diff --git a/.circleci/config.yml b/.circleci/config.yml
index d524fe69b..8b4834e92 100644
--- a/.circleci/config.yml
+++ b/.circleci/config.yml
@@ -1,85 +1,85 @@
-version: 2
-
-jobs:
-  build:
-    working_directory: ~/code
-    docker:
-      - image: circleci/android:api-29
-    steps:
-      - checkout
-      - restore_cache:
-          key: jars-{{ checksum "build.gradle" }}-{{ checksum  "presentation/build.gradle" }}-{{ checksum  "data/build.gradle" }}-{{ checksum  "domain/build.gradle" }}
-      - run:
-          name: Download dependencies
-          command: ./gradlew androidDependencies
-      - save_cache:
-          paths:
-            - ~/.gradle
-          key: jars-{{ checksum "build.gradle" }}-{{ checksum  "presentation/build.gradle" }}-{{ checksum  "data/build.gradle" }}-{{ checksum  "domain/build.gradle" }}
-      - run:
-          name: Decrypt and unzip secrets
-          command: |
-            openssl aes-256-cbc -d -in secrets.tar.enc -md sha1 -k ${SECRETS_KEY} -iv ${SECRETS_IV} >> secrets.tar
-            tar xvf secrets.tar
-      - run:
-          name: Gradle build
-          command: ./gradlew :presentation:assembleWithAnalyticsRelease :presentation:bundleWithAnalyticsRelease
-      - run:
-          name: Flatten outputs
-          command: find presentation/build/outputs -mindepth 2 -type f -exec mv -i '{}' presentation/build/outputs/ ';'
-      - store_artifacts:
-          path: presentation/build/outputs
-      - persist_to_workspace:
-          root: presentation/build/outputs
-          paths: .
-
-  test:
-    working_directory: ~/code
-    docker:
-      - image: circleci/android:api-29
-    steps:
-      - checkout
-      - restore_cache:
-          key: jars-{{ checksum "build.gradle" }}-{{ checksum  "presentation/build.gradle" }}-{{ checksum  "data/build.gradle" }}-{{ checksum  "domain/build.gradle" }}
-      - run:
-          name: Download dependencies
-          command: ./gradlew androidDependencies
-      - save_cache:
-          paths:
-            - ~/.gradle
-          key: jars-{{ checksum "build.gradle" }}-{{ checksum  "presentation/build.gradle" }}-{{ checksum  "data/build.gradle" }}-{{ checksum  "domain/build.gradle" }}
-      - store_test_results:
-          path: presentation/build/test-results
-
-  deploy:
-    docker:
-      - image: cibuilds/github:0.10
-    steps:
-      - attach_workspace:
-          at: presentation/build/outputs
-      - run:
-          name: "Publish Release on GitHub"
-          command: ghr -t ${GITHUB_TOKEN} -u ${CIRCLE_PROJECT_USERNAME} -r ${CIRCLE_PROJECT_REPONAME} -c ${CIRCLE_SHA1} ${CIRCLE_TAG} presentation/build/outputs/
-
-workflows:
-  version: 2
-  main:
-    jobs:
-      - build:
-          filters:
-            tags:
-              only: /^v.*/
-      - test:
-          requires:
-            - build
-          filters:
-            tags:
-              only: /^v.*/
-      - deploy:
-          requires:
-            - test
-          filters:
-            branches:
-              ignore: /.*/
-            tags:
-              only: /^v.*/
+version: 2
+
+jobs:
+  build:
+    working_directory: ~/code
+    docker:
+      - image: circleci/android:api-29
+    steps:
+      - checkout
+      - restore_cache:
+          key: jars-{{ checksum "build.gradle" }}-{{ checksum  "presentation/build.gradle" }}-{{ checksum  "data/build.gradle" }}-{{ checksum  "domain/build.gradle" }}
+      - run:
+          name: Download dependencies
+          command: ./gradlew androidDependencies
+      - save_cache:
+          paths:
+            - ~/.gradle
+          key: jars-{{ checksum "build.gradle" }}-{{ checksum  "presentation/build.gradle" }}-{{ checksum  "data/build.gradle" }}-{{ checksum  "domain/build.gradle" }}
+      - run:
+          name: Decrypt and unzip secrets
+          command: |
+            openssl aes-256-cbc -d -in secrets.tar.enc -md sha1 -k ${SECRETS_KEY} -iv ${SECRETS_IV} >> secrets.tar
+            tar xvf secrets.tar
+      - run:
+          name: Gradle build
+          command: ./gradlew :presentation:assembleWithAnalyticsRelease :presentation:bundleWithAnalyticsRelease
+      - run:
+          name: Flatten outputs
+          command: find presentation/build/outputs -mindepth 2 -type f -exec mv -i '{}' presentation/build/outputs/ ';'
+      - store_artifacts:
+          path: presentation/build/outputs
+      - persist_to_workspace:
+          root: presentation/build/outputs
+          paths: .
+
+  test:
+    working_directory: ~/code
+    docker:
+      - image: circleci/android:api-29
+    steps:
+      - checkout
+      - restore_cache:
+          key: jars-{{ checksum "build.gradle" }}-{{ checksum  "presentation/build.gradle" }}-{{ checksum  "data/build.gradle" }}-{{ checksum  "domain/build.gradle" }}
+      - run:
+          name: Download dependencies
+          command: ./gradlew androidDependencies
+      - save_cache:
+          paths:
+            - ~/.gradle
+          key: jars-{{ checksum "build.gradle" }}-{{ checksum  "presentation/build.gradle" }}-{{ checksum  "data/build.gradle" }}-{{ checksum  "domain/build.gradle" }}
+      - store_test_results:
+          path: presentation/build/test-results
+
+  deploy:
+    docker:
+      - image: cibuilds/github:0.10
+    steps:
+      - attach_workspace:
+          at: presentation/build/outputs
+      - run:
+          name: "Publish Release on GitHub"
+          command: ghr -t ${GITHUB_TOKEN} -u ${CIRCLE_PROJECT_USERNAME} -r ${CIRCLE_PROJECT_REPONAME} -c ${CIRCLE_SHA1} ${CIRCLE_TAG} presentation/build/outputs/
+
+workflows:
+  version: 2
+  main:
+    jobs:
+      - build:
+          filters:
+            tags:
+              only: /^v.*/
+      - test:
+          requires:
+            - build
+          filters:
+            tags:
+              only: /^v.*/
+      - deploy:
+          requires:
+            - test
+          filters:
+            branches:
+              ignore: /.*/
+            tags:
+              only: /^v.*/
diff --git a/.github/ISSUE_TEMPLATE.md b/.github/ISSUE_TEMPLATE.md
index 9db78b9a5..7acd8af8d 100644
--- a/.github/ISSUE_TEMPLATE.md
+++ b/.github/ISSUE_TEMPLATE.md
@@ -1,17 +1,17 @@
-### DESCRIPTION
-A short description of the issue. 
-Example: Conversations aren't marked as read when they are opened from a notification.
-
-### STEPS
-1. Steps
-2. to 
-3. reproduce
-4. the 
-5. issue.
-
-### EXPECTED
-Describe the expected behaviour.
-
-### OBSERVATIONS
-Describe what happens instead of the expected behaviour.
-
+### DESCRIPTION
+A short description of the issue. 
+Example: Conversations aren't marked as read when they are opened from a notification.
+
+### STEPS
+1. Steps
+2. to 
+3. reproduce
+4. the 
+5. issue.
+
+### EXPECTED
+Describe the expected behaviour.
+
+### OBSERVATIONS
+Describe what happens instead of the expected behaviour.
+
diff --git a/.gitignore b/.gitignore
index ca5f5f323..0187a4f44 100644
--- a/.gitignore
+++ b/.gitignore
@@ -1,54 +1,54 @@
-# Built application files
-*.apk
-*.ap_
-
-# Files for the ART/Dalvik VM
-*.dex
-
-# Java class files
-*.class
-
-# Generated files
-bin/
-gen/
-out/
-
-# Gradle files
-.gradle/
-build/
-
-# Local configuration file (sdk path, etc)
-local.properties
-
-# Proguard folder generated by Eclipse
-proguard/
-
-# Log Files
-*.log
-
-# Android Studio Navigation editor temp files
-.navigation/
-
-# Android Studio captures folder
-captures/
-
-# Intellij
-*.iml
-.idea/*
-
-# Keystore files
-*.jks
-
-# Mac .DS_STORE files
-*.DS_STORE
-
-# External native build folder generated in Android Studio 2.2 and later
-.externalNativeBuild
-
-# Google Services (e.g. APIs or Firebase)
-google-services.json
-
-# Freeline
-freeline.py
-freeline/
-freeline_project_description.json
+# Built application files
+*.apk
+*.ap_
+
+# Files for the ART/Dalvik VM
+*.dex
+
+# Java class files
+*.class
+
+# Generated files
+bin/
+gen/
+out/
+
+# Gradle files
+.gradle/
+build/
+
+# Local configuration file (sdk path, etc)
+local.properties
+
+# Proguard folder generated by Eclipse
+proguard/
+
+# Log Files
+*.log
+
+# Android Studio Navigation editor temp files
+.navigation/
+
+# Android Studio captures folder
+captures/
+
+# Intellij
+*.iml
+.idea/*
+
+# Keystore files
+*.jks
+
+# Mac .DS_STORE files
+*.DS_STORE
+
+# External native build folder generated in Android Studio 2.2 and later
+.externalNativeBuild
+
+# Google Services (e.g. APIs or Firebase)
+google-services.json
+
+# Freeline
+freeline.py
+freeline/
+freeline_project_description.json
diff --git a/.travis.yml b/.travis.yml
index ae7f6a942..5b8523005 100644
--- a/.travis.yml
+++ b/.travis.yml
@@ -1,98 +1,98 @@
-language: android
-jdk: oraclejdk8
-sudo: false
-
-notifications:
-  email:
-    on_success: change
-    on_failure: change
-
-env:
-  global:
-    - COMPILE_API_LEVEL=29
-    - EMULATOR_API_LEVEL=24              # It seems emulator levels 25,26,27 from main repos have google_apis by default, and do not support armeabi-v7a. Check commit comment.
-    - EMULATOR_TAG=default               # Possible values are default, google_apis, android-tv, android-wear, android-wear-cn
-    - EMULATOR_ABI=armeabi-v7a           # Default is armeabi-v7a, possible options are: x86, x86_64, mips, arm64-v8a, armeabi-v7a. Note: check commit comment
-    - EMULATOR_NAME=qksms3
-    - ANDROID_BUILD_TOOLS_VERSION=29.0.2 # Match build-tools version used in build.gradle
-    - EMULATOR="system-images;android-${EMULATOR_API_LEVEL};${EMULATOR_TAG};${EMULATOR_ABI}" # Used to install/create emulator
-
-android:
-  components:
-    - tools
-    - platform-tools
-    - tools
-    - extra
-
-    # The build tools used in the project
-    - build-tools-${ANDROID_BUILD_TOOLS_VERSION}
-
-    # The SDK used in the project
-    - android-${COMPILE_API_LEVEL}
-
-    # For running the emulator in Travis
-    - android-${EMULATOR_API_LEVEL}
-    - sys-img-${EMULATOR_ABI}-android-${EMULATOR_API_LEVEL}
-
-# Set up Android-sdk and the emulator
-before_install:
-  # Decrypt keystore and google-services.json
-  - openssl aes-256-cbc -K $encrypted_4d1d940e2c65_key -iv $encrypted_4d1d940e2c65_iv -in secrets.tar.enc -out secrets.tar -d
-  - tar xvf secrets.tar
-
-  - echo 'count=0' > /home/travis/.android/repositories.cfg # Avoid warning
-  - ls -lar $HOME/**/*
-
-  # List and delete unnecessary components to free space
-  - sdkmanager --list || true                                     # Print out package list for debug purposes
-  - sdkmanager --uninstall "extras;google;google_play_services"
-  - yes | sdkmanager "tools"                                      # Update tools
-  - yes | sdkmanager "platforms;android-${EMULATOR_API_LEVEL}"    # Android platform required by emulator
-  - yes | sdkmanager "platforms;android-${COMPILE_API_LEVEL}"     # Android platform required by compiler
-  - yes | sdkmanager "build-tools;${ANDROID_BUILD_TOOLS_VERSION}" # Android build tools
-  - yes | sdkmanager "${EMULATOR}"                                # Install emulator system image
-  - sdkmanager --list || true                                     # Print out package list for debug purposes
-
-# Run the emulator
-install:
-  # emulator instance
-  - echo no | android create avd --force -n ${EMULATOR_NAME} -k "${EMULATOR}"
-  # Run emulator in a subshell, this seems to solve the travis QT issue
-  - ( cd "$(dirname "$(which emulator)")" && ./emulator -avd ${EMULATOR_NAME} -verbose -show-kernel -selinux permissive -no-audio -no-window -no-boot-anim -wipe-data & )
-  - android-wait-for-emulator
-  - adb shell settings put global window_animation_scale 0 &
-  - adb shell settings put global transition_animation_scale 0 &
-  - adb shell settings put global animator_duration_scale 0 &
-  - sleep 30
-  - adb shell input keyevent 82 &
-  - adb devices
-
-# Gradle setup
-before_script:
-  - cd ${TRAVIS_BUILD_DIR}
-  - ./gradlew --version
-  - ./gradlew clean
-
-# Build APK
-script:
-  - |
-    ./gradlew :presentation:assembleWithAnalyticsRelease :presentation:bundleWithAnalyticsRelease assembleAndroidTest -PtestCoverageEnabled='true'
-    retval=$?
-    if [$retval -ne 0]; then
-      echo "error on assembling, exit code: "$retval
-      exit $retval
-    fi
-
-# Deploy APK
-deploy:
-  provider: releases
-  skip_cleanup: true
-  overwrite: true
-  api_key:
-    secure: XF7V/I02gpyOzCAFXEFyrThXVUUnKjSaWQ8lppO50mVtdugimjWIPtHrcYASaJQf9INhqo0lamk+khPxtKxc1BSCp8o+c22UKcpczyjD4kK27a3zKfuNQWteBRjCH34vIGnrRFSHSWYLIgeuoIK3q5Lq4IBK/Od3mfpRaDt1ER+IqMzR3L205x1H8dW3MVuxXgdnq3jHlRpq86oOe293+dnblVCtWUvAzwhZPnnbBc4JUaNomMI7dLJ/pAigByCoHHmG9pc2Cky1yyWVAnTZFAlf2PbzPDLRRnXmHuYKfHxiZgd/l8JTiZdhky9cXgFoSxvJyDABRqqLxVNfXt2ZwgdtiulZml8RB1FB0L37qL72mxWgi6y9IbQgt/FG20K2QpSBglk0bCGLS+h5Yz3kV4fhsBY7llpWGw14BvlAx9sUfl3Ej+IUsWoJgA00TFNGDG8sMyOFoCQVz/sB4Dv4h+JfynJZcmm8okcfYrWBHOoHY7cH3chBWp/2A736f2A/aqnBd6z8a03toe2ILC9eSOiIhrVxPyqLmEKBD1rCduVFNteqGwm9G9YwKpvFibTqu0gqEtfF7cmuMH6M5PYExI5EzoewZTYmgp02+lBuFAEMvycVvXcu8VfeeT6cgeLlmz2hsbo93UfoSQyP+gSojMOOkVUsl6mIp1STLiJ5IRY=
-  file:
-    - /home/travis/build/moezbhatti/qksms/presentation/build/outputs/bundle/withAnalyticsRelease/presentation.aab
-    - /home/travis/build/moezbhatti/qksms/presentation/build/outputs/apk/withAnalytics/release/presentation-withAnalytics-release.apk
-  on:
-    repo: moezbhatti/qksms
+language: android
+jdk: oraclejdk8
+sudo: false
+
+notifications:
+  email:
+    on_success: change
+    on_failure: change
+
+env:
+  global:
+    - COMPILE_API_LEVEL=29
+    - EMULATOR_API_LEVEL=24              # It seems emulator levels 25,26,27 from main repos have google_apis by default, and do not support armeabi-v7a. Check commit comment.
+    - EMULATOR_TAG=default               # Possible values are default, google_apis, android-tv, android-wear, android-wear-cn
+    - EMULATOR_ABI=armeabi-v7a           # Default is armeabi-v7a, possible options are: x86, x86_64, mips, arm64-v8a, armeabi-v7a. Note: check commit comment
+    - EMULATOR_NAME=qksms3
+    - ANDROID_BUILD_TOOLS_VERSION=29.0.2 # Match build-tools version used in build.gradle
+    - EMULATOR="system-images;android-${EMULATOR_API_LEVEL};${EMULATOR_TAG};${EMULATOR_ABI}" # Used to install/create emulator
+
+android:
+  components:
+    - tools
+    - platform-tools
+    - tools
+    - extra
+
+    # The build tools used in the project
+    - build-tools-${ANDROID_BUILD_TOOLS_VERSION}
+
+    # The SDK used in the project
+    - android-${COMPILE_API_LEVEL}
+
+    # For running the emulator in Travis
+    - android-${EMULATOR_API_LEVEL}
+    - sys-img-${EMULATOR_ABI}-android-${EMULATOR_API_LEVEL}
+
+# Set up Android-sdk and the emulator
+before_install:
+  # Decrypt keystore and google-services.json
+  - openssl aes-256-cbc -K $encrypted_4d1d940e2c65_key -iv $encrypted_4d1d940e2c65_iv -in secrets.tar.enc -out secrets.tar -d
+  - tar xvf secrets.tar
+
+  - echo 'count=0' > /home/travis/.android/repositories.cfg # Avoid warning
+  - ls -lar $HOME/**/*
+
+  # List and delete unnecessary components to free space
+  - sdkmanager --list || true                                     # Print out package list for debug purposes
+  - sdkmanager --uninstall "extras;google;google_play_services"
+  - yes | sdkmanager "tools"                                      # Update tools
+  - yes | sdkmanager "platforms;android-${EMULATOR_API_LEVEL}"    # Android platform required by emulator
+  - yes | sdkmanager "platforms;android-${COMPILE_API_LEVEL}"     # Android platform required by compiler
+  - yes | sdkmanager "build-tools;${ANDROID_BUILD_TOOLS_VERSION}" # Android build tools
+  - yes | sdkmanager "${EMULATOR}"                                # Install emulator system image
+  - sdkmanager --list || true                                     # Print out package list for debug purposes
+
+# Run the emulator
+install:
+  # emulator instance
+  - echo no | android create avd --force -n ${EMULATOR_NAME} -k "${EMULATOR}"
+  # Run emulator in a subshell, this seems to solve the travis QT issue
+  - ( cd "$(dirname "$(which emulator)")" && ./emulator -avd ${EMULATOR_NAME} -verbose -show-kernel -selinux permissive -no-audio -no-window -no-boot-anim -wipe-data & )
+  - android-wait-for-emulator
+  - adb shell settings put global window_animation_scale 0 &
+  - adb shell settings put global transition_animation_scale 0 &
+  - adb shell settings put global animator_duration_scale 0 &
+  - sleep 30
+  - adb shell input keyevent 82 &
+  - adb devices
+
+# Gradle setup
+before_script:
+  - cd ${TRAVIS_BUILD_DIR}
+  - ./gradlew --version
+  - ./gradlew clean
+
+# Build APK
+script:
+  - |
+    ./gradlew :presentation:assembleWithAnalyticsRelease :presentation:bundleWithAnalyticsRelease assembleAndroidTest -PtestCoverageEnabled='true'
+    retval=$?
+    if [$retval -ne 0]; then
+      echo "error on assembling, exit code: "$retval
+      exit $retval
+    fi
+
+# Deploy APK
+deploy:
+  provider: releases
+  skip_cleanup: true
+  overwrite: true
+  api_key:
+    secure: XF7V/I02gpyOzCAFXEFyrThXVUUnKjSaWQ8lppO50mVtdugimjWIPtHrcYASaJQf9INhqo0lamk+khPxtKxc1BSCp8o+c22UKcpczyjD4kK27a3zKfuNQWteBRjCH34vIGnrRFSHSWYLIgeuoIK3q5Lq4IBK/Od3mfpRaDt1ER+IqMzR3L205x1H8dW3MVuxXgdnq3jHlRpq86oOe293+dnblVCtWUvAzwhZPnnbBc4JUaNomMI7dLJ/pAigByCoHHmG9pc2Cky1yyWVAnTZFAlf2PbzPDLRRnXmHuYKfHxiZgd/l8JTiZdhky9cXgFoSxvJyDABRqqLxVNfXt2ZwgdtiulZml8RB1FB0L37qL72mxWgi6y9IbQgt/FG20K2QpSBglk0bCGLS+h5Yz3kV4fhsBY7llpWGw14BvlAx9sUfl3Ej+IUsWoJgA00TFNGDG8sMyOFoCQVz/sB4Dv4h+JfynJZcmm8okcfYrWBHOoHY7cH3chBWp/2A736f2A/aqnBd6z8a03toe2ILC9eSOiIhrVxPyqLmEKBD1rCduVFNteqGwm9G9YwKpvFibTqu0gqEtfF7cmuMH6M5PYExI5EzoewZTYmgp02+lBuFAEMvycVvXcu8VfeeT6cgeLlmz2hsbo93UfoSQyP+gSojMOOkVUsl6mIp1STLiJ5IRY=
+  file:
+    - /home/travis/build/moezbhatti/qksms/presentation/build/outputs/bundle/withAnalyticsRelease/presentation.aab
+    - /home/travis/build/moezbhatti/qksms/presentation/build/outputs/apk/withAnalytics/release/presentation-withAnalytics-release.apk
+  on:
+    repo: moezbhatti/qksms
     tags: true
\ No newline at end of file
diff --git a/LICENSE b/LICENSE
index 9cecc1d46..c65825e32 100644
--- a/LICENSE
+++ b/LICENSE
@@ -1,674 +1,674 @@
-                    GNU GENERAL PUBLIC LICENSE
-                       Version 3, 29 June 2007
-
- Copyright (C) 2007 Free Software Foundation, Inc. <http://fsf.org/>
- Everyone is permitted to copy and distribute verbatim copies
- of this license document, but changing it is not allowed.
-
-                            Preamble
-
-  The GNU General Public License is a free, copyleft license for
-software and other kinds of works.
-
-  The licenses for most software and other practical works are designed
-to take away your freedom to share and change the works.  By contrast,
-the GNU General Public License is intended to guarantee your freedom to
-share and change all versions of a program--to make sure it remains free
-software for all its users.  We, the Free Software Foundation, use the
-GNU General Public License for most of our software; it applies also to
-any other work released this way by its authors.  You can apply it to
-your programs, too.
-
-  When we speak of free software, we are referring to freedom, not
-price.  Our General Public Licenses are designed to make sure that you
-have the freedom to distribute copies of free software (and charge for
-them if you wish), that you receive source code or can get it if you
-want it, that you can change the software or use pieces of it in new
-free programs, and that you know you can do these things.
-
-  To protect your rights, we need to prevent others from denying you
-these rights or asking you to surrender the rights.  Therefore, you have
-certain responsibilities if you distribute copies of the software, or if
-you modify it: responsibilities to respect the freedom of others.
-
-  For example, if you distribute copies of such a program, whether
-gratis or for a fee, you must pass on to the recipients the same
-freedoms that you received.  You must make sure that they, too, receive
-or can get the source code.  And you must show them these terms so they
-know their rights.
-
-  Developers that use the GNU GPL protect your rights with two steps:
-(1) assert copyright on the software, and (2) offer you this License
-giving you legal permission to copy, distribute and/or modify it.
-
-  For the developers' and authors' protection, the GPL clearly explains
-that there is no warranty for this free software.  For both users' and
-authors' sake, the GPL requires that modified versions be marked as
-changed, so that their problems will not be attributed erroneously to
-authors of previous versions.
-
-  Some devices are designed to deny users access to install or run
-modified versions of the software inside them, although the manufacturer
-can do so.  This is fundamentally incompatible with the aim of
-protecting users' freedom to change the software.  The systematic
-pattern of such abuse occurs in the area of products for individuals to
-use, which is precisely where it is most unacceptable.  Therefore, we
-have designed this version of the GPL to prohibit the practice for those
-products.  If such problems arise substantially in other domains, we
-stand ready to extend this provision to those domains in future versions
-of the GPL, as needed to protect the freedom of users.
-
-  Finally, every program is threatened constantly by software patents.
-States should not allow patents to restrict development and use of
-software on general-purpose computers, but in those that do, we wish to
-avoid the special danger that patents applied to a free program could
-make it effectively proprietary.  To prevent this, the GPL assures that
-patents cannot be used to render the program non-free.
-
-  The precise terms and conditions for copying, distribution and
-modification follow.
-
-                       TERMS AND CONDITIONS
-
-  0. Definitions.
-
-  "This License" refers to version 3 of the GNU General Public License.
-
-  "Copyright" also means copyright-like laws that apply to other kinds of
-works, such as semiconductor masks.
-
-  "The Program" refers to any copyrightable work licensed under this
-License.  Each licensee is addressed as "you".  "Licensees" and
-"recipients" may be individuals or organizations.
-
-  To "modify" a work means to copy from or adapt all or part of the work
-in a fashion requiring copyright permission, other than the making of an
-exact copy.  The resulting work is called a "modified version" of the
-earlier work or a work "based on" the earlier work.
-
-  A "covered work" means either the unmodified Program or a work based
-on the Program.
-
-  To "propagate" a work means to do anything with it that, without
-permission, would make you directly or secondarily liable for
-infringement under applicable copyright law, except executing it on a
-computer or modifying a private copy.  Propagation includes copying,
-distribution (with or without modification), making available to the
-public, and in some countries other activities as well.
-
-  To "convey" a work means any kind of propagation that enables other
-parties to make or receive copies.  Mere interaction with a user through
-a computer network, with no transfer of a copy, is not conveying.
-
-  An interactive user interface displays "Appropriate Legal Notices"
-to the extent that it includes a convenient and prominently visible
-feature that (1) displays an appropriate copyright notice, and (2)
-tells the user that there is no warranty for the work (except to the
-extent that warranties are provided), that licensees may convey the
-work under this License, and how to view a copy of this License.  If
-the interface presents a list of user commands or options, such as a
-menu, a prominent item in the list meets this criterion.
-
-  1. Source Code.
-
-  The "source code" for a work means the preferred form of the work
-for making modifications to it.  "Object code" means any non-source
-form of a work.
-
-  A "Standard Interface" means an interface that either is an official
-standard defined by a recognized standards body, or, in the case of
-interfaces specified for a particular programming language, one that
-is widely used among developers working in that language.
-
-  The "System Libraries" of an executable work include anything, other
-than the work as a whole, that (a) is included in the normal form of
-packaging a Major Component, but which is not part of that Major
-Component, and (b) serves only to enable use of the work with that
-Major Component, or to implement a Standard Interface for which an
-implementation is available to the public in source code form.  A
-"Major Component", in this context, means a major essential component
-(kernel, window system, and so on) of the specific operating system
-(if any) on which the executable work runs, or a compiler used to
-produce the work, or an object code interpreter used to run it.
-
-  The "Corresponding Source" for a work in object code form means all
-the source code needed to generate, install, and (for an executable
-work) run the object code and to modify the work, including scripts to
-control those activities.  However, it does not include the work's
-System Libraries, or general-purpose tools or generally available free
-programs which are used unmodified in performing those activities but
-which are not part of the work.  For example, Corresponding Source
-includes interface definition files associated with source files for
-the work, and the source code for shared libraries and dynamically
-linked subprograms that the work is specifically designed to require,
-such as by intimate data communication or control flow between those
-subprograms and other parts of the work.
-
-  The Corresponding Source need not include anything that users
-can regenerate automatically from other parts of the Corresponding
-Source.
-
-  The Corresponding Source for a work in source code form is that
-same work.
-
-  2. Basic Permissions.
-
-  All rights granted under this License are granted for the term of
-copyright on the Program, and are irrevocable provided the stated
-conditions are met.  This License explicitly affirms your unlimited
-permission to run the unmodified Program.  The output from running a
-covered work is covered by this License only if the output, given its
-content, constitutes a covered work.  This License acknowledges your
-rights of fair use or other equivalent, as provided by copyright law.
-
-  You may make, run and propagate covered works that you do not
-convey, without conditions so long as your license otherwise remains
-in force.  You may convey covered works to others for the sole purpose
-of having them make modifications exclusively for you, or provide you
-with facilities for running those works, provided that you comply with
-the terms of this License in conveying all material for which you do
-not control copyright.  Those thus making or running the covered works
-for you must do so exclusively on your behalf, under your direction
-and control, on terms that prohibit them from making any copies of
-your copyrighted material outside their relationship with you.
-
-  Conveying under any other circumstances is permitted solely under
-the conditions stated below.  Sublicensing is not allowed; section 10
-makes it unnecessary.
-
-  3. Protecting Users' Legal Rights From Anti-Circumvention Law.
-
-  No covered work shall be deemed part of an effective technological
-measure under any applicable law fulfilling obligations under article
-11 of the WIPO copyright treaty adopted on 20 December 1996, or
-similar laws prohibiting or restricting circumvention of such
-measures.
-
-  When you convey a covered work, you waive any legal power to forbid
-circumvention of technological measures to the extent such circumvention
-is effected by exercising rights under this License with respect to
-the covered work, and you disclaim any intention to limit operation or
-modification of the work as a means of enforcing, against the work's
-users, your or third parties' legal rights to forbid circumvention of
-technological measures.
-
-  4. Conveying Verbatim Copies.
-
-  You may convey verbatim copies of the Program's source code as you
-receive it, in any medium, provided that you conspicuously and
-appropriately publish on each copy an appropriate copyright notice;
-keep intact all notices stating that this License and any
-non-permissive terms added in accord with section 7 apply to the code;
-keep intact all notices of the absence of any warranty; and give all
-recipients a copy of this License along with the Program.
-
-  You may charge any price or no price for each copy that you convey,
-and you may offer support or warranty protection for a fee.
-
-  5. Conveying Modified Source Versions.
-
-  You may convey a work based on the Program, or the modifications to
-produce it from the Program, in the form of source code under the
-terms of section 4, provided that you also meet all of these conditions:
-
-    a) The work must carry prominent notices stating that you modified
-    it, and giving a relevant date.
-
-    b) The work must carry prominent notices stating that it is
-    released under this License and any conditions added under section
-    7.  This requirement modifies the requirement in section 4 to
-    "keep intact all notices".
-
-    c) You must license the entire work, as a whole, under this
-    License to anyone who comes into possession of a copy.  This
-    License will therefore apply, along with any applicable section 7
-    additional terms, to the whole of the work, and all its parts,
-    regardless of how they are packaged.  This License gives no
-    permission to license the work in any other way, but it does not
-    invalidate such permission if you have separately received it.
-
-    d) If the work has interactive user interfaces, each must display
-    Appropriate Legal Notices; however, if the Program has interactive
-    interfaces that do not display Appropriate Legal Notices, your
-    work need not make them do so.
-
-  A compilation of a covered work with other separate and independent
-works, which are not by their nature extensions of the covered work,
-and which are not combined with it such as to form a larger program,
-in or on a volume of a storage or distribution medium, is called an
-"aggregate" if the compilation and its resulting copyright are not
-used to limit the access or legal rights of the compilation's users
-beyond what the individual works permit.  Inclusion of a covered work
-in an aggregate does not cause this License to apply to the other
-parts of the aggregate.
-
-  6. Conveying Non-Source Forms.
-
-  You may convey a covered work in object code form under the terms
-of sections 4 and 5, provided that you also convey the
-machine-readable Corresponding Source under the terms of this License,
-in one of these ways:
-
-    a) Convey the object code in, or embodied in, a physical product
-    (including a physical distribution medium), accompanied by the
-    Corresponding Source fixed on a durable physical medium
-    customarily used for software interchange.
-
-    b) Convey the object code in, or embodied in, a physical product
-    (including a physical distribution medium), accompanied by a
-    written offer, valid for at least three years and valid for as
-    long as you offer spare parts or customer support for that product
-    model, to give anyone who possesses the object code either (1) a
-    copy of the Corresponding Source for all the software in the
-    product that is covered by this License, on a durable physical
-    medium customarily used for software interchange, for a price no
-    more than your reasonable cost of physically performing this
-    conveying of source, or (2) access to copy the
-    Corresponding Source from a network server at no charge.
-
-    c) Convey individual copies of the object code with a copy of the
-    written offer to provide the Corresponding Source.  This
-    alternative is allowed only occasionally and noncommercially, and
-    only if you received the object code with such an offer, in accord
-    with subsection 6b.
-
-    d) Convey the object code by offering access from a designated
-    place (gratis or for a charge), and offer equivalent access to the
-    Corresponding Source in the same way through the same place at no
-    further charge.  You need not require recipients to copy the
-    Corresponding Source along with the object code.  If the place to
-    copy the object code is a network server, the Corresponding Source
-    may be on a different server (operated by you or a third party)
-    that supports equivalent copying facilities, provided you maintain
-    clear directions next to the object code saying where to find the
-    Corresponding Source.  Regardless of what server hosts the
-    Corresponding Source, you remain obligated to ensure that it is
-    available for as long as needed to satisfy these requirements.
-
-    e) Convey the object code using peer-to-peer transmission, provided
-    you inform other peers where the object code and Corresponding
-    Source of the work are being offered to the general public at no
-    charge under subsection 6d.
-
-  A separable portion of the object code, whose source code is excluded
-from the Corresponding Source as a System Library, need not be
-included in conveying the object code work.
-
-  A "User Product" is either (1) a "consumer product", which means any
-tangible personal property which is normally used for personal, family,
-or household purposes, or (2) anything designed or sold for incorporation
-into a dwelling.  In determining whether a product is a consumer product,
-doubtful cases shall be resolved in favor of coverage.  For a particular
-product received by a particular user, "normally used" refers to a
-typical or common use of that class of product, regardless of the status
-of the particular user or of the way in which the particular user
-actually uses, or expects or is expected to use, the product.  A product
-is a consumer product regardless of whether the product has substantial
-commercial, industrial or non-consumer uses, unless such uses represent
-the only significant mode of use of the product.
-
-  "Installation Information" for a User Product means any methods,
-procedures, authorization keys, or other information required to install
-and execute modified versions of a covered work in that User Product from
-a modified version of its Corresponding Source.  The information must
-suffice to ensure that the continued functioning of the modified object
-code is in no case prevented or interfered with solely because
-modification has been made.
-
-  If you convey an object code work under this section in, or with, or
-specifically for use in, a User Product, and the conveying occurs as
-part of a transaction in which the right of possession and use of the
-User Product is transferred to the recipient in perpetuity or for a
-fixed term (regardless of how the transaction is characterized), the
-Corresponding Source conveyed under this section must be accompanied
-by the Installation Information.  But this requirement does not apply
-if neither you nor any third party retains the ability to install
-modified object code on the User Product (for example, the work has
-been installed in ROM).
-
-  The requirement to provide Installation Information does not include a
-requirement to continue to provide support service, warranty, or updates
-for a work that has been modified or installed by the recipient, or for
-the User Product in which it has been modified or installed.  Access to a
-network may be denied when the modification itself materially and
-adversely affects the operation of the network or violates the rules and
-protocols for communication across the network.
-
-  Corresponding Source conveyed, and Installation Information provided,
-in accord with this section must be in a format that is publicly
-documented (and with an implementation available to the public in
-source code form), and must require no special password or key for
-unpacking, reading or copying.
-
-  7. Additional Terms.
-
-  "Additional permissions" are terms that supplement the terms of this
-License by making exceptions from one or more of its conditions.
-Additional permissions that are applicable to the entire Program shall
-be treated as though they were included in this License, to the extent
-that they are valid under applicable law.  If additional permissions
-apply only to part of the Program, that part may be used separately
-under those permissions, but the entire Program remains governed by
-this License without regard to the additional permissions.
-
-  When you convey a copy of a covered work, you may at your option
-remove any additional permissions from that copy, or from any part of
-it.  (Additional permissions may be written to require their own
-removal in certain cases when you modify the work.)  You may place
-additional permissions on material, added by you to a covered work,
-for which you have or can give appropriate copyright permission.
-
-  Notwithstanding any other provision of this License, for material you
-add to a covered work, you may (if authorized by the copyright holders of
-that material) supplement the terms of this License with terms:
-
-    a) Disclaiming warranty or limiting liability differently from the
-    terms of sections 15 and 16 of this License; or
-
-    b) Requiring preservation of specified reasonable legal notices or
-    author attributions in that material or in the Appropriate Legal
-    Notices displayed by works containing it; or
-
-    c) Prohibiting misrepresentation of the origin of that material, or
-    requiring that modified versions of such material be marked in
-    reasonable ways as different from the original version; or
-
-    d) Limiting the use for publicity purposes of names of licensors or
-    authors of the material; or
-
-    e) Declining to grant rights under trademark law for use of some
-    trade names, trademarks, or service marks; or
-
-    f) Requiring indemnification of licensors and authors of that
-    material by anyone who conveys the material (or modified versions of
-    it) with contractual assumptions of liability to the recipient, for
-    any liability that these contractual assumptions directly impose on
-    those licensors and authors.
-
-  All other non-permissive additional terms are considered "further
-restrictions" within the meaning of section 10.  If the Program as you
-received it, or any part of it, contains a notice stating that it is
-governed by this License along with a term that is a further
-restriction, you may remove that term.  If a license document contains
-a further restriction but permits relicensing or conveying under this
-License, you may add to a covered work material governed by the terms
-of that license document, provided that the further restriction does
-not survive such relicensing or conveying.
-
-  If you add terms to a covered work in accord with this section, you
-must place, in the relevant source files, a statement of the
-additional terms that apply to those files, or a notice indicating
-where to find the applicable terms.
-
-  Additional terms, permissive or non-permissive, may be stated in the
-form of a separately written license, or stated as exceptions;
-the above requirements apply either way.
-
-  8. Termination.
-
-  You may not propagate or modify a covered work except as expressly
-provided under this License.  Any attempt otherwise to propagate or
-modify it is void, and will automatically terminate your rights under
-this License (including any patent licenses granted under the third
-paragraph of section 11).
-
-  However, if you cease all violation of this License, then your
-license from a particular copyright holder is reinstated (a)
-provisionally, unless and until the copyright holder explicitly and
-finally terminates your license, and (b) permanently, if the copyright
-holder fails to notify you of the violation by some reasonable means
-prior to 60 days after the cessation.
-
-  Moreover, your license from a particular copyright holder is
-reinstated permanently if the copyright holder notifies you of the
-violation by some reasonable means, this is the first time you have
-received notice of violation of this License (for any work) from that
-copyright holder, and you cure the violation prior to 30 days after
-your receipt of the notice.
-
-  Termination of your rights under this section does not terminate the
-licenses of parties who have received copies or rights from you under
-this License.  If your rights have been terminated and not permanently
-reinstated, you do not qualify to receive new licenses for the same
-material under section 10.
-
-  9. Acceptance Not Required for Having Copies.
-
-  You are not required to accept this License in order to receive or
-run a copy of the Program.  Ancillary propagation of a covered work
-occurring solely as a consequence of using peer-to-peer transmission
-to receive a copy likewise does not require acceptance.  However,
-nothing other than this License grants you permission to propagate or
-modify any covered work.  These actions infringe copyright if you do
-not accept this License.  Therefore, by modifying or propagating a
-covered work, you indicate your acceptance of this License to do so.
-
-  10. Automatic Licensing of Downstream Recipients.
-
-  Each time you convey a covered work, the recipient automatically
-receives a license from the original licensors, to run, modify and
-propagate that work, subject to this License.  You are not responsible
-for enforcing compliance by third parties with this License.
-
-  An "entity transaction" is a transaction transferring control of an
-organization, or substantially all assets of one, or subdividing an
-organization, or merging organizations.  If propagation of a covered
-work results from an entity transaction, each party to that
-transaction who receives a copy of the work also receives whatever
-licenses to the work the party's predecessor in interest had or could
-give under the previous paragraph, plus a right to possession of the
-Corresponding Source of the work from the predecessor in interest, if
-the predecessor has it or can get it with reasonable efforts.
-
-  You may not impose any further restrictions on the exercise of the
-rights granted or affirmed under this License.  For example, you may
-not impose a license fee, royalty, or other charge for exercise of
-rights granted under this License, and you may not initiate litigation
-(including a cross-claim or counterclaim in a lawsuit) alleging that
-any patent claim is infringed by making, using, selling, offering for
-sale, or importing the Program or any portion of it.
-
-  11. Patents.
-
-  A "contributor" is a copyright holder who authorizes use under this
-License of the Program or a work on which the Program is based.  The
-work thus licensed is called the contributor's "contributor version".
-
-  A contributor's "essential patent claims" are all patent claims
-owned or controlled by the contributor, whether already acquired or
-hereafter acquired, that would be infringed by some manner, permitted
-by this License, of making, using, or selling its contributor version,
-but do not include claims that would be infringed only as a
-consequence of further modification of the contributor version.  For
-purposes of this definition, "control" includes the right to grant
-patent sublicenses in a manner consistent with the requirements of
-this License.
-
-  Each contributor grants you a non-exclusive, worldwide, royalty-free
-patent license under the contributor's essential patent claims, to
-make, use, sell, offer for sale, import and otherwise run, modify and
-propagate the contents of its contributor version.
-
-  In the following three paragraphs, a "patent license" is any express
-agreement or commitment, however denominated, not to enforce a patent
-(such as an express permission to practice a patent or covenant not to
-sue for patent infringement).  To "grant" such a patent license to a
-party means to make such an agreement or commitment not to enforce a
-patent against the party.
-
-  If you convey a covered work, knowingly relying on a patent license,
-and the Corresponding Source of the work is not available for anyone
-to copy, free of charge and under the terms of this License, through a
-publicly available network server or other readily accessible means,
-then you must either (1) cause the Corresponding Source to be so
-available, or (2) arrange to deprive yourself of the benefit of the
-patent license for this particular work, or (3) arrange, in a manner
-consistent with the requirements of this License, to extend the patent
-license to downstream recipients.  "Knowingly relying" means you have
-actual knowledge that, but for the patent license, your conveying the
-covered work in a country, or your recipient's use of the covered work
-in a country, would infringe one or more identifiable patents in that
-country that you have reason to believe are valid.
-
-  If, pursuant to or in connection with a single transaction or
-arrangement, you convey, or propagate by procuring conveyance of, a
-covered work, and grant a patent license to some of the parties
-receiving the covered work authorizing them to use, propagate, modify
-or convey a specific copy of the covered work, then the patent license
-you grant is automatically extended to all recipients of the covered
-work and works based on it.
-
-  A patent license is "discriminatory" if it does not include within
-the scope of its coverage, prohibits the exercise of, or is
-conditioned on the non-exercise of one or more of the rights that are
-specifically granted under this License.  You may not convey a covered
-work if you are a party to an arrangement with a third party that is
-in the business of distributing software, under which you make payment
-to the third party based on the extent of your activity of conveying
-the work, and under which the third party grants, to any of the
-parties who would receive the covered work from you, a discriminatory
-patent license (a) in connection with copies of the covered work
-conveyed by you (or copies made from those copies), or (b) primarily
-for and in connection with specific products or compilations that
-contain the covered work, unless you entered into that arrangement,
-or that patent license was granted, prior to 28 March 2007.
-
-  Nothing in this License shall be construed as excluding or limiting
-any implied license or other defenses to infringement that may
-otherwise be available to you under applicable patent law.
-
-  12. No Surrender of Others' Freedom.
-
-  If conditions are imposed on you (whether by court order, agreement or
-otherwise) that contradict the conditions of this License, they do not
-excuse you from the conditions of this License.  If you cannot convey a
-covered work so as to satisfy simultaneously your obligations under this
-License and any other pertinent obligations, then as a consequence you may
-not convey it at all.  For example, if you agree to terms that obligate you
-to collect a royalty for further conveying from those to whom you convey
-the Program, the only way you could satisfy both those terms and this
-License would be to refrain entirely from conveying the Program.
-
-  13. Use with the GNU Affero General Public License.
-
-  Notwithstanding any other provision of this License, you have
-permission to link or combine any covered work with a work licensed
-under version 3 of the GNU Affero General Public License into a single
-combined work, and to convey the resulting work.  The terms of this
-License will continue to apply to the part which is the covered work,
-but the special requirements of the GNU Affero General Public License,
-section 13, concerning interaction through a network will apply to the
-combination as such.
-
-  14. Revised Versions of this License.
-
-  The Free Software Foundation may publish revised and/or new versions of
-the GNU General Public License from time to time.  Such new versions will
-be similar in spirit to the present version, but may differ in detail to
-address new problems or concerns.
-
-  Each version is given a distinguishing version number.  If the
-Program specifies that a certain numbered version of the GNU General
-Public License "or any later version" applies to it, you have the
-option of following the terms and conditions either of that numbered
-version or of any later version published by the Free Software
-Foundation.  If the Program does not specify a version number of the
-GNU General Public License, you may choose any version ever published
-by the Free Software Foundation.
-
-  If the Program specifies that a proxy can decide which future
-versions of the GNU General Public License can be used, that proxy's
-public statement of acceptance of a version permanently authorizes you
-to choose that version for the Program.
-
-  Later license versions may give you additional or different
-permissions.  However, no additional obligations are imposed on any
-author or copyright holder as a result of your choosing to follow a
-later version.
-
-  15. Disclaimer of Warranty.
-
-  THERE IS NO WARRANTY FOR THE PROGRAM, TO THE EXTENT PERMITTED BY
-APPLICABLE LAW.  EXCEPT WHEN OTHERWISE STATED IN WRITING THE COPYRIGHT
-HOLDERS AND/OR OTHER PARTIES PROVIDE THE PROGRAM "AS IS" WITHOUT WARRANTY
-OF ANY KIND, EITHER EXPRESSED OR IMPLIED, INCLUDING, BUT NOT LIMITED TO,
-THE IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR
-PURPOSE.  THE ENTIRE RISK AS TO THE QUALITY AND PERFORMANCE OF THE PROGRAM
-IS WITH YOU.  SHOULD THE PROGRAM PROVE DEFECTIVE, YOU ASSUME THE COST OF
-ALL NECESSARY SERVICING, REPAIR OR CORRECTION.
-
-  16. Limitation of Liability.
-
-  IN NO EVENT UNLESS REQUIRED BY APPLICABLE LAW OR AGREED TO IN WRITING
-WILL ANY COPYRIGHT HOLDER, OR ANY OTHER PARTY WHO MODIFIES AND/OR CONVEYS
-THE PROGRAM AS PERMITTED ABOVE, BE LIABLE TO YOU FOR DAMAGES, INCLUDING ANY
-GENERAL, SPECIAL, INCIDENTAL OR CONSEQUENTIAL DAMAGES ARISING OUT OF THE
-USE OR INABILITY TO USE THE PROGRAM (INCLUDING BUT NOT LIMITED TO LOSS OF
-DATA OR DATA BEING RENDERED INACCURATE OR LOSSES SUSTAINED BY YOU OR THIRD
-PARTIES OR A FAILURE OF THE PROGRAM TO OPERATE WITH ANY OTHER PROGRAMS),
-EVEN IF SUCH HOLDER OR OTHER PARTY HAS BEEN ADVISED OF THE POSSIBILITY OF
-SUCH DAMAGES.
-
-  17. Interpretation of Sections 15 and 16.
-
-  If the disclaimer of warranty and limitation of liability provided
-above cannot be given local legal effect according to their terms,
-reviewing courts shall apply local law that most closely approximates
-an absolute waiver of all civil liability in connection with the
-Program, unless a warranty or assumption of liability accompanies a
-copy of the Program in return for a fee.
-
-                     END OF TERMS AND CONDITIONS
-
-            How to Apply These Terms to Your New Programs
-
-  If you develop a new program, and you want it to be of the greatest
-possible use to the public, the best way to achieve this is to make it
-free software which everyone can redistribute and change under these terms.
-
-  To do so, attach the following notices to the program.  It is safest
-to attach them to the start of each source file to most effectively
-state the exclusion of warranty; and each file should have at least
-the "copyright" line and a pointer to where the full notice is found.
-
-    {one line to give the program's name and a brief idea of what it does.}
-    Copyright (C) {year}  {name of author}
-
-    This program is free software: you can redistribute it and/or modify
-    it under the terms of the GNU General Public License as published by
-    the Free Software Foundation, either version 3 of the License, or
-    (at your option) any later version.
-
-    This program is distributed in the hope that it will be useful,
-    but WITHOUT ANY WARRANTY; without even the implied warranty of
-    MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
-    GNU General Public License for more details.
-
-    You should have received a copy of the GNU General Public License
-    along with this program.  If not, see <http://www.gnu.org/licenses/>.
-
-Also add information on how to contact you by electronic and paper mail.
-
-  If the program does terminal interaction, make it output a short
-notice like this when it starts in an interactive mode:
-
-    {project}  Copyright (C) {year}  {fullname}
-    This program comes with ABSOLUTELY NO WARRANTY; for details type `show w'.
-    This is free software, and you are welcome to redistribute it
-    under certain conditions; type `show c' for details.
-
-The hypothetical commands `show w' and `show c' should show the appropriate
-parts of the General Public License.  Of course, your program's commands
-might be different; for a GUI interface, you would use an "about box".
-
-  You should also get your employer (if you work as a programmer) or school,
-if any, to sign a "copyright disclaimer" for the program, if necessary.
-For more information on this, and how to apply and follow the GNU GPL, see
-<http://www.gnu.org/licenses/>.
-
-  The GNU General Public License does not permit incorporating your program
-into proprietary programs.  If your program is a subroutine library, you
-may consider it more useful to permit linking proprietary applications with
-the library.  If this is what you want to do, use the GNU Lesser General
-Public License instead of this License.  But first, please read
-<http://www.gnu.org/philosophy/why-not-lgpl.html>.
+                    GNU GENERAL PUBLIC LICENSE
+                       Version 3, 29 June 2007
+
+ Copyright (C) 2007 Free Software Foundation, Inc. <http://fsf.org/>
+ Everyone is permitted to copy and distribute verbatim copies
+ of this license document, but changing it is not allowed.
+
+                            Preamble
+
+  The GNU General Public License is a free, copyleft license for
+software and other kinds of works.
+
+  The licenses for most software and other practical works are designed
+to take away your freedom to share and change the works.  By contrast,
+the GNU General Public License is intended to guarantee your freedom to
+share and change all versions of a program--to make sure it remains free
+software for all its users.  We, the Free Software Foundation, use the
+GNU General Public License for most of our software; it applies also to
+any other work released this way by its authors.  You can apply it to
+your programs, too.
+
+  When we speak of free software, we are referring to freedom, not
+price.  Our General Public Licenses are designed to make sure that you
+have the freedom to distribute copies of free software (and charge for
+them if you wish), that you receive source code or can get it if you
+want it, that you can change the software or use pieces of it in new
+free programs, and that you know you can do these things.
+
+  To protect your rights, we need to prevent others from denying you
+these rights or asking you to surrender the rights.  Therefore, you have
+certain responsibilities if you distribute copies of the software, or if
+you modify it: responsibilities to respect the freedom of others.
+
+  For example, if you distribute copies of such a program, whether
+gratis or for a fee, you must pass on to the recipients the same
+freedoms that you received.  You must make sure that they, too, receive
+or can get the source code.  And you must show them these terms so they
+know their rights.
+
+  Developers that use the GNU GPL protect your rights with two steps:
+(1) assert copyright on the software, and (2) offer you this License
+giving you legal permission to copy, distribute and/or modify it.
+
+  For the developers' and authors' protection, the GPL clearly explains
+that there is no warranty for this free software.  For both users' and
+authors' sake, the GPL requires that modified versions be marked as
+changed, so that their problems will not be attributed erroneously to
+authors of previous versions.
+
+  Some devices are designed to deny users access to install or run
+modified versions of the software inside them, although the manufacturer
+can do so.  This is fundamentally incompatible with the aim of
+protecting users' freedom to change the software.  The systematic
+pattern of such abuse occurs in the area of products for individuals to
+use, which is precisely where it is most unacceptable.  Therefore, we
+have designed this version of the GPL to prohibit the practice for those
+products.  If such problems arise substantially in other domains, we
+stand ready to extend this provision to those domains in future versions
+of the GPL, as needed to protect the freedom of users.
+
+  Finally, every program is threatened constantly by software patents.
+States should not allow patents to restrict development and use of
+software on general-purpose computers, but in those that do, we wish to
+avoid the special danger that patents applied to a free program could
+make it effectively proprietary.  To prevent this, the GPL assures that
+patents cannot be used to render the program non-free.
+
+  The precise terms and conditions for copying, distribution and
+modification follow.
+
+                       TERMS AND CONDITIONS
+
+  0. Definitions.
+
+  "This License" refers to version 3 of the GNU General Public License.
+
+  "Copyright" also means copyright-like laws that apply to other kinds of
+works, such as semiconductor masks.
+
+  "The Program" refers to any copyrightable work licensed under this
+License.  Each licensee is addressed as "you".  "Licensees" and
+"recipients" may be individuals or organizations.
+
+  To "modify" a work means to copy from or adapt all or part of the work
+in a fashion requiring copyright permission, other than the making of an
+exact copy.  The resulting work is called a "modified version" of the
+earlier work or a work "based on" the earlier work.
+
+  A "covered work" means either the unmodified Program or a work based
+on the Program.
+
+  To "propagate" a work means to do anything with it that, without
+permission, would make you directly or secondarily liable for
+infringement under applicable copyright law, except executing it on a
+computer or modifying a private copy.  Propagation includes copying,
+distribution (with or without modification), making available to the
+public, and in some countries other activities as well.
+
+  To "convey" a work means any kind of propagation that enables other
+parties to make or receive copies.  Mere interaction with a user through
+a computer network, with no transfer of a copy, is not conveying.
+
+  An interactive user interface displays "Appropriate Legal Notices"
+to the extent that it includes a convenient and prominently visible
+feature that (1) displays an appropriate copyright notice, and (2)
+tells the user that there is no warranty for the work (except to the
+extent that warranties are provided), that licensees may convey the
+work under this License, and how to view a copy of this License.  If
+the interface presents a list of user commands or options, such as a
+menu, a prominent item in the list meets this criterion.
+
+  1. Source Code.
+
+  The "source code" for a work means the preferred form of the work
+for making modifications to it.  "Object code" means any non-source
+form of a work.
+
+  A "Standard Interface" means an interface that either is an official
+standard defined by a recognized standards body, or, in the case of
+interfaces specified for a particular programming language, one that
+is widely used among developers working in that language.
+
+  The "System Libraries" of an executable work include anything, other
+than the work as a whole, that (a) is included in the normal form of
+packaging a Major Component, but which is not part of that Major
+Component, and (b) serves only to enable use of the work with that
+Major Component, or to implement a Standard Interface for which an
+implementation is available to the public in source code form.  A
+"Major Component", in this context, means a major essential component
+(kernel, window system, and so on) of the specific operating system
+(if any) on which the executable work runs, or a compiler used to
+produce the work, or an object code interpreter used to run it.
+
+  The "Corresponding Source" for a work in object code form means all
+the source code needed to generate, install, and (for an executable
+work) run the object code and to modify the work, including scripts to
+control those activities.  However, it does not include the work's
+System Libraries, or general-purpose tools or generally available free
+programs which are used unmodified in performing those activities but
+which are not part of the work.  For example, Corresponding Source
+includes interface definition files associated with source files for
+the work, and the source code for shared libraries and dynamically
+linked subprograms that the work is specifically designed to require,
+such as by intimate data communication or control flow between those
+subprograms and other parts of the work.
+
+  The Corresponding Source need not include anything that users
+can regenerate automatically from other parts of the Corresponding
+Source.
+
+  The Corresponding Source for a work in source code form is that
+same work.
+
+  2. Basic Permissions.
+
+  All rights granted under this License are granted for the term of
+copyright on the Program, and are irrevocable provided the stated
+conditions are met.  This License explicitly affirms your unlimited
+permission to run the unmodified Program.  The output from running a
+covered work is covered by this License only if the output, given its
+content, constitutes a covered work.  This License acknowledges your
+rights of fair use or other equivalent, as provided by copyright law.
+
+  You may make, run and propagate covered works that you do not
+convey, without conditions so long as your license otherwise remains
+in force.  You may convey covered works to others for the sole purpose
+of having them make modifications exclusively for you, or provide you
+with facilities for running those works, provided that you comply with
+the terms of this License in conveying all material for which you do
+not control copyright.  Those thus making or running the covered works
+for you must do so exclusively on your behalf, under your direction
+and control, on terms that prohibit them from making any copies of
+your copyrighted material outside their relationship with you.
+
+  Conveying under any other circumstances is permitted solely under
+the conditions stated below.  Sublicensing is not allowed; section 10
+makes it unnecessary.
+
+  3. Protecting Users' Legal Rights From Anti-Circumvention Law.
+
+  No covered work shall be deemed part of an effective technological
+measure under any applicable law fulfilling obligations under article
+11 of the WIPO copyright treaty adopted on 20 December 1996, or
+similar laws prohibiting or restricting circumvention of such
+measures.
+
+  When you convey a covered work, you waive any legal power to forbid
+circumvention of technological measures to the extent such circumvention
+is effected by exercising rights under this License with respect to
+the covered work, and you disclaim any intention to limit operation or
+modification of the work as a means of enforcing, against the work's
+users, your or third parties' legal rights to forbid circumvention of
+technological measures.
+
+  4. Conveying Verbatim Copies.
+
+  You may convey verbatim copies of the Program's source code as you
+receive it, in any medium, provided that you conspicuously and
+appropriately publish on each copy an appropriate copyright notice;
+keep intact all notices stating that this License and any
+non-permissive terms added in accord with section 7 apply to the code;
+keep intact all notices of the absence of any warranty; and give all
+recipients a copy of this License along with the Program.
+
+  You may charge any price or no price for each copy that you convey,
+and you may offer support or warranty protection for a fee.
+
+  5. Conveying Modified Source Versions.
+
+  You may convey a work based on the Program, or the modifications to
+produce it from the Program, in the form of source code under the
+terms of section 4, provided that you also meet all of these conditions:
+
+    a) The work must carry prominent notices stating that you modified
+    it, and giving a relevant date.
+
+    b) The work must carry prominent notices stating that it is
+    released under this License and any conditions added under section
+    7.  This requirement modifies the requirement in section 4 to
+    "keep intact all notices".
+
+    c) You must license the entire work, as a whole, under this
+    License to anyone who comes into possession of a copy.  This
+    License will therefore apply, along with any applicable section 7
+    additional terms, to the whole of the work, and all its parts,
+    regardless of how they are packaged.  This License gives no
+    permission to license the work in any other way, but it does not
+    invalidate such permission if you have separately received it.
+
+    d) If the work has interactive user interfaces, each must display
+    Appropriate Legal Notices; however, if the Program has interactive
+    interfaces that do not display Appropriate Legal Notices, your
+    work need not make them do so.
+
+  A compilation of a covered work with other separate and independent
+works, which are not by their nature extensions of the covered work,
+and which are not combined with it such as to form a larger program,
+in or on a volume of a storage or distribution medium, is called an
+"aggregate" if the compilation and its resulting copyright are not
+used to limit the access or legal rights of the compilation's users
+beyond what the individual works permit.  Inclusion of a covered work
+in an aggregate does not cause this License to apply to the other
+parts of the aggregate.
+
+  6. Conveying Non-Source Forms.
+
+  You may convey a covered work in object code form under the terms
+of sections 4 and 5, provided that you also convey the
+machine-readable Corresponding Source under the terms of this License,
+in one of these ways:
+
+    a) Convey the object code in, or embodied in, a physical product
+    (including a physical distribution medium), accompanied by the
+    Corresponding Source fixed on a durable physical medium
+    customarily used for software interchange.
+
+    b) Convey the object code in, or embodied in, a physical product
+    (including a physical distribution medium), accompanied by a
+    written offer, valid for at least three years and valid for as
+    long as you offer spare parts or customer support for that product
+    model, to give anyone who possesses the object code either (1) a
+    copy of the Corresponding Source for all the software in the
+    product that is covered by this License, on a durable physical
+    medium customarily used for software interchange, for a price no
+    more than your reasonable cost of physically performing this
+    conveying of source, or (2) access to copy the
+    Corresponding Source from a network server at no charge.
+
+    c) Convey individual copies of the object code with a copy of the
+    written offer to provide the Corresponding Source.  This
+    alternative is allowed only occasionally and noncommercially, and
+    only if you received the object code with such an offer, in accord
+    with subsection 6b.
+
+    d) Convey the object code by offering access from a designated
+    place (gratis or for a charge), and offer equivalent access to the
+    Corresponding Source in the same way through the same place at no
+    further charge.  You need not require recipients to copy the
+    Corresponding Source along with the object code.  If the place to
+    copy the object code is a network server, the Corresponding Source
+    may be on a different server (operated by you or a third party)
+    that supports equivalent copying facilities, provided you maintain
+    clear directions next to the object code saying where to find the
+    Corresponding Source.  Regardless of what server hosts the
+    Corresponding Source, you remain obligated to ensure that it is
+    available for as long as needed to satisfy these requirements.
+
+    e) Convey the object code using peer-to-peer transmission, provided
+    you inform other peers where the object code and Corresponding
+    Source of the work are being offered to the general public at no
+    charge under subsection 6d.
+
+  A separable portion of the object code, whose source code is excluded
+from the Corresponding Source as a System Library, need not be
+included in conveying the object code work.
+
+  A "User Product" is either (1) a "consumer product", which means any
+tangible personal property which is normally used for personal, family,
+or household purposes, or (2) anything designed or sold for incorporation
+into a dwelling.  In determining whether a product is a consumer product,
+doubtful cases shall be resolved in favor of coverage.  For a particular
+product received by a particular user, "normally used" refers to a
+typical or common use of that class of product, regardless of the status
+of the particular user or of the way in which the particular user
+actually uses, or expects or is expected to use, the product.  A product
+is a consumer product regardless of whether the product has substantial
+commercial, industrial or non-consumer uses, unless such uses represent
+the only significant mode of use of the product.
+
+  "Installation Information" for a User Product means any methods,
+procedures, authorization keys, or other information required to install
+and execute modified versions of a covered work in that User Product from
+a modified version of its Corresponding Source.  The information must
+suffice to ensure that the continued functioning of the modified object
+code is in no case prevented or interfered with solely because
+modification has been made.
+
+  If you convey an object code work under this section in, or with, or
+specifically for use in, a User Product, and the conveying occurs as
+part of a transaction in which the right of possession and use of the
+User Product is transferred to the recipient in perpetuity or for a
+fixed term (regardless of how the transaction is characterized), the
+Corresponding Source conveyed under this section must be accompanied
+by the Installation Information.  But this requirement does not apply
+if neither you nor any third party retains the ability to install
+modified object code on the User Product (for example, the work has
+been installed in ROM).
+
+  The requirement to provide Installation Information does not include a
+requirement to continue to provide support service, warranty, or updates
+for a work that has been modified or installed by the recipient, or for
+the User Product in which it has been modified or installed.  Access to a
+network may be denied when the modification itself materially and
+adversely affects the operation of the network or violates the rules and
+protocols for communication across the network.
+
+  Corresponding Source conveyed, and Installation Information provided,
+in accord with this section must be in a format that is publicly
+documented (and with an implementation available to the public in
+source code form), and must require no special password or key for
+unpacking, reading or copying.
+
+  7. Additional Terms.
+
+  "Additional permissions" are terms that supplement the terms of this
+License by making exceptions from one or more of its conditions.
+Additional permissions that are applicable to the entire Program shall
+be treated as though they were included in this License, to the extent
+that they are valid under applicable law.  If additional permissions
+apply only to part of the Program, that part may be used separately
+under those permissions, but the entire Program remains governed by
+this License without regard to the additional permissions.
+
+  When you convey a copy of a covered work, you may at your option
+remove any additional permissions from that copy, or from any part of
+it.  (Additional permissions may be written to require their own
+removal in certain cases when you modify the work.)  You may place
+additional permissions on material, added by you to a covered work,
+for which you have or can give appropriate copyright permission.
+
+  Notwithstanding any other provision of this License, for material you
+add to a covered work, you may (if authorized by the copyright holders of
+that material) supplement the terms of this License with terms:
+
+    a) Disclaiming warranty or limiting liability differently from the
+    terms of sections 15 and 16 of this License; or
+
+    b) Requiring preservation of specified reasonable legal notices or
+    author attributions in that material or in the Appropriate Legal
+    Notices displayed by works containing it; or
+
+    c) Prohibiting misrepresentation of the origin of that material, or
+    requiring that modified versions of such material be marked in
+    reasonable ways as different from the original version; or
+
+    d) Limiting the use for publicity purposes of names of licensors or
+    authors of the material; or
+
+    e) Declining to grant rights under trademark law for use of some
+    trade names, trademarks, or service marks; or
+
+    f) Requiring indemnification of licensors and authors of that
+    material by anyone who conveys the material (or modified versions of
+    it) with contractual assumptions of liability to the recipient, for
+    any liability that these contractual assumptions directly impose on
+    those licensors and authors.
+
+  All other non-permissive additional terms are considered "further
+restrictions" within the meaning of section 10.  If the Program as you
+received it, or any part of it, contains a notice stating that it is
+governed by this License along with a term that is a further
+restriction, you may remove that term.  If a license document contains
+a further restriction but permits relicensing or conveying under this
+License, you may add to a covered work material governed by the terms
+of that license document, provided that the further restriction does
+not survive such relicensing or conveying.
+
+  If you add terms to a covered work in accord with this section, you
+must place, in the relevant source files, a statement of the
+additional terms that apply to those files, or a notice indicating
+where to find the applicable terms.
+
+  Additional terms, permissive or non-permissive, may be stated in the
+form of a separately written license, or stated as exceptions;
+the above requirements apply either way.
+
+  8. Termination.
+
+  You may not propagate or modify a covered work except as expressly
+provided under this License.  Any attempt otherwise to propagate or
+modify it is void, and will automatically terminate your rights under
+this License (including any patent licenses granted under the third
+paragraph of section 11).
+
+  However, if you cease all violation of this License, then your
+license from a particular copyright holder is reinstated (a)
+provisionally, unless and until the copyright holder explicitly and
+finally terminates your license, and (b) permanently, if the copyright
+holder fails to notify you of the violation by some reasonable means
+prior to 60 days after the cessation.
+
+  Moreover, your license from a particular copyright holder is
+reinstated permanently if the copyright holder notifies you of the
+violation by some reasonable means, this is the first time you have
+received notice of violation of this License (for any work) from that
+copyright holder, and you cure the violation prior to 30 days after
+your receipt of the notice.
+
+  Termination of your rights under this section does not terminate the
+licenses of parties who have received copies or rights from you under
+this License.  If your rights have been terminated and not permanently
+reinstated, you do not qualify to receive new licenses for the same
+material under section 10.
+
+  9. Acceptance Not Required for Having Copies.
+
+  You are not required to accept this License in order to receive or
+run a copy of the Program.  Ancillary propagation of a covered work
+occurring solely as a consequence of using peer-to-peer transmission
+to receive a copy likewise does not require acceptance.  However,
+nothing other than this License grants you permission to propagate or
+modify any covered work.  These actions infringe copyright if you do
+not accept this License.  Therefore, by modifying or propagating a
+covered work, you indicate your acceptance of this License to do so.
+
+  10. Automatic Licensing of Downstream Recipients.
+
+  Each time you convey a covered work, the recipient automatically
+receives a license from the original licensors, to run, modify and
+propagate that work, subject to this License.  You are not responsible
+for enforcing compliance by third parties with this License.
+
+  An "entity transaction" is a transaction transferring control of an
+organization, or substantially all assets of one, or subdividing an
+organization, or merging organizations.  If propagation of a covered
+work results from an entity transaction, each party to that
+transaction who receives a copy of the work also receives whatever
+licenses to the work the party's predecessor in interest had or could
+give under the previous paragraph, plus a right to possession of the
+Corresponding Source of the work from the predecessor in interest, if
+the predecessor has it or can get it with reasonable efforts.
+
+  You may not impose any further restrictions on the exercise of the
+rights granted or affirmed under this License.  For example, you may
+not impose a license fee, royalty, or other charge for exercise of
+rights granted under this License, and you may not initiate litigation
+(including a cross-claim or counterclaim in a lawsuit) alleging that
+any patent claim is infringed by making, using, selling, offering for
+sale, or importing the Program or any portion of it.
+
+  11. Patents.
+
+  A "contributor" is a copyright holder who authorizes use under this
+License of the Program or a work on which the Program is based.  The
+work thus licensed is called the contributor's "contributor version".
+
+  A contributor's "essential patent claims" are all patent claims
+owned or controlled by the contributor, whether already acquired or
+hereafter acquired, that would be infringed by some manner, permitted
+by this License, of making, using, or selling its contributor version,
+but do not include claims that would be infringed only as a
+consequence of further modification of the contributor version.  For
+purposes of this definition, "control" includes the right to grant
+patent sublicenses in a manner consistent with the requirements of
+this License.
+
+  Each contributor grants you a non-exclusive, worldwide, royalty-free
+patent license under the contributor's essential patent claims, to
+make, use, sell, offer for sale, import and otherwise run, modify and
+propagate the contents of its contributor version.
+
+  In the following three paragraphs, a "patent license" is any express
+agreement or commitment, however denominated, not to enforce a patent
+(such as an express permission to practice a patent or covenant not to
+sue for patent infringement).  To "grant" such a patent license to a
+party means to make such an agreement or commitment not to enforce a
+patent against the party.
+
+  If you convey a covered work, knowingly relying on a patent license,
+and the Corresponding Source of the work is not available for anyone
+to copy, free of charge and under the terms of this License, through a
+publicly available network server or other readily accessible means,
+then you must either (1) cause the Corresponding Source to be so
+available, or (2) arrange to deprive yourself of the benefit of the
+patent license for this particular work, or (3) arrange, in a manner
+consistent with the requirements of this License, to extend the patent
+license to downstream recipients.  "Knowingly relying" means you have
+actual knowledge that, but for the patent license, your conveying the
+covered work in a country, or your recipient's use of the covered work
+in a country, would infringe one or more identifiable patents in that
+country that you have reason to believe are valid.
+
+  If, pursuant to or in connection with a single transaction or
+arrangement, you convey, or propagate by procuring conveyance of, a
+covered work, and grant a patent license to some of the parties
+receiving the covered work authorizing them to use, propagate, modify
+or convey a specific copy of the covered work, then the patent license
+you grant is automatically extended to all recipients of the covered
+work and works based on it.
+
+  A patent license is "discriminatory" if it does not include within
+the scope of its coverage, prohibits the exercise of, or is
+conditioned on the non-exercise of one or more of the rights that are
+specifically granted under this License.  You may not convey a covered
+work if you are a party to an arrangement with a third party that is
+in the business of distributing software, under which you make payment
+to the third party based on the extent of your activity of conveying
+the work, and under which the third party grants, to any of the
+parties who would receive the covered work from you, a discriminatory
+patent license (a) in connection with copies of the covered work
+conveyed by you (or copies made from those copies), or (b) primarily
+for and in connection with specific products or compilations that
+contain the covered work, unless you entered into that arrangement,
+or that patent license was granted, prior to 28 March 2007.
+
+  Nothing in this License shall be construed as excluding or limiting
+any implied license or other defenses to infringement that may
+otherwise be available to you under applicable patent law.
+
+  12. No Surrender of Others' Freedom.
+
+  If conditions are imposed on you (whether by court order, agreement or
+otherwise) that contradict the conditions of this License, they do not
+excuse you from the conditions of this License.  If you cannot convey a
+covered work so as to satisfy simultaneously your obligations under this
+License and any other pertinent obligations, then as a consequence you may
+not convey it at all.  For example, if you agree to terms that obligate you
+to collect a royalty for further conveying from those to whom you convey
+the Program, the only way you could satisfy both those terms and this
+License would be to refrain entirely from conveying the Program.
+
+  13. Use with the GNU Affero General Public License.
+
+  Notwithstanding any other provision of this License, you have
+permission to link or combine any covered work with a work licensed
+under version 3 of the GNU Affero General Public License into a single
+combined work, and to convey the resulting work.  The terms of this
+License will continue to apply to the part which is the covered work,
+but the special requirements of the GNU Affero General Public License,
+section 13, concerning interaction through a network will apply to the
+combination as such.
+
+  14. Revised Versions of this License.
+
+  The Free Software Foundation may publish revised and/or new versions of
+the GNU General Public License from time to time.  Such new versions will
+be similar in spirit to the present version, but may differ in detail to
+address new problems or concerns.
+
+  Each version is given a distinguishing version number.  If the
+Program specifies that a certain numbered version of the GNU General
+Public License "or any later version" applies to it, you have the
+option of following the terms and conditions either of that numbered
+version or of any later version published by the Free Software
+Foundation.  If the Program does not specify a version number of the
+GNU General Public License, you may choose any version ever published
+by the Free Software Foundation.
+
+  If the Program specifies that a proxy can decide which future
+versions of the GNU General Public License can be used, that proxy's
+public statement of acceptance of a version permanently authorizes you
+to choose that version for the Program.
+
+  Later license versions may give you additional or different
+permissions.  However, no additional obligations are imposed on any
+author or copyright holder as a result of your choosing to follow a
+later version.
+
+  15. Disclaimer of Warranty.
+
+  THERE IS NO WARRANTY FOR THE PROGRAM, TO THE EXTENT PERMITTED BY
+APPLICABLE LAW.  EXCEPT WHEN OTHERWISE STATED IN WRITING THE COPYRIGHT
+HOLDERS AND/OR OTHER PARTIES PROVIDE THE PROGRAM "AS IS" WITHOUT WARRANTY
+OF ANY KIND, EITHER EXPRESSED OR IMPLIED, INCLUDING, BUT NOT LIMITED TO,
+THE IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR
+PURPOSE.  THE ENTIRE RISK AS TO THE QUALITY AND PERFORMANCE OF THE PROGRAM
+IS WITH YOU.  SHOULD THE PROGRAM PROVE DEFECTIVE, YOU ASSUME THE COST OF
+ALL NECESSARY SERVICING, REPAIR OR CORRECTION.
+
+  16. Limitation of Liability.
+
+  IN NO EVENT UNLESS REQUIRED BY APPLICABLE LAW OR AGREED TO IN WRITING
+WILL ANY COPYRIGHT HOLDER, OR ANY OTHER PARTY WHO MODIFIES AND/OR CONVEYS
+THE PROGRAM AS PERMITTED ABOVE, BE LIABLE TO YOU FOR DAMAGES, INCLUDING ANY
+GENERAL, SPECIAL, INCIDENTAL OR CONSEQUENTIAL DAMAGES ARISING OUT OF THE
+USE OR INABILITY TO USE THE PROGRAM (INCLUDING BUT NOT LIMITED TO LOSS OF
+DATA OR DATA BEING RENDERED INACCURATE OR LOSSES SUSTAINED BY YOU OR THIRD
+PARTIES OR A FAILURE OF THE PROGRAM TO OPERATE WITH ANY OTHER PROGRAMS),
+EVEN IF SUCH HOLDER OR OTHER PARTY HAS BEEN ADVISED OF THE POSSIBILITY OF
+SUCH DAMAGES.
+
+  17. Interpretation of Sections 15 and 16.
+
+  If the disclaimer of warranty and limitation of liability provided
+above cannot be given local legal effect according to their terms,
+reviewing courts shall apply local law that most closely approximates
+an absolute waiver of all civil liability in connection with the
+Program, unless a warranty or assumption of liability accompanies a
+copy of the Program in return for a fee.
+
+                     END OF TERMS AND CONDITIONS
+
+            How to Apply These Terms to Your New Programs
+
+  If you develop a new program, and you want it to be of the greatest
+possible use to the public, the best way to achieve this is to make it
+free software which everyone can redistribute and change under these terms.
+
+  To do so, attach the following notices to the program.  It is safest
+to attach them to the start of each source file to most effectively
+state the exclusion of warranty; and each file should have at least
+the "copyright" line and a pointer to where the full notice is found.
+
+    {one line to give the program's name and a brief idea of what it does.}
+    Copyright (C) {year}  {name of author}
+
+    This program is free software: you can redistribute it and/or modify
+    it under the terms of the GNU General Public License as published by
+    the Free Software Foundation, either version 3 of the License, or
+    (at your option) any later version.
+
+    This program is distributed in the hope that it will be useful,
+    but WITHOUT ANY WARRANTY; without even the implied warranty of
+    MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+    GNU General Public License for more details.
+
+    You should have received a copy of the GNU General Public License
+    along with this program.  If not, see <http://www.gnu.org/licenses/>.
+
+Also add information on how to contact you by electronic and paper mail.
+
+  If the program does terminal interaction, make it output a short
+notice like this when it starts in an interactive mode:
+
+    {project}  Copyright (C) {year}  {fullname}
+    This program comes with ABSOLUTELY NO WARRANTY; for details type `show w'.
+    This is free software, and you are welcome to redistribute it
+    under certain conditions; type `show c' for details.
+
+The hypothetical commands `show w' and `show c' should show the appropriate
+parts of the General Public License.  Of course, your program's commands
+might be different; for a GUI interface, you would use an "about box".
+
+  You should also get your employer (if you work as a programmer) or school,
+if any, to sign a "copyright disclaimer" for the program, if necessary.
+For more information on this, and how to apply and follow the GNU GPL, see
+<http://www.gnu.org/licenses/>.
+
+  The GNU General Public License does not permit incorporating your program
+into proprietary programs.  If your program is a subroutine library, you
+may consider it more useful to permit linking proprietary applications with
+the library.  If this is what you want to do, use the GNU Lesser General
+Public License instead of this License.  But first, please read
+<http://www.gnu.org/philosophy/why-not-lgpl.html>.
diff --git a/README.md b/README.md
index b8476a568..18e675c32 100644
--- a/README.md
+++ b/README.md
@@ -1,39 +1,39 @@
-![QKSMS](https://user-images.githubusercontent.com/4358785/39079306-a5a409b6-44e5-11e8-8589-b4acd63b636e.jpg)
-
-# QKSMS
-
-[![Build Status](https://circleci.com/gh/moezbhatti/qksms/tree/master.svg?style=svg)](https://circleci.com/gh/moezbhatti/qksms/tree/master)
-[![Crowdin](https://badges.crowdin.net/qksms/localized.svg)](https://crowdin.com/project/qksms)
-[![Liberapay donation](https://img.shields.io/badge/donate-liberapay-yellow.svg)](https://liberapay.com/moezbhatti/)
-[![Bitcoin donation](https://img.shields.io/badge/donate-bitcoin-yellow.svg)](https://qklabs.com/donate-btc/)
-[![PayPal donation](https://img.shields.io/badge/donate-paypal-yellow.svg)](https://qklabs.com/donate)
-
-QKSMS is an open source replacement to the [stock messaging app](https://github.com/android/platform_packages_apps_mms) on Android. It is currently available on the [Google Play Store](https://play.google.com/store/apps/details?id=com.moez.QKSMS) and on [F-Droid](https://f-droid.org/repository/browse/?fdid=com.moez.QKSMS)
-
-<a href="https://play.google.com/store/apps/details?id=com.moez.QKSMS"><img src="https://play.google.com/intl/en_us/badges/images/generic/en_badge_web_generic.png" alt="Download on Google Play" height="100"></a><a href="https://f-droid.org/repository/browse/?fdid=com.moez.QKSMS"><img src="https://f-droid.org/badge/get-it-on.png" alt="Get it on F-Droid" height="100"></a>
-
-## Reporting bugs
-
-A great bug report contains a description of the problem and steps to reproduce the problem. We need to know what we're looking for and where to look for it.
-
-When reporting a bug, please make sure to provide the following information:
-- Steps to reproduce the issue
-- QKSMS version
-- Device / OS information
-
-## Translations
-
-If you'd like to add translations to QKSMS, please join the project on [Crowdin](https://crowdin.com/project/qksms). Translations that are committed directly to source files will not be accepted.
-
-## Thank you
-
-A special thank you to Jake ([@klinker41](https://github.com/klinker41)) and Luke Klinker ([@klinker24](https://github.com/klinker24)) for their work on [android-smsmms](https://github.com/klinker41/android-smsmms), which has been an unspeakably large help in implementing MMS into QKSMS.
-
-
-## Contact
-
-QKSMS is developed and maintained by [Moez Bhatti](https://github.com/moezbhatti). Feel free to reach out to moez@qklabs.com
-
-## License
-
-QKSMS is released under the **The GNU General Public License v3.0 (GPLv3)**, which can be found in the `LICENSE` file in the root of this project.
+![QKSMS](https://user-images.githubusercontent.com/4358785/39079306-a5a409b6-44e5-11e8-8589-b4acd63b636e.jpg)
+
+# QKSMS
+
+[![Build Status](https://circleci.com/gh/moezbhatti/qksms/tree/master.svg?style=svg)](https://circleci.com/gh/moezbhatti/qksms/tree/master)
+[![Crowdin](https://badges.crowdin.net/qksms/localized.svg)](https://crowdin.com/project/qksms)
+[![Liberapay donation](https://img.shields.io/badge/donate-liberapay-yellow.svg)](https://liberapay.com/moezbhatti/)
+[![Bitcoin donation](https://img.shields.io/badge/donate-bitcoin-yellow.svg)](https://qklabs.com/donate-btc/)
+[![PayPal donation](https://img.shields.io/badge/donate-paypal-yellow.svg)](https://qklabs.com/donate)
+
+QKSMS is an open source replacement to the [stock messaging app](https://github.com/android/platform_packages_apps_mms) on Android. It is currently available on the [Google Play Store](https://play.google.com/store/apps/details?id=com.moez.QKSMS) and on [F-Droid](https://f-droid.org/repository/browse/?fdid=com.moez.QKSMS)
+
+<a href="https://play.google.com/store/apps/details?id=com.moez.QKSMS"><img src="https://play.google.com/intl/en_us/badges/images/generic/en_badge_web_generic.png" alt="Download on Google Play" height="100"></a><a href="https://f-droid.org/repository/browse/?fdid=com.moez.QKSMS"><img src="https://f-droid.org/badge/get-it-on.png" alt="Get it on F-Droid" height="100"></a>
+
+## Reporting bugs
+
+A great bug report contains a description of the problem and steps to reproduce the problem. We need to know what we're looking for and where to look for it.
+
+When reporting a bug, please make sure to provide the following information:
+- Steps to reproduce the issue
+- QKSMS version
+- Device / OS information
+
+## Translations
+
+If you'd like to add translations to QKSMS, please join the project on [Crowdin](https://crowdin.com/project/qksms). Translations that are committed directly to source files will not be accepted.
+
+## Thank you
+
+A special thank you to Jake ([@klinker41](https://github.com/klinker41)) and Luke Klinker ([@klinker24](https://github.com/klinker24)) for their work on [android-smsmms](https://github.com/klinker41/android-smsmms), which has been an unspeakably large help in implementing MMS into QKSMS.
+
+
+## Contact
+
+QKSMS is developed and maintained by [Moez Bhatti](https://github.com/moezbhatti). Feel free to reach out to moez@qklabs.com
+
+## License
+
+QKSMS is released under the **The GNU General Public License v3.0 (GPLv3)**, which can be found in the `LICENSE` file in the root of this project.
diff --git a/android-smsmms/build.gradle b/android-smsmms/build.gradle
index 505404cb3..14b0f168e 100644
--- a/android-smsmms/build.gradle
+++ b/android-smsmms/build.gradle
@@ -1,49 +1,49 @@
-/*
- * Copyright (C) 2017 Moez Bhatti <moez.bhatti@gmail.com>
- *
- * This file is part of QKSMS.
- *
- * QKSMS is free software: you can redistribute it and/or modify
- * it under the terms of the GNU General Public License as published by
- * the Free Software Foundation, either version 3 of the License, or
- * (at your option) any later version.
- *
- * QKSMS is distributed in the hope that it will be useful,
- * but WITHOUT ANY WARRANTY; without even the implied warranty of
- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
- * GNU General Public License for more details.
- *
- * You should have received a copy of the GNU General Public License
- * along with QKSMS.  If not, see <http://www.gnu.org/licenses/>.
- */
-apply plugin: 'com.android.library'
-apply plugin: 'kotlin-android'
-
-android {
-    compileSdkVersion 25
-
-    defaultConfig {
-        minSdkVersion 21
-        targetSdkVersion 25
-        versionCode 1
-        versionName "1.0"
-    }
-
-    lintOptions {
-        abortOnError false
-    }
-
-    useLibrary 'org.apache.http.legacy'
-}
-
-dependencies {
-    implementation "androidx.core:core-ktx:$androidx_core_version"
-    implementation "com.jakewharton.timber:timber:$timber_version"
-    implementation 'com.squareup.okhttp:okhttp:2.5.0'
-    implementation 'com.squareup.okhttp:okhttp-urlconnection:2.5.0'
-    implementation "org.jetbrains.kotlin:kotlin-stdlib:$kotlin_version"
-}
-
-repositories {
-    mavenCentral()
+/*
+ * Copyright (C) 2017 Moez Bhatti <moez.bhatti@gmail.com>
+ *
+ * This file is part of QKSMS.
+ *
+ * QKSMS is free software: you can redistribute it and/or modify
+ * it under the terms of the GNU General Public License as published by
+ * the Free Software Foundation, either version 3 of the License, or
+ * (at your option) any later version.
+ *
+ * QKSMS is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+ * GNU General Public License for more details.
+ *
+ * You should have received a copy of the GNU General Public License
+ * along with QKSMS.  If not, see <http://www.gnu.org/licenses/>.
+ */
+apply plugin: 'com.android.library'
+apply plugin: 'kotlin-android'
+
+android {
+    compileSdkVersion 25
+
+    defaultConfig {
+        minSdkVersion 21
+        targetSdkVersion 25
+        versionCode 1
+        versionName "1.0"
+    }
+
+    lintOptions {
+        abortOnError false
+    }
+
+    useLibrary 'org.apache.http.legacy'
+}
+
+dependencies {
+    implementation "androidx.core:core-ktx:$androidx_core_version"
+    implementation "com.jakewharton.timber:timber:$timber_version"
+    implementation 'com.squareup.okhttp:okhttp:2.5.0'
+    implementation 'com.squareup.okhttp:okhttp-urlconnection:2.5.0'
+    implementation "org.jetbrains.kotlin:kotlin-stdlib:$kotlin_version"
+}
+
+repositories {
+    mavenCentral()
 }
\ No newline at end of file
diff --git a/android-smsmms/proguard-rules.pro b/android-smsmms/proguard-rules.pro
index f1b424510..6e7ffa997 100644
--- a/android-smsmms/proguard-rules.pro
+++ b/android-smsmms/proguard-rules.pro
@@ -1,21 +1,21 @@
-# Add project specific ProGuard rules here.
-# You can control the set of applied configuration files using the
-# proguardFiles setting in build.gradle.
-#
-# For more details, see
-#   http://developer.android.com/guide/developing/tools/proguard.html
-
-# If your project uses WebView with JS, uncomment the following
-# and specify the fully qualified class name to the JavaScript interface
-# class:
-#-keepclassmembers class fqcn.of.javascript.interface.for.webview {
-#   public *;
-#}
-
-# Uncomment this to preserve the line number information for
-# debugging stack traces.
-#-keepattributes SourceFile,LineNumberTable
-
-# If you keep the line number information, uncomment this to
-# hide the original source file name.
-#-renamesourcefileattribute SourceFile
+# Add project specific ProGuard rules here.
+# You can control the set of applied configuration files using the
+# proguardFiles setting in build.gradle.
+#
+# For more details, see
+#   http://developer.android.com/guide/developing/tools/proguard.html
+
+# If your project uses WebView with JS, uncomment the following
+# and specify the fully qualified class name to the JavaScript interface
+# class:
+#-keepclassmembers class fqcn.of.javascript.interface.for.webview {
+#   public *;
+#}
+
+# Uncomment this to preserve the line number information for
+# debugging stack traces.
+#-keepattributes SourceFile,LineNumberTable
+
+# If you keep the line number information, uncomment this to
+# hide the original source file name.
+#-renamesourcefileattribute SourceFile
diff --git a/android-smsmms/src/main/AndroidManifest.xml b/android-smsmms/src/main/AndroidManifest.xml
index c87baa9a5..9a3a4d52c 100755
--- a/android-smsmms/src/main/AndroidManifest.xml
+++ b/android-smsmms/src/main/AndroidManifest.xml
@@ -1,15 +1,15 @@
-<?xml version="1.0" encoding="utf-8"?>
-<manifest
-    package="com.klinker.android.send_message"
-    xmlns:android="http://schemas.android.com/apk/res/android">
-
-    <application>
-
-        <provider android:name=".MmsFileProvider"
-                  android:authorities="${applicationId}.MmsFileProvider"
-                  android:enabled="true"
-                  android:grantUriPermissions="true"
-                  android:exported="false" />
-
-    </application>
-</manifest>
+<?xml version="1.0" encoding="utf-8"?>
+<manifest
+    package="com.klinker.android.send_message"
+    xmlns:android="http://schemas.android.com/apk/res/android">
+
+    <application>
+
+        <provider android:name=".MmsFileProvider"
+                  android:authorities="${applicationId}.MmsFileProvider"
+                  android:enabled="true"
+                  android:grantUriPermissions="true"
+                  android:exported="false" />
+
+    </application>
+</manifest>
diff --git a/android-smsmms/src/main/java/android/database/sqlite/SqliteWrapper.java b/android-smsmms/src/main/java/android/database/sqlite/SqliteWrapper.java
index ebf980d33..3c41a3c99 100755
--- a/android-smsmms/src/main/java/android/database/sqlite/SqliteWrapper.java
+++ b/android-smsmms/src/main/java/android/database/sqlite/SqliteWrapper.java
@@ -1,99 +1,99 @@
-/*
- * Copyright (C) 2008 Esmertec AG.
- * Copyright (C) 2008 The Android Open Source Project
- *
- * Licensed under the Apache License, Version 2.0 (the "License");
- * you may not use this file except in compliance with the License.
- * You may obtain a copy of the License at
- *
- *      http://www.apache.org/licenses/LICENSE-2.0
- *
- * Unless required by applicable law or agreed to in writing, software
- * distributed under the License is distributed on an "AS IS" BASIS,
- * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
- * See the License for the specific language governing permissions and
- * limitations under the License.
- */
-
-package android.database.sqlite;
-
-import android.content.ContentResolver;
-import android.content.ContentValues;
-import android.content.Context;
-import android.database.Cursor;
-import android.net.Uri;
-import android.widget.Toast;
-import org.jetbrains.annotations.Nullable;
-import timber.log.Timber;
-
-/**
- * @hide
- */
-
-public final class SqliteWrapper {
-    private static final String SQLITE_EXCEPTION_DETAIL_MESSAGE
-            = "unable to open database file";
-
-    private SqliteWrapper() {
-        // Forbidden being instantiated.
-    }
-
-    // FIXME: need to optimize this method.
-    private static boolean isLowMemory(SQLiteException e) {
-        return e.getMessage().equals(SQLITE_EXCEPTION_DETAIL_MESSAGE);
-    }
-
-    public static void checkSQLiteException(Context context, SQLiteException e) {
-        if (isLowMemory(e)) {
-            Toast.makeText(context, "Low Memory",
-                    Toast.LENGTH_SHORT).show();
-        } else {
-            throw e;
-        }
-    }
-
-    @Nullable
-    public static Cursor query(Context context, ContentResolver resolver, Uri uri,
-                               String[] projection, String selection, String[] selectionArgs, String sortOrder) {
-        try {
-            return resolver.query(uri, projection, selection, selectionArgs, sortOrder);
-        } catch (SQLiteException e) {
-            Timber.e(e, "Catch a SQLiteException when query: ");
-            checkSQLiteException(context, e);
-            return null;
-        }
-    }
-
-    public static int update(Context context, ContentResolver resolver, Uri uri,
-                             ContentValues values, String where, String[] selectionArgs) {
-        try {
-            return resolver.update(uri, values, where, selectionArgs);
-        } catch (SQLiteException e) {
-            Timber.e(e, "Catch a SQLiteException when update: ");
-            checkSQLiteException(context, e);
-            return -1;
-        }
-    }
-
-    public static int delete(Context context, ContentResolver resolver, Uri uri,
-                             String where, String[] selectionArgs) {
-        try {
-            return resolver.delete(uri, where, selectionArgs);
-        } catch (SQLiteException e) {
-            Timber.e(e, "Catch a SQLiteException when delete: ");
-            checkSQLiteException(context, e);
-            return -1;
-        }
-    }
-
-    public static Uri insert(Context context, ContentResolver resolver,
-                             Uri uri, ContentValues values) {
-        try {
-            return resolver.insert(uri, values);
-        } catch (SQLiteException e) {
-            Timber.e(e, "Catch a SQLiteException when insert: ");
-            checkSQLiteException(context, e);
-            return null;
-        }
-    }
-}
+/*
+ * Copyright (C) 2008 Esmertec AG.
+ * Copyright (C) 2008 The Android Open Source Project
+ *
+ * Licensed under the Apache License, Version 2.0 (the "License");
+ * you may not use this file except in compliance with the License.
+ * You may obtain a copy of the License at
+ *
+ *      http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing, software
+ * distributed under the License is distributed on an "AS IS" BASIS,
+ * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ * See the License for the specific language governing permissions and
+ * limitations under the License.
+ */
+
+package android.database.sqlite;
+
+import android.content.ContentResolver;
+import android.content.ContentValues;
+import android.content.Context;
+import android.database.Cursor;
+import android.net.Uri;
+import android.widget.Toast;
+import org.jetbrains.annotations.Nullable;
+import timber.log.Timber;
+
+/**
+ * @hide
+ */
+
+public final class SqliteWrapper {
+    private static final String SQLITE_EXCEPTION_DETAIL_MESSAGE
+            = "unable to open database file";
+
+    private SqliteWrapper() {
+        // Forbidden being instantiated.
+    }
+
+    // FIXME: need to optimize this method.
+    private static boolean isLowMemory(SQLiteException e) {
+        return e.getMessage().equals(SQLITE_EXCEPTION_DETAIL_MESSAGE);
+    }
+
+    public static void checkSQLiteException(Context context, SQLiteException e) {
+        if (isLowMemory(e)) {
+            Toast.makeText(context, "Low Memory",
+                    Toast.LENGTH_SHORT).show();
+        } else {
+            throw e;
+        }
+    }
+
+    @Nullable
+    public static Cursor query(Context context, ContentResolver resolver, Uri uri,
+                               String[] projection, String selection, String[] selectionArgs, String sortOrder) {
+        try {
+            return resolver.query(uri, projection, selection, selectionArgs, sortOrder);
+        } catch (SQLiteException e) {
+            Timber.e(e, "Catch a SQLiteException when query: ");
+            checkSQLiteException(context, e);
+            return null;
+        }
+    }
+
+    public static int update(Context context, ContentResolver resolver, Uri uri,
+                             ContentValues values, String where, String[] selectionArgs) {
+        try {
+            return resolver.update(uri, values, where, selectionArgs);
+        } catch (SQLiteException e) {
+            Timber.e(e, "Catch a SQLiteException when update: ");
+            checkSQLiteException(context, e);
+            return -1;
+        }
+    }
+
+    public static int delete(Context context, ContentResolver resolver, Uri uri,
+                             String where, String[] selectionArgs) {
+        try {
+            return resolver.delete(uri, where, selectionArgs);
+        } catch (SQLiteException e) {
+            Timber.e(e, "Catch a SQLiteException when delete: ");
+            checkSQLiteException(context, e);
+            return -1;
+        }
+    }
+
+    public static Uri insert(Context context, ContentResolver resolver,
+                             Uri uri, ContentValues values) {
+        try {
+            return resolver.insert(uri, values);
+        } catch (SQLiteException e) {
+            Timber.e(e, "Catch a SQLiteException when insert: ");
+            checkSQLiteException(context, e);
+            return null;
+        }
+    }
+}
diff --git a/android-smsmms/src/main/java/android/net/DhcpInfoInternal.java b/android-smsmms/src/main/java/android/net/DhcpInfoInternal.java
index 1e0c7f63a..021aab594 100755
--- a/android-smsmms/src/main/java/android/net/DhcpInfoInternal.java
+++ b/android-smsmms/src/main/java/android/net/DhcpInfoInternal.java
@@ -1,167 +1,167 @@
-/*
- * Copyright (C) 2010 The Android Open Source Project
- *
- * Licensed under the Apache License, Version 2.0 (the "License");
- * you may not use this file except in compliance with the License.
- * You may obtain a copy of the License at
- *
- *      http://www.apache.org/licenses/LICENSE-2.0
- *
- * Unless required by applicable law or agreed to in writing, software
- * distributed under the License is distributed on an "AS IS" BASIS,
- * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
- * See the License for the specific language governing permissions and
- * limitations under the License.
- */
-
-package android.net;
-
-import android.text.TextUtils;
-import timber.log.Timber;
-
-import java.net.Inet4Address;
-import java.net.InetAddress;
-import java.util.ArrayList;
-import java.util.Collection;
-import java.util.Collections;
-
-/**
- * A simple object for retrieving the results of a DHCP request.
- * Replaces (internally) the IPv4-only DhcpInfo class.
- *
- * @hide
- */
-public class DhcpInfoInternal {
-    public String ipAddress;
-    public int prefixLength;
-
-    public String dns1;
-    public String dns2;
-
-    public String serverAddress;
-    public int leaseDuration;
-
-    /**
-     * Vendor specific information (from RFC 2132).
-     */
-    public String vendorInfo;
-
-    private Collection<RouteInfo> mRoutes;
-
-    public DhcpInfoInternal() {
-        mRoutes = new ArrayList<RouteInfo>();
-    }
-
-    public void addRoute(RouteInfo routeInfo) {
-        mRoutes.add(routeInfo);
-    }
-
-    public Collection<RouteInfo> getRoutes() {
-        return Collections.unmodifiableCollection(mRoutes);
-    }
-
-    private int convertToInt(String addr) {
-        if (addr != null) {
-            try {
-                InetAddress inetAddress = NetworkUtilsHelper.numericToInetAddress(addr);
-                if (inetAddress instanceof Inet4Address) {
-                    return NetworkUtilsHelper.inetAddressToInt(inetAddress);
-                }
-            } catch (IllegalArgumentException e) {
-            }
-        }
-        return 0;
-    }
-
-    public DhcpInfo makeDhcpInfo() {
-        DhcpInfo info = new DhcpInfo();
-        info.ipAddress = convertToInt(ipAddress);
-        for (RouteInfo route : mRoutes) {
-            if (route.isDefaultRoute()) {
-                info.gateway = convertToInt(route.getGateway().getHostAddress());
-                break;
-            }
-        }
-        try {
-            info.netmask = NetworkUtilsHelper.prefixLengthToNetmaskInt(prefixLength);
-        } catch (IllegalArgumentException e) {
-        }
-        info.dns1 = convertToInt(dns1);
-        info.dns2 = convertToInt(dns2);
-        info.serverAddress = convertToInt(serverAddress);
-        info.leaseDuration = leaseDuration;
-        return info;
-    }
-
-    public LinkAddress makeLinkAddress() {
-        if (TextUtils.isEmpty(ipAddress)) {
-            Timber.e("makeLinkAddress with empty ipAddress");
-            return null;
-        }
-        return new LinkAddress(NetworkUtilsHelper.numericToInetAddress(ipAddress), prefixLength);
-    }
-
-    public LinkProperties makeLinkProperties() {
-        LinkProperties p = new LinkProperties();
-        p.addLinkAddress(makeLinkAddress());
-        for (RouteInfo route : mRoutes) {
-            p.addRoute(route);
-        }
-        //if empty, connectivity configures default DNS
-        if (TextUtils.isEmpty(dns1) == false) {
-            p.addDns(NetworkUtilsHelper.numericToInetAddress(dns1));
-        } else {
-            Timber.d("makeLinkProperties with empty dns1!");
-        }
-        if (TextUtils.isEmpty(dns2) == false) {
-            p.addDns(NetworkUtilsHelper.numericToInetAddress(dns2));
-        } else {
-            Timber.d("makeLinkProperties with empty dns2!");
-        }
-        return p;
-    }
-
-    /* Updates the DHCP fields that need to be retained from
-     * original DHCP request if the DHCP renewal shows them as
-     * being empty
-     */
-    public void updateFromDhcpRequest(DhcpInfoInternal orig) {
-        if (orig == null) return;
-
-        if (TextUtils.isEmpty(dns1)) {
-            dns1 = orig.dns1;
-        }
-
-        if (TextUtils.isEmpty(dns2)) {
-            dns2 = orig.dns2;
-        }
-
-        if (mRoutes.size() == 0) {
-            for (RouteInfo route : orig.getRoutes()) {
-                addRoute(route);
-            }
-        }
-    }
-
-    /**
-     * Test if this DHCP lease includes vendor hint that network link is
-     * metered, and sensitive to heavy data transfers.
-     */
-    public boolean hasMeteredHint() {
-        if (vendorInfo != null) {
-            return vendorInfo.contains("ANDROID_METERED");
-        } else {
-            return false;
-        }
-    }
-
-    public String toString() {
-        String routeString = "";
-        for (RouteInfo route : mRoutes) routeString += route.toString() + " | ";
-        return "addr: " + ipAddress + "/" + prefixLength +
-                " mRoutes: " + routeString +
-                " dns: " + dns1 + "," + dns2 +
-                " dhcpServer: " + serverAddress +
-                " leaseDuration: " + leaseDuration;
-    }
-}
+/*
+ * Copyright (C) 2010 The Android Open Source Project
+ *
+ * Licensed under the Apache License, Version 2.0 (the "License");
+ * you may not use this file except in compliance with the License.
+ * You may obtain a copy of the License at
+ *
+ *      http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing, software
+ * distributed under the License is distributed on an "AS IS" BASIS,
+ * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ * See the License for the specific language governing permissions and
+ * limitations under the License.
+ */
+
+package android.net;
+
+import android.text.TextUtils;
+import timber.log.Timber;
+
+import java.net.Inet4Address;
+import java.net.InetAddress;
+import java.util.ArrayList;
+import java.util.Collection;
+import java.util.Collections;
+
+/**
+ * A simple object for retrieving the results of a DHCP request.
+ * Replaces (internally) the IPv4-only DhcpInfo class.
+ *
+ * @hide
+ */
+public class DhcpInfoInternal {
+    public String ipAddress;
+    public int prefixLength;
+
+    public String dns1;
+    public String dns2;
+
+    public String serverAddress;
+    public int leaseDuration;
+
+    /**
+     * Vendor specific information (from RFC 2132).
+     */
+    public String vendorInfo;
+
+    private Collection<RouteInfo> mRoutes;
+
+    public DhcpInfoInternal() {
+        mRoutes = new ArrayList<RouteInfo>();
+    }
+
+    public void addRoute(RouteInfo routeInfo) {
+        mRoutes.add(routeInfo);
+    }
+
+    public Collection<RouteInfo> getRoutes() {
+        return Collections.unmodifiableCollection(mRoutes);
+    }
+
+    private int convertToInt(String addr) {
+        if (addr != null) {
+            try {
+                InetAddress inetAddress = NetworkUtilsHelper.numericToInetAddress(addr);
+                if (inetAddress instanceof Inet4Address) {
+                    return NetworkUtilsHelper.inetAddressToInt(inetAddress);
+                }
+            } catch (IllegalArgumentException e) {
+            }
+        }
+        return 0;
+    }
+
+    public DhcpInfo makeDhcpInfo() {
+        DhcpInfo info = new DhcpInfo();
+        info.ipAddress = convertToInt(ipAddress);
+        for (RouteInfo route : mRoutes) {
+            if (route.isDefaultRoute()) {
+                info.gateway = convertToInt(route.getGateway().getHostAddress());
+                break;
+            }
+        }
+        try {
+            info.netmask = NetworkUtilsHelper.prefixLengthToNetmaskInt(prefixLength);
+        } catch (IllegalArgumentException e) {
+        }
+        info.dns1 = convertToInt(dns1);
+        info.dns2 = convertToInt(dns2);
+        info.serverAddress = convertToInt(serverAddress);
+        info.leaseDuration = leaseDuration;
+        return info;
+    }
+
+    public LinkAddress makeLinkAddress() {
+        if (TextUtils.isEmpty(ipAddress)) {
+            Timber.e("makeLinkAddress with empty ipAddress");
+            return null;
+        }
+        return new LinkAddress(NetworkUtilsHelper.numericToInetAddress(ipAddress), prefixLength);
+    }
+
+    public LinkProperties makeLinkProperties() {
+        LinkProperties p = new LinkProperties();
+        p.addLinkAddress(makeLinkAddress());
+        for (RouteInfo route : mRoutes) {
+            p.addRoute(route);
+        }
+        //if empty, connectivity configures default DNS
+        if (TextUtils.isEmpty(dns1) == false) {
+            p.addDns(NetworkUtilsHelper.numericToInetAddress(dns1));
+        } else {
+            Timber.d("makeLinkProperties with empty dns1!");
+        }
+        if (TextUtils.isEmpty(dns2) == false) {
+            p.addDns(NetworkUtilsHelper.numericToInetAddress(dns2));
+        } else {
+            Timber.d("makeLinkProperties with empty dns2!");
+        }
+        return p;
+    }
+
+    /* Updates the DHCP fields that need to be retained from
+     * original DHCP request if the DHCP renewal shows them as
+     * being empty
+     */
+    public void updateFromDhcpRequest(DhcpInfoInternal orig) {
+        if (orig == null) return;
+
+        if (TextUtils.isEmpty(dns1)) {
+            dns1 = orig.dns1;
+        }
+
+        if (TextUtils.isEmpty(dns2)) {
+            dns2 = orig.dns2;
+        }
+
+        if (mRoutes.size() == 0) {
+            for (RouteInfo route : orig.getRoutes()) {
+                addRoute(route);
+            }
+        }
+    }
+
+    /**
+     * Test if this DHCP lease includes vendor hint that network link is
+     * metered, and sensitive to heavy data transfers.
+     */
+    public boolean hasMeteredHint() {
+        if (vendorInfo != null) {
+            return vendorInfo.contains("ANDROID_METERED");
+        } else {
+            return false;
+        }
+    }
+
+    public String toString() {
+        String routeString = "";
+        for (RouteInfo route : mRoutes) routeString += route.toString() + " | ";
+        return "addr: " + ipAddress + "/" + prefixLength +
+                " mRoutes: " + routeString +
+                " dns: " + dns1 + "," + dns2 +
+                " dhcpServer: " + serverAddress +
+                " leaseDuration: " + leaseDuration;
+    }
+}
diff --git a/android-smsmms/src/main/java/android/net/INetworkPolicyListener.java b/android-smsmms/src/main/java/android/net/INetworkPolicyListener.java
index d6ec4e59c..d0fecf265 100755
--- a/android-smsmms/src/main/java/android/net/INetworkPolicyListener.java
+++ b/android-smsmms/src/main/java/android/net/INetworkPolicyListener.java
@@ -1,138 +1,138 @@
-/*
- * This file is auto-generated.  DO NOT MODIFY.
- * Original file: frameworks/base/core/java/android/net/INetworkPolicyListener.aidl
- */
-package android.net;
-
-/**
- * {@hide}
- */
-public interface INetworkPolicyListener extends android.os.IInterface {
-    /**
-     * Local-side IPC implementation stub class.
-     */
-    public static abstract class Stub extends android.os.Binder implements android.net.INetworkPolicyListener {
-        private static final java.lang.String DESCRIPTOR = "android.net.INetworkPolicyListener";
-
-        /**
-         * Construct the stub at attach it to the interface.
-         */
-        public Stub() {
-            this.attachInterface(this, DESCRIPTOR);
-        }
-
-        /**
-         * Cast an IBinder object into an android.net.INetworkPolicyListener interface,
-         * generating a proxy if needed.
-         */
-        public static android.net.INetworkPolicyListener asInterface(android.os.IBinder obj) {
-            if ((obj == null)) {
-                return null;
-            }
-            android.os.IInterface iin = obj.queryLocalInterface(DESCRIPTOR);
-            if (((iin != null) && (iin instanceof android.net.INetworkPolicyListener))) {
-                return ((android.net.INetworkPolicyListener) iin);
-            }
-            return new android.net.INetworkPolicyListener.Stub.Proxy(obj);
-        }
-
-        @Override
-        public android.os.IBinder asBinder() {
-            return this;
-        }
-
-        @Override
-        public boolean onTransact(int code, android.os.Parcel data, android.os.Parcel reply, int flags) throws android.os.RemoteException {
-            switch (code) {
-                case INTERFACE_TRANSACTION: {
-                    reply.writeString(DESCRIPTOR);
-                    return true;
-                }
-                case TRANSACTION_onUidRulesChanged: {
-                    data.enforceInterface(DESCRIPTOR);
-                    int _arg0;
-                    _arg0 = data.readInt();
-                    int _arg1;
-                    _arg1 = data.readInt();
-                    this.onUidRulesChanged(_arg0, _arg1);
-                    return true;
-                }
-                case TRANSACTION_onMeteredIfacesChanged: {
-                    data.enforceInterface(DESCRIPTOR);
-                    java.lang.String[] _arg0;
-                    _arg0 = data.createStringArray();
-                    this.onMeteredIfacesChanged(_arg0);
-                    return true;
-                }
-                case TRANSACTION_onRestrictBackgroundChanged: {
-                    data.enforceInterface(DESCRIPTOR);
-                    boolean _arg0;
-                    _arg0 = (0 != data.readInt());
-                    this.onRestrictBackgroundChanged(_arg0);
-                    return true;
-                }
-            }
-            return super.onTransact(code, data, reply, flags);
-        }
-
-        private static class Proxy implements android.net.INetworkPolicyListener {
-            private android.os.IBinder mRemote;
-
-            Proxy(android.os.IBinder remote) {
-                mRemote = remote;
-            }
-
-            @Override
-            public android.os.IBinder asBinder() {
-                return mRemote;
-            }
-
-            @Override
-            public void onUidRulesChanged(int uid, int uidRules) throws android.os.RemoteException {
-                android.os.Parcel _data = android.os.Parcel.obtain();
-                try {
-                    _data.writeInterfaceToken(DESCRIPTOR);
-                    _data.writeInt(uid);
-                    _data.writeInt(uidRules);
-                    mRemote.transact(Stub.TRANSACTION_onUidRulesChanged, _data, null, android.os.IBinder.FLAG_ONEWAY);
-                } finally {
-                    _data.recycle();
-                }
-            }
-
-            @Override
-            public void onMeteredIfacesChanged(java.lang.String[] meteredIfaces) throws android.os.RemoteException {
-                android.os.Parcel _data = android.os.Parcel.obtain();
-                try {
-                    _data.writeInterfaceToken(DESCRIPTOR);
-                    _data.writeStringArray(meteredIfaces);
-                    mRemote.transact(Stub.TRANSACTION_onMeteredIfacesChanged, _data, null, android.os.IBinder.FLAG_ONEWAY);
-                } finally {
-                    _data.recycle();
-                }
-            }
-
-            @Override
-            public void onRestrictBackgroundChanged(boolean restrictBackground) throws android.os.RemoteException {
-                android.os.Parcel _data = android.os.Parcel.obtain();
-                try {
-                    _data.writeInterfaceToken(DESCRIPTOR);
-                    _data.writeInt(((restrictBackground) ? (1) : (0)));
-                    mRemote.transact(Stub.TRANSACTION_onRestrictBackgroundChanged, _data, null, android.os.IBinder.FLAG_ONEWAY);
-                } finally {
-                    _data.recycle();
-                }
-            }
-        }
-
-        static final int TRANSACTION_onUidRulesChanged = (android.os.IBinder.FIRST_CALL_TRANSACTION + 0);
-        static final int TRANSACTION_onMeteredIfacesChanged = (android.os.IBinder.FIRST_CALL_TRANSACTION + 1);
-        static final int TRANSACTION_onRestrictBackgroundChanged = (android.os.IBinder.FIRST_CALL_TRANSACTION + 2);
-    }
-
-    public void onUidRulesChanged(int uid, int uidRules) throws android.os.RemoteException;
-
-    public void onMeteredIfacesChanged(java.lang.String[] meteredIfaces) throws android.os.RemoteException;
-
-    public void onRestrictBackgroundChanged(boolean restrictBackground) throws android.os.RemoteException;
-}
+/*
+ * This file is auto-generated.  DO NOT MODIFY.
+ * Original file: frameworks/base/core/java/android/net/INetworkPolicyListener.aidl
+ */
+package android.net;
+
+/**
+ * {@hide}
+ */
+public interface INetworkPolicyListener extends android.os.IInterface {
+    /**
+     * Local-side IPC implementation stub class.
+     */
+    public static abstract class Stub extends android.os.Binder implements android.net.INetworkPolicyListener {
+        private static final java.lang.String DESCRIPTOR = "android.net.INetworkPolicyListener";
+
+        /**
+         * Construct the stub at attach it to the interface.
+         */
+        public Stub() {
+            this.attachInterface(this, DESCRIPTOR);
+        }
+
+        /**
+         * Cast an IBinder object into an android.net.INetworkPolicyListener interface,
+         * generating a proxy if needed.
+         */
+        public static android.net.INetworkPolicyListener asInterface(android.os.IBinder obj) {
+            if ((obj == null)) {
+                return null;
+            }
+            android.os.IInterface iin = obj.queryLocalInterface(DESCRIPTOR);
+            if (((iin != null) && (iin instanceof android.net.INetworkPolicyListener))) {
+                return ((android.net.INetworkPolicyListener) iin);
+            }
+            return new android.net.INetworkPolicyListener.Stub.Proxy(obj);
+        }
+
+        @Override
+        public android.os.IBinder asBinder() {
+            return this;
+        }
+
+        @Override
+        public boolean onTransact(int code, android.os.Parcel data, android.os.Parcel reply, int flags) throws android.os.RemoteException {
+            switch (code) {
+                case INTERFACE_TRANSACTION: {
+                    reply.writeString(DESCRIPTOR);
+                    return true;
+                }
+                case TRANSACTION_onUidRulesChanged: {
+                    data.enforceInterface(DESCRIPTOR);
+                    int _arg0;
+                    _arg0 = data.readInt();
+                    int _arg1;
+                    _arg1 = data.readInt();
+                    this.onUidRulesChanged(_arg0, _arg1);
+                    return true;
+                }
+                case TRANSACTION_onMeteredIfacesChanged: {
+                    data.enforceInterface(DESCRIPTOR);
+                    java.lang.String[] _arg0;
+                    _arg0 = data.createStringArray();
+                    this.onMeteredIfacesChanged(_arg0);
+                    return true;
+                }
+                case TRANSACTION_onRestrictBackgroundChanged: {
+                    data.enforceInterface(DESCRIPTOR);
+                    boolean _arg0;
+                    _arg0 = (0 != data.readInt());
+                    this.onRestrictBackgroundChanged(_arg0);
+                    return true;
+                }
+            }
+            return super.onTransact(code, data, reply, flags);
+        }
+
+        private static class Proxy implements android.net.INetworkPolicyListener {
+            private android.os.IBinder mRemote;
+
+            Proxy(android.os.IBinder remote) {
+                mRemote = remote;
+            }
+
+            @Override
+            public android.os.IBinder asBinder() {
+                return mRemote;
+            }
+
+            @Override
+            public void onUidRulesChanged(int uid, int uidRules) throws android.os.RemoteException {
+                android.os.Parcel _data = android.os.Parcel.obtain();
+                try {
+                    _data.writeInterfaceToken(DESCRIPTOR);
+                    _data.writeInt(uid);
+                    _data.writeInt(uidRules);
+                    mRemote.transact(Stub.TRANSACTION_onUidRulesChanged, _data, null, android.os.IBinder.FLAG_ONEWAY);
+                } finally {
+                    _data.recycle();
+                }
+            }
+
+            @Override
+            public void onMeteredIfacesChanged(java.lang.String[] meteredIfaces) throws android.os.RemoteException {
+                android.os.Parcel _data = android.os.Parcel.obtain();
+                try {
+                    _data.writeInterfaceToken(DESCRIPTOR);
+                    _data.writeStringArray(meteredIfaces);
+                    mRemote.transact(Stub.TRANSACTION_onMeteredIfacesChanged, _data, null, android.os.IBinder.FLAG_ONEWAY);
+                } finally {
+                    _data.recycle();
+                }
+            }
+
+            @Override
+            public void onRestrictBackgroundChanged(boolean restrictBackground) throws android.os.RemoteException {
+                android.os.Parcel _data = android.os.Parcel.obtain();
+                try {
+                    _data.writeInterfaceToken(DESCRIPTOR);
+                    _data.writeInt(((restrictBackground) ? (1) : (0)));
+                    mRemote.transact(Stub.TRANSACTION_onRestrictBackgroundChanged, _data, null, android.os.IBinder.FLAG_ONEWAY);
+                } finally {
+                    _data.recycle();
+                }
+            }
+        }
+
+        static final int TRANSACTION_onUidRulesChanged = (android.os.IBinder.FIRST_CALL_TRANSACTION + 0);
+        static final int TRANSACTION_onMeteredIfacesChanged = (android.os.IBinder.FIRST_CALL_TRANSACTION + 1);
+        static final int TRANSACTION_onRestrictBackgroundChanged = (android.os.IBinder.FIRST_CALL_TRANSACTION + 2);
+    }
+
+    public void onUidRulesChanged(int uid, int uidRules) throws android.os.RemoteException;
+
+    public void onMeteredIfacesChanged(java.lang.String[] meteredIfaces) throws android.os.RemoteException;
+
+    public void onRestrictBackgroundChanged(boolean restrictBackground) throws android.os.RemoteException;
+}
diff --git a/android-smsmms/src/main/java/android/net/LinkAddress.java b/android-smsmms/src/main/java/android/net/LinkAddress.java
index 21a5fe3fb..b433630c8 100755
--- a/android-smsmms/src/main/java/android/net/LinkAddress.java
+++ b/android-smsmms/src/main/java/android/net/LinkAddress.java
@@ -1,152 +1,152 @@
-/*
- * Copyright (C) 2010 The Android Open Source Project
- *
- * Licensed under the Apache License, Version 2.0 (the "License");
- * you may not use this file except in compliance with the License.
- * You may obtain a copy of the License at
- *
- *      http://www.apache.org/licenses/LICENSE-2.0
- *
- * Unless required by applicable law or agreed to in writing, software
- * distributed under the License is distributed on an "AS IS" BASIS,
- * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
- * See the License for the specific language governing permissions and
- * limitations under the License.
- */
-
-package android.net;
-
-import android.os.Parcel;
-import android.os.Parcelable;
-
-import java.net.Inet4Address;
-import java.net.InetAddress;
-import java.net.InterfaceAddress;
-import java.net.UnknownHostException;
-
-/**
- * Identifies an address of a network link
- *
- * @hide
- */
-public class LinkAddress implements Parcelable {
-    /**
-     * IPv4 or IPv6 address.
-     */
-    private final InetAddress address;
-
-    /**
-     * Network prefix length
-     */
-    private final int prefixLength;
-
-    public LinkAddress(InetAddress address, int prefixLength) {
-        if (address == null || prefixLength < 0 ||
-                ((address instanceof Inet4Address) && prefixLength > 32) ||
-                (prefixLength > 128)) {
-            throw new IllegalArgumentException("Bad LinkAddress haloParams " + address +
-                    prefixLength);
-        }
-        this.address = address;
-        this.prefixLength = prefixLength;
-    }
-
-    public LinkAddress(InterfaceAddress interfaceAddress) {
-        this.address = interfaceAddress.getAddress();
-        this.prefixLength = interfaceAddress.getNetworkPrefixLength();
-    }
-
-    @Override
-    public String toString() {
-        return (address == null ? "" : (address.getHostAddress() + "/" + prefixLength));
-    }
-
-    /**
-     * Compares this {@code LinkAddress} instance against the specified address
-     * in {@code obj}. Two addresses are equal if their InetAddress and prefixLength
-     * are equal
-     *
-     * @param obj the object to be tested for equality.
-     * @return {@code true} if both objects are equal, {@code false} otherwise.
-     */
-    @Override
-    public boolean equals(Object obj) {
-        if (!(obj instanceof LinkAddress)) {
-            return false;
-        }
-        LinkAddress linkAddress = (LinkAddress) obj;
-        return this.address.equals(linkAddress.address) &&
-                this.prefixLength == linkAddress.prefixLength;
-    }
-
-    @Override
-    /*
-     * generate hashcode based on significant fields
-     */
-    public int hashCode() {
-        return ((null == address) ? 0 : address.hashCode()) + prefixLength;
-    }
-
-    /**
-     * Returns the InetAddress for this address.
-     */
-    public InetAddress getAddress() {
-        return address;
-    }
-
-    /**
-     * Get network prefix length
-     */
-    public int getNetworkPrefixLength() {
-        return prefixLength;
-    }
-
-    /**
-     * Implement the Parcelable interface
-     *
-     * @hide
-     */
-    public int describeContents() {
-        return 0;
-    }
-
-    /**
-     * Implement the Parcelable interface.
-     *
-     * @hide
-     */
-    public void writeToParcel(Parcel dest, int flags) {
-        if (address != null) {
-            dest.writeByte((byte) 1);
-            dest.writeByteArray(address.getAddress());
-            dest.writeInt(prefixLength);
-        } else {
-            dest.writeByte((byte) 0);
-        }
-    }
-
-    /**
-     * Implement the Parcelable interface.
-     *
-     * @hide
-     */
-    public static final Creator<LinkAddress> CREATOR =
-            new Creator<LinkAddress>() {
-                public LinkAddress createFromParcel(Parcel in) {
-                    InetAddress address = null;
-                    int prefixLength = 0;
-                    if (in.readByte() == 1) {
-                        try {
-                            address = InetAddress.getByAddress(in.createByteArray());
-                            prefixLength = in.readInt();
-                        } catch (UnknownHostException e) {
-                        }
-                    }
-                    return new LinkAddress(address, prefixLength);
-                }
-
-                public LinkAddress[] newArray(int size) {
-                    return new LinkAddress[size];
-                }
-            };
-}
+/*
+ * Copyright (C) 2010 The Android Open Source Project
+ *
+ * Licensed under the Apache License, Version 2.0 (the "License");
+ * you may not use this file except in compliance with the License.
+ * You may obtain a copy of the License at
+ *
+ *      http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing, software
+ * distributed under the License is distributed on an "AS IS" BASIS,
+ * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ * See the License for the specific language governing permissions and
+ * limitations under the License.
+ */
+
+package android.net;
+
+import android.os.Parcel;
+import android.os.Parcelable;
+
+import java.net.Inet4Address;
+import java.net.InetAddress;
+import java.net.InterfaceAddress;
+import java.net.UnknownHostException;
+
+/**
+ * Identifies an address of a network link
+ *
+ * @hide
+ */
+public class LinkAddress implements Parcelable {
+    /**
+     * IPv4 or IPv6 address.
+     */
+    private final InetAddress address;
+
+    /**
+     * Network prefix length
+     */
+    private final int prefixLength;
+
+    public LinkAddress(InetAddress address, int prefixLength) {
+        if (address == null || prefixLength < 0 ||
+                ((address instanceof Inet4Address) && prefixLength > 32) ||
+                (prefixLength > 128)) {
+            throw new IllegalArgumentException("Bad LinkAddress haloParams " + address +
+                    prefixLength);
+        }
+        this.address = address;
+        this.prefixLength = prefixLength;
+    }
+
+    public LinkAddress(InterfaceAddress interfaceAddress) {
+        this.address = interfaceAddress.getAddress();
+        this.prefixLength = interfaceAddress.getNetworkPrefixLength();
+    }
+
+    @Override
+    public String toString() {
+        return (address == null ? "" : (address.getHostAddress() + "/" + prefixLength));
+    }
+
+    /**
+     * Compares this {@code LinkAddress} instance against the specified address
+     * in {@code obj}. Two addresses are equal if their InetAddress and prefixLength
+     * are equal
+     *
+     * @param obj the object to be tested for equality.
+     * @return {@code true} if both objects are equal, {@code false} otherwise.
+     */
+    @Override
+    public boolean equals(Object obj) {
+        if (!(obj instanceof LinkAddress)) {
+            return false;
+        }
+        LinkAddress linkAddress = (LinkAddress) obj;
+        return this.address.equals(linkAddress.address) &&
+                this.prefixLength == linkAddress.prefixLength;
+    }
+
+    @Override
+    /*
+     * generate hashcode based on significant fields
+     */
+    public int hashCode() {
+        return ((null == address) ? 0 : address.hashCode()) + prefixLength;
+    }
+
+    /**
+     * Returns the InetAddress for this address.
+     */
+    public InetAddress getAddress() {
+        return address;
+    }
+
+    /**
+     * Get network prefix length
+     */
+    public int getNetworkPrefixLength() {
+        return prefixLength;
+    }
+
+    /**
+     * Implement the Parcelable interface
+     *
+     * @hide
+     */
+    public int describeContents() {
+        return 0;
+    }
+
+    /**
+     * Implement the Parcelable interface.
+     *
+     * @hide
+     */
+    public void writeToParcel(Parcel dest, int flags) {
+        if (address != null) {
+            dest.writeByte((byte) 1);
+            dest.writeByteArray(address.getAddress());
+            dest.writeInt(prefixLength);
+        } else {
+            dest.writeByte((byte) 0);
+        }
+    }
+
+    /**
+     * Implement the Parcelable interface.
+     *
+     * @hide
+     */
+    public static final Creator<LinkAddress> CREATOR =
+            new Creator<LinkAddress>() {
+                public LinkAddress createFromParcel(Parcel in) {
+                    InetAddress address = null;
+                    int prefixLength = 0;
+                    if (in.readByte() == 1) {
+                        try {
+                            address = InetAddress.getByAddress(in.createByteArray());
+                            prefixLength = in.readInt();
+                        } catch (UnknownHostException e) {
+                        }
+                    }
+                    return new LinkAddress(address, prefixLength);
+                }
+
+                public LinkAddress[] newArray(int size) {
+                    return new LinkAddress[size];
+                }
+            };
+}
diff --git a/android-smsmms/src/main/java/android/net/LinkCapabilities.java b/android-smsmms/src/main/java/android/net/LinkCapabilities.java
index 1c8be5c64..7c30373f4 100755
--- a/android-smsmms/src/main/java/android/net/LinkCapabilities.java
+++ b/android-smsmms/src/main/java/android/net/LinkCapabilities.java
@@ -1,392 +1,392 @@
-/*
- * Copyright (C) 2010 The Android Open Source Project
- *
- * Licensed under the Apache License, Version 2.0 (the "License");
- * you may not use this file except in compliance with the License.
- * You may obtain a copy of the License at
- *
- *      http://www.apache.org/licenses/LICENSE-2.0
- *
- * Unless required by applicable law or agreed to in writing, software
- * distributed under the License is distributed on an "AS IS" BASIS,
- * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
- * See the License for the specific language governing permissions and
- * limitations under the License.
- */
-
-package android.net;
-
-import android.os.Parcel;
-import android.os.Parcelable;
-import timber.log.Timber;
-
-import java.util.Collection;
-import java.util.HashMap;
-import java.util.Map;
-import java.util.Map.Entry;
-import java.util.Set;
-
-/**
- * A class representing the capabilities of a link
- *
- * @hide
- */
-public class LinkCapabilities implements Parcelable {
-    private static final boolean DBG = false;
-
-    /**
-     * The Map of Keys to Values
-     */
-    private HashMap<Integer, String> mCapabilities;
-
-
-    /**
-     * The set of keys defined for a links capabilities.
-     * <p/>
-     * Keys starting with RW are read + write, i.e. the application
-     * can request for a certain requirement corresponding to that key.
-     * Keys starting with RO are read only, i.e. the the application
-     * can read the value of that key from the socket but cannot request
-     * a corresponding requirement.
-     * <p/>
-     * TODO: Provide a documentation technique for concisely and precisely
-     * define the syntax for each value string associated with a key.
-     */
-    public static final class Key {
-        /**
-         * No constructor
-         */
-        private Key() {
-        }
-
-        /**
-         * An integer representing the network type.
-         *
-         * @see ConnectivityManager
-         */
-        public final static int RO_NETWORK_TYPE = 1;
-
-        /**
-         * Desired minimum forward link (download) bandwidth for the
-         * in kilobits per second (kbps). Values should be strings such
-         * "50", "100", "1500", etc.
-         */
-        public final static int RW_DESIRED_FWD_BW = 2;
-
-        /**
-         * Required minimum forward link (download) bandwidth, in
-         * per second (kbps), below which the socket cannot function.
-         * Values should be strings such as "50", "100", "1500", etc.
-         */
-        public final static int RW_REQUIRED_FWD_BW = 3;
-
-        /**
-         * Available forward link (download) bandwidth for the socket.
-         * This value is in kilobits per second (kbps).
-         * Values will be strings such as "50", "100", "1500", etc.
-         */
-        public final static int RO_AVAILABLE_FWD_BW = 4;
-
-        /**
-         * Desired minimum reverse link (upload) bandwidth for the socket
-         * in kilobits per second (kbps).
-         * Values should be strings such as "50", "100", "1500", etc.
-         * <p/>
-         * This key is set via the needs map.
-         */
-        public final static int RW_DESIRED_REV_BW = 5;
-
-        /**
-         * Required minimum reverse link (upload) bandwidth, in kilobits
-         * per second (kbps), below which the socket cannot function.
-         * If a rate is not specified, the default rate of kbps will be
-         * Values should be strings such as "50", "100", "1500", etc.
-         */
-        public final static int RW_REQUIRED_REV_BW = 6;
-
-        /**
-         * Available reverse link (upload) bandwidth for the socket.
-         * This value is in kilobits per second (kbps).
-         * Values will be strings such as "50", "100", "1500", etc.
-         */
-        public final static int RO_AVAILABLE_REV_BW = 7;
-
-        /**
-         * Maximum latency for the socket, in milliseconds, above which
-         * socket cannot function.
-         * Values should be strings such as "50", "300", "500", etc.
-         */
-        public final static int RW_MAX_ALLOWED_LATENCY = 8;
-
-        /**
-         * Interface that the socket is bound to. This can be a virtual
-         * interface (e.g. VPN or Mobile IP) or a physical interface
-         * (e.g. wlan0 or rmnet0).
-         * Values will be strings such as "wlan0", "rmnet0"
-         */
-        public final static int RO_BOUND_INTERFACE = 9;
-
-        /**
-         * Physical interface that the socket is routed on.
-         * This can be different from BOUND_INTERFACE in cases such as
-         * VPN or Mobile IP. The physical interface may change over time
-         * if seamless mobility is supported.
-         * Values will be strings such as "wlan0", "rmnet0"
-         */
-        public final static int RO_PHYSICAL_INTERFACE = 10;
-    }
-
-    /**
-     * Role informs the LinkSocket about the data usage patterns of your
-     * application.
-     * <p/>
-     * {@code Role.DEFAULT} is the default role, and is used whenever
-     * a role isn't set.
-     */
-    public static final class Role {
-        /**
-         * No constructor
-         */
-        private Role() {
-        }
-
-        // examples only, discuss which roles should be defined, and then
-        // code these to match
-
-        /**
-         * Default Role
-         */
-        public static final String DEFAULT = "default";
-        /**
-         * Bulk down load
-         */
-        public static final String BULK_DOWNLOAD = "bulk.download";
-        /**
-         * Bulk upload
-         */
-        public static final String BULK_UPLOAD = "bulk.upload";
-
-        /**
-         * VoIP Application at 24kbps
-         */
-        public static final String VOIP_24KBPS = "voip.24k";
-        /**
-         * VoIP Application at 32kbps
-         */
-        public static final String VOIP_32KBPS = "voip.32k";
-
-        /**
-         * Video Streaming at 480p
-         */
-        public static final String VIDEO_STREAMING_480P = "video.streaming.480p";
-        /**
-         * Video Streaming at 720p
-         */
-        public static final String VIDEO_STREAMING_720I = "video.streaming.720i";
-
-        /**
-         * Video Chat Application at 360p
-         */
-        public static final String VIDEO_CHAT_360P = "video.chat.360p";
-        /**
-         * Video Chat Application at 480p
-         */
-        public static final String VIDEO_CHAT_480P = "video.chat.480i";
-    }
-
-    /**
-     * Constructor
-     */
-    public LinkCapabilities() {
-        mCapabilities = new HashMap<Integer, String>();
-    }
-
-    /**
-     * Copy constructor.
-     *
-     * @param source
-     */
-    public LinkCapabilities(LinkCapabilities source) {
-        if (source != null) {
-            mCapabilities = new HashMap<Integer, String>(source.mCapabilities);
-        } else {
-            mCapabilities = new HashMap<Integer, String>();
-        }
-    }
-
-    /**
-     * Create the {@code LinkCapabilities} with values depending on role type.
-     *
-     * @param applicationRole a {@code LinkSocket.Role}
-     * @return the {@code LinkCapabilities} associated with the applicationRole, empty if none
-     */
-    public static LinkCapabilities createNeedsMap(String applicationRole) {
-        if (DBG) log("createNeededCapabilities(applicationRole) EX");
-        return new LinkCapabilities();
-    }
-
-    /**
-     * Remove all capabilities
-     */
-    public void clear() {
-        mCapabilities.clear();
-    }
-
-    /**
-     * Returns whether this map is empty.
-     */
-    public boolean isEmpty() {
-        return mCapabilities.isEmpty();
-    }
-
-    /**
-     * Returns the number of elements in this map.
-     *
-     * @return the number of elements in this map.
-     */
-    public int size() {
-        return mCapabilities.size();
-    }
-
-    /**
-     * Given the key return the capability string
-     *
-     * @param key
-     * @return the capability string
-     */
-    public String get(int key) {
-        return mCapabilities.get(key);
-    }
-
-    /**
-     * Store the key/value capability pair
-     *
-     * @param key
-     * @param value
-     */
-    public void put(int key, String value) {
-        mCapabilities.put(key, value);
-    }
-
-    /**
-     * Returns whether this map contains the specified key.
-     *
-     * @param key to search for.
-     * @return {@code true} if this map contains the specified key,
-     * {@code false} otherwise.
-     */
-    public boolean containsKey(int key) {
-        return mCapabilities.containsKey(key);
-    }
-
-    /**
-     * Returns whether this map contains the specified value.
-     *
-     * @param value to search for.
-     * @return {@code true} if this map contains the specified value,
-     * {@code false} otherwise.
-     */
-    public boolean containsValue(String value) {
-        return mCapabilities.containsValue(value);
-    }
-
-    /**
-     * Returns a set containing all of the mappings in this map. Each mapping is
-     * an instance of {@link Map.Entry}. As the set is backed by this map,
-     * changes in one will be reflected in the other.
-     *
-     * @return a set of the mappings.
-     */
-    public Set<Entry<Integer, String>> entrySet() {
-        return mCapabilities.entrySet();
-    }
-
-    /**
-     * @return the set of the keys.
-     */
-    public Set<Integer> keySet() {
-        return mCapabilities.keySet();
-    }
-
-    /**
-     * @return the set of values
-     */
-    public Collection<String> values() {
-        return mCapabilities.values();
-    }
-
-    /**
-     * Implement the Parcelable interface
-     *
-     * @hide
-     */
-    public int describeContents() {
-        return 0;
-    }
-
-    /**
-     * Convert to string for debugging
-     */
-    @Override
-    public String toString() {
-        StringBuilder sb = new StringBuilder();
-        sb.append("{");
-        boolean firstTime = true;
-        for (Entry<Integer, String> entry : mCapabilities.entrySet()) {
-            if (firstTime) {
-                firstTime = false;
-            } else {
-                sb.append(",");
-            }
-            sb.append(entry.getKey());
-            sb.append(":\"");
-            sb.append(entry.getValue());
-            sb.append("\"");
-            return mCapabilities.toString();
-        }
-        return sb.toString();
-    }
-
-    /**
-     * Implement the Parcelable interface.
-     *
-     * @hide
-     */
-    public void writeToParcel(Parcel dest, int flags) {
-        dest.writeInt(mCapabilities.size());
-        for (Entry<Integer, String> entry : mCapabilities.entrySet()) {
-            dest.writeInt(entry.getKey().intValue());
-            dest.writeString(entry.getValue());
-        }
-    }
-
-    /**
-     * Implement the Parcelable interface.
-     *
-     * @hide
-     */
-    public static final Creator<LinkCapabilities> CREATOR =
-            new Creator<LinkCapabilities>() {
-                public LinkCapabilities createFromParcel(Parcel in) {
-                    LinkCapabilities capabilities = new LinkCapabilities();
-                    int size = in.readInt();
-                    while (size-- != 0) {
-                        int key = in.readInt();
-                        String value = in.readString();
-                        capabilities.mCapabilities.put(key, value);
-                    }
-                    return capabilities;
-                }
-
-                public LinkCapabilities[] newArray(int size) {
-                    return new LinkCapabilities[size];
-                }
-            };
-
-    /**
-     * Debug logging
-     */
-    protected static void log(String s) {
-        Timber.d(s);
-    }
-}
+/*
+ * Copyright (C) 2010 The Android Open Source Project
+ *
+ * Licensed under the Apache License, Version 2.0 (the "License");
+ * you may not use this file except in compliance with the License.
+ * You may obtain a copy of the License at
+ *
+ *      http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing, software
+ * distributed under the License is distributed on an "AS IS" BASIS,
+ * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ * See the License for the specific language governing permissions and
+ * limitations under the License.
+ */
+
+package android.net;
+
+import android.os.Parcel;
+import android.os.Parcelable;
+import timber.log.Timber;
+
+import java.util.Collection;
+import java.util.HashMap;
+import java.util.Map;
+import java.util.Map.Entry;
+import java.util.Set;
+
+/**
+ * A class representing the capabilities of a link
+ *
+ * @hide
+ */
+public class LinkCapabilities implements Parcelable {
+    private static final boolean DBG = false;
+
+    /**
+     * The Map of Keys to Values
+     */
+    private HashMap<Integer, String> mCapabilities;
+
+
+    /**
+     * The set of keys defined for a links capabilities.
+     * <p/>
+     * Keys starting with RW are read + write, i.e. the application
+     * can request for a certain requirement corresponding to that key.
+     * Keys starting with RO are read only, i.e. the the application
+     * can read the value of that key from the socket but cannot request
+     * a corresponding requirement.
+     * <p/>
+     * TODO: Provide a documentation technique for concisely and precisely
+     * define the syntax for each value string associated with a key.
+     */
+    public static final class Key {
+        /**
+         * No constructor
+         */
+        private Key() {
+        }
+
+        /**
+         * An integer representing the network type.
+         *
+         * @see ConnectivityManager
+         */
+        public final static int RO_NETWORK_TYPE = 1;
+
+        /**
+         * Desired minimum forward link (download) bandwidth for the
+         * in kilobits per second (kbps). Values should be strings such
+         * "50", "100", "1500", etc.
+         */
+        public final static int RW_DESIRED_FWD_BW = 2;
+
+        /**
+         * Required minimum forward link (download) bandwidth, in
+         * per second (kbps), below which the socket cannot function.
+         * Values should be strings such as "50", "100", "1500", etc.
+         */
+        public final static int RW_REQUIRED_FWD_BW = 3;
+
+        /**
+         * Available forward link (download) bandwidth for the socket.
+         * This value is in kilobits per second (kbps).
+         * Values will be strings such as "50", "100", "1500", etc.
+         */
+        public final static int RO_AVAILABLE_FWD_BW = 4;
+
+        /**
+         * Desired minimum reverse link (upload) bandwidth for the socket
+         * in kilobits per second (kbps).
+         * Values should be strings such as "50", "100", "1500", etc.
+         * <p/>
+         * This key is set via the needs map.
+         */
+        public final static int RW_DESIRED_REV_BW = 5;
+
+        /**
+         * Required minimum reverse link (upload) bandwidth, in kilobits
+         * per second (kbps), below which the socket cannot function.
+         * If a rate is not specified, the default rate of kbps will be
+         * Values should be strings such as "50", "100", "1500", etc.
+         */
+        public final static int RW_REQUIRED_REV_BW = 6;
+
+        /**
+         * Available reverse link (upload) bandwidth for the socket.
+         * This value is in kilobits per second (kbps).
+         * Values will be strings such as "50", "100", "1500", etc.
+         */
+        public final static int RO_AVAILABLE_REV_BW = 7;
+
+        /**
+         * Maximum latency for the socket, in milliseconds, above which
+         * socket cannot function.
+         * Values should be strings such as "50", "300", "500", etc.
+         */
+        public final static int RW_MAX_ALLOWED_LATENCY = 8;
+
+        /**
+         * Interface that the socket is bound to. This can be a virtual
+         * interface (e.g. VPN or Mobile IP) or a physical interface
+         * (e.g. wlan0 or rmnet0).
+         * Values will be strings such as "wlan0", "rmnet0"
+         */
+        public final static int RO_BOUND_INTERFACE = 9;
+
+        /**
+         * Physical interface that the socket is routed on.
+         * This can be different from BOUND_INTERFACE in cases such as
+         * VPN or Mobile IP. The physical interface may change over time
+         * if seamless mobility is supported.
+         * Values will be strings such as "wlan0", "rmnet0"
+         */
+        public final static int RO_PHYSICAL_INTERFACE = 10;
+    }
+
+    /**
+     * Role informs the LinkSocket about the data usage patterns of your
+     * application.
+     * <p/>
+     * {@code Role.DEFAULT} is the default role, and is used whenever
+     * a role isn't set.
+     */
+    public static final class Role {
+        /**
+         * No constructor
+         */
+        private Role() {
+        }
+
+        // examples only, discuss which roles should be defined, and then
+        // code these to match
+
+        /**
+         * Default Role
+         */
+        public static final String DEFAULT = "default";
+        /**
+         * Bulk down load
+         */
+        public static final String BULK_DOWNLOAD = "bulk.download";
+        /**
+         * Bulk upload
+         */
+        public static final String BULK_UPLOAD = "bulk.upload";
+
+        /**
+         * VoIP Application at 24kbps
+         */
+        public static final String VOIP_24KBPS = "voip.24k";
+        /**
+         * VoIP Application at 32kbps
+         */
+        public static final String VOIP_32KBPS = "voip.32k";
+
+        /**
+         * Video Streaming at 480p
+         */
+        public static final String VIDEO_STREAMING_480P = "video.streaming.480p";
+        /**
+         * Video Streaming at 720p
+         */
+        public static final String VIDEO_STREAMING_720I = "video.streaming.720i";
+
+        /**
+         * Video Chat Application at 360p
+         */
+        public static final String VIDEO_CHAT_360P = "video.chat.360p";
+        /**
+         * Video Chat Application at 480p
+         */
+        public static final String VIDEO_CHAT_480P = "video.chat.480i";
+    }
+
+    /**
+     * Constructor
+     */
+    public LinkCapabilities() {
+        mCapabilities = new HashMap<Integer, String>();
+    }
+
+    /**
+     * Copy constructor.
+     *
+     * @param source
+     */
+    public LinkCapabilities(LinkCapabilities source) {
+        if (source != null) {
+            mCapabilities = new HashMap<Integer, String>(source.mCapabilities);
+        } else {
+            mCapabilities = new HashMap<Integer, String>();
+        }
+    }
+
+    /**
+     * Create the {@code LinkCapabilities} with values depending on role type.
+     *
+     * @param applicationRole a {@code LinkSocket.Role}
+     * @return the {@code LinkCapabilities} associated with the applicationRole, empty if none
+     */
+    public static LinkCapabilities createNeedsMap(String applicationRole) {
+        if (DBG) log("createNeededCapabilities(applicationRole) EX");
+        return new LinkCapabilities();
+    }
+
+    /**
+     * Remove all capabilities
+     */
+    public void clear() {
+        mCapabilities.clear();
+    }
+
+    /**
+     * Returns whether this map is empty.
+     */
+    public boolean isEmpty() {
+        return mCapabilities.isEmpty();
+    }
+
+    /**
+     * Returns the number of elements in this map.
+     *
+     * @return the number of elements in this map.
+     */
+    public int size() {
+        return mCapabilities.size();
+    }
+
+    /**
+     * Given the key return the capability string
+     *
+     * @param key
+     * @return the capability string
+     */
+    public String get(int key) {
+        return mCapabilities.get(key);
+    }
+
+    /**
+     * Store the key/value capability pair
+     *
+     * @param key
+     * @param value
+     */
+    public void put(int key, String value) {
+        mCapabilities.put(key, value);
+    }
+
+    /**
+     * Returns whether this map contains the specified key.
+     *
+     * @param key to search for.
+     * @return {@code true} if this map contains the specified key,
+     * {@code false} otherwise.
+     */
+    public boolean containsKey(int key) {
+        return mCapabilities.containsKey(key);
+    }
+
+    /**
+     * Returns whether this map contains the specified value.
+     *
+     * @param value to search for.
+     * @return {@code true} if this map contains the specified value,
+     * {@code false} otherwise.
+     */
+    public boolean containsValue(String value) {
+        return mCapabilities.containsValue(value);
+    }
+
+    /**
+     * Returns a set containing all of the mappings in this map. Each mapping is
+     * an instance of {@link Map.Entry}. As the set is backed by this map,
+     * changes in one will be reflected in the other.
+     *
+     * @return a set of the mappings.
+     */
+    public Set<Entry<Integer, String>> entrySet() {
+        return mCapabilities.entrySet();
+    }
+
+    /**
+     * @return the set of the keys.
+     */
+    public Set<Integer> keySet() {
+        return mCapabilities.keySet();
+    }
+
+    /**
+     * @return the set of values
+     */
+    public Collection<String> values() {
+        return mCapabilities.values();
+    }
+
+    /**
+     * Implement the Parcelable interface
+     *
+     * @hide
+     */
+    public int describeContents() {
+        return 0;
+    }
+
+    /**
+     * Convert to string for debugging
+     */
+    @Override
+    public String toString() {
+        StringBuilder sb = new StringBuilder();
+        sb.append("{");
+        boolean firstTime = true;
+        for (Entry<Integer, String> entry : mCapabilities.entrySet()) {
+            if (firstTime) {
+                firstTime = false;
+            } else {
+                sb.append(",");
+            }
+            sb.append(entry.getKey());
+            sb.append(":\"");
+            sb.append(entry.getValue());
+            sb.append("\"");
+            return mCapabilities.toString();
+        }
+        return sb.toString();
+    }
+
+    /**
+     * Implement the Parcelable interface.
+     *
+     * @hide
+     */
+    public void writeToParcel(Parcel dest, int flags) {
+        dest.writeInt(mCapabilities.size());
+        for (Entry<Integer, String> entry : mCapabilities.entrySet()) {
+            dest.writeInt(entry.getKey().intValue());
+            dest.writeString(entry.getValue());
+        }
+    }
+
+    /**
+     * Implement the Parcelable interface.
+     *
+     * @hide
+     */
+    public static final Creator<LinkCapabilities> CREATOR =
+            new Creator<LinkCapabilities>() {
+                public LinkCapabilities createFromParcel(Parcel in) {
+                    LinkCapabilities capabilities = new LinkCapabilities();
+                    int size = in.readInt();
+                    while (size-- != 0) {
+                        int key = in.readInt();
+                        String value = in.readString();
+                        capabilities.mCapabilities.put(key, value);
+                    }
+                    return capabilities;
+                }
+
+                public LinkCapabilities[] newArray(int size) {
+                    return new LinkCapabilities[size];
+                }
+            };
+
+    /**
+     * Debug logging
+     */
+    protected static void log(String s) {
+        Timber.d(s);
+    }
+}
diff --git a/android-smsmms/src/main/java/android/net/LinkProperties.java b/android-smsmms/src/main/java/android/net/LinkProperties.java
index d00be14db..662fe3567 100755
--- a/android-smsmms/src/main/java/android/net/LinkProperties.java
+++ b/android-smsmms/src/main/java/android/net/LinkProperties.java
@@ -1,441 +1,441 @@
-/*
- * Copyright (C) 2010 The Android Open Source Project
- *
- * Licensed under the Apache License, Version 2.0 (the "License");
- * you may not use this file except in compliance with the License.
- * You may obtain a copy of the License at
- *
- *      http://www.apache.org/licenses/LICENSE-2.0
- *
- * Unless required by applicable law or agreed to in writing, software
- * distributed under the License is distributed on an "AS IS" BASIS,
- * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
- * See the License for the specific language governing permissions and
- * limitations under the License.
- */
-
-package android.net;
-
-import android.os.Parcel;
-import android.os.Parcelable;
-import android.text.TextUtils;
-
-import java.net.InetAddress;
-import java.net.UnknownHostException;
-import java.util.ArrayList;
-import java.util.Collection;
-import java.util.Collections;
-
-/**
- * Describes the properties of a network link.
- * <p/>
- * A link represents a connection to a network.
- * It may have multiple addresses and multiple gateways,
- * multiple dns servers but only one http proxy.
- * <p/>
- * Because it's a single network, the dns's
- * are interchangeable and don't need associating with
- * particular addresses.  The gateways similarly don't
- * need associating with particular addresses.
- * <p/>
- * A dual stack interface works fine in this model:
- * each address has it's own prefix length to describe
- * the local network.  The dns servers all return
- * both v4 addresses and v6 addresses regardless of the
- * address family of the server itself (rfc4213) and we
- * don't care which is used.  The gateways will be
- * selected based on the destination address and the
- * source address has no relavence.
- *
- * @hide
- */
-public class LinkProperties implements Parcelable {
-
-    String mIfaceName;
-    private Collection<LinkAddress> mLinkAddresses = new ArrayList<LinkAddress>();
-    private Collection<InetAddress> mDnses = new ArrayList<InetAddress>();
-    private Collection<RouteInfo> mRoutes = new ArrayList<RouteInfo>();
-    private ProxyProperties mHttpProxy;
-
-    public static class CompareResult<T> {
-        public Collection<T> removed = new ArrayList<T>();
-        public Collection<T> added = new ArrayList<T>();
-
-        @Override
-        public String toString() {
-            String retVal = "removed=[";
-            for (T addr : removed) retVal += addr.toString() + ",";
-            retVal += "] added=[";
-            for (T addr : added) retVal += addr.toString() + ",";
-            retVal += "]";
-            return retVal;
-        }
-    }
-
-    public LinkProperties() {
-        clear();
-    }
-
-    // copy constructor instead of clone
-    public LinkProperties(LinkProperties source) {
-        if (source != null) {
-            mIfaceName = source.getInterfaceName();
-            for (LinkAddress l : source.getLinkAddresses()) mLinkAddresses.add(l);
-            for (InetAddress i : source.getDnses()) mDnses.add(i);
-            for (RouteInfo r : source.getRoutes()) mRoutes.add(r);
-            mHttpProxy = (source.getHttpProxy() == null) ?
-                    null : new ProxyProperties(source.getHttpProxy());
-        }
-    }
-
-    public void setInterfaceName(String iface) {
-        mIfaceName = iface;
-    }
-
-    public String getInterfaceName() {
-        return mIfaceName;
-    }
-
-    public Collection<InetAddress> getAddresses() {
-        Collection<InetAddress> addresses = new ArrayList<InetAddress>();
-        for (LinkAddress linkAddress : mLinkAddresses) {
-            addresses.add(linkAddress.getAddress());
-        }
-        return Collections.unmodifiableCollection(addresses);
-    }
-
-    public void addLinkAddress(LinkAddress address) {
-        if (address != null) mLinkAddresses.add(address);
-    }
-
-    public Collection<LinkAddress> getLinkAddresses() {
-        return Collections.unmodifiableCollection(mLinkAddresses);
-    }
-
-    public void addDns(InetAddress dns) {
-        if (dns != null) mDnses.add(dns);
-    }
-
-    public Collection<InetAddress> getDnses() {
-        return Collections.unmodifiableCollection(mDnses);
-    }
-
-    public void addRoute(RouteInfo route) {
-        if (route != null) mRoutes.add(route);
-    }
-
-    public Collection<RouteInfo> getRoutes() {
-        return Collections.unmodifiableCollection(mRoutes);
-    }
-
-    public void setHttpProxy(ProxyProperties proxy) {
-        mHttpProxy = proxy;
-    }
-
-    public ProxyProperties getHttpProxy() {
-        return mHttpProxy;
-    }
-
-    public void clear() {
-        mIfaceName = null;
-        mLinkAddresses.clear();
-        mDnses.clear();
-        mRoutes.clear();
-        mHttpProxy = null;
-    }
-
-    /**
-     * Implement the Parcelable interface
-     *
-     * @hide
-     */
-    public int describeContents() {
-        return 0;
-    }
-
-    @Override
-    public String toString() {
-        String ifaceName = (mIfaceName == null ? "" : "InterfaceName: " + mIfaceName + " ");
-
-        String linkAddresses = "LinkAddresses: [";
-        for (LinkAddress addr : mLinkAddresses) linkAddresses += addr.toString() + ",";
-        linkAddresses += "] ";
-
-        String dns = "DnsAddresses: [";
-        for (InetAddress addr : mDnses) dns += addr.getHostAddress() + ",";
-        dns += "] ";
-
-        String routes = "Routes: [";
-        for (RouteInfo route : mRoutes) routes += route.toString() + ",";
-        routes += "] ";
-        String proxy = (mHttpProxy == null ? "" : "HttpProxy: " + mHttpProxy.toString() + " ");
-
-        return ifaceName + linkAddresses + routes + dns + proxy;
-    }
-
-    /**
-     * Compares this {@code LinkProperties} interface name against the target
-     *
-     * @param target LinkProperties to compare.
-     * @return {@code true} if both are identical, {@code false} otherwise.
-     */
-    public boolean isIdenticalInterfaceName(LinkProperties target) {
-        return TextUtils.equals(getInterfaceName(), target.getInterfaceName());
-    }
-
-    /**
-     * Compares this {@code LinkProperties} interface name against the target
-     *
-     * @param target LinkProperties to compare.
-     * @return {@code true} if both are identical, {@code false} otherwise.
-     */
-    public boolean isIdenticalAddresses(LinkProperties target) {
-        Collection<InetAddress> targetAddresses = target.getAddresses();
-        Collection<InetAddress> sourceAddresses = getAddresses();
-        return (sourceAddresses.size() == targetAddresses.size()) ?
-                sourceAddresses.containsAll(targetAddresses) : false;
-    }
-
-    /**
-     * Compares this {@code LinkProperties} DNS addresses against the target
-     *
-     * @param target LinkProperties to compare.
-     * @return {@code true} if both are identical, {@code false} otherwise.
-     */
-    public boolean isIdenticalDnses(LinkProperties target) {
-        Collection<InetAddress> targetDnses = target.getDnses();
-        return (mDnses.size() == targetDnses.size()) ?
-                mDnses.containsAll(targetDnses) : false;
-    }
-
-    /**
-     * Compares this {@code LinkProperties} Routes against the target
-     *
-     * @param target LinkProperties to compare.
-     * @return {@code true} if both are identical, {@code false} otherwise.
-     */
-    public boolean isIdenticalRoutes(LinkProperties target) {
-        Collection<RouteInfo> targetRoutes = target.getRoutes();
-        return (mRoutes.size() == targetRoutes.size()) ?
-                mRoutes.containsAll(targetRoutes) : false;
-    }
-
-    /**
-     * Compares this {@code LinkProperties} HttpProxy against the target
-     *
-     * @param target LinkProperties to compare.
-     * @return {@code true} if both are identical, {@code false} otherwise.
-     */
-    public boolean isIdenticalHttpProxy(LinkProperties target) {
-        return getHttpProxy() == null ? target.getHttpProxy() == null :
-                getHttpProxy().equals(target.getHttpProxy());
-    }
-
-    @Override
-    /**
-     * Compares this {@code LinkProperties} instance against the target
-     * LinkProperties in {@code obj}. Two LinkPropertieses are equal if
-     * all their fields are equal in values.
-     *
-     * For collection fields, such as mDnses, containsAll() is used to check
-     * if two collections contains the same elements, independent of order.
-     * There are two thoughts regarding containsAll()
-     * 1. Duplicated elements. eg, (A, B, B) and (A, A, B) are equal.
-     * 2. Worst case performance is O(n^2).
-     *
-     * @param obj the object to be tested for equality.
-     * @return {@code true} if both objects are equal, {@code false} otherwise.
-     */
-    public boolean equals(Object obj) {
-        if (this == obj) return true;
-
-        if (!(obj instanceof LinkProperties)) return false;
-
-        LinkProperties target = (LinkProperties) obj;
-
-        return isIdenticalInterfaceName(target) &&
-                isIdenticalAddresses(target) &&
-                isIdenticalDnses(target) &&
-                isIdenticalRoutes(target) &&
-                isIdenticalHttpProxy(target);
-    }
-
-    /**
-     * Return two lists, a list of addresses that would be removed from
-     * mLinkAddresses and a list of addresses that would be added to
-     * mLinkAddress which would then result in target and mLinkAddresses
-     * being the same list.
-     *
-     * @param target is a LinkProperties with the new list of addresses
-     * @return the removed and added lists.
-     */
-    public CompareResult<LinkAddress> compareAddresses(LinkProperties target) {
-        /*
-         * Duplicate the LinkAddresses into removed, we will be removing
-         * address which are common between mLinkAddresses and target
-         * leaving the addresses that are different. And address which
-         * are in target but not in mLinkAddresses are placed in the
-         * addedAddresses.
-         */
-        CompareResult<LinkAddress> result = new CompareResult<LinkAddress>();
-        result.removed = new ArrayList<LinkAddress>(mLinkAddresses);
-        result.added.clear();
-        if (target != null) {
-            for (LinkAddress newAddress : target.getLinkAddresses()) {
-                if (!result.removed.remove(newAddress)) {
-                    result.added.add(newAddress);
-                }
-            }
-        }
-        return result;
-    }
-
-    /**
-     * Return two lists, a list of dns addresses that would be removed from
-     * mDnses and a list of addresses that would be added to
-     * mDnses which would then result in target and mDnses
-     * being the same list.
-     *
-     * @param target is a LinkProperties with the new list of dns addresses
-     * @return the removed and added lists.
-     */
-    public CompareResult<InetAddress> compareDnses(LinkProperties target) {
-        /*
-         * Duplicate the InetAddresses into removed, we will be removing
-         * dns address which are common between mDnses and target
-         * leaving the addresses that are different. And dns address which
-         * are in target but not in mDnses are placed in the
-         * addedAddresses.
-         */
-        CompareResult<InetAddress> result = new CompareResult<InetAddress>();
-
-        result.removed = new ArrayList<InetAddress>(mDnses);
-        result.added.clear();
-        if (target != null) {
-            for (InetAddress newAddress : target.getDnses()) {
-                if (!result.removed.remove(newAddress)) {
-                    result.added.add(newAddress);
-                }
-            }
-        }
-        return result;
-    }
-
-    /**
-     * Return two lists, a list of routes that would be removed from
-     * mRoutes and a list of routes that would be added to
-     * mRoutes which would then result in target and mRoutes
-     * being the same list.
-     *
-     * @param target is a LinkProperties with the new list of routes
-     * @return the removed and added lists.
-     */
-    public CompareResult<RouteInfo> compareRoutes(LinkProperties target) {
-        /*
-         * Duplicate the RouteInfos into removed, we will be removing
-         * routes which are common between mDnses and target
-         * leaving the routes that are different. And route address which
-         * are in target but not in mRoutes are placed in added.
-         */
-        CompareResult<RouteInfo> result = new CompareResult<RouteInfo>();
-
-        result.removed = new ArrayList<RouteInfo>(mRoutes);
-        result.added.clear();
-        if (target != null) {
-            for (RouteInfo r : target.getRoutes()) {
-                if (!result.removed.remove(r)) {
-                    result.added.add(r);
-                }
-            }
-        }
-        return result;
-    }
-
-
-    @Override
-    /**
-     * generate hashcode based on significant fields
-     * Equal objects must produce the same hash code, while unequal objects
-     * may have the same hash codes.
-     */
-    public int hashCode() {
-        return ((null == mIfaceName) ? 0 : mIfaceName.hashCode()
-                + mLinkAddresses.size() * 31
-                + mDnses.size() * 37
-                + mRoutes.size() * 41
-                + ((null == mHttpProxy) ? 0 : mHttpProxy.hashCode()));
-    }
-
-    /**
-     * Implement the Parcelable interface.
-     *
-     * @hide
-     */
-    public void writeToParcel(Parcel dest, int flags) {
-        dest.writeString(getInterfaceName());
-        dest.writeInt(mLinkAddresses.size());
-        for (LinkAddress linkAddress : mLinkAddresses) {
-            dest.writeParcelable(linkAddress, flags);
-        }
-
-        dest.writeInt(mDnses.size());
-        for (InetAddress d : mDnses) {
-            dest.writeByteArray(d.getAddress());
-        }
-
-        dest.writeInt(mRoutes.size());
-        for (RouteInfo route : mRoutes) {
-            dest.writeParcelable(route, flags);
-        }
-
-        if (mHttpProxy != null) {
-            dest.writeByte((byte) 1);
-            dest.writeParcelable(mHttpProxy, flags);
-        } else {
-            dest.writeByte((byte) 0);
-        }
-    }
-
-    /**
-     * Implement the Parcelable interface.
-     *
-     * @hide
-     */
-    public static final Creator<LinkProperties> CREATOR =
-            new Creator<LinkProperties>() {
-                public LinkProperties createFromParcel(Parcel in) {
-                    LinkProperties netProp = new LinkProperties();
-                    String iface = in.readString();
-                    if (iface != null) {
-                        try {
-                            netProp.setInterfaceName(iface);
-                        } catch (Exception e) {
-                            return null;
-                        }
-                    }
-                    int addressCount = in.readInt();
-                    for (int i = 0; i < addressCount; i++) {
-                        netProp.addLinkAddress((LinkAddress) in.readParcelable(null));
-                    }
-                    addressCount = in.readInt();
-                    for (int i = 0; i < addressCount; i++) {
-                        try {
-                            netProp.addDns(InetAddress.getByAddress(in.createByteArray()));
-                        } catch (UnknownHostException e) {
-                        }
-                    }
-                    addressCount = in.readInt();
-                    for (int i = 0; i < addressCount; i++) {
-                        netProp.addRoute((RouteInfo) in.readParcelable(null));
-                    }
-                    if (in.readByte() == 1) {
-                        netProp.setHttpProxy((ProxyProperties) in.readParcelable(null));
-                    }
-                    return netProp;
-                }
-
-                public LinkProperties[] newArray(int size) {
-                    return new LinkProperties[size];
-                }
-            };
-}
+/*
+ * Copyright (C) 2010 The Android Open Source Project
+ *
+ * Licensed under the Apache License, Version 2.0 (the "License");
+ * you may not use this file except in compliance with the License.
+ * You may obtain a copy of the License at
+ *
+ *      http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing, software
+ * distributed under the License is distributed on an "AS IS" BASIS,
+ * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ * See the License for the specific language governing permissions and
+ * limitations under the License.
+ */
+
+package android.net;
+
+import android.os.Parcel;
+import android.os.Parcelable;
+import android.text.TextUtils;
+
+import java.net.InetAddress;
+import java.net.UnknownHostException;
+import java.util.ArrayList;
+import java.util.Collection;
+import java.util.Collections;
+
+/**
+ * Describes the properties of a network link.
+ * <p/>
+ * A link represents a connection to a network.
+ * It may have multiple addresses and multiple gateways,
+ * multiple dns servers but only one http proxy.
+ * <p/>
+ * Because it's a single network, the dns's
+ * are interchangeable and don't need associating with
+ * particular addresses.  The gateways similarly don't
+ * need associating with particular addresses.
+ * <p/>
+ * A dual stack interface works fine in this model:
+ * each address has it's own prefix length to describe
+ * the local network.  The dns servers all return
+ * both v4 addresses and v6 addresses regardless of the
+ * address family of the server itself (rfc4213) and we
+ * don't care which is used.  The gateways will be
+ * selected based on the destination address and the
+ * source address has no relavence.
+ *
+ * @hide
+ */
+public class LinkProperties implements Parcelable {
+
+    String mIfaceName;
+    private Collection<LinkAddress> mLinkAddresses = new ArrayList<LinkAddress>();
+    private Collection<InetAddress> mDnses = new ArrayList<InetAddress>();
+    private Collection<RouteInfo> mRoutes = new ArrayList<RouteInfo>();
+    private ProxyProperties mHttpProxy;
+
+    public static class CompareResult<T> {
+        public Collection<T> removed = new ArrayList<T>();
+        public Collection<T> added = new ArrayList<T>();
+
+        @Override
+        public String toString() {
+            String retVal = "removed=[";
+            for (T addr : removed) retVal += addr.toString() + ",";
+            retVal += "] added=[";
+            for (T addr : added) retVal += addr.toString() + ",";
+            retVal += "]";
+            return retVal;
+        }
+    }
+
+    public LinkProperties() {
+        clear();
+    }
+
+    // copy constructor instead of clone
+    public LinkProperties(LinkProperties source) {
+        if (source != null) {
+            mIfaceName = source.getInterfaceName();
+            for (LinkAddress l : source.getLinkAddresses()) mLinkAddresses.add(l);
+            for (InetAddress i : source.getDnses()) mDnses.add(i);
+            for (RouteInfo r : source.getRoutes()) mRoutes.add(r);
+            mHttpProxy = (source.getHttpProxy() == null) ?
+                    null : new ProxyProperties(source.getHttpProxy());
+        }
+    }
+
+    public void setInterfaceName(String iface) {
+        mIfaceName = iface;
+    }
+
+    public String getInterfaceName() {
+        return mIfaceName;
+    }
+
+    public Collection<InetAddress> getAddresses() {
+        Collection<InetAddress> addresses = new ArrayList<InetAddress>();
+        for (LinkAddress linkAddress : mLinkAddresses) {
+            addresses.add(linkAddress.getAddress());
+        }
+        return Collections.unmodifiableCollection(addresses);
+    }
+
+    public void addLinkAddress(LinkAddress address) {
+        if (address != null) mLinkAddresses.add(address);
+    }
+
+    public Collection<LinkAddress> getLinkAddresses() {
+        return Collections.unmodifiableCollection(mLinkAddresses);
+    }
+
+    public void addDns(InetAddress dns) {
+        if (dns != null) mDnses.add(dns);
+    }
+
+    public Collection<InetAddress> getDnses() {
+        return Collections.unmodifiableCollection(mDnses);
+    }
+
+    public void addRoute(RouteInfo route) {
+        if (route != null) mRoutes.add(route);
+    }
+
+    public Collection<RouteInfo> getRoutes() {
+        return Collections.unmodifiableCollection(mRoutes);
+    }
+
+    public void setHttpProxy(ProxyProperties proxy) {
+        mHttpProxy = proxy;
+    }
+
+    public ProxyProperties getHttpProxy() {
+        return mHttpProxy;
+    }
+
+    public void clear() {
+        mIfaceName = null;
+        mLinkAddresses.clear();
+        mDnses.clear();
+        mRoutes.clear();
+        mHttpProxy = null;
+    }
+
+    /**
+     * Implement the Parcelable interface
+     *
+     * @hide
+     */
+    public int describeContents() {
+        return 0;
+    }
+
+    @Override
+    public String toString() {
+        String ifaceName = (mIfaceName == null ? "" : "InterfaceName: " + mIfaceName + " ");
+
+        String linkAddresses = "LinkAddresses: [";
+        for (LinkAddress addr : mLinkAddresses) linkAddresses += addr.toString() + ",";
+        linkAddresses += "] ";
+
+        String dns = "DnsAddresses: [";
+        for (InetAddress addr : mDnses) dns += addr.getHostAddress() + ",";
+        dns += "] ";
+
+        String routes = "Routes: [";
+        for (RouteInfo route : mRoutes) routes += route.toString() + ",";
+        routes += "] ";
+        String proxy = (mHttpProxy == null ? "" : "HttpProxy: " + mHttpProxy.toString() + " ");
+
+        return ifaceName + linkAddresses + routes + dns + proxy;
+    }
+
+    /**
+     * Compares this {@code LinkProperties} interface name against the target
+     *
+     * @param target LinkProperties to compare.
+     * @return {@code true} if both are identical, {@code false} otherwise.
+     */
+    public boolean isIdenticalInterfaceName(LinkProperties target) {
+        return TextUtils.equals(getInterfaceName(), target.getInterfaceName());
+    }
+
+    /**
+     * Compares this {@code LinkProperties} interface name against the target
+     *
+     * @param target LinkProperties to compare.
+     * @return {@code true} if both are identical, {@code false} otherwise.
+     */
+    public boolean isIdenticalAddresses(LinkProperties target) {
+        Collection<InetAddress> targetAddresses = target.getAddresses();
+        Collection<InetAddress> sourceAddresses = getAddresses();
+        return (sourceAddresses.size() == targetAddresses.size()) ?
+                sourceAddresses.containsAll(targetAddresses) : false;
+    }
+
+    /**
+     * Compares this {@code LinkProperties} DNS addresses against the target
+     *
+     * @param target LinkProperties to compare.
+     * @return {@code true} if both are identical, {@code false} otherwise.
+     */
+    public boolean isIdenticalDnses(LinkProperties target) {
+        Collection<InetAddress> targetDnses = target.getDnses();
+        return (mDnses.size() == targetDnses.size()) ?
+                mDnses.containsAll(targetDnses) : false;
+    }
+
+    /**
+     * Compares this {@code LinkProperties} Routes against the target
+     *
+     * @param target LinkProperties to compare.
+     * @return {@code true} if both are identical, {@code false} otherwise.
+     */
+    public boolean isIdenticalRoutes(LinkProperties target) {
+        Collection<RouteInfo> targetRoutes = target.getRoutes();
+        return (mRoutes.size() == targetRoutes.size()) ?
+                mRoutes.containsAll(targetRoutes) : false;
+    }
+
+    /**
+     * Compares this {@code LinkProperties} HttpProxy against the target
+     *
+     * @param target LinkProperties to compare.
+     * @return {@code true} if both are identical, {@code false} otherwise.
+     */
+    public boolean isIdenticalHttpProxy(LinkProperties target) {
+        return getHttpProxy() == null ? target.getHttpProxy() == null :
+                getHttpProxy().equals(target.getHttpProxy());
+    }
+
+    @Override
+    /**
+     * Compares this {@code LinkProperties} instance against the target
+     * LinkProperties in {@code obj}. Two LinkPropertieses are equal if
+     * all their fields are equal in values.
+     *
+     * For collection fields, such as mDnses, containsAll() is used to check
+     * if two collections contains the same elements, independent of order.
+     * There are two thoughts regarding containsAll()
+     * 1. Duplicated elements. eg, (A, B, B) and (A, A, B) are equal.
+     * 2. Worst case performance is O(n^2).
+     *
+     * @param obj the object to be tested for equality.
+     * @return {@code true} if both objects are equal, {@code false} otherwise.
+     */
+    public boolean equals(Object obj) {
+        if (this == obj) return true;
+
+        if (!(obj instanceof LinkProperties)) return false;
+
+        LinkProperties target = (LinkProperties) obj;
+
+        return isIdenticalInterfaceName(target) &&
+                isIdenticalAddresses(target) &&
+                isIdenticalDnses(target) &&
+                isIdenticalRoutes(target) &&
+                isIdenticalHttpProxy(target);
+    }
+
+    /**
+     * Return two lists, a list of addresses that would be removed from
+     * mLinkAddresses and a list of addresses that would be added to
+     * mLinkAddress which would then result in target and mLinkAddresses
+     * being the same list.
+     *
+     * @param target is a LinkProperties with the new list of addresses
+     * @return the removed and added lists.
+     */
+    public CompareResult<LinkAddress> compareAddresses(LinkProperties target) {
+        /*
+         * Duplicate the LinkAddresses into removed, we will be removing
+         * address which are common between mLinkAddresses and target
+         * leaving the addresses that are different. And address which
+         * are in target but not in mLinkAddresses are placed in the
+         * addedAddresses.
+         */
+        CompareResult<LinkAddress> result = new CompareResult<LinkAddress>();
+        result.removed = new ArrayList<LinkAddress>(mLinkAddresses);
+        result.added.clear();
+        if (target != null) {
+            for (LinkAddress newAddress : target.getLinkAddresses()) {
+                if (!result.removed.remove(newAddress)) {
+                    result.added.add(newAddress);
+                }
+            }
+        }
+        return result;
+    }
+
+    /**
+     * Return two lists, a list of dns addresses that would be removed from
+     * mDnses and a list of addresses that would be added to
+     * mDnses which would then result in target and mDnses
+     * being the same list.
+     *
+     * @param target is a LinkProperties with the new list of dns addresses
+     * @return the removed and added lists.
+     */
+    public CompareResult<InetAddress> compareDnses(LinkProperties target) {
+        /*
+         * Duplicate the InetAddresses into removed, we will be removing
+         * dns address which are common between mDnses and target
+         * leaving the addresses that are different. And dns address which
+         * are in target but not in mDnses are placed in the
+         * addedAddresses.
+         */
+        CompareResult<InetAddress> result = new CompareResult<InetAddress>();
+
+        result.removed = new ArrayList<InetAddress>(mDnses);
+        result.added.clear();
+        if (target != null) {
+            for (InetAddress newAddress : target.getDnses()) {
+                if (!result.removed.remove(newAddress)) {
+                    result.added.add(newAddress);
+                }
+            }
+        }
+        return result;
+    }
+
+    /**
+     * Return two lists, a list of routes that would be removed from
+     * mRoutes and a list of routes that would be added to
+     * mRoutes which would then result in target and mRoutes
+     * being the same list.
+     *
+     * @param target is a LinkProperties with the new list of routes
+     * @return the removed and added lists.
+     */
+    public CompareResult<RouteInfo> compareRoutes(LinkProperties target) {
+        /*
+         * Duplicate the RouteInfos into removed, we will be removing
+         * routes which are common between mDnses and target
+         * leaving the routes that are different. And route address which
+         * are in target but not in mRoutes are placed in added.
+         */
+        CompareResult<RouteInfo> result = new CompareResult<RouteInfo>();
+
+        result.removed = new ArrayList<RouteInfo>(mRoutes);
+        result.added.clear();
+        if (target != null) {
+            for (RouteInfo r : target.getRoutes()) {
+                if (!result.removed.remove(r)) {
+                    result.added.add(r);
+                }
+            }
+        }
+        return result;
+    }
+
+
+    @Override
+    /**
+     * generate hashcode based on significant fields
+     * Equal objects must produce the same hash code, while unequal objects
+     * may have the same hash codes.
+     */
+    public int hashCode() {
+        return ((null == mIfaceName) ? 0 : mIfaceName.hashCode()
+                + mLinkAddresses.size() * 31
+                + mDnses.size() * 37
+                + mRoutes.size() * 41
+                + ((null == mHttpProxy) ? 0 : mHttpProxy.hashCode()));
+    }
+
+    /**
+     * Implement the Parcelable interface.
+     *
+     * @hide
+     */
+    public void writeToParcel(Parcel dest, int flags) {
+        dest.writeString(getInterfaceName());
+        dest.writeInt(mLinkAddresses.size());
+        for (LinkAddress linkAddress : mLinkAddresses) {
+            dest.writeParcelable(linkAddress, flags);
+        }
+
+        dest.writeInt(mDnses.size());
+        for (InetAddress d : mDnses) {
+            dest.writeByteArray(d.getAddress());
+        }
+
+        dest.writeInt(mRoutes.size());
+        for (RouteInfo route : mRoutes) {
+            dest.writeParcelable(route, flags);
+        }
+
+        if (mHttpProxy != null) {
+            dest.writeByte((byte) 1);
+            dest.writeParcelable(mHttpProxy, flags);
+        } else {
+            dest.writeByte((byte) 0);
+        }
+    }
+
+    /**
+     * Implement the Parcelable interface.
+     *
+     * @hide
+     */
+    public static final Creator<LinkProperties> CREATOR =
+            new Creator<LinkProperties>() {
+                public LinkProperties createFromParcel(Parcel in) {
+                    LinkProperties netProp = new LinkProperties();
+                    String iface = in.readString();
+                    if (iface != null) {
+                        try {
+                            netProp.setInterfaceName(iface);
+                        } catch (Exception e) {
+                            return null;
+                        }
+                    }
+                    int addressCount = in.readInt();
+                    for (int i = 0; i < addressCount; i++) {
+                        netProp.addLinkAddress((LinkAddress) in.readParcelable(null));
+                    }
+                    addressCount = in.readInt();
+                    for (int i = 0; i < addressCount; i++) {
+                        try {
+                            netProp.addDns(InetAddress.getByAddress(in.createByteArray()));
+                        } catch (UnknownHostException e) {
+                        }
+                    }
+                    addressCount = in.readInt();
+                    for (int i = 0; i < addressCount; i++) {
+                        netProp.addRoute((RouteInfo) in.readParcelable(null));
+                    }
+                    if (in.readByte() == 1) {
+                        netProp.setHttpProxy((ProxyProperties) in.readParcelable(null));
+                    }
+                    return netProp;
+                }
+
+                public LinkProperties[] newArray(int size) {
+                    return new LinkProperties[size];
+                }
+            };
+}
diff --git a/android-smsmms/src/main/java/android/net/NetworkQuotaInfo.java b/android-smsmms/src/main/java/android/net/NetworkQuotaInfo.java
index b67d41c7b..3666610f7 100755
--- a/android-smsmms/src/main/java/android/net/NetworkQuotaInfo.java
+++ b/android-smsmms/src/main/java/android/net/NetworkQuotaInfo.java
@@ -1,87 +1,87 @@
-/*
- * Copyright (C) 2011 The Android Open Source Project
- *
- * Licensed under the Apache License, Version 2.0 (the "License");
- * you may not use this file except in compliance with the License.
- * You may obtain a copy of the License at
- *
- *      http://www.apache.org/licenses/LICENSE-2.0
- *
- * Unless required by applicable law or agreed to in writing, software
- * distributed under the License is distributed on an "AS IS" BASIS,
- * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
- * See the License for the specific language governing permissions and
- * limitations under the License.
- */
-
-package android.net;
-
-import android.os.Parcel;
-import android.os.Parcelable;
-
-/**
- * Information about quota status on a specific network.
- *
- * @hide
- */
-public class NetworkQuotaInfo implements Parcelable {
-    private final long mEstimatedBytes;
-    private final long mSoftLimitBytes;
-    private final long mHardLimitBytes;
-
-    public static final long NO_LIMIT = -1;
-
-    /**
-     * {@hide}
-     */
-    public NetworkQuotaInfo(long estimatedBytes, long softLimitBytes, long hardLimitBytes) {
-        mEstimatedBytes = estimatedBytes;
-        mSoftLimitBytes = softLimitBytes;
-        mHardLimitBytes = hardLimitBytes;
-    }
-
-    /**
-     * {@hide}
-     */
-    public NetworkQuotaInfo(Parcel in) {
-        mEstimatedBytes = in.readLong();
-        mSoftLimitBytes = in.readLong();
-        mHardLimitBytes = in.readLong();
-    }
-
-    public long getEstimatedBytes() {
-        return mEstimatedBytes;
-    }
-
-    public long getSoftLimitBytes() {
-        return mSoftLimitBytes;
-    }
-
-    public long getHardLimitBytes() {
-        return mHardLimitBytes;
-    }
-
-    @Override
-    public int describeContents() {
-        return 0;
-    }
-
-    @Override
-    public void writeToParcel(Parcel out, int flags) {
-        out.writeLong(mEstimatedBytes);
-        out.writeLong(mSoftLimitBytes);
-        out.writeLong(mHardLimitBytes);
-    }
-
-    public static final Creator<NetworkQuotaInfo> CREATOR = new Creator<NetworkQuotaInfo>() {
-        @Override
-        public NetworkQuotaInfo createFromParcel(Parcel in) {
-            return new NetworkQuotaInfo(in);
-        }
-
-        @Override
-        public NetworkQuotaInfo[] newArray(int size) {
-            return new NetworkQuotaInfo[size];
-        }
-    };
-}
+/*
+ * Copyright (C) 2011 The Android Open Source Project
+ *
+ * Licensed under the Apache License, Version 2.0 (the "License");
+ * you may not use this file except in compliance with the License.
+ * You may obtain a copy of the License at
+ *
+ *      http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing, software
+ * distributed under the License is distributed on an "AS IS" BASIS,
+ * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ * See the License for the specific language governing permissions and
+ * limitations under the License.
+ */
+
+package android.net;
+
+import android.os.Parcel;
+import android.os.Parcelable;
+
+/**
+ * Information about quota status on a specific network.
+ *
+ * @hide
+ */
+public class NetworkQuotaInfo implements Parcelable {
+    private final long mEstimatedBytes;
+    private final long mSoftLimitBytes;
+    private final long mHardLimitBytes;
+
+    public static final long NO_LIMIT = -1;
+
+    /**
+     * {@hide}
+     */
+    public NetworkQuotaInfo(long estimatedBytes, long softLimitBytes, long hardLimitBytes) {
+        mEstimatedBytes = estimatedBytes;
+        mSoftLimitBytes = softLimitBytes;
+        mHardLimitBytes = hardLimitBytes;
+    }
+
+    /**
+     * {@hide}
+     */
+    public NetworkQuotaInfo(Parcel in) {
+        mEstimatedBytes = in.readLong();
+        mSoftLimitBytes = in.readLong();
+        mHardLimitBytes = in.readLong();
+    }
+
+    public long getEstimatedBytes() {
+        return mEstimatedBytes;
+    }
+
+    public long getSoftLimitBytes() {
+        return mSoftLimitBytes;
+    }
+
+    public long getHardLimitBytes() {
+        return mHardLimitBytes;
+    }
+
+    @Override
+    public int describeContents() {
+        return 0;
+    }
+
+    @Override
+    public void writeToParcel(Parcel out, int flags) {
+        out.writeLong(mEstimatedBytes);
+        out.writeLong(mSoftLimitBytes);
+        out.writeLong(mHardLimitBytes);
+    }
+
+    public static final Creator<NetworkQuotaInfo> CREATOR = new Creator<NetworkQuotaInfo>() {
+        @Override
+        public NetworkQuotaInfo createFromParcel(Parcel in) {
+            return new NetworkQuotaInfo(in);
+        }
+
+        @Override
+        public NetworkQuotaInfo[] newArray(int size) {
+            return new NetworkQuotaInfo[size];
+        }
+    };
+}
diff --git a/android-smsmms/src/main/java/android/net/NetworkState.java b/android-smsmms/src/main/java/android/net/NetworkState.java
index 30f137010..aa4c4902a 100755
--- a/android-smsmms/src/main/java/android/net/NetworkState.java
+++ b/android-smsmms/src/main/java/android/net/NetworkState.java
@@ -1,86 +1,86 @@
-/*
- * Copyright (C) 2011 The Android Open Source Project
- *
- * Licensed under the Apache License, Version 2.0 (the "License");
- * you may not use this file except in compliance with the License.
- * You may obtain a copy of the License at
- *
- *      http://www.apache.org/licenses/LICENSE-2.0
- *
- * Unless required by applicable law or agreed to in writing, software
- * distributed under the License is distributed on an "AS IS" BASIS,
- * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
- * See the License for the specific language governing permissions and
- * limitations under the License.
- */
-
-package android.net;
-
-import android.os.Parcel;
-import android.os.Parcelable;
-
-/**
- * Snapshot of network state.
- *
- * @hide
- */
-public class NetworkState implements Parcelable {
-
-    public final NetworkInfo networkInfo;
-    public final LinkProperties linkProperties;
-    public final LinkCapabilities linkCapabilities;
-    /**
-     * Currently only used by testing.
-     */
-    public final String subscriberId;
-    public final String networkId;
-
-    public NetworkState(NetworkInfo networkInfo, LinkProperties linkProperties,
-                        LinkCapabilities linkCapabilities) {
-        this(networkInfo, linkProperties, linkCapabilities, null, null);
-    }
-
-    public NetworkState(NetworkInfo networkInfo, LinkProperties linkProperties,
-                        LinkCapabilities linkCapabilities, String subscriberId, String networkId) {
-        this.networkInfo = networkInfo;
-        this.linkProperties = linkProperties;
-        this.linkCapabilities = linkCapabilities;
-        this.subscriberId = subscriberId;
-        this.networkId = networkId;
-    }
-
-    public NetworkState(Parcel in) {
-        networkInfo = in.readParcelable(null);
-        linkProperties = in.readParcelable(null);
-        linkCapabilities = in.readParcelable(null);
-        subscriberId = in.readString();
-        networkId = in.readString();
-    }
-
-    @Override
-    public int describeContents() {
-        return 0;
-    }
-
-    @Override
-    public void writeToParcel(Parcel out, int flags) {
-        out.writeParcelable(networkInfo, flags);
-        out.writeParcelable(linkProperties, flags);
-        out.writeParcelable(linkCapabilities, flags);
-        out.writeString(subscriberId);
-        out.writeString(networkId);
-    }
-
-    public static final Creator<NetworkState> CREATOR = new Creator<NetworkState>() {
-        @Override
-        public NetworkState createFromParcel(Parcel in) {
-            return new NetworkState(in);
-        }
-
-        @Override
-        public NetworkState[] newArray(int size) {
-            return new NetworkState[size];
-        }
-    };
-
-}
+/*
+ * Copyright (C) 2011 The Android Open Source Project
+ *
+ * Licensed under the Apache License, Version 2.0 (the "License");
+ * you may not use this file except in compliance with the License.
+ * You may obtain a copy of the License at
+ *
+ *      http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing, software
+ * distributed under the License is distributed on an "AS IS" BASIS,
+ * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ * See the License for the specific language governing permissions and
+ * limitations under the License.
+ */
+
+package android.net;
+
+import android.os.Parcel;
+import android.os.Parcelable;
+
+/**
+ * Snapshot of network state.
+ *
+ * @hide
+ */
+public class NetworkState implements Parcelable {
+
+    public final NetworkInfo networkInfo;
+    public final LinkProperties linkProperties;
+    public final LinkCapabilities linkCapabilities;
+    /**
+     * Currently only used by testing.
+     */
+    public final String subscriberId;
+    public final String networkId;
+
+    public NetworkState(NetworkInfo networkInfo, LinkProperties linkProperties,
+                        LinkCapabilities linkCapabilities) {
+        this(networkInfo, linkProperties, linkCapabilities, null, null);
+    }
+
+    public NetworkState(NetworkInfo networkInfo, LinkProperties linkProperties,
+                        LinkCapabilities linkCapabilities, String subscriberId, String networkId) {
+        this.networkInfo = networkInfo;
+        this.linkProperties = linkProperties;
+        this.linkCapabilities = linkCapabilities;
+        this.subscriberId = subscriberId;
+        this.networkId = networkId;
+    }
+
+    public NetworkState(Parcel in) {
+        networkInfo = in.readParcelable(null);
+        linkProperties = in.readParcelable(null);
+        linkCapabilities = in.readParcelable(null);
+        subscriberId = in.readString();
+        networkId = in.readString();
+    }
+
+    @Override
+    public int describeContents() {
+        return 0;
+    }
+
+    @Override
+    public void writeToParcel(Parcel out, int flags) {
+        out.writeParcelable(networkInfo, flags);
+        out.writeParcelable(linkProperties, flags);
+        out.writeParcelable(linkCapabilities, flags);
+        out.writeString(subscriberId);
+        out.writeString(networkId);
+    }
+
+    public static final Creator<NetworkState> CREATOR = new Creator<NetworkState>() {
+        @Override
+        public NetworkState createFromParcel(Parcel in) {
+            return new NetworkState(in);
+        }
+
+        @Override
+        public NetworkState[] newArray(int size) {
+            return new NetworkState[size];
+        }
+    };
+
+}
diff --git a/android-smsmms/src/main/java/android/net/NetworkUtilsHelper.java b/android-smsmms/src/main/java/android/net/NetworkUtilsHelper.java
index 601f73571..0848b6ad2 100755
--- a/android-smsmms/src/main/java/android/net/NetworkUtilsHelper.java
+++ b/android-smsmms/src/main/java/android/net/NetworkUtilsHelper.java
@@ -1,304 +1,304 @@
-/*
- * Copyright (C) 2008 The Android Open Source Project
- *
- * Licensed under the Apache License, Version 2.0 (the "License");
- * you may not use this file except in compliance with the License.
- * You may obtain a copy of the License at
- *
- *      http://www.apache.org/licenses/LICENSE-2.0
- *
- * Unless required by applicable law or agreed to in writing, software
- * distributed under the License is distributed on an "AS IS" BASIS,
- * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
- * See the License for the specific language governing permissions and
- * limitations under the License.
- */
-
-package android.net;
-
-import timber.log.Timber;
-
-import java.net.Inet4Address;
-import java.net.Inet6Address;
-import java.net.InetAddress;
-import java.net.UnknownHostException;
-import java.util.Collection;
-
-/**
- * Native methods for managing network interfaces.
- * <p/>
- * {@hide}
- */
-public class NetworkUtilsHelper {
-
-    /**
-     * Bring the named network interface up.
-     */
-    public native static int enableInterface(String interfaceName);
-
-    /**
-     * Bring the named network interface down.
-     */
-    public native static int disableInterface(String interfaceName);
-
-    /**
-     * Setting bit 0 indicates reseting of IPv4 addresses required
-     */
-    public static final int RESET_IPV4_ADDRESSES = 0x01;
-
-    /**
-     * Setting bit 1 indicates reseting of IPv4 addresses required
-     */
-    public static final int RESET_IPV6_ADDRESSES = 0x02;
-
-    /**
-     * Reset all addresses
-     */
-    public static final int RESET_ALL_ADDRESSES = RESET_IPV4_ADDRESSES | RESET_IPV6_ADDRESSES;
-
-    /**
-     * Reset IPv6 or IPv4 sockets that are connected via the named interface.
-     *
-     * @param interfaceName is the interface to reset
-     * @param mask          {@see #RESET_IPV4_ADDRESSES} and {@see #RESET_IPV6_ADDRESSES}
-     */
-    public native static int resetConnections(String interfaceName, int mask);
-
-    /**
-     * Start the DHCP client daemon, in order to have it request addresses
-     * for the named interface, and then configure the interface with those
-     * addresses. This call blocks until it obtains a result (either success
-     * or failure) from the daemon.
-     *
-     * @param interfaceName the name of the interface to configure
-     * @param ipInfo        if the request succeeds, this object is filled in with
-     *                      the IP address information.
-     * @return {@code true} for success, {@code false} for failure
-     */
-    public native static boolean runDhcp(String interfaceName, DhcpInfoInternal ipInfo);
-
-    /**
-     * Initiate renewal on the Dhcp client daemon. This call blocks until it obtains
-     * a result (either success or failure) from the daemon.
-     *
-     * @param interfaceName the name of the interface to configure
-     * @param ipInfo        if the request succeeds, this object is filled in with
-     *                      the IP address information.
-     * @return {@code true} for success, {@code false} for failure
-     */
-    public native static boolean runDhcpRenew(String interfaceName, DhcpInfoInternal ipInfo);
-
-    /**
-     * Shut down the DHCP client daemon.
-     *
-     * @param interfaceName the name of the interface for which the daemon
-     *                      should be stopped
-     * @return {@code true} for success, {@code false} for failure
-     */
-    public native static boolean stopDhcp(String interfaceName);
-
-    /**
-     * Release the current DHCP lease.
-     *
-     * @param interfaceName the name of the interface for which the lease should
-     *                      be released
-     * @return {@code true} for success, {@code false} for failure
-     */
-    public native static boolean releaseDhcpLease(String interfaceName);
-
-    /**
-     * Return the last DHCP-related error message that was recorded.
-     * <p/>NOTE: This string is not localized, but currently it is only
-     * used in logging.
-     *
-     * @return the most recent error message, if any
-     */
-    public native static String getDhcpError();
-
-    /**
-     * Convert a IPv4 address from an integer to an InetAddress.
-     *
-     * @param hostAddress an int corresponding to the IPv4 address in network byte order
-     */
-    public static InetAddress intToInetAddress(int hostAddress) {
-        byte[] addressBytes = {(byte) (0xff & hostAddress),
-                (byte) (0xff & (hostAddress >> 8)),
-                (byte) (0xff & (hostAddress >> 16)),
-                (byte) (0xff & (hostAddress >> 24))};
-
-        try {
-            return InetAddress.getByAddress(addressBytes);
-        } catch (UnknownHostException e) {
-            throw new AssertionError();
-        }
-    }
-
-    /**
-     * Convert a IPv4 address from an InetAddress to an integer
-     *
-     * @param inetAddr is an InetAddress corresponding to the IPv4 address
-     * @return the IP address as an integer in network byte order
-     */
-    public static int inetAddressToInt(InetAddress inetAddr)
-            throws IllegalArgumentException {
-        byte[] addr = inetAddr.getAddress();
-        if (addr.length != 4) {
-            throw new IllegalArgumentException("Not an IPv4 address");
-        }
-        return ((addr[3] & 0xff) << 24) | ((addr[2] & 0xff) << 16) |
-                ((addr[1] & 0xff) << 8) | (addr[0] & 0xff);
-    }
-
-    /**
-     * Convert a network prefix length to an IPv4 netmask integer
-     *
-     * @param prefixLength
-     * @return the IPv4 netmask as an integer in network byte order
-     */
-    public static int prefixLengthToNetmaskInt(int prefixLength)
-            throws IllegalArgumentException {
-        if (prefixLength < 0 || prefixLength > 32) {
-            throw new IllegalArgumentException("Invalid prefix length (0 <= prefix <= 32)");
-        }
-        int value = 0xffffffff << (32 - prefixLength);
-        return Integer.reverseBytes(value);
-    }
-
-    /**
-     * Convert a IPv4 netmask integer to a prefix length
-     *
-     * @param netmask as an integer in network byte order
-     * @return the network prefix length
-     */
-    public static int netmaskIntToPrefixLength(int netmask) {
-        return Integer.bitCount(netmask);
-    }
-
-    /**
-     * Create an InetAddress from a string where the string must be a standard
-     * representation of a V4 or V6 address.  Avoids doing a DNS lookup on failure
-     * but it will throw an IllegalArgumentException in that case.
-     *
-     * @param addrString
-     * @return the InetAddress
-     * @hide
-     */
-    public static InetAddress numericToInetAddress(String addrString)
-            throws IllegalArgumentException {
-        return null;
-    }
-
-    /**
-     * Get InetAddress masked with prefixLength.  Will never return null.
-     *
-     * @param IP           address which will be masked with specified prefixLength
-     * @param prefixLength the prefixLength used to mask the IP
-     */
-    public static InetAddress getNetworkPart(InetAddress address, int prefixLength) {
-        if (address == null) {
-            throw new RuntimeException("getNetworkPart doesn't accept null address");
-        }
-
-        byte[] array = address.getAddress();
-
-        if (prefixLength < 0 || prefixLength > array.length * 8) {
-            throw new RuntimeException("getNetworkPart - bad prefixLength");
-        }
-
-        int offset = prefixLength / 8;
-        int reminder = prefixLength % 8;
-        byte mask = (byte) (0xFF << (8 - reminder));
-
-        if (offset < array.length) array[offset] = (byte) (array[offset] & mask);
-
-        offset++;
-
-        for (; offset < array.length; offset++) {
-            array[offset] = 0;
-        }
-
-        InetAddress netPart = null;
-        try {
-            netPart = InetAddress.getByAddress(array);
-        } catch (UnknownHostException e) {
-            throw new RuntimeException("getNetworkPart error - " + e.toString());
-        }
-        return netPart;
-    }
-
-    /**
-     * Check if IP address type is consistent between two InetAddress.
-     *
-     * @return true if both are the same type.  False otherwise.
-     */
-    public static boolean addressTypeMatches(InetAddress left, InetAddress right) {
-        return (((left instanceof Inet4Address) && (right instanceof Inet4Address)) ||
-                ((left instanceof Inet6Address) && (right instanceof Inet6Address)));
-    }
-
-    /**
-     * Convert a 32 char hex string into a Inet6Address.
-     * throws a runtime exception if the string isn't 32 chars, isn't hex or can't be
-     * made into an Inet6Address
-     *
-     * @param addrHexString a 32 character hex string representing an IPv6 addr
-     * @return addr an InetAddress representation for the string
-     */
-    public static InetAddress hexToInet6Address(String addrHexString)
-            throws IllegalArgumentException {
-        try {
-            return numericToInetAddress(String.format("%s:%s:%s:%s:%s:%s:%s:%s",
-                    addrHexString.substring(0, 4), addrHexString.substring(4, 8),
-                    addrHexString.substring(8, 12), addrHexString.substring(12, 16),
-                    addrHexString.substring(16, 20), addrHexString.substring(20, 24),
-                    addrHexString.substring(24, 28), addrHexString.substring(28, 32)));
-        } catch (Exception e) {
-            Timber.e("error in hexToInet6Address(" + addrHexString + "): " + e);
-            throw new IllegalArgumentException(e);
-        }
-    }
-
-    /**
-     * Create a string array of host addresses from a collection of InetAddresses
-     *
-     * @param addrs a Collection of InetAddresses
-     * @return an array of Strings containing their host addresses
-     */
-    public static String[] makeStrings(Collection<InetAddress> addrs) {
-        String[] result = new String[addrs.size()];
-        int i = 0;
-        for (InetAddress addr : addrs) {
-            result[i++] = addr.getHostAddress();
-        }
-        return result;
-    }
-
-    /**
-     * Trim leading zeros from IPv4 address strings
-     * Our base libraries will interpret that as octel..
-     * Must leave non v4 addresses and host names alone.
-     * For example, 192.168.000.010 -> 192.168.0.10
-     * TODO - fix base libraries and remove this function
-     *
-     * @param addr a string representing an ip addr
-     * @return a string propertly trimmed
-     */
-    public static String trimV4AddrZeros(String addr) {
-        if (addr == null) return null;
-        String[] octets = addr.split("\\.");
-        if (octets.length != 4) return addr;
-        StringBuilder builder = new StringBuilder(16);
-        String result = null;
-        for (int i = 0; i < 4; i++) {
-            try {
-                if (octets[i].length() > 3) return addr;
-                builder.append(Integer.parseInt(octets[i]));
-            } catch (NumberFormatException e) {
-                return addr;
-            }
-            if (i < 3) builder.append('.');
-        }
-        result = builder.toString();
-        return result;
-    }
-}
+/*
+ * Copyright (C) 2008 The Android Open Source Project
+ *
+ * Licensed under the Apache License, Version 2.0 (the "License");
+ * you may not use this file except in compliance with the License.
+ * You may obtain a copy of the License at
+ *
+ *      http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing, software
+ * distributed under the License is distributed on an "AS IS" BASIS,
+ * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ * See the License for the specific language governing permissions and
+ * limitations under the License.
+ */
+
+package android.net;
+
+import timber.log.Timber;
+
+import java.net.Inet4Address;
+import java.net.Inet6Address;
+import java.net.InetAddress;
+import java.net.UnknownHostException;
+import java.util.Collection;
+
+/**
+ * Native methods for managing network interfaces.
+ * <p/>
+ * {@hide}
+ */
+public class NetworkUtilsHelper {
+
+    /**
+     * Bring the named network interface up.
+     */
+    public native static int enableInterface(String interfaceName);
+
+    /**
+     * Bring the named network interface down.
+     */
+    public native static int disableInterface(String interfaceName);
+
+    /**
+     * Setting bit 0 indicates reseting of IPv4 addresses required
+     */
+    public static final int RESET_IPV4_ADDRESSES = 0x01;
+
+    /**
+     * Setting bit 1 indicates reseting of IPv4 addresses required
+     */
+    public static final int RESET_IPV6_ADDRESSES = 0x02;
+
+    /**
+     * Reset all addresses
+     */
+    public static final int RESET_ALL_ADDRESSES = RESET_IPV4_ADDRESSES | RESET_IPV6_ADDRESSES;
+
+    /**
+     * Reset IPv6 or IPv4 sockets that are connected via the named interface.
+     *
+     * @param interfaceName is the interface to reset
+     * @param mask          {@see #RESET_IPV4_ADDRESSES} and {@see #RESET_IPV6_ADDRESSES}
+     */
+    public native static int resetConnections(String interfaceName, int mask);
+
+    /**
+     * Start the DHCP client daemon, in order to have it request addresses
+     * for the named interface, and then configure the interface with those
+     * addresses. This call blocks until it obtains a result (either success
+     * or failure) from the daemon.
+     *
+     * @param interfaceName the name of the interface to configure
+     * @param ipInfo        if the request succeeds, this object is filled in with
+     *                      the IP address information.
+     * @return {@code true} for success, {@code false} for failure
+     */
+    public native static boolean runDhcp(String interfaceName, DhcpInfoInternal ipInfo);
+
+    /**
+     * Initiate renewal on the Dhcp client daemon. This call blocks until it obtains
+     * a result (either success or failure) from the daemon.
+     *
+     * @param interfaceName the name of the interface to configure
+     * @param ipInfo        if the request succeeds, this object is filled in with
+     *                      the IP address information.
+     * @return {@code true} for success, {@code false} for failure
+     */
+    public native static boolean runDhcpRenew(String interfaceName, DhcpInfoInternal ipInfo);
+
+    /**
+     * Shut down the DHCP client daemon.
+     *
+     * @param interfaceName the name of the interface for which the daemon
+     *                      should be stopped
+     * @return {@code true} for success, {@code false} for failure
+     */
+    public native static boolean stopDhcp(String interfaceName);
+
+    /**
+     * Release the current DHCP lease.
+     *
+     * @param interfaceName the name of the interface for which the lease should
+     *                      be released
+     * @return {@code true} for success, {@code false} for failure
+     */
+    public native static boolean releaseDhcpLease(String interfaceName);
+
+    /**
+     * Return the last DHCP-related error message that was recorded.
+     * <p/>NOTE: This string is not localized, but currently it is only
+     * used in logging.
+     *
+     * @return the most recent error message, if any
+     */
+    public native static String getDhcpError();
+
+    /**
+     * Convert a IPv4 address from an integer to an InetAddress.
+     *
+     * @param hostAddress an int corresponding to the IPv4 address in network byte order
+     */
+    public static InetAddress intToInetAddress(int hostAddress) {
+        byte[] addressBytes = {(byte) (0xff & hostAddress),
+                (byte) (0xff & (hostAddress >> 8)),
+                (byte) (0xff & (hostAddress >> 16)),
+                (byte) (0xff & (hostAddress >> 24))};
+
+        try {
+            return InetAddress.getByAddress(addressBytes);
+        } catch (UnknownHostException e) {
+            throw new AssertionError();
+        }
+    }
+
+    /**
+     * Convert a IPv4 address from an InetAddress to an integer
+     *
+     * @param inetAddr is an InetAddress corresponding to the IPv4 address
+     * @return the IP address as an integer in network byte order
+     */
+    public static int inetAddressToInt(InetAddress inetAddr)
+            throws IllegalArgumentException {
+        byte[] addr = inetAddr.getAddress();
+        if (addr.length != 4) {
+            throw new IllegalArgumentException("Not an IPv4 address");
+        }
+        return ((addr[3] & 0xff) << 24) | ((addr[2] & 0xff) << 16) |
+                ((addr[1] & 0xff) << 8) | (addr[0] & 0xff);
+    }
+
+    /**
+     * Convert a network prefix length to an IPv4 netmask integer
+     *
+     * @param prefixLength
+     * @return the IPv4 netmask as an integer in network byte order
+     */
+    public static int prefixLengthToNetmaskInt(int prefixLength)
+            throws IllegalArgumentException {
+        if (prefixLength < 0 || prefixLength > 32) {
+            throw new IllegalArgumentException("Invalid prefix length (0 <= prefix <= 32)");
+        }
+        int value = 0xffffffff << (32 - prefixLength);
+        return Integer.reverseBytes(value);
+    }
+
+    /**
+     * Convert a IPv4 netmask integer to a prefix length
+     *
+     * @param netmask as an integer in network byte order
+     * @return the network prefix length
+     */
+    public static int netmaskIntToPrefixLength(int netmask) {
+        return Integer.bitCount(netmask);
+    }
+
+    /**
+     * Create an InetAddress from a string where the string must be a standard
+     * representation of a V4 or V6 address.  Avoids doing a DNS lookup on failure
+     * but it will throw an IllegalArgumentException in that case.
+     *
+     * @param addrString
+     * @return the InetAddress
+     * @hide
+     */
+    public static InetAddress numericToInetAddress(String addrString)
+            throws IllegalArgumentException {
+        return null;
+    }
+
+    /**
+     * Get InetAddress masked with prefixLength.  Will never return null.
+     *
+     * @param IP           address which will be masked with specified prefixLength
+     * @param prefixLength the prefixLength used to mask the IP
+     */
+    public static InetAddress getNetworkPart(InetAddress address, int prefixLength) {
+        if (address == null) {
+            throw new RuntimeException("getNetworkPart doesn't accept null address");
+        }
+
+        byte[] array = address.getAddress();
+
+        if (prefixLength < 0 || prefixLength > array.length * 8) {
+            throw new RuntimeException("getNetworkPart - bad prefixLength");
+        }
+
+        int offset = prefixLength / 8;
+        int reminder = prefixLength % 8;
+        byte mask = (byte) (0xFF << (8 - reminder));
+
+        if (offset < array.length) array[offset] = (byte) (array[offset] & mask);
+
+        offset++;
+
+        for (; offset < array.length; offset++) {
+            array[offset] = 0;
+        }
+
+        InetAddress netPart = null;
+        try {
+            netPart = InetAddress.getByAddress(array);
+        } catch (UnknownHostException e) {
+            throw new RuntimeException("getNetworkPart error - " + e.toString());
+        }
+        return netPart;
+    }
+
+    /**
+     * Check if IP address type is consistent between two InetAddress.
+     *
+     * @return true if both are the same type.  False otherwise.
+     */
+    public static boolean addressTypeMatches(InetAddress left, InetAddress right) {
+        return (((left instanceof Inet4Address) && (right instanceof Inet4Address)) ||
+                ((left instanceof Inet6Address) && (right instanceof Inet6Address)));
+    }
+
+    /**
+     * Convert a 32 char hex string into a Inet6Address.
+     * throws a runtime exception if the string isn't 32 chars, isn't hex or can't be
+     * made into an Inet6Address
+     *
+     * @param addrHexString a 32 character hex string representing an IPv6 addr
+     * @return addr an InetAddress representation for the string
+     */
+    public static InetAddress hexToInet6Address(String addrHexString)
+            throws IllegalArgumentException {
+        try {
+            return numericToInetAddress(String.format("%s:%s:%s:%s:%s:%s:%s:%s",
+                    addrHexString.substring(0, 4), addrHexString.substring(4, 8),
+                    addrHexString.substring(8, 12), addrHexString.substring(12, 16),
+                    addrHexString.substring(16, 20), addrHexString.substring(20, 24),
+                    addrHexString.substring(24, 28), addrHexString.substring(28, 32)));
+        } catch (Exception e) {
+            Timber.e("error in hexToInet6Address(" + addrHexString + "): " + e);
+            throw new IllegalArgumentException(e);
+        }
+    }
+
+    /**
+     * Create a string array of host addresses from a collection of InetAddresses
+     *
+     * @param addrs a Collection of InetAddresses
+     * @return an array of Strings containing their host addresses
+     */
+    public static String[] makeStrings(Collection<InetAddress> addrs) {
+        String[] result = new String[addrs.size()];
+        int i = 0;
+        for (InetAddress addr : addrs) {
+            result[i++] = addr.getHostAddress();
+        }
+        return result;
+    }
+
+    /**
+     * Trim leading zeros from IPv4 address strings
+     * Our base libraries will interpret that as octel..
+     * Must leave non v4 addresses and host names alone.
+     * For example, 192.168.000.010 -> 192.168.0.10
+     * TODO - fix base libraries and remove this function
+     *
+     * @param addr a string representing an ip addr
+     * @return a string propertly trimmed
+     */
+    public static String trimV4AddrZeros(String addr) {
+        if (addr == null) return null;
+        String[] octets = addr.split("\\.");
+        if (octets.length != 4) return addr;
+        StringBuilder builder = new StringBuilder(16);
+        String result = null;
+        for (int i = 0; i < 4; i++) {
+            try {
+                if (octets[i].length() > 3) return addr;
+                builder.append(Integer.parseInt(octets[i]));
+            } catch (NumberFormatException e) {
+                return addr;
+            }
+            if (i < 3) builder.append('.');
+        }
+        result = builder.toString();
+        return result;
+    }
+}
diff --git a/android-smsmms/src/main/java/android/net/ProxyProperties.java b/android-smsmms/src/main/java/android/net/ProxyProperties.java
index 9d6068f50..ca6af4757 100755
--- a/android-smsmms/src/main/java/android/net/ProxyProperties.java
+++ b/android-smsmms/src/main/java/android/net/ProxyProperties.java
@@ -1,222 +1,222 @@
-/*
- * Copyright (C) 2010 The Android Open Source Project
- *
- * Licensed under the Apache License, Version 2.0 (the "License");
- * you may not use this file except in compliance with the License.
- * You may obtain a copy of the License at
- *
- *      http://www.apache.org/licenses/LICENSE-2.0
- *
- * Unless required by applicable law or agreed to in writing, software
- * distributed under the License is distributed on an "AS IS" BASIS,
- * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
- * See the License for the specific language governing permissions and
- * limitations under the License.
- */
-
-package android.net;
-
-
-import android.annotation.SuppressLint;
-import android.os.Parcel;
-import android.os.Parcelable;
-import android.text.TextUtils;
-
-import java.net.InetSocketAddress;
-
-/**
- * A container class for the http proxy info
- *
- * @hide
- */
-public class ProxyProperties implements Parcelable {
-
-    private String mHost;
-    private int mPort;
-    private String mExclusionList;
-    private String[] mParsedExclusionList;
-
-    public ProxyProperties(String host, int port, String exclList) {
-        mHost = host;
-        mPort = port;
-        setExclusionList(exclList);
-    }
-
-    private ProxyProperties(String host, int port, String exclList, String[] parsedExclList) {
-        mHost = host;
-        mPort = port;
-        mExclusionList = exclList;
-        mParsedExclusionList = parsedExclList;
-    }
-
-    // copy constructor instead of clone
-    public ProxyProperties(ProxyProperties source) {
-        if (source != null) {
-            mHost = source.getHost();
-            mPort = source.getPort();
-            mExclusionList = source.getExclusionList();
-            mParsedExclusionList = source.mParsedExclusionList;
-        }
-    }
-
-    public InetSocketAddress getSocketAddress() {
-        InetSocketAddress inetSocketAddress = null;
-        try {
-            inetSocketAddress = new InetSocketAddress(mHost, mPort);
-        } catch (IllegalArgumentException e) {
-        }
-        return inetSocketAddress;
-    }
-
-    public String getHost() {
-        return mHost;
-    }
-
-    public int getPort() {
-        return mPort;
-    }
-
-    // comma separated
-    public String getExclusionList() {
-        return mExclusionList;
-    }
-
-    // comma separated
-    @SuppressLint("DefaultLocale")
-    private void setExclusionList(String exclusionList) {
-        mExclusionList = exclusionList;
-        if (mExclusionList == null) {
-            mParsedExclusionList = new String[0];
-        } else {
-            String splitExclusionList[] = exclusionList.toLowerCase().split(",");
-            mParsedExclusionList = new String[splitExclusionList.length * 2];
-            for (int i = 0; i < splitExclusionList.length; i++) {
-                String s = splitExclusionList[i].trim();
-                if (s.startsWith(".")) s = s.substring(1);
-                mParsedExclusionList[i * 2] = s;
-                mParsedExclusionList[(i * 2) + 1] = "." + s;
-            }
-        }
-    }
-
-    public boolean isExcluded(String url) {
-        if (TextUtils.isEmpty(url) || mParsedExclusionList == null ||
-                mParsedExclusionList.length == 0) return false;
-
-        Uri u = Uri.parse(url);
-        String urlDomain = u.getHost();
-        if (urlDomain == null) return false;
-        for (int i = 0; i < mParsedExclusionList.length; i += 2) {
-            if (urlDomain.equals(mParsedExclusionList[i]) ||
-                    urlDomain.endsWith(mParsedExclusionList[i + 1])) {
-                return true;
-            }
-        }
-        return false;
-    }
-
-    public java.net.Proxy makeProxy() {
-        java.net.Proxy proxy = java.net.Proxy.NO_PROXY;
-        if (mHost != null) {
-            try {
-                InetSocketAddress inetSocketAddress = new InetSocketAddress(mHost, mPort);
-                proxy = new java.net.Proxy(java.net.Proxy.Type.HTTP, inetSocketAddress);
-            } catch (IllegalArgumentException e) {
-            }
-        }
-        return proxy;
-    }
-
-    @Override
-    public String toString() {
-        StringBuilder sb = new StringBuilder();
-        if (mHost != null) {
-            sb.append("[");
-            sb.append(mHost);
-            sb.append("] ");
-            sb.append(Integer.toString(mPort));
-            if (mExclusionList != null) {
-                sb.append(" xl=").append(mExclusionList);
-            }
-        } else {
-            sb.append("[ProxyProperties.mHost == null]");
-        }
-        return sb.toString();
-    }
-
-    @Override
-    public boolean equals(Object o) {
-        if (!(o instanceof ProxyProperties)) return false;
-        ProxyProperties p = (ProxyProperties) o;
-        if (mExclusionList != null && !mExclusionList.equals(p.getExclusionList())) return false;
-        if (mHost != null && p.getHost() != null && mHost.equals(p.getHost()) == false) {
-            return false;
-        }
-        if (mHost != null && p.mHost == null) return false;
-        if (mHost == null && p.mHost != null) return false;
-        if (mPort != p.mPort) return false;
-        return true;
-    }
-
-    /**
-     * Implement the Parcelable interface
-     *
-     * @hide
-     */
-    public int describeContents() {
-        return 0;
-    }
-
-    @Override
-    /*
-     * generate hashcode based on significant fields
-     */
-    public int hashCode() {
-        return ((null == mHost) ? 0 : mHost.hashCode())
-                + ((null == mExclusionList) ? 0 : mExclusionList.hashCode())
-                + mPort;
-    }
-
-    /**
-     * Implement the Parcelable interface.
-     *
-     * @hide
-     */
-    public void writeToParcel(Parcel dest, int flags) {
-        if (mHost != null) {
-            dest.writeByte((byte) 1);
-            dest.writeString(mHost);
-            dest.writeInt(mPort);
-        } else {
-            dest.writeByte((byte) 0);
-        }
-        dest.writeString(mExclusionList);
-        dest.writeStringArray(mParsedExclusionList);
-    }
-
-    /**
-     * Implement the Parcelable interface.
-     *
-     * @hide
-     */
-    public static final Creator<ProxyProperties> CREATOR =
-            new Creator<ProxyProperties>() {
-                public ProxyProperties createFromParcel(Parcel in) {
-                    String host = null;
-                    int port = 0;
-                    if (in.readByte() == 1) {
-                        host = in.readString();
-                        port = in.readInt();
-                    }
-                    String exclList = in.readString();
-                    //String[] parsedExclList = in.readStringArray();
-                    ProxyProperties proxyProperties =
-                            new ProxyProperties(host, port, exclList, null);
-                    return proxyProperties;
-                }
-
-                public ProxyProperties[] newArray(int size) {
-                    return new ProxyProperties[size];
-                }
-            };
-}
+/*
+ * Copyright (C) 2010 The Android Open Source Project
+ *
+ * Licensed under the Apache License, Version 2.0 (the "License");
+ * you may not use this file except in compliance with the License.
+ * You may obtain a copy of the License at
+ *
+ *      http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing, software
+ * distributed under the License is distributed on an "AS IS" BASIS,
+ * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ * See the License for the specific language governing permissions and
+ * limitations under the License.
+ */
+
+package android.net;
+
+
+import android.annotation.SuppressLint;
+import android.os.Parcel;
+import android.os.Parcelable;
+import android.text.TextUtils;
+
+import java.net.InetSocketAddress;
+
+/**
+ * A container class for the http proxy info
+ *
+ * @hide
+ */
+public class ProxyProperties implements Parcelable {
+
+    private String mHost;
+    private int mPort;
+    private String mExclusionList;
+    private String[] mParsedExclusionList;
+
+    public ProxyProperties(String host, int port, String exclList) {
+        mHost = host;
+        mPort = port;
+        setExclusionList(exclList);
+    }
+
+    private ProxyProperties(String host, int port, String exclList, String[] parsedExclList) {
+        mHost = host;
+        mPort = port;
+        mExclusionList = exclList;
+        mParsedExclusionList = parsedExclList;
+    }
+
+    // copy constructor instead of clone
+    public ProxyProperties(ProxyProperties source) {
+        if (source != null) {
+            mHost = source.getHost();
+            mPort = source.getPort();
+            mExclusionList = source.getExclusionList();
+            mParsedExclusionList = source.mParsedExclusionList;
+        }
+    }
+
+    public InetSocketAddress getSocketAddress() {
+        InetSocketAddress inetSocketAddress = null;
+        try {
+            inetSocketAddress = new InetSocketAddress(mHost, mPort);
+        } catch (IllegalArgumentException e) {
+        }
+        return inetSocketAddress;
+    }
+
+    public String getHost() {
+        return mHost;
+    }
+
+    public int getPort() {
+        return mPort;
+    }
+
+    // comma separated
+    public String getExclusionList() {
+        return mExclusionList;
+    }
+
+    // comma separated
+    @SuppressLint("DefaultLocale")
+    private void setExclusionList(String exclusionList) {
+        mExclusionList = exclusionList;
+        if (mExclusionList == null) {
+            mParsedExclusionList = new String[0];
+        } else {
+            String splitExclusionList[] = exclusionList.toLowerCase().split(",");
+            mParsedExclusionList = new String[splitExclusionList.length * 2];
+            for (int i = 0; i < splitExclusionList.length; i++) {
+                String s = splitExclusionList[i].trim();
+                if (s.startsWith(".")) s = s.substring(1);
+                mParsedExclusionList[i * 2] = s;
+                mParsedExclusionList[(i * 2) + 1] = "." + s;
+            }
+        }
+    }
+
+    public boolean isExcluded(String url) {
+        if (TextUtils.isEmpty(url) || mParsedExclusionList == null ||
+                mParsedExclusionList.length == 0) return false;
+
+        Uri u = Uri.parse(url);
+        String urlDomain = u.getHost();
+        if (urlDomain == null) return false;
+        for (int i = 0; i < mParsedExclusionList.length; i += 2) {
+            if (urlDomain.equals(mParsedExclusionList[i]) ||
+                    urlDomain.endsWith(mParsedExclusionList[i + 1])) {
+                return true;
+            }
+        }
+        return false;
+    }
+
+    public java.net.Proxy makeProxy() {
+        java.net.Proxy proxy = java.net.Proxy.NO_PROXY;
+        if (mHost != null) {
+            try {
+                InetSocketAddress inetSocketAddress = new InetSocketAddress(mHost, mPort);
+                proxy = new java.net.Proxy(java.net.Proxy.Type.HTTP, inetSocketAddress);
+            } catch (IllegalArgumentException e) {
+            }
+        }
+        return proxy;
+    }
+
+    @Override
+    public String toString() {
+        StringBuilder sb = new StringBuilder();
+        if (mHost != null) {
+            sb.append("[");
+            sb.append(mHost);
+            sb.append("] ");
+            sb.append(Integer.toString(mPort));
+            if (mExclusionList != null) {
+                sb.append(" xl=").append(mExclusionList);
+            }
+        } else {
+            sb.append("[ProxyProperties.mHost == null]");
+        }
+        return sb.toString();
+    }
+
+    @Override
+    public boolean equals(Object o) {
+        if (!(o instanceof ProxyProperties)) return false;
+        ProxyProperties p = (ProxyProperties) o;
+        if (mExclusionList != null && !mExclusionList.equals(p.getExclusionList())) return false;
+        if (mHost != null && p.getHost() != null && mHost.equals(p.getHost()) == false) {
+            return false;
+        }
+        if (mHost != null && p.mHost == null) return false;
+        if (mHost == null && p.mHost != null) return false;
+        if (mPort != p.mPort) return false;
+        return true;
+    }
+
+    /**
+     * Implement the Parcelable interface
+     *
+     * @hide
+     */
+    public int describeContents() {
+        return 0;
+    }
+
+    @Override
+    /*
+     * generate hashcode based on significant fields
+     */
+    public int hashCode() {
+        return ((null == mHost) ? 0 : mHost.hashCode())
+                + ((null == mExclusionList) ? 0 : mExclusionList.hashCode())
+                + mPort;
+    }
+
+    /**
+     * Implement the Parcelable interface.
+     *
+     * @hide
+     */
+    public void writeToParcel(Parcel dest, int flags) {
+        if (mHost != null) {
+            dest.writeByte((byte) 1);
+            dest.writeString(mHost);
+            dest.writeInt(mPort);
+        } else {
+            dest.writeByte((byte) 0);
+        }
+        dest.writeString(mExclusionList);
+        dest.writeStringArray(mParsedExclusionList);
+    }
+
+    /**
+     * Implement the Parcelable interface.
+     *
+     * @hide
+     */
+    public static final Creator<ProxyProperties> CREATOR =
+            new Creator<ProxyProperties>() {
+                public ProxyProperties createFromParcel(Parcel in) {
+                    String host = null;
+                    int port = 0;
+                    if (in.readByte() == 1) {
+                        host = in.readString();
+                        port = in.readInt();
+                    }
+                    String exclList = in.readString();
+                    //String[] parsedExclList = in.readStringArray();
+                    ProxyProperties proxyProperties =
+                            new ProxyProperties(host, port, exclList, null);
+                    return proxyProperties;
+                }
+
+                public ProxyProperties[] newArray(int size) {
+                    return new ProxyProperties[size];
+                }
+            };
+}
diff --git a/android-smsmms/src/main/java/android/net/RouteInfo.java b/android-smsmms/src/main/java/android/net/RouteInfo.java
index 1aa3ea8cb..1de76185b 100755
--- a/android-smsmms/src/main/java/android/net/RouteInfo.java
+++ b/android-smsmms/src/main/java/android/net/RouteInfo.java
@@ -1,285 +1,285 @@
-/*
- * Copyright (C) 2011 The Android Open Source Project
- *
- * Licensed under the Apache License, Version 2.0 (the "License");
- * you may not use this file except in compliance with the License.
- * You may obtain a copy of the License at
- *
- *      http://www.apache.org/licenses/LICENSE-2.0
- *
- * Unless required by applicable law or agreed to in writing, software
- * distributed under the License is distributed on an "AS IS" BASIS,
- * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
- * See the License for the specific language governing permissions and
- * limitations under the License.
- */
-
-package android.net;
-
-import android.os.Parcel;
-import android.os.Parcelable;
-import timber.log.Timber;
-
-import java.net.Inet4Address;
-import java.net.Inet6Address;
-import java.net.InetAddress;
-import java.net.UnknownHostException;
-import java.util.Collection;
-
-/**
- * A simple container for route information.
- *
- * @hide
- */
-public class RouteInfo implements Parcelable {
-    /**
-     * The IP destination address for this route.
-     */
-    private final LinkAddress mDestination;
-
-    /**
-     * The gateway address for this route.
-     */
-    private final InetAddress mGateway;
-
-    private final boolean mIsDefault;
-    private final boolean mIsHost;
-
-    public RouteInfo(LinkAddress destination, InetAddress gateway) {
-        if (destination == null) {
-            if (gateway != null) {
-                if (gateway instanceof Inet4Address) {
-                    try {
-                        destination = new LinkAddress(Inet4Address.getLocalHost(), 0);
-                    } catch (UnknownHostException e) {
-                        // TODO Auto-generated catch block
-                        Timber.e(e, "exception thrown");
-                    }
-                } else {
-                    try {
-                        destination = new LinkAddress(Inet6Address.getLocalHost(), 0);
-                    } catch (UnknownHostException e) {
-                        // TODO Auto-generated catch block
-                        Timber.e(e, "exception thrown");
-                    }
-                }
-            } else {
-                // no destination, no gateway. invalid.
-                throw new RuntimeException("Invalid arguments passed in.");
-            }
-        }
-        if (gateway == null) {
-            if (destination.getAddress() instanceof Inet4Address) {
-                try {
-                    gateway = Inet4Address.getLocalHost();
-                } catch (UnknownHostException e) {
-                    // TODO Auto-generated catch block
-                    Timber.e(e, "exception thrown");
-                }
-            } else {
-                try {
-                    gateway = Inet6Address.getLocalHost();
-                } catch (UnknownHostException e) {
-                    // TODO Auto-generated catch block
-                    Timber.e(e, "exception thrown");
-                }
-            }
-        }
-        mDestination = new LinkAddress(NetworkUtilsHelper.getNetworkPart(destination.getAddress(),
-                destination.getNetworkPrefixLength()), destination.getNetworkPrefixLength());
-        mGateway = gateway;
-        mIsDefault = isDefault();
-        mIsHost = isHost();
-    }
-
-    public RouteInfo(InetAddress gateway) {
-        this(null, gateway);
-    }
-
-    public static RouteInfo makeHostRoute(InetAddress host) {
-        return makeHostRoute(host, null);
-    }
-
-    public static RouteInfo makeHostRoute(InetAddress host, InetAddress gateway) {
-        if (host == null) return null;
-
-        if (host instanceof Inet4Address) {
-            return new RouteInfo(new LinkAddress(host, 32), gateway);
-        } else {
-            return new RouteInfo(new LinkAddress(host, 128), gateway);
-        }
-    }
-
-    private boolean isHost() {
-        try {
-            return (mGateway.equals(Inet4Address.getLocalHost()) || mGateway.equals(Inet6Address.getLocalHost()));
-        } catch (UnknownHostException e) {
-            // TODO Auto-generated catch block
-            return false;
-        }
-    }
-
-    private boolean isDefault() {
-        boolean val = false;
-        if (mGateway != null) {
-            if (mGateway instanceof Inet4Address) {
-                val = (mDestination == null || mDestination.getNetworkPrefixLength() == 0);
-            } else {
-                val = (mDestination == null || mDestination.getNetworkPrefixLength() == 0);
-            }
-        }
-        return val;
-    }
-
-
-    public LinkAddress getDestination() {
-        return mDestination;
-    }
-
-    public InetAddress getGateway() {
-        return mGateway;
-    }
-
-    public boolean isDefaultRoute() {
-        return mIsDefault;
-    }
-
-    public boolean isHostRoute() {
-        return mIsHost;
-    }
-
-    public String toString() {
-        String val = "";
-        if (mDestination != null) val = mDestination.toString();
-        if (mGateway != null) val += " -> " + mGateway.getHostAddress();
-        return val;
-    }
-
-    public int describeContents() {
-        return 0;
-    }
-
-    public void writeToParcel(Parcel dest, int flags) {
-        if (mDestination == null) {
-            dest.writeByte((byte) 0);
-        } else {
-            dest.writeByte((byte) 1);
-            dest.writeByteArray(mDestination.getAddress().getAddress());
-            dest.writeInt(mDestination.getNetworkPrefixLength());
-        }
-
-        if (mGateway == null) {
-            dest.writeByte((byte) 0);
-        } else {
-            dest.writeByte((byte) 1);
-            dest.writeByteArray(mGateway.getAddress());
-        }
-    }
-
-    @Override
-    public boolean equals(Object obj) {
-        if (this == obj) return true;
-
-        if (!(obj instanceof RouteInfo)) return false;
-
-        RouteInfo target = (RouteInfo) obj;
-
-        boolean sameDestination = (mDestination == null) ?
-                target.getDestination() == null
-                : mDestination.equals(target.getDestination());
-
-        boolean sameAddress = (mGateway == null) ?
-                target.getGateway() == null
-                : mGateway.equals(target.getGateway());
-
-        return sameDestination && sameAddress
-                && mIsDefault == target.mIsDefault;
-    }
-
-    @Override
-    public int hashCode() {
-        return (mDestination == null ? 0 : mDestination.hashCode())
-                + (mGateway == null ? 0 : mGateway.hashCode())
-                + (mIsDefault ? 3 : 7);
-    }
-
-    public static final Creator<RouteInfo> CREATOR =
-            new Creator<RouteInfo>() {
-                public RouteInfo createFromParcel(Parcel in) {
-                    InetAddress destAddr = null;
-                    int prefix = 0;
-                    InetAddress gateway = null;
-
-                    if (in.readByte() == 1) {
-                        byte[] addr = in.createByteArray();
-                        prefix = in.readInt();
-
-                        try {
-                            destAddr = InetAddress.getByAddress(addr);
-                        } catch (UnknownHostException e) {
-                        }
-                    }
-
-                    if (in.readByte() == 1) {
-                        byte[] addr = in.createByteArray();
-
-                        try {
-                            gateway = InetAddress.getByAddress(addr);
-                        } catch (UnknownHostException e) {
-                        }
-                    }
-
-                    LinkAddress dest = null;
-
-                    if (destAddr != null) {
-                        dest = new LinkAddress(destAddr, prefix);
-                    }
-
-                    return new RouteInfo(dest, gateway);
-                }
-
-                public RouteInfo[] newArray(int size) {
-                    return new RouteInfo[size];
-                }
-            };
-
-    private boolean matches(InetAddress destination) {
-        if (destination == null) return false;
-
-        // if the destination is present and the route is default.
-        // return true
-        if (isDefault()) return true;
-
-        // match the route destination and destination with prefix length
-        InetAddress dstNet = NetworkUtilsHelper.getNetworkPart(destination,
-                mDestination.getNetworkPrefixLength());
-
-        return mDestination.getAddress().equals(dstNet);
-    }
-
-    /**
-     * Find the route from a Collection of routes that best matches a given address.
-     * May return null if no routes are applicable.
-     *
-     * @param routes a Collection of RouteInfos to chose from
-     * @param dest   the InetAddress your trying to get to
-     * @return the RouteInfo from the Collection that best fits the given address
-     */
-    public static RouteInfo selectBestRoute(Collection<RouteInfo> routes, InetAddress dest) {
-        if ((routes == null) || (dest == null)) return null;
-
-        RouteInfo bestRoute = null;
-        // pick a longest prefix match under same address type
-        for (RouteInfo route : routes) {
-            if (NetworkUtilsHelper.addressTypeMatches(route.mDestination.getAddress(), dest)) {
-                if ((bestRoute != null) &&
-                        (bestRoute.mDestination.getNetworkPrefixLength() >=
-                                route.mDestination.getNetworkPrefixLength())) {
-                    continue;
-                }
-                if (route.matches(dest)) bestRoute = route;
-            }
-        }
-        return bestRoute;
-    }
-}
+/*
+ * Copyright (C) 2011 The Android Open Source Project
+ *
+ * Licensed under the Apache License, Version 2.0 (the "License");
+ * you may not use this file except in compliance with the License.
+ * You may obtain a copy of the License at
+ *
+ *      http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing, software
+ * distributed under the License is distributed on an "AS IS" BASIS,
+ * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ * See the License for the specific language governing permissions and
+ * limitations under the License.
+ */
+
+package android.net;
+
+import android.os.Parcel;
+import android.os.Parcelable;
+import timber.log.Timber;
+
+import java.net.Inet4Address;
+import java.net.Inet6Address;
+import java.net.InetAddress;
+import java.net.UnknownHostException;
+import java.util.Collection;
+
+/**
+ * A simple container for route information.
+ *
+ * @hide
+ */
+public class RouteInfo implements Parcelable {
+    /**
+     * The IP destination address for this route.
+     */
+    private final LinkAddress mDestination;
+
+    /**
+     * The gateway address for this route.
+     */
+    private final InetAddress mGateway;
+
+    private final boolean mIsDefault;
+    private final boolean mIsHost;
+
+    public RouteInfo(LinkAddress destination, InetAddress gateway) {
+        if (destination == null) {
+            if (gateway != null) {
+                if (gateway instanceof Inet4Address) {
+                    try {
+                        destination = new LinkAddress(Inet4Address.getLocalHost(), 0);
+                    } catch (UnknownHostException e) {
+                        // TODO Auto-generated catch block
+                        Timber.e(e, "exception thrown");
+                    }
+                } else {
+                    try {
+                        destination = new LinkAddress(Inet6Address.getLocalHost(), 0);
+                    } catch (UnknownHostException e) {
+                        // TODO Auto-generated catch block
+                        Timber.e(e, "exception thrown");
+                    }
+                }
+            } else {
+                // no destination, no gateway. invalid.
+                throw new RuntimeException("Invalid arguments passed in.");
+            }
+        }
+        if (gateway == null) {
+            if (destination.getAddress() instanceof Inet4Address) {
+                try {
+                    gateway = Inet4Address.getLocalHost();
+                } catch (UnknownHostException e) {
+                    // TODO Auto-generated catch block
+                    Timber.e(e, "exception thrown");
+                }
+            } else {
+                try {
+                    gateway = Inet6Address.getLocalHost();
+                } catch (UnknownHostException e) {
+                    // TODO Auto-generated catch block
+                    Timber.e(e, "exception thrown");
+                }
+            }
+        }
+        mDestination = new LinkAddress(NetworkUtilsHelper.getNetworkPart(destination.getAddress(),
+                destination.getNetworkPrefixLength()), destination.getNetworkPrefixLength());
+        mGateway = gateway;
+        mIsDefault = isDefault();
+        mIsHost = isHost();
+    }
+
+    public RouteInfo(InetAddress gateway) {
+        this(null, gateway);
+    }
+
+    public static RouteInfo makeHostRoute(InetAddress host) {
+        return makeHostRoute(host, null);
+    }
+
+    public static RouteInfo makeHostRoute(InetAddress host, InetAddress gateway) {
+        if (host == null) return null;
+
+        if (host instanceof Inet4Address) {
+            return new RouteInfo(new LinkAddress(host, 32), gateway);
+        } else {
+            return new RouteInfo(new LinkAddress(host, 128), gateway);
+        }
+    }
+
+    private boolean isHost() {
+        try {
+            return (mGateway.equals(Inet4Address.getLocalHost()) || mGateway.equals(Inet6Address.getLocalHost()));
+        } catch (UnknownHostException e) {
+            // TODO Auto-generated catch block
+            return false;
+        }
+    }
+
+    private boolean isDefault() {
+        boolean val = false;
+        if (mGateway != null) {
+            if (mGateway instanceof Inet4Address) {
+                val = (mDestination == null || mDestination.getNetworkPrefixLength() == 0);
+            } else {
+                val = (mDestination == null || mDestination.getNetworkPrefixLength() == 0);
+            }
+        }
+        return val;
+    }
+
+
+    public LinkAddress getDestination() {
+        return mDestination;
+    }
+
+    public InetAddress getGateway() {
+        return mGateway;
+    }
+
+    public boolean isDefaultRoute() {
+        return mIsDefault;
+    }
+
+    public boolean isHostRoute() {
+        return mIsHost;
+    }
+
+    public String toString() {
+        String val = "";
+        if (mDestination != null) val = mDestination.toString();
+        if (mGateway != null) val += " -> " + mGateway.getHostAddress();
+        return val;
+    }
+
+    public int describeContents() {
+        return 0;
+    }
+
+    public void writeToParcel(Parcel dest, int flags) {
+        if (mDestination == null) {
+            dest.writeByte((byte) 0);
+        } else {
+            dest.writeByte((byte) 1);
+            dest.writeByteArray(mDestination.getAddress().getAddress());
+            dest.writeInt(mDestination.getNetworkPrefixLength());
+        }
+
+        if (mGateway == null) {
+            dest.writeByte((byte) 0);
+        } else {
+            dest.writeByte((byte) 1);
+            dest.writeByteArray(mGateway.getAddress());
+        }
+    }
+
+    @Override
+    public boolean equals(Object obj) {
+        if (this == obj) return true;
+
+        if (!(obj instanceof RouteInfo)) return false;
+
+        RouteInfo target = (RouteInfo) obj;
+
+        boolean sameDestination = (mDestination == null) ?
+                target.getDestination() == null
+                : mDestination.equals(target.getDestination());
+
+        boolean sameAddress = (mGateway == null) ?
+                target.getGateway() == null
+                : mGateway.equals(target.getGateway());
+
+        return sameDestination && sameAddress
+                && mIsDefault == target.mIsDefault;
+    }
+
+    @Override
+    public int hashCode() {
+        return (mDestination == null ? 0 : mDestination.hashCode())
+                + (mGateway == null ? 0 : mGateway.hashCode())
+                + (mIsDefault ? 3 : 7);
+    }
+
+    public static final Creator<RouteInfo> CREATOR =
+            new Creator<RouteInfo>() {
+                public RouteInfo createFromParcel(Parcel in) {
+                    InetAddress destAddr = null;
+                    int prefix = 0;
+                    InetAddress gateway = null;
+
+                    if (in.readByte() == 1) {
+                        byte[] addr = in.createByteArray();
+                        prefix = in.readInt();
+
+                        try {
+                            destAddr = InetAddress.getByAddress(addr);
+                        } catch (UnknownHostException e) {
+                        }
+                    }
+
+                    if (in.readByte() == 1) {
+                        byte[] addr = in.createByteArray();
+
+                        try {
+                            gateway = InetAddress.getByAddress(addr);
+                        } catch (UnknownHostException e) {
+                        }
+                    }
+
+                    LinkAddress dest = null;
+
+                    if (destAddr != null) {
+                        dest = new LinkAddress(destAddr, prefix);
+                    }
+
+                    return new RouteInfo(dest, gateway);
+                }
+
+                public RouteInfo[] newArray(int size) {
+                    return new RouteInfo[size];
+                }
+            };
+
+    private boolean matches(InetAddress destination) {
+        if (destination == null) return false;
+
+        // if the destination is present and the route is default.
+        // return true
+        if (isDefault()) return true;
+
+        // match the route destination and destination with prefix length
+        InetAddress dstNet = NetworkUtilsHelper.getNetworkPart(destination,
+                mDestination.getNetworkPrefixLength());
+
+        return mDestination.getAddress().equals(dstNet);
+    }
+
+    /**
+     * Find the route from a Collection of routes that best matches a given address.
+     * May return null if no routes are applicable.
+     *
+     * @param routes a Collection of RouteInfos to chose from
+     * @param dest   the InetAddress your trying to get to
+     * @return the RouteInfo from the Collection that best fits the given address
+     */
+    public static RouteInfo selectBestRoute(Collection<RouteInfo> routes, InetAddress dest) {
+        if ((routes == null) || (dest == null)) return null;
+
+        RouteInfo bestRoute = null;
+        // pick a longest prefix match under same address type
+        for (RouteInfo route : routes) {
+            if (NetworkUtilsHelper.addressTypeMatches(route.mDestination.getAddress(), dest)) {
+                if ((bestRoute != null) &&
+                        (bestRoute.mDestination.getNetworkPrefixLength() >=
+                                route.mDestination.getNetworkPrefixLength())) {
+                    continue;
+                }
+                if (route.matches(dest)) bestRoute = route;
+            }
+        }
+        return bestRoute;
+    }
+}
diff --git a/android-smsmms/src/main/java/com/android/i18n/phonenumbers/NumberParseException.java b/android-smsmms/src/main/java/com/android/i18n/phonenumbers/NumberParseException.java
index bdb3cf4e5..b0855857e 100755
--- a/android-smsmms/src/main/java/com/android/i18n/phonenumbers/NumberParseException.java
+++ b/android-smsmms/src/main/java/com/android/i18n/phonenumbers/NumberParseException.java
@@ -1,20 +1,20 @@
-/*
- * Copyright (C) 2015 Jacob Klinker
- *
- * Licensed under the Apache License, Version 2.0 (the "License");
- * you may not use this file except in compliance with the License.
- * You may obtain a copy of the License at
- *
- * http://www.apache.org/licenses/LICENSE-2.0
- *
- * Unless required by applicable law or agreed to in writing, software
- * distributed under the License is distributed on an "AS IS" BASIS,
- * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
- * See the License for the specific language governing permissions and
- * limitations under the License.
- */
-
-package com.android.i18n.phonenumbers;
-
-public class NumberParseException extends Exception {
-}
+/*
+ * Copyright (C) 2015 Jacob Klinker
+ *
+ * Licensed under the Apache License, Version 2.0 (the "License");
+ * you may not use this file except in compliance with the License.
+ * You may obtain a copy of the License at
+ *
+ * http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing, software
+ * distributed under the License is distributed on an "AS IS" BASIS,
+ * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ * See the License for the specific language governing permissions and
+ * limitations under the License.
+ */
+
+package com.android.i18n.phonenumbers;
+
+public class NumberParseException extends Exception {
+}
diff --git a/android-smsmms/src/main/java/com/android/i18n/phonenumbers/PhoneNumberUtil.java b/android-smsmms/src/main/java/com/android/i18n/phonenumbers/PhoneNumberUtil.java
index 863263917..49f8939bf 100755
--- a/android-smsmms/src/main/java/com/android/i18n/phonenumbers/PhoneNumberUtil.java
+++ b/android-smsmms/src/main/java/com/android/i18n/phonenumbers/PhoneNumberUtil.java
@@ -1,44 +1,44 @@
-/*
- * Copyright (C) 2015 Jacob Klinker
- *
- * Licensed under the Apache License, Version 2.0 (the "License");
- * you may not use this file except in compliance with the License.
- * You may obtain a copy of the License at
- *
- * http://www.apache.org/licenses/LICENSE-2.0
- *
- * Unless required by applicable law or agreed to in writing, software
- * distributed under the License is distributed on an "AS IS" BASIS,
- * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
- * See the License for the specific language governing permissions and
- * limitations under the License.
- */
-
-package com.android.i18n.phonenumbers;
-
-public class PhoneNumberUtil {
-    private static PhoneNumberUtil instance;
-
-    public static PhoneNumberUtil getInstance() {
-        return instance;
-    }
-
-    public String format(Phonenumber.PhoneNumber parsed, PhoneNumberFormat format) {
-        return null;
-    }
-
-    public Phonenumber.PhoneNumber parse(String s, String s2) throws NumberParseException {
-        return new Phonenumber.PhoneNumber();
-    }
-
-    public boolean isValidNumber(Phonenumber.PhoneNumber phoneNumber) {
-        return true;
-    }
-
-    public enum PhoneNumberFormat {
-        E164,
-        INTERNATIONAL,
-        NATIONAL,
-        RFC3966
-    }
-}
+/*
+ * Copyright (C) 2015 Jacob Klinker
+ *
+ * Licensed under the Apache License, Version 2.0 (the "License");
+ * you may not use this file except in compliance with the License.
+ * You may obtain a copy of the License at
+ *
+ * http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing, software
+ * distributed under the License is distributed on an "AS IS" BASIS,
+ * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ * See the License for the specific language governing permissions and
+ * limitations under the License.
+ */
+
+package com.android.i18n.phonenumbers;
+
+public class PhoneNumberUtil {
+    private static PhoneNumberUtil instance;
+
+    public static PhoneNumberUtil getInstance() {
+        return instance;
+    }
+
+    public String format(Phonenumber.PhoneNumber parsed, PhoneNumberFormat format) {
+        return null;
+    }
+
+    public Phonenumber.PhoneNumber parse(String s, String s2) throws NumberParseException {
+        return new Phonenumber.PhoneNumber();
+    }
+
+    public boolean isValidNumber(Phonenumber.PhoneNumber phoneNumber) {
+        return true;
+    }
+
+    public enum PhoneNumberFormat {
+        E164,
+        INTERNATIONAL,
+        NATIONAL,
+        RFC3966
+    }
+}
diff --git a/android-smsmms/src/main/java/com/android/i18n/phonenumbers/Phonenumber.java b/android-smsmms/src/main/java/com/android/i18n/phonenumbers/Phonenumber.java
index 86fdafdd6..2a1904a64 100755
--- a/android-smsmms/src/main/java/com/android/i18n/phonenumbers/Phonenumber.java
+++ b/android-smsmms/src/main/java/com/android/i18n/phonenumbers/Phonenumber.java
@@ -1,22 +1,22 @@
-/*
- * Copyright (C) 2015 Jacob Klinker
- *
- * Licensed under the Apache License, Version 2.0 (the "License");
- * you may not use this file except in compliance with the License.
- * You may obtain a copy of the License at
- *
- * http://www.apache.org/licenses/LICENSE-2.0
- *
- * Unless required by applicable law or agreed to in writing, software
- * distributed under the License is distributed on an "AS IS" BASIS,
- * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
- * See the License for the specific language governing permissions and
- * limitations under the License.
- */
-
-package com.android.i18n.phonenumbers;
-
-public class Phonenumber {
-    public static class PhoneNumber {
-    }
-}
+/*
+ * Copyright (C) 2015 Jacob Klinker
+ *
+ * Licensed under the Apache License, Version 2.0 (the "License");
+ * you may not use this file except in compliance with the License.
+ * You may obtain a copy of the License at
+ *
+ * http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing, software
+ * distributed under the License is distributed on an "AS IS" BASIS,
+ * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ * See the License for the specific language governing permissions and
+ * limitations under the License.
+ */
+
+package com.android.i18n.phonenumbers;
+
+public class Phonenumber {
+    public static class PhoneNumber {
+    }
+}
diff --git a/android-smsmms/src/main/java/com/android/internal/telephony/TelephonyProperties.java b/android-smsmms/src/main/java/com/android/internal/telephony/TelephonyProperties.java
index 61aaaa366..ab230e614 100755
--- a/android-smsmms/src/main/java/com/android/internal/telephony/TelephonyProperties.java
+++ b/android-smsmms/src/main/java/com/android/internal/telephony/TelephonyProperties.java
@@ -1,207 +1,207 @@
-/*
- * Copyright (C) 2006 The Android Open Source Project
- *
- * Licensed under the Apache License, Version 2.0 (the "License");
- * you may not use this file except in compliance with the License.
- * You may obtain a copy of the License at
- *
- *      http://www.apache.org/licenses/LICENSE-2.0
- *
- * Unless required by applicable law or agreed to in writing, software
- * distributed under the License is distributed on an "AS IS" BASIS,
- * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
- * See the License for the specific language governing permissions and
- * limitations under the License.
- */
-
-package com.android.internal.telephony;
-
-/**
- * Contains a list of string constants used to get or set telephone properties
- * in the system. You can use {@link android.os.SystemProperties os.SystemProperties}
- * to get and set these values.
- *
- * @hide
- */
-public interface TelephonyProperties {
-    //****** Baseband and Radio Interface version
-
-    //TODO T: property strings do not have to be gsm specific
-    //        change gsm.*operator.*" properties to "operator.*" properties
-
-    /**
-     * Baseband version
-     * Availability: property is available any time radio is on
-     */
-    static final String PROPERTY_BASEBAND_VERSION = "gsm.version.baseband";
-
-    /**
-     * Radio Interface Layer (RIL) library implementation.
-     */
-    static final String PROPERTY_RIL_IMPL = "gsm.version.ril-impl";
-
-    //****** Current Network
-
-    /**
-     * Alpha name of current registered operator.<p>
-     * Availability: when registered to a network. Result may be unreliable on
-     * CDMA networks.
-     */
-    static final String PROPERTY_OPERATOR_ALPHA = "gsm.operator.alpha";
-    //TODO: most of these properties are generic, substitute gsm. with phone. bug 1856959
-
-    /**
-     * Numeric name (MCC+MNC) of current registered operator.<p>
-     * Availability: when registered to a network. Result may be unreliable on
-     * CDMA networks.
-     */
-    static final String PROPERTY_OPERATOR_NUMERIC = "gsm.operator.numeric";
-
-    /**
-     * 'true' if the device is on a manually selected network
-     * <p/>
-     * Availability: when registered to a network
-     */
-    static final String PROPERTY_OPERATOR_ISMANUAL = "operator.ismanual";
-
-    /**
-     * 'true' if the device is considered roaming on this network for GSM
-     * purposes.
-     * Availability: when registered to a network
-     */
-    static final String PROPERTY_OPERATOR_ISROAMING = "gsm.operator.isroaming";
-
-    /**
-     * The ISO country code equivalent of the current registered operator's
-     * MCC (Mobile Country Code)<p>
-     * Availability: when registered to a network. Result may be unreliable on
-     * CDMA networks.
-     */
-    static final String PROPERTY_OPERATOR_ISO_COUNTRY = "gsm.operator.iso-country";
-
-    /**
-     * The contents of this property is the value of the kernel command line
-     * product_type variable that corresponds to a product that supports LTE on CDMA.
-     * {@see BaseCommands#getLteOnCdmaMode()}
-     */
-    static final String PROPERTY_LTE_ON_CDMA_PRODUCT_TYPE = "telephony.lteOnCdmaProductType";
-
-    /**
-     * The contents of this property is the one of {@link Phone#LTE_ON_CDMA_TRUE} or
-     * {@link Phone#LTE_ON_CDMA_FALSE}. If absent the value will assumed to be false
-     * and the {@see #PROPERTY_LTE_ON_CDMA_PRODUCT_TYPE} will be used to determine its
-     * final value which could also be {@link Phone#LTE_ON_CDMA_FALSE}.
-     * {@see BaseCommands#getLteOnCdmaMode()}
-     */
-    static final String PROPERTY_LTE_ON_CDMA_DEVICE = "telephony.lteOnCdmaDevice";
-
-    static final String CURRENT_ACTIVE_PHONE = "gsm.current.phone-type";
-
-    //****** SIM Card
-    /**
-     * One of <code>"UNKNOWN"</code> <code>"ABSENT"</code> <code>"PIN_REQUIRED"</code>
-     * <code>"PUK_REQUIRED"</code> <code>"NETWORK_LOCKED"</code> or <code>"READY"</code>
-     */
-    static String PROPERTY_SIM_STATE = "gsm.sim.state";
-
-    /**
-     * The MCC+MNC (mobile country code+mobile network code) of the
-     * provider of the SIM. 5 or 6 decimal digits.
-     * Availability: SIM state must be "READY"
-     */
-    static String PROPERTY_ICC_OPERATOR_NUMERIC = "gsm.sim.operator.numeric";
-
-    /**
-     * PROPERTY_ICC_OPERATOR_ALPHA is also known as the SPN, or Service Provider Name.
-     * Availability: SIM state must be "READY"
-     */
-    static String PROPERTY_ICC_OPERATOR_ALPHA = "gsm.sim.operator.alpha";
-
-    /**
-     * ISO country code equivalent for the SIM provider's country code
-     */
-    static String PROPERTY_ICC_OPERATOR_ISO_COUNTRY = "gsm.sim.operator.iso-country";
-
-    /**
-     * Indicates the available radio technology.  Values include: <code>"unknown"</code>,
-     * <code>"GPRS"</code>, <code>"EDGE"</code> and <code>"UMTS"</code>.
-     */
-    static String PROPERTY_DATA_NETWORK_TYPE = "gsm.network.type";
-
-    /**
-     * Indicate if phone is in emergency callback mode
-     */
-    static final String PROPERTY_INECM_MODE = "ril.cdma.inecmmode";
-
-    /**
-     * Indicate the timer value for exiting emergency callback mode
-     */
-    static final String PROPERTY_ECM_EXIT_TIMER = "ro.cdma.ecmexittimer";
-
-    /**
-     * The international dialing prefix conversion string
-     */
-    static final String PROPERTY_IDP_STRING = "ro.cdma.idpstring";
-
-    /**
-     * Defines the schema for the carrier specified OTASP number
-     */
-    static final String PROPERTY_OTASP_NUM_SCHEMA = "ro.cdma.otaspnumschema";
-
-    /**
-     * Disable all calls including Emergency call when it set to true.
-     */
-    static final String PROPERTY_DISABLE_CALL = "ro.telephony.disable-call";
-
-    /**
-     * Set to true for vendor RIL's that send multiple UNSOL_CALL_RING notifications.
-     */
-    static final String PROPERTY_RIL_SENDS_MULTIPLE_CALL_RING =
-            "ro.telephony.call_ring.multiple";
-
-    /**
-     * The number of milliseconds between CALL_RING notifications.
-     */
-    static final String PROPERTY_CALL_RING_DELAY = "ro.telephony.call_ring.delay";
-
-    /**
-     * Track CDMA SMS message id numbers to ensure they increment
-     * monotonically, regardless of reboots.
-     */
-    static final String PROPERTY_CDMA_MSG_ID = "persist.radio.cdma.msgid";
-
-    /**
-     * Property to override DEFAULT_WAKE_LOCK_TIMEOUT
-     */
-    static final String PROPERTY_WAKE_LOCK_TIMEOUT = "ro.ril.wake_lock_timeout";
-
-    /**
-     * Set to true to indicate that the modem needs to be reset
-     * when there is a radio technology change.
-     */
-    static final String PROPERTY_RESET_ON_RADIO_TECH_CHANGE = "persist.radio.reset_on_switch";
-
-    /**
-     * Set to false to disable SMS receiving, default is
-     * the value of config_sms_capable
-     */
-    static final String PROPERTY_SMS_RECEIVE = "telephony.sms.receive";
-
-    /**
-     * Set to false to disable SMS sending, default is
-     * the value of config_sms_capable
-     */
-    static final String PROPERTY_SMS_SEND = "telephony.sms.send";
-
-    /**
-     * Set to true to indicate a test CSIM card is used in the device.
-     * This property is for testing purpose only. This should not be defined
-     * in commercial configuration.
-     */
-    static final String PROPERTY_TEST_CSIM = "persist.radio.test-csim";
-
-    /**
-     * Ignore RIL_UNSOL_NITZ_TIME_RECEIVED completely, used for debugging/testing.
-     */
-    static final String PROPERTY_IGNORE_NITZ = "telephony.test.ignore.nitz";
-}
+/*
+ * Copyright (C) 2006 The Android Open Source Project
+ *
+ * Licensed under the Apache License, Version 2.0 (the "License");
+ * you may not use this file except in compliance with the License.
+ * You may obtain a copy of the License at
+ *
+ *      http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing, software
+ * distributed under the License is distributed on an "AS IS" BASIS,
+ * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ * See the License for the specific language governing permissions and
+ * limitations under the License.
+ */
+
+package com.android.internal.telephony;
+
+/**
+ * Contains a list of string constants used to get or set telephone properties
+ * in the system. You can use {@link android.os.SystemProperties os.SystemProperties}
+ * to get and set these values.
+ *
+ * @hide
+ */
+public interface TelephonyProperties {
+    //****** Baseband and Radio Interface version
+
+    //TODO T: property strings do not have to be gsm specific
+    //        change gsm.*operator.*" properties to "operator.*" properties
+
+    /**
+     * Baseband version
+     * Availability: property is available any time radio is on
+     */
+    static final String PROPERTY_BASEBAND_VERSION = "gsm.version.baseband";
+
+    /**
+     * Radio Interface Layer (RIL) library implementation.
+     */
+    static final String PROPERTY_RIL_IMPL = "gsm.version.ril-impl";
+
+    //****** Current Network
+
+    /**
+     * Alpha name of current registered operator.<p>
+     * Availability: when registered to a network. Result may be unreliable on
+     * CDMA networks.
+     */
+    static final String PROPERTY_OPERATOR_ALPHA = "gsm.operator.alpha";
+    //TODO: most of these properties are generic, substitute gsm. with phone. bug 1856959
+
+    /**
+     * Numeric name (MCC+MNC) of current registered operator.<p>
+     * Availability: when registered to a network. Result may be unreliable on
+     * CDMA networks.
+     */
+    static final String PROPERTY_OPERATOR_NUMERIC = "gsm.operator.numeric";
+
+    /**
+     * 'true' if the device is on a manually selected network
+     * <p/>
+     * Availability: when registered to a network
+     */
+    static final String PROPERTY_OPERATOR_ISMANUAL = "operator.ismanual";
+
+    /**
+     * 'true' if the device is considered roaming on this network for GSM
+     * purposes.
+     * Availability: when registered to a network
+     */
+    static final String PROPERTY_OPERATOR_ISROAMING = "gsm.operator.isroaming";
+
+    /**
+     * The ISO country code equivalent of the current registered operator's
+     * MCC (Mobile Country Code)<p>
+     * Availability: when registered to a network. Result may be unreliable on
+     * CDMA networks.
+     */
+    static final String PROPERTY_OPERATOR_ISO_COUNTRY = "gsm.operator.iso-country";
+
+    /**
+     * The contents of this property is the value of the kernel command line
+     * product_type variable that corresponds to a product that supports LTE on CDMA.
+     * {@see BaseCommands#getLteOnCdmaMode()}
+     */
+    static final String PROPERTY_LTE_ON_CDMA_PRODUCT_TYPE = "telephony.lteOnCdmaProductType";
+
+    /**
+     * The contents of this property is the one of {@link Phone#LTE_ON_CDMA_TRUE} or
+     * {@link Phone#LTE_ON_CDMA_FALSE}. If absent the value will assumed to be false
+     * and the {@see #PROPERTY_LTE_ON_CDMA_PRODUCT_TYPE} will be used to determine its
+     * final value which could also be {@link Phone#LTE_ON_CDMA_FALSE}.
+     * {@see BaseCommands#getLteOnCdmaMode()}
+     */
+    static final String PROPERTY_LTE_ON_CDMA_DEVICE = "telephony.lteOnCdmaDevice";
+
+    static final String CURRENT_ACTIVE_PHONE = "gsm.current.phone-type";
+
+    //****** SIM Card
+    /**
+     * One of <code>"UNKNOWN"</code> <code>"ABSENT"</code> <code>"PIN_REQUIRED"</code>
+     * <code>"PUK_REQUIRED"</code> <code>"NETWORK_LOCKED"</code> or <code>"READY"</code>
+     */
+    static String PROPERTY_SIM_STATE = "gsm.sim.state";
+
+    /**
+     * The MCC+MNC (mobile country code+mobile network code) of the
+     * provider of the SIM. 5 or 6 decimal digits.
+     * Availability: SIM state must be "READY"
+     */
+    static String PROPERTY_ICC_OPERATOR_NUMERIC = "gsm.sim.operator.numeric";
+
+    /**
+     * PROPERTY_ICC_OPERATOR_ALPHA is also known as the SPN, or Service Provider Name.
+     * Availability: SIM state must be "READY"
+     */
+    static String PROPERTY_ICC_OPERATOR_ALPHA = "gsm.sim.operator.alpha";
+
+    /**
+     * ISO country code equivalent for the SIM provider's country code
+     */
+    static String PROPERTY_ICC_OPERATOR_ISO_COUNTRY = "gsm.sim.operator.iso-country";
+
+    /**
+     * Indicates the available radio technology.  Values include: <code>"unknown"</code>,
+     * <code>"GPRS"</code>, <code>"EDGE"</code> and <code>"UMTS"</code>.
+     */
+    static String PROPERTY_DATA_NETWORK_TYPE = "gsm.network.type";
+
+    /**
+     * Indicate if phone is in emergency callback mode
+     */
+    static final String PROPERTY_INECM_MODE = "ril.cdma.inecmmode";
+
+    /**
+     * Indicate the timer value for exiting emergency callback mode
+     */
+    static final String PROPERTY_ECM_EXIT_TIMER = "ro.cdma.ecmexittimer";
+
+    /**
+     * The international dialing prefix conversion string
+     */
+    static final String PROPERTY_IDP_STRING = "ro.cdma.idpstring";
+
+    /**
+     * Defines the schema for the carrier specified OTASP number
+     */
+    static final String PROPERTY_OTASP_NUM_SCHEMA = "ro.cdma.otaspnumschema";
+
+    /**
+     * Disable all calls including Emergency call when it set to true.
+     */
+    static final String PROPERTY_DISABLE_CALL = "ro.telephony.disable-call";
+
+    /**
+     * Set to true for vendor RIL's that send multiple UNSOL_CALL_RING notifications.
+     */
+    static final String PROPERTY_RIL_SENDS_MULTIPLE_CALL_RING =
+            "ro.telephony.call_ring.multiple";
+
+    /**
+     * The number of milliseconds between CALL_RING notifications.
+     */
+    static final String PROPERTY_CALL_RING_DELAY = "ro.telephony.call_ring.delay";
+
+    /**
+     * Track CDMA SMS message id numbers to ensure they increment
+     * monotonically, regardless of reboots.
+     */
+    static final String PROPERTY_CDMA_MSG_ID = "persist.radio.cdma.msgid";
+
+    /**
+     * Property to override DEFAULT_WAKE_LOCK_TIMEOUT
+     */
+    static final String PROPERTY_WAKE_LOCK_TIMEOUT = "ro.ril.wake_lock_timeout";
+
+    /**
+     * Set to true to indicate that the modem needs to be reset
+     * when there is a radio technology change.
+     */
+    static final String PROPERTY_RESET_ON_RADIO_TECH_CHANGE = "persist.radio.reset_on_switch";
+
+    /**
+     * Set to false to disable SMS receiving, default is
+     * the value of config_sms_capable
+     */
+    static final String PROPERTY_SMS_RECEIVE = "telephony.sms.receive";
+
+    /**
+     * Set to false to disable SMS sending, default is
+     * the value of config_sms_capable
+     */
+    static final String PROPERTY_SMS_SEND = "telephony.sms.send";
+
+    /**
+     * Set to true to indicate a test CSIM card is used in the device.
+     * This property is for testing purpose only. This should not be defined
+     * in commercial configuration.
+     */
+    static final String PROPERTY_TEST_CSIM = "persist.radio.test-csim";
+
+    /**
+     * Ignore RIL_UNSOL_NITZ_TIME_RECEIVED completely, used for debugging/testing.
+     */
+    static final String PROPERTY_IGNORE_NITZ = "telephony.test.ignore.nitz";
+}
diff --git a/android-smsmms/src/main/java/com/android/mms/MmsConfig.java b/android-smsmms/src/main/java/com/android/mms/MmsConfig.java
index 7e7ab62a5..2ac5d00c9 100755
--- a/android-smsmms/src/main/java/com/android/mms/MmsConfig.java
+++ b/android-smsmms/src/main/java/com/android/mms/MmsConfig.java
@@ -1,334 +1,334 @@
-/*
- * Copyright (C) 2009 The Android Open Source Project
- *
- * Licensed under the Apache License, Version 2.0 (the "License");
- * you may not use this file except in compliance with the License.
- * You may obtain a copy of the License at
- *
- *      http://www.apache.org/licenses/LICENSE-2.0
- *
- * Unless required by applicable law or agreed to in writing, software
- * distributed under the License is distributed on an "AS IS" BASIS,
- * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
- * See the License for the specific language governing permissions and
- * limitations under the License.
- */
-
-package com.android.mms;
-
-import android.content.Context;
-import android.content.res.XmlResourceParser;
-import com.klinker.android.send_message.R;
-import org.xmlpull.v1.XmlPullParser;
-import org.xmlpull.v1.XmlPullParserException;
-import timber.log.Timber;
-
-import java.io.IOException;
-
-public class MmsConfig {
-    private static final boolean DEBUG = true;
-    private static final boolean LOCAL_LOGV = false;
-
-    public static final String DEFAULT_HTTP_KEY_X_WAP_PROFILE = "x-wap-profile";
-    public static final String DEFAULT_USER_AGENT = "Android-Mms/2.0";
-
-    private static final int MAX_IMAGE_HEIGHT = 480;
-    private static final int MAX_IMAGE_WIDTH = 640;
-    private static final int MAX_TEXT_LENGTH = 2000;
-
-    /**
-     * Whether to hide MMS functionality from the user (i.e. SMS only).
-     */
-    private static boolean mTransIdEnabled = false;
-    private static boolean mMmsEnabled = true;                  // default to true
-    private static int mMaxMessageSize = 800 * 1024;            // default to 800k max size
-    private static String mUserAgent = DEFAULT_USER_AGENT;
-    private static String mUaProfTagName = DEFAULT_HTTP_KEY_X_WAP_PROFILE;
-    private static String mUaProfUrl = null;
-    private static String mHttpParams = null;
-    private static String mHttpParamsLine1Key = null;
-    private static String mEmailGateway = null;
-    private static int mMaxImageHeight = MAX_IMAGE_HEIGHT;      // default value
-    private static int mMaxImageWidth = MAX_IMAGE_WIDTH;        // default value
-    private static int mRecipientLimit = Integer.MAX_VALUE;     // default value
-    private static int mDefaultSMSMessagesPerThread = 10000;    // default value
-    private static int mDefaultMMSMessagesPerThread = 1000;     // default value
-    private static int mMinMessageCountPerThread = 2;           // default value
-    private static int mMaxMessageCountPerThread = 5000;        // default value
-    private static int mHttpSocketTimeout = 60*1000;            // default to 1 min
-    private static int mMinimumSlideElementDuration = 7;        // default to 7 sec
-    private static boolean mNotifyWapMMSC = false;
-    private static boolean mAllowAttachAudio = true;
-
-    // If mEnableMultipartSMS is true, long sms messages are always sent as multi-part sms
-    // messages, with no checked limit on the number of segments.
-    // If mEnableMultipartSMS is false, then as soon as the user types a message longer
-    // than a single segment (i.e. 140 chars), then the message will turn into and be sent
-    // as an mms message. This feature exists for carriers that don't support multi-part sms's.
-    private static boolean mEnableMultipartSMS = true;
-    
-    // By default, the radio splits multipart sms, not the application. If the carrier or radio
-    // does not support this, and the recipient gets garbled text, set this to true. If this is
-    // true and mEnableMultipartSMS is false, the mSmsToMmsTextThreshold will be observed,
-    // converting to mms if we reach the required number of segments.
-    private static boolean mEnableSplitSMS = false;
-
-    // If mEnableMultipartSMS is true and mSmsToMmsTextThreshold > 1, then multi-part SMS messages
-    // will be converted into a single mms message. For example, if the mms_config.xml file
-    // specifies <int name="smsToMmsTextThreshold">4</int>, then on the 5th sms segment, the
-    // message will be converted to an mms.
-    private static int mSmsToMmsTextThreshold = -1;
-
-    private static boolean mEnableSlideDuration = true;
-    private static boolean mEnableMMSReadReports = true;        // key: "enableMMSReadReports"
-    private static boolean mEnableSMSDeliveryReports = true;    // key: "enableSMSDeliveryReports"
-    private static boolean mEnableMMSDeliveryReports = true;    // key: "enableMMSDeliveryReports"
-    private static int mMaxTextLength = -1;
-
-    // This is the max amount of storage multiplied by mMaxMessageSize that we
-    // allow of unsent messages before blocking the user from sending any more
-    // MMS's.
-    private static int mMaxSizeScaleForPendingMmsAllowed = 4;       // default value
-
-    // Email gateway alias support, including the master switch and different rules
-    private static boolean mAliasEnabled = false;
-    private static int mAliasRuleMinChars = 2;
-    private static int mAliasRuleMaxChars = 48;
-
-    private static int mMaxSubjectLength = 40;  // maximum number of characters allowed for mms
-                                                // subject
-
-    // If mEnableGroupMms is true, a message with multiple recipients, regardless of contents,
-    // will be sent as a single MMS message with multiple "TO" fields set for each recipient.
-    // If mEnableGroupMms is false, the group MMS setting/preference will be hidden in the settings
-    // activity.
-    private static boolean mEnableGroupMms = true;
-
-    public static void init(Context context) {
-        if (LOCAL_LOGV) {
-            Timber.v("MmsConfig.init()");
-        }
-        // Always put the mnc/mcc in the log so we can tell which mms_config.xml was loaded.
-
-        loadMmsSettings(context);
-    }
-
-    public static boolean getMmsEnabled() {
-        return mMmsEnabled;
-    }
-
-    public static int getMaxMessageSize() {
-        if (LOCAL_LOGV) {
-            Timber.v("MmsConfig.getMaxMessageSize(): " + mMaxMessageSize);
-        }
-       return mMaxMessageSize;
-    }
-
-    /**
-     * This function returns the value of "enabledTransID" present in mms_config file.
-     * In case of single segment wap push message, this "enabledTransID" indicates whether
-     * TransactionID should be appended to URI or not.
-     */
-    public static boolean getTransIdEnabled() {
-        return mTransIdEnabled;
-    }
-
-    public static String getUserAgent() {
-        return mUserAgent;
-    }
-
-    public static String getUaProfTagName() {
-        return mUaProfTagName;
-    }
-
-    public static String getUaProfUrl() {
-        return mUaProfUrl;
-    }
-
-    public static String getHttpParams() {
-        return mHttpParams;
-    }
-
-    public static String getHttpParamsLine1Key() {
-        return mHttpParamsLine1Key;
-    }
-
-    public static int getHttpSocketTimeout() {
-        return mHttpSocketTimeout;
-    }
-
-    public static boolean getNotifyWapMMSC() {
-        return mNotifyWapMMSC;
-    }
-
-    public static final void beginDocument(XmlPullParser parser, String firstElementName) throws XmlPullParserException, IOException
-    {
-        int type;
-        while ((type=parser.next()) != parser.START_TAG
-                   && type != parser.END_DOCUMENT) {
-            ;
-        }
-
-        if (type != parser.START_TAG) {
-            throw new XmlPullParserException("No start tag found");
-        }
-
-        if (!parser.getName().equals(firstElementName)) {
-            throw new XmlPullParserException("Unexpected start tag: found " + parser.getName() +
-                    ", expected " + firstElementName);
-        }
-    }
-
-    public static final void nextElement(XmlPullParser parser) throws XmlPullParserException, IOException
-    {
-        int type;
-        while ((type=parser.next()) != parser.START_TAG
-                   && type != parser.END_DOCUMENT) {
-            ;
-        }
-    }
-
-    private static void loadMmsSettings(Context context) {
-        XmlResourceParser parser = context.getResources().getXml(R.xml.mms_config);
-
-        try {
-            beginDocument(parser, "mms_config");
-
-            while (true) {
-                nextElement(parser);
-                String tag = parser.getName();
-                if (tag == null) {
-                    break;
-                }
-                String name = parser.getAttributeName(0);
-                String value = parser.getAttributeValue(0);
-                String text = null;
-                if (parser.next() == XmlPullParser.TEXT) {
-                    text = parser.getText();
-                }
-
-                if (DEBUG) {
-                    Timber.v("tag: " + tag + " value: " + value + " - " +
-                            text);
-                }
-                if ("name".equalsIgnoreCase(name)) {
-                    if ("bool".equals(tag)) {
-                        // bool config tags go here
-                        if ("enabledMMS".equalsIgnoreCase(value)) {
-                            mMmsEnabled = "true".equalsIgnoreCase(text);
-                        } else if ("enabledTransID".equalsIgnoreCase(value)) {
-                            mTransIdEnabled = "true".equalsIgnoreCase(text);
-                        } else if ("enabledNotifyWapMMSC".equalsIgnoreCase(value)) {
-                            mNotifyWapMMSC = "true".equalsIgnoreCase(text);
-                        } else if ("aliasEnabled".equalsIgnoreCase(value)) {
-                            mAliasEnabled = "true".equalsIgnoreCase(text);
-                        } else if ("allowAttachAudio".equalsIgnoreCase(value)) {
-                            mAllowAttachAudio = "true".equalsIgnoreCase(text);
-                        } else if ("enableMultipartSMS".equalsIgnoreCase(value)) {
-                            mEnableMultipartSMS = "true".equalsIgnoreCase(text);
-                        } else if ("enableSplitSMS".equalsIgnoreCase(value)) {
-                            mEnableSplitSMS = "true".equalsIgnoreCase(text);
-                        } else if ("enableSlideDuration".equalsIgnoreCase(value)) {
-                            mEnableSlideDuration = "true".equalsIgnoreCase(text);
-                        } else if ("enableMMSReadReports".equalsIgnoreCase(value)) {
-                            mEnableMMSReadReports = "true".equalsIgnoreCase(text);
-                        } else if ("enableSMSDeliveryReports".equalsIgnoreCase(value)) {
-                            mEnableSMSDeliveryReports = "true".equalsIgnoreCase(text);
-                        } else if ("enableMMSDeliveryReports".equalsIgnoreCase(value)) {
-                            mEnableMMSDeliveryReports = "true".equalsIgnoreCase(text);
-                        } else if ("enableGroupMms".equalsIgnoreCase(value)) {
-                            mEnableGroupMms = "true".equalsIgnoreCase(text);
-                        }
-                    } else if ("int".equals(tag)) {
-                        // int config tags go here
-                        if ("maxMessageSize".equalsIgnoreCase(value)) {
-                            mMaxMessageSize = Integer.parseInt(text);
-                        } else if ("maxImageHeight".equalsIgnoreCase(value)) {
-                            mMaxImageHeight = Integer.parseInt(text);
-                        } else if ("maxImageWidth".equalsIgnoreCase(value)) {
-                            mMaxImageWidth = Integer.parseInt(text);
-                        } else if ("defaultSMSMessagesPerThread".equalsIgnoreCase(value)) {
-                            mDefaultSMSMessagesPerThread = Integer.parseInt(text);
-                        } else if ("defaultMMSMessagesPerThread".equalsIgnoreCase(value)) {
-                            mDefaultMMSMessagesPerThread = Integer.parseInt(text);
-                        } else if ("minMessageCountPerThread".equalsIgnoreCase(value)) {
-                            mMinMessageCountPerThread = Integer.parseInt(text);
-                        } else if ("maxMessageCountPerThread".equalsIgnoreCase(value)) {
-                            mMaxMessageCountPerThread = Integer.parseInt(text);
-                        } else if ("recipientLimit".equalsIgnoreCase(value)) {
-                            mRecipientLimit = Integer.parseInt(text);
-                            if (mRecipientLimit < 0) {
-                                mRecipientLimit = Integer.MAX_VALUE;
-                            }
-                        } else if ("httpSocketTimeout".equalsIgnoreCase(value)) {
-                            mHttpSocketTimeout = Integer.parseInt(text);
-                        } else if ("minimumSlideElementDuration".equalsIgnoreCase(value)) {
-                            mMinimumSlideElementDuration = Integer.parseInt(text);
-                        } else if ("maxSizeScaleForPendingMmsAllowed".equalsIgnoreCase(value)) {
-                            mMaxSizeScaleForPendingMmsAllowed = Integer.parseInt(text);
-                        } else if ("aliasMinChars".equalsIgnoreCase(value)) {
-                            mAliasRuleMinChars = Integer.parseInt(text);
-                        } else if ("aliasMaxChars".equalsIgnoreCase(value)) {
-                            mAliasRuleMaxChars = Integer.parseInt(text);
-                        } else if ("smsToMmsTextThreshold".equalsIgnoreCase(value)) {
-                            mSmsToMmsTextThreshold = Integer.parseInt(text);
-                        } else if ("maxMessageTextSize".equalsIgnoreCase(value)) {
-                            mMaxTextLength = Integer.parseInt(text);
-                        } else if ("maxSubjectLength".equalsIgnoreCase(value)) {
-                            mMaxSubjectLength = Integer.parseInt(text);
-                        }
-                    } else if ("string".equals(tag)) {
-                        // string config tags go here
-                        if ("userAgent".equalsIgnoreCase(value)) {
-                            mUserAgent = text;
-                        } else if ("uaProfTagName".equalsIgnoreCase(value)) {
-                            mUaProfTagName = text;
-                        } else if ("uaProfUrl".equalsIgnoreCase(value)) {
-                            mUaProfUrl = text;
-                        } else if ("httpParams".equalsIgnoreCase(value)) {
-                            mHttpParams = text;
-                        } else if ("httpParamsLine1Key".equalsIgnoreCase(value)) {
-                            mHttpParamsLine1Key = text;
-                        } else if ("emailGatewayNumber".equalsIgnoreCase(value)) {
-                            mEmailGateway = text;
-                        }
-                    }
-                }
-            }
-        } catch (XmlPullParserException e) {
-            Timber.e(e, "loadMmsSettings caught ");
-        } catch (NumberFormatException e) {
-            Timber.e(e, "loadMmsSettings caught ");
-        } catch (IOException e) {
-            Timber.e(e, "loadMmsSettings caught ");
-        } finally {
-            parser.close();
-        }
-
-        String errorStr = null;
-
-        if (getMmsEnabled() && mUaProfUrl == null) {
-            errorStr = "uaProfUrl";
-        }
-
-        if (errorStr != null) {
-            String err =
-                String.format("MmsConfig.loadMmsSettings mms_config.xml missing %s setting",
-                        errorStr);
-            Timber.e(err);
-        }
-    }
-
-    public static void setUserAgent(String userAgent) {
-        MmsConfig.mUserAgent = userAgent;
-    }
-
-    public static void setUaProfUrl(String url) {
-        MmsConfig.mUaProfUrl = url;
-    }
-
-    public static void setUaProfTagName(String tagName) {
-        MmsConfig.mUaProfTagName = tagName;
-    }
-
-}
+/*
+ * Copyright (C) 2009 The Android Open Source Project
+ *
+ * Licensed under the Apache License, Version 2.0 (the "License");
+ * you may not use this file except in compliance with the License.
+ * You may obtain a copy of the License at
+ *
+ *      http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing, software
+ * distributed under the License is distributed on an "AS IS" BASIS,
+ * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ * See the License for the specific language governing permissions and
+ * limitations under the License.
+ */
+
+package com.android.mms;
+
+import android.content.Context;
+import android.content.res.XmlResourceParser;
+import com.klinker.android.send_message.R;
+import org.xmlpull.v1.XmlPullParser;
+import org.xmlpull.v1.XmlPullParserException;
+import timber.log.Timber;
+
+import java.io.IOException;
+
+public class MmsConfig {
+    private static final boolean DEBUG = true;
+    private static final boolean LOCAL_LOGV = false;
+
+    public static final String DEFAULT_HTTP_KEY_X_WAP_PROFILE = "x-wap-profile";
+    public static final String DEFAULT_USER_AGENT = "Android-Mms/2.0";
+
+    private static final int MAX_IMAGE_HEIGHT = 480;
+    private static final int MAX_IMAGE_WIDTH = 640;
+    private static final int MAX_TEXT_LENGTH = 2000;
+
+    /**
+     * Whether to hide MMS functionality from the user (i.e. SMS only).
+     */
+    private static boolean mTransIdEnabled = false;
+    private static boolean mMmsEnabled = true;                  // default to true
+    private static int mMaxMessageSize = 800 * 1024;            // default to 800k max size
+    private static String mUserAgent = DEFAULT_USER_AGENT;
+    private static String mUaProfTagName = DEFAULT_HTTP_KEY_X_WAP_PROFILE;
+    private static String mUaProfUrl = null;
+    private static String mHttpParams = null;
+    private static String mHttpParamsLine1Key = null;
+    private static String mEmailGateway = null;
+    private static int mMaxImageHeight = MAX_IMAGE_HEIGHT;      // default value
+    private static int mMaxImageWidth = MAX_IMAGE_WIDTH;        // default value
+    private static int mRecipientLimit = Integer.MAX_VALUE;     // default value
+    private static int mDefaultSMSMessagesPerThread = 10000;    // default value
+    private static int mDefaultMMSMessagesPerThread = 1000;     // default value
+    private static int mMinMessageCountPerThread = 2;           // default value
+    private static int mMaxMessageCountPerThread = 5000;        // default value
+    private static int mHttpSocketTimeout = 60*1000;            // default to 1 min
+    private static int mMinimumSlideElementDuration = 7;        // default to 7 sec
+    private static boolean mNotifyWapMMSC = false;
+    private static boolean mAllowAttachAudio = true;
+
+    // If mEnableMultipartSMS is true, long sms messages are always sent as multi-part sms
+    // messages, with no checked limit on the number of segments.
+    // If mEnableMultipartSMS is false, then as soon as the user types a message longer
+    // than a single segment (i.e. 140 chars), then the message will turn into and be sent
+    // as an mms message. This feature exists for carriers that don't support multi-part sms's.
+    private static boolean mEnableMultipartSMS = true;
+    
+    // By default, the radio splits multipart sms, not the application. If the carrier or radio
+    // does not support this, and the recipient gets garbled text, set this to true. If this is
+    // true and mEnableMultipartSMS is false, the mSmsToMmsTextThreshold will be observed,
+    // converting to mms if we reach the required number of segments.
+    private static boolean mEnableSplitSMS = false;
+
+    // If mEnableMultipartSMS is true and mSmsToMmsTextThreshold > 1, then multi-part SMS messages
+    // will be converted into a single mms message. For example, if the mms_config.xml file
+    // specifies <int name="smsToMmsTextThreshold">4</int>, then on the 5th sms segment, the
+    // message will be converted to an mms.
+    private static int mSmsToMmsTextThreshold = -1;
+
+    private static boolean mEnableSlideDuration = true;
+    private static boolean mEnableMMSReadReports = true;        // key: "enableMMSReadReports"
+    private static boolean mEnableSMSDeliveryReports = true;    // key: "enableSMSDeliveryReports"
+    private static boolean mEnableMMSDeliveryReports = true;    // key: "enableMMSDeliveryReports"
+    private static int mMaxTextLength = -1;
+
+    // This is the max amount of storage multiplied by mMaxMessageSize that we
+    // allow of unsent messages before blocking the user from sending any more
+    // MMS's.
+    private static int mMaxSizeScaleForPendingMmsAllowed = 4;       // default value
+
+    // Email gateway alias support, including the master switch and different rules
+    private static boolean mAliasEnabled = false;
+    private static int mAliasRuleMinChars = 2;
+    private static int mAliasRuleMaxChars = 48;
+
+    private static int mMaxSubjectLength = 40;  // maximum number of characters allowed for mms
+                                                // subject
+
+    // If mEnableGroupMms is true, a message with multiple recipients, regardless of contents,
+    // will be sent as a single MMS message with multiple "TO" fields set for each recipient.
+    // If mEnableGroupMms is false, the group MMS setting/preference will be hidden in the settings
+    // activity.
+    private static boolean mEnableGroupMms = true;
+
+    public static void init(Context context) {
+        if (LOCAL_LOGV) {
+            Timber.v("MmsConfig.init()");
+        }
+        // Always put the mnc/mcc in the log so we can tell which mms_config.xml was loaded.
+
+        loadMmsSettings(context);
+    }
+
+    public static boolean getMmsEnabled() {
+        return mMmsEnabled;
+    }
+
+    public static int getMaxMessageSize() {
+        if (LOCAL_LOGV) {
+            Timber.v("MmsConfig.getMaxMessageSize(): " + mMaxMessageSize);
+        }
+       return mMaxMessageSize;
+    }
+
+    /**
+     * This function returns the value of "enabledTransID" present in mms_config file.
+     * In case of single segment wap push message, this "enabledTransID" indicates whether
+     * TransactionID should be appended to URI or not.
+     */
+    public static boolean getTransIdEnabled() {
+        return mTransIdEnabled;
+    }
+
+    public static String getUserAgent() {
+        return mUserAgent;
+    }
+
+    public static String getUaProfTagName() {
+        return mUaProfTagName;
+    }
+
+    public static String getUaProfUrl() {
+        return mUaProfUrl;
+    }
+
+    public static String getHttpParams() {
+        return mHttpParams;
+    }
+
+    public static String getHttpParamsLine1Key() {
+        return mHttpParamsLine1Key;
+    }
+
+    public static int getHttpSocketTimeout() {
+        return mHttpSocketTimeout;
+    }
+
+    public static boolean getNotifyWapMMSC() {
+        return mNotifyWapMMSC;
+    }
+
+    public static final void beginDocument(XmlPullParser parser, String firstElementName) throws XmlPullParserException, IOException
+    {
+        int type;
+        while ((type=parser.next()) != parser.START_TAG
+                   && type != parser.END_DOCUMENT) {
+            ;
+        }
+
+        if (type != parser.START_TAG) {
+            throw new XmlPullParserException("No start tag found");
+        }
+
+        if (!parser.getName().equals(firstElementName)) {
+            throw new XmlPullParserException("Unexpected start tag: found " + parser.getName() +
+                    ", expected " + firstElementName);
+        }
+    }
+
+    public static final void nextElement(XmlPullParser parser) throws XmlPullParserException, IOException
+    {
+        int type;
+        while ((type=parser.next()) != parser.START_TAG
+                   && type != parser.END_DOCUMENT) {
+            ;
+        }
+    }
+
+    private static void loadMmsSettings(Context context) {
+        XmlResourceParser parser = context.getResources().getXml(R.xml.mms_config);
+
+        try {
+            beginDocument(parser, "mms_config");
+
+            while (true) {
+                nextElement(parser);
+                String tag = parser.getName();
+                if (tag == null) {
+                    break;
+                }
+                String name = parser.getAttributeName(0);
+                String value = parser.getAttributeValue(0);
+                String text = null;
+                if (parser.next() == XmlPullParser.TEXT) {
+                    text = parser.getText();
+                }
+
+                if (DEBUG) {
+                    Timber.v("tag: " + tag + " value: " + value + " - " +
+                            text);
+                }
+                if ("name".equalsIgnoreCase(name)) {
+                    if ("bool".equals(tag)) {
+                        // bool config tags go here
+                        if ("enabledMMS".equalsIgnoreCase(value)) {
+                            mMmsEnabled = "true".equalsIgnoreCase(text);
+                        } else if ("enabledTransID".equalsIgnoreCase(value)) {
+                            mTransIdEnabled = "true".equalsIgnoreCase(text);
+                        } else if ("enabledNotifyWapMMSC".equalsIgnoreCase(value)) {
+                            mNotifyWapMMSC = "true".equalsIgnoreCase(text);
+                        } else if ("aliasEnabled".equalsIgnoreCase(value)) {
+                            mAliasEnabled = "true".equalsIgnoreCase(text);
+                        } else if ("allowAttachAudio".equalsIgnoreCase(value)) {
+                            mAllowAttachAudio = "true".equalsIgnoreCase(text);
+                        } else if ("enableMultipartSMS".equalsIgnoreCase(value)) {
+                            mEnableMultipartSMS = "true".equalsIgnoreCase(text);
+                        } else if ("enableSplitSMS".equalsIgnoreCase(value)) {
+                            mEnableSplitSMS = "true".equalsIgnoreCase(text);
+                        } else if ("enableSlideDuration".equalsIgnoreCase(value)) {
+                            mEnableSlideDuration = "true".equalsIgnoreCase(text);
+                        } else if ("enableMMSReadReports".equalsIgnoreCase(value)) {
+                            mEnableMMSReadReports = "true".equalsIgnoreCase(text);
+                        } else if ("enableSMSDeliveryReports".equalsIgnoreCase(value)) {
+                            mEnableSMSDeliveryReports = "true".equalsIgnoreCase(text);
+                        } else if ("enableMMSDeliveryReports".equalsIgnoreCase(value)) {
+                            mEnableMMSDeliveryReports = "true".equalsIgnoreCase(text);
+                        } else if ("enableGroupMms".equalsIgnoreCase(value)) {
+                            mEnableGroupMms = "true".equalsIgnoreCase(text);
+                        }
+                    } else if ("int".equals(tag)) {
+                        // int config tags go here
+                        if ("maxMessageSize".equalsIgnoreCase(value)) {
+                            mMaxMessageSize = Integer.parseInt(text);
+                        } else if ("maxImageHeight".equalsIgnoreCase(value)) {
+                            mMaxImageHeight = Integer.parseInt(text);
+                        } else if ("maxImageWidth".equalsIgnoreCase(value)) {
+                            mMaxImageWidth = Integer.parseInt(text);
+                        } else if ("defaultSMSMessagesPerThread".equalsIgnoreCase(value)) {
+                            mDefaultSMSMessagesPerThread = Integer.parseInt(text);
+                        } else if ("defaultMMSMessagesPerThread".equalsIgnoreCase(value)) {
+                            mDefaultMMSMessagesPerThread = Integer.parseInt(text);
+                        } else if ("minMessageCountPerThread".equalsIgnoreCase(value)) {
+                            mMinMessageCountPerThread = Integer.parseInt(text);
+                        } else if ("maxMessageCountPerThread".equalsIgnoreCase(value)) {
+                            mMaxMessageCountPerThread = Integer.parseInt(text);
+                        } else if ("recipientLimit".equalsIgnoreCase(value)) {
+                            mRecipientLimit = Integer.parseInt(text);
+                            if (mRecipientLimit < 0) {
+                                mRecipientLimit = Integer.MAX_VALUE;
+                            }
+                        } else if ("httpSocketTimeout".equalsIgnoreCase(value)) {
+                            mHttpSocketTimeout = Integer.parseInt(text);
+                        } else if ("minimumSlideElementDuration".equalsIgnoreCase(value)) {
+                            mMinimumSlideElementDuration = Integer.parseInt(text);
+                        } else if ("maxSizeScaleForPendingMmsAllowed".equalsIgnoreCase(value)) {
+                            mMaxSizeScaleForPendingMmsAllowed = Integer.parseInt(text);
+                        } else if ("aliasMinChars".equalsIgnoreCase(value)) {
+                            mAliasRuleMinChars = Integer.parseInt(text);
+                        } else if ("aliasMaxChars".equalsIgnoreCase(value)) {
+                            mAliasRuleMaxChars = Integer.parseInt(text);
+                        } else if ("smsToMmsTextThreshold".equalsIgnoreCase(value)) {
+                            mSmsToMmsTextThreshold = Integer.parseInt(text);
+                        } else if ("maxMessageTextSize".equalsIgnoreCase(value)) {
+                            mMaxTextLength = Integer.parseInt(text);
+                        } else if ("maxSubjectLength".equalsIgnoreCase(value)) {
+                            mMaxSubjectLength = Integer.parseInt(text);
+                        }
+                    } else if ("string".equals(tag)) {
+                        // string config tags go here
+                        if ("userAgent".equalsIgnoreCase(value)) {
+                            mUserAgent = text;
+                        } else if ("uaProfTagName".equalsIgnoreCase(value)) {
+                            mUaProfTagName = text;
+                        } else if ("uaProfUrl".equalsIgnoreCase(value)) {
+                            mUaProfUrl = text;
+                        } else if ("httpParams".equalsIgnoreCase(value)) {
+                            mHttpParams = text;
+                        } else if ("httpParamsLine1Key".equalsIgnoreCase(value)) {
+                            mHttpParamsLine1Key = text;
+                        } else if ("emailGatewayNumber".equalsIgnoreCase(value)) {
+                            mEmailGateway = text;
+                        }
+                    }
+                }
+            }
+        } catch (XmlPullParserException e) {
+            Timber.e(e, "loadMmsSettings caught ");
+        } catch (NumberFormatException e) {
+            Timber.e(e, "loadMmsSettings caught ");
+        } catch (IOException e) {
+            Timber.e(e, "loadMmsSettings caught ");
+        } finally {
+            parser.close();
+        }
+
+        String errorStr = null;
+
+        if (getMmsEnabled() && mUaProfUrl == null) {
+            errorStr = "uaProfUrl";
+        }
+
+        if (errorStr != null) {
+            String err =
+                String.format("MmsConfig.loadMmsSettings mms_config.xml missing %s setting",
+                        errorStr);
+            Timber.e(err);
+        }
+    }
+
+    public static void setUserAgent(String userAgent) {
+        MmsConfig.mUserAgent = userAgent;
+    }
+
+    public static void setUaProfUrl(String url) {
+        MmsConfig.mUaProfUrl = url;
+    }
+
+    public static void setUaProfTagName(String tagName) {
+        MmsConfig.mUaProfTagName = tagName;
+    }
+
+}
diff --git a/android-smsmms/src/main/java/com/android/mms/dom/AttrImpl.java b/android-smsmms/src/main/java/com/android/mms/dom/AttrImpl.java
index ead639c41..8ff7c442b 100755
--- a/android-smsmms/src/main/java/com/android/mms/dom/AttrImpl.java
+++ b/android-smsmms/src/main/java/com/android/mms/dom/AttrImpl.java
@@ -1,108 +1,108 @@
-/*
- * Copyright (C) 2007 Esmertec AG.
- * Copyright (C) 2007 The Android Open Source Project
- *
- * Licensed under the Apache License, Version 2.0 (the "License");
- * you may not use this file except in compliance with the License.
- * You may obtain a copy of the License at
- *
- *      http://www.apache.org/licenses/LICENSE-2.0
- *
- * Unless required by applicable law or agreed to in writing, software
- * distributed under the License is distributed on an "AS IS" BASIS,
- * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
- * See the License for the specific language governing permissions and
- * limitations under the License.
- */
-
-package com.android.mms.dom;
-
-import org.w3c.dom.Attr;
-import org.w3c.dom.DOMException;
-import org.w3c.dom.Element;
-import org.w3c.dom.Node;
-import org.w3c.dom.TypeInfo;
-
-public class AttrImpl extends NodeImpl implements Attr {
-    private String mName;
-    private String mValue;
-	
-	/*
-     * Internal methods
-     */
-	
-	protected AttrImpl(DocumentImpl owner, String name) {
-		super(owner);
-		mName = name;
-	}
-	
-    /*
-     * Attr Interface Methods
-     */
-
-	public String getName() {
-		return mName;
-	}
-
-	public Element getOwnerElement() {
-		// TODO Auto-generated method stub
-		return null;
-	}
-
-	public boolean getSpecified() {
-		return mValue != null;
-	}
-
-	public String getValue() {
-		return mValue;
-	}
-
-	// Instead of setting a <code>Text></code> with the content of the
-	// String value as defined in the specs,  we directly set here the
-	// internal mValue member.
-	public void setValue(String value) throws DOMException {
-		mValue = value;
-	}
-	
-    /*
-     * Node Interface Methods
-     */
-
-	@Override
-	public String getNodeName() {
-		return mName;
-	}
-
-	@Override
-	public short getNodeType() {
-		return Node.ATTRIBUTE_NODE;
-	}
-	
-	@Override
-	public Node getParentNode() {
-		return null;
-	}
-	
-	@Override 
-	public Node getPreviousSibling() {
-		return null;
-	}
-	
-	@Override
-	public Node getNextSibling() {
-		return null;
-	}
-	
-	@Override
-	public void setNodeValue(String nodeValue) throws DOMException {
-        setValue(nodeValue);
-    }
-
-    public TypeInfo getSchemaTypeInfo() {
-        return null;
-    }
-
-    public boolean isId() {
-        return false;
-    }
-}
+/*
+ * Copyright (C) 2007 Esmertec AG.
+ * Copyright (C) 2007 The Android Open Source Project
+ *
+ * Licensed under the Apache License, Version 2.0 (the "License");
+ * you may not use this file except in compliance with the License.
+ * You may obtain a copy of the License at
+ *
+ *      http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing, software
+ * distributed under the License is distributed on an "AS IS" BASIS,
+ * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ * See the License for the specific language governing permissions and
+ * limitations under the License.
+ */
+
+package com.android.mms.dom;
+
+import org.w3c.dom.Attr;
+import org.w3c.dom.DOMException;
+import org.w3c.dom.Element;
+import org.w3c.dom.Node;
+import org.w3c.dom.TypeInfo;
+
+public class AttrImpl extends NodeImpl implements Attr {
+    private String mName;
+    private String mValue;
+	
+	/*
+     * Internal methods
+     */
+	
+	protected AttrImpl(DocumentImpl owner, String name) {
+		super(owner);
+		mName = name;
+	}
+	
+    /*
+     * Attr Interface Methods
+     */
+
+	public String getName() {
+		return mName;
+	}
+
+	public Element getOwnerElement() {
+		// TODO Auto-generated method stub
+		return null;
+	}
+
+	public boolean getSpecified() {
+		return mValue != null;
+	}
+
+	public String getValue() {
+		return mValue;
+	}
+
+	// Instead of setting a <code>Text></code> with the content of the
+	// String value as defined in the specs,  we directly set here the
+	// internal mValue member.
+	public void setValue(String value) throws DOMException {
+		mValue = value;
+	}
+	
+    /*
+     * Node Interface Methods
+     */
+
+	@Override
+	public String getNodeName() {
+		return mName;
+	}
+
+	@Override
+	public short getNodeType() {
+		return Node.ATTRIBUTE_NODE;
+	}
+	
+	@Override
+	public Node getParentNode() {
+		return null;
+	}
+	
+	@Override 
+	public Node getPreviousSibling() {
+		return null;
+	}
+	
+	@Override
+	public Node getNextSibling() {
+		return null;
+	}
+	
+	@Override
+	public void setNodeValue(String nodeValue) throws DOMException {
+        setValue(nodeValue);
+    }
+
+    public TypeInfo getSchemaTypeInfo() {
+        return null;
+    }
+
+    public boolean isId() {
+        return false;
+    }
+}
diff --git a/android-smsmms/src/main/java/com/android/mms/dom/DocumentImpl.java b/android-smsmms/src/main/java/com/android/mms/dom/DocumentImpl.java
index aeeb51e37..5d0da1c42 100755
--- a/android-smsmms/src/main/java/com/android/mms/dom/DocumentImpl.java
+++ b/android-smsmms/src/main/java/com/android/mms/dom/DocumentImpl.java
@@ -1,194 +1,194 @@
-/*
- * Copyright (C) 2007 Esmertec AG.
- * Copyright (C) 2007 The Android Open Source Project
- *
- * Licensed under the Apache License, Version 2.0 (the "License");
- * you may not use this file except in compliance with the License.
- * You may obtain a copy of the License at
- *
- *      http://www.apache.org/licenses/LICENSE-2.0
- *
- * Unless required by applicable law or agreed to in writing, software
- * distributed under the License is distributed on an "AS IS" BASIS,
- * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
- * See the License for the specific language governing permissions and
- * limitations under the License.
- */
-
-package com.android.mms.dom;
-
-import org.w3c.dom.Attr;
-import org.w3c.dom.CDATASection;
-import org.w3c.dom.Comment;
-import org.w3c.dom.DOMConfiguration;
-import org.w3c.dom.DOMException;
-import org.w3c.dom.DOMImplementation;
-import org.w3c.dom.Document;
-import org.w3c.dom.DocumentFragment;
-import org.w3c.dom.DocumentType;
-import org.w3c.dom.Element;
-import org.w3c.dom.EntityReference;
-import org.w3c.dom.Node;
-import org.w3c.dom.NodeList;
-import org.w3c.dom.ProcessingInstruction;
-import org.w3c.dom.Text;
-
-public abstract class DocumentImpl extends NodeImpl implements Document {
-
-    /*
-     * Internal methods
-     */
-
-    public DocumentImpl() {
-        super(null);
-    }
-
-    /*
-     * Document Interface Methods
-     */
-
-    public Attr createAttribute(String name) throws DOMException {
-        return new AttrImpl(this, name);
-    }
-
-    public Attr createAttributeNS(String namespaceURI, String qualifiedName)
-            throws DOMException {
-        // TODO Auto-generated method stub
-        return null;
-    }
-
-    public CDATASection createCDATASection(String data) throws DOMException {
-        // TODO Auto-generated method stub
-        return null;
-    }
-
-    public Comment createComment(String data) {
-        // TODO Auto-generated method stub
-        return null;
-    }
-
-    public DocumentFragment createDocumentFragment() {
-        // TODO Auto-generated method stub
-        return null;
-    }
-
-    public abstract Element createElement(String tagName) throws DOMException;
-
-    public Element createElementNS(String namespaceURI, String qualifiedName)
-            throws DOMException {
-        // TODO Auto-generated method stub
-        return null;
-    }
-
-    public EntityReference createEntityReference(String name) throws DOMException {
-        // TODO Auto-generated method stub
-        return null;
-    }
-
-    public ProcessingInstruction createProcessingInstruction(String target, String data)
-            throws DOMException {
-        // TODO Auto-generated method stub
-        return null;
-    }
-
-    public Text createTextNode(String data) {
-        // TODO Auto-generated method stub
-        return null;
-    }
-
-    public DocumentType getDoctype() {
-        // TODO Auto-generated method stub
-        return null;
-    }
-
-    public abstract Element getDocumentElement();
-
-    public Element getElementById(String elementId) {
-        // TODO Auto-generated method stub
-        return null;
-    }
-
-    public NodeList getElementsByTagName(String tagname) {
-        // TODO Auto-generated method stub
-        return null;
-    }
-
-    public NodeList getElementsByTagNameNS(String namespaceURI, String localName) {
-        // TODO Auto-generated method stub
-        return null;
-    }
-
-    public DOMImplementation getImplementation() {
-        // TODO Auto-generated method stub
-        return null;
-    }
-
-    public Node importNode(Node importedNode, boolean deep) throws DOMException {
-        // TODO Auto-generated method stub
-        return null;
-    }
-
-    /*
-     * Node Interface methods
-     */
-
-    @Override
-    public short getNodeType() {
-        return Node.DOCUMENT_NODE;
-    }
-
-    @Override
-    public String getNodeName() {
-        // The value of nodeName is "#document" when Node is a Document
-        return "#document";
-    }
-
-    public String getInputEncoding() {
-        return null;
-    }
-
-    public String getXmlEncoding() {
-        return null;
-    }
-
-    public boolean getXmlStandalone() {
-        return false;
-    }
-
-    public void setXmlStandalone(boolean xmlStandalone) throws DOMException {}
-
-    public String getXmlVersion() {
-        return null;
-    }
-
-    public void setXmlVersion(String xmlVersion) throws DOMException {}
-
-    public boolean getStrictErrorChecking() {
-        return true;
-    }
-
-    public void setStrictErrorChecking(boolean strictErrorChecking) {}
-
-    public String getDocumentURI() {
-        return null;
-    }
-
-    public void setDocumentURI(String documentURI) {}
-
-    public Node adoptNode(Node source) throws DOMException {
-        throw new DOMException(DOMException.NOT_SUPPORTED_ERR, null);
-    }
-
-    public DOMConfiguration getDomConfig() {
-        throw new DOMException(DOMException.NOT_SUPPORTED_ERR, null);
-    }
-
-    public void normalizeDocument() {
-        throw new DOMException(DOMException.NOT_SUPPORTED_ERR, null);
-    }
-
-    public Node renameNode(Node n, String namespaceURI, String qualifiedName)
-            throws DOMException {
-        throw new DOMException(DOMException.NOT_SUPPORTED_ERR, null);
-    }
-}
+/*
+ * Copyright (C) 2007 Esmertec AG.
+ * Copyright (C) 2007 The Android Open Source Project
+ *
+ * Licensed under the Apache License, Version 2.0 (the "License");
+ * you may not use this file except in compliance with the License.
+ * You may obtain a copy of the License at
+ *
+ *      http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing, software
+ * distributed under the License is distributed on an "AS IS" BASIS,
+ * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ * See the License for the specific language governing permissions and
+ * limitations under the License.
+ */
+
+package com.android.mms.dom;
+
+import org.w3c.dom.Attr;
+import org.w3c.dom.CDATASection;
+import org.w3c.dom.Comment;
+import org.w3c.dom.DOMConfiguration;
+import org.w3c.dom.DOMException;
+import org.w3c.dom.DOMImplementation;
+import org.w3c.dom.Document;
+import org.w3c.dom.DocumentFragment;
+import org.w3c.dom.DocumentType;
+import org.w3c.dom.Element;
+import org.w3c.dom.EntityReference;
+import org.w3c.dom.Node;
+import org.w3c.dom.NodeList;
+import org.w3c.dom.ProcessingInstruction;
+import org.w3c.dom.Text;
+
+public abstract class DocumentImpl extends NodeImpl implements Document {
+
+    /*
+     * Internal methods
+     */
+
+    public DocumentImpl() {
+        super(null);
+    }
+
+    /*
+     * Document Interface Methods
+     */
+
+    public Attr createAttribute(String name) throws DOMException {
+        return new AttrImpl(this, name);
+    }
+
+    public Attr createAttributeNS(String namespaceURI, String qualifiedName)
+            throws DOMException {
+        // TODO Auto-generated method stub
+        return null;
+    }
+
+    public CDATASection createCDATASection(String data) throws DOMException {
+        // TODO Auto-generated method stub
+        return null;
+    }
+
+    public Comment createComment(String data) {
+        // TODO Auto-generated method stub
+        return null;
+    }
+
+    public DocumentFragment createDocumentFragment() {
+        // TODO Auto-generated method stub
+        return null;
+    }
+
+    public abstract Element createElement(String tagName) throws DOMException;
+
+    public Element createElementNS(String namespaceURI, String qualifiedName)
+            throws DOMException {
+        // TODO Auto-generated method stub
+        return null;
+    }
+
+    public EntityReference createEntityReference(String name) throws DOMException {
+        // TODO Auto-generated method stub
+        return null;
+    }
+
+    public ProcessingInstruction createProcessingInstruction(String target, String data)
+            throws DOMException {
+        // TODO Auto-generated method stub
+        return null;
+    }
+
+    public Text createTextNode(String data) {
+        // TODO Auto-generated method stub
+        return null;
+    }
+
+    public DocumentType getDoctype() {
+        // TODO Auto-generated method stub
+        return null;
+    }
+
+    public abstract Element getDocumentElement();
+
+    public Element getElementById(String elementId) {
+        // TODO Auto-generated method stub
+        return null;
+    }
+
+    public NodeList getElementsByTagName(String tagname) {
+        // TODO Auto-generated method stub
+        return null;
+    }
+
+    public NodeList getElementsByTagNameNS(String namespaceURI, String localName) {
+        // TODO Auto-generated method stub
+        return null;
+    }
+
+    public DOMImplementation getImplementation() {
+        // TODO Auto-generated method stub
+        return null;
+    }
+
+    public Node importNode(Node importedNode, boolean deep) throws DOMException {
+        // TODO Auto-generated method stub
+        return null;
+    }
+
+    /*
+     * Node Interface methods
+     */
+
+    @Override
+    public short getNodeType() {
+        return Node.DOCUMENT_NODE;
+    }
+
+    @Override
+    public String getNodeName() {
+        // The value of nodeName is "#document" when Node is a Document
+        return "#document";
+    }
+
+    public String getInputEncoding() {
+        return null;
+    }
+
+    public String getXmlEncoding() {
+        return null;
+    }
+
+    public boolean getXmlStandalone() {
+        return false;
+    }
+
+    public void setXmlStandalone(boolean xmlStandalone) throws DOMException {}
+
+    public String getXmlVersion() {
+        return null;
+    }
+
+    public void setXmlVersion(String xmlVersion) throws DOMException {}
+
+    public boolean getStrictErrorChecking() {
+        return true;
+    }
+
+    public void setStrictErrorChecking(boolean strictErrorChecking) {}
+
+    public String getDocumentURI() {
+        return null;
+    }
+
+    public void setDocumentURI(String documentURI) {}
+
+    public Node adoptNode(Node source) throws DOMException {
+        throw new DOMException(DOMException.NOT_SUPPORTED_ERR, null);
+    }
+
+    public DOMConfiguration getDomConfig() {
+        throw new DOMException(DOMException.NOT_SUPPORTED_ERR, null);
+    }
+
+    public void normalizeDocument() {
+        throw new DOMException(DOMException.NOT_SUPPORTED_ERR, null);
+    }
+
+    public Node renameNode(Node n, String namespaceURI, String qualifiedName)
+            throws DOMException {
+        throw new DOMException(DOMException.NOT_SUPPORTED_ERR, null);
+    }
+}
diff --git a/android-smsmms/src/main/java/com/android/mms/dom/ElementImpl.java b/android-smsmms/src/main/java/com/android/mms/dom/ElementImpl.java
index bad35ef7b..41512df6f 100755
--- a/android-smsmms/src/main/java/com/android/mms/dom/ElementImpl.java
+++ b/android-smsmms/src/main/java/com/android/mms/dom/ElementImpl.java
@@ -1,172 +1,172 @@
-/*
- * Copyright (C) 2007 Esmertec AG.
- * Copyright (C) 2007 The Android Open Source Project
- *
- * Licensed under the Apache License, Version 2.0 (the "License");
- * you may not use this file except in compliance with the License.
- * You may obtain a copy of the License at
- *
- *      http://www.apache.org/licenses/LICENSE-2.0
- *
- * Unless required by applicable law or agreed to in writing, software
- * distributed under the License is distributed on an "AS IS" BASIS,
- * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
- * See the License for the specific language governing permissions and
- * limitations under the License.
- */
-
-package com.android.mms.dom;
-
-import org.w3c.dom.Attr;
-import org.w3c.dom.DOMException;
-import org.w3c.dom.Element;
-import org.w3c.dom.NamedNodeMap;
-import org.w3c.dom.NodeList;
-import org.w3c.dom.TypeInfo;
-
-public class ElementImpl extends NodeImpl implements Element {
-    private String mTagName;
-    private NamedNodeMap mAttributes = new NamedNodeMapImpl();
-
-    /*
-     * Internal methods
-     */
-
-    protected ElementImpl(DocumentImpl owner, String tagName) {
-        super(owner);
-        mTagName = tagName;
-    }
-
-    /*
-     *  Element Interface methods
-     */
-
-    public String getAttribute(String name) {
-        Attr attrNode = getAttributeNode(name);
-        String attrValue = "";
-        if (attrNode != null) {
-            attrValue = attrNode.getValue();
-        }
-        return attrValue;
-    }
-
-    public String getAttributeNS(String namespaceURI, String localName) {
-        // TODO Auto-generated method stub
-        return null;
-    }
-
-    public Attr getAttributeNode(String name) {
-        return (Attr)mAttributes.getNamedItem(name);
-    }
-
-    public Attr getAttributeNodeNS(String namespaceURI, String localName) {
-        // TODO Auto-generated method stub
-        return null;
-    }
-
-    public NodeList getElementsByTagName(String name) {
-        return new NodeListImpl(this, name, true);
-    }
-
-    public NodeList getElementsByTagNameNS(String namespaceURI, String localName) {
-        // TODO Auto-generated method stub
-        return null;
-    }
-
-    public String getTagName() {
-        return mTagName;
-    }
-
-    public boolean hasAttribute(String name) {
-        return (getAttributeNode(name) != null);
-    }
-
-    public boolean hasAttributeNS(String namespaceURI, String localName) {
-        // TODO Auto-generated method stub
-        return false;
-    }
-
-    public void removeAttribute(String name) throws DOMException {
-        // TODO Auto-generated method stub
-
-    }
-
-    public void removeAttributeNS(String namespaceURI, String localName)
-            throws DOMException {
-        // TODO Auto-generated method stub
-
-    }
-
-    public Attr removeAttributeNode(Attr oldAttr) throws DOMException {
-        // TODO Auto-generated method stub
-        return null;
-    }
-
-    public void setAttribute(String name, String value) throws DOMException {
-        Attr attribute = getAttributeNode(name);
-        if (attribute == null) {
-            attribute = mOwnerDocument.createAttribute(name);
-        }
-        attribute.setNodeValue(value);
-        mAttributes.setNamedItem(attribute);
-    }
-
-    public void setAttributeNS(String namespaceURI, String qualifiedName,
-            String value) throws DOMException {
-        // TODO Auto-generated method stub
-
-    }
-
-    public Attr setAttributeNode(Attr newAttr) throws DOMException {
-        // TODO Auto-generated method stub
-        return null;
-    }
-
-    public Attr setAttributeNodeNS(Attr newAttr) throws DOMException {
-        // TODO Auto-generated method stub
-        return null;
-    }
-
-    /*
-     * Node Interface methods
-     */
-
-    @Override
-    public short getNodeType() {
-        return ELEMENT_NODE;
-    }
-
-    @Override
-    public String getNodeName() {
-        // The value of nodeName is tagName when Node is an Element
-        return mTagName;
-    }
-
-    @Override
-    public NamedNodeMap getAttributes() {
-        return mAttributes;
-    }
-
-    @Override
-    public boolean hasAttributes() {
-        return (mAttributes.getLength() > 0);
-    }
-
-    public TypeInfo getSchemaTypeInfo() {
-        return null;
-    }
-
-    public void setIdAttribute(String name, boolean isId) throws DOMException {
-        throw new DOMException(DOMException.NOT_SUPPORTED_ERR, null);
-    }
-
-    public void setIdAttributeNS(String namespaceURI, String localName,
-            boolean isId) throws DOMException {
-        throw new DOMException(DOMException.NOT_SUPPORTED_ERR, null);
-    }
-
-    public void setIdAttributeNode(Attr idAttr, boolean isId)
-            throws DOMException {
-        throw new DOMException(DOMException.NOT_SUPPORTED_ERR, null);
-    }
-}
+/*
+ * Copyright (C) 2007 Esmertec AG.
+ * Copyright (C) 2007 The Android Open Source Project
+ *
+ * Licensed under the Apache License, Version 2.0 (the "License");
+ * you may not use this file except in compliance with the License.
+ * You may obtain a copy of the License at
+ *
+ *      http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing, software
+ * distributed under the License is distributed on an "AS IS" BASIS,
+ * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ * See the License for the specific language governing permissions and
+ * limitations under the License.
+ */
+
+package com.android.mms.dom;
+
+import org.w3c.dom.Attr;
+import org.w3c.dom.DOMException;
+import org.w3c.dom.Element;
+import org.w3c.dom.NamedNodeMap;
+import org.w3c.dom.NodeList;
+import org.w3c.dom.TypeInfo;
+
+public class ElementImpl extends NodeImpl implements Element {
+    private String mTagName;
+    private NamedNodeMap mAttributes = new NamedNodeMapImpl();
+
+    /*
+     * Internal methods
+     */
+
+    protected ElementImpl(DocumentImpl owner, String tagName) {
+        super(owner);
+        mTagName = tagName;
+    }
+
+    /*
+     *  Element Interface methods
+     */
+
+    public String getAttribute(String name) {
+        Attr attrNode = getAttributeNode(name);
+        String attrValue = "";
+        if (attrNode != null) {
+            attrValue = attrNode.getValue();
+        }
+        return attrValue;
+    }
+
+    public String getAttributeNS(String namespaceURI, String localName) {
+        // TODO Auto-generated method stub
+        return null;
+    }
+
+    public Attr getAttributeNode(String name) {
+        return (Attr)mAttributes.getNamedItem(name);
+    }
+
+    public Attr getAttributeNodeNS(String namespaceURI, String localName) {
+        // TODO Auto-generated method stub
+        return null;
+    }
+
+    public NodeList getElementsByTagName(String name) {
+        return new NodeListImpl(this, name, true);
+    }
+
+    public NodeList getElementsByTagNameNS(String namespaceURI, String localName) {
+        // TODO Auto-generated method stub
+        return null;
+    }
+
+    public String getTagName() {
+        return mTagName;
+    }
+
+    public boolean hasAttribute(String name) {
+        return (getAttributeNode(name) != null);
+    }
+
+    public boolean hasAttributeNS(String namespaceURI, String localName) {
+        // TODO Auto-generated method stub
+        return false;
+    }
+
+    public void removeAttribute(String name) throws DOMException {
+        // TODO Auto-generated method stub
+
+    }
+
+    public void removeAttributeNS(String namespaceURI, String localName)
+            throws DOMException {
+        // TODO Auto-generated method stub
+
+    }
+
+    public Attr removeAttributeNode(Attr oldAttr) throws DOMException {
+        // TODO Auto-generated method stub
+        return null;
+    }
+
+    public void setAttribute(String name, String value) throws DOMException {
+        Attr attribute = getAttributeNode(name);
+        if (attribute == null) {
+            attribute = mOwnerDocument.createAttribute(name);
+        }
+        attribute.setNodeValue(value);
+        mAttributes.setNamedItem(attribute);
+    }
+
+    public void setAttributeNS(String namespaceURI, String qualifiedName,
+            String value) throws DOMException {
+        // TODO Auto-generated method stub
+
+    }
+
+    public Attr setAttributeNode(Attr newAttr) throws DOMException {
+        // TODO Auto-generated method stub
+        return null;
+    }
+
+    public Attr setAttributeNodeNS(Attr newAttr) throws DOMException {
+        // TODO Auto-generated method stub
+        return null;
+    }
+
+    /*
+     * Node Interface methods
+     */
+
+    @Override
+    public short getNodeType() {
+        return ELEMENT_NODE;
+    }
+
+    @Override
+    public String getNodeName() {
+        // The value of nodeName is tagName when Node is an Element
+        return mTagName;
+    }
+
+    @Override
+    public NamedNodeMap getAttributes() {
+        return mAttributes;
+    }
+
+    @Override
+    public boolean hasAttributes() {
+        return (mAttributes.getLength() > 0);
+    }
+
+    public TypeInfo getSchemaTypeInfo() {
+        return null;
+    }
+
+    public void setIdAttribute(String name, boolean isId) throws DOMException {
+        throw new DOMException(DOMException.NOT_SUPPORTED_ERR, null);
+    }
+
+    public void setIdAttributeNS(String namespaceURI, String localName,
+            boolean isId) throws DOMException {
+        throw new DOMException(DOMException.NOT_SUPPORTED_ERR, null);
+    }
+
+    public void setIdAttributeNode(Attr idAttr, boolean isId)
+            throws DOMException {
+        throw new DOMException(DOMException.NOT_SUPPORTED_ERR, null);
+    }
+}
diff --git a/android-smsmms/src/main/java/com/android/mms/dom/NamedNodeMapImpl.java b/android-smsmms/src/main/java/com/android/mms/dom/NamedNodeMapImpl.java
index c08d44c47..617528fc1 100755
--- a/android-smsmms/src/main/java/com/android/mms/dom/NamedNodeMapImpl.java
+++ b/android-smsmms/src/main/java/com/android/mms/dom/NamedNodeMapImpl.java
@@ -1,87 +1,87 @@
-/*
- * Copyright (C) 2007 Esmertec AG.
- * Copyright (C) 2007 The Android Open Source Project
- *
- * Licensed under the Apache License, Version 2.0 (the "License");
- * you may not use this file except in compliance with the License.
- * You may obtain a copy of the License at
- *
- *      http://www.apache.org/licenses/LICENSE-2.0
- *
- * Unless required by applicable law or agreed to in writing, software
- * distributed under the License is distributed on an "AS IS" BASIS,
- * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
- * See the License for the specific language governing permissions and
- * limitations under the License.
- */
-
-package com.android.mms.dom;
-
-import org.w3c.dom.DOMException;
-import org.w3c.dom.NamedNodeMap;
-import org.w3c.dom.Node;
-
-import java.util.Vector;
-
-public class NamedNodeMapImpl implements NamedNodeMap {
-
-    private Vector<Node> mNodes = new Vector<Node>();
-
-    public int getLength() {
-        return mNodes.size();
-    }
-
-    public Node getNamedItem(String name) {
-        Node node = null;
-        for (int i = 0; i < mNodes.size(); i++) {
-            if (name.equals(mNodes.elementAt(i).getNodeName())) {
-                node = mNodes.elementAt(i);
-                break;
-            }
-        }
-        return node;
-    }
-
-    public Node getNamedItemNS(String namespaceURI, String localName) {
-        // TODO Auto-generated method stub
-        return null;
-    }
-
-    public Node item(int index) {
-        if (index < mNodes.size()) {
-            return mNodes.elementAt(index);
-        }
-        return null;
-    }
-
-    public Node removeNamedItem(String name) throws DOMException {
-        Node node = getNamedItem(name);
-        if (node == null) {
-            throw new DOMException(DOMException.NOT_FOUND_ERR, "Not found");
-        } else {
-            mNodes.remove(node);
-        }
-        return node;
-    }
-
-    public Node removeNamedItemNS(String namespaceURI, String localName)
-            throws DOMException {
-        // TODO Auto-generated method stub
-        return null;
-    }
-
-    public Node setNamedItem(Node arg) throws DOMException {
-        Node existing = getNamedItem(arg.getNodeName());
-        if (existing != null) {
-            mNodes.remove(existing);
-        }
-        mNodes.add(arg);
-        return existing;
-    }
-
-    public Node setNamedItemNS(Node arg) throws DOMException {
-        // TODO Auto-generated method stub
-        return null;
-    }
-
-}
+/*
+ * Copyright (C) 2007 Esmertec AG.
+ * Copyright (C) 2007 The Android Open Source Project
+ *
+ * Licensed under the Apache License, Version 2.0 (the "License");
+ * you may not use this file except in compliance with the License.
+ * You may obtain a copy of the License at
+ *
+ *      http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing, software
+ * distributed under the License is distributed on an "AS IS" BASIS,
+ * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ * See the License for the specific language governing permissions and
+ * limitations under the License.
+ */
+
+package com.android.mms.dom;
+
+import org.w3c.dom.DOMException;
+import org.w3c.dom.NamedNodeMap;
+import org.w3c.dom.Node;
+
+import java.util.Vector;
+
+public class NamedNodeMapImpl implements NamedNodeMap {
+
+    private Vector<Node> mNodes = new Vector<Node>();
+
+    public int getLength() {
+        return mNodes.size();
+    }
+
+    public Node getNamedItem(String name) {
+        Node node = null;
+        for (int i = 0; i < mNodes.size(); i++) {
+            if (name.equals(mNodes.elementAt(i).getNodeName())) {
+                node = mNodes.elementAt(i);
+                break;
+            }
+        }
+        return node;
+    }
+
+    public Node getNamedItemNS(String namespaceURI, String localName) {
+        // TODO Auto-generated method stub
+        return null;
+    }
+
+    public Node item(int index) {
+        if (index < mNodes.size()) {
+            return mNodes.elementAt(index);
+        }
+        return null;
+    }
+
+    public Node removeNamedItem(String name) throws DOMException {
+        Node node = getNamedItem(name);
+        if (node == null) {
+            throw new DOMException(DOMException.NOT_FOUND_ERR, "Not found");
+        } else {
+            mNodes.remove(node);
+        }
+        return node;
+    }
+
+    public Node removeNamedItemNS(String namespaceURI, String localName)
+            throws DOMException {
+        // TODO Auto-generated method stub
+        return null;
+    }
+
+    public Node setNamedItem(Node arg) throws DOMException {
+        Node existing = getNamedItem(arg.getNodeName());
+        if (existing != null) {
+            mNodes.remove(existing);
+        }
+        mNodes.add(arg);
+        return existing;
+    }
+
+    public Node setNamedItemNS(Node arg) throws DOMException {
+        // TODO Auto-generated method stub
+        return null;
+    }
+
+}
diff --git a/android-smsmms/src/main/java/com/android/mms/dom/NodeImpl.java b/android-smsmms/src/main/java/com/android/mms/dom/NodeImpl.java
index d21bfa1a0..42599713e 100755
--- a/android-smsmms/src/main/java/com/android/mms/dom/NodeImpl.java
+++ b/android-smsmms/src/main/java/com/android/mms/dom/NodeImpl.java
@@ -1,272 +1,272 @@
-/*
- * Copyright (C) 2007 Esmertec AG.
- * Copyright (C) 2007 The Android Open Source Project
- *
- * Licensed under the Apache License, Version 2.0 (the "License");
- * you may not use this file except in compliance with the License.
- * You may obtain a copy of the License at
- *
- *      http://www.apache.org/licenses/LICENSE-2.0
- *
- * Unless required by applicable law or agreed to in writing, software
- * distributed under the License is distributed on an "AS IS" BASIS,
- * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
- * See the License for the specific language governing permissions and
- * limitations under the License.
- */
-
-package com.android.mms.dom;
-
-import com.android.mms.dom.events.EventTargetImpl;
-import org.w3c.dom.DOMException;
-import org.w3c.dom.Document;
-import org.w3c.dom.NamedNodeMap;
-import org.w3c.dom.Node;
-import org.w3c.dom.NodeList;
-import org.w3c.dom.UserDataHandler;
-import org.w3c.dom.events.Event;
-import org.w3c.dom.events.EventException;
-import org.w3c.dom.events.EventListener;
-import org.w3c.dom.events.EventTarget;
-
-import java.util.NoSuchElementException;
-import java.util.Vector;
-
-public abstract class NodeImpl implements Node, EventTarget {
-    private Node mParentNode;
-    private final Vector<Node> mChildNodes = new Vector<Node>();
-    DocumentImpl mOwnerDocument;
-    private final EventTarget mEventTarget = new EventTargetImpl(this);
-
-    /*
-     * Internal methods
-     */
-
-    protected NodeImpl(DocumentImpl owner) {
-        mOwnerDocument = owner;
-    }
-
-    /*
-     * Node Interface Methods
-     */
-
-    public Node appendChild(Node newChild) throws DOMException {
-        ((NodeImpl)newChild).setParentNode(this);
-        mChildNodes.remove(newChild);
-        mChildNodes.add(newChild);
-        return newChild;
-    }
-
-    public Node cloneNode(boolean deep) {
-        // TODO Auto-generated method stub
-        return null;
-    }
-
-    public NamedNodeMap getAttributes() {
-        // Default. Override in Element.
-        return null;
-    }
-
-    public NodeList getChildNodes() {
-        return new NodeListImpl(this, null, false);
-    }
-
-    public Node getFirstChild() {
-        Node firstChild = null;
-        try {
-            firstChild = mChildNodes.firstElement();
-        }
-        catch (NoSuchElementException e) {
-            // Ignore and return null
-        }
-        return firstChild;
-    }
-
-    public Node getLastChild() {
-        Node lastChild = null;
-        try {
-            lastChild = mChildNodes.lastElement();
-        }
-        catch (NoSuchElementException e) {
-            // Ignore and return null
-        }
-        return lastChild;
-    }
-
-    public String getLocalName() {
-        // TODO Auto-generated method stub
-        return null;
-    }
-
-    public String getNamespaceURI() {
-        // TODO Auto-generated method stub
-        return null;
-    }
-
-    public Node getNextSibling() {
-        if ((mParentNode != null) && (this != mParentNode.getLastChild())) {
-            Vector<Node> siblings = ((NodeImpl)mParentNode).mChildNodes;
-            int indexOfThis = siblings.indexOf(this);
-            return siblings.elementAt(indexOfThis + 1);
-        }
-        return null;
-    }
-
-    public abstract String getNodeName();
-
-    public abstract short getNodeType();
-
-    public String getNodeValue() throws DOMException {
-        // Default behaviour. Override if required.
-        return null;
-    }
-
-    public Document getOwnerDocument() {
-        return mOwnerDocument;
-    }
-
-    public Node getParentNode() {
-        return mParentNode;
-    }
-
-    public String getPrefix() {
-        // TODO Auto-generated method stub
-        return null;
-    }
-
-    public Node getPreviousSibling() {
-        if ((mParentNode != null) && (this != mParentNode.getFirstChild())) {
-            Vector<Node> siblings = ((NodeImpl)mParentNode).mChildNodes;
-            int indexOfThis = siblings.indexOf(this);
-            return siblings.elementAt(indexOfThis - 1);
-        }
-        return null;
-    }
-
-    public boolean hasAttributes() {
-        // Default. Override in Element.
-        return false;
-    }
-
-    public boolean hasChildNodes() {
-        return !(mChildNodes.isEmpty());
-    }
-
-    public Node insertBefore(Node newChild, Node refChild) throws DOMException {
-        // TODO Auto-generated method stub
-        return null;
-    }
-
-    public boolean isSupported(String feature, String version) {
-        // TODO Auto-generated method stub
-        return false;
-    }
-
-    public void normalize() {
-        // TODO Auto-generated method stub
-    }
-
-    public Node removeChild(Node oldChild) throws DOMException {
-        if (mChildNodes.contains(oldChild)) {
-            mChildNodes.remove(oldChild);
-            ((NodeImpl)oldChild).setParentNode(null);
-        } else {
-            throw new DOMException(DOMException.NOT_FOUND_ERR, "Child does not exist");
-        }
-        return null;
-    }
-
-    public Node replaceChild(Node newChild, Node oldChild) throws DOMException {
-        if (mChildNodes.contains(oldChild)) {
-            // Try to remove the new child if available
-            try {
-                mChildNodes.remove(newChild);
-            } catch (DOMException e) {
-                // Ignore exception
-            }
-            mChildNodes.setElementAt(newChild, mChildNodes.indexOf(oldChild));
-            ((NodeImpl)newChild).setParentNode(this);
-            ((NodeImpl)oldChild).setParentNode(null);
-        } else {
-            throw new DOMException(DOMException.NOT_FOUND_ERR, "Old child does not exist");
-        }
-        return oldChild;
-    }
-
-    public void setNodeValue(String nodeValue) throws DOMException {
-        // Default behaviour. Override if required.
-    }
-
-    public void setPrefix(String prefix) throws DOMException {
-        // TODO Auto-generated method stub
-    }
-
-    private void setParentNode(Node parentNode) {
-        mParentNode = parentNode;
-    }
-
-    /*
-     * EventTarget Interface
-     */
-
-    public void addEventListener(String type, EventListener listener, boolean useCapture) {
-        mEventTarget.addEventListener(type, listener, useCapture);
-    }
-
-    public void removeEventListener(String type, EventListener listener, boolean useCapture) {
-        mEventTarget.removeEventListener(type, listener, useCapture);
-    }
-
-    public boolean dispatchEvent(Event evt) throws EventException {
-        return mEventTarget.dispatchEvent(evt);
-    }
-
-    public String getBaseURI() {
-        return null;
-    }
-
-    public short compareDocumentPosition(Node other) throws DOMException {
-        throw new DOMException(DOMException.NOT_SUPPORTED_ERR, null);
-    }
-
-    public String getTextContent() throws DOMException {
-        throw new DOMException(DOMException.NOT_SUPPORTED_ERR, null);
-    }
-
-    public void setTextContent(String textContent) throws DOMException {
-        throw new DOMException(DOMException.NOT_SUPPORTED_ERR, null);
-    }
-
-    public boolean isSameNode(Node other) {
-        throw new DOMException(DOMException.NOT_SUPPORTED_ERR, null);
-    }
-
-    public String lookupPrefix(String namespaceURI) {
-        return null;
-    }
-
-    public boolean isDefaultNamespace(String namespaceURI) {
-        throw new DOMException(DOMException.NOT_SUPPORTED_ERR, null);
-    }
-
-    public String lookupNamespaceURI(String prefix) {
-        return null;
-    }
-
-    public boolean isEqualNode(Node arg) {
-        throw new DOMException(DOMException.NOT_SUPPORTED_ERR, null);
-    }
-
-    public Object getFeature(String feature, String version) {
-        return null;
-    }
-
-    public Object setUserData(String key, Object data,
-            UserDataHandler handler) {
-        throw new DOMException(DOMException.NOT_SUPPORTED_ERR, null);
-    }
-
-    public Object getUserData(String key) {
-        return null;
-    }
-}
+/*
+ * Copyright (C) 2007 Esmertec AG.
+ * Copyright (C) 2007 The Android Open Source Project
+ *
+ * Licensed under the Apache License, Version 2.0 (the "License");
+ * you may not use this file except in compliance with the License.
+ * You may obtain a copy of the License at
+ *
+ *      http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing, software
+ * distributed under the License is distributed on an "AS IS" BASIS,
+ * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ * See the License for the specific language governing permissions and
+ * limitations under the License.
+ */
+
+package com.android.mms.dom;
+
+import com.android.mms.dom.events.EventTargetImpl;
+import org.w3c.dom.DOMException;
+import org.w3c.dom.Document;
+import org.w3c.dom.NamedNodeMap;
+import org.w3c.dom.Node;
+import org.w3c.dom.NodeList;
+import org.w3c.dom.UserDataHandler;
+import org.w3c.dom.events.Event;
+import org.w3c.dom.events.EventException;
+import org.w3c.dom.events.EventListener;
+import org.w3c.dom.events.EventTarget;
+
+import java.util.NoSuchElementException;
+import java.util.Vector;
+
+public abstract class NodeImpl implements Node, EventTarget {
+    private Node mParentNode;
+    private final Vector<Node> mChildNodes = new Vector<Node>();
+    DocumentImpl mOwnerDocument;
+    private final EventTarget mEventTarget = new EventTargetImpl(this);
+
+    /*
+     * Internal methods
+     */
+
+    protected NodeImpl(DocumentImpl owner) {
+        mOwnerDocument = owner;
+    }
+
+    /*
+     * Node Interface Methods
+     */
+
+    public Node appendChild(Node newChild) throws DOMException {
+        ((NodeImpl)newChild).setParentNode(this);
+        mChildNodes.remove(newChild);
+        mChildNodes.add(newChild);
+        return newChild;
+    }
+
+    public Node cloneNode(boolean deep) {
+        // TODO Auto-generated method stub
+        return null;
+    }
+
+    public NamedNodeMap getAttributes() {
+        // Default. Override in Element.
+        return null;
+    }
+
+    public NodeList getChildNodes() {
+        return new NodeListImpl(this, null, false);
+    }
+
+    public Node getFirstChild() {
+        Node firstChild = null;
+        try {
+            firstChild = mChildNodes.firstElement();
+        }
+        catch (NoSuchElementException e) {
+            // Ignore and return null
+        }
+        return firstChild;
+    }
+
+    public Node getLastChild() {
+        Node lastChild = null;
+        try {
+            lastChild = mChildNodes.lastElement();
+        }
+        catch (NoSuchElementException e) {
+            // Ignore and return null
+        }
+        return lastChild;
+    }
+
+    public String getLocalName() {
+        // TODO Auto-generated method stub
+        return null;
+    }
+
+    public String getNamespaceURI() {
+        // TODO Auto-generated method stub
+        return null;
+    }
+
+    public Node getNextSibling() {
+        if ((mParentNode != null) && (this != mParentNode.getLastChild())) {
+            Vector<Node> siblings = ((NodeImpl)mParentNode).mChildNodes;
+            int indexOfThis = siblings.indexOf(this);
+            return siblings.elementAt(indexOfThis + 1);
+        }
+        return null;
+    }
+
+    public abstract String getNodeName();
+
+    public abstract short getNodeType();
+
+    public String getNodeValue() throws DOMException {
+        // Default behaviour. Override if required.
+        return null;
+    }
+
+    public Document getOwnerDocument() {
+        return mOwnerDocument;
+    }
+
+    public Node getParentNode() {
+        return mParentNode;
+    }
+
+    public String getPrefix() {
+        // TODO Auto-generated method stub
+        return null;
+    }
+
+    public Node getPreviousSibling() {
+        if ((mParentNode != null) && (this != mParentNode.getFirstChild())) {
+            Vector<Node> siblings = ((NodeImpl)mParentNode).mChildNodes;
+            int indexOfThis = siblings.indexOf(this);
+            return siblings.elementAt(indexOfThis - 1);
+        }
+        return null;
+    }
+
+    public boolean hasAttributes() {
+        // Default. Override in Element.
+        return false;
+    }
+
+    public boolean hasChildNodes() {
+        return !(mChildNodes.isEmpty());
+    }
+
+    public Node insertBefore(Node newChild, Node refChild) throws DOMException {
+        // TODO Auto-generated method stub
+        return null;
+    }
+
+    public boolean isSupported(String feature, String version) {
+        // TODO Auto-generated method stub
+        return false;
+    }
+
+    public void normalize() {
+        // TODO Auto-generated method stub
+    }
+
+    public Node removeChild(Node oldChild) throws DOMException {
+        if (mChildNodes.contains(oldChild)) {
+            mChildNodes.remove(oldChild);
+            ((NodeImpl)oldChild).setParentNode(null);
+        } else {
+            throw new DOMException(DOMException.NOT_FOUND_ERR, "Child does not exist");
+        }
+        return null;
+    }
+
+    public Node replaceChild(Node newChild, Node oldChild) throws DOMException {
+        if (mChildNodes.contains(oldChild)) {
+            // Try to remove the new child if available
+            try {
+                mChildNodes.remove(newChild);
+            } catch (DOMException e) {
+                // Ignore exception
+            }
+            mChildNodes.setElementAt(newChild, mChildNodes.indexOf(oldChild));
+            ((NodeImpl)newChild).setParentNode(this);
+            ((NodeImpl)oldChild).setParentNode(null);
+        } else {
+            throw new DOMException(DOMException.NOT_FOUND_ERR, "Old child does not exist");
+        }
+        return oldChild;
+    }
+
+    public void setNodeValue(String nodeValue) throws DOMException {
+        // Default behaviour. Override if required.
+    }
+
+    public void setPrefix(String prefix) throws DOMException {
+        // TODO Auto-generated method stub
+    }
+
+    private void setParentNode(Node parentNode) {
+        mParentNode = parentNode;
+    }
+
+    /*
+     * EventTarget Interface
+     */
+
+    public void addEventListener(String type, EventListener listener, boolean useCapture) {
+        mEventTarget.addEventListener(type, listener, useCapture);
+    }
+
+    public void removeEventListener(String type, EventListener listener, boolean useCapture) {
+        mEventTarget.removeEventListener(type, listener, useCapture);
+    }
+
+    public boolean dispatchEvent(Event evt) throws EventException {
+        return mEventTarget.dispatchEvent(evt);
+    }
+
+    public String getBaseURI() {
+        return null;
+    }
+
+    public short compareDocumentPosition(Node other) throws DOMException {
+        throw new DOMException(DOMException.NOT_SUPPORTED_ERR, null);
+    }
+
+    public String getTextContent() throws DOMException {
+        throw new DOMException(DOMException.NOT_SUPPORTED_ERR, null);
+    }
+
+    public void setTextContent(String textContent) throws DOMException {
+        throw new DOMException(DOMException.NOT_SUPPORTED_ERR, null);
+    }
+
+    public boolean isSameNode(Node other) {
+        throw new DOMException(DOMException.NOT_SUPPORTED_ERR, null);
+    }
+
+    public String lookupPrefix(String namespaceURI) {
+        return null;
+    }
+
+    public boolean isDefaultNamespace(String namespaceURI) {
+        throw new DOMException(DOMException.NOT_SUPPORTED_ERR, null);
+    }
+
+    public String lookupNamespaceURI(String prefix) {
+        return null;
+    }
+
+    public boolean isEqualNode(Node arg) {
+        throw new DOMException(DOMException.NOT_SUPPORTED_ERR, null);
+    }
+
+    public Object getFeature(String feature, String version) {
+        return null;
+    }
+
+    public Object setUserData(String key, Object data,
+            UserDataHandler handler) {
+        throw new DOMException(DOMException.NOT_SUPPORTED_ERR, null);
+    }
+
+    public Object getUserData(String key) {
+        return null;
+    }
+}
diff --git a/android-smsmms/src/main/java/com/android/mms/dom/NodeListImpl.java b/android-smsmms/src/main/java/com/android/mms/dom/NodeListImpl.java
index 809388961..5a91cfce8 100755
--- a/android-smsmms/src/main/java/com/android/mms/dom/NodeListImpl.java
+++ b/android-smsmms/src/main/java/com/android/mms/dom/NodeListImpl.java
@@ -1,128 +1,128 @@
-/*
- * Copyright (C) 2007 Esmertec AG.
- * Copyright (C) 2007 The Android Open Source Project
- *
- * Licensed under the Apache License, Version 2.0 (the "License");
- * you may not use this file except in compliance with the License.
- * You may obtain a copy of the License at
- *
- *      http://www.apache.org/licenses/LICENSE-2.0
- *
- * Unless required by applicable law or agreed to in writing, software
- * distributed under the License is distributed on an "AS IS" BASIS,
- * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
- * See the License for the specific language governing permissions and
- * limitations under the License.
- */
-
-package com.android.mms.dom;
-
-import org.w3c.dom.Node;
-import org.w3c.dom.NodeList;
-
-import java.util.ArrayList;
-
-public class NodeListImpl implements NodeList {
-    private ArrayList<Node> mSearchNodes;
-    private ArrayList<Node> mStaticNodes;
-    private Node mRootNode;
-    private String mTagName;
-    private boolean mDeepSearch;
-
-    /*
-     * Internal Interface
-     */
-
-    /**
-     * Constructs a NodeList by searching for all descendants or the direct
-     * children of a root node with a given tag name.
-     * @param rootNode The root <code>Node</code> of the search.
-     * @param tagName The tag name to be searched for. If null, all descendants
-     *              will be returned.
-     * @param deep Limit the search to the direct children of rootNode if false,
-     *              to all descendants otherwise.
-     */
-    public NodeListImpl(Node rootNode, String tagName, boolean deepSearch) {
-        mRootNode = rootNode;
-        mTagName  = tagName;
-        mDeepSearch = deepSearch;
-    }
-
-    /**
-     * Constructs a NodeList for a given static node list.
-     * @param nodes The static node list.
-     */
-    public NodeListImpl(ArrayList<Node> nodes) {
-        mStaticNodes = nodes;
-    }
-
-    /*
-     * NodeListImpl Interface
-     */
-
-    public int getLength() {
-        if (mStaticNodes == null) {
-            fillList(mRootNode);
-            return mSearchNodes.size();
-        } else {
-            return mStaticNodes.size();
-        }
-    }
-
-    public Node item(int index) {
-        Node node = null;
-        if (mStaticNodes == null) {
-            fillList(mRootNode);
-            try {
-                node = mSearchNodes.get(index);
-            } catch (IndexOutOfBoundsException e) {
-                // Do nothing and return null
-            }
-        } else {
-            try {
-                node = mStaticNodes.get(index);
-            } catch (IndexOutOfBoundsException e) {
-                // Do nothing and return null
-            }
-        }
-        return node;
-    }
-
-    /**
-     * A preorder traversal is done in the following order:
-     * <ul>
-     *   <li> Visit root.
-     *   <li> Traverse children from left to right in preorder.
-     * </ul>
-     * This method fills the live node list.
-     * @param The root of preorder traversal
-     * @return The next match
-     */
-    private void fillList(Node node) {
-        // (Re)-initialize the container if this is the start of the search.
-        // Visit the root of this iteration otherwise.
-        if (node == mRootNode) {
-            mSearchNodes = new ArrayList<Node>();
-        } else {
-            if ((mTagName == null) || node.getNodeName().equals(mTagName)) {
-                mSearchNodes.add(node);
-            }
-        }
-
-        // Descend one generation...
-        node = node.getFirstChild();
-
-        // ...and visit in preorder the children if we are in deep search
-        // or directly add the children to the list otherwise.
-        while (node != null) {
-            if (mDeepSearch) {
-                fillList(node);
-            } else {
-                if ((mTagName == null) || node.getNodeName().equals(mTagName)) {
-                    mSearchNodes.add(node);
-                }
-            }
-            node = node.getNextSibling();
-        }
-    }
-}
+/*
+ * Copyright (C) 2007 Esmertec AG.
+ * Copyright (C) 2007 The Android Open Source Project
+ *
+ * Licensed under the Apache License, Version 2.0 (the "License");
+ * you may not use this file except in compliance with the License.
+ * You may obtain a copy of the License at
+ *
+ *      http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing, software
+ * distributed under the License is distributed on an "AS IS" BASIS,
+ * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ * See the License for the specific language governing permissions and
+ * limitations under the License.
+ */
+
+package com.android.mms.dom;
+
+import org.w3c.dom.Node;
+import org.w3c.dom.NodeList;
+
+import java.util.ArrayList;
+
+public class NodeListImpl implements NodeList {
+    private ArrayList<Node> mSearchNodes;
+    private ArrayList<Node> mStaticNodes;
+    private Node mRootNode;
+    private String mTagName;
+    private boolean mDeepSearch;
+
+    /*
+     * Internal Interface
+     */
+
+    /**
+     * Constructs a NodeList by searching for all descendants or the direct
+     * children of a root node with a given tag name.
+     * @param rootNode The root <code>Node</code> of the search.
+     * @param tagName The tag name to be searched for. If null, all descendants
+     *              will be returned.
+     * @param deep Limit the search to the direct children of rootNode if false,
+     *              to all descendants otherwise.
+     */
+    public NodeListImpl(Node rootNode, String tagName, boolean deepSearch) {
+        mRootNode = rootNode;
+        mTagName  = tagName;
+        mDeepSearch = deepSearch;
+    }
+
+    /**
+     * Constructs a NodeList for a given static node list.
+     * @param nodes The static node list.
+     */
+    public NodeListImpl(ArrayList<Node> nodes) {
+        mStaticNodes = nodes;
+    }
+
+    /*
+     * NodeListImpl Interface
+     */
+
+    public int getLength() {
+        if (mStaticNodes == null) {
+            fillList(mRootNode);
+            return mSearchNodes.size();
+        } else {
+            return mStaticNodes.size();
+        }
+    }
+
+    public Node item(int index) {
+        Node node = null;
+        if (mStaticNodes == null) {
+            fillList(mRootNode);
+            try {
+                node = mSearchNodes.get(index);
+            } catch (IndexOutOfBoundsException e) {
+                // Do nothing and return null
+            }
+        } else {
+            try {
+                node = mStaticNodes.get(index);
+            } catch (IndexOutOfBoundsException e) {
+                // Do nothing and return null
+            }
+        }
+        return node;
+    }
+
+    /**
+     * A preorder traversal is done in the following order:
+     * <ul>
+     *   <li> Visit root.
+     *   <li> Traverse children from left to right in preorder.
+     * </ul>
+     * This method fills the live node list.
+     * @param The root of preorder traversal
+     * @return The next match
+     */
+    private void fillList(Node node) {
+        // (Re)-initialize the container if this is the start of the search.
+        // Visit the root of this iteration otherwise.
+        if (node == mRootNode) {
+            mSearchNodes = new ArrayList<Node>();
+        } else {
+            if ((mTagName == null) || node.getNodeName().equals(mTagName)) {
+                mSearchNodes.add(node);
+            }
+        }
+
+        // Descend one generation...
+        node = node.getFirstChild();
+
+        // ...and visit in preorder the children if we are in deep search
+        // or directly add the children to the list otherwise.
+        while (node != null) {
+            if (mDeepSearch) {
+                fillList(node);
+            } else {
+                if ((mTagName == null) || node.getNodeName().equals(mTagName)) {
+                    mSearchNodes.add(node);
+                }
+            }
+            node = node.getNextSibling();
+        }
+    }
+}
diff --git a/android-smsmms/src/main/java/com/android/mms/dom/events/EventImpl.java b/android-smsmms/src/main/java/com/android/mms/dom/events/EventImpl.java
index 24fc908fa..2cfb88b40 100755
--- a/android-smsmms/src/main/java/com/android/mms/dom/events/EventImpl.java
+++ b/android-smsmms/src/main/java/com/android/mms/dom/events/EventImpl.java
@@ -1,127 +1,127 @@
-/*
- * Copyright (C) 2007 Esmertec AG.
- * Copyright (C) 2007 The Android Open Source Project
- *
- * Licensed under the Apache License, Version 2.0 (the "License");
- * you may not use this file except in compliance with the License.
- * You may obtain a copy of the License at
- *
- *      http://www.apache.org/licenses/LICENSE-2.0
- *
- * Unless required by applicable law or agreed to in writing, software
- * distributed under the License is distributed on an "AS IS" BASIS,
- * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
- * See the License for the specific language governing permissions and
- * limitations under the License.
- */
-
-package com.android.mms.dom.events;
-
-import org.w3c.dom.events.Event;
-import org.w3c.dom.events.EventTarget;
-
-public class EventImpl implements Event {
-
-    // Event type informations
-    private String mEventType;
-    private boolean mCanBubble;
-    private boolean mCancelable;
-
-    // Flags whether the event type information was set
-    // FIXME: Can we use mEventType for this purpose?
-    private boolean mInitialized;
-
-    // Target of this event
-    private EventTarget mTarget;
-
-    // Event status variables
-    private short mEventPhase;
-    private boolean mStopPropagation;
-    private boolean mPreventDefault;
-    private EventTarget mCurrentTarget;
-    private int mSeekTo;
-
-    private final long mTimeStamp = System.currentTimeMillis();
-
-    public boolean getBubbles() {
-        return mCanBubble;
-    }
-
-    public boolean getCancelable() {
-        return mCancelable;
-    }
-
-    public EventTarget getCurrentTarget() {
-        return mCurrentTarget;
-    }
-
-    public short getEventPhase() {
-        return mEventPhase;
-    }
-
-    public EventTarget getTarget() {
-        return mTarget;
-    }
-
-    public long getTimeStamp() {
-        return mTimeStamp;
-    }
-
-    public String getType() {
-        return mEventType;
-    }
-
-    public void initEvent(String eventTypeArg, boolean canBubbleArg,
-            boolean cancelableArg) {
-        mEventType = eventTypeArg;
-        mCanBubble = canBubbleArg;
-        mCancelable = cancelableArg;
-        mInitialized = true;
-    }
-
-    public void initEvent(String eventTypeArg, boolean canBubbleArg, boolean cancelableArg,
-            int seekTo) {
-        mSeekTo = seekTo;
-        initEvent(eventTypeArg, canBubbleArg, cancelableArg);
-    }
-
-    public void preventDefault() {
-        mPreventDefault = true;
-    }
-
-    public void stopPropagation() {
-        mStopPropagation = true;
-    }
-
-    /*
-     * Internal Interface
-     */
-
-    boolean isInitialized() {
-        return mInitialized;
-    }
-
-    boolean isPreventDefault() {
-        return mPreventDefault;
-    }
-
-    boolean isPropogationStopped() {
-        return mStopPropagation;
-    }
-
-    void setTarget(EventTarget target) {
-        mTarget = target;
-    }
-
-    void setEventPhase(short eventPhase) {
-        mEventPhase = eventPhase;
-    }
-
-    void setCurrentTarget(EventTarget currentTarget) {
-        mCurrentTarget = currentTarget;
-    }
-
-    public int getSeekTo() {
-        return mSeekTo;
-    }
-}
+/*
+ * Copyright (C) 2007 Esmertec AG.
+ * Copyright (C) 2007 The Android Open Source Project
+ *
+ * Licensed under the Apache License, Version 2.0 (the "License");
+ * you may not use this file except in compliance with the License.
+ * You may obtain a copy of the License at
+ *
+ *      http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing, software
+ * distributed under the License is distributed on an "AS IS" BASIS,
+ * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ * See the License for the specific language governing permissions and
+ * limitations under the License.
+ */
+
+package com.android.mms.dom.events;
+
+import org.w3c.dom.events.Event;
+import org.w3c.dom.events.EventTarget;
+
+public class EventImpl implements Event {
+
+    // Event type informations
+    private String mEventType;
+    private boolean mCanBubble;
+    private boolean mCancelable;
+
+    // Flags whether the event type information was set
+    // FIXME: Can we use mEventType for this purpose?
+    private boolean mInitialized;
+
+    // Target of this event
+    private EventTarget mTarget;
+
+    // Event status variables
+    private short mEventPhase;
+    private boolean mStopPropagation;
+    private boolean mPreventDefault;
+    private EventTarget mCurrentTarget;
+    private int mSeekTo;
+
+    private final long mTimeStamp = System.currentTimeMillis();
+
+    public boolean getBubbles() {
+        return mCanBubble;
+    }
+
+    public boolean getCancelable() {
+        return mCancelable;
+    }
+
+    public EventTarget getCurrentTarget() {
+        return mCurrentTarget;
+    }
+
+    public short getEventPhase() {
+        return mEventPhase;
+    }
+
+    public EventTarget getTarget() {
+        return mTarget;
+    }
+
+    public long getTimeStamp() {
+        return mTimeStamp;
+    }
+
+    public String getType() {
+        return mEventType;
+    }
+
+    public void initEvent(String eventTypeArg, boolean canBubbleArg,
+            boolean cancelableArg) {
+        mEventType = eventTypeArg;
+        mCanBubble = canBubbleArg;
+        mCancelable = cancelableArg;
+        mInitialized = true;
+    }
+
+    public void initEvent(String eventTypeArg, boolean canBubbleArg, boolean cancelableArg,
+            int seekTo) {
+        mSeekTo = seekTo;
+        initEvent(eventTypeArg, canBubbleArg, cancelableArg);
+    }
+
+    public void preventDefault() {
+        mPreventDefault = true;
+    }
+
+    public void stopPropagation() {
+        mStopPropagation = true;
+    }
+
+    /*
+     * Internal Interface
+     */
+
+    boolean isInitialized() {
+        return mInitialized;
+    }
+
+    boolean isPreventDefault() {
+        return mPreventDefault;
+    }
+
+    boolean isPropogationStopped() {
+        return mStopPropagation;
+    }
+
+    void setTarget(EventTarget target) {
+        mTarget = target;
+    }
+
+    void setEventPhase(short eventPhase) {
+        mEventPhase = eventPhase;
+    }
+
+    void setCurrentTarget(EventTarget currentTarget) {
+        mCurrentTarget = currentTarget;
+    }
+
+    public int getSeekTo() {
+        return mSeekTo;
+    }
+}
diff --git a/android-smsmms/src/main/java/com/android/mms/dom/events/EventTargetImpl.java b/android-smsmms/src/main/java/com/android/mms/dom/events/EventTargetImpl.java
index 9317d1f40..8cbe72b72 100755
--- a/android-smsmms/src/main/java/com/android/mms/dom/events/EventTargetImpl.java
+++ b/android-smsmms/src/main/java/com/android/mms/dom/events/EventTargetImpl.java
@@ -1,128 +1,128 @@
-/*
- * Copyright 2014 Jacob Klinker
- *
- * Licensed under the Apache License, Version 2.0 (the "License");
- * you may not use this file except in compliance with the License.
- * You may obtain a copy of the License at
- *
- *     http://www.apache.org/licenses/LICENSE-2.0
- *
- * Unless required by applicable law or agreed to in writing, software
- * distributed under the License is distributed on an "AS IS" BASIS,
- * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
- * See the License for the specific language governing permissions and
- * limitations under the License.
- */
-
-package com.android.mms.dom.events;
-
-import org.w3c.dom.events.Event;
-import org.w3c.dom.events.EventException;
-import org.w3c.dom.events.EventListener;
-import org.w3c.dom.events.EventTarget;
-import timber.log.Timber;
-
-import java.util.ArrayList;
-
-public class EventTargetImpl implements EventTarget {
-    private ArrayList<EventListenerEntry> mListenerEntries;
-    private EventTarget mNodeTarget;
-
-    static class EventListenerEntry
-    {
-        final String mType;
-        final EventListener mListener;
-        final boolean mUseCapture;
-
-        EventListenerEntry(String type, EventListener listener, boolean useCapture)
-        {
-            mType = type;
-            mListener = listener;
-            mUseCapture = useCapture;
-        }
-    }
-
-    public EventTargetImpl(EventTarget target) {
-        mNodeTarget = target;
-    }
-
-    public void addEventListener(String type, EventListener listener, boolean useCapture) {
-        if ((type == null) || type.equals("") || (listener == null)) {
-            return;
-        }
-
-        // Make sure we have only one entry
-        removeEventListener(type, listener, useCapture);
-
-        if (mListenerEntries == null) {
-            mListenerEntries = new ArrayList<EventListenerEntry>();
-        }
-        mListenerEntries.add(new EventListenerEntry(type, listener, useCapture));
-    }
-
-    public boolean dispatchEvent(Event evt) throws EventException {
-        // We need to use the internal APIs to modify and access the event status
-        EventImpl eventImpl = (EventImpl)evt;
-
-        if (!eventImpl.isInitialized()) {
-            throw new EventException(EventException.UNSPECIFIED_EVENT_TYPE_ERR,
-                    "Event not initialized");
-        } else if ((eventImpl.getType() == null) || eventImpl.getType().equals("")) {
-            throw new EventException(EventException.UNSPECIFIED_EVENT_TYPE_ERR,
-                    "Unspecified even type");
-        }
-
-        // Initialize event status
-        eventImpl.setTarget(mNodeTarget);
-
-        // TODO: At this point, to support event capturing and bubbling, we should
-        // establish the chain of EventTargets from the top of the tree to this
-        // event's target.
-
-        // TODO: CAPTURING_PHASE skipped
-
-        // Handle AT_TARGET
-        // Invoke handleEvent of non-capturing listeners on this EventTarget.
-        eventImpl.setEventPhase(Event.AT_TARGET);
-        eventImpl.setCurrentTarget(mNodeTarget);
-        if (!eventImpl.isPropogationStopped() && (mListenerEntries != null)) {
-            for (int i = 0; i < mListenerEntries.size(); i++) {
-                EventListenerEntry listenerEntry = mListenerEntries.get(i);
-                if (!listenerEntry.mUseCapture
-                        && listenerEntry.mType.equals(eventImpl.getType())) {
-                    try {
-                        listenerEntry.mListener.handleEvent(eventImpl);
-                    }
-                    catch (Exception e) {
-                        // Any exceptions thrown inside an EventListener will
-                        // not stop propagation of the event
-                        Timber.w(e, "Catched EventListener exception");
-                    }
-                }
-            }
-        }
-
-        if (eventImpl.getBubbles()) {
-            // TODO: BUBBLING_PHASE skipped
-        }
-
-        return eventImpl.isPreventDefault();
-    }
-
-    public void removeEventListener(String type, EventListener listener,
-            boolean useCapture) {
-        if (null == mListenerEntries) {
-            return;
-        }
-        for (int i = 0; i < mListenerEntries.size(); i ++) {
-            EventListenerEntry listenerEntry = mListenerEntries.get(i);
-            if ((listenerEntry.mUseCapture == useCapture)
-                    && (listenerEntry.mListener == listener)
-                    && listenerEntry.mType.equals(type)) {
-                mListenerEntries.remove(i);
-                break;
-            }
-        }
-    }
-
-}
+/*
+ * Copyright 2014 Jacob Klinker
+ *
+ * Licensed under the Apache License, Version 2.0 (the "License");
+ * you may not use this file except in compliance with the License.
+ * You may obtain a copy of the License at
+ *
+ *     http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing, software
+ * distributed under the License is distributed on an "AS IS" BASIS,
+ * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ * See the License for the specific language governing permissions and
+ * limitations under the License.
+ */
+
+package com.android.mms.dom.events;
+
+import org.w3c.dom.events.Event;
+import org.w3c.dom.events.EventException;
+import org.w3c.dom.events.EventListener;
+import org.w3c.dom.events.EventTarget;
+import timber.log.Timber;
+
+import java.util.ArrayList;
+
+public class EventTargetImpl implements EventTarget {
+    private ArrayList<EventListenerEntry> mListenerEntries;
+    private EventTarget mNodeTarget;
+
+    static class EventListenerEntry
+    {
+        final String mType;
+        final EventListener mListener;
+        final boolean mUseCapture;
+
+        EventListenerEntry(String type, EventListener listener, boolean useCapture)
+        {
+            mType = type;
+            mListener = listener;
+            mUseCapture = useCapture;
+        }
+    }
+
+    public EventTargetImpl(EventTarget target) {
+        mNodeTarget = target;
+    }
+
+    public void addEventListener(String type, EventListener listener, boolean useCapture) {
+        if ((type == null) || type.equals("") || (listener == null)) {
+            return;
+        }
+
+        // Make sure we have only one entry
+        removeEventListener(type, listener, useCapture);
+
+        if (mListenerEntries == null) {
+            mListenerEntries = new ArrayList<EventListenerEntry>();
+        }
+        mListenerEntries.add(new EventListenerEntry(type, listener, useCapture));
+    }
+
+    public boolean dispatchEvent(Event evt) throws EventException {
+        // We need to use the internal APIs to modify and access the event status
+        EventImpl eventImpl = (EventImpl)evt;
+
+        if (!eventImpl.isInitialized()) {
+            throw new EventException(EventException.UNSPECIFIED_EVENT_TYPE_ERR,
+                    "Event not initialized");
+        } else if ((eventImpl.getType() == null) || eventImpl.getType().equals("")) {
+            throw new EventException(EventException.UNSPECIFIED_EVENT_TYPE_ERR,
+                    "Unspecified even type");
+        }
+
+        // Initialize event status
+        eventImpl.setTarget(mNodeTarget);
+
+        // TODO: At this point, to support event capturing and bubbling, we should
+        // establish the chain of EventTargets from the top of the tree to this
+        // event's target.
+
+        // TODO: CAPTURING_PHASE skipped
+
+        // Handle AT_TARGET
+        // Invoke handleEvent of non-capturing listeners on this EventTarget.
+        eventImpl.setEventPhase(Event.AT_TARGET);
+        eventImpl.setCurrentTarget(mNodeTarget);
+        if (!eventImpl.isPropogationStopped() && (mListenerEntries != null)) {
+            for (int i = 0; i < mListenerEntries.size(); i++) {
+                EventListenerEntry listenerEntry = mListenerEntries.get(i);
+                if (!listenerEntry.mUseCapture
+                        && listenerEntry.mType.equals(eventImpl.getType())) {
+                    try {
+                        listenerEntry.mListener.handleEvent(eventImpl);
+                    }
+                    catch (Exception e) {
+                        // Any exceptions thrown inside an EventListener will
+                        // not stop propagation of the event
+                        Timber.w(e, "Catched EventListener exception");
+                    }
+                }
+            }
+        }
+
+        if (eventImpl.getBubbles()) {
+            // TODO: BUBBLING_PHASE skipped
+        }
+
+        return eventImpl.isPreventDefault();
+    }
+
+    public void removeEventListener(String type, EventListener listener,
+            boolean useCapture) {
+        if (null == mListenerEntries) {
+            return;
+        }
+        for (int i = 0; i < mListenerEntries.size(); i ++) {
+            EventListenerEntry listenerEntry = mListenerEntries.get(i);
+            if ((listenerEntry.mUseCapture == useCapture)
+                    && (listenerEntry.mListener == listener)
+                    && listenerEntry.mType.equals(type)) {
+                mListenerEntries.remove(i);
+                break;
+            }
+        }
+    }
+
+}
diff --git a/android-smsmms/src/main/java/com/android/mms/dom/smil/ElementParallelTimeContainerImpl.java b/android-smsmms/src/main/java/com/android/mms/dom/smil/ElementParallelTimeContainerImpl.java
index 13be9f2c5..a8acbaf09 100755
--- a/android-smsmms/src/main/java/com/android/mms/dom/smil/ElementParallelTimeContainerImpl.java
+++ b/android-smsmms/src/main/java/com/android/mms/dom/smil/ElementParallelTimeContainerImpl.java
@@ -1,154 +1,154 @@
-/*
- * Copyright (C) 2007-2008 Esmertec AG.
- * Copyright (C) 2007-2008 The Android Open Source Project
- *
- * Licensed under the Apache License, Version 2.0 (the "License");
- * you may not use this file except in compliance with the License.
- * You may obtain a copy of the License at
- *
- *      http://www.apache.org/licenses/LICENSE-2.0
- *
- * Unless required by applicable law or agreed to in writing, software
- * distributed under the License is distributed on an "AS IS" BASIS,
- * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
- * See the License for the specific language governing permissions and
- * limitations under the License.
- */
-
-package com.android.mms.dom.smil;
-
-import com.android.mms.dom.NodeListImpl;
-import org.w3c.dom.DOMException;
-import org.w3c.dom.Node;
-import org.w3c.dom.NodeList;
-import org.w3c.dom.smil.ElementParallelTimeContainer;
-import org.w3c.dom.smil.ElementTime;
-import org.w3c.dom.smil.SMILElement;
-import org.w3c.dom.smil.Time;
-import org.w3c.dom.smil.TimeList;
-
-import java.util.ArrayList;
-
-public abstract class ElementParallelTimeContainerImpl extends ElementTimeContainerImpl
-        implements ElementParallelTimeContainer {
-    private final static String ENDSYNC_ATTRIBUTE_NAME = "endsync";
-    private final static String ENDSYNC_FIRST = "first";
-    private final static String ENDSYNC_LAST  = "last";
-    private final static String ENDSYNC_ALL   = "all";
-    private final static String ENDSYNC_MEDIA = "media";
-
-    /*
-     * Internal Interface
-     */
-
-    ElementParallelTimeContainerImpl(SMILElement element) {
-        super(element);
-    }
-
-    public String getEndSync() {
-        String endsync = mSmilElement.getAttribute(ENDSYNC_ATTRIBUTE_NAME);
-        if ((endsync == null) || (endsync.length() == 0)) {
-            setEndSync(ENDSYNC_LAST);
-            return ENDSYNC_LAST;
-        }
-        if (ENDSYNC_FIRST.equals(endsync) || ENDSYNC_LAST.equals(endsync) ||
-                ENDSYNC_ALL.equals(endsync) || ENDSYNC_MEDIA.equals(endsync)) {
-            return endsync;
-        }
-
-        // FIXME add the checking for ID-Value and smil1.0-Id-value.
-
-        setEndSync(ENDSYNC_LAST);
-        return ENDSYNC_LAST;
-    }
-
-    public void setEndSync(String endSync) throws DOMException {
-        if (ENDSYNC_FIRST.equals(endSync) || ENDSYNC_LAST.equals(endSync) ||
-                ENDSYNC_ALL.equals(endSync) || ENDSYNC_MEDIA.equals(endSync)) {
-            mSmilElement.setAttribute(ENDSYNC_ATTRIBUTE_NAME, endSync);
-        } else { // FIXME add the support for ID-Value and smil1.0-Id-value.
-            throw new DOMException(DOMException.NOT_SUPPORTED_ERR,
-                    "Unsupported endsync value" + endSync);
-        }
-    }
-
-    @Override
-    public float getDur() {
-        float dur = super.getDur();
-        if (dur == 0) {
-            dur = getImplicitDuration();
-        }
-        return dur;
-    }
-
-    public float getImplicitDuration() {
-        float dur = -1.0F;
-        if (ENDSYNC_LAST.equals(getEndSync())) {
-            NodeList children = getTimeChildren();
-            for (int i = 0; i < children.getLength(); ++i) {
-                ElementTime child = (ElementTime) children.item(i);
-                TimeList endTimeList = child.getEnd();
-                for (int j = 0; j < endTimeList.getLength(); ++j) {
-                    Time endTime = endTimeList.item(j);
-                    if (endTime.getTimeType() == Time.SMIL_TIME_INDEFINITE) {
-                        // Return "indefinite" here.
-                        return -1.0F;
-                    }
-                    if (endTime.getResolved()) {
-                        float end = (float)endTime.getResolvedOffset();
-                        dur = (end > dur) ? end : dur;
-                    }
-                }
-            }
-        } // Other endsync types are not supported now.
-
-        return dur;
-    }
-
-    public NodeList getActiveChildrenAt(float instant) {
-        /*
-         * Find the closest Time of ElementTime before instant.
-         * Add ElementTime to list of active elements if the Time belongs to the begin-list,
-         * do not add it otherwise.
-         */
-        ArrayList<Node> activeChildren = new ArrayList<Node>();
-        NodeList children = getTimeChildren();
-        int childrenLen = children.getLength();
-        for (int i = 0; i < childrenLen; ++i) {
-            double maxOffset = 0.0;
-            boolean active = false;
-            ElementTime child = (ElementTime) children.item(i);
-
-            TimeList beginList = child.getBegin();
-            int len = beginList.getLength();
-            for (int j = 0; j < len; ++j) {
-                Time begin = beginList.item(j);
-                if (begin.getResolved()) {
-                    double resolvedOffset = begin.getResolvedOffset() * 1000.0;
-                    if ((resolvedOffset <= instant) && (resolvedOffset >= maxOffset)) {
-                        maxOffset = resolvedOffset;
-                        active = true;
-                    }
-                }
-            }
-
-            TimeList endList = child.getEnd();
-            len = endList.getLength();
-            for (int j = 0; j < len; ++j) {
-                Time end = endList.item(j);
-                if (end.getResolved()) {
-                    double resolvedOffset = end.getResolvedOffset() * 1000.0;
-                    if ((resolvedOffset <= instant) && (resolvedOffset >= maxOffset)) {
-                        maxOffset = resolvedOffset;
-                        active = false;
-                    }
-                }
-            }
-
-            if (active) {
-                activeChildren.add((Node) child);
-            }
-        }
-        return new NodeListImpl(activeChildren);
-    }
-}
+/*
+ * Copyright (C) 2007-2008 Esmertec AG.
+ * Copyright (C) 2007-2008 The Android Open Source Project
+ *
+ * Licensed under the Apache License, Version 2.0 (the "License");
+ * you may not use this file except in compliance with the License.
+ * You may obtain a copy of the License at
+ *
+ *      http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing, software
+ * distributed under the License is distributed on an "AS IS" BASIS,
+ * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ * See the License for the specific language governing permissions and
+ * limitations under the License.
+ */
+
+package com.android.mms.dom.smil;
+
+import com.android.mms.dom.NodeListImpl;
+import org.w3c.dom.DOMException;
+import org.w3c.dom.Node;
+import org.w3c.dom.NodeList;
+import org.w3c.dom.smil.ElementParallelTimeContainer;
+import org.w3c.dom.smil.ElementTime;
+import org.w3c.dom.smil.SMILElement;
+import org.w3c.dom.smil.Time;
+import org.w3c.dom.smil.TimeList;
+
+import java.util.ArrayList;
+
+public abstract class ElementParallelTimeContainerImpl extends ElementTimeContainerImpl
+        implements ElementParallelTimeContainer {
+    private final static String ENDSYNC_ATTRIBUTE_NAME = "endsync";
+    private final static String ENDSYNC_FIRST = "first";
+    private final static String ENDSYNC_LAST  = "last";
+    private final static String ENDSYNC_ALL   = "all";
+    private final static String ENDSYNC_MEDIA = "media";
+
+    /*
+     * Internal Interface
+     */
+
+    ElementParallelTimeContainerImpl(SMILElement element) {
+        super(element);
+    }
+
+    public String getEndSync() {
+        String endsync = mSmilElement.getAttribute(ENDSYNC_ATTRIBUTE_NAME);
+        if ((endsync == null) || (endsync.length() == 0)) {
+            setEndSync(ENDSYNC_LAST);
+            return ENDSYNC_LAST;
+        }
+        if (ENDSYNC_FIRST.equals(endsync) || ENDSYNC_LAST.equals(endsync) ||
+                ENDSYNC_ALL.equals(endsync) || ENDSYNC_MEDIA.equals(endsync)) {
+            return endsync;
+        }
+
+        // FIXME add the checking for ID-Value and smil1.0-Id-value.
+
+        setEndSync(ENDSYNC_LAST);
+        return ENDSYNC_LAST;
+    }
+
+    public void setEndSync(String endSync) throws DOMException {
+        if (ENDSYNC_FIRST.equals(endSync) || ENDSYNC_LAST.equals(endSync) ||
+                ENDSYNC_ALL.equals(endSync) || ENDSYNC_MEDIA.equals(endSync)) {
+            mSmilElement.setAttribute(ENDSYNC_ATTRIBUTE_NAME, endSync);
+        } else { // FIXME add the support for ID-Value and smil1.0-Id-value.
+            throw new DOMException(DOMException.NOT_SUPPORTED_ERR,
+                    "Unsupported endsync value" + endSync);
+        }
+    }
+
+    @Override
+    public float getDur() {
+        float dur = super.getDur();
+        if (dur == 0) {
+            dur = getImplicitDuration();
+        }
+        return dur;
+    }
+
+    public float getImplicitDuration() {
+        float dur = -1.0F;
+        if (ENDSYNC_LAST.equals(getEndSync())) {
+            NodeList children = getTimeChildren();
+            for (int i = 0; i < children.getLength(); ++i) {
+                ElementTime child = (ElementTime) children.item(i);
+                TimeList endTimeList = child.getEnd();
+                for (int j = 0; j < endTimeList.getLength(); ++j) {
+                    Time endTime = endTimeList.item(j);
+                    if (endTime.getTimeType() == Time.SMIL_TIME_INDEFINITE) {
+                        // Return "indefinite" here.
+                        return -1.0F;
+                    }
+                    if (endTime.getResolved()) {
+                        float end = (float)endTime.getResolvedOffset();
+                        dur = (end > dur) ? end : dur;
+                    }
+                }
+            }
+        } // Other endsync types are not supported now.
+
+        return dur;
+    }
+
+    public NodeList getActiveChildrenAt(float instant) {
+        /*
+         * Find the closest Time of ElementTime before instant.
+         * Add ElementTime to list of active elements if the Time belongs to the begin-list,
+         * do not add it otherwise.
+         */
+        ArrayList<Node> activeChildren = new ArrayList<Node>();
+        NodeList children = getTimeChildren();
+        int childrenLen = children.getLength();
+        for (int i = 0; i < childrenLen; ++i) {
+            double maxOffset = 0.0;
+            boolean active = false;
+            ElementTime child = (ElementTime) children.item(i);
+
+            TimeList beginList = child.getBegin();
+            int len = beginList.getLength();
+            for (int j = 0; j < len; ++j) {
+                Time begin = beginList.item(j);
+                if (begin.getResolved()) {
+                    double resolvedOffset = begin.getResolvedOffset() * 1000.0;
+                    if ((resolvedOffset <= instant) && (resolvedOffset >= maxOffset)) {
+                        maxOffset = resolvedOffset;
+                        active = true;
+                    }
+                }
+            }
+
+            TimeList endList = child.getEnd();
+            len = endList.getLength();
+            for (int j = 0; j < len; ++j) {
+                Time end = endList.item(j);
+                if (end.getResolved()) {
+                    double resolvedOffset = end.getResolvedOffset() * 1000.0;
+                    if ((resolvedOffset <= instant) && (resolvedOffset >= maxOffset)) {
+                        maxOffset = resolvedOffset;
+                        active = false;
+                    }
+                }
+            }
+
+            if (active) {
+                activeChildren.add((Node) child);
+            }
+        }
+        return new NodeListImpl(activeChildren);
+    }
+}
diff --git a/android-smsmms/src/main/java/com/android/mms/dom/smil/ElementSequentialTimeContainerImpl.java b/android-smsmms/src/main/java/com/android/mms/dom/smil/ElementSequentialTimeContainerImpl.java
index 801ae527d..6bfd20506 100755
--- a/android-smsmms/src/main/java/com/android/mms/dom/smil/ElementSequentialTimeContainerImpl.java
+++ b/android-smsmms/src/main/java/com/android/mms/dom/smil/ElementSequentialTimeContainerImpl.java
@@ -1,72 +1,72 @@
-/*
- * Copyright (C) 2007 Esmertec AG.
- * Copyright (C) 2007 The Android Open Source Project
- *
- * Licensed under the Apache License, Version 2.0 (the "License");
- * you may not use this file except in compliance with the License.
- * You may obtain a copy of the License at
- *
- *      http://www.apache.org/licenses/LICENSE-2.0
- *
- * Unless required by applicable law or agreed to in writing, software
- * distributed under the License is distributed on an "AS IS" BASIS,
- * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
- * See the License for the specific language governing permissions and
- * limitations under the License.
- */
-
-package com.android.mms.dom.smil;
-
-import com.android.mms.dom.NodeListImpl;
-import org.w3c.dom.Node;
-import org.w3c.dom.NodeList;
-import org.w3c.dom.smil.ElementSequentialTimeContainer;
-import org.w3c.dom.smil.ElementTime;
-import org.w3c.dom.smil.SMILElement;
-
-import java.util.ArrayList;
-
-public abstract class ElementSequentialTimeContainerImpl extends
-        ElementTimeContainerImpl implements ElementSequentialTimeContainer {
-
-    /*
-     * Internal Interface
-     */
-
-    ElementSequentialTimeContainerImpl(SMILElement element) {
-        super(element);
-    }
-
-    /*
-     * ElementSequentialTimeContainer Interface
-     */
-
-    public NodeList getActiveChildrenAt(float instant) {
-        NodeList allChildren = this.getTimeChildren();
-        ArrayList<Node> nodes = new ArrayList<Node>();
-        for (int i = 0; i < allChildren.getLength(); i++) {
-            instant -= ((ElementTime) allChildren.item(i)).getDur();
-            if (instant < 0) {
-                nodes.add(allChildren.item(i));
-                return new NodeListImpl(nodes);
-            }
-        }
-        return new NodeListImpl(nodes);
-    }
-
-    public float getDur() {
-        float dur = super.getDur();
-        if (dur == 0) {
-            NodeList children = getTimeChildren();
-            for (int i = 0; i < children.getLength(); ++i) {
-                ElementTime child = (ElementTime) children.item(i);
-                if (child.getDur() < 0) {
-                    // Return "indefinite" since containing a child whose duration is indefinite.
-                    return -1.0F;
-                }
-                dur += child.getDur();
-            }
-        }
-        return dur;
-    }
-}
+/*
+ * Copyright (C) 2007 Esmertec AG.
+ * Copyright (C) 2007 The Android Open Source Project
+ *
+ * Licensed under the Apache License, Version 2.0 (the "License");
+ * you may not use this file except in compliance with the License.
+ * You may obtain a copy of the License at
+ *
+ *      http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing, software
+ * distributed under the License is distributed on an "AS IS" BASIS,
+ * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ * See the License for the specific language governing permissions and
+ * limitations under the License.
+ */
+
+package com.android.mms.dom.smil;
+
+import com.android.mms.dom.NodeListImpl;
+import org.w3c.dom.Node;
+import org.w3c.dom.NodeList;
+import org.w3c.dom.smil.ElementSequentialTimeContainer;
+import org.w3c.dom.smil.ElementTime;
+import org.w3c.dom.smil.SMILElement;
+
+import java.util.ArrayList;
+
+public abstract class ElementSequentialTimeContainerImpl extends
+        ElementTimeContainerImpl implements ElementSequentialTimeContainer {
+
+    /*
+     * Internal Interface
+     */
+
+    ElementSequentialTimeContainerImpl(SMILElement element) {
+        super(element);
+    }
+
+    /*
+     * ElementSequentialTimeContainer Interface
+     */
+
+    public NodeList getActiveChildrenAt(float instant) {
+        NodeList allChildren = this.getTimeChildren();
+        ArrayList<Node> nodes = new ArrayList<Node>();
+        for (int i = 0; i < allChildren.getLength(); i++) {
+            instant -= ((ElementTime) allChildren.item(i)).getDur();
+            if (instant < 0) {
+                nodes.add(allChildren.item(i));
+                return new NodeListImpl(nodes);
+            }
+        }
+        return new NodeListImpl(nodes);
+    }
+
+    public float getDur() {
+        float dur = super.getDur();
+        if (dur == 0) {
+            NodeList children = getTimeChildren();
+            for (int i = 0; i < children.getLength(); ++i) {
+                ElementTime child = (ElementTime) children.item(i);
+                if (child.getDur() < 0) {
+                    // Return "indefinite" since containing a child whose duration is indefinite.
+                    return -1.0F;
+                }
+                dur += child.getDur();
+            }
+        }
+        return dur;
+    }
+}
diff --git a/android-smsmms/src/main/java/com/android/mms/dom/smil/ElementTimeContainerImpl.java b/android-smsmms/src/main/java/com/android/mms/dom/smil/ElementTimeContainerImpl.java
index eca14cf31..bcf9d6120 100755
--- a/android-smsmms/src/main/java/com/android/mms/dom/smil/ElementTimeContainerImpl.java
+++ b/android-smsmms/src/main/java/com/android/mms/dom/smil/ElementTimeContainerImpl.java
@@ -1,33 +1,33 @@
-/*
- * Copyright (C) 2007 Esmertec AG.
- * Copyright (C) 2007 The Android Open Source Project
- *
- * Licensed under the Apache License, Version 2.0 (the "License");
- * you may not use this file except in compliance with the License.
- * You may obtain a copy of the License at
- *
- *      http://www.apache.org/licenses/LICENSE-2.0
- *
- * Unless required by applicable law or agreed to in writing, software
- * distributed under the License is distributed on an "AS IS" BASIS,
- * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
- * See the License for the specific language governing permissions and
- * limitations under the License.
- */
-
-package com.android.mms.dom.smil;
-
-import org.w3c.dom.smil.ElementTimeContainer;
-import org.w3c.dom.smil.SMILElement;
-
-public abstract class ElementTimeContainerImpl extends ElementTimeImpl implements
-        ElementTimeContainer {
-
-    /*
-     * Internal Interface
-     */
-
-    ElementTimeContainerImpl(SMILElement element) {
-        super(element);
-    }
-}
+/*
+ * Copyright (C) 2007 Esmertec AG.
+ * Copyright (C) 2007 The Android Open Source Project
+ *
+ * Licensed under the Apache License, Version 2.0 (the "License");
+ * you may not use this file except in compliance with the License.
+ * You may obtain a copy of the License at
+ *
+ *      http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing, software
+ * distributed under the License is distributed on an "AS IS" BASIS,
+ * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ * See the License for the specific language governing permissions and
+ * limitations under the License.
+ */
+
+package com.android.mms.dom.smil;
+
+import org.w3c.dom.smil.ElementTimeContainer;
+import org.w3c.dom.smil.SMILElement;
+
+public abstract class ElementTimeContainerImpl extends ElementTimeImpl implements
+        ElementTimeContainer {
+
+    /*
+     * Internal Interface
+     */
+
+    ElementTimeContainerImpl(SMILElement element) {
+        super(element);
+    }
+}
diff --git a/android-smsmms/src/main/java/com/android/mms/dom/smil/ElementTimeImpl.java b/android-smsmms/src/main/java/com/android/mms/dom/smil/ElementTimeImpl.java
index 7bee39013..e78df88f5 100755
--- a/android-smsmms/src/main/java/com/android/mms/dom/smil/ElementTimeImpl.java
+++ b/android-smsmms/src/main/java/com/android/mms/dom/smil/ElementTimeImpl.java
@@ -1,345 +1,345 @@
-/*
- * Copyright 2014 Jacob Klinker
- *
- * Licensed under the Apache License, Version 2.0 (the "License");
- * you may not use this file except in compliance with the License.
- * You may obtain a copy of the License at
- *
- *     http://www.apache.org/licenses/LICENSE-2.0
- *
- * Unless required by applicable law or agreed to in writing, software
- * distributed under the License is distributed on an "AS IS" BASIS,
- * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
- * See the License for the specific language governing permissions and
- * limitations under the License.
- */
-
-package com.android.mms.dom.smil;
-
-import org.w3c.dom.DOMException;
-import org.w3c.dom.smil.ElementTime;
-import org.w3c.dom.smil.SMILElement;
-import org.w3c.dom.smil.Time;
-import org.w3c.dom.smil.TimeList;
-import timber.log.Timber;
-
-import java.util.ArrayList;
-
-public abstract class ElementTimeImpl implements ElementTime {
-
-    private static final String FILL_REMOVE_ATTRIBUTE = "remove";
-    private static final String FILL_FREEZE_ATTRIBUTE = "freeze";
-    private static final String FILL_HOLD_ATTRIBUTE = "hold";
-    private static final String FILL_TRANSITION_ATTRIBUTE = "transition";
-    private static final String FILL_AUTO_ATTRIBUTE   = "auto";
-    private static final String FILL_ATTRIBUTE_NAME   = "fill";
-    private static final String FILLDEFAULT_ATTRIBUTE_NAME   = "fillDefault";
-
-    final SMILElement mSmilElement;
-
-    /*
-     * Internal Interface
-     */
-    ElementTimeImpl(SMILElement element) {
-        mSmilElement = element;
-    }
-
-    // Default implementation. Override if required.
-    int getBeginConstraints() {
-        return TimeImpl.ALLOW_ALL;
-    }
-
-    // Default implementation. Override if required
-    int getEndConstraints() {
-        return TimeImpl.ALLOW_ALL;
-    }
-
-    /**
-     * To get the parent node on the ElementTime tree. It is in opposition to getTimeChildren.
-     * @return the parent ElementTime. Returns <code>null</code> if there is no parent.
-     */
-    abstract ElementTime getParentElementTime();
-
-    /*
-     * ElementTime Interface
-     */
-
-    public TimeList getBegin() {
-        String[] beginTimeStringList = mSmilElement.getAttribute("begin").split(";");
-
-        // TODO: Check other constraints on parsed values, e.g., "single, non-negative offset values
-        ArrayList<Time> beginTimeList = new ArrayList<Time>();
-        // Initialize Time instances and add them to Vector
-        for (int i = 0; i < beginTimeStringList.length; i++) {
-            try {
-                beginTimeList.add(new TimeImpl(beginTimeStringList[i], getBeginConstraints()));
-            } catch (IllegalArgumentException e) {
-                // Ignore badly formatted times
-            }
-        }
-        if (beginTimeList.size() == 0) {
-            /*
-             * What is the right default value?
-             *
-             * In MMS SMIL, this method may be called either on an instance of:
-             *
-             * 1 - ElementSequentialTimeContainer (The SMILDocument)
-             * 2 - ElementParallelTimeContainer (A Time-Child of the SMILDocument, which is a seq)
-             * 3 - ElementTime (A SMILMediaElement).
-             *
-             * 1 - In the first case, the default start time is obviously 0.
-             * 2 - In the second case, the specifications mentions that
-             *      "For children of a sequence, the only legal value for begin is
-             *      a (single) non-negative offset value. The default begin value is 0."
-             * 3 - In the third case, the specification mentions that
-             *      "The default value of begin for children of a par is 0."
-             *
-             * In short, if no value is specified, the default is always 0.
-             */
-
-            beginTimeList.add(new TimeImpl("0", TimeImpl.ALLOW_ALL));
-        }
-        return new TimeListImpl(beginTimeList);
-    }
-
-    public float getDur() {
-        float dur = 0;
-        try {
-            String durString = mSmilElement.getAttribute("dur");
-            if (durString != null) {
-                dur = TimeImpl.parseClockValue(durString) / 1000f;
-            }
-        } catch (IllegalArgumentException e) {
-            // Do nothing and return the minimum value
-        }
-
-        return dur;
-    }
-
-    public TimeList getEnd() {
-        ArrayList<Time> endTimeList = new ArrayList<Time>();
-
-        String[] endTimeStringList = mSmilElement.getAttribute("end").split(";");
-        int len = endTimeStringList.length;
-        if (!((len == 1) && (endTimeStringList[0].length() == 0))) {  // Ensure the end field is set.
-            // Initialize Time instances and add them to Vector
-            for (int i = 0; i < len; i++) {
-                try {
-                    endTimeList.add(new TimeImpl(endTimeStringList[i],
-                            getEndConstraints()));
-                } catch (IllegalArgumentException e) {
-                    // Ignore badly formatted times
-                    Timber.e(e, "Malformed time value.");
-                }
-            }
-        }
-
-        // "end" time is not specified
-        if (endTimeList.size() == 0) {
-            // Get duration
-            float duration = getDur();
-
-            if (duration < 0) {
-                endTimeList.add(new TimeImpl("indefinite", getEndConstraints()));
-            } else {
-                // Get begin
-                TimeList begin = getBegin();
-                for (int i = 0; i < begin.getLength(); i++) {
-                    endTimeList.add(new TimeImpl(
-                            // end = begin + dur
-                            begin.item(i).getResolvedOffset() + duration + "s",
-                            getEndConstraints()));
-                }
-            }
-        }
-
-        return new TimeListImpl(endTimeList);
-    }
-
-    private boolean beginAndEndAreZero() {
-        TimeList begin = getBegin();
-        TimeList end = getEnd();
-        if (begin.getLength() == 1 && end.getLength() == 1) {
-            Time beginTime = begin.item(0);
-            Time endTime = end.item(0);
-            return beginTime.getOffset() == 0. && endTime.getOffset() == 0.;
-        }
-        return false;
-    }
-
-    public short getFill() {
-        String fill = mSmilElement.getAttribute(FILL_ATTRIBUTE_NAME);
-        if (fill.equalsIgnoreCase(FILL_FREEZE_ATTRIBUTE)) {
-            return FILL_FREEZE;
-        } else if (fill.equalsIgnoreCase(FILL_REMOVE_ATTRIBUTE)) {
-            return FILL_REMOVE;
-        } else if (fill.equalsIgnoreCase(FILL_HOLD_ATTRIBUTE)) {
-            // FIXME handle it as freeze for now
-            return FILL_FREEZE;
-        } else if (fill.equalsIgnoreCase(FILL_TRANSITION_ATTRIBUTE)) {
-            // FIXME handle it as freeze for now
-            return FILL_FREEZE;
-        } else if (!fill.equalsIgnoreCase(FILL_AUTO_ATTRIBUTE)) {
-            /*
-             * fill = default
-             * The fill behavior for the element is determined by the value of the fillDefault
-             * attribute.  This is the default value.
-             */
-            short fillDefault = getFillDefault();
-            if (fillDefault != FILL_AUTO) {
-                return fillDefault;
-            }
-        }
-
-        /*
-         * fill = auto
-         * The fill behavior for this element depends on whether the element specifies any of
-         * the attributes that define the simple or active duration:
-         *  - If none of the attributes dur, end, repeatCount or repeatDur are specified on
-         *    the element, then the element will have a fill behavior identical to that if it were
-         *    specified as "freeze".
-         *  - Otherwise, the element will have a fill behavior identical to that if it were
-         *    specified as "remove".
-         */
-        if (((mSmilElement.getAttribute("dur").length() == 0) &&
-                (mSmilElement.getAttribute("end").length() == 0) &&
-                (mSmilElement.getAttribute("repeatCount").length() == 0) &&
-                (mSmilElement.getAttribute("repeatDur").length() == 0)) ||
-                beginAndEndAreZero()) {
-            return FILL_FREEZE;
-        } else {
-            return FILL_REMOVE;
-        }
-    }
-
-    public short getFillDefault() {
-        String fillDefault = mSmilElement.getAttribute(FILLDEFAULT_ATTRIBUTE_NAME);
-        if (fillDefault.equalsIgnoreCase(FILL_REMOVE_ATTRIBUTE)) {
-            return FILL_REMOVE;
-        } else if (fillDefault.equalsIgnoreCase(FILL_FREEZE_ATTRIBUTE)) {
-            return FILL_FREEZE;
-        } else if (fillDefault.equalsIgnoreCase(FILL_AUTO_ATTRIBUTE)) {
-            return FILL_AUTO;
-        } else if (fillDefault.equalsIgnoreCase(FILL_HOLD_ATTRIBUTE)) {
-            // FIXME handle it as freeze for now
-            return FILL_FREEZE;
-        } else if (fillDefault.equalsIgnoreCase(FILL_TRANSITION_ATTRIBUTE)) {
-            // FIXME handle it as freeze for now
-            return FILL_FREEZE;
-        } else {
-            /*
-             * fillDefault = inherit
-             * Specifies that the value of this attribute (and of the fill behavior) are
-             * inherited from the fillDefault value of the parent element.
-             * This is the default value.
-             */
-            ElementTime parent = getParentElementTime();
-            if (parent == null) {
-                /*
-                 * fillDefault = auto
-                 * If there is no parent element, the value is "auto".
-                 */
-                return FILL_AUTO;
-            } else {
-                return ((ElementTimeImpl) parent).getFillDefault();
-            }
-        }
-    }
-
-    public float getRepeatCount() {
-        String repeatCount = mSmilElement.getAttribute("repeatCount");
-        try {
-            float value = Float.parseFloat(repeatCount);
-            if (value > 0) {
-                return value;
-            } else {
-                return 0; // default
-            }
-        } catch (NumberFormatException e) {
-            return 0; // default
-        }
-    }
-
-    public float getRepeatDur() {
-        try {
-            float repeatDur =
-                TimeImpl.parseClockValue(mSmilElement.getAttribute("repeatDur"));
-            if (repeatDur > 0) {
-                return repeatDur;
-            } else {
-                return 0; // default
-            }
-        } catch (IllegalArgumentException e) {
-            return 0; // default
-        }
-    }
-
-    public short getRestart() {
-        String restart = mSmilElement.getAttribute("restart");
-        if (restart.equalsIgnoreCase("never")) {
-            return RESTART_NEVER;
-        } else if (restart.equalsIgnoreCase("whenNotActive")) {
-            return RESTART_WHEN_NOT_ACTIVE;
-        } else {
-            return RESTART_ALWAYS; // default
-        }
-    }
-
-    public void setBegin(TimeList begin) throws DOMException {
-        // TODO Implement this
-        mSmilElement.setAttribute("begin", "indefinite");
-    }
-
-    public void setDur(float dur) throws DOMException {
-        // In SMIL 3.0, the dur could be a timecount-value which may contain fractions.
-        // However, in MMS 1.3, the dur SHALL be expressed in integer milliseconds.
-        mSmilElement.setAttribute("dur", Integer.toString((int)(dur * 1000)) + "ms");
-    }
-
-    public void setEnd(TimeList end) throws DOMException {
-        // TODO Implement this
-        mSmilElement.setAttribute("end", "indefinite");
-    }
-
-    public void setFill(short fill) throws DOMException {
-        if (fill == FILL_FREEZE) {
-            mSmilElement.setAttribute(FILL_ATTRIBUTE_NAME, FILL_FREEZE_ATTRIBUTE);
-        } else {
-            mSmilElement.setAttribute(FILL_ATTRIBUTE_NAME, FILL_REMOVE_ATTRIBUTE); // default
-        }
-    }
-
-    public void setFillDefault(short fillDefault) throws DOMException {
-        if (fillDefault == FILL_FREEZE) {
-            mSmilElement.setAttribute(FILLDEFAULT_ATTRIBUTE_NAME, FILL_FREEZE_ATTRIBUTE);
-        } else {
-            mSmilElement.setAttribute(FILLDEFAULT_ATTRIBUTE_NAME, FILL_REMOVE_ATTRIBUTE);
-        }
-    }
-
-    public void setRepeatCount(float repeatCount) throws DOMException {
-        String repeatCountString = "indefinite";
-        if (repeatCount > 0) {
-            repeatCountString = Float.toString(repeatCount);
-        }
-        mSmilElement.setAttribute("repeatCount", repeatCountString);
-    }
-
-    public void setRepeatDur(float repeatDur) throws DOMException {
-        String repeatDurString = "indefinite";
-        if (repeatDur > 0) {
-            repeatDurString = Float.toString(repeatDur) + "ms";
-        }
-        mSmilElement.setAttribute("repeatDur", repeatDurString);
-    }
-
-    public void setRestart(short restart) throws DOMException {
-        if (restart == RESTART_NEVER) {
-            mSmilElement.setAttribute("restart", "never");
-        } else if (restart == RESTART_WHEN_NOT_ACTIVE) {
-            mSmilElement.setAttribute("restart", "whenNotActive");
-        } else {
-            mSmilElement.setAttribute("restart", "always");
-        }
-    }
-}
+/*
+ * Copyright 2014 Jacob Klinker
+ *
+ * Licensed under the Apache License, Version 2.0 (the "License");
+ * you may not use this file except in compliance with the License.
+ * You may obtain a copy of the License at
+ *
+ *     http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing, software
+ * distributed under the License is distributed on an "AS IS" BASIS,
+ * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ * See the License for the specific language governing permissions and
+ * limitations under the License.
+ */
+
+package com.android.mms.dom.smil;
+
+import org.w3c.dom.DOMException;
+import org.w3c.dom.smil.ElementTime;
+import org.w3c.dom.smil.SMILElement;
+import org.w3c.dom.smil.Time;
+import org.w3c.dom.smil.TimeList;
+import timber.log.Timber;
+
+import java.util.ArrayList;
+
+public abstract class ElementTimeImpl implements ElementTime {
+
+    private static final String FILL_REMOVE_ATTRIBUTE = "remove";
+    private static final String FILL_FREEZE_ATTRIBUTE = "freeze";
+    private static final String FILL_HOLD_ATTRIBUTE = "hold";
+    private static final String FILL_TRANSITION_ATTRIBUTE = "transition";
+    private static final String FILL_AUTO_ATTRIBUTE   = "auto";
+    private static final String FILL_ATTRIBUTE_NAME   = "fill";
+    private static final String FILLDEFAULT_ATTRIBUTE_NAME   = "fillDefault";
+
+    final SMILElement mSmilElement;
+
+    /*
+     * Internal Interface
+     */
+    ElementTimeImpl(SMILElement element) {
+        mSmilElement = element;
+    }
+
+    // Default implementation. Override if required.
+    int getBeginConstraints() {
+        return TimeImpl.ALLOW_ALL;
+    }
+
+    // Default implementation. Override if required
+    int getEndConstraints() {
+        return TimeImpl.ALLOW_ALL;
+    }
+
+    /**
+     * To get the parent node on the ElementTime tree. It is in opposition to getTimeChildren.
+     * @return the parent ElementTime. Returns <code>null</code> if there is no parent.
+     */
+    abstract ElementTime getParentElementTime();
+
+    /*
+     * ElementTime Interface
+     */
+
+    public TimeList getBegin() {
+        String[] beginTimeStringList = mSmilElement.getAttribute("begin").split(";");
+
+        // TODO: Check other constraints on parsed values, e.g., "single, non-negative offset values
+        ArrayList<Time> beginTimeList = new ArrayList<Time>();
+        // Initialize Time instances and add them to Vector
+        for (int i = 0; i < beginTimeStringList.length; i++) {
+            try {
+                beginTimeList.add(new TimeImpl(beginTimeStringList[i], getBeginConstraints()));
+            } catch (IllegalArgumentException e) {
+                // Ignore badly formatted times
+            }
+        }
+        if (beginTimeList.size() == 0) {
+            /*
+             * What is the right default value?
+             *
+             * In MMS SMIL, this method may be called either on an instance of:
+             *
+             * 1 - ElementSequentialTimeContainer (The SMILDocument)
+             * 2 - ElementParallelTimeContainer (A Time-Child of the SMILDocument, which is a seq)
+             * 3 - ElementTime (A SMILMediaElement).
+             *
+             * 1 - In the first case, the default start time is obviously 0.
+             * 2 - In the second case, the specifications mentions that
+             *      "For children of a sequence, the only legal value for begin is
+             *      a (single) non-negative offset value. The default begin value is 0."
+             * 3 - In the third case, the specification mentions that
+             *      "The default value of begin for children of a par is 0."
+             *
+             * In short, if no value is specified, the default is always 0.
+             */
+
+            beginTimeList.add(new TimeImpl("0", TimeImpl.ALLOW_ALL));
+        }
+        return new TimeListImpl(beginTimeList);
+    }
+
+    public float getDur() {
+        float dur = 0;
+        try {
+            String durString = mSmilElement.getAttribute("dur");
+            if (durString != null) {
+                dur = TimeImpl.parseClockValue(durString) / 1000f;
+            }
+        } catch (IllegalArgumentException e) {
+            // Do nothing and return the minimum value
+        }
+
+        return dur;
+    }
+
+    public TimeList getEnd() {
+        ArrayList<Time> endTimeList = new ArrayList<Time>();
+
+        String[] endTimeStringList = mSmilElement.getAttribute("end").split(";");
+        int len = endTimeStringList.length;
+        if (!((len == 1) && (endTimeStringList[0].length() == 0))) {  // Ensure the end field is set.
+            // Initialize Time instances and add them to Vector
+            for (int i = 0; i < len; i++) {
+                try {
+                    endTimeList.add(new TimeImpl(endTimeStringList[i],
+                            getEndConstraints()));
+                } catch (IllegalArgumentException e) {
+                    // Ignore badly formatted times
+                    Timber.e(e, "Malformed time value.");
+                }
+            }
+        }
+
+        // "end" time is not specified
+        if (endTimeList.size() == 0) {
+            // Get duration
+            float duration = getDur();
+
+            if (duration < 0) {
+                endTimeList.add(new TimeImpl("indefinite", getEndConstraints()));
+            } else {
+                // Get begin
+                TimeList begin = getBegin();
+                for (int i = 0; i < begin.getLength(); i++) {
+                    endTimeList.add(new TimeImpl(
+                            // end = begin + dur
+                            begin.item(i).getResolvedOffset() + duration + "s",
+                            getEndConstraints()));
+                }
+            }
+        }
+
+        return new TimeListImpl(endTimeList);
+    }
+
+    private boolean beginAndEndAreZero() {
+        TimeList begin = getBegin();
+        TimeList end = getEnd();
+        if (begin.getLength() == 1 && end.getLength() == 1) {
+            Time beginTime = begin.item(0);
+            Time endTime = end.item(0);
+            return beginTime.getOffset() == 0. && endTime.getOffset() == 0.;
+        }
+        return false;
+    }
+
+    public short getFill() {
+        String fill = mSmilElement.getAttribute(FILL_ATTRIBUTE_NAME);
+        if (fill.equalsIgnoreCase(FILL_FREEZE_ATTRIBUTE)) {
+            return FILL_FREEZE;
+        } else if (fill.equalsIgnoreCase(FILL_REMOVE_ATTRIBUTE)) {
+            return FILL_REMOVE;
+        } else if (fill.equalsIgnoreCase(FILL_HOLD_ATTRIBUTE)) {
+            // FIXME handle it as freeze for now
+            return FILL_FREEZE;
+        } else if (fill.equalsIgnoreCase(FILL_TRANSITION_ATTRIBUTE)) {
+            // FIXME handle it as freeze for now
+            return FILL_FREEZE;
+        } else if (!fill.equalsIgnoreCase(FILL_AUTO_ATTRIBUTE)) {
+            /*
+             * fill = default
+             * The fill behavior for the element is determined by the value of the fillDefault
+             * attribute.  This is the default value.
+             */
+            short fillDefault = getFillDefault();
+            if (fillDefault != FILL_AUTO) {
+                return fillDefault;
+            }
+        }
+
+        /*
+         * fill = auto
+         * The fill behavior for this element depends on whether the element specifies any of
+         * the attributes that define the simple or active duration:
+         *  - If none of the attributes dur, end, repeatCount or repeatDur are specified on
+         *    the element, then the element will have a fill behavior identical to that if it were
+         *    specified as "freeze".
+         *  - Otherwise, the element will have a fill behavior identical to that if it were
+         *    specified as "remove".
+         */
+        if (((mSmilElement.getAttribute("dur").length() == 0) &&
+                (mSmilElement.getAttribute("end").length() == 0) &&
+                (mSmilElement.getAttribute("repeatCount").length() == 0) &&
+                (mSmilElement.getAttribute("repeatDur").length() == 0)) ||
+                beginAndEndAreZero()) {
+            return FILL_FREEZE;
+        } else {
+            return FILL_REMOVE;
+        }
+    }
+
+    public short getFillDefault() {
+        String fillDefault = mSmilElement.getAttribute(FILLDEFAULT_ATTRIBUTE_NAME);
+        if (fillDefault.equalsIgnoreCase(FILL_REMOVE_ATTRIBUTE)) {
+            return FILL_REMOVE;
+        } else if (fillDefault.equalsIgnoreCase(FILL_FREEZE_ATTRIBUTE)) {
+            return FILL_FREEZE;
+        } else if (fillDefault.equalsIgnoreCase(FILL_AUTO_ATTRIBUTE)) {
+            return FILL_AUTO;
+        } else if (fillDefault.equalsIgnoreCase(FILL_HOLD_ATTRIBUTE)) {
+            // FIXME handle it as freeze for now
+            return FILL_FREEZE;
+        } else if (fillDefault.equalsIgnoreCase(FILL_TRANSITION_ATTRIBUTE)) {
+            // FIXME handle it as freeze for now
+            return FILL_FREEZE;
+        } else {
+            /*
+             * fillDefault = inherit
+             * Specifies that the value of this attribute (and of the fill behavior) are
+             * inherited from the fillDefault value of the parent element.
+             * This is the default value.
+             */
+            ElementTime parent = getParentElementTime();
+            if (parent == null) {
+                /*
+                 * fillDefault = auto
+                 * If there is no parent element, the value is "auto".
+                 */
+                return FILL_AUTO;
+            } else {
+                return ((ElementTimeImpl) parent).getFillDefault();
+            }
+        }
+    }
+
+    public float getRepeatCount() {
+        String repeatCount = mSmilElement.getAttribute("repeatCount");
+        try {
+            float value = Float.parseFloat(repeatCount);
+            if (value > 0) {
+                return value;
+            } else {
+                return 0; // default
+            }
+        } catch (NumberFormatException e) {
+            return 0; // default
+        }
+    }
+
+    public float getRepeatDur() {
+        try {
+            float repeatDur =
+                TimeImpl.parseClockValue(mSmilElement.getAttribute("repeatDur"));
+            if (repeatDur > 0) {
+                return repeatDur;
+            } else {
+                return 0; // default
+            }
+        } catch (IllegalArgumentException e) {
+            return 0; // default
+        }
+    }
+
+    public short getRestart() {
+        String restart = mSmilElement.getAttribute("restart");
+        if (restart.equalsIgnoreCase("never")) {
+            return RESTART_NEVER;
+        } else if (restart.equalsIgnoreCase("whenNotActive")) {
+            return RESTART_WHEN_NOT_ACTIVE;
+        } else {
+            return RESTART_ALWAYS; // default
+        }
+    }
+
+    public void setBegin(TimeList begin) throws DOMException {
+        // TODO Implement this
+        mSmilElement.setAttribute("begin", "indefinite");
+    }
+
+    public void setDur(float dur) throws DOMException {
+        // In SMIL 3.0, the dur could be a timecount-value which may contain fractions.
+        // However, in MMS 1.3, the dur SHALL be expressed in integer milliseconds.
+        mSmilElement.setAttribute("dur", Integer.toString((int)(dur * 1000)) + "ms");
+    }
+
+    public void setEnd(TimeList end) throws DOMException {
+        // TODO Implement this
+        mSmilElement.setAttribute("end", "indefinite");
+    }
+
+    public void setFill(short fill) throws DOMException {
+        if (fill == FILL_FREEZE) {
+            mSmilElement.setAttribute(FILL_ATTRIBUTE_NAME, FILL_FREEZE_ATTRIBUTE);
+        } else {
+            mSmilElement.setAttribute(FILL_ATTRIBUTE_NAME, FILL_REMOVE_ATTRIBUTE); // default
+        }
+    }
+
+    public void setFillDefault(short fillDefault) throws DOMException {
+        if (fillDefault == FILL_FREEZE) {
+            mSmilElement.setAttribute(FILLDEFAULT_ATTRIBUTE_NAME, FILL_FREEZE_ATTRIBUTE);
+        } else {
+            mSmilElement.setAttribute(FILLDEFAULT_ATTRIBUTE_NAME, FILL_REMOVE_ATTRIBUTE);
+        }
+    }
+
+    public void setRepeatCount(float repeatCount) throws DOMException {
+        String repeatCountString = "indefinite";
+        if (repeatCount > 0) {
+            repeatCountString = Float.toString(repeatCount);
+        }
+        mSmilElement.setAttribute("repeatCount", repeatCountString);
+    }
+
+    public void setRepeatDur(float repeatDur) throws DOMException {
+        String repeatDurString = "indefinite";
+        if (repeatDur > 0) {
+            repeatDurString = Float.toString(repeatDur) + "ms";
+        }
+        mSmilElement.setAttribute("repeatDur", repeatDurString);
+    }
+
+    public void setRestart(short restart) throws DOMException {
+        if (restart == RESTART_NEVER) {
+            mSmilElement.setAttribute("restart", "never");
+        } else if (restart == RESTART_WHEN_NOT_ACTIVE) {
+            mSmilElement.setAttribute("restart", "whenNotActive");
+        } else {
+            mSmilElement.setAttribute("restart", "always");
+        }
+    }
+}
diff --git a/android-smsmms/src/main/java/com/android/mms/dom/smil/SmilDocumentImpl.java b/android-smsmms/src/main/java/com/android/mms/dom/smil/SmilDocumentImpl.java
index 7c722147e..99551121d 100755
--- a/android-smsmms/src/main/java/com/android/mms/dom/smil/SmilDocumentImpl.java
+++ b/android-smsmms/src/main/java/com/android/mms/dom/smil/SmilDocumentImpl.java
@@ -1,291 +1,291 @@
-/*
- * Copyright 2014 Jacob Klinker
- *
- * Licensed under the Apache License, Version 2.0 (the "License");
- * you may not use this file except in compliance with the License.
- * You may obtain a copy of the License at
- *
- *     http://www.apache.org/licenses/LICENSE-2.0
- *
- * Unless required by applicable law or agreed to in writing, software
- * distributed under the License is distributed on an "AS IS" BASIS,
- * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
- * See the License for the specific language governing permissions and
- * limitations under the License.
- */
-
-package com.android.mms.dom.smil;
-
-import com.android.mms.dom.DocumentImpl;
-import com.android.mms.dom.events.EventImpl;
-import org.w3c.dom.DOMException;
-import org.w3c.dom.Element;
-import org.w3c.dom.Node;
-import org.w3c.dom.NodeList;
-import org.w3c.dom.events.DocumentEvent;
-import org.w3c.dom.events.Event;
-import org.w3c.dom.smil.ElementSequentialTimeContainer;
-import org.w3c.dom.smil.ElementTime;
-import org.w3c.dom.smil.SMILDocument;
-import org.w3c.dom.smil.SMILElement;
-import org.w3c.dom.smil.SMILLayoutElement;
-import org.w3c.dom.smil.TimeList;
-
-public class SmilDocumentImpl extends DocumentImpl implements SMILDocument, DocumentEvent {
-    /*
-     * The sequential time container cannot be initialized here because the real container
-     * is body, which hasn't been created yet. It will be initialized when the body has
-     * already been created. Please see getBody().
-     */
-    ElementSequentialTimeContainer mSeqTimeContainer;
-
-    public final static String SMIL_DOCUMENT_START_EVENT = "SmilDocumentStart";
-    public final static String SMIL_DOCUMENT_END_EVENT = "SimlDocumentEnd";
-
-    /*
-     * Internal methods
-     */
-    public SmilDocumentImpl() {
-        super();
-    }
-
-    /*
-     * ElementSequentialTimeContainer stuff
-     */
-
-    public NodeList getActiveChildrenAt(float instant) {
-        return mSeqTimeContainer.getActiveChildrenAt(instant);
-    }
-
-    public NodeList getTimeChildren() {
-        return mSeqTimeContainer.getTimeChildren();
-    }
-
-    public boolean beginElement() {
-        return mSeqTimeContainer.beginElement();
-    }
-
-    public boolean endElement() {
-        return mSeqTimeContainer.endElement();
-    }
-
-    public TimeList getBegin() {
-        return mSeqTimeContainer.getBegin();
-    }
-
-    public float getDur() {
-        return mSeqTimeContainer.getDur();
-    }
-
-    public TimeList getEnd() {
-        return mSeqTimeContainer.getEnd();
-    }
-
-    public short getFill() {
-        return mSeqTimeContainer.getFill();
-    }
-
-    public short getFillDefault() {
-        return mSeqTimeContainer.getFillDefault();
-    }
-
-    public float getRepeatCount() {
-        return mSeqTimeContainer.getRepeatCount();
-    }
-
-    public float getRepeatDur() {
-        return mSeqTimeContainer.getRepeatDur();
-    }
-
-    public short getRestart() {
-        return mSeqTimeContainer.getRestart();
-    }
-
-    public void pauseElement() {
-        mSeqTimeContainer.pauseElement();
-    }
-
-    public void resumeElement() {
-        mSeqTimeContainer.resumeElement();
-    }
-
-    public void seekElement(float seekTo) {
-        mSeqTimeContainer.seekElement(seekTo);
-    }
-
-    public void setBegin(TimeList begin) throws DOMException {
-        mSeqTimeContainer.setBegin(begin);
-    }
-
-    public void setDur(float dur) throws DOMException {
-        mSeqTimeContainer.setDur(dur);
-    }
-
-    public void setEnd(TimeList end) throws DOMException {
-        mSeqTimeContainer.setEnd(end);
-    }
-
-    public void setFill(short fill) throws DOMException {
-        mSeqTimeContainer.setFill(fill);
-    }
-
-    public void setFillDefault(short fillDefault) throws DOMException {
-        mSeqTimeContainer.setFillDefault(fillDefault);
-    }
-
-    public void setRepeatCount(float repeatCount) throws DOMException {
-        mSeqTimeContainer.setRepeatCount(repeatCount);
-    }
-
-    public void setRepeatDur(float repeatDur) throws DOMException {
-        mSeqTimeContainer.setRepeatDur(repeatDur);
-    }
-
-    public void setRestart(short restart) throws DOMException {
-        mSeqTimeContainer.setRestart(restart);
-    }
-
-    /*
-     * Document Interface
-     */
-
-    @Override
-    public Element createElement(String tagName) throws DOMException {
-        // Find the appropriate class for this element
-        tagName = tagName.toLowerCase();
-        if (tagName.equals("text") ||
-                tagName.equals("img") ||
-                tagName.equals("video")) {
-            return new SmilRegionMediaElementImpl(this, tagName);
-        } else if (tagName.equals("audio")) {
-            return new SmilMediaElementImpl(this, tagName);
-        } else if (tagName.equals("layout")) {
-            return new SmilLayoutElementImpl(this, tagName);
-        } else if (tagName.equals("root-layout")) {
-            return new SmilRootLayoutElementImpl(this, tagName);
-        } else if (tagName.equals("region")) {
-            return new SmilRegionElementImpl(this, tagName);
-        } else if (tagName.equals("ref")) {
-            return new SmilRefElementImpl(this, tagName);
-        } else if (tagName.equals("par")) {
-            return new SmilParElementImpl(this, tagName);
-        } else if (tagName.equals("vcard")) {
-            return new SmilRegionMediaElementImpl(this, tagName);
-        } else {
-            // This includes also the structural nodes SMIL,
-            // HEAD, BODY, for which no specific types are defined.
-            return new SmilElementImpl(this, tagName);
-        }
-    }
-
-    @Override
-    public SMILElement getDocumentElement() {
-        Node rootElement = getFirstChild();
-        if (rootElement == null || !(rootElement instanceof SMILElement)) {
-            // The root doesn't exist. Create a new one.
-            rootElement = createElement("smil");
-            appendChild(rootElement);
-        }
-
-        return (SMILElement) rootElement;
-    }
-
-    /*
-     * SMILElement Interface
-     */
-
-    public SMILElement getHead() {
-        Node rootElement = getDocumentElement();
-        Node headElement = rootElement.getFirstChild();
-        if (headElement == null || !(headElement instanceof SMILElement)) {
-            // The head doesn't exist. Create a new one.
-            headElement = createElement("head");
-            rootElement.appendChild(headElement);
-        }
-
-        return (SMILElement) headElement;
-    }
-
-    public SMILElement getBody() {
-        Node rootElement = getDocumentElement();
-        Node headElement = getHead();
-        Node bodyElement = headElement.getNextSibling();
-        if (bodyElement == null || !(bodyElement instanceof SMILElement)) {
-            // The body doesn't exist. Create a new one.
-            bodyElement = createElement("body");
-            rootElement.appendChild(bodyElement);
-        }
-
-        // Initialize the real sequential time container, which is body.
-        mSeqTimeContainer = new ElementSequentialTimeContainerImpl((SMILElement) bodyElement) {
-            public NodeList getTimeChildren() {
-                return getBody().getElementsByTagName("par");
-            }
-
-            public boolean beginElement() {
-                Event startEvent = createEvent("Event");
-                startEvent.initEvent(SMIL_DOCUMENT_START_EVENT, false, false);
-                dispatchEvent(startEvent);
-                return true;
-            }
-
-            public boolean endElement() {
-                Event endEvent = createEvent("Event");
-                endEvent.initEvent(SMIL_DOCUMENT_END_EVENT, false, false);
-                dispatchEvent(endEvent);
-                return true;
-            }
-
-            public void pauseElement() {
-                // TODO Auto-generated method stub
-
-            }
-
-            public void resumeElement() {
-                // TODO Auto-generated method stub
-
-            }
-
-            public void seekElement(float seekTo) {
-                // TODO Auto-generated method stub
-
-            }
-
-            ElementTime getParentElementTime() {
-                return null;
-            }
-        };
-
-        return (SMILElement) bodyElement;
-    }
-
-    public SMILLayoutElement getLayout() {
-        Node headElement = getHead();
-        Node layoutElement = null;
-
-        // Find the layout element under <code>HEAD</code>
-        layoutElement = headElement.getFirstChild();
-        while ((layoutElement != null) && !(layoutElement instanceof SMILLayoutElement)) {
-            layoutElement = layoutElement.getNextSibling();
-        }
-
-        if (layoutElement == null) {
-            // The layout doesn't exist. Create a default one.
-            layoutElement = new SmilLayoutElementImpl(this, "layout");
-            headElement.appendChild(layoutElement);
-        }
-        return (SMILLayoutElement) layoutElement;
-    }
-
-    /*
-     * DocumentEvent Interface
-     */
-    public Event createEvent(String eventType) throws DOMException {
-        if ("Event".equals(eventType)) {
-            return new EventImpl();
-        } else {
-            throw new DOMException(DOMException.NOT_SUPPORTED_ERR,
-                       "Not supported interface");
-        }
-    }
-}
+/*
+ * Copyright 2014 Jacob Klinker
+ *
+ * Licensed under the Apache License, Version 2.0 (the "License");
+ * you may not use this file except in compliance with the License.
+ * You may obtain a copy of the License at
+ *
+ *     http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing, software
+ * distributed under the License is distributed on an "AS IS" BASIS,
+ * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ * See the License for the specific language governing permissions and
+ * limitations under the License.
+ */
+
+package com.android.mms.dom.smil;
+
+import com.android.mms.dom.DocumentImpl;
+import com.android.mms.dom.events.EventImpl;
+import org.w3c.dom.DOMException;
+import org.w3c.dom.Element;
+import org.w3c.dom.Node;
+import org.w3c.dom.NodeList;
+import org.w3c.dom.events.DocumentEvent;
+import org.w3c.dom.events.Event;
+import org.w3c.dom.smil.ElementSequentialTimeContainer;
+import org.w3c.dom.smil.ElementTime;
+import org.w3c.dom.smil.SMILDocument;
+import org.w3c.dom.smil.SMILElement;
+import org.w3c.dom.smil.SMILLayoutElement;
+import org.w3c.dom.smil.TimeList;
+
+public class SmilDocumentImpl extends DocumentImpl implements SMILDocument, DocumentEvent {
+    /*
+     * The sequential time container cannot be initialized here because the real container
+     * is body, which hasn't been created yet. It will be initialized when the body has
+     * already been created. Please see getBody().
+     */
+    ElementSequentialTimeContainer mSeqTimeContainer;
+
+    public final static String SMIL_DOCUMENT_START_EVENT = "SmilDocumentStart";
+    public final static String SMIL_DOCUMENT_END_EVENT = "SimlDocumentEnd";
+
+    /*
+     * Internal methods
+     */
+    public SmilDocumentImpl() {
+        super();
+    }
+
+    /*
+     * ElementSequentialTimeContainer stuff
+     */
+
+    public NodeList getActiveChildrenAt(float instant) {
+        return mSeqTimeContainer.getActiveChildrenAt(instant);
+    }
+
+    public NodeList getTimeChildren() {
+        return mSeqTimeContainer.getTimeChildren();
+    }
+
+    public boolean beginElement() {
+        return mSeqTimeContainer.beginElement();
+    }
+
+    public boolean endElement() {
+        return mSeqTimeContainer.endElement();
+    }
+
+    public TimeList getBegin() {
+        return mSeqTimeContainer.getBegin();
+    }
+
+    public float getDur() {
+        return mSeqTimeContainer.getDur();
+    }
+
+    public TimeList getEnd() {
+        return mSeqTimeContainer.getEnd();
+    }
+
+    public short getFill() {
+        return mSeqTimeContainer.getFill();
+    }
+
+    public short getFillDefault() {
+        return mSeqTimeContainer.getFillDefault();
+    }
+
+    public float getRepeatCount() {
+        return mSeqTimeContainer.getRepeatCount();
+    }
+
+    public float getRepeatDur() {
+        return mSeqTimeContainer.getRepeatDur();
+    }
+
+    public short getRestart() {
+        return mSeqTimeContainer.getRestart();
+    }
+
+    public void pauseElement() {
+        mSeqTimeContainer.pauseElement();
+    }
+
+    public void resumeElement() {
+        mSeqTimeContainer.resumeElement();
+    }
+
+    public void seekElement(float seekTo) {
+        mSeqTimeContainer.seekElement(seekTo);
+    }
+
+    public void setBegin(TimeList begin) throws DOMException {
+        mSeqTimeContainer.setBegin(begin);
+    }
+
+    public void setDur(float dur) throws DOMException {
+        mSeqTimeContainer.setDur(dur);
+    }
+
+    public void setEnd(TimeList end) throws DOMException {
+        mSeqTimeContainer.setEnd(end);
+    }
+
+    public void setFill(short fill) throws DOMException {
+        mSeqTimeContainer.setFill(fill);
+    }
+
+    public void setFillDefault(short fillDefault) throws DOMException {
+        mSeqTimeContainer.setFillDefault(fillDefault);
+    }
+
+    public void setRepeatCount(float repeatCount) throws DOMException {
+        mSeqTimeContainer.setRepeatCount(repeatCount);
+    }
+
+    public void setRepeatDur(float repeatDur) throws DOMException {
+        mSeqTimeContainer.setRepeatDur(repeatDur);
+    }
+
+    public void setRestart(short restart) throws DOMException {
+        mSeqTimeContainer.setRestart(restart);
+    }
+
+    /*
+     * Document Interface
+     */
+
+    @Override
+    public Element createElement(String tagName) throws DOMException {
+        // Find the appropriate class for this element
+        tagName = tagName.toLowerCase();
+        if (tagName.equals("text") ||
+                tagName.equals("img") ||
+                tagName.equals("video")) {
+            return new SmilRegionMediaElementImpl(this, tagName);
+        } else if (tagName.equals("audio")) {
+            return new SmilMediaElementImpl(this, tagName);
+        } else if (tagName.equals("layout")) {
+            return new SmilLayoutElementImpl(this, tagName);
+        } else if (tagName.equals("root-layout")) {
+            return new SmilRootLayoutElementImpl(this, tagName);
+        } else if (tagName.equals("region")) {
+            return new SmilRegionElementImpl(this, tagName);
+        } else if (tagName.equals("ref")) {
+            return new SmilRefElementImpl(this, tagName);
+        } else if (tagName.equals("par")) {
+            return new SmilParElementImpl(this, tagName);
+        } else if (tagName.equals("vcard")) {
+            return new SmilRegionMediaElementImpl(this, tagName);
+        } else {
+            // This includes also the structural nodes SMIL,
+            // HEAD, BODY, for which no specific types are defined.
+            return new SmilElementImpl(this, tagName);
+        }
+    }
+
+    @Override
+    public SMILElement getDocumentElement() {
+        Node rootElement = getFirstChild();
+        if (rootElement == null || !(rootElement instanceof SMILElement)) {
+            // The root doesn't exist. Create a new one.
+            rootElement = createElement("smil");
+            appendChild(rootElement);
+        }
+
+        return (SMILElement) rootElement;
+    }
+
+    /*
+     * SMILElement Interface
+     */
+
+    public SMILElement getHead() {
+        Node rootElement = getDocumentElement();
+        Node headElement = rootElement.getFirstChild();
+        if (headElement == null || !(headElement instanceof SMILElement)) {
+            // The head doesn't exist. Create a new one.
+            headElement = createElement("head");
+            rootElement.appendChild(headElement);
+        }
+
+        return (SMILElement) headElement;
+    }
+
+    public SMILElement getBody() {
+        Node rootElement = getDocumentElement();
+        Node headElement = getHead();
+        Node bodyElement = headElement.getNextSibling();
+        if (bodyElement == null || !(bodyElement instanceof SMILElement)) {
+            // The body doesn't exist. Create a new one.
+            bodyElement = createElement("body");
+            rootElement.appendChild(bodyElement);
+        }
+
+        // Initialize the real sequential time container, which is body.
+        mSeqTimeContainer = new ElementSequentialTimeContainerImpl((SMILElement) bodyElement) {
+            public NodeList getTimeChildren() {
+                return getBody().getElementsByTagName("par");
+            }
+
+            public boolean beginElement() {
+                Event startEvent = createEvent("Event");
+                startEvent.initEvent(SMIL_DOCUMENT_START_EVENT, false, false);
+                dispatchEvent(startEvent);
+                return true;
+            }
+
+            public boolean endElement() {
+                Event endEvent = createEvent("Event");
+                endEvent.initEvent(SMIL_DOCUMENT_END_EVENT, false, false);
+                dispatchEvent(endEvent);
+                return true;
+            }
+
+            public void pauseElement() {
+                // TODO Auto-generated method stub
+
+            }
+
+            public void resumeElement() {
+                // TODO Auto-generated method stub
+
+            }
+
+            public void seekElement(float seekTo) {
+                // TODO Auto-generated method stub
+
+            }
+
+            ElementTime getParentElementTime() {
+                return null;
+            }
+        };
+
+        return (SMILElement) bodyElement;
+    }
+
+    public SMILLayoutElement getLayout() {
+        Node headElement = getHead();
+        Node layoutElement = null;
+
+        // Find the layout element under <code>HEAD</code>
+        layoutElement = headElement.getFirstChild();
+        while ((layoutElement != null) && !(layoutElement instanceof SMILLayoutElement)) {
+            layoutElement = layoutElement.getNextSibling();
+        }
+
+        if (layoutElement == null) {
+            // The layout doesn't exist. Create a default one.
+            layoutElement = new SmilLayoutElementImpl(this, "layout");
+            headElement.appendChild(layoutElement);
+        }
+        return (SMILLayoutElement) layoutElement;
+    }
+
+    /*
+     * DocumentEvent Interface
+     */
+    public Event createEvent(String eventType) throws DOMException {
+        if ("Event".equals(eventType)) {
+            return new EventImpl();
+        } else {
+            throw new DOMException(DOMException.NOT_SUPPORTED_ERR,
+                       "Not supported interface");
+        }
+    }
+}
diff --git a/android-smsmms/src/main/java/com/android/mms/dom/smil/SmilElementImpl.java b/android-smsmms/src/main/java/com/android/mms/dom/smil/SmilElementImpl.java
index 122f23f10..254f18020 100755
--- a/android-smsmms/src/main/java/com/android/mms/dom/smil/SmilElementImpl.java
+++ b/android-smsmms/src/main/java/com/android/mms/dom/smil/SmilElementImpl.java
@@ -1,46 +1,46 @@
-/*
- * Copyright (C) 2007 Esmertec AG.
- * Copyright (C) 2007 The Android Open Source Project
- *
- * Licensed under the Apache License, Version 2.0 (the "License");
- * you may not use this file except in compliance with the License.
- * You may obtain a copy of the License at
- *
- *      http://www.apache.org/licenses/LICENSE-2.0
- *
- * Unless required by applicable law or agreed to in writing, software
- * distributed under the License is distributed on an "AS IS" BASIS,
- * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
- * See the License for the specific language governing permissions and
- * limitations under the License.
- */
-
-package com.android.mms.dom.smil;
-
-import com.android.mms.dom.ElementImpl;
-import org.w3c.dom.DOMException;
-import org.w3c.dom.smil.SMILElement;
-
-public class SmilElementImpl extends ElementImpl implements SMILElement {
-    /**
-     * This constructor is used by the factory methods of the SmilDocument.
-     *
-     * @param owner The SMIL document to which this element belongs to
-     * @param tagName The tag name of the element
-     */
-    SmilElementImpl(SmilDocumentImpl owner, String tagName)
-    {
-        super(owner, tagName.toLowerCase());
-    }
-
-    public String getId() {
-        // TODO Auto-generated method stub
-        return null;
-    }
-
-    public void setId(String id) throws DOMException {
-        // TODO Auto-generated method stub
-
-    }
-
-}
+/*
+ * Copyright (C) 2007 Esmertec AG.
+ * Copyright (C) 2007 The Android Open Source Project
+ *
+ * Licensed under the Apache License, Version 2.0 (the "License");
+ * you may not use this file except in compliance with the License.
+ * You may obtain a copy of the License at
+ *
+ *      http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing, software
+ * distributed under the License is distributed on an "AS IS" BASIS,
+ * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ * See the License for the specific language governing permissions and
+ * limitations under the License.
+ */
+
+package com.android.mms.dom.smil;
+
+import com.android.mms.dom.ElementImpl;
+import org.w3c.dom.DOMException;
+import org.w3c.dom.smil.SMILElement;
+
+public class SmilElementImpl extends ElementImpl implements SMILElement {
+    /**
+     * This constructor is used by the factory methods of the SmilDocument.
+     *
+     * @param owner The SMIL document to which this element belongs to
+     * @param tagName The tag name of the element
+     */
+    SmilElementImpl(SmilDocumentImpl owner, String tagName)
+    {
+        super(owner, tagName.toLowerCase());
+    }
+
+    public String getId() {
+        // TODO Auto-generated method stub
+        return null;
+    }
+
+    public void setId(String id) throws DOMException {
+        // TODO Auto-generated method stub
+
+    }
+
+}
diff --git a/android-smsmms/src/main/java/com/android/mms/dom/smil/SmilLayoutElementImpl.java b/android-smsmms/src/main/java/com/android/mms/dom/smil/SmilLayoutElementImpl.java
index 9cf4e69ca..3aa0ee9c4 100755
--- a/android-smsmms/src/main/java/com/android/mms/dom/smil/SmilLayoutElementImpl.java
+++ b/android-smsmms/src/main/java/com/android/mms/dom/smil/SmilLayoutElementImpl.java
@@ -1,63 +1,63 @@
-/*
- * Copyright (C) 2007 Esmertec AG.
- * Copyright (C) 2007 The Android Open Source Project
- *
- * Licensed under the Apache License, Version 2.0 (the "License");
- * you may not use this file except in compliance with the License.
- * You may obtain a copy of the License at
- *
- *      http://www.apache.org/licenses/LICENSE-2.0
- *
- * Unless required by applicable law or agreed to in writing, software
- * distributed under the License is distributed on an "AS IS" BASIS,
- * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
- * See the License for the specific language governing permissions and
- * limitations under the License.
- */
-
-package com.android.mms.dom.smil;
-
-import com.android.mms.layout.LayoutManager;
-import org.w3c.dom.NodeList;
-import org.w3c.dom.smil.SMILLayoutElement;
-import org.w3c.dom.smil.SMILRootLayoutElement;
-
-public class SmilLayoutElementImpl extends SmilElementImpl implements
-        SMILLayoutElement {
-    SmilLayoutElementImpl(SmilDocumentImpl owner, String tagName) {
-        super(owner, tagName);
-    }
-
-    public boolean getResolved() {
-        // TODO Auto-generated method stub
-        return false;
-    }
-
-    public String getType() {
-        return this.getAttribute("type");
-    }
-
-    public NodeList getRegions() {
-        return this.getElementsByTagName("region");
-    }
-
-    public SMILRootLayoutElement getRootLayout() {
-        NodeList childNodes = this.getChildNodes();
-        SMILRootLayoutElement rootLayoutNode = null;
-        int childrenCount = childNodes.getLength();
-        for (int i = 0; i < childrenCount; i++) {
-            if (childNodes.item(i).getNodeName().equals("root-layout")) {
-                rootLayoutNode = (SMILRootLayoutElement)childNodes.item(i);
-            }
-        }
-        if (null == rootLayoutNode) {
-            // root-layout node is not set. Create a default one.
-            rootLayoutNode = (SMILRootLayoutElement) getOwnerDocument().createElement("root-layout");
-            rootLayoutNode.setWidth(LayoutManager.getInstance().getLayoutParameters().getWidth());
-            rootLayoutNode.setHeight(LayoutManager.getInstance().getLayoutParameters().getHeight());
-            appendChild(rootLayoutNode);
-        }
-        return rootLayoutNode;
-    }
-
-}
+/*
+ * Copyright (C) 2007 Esmertec AG.
+ * Copyright (C) 2007 The Android Open Source Project
+ *
+ * Licensed under the Apache License, Version 2.0 (the "License");
+ * you may not use this file except in compliance with the License.
+ * You may obtain a copy of the License at
+ *
+ *      http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing, software
+ * distributed under the License is distributed on an "AS IS" BASIS,
+ * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ * See the License for the specific language governing permissions and
+ * limitations under the License.
+ */
+
+package com.android.mms.dom.smil;
+
+import com.android.mms.layout.LayoutManager;
+import org.w3c.dom.NodeList;
+import org.w3c.dom.smil.SMILLayoutElement;
+import org.w3c.dom.smil.SMILRootLayoutElement;
+
+public class SmilLayoutElementImpl extends SmilElementImpl implements
+        SMILLayoutElement {
+    SmilLayoutElementImpl(SmilDocumentImpl owner, String tagName) {
+        super(owner, tagName);
+    }
+
+    public boolean getResolved() {
+        // TODO Auto-generated method stub
+        return false;
+    }
+
+    public String getType() {
+        return this.getAttribute("type");
+    }
+
+    public NodeList getRegions() {
+        return this.getElementsByTagName("region");
+    }
+
+    public SMILRootLayoutElement getRootLayout() {
+        NodeList childNodes = this.getChildNodes();
+        SMILRootLayoutElement rootLayoutNode = null;
+        int childrenCount = childNodes.getLength();
+        for (int i = 0; i < childrenCount; i++) {
+            if (childNodes.item(i).getNodeName().equals("root-layout")) {
+                rootLayoutNode = (SMILRootLayoutElement)childNodes.item(i);
+            }
+        }
+        if (null == rootLayoutNode) {
+            // root-layout node is not set. Create a default one.
+            rootLayoutNode = (SMILRootLayoutElement) getOwnerDocument().createElement("root-layout");
+            rootLayoutNode.setWidth(LayoutManager.getInstance().getLayoutParameters().getWidth());
+            rootLayoutNode.setHeight(LayoutManager.getInstance().getLayoutParameters().getHeight());
+            appendChild(rootLayoutNode);
+        }
+        return rootLayoutNode;
+    }
+
+}
diff --git a/android-smsmms/src/main/java/com/android/mms/dom/smil/SmilMediaElementImpl.java b/android-smsmms/src/main/java/com/android/mms/dom/smil/SmilMediaElementImpl.java
index 3d03aaba5..a47955a5e 100755
--- a/android-smsmms/src/main/java/com/android/mms/dom/smil/SmilMediaElementImpl.java
+++ b/android-smsmms/src/main/java/com/android/mms/dom/smil/SmilMediaElementImpl.java
@@ -1,337 +1,337 @@
-/*
- * Copyright 2014 Jacob Klinker
- *
- * Licensed under the Apache License, Version 2.0 (the "License");
- * you may not use this file except in compliance with the License.
- * You may obtain a copy of the License at
- *
- *     http://www.apache.org/licenses/LICENSE-2.0
- *
- * Unless required by applicable law or agreed to in writing, software
- * distributed under the License is distributed on an "AS IS" BASIS,
- * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
- * See the License for the specific language governing permissions and
- * limitations under the License.
- */
-
-package com.android.mms.dom.smil;
-
-import com.android.mms.dom.events.EventImpl;
-import org.w3c.dom.DOMException;
-import org.w3c.dom.events.DocumentEvent;
-import org.w3c.dom.events.Event;
-import org.w3c.dom.smil.ElementTime;
-import org.w3c.dom.smil.SMILMediaElement;
-import org.w3c.dom.smil.TimeList;
-import timber.log.Timber;
-
-public class SmilMediaElementImpl extends SmilElementImpl implements SMILMediaElement {
-    public final static String SMIL_MEDIA_START_EVENT = "SmilMediaStart";
-    public final static String SMIL_MEDIA_END_EVENT = "SmilMediaEnd";
-    public final static String SMIL_MEDIA_PAUSE_EVENT = "SmilMediaPause";
-    public final static String SMIL_MEDIA_SEEK_EVENT = "SmilMediaSeek";
-    private static final boolean LOCAL_LOGV = false;
-
-    ElementTime mElementTime = new ElementTimeImpl(this) {
-            private Event createEvent(String eventType) {
-                DocumentEvent doc =
-                    (DocumentEvent)SmilMediaElementImpl.this.getOwnerDocument();
-                Event event = doc.createEvent("Event");
-                event.initEvent(eventType, false, false);
-                if (LOCAL_LOGV) {
-                    Timber.v("Dispatching 'begin' event to "
-                            + SmilMediaElementImpl.this.getTagName() + " "
-                            + SmilMediaElementImpl.this.getSrc() + " at "
-                            + System.currentTimeMillis());
-                }
-                return event;
-            }
-
-            private Event createEvent(String eventType, int seekTo) {
-                DocumentEvent doc =
-                    (DocumentEvent)SmilMediaElementImpl.this.getOwnerDocument();
-                EventImpl event = (EventImpl) doc.createEvent("Event");
-                event.initEvent(eventType, false, false, seekTo);
-                if (LOCAL_LOGV) {
-                    Timber.v("Dispatching 'begin' event to "
-                            + SmilMediaElementImpl.this.getTagName() + " "
-                            + SmilMediaElementImpl.this.getSrc() + " at "
-                            + System.currentTimeMillis());
-                }
-                return event;
-            }
-
-            public boolean beginElement() {
-                Event startEvent = createEvent(SMIL_MEDIA_START_EVENT);
-                dispatchEvent(startEvent);
-                return true;
-            }
-
-            public boolean endElement() {
-                Event endEvent = createEvent(SMIL_MEDIA_END_EVENT);
-                dispatchEvent(endEvent);
-                return true;
-            }
-
-            public void resumeElement() {
-                Event resumeEvent = createEvent(SMIL_MEDIA_START_EVENT);
-                dispatchEvent(resumeEvent);
-            }
-
-            public void pauseElement() {
-                Event pauseEvent = createEvent(SMIL_MEDIA_PAUSE_EVENT);
-                dispatchEvent(pauseEvent);
-            }
-
-            public void seekElement(float seekTo) {
-                Event seekEvent = createEvent(SMIL_MEDIA_SEEK_EVENT, (int) seekTo);
-                dispatchEvent(seekEvent);
-            }
-
-            @Override
-            public float getDur() {
-                float dur = super.getDur();
-                if (dur == 0) {
-                    // Duration is not specified, So get the implicit duration.
-                    String tag = getTagName();
-                    if (tag.equals("video") || tag.equals("audio")) {
-                        // Continuous media
-                        // FIXME Should get the duration of the media. "indefinite" instead here.
-                        dur = -1.0F;
-                    } else if (tag.equals("text") || tag.equals("img")) {
-                        // Discrete media
-                        dur = 0;
-                    } else {
-                        Timber.w("Unknown media type");
-                    }
-                }
-                return dur;
-            }
-
-            @Override
-            ElementTime getParentElementTime() {
-                return ((SmilParElementImpl) mSmilElement.getParentNode()).mParTimeContainer;
-            }
-    };
-
-    /*
-     * Internal Interface
-     */
-
-    SmilMediaElementImpl(SmilDocumentImpl owner, String tagName) {
-        super(owner, tagName);
-    }
-
-    /*
-     * SMILMediaElement Interface
-     */
-
-    public String getAbstractAttr() {
-        return this.getAttribute("abstract");
-    }
-
-    public String getAlt() {
-        return this.getAttribute("alt");
-    }
-
-    public String getAuthor() {
-        return this.getAttribute("author");
-    }
-
-    public String getClipBegin() {
-        return this.getAttribute("clipBegin");
-    }
-
-    public String getClipEnd() {
-        return this.getAttribute("clipEnd");
-    }
-
-    public String getCopyright() {
-        return this.getAttribute("copyright");
-    }
-
-    public String getLongdesc() {
-        return this.getAttribute("longdesc");
-    }
-
-    public String getPort() {
-        return this.getAttribute("port");
-    }
-
-    public String getReadIndex() {
-        return this.getAttribute("readIndex");
-    }
-
-    public String getRtpformat() {
-        return this.getAttribute("rtpformat");
-    }
-
-    public String getSrc() {
-        return this.getAttribute("src");
-    }
-
-    public String getStripRepeat() {
-        return this.getAttribute("stripRepeat");
-    }
-
-    public String getTitle() {
-        return this.getAttribute("title");
-    }
-
-    public String getTransport() {
-        return this.getAttribute("transport");
-    }
-
-    public String getType() {
-        return this.getAttribute("type");
-    }
-
-    public void setAbstractAttr(String abstractAttr) throws DOMException {
-        this.setAttribute("abstract", abstractAttr);
-    }
-
-    public void setAlt(String alt) throws DOMException {
-        this.setAttribute("alt", alt);
-    }
-
-    public void setAuthor(String author) throws DOMException {
-        this.setAttribute("author", author);
-    }
-
-    public void setClipBegin(String clipBegin) throws DOMException {
-        this.setAttribute("clipBegin", clipBegin);
-    }
-
-    public void setClipEnd(String clipEnd) throws DOMException {
-        this.setAttribute("clipEnd", clipEnd);
-    }
-
-    public void setCopyright(String copyright) throws DOMException {
-        this.setAttribute("copyright", copyright);
-    }
-
-    public void setLongdesc(String longdesc) throws DOMException {
-        this.setAttribute("longdesc", longdesc);
-
-    }
-
-    public void setPort(String port) throws DOMException {
-        this.setAttribute("port", port);
-    }
-
-    public void setReadIndex(String readIndex) throws DOMException {
-        this.setAttribute("readIndex", readIndex);
-    }
-
-    public void setRtpformat(String rtpformat) throws DOMException {
-        this.setAttribute("rtpformat", rtpformat);
-    }
-
-    public void setSrc(String src) throws DOMException {
-        this.setAttribute("src", src);
-    }
-
-    public void setStripRepeat(String stripRepeat) throws DOMException {
-        this.setAttribute("stripRepeat", stripRepeat);
-    }
-
-    public void setTitle(String title) throws DOMException {
-        this.setAttribute("title", title);
-    }
-
-    public void setTransport(String transport) throws DOMException {
-        this.setAttribute("transport", transport);
-    }
-
-    public void setType(String type) throws DOMException {
-        this.setAttribute("type", type);
-    }
-
-    /*
-     * TimeElement Interface
-     */
-
-    public boolean beginElement() {
-        return mElementTime.beginElement();
-    }
-
-    public boolean endElement() {
-        return mElementTime.endElement();
-    }
-
-    public TimeList getBegin() {
-        return mElementTime.getBegin();
-    }
-
-    public float getDur() {
-        return mElementTime.getDur();
-    }
-
-    public TimeList getEnd() {
-        return mElementTime.getEnd();
-    }
-
-    public short getFill() {
-        return mElementTime.getFill();
-    }
-
-    public short getFillDefault() {
-        return mElementTime.getFillDefault();
-    }
-
-    public float getRepeatCount() {
-        return mElementTime.getRepeatCount();
-    }
-
-    public float getRepeatDur() {
-        return mElementTime.getRepeatDur();
-    }
-
-    public short getRestart() {
-        return mElementTime.getRestart();
-    }
-
-    public void pauseElement() {
-        mElementTime.pauseElement();
-    }
-
-    public void resumeElement() {
-        mElementTime.resumeElement();
-    }
-
-    public void seekElement(float seekTo) {
-        mElementTime.seekElement(seekTo);
-    }
-
-    public void setBegin(TimeList begin) throws DOMException {
-        mElementTime.setBegin(begin);
-    }
-
-    public void setDur(float dur) throws DOMException {
-        mElementTime.setDur(dur);
-    }
-
-    public void setEnd(TimeList end) throws DOMException {
-        mElementTime.setEnd(end);
-    }
-
-    public void setFill(short fill) throws DOMException {
-        mElementTime.setFill(fill);
-    }
-
-    public void setFillDefault(short fillDefault) throws DOMException {
-        mElementTime.setFillDefault(fillDefault);
-    }
-
-    public void setRepeatCount(float repeatCount) throws DOMException {
-        mElementTime.setRepeatCount(repeatCount);
-    }
-
-    public void setRepeatDur(float repeatDur) throws DOMException {
-        mElementTime.setRepeatDur(repeatDur);
-    }
-
-    public void setRestart(short restart) throws DOMException {
-        mElementTime.setRestart(restart);
-    }
-}
+/*
+ * Copyright 2014 Jacob Klinker
+ *
+ * Licensed under the Apache License, Version 2.0 (the "License");
+ * you may not use this file except in compliance with the License.
+ * You may obtain a copy of the License at
+ *
+ *     http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing, software
+ * distributed under the License is distributed on an "AS IS" BASIS,
+ * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ * See the License for the specific language governing permissions and
+ * limitations under the License.
+ */
+
+package com.android.mms.dom.smil;
+
+import com.android.mms.dom.events.EventImpl;
+import org.w3c.dom.DOMException;
+import org.w3c.dom.events.DocumentEvent;
+import org.w3c.dom.events.Event;
+import org.w3c.dom.smil.ElementTime;
+import org.w3c.dom.smil.SMILMediaElement;
+import org.w3c.dom.smil.TimeList;
+import timber.log.Timber;
+
+public class SmilMediaElementImpl extends SmilElementImpl implements SMILMediaElement {
+    public final static String SMIL_MEDIA_START_EVENT = "SmilMediaStart";
+    public final static String SMIL_MEDIA_END_EVENT = "SmilMediaEnd";
+    public final static String SMIL_MEDIA_PAUSE_EVENT = "SmilMediaPause";
+    public final static String SMIL_MEDIA_SEEK_EVENT = "SmilMediaSeek";
+    private static final boolean LOCAL_LOGV = false;
+
+    ElementTime mElementTime = new ElementTimeImpl(this) {
+            private Event createEvent(String eventType) {
+                DocumentEvent doc =
+                    (DocumentEvent)SmilMediaElementImpl.this.getOwnerDocument();
+                Event event = doc.createEvent("Event");
+                event.initEvent(eventType, false, false);
+                if (LOCAL_LOGV) {
+                    Timber.v("Dispatching 'begin' event to "
+                            + SmilMediaElementImpl.this.getTagName() + " "
+                            + SmilMediaElementImpl.this.getSrc() + " at "
+                            + System.currentTimeMillis());
+                }
+                return event;
+            }
+
+            private Event createEvent(String eventType, int seekTo) {
+                DocumentEvent doc =
+                    (DocumentEvent)SmilMediaElementImpl.this.getOwnerDocument();
+                EventImpl event = (EventImpl) doc.createEvent("Event");
+                event.initEvent(eventType, false, false, seekTo);
+                if (LOCAL_LOGV) {
+                    Timber.v("Dispatching 'begin' event to "
+                            + SmilMediaElementImpl.this.getTagName() + " "
+                            + SmilMediaElementImpl.this.getSrc() + " at "
+                            + System.currentTimeMillis());
+                }
+                return event;
+            }
+
+            public boolean beginElement() {
+                Event startEvent = createEvent(SMIL_MEDIA_START_EVENT);
+                dispatchEvent(startEvent);
+                return true;
+            }
+
+            public boolean endElement() {
+                Event endEvent = createEvent(SMIL_MEDIA_END_EVENT);
+                dispatchEvent(endEvent);
+                return true;
+            }
+
+            public void resumeElement() {
+                Event resumeEvent = createEvent(SMIL_MEDIA_START_EVENT);
+                dispatchEvent(resumeEvent);
+            }
+
+            public void pauseElement() {
+                Event pauseEvent = createEvent(SMIL_MEDIA_PAUSE_EVENT);
+                dispatchEvent(pauseEvent);
+            }
+
+            public void seekElement(float seekTo) {
+                Event seekEvent = createEvent(SMIL_MEDIA_SEEK_EVENT, (int) seekTo);
+                dispatchEvent(seekEvent);
+            }
+
+            @Override
+            public float getDur() {
+                float dur = super.getDur();
+                if (dur == 0) {
+                    // Duration is not specified, So get the implicit duration.
+                    String tag = getTagName();
+                    if (tag.equals("video") || tag.equals("audio")) {
+                        // Continuous media
+                        // FIXME Should get the duration of the media. "indefinite" instead here.
+                        dur = -1.0F;
+                    } else if (tag.equals("text") || tag.equals("img")) {
+                        // Discrete media
+                        dur = 0;
+                    } else {
+                        Timber.w("Unknown media type");
+                    }
+                }
+                return dur;
+            }
+
+            @Override
+            ElementTime getParentElementTime() {
+                return ((SmilParElementImpl) mSmilElement.getParentNode()).mParTimeContainer;
+            }
+    };
+
+    /*
+     * Internal Interface
+     */
+
+    SmilMediaElementImpl(SmilDocumentImpl owner, String tagName) {
+        super(owner, tagName);
+    }
+
+    /*
+     * SMILMediaElement Interface
+     */
+
+    public String getAbstractAttr() {
+        return this.getAttribute("abstract");
+    }
+
+    public String getAlt() {
+        return this.getAttribute("alt");
+    }
+
+    public String getAuthor() {
+        return this.getAttribute("author");
+    }
+
+    public String getClipBegin() {
+        return this.getAttribute("clipBegin");
+    }
+
+    public String getClipEnd() {
+        return this.getAttribute("clipEnd");
+    }
+
+    public String getCopyright() {
+        return this.getAttribute("copyright");
+    }
+
+    public String getLongdesc() {
+        return this.getAttribute("longdesc");
+    }
+
+    public String getPort() {
+        return this.getAttribute("port");
+    }
+
+    public String getReadIndex() {
+        return this.getAttribute("readIndex");
+    }
+
+    public String getRtpformat() {
+        return this.getAttribute("rtpformat");
+    }
+
+    public String getSrc() {
+        return this.getAttribute("src");
+    }
+
+    public String getStripRepeat() {
+        return this.getAttribute("stripRepeat");
+    }
+
+    public String getTitle() {
+        return this.getAttribute("title");
+    }
+
+    public String getTransport() {
+        return this.getAttribute("transport");
+    }
+
+    public String getType() {
+        return this.getAttribute("type");
+    }
+
+    public void setAbstractAttr(String abstractAttr) throws DOMException {
+        this.setAttribute("abstract", abstractAttr);
+    }
+
+    public void setAlt(String alt) throws DOMException {
+        this.setAttribute("alt", alt);
+    }
+
+    public void setAuthor(String author) throws DOMException {
+        this.setAttribute("author", author);
+    }
+
+    public void setClipBegin(String clipBegin) throws DOMException {
+        this.setAttribute("clipBegin", clipBegin);
+    }
+
+    public void setClipEnd(String clipEnd) throws DOMException {
+        this.setAttribute("clipEnd", clipEnd);
+    }
+
+    public void setCopyright(String copyright) throws DOMException {
+        this.setAttribute("copyright", copyright);
+    }
+
+    public void setLongdesc(String longdesc) throws DOMException {
+        this.setAttribute("longdesc", longdesc);
+
+    }
+
+    public void setPort(String port) throws DOMException {
+        this.setAttribute("port", port);
+    }
+
+    public void setReadIndex(String readIndex) throws DOMException {
+        this.setAttribute("readIndex", readIndex);
+    }
+
+    public void setRtpformat(String rtpformat) throws DOMException {
+        this.setAttribute("rtpformat", rtpformat);
+    }
+
+    public void setSrc(String src) throws DOMException {
+        this.setAttribute("src", src);
+    }
+
+    public void setStripRepeat(String stripRepeat) throws DOMException {
+        this.setAttribute("stripRepeat", stripRepeat);
+    }
+
+    public void setTitle(String title) throws DOMException {
+        this.setAttribute("title", title);
+    }
+
+    public void setTransport(String transport) throws DOMException {
+        this.setAttribute("transport", transport);
+    }
+
+    public void setType(String type) throws DOMException {
+        this.setAttribute("type", type);
+    }
+
+    /*
+     * TimeElement Interface
+     */
+
+    public boolean beginElement() {
+        return mElementTime.beginElement();
+    }
+
+    public boolean endElement() {
+        return mElementTime.endElement();
+    }
+
+    public TimeList getBegin() {
+        return mElementTime.getBegin();
+    }
+
+    public float getDur() {
+        return mElementTime.getDur();
+    }
+
+    public TimeList getEnd() {
+        return mElementTime.getEnd();
+    }
+
+    public short getFill() {
+        return mElementTime.getFill();
+    }
+
+    public short getFillDefault() {
+        return mElementTime.getFillDefault();
+    }
+
+    public float getRepeatCount() {
+        return mElementTime.getRepeatCount();
+    }
+
+    public float getRepeatDur() {
+        return mElementTime.getRepeatDur();
+    }
+
+    public short getRestart() {
+        return mElementTime.getRestart();
+    }
+
+    public void pauseElement() {
+        mElementTime.pauseElement();
+    }
+
+    public void resumeElement() {
+        mElementTime.resumeElement();
+    }
+
+    public void seekElement(float seekTo) {
+        mElementTime.seekElement(seekTo);
+    }
+
+    public void setBegin(TimeList begin) throws DOMException {
+        mElementTime.setBegin(begin);
+    }
+
+    public void setDur(float dur) throws DOMException {
+        mElementTime.setDur(dur);
+    }
+
+    public void setEnd(TimeList end) throws DOMException {
+        mElementTime.setEnd(end);
+    }
+
+    public void setFill(short fill) throws DOMException {
+        mElementTime.setFill(fill);
+    }
+
+    public void setFillDefault(short fillDefault) throws DOMException {
+        mElementTime.setFillDefault(fillDefault);
+    }
+
+    public void setRepeatCount(float repeatCount) throws DOMException {
+        mElementTime.setRepeatCount(repeatCount);
+    }
+
+    public void setRepeatDur(float repeatDur) throws DOMException {
+        mElementTime.setRepeatDur(repeatDur);
+    }
+
+    public void setRestart(short restart) throws DOMException {
+        mElementTime.setRestart(restart);
+    }
+}
diff --git a/android-smsmms/src/main/java/com/android/mms/dom/smil/SmilParElementImpl.java b/android-smsmms/src/main/java/com/android/mms/dom/smil/SmilParElementImpl.java
index 2d09f2761..551e80710 100755
--- a/android-smsmms/src/main/java/com/android/mms/dom/smil/SmilParElementImpl.java
+++ b/android-smsmms/src/main/java/com/android/mms/dom/smil/SmilParElementImpl.java
@@ -1,217 +1,217 @@
-/*
- * Copyright (C) 2007 Esmertec AG.
- * Copyright (C) 2007 The Android Open Source Project
- *
- * Licensed under the Apache License, Version 2.0 (the "License");
- * you may not use this file except in compliance with the License.
- * You may obtain a copy of the License at
- *
- *      http://www.apache.org/licenses/LICENSE-2.0
- *
- * Unless required by applicable law or agreed to in writing, software
- * distributed under the License is distributed on an "AS IS" BASIS,
- * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
- * See the License for the specific language governing permissions and
- * limitations under the License.
- */
-
-package com.android.mms.dom.smil;
-
-import org.w3c.dom.DOMException;
-import org.w3c.dom.NodeList;
-import org.w3c.dom.events.DocumentEvent;
-import org.w3c.dom.events.Event;
-import org.w3c.dom.smil.ElementParallelTimeContainer;
-import org.w3c.dom.smil.ElementTime;
-import org.w3c.dom.smil.SMILParElement;
-import org.w3c.dom.smil.Time;
-import org.w3c.dom.smil.TimeList;
-
-import java.util.ArrayList;
-
-public class SmilParElementImpl extends SmilElementImpl implements SMILParElement {
-    public final static String SMIL_SLIDE_START_EVENT = "SmilSlideStart";
-    public final static String SMIL_SLIDE_END_EVENT = "SmilSlideEnd";
-
-    ElementParallelTimeContainer mParTimeContainer =
-        new ElementParallelTimeContainerImpl(this) {
-        @Override
-        public TimeList getBegin() {
-            /*
-             * For children of a sequence, the only legal value for begin is
-             * a (single) non-negative offset value.
-             */
-            TimeList beginTimeList = super.getBegin();
-            if (beginTimeList.getLength() > 1) {
-                ArrayList<Time> singleTimeContainer = new ArrayList<Time>();
-                singleTimeContainer.add(beginTimeList.item(0));
-                beginTimeList = new TimeListImpl(singleTimeContainer);
-            }
-            return beginTimeList;
-        }
-
-        public NodeList getTimeChildren() {
-            return getChildNodes();
-        }
-
-        public boolean beginElement() {
-            DocumentEvent doc = (DocumentEvent) SmilParElementImpl.this.getOwnerDocument();
-            Event startEvent = doc.createEvent("Event");
-            startEvent.initEvent(SMIL_SLIDE_START_EVENT, false, false);
-            dispatchEvent(startEvent);
-            return true;
-        }
-
-        public boolean endElement() {
-            DocumentEvent doc = (DocumentEvent) SmilParElementImpl.this.getOwnerDocument();
-            Event endEvent = doc.createEvent("Event");
-            endEvent.initEvent(SMIL_SLIDE_END_EVENT, false, false);
-            dispatchEvent(endEvent);
-            return true;
-        }
-
-        public void pauseElement() {
-            // TODO Auto-generated method stub
-
-        }
-
-        public void resumeElement() {
-            // TODO Auto-generated method stub
-
-        }
-
-        public void seekElement(float seekTo) {
-            // TODO Auto-generated method stub
-
-        }
-
-        ElementTime getParentElementTime() {
-            return ((SmilDocumentImpl) mSmilElement.getOwnerDocument()).mSeqTimeContainer;
-        }
-    };
-
-    /*
-     * Internal Interface
-     */
-
-    SmilParElementImpl(SmilDocumentImpl owner, String tagName)
-    {
-        super(owner, tagName.toUpperCase());
-    }
-
-    int getBeginConstraints() {
-        /*
-         * For children of a sequence, the only legal value for begin is
-         * a (single) non-negative offset value.
-         */
-        return (TimeImpl.ALLOW_OFFSET_VALUE); // Do not set ALLOW_NEGATIVE_VALUE
-    }
-
-    /*
-     * ElementParallelTimeContainer
-     */
-
-    public String getEndSync() {
-        return mParTimeContainer.getEndSync();
-    }
-
-    public float getImplicitDuration() {
-        return mParTimeContainer.getImplicitDuration();
-    }
-
-    public void setEndSync(String endSync) throws DOMException {
-        mParTimeContainer.setEndSync(endSync);
-    }
-
-    public NodeList getActiveChildrenAt(float instant) {
-        return mParTimeContainer.getActiveChildrenAt(instant);
-    }
-
-    public NodeList getTimeChildren() {
-        return mParTimeContainer.getTimeChildren();
-    }
-
-    public boolean beginElement() {
-        return mParTimeContainer.beginElement();
-    }
-
-    public boolean endElement() {
-        return mParTimeContainer.endElement();
-    }
-
-    public TimeList getBegin() {
-        return mParTimeContainer.getBegin();
-    }
-
-    public float getDur() {
-        return mParTimeContainer.getDur();
-    }
-
-    public TimeList getEnd() {
-        return mParTimeContainer.getEnd();
-    }
-
-    public short getFill() {
-        return mParTimeContainer.getFill();
-    }
-
-    public short getFillDefault() {
-        return mParTimeContainer.getFillDefault();
-    }
-
-    public float getRepeatCount() {
-        return mParTimeContainer.getRepeatCount();
-    }
-
-    public float getRepeatDur() {
-        return mParTimeContainer.getRepeatDur();
-    }
-
-    public short getRestart() {
-        return mParTimeContainer.getRestart();
-    }
-
-    public void pauseElement() {
-        mParTimeContainer.pauseElement();
-    }
-
-    public void resumeElement() {
-        mParTimeContainer.resumeElement();
-    }
-
-    public void seekElement(float seekTo) {
-        mParTimeContainer.seekElement(seekTo);
-    }
-
-    public void setBegin(TimeList begin) throws DOMException {
-        mParTimeContainer.setBegin(begin);
-    }
-
-    public void setDur(float dur) throws DOMException {
-        mParTimeContainer.setDur(dur);
-    }
-
-    public void setEnd(TimeList end) throws DOMException {
-        mParTimeContainer.setEnd(end);
-    }
-
-    public void setFill(short fill) throws DOMException {
-        mParTimeContainer.setFill(fill);
-    }
-
-    public void setFillDefault(short fillDefault) throws DOMException {
-        mParTimeContainer.setFillDefault(fillDefault);
-    }
-
-    public void setRepeatCount(float repeatCount) throws DOMException {
-        mParTimeContainer.setRepeatCount(repeatCount);
-    }
-
-    public void setRepeatDur(float repeatDur) throws DOMException {
-        mParTimeContainer.setRepeatDur(repeatDur);
-    }
-
-    public void setRestart(short restart) throws DOMException {
-        mParTimeContainer.setRestart(restart);
-    }
-}
+/*
+ * Copyright (C) 2007 Esmertec AG.
+ * Copyright (C) 2007 The Android Open Source Project
+ *
+ * Licensed under the Apache License, Version 2.0 (the "License");
+ * you may not use this file except in compliance with the License.
+ * You may obtain a copy of the License at
+ *
+ *      http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing, software
+ * distributed under the License is distributed on an "AS IS" BASIS,
+ * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ * See the License for the specific language governing permissions and
+ * limitations under the License.
+ */
+
+package com.android.mms.dom.smil;
+
+import org.w3c.dom.DOMException;
+import org.w3c.dom.NodeList;
+import org.w3c.dom.events.DocumentEvent;
+import org.w3c.dom.events.Event;
+import org.w3c.dom.smil.ElementParallelTimeContainer;
+import org.w3c.dom.smil.ElementTime;
+import org.w3c.dom.smil.SMILParElement;
+import org.w3c.dom.smil.Time;
+import org.w3c.dom.smil.TimeList;
+
+import java.util.ArrayList;
+
+public class SmilParElementImpl extends SmilElementImpl implements SMILParElement {
+    public final static String SMIL_SLIDE_START_EVENT = "SmilSlideStart";
+    public final static String SMIL_SLIDE_END_EVENT = "SmilSlideEnd";
+
+    ElementParallelTimeContainer mParTimeContainer =
+        new ElementParallelTimeContainerImpl(this) {
+        @Override
+        public TimeList getBegin() {
+            /*
+             * For children of a sequence, the only legal value for begin is
+             * a (single) non-negative offset value.
+             */
+            TimeList beginTimeList = super.getBegin();
+            if (beginTimeList.getLength() > 1) {
+                ArrayList<Time> singleTimeContainer = new ArrayList<Time>();
+                singleTimeContainer.add(beginTimeList.item(0));
+                beginTimeList = new TimeListImpl(singleTimeContainer);
+            }
+            return beginTimeList;
+        }
+
+        public NodeList getTimeChildren() {
+            return getChildNodes();
+        }
+
+        public boolean beginElement() {
+            DocumentEvent doc = (DocumentEvent) SmilParElementImpl.this.getOwnerDocument();
+            Event startEvent = doc.createEvent("Event");
+            startEvent.initEvent(SMIL_SLIDE_START_EVENT, false, false);
+            dispatchEvent(startEvent);
+            return true;
+        }
+
+        public boolean endElement() {
+            DocumentEvent doc = (DocumentEvent) SmilParElementImpl.this.getOwnerDocument();
+            Event endEvent = doc.createEvent("Event");
+            endEvent.initEvent(SMIL_SLIDE_END_EVENT, false, false);
+            dispatchEvent(endEvent);
+            return true;
+        }
+
+        public void pauseElement() {
+            // TODO Auto-generated method stub
+
+        }
+
+        public void resumeElement() {
+            // TODO Auto-generated method stub
+
+        }
+
+        public void seekElement(float seekTo) {
+            // TODO Auto-generated method stub
+
+        }
+
+        ElementTime getParentElementTime() {
+            return ((SmilDocumentImpl) mSmilElement.getOwnerDocument()).mSeqTimeContainer;
+        }
+    };
+
+    /*
+     * Internal Interface
+     */
+
+    SmilParElementImpl(SmilDocumentImpl owner, String tagName)
+    {
+        super(owner, tagName.toUpperCase());
+    }
+
+    int getBeginConstraints() {
+        /*
+         * For children of a sequence, the only legal value for begin is
+         * a (single) non-negative offset value.
+         */
+        return (TimeImpl.ALLOW_OFFSET_VALUE); // Do not set ALLOW_NEGATIVE_VALUE
+    }
+
+    /*
+     * ElementParallelTimeContainer
+     */
+
+    public String getEndSync() {
+        return mParTimeContainer.getEndSync();
+    }
+
+    public float getImplicitDuration() {
+        return mParTimeContainer.getImplicitDuration();
+    }
+
+    public void setEndSync(String endSync) throws DOMException {
+        mParTimeContainer.setEndSync(endSync);
+    }
+
+    public NodeList getActiveChildrenAt(float instant) {
+        return mParTimeContainer.getActiveChildrenAt(instant);
+    }
+
+    public NodeList getTimeChildren() {
+        return mParTimeContainer.getTimeChildren();
+    }
+
+    public boolean beginElement() {
+        return mParTimeContainer.beginElement();
+    }
+
+    public boolean endElement() {
+        return mParTimeContainer.endElement();
+    }
+
+    public TimeList getBegin() {
+        return mParTimeContainer.getBegin();
+    }
+
+    public float getDur() {
+        return mParTimeContainer.getDur();
+    }
+
+    public TimeList getEnd() {
+        return mParTimeContainer.getEnd();
+    }
+
+    public short getFill() {
+        return mParTimeContainer.getFill();
+    }
+
+    public short getFillDefault() {
+        return mParTimeContainer.getFillDefault();
+    }
+
+    public float getRepeatCount() {
+        return mParTimeContainer.getRepeatCount();
+    }
+
+    public float getRepeatDur() {
+        return mParTimeContainer.getRepeatDur();
+    }
+
+    public short getRestart() {
+        return mParTimeContainer.getRestart();
+    }
+
+    public void pauseElement() {
+        mParTimeContainer.pauseElement();
+    }
+
+    public void resumeElement() {
+        mParTimeContainer.resumeElement();
+    }
+
+    public void seekElement(float seekTo) {
+        mParTimeContainer.seekElement(seekTo);
+    }
+
+    public void setBegin(TimeList begin) throws DOMException {
+        mParTimeContainer.setBegin(begin);
+    }
+
+    public void setDur(float dur) throws DOMException {
+        mParTimeContainer.setDur(dur);
+    }
+
+    public void setEnd(TimeList end) throws DOMException {
+        mParTimeContainer.setEnd(end);
+    }
+
+    public void setFill(short fill) throws DOMException {
+        mParTimeContainer.setFill(fill);
+    }
+
+    public void setFillDefault(short fillDefault) throws DOMException {
+        mParTimeContainer.setFillDefault(fillDefault);
+    }
+
+    public void setRepeatCount(float repeatCount) throws DOMException {
+        mParTimeContainer.setRepeatCount(repeatCount);
+    }
+
+    public void setRepeatDur(float repeatDur) throws DOMException {
+        mParTimeContainer.setRepeatDur(repeatDur);
+    }
+
+    public void setRestart(short restart) throws DOMException {
+        mParTimeContainer.setRestart(restart);
+    }
+}
diff --git a/android-smsmms/src/main/java/com/android/mms/dom/smil/SmilRefElementImpl.java b/android-smsmms/src/main/java/com/android/mms/dom/smil/SmilRefElementImpl.java
index 48be34b82..0f1f0e826 100755
--- a/android-smsmms/src/main/java/com/android/mms/dom/smil/SmilRefElementImpl.java
+++ b/android-smsmms/src/main/java/com/android/mms/dom/smil/SmilRefElementImpl.java
@@ -1,29 +1,29 @@
-/*
- * Copyright (C) 2007 Esmertec AG.
- * Copyright (C) 2007 The Android Open Source Project
- *
- * Licensed under the Apache License, Version 2.0 (the "License");
- * you may not use this file except in compliance with the License.
- * You may obtain a copy of the License at
- *
- *      http://www.apache.org/licenses/LICENSE-2.0
- *
- * Unless required by applicable law or agreed to in writing, software
- * distributed under the License is distributed on an "AS IS" BASIS,
- * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
- * See the License for the specific language governing permissions and
- * limitations under the License.
- */
-
-package com.android.mms.dom.smil;
-
-import org.w3c.dom.smil.SMILRefElement;
-
-public class SmilRefElementImpl extends SmilRegionMediaElementImpl implements
-        SMILRefElement {
-
-    SmilRefElementImpl(SmilDocumentImpl owner, String tagName) {
-        super(owner, tagName);
-    }
-
-}
+/*
+ * Copyright (C) 2007 Esmertec AG.
+ * Copyright (C) 2007 The Android Open Source Project
+ *
+ * Licensed under the Apache License, Version 2.0 (the "License");
+ * you may not use this file except in compliance with the License.
+ * You may obtain a copy of the License at
+ *
+ *      http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing, software
+ * distributed under the License is distributed on an "AS IS" BASIS,
+ * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ * See the License for the specific language governing permissions and
+ * limitations under the License.
+ */
+
+package com.android.mms.dom.smil;
+
+import org.w3c.dom.smil.SMILRefElement;
+
+public class SmilRefElementImpl extends SmilRegionMediaElementImpl implements
+        SMILRefElement {
+
+    SmilRefElementImpl(SmilDocumentImpl owner, String tagName) {
+        super(owner, tagName);
+    }
+
+}
diff --git a/android-smsmms/src/main/java/com/android/mms/dom/smil/SmilRegionElementImpl.java b/android-smsmms/src/main/java/com/android/mms/dom/smil/SmilRegionElementImpl.java
index 6f136ef75..9cb094698 100755
--- a/android-smsmms/src/main/java/com/android/mms/dom/smil/SmilRegionElementImpl.java
+++ b/android-smsmms/src/main/java/com/android/mms/dom/smil/SmilRegionElementImpl.java
@@ -1,279 +1,279 @@
-/*
- * Copyright 2014 Jacob Klinker
- *
- * Licensed under the Apache License, Version 2.0 (the "License");
- * you may not use this file except in compliance with the License.
- * You may obtain a copy of the License at
- *
- *     http://www.apache.org/licenses/LICENSE-2.0
- *
- * Unless required by applicable law or agreed to in writing, software
- * distributed under the License is distributed on an "AS IS" BASIS,
- * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
- * See the License for the specific language governing permissions and
- * limitations under the License.
- */
-
-package com.android.mms.dom.smil;
-
-import org.w3c.dom.DOMException;
-import org.w3c.dom.smil.SMILDocument;
-import org.w3c.dom.smil.SMILRegionElement;
-import timber.log.Timber;
-
-public class SmilRegionElementImpl extends SmilElementImpl implements
-        SMILRegionElement {
-
-    /*
-     * Internal Interface
-     */
-
-    private static final String HIDDEN_ATTRIBUTE = "hidden";
-    private static final String SLICE_ATTRIBUTE = "slice";
-    private static final String SCROLL_ATTRIBUTE = "scroll";
-    private static final String MEET_ATTRIBUTE = "meet";
-    private static final String FILL_ATTRIBUTE = "fill";
-    private static final String ID_ATTRIBUTE_NAME = "id";
-    private static final String WIDTH_ATTRIBUTE_NAME = "width";
-    private static final String TITLE_ATTRIBUTE_NAME = "title";
-    private static final String HEIGHT_ATTRIBUTE_NAME = "height";
-    private static final String BACKGROUND_COLOR_ATTRIBUTE_NAME = "backgroundColor";
-    private static final String Z_INDEX_ATTRIBUTE_NAME = "z-index";
-    private static final String TOP_ATTRIBUTE_NAME = "top";
-    private static final String LEFT_ATTRIBUTE_NAME = "left";
-    private static final String RIGHT_ATTRIBUTE_NAME = "right";
-    private static final String BOTTOM_ATTRIBUTE_NAME = "bottom";
-    private static final String FIT_ATTRIBUTE_NAME = "fit";
-    private static final boolean LOCAL_LOGV = false;
-
-    SmilRegionElementImpl(SmilDocumentImpl owner, String tagName) {
-        super(owner, tagName);
-    }
-
-    /*
-     * SMILRegionElement Interface
-     */
-
-    public String getFit() {
-        String fit = getAttribute(FIT_ATTRIBUTE_NAME);
-        if (FILL_ATTRIBUTE.equalsIgnoreCase(fit)) {
-            return FILL_ATTRIBUTE;
-        } else if (MEET_ATTRIBUTE.equalsIgnoreCase(fit)) {
-            return MEET_ATTRIBUTE;
-        } else if (SCROLL_ATTRIBUTE.equalsIgnoreCase(fit)) {
-            return SCROLL_ATTRIBUTE;
-        } else if (SLICE_ATTRIBUTE.equalsIgnoreCase(fit)) {
-            return SLICE_ATTRIBUTE;
-        } else {
-            return HIDDEN_ATTRIBUTE;
-        }
-    }
-
-    public int getLeft() {
-        try {
-            return parseRegionLength(getAttribute(LEFT_ATTRIBUTE_NAME), true);
-        } catch (NumberFormatException e) {
-            if (LOCAL_LOGV) {
-                Timber.v("Left attribute is not set or incorrect.");
-            }
-        }
-        try {
-            int bbw = ((SMILDocument) getOwnerDocument()).getLayout().getRootLayout().getWidth();
-            int right = parseRegionLength(getAttribute(RIGHT_ATTRIBUTE_NAME), true);
-            int width = parseRegionLength(getAttribute(WIDTH_ATTRIBUTE_NAME), true);
-            return bbw - right - width;
-        } catch (NumberFormatException e) {
-            if (LOCAL_LOGV) {
-                Timber.v("Right or width attribute is not set or incorrect.");
-            }
-        }
-        return 0;
-    }
-
-    public int getTop() {
-        try {
-            return parseRegionLength(getAttribute(TOP_ATTRIBUTE_NAME), false);
-        } catch (NumberFormatException e) {
-            if (LOCAL_LOGV) {
-                Timber.v("Top attribute is not set or incorrect.");
-            }
-        }
-        try {
-            int bbh = ((SMILDocument) getOwnerDocument()).getLayout().getRootLayout().getHeight();
-            int bottom = parseRegionLength(getAttribute(BOTTOM_ATTRIBUTE_NAME), false);
-            int height = parseRegionLength(getAttribute(HEIGHT_ATTRIBUTE_NAME), false);
-            return bbh - bottom - height;
-        } catch (NumberFormatException e) {
-            if (LOCAL_LOGV) {
-                Timber.v("Bottom or height attribute is not set or incorrect.");
-            }
-        }
-        return 0;
-    }
-
-    public int getZIndex() {
-        try {
-            return Integer.parseInt(this.getAttribute(Z_INDEX_ATTRIBUTE_NAME));
-        } catch (NumberFormatException e) {
-            return 0;
-        }
-    }
-
-    public void setFit(String fit) throws DOMException {
-        if (fit.equalsIgnoreCase(FILL_ATTRIBUTE)
-                || fit.equalsIgnoreCase(MEET_ATTRIBUTE)
-                || fit.equalsIgnoreCase(SCROLL_ATTRIBUTE)
-                || fit.equalsIgnoreCase(SLICE_ATTRIBUTE)) {
-            this.setAttribute(FIT_ATTRIBUTE_NAME, fit.toLowerCase());
-        } else {
-            this.setAttribute(FIT_ATTRIBUTE_NAME, HIDDEN_ATTRIBUTE);
-        }
-    }
-
-    public void setLeft(int left) throws DOMException {
-        this.setAttribute(LEFT_ATTRIBUTE_NAME, String.valueOf(left));
-    }
-
-    public void setTop(int top) throws DOMException {
-        this.setAttribute(TOP_ATTRIBUTE_NAME, String.valueOf(top));
-    }
-
-    public void setZIndex(int zIndex) throws DOMException {
-        if (zIndex > 0) {
-            this.setAttribute(Z_INDEX_ATTRIBUTE_NAME, Integer.toString(zIndex));
-        } else {
-            this.setAttribute(Z_INDEX_ATTRIBUTE_NAME, Integer.toString(0));
-        }
-    }
-
-    public String getBackgroundColor() {
-        return this.getAttribute(BACKGROUND_COLOR_ATTRIBUTE_NAME);
-    }
-
-    public int getHeight() {
-        try {
-            final int height = parseRegionLength(getAttribute(HEIGHT_ATTRIBUTE_NAME), false);
-            return height == 0 ?
-                    ((SMILDocument) getOwnerDocument()).getLayout().getRootLayout().getHeight() :
-                        height;
-        } catch (NumberFormatException e) {
-            if (LOCAL_LOGV) {
-                Timber.v("Height attribute is not set or incorrect.");
-            }
-        }
-        int bbh = ((SMILDocument) getOwnerDocument()).getLayout().getRootLayout().getHeight();
-        try {
-            bbh -= parseRegionLength(getAttribute(TOP_ATTRIBUTE_NAME), false);
-        } catch (NumberFormatException e) {
-            if (LOCAL_LOGV) {
-                Timber.v("Top attribute is not set or incorrect.");
-            }
-        }
-        try {
-            bbh -= parseRegionLength(getAttribute(BOTTOM_ATTRIBUTE_NAME), false);
-        } catch (NumberFormatException e) {
-            if (LOCAL_LOGV) {
-                Timber.v("Bottom attribute is not set or incorrect.");
-            }
-        }
-        return bbh;
-    }
-
-    public String getTitle() {
-        return this.getAttribute(TITLE_ATTRIBUTE_NAME);
-    }
-
-    public int getWidth() {
-        try {
-            final int width = parseRegionLength(getAttribute(WIDTH_ATTRIBUTE_NAME), true);
-            return width == 0 ?
-                    ((SMILDocument) getOwnerDocument()).getLayout().getRootLayout().getWidth() :
-                        width;
-        } catch (NumberFormatException e) {
-            if (LOCAL_LOGV) {
-                Timber.v("Width attribute is not set or incorrect.");
-            }
-        }
-        int bbw = ((SMILDocument) getOwnerDocument()).getLayout().getRootLayout().getWidth();
-        try {
-            bbw -= parseRegionLength(getAttribute(LEFT_ATTRIBUTE_NAME), true);
-        } catch (NumberFormatException e) {
-            if (LOCAL_LOGV) {
-                Timber.v("Left attribute is not set or incorrect.");
-            }
-        }
-        try {
-            bbw -= parseRegionLength(getAttribute(RIGHT_ATTRIBUTE_NAME), true);
-        } catch (NumberFormatException e) {
-            if (LOCAL_LOGV) {
-                Timber.v("Right attribute is not set or incorrect.");
-            }
-        }
-        return bbw;
-    }
-
-    public void setBackgroundColor(String backgroundColor) throws DOMException {
-        this.setAttribute(BACKGROUND_COLOR_ATTRIBUTE_NAME, backgroundColor);
-    }
-
-    public void setHeight(int height) throws DOMException {
-        this.setAttribute(HEIGHT_ATTRIBUTE_NAME, String.valueOf(height) + "px");
-    }
-
-    public void setTitle(String title) throws DOMException {
-        this.setAttribute(TITLE_ATTRIBUTE_NAME, title);
-    }
-
-    public void setWidth(int width) throws DOMException {
-        this.setAttribute(WIDTH_ATTRIBUTE_NAME, String.valueOf(width) + "px");
-    }
-
-    /*
-     * SMILElement Interface
-     */
-
-    @Override
-    public String getId() {
-        return this.getAttribute(ID_ATTRIBUTE_NAME);
-    }
-
-    @Override
-    public void setId(String id) throws DOMException {
-        this.setAttribute(ID_ATTRIBUTE_NAME, id);
-    }
-
-    /*
-     * Internal Interface
-     */
-
-    private int parseRegionLength(String length, boolean horizontal) {
-        if (length.endsWith("px")) {
-            length = length.substring(0, length.indexOf("px"));
-            return Integer.parseInt(length);
-        } else if (length.endsWith("%")) {
-            double value = 0.01*Integer.parseInt(length.substring(0, length.length() - 1));
-            if (horizontal) {
-                value *= ((SMILDocument) getOwnerDocument()).getLayout().getRootLayout().getWidth();
-            } else {
-                value *= ((SMILDocument) getOwnerDocument()).getLayout().getRootLayout().getHeight();
-            }
-            return (int) Math.round(value);
-        } else {
-            return Integer.parseInt(length);
-        }
-    }
-
-    /*
-     * (non-Javadoc)
-     * @see java.lang.Object#toString()
-     */
-    @Override
-    public String toString() {
-        return super.toString()
-                + ": id=" + getId()
-                + ", width=" + getWidth()
-                + ", height=" + getHeight()
-                + ", left=" + getLeft()
-                + ", top=" + getTop();
-    }
-}
+/*
+ * Copyright 2014 Jacob Klinker
+ *
+ * Licensed under the Apache License, Version 2.0 (the "License");
+ * you may not use this file except in compliance with the License.
+ * You may obtain a copy of the License at
+ *
+ *     http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing, software
+ * distributed under the License is distributed on an "AS IS" BASIS,
+ * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ * See the License for the specific language governing permissions and
+ * limitations under the License.
+ */
+
+package com.android.mms.dom.smil;
+
+import org.w3c.dom.DOMException;
+import org.w3c.dom.smil.SMILDocument;
+import org.w3c.dom.smil.SMILRegionElement;
+import timber.log.Timber;
+
+public class SmilRegionElementImpl extends SmilElementImpl implements
+        SMILRegionElement {
+
+    /*
+     * Internal Interface
+     */
+
+    private static final String HIDDEN_ATTRIBUTE = "hidden";
+    private static final String SLICE_ATTRIBUTE = "slice";
+    private static final String SCROLL_ATTRIBUTE = "scroll";
+    private static final String MEET_ATTRIBUTE = "meet";
+    private static final String FILL_ATTRIBUTE = "fill";
+    private static final String ID_ATTRIBUTE_NAME = "id";
+    private static final String WIDTH_ATTRIBUTE_NAME = "width";
+    private static final String TITLE_ATTRIBUTE_NAME = "title";
+    private static final String HEIGHT_ATTRIBUTE_NAME = "height";
+    private static final String BACKGROUND_COLOR_ATTRIBUTE_NAME = "backgroundColor";
+    private static final String Z_INDEX_ATTRIBUTE_NAME = "z-index";
+    private static final String TOP_ATTRIBUTE_NAME = "top";
+    private static final String LEFT_ATTRIBUTE_NAME = "left";
+    private static final String RIGHT_ATTRIBUTE_NAME = "right";
+    private static final String BOTTOM_ATTRIBUTE_NAME = "bottom";
+    private static final String FIT_ATTRIBUTE_NAME = "fit";
+    private static final boolean LOCAL_LOGV = false;
+
+    SmilRegionElementImpl(SmilDocumentImpl owner, String tagName) {
+        super(owner, tagName);
+    }
+
+    /*
+     * SMILRegionElement Interface
+     */
+
+    public String getFit() {
+        String fit = getAttribute(FIT_ATTRIBUTE_NAME);
+        if (FILL_ATTRIBUTE.equalsIgnoreCase(fit)) {
+            return FILL_ATTRIBUTE;
+        } else if (MEET_ATTRIBUTE.equalsIgnoreCase(fit)) {
+            return MEET_ATTRIBUTE;
+        } else if (SCROLL_ATTRIBUTE.equalsIgnoreCase(fit)) {
+            return SCROLL_ATTRIBUTE;
+        } else if (SLICE_ATTRIBUTE.equalsIgnoreCase(fit)) {
+            return SLICE_ATTRIBUTE;
+        } else {
+            return HIDDEN_ATTRIBUTE;
+        }
+    }
+
+    public int getLeft() {
+        try {
+            return parseRegionLength(getAttribute(LEFT_ATTRIBUTE_NAME), true);
+        } catch (NumberFormatException e) {
+            if (LOCAL_LOGV) {
+                Timber.v("Left attribute is not set or incorrect.");
+            }
+        }
+        try {
+            int bbw = ((SMILDocument) getOwnerDocument()).getLayout().getRootLayout().getWidth();
+            int right = parseRegionLength(getAttribute(RIGHT_ATTRIBUTE_NAME), true);
+            int width = parseRegionLength(getAttribute(WIDTH_ATTRIBUTE_NAME), true);
+            return bbw - right - width;
+        } catch (NumberFormatException e) {
+            if (LOCAL_LOGV) {
+                Timber.v("Right or width attribute is not set or incorrect.");
+            }
+        }
+        return 0;
+    }
+
+    public int getTop() {
+        try {
+            return parseRegionLength(getAttribute(TOP_ATTRIBUTE_NAME), false);
+        } catch (NumberFormatException e) {
+            if (LOCAL_LOGV) {
+                Timber.v("Top attribute is not set or incorrect.");
+            }
+        }
+        try {
+            int bbh = ((SMILDocument) getOwnerDocument()).getLayout().getRootLayout().getHeight();
+            int bottom = parseRegionLength(getAttribute(BOTTOM_ATTRIBUTE_NAME), false);
+            int height = parseRegionLength(getAttribute(HEIGHT_ATTRIBUTE_NAME), false);
+            return bbh - bottom - height;
+        } catch (NumberFormatException e) {
+            if (LOCAL_LOGV) {
+                Timber.v("Bottom or height attribute is not set or incorrect.");
+            }
+        }
+        return 0;
+    }
+
+    public int getZIndex() {
+        try {
+            return Integer.parseInt(this.getAttribute(Z_INDEX_ATTRIBUTE_NAME));
+        } catch (NumberFormatException e) {
+            return 0;
+        }
+    }
+
+    public void setFit(String fit) throws DOMException {
+        if (fit.equalsIgnoreCase(FILL_ATTRIBUTE)
+                || fit.equalsIgnoreCase(MEET_ATTRIBUTE)
+                || fit.equalsIgnoreCase(SCROLL_ATTRIBUTE)
+                || fit.equalsIgnoreCase(SLICE_ATTRIBUTE)) {
+            this.setAttribute(FIT_ATTRIBUTE_NAME, fit.toLowerCase());
+        } else {
+            this.setAttribute(FIT_ATTRIBUTE_NAME, HIDDEN_ATTRIBUTE);
+        }
+    }
+
+    public void setLeft(int left) throws DOMException {
+        this.setAttribute(LEFT_ATTRIBUTE_NAME, String.valueOf(left));
+    }
+
+    public void setTop(int top) throws DOMException {
+        this.setAttribute(TOP_ATTRIBUTE_NAME, String.valueOf(top));
+    }
+
+    public void setZIndex(int zIndex) throws DOMException {
+        if (zIndex > 0) {
+            this.setAttribute(Z_INDEX_ATTRIBUTE_NAME, Integer.toString(zIndex));
+        } else {
+            this.setAttribute(Z_INDEX_ATTRIBUTE_NAME, Integer.toString(0));
+        }
+    }
+
+    public String getBackgroundColor() {
+        return this.getAttribute(BACKGROUND_COLOR_ATTRIBUTE_NAME);
+    }
+
+    public int getHeight() {
+        try {
+            final int height = parseRegionLength(getAttribute(HEIGHT_ATTRIBUTE_NAME), false);
+            return height == 0 ?
+                    ((SMILDocument) getOwnerDocument()).getLayout().getRootLayout().getHeight() :
+                        height;
+        } catch (NumberFormatException e) {
+            if (LOCAL_LOGV) {
+                Timber.v("Height attribute is not set or incorrect.");
+            }
+        }
+        int bbh = ((SMILDocument) getOwnerDocument()).getLayout().getRootLayout().getHeight();
+        try {
+            bbh -= parseRegionLength(getAttribute(TOP_ATTRIBUTE_NAME), false);
+        } catch (NumberFormatException e) {
+            if (LOCAL_LOGV) {
+                Timber.v("Top attribute is not set or incorrect.");
+            }
+        }
+        try {
+            bbh -= parseRegionLength(getAttribute(BOTTOM_ATTRIBUTE_NAME), false);
+        } catch (NumberFormatException e) {
+            if (LOCAL_LOGV) {
+                Timber.v("Bottom attribute is not set or incorrect.");
+            }
+        }
+        return bbh;
+    }
+
+    public String getTitle() {
+        return this.getAttribute(TITLE_ATTRIBUTE_NAME);
+    }
+
+    public int getWidth() {
+        try {
+            final int width = parseRegionLength(getAttribute(WIDTH_ATTRIBUTE_NAME), true);
+            return width == 0 ?
+                    ((SMILDocument) getOwnerDocument()).getLayout().getRootLayout().getWidth() :
+                        width;
+        } catch (NumberFormatException e) {
+            if (LOCAL_LOGV) {
+                Timber.v("Width attribute is not set or incorrect.");
+            }
+        }
+        int bbw = ((SMILDocument) getOwnerDocument()).getLayout().getRootLayout().getWidth();
+        try {
+            bbw -= parseRegionLength(getAttribute(LEFT_ATTRIBUTE_NAME), true);
+        } catch (NumberFormatException e) {
+            if (LOCAL_LOGV) {
+                Timber.v("Left attribute is not set or incorrect.");
+            }
+        }
+        try {
+            bbw -= parseRegionLength(getAttribute(RIGHT_ATTRIBUTE_NAME), true);
+        } catch (NumberFormatException e) {
+            if (LOCAL_LOGV) {
+                Timber.v("Right attribute is not set or incorrect.");
+            }
+        }
+        return bbw;
+    }
+
+    public void setBackgroundColor(String backgroundColor) throws DOMException {
+        this.setAttribute(BACKGROUND_COLOR_ATTRIBUTE_NAME, backgroundColor);
+    }
+
+    public void setHeight(int height) throws DOMException {
+        this.setAttribute(HEIGHT_ATTRIBUTE_NAME, String.valueOf(height) + "px");
+    }
+
+    public void setTitle(String title) throws DOMException {
+        this.setAttribute(TITLE_ATTRIBUTE_NAME, title);
+    }
+
+    public void setWidth(int width) throws DOMException {
+        this.setAttribute(WIDTH_ATTRIBUTE_NAME, String.valueOf(width) + "px");
+    }
+
+    /*
+     * SMILElement Interface
+     */
+
+    @Override
+    public String getId() {
+        return this.getAttribute(ID_ATTRIBUTE_NAME);
+    }
+
+    @Override
+    public void setId(String id) throws DOMException {
+        this.setAttribute(ID_ATTRIBUTE_NAME, id);
+    }
+
+    /*
+     * Internal Interface
+     */
+
+    private int parseRegionLength(String length, boolean horizontal) {
+        if (length.endsWith("px")) {
+            length = length.substring(0, length.indexOf("px"));
+            return Integer.parseInt(length);
+        } else if (length.endsWith("%")) {
+            double value = 0.01*Integer.parseInt(length.substring(0, length.length() - 1));
+            if (horizontal) {
+                value *= ((SMILDocument) getOwnerDocument()).getLayout().getRootLayout().getWidth();
+            } else {
+                value *= ((SMILDocument) getOwnerDocument()).getLayout().getRootLayout().getHeight();
+            }
+            return (int) Math.round(value);
+        } else {
+            return Integer.parseInt(length);
+        }
+    }
+
+    /*
+     * (non-Javadoc)
+     * @see java.lang.Object#toString()
+     */
+    @Override
+    public String toString() {
+        return super.toString()
+                + ": id=" + getId()
+                + ", width=" + getWidth()
+                + ", height=" + getHeight()
+                + ", left=" + getLeft()
+                + ", top=" + getTop();
+    }
+}
diff --git a/android-smsmms/src/main/java/com/android/mms/dom/smil/SmilRegionMediaElementImpl.java b/android-smsmms/src/main/java/com/android/mms/dom/smil/SmilRegionMediaElementImpl.java
index 21a70e3ba..7b6e5c5ca 100755
--- a/android-smsmms/src/main/java/com/android/mms/dom/smil/SmilRegionMediaElementImpl.java
+++ b/android-smsmms/src/main/java/com/android/mms/dom/smil/SmilRegionMediaElementImpl.java
@@ -1,53 +1,53 @@
-/*
- * Copyright (C) 2007 Esmertec AG.
- * Copyright (C) 2007 The Android Open Source Project
- *
- * Licensed under the Apache License, Version 2.0 (the "License");
- * you may not use this file except in compliance with the License.
- * You may obtain a copy of the License at
- *
- *      http://www.apache.org/licenses/LICENSE-2.0
- *
- * Unless required by applicable law or agreed to in writing, software
- * distributed under the License is distributed on an "AS IS" BASIS,
- * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
- * See the License for the specific language governing permissions and
- * limitations under the License.
- */
-
-package com.android.mms.dom.smil;
-
-import org.w3c.dom.NodeList;
-import org.w3c.dom.smil.SMILDocument;
-import org.w3c.dom.smil.SMILRegionElement;
-import org.w3c.dom.smil.SMILRegionMediaElement;
-
-public class SmilRegionMediaElementImpl extends SmilMediaElementImpl implements
-        SMILRegionMediaElement {
-    private SMILRegionElement mRegion;
-
-    SmilRegionMediaElementImpl(SmilDocumentImpl owner, String tagName) {
-        super(owner, tagName);
-    }
-
-    public SMILRegionElement getRegion() {
-        if (mRegion == null) {
-            SMILDocument doc = (SMILDocument)this.getOwnerDocument();
-            NodeList regions = doc.getLayout().getElementsByTagName("region");
-            SMILRegionElement region = null;
-            for (int i = 0; i < regions.getLength(); i++) {
-                region = (SMILRegionElement)regions.item(i);
-                if (region.getId().equals(this.getAttribute("region"))) {
-                    mRegion = region;
-                }
-            }
-        }
-        return mRegion;
-    }
-
-    public void setRegion(SMILRegionElement region) {
-        this.setAttribute("region", region.getId());
-        mRegion = region;
-    }
-
-}
+/*
+ * Copyright (C) 2007 Esmertec AG.
+ * Copyright (C) 2007 The Android Open Source Project
+ *
+ * Licensed under the Apache License, Version 2.0 (the "License");
+ * you may not use this file except in compliance with the License.
+ * You may obtain a copy of the License at
+ *
+ *      http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing, software
+ * distributed under the License is distributed on an "AS IS" BASIS,
+ * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ * See the License for the specific language governing permissions and
+ * limitations under the License.
+ */
+
+package com.android.mms.dom.smil;
+
+import org.w3c.dom.NodeList;
+import org.w3c.dom.smil.SMILDocument;
+import org.w3c.dom.smil.SMILRegionElement;
+import org.w3c.dom.smil.SMILRegionMediaElement;
+
+public class SmilRegionMediaElementImpl extends SmilMediaElementImpl implements
+        SMILRegionMediaElement {
+    private SMILRegionElement mRegion;
+
+    SmilRegionMediaElementImpl(SmilDocumentImpl owner, String tagName) {
+        super(owner, tagName);
+    }
+
+    public SMILRegionElement getRegion() {
+        if (mRegion == null) {
+            SMILDocument doc = (SMILDocument)this.getOwnerDocument();
+            NodeList regions = doc.getLayout().getElementsByTagName("region");
+            SMILRegionElement region = null;
+            for (int i = 0; i < regions.getLength(); i++) {
+                region = (SMILRegionElement)regions.item(i);
+                if (region.getId().equals(this.getAttribute("region"))) {
+                    mRegion = region;
+                }
+            }
+        }
+        return mRegion;
+    }
+
+    public void setRegion(SMILRegionElement region) {
+        this.setAttribute("region", region.getId());
+        mRegion = region;
+    }
+
+}
diff --git a/android-smsmms/src/main/java/com/android/mms/dom/smil/SmilRootLayoutElementImpl.java b/android-smsmms/src/main/java/com/android/mms/dom/smil/SmilRootLayoutElementImpl.java
index 109ae072e..29350c373 100755
--- a/android-smsmms/src/main/java/com/android/mms/dom/smil/SmilRootLayoutElementImpl.java
+++ b/android-smsmms/src/main/java/com/android/mms/dom/smil/SmilRootLayoutElementImpl.java
@@ -1,84 +1,84 @@
-/*
- * Copyright (C) 2007 Esmertec AG.
- * Copyright (C) 2007 The Android Open Source Project
- *
- * Licensed under the Apache License, Version 2.0 (the "License");
- * you may not use this file except in compliance with the License.
- * You may obtain a copy of the License at
- *
- *      http://www.apache.org/licenses/LICENSE-2.0
- *
- * Unless required by applicable law or agreed to in writing, software
- * distributed under the License is distributed on an "AS IS" BASIS,
- * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
- * See the License for the specific language governing permissions and
- * limitations under the License.
- */
-
-package com.android.mms.dom.smil;
-
-import org.w3c.dom.DOMException;
-import org.w3c.dom.smil.SMILRootLayoutElement;
-
-public class SmilRootLayoutElementImpl extends SmilElementImpl implements
-        SMILRootLayoutElement {
-
-    private static final String WIDTH_ATTRIBUTE_NAME = "width";
-    private static final String HEIGHT_ATTRIBUTE_NAME = "height";
-    private static final String BACKGROUND_COLOR_ATTRIBUTE_NAME = "backgroundColor";
-    private static final String TITLE_ATTRIBUTE_NAME = "title";
-
-    SmilRootLayoutElementImpl(SmilDocumentImpl owner, String tagName) {
-        super(owner, tagName);
-    }
-
-    public String getBackgroundColor() {
-        return this.getAttribute(BACKGROUND_COLOR_ATTRIBUTE_NAME);
-    }
-
-    public int getHeight() {
-        String heightString = this.getAttribute(HEIGHT_ATTRIBUTE_NAME);
-        return parseAbsoluteLength(heightString);
-    }
-
-    public String getTitle() {
-        return this.getAttribute(TITLE_ATTRIBUTE_NAME);
-    }
-
-    public int getWidth() {
-        String widthString = this.getAttribute(WIDTH_ATTRIBUTE_NAME);
-        return parseAbsoluteLength(widthString);
-    }
-
-    public void setBackgroundColor(String backgroundColor) throws DOMException {
-        this.setAttribute(BACKGROUND_COLOR_ATTRIBUTE_NAME, backgroundColor);
-    }
-
-    public void setHeight(int height) throws DOMException {
-        this.setAttribute(HEIGHT_ATTRIBUTE_NAME, String.valueOf(height) + "px");
-
-    }
-
-    public void setTitle(String title) throws DOMException {
-        this.setAttribute(TITLE_ATTRIBUTE_NAME, title);
-    }
-
-    public void setWidth(int width) throws DOMException {
-        this.setAttribute(WIDTH_ATTRIBUTE_NAME, String.valueOf(width) + "px");
-    }
-
-    /*
-     * Internal Interface
-     */
-
-    private int parseAbsoluteLength(String length) {
-        if (length.endsWith("px")) {
-            length = length.substring(0, length.indexOf("px"));
-        }
-        try {
-            return Integer.parseInt(length);
-        } catch (NumberFormatException e) {
-            return 0;
-        }
-    }
-}
+/*
+ * Copyright (C) 2007 Esmertec AG.
+ * Copyright (C) 2007 The Android Open Source Project
+ *
+ * Licensed under the Apache License, Version 2.0 (the "License");
+ * you may not use this file except in compliance with the License.
+ * You may obtain a copy of the License at
+ *
+ *      http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing, software
+ * distributed under the License is distributed on an "AS IS" BASIS,
+ * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ * See the License for the specific language governing permissions and
+ * limitations under the License.
+ */
+
+package com.android.mms.dom.smil;
+
+import org.w3c.dom.DOMException;
+import org.w3c.dom.smil.SMILRootLayoutElement;
+
+public class SmilRootLayoutElementImpl extends SmilElementImpl implements
+        SMILRootLayoutElement {
+
+    private static final String WIDTH_ATTRIBUTE_NAME = "width";
+    private static final String HEIGHT_ATTRIBUTE_NAME = "height";
+    private static final String BACKGROUND_COLOR_ATTRIBUTE_NAME = "backgroundColor";
+    private static final String TITLE_ATTRIBUTE_NAME = "title";
+
+    SmilRootLayoutElementImpl(SmilDocumentImpl owner, String tagName) {
+        super(owner, tagName);
+    }
+
+    public String getBackgroundColor() {
+        return this.getAttribute(BACKGROUND_COLOR_ATTRIBUTE_NAME);
+    }
+
+    public int getHeight() {
+        String heightString = this.getAttribute(HEIGHT_ATTRIBUTE_NAME);
+        return parseAbsoluteLength(heightString);
+    }
+
+    public String getTitle() {
+        return this.getAttribute(TITLE_ATTRIBUTE_NAME);
+    }
+
+    public int getWidth() {
+        String widthString = this.getAttribute(WIDTH_ATTRIBUTE_NAME);
+        return parseAbsoluteLength(widthString);
+    }
+
+    public void setBackgroundColor(String backgroundColor) throws DOMException {
+        this.setAttribute(BACKGROUND_COLOR_ATTRIBUTE_NAME, backgroundColor);
+    }
+
+    public void setHeight(int height) throws DOMException {
+        this.setAttribute(HEIGHT_ATTRIBUTE_NAME, String.valueOf(height) + "px");
+
+    }
+
+    public void setTitle(String title) throws DOMException {
+        this.setAttribute(TITLE_ATTRIBUTE_NAME, title);
+    }
+
+    public void setWidth(int width) throws DOMException {
+        this.setAttribute(WIDTH_ATTRIBUTE_NAME, String.valueOf(width) + "px");
+    }
+
+    /*
+     * Internal Interface
+     */
+
+    private int parseAbsoluteLength(String length) {
+        if (length.endsWith("px")) {
+            length = length.substring(0, length.indexOf("px"));
+        }
+        try {
+            return Integer.parseInt(length);
+        } catch (NumberFormatException e) {
+            return 0;
+        }
+    }
+}
diff --git a/android-smsmms/src/main/java/com/android/mms/dom/smil/TimeImpl.java b/android-smsmms/src/main/java/com/android/mms/dom/smil/TimeImpl.java
index 2adbaae35..8e6774db5 100755
--- a/android-smsmms/src/main/java/com/android/mms/dom/smil/TimeImpl.java
+++ b/android-smsmms/src/main/java/com/android/mms/dom/smil/TimeImpl.java
@@ -1,294 +1,294 @@
-/*
- * Copyright 2014 Jacob Klinker
- *
- * Licensed under the Apache License, Version 2.0 (the "License");
- * you may not use this file except in compliance with the License.
- * You may obtain a copy of the License at
- *
- *     http://www.apache.org/licenses/LICENSE-2.0
- *
- * Unless required by applicable law or agreed to in writing, software
- * distributed under the License is distributed on an "AS IS" BASIS,
- * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
- * See the License for the specific language governing permissions and
- * limitations under the License.
- */
-
-package com.android.mms.dom.smil;
-
-import org.w3c.dom.DOMException;
-import org.w3c.dom.Element;
-import org.w3c.dom.smil.Time;
-
-public class TimeImpl implements Time {
-    static final int ALLOW_INDEFINITE_VALUE = (1 << 0);
-    static final int ALLOW_OFFSET_VALUE     = (1 << 1);
-    static final int ALLOW_SYNCBASE_VALUE   = (1 << 2);
-    static final int ALLOW_SYNCTOPREV_VALUE = (1 << 3);
-    static final int ALLOW_EVENT_VALUE      = (1 << 4);
-    static final int ALLOW_MARKER_VALUE     = (1 << 5);
-    static final int ALLOW_WALLCLOCK_VALUE  = (1 << 6);
-    static final int ALLOW_NEGATIVE_VALUE   = (1 << 7);
-    static final int ALLOW_ALL              = 0xFF;
-
-    short mTimeType;
-    boolean mResolved;
-    double mResolvedOffset;
-
-    /**
-     * Creates a TimeImpl representation of a time-value represented as a String.
-     * Time-values have the following syntax:
-     * <p>
-     * <pre>
-     * Time-val ::= ( smil-1.0-syncbase-value
-     *                          | "indefinite"
-     *                          | offset-value
-     *                          | syncbase-value
-     *                          | syncToPrev-value
-     *                          | event-value
-     *                          | media-marker-value
-     *                          | wallclock-sync-value )
-     * Smil-1.0-syncbase-value ::=
-     *          "id(" id-ref ")" ( "(" ( "begin" | "end" | clock-value ) ")" )?
-     * Offset-value         ::= ( "+" | "-" )? clock-value
-     * Syncbase-value       ::= ( id-ref "." ( "begin" | "end" ) ) ( ( "+" | "-" ) clock-value )?
-     * SyncToPrev-value     ::= ( "prev.begin" | "prev.end" ) ( ( "+" | "-" ) clock-value )?
-     * Event-value          ::= ( id-ref "." )? ( event-ref  ) ( ( "+" | "-" ) clock-value )?
-     * Media-marker-value   ::= id-ref ".marker(" marker-name ")"
-     * Wallclock-sync-value ::= "wallclock(" wallclock-value ")"
-     * </pre>
-     *
-     * @param timeValue A String in the representation specified above
-     * @param constraints Any combination of the #ALLOW_* flags
-     * @return  A TimeImpl instance representing
-     * @exception IllegalArgumentException if the timeValue input
-     *          parameter does not comply with the defined syntax
-     * @exception NullPointerException if the timekValue string is
-     *          <code>null</code>
-     */
-    TimeImpl(String timeValue, int constraints) {
-        /*
-         * We do not support yet:
-         *      - smil-1.0-syncbase-value
-         *      - syncbase-value
-         *      - syncToPrev-value
-         *      - event-value
-         *      - Media-marker-value
-         *      - Wallclock-sync-value
-         */
-        // Will throw NullPointerException if timeValue is null
-        if (timeValue.equals("indefinite")
-                && ((constraints & ALLOW_INDEFINITE_VALUE) != 0) ) {
-            mTimeType = SMIL_TIME_INDEFINITE;
-        } else if ((constraints & ALLOW_OFFSET_VALUE) != 0) {
-            int sign = 1;
-            if (timeValue.startsWith("+")) {
-                timeValue = timeValue.substring(1);
-            } else if (timeValue.startsWith("-")) {
-                timeValue = timeValue.substring(1);
-                sign = -1;
-            }
-            mResolvedOffset = sign*parseClockValue(timeValue)/1000.0;
-            mResolved = true;
-            mTimeType = SMIL_TIME_OFFSET;
-        } else {
-            throw new IllegalArgumentException("Unsupported time value");
-        }
-    }
-
-    /**
-     * Converts a String representation of a clock value into the float
-     * representation used in this API.
-     * <p>
-     * Clock values have the following syntax:
-     * </p>
-     * <p>
-     * <pre>
-     * Clock-val         ::= ( Full-clock-val | Partial-clock-val | Timecount-val )
-     * Full-clock-val    ::= Hours ":" Minutes ":" Seconds ("." Fraction)?
-     * Partial-clock-val ::= Minutes ":" Seconds ("." Fraction)?
-     * Timecount-val     ::= Timecount ("." Fraction)? (Metric)?
-     * Metric            ::= "h" | "min" | "s" | "ms"
-     * Hours             ::= DIGIT+; any positive number
-     * Minutes           ::= 2DIGIT; range from 00 to 59
-     * Seconds           ::= 2DIGIT; range from 00 to 59
-     * Fraction          ::= DIGIT+
-     * Timecount         ::= DIGIT+
-     * 2DIGIT            ::= DIGIT DIGIT
-     * DIGIT             ::= [0-9]
-     * </pre>
-     *
-     * @param clockValue A String in the representation specified above
-     * @return  A float value in milliseconds that matches the string
-     *          representation given as the parameter
-     * @exception IllegalArgumentException if the clockValue input
-     *          parameter does not comply with the defined syntax
-     * @exception NullPointerException if the clockValue string is
-     *          <code>null</code>
-     */
-    public static float parseClockValue(String clockValue) {
-        try {
-            float result = 0;
-
-            // Will throw NullPointerException if clockValue is null
-            clockValue = clockValue.trim();
-
-            // Handle first 'Timecount-val' cases with metric
-            if (clockValue.endsWith("ms")) {
-                result = parseFloat(clockValue, 2, true);
-            } else if (clockValue.endsWith("s")) {
-                result = 1000*parseFloat(clockValue, 1, true);
-            } else if (clockValue.endsWith("min")) {
-                result = 60000*parseFloat(clockValue, 3, true);
-            } else if (clockValue.endsWith("h")) {
-                result = 3600000*parseFloat(clockValue, 1, true);
-            } else {
-                // Handle Timecount-val without metric
-                try {
-                    return parseFloat(clockValue, 0, true) * 1000;
-                } catch (NumberFormatException e) {
-                    // Ignore
-                }
-
-                // Split in {[Hours], Minutes, Seconds}
-                String[] timeValues = clockValue.split(":");
-
-                // Read Hours if present and remember location of Minutes
-                int indexOfMinutes;
-                if (timeValues.length == 2) {
-                    indexOfMinutes = 0;
-                } else if (timeValues.length == 3) {
-                    result = 3600000*(int)parseFloat(timeValues[0], 0, false);
-                    indexOfMinutes = 1;
-                } else {
-                    throw new IllegalArgumentException();
-                }
-
-                // Read Minutes
-                int minutes = (int)parseFloat(timeValues[indexOfMinutes], 0, false);
-                if ((minutes >= 00) && (minutes <= 59)) {
-                    result += 60000*minutes;
-                } else {
-                    throw new IllegalArgumentException();
-                }
-
-                // Read Seconds
-                float seconds = parseFloat(timeValues[indexOfMinutes + 1], 0, true);
-                if ((seconds >= 00) && (seconds < 60)) {
-                    result += 60000*seconds;
-                } else {
-                    throw new IllegalArgumentException();
-                }
-
-            }
-            return result;
-        } catch (NumberFormatException e) {
-            throw new IllegalArgumentException();
-        }
-    }
-
-    /**
-     * Parse a value formatted as follows:
-     * <p>
-     * <pre>
-     * Value    ::= Number ("." Decimal)? (Text)?
-     * Number   ::= DIGIT+; any positive number
-     * Decimal  ::= DIGIT+; any positive number
-     * Text     ::= CHAR*;   any sequence of chars
-     * DIGIT    ::= [0-9]
-     * </pre>
-     * @param value The Value to parse
-     * @param ignoreLast The size of Text to ignore
-     * @param parseDecimal Whether Decimal is expected
-     * @return The float value without Text, rounded to 3 digits after '.'
-     * @throws IllegalArgumentException if Decimal was not expected but encountered
-     */
-    private static float parseFloat(String value, int ignoreLast, boolean parseDecimal) {
-        // Ignore last characters
-        value = value.substring(0, value.length() - ignoreLast);
-
-        float result;
-        int indexOfComma = value.indexOf('.');
-        if (indexOfComma != -1) {
-            if (!parseDecimal) {
-                throw new IllegalArgumentException("int value contains decimal");
-            }
-            // Ensure that there are at least 3 decimals
-            value = value + "000";
-            // Read value up to 3 decimals and cut the rest
-            result = Float.parseFloat(value.substring(0, indexOfComma));
-            result += Float.parseFloat(
-                    value.substring(indexOfComma + 1, indexOfComma + 4))/1000;
-        } else {
-            result = Integer.parseInt(value);
-        }
-
-        return result;
-    }
-
-    /*
-     * Time Interface
-     */
-
-    public boolean getBaseBegin() {
-        // TODO Auto-generated method stub
-        return false;
-    }
-
-    public Element getBaseElement() {
-        // TODO Auto-generated method stub
-        return null;
-    }
-
-    public String getEvent() {
-        // TODO Auto-generated method stub
-        return null;
-    }
-
-    public String getMarker() {
-        // TODO Auto-generated method stub
-        return null;
-    }
-
-    public double getOffset() {
-        // TODO Auto-generated method stub
-        return 0;
-    }
-
-    public boolean getResolved() {
-        return mResolved;
-    }
-
-    public double getResolvedOffset() {
-        return mResolvedOffset;
-    }
-
-    public short getTimeType() {
-        return mTimeType;
-    }
-
-    public void setBaseBegin(boolean baseBegin) throws DOMException {
-        // TODO Auto-generated method stub
-
-    }
-
-    public void setBaseElement(Element baseElement) throws DOMException {
-        // TODO Auto-generated method stub
-
-    }
-
-    public void setEvent(String event) throws DOMException {
-        // TODO Auto-generated method stub
-
-    }
-
-    public void setMarker(String marker) throws DOMException {
-        // TODO Auto-generated method stub
-
-    }
-
-    public void setOffset(double offset) throws DOMException {
-        // TODO Auto-generated method stub
-
-    }
-}
+/*
+ * Copyright 2014 Jacob Klinker
+ *
+ * Licensed under the Apache License, Version 2.0 (the "License");
+ * you may not use this file except in compliance with the License.
+ * You may obtain a copy of the License at
+ *
+ *     http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing, software
+ * distributed under the License is distributed on an "AS IS" BASIS,
+ * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ * See the License for the specific language governing permissions and
+ * limitations under the License.
+ */
+
+package com.android.mms.dom.smil;
+
+import org.w3c.dom.DOMException;
+import org.w3c.dom.Element;
+import org.w3c.dom.smil.Time;
+
+public class TimeImpl implements Time {
+    static final int ALLOW_INDEFINITE_VALUE = (1 << 0);
+    static final int ALLOW_OFFSET_VALUE     = (1 << 1);
+    static final int ALLOW_SYNCBASE_VALUE   = (1 << 2);
+    static final int ALLOW_SYNCTOPREV_VALUE = (1 << 3);
+    static final int ALLOW_EVENT_VALUE      = (1 << 4);
+    static final int ALLOW_MARKER_VALUE     = (1 << 5);
+    static final int ALLOW_WALLCLOCK_VALUE  = (1 << 6);
+    static final int ALLOW_NEGATIVE_VALUE   = (1 << 7);
+    static final int ALLOW_ALL              = 0xFF;
+
+    short mTimeType;
+    boolean mResolved;
+    double mResolvedOffset;
+
+    /**
+     * Creates a TimeImpl representation of a time-value represented as a String.
+     * Time-values have the following syntax:
+     * <p>
+     * <pre>
+     * Time-val ::= ( smil-1.0-syncbase-value
+     *                          | "indefinite"
+     *                          | offset-value
+     *                          | syncbase-value
+     *                          | syncToPrev-value
+     *                          | event-value
+     *                          | media-marker-value
+     *                          | wallclock-sync-value )
+     * Smil-1.0-syncbase-value ::=
+     *          "id(" id-ref ")" ( "(" ( "begin" | "end" | clock-value ) ")" )?
+     * Offset-value         ::= ( "+" | "-" )? clock-value
+     * Syncbase-value       ::= ( id-ref "." ( "begin" | "end" ) ) ( ( "+" | "-" ) clock-value )?
+     * SyncToPrev-value     ::= ( "prev.begin" | "prev.end" ) ( ( "+" | "-" ) clock-value )?
+     * Event-value          ::= ( id-ref "." )? ( event-ref  ) ( ( "+" | "-" ) clock-value )?
+     * Media-marker-value   ::= id-ref ".marker(" marker-name ")"
+     * Wallclock-sync-value ::= "wallclock(" wallclock-value ")"
+     * </pre>
+     *
+     * @param timeValue A String in the representation specified above
+     * @param constraints Any combination of the #ALLOW_* flags
+     * @return  A TimeImpl instance representing
+     * @exception IllegalArgumentException if the timeValue input
+     *          parameter does not comply with the defined syntax
+     * @exception NullPointerException if the timekValue string is
+     *          <code>null</code>
+     */
+    TimeImpl(String timeValue, int constraints) {
+        /*
+         * We do not support yet:
+         *      - smil-1.0-syncbase-value
+         *      - syncbase-value
+         *      - syncToPrev-value
+         *      - event-value
+         *      - Media-marker-value
+         *      - Wallclock-sync-value
+         */
+        // Will throw NullPointerException if timeValue is null
+        if (timeValue.equals("indefinite")
+                && ((constraints & ALLOW_INDEFINITE_VALUE) != 0) ) {
+            mTimeType = SMIL_TIME_INDEFINITE;
+        } else if ((constraints & ALLOW_OFFSET_VALUE) != 0) {
+            int sign = 1;
+            if (timeValue.startsWith("+")) {
+                timeValue = timeValue.substring(1);
+            } else if (timeValue.startsWith("-")) {
+                timeValue = timeValue.substring(1);
+                sign = -1;
+            }
+            mResolvedOffset = sign*parseClockValue(timeValue)/1000.0;
+            mResolved = true;
+            mTimeType = SMIL_TIME_OFFSET;
+        } else {
+            throw new IllegalArgumentException("Unsupported time value");
+        }
+    }
+
+    /**
+     * Converts a String representation of a clock value into the float
+     * representation used in this API.
+     * <p>
+     * Clock values have the following syntax:
+     * </p>
+     * <p>
+     * <pre>
+     * Clock-val         ::= ( Full-clock-val | Partial-clock-val | Timecount-val )
+     * Full-clock-val    ::= Hours ":" Minutes ":" Seconds ("." Fraction)?
+     * Partial-clock-val ::= Minutes ":" Seconds ("." Fraction)?
+     * Timecount-val     ::= Timecount ("." Fraction)? (Metric)?
+     * Metric            ::= "h" | "min" | "s" | "ms"
+     * Hours             ::= DIGIT+; any positive number
+     * Minutes           ::= 2DIGIT; range from 00 to 59
+     * Seconds           ::= 2DIGIT; range from 00 to 59
+     * Fraction          ::= DIGIT+
+     * Timecount         ::= DIGIT+
+     * 2DIGIT            ::= DIGIT DIGIT
+     * DIGIT             ::= [0-9]
+     * </pre>
+     *
+     * @param clockValue A String in the representation specified above
+     * @return  A float value in milliseconds that matches the string
+     *          representation given as the parameter
+     * @exception IllegalArgumentException if the clockValue input
+     *          parameter does not comply with the defined syntax
+     * @exception NullPointerException if the clockValue string is
+     *          <code>null</code>
+     */
+    public static float parseClockValue(String clockValue) {
+        try {
+            float result = 0;
+
+            // Will throw NullPointerException if clockValue is null
+            clockValue = clockValue.trim();
+
+            // Handle first 'Timecount-val' cases with metric
+            if (clockValue.endsWith("ms")) {
+                result = parseFloat(clockValue, 2, true);
+            } else if (clockValue.endsWith("s")) {
+                result = 1000*parseFloat(clockValue, 1, true);
+            } else if (clockValue.endsWith("min")) {
+                result = 60000*parseFloat(clockValue, 3, true);
+            } else if (clockValue.endsWith("h")) {
+                result = 3600000*parseFloat(clockValue, 1, true);
+            } else {
+                // Handle Timecount-val without metric
+                try {
+                    return parseFloat(clockValue, 0, true) * 1000;
+                } catch (NumberFormatException e) {
+                    // Ignore
+                }
+
+                // Split in {[Hours], Minutes, Seconds}
+                String[] timeValues = clockValue.split(":");
+
+                // Read Hours if present and remember location of Minutes
+                int indexOfMinutes;
+                if (timeValues.length == 2) {
+                    indexOfMinutes = 0;
+                } else if (timeValues.length == 3) {
+                    result = 3600000*(int)parseFloat(timeValues[0], 0, false);
+                    indexOfMinutes = 1;
+                } else {
+                    throw new IllegalArgumentException();
+                }
+
+                // Read Minutes
+                int minutes = (int)parseFloat(timeValues[indexOfMinutes], 0, false);
+                if ((minutes >= 00) && (minutes <= 59)) {
+                    result += 60000*minutes;
+                } else {
+                    throw new IllegalArgumentException();
+                }
+
+                // Read Seconds
+                float seconds = parseFloat(timeValues[indexOfMinutes + 1], 0, true);
+                if ((seconds >= 00) && (seconds < 60)) {
+                    result += 60000*seconds;
+                } else {
+                    throw new IllegalArgumentException();
+                }
+
+            }
+            return result;
+        } catch (NumberFormatException e) {
+            throw new IllegalArgumentException();
+        }
+    }
+
+    /**
+     * Parse a value formatted as follows:
+     * <p>
+     * <pre>
+     * Value    ::= Number ("." Decimal)? (Text)?
+     * Number   ::= DIGIT+; any positive number
+     * Decimal  ::= DIGIT+; any positive number
+     * Text     ::= CHAR*;   any sequence of chars
+     * DIGIT    ::= [0-9]
+     * </pre>
+     * @param value The Value to parse
+     * @param ignoreLast The size of Text to ignore
+     * @param parseDecimal Whether Decimal is expected
+     * @return The float value without Text, rounded to 3 digits after '.'
+     * @throws IllegalArgumentException if Decimal was not expected but encountered
+     */
+    private static float parseFloat(String value, int ignoreLast, boolean parseDecimal) {
+        // Ignore last characters
+        value = value.substring(0, value.length() - ignoreLast);
+
+        float result;
+        int indexOfComma = value.indexOf('.');
+        if (indexOfComma != -1) {
+            if (!parseDecimal) {
+                throw new IllegalArgumentException("int value contains decimal");
+            }
+            // Ensure that there are at least 3 decimals
+            value = value + "000";
+            // Read value up to 3 decimals and cut the rest
+            result = Float.parseFloat(value.substring(0, indexOfComma));
+            result += Float.parseFloat(
+                    value.substring(indexOfComma + 1, indexOfComma + 4))/1000;
+        } else {
+            result = Integer.parseInt(value);
+        }
+
+        return result;
+    }
+
+    /*
+     * Time Interface
+     */
+
+    public boolean getBaseBegin() {
+        // TODO Auto-generated method stub
+        return false;
+    }
+
+    public Element getBaseElement() {
+        // TODO Auto-generated method stub
+        return null;
+    }
+
+    public String getEvent() {
+        // TODO Auto-generated method stub
+        return null;
+    }
+
+    public String getMarker() {
+        // TODO Auto-generated method stub
+        return null;
+    }
+
+    public double getOffset() {
+        // TODO Auto-generated method stub
+        return 0;
+    }
+
+    public boolean getResolved() {
+        return mResolved;
+    }
+
+    public double getResolvedOffset() {
+        return mResolvedOffset;
+    }
+
+    public short getTimeType() {
+        return mTimeType;
+    }
+
+    public void setBaseBegin(boolean baseBegin) throws DOMException {
+        // TODO Auto-generated method stub
+
+    }
+
+    public void setBaseElement(Element baseElement) throws DOMException {
+        // TODO Auto-generated method stub
+
+    }
+
+    public void setEvent(String event) throws DOMException {
+        // TODO Auto-generated method stub
+
+    }
+
+    public void setMarker(String marker) throws DOMException {
+        // TODO Auto-generated method stub
+
+    }
+
+    public void setOffset(double offset) throws DOMException {
+        // TODO Auto-generated method stub
+
+    }
+}
diff --git a/android-smsmms/src/main/java/com/android/mms/dom/smil/TimeListImpl.java b/android-smsmms/src/main/java/com/android/mms/dom/smil/TimeListImpl.java
index 4ad4be758..75cc19450 100755
--- a/android-smsmms/src/main/java/com/android/mms/dom/smil/TimeListImpl.java
+++ b/android-smsmms/src/main/java/com/android/mms/dom/smil/TimeListImpl.java
@@ -1,53 +1,53 @@
-/*
- * Copyright (C) 2007 Esmertec AG.
- * Copyright (C) 2007 The Android Open Source Project
- *
- * Licensed under the Apache License, Version 2.0 (the "License");
- * you may not use this file except in compliance with the License.
- * You may obtain a copy of the License at
- *
- *      http://www.apache.org/licenses/LICENSE-2.0
- *
- * Unless required by applicable law or agreed to in writing, software
- * distributed under the License is distributed on an "AS IS" BASIS,
- * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
- * See the License for the specific language governing permissions and
- * limitations under the License.
- */
-
-package com.android.mms.dom.smil;
-
-import org.w3c.dom.smil.Time;
-import org.w3c.dom.smil.TimeList;
-
-import java.util.ArrayList;
-
-public class TimeListImpl implements TimeList {
-    private final ArrayList<Time> mTimes;
-
-    /*
-     * Internal Interface
-     */
-    TimeListImpl(ArrayList<Time> times) {
-        mTimes = times;
-    }
-
-    /*
-     * TimeList Interface
-     */
-
-    public int getLength() {
-        return mTimes.size();
-    }
-
-    public Time item(int index) {
-        Time time = null;
-        try {
-            time = mTimes.get(index);
-        } catch (IndexOutOfBoundsException e) {
-            // Do nothing and return null
-        }
-        return time;
-    }
-
-}
+/*
+ * Copyright (C) 2007 Esmertec AG.
+ * Copyright (C) 2007 The Android Open Source Project
+ *
+ * Licensed under the Apache License, Version 2.0 (the "License");
+ * you may not use this file except in compliance with the License.
+ * You may obtain a copy of the License at
+ *
+ *      http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing, software
+ * distributed under the License is distributed on an "AS IS" BASIS,
+ * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ * See the License for the specific language governing permissions and
+ * limitations under the License.
+ */
+
+package com.android.mms.dom.smil;
+
+import org.w3c.dom.smil.Time;
+import org.w3c.dom.smil.TimeList;
+
+import java.util.ArrayList;
+
+public class TimeListImpl implements TimeList {
+    private final ArrayList<Time> mTimes;
+
+    /*
+     * Internal Interface
+     */
+    TimeListImpl(ArrayList<Time> times) {
+        mTimes = times;
+    }
+
+    /*
+     * TimeList Interface
+     */
+
+    public int getLength() {
+        return mTimes.size();
+    }
+
+    public Time item(int index) {
+        Time time = null;
+        try {
+            time = mTimes.get(index);
+        } catch (IndexOutOfBoundsException e) {
+            // Do nothing and return null
+        }
+        return time;
+    }
+
+}
diff --git a/android-smsmms/src/main/java/com/android/mms/dom/smil/parser/SmilXmlSerializer.java b/android-smsmms/src/main/java/com/android/mms/dom/smil/parser/SmilXmlSerializer.java
index 7ab3f90f0..40da28c3b 100755
--- a/android-smsmms/src/main/java/com/android/mms/dom/smil/parser/SmilXmlSerializer.java
+++ b/android-smsmms/src/main/java/com/android/mms/dom/smil/parser/SmilXmlSerializer.java
@@ -1,81 +1,81 @@
-/*
- * Copyright 2014 Jacob Klinker
- *
- * Licensed under the Apache License, Version 2.0 (the "License");
- * you may not use this file except in compliance with the License.
- * You may obtain a copy of the License at
- *
- *     http://www.apache.org/licenses/LICENSE-2.0
- *
- * Unless required by applicable law or agreed to in writing, software
- * distributed under the License is distributed on an "AS IS" BASIS,
- * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
- * See the License for the specific language governing permissions and
- * limitations under the License.
- */
-
-package com.android.mms.dom.smil.parser;
-
-import org.w3c.dom.Attr;
-import org.w3c.dom.Element;
-import org.w3c.dom.NamedNodeMap;
-import org.w3c.dom.smil.SMILDocument;
-import org.w3c.dom.smil.SMILElement;
-import timber.log.Timber;
-
-import java.io.BufferedWriter;
-import java.io.IOException;
-import java.io.OutputStream;
-import java.io.OutputStreamWriter;
-import java.io.UnsupportedEncodingException;
-import java.io.Writer;
-
-public class SmilXmlSerializer {
-
-    public static void serialize(SMILDocument smilDoc, OutputStream out) {
-        try {
-            Writer writer = new BufferedWriter(new OutputStreamWriter(out, "UTF-8"), 2048);
-
-            writeElement(writer, smilDoc.getDocumentElement());
-            writer.flush();
-        } catch (UnsupportedEncodingException e) {
-            Timber.e(e, "exception thrown");
-        } catch (IOException e) {
-            Timber.e(e, "exception thrown");
-        }
-    }
-
-    private static void writeElement(Writer writer, Element element)
-            throws IOException {
-        writer.write('<');
-        writer.write(element.getTagName());
-
-        if (element.hasAttributes()) {
-            NamedNodeMap attributes = element.getAttributes();
-            for (int i = 0; i < attributes.getLength(); i++) {
-                Attr attribute = (Attr)attributes.item(i);
-                writer.write(" " + attribute.getName());
-                writer.write("=\"" + attribute.getValue() + "\"");
-            }
-        }
-
-        // FIXME: Might throw ClassCastException
-        SMILElement childElement = (SMILElement) element.getFirstChild();
-
-        if (childElement != null) {
-            writer.write('>');
-
-            do {
-                writeElement(writer, childElement);
-                childElement = (SMILElement) childElement.getNextSibling();
-            } while (childElement != null);
-
-            writer.write("</");
-            writer.write(element.getTagName());
-            writer.write('>');
-        } else {
-            writer.write("/>");
-        }
-    }
-}
-
+/*
+ * Copyright 2014 Jacob Klinker
+ *
+ * Licensed under the Apache License, Version 2.0 (the "License");
+ * you may not use this file except in compliance with the License.
+ * You may obtain a copy of the License at
+ *
+ *     http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing, software
+ * distributed under the License is distributed on an "AS IS" BASIS,
+ * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ * See the License for the specific language governing permissions and
+ * limitations under the License.
+ */
+
+package com.android.mms.dom.smil.parser;
+
+import org.w3c.dom.Attr;
+import org.w3c.dom.Element;
+import org.w3c.dom.NamedNodeMap;
+import org.w3c.dom.smil.SMILDocument;
+import org.w3c.dom.smil.SMILElement;
+import timber.log.Timber;
+
+import java.io.BufferedWriter;
+import java.io.IOException;
+import java.io.OutputStream;
+import java.io.OutputStreamWriter;
+import java.io.UnsupportedEncodingException;
+import java.io.Writer;
+
+public class SmilXmlSerializer {
+
+    public static void serialize(SMILDocument smilDoc, OutputStream out) {
+        try {
+            Writer writer = new BufferedWriter(new OutputStreamWriter(out, "UTF-8"), 2048);
+
+            writeElement(writer, smilDoc.getDocumentElement());
+            writer.flush();
+        } catch (UnsupportedEncodingException e) {
+            Timber.e(e, "exception thrown");
+        } catch (IOException e) {
+            Timber.e(e, "exception thrown");
+        }
+    }
+
+    private static void writeElement(Writer writer, Element element)
+            throws IOException {
+        writer.write('<');
+        writer.write(element.getTagName());
+
+        if (element.hasAttributes()) {
+            NamedNodeMap attributes = element.getAttributes();
+            for (int i = 0; i < attributes.getLength(); i++) {
+                Attr attribute = (Attr)attributes.item(i);
+                writer.write(" " + attribute.getName());
+                writer.write("=\"" + attribute.getValue() + "\"");
+            }
+        }
+
+        // FIXME: Might throw ClassCastException
+        SMILElement childElement = (SMILElement) element.getFirstChild();
+
+        if (childElement != null) {
+            writer.write('>');
+
+            do {
+                writeElement(writer, childElement);
+                childElement = (SMILElement) childElement.getNextSibling();
+            } while (childElement != null);
+
+            writer.write("</");
+            writer.write(element.getTagName());
+            writer.write('>');
+        } else {
+            writer.write("/>");
+        }
+    }
+}
+
diff --git a/android-smsmms/src/main/java/com/android/mms/layout/HVGALayoutParameters.java b/android-smsmms/src/main/java/com/android/mms/layout/HVGALayoutParameters.java
index 61cf1da5a..070fcc4c4 100755
--- a/android-smsmms/src/main/java/com/android/mms/layout/HVGALayoutParameters.java
+++ b/android-smsmms/src/main/java/com/android/mms/layout/HVGALayoutParameters.java
@@ -1,93 +1,93 @@
-/*
- * Copyright 2014 Jacob Klinker
- *
- * Licensed under the Apache License, Version 2.0 (the "License");
- * you may not use this file except in compliance with the License.
- * You may obtain a copy of the License at
- *
- *     http://www.apache.org/licenses/LICENSE-2.0
- *
- * Unless required by applicable law or agreed to in writing, software
- * distributed under the License is distributed on an "AS IS" BASIS,
- * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
- * See the License for the specific language governing permissions and
- * limitations under the License.
- */
-
-package com.android.mms.layout;
-
-import android.content.Context;
-import timber.log.Timber;
-
-public class HVGALayoutParameters implements LayoutParameters {
-    private static final boolean LOCAL_LOGV = false;
-
-    private int mType = -1;
-
-    private static int mImageHeightLandscape;
-    private static int mTextHeightLandscape;
-    private static int mImageHeightPortrait;
-    private static int mTextHeightPortrait;
-    private static int mMaxHeight;
-    private static int mMaxWidth;
-
-    public HVGALayoutParameters(Context context, int type) {
-        if ((type != HVGA_LANDSCAPE) && (type != HVGA_PORTRAIT)) {
-            throw new IllegalArgumentException(
-                    "Bad layout type detected: " + type);
-        }
-
-        if (LOCAL_LOGV) {
-            Timber.v("HVGALayoutParameters.<init>(" + type + ").");
-        }
-        mType = type;
-
-        float scale = context.getResources().getDisplayMetrics().density;
-        mMaxWidth = (int) (context.getResources().getConfiguration().screenWidthDp * scale + 0.5f);
-        mMaxHeight =
-            (int) (context.getResources().getConfiguration().screenHeightDp * scale + 0.5f);
-
-        mImageHeightLandscape = (int) (mMaxHeight * .90f);
-        mTextHeightLandscape = (int) (mMaxHeight * .10f);
-        mImageHeightPortrait = (int) (mMaxWidth * .90f);
-        mTextHeightPortrait = (int) (mMaxWidth * .10f);
-
-        if (LOCAL_LOGV) {
-            Timber.v("HVGALayoutParameters mMaxWidth: " + mMaxWidth +
-                    " mMaxHeight: " + mMaxHeight +
-                    " mImageHeightLandscape: " + mImageHeightLandscape +
-                    " mTextHeightLandscape: " + mTextHeightLandscape +
-                    " mImageHeightPortrait: " + mImageHeightPortrait +
-                    " mTextHeightPortrait: " + mTextHeightPortrait);
-        }
-
-    }
-
-    public int getWidth() {
-        return mType == HVGA_LANDSCAPE ? mMaxWidth
-                                       : mMaxHeight;
-    }
-
-    public int getHeight() {
-        return mType == HVGA_LANDSCAPE ? mMaxHeight
-                                       : mMaxWidth;
-    }
-
-    public int getImageHeight() {
-        return mType == HVGA_LANDSCAPE ? mImageHeightLandscape
-                                       : mImageHeightPortrait;
-    }
-
-    public int getTextHeight() {
-        return mType == HVGA_LANDSCAPE ? mTextHeightLandscape
-                                       : mTextHeightPortrait;
-    }
-
-    public int getType() {
-        return mType;
-    }
-
-    public String getTypeDescription() {
-        return mType == HVGA_LANDSCAPE ? "HVGA-L" : "HVGA-P";
-    }
-}
+/*
+ * Copyright 2014 Jacob Klinker
+ *
+ * Licensed under the Apache License, Version 2.0 (the "License");
+ * you may not use this file except in compliance with the License.
+ * You may obtain a copy of the License at
+ *
+ *     http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing, software
+ * distributed under the License is distributed on an "AS IS" BASIS,
+ * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ * See the License for the specific language governing permissions and
+ * limitations under the License.
+ */
+
+package com.android.mms.layout;
+
+import android.content.Context;
+import timber.log.Timber;
+
+public class HVGALayoutParameters implements LayoutParameters {
+    private static final boolean LOCAL_LOGV = false;
+
+    private int mType = -1;
+
+    private static int mImageHeightLandscape;
+    private static int mTextHeightLandscape;
+    private static int mImageHeightPortrait;
+    private static int mTextHeightPortrait;
+    private static int mMaxHeight;
+    private static int mMaxWidth;
+
+    public HVGALayoutParameters(Context context, int type) {
+        if ((type != HVGA_LANDSCAPE) && (type != HVGA_PORTRAIT)) {
+            throw new IllegalArgumentException(
+                    "Bad layout type detected: " + type);
+        }
+
+        if (LOCAL_LOGV) {
+            Timber.v("HVGALayoutParameters.<init>(" + type + ").");
+        }
+        mType = type;
+
+        float scale = context.getResources().getDisplayMetrics().density;
+        mMaxWidth = (int) (context.getResources().getConfiguration().screenWidthDp * scale + 0.5f);
+        mMaxHeight =
+            (int) (context.getResources().getConfiguration().screenHeightDp * scale + 0.5f);
+
+        mImageHeightLandscape = (int) (mMaxHeight * .90f);
+        mTextHeightLandscape = (int) (mMaxHeight * .10f);
+        mImageHeightPortrait = (int) (mMaxWidth * .90f);
+        mTextHeightPortrait = (int) (mMaxWidth * .10f);
+
+        if (LOCAL_LOGV) {
+            Timber.v("HVGALayoutParameters mMaxWidth: " + mMaxWidth +
+                    " mMaxHeight: " + mMaxHeight +
+                    " mImageHeightLandscape: " + mImageHeightLandscape +
+                    " mTextHeightLandscape: " + mTextHeightLandscape +
+                    " mImageHeightPortrait: " + mImageHeightPortrait +
+                    " mTextHeightPortrait: " + mTextHeightPortrait);
+        }
+
+    }
+
+    public int getWidth() {
+        return mType == HVGA_LANDSCAPE ? mMaxWidth
+                                       : mMaxHeight;
+    }
+
+    public int getHeight() {
+        return mType == HVGA_LANDSCAPE ? mMaxHeight
+                                       : mMaxWidth;
+    }
+
+    public int getImageHeight() {
+        return mType == HVGA_LANDSCAPE ? mImageHeightLandscape
+                                       : mImageHeightPortrait;
+    }
+
+    public int getTextHeight() {
+        return mType == HVGA_LANDSCAPE ? mTextHeightLandscape
+                                       : mTextHeightPortrait;
+    }
+
+    public int getType() {
+        return mType;
+    }
+
+    public String getTypeDescription() {
+        return mType == HVGA_LANDSCAPE ? "HVGA-L" : "HVGA-P";
+    }
+}
diff --git a/android-smsmms/src/main/java/com/android/mms/layout/LayoutManager.java b/android-smsmms/src/main/java/com/android/mms/layout/LayoutManager.java
index 5113b4a72..52d74985d 100755
--- a/android-smsmms/src/main/java/com/android/mms/layout/LayoutManager.java
+++ b/android-smsmms/src/main/java/com/android/mms/layout/LayoutManager.java
@@ -1,104 +1,104 @@
-/*
- * Copyright 2014 Jacob Klinker
- *
- * Licensed under the Apache License, Version 2.0 (the "License");
- * you may not use this file except in compliance with the License.
- * You may obtain a copy of the License at
- *
- *     http://www.apache.org/licenses/LICENSE-2.0
- *
- * Unless required by applicable law or agreed to in writing, software
- * distributed under the License is distributed on an "AS IS" BASIS,
- * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
- * See the License for the specific language governing permissions and
- * limitations under the License.
- */
-
-package com.android.mms.layout;
-
-import android.content.Context;
-import android.content.res.Configuration;
-import timber.log.Timber;
-
-/**
- * MMS presentation layout management.
- */
-public class LayoutManager {
-    private static final boolean DEBUG = false;
-    private static final boolean LOCAL_LOGV = false;
-
-    private final Context mContext;
-    private LayoutParameters mLayoutParams;
-
-    private static LayoutManager sInstance;
-
-    private LayoutManager(Context context) {
-        mContext = context;
-        initLayoutParameters(context.getResources().getConfiguration());
-    }
-
-    private void initLayoutParameters(Configuration configuration) {
-        mLayoutParams = getLayoutParameters(
-                configuration.orientation == Configuration.ORIENTATION_PORTRAIT
-                ? LayoutParameters.HVGA_PORTRAIT
-                : LayoutParameters.HVGA_LANDSCAPE);
-
-        if (LOCAL_LOGV) {
-            Timber.v("LayoutParameters: " + mLayoutParams.getTypeDescription()
-                    + ": " + mLayoutParams.getWidth() + "x" + mLayoutParams.getHeight());
-        }
-    }
-
-    private LayoutParameters getLayoutParameters(int displayType) {
-        switch (displayType) {
-            case LayoutParameters.HVGA_LANDSCAPE:
-                return new HVGALayoutParameters(mContext, LayoutParameters.HVGA_LANDSCAPE);
-            case LayoutParameters.HVGA_PORTRAIT:
-                return new HVGALayoutParameters(mContext, LayoutParameters.HVGA_PORTRAIT);
-        }
-
-        throw new IllegalArgumentException(
-                "Unsupported display type: " + displayType);
-    }
-
-    public static void init(Context context) {
-        if (LOCAL_LOGV) {
-            Timber.v("DefaultLayoutManager.init()");
-        }
-
-        if (sInstance != null) {
-            Timber.w("Already initialized.");
-        }
-        sInstance = new LayoutManager(context);
-    }
-
-    public static LayoutManager getInstance() {
-        if (sInstance == null) {
-            throw new IllegalStateException("Uninitialized.");
-        }
-        return sInstance;
-    }
-
-    public void onConfigurationChanged(Configuration newConfig) {
-        if (LOCAL_LOGV) {
-            Timber.v("-> LayoutManager.onConfigurationChanged().");
-        }
-        initLayoutParameters(newConfig);
-    }
-
-    public int getLayoutType() {
-        return mLayoutParams.getType();
-    }
-
-    public int getLayoutWidth() {
-        return mLayoutParams.getWidth();
-    }
-
-    public int getLayoutHeight() {
-        return mLayoutParams.getHeight();
-    }
-
-    public LayoutParameters getLayoutParameters() {
-        return mLayoutParams;
-    }
-}
+/*
+ * Copyright 2014 Jacob Klinker
+ *
+ * Licensed under the Apache License, Version 2.0 (the "License");
+ * you may not use this file except in compliance with the License.
+ * You may obtain a copy of the License at
+ *
+ *     http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing, software
+ * distributed under the License is distributed on an "AS IS" BASIS,
+ * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ * See the License for the specific language governing permissions and
+ * limitations under the License.
+ */
+
+package com.android.mms.layout;
+
+import android.content.Context;
+import android.content.res.Configuration;
+import timber.log.Timber;
+
+/**
+ * MMS presentation layout management.
+ */
+public class LayoutManager {
+    private static final boolean DEBUG = false;
+    private static final boolean LOCAL_LOGV = false;
+
+    private final Context mContext;
+    private LayoutParameters mLayoutParams;
+
+    private static LayoutManager sInstance;
+
+    private LayoutManager(Context context) {
+        mContext = context;
+        initLayoutParameters(context.getResources().getConfiguration());
+    }
+
+    private void initLayoutParameters(Configuration configuration) {
+        mLayoutParams = getLayoutParameters(
+                configuration.orientation == Configuration.ORIENTATION_PORTRAIT
+                ? LayoutParameters.HVGA_PORTRAIT
+                : LayoutParameters.HVGA_LANDSCAPE);
+
+        if (LOCAL_LOGV) {
+            Timber.v("LayoutParameters: " + mLayoutParams.getTypeDescription()
+                    + ": " + mLayoutParams.getWidth() + "x" + mLayoutParams.getHeight());
+        }
+    }
+
+    private LayoutParameters getLayoutParameters(int displayType) {
+        switch (displayType) {
+            case LayoutParameters.HVGA_LANDSCAPE:
+                return new HVGALayoutParameters(mContext, LayoutParameters.HVGA_LANDSCAPE);
+            case LayoutParameters.HVGA_PORTRAIT:
+                return new HVGALayoutParameters(mContext, LayoutParameters.HVGA_PORTRAIT);
+        }
+
+        throw new IllegalArgumentException(
+                "Unsupported display type: " + displayType);
+    }
+
+    public static void init(Context context) {
+        if (LOCAL_LOGV) {
+            Timber.v("DefaultLayoutManager.init()");
+        }
+
+        if (sInstance != null) {
+            Timber.w("Already initialized.");
+        }
+        sInstance = new LayoutManager(context);
+    }
+
+    public static LayoutManager getInstance() {
+        if (sInstance == null) {
+            throw new IllegalStateException("Uninitialized.");
+        }
+        return sInstance;
+    }
+
+    public void onConfigurationChanged(Configuration newConfig) {
+        if (LOCAL_LOGV) {
+            Timber.v("-> LayoutManager.onConfigurationChanged().");
+        }
+        initLayoutParameters(newConfig);
+    }
+
+    public int getLayoutType() {
+        return mLayoutParams.getType();
+    }
+
+    public int getLayoutWidth() {
+        return mLayoutParams.getWidth();
+    }
+
+    public int getLayoutHeight() {
+        return mLayoutParams.getHeight();
+    }
+
+    public LayoutParameters getLayoutParameters() {
+        return mLayoutParams;
+    }
+}
diff --git a/android-smsmms/src/main/java/com/android/mms/layout/LayoutParameters.java b/android-smsmms/src/main/java/com/android/mms/layout/LayoutParameters.java
index e9711db8a..d88b15e9b 100755
--- a/android-smsmms/src/main/java/com/android/mms/layout/LayoutParameters.java
+++ b/android-smsmms/src/main/java/com/android/mms/layout/LayoutParameters.java
@@ -1,56 +1,56 @@
-/*
- * Copyright (C) 2008 Esmertec AG.
- * Copyright (C) 2008 The Android Open Source Project
- *
- * Licensed under the Apache License, Version 2.0 (the "License");
- * you may not use this file except in compliance with the License.
- * You may obtain a copy of the License at
- *
- *      http://www.apache.org/licenses/LICENSE-2.0
- *
- * Unless required by applicable law or agreed to in writing, software
- * distributed under the License is distributed on an "AS IS" BASIS,
- * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
- * See the License for the specific language governing permissions and
- * limitations under the License.
- */
-
-package com.android.mms.layout;
-
-public interface LayoutParameters {
-    /* Layouts type definition */
-    public static final int UNKNOWN        = -1;
-    public static final int HVGA_LANDSCAPE = 10;
-    public static final int HVGA_PORTRAIT  = 11;
-
-    /* Parameters for known layouts */
-    public static final int HVGA_LANDSCAPE_WIDTH  = 480;
-    public static final int HVGA_LANDSCAPE_HEIGHT = 320;
-    public static final int HVGA_PORTRAIT_WIDTH   = 320;
-    public static final int HVGA_PORTRAIT_HEIGHT  = 480;
-
-    /**
-     * Get the width of current layout.
-     */
-    int getWidth();
-    /**
-     * Get the height of current layout.
-     */
-    int getHeight();
-    /**
-     * Get the width of the image region of current layout.
-     */
-    int getImageHeight();
-    /**
-     * Get the height of the text region of current layout.
-     */
-    int getTextHeight();
-    /**
-     * Get the type of current layout.
-     */
-    int getType();
-    /**
-     * Get the type description of current layout.
-     */
-    String getTypeDescription();
-}
+/*
+ * Copyright (C) 2008 Esmertec AG.
+ * Copyright (C) 2008 The Android Open Source Project
+ *
+ * Licensed under the Apache License, Version 2.0 (the "License");
+ * you may not use this file except in compliance with the License.
+ * You may obtain a copy of the License at
+ *
+ *      http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing, software
+ * distributed under the License is distributed on an "AS IS" BASIS,
+ * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ * See the License for the specific language governing permissions and
+ * limitations under the License.
+ */
+
+package com.android.mms.layout;
+
+public interface LayoutParameters {
+    /* Layouts type definition */
+    public static final int UNKNOWN        = -1;
+    public static final int HVGA_LANDSCAPE = 10;
+    public static final int HVGA_PORTRAIT  = 11;
+
+    /* Parameters for known layouts */
+    public static final int HVGA_LANDSCAPE_WIDTH  = 480;
+    public static final int HVGA_LANDSCAPE_HEIGHT = 320;
+    public static final int HVGA_PORTRAIT_WIDTH   = 320;
+    public static final int HVGA_PORTRAIT_HEIGHT  = 480;
+
+    /**
+     * Get the width of current layout.
+     */
+    int getWidth();
+    /**
+     * Get the height of current layout.
+     */
+    int getHeight();
+    /**
+     * Get the width of the image region of current layout.
+     */
+    int getImageHeight();
+    /**
+     * Get the height of the text region of current layout.
+     */
+    int getTextHeight();
+    /**
+     * Get the type of current layout.
+     */
+    int getType();
+    /**
+     * Get the type description of current layout.
+     */
+    String getTypeDescription();
+}
diff --git a/android-smsmms/src/main/java/com/android/mms/service_alt/ApnSettings.java b/android-smsmms/src/main/java/com/android/mms/service_alt/ApnSettings.java
index cf36a4043..744caf3e2 100755
--- a/android-smsmms/src/main/java/com/android/mms/service_alt/ApnSettings.java
+++ b/android-smsmms/src/main/java/com/android/mms/service_alt/ApnSettings.java
@@ -1,240 +1,240 @@
-/*
- * Copyright (C) 2015 Jacob Klinker
- *
- * Licensed under the Apache License, Version 2.0 (the "License");
- * you may not use this file except in compliance with the License.
- * You may obtain a copy of the License at
- *
- * http://www.apache.org/licenses/LICENSE-2.0
- *
- * Unless required by applicable law or agreed to in writing, software
- * distributed under the License is distributed on an "AS IS" BASIS,
- * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
- * See the License for the specific language governing permissions and
- * limitations under the License.
- */
-
-package com.android.mms.service_alt;
-
-import android.content.Context;
-import android.content.SharedPreferences;
-import android.database.Cursor;
-import android.database.sqlite.SqliteWrapper;
-import android.net.NetworkUtilsHelper;
-import android.net.Uri;
-import android.preference.PreferenceManager;
-import android.provider.Telephony;
-import android.text.TextUtils;
-import com.android.mms.service_alt.exception.ApnException;
-import timber.log.Timber;
-
-import java.net.URI;
-import java.net.URISyntaxException;
-
-/**
- * APN settings used for MMS transactions
- */
-public class ApnSettings {
-
-    // MMSC URL
-    private final String mServiceCenter;
-    // MMSC proxy address
-    private final String mProxyAddress;
-    // MMSC proxy port
-    private final int mProxyPort;
-    // Debug text for this APN: a concatenation of interesting columns of this APN
-    private final String mDebugText;
-
-    private static final String[] APN_PROJECTION = {
-            Telephony.Carriers.TYPE,
-            Telephony.Carriers.MMSC,
-            Telephony.Carriers.MMSPROXY,
-            Telephony.Carriers.MMSPORT,
-            Telephony.Carriers.NAME,
-            Telephony.Carriers.APN,
-            Telephony.Carriers.BEARER,
-            Telephony.Carriers.PROTOCOL,
-            Telephony.Carriers.ROAMING_PROTOCOL,
-            Telephony.Carriers.AUTH_TYPE,
-            Telephony.Carriers.MVNO_TYPE,
-            Telephony.Carriers.MVNO_MATCH_DATA,
-            Telephony.Carriers.PROXY,
-            Telephony.Carriers.PORT,
-            Telephony.Carriers.SERVER,
-            Telephony.Carriers.USER,
-            Telephony.Carriers.PASSWORD,
-    };
-    private static final int COLUMN_TYPE         = 0;
-    private static final int COLUMN_MMSC         = 1;
-    private static final int COLUMN_MMSPROXY     = 2;
-    private static final int COLUMN_MMSPORT      = 3;
-    private static final int COLUMN_NAME         = 4;
-    private static final int COLUMN_APN          = 5;
-    private static final int COLUMN_BEARER       = 6;
-    private static final int COLUMN_PROTOCOL     = 7;
-    private static final int COLUMN_ROAMING_PROTOCOL = 8;
-    private static final int COLUMN_AUTH_TYPE    = 9;
-    private static final int COLUMN_MVNO_TYPE    = 10;
-    private static final int COLUMN_MVNO_MATCH_DATA = 11;
-    private static final int COLUMN_PROXY        = 12;
-    private static final int COLUMN_PORT         = 13;
-    private static final int COLUMN_SERVER       = 14;
-    private static final int COLUMN_USER         = 15;
-    private static final int COLUMN_PASSWORD     = 16;
-
-
-    /**
-     * Load APN settings from system
-     *
-     * @param context
-     * @param apnName the optional APN name to match
-     */
-    public static ApnSettings load(Context context, String apnName, int subId)
-            throws ApnException {
-        SharedPreferences sharedPrefs = PreferenceManager.getDefaultSharedPreferences(context);
-        String mmsc = sharedPrefs.getString("mmsc_url", "");
-        if (!TextUtils.isEmpty(mmsc)) {
-            String mmsProxy = sharedPrefs.getString("mms_proxy", "");
-            String mmsPort = sharedPrefs.getString("mms_port", "");
-            return new ApnSettings(mmsc, mmsProxy, parsePort(mmsPort), "Default from settings");
-        }
-
-        Timber.v("ApnSettings: apnName " + apnName);
-        // TODO: CURRENT semantics is currently broken in telephony. Revive this when it is fixed.
-        //String selection = Telephony.Carriers.CURRENT + " IS NOT NULL";
-        String selection = null;
-        String[] selectionArgs = null;
-        apnName = apnName != null ? apnName.trim() : null;
-        if (!TextUtils.isEmpty(apnName)) {
-            //selection += " AND " + Telephony.Carriers.APN + "=?";
-            selection = Telephony.Carriers.APN + "=?";
-            selectionArgs = new String[]{ apnName };
-        }
-        Cursor cursor = null;
-        try {
-            cursor = SqliteWrapper.query(
-                    context,
-                    context.getContentResolver(),
-                    Uri.withAppendedPath(Telephony.Carriers.CONTENT_URI, "/subId/" + subId),
-                    APN_PROJECTION,
-                    selection,
-                    selectionArgs,
-                    null/*sortOrder*/);
-            if (cursor != null) {
-                String mmscUrl = null;
-                String proxyAddress = null;
-                int proxyPort = -1;
-                while (cursor.moveToNext()) {
-                    // Read values from APN settings
-                    if (isValidApnType(
-                            cursor.getString(COLUMN_TYPE), "mms")) {
-                        mmscUrl = trimWithNullCheck(cursor.getString(COLUMN_MMSC));
-                        if (TextUtils.isEmpty(mmscUrl)) {
-                            continue;
-                        }
-                        mmscUrl = NetworkUtilsHelper.trimV4AddrZeros(mmscUrl);
-                        try {
-                            new URI(mmscUrl);
-                        } catch (URISyntaxException e) {
-                            throw new ApnException("Invalid MMSC url " + mmscUrl);
-                        }
-                        proxyAddress = trimWithNullCheck(cursor.getString(COLUMN_MMSPROXY));
-                        if (!TextUtils.isEmpty(proxyAddress)) {
-                            proxyAddress = NetworkUtilsHelper.trimV4AddrZeros(proxyAddress);
-                            final String portString =
-                                    trimWithNullCheck(cursor.getString(COLUMN_MMSPORT));
-                            if (portString != null) {
-                                try {
-                                    proxyPort = Integer.parseInt(portString);
-                                } catch (NumberFormatException e) {
-                                    Timber.e("Invalid port " + portString);
-                                    throw new ApnException("Invalid port " + portString);
-                                }
-                            }
-                        }
-                        return new ApnSettings(
-                                mmscUrl, proxyAddress, proxyPort, getDebugText(cursor));
-                    }
-                }
-
-            }
-        } finally {
-            if (cursor != null) {
-                cursor.close();
-            }
-        }
-
-        return new ApnSettings("", "", 80, "Failed to find APNs :(");
-    }
-
-    private static String getDebugText(Cursor cursor) {
-        final StringBuilder sb = new StringBuilder();
-        sb.append("APN [");
-        for (int i = 0; i < cursor.getColumnCount(); i++) {
-            final String name = cursor.getColumnName(i);
-            final String value = cursor.getString(i);
-            if (TextUtils.isEmpty(value)) {
-                continue;
-            }
-            if (i > 0) {
-                sb.append(' ');
-            }
-            sb.append(name).append('=').append(value);
-        }
-        sb.append("]");
-        return sb.toString();
-    }
-
-    private static String trimWithNullCheck(String value) {
-        return value != null ? value.trim() : null;
-    }
-
-    public ApnSettings(String mmscUrl, String proxyAddr, int proxyPort, String debugText) {
-        mServiceCenter = mmscUrl;
-        mProxyAddress = proxyAddr;
-        mProxyPort = proxyPort;
-        mDebugText = debugText;
-   }
-
-    public String getMmscUrl() {
-        return mServiceCenter;
-    }
-
-    public String getProxyAddress() {
-        return mProxyAddress;
-    }
-
-    public int getProxyPort() {
-        return mProxyPort;
-    }
-
-    public boolean isProxySet() {
-        return !TextUtils.isEmpty(mProxyAddress);
-    }
-
-    private static boolean isValidApnType(String types, String requestType) {
-        // If APN type is unspecified, assume APN_TYPE_ALL.
-        if (TextUtils.isEmpty(types)) {
-            return true;
-        }
-        for (String type : types.split(",")) {
-            type = type.trim();
-            if (type.equals(requestType) || type.equals("*")) {
-                return true;
-            }
-        }
-        return false;
-    }
-
-    private static int parsePort(String port) {
-        if (TextUtils.isEmpty(port)) {
-            return 80;
-        } else {
-            return Integer.parseInt(port);
-        }
-    }
-
-    public String toString() {
-        return mDebugText;
-    }
-}
+/*
+ * Copyright (C) 2015 Jacob Klinker
+ *
+ * Licensed under the Apache License, Version 2.0 (the "License");
+ * you may not use this file except in compliance with the License.
+ * You may obtain a copy of the License at
+ *
+ * http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing, software
+ * distributed under the License is distributed on an "AS IS" BASIS,
+ * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ * See the License for the specific language governing permissions and
+ * limitations under the License.
+ */
+
+package com.android.mms.service_alt;
+
+import android.content.Context;
+import android.content.SharedPreferences;
+import android.database.Cursor;
+import android.database.sqlite.SqliteWrapper;
+import android.net.NetworkUtilsHelper;
+import android.net.Uri;
+import android.preference.PreferenceManager;
+import android.provider.Telephony;
+import android.text.TextUtils;
+import com.android.mms.service_alt.exception.ApnException;
+import timber.log.Timber;
+
+import java.net.URI;
+import java.net.URISyntaxException;
+
+/**
+ * APN settings used for MMS transactions
+ */
+public class ApnSettings {
+
+    // MMSC URL
+    private final String mServiceCenter;
+    // MMSC proxy address
+    private final String mProxyAddress;
+    // MMSC proxy port
+    private final int mProxyPort;
+    // Debug text for this APN: a concatenation of interesting columns of this APN
+    private final String mDebugText;
+
+    private static final String[] APN_PROJECTION = {
+            Telephony.Carriers.TYPE,
+            Telephony.Carriers.MMSC,
+            Telephony.Carriers.MMSPROXY,
+            Telephony.Carriers.MMSPORT,
+            Telephony.Carriers.NAME,
+            Telephony.Carriers.APN,
+            Telephony.Carriers.BEARER,
+            Telephony.Carriers.PROTOCOL,
+            Telephony.Carriers.ROAMING_PROTOCOL,
+            Telephony.Carriers.AUTH_TYPE,
+            Telephony.Carriers.MVNO_TYPE,
+            Telephony.Carriers.MVNO_MATCH_DATA,
+            Telephony.Carriers.PROXY,
+            Telephony.Carriers.PORT,
+            Telephony.Carriers.SERVER,
+            Telephony.Carriers.USER,
+            Telephony.Carriers.PASSWORD,
+    };
+    private static final int COLUMN_TYPE         = 0;
+    private static final int COLUMN_MMSC         = 1;
+    private static final int COLUMN_MMSPROXY     = 2;
+    private static final int COLUMN_MMSPORT      = 3;
+    private static final int COLUMN_NAME         = 4;
+    private static final int COLUMN_APN          = 5;
+    private static final int COLUMN_BEARER       = 6;
+    private static final int COLUMN_PROTOCOL     = 7;
+    private static final int COLUMN_ROAMING_PROTOCOL = 8;
+    private static final int COLUMN_AUTH_TYPE    = 9;
+    private static final int COLUMN_MVNO_TYPE    = 10;
+    private static final int COLUMN_MVNO_MATCH_DATA = 11;
+    private static final int COLUMN_PROXY        = 12;
+    private static final int COLUMN_PORT         = 13;
+    private static final int COLUMN_SERVER       = 14;
+    private static final int COLUMN_USER         = 15;
+    private static final int COLUMN_PASSWORD     = 16;
+
+
+    /**
+     * Load APN settings from system
+     *
+     * @param context
+     * @param apnName the optional APN name to match
+     */
+    public static ApnSettings load(Context context, String apnName, int subId)
+            throws ApnException {
+        SharedPreferences sharedPrefs = PreferenceManager.getDefaultSharedPreferences(context);
+        String mmsc = sharedPrefs.getString("mmsc_url", "");
+        if (!TextUtils.isEmpty(mmsc)) {
+            String mmsProxy = sharedPrefs.getString("mms_proxy", "");
+            String mmsPort = sharedPrefs.getString("mms_port", "");
+            return new ApnSettings(mmsc, mmsProxy, parsePort(mmsPort), "Default from settings");
+        }
+
+        Timber.v("ApnSettings: apnName " + apnName);
+        // TODO: CURRENT semantics is currently broken in telephony. Revive this when it is fixed.
+        //String selection = Telephony.Carriers.CURRENT + " IS NOT NULL";
+        String selection = null;
+        String[] selectionArgs = null;
+        apnName = apnName != null ? apnName.trim() : null;
+        if (!TextUtils.isEmpty(apnName)) {
+            //selection += " AND " + Telephony.Carriers.APN + "=?";
+            selection = Telephony.Carriers.APN + "=?";
+            selectionArgs = new String[]{ apnName };
+        }
+        Cursor cursor = null;
+        try {
+            cursor = SqliteWrapper.query(
+                    context,
+                    context.getContentResolver(),
+                    Uri.withAppendedPath(Telephony.Carriers.CONTENT_URI, "/subId/" + subId),
+                    APN_PROJECTION,
+                    selection,
+                    selectionArgs,
+                    null/*sortOrder*/);
+            if (cursor != null) {
+                String mmscUrl = null;
+                String proxyAddress = null;
+                int proxyPort = -1;
+                while (cursor.moveToNext()) {
+                    // Read values from APN settings
+                    if (isValidApnType(
+                            cursor.getString(COLUMN_TYPE), "mms")) {
+                        mmscUrl = trimWithNullCheck(cursor.getString(COLUMN_MMSC));
+                        if (TextUtils.isEmpty(mmscUrl)) {
+                            continue;
+                        }
+                        mmscUrl = NetworkUtilsHelper.trimV4AddrZeros(mmscUrl);
+                        try {
+                            new URI(mmscUrl);
+                        } catch (URISyntaxException e) {
+                            throw new ApnException("Invalid MMSC url " + mmscUrl);
+                        }
+                        proxyAddress = trimWithNullCheck(cursor.getString(COLUMN_MMSPROXY));
+                        if (!TextUtils.isEmpty(proxyAddress)) {
+                            proxyAddress = NetworkUtilsHelper.trimV4AddrZeros(proxyAddress);
+                            final String portString =
+                                    trimWithNullCheck(cursor.getString(COLUMN_MMSPORT));
+                            if (portString != null) {
+                                try {
+                                    proxyPort = Integer.parseInt(portString);
+                                } catch (NumberFormatException e) {
+                                    Timber.e("Invalid port " + portString);
+                                    throw new ApnException("Invalid port " + portString);
+                                }
+                            }
+                        }
+                        return new ApnSettings(
+                                mmscUrl, proxyAddress, proxyPort, getDebugText(cursor));
+                    }
+                }
+
+            }
+        } finally {
+            if (cursor != null) {
+                cursor.close();
+            }
+        }
+
+        return new ApnSettings("", "", 80, "Failed to find APNs :(");
+    }
+
+    private static String getDebugText(Cursor cursor) {
+        final StringBuilder sb = new StringBuilder();
+        sb.append("APN [");
+        for (int i = 0; i < cursor.getColumnCount(); i++) {
+            final String name = cursor.getColumnName(i);
+            final String value = cursor.getString(i);
+            if (TextUtils.isEmpty(value)) {
+                continue;
+            }
+            if (i > 0) {
+                sb.append(' ');
+            }
+            sb.append(name).append('=').append(value);
+        }
+        sb.append("]");
+        return sb.toString();
+    }
+
+    private static String trimWithNullCheck(String value) {
+        return value != null ? value.trim() : null;
+    }
+
+    public ApnSettings(String mmscUrl, String proxyAddr, int proxyPort, String debugText) {
+        mServiceCenter = mmscUrl;
+        mProxyAddress = proxyAddr;
+        mProxyPort = proxyPort;
+        mDebugText = debugText;
+   }
+
+    public String getMmscUrl() {
+        return mServiceCenter;
+    }
+
+    public String getProxyAddress() {
+        return mProxyAddress;
+    }
+
+    public int getProxyPort() {
+        return mProxyPort;
+    }
+
+    public boolean isProxySet() {
+        return !TextUtils.isEmpty(mProxyAddress);
+    }
+
+    private static boolean isValidApnType(String types, String requestType) {
+        // If APN type is unspecified, assume APN_TYPE_ALL.
+        if (TextUtils.isEmpty(types)) {
+            return true;
+        }
+        for (String type : types.split(",")) {
+            type = type.trim();
+            if (type.equals(requestType) || type.equals("*")) {
+                return true;
+            }
+        }
+        return false;
+    }
+
+    private static int parsePort(String port) {
+        if (TextUtils.isEmpty(port)) {
+            return 80;
+        } else {
+            return Integer.parseInt(port);
+        }
+    }
+
+    public String toString() {
+        return mDebugText;
+    }
+}
diff --git a/android-smsmms/src/main/java/com/android/mms/service_alt/DownloadRequest.java b/android-smsmms/src/main/java/com/android/mms/service_alt/DownloadRequest.java
index b70679497..d46800aad 100755
--- a/android-smsmms/src/main/java/com/android/mms/service_alt/DownloadRequest.java
+++ b/android-smsmms/src/main/java/com/android/mms/service_alt/DownloadRequest.java
@@ -1,376 +1,376 @@
-/*
- * Copyright (C) 2015 Jacob Klinker
- *
- * Licensed under the Apache License, Version 2.0 (the "License");
- * you may not use this file except in compliance with the License.
- * You may obtain a copy of the License at
- *
- * http://www.apache.org/licenses/LICENSE-2.0
- *
- * Unless required by applicable law or agreed to in writing, software
- * distributed under the License is distributed on an "AS IS" BASIS,
- * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
- * See the License for the specific language governing permissions and
- * limitations under the License.
- */
-
-package com.android.mms.service_alt;
-
-import android.app.PendingIntent;
-import android.content.ContentValues;
-import android.content.Context;
-import android.content.Intent;
-import android.database.Cursor;
-import android.database.sqlite.SQLiteException;
-import android.net.Uri;
-import android.os.Binder;
-import android.os.Bundle;
-import android.provider.Telephony;
-import android.text.TextUtils;
-
-import com.android.mms.service_alt.exception.MmsHttpException;
-import com.google.android.mms.MmsException;
-import com.google.android.mms.pdu_alt.GenericPdu;
-import com.google.android.mms.pdu_alt.PduHeaders;
-import com.google.android.mms.pdu_alt.PduParser;
-import com.google.android.mms.pdu_alt.PduPersister;
-import com.google.android.mms.pdu_alt.RetrieveConf;
-import com.google.android.mms.util_alt.SqliteWrapper;
-import com.klinker.android.send_message.BroadcastUtils;
-import com.klinker.android.send_message.Transaction;
-
-import timber.log.Timber;
-
-/**
- * Request to download an MMS
- */
-public class DownloadRequest extends MmsRequest {
-
-    private static final String LOCATION_SELECTION =
-            Telephony.Mms.MESSAGE_TYPE + "=? AND " + Telephony.Mms.CONTENT_LOCATION + " =?";
-
-    static final String[] PROJECTION = new String[]{
-            Telephony.Mms.CONTENT_LOCATION
-    };
-
-    // The indexes of the columns which must be consistent with above PROJECTION.
-    static final int COLUMN_CONTENT_LOCATION = 0;
-
-    private final String mLocationUrl;
-    private final PendingIntent mDownloadedIntent;
-    private final Uri mContentUri;
-
-    public DownloadRequest(RequestManager manager, int subId, String locationUrl,
-                           Uri contentUri, PendingIntent downloadedIntent, String creator,
-                           Bundle configOverrides, Context context) throws MmsException {
-        super(manager, subId, creator, configOverrides);
-
-        if (locationUrl == null) {
-            mLocationUrl = getContentLocation(context, contentUri);
-        } else {
-            mLocationUrl = locationUrl;
-        }
-
-        mDownloadedIntent = downloadedIntent;
-        mContentUri = contentUri;
-    }
-
-    @Override
-    protected byte[] doHttp(Context context, MmsNetworkManager netMgr, ApnSettings apn)
-            throws MmsHttpException {
-        final MmsHttpClient mmsHttpClient = netMgr.getOrCreateHttpClient();
-        if (mmsHttpClient == null) {
-            Timber.e("MMS network is not ready!");
-            throw new MmsHttpException(0/*statusCode*/, "MMS network is not ready");
-        }
-        return mmsHttpClient.execute(
-                mLocationUrl,
-                null/*pud*/,
-                MmsHttpClient.METHOD_GET,
-                apn.isProxySet(),
-                apn.getProxyAddress(),
-                apn.getProxyPort(),
-                mMmsConfig);
-    }
-
-    @Override
-    protected PendingIntent getPendingIntent() {
-        return mDownloadedIntent;
-    }
-
-    @Override
-    protected int getQueueType() {
-        return 1;
-    }
-
-    @Override
-    protected Uri persistIfRequired(Context context, int result, byte[] response) {
-        if (!mRequestManager.getAutoPersistingPref()) {
-            notifyOfDownload(context);
-            return null;
-        }
-
-        return persist(context, response, mMmsConfig, mLocationUrl, mSubId, mCreator);
-    }
-
-    public static Uri persist(Context context, byte[] response, MmsConfig.Overridden mmsConfig,
-                              String locationUrl, int subId, String creator) {
-        // Let any mms apps running as secondary user know that a new mms has been downloaded.
-        notifyOfDownload(context);
-
-        Timber.d("DownloadRequest.persistIfRequired");
-        if (response == null || response.length < 1) {
-            Timber.e("DownloadRequest.persistIfRequired: empty response");
-            // Update the retrieve status of the NotificationInd
-            final ContentValues values = new ContentValues(1);
-            values.put(Telephony.Mms.RETRIEVE_STATUS, PduHeaders.RETRIEVE_STATUS_ERROR_END);
-            SqliteWrapper.update(
-                    context,
-                    context.getContentResolver(),
-                    Telephony.Mms.CONTENT_URI,
-                    values,
-                    LOCATION_SELECTION,
-                    new String[]{
-                            Integer.toString(PduHeaders.MESSAGE_TYPE_NOTIFICATION_IND),
-                            locationUrl
-                    });
-            return null;
-        }
-        final long identity = Binder.clearCallingIdentity();
-        try {
-            final GenericPdu pdu =
-                    (new PduParser(response, mmsConfig.getSupportMmsContentDisposition())).parse();
-            if (pdu == null || !(pdu instanceof RetrieveConf)) {
-                Timber.e("DownloadRequest.persistIfRequired: invalid parsed PDU");
-
-                // Update the error type of the NotificationInd
-                setErrorType(context, locationUrl, Telephony.MmsSms.ERR_TYPE_MMS_PROTO_PERMANENT);
-                return null;
-            }
-            final RetrieveConf retrieveConf = (RetrieveConf) pdu;
-            final int status = retrieveConf.getRetrieveStatus();
-//            if (status != PduHeaders.RETRIEVE_STATUS_OK) {
-//                Timber.e("DownloadRequest.persistIfRequired: retrieve failed "
-//                        + status);
-//                // Update the retrieve status of the NotificationInd
-//                final ContentValues values = new ContentValues(1);
-//                values.put(Telephony.Mms.RETRIEVE_STATUS, status);
-//                SqliteWrapper.update(
-//                        context,
-//                        context.getContentResolver(),
-//                        Telephony.Mms.CONTENT_URI,
-//                        values,
-//                        LOCATION_SELECTION,
-//                        new String[]{
-//                                Integer.toString(PduHeaders.MESSAGE_TYPE_NOTIFICATION_IND),
-//                                mLocationUrl
-//                        });
-//                return null;
-//            }
-            // Store the downloaded message
-            final PduPersister persister = PduPersister.getPduPersister(context);
-            final Uri messageUri = persister.persist(pdu, Telephony.Mms.Inbox.CONTENT_URI, PduPersister.DUMMY_THREAD_ID, true, true, null);
-            if (messageUri == null) {
-                Timber.e("DownloadRequest.persistIfRequired: can not persist message");
-                return null;
-            }
-
-            // Update some of the properties of the message
-            final ContentValues values = new ContentValues();
-            values.put(Telephony.Mms.DATE, System.currentTimeMillis() / 1000L);
-            try {
-                values.put(Telephony.Mms.DATE_SENT, retrieveConf.getDate());
-            } catch (Exception ignored) {
-            }
-            values.put(Telephony.Mms.READ, 0);
-            values.put(Telephony.Mms.SEEN, 0);
-            if (!TextUtils.isEmpty(creator)) {
-                values.put(Telephony.Mms.CREATOR, creator);
-            }
-
-            if (SubscriptionIdChecker.getInstance(context).canUseSubscriptionId()) {
-                values.put(Telephony.Mms.SUBSCRIPTION_ID, subId);
-            }
-
-            try {
-                context.getContentResolver().update(messageUri, values, null, null);
-            } catch (SQLiteException e) {
-                // On MIUI and a couple other devices, the above call will fail and say `no such column: sub_id`
-                // If before making that call, we check to see if the sub_id column is available for messageUri, we will
-                // find that it is available, and yet the update call will still fail. So - there's no way we can know
-                // in advance that it will fail, and we have to just try again
-                if (values.containsKey(Telephony.Mms.SUBSCRIPTION_ID)) {
-                    values.remove(Telephony.Mms.SUBSCRIPTION_ID);
-                    context.getContentResolver().update(messageUri, values, null, null);
-                } else {
-                    throw e;
-                }
-            }
-            // Delete the corresponding NotificationInd
-            SqliteWrapper.delete(context, context.getContentResolver(), Telephony.Mms.CONTENT_URI, LOCATION_SELECTION,
-                    new String[]{Integer.toString(PduHeaders.MESSAGE_TYPE_NOTIFICATION_IND), locationUrl});
-
-            return messageUri;
-        } catch (MmsException e) {
-            Timber.e(e, "DownloadRequest.persistIfRequired: can not persist message");
-        } catch (SQLiteException e) {
-            Timber.e(e, "DownloadRequest.persistIfRequired: can not update message");
-        } catch (RuntimeException e) {
-            Timber.e(e, "DownloadRequest.persistIfRequired: can not parse response");
-        } finally {
-            Binder.restoreCallingIdentity(identity);
-        }
-        return null;
-    }
-
-    private static void notifyOfDownload(Context context) {
-        BroadcastUtils.sendExplicitBroadcast(context, new Intent(), Transaction.NOTIFY_OF_MMS);
-
-        // TODO, not sure what this is doing... sending a broadcast that
-        // the download has finished from a specific user account I believe.
-//        final Intent intent = new Intent("android.provider.Telephony.MMS_DOWNLOADED");
-//        intent.addFlags(Intent.FLAG_RECEIVER_NO_ABORT);
-//
-//        // Get a list of currently started users.
-//        int[] users = null;
-//        try {
-//            users = ActivityManagerNative.getDefault().getRunningUserIds();
-//        } catch (RemoteException re) {
-//        }
-//        if (users == null) {
-//            users = new int[] {UserHandle.ALL.getIdentifier()};
-//        }
-//        final UserManager userManager =
-//                (UserManager) context.getSystemService(Context.USER_SERVICE);
-//
-//        // Deliver the broadcast only to those running users that are permitted
-//        // by user policy.
-//        for (int i = users.length - 1; i >= 0; i--) {
-//            UserHandle targetUser = new UserHandle(users[i]);
-//            if (users[i] != UserHandle.USER_OWNER) {
-//                // Is the user not allowed to use SMS?
-//                if (userManager.hasUserRestriction(UserManager.DISALLOW_SMS, targetUser)) {
-//                    continue;
-//                }
-//                // Skip unknown users and managed profiles as well
-//                UserInfo info = userManager.getUserInfo(users[i]);
-//                if (info == null || info.isManagedProfile()) {
-//                    continue;
-//                }
-//            }
-//            context.sendOrderedBroadcastAsUser(intent, targetUser,
-//                    android.Manifest.permission.RECEIVE_MMS,
-//                    18,
-//                    null,
-//                    null, Activity.RESULT_OK, null, null);
-//        }
-    }
-
-    /**
-     * Transfer the received response to the caller (for download requests write to content uri)
-     *
-     * @param fillIn   the intent that will be returned to the caller
-     * @param response the pdu to transfer
-     */
-    @Override
-    protected boolean transferResponse(Intent fillIn, final byte[] response) {
-        return mRequestManager.writePduToContentUri(mContentUri, response);
-    }
-
-    @Override
-    protected boolean prepareForHttpRequest() {
-        return true;
-    }
-
-    /**
-     * Try downloading via the carrier app.
-     *
-     * @param context                        The context
-     * @param carrierMessagingServicePackage The carrier messaging service handling the download
-     */
-    public void tryDownloadingByCarrierApp(Context context, String carrierMessagingServicePackage) {
-//        final CarrierDownloadManager carrierDownloadManger = new CarrierDownloadManager();
-//        final CarrierDownloadCompleteCallback downloadCallback =
-//                new CarrierDownloadCompleteCallback(context, carrierDownloadManger);
-//        carrierDownloadManger.downloadMms(context, carrierMessagingServicePackage,
-//                downloadCallback);
-    }
-
-    @Override
-    protected void revokeUriPermission(Context context) {
-        context.revokeUriPermission(mContentUri, Intent.FLAG_GRANT_WRITE_URI_PERMISSION);
-    }
-
-    private String getContentLocation(Context context, Uri uri)
-            throws MmsException {
-        Cursor cursor = android.database.sqlite.SqliteWrapper.query(context, context.getContentResolver(),
-                uri, PROJECTION, null, null, null);
-
-        if (cursor != null) {
-            try {
-                if ((cursor.getCount() == 1) && cursor.moveToFirst()) {
-                    String location = cursor.getString(COLUMN_CONTENT_LOCATION);
-                    cursor.close();
-                    return location;
-                }
-            } finally {
-                cursor.close();
-            }
-        }
-
-        throw new MmsException("Cannot get X-Mms-Content-Location from: " + uri);
-    }
-
-    private static Long getId(Context context, String location) {
-        String selection = Telephony.Mms.CONTENT_LOCATION + " = ?";
-        String[] selectionArgs = new String[]{location};
-        Cursor c = android.database.sqlite.SqliteWrapper.query(
-                context, context.getContentResolver(),
-                Telephony.Mms.CONTENT_URI, new String[]{Telephony.Mms._ID},
-                selection, selectionArgs, null);
-        if (c != null) {
-            try {
-                if (c.moveToFirst()) {
-                    return c.getLong(c.getColumnIndex(Telephony.Mms._ID));
-                }
-            } finally {
-                c.close();
-            }
-        }
-        return null;
-    }
-
-    private static void setErrorType(Context context, String locationUrl, int errorType) {
-        Long msgId = getId(context, locationUrl);
-        if (msgId == null) {
-            return;
-        }
-
-        Uri.Builder uriBuilder = Telephony.MmsSms.PendingMessages.CONTENT_URI.buildUpon();
-        uriBuilder.appendQueryParameter("protocol", "mms");
-        uriBuilder.appendQueryParameter("message", String.valueOf(msgId));
-
-        Cursor cursor = android.database.sqlite.SqliteWrapper.query(context, context.getContentResolver(),
-                uriBuilder.build(), null, null, null, null);
-        if (cursor == null) {
-            return;
-        }
-
-        try {
-            if ((cursor.getCount() == 1) && cursor.moveToFirst()) {
-                ContentValues values = new ContentValues();
-                values.put(Telephony.MmsSms.PendingMessages.ERROR_TYPE, errorType);
-
-                int columnIndex = cursor.getColumnIndexOrThrow(
-                        Telephony.MmsSms.PendingMessages._ID);
-                long id = cursor.getLong(columnIndex);
-
-                android.database.sqlite.SqliteWrapper.update(context, context.getContentResolver(),
-                        Telephony.MmsSms.PendingMessages.CONTENT_URI,
-                        values, Telephony.MmsSms.PendingMessages._ID + "=" + id, null);
-            }
-        } finally {
-            cursor.close();
-        }
-    }
-}
+/*
+ * Copyright (C) 2015 Jacob Klinker
+ *
+ * Licensed under the Apache License, Version 2.0 (the "License");
+ * you may not use this file except in compliance with the License.
+ * You may obtain a copy of the License at
+ *
+ * http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing, software
+ * distributed under the License is distributed on an "AS IS" BASIS,
+ * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ * See the License for the specific language governing permissions and
+ * limitations under the License.
+ */
+
+package com.android.mms.service_alt;
+
+import android.app.PendingIntent;
+import android.content.ContentValues;
+import android.content.Context;
+import android.content.Intent;
+import android.database.Cursor;
+import android.database.sqlite.SQLiteException;
+import android.net.Uri;
+import android.os.Binder;
+import android.os.Bundle;
+import android.provider.Telephony;
+import android.text.TextUtils;
+
+import com.android.mms.service_alt.exception.MmsHttpException;
+import com.google.android.mms.MmsException;
+import com.google.android.mms.pdu_alt.GenericPdu;
+import com.google.android.mms.pdu_alt.PduHeaders;
+import com.google.android.mms.pdu_alt.PduParser;
+import com.google.android.mms.pdu_alt.PduPersister;
+import com.google.android.mms.pdu_alt.RetrieveConf;
+import com.google.android.mms.util_alt.SqliteWrapper;
+import com.klinker.android.send_message.BroadcastUtils;
+import com.klinker.android.send_message.Transaction;
+
+import timber.log.Timber;
+
+/**
+ * Request to download an MMS
+ */
+public class DownloadRequest extends MmsRequest {
+
+    private static final String LOCATION_SELECTION =
+            Telephony.Mms.MESSAGE_TYPE + "=? AND " + Telephony.Mms.CONTENT_LOCATION + " =?";
+
+    static final String[] PROJECTION = new String[]{
+            Telephony.Mms.CONTENT_LOCATION
+    };
+
+    // The indexes of the columns which must be consistent with above PROJECTION.
+    static final int COLUMN_CONTENT_LOCATION = 0;
+
+    private final String mLocationUrl;
+    private final PendingIntent mDownloadedIntent;
+    private final Uri mContentUri;
+
+    public DownloadRequest(RequestManager manager, int subId, String locationUrl,
+                           Uri contentUri, PendingIntent downloadedIntent, String creator,
+                           Bundle configOverrides, Context context) throws MmsException {
+        super(manager, subId, creator, configOverrides);
+
+        if (locationUrl == null) {
+            mLocationUrl = getContentLocation(context, contentUri);
+        } else {
+            mLocationUrl = locationUrl;
+        }
+
+        mDownloadedIntent = downloadedIntent;
+        mContentUri = contentUri;
+    }
+
+    @Override
+    protected byte[] doHttp(Context context, MmsNetworkManager netMgr, ApnSettings apn)
+            throws MmsHttpException {
+        final MmsHttpClient mmsHttpClient = netMgr.getOrCreateHttpClient();
+        if (mmsHttpClient == null) {
+            Timber.e("MMS network is not ready!");
+            throw new MmsHttpException(0/*statusCode*/, "MMS network is not ready");
+        }
+        return mmsHttpClient.execute(
+                mLocationUrl,
+                null/*pud*/,
+                MmsHttpClient.METHOD_GET,
+                apn.isProxySet(),
+                apn.getProxyAddress(),
+                apn.getProxyPort(),
+                mMmsConfig);
+    }
+
+    @Override
+    protected PendingIntent getPendingIntent() {
+        return mDownloadedIntent;
+    }
+
+    @Override
+    protected int getQueueType() {
+        return 1;
+    }
+
+    @Override
+    protected Uri persistIfRequired(Context context, int result, byte[] response) {
+        if (!mRequestManager.getAutoPersistingPref()) {
+            notifyOfDownload(context);
+            return null;
+        }
+
+        return persist(context, response, mMmsConfig, mLocationUrl, mSubId, mCreator);
+    }
+
+    public static Uri persist(Context context, byte[] response, MmsConfig.Overridden mmsConfig,
+                              String locationUrl, int subId, String creator) {
+        // Let any mms apps running as secondary user know that a new mms has been downloaded.
+        notifyOfDownload(context);
+
+        Timber.d("DownloadRequest.persistIfRequired");
+        if (response == null || response.length < 1) {
+            Timber.e("DownloadRequest.persistIfRequired: empty response");
+            // Update the retrieve status of the NotificationInd
+            final ContentValues values = new ContentValues(1);
+            values.put(Telephony.Mms.RETRIEVE_STATUS, PduHeaders.RETRIEVE_STATUS_ERROR_END);
+            SqliteWrapper.update(
+                    context,
+                    context.getContentResolver(),
+                    Telephony.Mms.CONTENT_URI,
+                    values,
+                    LOCATION_SELECTION,
+                    new String[]{
+                            Integer.toString(PduHeaders.MESSAGE_TYPE_NOTIFICATION_IND),
+                            locationUrl
+                    });
+            return null;
+        }
+        final long identity = Binder.clearCallingIdentity();
+        try {
+            final GenericPdu pdu =
+                    (new PduParser(response, mmsConfig.getSupportMmsContentDisposition())).parse();
+            if (pdu == null || !(pdu instanceof RetrieveConf)) {
+                Timber.e("DownloadRequest.persistIfRequired: invalid parsed PDU");
+
+                // Update the error type of the NotificationInd
+                setErrorType(context, locationUrl, Telephony.MmsSms.ERR_TYPE_MMS_PROTO_PERMANENT);
+                return null;
+            }
+            final RetrieveConf retrieveConf = (RetrieveConf) pdu;
+            final int status = retrieveConf.getRetrieveStatus();
+//            if (status != PduHeaders.RETRIEVE_STATUS_OK) {
+//                Timber.e("DownloadRequest.persistIfRequired: retrieve failed "
+//                        + status);
+//                // Update the retrieve status of the NotificationInd
+//                final ContentValues values = new ContentValues(1);
+//                values.put(Telephony.Mms.RETRIEVE_STATUS, status);
+//                SqliteWrapper.update(
+//                        context,
+//                        context.getContentResolver(),
+//                        Telephony.Mms.CONTENT_URI,
+//                        values,
+//                        LOCATION_SELECTION,
+//                        new String[]{
+//                                Integer.toString(PduHeaders.MESSAGE_TYPE_NOTIFICATION_IND),
+//                                mLocationUrl
+//                        });
+//                return null;
+//            }
+            // Store the downloaded message
+            final PduPersister persister = PduPersister.getPduPersister(context);
+            final Uri messageUri = persister.persist(pdu, Telephony.Mms.Inbox.CONTENT_URI, PduPersister.DUMMY_THREAD_ID, true, true, null);
+            if (messageUri == null) {
+                Timber.e("DownloadRequest.persistIfRequired: can not persist message");
+                return null;
+            }
+
+            // Update some of the properties of the message
+            final ContentValues values = new ContentValues();
+            values.put(Telephony.Mms.DATE, System.currentTimeMillis() / 1000L);
+            try {
+                values.put(Telephony.Mms.DATE_SENT, retrieveConf.getDate());
+            } catch (Exception ignored) {
+            }
+            values.put(Telephony.Mms.READ, 0);
+            values.put(Telephony.Mms.SEEN, 0);
+            if (!TextUtils.isEmpty(creator)) {
+                values.put(Telephony.Mms.CREATOR, creator);
+            }
+
+            if (SubscriptionIdChecker.getInstance(context).canUseSubscriptionId()) {
+                values.put(Telephony.Mms.SUBSCRIPTION_ID, subId);
+            }
+
+            try {
+                context.getContentResolver().update(messageUri, values, null, null);
+            } catch (SQLiteException e) {
+                // On MIUI and a couple other devices, the above call will fail and say `no such column: sub_id`
+                // If before making that call, we check to see if the sub_id column is available for messageUri, we will
+                // find that it is available, and yet the update call will still fail. So - there's no way we can know
+                // in advance that it will fail, and we have to just try again
+                if (values.containsKey(Telephony.Mms.SUBSCRIPTION_ID)) {
+                    values.remove(Telephony.Mms.SUBSCRIPTION_ID);
+                    context.getContentResolver().update(messageUri, values, null, null);
+                } else {
+                    throw e;
+                }
+            }
+            // Delete the corresponding NotificationInd
+            SqliteWrapper.delete(context, context.getContentResolver(), Telephony.Mms.CONTENT_URI, LOCATION_SELECTION,
+                    new String[]{Integer.toString(PduHeaders.MESSAGE_TYPE_NOTIFICATION_IND), locationUrl});
+
+            return messageUri;
+        } catch (MmsException e) {
+            Timber.e(e, "DownloadRequest.persistIfRequired: can not persist message");
+        } catch (SQLiteException e) {
+            Timber.e(e, "DownloadRequest.persistIfRequired: can not update message");
+        } catch (RuntimeException e) {
+            Timber.e(e, "DownloadRequest.persistIfRequired: can not parse response");
+        } finally {
+            Binder.restoreCallingIdentity(identity);
+        }
+        return null;
+    }
+
+    private static void notifyOfDownload(Context context) {
+        BroadcastUtils.sendExplicitBroadcast(context, new Intent(), Transaction.NOTIFY_OF_MMS);
+
+        // TODO, not sure what this is doing... sending a broadcast that
+        // the download has finished from a specific user account I believe.
+//        final Intent intent = new Intent("android.provider.Telephony.MMS_DOWNLOADED");
+//        intent.addFlags(Intent.FLAG_RECEIVER_NO_ABORT);
+//
+//        // Get a list of currently started users.
+//        int[] users = null;
+//        try {
+//            users = ActivityManagerNative.getDefault().getRunningUserIds();
+//        } catch (RemoteException re) {
+//        }
+//        if (users == null) {
+//            users = new int[] {UserHandle.ALL.getIdentifier()};
+//        }
+//        final UserManager userManager =
+//                (UserManager) context.getSystemService(Context.USER_SERVICE);
+//
+//        // Deliver the broadcast only to those running users that are permitted
+//        // by user policy.
+//        for (int i = users.length - 1; i >= 0; i--) {
+//            UserHandle targetUser = new UserHandle(users[i]);
+//            if (users[i] != UserHandle.USER_OWNER) {
+//                // Is the user not allowed to use SMS?
+//                if (userManager.hasUserRestriction(UserManager.DISALLOW_SMS, targetUser)) {
+//                    continue;
+//                }
+//                // Skip unknown users and managed profiles as well
+//                UserInfo info = userManager.getUserInfo(users[i]);
+//                if (info == null || info.isManagedProfile()) {
+//                    continue;
+//                }
+//            }
+//            context.sendOrderedBroadcastAsUser(intent, targetUser,
+//                    android.Manifest.permission.RECEIVE_MMS,
+//                    18,
+//                    null,
+//                    null, Activity.RESULT_OK, null, null);
+//        }
+    }
+
+    /**
+     * Transfer the received response to the caller (for download requests write to content uri)
+     *
+     * @param fillIn   the intent that will be returned to the caller
+     * @param response the pdu to transfer
+     */
+    @Override
+    protected boolean transferResponse(Intent fillIn, final byte[] response) {
+        return mRequestManager.writePduToContentUri(mContentUri, response);
+    }
+
+    @Override
+    protected boolean prepareForHttpRequest() {
+        return true;
+    }
+
+    /**
+     * Try downloading via the carrier app.
+     *
+     * @param context                        The context
+     * @param carrierMessagingServicePackage The carrier messaging service handling the download
+     */
+    public void tryDownloadingByCarrierApp(Context context, String carrierMessagingServicePackage) {
+//        final CarrierDownloadManager carrierDownloadManger = new CarrierDownloadManager();
+//        final CarrierDownloadCompleteCallback downloadCallback =
+//                new CarrierDownloadCompleteCallback(context, carrierDownloadManger);
+//        carrierDownloadManger.downloadMms(context, carrierMessagingServicePackage,
+//                downloadCallback);
+    }
+
+    @Override
+    protected void revokeUriPermission(Context context) {
+        context.revokeUriPermission(mContentUri, Intent.FLAG_GRANT_WRITE_URI_PERMISSION);
+    }
+
+    private String getContentLocation(Context context, Uri uri)
+            throws MmsException {
+        Cursor cursor = android.database.sqlite.SqliteWrapper.query(context, context.getContentResolver(),
+                uri, PROJECTION, null, null, null);
+
+        if (cursor != null) {
+            try {
+                if ((cursor.getCount() == 1) && cursor.moveToFirst()) {
+                    String location = cursor.getString(COLUMN_CONTENT_LOCATION);
+                    cursor.close();
+                    return location;
+                }
+            } finally {
+                cursor.close();
+            }
+        }
+
+        throw new MmsException("Cannot get X-Mms-Content-Location from: " + uri);
+    }
+
+    private static Long getId(Context context, String location) {
+        String selection = Telephony.Mms.CONTENT_LOCATION + " = ?";
+        String[] selectionArgs = new String[]{location};
+        Cursor c = android.database.sqlite.SqliteWrapper.query(
+                context, context.getContentResolver(),
+                Telephony.Mms.CONTENT_URI, new String[]{Telephony.Mms._ID},
+                selection, selectionArgs, null);
+        if (c != null) {
+            try {
+                if (c.moveToFirst()) {
+                    return c.getLong(c.getColumnIndex(Telephony.Mms._ID));
+                }
+            } finally {
+                c.close();
+            }
+        }
+        return null;
+    }
+
+    private static void setErrorType(Context context, String locationUrl, int errorType) {
+        Long msgId = getId(context, locationUrl);
+        if (msgId == null) {
+            return;
+        }
+
+        Uri.Builder uriBuilder = Telephony.MmsSms.PendingMessages.CONTENT_URI.buildUpon();
+        uriBuilder.appendQueryParameter("protocol", "mms");
+        uriBuilder.appendQueryParameter("message", String.valueOf(msgId));
+
+        Cursor cursor = android.database.sqlite.SqliteWrapper.query(context, context.getContentResolver(),
+                uriBuilder.build(), null, null, null, null);
+        if (cursor == null) {
+            return;
+        }
+
+        try {
+            if ((cursor.getCount() == 1) && cursor.moveToFirst()) {
+                ContentValues values = new ContentValues();
+                values.put(Telephony.MmsSms.PendingMessages.ERROR_TYPE, errorType);
+
+                int columnIndex = cursor.getColumnIndexOrThrow(
+                        Telephony.MmsSms.PendingMessages._ID);
+                long id = cursor.getLong(columnIndex);
+
+                android.database.sqlite.SqliteWrapper.update(context, context.getContentResolver(),
+                        Telephony.MmsSms.PendingMessages.CONTENT_URI,
+                        values, Telephony.MmsSms.PendingMessages._ID + "=" + id, null);
+            }
+        } finally {
+            cursor.close();
+        }
+    }
+}
diff --git a/android-smsmms/src/main/java/com/android/mms/service_alt/MmsConfig.java b/android-smsmms/src/main/java/com/android/mms/service_alt/MmsConfig.java
index 00eb2357a..1c39707ce 100755
--- a/android-smsmms/src/main/java/com/android/mms/service_alt/MmsConfig.java
+++ b/android-smsmms/src/main/java/com/android/mms/service_alt/MmsConfig.java
@@ -1,618 +1,618 @@
-/*
- * Copyright (C) 2015 Jacob Klinker
- *
- * Licensed under the Apache License, Version 2.0 (the "License");
- * you may not use this file except in compliance with the License.
- * You may obtain a copy of the License at
- *
- * http://www.apache.org/licenses/LICENSE-2.0
- *
- * Unless required by applicable law or agreed to in writing, software
- * distributed under the License is distributed on an "AS IS" BASIS,
- * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
- * See the License for the specific language governing permissions and
- * limitations under the License.
- */
-
-package com.android.mms.service_alt;
-
-import android.content.Context;
-import android.content.res.XmlResourceParser;
-import android.os.Build;
-import android.os.Bundle;
-import android.telephony.SubscriptionManager;
-import android.telephony.TelephonyManager;
-import android.text.TextUtils;
-import android.util.Base64;
-import com.klinker.android.send_message.R;
-import timber.log.Timber;
-
-import java.io.UnsupportedEncodingException;
-import java.lang.reflect.Method;
-import java.util.Iterator;
-import java.util.Map;
-import java.util.concurrent.ConcurrentHashMap;
-
-/**
- * This class manages a cached copy of current MMS configuration key values
- *
- * The steps to add a key
- * 1. Add a String constant for the key
- * 2. Add a default value for the key by putting a typed value to DEFAULTS
- *    (null means String type only)
- * 3. Add a getter for the key
- * 4. Add key/value for relevant mms_config.xml of a specific carrier (mcc/mnc)
- */
-public class MmsConfig {
-
-    private static final String DEFAULT_HTTP_KEY_X_WAP_PROFILE = "x-wap-profile";
-
-    private static final int MAX_IMAGE_HEIGHT = 480;
-    private static final int MAX_IMAGE_WIDTH = 640;
-    private static final int MAX_TEXT_LENGTH = 2000;
-
-    /*
-     * MmsConfig keys. These have to stay in sync with the MMS_CONFIG_* values defined in
-     * SmsManager.
-     */
-    public static final String CONFIG_ENABLED_MMS = "enabledMMS";
-    // In case of single segment wap push message, this CONFIG_ENABLED_TRANS_ID indicates whether
-    // TransactionID should be appended to URI or not.
-    public static final String CONFIG_ENABLED_TRANS_ID = "enabledTransID";
-    public static final String CONFIG_ENABLED_NOTIFY_WAP_MMSC = "enabledNotifyWapMMSC";
-    public static final String CONFIG_ALIAS_ENABLED = "aliasEnabled";
-    public static final String CONFIG_ALLOW_ATTACH_AUDIO = "allowAttachAudio";
-    // If CONFIG_ENABLE_MULTIPART_SMS is true, long sms messages are always sent as multi-part sms
-    // messages, with no checked limit on the number of segments.
-    // If CONFIG_ENABLE_MULTIPART_SMS is false, then as soon as the user types a message longer
-    // than a single segment (i.e. 140 chars), then the message will turn into and be sent
-    // as an mms message or separate, independent SMS messages
-    // (which is dependent on CONFIG_SEND_MULTIPART_SMS_AS_SEPARATE_MESSAGES flag).
-    // This feature exists for carriers that don't support multi-part sms's.
-    public static final String CONFIG_ENABLE_MULTIPART_SMS = "enableMultipartSMS";
-    public static final String CONFIG_ENABLE_SMS_DELIVERY_REPORTS = "enableSMSDeliveryReports";
-    // If CONFIG_ENABLE_GROUP_MMS is true, a message with multiple recipients,
-    // regardless of contents, will be sent as a single MMS message with multiple "TO" fields set
-    // for each recipient.
-    // If CONFIG_ENABLE_GROUP_MMS is false, the group MMS setting/preference will be hidden
-    // in the settings activity.
-    public static final String CONFIG_ENABLE_GROUP_MMS = "enableGroupMms";
-    // If this is true, then we should read the content_disposition field of an MMS part
-    // Check wap-230-wsp-20010705-a.pdf, chapter 8.4.2.21
-    // Most carriers support it except Sprint.
-    // There is a system resource defining it:
-    // com.android.internal.R.bool.config_mms_content_disposition_support.
-    // But Shem can not read it. Add here so that we can configure for different carriers.
-    public static final String CONFIG_SUPPORT_MMS_CONTENT_DISPOSITION =
-            "supportMmsContentDisposition";
-    // if true, show the cell broadcast (amber alert) in the SMS settings. Some carriers
-    // don't want this shown.
-    public static final String CONFIG_CELL_BROADCAST_APP_LINKS = "config_cellBroadcastAppLinks";
-    // If this is true, we will send multipart SMS as separate SMS messages
-    public static final String CONFIG_SEND_MULTIPART_SMS_AS_SEPARATE_MESSAGES =
-            "sendMultipartSmsAsSeparateMessages";
-    // FLAG(ywen): the following two is not supported yet.
-    public static final String CONFIG_ENABLE_MMS_READ_REPORTS = "enableMMSReadReports";
-    public static final String CONFIG_ENABLE_MMS_DELIVERY_REPORTS = "enableMMSDeliveryReports";
-    // Bouygues Telecom (20820) MMSC does not support "charset" with "Content-Type" header
-    // It would fail and return 500. See b/18604507
-    // If this is false, then we don't add "charset" to "Content-Type"
-    public static final String CONFIG_SUPPORT_HTTP_CHARSET_HEADER = "supportHttpCharsetHeader";
-    public static final String CONFIG_MAX_MESSAGE_SIZE = "maxMessageSize"; // in bytes
-    public static final String CONFIG_MAX_IMAGE_HEIGHT = "maxImageHeight"; // in pixels
-    public static final String CONFIG_MAX_IMAGE_WIDTH = "maxImageWidth"; // in pixels
-    public static final String CONFIG_RECIPIENT_LIMIT = "recipientLimit";
-    public static final String CONFIG_HTTP_SOCKET_TIMEOUT = "httpSocketTimeout";
-    public static final String CONFIG_ALIAS_MIN_CHARS = "aliasMinChars";
-    public static final String CONFIG_ALIAS_MAX_CHARS = "aliasMaxChars";
-    // If CONFIG_ENABLE_MULTIPART_SMS is true and CONFIG_SMS_TO_MMS_TEXT_THRESHOLD > 1,
-    // then multi-part SMS messages will be converted into a single mms message.
-    // For example, if the mms_config.xml file specifies <int name="smsToMmsTextThreshold">4</int>,
-    // then on the 5th sms segment, the message will be converted to an mms.
-    public static final String CONFIG_SMS_TO_MMS_TEXT_THRESHOLD = "smsToMmsTextThreshold";
-    // LGU+ temporarily requires any SMS message longer than 80 bytes to be sent as MMS
-    // see b/12122333
-    public static final String CONFIG_SMS_TO_MMS_TEXT_LENGTH_THRESHOLD =
-            "smsToMmsTextLengthThreshold";
-    public static final String CONFIG_MAX_MESSAGE_TEXT_SIZE = "maxMessageTextSize";
-    // maximum number of characters allowed for mms subject
-    public static final String CONFIG_MAX_SUBJECT_LENGTH = "maxSubjectLength";
-    public static final String CONFIG_UA_PROF_TAG_NAME = "uaProfTagName";
-    public static final String CONFIG_USER_AGENT = "userAgent";
-    public static final String CONFIG_UA_PROF_URL = "uaProfUrl";
-    public static final String CONFIG_HTTP_PARAMS = "httpParams";
-    // Email gateway alias support, including the master switch and different rules
-    public static final String CONFIG_EMAIL_GATEWAY_NUMBER = "emailGatewayNumber";
-    // String to append to the NAI header, e.g. ":pcs"
-    public static final String CONFIG_NAI_SUFFIX = "naiSuffix";
-
-    /*
-     * Key types
-     */
-    public static final String KEY_TYPE_INT = "int";
-    public static final String KEY_TYPE_BOOL = "bool";
-    public static final String KEY_TYPE_STRING = "string";
-
-    /*
-     * Macro names
-     */
-    // The raw phone number from TelephonyManager.getLine1Number
-    public static final String MACRO_LINE1 = "LINE1";
-    // The phone number without country code
-    public static final String MACRO_LINE1NOCOUNTRYCODE = "LINE1NOCOUNTRYCODE";
-    // NAI (Network Access Identifier), used by Sprint for authentication
-    public static final String MACRO_NAI = "NAI";
-
-    // Default values. This is read-only. Don't write into it.
-    // This provides the info on valid keys, their types and default values
-    private static final Map<String, Object> DEFAULTS = new ConcurrentHashMap<String, Object>();
-    static {
-        DEFAULTS.put(CONFIG_ENABLED_MMS, Boolean.valueOf(true));
-        DEFAULTS.put(CONFIG_ENABLED_TRANS_ID, Boolean.valueOf(false));
-        DEFAULTS.put(CONFIG_ENABLED_NOTIFY_WAP_MMSC, Boolean.valueOf(false));
-        DEFAULTS.put(CONFIG_ALIAS_ENABLED, Boolean.valueOf(false));
-        DEFAULTS.put(CONFIG_ALLOW_ATTACH_AUDIO, Boolean.valueOf(true));
-        DEFAULTS.put(CONFIG_ENABLE_MULTIPART_SMS, Boolean.valueOf(true));
-        DEFAULTS.put(CONFIG_ENABLE_SMS_DELIVERY_REPORTS, Boolean.valueOf(true));
-        DEFAULTS.put(CONFIG_ENABLE_GROUP_MMS, Boolean.valueOf(true));
-        DEFAULTS.put(CONFIG_SUPPORT_MMS_CONTENT_DISPOSITION, Boolean.valueOf(true));
-        DEFAULTS.put(CONFIG_CELL_BROADCAST_APP_LINKS, Boolean.valueOf(true));
-        DEFAULTS.put(CONFIG_SEND_MULTIPART_SMS_AS_SEPARATE_MESSAGES, Boolean.valueOf(false));
-        DEFAULTS.put(CONFIG_ENABLE_MMS_READ_REPORTS, Boolean.valueOf(false));
-        DEFAULTS.put(CONFIG_ENABLE_MMS_DELIVERY_REPORTS, Boolean.valueOf(false));
-        DEFAULTS.put(CONFIG_SUPPORT_HTTP_CHARSET_HEADER, Boolean.valueOf(false));
-        DEFAULTS.put(CONFIG_MAX_MESSAGE_SIZE, Integer.valueOf(300 * 1024));
-        DEFAULTS.put(CONFIG_MAX_IMAGE_HEIGHT, Integer.valueOf(MAX_IMAGE_HEIGHT));
-        DEFAULTS.put(CONFIG_MAX_IMAGE_WIDTH, Integer.valueOf(MAX_IMAGE_WIDTH));
-        DEFAULTS.put(CONFIG_RECIPIENT_LIMIT, Integer.valueOf(Integer.MAX_VALUE));
-        DEFAULTS.put(CONFIG_HTTP_SOCKET_TIMEOUT, Integer.valueOf(60 * 1000));
-        DEFAULTS.put(CONFIG_ALIAS_MIN_CHARS, Integer.valueOf(2));
-        DEFAULTS.put(CONFIG_ALIAS_MAX_CHARS, Integer.valueOf(48));
-        DEFAULTS.put(CONFIG_SMS_TO_MMS_TEXT_THRESHOLD, Integer.valueOf(-1));
-        DEFAULTS.put(CONFIG_SMS_TO_MMS_TEXT_LENGTH_THRESHOLD, Integer.valueOf(-1));
-        DEFAULTS.put(CONFIG_MAX_MESSAGE_TEXT_SIZE, Integer.valueOf(-1));
-        DEFAULTS.put(CONFIG_MAX_SUBJECT_LENGTH, Integer.valueOf(40));
-        DEFAULTS.put(CONFIG_UA_PROF_TAG_NAME, DEFAULT_HTTP_KEY_X_WAP_PROFILE);
-        DEFAULTS.put(CONFIG_USER_AGENT, "");
-        DEFAULTS.put(CONFIG_UA_PROF_URL, "");
-        DEFAULTS.put(CONFIG_HTTP_PARAMS, "");
-        DEFAULTS.put(CONFIG_EMAIL_GATEWAY_NUMBER, "");
-        DEFAULTS.put(CONFIG_NAI_SUFFIX, "");
-    }
-
-    private final int mSubId;
-
-    /**
-     * This class manages a cached copy of current MMS configuration key values for a particular
-     * subscription id. (See the {@link SubscriptionManager}).
-     *
-     * @param context Context of the particular subscription to load. The context's mcc/mnc
-     * should be set to that of the subscription id
-     * @param subId Subscription id of the mcc/mnc in the context
-     */
-    public MmsConfig(Context context, int subId) {
-        mSubId = subId;
-        // Load defaults
-        mKeyValues.clear();
-        mKeyValues.putAll(DEFAULTS);
-        // Load User-Agent and UA profile URL settings
-        loadDeviceUaSettings(context);
-        Timber.v("MmsConfig: mUserAgent=" + mUserAgent + ", mUaProfUrl=" + mUaProfUrl);
-        // Load mms_config.xml resource overlays
-        loadFromResources(context);
-        Timber.v("MmsConfig: all settings -- " + mKeyValues);
-    }
-
-    /**
-     * This class manages a cached copy of current MMS configuration key values for a particular
-     * subscription id. (See the {@link SubscriptionManager}).
-     *
-     * @param context Context of the particular subscription to load. The context's mcc/mnc
-     * should be set to that of the subscription id\
-     */
-    public MmsConfig(Context context) {
-        mSubId = -1;
-        // Load defaults
-        mKeyValues.clear();
-        mKeyValues.putAll(DEFAULTS);
-        // Load User-Agent and UA profile URL settings
-        loadDeviceUaSettings(context);
-        Timber.v("MmsConfig: mUserAgent=" + mUserAgent + ", mUaProfUrl=" + mUaProfUrl);
-        // Load mms_config.xml resource overlays
-        loadFromResources(context);
-        Timber.v("MmsConfig: all settings -- " + mKeyValues);
-    }
-
-    /**
-     * Return the subscription ID associated with this MmsConfig
-     *
-     * @return subId the subId associated with this MmsConfig
-     */
-    public int getSubId() {
-        return mSubId;
-    }
-
-    /**
-     * Check a key and its type match the predefined keys and corresponding types
-     *
-     * @param key
-     * @param type Including "int" "bool" and "string"
-     * @return True if key and type both matches and false otherwise
-     */
-    public static boolean isValidKey(String key, String type) {
-        if (!TextUtils.isEmpty(key) && DEFAULTS.containsKey(key)) {
-            Object defVal = DEFAULTS.get(key);
-            Class<?> valueType = defVal != null ? defVal.getClass() : String.class;
-            if (KEY_TYPE_INT.equals(type)) {
-                return valueType == Integer.class;
-            } else if (KEY_TYPE_BOOL.equals(type)) {
-                return valueType == Boolean.class;
-            } else if (KEY_TYPE_STRING.equals(type)) {
-                return valueType == String.class;
-            }
-        }
-        return false;
-    }
-
-    /**
-     * Check a key and its type match the predefined keys and corresponding types
-     *
-     * @param key The key of the config
-     * @param value The value of the config
-     * @return True if key and type both matches and false otherwise
-     */
-    public static boolean isValidValue(String key, Object value) {
-        if (!TextUtils.isEmpty(key) && DEFAULTS.containsKey(key)) {
-            Object defVal = DEFAULTS.get(key);
-            Class<?> valueType = defVal != null ? defVal.getClass() : String.class;
-            return value.getClass().equals(valueType);
-        }
-        return false;
-    }
-
-    private String mUserAgent = null;
-    private String mUaProfUrl = null;
-
-    // The current values
-    private final Map<String, Object> mKeyValues = new ConcurrentHashMap<String, Object>();
-
-    /**
-     * Get a config value by its type
-     *
-     * @param key The key of the config
-     * @param type The type of the config value
-     * @return The expected typed value or null if no match
-     */
-    public Object getValueAsType(String key, String type) {
-        if (isValidKey(key, type)) {
-            return mKeyValues.get(key);
-        }
-        return null;
-    }
-
-    public Bundle getCarrierConfigValues() {
-        final Bundle bundle = new Bundle();
-        final Iterator<Map.Entry<String, Object>> iter = mKeyValues.entrySet().iterator();
-        while(iter.hasNext()) {
-            final Map.Entry<String, Object> entry = iter.next();
-            final String key = entry.getKey();
-            final Object val = entry.getValue();
-            Class<?> valueType =  val != null ? val.getClass() : String.class;
-            if (valueType == Integer.class) {
-                bundle.putInt(key, (Integer)val);
-            } else if (valueType == Boolean.class) {
-                bundle.putBoolean(key, (Boolean)val);
-            } else if (valueType == String.class) {
-                bundle.putString(key, (String)val);
-            }
-        }
-        return bundle;
-    }
-
-    private String getNullableStringValue(String key) {
-        final Object value = mKeyValues.get(key);
-        if (value != null) {
-            return (String) value;
-        }
-        return null;
-    }
-
-    private void update(String key, String value, String type) {
-        try {
-            if (KEY_TYPE_INT.equals(type)) {
-                mKeyValues.put(key, Integer.parseInt(value));
-            } else if (KEY_TYPE_BOOL.equals(type)) {
-                mKeyValues.put(key, Boolean.parseBoolean(value));
-            } else if (KEY_TYPE_STRING.equals(type)){
-                mKeyValues.put(key, value);
-            }
-        } catch (NumberFormatException e) {
-            Timber.e("MmsConfig.update: invalid " + key + "," + value + "," + type);
-        }
-    }
-
-    private void loadDeviceUaSettings(Context context) {
-        // load the MMS User agent and UaProfUrl from TelephonyManager APIs
-        final TelephonyManager telephonyManager =
-                (TelephonyManager) context.getSystemService(Context.TELEPHONY_SERVICE);
-
-        mUserAgent = telephonyManager.getMmsUserAgent();
-        mUaProfUrl = telephonyManager.getMmsUAProfUrl();
-        // defaults for nexus 6, seems to work well.
-        //mUserAgent = "nexus6";
-        //mUaProfUrl = "http://uaprof.motorola.com/phoneconfig/nexus6/Profile/nexus6.rdf";
-    }
-
-    private void loadFromResources(Context context) {
-        Timber.d("MmsConfig.loadFromResources");
-        final XmlResourceParser parser = context.getResources().getXml(R.xml.mms_config);
-        final MmsConfigXmlProcessor processor = MmsConfigXmlProcessor.get(parser);
-        processor.setMmsConfigHandler(new MmsConfigXmlProcessor.MmsConfigHandler() {
-            @Override
-            public void process(String key, String value, String type) {
-                update(key, value, type);
-            }
-        });
-        try {
-            processor.process();
-        } finally {
-            parser.close();
-        }
-    }
-
-    /**
-     * This class returns corresponding MmsConfig values which can be overridden by
-     * externally provided values.
-     */
-    public static class Overridden {
-        // The base MmsConfig
-        private final MmsConfig mBase;
-        // The overridden values
-        private final Bundle mOverrides;
-
-        public Overridden(MmsConfig base, Bundle overrides) {
-            mBase = base;
-            mOverrides = overrides;
-        }
-
-        private int getInt(String key) {
-            final Integer def = (Integer) mBase.mKeyValues.get(key);
-            return mOverrides != null ? mOverrides.getInt(key, def) : def;
-        }
-
-        private boolean getBoolean(String key) {
-            final Boolean def = (Boolean) mBase.mKeyValues.get(key);
-            return mOverrides != null ? mOverrides.getBoolean(key, def) : def;
-        }
-
-        private String getString(String key) {
-            if (mOverrides != null && mOverrides.containsKey(key)) {
-                return mOverrides.getString(key);
-            }
-            return mBase.getNullableStringValue(key);
-        }
-
-        public int getSmsToMmsTextThreshold() {
-            return getInt(CONFIG_SMS_TO_MMS_TEXT_THRESHOLD);
-        }
-
-        public int getSmsToMmsTextLengthThreshold() {
-            return getInt(CONFIG_SMS_TO_MMS_TEXT_LENGTH_THRESHOLD);
-        }
-
-        public boolean getMmsEnabled() {
-            return getBoolean(CONFIG_ENABLED_MMS);
-        }
-
-        public int getMaxMessageSize() {
-            return getInt(CONFIG_MAX_MESSAGE_SIZE);
-        }
-
-        public boolean getTransIdEnabled() {
-            return getBoolean(CONFIG_ENABLED_TRANS_ID);
-        }
-
-        public String getUserAgent() {
-            if (mOverrides != null && mOverrides.containsKey(CONFIG_USER_AGENT)) {
-                return mOverrides.getString(CONFIG_USER_AGENT);
-            }
-            return !TextUtils.isEmpty(mBase.mUserAgent) ?
-                    mBase.mUserAgent : mBase.getNullableStringValue(CONFIG_USER_AGENT);
-        }
-
-        public String getUaProfTagName() {
-            return getString(CONFIG_UA_PROF_TAG_NAME);
-        }
-
-        public String getUaProfUrl() {
-            if (mOverrides != null && mOverrides.containsKey(CONFIG_UA_PROF_URL)) {
-                return mOverrides.getString(CONFIG_UA_PROF_URL);
-            }
-            return !TextUtils.isEmpty(mBase.mUaProfUrl) ?
-                    mBase.mUaProfUrl : mBase.getNullableStringValue(CONFIG_UA_PROF_URL);
-        }
-
-        public String getHttpParams() {
-            return getString(CONFIG_HTTP_PARAMS);
-        }
-
-        public String getEmailGateway() {
-            return getString(CONFIG_EMAIL_GATEWAY_NUMBER);
-        }
-
-        public int getMaxImageHeight() {
-            return getInt(CONFIG_MAX_IMAGE_HEIGHT);
-        }
-
-        public int getMaxImageWidth() {
-            return getInt(CONFIG_MAX_IMAGE_WIDTH);
-        }
-
-        public int getRecipientLimit() {
-            final int limit = getInt(CONFIG_RECIPIENT_LIMIT);
-            return limit < 0 ? Integer.MAX_VALUE : limit;
-        }
-
-        public int getMaxTextLimit() {
-            final int max = getInt(CONFIG_MAX_MESSAGE_TEXT_SIZE);
-            return max > -1 ? max : MAX_TEXT_LENGTH;
-        }
-
-        public int getHttpSocketTimeout() {
-            return getInt(CONFIG_HTTP_SOCKET_TIMEOUT);
-        }
-
-        public boolean getMultipartSmsEnabled() {
-            return getBoolean(CONFIG_ENABLE_MULTIPART_SMS);
-        }
-
-        public boolean getSendMultipartSmsAsSeparateMessages() {
-            return getBoolean(CONFIG_SEND_MULTIPART_SMS_AS_SEPARATE_MESSAGES);
-        }
-
-        public boolean getSMSDeliveryReportsEnabled() {
-            return getBoolean(CONFIG_ENABLE_SMS_DELIVERY_REPORTS);
-        }
-
-        public boolean getNotifyWapMMSC() {
-            return getBoolean(CONFIG_ENABLED_NOTIFY_WAP_MMSC);
-        }
-
-        public boolean isAliasEnabled() {
-            return getBoolean(CONFIG_ALIAS_ENABLED);
-        }
-
-        public int getAliasMinChars() {
-            return getInt(CONFIG_ALIAS_MIN_CHARS);
-        }
-
-        public int getAliasMaxChars() {
-            return getInt(CONFIG_ALIAS_MAX_CHARS);
-        }
-
-        public boolean getAllowAttachAudio() {
-            return getBoolean(CONFIG_ALLOW_ATTACH_AUDIO);
-        }
-
-        public int getMaxSubjectLength() {
-            return getInt(CONFIG_MAX_SUBJECT_LENGTH);
-        }
-
-        public boolean getGroupMmsEnabled() {
-            return getBoolean(CONFIG_ENABLE_GROUP_MMS);
-        }
-
-        public boolean getSupportMmsContentDisposition() {
-            return getBoolean(CONFIG_SUPPORT_MMS_CONTENT_DISPOSITION);
-        }
-
-        public boolean getShowCellBroadcast() {
-            return getBoolean(CONFIG_CELL_BROADCAST_APP_LINKS);
-        }
-
-        public String getNaiSuffix() {
-            return getString(CONFIG_NAI_SUFFIX);
-        }
-
-        public boolean isMmsReadReportsEnabled() {
-            return getBoolean(CONFIG_ENABLE_MMS_READ_REPORTS);
-        }
-
-        public boolean isMmsDeliveryReportsEnabled() {
-            return getBoolean(CONFIG_ENABLE_MMS_DELIVERY_REPORTS);
-        }
-
-        public boolean getSupportHttpCharsetHeader() {
-            return getBoolean(CONFIG_SUPPORT_HTTP_CHARSET_HEADER);
-        }
-
-        /**
-         * Return the HTTP param macro value.
-         * Example: LINE1 returns the phone number, etc.
-         *
-         * @param macro The macro name
-         * @return The value of the defined macro
-         */
-        public String getHttpParamMacro(Context context, String macro) {
-            if (MACRO_LINE1.equals(macro)) {
-                return getLine1(context, mBase.getSubId());
-            } else if (MACRO_LINE1NOCOUNTRYCODE.equals(macro)) {
-                return getLine1NoCountryCode(context, mBase.getSubId());
-            } else if (MACRO_NAI.equals(macro)) {
-                return getNai(context, mBase.getSubId());
-            }
-            return null;
-        }
-
-        /**
-         * @return the phone number
-         */
-        private static String getLine1(Context context, int subId) {
-            final TelephonyManager telephonyManager = (TelephonyManager) context.getSystemService(
-                    Context.TELEPHONY_SERVICE);
-
-            if (Build.VERSION.SDK_INT < Build.VERSION_CODES.LOLLIPOP_MR1) {
-                return telephonyManager.getLine1Number();
-            } else {
-                try {
-                    Method method = telephonyManager.getClass().getMethod("getLine1NumberForSubscriber", int.class);
-                    return (String) method.invoke(telephonyManager, subId);
-                } catch (Exception e) {
-                    return telephonyManager.getLine1Number();
-                }
-            }
-        }
-
-        private static String getLine1NoCountryCode(Context context, int subId) {
-            final TelephonyManager telephonyManager = (TelephonyManager) context.getSystemService(
-                    Context.TELEPHONY_SERVICE);
-            return PhoneUtils.getNationalNumber(
-                    telephonyManager,
-                    subId,
-                    getLine1(context, subId));
-        }
-
-        /**
-         * @return the NAI (Network Access Identifier) from SystemProperties
-         */
-        private String getNai(Context context, int subId) {
-            final TelephonyManager telephonyManager = (TelephonyManager) context.getSystemService(
-                    Context.TELEPHONY_SERVICE);
-
-            String nai = "";
-
-            if (Build.VERSION.SDK_INT < Build.VERSION_CODES.LOLLIPOP_MR1) {
-                nai = SystemPropertiesProxy.get(context, "persist.radio.cdma.nai");
-            } else {
-                try {
-                    Method method = telephonyManager.getClass().getMethod("getNai", int.class);
-                    Method getSlotId = SubscriptionManager.class.getMethod("getSlotId", int.class);
-                    nai = (String) method.invoke(telephonyManager, getSlotId.invoke(null, subId));
-                } catch (Exception e) {
-                    nai = SystemPropertiesProxy.get(context, "persist.radio.cdma.nai");
-                }
-            }
-
-            Timber.v("MmsConfig.getNai: nai=" + nai);
-
-            if (!TextUtils.isEmpty(nai)) {
-                String naiSuffix = getNaiSuffix();
-                if (!TextUtils.isEmpty(naiSuffix)) {
-                    nai = nai + naiSuffix;
-                }
-                byte[] encoded = null;
-                try {
-                    encoded = Base64.encode(nai.getBytes("UTF-8"), Base64.NO_WRAP);
-                } catch (UnsupportedEncodingException e) {
-                    encoded = Base64.encode(nai.getBytes(), Base64.NO_WRAP);
-                }
-                try {
-                    nai = new String(encoded, "UTF-8");
-                } catch (UnsupportedEncodingException e) {
-                    nai = new String(encoded);
-                }
-            }
-            return nai;
-        }
-    }
-}
+/*
+ * Copyright (C) 2015 Jacob Klinker
+ *
+ * Licensed under the Apache License, Version 2.0 (the "License");
+ * you may not use this file except in compliance with the License.
+ * You may obtain a copy of the License at
+ *
+ * http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing, software
+ * distributed under the License is distributed on an "AS IS" BASIS,
+ * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ * See the License for the specific language governing permissions and
+ * limitations under the License.
+ */
+
+package com.android.mms.service_alt;
+
+import android.content.Context;
+import android.content.res.XmlResourceParser;
+import android.os.Build;
+import android.os.Bundle;
+import android.telephony.SubscriptionManager;
+import android.telephony.TelephonyManager;
+import android.text.TextUtils;
+import android.util.Base64;
+import com.klinker.android.send_message.R;
+import timber.log.Timber;
+
+import java.io.UnsupportedEncodingException;
+import java.lang.reflect.Method;
+import java.util.Iterator;
+import java.util.Map;
+import java.util.concurrent.ConcurrentHashMap;
+
+/**
+ * This class manages a cached copy of current MMS configuration key values
+ *
+ * The steps to add a key
+ * 1. Add a String constant for the key
+ * 2. Add a default value for the key by putting a typed value to DEFAULTS
+ *    (null means String type only)
+ * 3. Add a getter for the key
+ * 4. Add key/value for relevant mms_config.xml of a specific carrier (mcc/mnc)
+ */
+public class MmsConfig {
+
+    private static final String DEFAULT_HTTP_KEY_X_WAP_PROFILE = "x-wap-profile";
+
+    private static final int MAX_IMAGE_HEIGHT = 480;
+    private static final int MAX_IMAGE_WIDTH = 640;
+    private static final int MAX_TEXT_LENGTH = 2000;
+
+    /*
+     * MmsConfig keys. These have to stay in sync with the MMS_CONFIG_* values defined in
+     * SmsManager.
+     */
+    public static final String CONFIG_ENABLED_MMS = "enabledMMS";
+    // In case of single segment wap push message, this CONFIG_ENABLED_TRANS_ID indicates whether
+    // TransactionID should be appended to URI or not.
+    public static final String CONFIG_ENABLED_TRANS_ID = "enabledTransID";
+    public static final String CONFIG_ENABLED_NOTIFY_WAP_MMSC = "enabledNotifyWapMMSC";
+    public static final String CONFIG_ALIAS_ENABLED = "aliasEnabled";
+    public static final String CONFIG_ALLOW_ATTACH_AUDIO = "allowAttachAudio";
+    // If CONFIG_ENABLE_MULTIPART_SMS is true, long sms messages are always sent as multi-part sms
+    // messages, with no checked limit on the number of segments.
+    // If CONFIG_ENABLE_MULTIPART_SMS is false, then as soon as the user types a message longer
+    // than a single segment (i.e. 140 chars), then the message will turn into and be sent
+    // as an mms message or separate, independent SMS messages
+    // (which is dependent on CONFIG_SEND_MULTIPART_SMS_AS_SEPARATE_MESSAGES flag).
+    // This feature exists for carriers that don't support multi-part sms's.
+    public static final String CONFIG_ENABLE_MULTIPART_SMS = "enableMultipartSMS";
+    public static final String CONFIG_ENABLE_SMS_DELIVERY_REPORTS = "enableSMSDeliveryReports";
+    // If CONFIG_ENABLE_GROUP_MMS is true, a message with multiple recipients,
+    // regardless of contents, will be sent as a single MMS message with multiple "TO" fields set
+    // for each recipient.
+    // If CONFIG_ENABLE_GROUP_MMS is false, the group MMS setting/preference will be hidden
+    // in the settings activity.
+    public static final String CONFIG_ENABLE_GROUP_MMS = "enableGroupMms";
+    // If this is true, then we should read the content_disposition field of an MMS part
+    // Check wap-230-wsp-20010705-a.pdf, chapter 8.4.2.21
+    // Most carriers support it except Sprint.
+    // There is a system resource defining it:
+    // com.android.internal.R.bool.config_mms_content_disposition_support.
+    // But Shem can not read it. Add here so that we can configure for different carriers.
+    public static final String CONFIG_SUPPORT_MMS_CONTENT_DISPOSITION =
+            "supportMmsContentDisposition";
+    // if true, show the cell broadcast (amber alert) in the SMS settings. Some carriers
+    // don't want this shown.
+    public static final String CONFIG_CELL_BROADCAST_APP_LINKS = "config_cellBroadcastAppLinks";
+    // If this is true, we will send multipart SMS as separate SMS messages
+    public static final String CONFIG_SEND_MULTIPART_SMS_AS_SEPARATE_MESSAGES =
+            "sendMultipartSmsAsSeparateMessages";
+    // FLAG(ywen): the following two is not supported yet.
+    public static final String CONFIG_ENABLE_MMS_READ_REPORTS = "enableMMSReadReports";
+    public static final String CONFIG_ENABLE_MMS_DELIVERY_REPORTS = "enableMMSDeliveryReports";
+    // Bouygues Telecom (20820) MMSC does not support "charset" with "Content-Type" header
+    // It would fail and return 500. See b/18604507
+    // If this is false, then we don't add "charset" to "Content-Type"
+    public static final String CONFIG_SUPPORT_HTTP_CHARSET_HEADER = "supportHttpCharsetHeader";
+    public static final String CONFIG_MAX_MESSAGE_SIZE = "maxMessageSize"; // in bytes
+    public static final String CONFIG_MAX_IMAGE_HEIGHT = "maxImageHeight"; // in pixels
+    public static final String CONFIG_MAX_IMAGE_WIDTH = "maxImageWidth"; // in pixels
+    public static final String CONFIG_RECIPIENT_LIMIT = "recipientLimit";
+    public static final String CONFIG_HTTP_SOCKET_TIMEOUT = "httpSocketTimeout";
+    public static final String CONFIG_ALIAS_MIN_CHARS = "aliasMinChars";
+    public static final String CONFIG_ALIAS_MAX_CHARS = "aliasMaxChars";
+    // If CONFIG_ENABLE_MULTIPART_SMS is true and CONFIG_SMS_TO_MMS_TEXT_THRESHOLD > 1,
+    // then multi-part SMS messages will be converted into a single mms message.
+    // For example, if the mms_config.xml file specifies <int name="smsToMmsTextThreshold">4</int>,
+    // then on the 5th sms segment, the message will be converted to an mms.
+    public static final String CONFIG_SMS_TO_MMS_TEXT_THRESHOLD = "smsToMmsTextThreshold";
+    // LGU+ temporarily requires any SMS message longer than 80 bytes to be sent as MMS
+    // see b/12122333
+    public static final String CONFIG_SMS_TO_MMS_TEXT_LENGTH_THRESHOLD =
+            "smsToMmsTextLengthThreshold";
+    public static final String CONFIG_MAX_MESSAGE_TEXT_SIZE = "maxMessageTextSize";
+    // maximum number of characters allowed for mms subject
+    public static final String CONFIG_MAX_SUBJECT_LENGTH = "maxSubjectLength";
+    public static final String CONFIG_UA_PROF_TAG_NAME = "uaProfTagName";
+    public static final String CONFIG_USER_AGENT = "userAgent";
+    public static final String CONFIG_UA_PROF_URL = "uaProfUrl";
+    public static final String CONFIG_HTTP_PARAMS = "httpParams";
+    // Email gateway alias support, including the master switch and different rules
+    public static final String CONFIG_EMAIL_GATEWAY_NUMBER = "emailGatewayNumber";
+    // String to append to the NAI header, e.g. ":pcs"
+    public static final String CONFIG_NAI_SUFFIX = "naiSuffix";
+
+    /*
+     * Key types
+     */
+    public static final String KEY_TYPE_INT = "int";
+    public static final String KEY_TYPE_BOOL = "bool";
+    public static final String KEY_TYPE_STRING = "string";
+
+    /*
+     * Macro names
+     */
+    // The raw phone number from TelephonyManager.getLine1Number
+    public static final String MACRO_LINE1 = "LINE1";
+    // The phone number without country code
+    public static final String MACRO_LINE1NOCOUNTRYCODE = "LINE1NOCOUNTRYCODE";
+    // NAI (Network Access Identifier), used by Sprint for authentication
+    public static final String MACRO_NAI = "NAI";
+
+    // Default values. This is read-only. Don't write into it.
+    // This provides the info on valid keys, their types and default values
+    private static final Map<String, Object> DEFAULTS = new ConcurrentHashMap<String, Object>();
+    static {
+        DEFAULTS.put(CONFIG_ENABLED_MMS, Boolean.valueOf(true));
+        DEFAULTS.put(CONFIG_ENABLED_TRANS_ID, Boolean.valueOf(false));
+        DEFAULTS.put(CONFIG_ENABLED_NOTIFY_WAP_MMSC, Boolean.valueOf(false));
+        DEFAULTS.put(CONFIG_ALIAS_ENABLED, Boolean.valueOf(false));
+        DEFAULTS.put(CONFIG_ALLOW_ATTACH_AUDIO, Boolean.valueOf(true));
+        DEFAULTS.put(CONFIG_ENABLE_MULTIPART_SMS, Boolean.valueOf(true));
+        DEFAULTS.put(CONFIG_ENABLE_SMS_DELIVERY_REPORTS, Boolean.valueOf(true));
+        DEFAULTS.put(CONFIG_ENABLE_GROUP_MMS, Boolean.valueOf(true));
+        DEFAULTS.put(CONFIG_SUPPORT_MMS_CONTENT_DISPOSITION, Boolean.valueOf(true));
+        DEFAULTS.put(CONFIG_CELL_BROADCAST_APP_LINKS, Boolean.valueOf(true));
+        DEFAULTS.put(CONFIG_SEND_MULTIPART_SMS_AS_SEPARATE_MESSAGES, Boolean.valueOf(false));
+        DEFAULTS.put(CONFIG_ENABLE_MMS_READ_REPORTS, Boolean.valueOf(false));
+        DEFAULTS.put(CONFIG_ENABLE_MMS_DELIVERY_REPORTS, Boolean.valueOf(false));
+        DEFAULTS.put(CONFIG_SUPPORT_HTTP_CHARSET_HEADER, Boolean.valueOf(false));
+        DEFAULTS.put(CONFIG_MAX_MESSAGE_SIZE, Integer.valueOf(300 * 1024));
+        DEFAULTS.put(CONFIG_MAX_IMAGE_HEIGHT, Integer.valueOf(MAX_IMAGE_HEIGHT));
+        DEFAULTS.put(CONFIG_MAX_IMAGE_WIDTH, Integer.valueOf(MAX_IMAGE_WIDTH));
+        DEFAULTS.put(CONFIG_RECIPIENT_LIMIT, Integer.valueOf(Integer.MAX_VALUE));
+        DEFAULTS.put(CONFIG_HTTP_SOCKET_TIMEOUT, Integer.valueOf(60 * 1000));
+        DEFAULTS.put(CONFIG_ALIAS_MIN_CHARS, Integer.valueOf(2));
+        DEFAULTS.put(CONFIG_ALIAS_MAX_CHARS, Integer.valueOf(48));
+        DEFAULTS.put(CONFIG_SMS_TO_MMS_TEXT_THRESHOLD, Integer.valueOf(-1));
+        DEFAULTS.put(CONFIG_SMS_TO_MMS_TEXT_LENGTH_THRESHOLD, Integer.valueOf(-1));
+        DEFAULTS.put(CONFIG_MAX_MESSAGE_TEXT_SIZE, Integer.valueOf(-1));
+        DEFAULTS.put(CONFIG_MAX_SUBJECT_LENGTH, Integer.valueOf(40));
+        DEFAULTS.put(CONFIG_UA_PROF_TAG_NAME, DEFAULT_HTTP_KEY_X_WAP_PROFILE);
+        DEFAULTS.put(CONFIG_USER_AGENT, "");
+        DEFAULTS.put(CONFIG_UA_PROF_URL, "");
+        DEFAULTS.put(CONFIG_HTTP_PARAMS, "");
+        DEFAULTS.put(CONFIG_EMAIL_GATEWAY_NUMBER, "");
+        DEFAULTS.put(CONFIG_NAI_SUFFIX, "");
+    }
+
+    private final int mSubId;
+
+    /**
+     * This class manages a cached copy of current MMS configuration key values for a particular
+     * subscription id. (See the {@link SubscriptionManager}).
+     *
+     * @param context Context of the particular subscription to load. The context's mcc/mnc
+     * should be set to that of the subscription id
+     * @param subId Subscription id of the mcc/mnc in the context
+     */
+    public MmsConfig(Context context, int subId) {
+        mSubId = subId;
+        // Load defaults
+        mKeyValues.clear();
+        mKeyValues.putAll(DEFAULTS);
+        // Load User-Agent and UA profile URL settings
+        loadDeviceUaSettings(context);
+        Timber.v("MmsConfig: mUserAgent=" + mUserAgent + ", mUaProfUrl=" + mUaProfUrl);
+        // Load mms_config.xml resource overlays
+        loadFromResources(context);
+        Timber.v("MmsConfig: all settings -- " + mKeyValues);
+    }
+
+    /**
+     * This class manages a cached copy of current MMS configuration key values for a particular
+     * subscription id. (See the {@link SubscriptionManager}).
+     *
+     * @param context Context of the particular subscription to load. The context's mcc/mnc
+     * should be set to that of the subscription id\
+     */
+    public MmsConfig(Context context) {
+        mSubId = -1;
+        // Load defaults
+        mKeyValues.clear();
+        mKeyValues.putAll(DEFAULTS);
+        // Load User-Agent and UA profile URL settings
+        loadDeviceUaSettings(context);
+        Timber.v("MmsConfig: mUserAgent=" + mUserAgent + ", mUaProfUrl=" + mUaProfUrl);
+        // Load mms_config.xml resource overlays
+        loadFromResources(context);
+        Timber.v("MmsConfig: all settings -- " + mKeyValues);
+    }
+
+    /**
+     * Return the subscription ID associated with this MmsConfig
+     *
+     * @return subId the subId associated with this MmsConfig
+     */
+    public int getSubId() {
+        return mSubId;
+    }
+
+    /**
+     * Check a key and its type match the predefined keys and corresponding types
+     *
+     * @param key
+     * @param type Including "int" "bool" and "string"
+     * @return True if key and type both matches and false otherwise
+     */
+    public static boolean isValidKey(String key, String type) {
+        if (!TextUtils.isEmpty(key) && DEFAULTS.containsKey(key)) {
+            Object defVal = DEFAULTS.get(key);
+            Class<?> valueType = defVal != null ? defVal.getClass() : String.class;
+            if (KEY_TYPE_INT.equals(type)) {
+                return valueType == Integer.class;
+            } else if (KEY_TYPE_BOOL.equals(type)) {
+                return valueType == Boolean.class;
+            } else if (KEY_TYPE_STRING.equals(type)) {
+                return valueType == String.class;
+            }
+        }
+        return false;
+    }
+
+    /**
+     * Check a key and its type match the predefined keys and corresponding types
+     *
+     * @param key The key of the config
+     * @param value The value of the config
+     * @return True if key and type both matches and false otherwise
+     */
+    public static boolean isValidValue(String key, Object value) {
+        if (!TextUtils.isEmpty(key) && DEFAULTS.containsKey(key)) {
+            Object defVal = DEFAULTS.get(key);
+            Class<?> valueType = defVal != null ? defVal.getClass() : String.class;
+            return value.getClass().equals(valueType);
+        }
+        return false;
+    }
+
+    private String mUserAgent = null;
+    private String mUaProfUrl = null;
+
+    // The current values
+    private final Map<String, Object> mKeyValues = new ConcurrentHashMap<String, Object>();
+
+    /**
+     * Get a config value by its type
+     *
+     * @param key The key of the config
+     * @param type The type of the config value
+     * @return The expected typed value or null if no match
+     */
+    public Object getValueAsType(String key, String type) {
+        if (isValidKey(key, type)) {
+            return mKeyValues.get(key);
+        }
+        return null;
+    }
+
+    public Bundle getCarrierConfigValues() {
+        final Bundle bundle = new Bundle();
+        final Iterator<Map.Entry<String, Object>> iter = mKeyValues.entrySet().iterator();
+        while(iter.hasNext()) {
+            final Map.Entry<String, Object> entry = iter.next();
+            final String key = entry.getKey();
+            final Object val = entry.getValue();
+            Class<?> valueType =  val != null ? val.getClass() : String.class;
+            if (valueType == Integer.class) {
+                bundle.putInt(key, (Integer)val);
+            } else if (valueType == Boolean.class) {
+                bundle.putBoolean(key, (Boolean)val);
+            } else if (valueType == String.class) {
+                bundle.putString(key, (String)val);
+            }
+        }
+        return bundle;
+    }
+
+    private String getNullableStringValue(String key) {
+        final Object value = mKeyValues.get(key);
+        if (value != null) {
+            return (String) value;
+        }
+        return null;
+    }
+
+    private void update(String key, String value, String type) {
+        try {
+            if (KEY_TYPE_INT.equals(type)) {
+                mKeyValues.put(key, Integer.parseInt(value));
+            } else if (KEY_TYPE_BOOL.equals(type)) {
+                mKeyValues.put(key, Boolean.parseBoolean(value));
+            } else if (KEY_TYPE_STRING.equals(type)){
+                mKeyValues.put(key, value);
+            }
+        } catch (NumberFormatException e) {
+            Timber.e("MmsConfig.update: invalid " + key + "," + value + "," + type);
+        }
+    }
+
+    private void loadDeviceUaSettings(Context context) {
+        // load the MMS User agent and UaProfUrl from TelephonyManager APIs
+        final TelephonyManager telephonyManager =
+                (TelephonyManager) context.getSystemService(Context.TELEPHONY_SERVICE);
+
+        mUserAgent = telephonyManager.getMmsUserAgent();
+        mUaProfUrl = telephonyManager.getMmsUAProfUrl();
+        // defaults for nexus 6, seems to work well.
+        //mUserAgent = "nexus6";
+        //mUaProfUrl = "http://uaprof.motorola.com/phoneconfig/nexus6/Profile/nexus6.rdf";
+    }
+
+    private void loadFromResources(Context context) {
+        Timber.d("MmsConfig.loadFromResources");
+        final XmlResourceParser parser = context.getResources().getXml(R.xml.mms_config);
+        final MmsConfigXmlProcessor processor = MmsConfigXmlProcessor.get(parser);
+        processor.setMmsConfigHandler(new MmsConfigXmlProcessor.MmsConfigHandler() {
+            @Override
+            public void process(String key, String value, String type) {
+                update(key, value, type);
+            }
+        });
+        try {
+            processor.process();
+        } finally {
+            parser.close();
+        }
+    }
+
+    /**
+     * This class returns corresponding MmsConfig values which can be overridden by
+     * externally provided values.
+     */
+    public static class Overridden {
+        // The base MmsConfig
+        private final MmsConfig mBase;
+        // The overridden values
+        private final Bundle mOverrides;
+
+        public Overridden(MmsConfig base, Bundle overrides) {
+            mBase = base;
+            mOverrides = overrides;
+        }
+
+        private int getInt(String key) {
+            final Integer def = (Integer) mBase.mKeyValues.get(key);
+            return mOverrides != null ? mOverrides.getInt(key, def) : def;
+        }
+
+        private boolean getBoolean(String key) {
+            final Boolean def = (Boolean) mBase.mKeyValues.get(key);
+            return mOverrides != null ? mOverrides.getBoolean(key, def) : def;
+        }
+
+        private String getString(String key) {
+            if (mOverrides != null && mOverrides.containsKey(key)) {
+                return mOverrides.getString(key);
+            }
+            return mBase.getNullableStringValue(key);
+        }
+
+        public int getSmsToMmsTextThreshold() {
+            return getInt(CONFIG_SMS_TO_MMS_TEXT_THRESHOLD);
+        }
+
+        public int getSmsToMmsTextLengthThreshold() {
+            return getInt(CONFIG_SMS_TO_MMS_TEXT_LENGTH_THRESHOLD);
+        }
+
+        public boolean getMmsEnabled() {
+            return getBoolean(CONFIG_ENABLED_MMS);
+        }
+
+        public int getMaxMessageSize() {
+            return getInt(CONFIG_MAX_MESSAGE_SIZE);
+        }
+
+        public boolean getTransIdEnabled() {
+            return getBoolean(CONFIG_ENABLED_TRANS_ID);
+        }
+
+        public String getUserAgent() {
+            if (mOverrides != null && mOverrides.containsKey(CONFIG_USER_AGENT)) {
+                return mOverrides.getString(CONFIG_USER_AGENT);
+            }
+            return !TextUtils.isEmpty(mBase.mUserAgent) ?
+                    mBase.mUserAgent : mBase.getNullableStringValue(CONFIG_USER_AGENT);
+        }
+
+        public String getUaProfTagName() {
+            return getString(CONFIG_UA_PROF_TAG_NAME);
+        }
+
+        public String getUaProfUrl() {
+            if (mOverrides != null && mOverrides.containsKey(CONFIG_UA_PROF_URL)) {
+                return mOverrides.getString(CONFIG_UA_PROF_URL);
+            }
+            return !TextUtils.isEmpty(mBase.mUaProfUrl) ?
+                    mBase.mUaProfUrl : mBase.getNullableStringValue(CONFIG_UA_PROF_URL);
+        }
+
+        public String getHttpParams() {
+            return getString(CONFIG_HTTP_PARAMS);
+        }
+
+        public String getEmailGateway() {
+            return getString(CONFIG_EMAIL_GATEWAY_NUMBER);
+        }
+
+        public int getMaxImageHeight() {
+            return getInt(CONFIG_MAX_IMAGE_HEIGHT);
+        }
+
+        public int getMaxImageWidth() {
+            return getInt(CONFIG_MAX_IMAGE_WIDTH);
+        }
+
+        public int getRecipientLimit() {
+            final int limit = getInt(CONFIG_RECIPIENT_LIMIT);
+            return limit < 0 ? Integer.MAX_VALUE : limit;
+        }
+
+        public int getMaxTextLimit() {
+            final int max = getInt(CONFIG_MAX_MESSAGE_TEXT_SIZE);
+            return max > -1 ? max : MAX_TEXT_LENGTH;
+        }
+
+        public int getHttpSocketTimeout() {
+            return getInt(CONFIG_HTTP_SOCKET_TIMEOUT);
+        }
+
+        public boolean getMultipartSmsEnabled() {
+            return getBoolean(CONFIG_ENABLE_MULTIPART_SMS);
+        }
+
+        public boolean getSendMultipartSmsAsSeparateMessages() {
+            return getBoolean(CONFIG_SEND_MULTIPART_SMS_AS_SEPARATE_MESSAGES);
+        }
+
+        public boolean getSMSDeliveryReportsEnabled() {
+            return getBoolean(CONFIG_ENABLE_SMS_DELIVERY_REPORTS);
+        }
+
+        public boolean getNotifyWapMMSC() {
+            return getBoolean(CONFIG_ENABLED_NOTIFY_WAP_MMSC);
+        }
+
+        public boolean isAliasEnabled() {
+            return getBoolean(CONFIG_ALIAS_ENABLED);
+        }
+
+        public int getAliasMinChars() {
+            return getInt(CONFIG_ALIAS_MIN_CHARS);
+        }
+
+        public int getAliasMaxChars() {
+            return getInt(CONFIG_ALIAS_MAX_CHARS);
+        }
+
+        public boolean getAllowAttachAudio() {
+            return getBoolean(CONFIG_ALLOW_ATTACH_AUDIO);
+        }
+
+        public int getMaxSubjectLength() {
+            return getInt(CONFIG_MAX_SUBJECT_LENGTH);
+        }
+
+        public boolean getGroupMmsEnabled() {
+            return getBoolean(CONFIG_ENABLE_GROUP_MMS);
+        }
+
+        public boolean getSupportMmsContentDisposition() {
+            return getBoolean(CONFIG_SUPPORT_MMS_CONTENT_DISPOSITION);
+        }
+
+        public boolean getShowCellBroadcast() {
+            return getBoolean(CONFIG_CELL_BROADCAST_APP_LINKS);
+        }
+
+        public String getNaiSuffix() {
+            return getString(CONFIG_NAI_SUFFIX);
+        }
+
+        public boolean isMmsReadReportsEnabled() {
+            return getBoolean(CONFIG_ENABLE_MMS_READ_REPORTS);
+        }
+
+        public boolean isMmsDeliveryReportsEnabled() {
+            return getBoolean(CONFIG_ENABLE_MMS_DELIVERY_REPORTS);
+        }
+
+        public boolean getSupportHttpCharsetHeader() {
+            return getBoolean(CONFIG_SUPPORT_HTTP_CHARSET_HEADER);
+        }
+
+        /**
+         * Return the HTTP param macro value.
+         * Example: LINE1 returns the phone number, etc.
+         *
+         * @param macro The macro name
+         * @return The value of the defined macro
+         */
+        public String getHttpParamMacro(Context context, String macro) {
+            if (MACRO_LINE1.equals(macro)) {
+                return getLine1(context, mBase.getSubId());
+            } else if (MACRO_LINE1NOCOUNTRYCODE.equals(macro)) {
+                return getLine1NoCountryCode(context, mBase.getSubId());
+            } else if (MACRO_NAI.equals(macro)) {
+                return getNai(context, mBase.getSubId());
+            }
+            return null;
+        }
+
+        /**
+         * @return the phone number
+         */
+        private static String getLine1(Context context, int subId) {
+            final TelephonyManager telephonyManager = (TelephonyManager) context.getSystemService(
+                    Context.TELEPHONY_SERVICE);
+
+            if (Build.VERSION.SDK_INT < Build.VERSION_CODES.LOLLIPOP_MR1) {
+                return telephonyManager.getLine1Number();
+            } else {
+                try {
+                    Method method = telephonyManager.getClass().getMethod("getLine1NumberForSubscriber", int.class);
+                    return (String) method.invoke(telephonyManager, subId);
+                } catch (Exception e) {
+                    return telephonyManager.getLine1Number();
+                }
+            }
+        }
+
+        private static String getLine1NoCountryCode(Context context, int subId) {
+            final TelephonyManager telephonyManager = (TelephonyManager) context.getSystemService(
+                    Context.TELEPHONY_SERVICE);
+            return PhoneUtils.getNationalNumber(
+                    telephonyManager,
+                    subId,
+                    getLine1(context, subId));
+        }
+
+        /**
+         * @return the NAI (Network Access Identifier) from SystemProperties
+         */
+        private String getNai(Context context, int subId) {
+            final TelephonyManager telephonyManager = (TelephonyManager) context.getSystemService(
+                    Context.TELEPHONY_SERVICE);
+
+            String nai = "";
+
+            if (Build.VERSION.SDK_INT < Build.VERSION_CODES.LOLLIPOP_MR1) {
+                nai = SystemPropertiesProxy.get(context, "persist.radio.cdma.nai");
+            } else {
+                try {
+                    Method method = telephonyManager.getClass().getMethod("getNai", int.class);
+                    Method getSlotId = SubscriptionManager.class.getMethod("getSlotId", int.class);
+                    nai = (String) method.invoke(telephonyManager, getSlotId.invoke(null, subId));
+                } catch (Exception e) {
+                    nai = SystemPropertiesProxy.get(context, "persist.radio.cdma.nai");
+                }
+            }
+
+            Timber.v("MmsConfig.getNai: nai=" + nai);
+
+            if (!TextUtils.isEmpty(nai)) {
+                String naiSuffix = getNaiSuffix();
+                if (!TextUtils.isEmpty(naiSuffix)) {
+                    nai = nai + naiSuffix;
+                }
+                byte[] encoded = null;
+                try {
+                    encoded = Base64.encode(nai.getBytes("UTF-8"), Base64.NO_WRAP);
+                } catch (UnsupportedEncodingException e) {
+                    encoded = Base64.encode(nai.getBytes(), Base64.NO_WRAP);
+                }
+                try {
+                    nai = new String(encoded, "UTF-8");
+                } catch (UnsupportedEncodingException e) {
+                    nai = new String(encoded);
+                }
+            }
+            return nai;
+        }
+    }
+}
diff --git a/android-smsmms/src/main/java/com/android/mms/service_alt/MmsConfigManager.java b/android-smsmms/src/main/java/com/android/mms/service_alt/MmsConfigManager.java
index 1f1aca0ab..faa1464c5 100755
--- a/android-smsmms/src/main/java/com/android/mms/service_alt/MmsConfigManager.java
+++ b/android-smsmms/src/main/java/com/android/mms/service_alt/MmsConfigManager.java
@@ -1,190 +1,190 @@
-/*
- * Copyright (C) 2015 Jacob Klinker
- *
- * Licensed under the Apache License, Version 2.0 (the "License");
- * you may not use this file except in compliance with the License.
- * You may obtain a copy of the License at
- *
- * http://www.apache.org/licenses/LICENSE-2.0
- *
- * Unless required by applicable law or agreed to in writing, software
- * distributed under the License is distributed on an "AS IS" BASIS,
- * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
- * See the License for the specific language governing permissions and
- * limitations under the License.
- */
-
-package com.android.mms.service_alt;
-
-import android.content.BroadcastReceiver;
-import android.content.Context;
-import android.content.Intent;
-import android.content.IntentFilter;
-import android.content.res.Configuration;
-import android.os.Build;
-import android.telephony.SubscriptionInfo;
-import android.telephony.SubscriptionManager;
-import android.util.ArrayMap;
-import timber.log.Timber;
-
-import java.util.List;
-import java.util.Map;
-
-/**
- * This class manages cached copies of all the MMS configuration for each subscription ID.
- * A subscription ID loosely corresponds to a particular SIM. See the
- * {@link SubscriptionManager} for more details.
- *
- */
-public class MmsConfigManager {
-
-    private static volatile MmsConfigManager sInstance = new MmsConfigManager();
-
-    public static MmsConfigManager getInstance() {
-        return sInstance;
-    }
-
-    // Map the various subIds to their corresponding MmsConfigs.
-    private final Map<Integer, MmsConfig> mSubIdConfigMap;
-    private Context mContext;
-    private SubscriptionManager mSubscriptionManager;
-
-    private MmsConfigManager() {
-        mSubIdConfigMap = new ArrayMap<Integer, MmsConfig>();
-    }
-
-    /**
-     * This receiver listens for changes made to SubInfoRecords and for a broadcast telling us
-     * the TelephonyManager has loaded the information needed in order to get the mcc/mnc's for
-     * each subscription Id. When either of these broadcasts are received, we rebuild the
-     * MmsConfig table.
-     */
-    private final BroadcastReceiver mReceiver = new BroadcastReceiver() {
-        public void onReceive(Context context, Intent intent) {
-            String action = intent.getAction();
-            Timber.i("mReceiver action: " + action);
-            if (action.equals("LOADED")) {
-                loadInBackground();
-            }
-        }
-    };
-
-
-    public void init(final Context context) {
-        mContext = context;
-
-        if (Build.VERSION.SDK_INT >= Build.VERSION_CODES.LOLLIPOP_MR1) {
-            mSubscriptionManager = SubscriptionManager.from(context);
-
-            // TODO: When this object "finishes" we should unregister.
-            IntentFilter intentFilterLoaded =
-                    new IntentFilter("LOADED");
-
-            try {
-                context.registerReceiver(mReceiver, intentFilterLoaded);
-            } catch (Exception e) {
-
-            }
-
-            load(context);
-        } else {
-            load(context);
-        }
-
-        // TODO: When this object "finishes" we should unregister by invoking
-        // SubscriptionManager.getInstance(mContext).unregister(mOnSubscriptionsChangedListener);
-        // This is not strictly necessary because it will be unregistered if the
-        // notification fails but it is good form.
-
-        // Register for SubscriptionInfo list changes which is guaranteed
-        // to invoke onSubscriptionsChanged the first time.
-//        SubscriptionManager.from(mContext).addOnSubscriptionsChangedListener(
-//                new OnSubscriptionsChangedListener() {
-//                    @Override
-//                    public void onSubscriptionsChanged() {
-//                        loadInBackground();
-//                    }
-//                });
-    }
-
-    private void loadInBackground() {
-        // TODO (ywen) - AsyncTask to avoid creating a new thread?
-        new Thread() {
-            @Override
-            public void run() {
-                Configuration configuration = mContext.getResources().getConfiguration();
-                // Always put the mnc/mcc in the log so we can tell which mms_config.xml
-                // was loaded.
-                Timber.i("MmsConfigManager.loadInBackground(): mcc/mnc: " +
-                        configuration.mcc + "/" + configuration.mnc);
-                load(mContext);
-            }
-        }.start();
-    }
-
-    /**
-     * Find and return the MmsConfig for a particular subscription id.
-     *
-     * @param subId Subscription id of the desired MmsConfig
-     * @return MmsConfig for the particular subscription id. This function can return null if
-     *         the MmsConfig cannot be found or if this function is called before the
-     *         TelephonyManager has setup the SIMs or if loadInBackground is still spawning a
-     *         thread after a recent LISTEN_SUBSCRIPTION_INFO_LIST_CHANGED event.
-     */
-    public MmsConfig getMmsConfigBySubId(int subId) {
-        MmsConfig mmsConfig;
-        synchronized(mSubIdConfigMap) {
-            mmsConfig = mSubIdConfigMap.get(subId);
-        }
-        Timber.i("getMmsConfigBySubId -- for sub: " + subId + " mmsConfig: " + mmsConfig);
-        return mmsConfig;
-    }
-
-    public MmsConfig getMmsConfig() {
-        return new MmsConfig(mContext);
-    }
-
-    /**
-     * This function goes through all the activated subscription ids (the actual SIMs in the
-     * device), builds a context with that SIM's mcc/mnc and loads the appropriate mms_config.xml
-     * file via the ResourceManager. With single-SIM devices, there will be a single subId.
-     *
-     */
-    private void load(Context context) {
-        if (Build.VERSION.SDK_INT >= Build.VERSION_CODES.LOLLIPOP_MR1) {
-            List<SubscriptionInfo> subs = mSubscriptionManager.getActiveSubscriptionInfoList();
-            if (subs == null || subs.size() < 1) {
-                Timber.e("MmsConfigManager.load -- empty getActiveSubInfoList");
-                return;
-            }
-            // Load all the mms_config.xml files in a separate map and then swap with the
-            // real map at the end so we don't block anyone sync'd on the real map.
-            final Map<Integer, MmsConfig> newConfigMap = new ArrayMap<Integer, MmsConfig>();
-            for (SubscriptionInfo sub : subs) {
-                Configuration configuration = new Configuration();
-                if (sub.getMcc() == 0 && sub.getMnc() == 0) {
-                    Configuration config = mContext.getResources().getConfiguration();
-                    configuration.mcc = config.mcc;
-                    configuration.mnc = config.mnc;
-                    Timber.i("MmsConfigManager.load -- no mcc/mnc for sub: " + sub +
-                            " using mcc/mnc from main context: " + configuration.mcc + "/" +
-                            configuration.mnc);
-                } else {
-                    Timber.i("MmsConfigManager.load -- mcc/mnc for sub: " + sub);
-
-                    configuration.mcc = sub.getMcc();
-                    configuration.mnc = sub.getMnc();
-                }
-                Context subContext = context.createConfigurationContext(configuration);
-
-                int subId = sub.getSubscriptionId();
-                newConfigMap.put(subId, new MmsConfig(subContext, subId));
-            }
-            synchronized (mSubIdConfigMap) {
-                mSubIdConfigMap.clear();
-                mSubIdConfigMap.putAll(newConfigMap);
-            }
-        }
-    }
-
-}
+/*
+ * Copyright (C) 2015 Jacob Klinker
+ *
+ * Licensed under the Apache License, Version 2.0 (the "License");
+ * you may not use this file except in compliance with the License.
+ * You may obtain a copy of the License at
+ *
+ * http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing, software
+ * distributed under the License is distributed on an "AS IS" BASIS,
+ * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ * See the License for the specific language governing permissions and
+ * limitations under the License.
+ */
+
+package com.android.mms.service_alt;
+
+import android.content.BroadcastReceiver;
+import android.content.Context;
+import android.content.Intent;
+import android.content.IntentFilter;
+import android.content.res.Configuration;
+import android.os.Build;
+import android.telephony.SubscriptionInfo;
+import android.telephony.SubscriptionManager;
+import android.util.ArrayMap;
+import timber.log.Timber;
+
+import java.util.List;
+import java.util.Map;
+
+/**
+ * This class manages cached copies of all the MMS configuration for each subscription ID.
+ * A subscription ID loosely corresponds to a particular SIM. See the
+ * {@link SubscriptionManager} for more details.
+ *
+ */
+public class MmsConfigManager {
+
+    private static volatile MmsConfigManager sInstance = new MmsConfigManager();
+
+    public static MmsConfigManager getInstance() {
+        return sInstance;
+    }
+
+    // Map the various subIds to their corresponding MmsConfigs.
+    private final Map<Integer, MmsConfig> mSubIdConfigMap;
+    private Context mContext;
+    private SubscriptionManager mSubscriptionManager;
+
+    private MmsConfigManager() {
+        mSubIdConfigMap = new ArrayMap<Integer, MmsConfig>();
+    }
+
+    /**
+     * This receiver listens for changes made to SubInfoRecords and for a broadcast telling us
+     * the TelephonyManager has loaded the information needed in order to get the mcc/mnc's for
+     * each subscription Id. When either of these broadcasts are received, we rebuild the
+     * MmsConfig table.
+     */
+    private final BroadcastReceiver mReceiver = new BroadcastReceiver() {
+        public void onReceive(Context context, Intent intent) {
+            String action = intent.getAction();
+            Timber.i("mReceiver action: " + action);
+            if (action.equals("LOADED")) {
+                loadInBackground();
+            }
+        }
+    };
+
+
+    public void init(final Context context) {
+        mContext = context;
+
+        if (Build.VERSION.SDK_INT >= Build.VERSION_CODES.LOLLIPOP_MR1) {
+            mSubscriptionManager = SubscriptionManager.from(context);
+
+            // TODO: When this object "finishes" we should unregister.
+            IntentFilter intentFilterLoaded =
+                    new IntentFilter("LOADED");
+
+            try {
+                context.registerReceiver(mReceiver, intentFilterLoaded);
+            } catch (Exception e) {
+
+            }
+
+            load(context);
+        } else {
+            load(context);
+        }
+
+        // TODO: When this object "finishes" we should unregister by invoking
+        // SubscriptionManager.getInstance(mContext).unregister(mOnSubscriptionsChangedListener);
+        // This is not strictly necessary because it will be unregistered if the
+        // notification fails but it is good form.
+
+        // Register for SubscriptionInfo list changes which is guaranteed
+        // to invoke onSubscriptionsChanged the first time.
+//        SubscriptionManager.from(mContext).addOnSubscriptionsChangedListener(
+//                new OnSubscriptionsChangedListener() {
+//                    @Override
+//                    public void onSubscriptionsChanged() {
+//                        loadInBackground();
+//                    }
+//                });
+    }
+
+    private void loadInBackground() {
+        // TODO (ywen) - AsyncTask to avoid creating a new thread?
+        new Thread() {
+            @Override
+            public void run() {
+                Configuration configuration = mContext.getResources().getConfiguration();
+                // Always put the mnc/mcc in the log so we can tell which mms_config.xml
+                // was loaded.
+                Timber.i("MmsConfigManager.loadInBackground(): mcc/mnc: " +
+                        configuration.mcc + "/" + configuration.mnc);
+                load(mContext);
+            }
+        }.start();
+    }
+
+    /**
+     * Find and return the MmsConfig for a particular subscription id.
+     *
+     * @param subId Subscription id of the desired MmsConfig
+     * @return MmsConfig for the particular subscription id. This function can return null if
+     *         the MmsConfig cannot be found or if this function is called before the
+     *         TelephonyManager has setup the SIMs or if loadInBackground is still spawning a
+     *         thread after a recent LISTEN_SUBSCRIPTION_INFO_LIST_CHANGED event.
+     */
+    public MmsConfig getMmsConfigBySubId(int subId) {
+        MmsConfig mmsConfig;
+        synchronized(mSubIdConfigMap) {
+            mmsConfig = mSubIdConfigMap.get(subId);
+        }
+        Timber.i("getMmsConfigBySubId -- for sub: " + subId + " mmsConfig: " + mmsConfig);
+        return mmsConfig;
+    }
+
+    public MmsConfig getMmsConfig() {
+        return new MmsConfig(mContext);
+    }
+
+    /**
+     * This function goes through all the activated subscription ids (the actual SIMs in the
+     * device), builds a context with that SIM's mcc/mnc and loads the appropriate mms_config.xml
+     * file via the ResourceManager. With single-SIM devices, there will be a single subId.
+     *
+     */
+    private void load(Context context) {
+        if (Build.VERSION.SDK_INT >= Build.VERSION_CODES.LOLLIPOP_MR1) {
+            List<SubscriptionInfo> subs = mSubscriptionManager.getActiveSubscriptionInfoList();
+            if (subs == null || subs.size() < 1) {
+                Timber.e("MmsConfigManager.load -- empty getActiveSubInfoList");
+                return;
+            }
+            // Load all the mms_config.xml files in a separate map and then swap with the
+            // real map at the end so we don't block anyone sync'd on the real map.
+            final Map<Integer, MmsConfig> newConfigMap = new ArrayMap<Integer, MmsConfig>();
+            for (SubscriptionInfo sub : subs) {
+                Configuration configuration = new Configuration();
+                if (sub.getMcc() == 0 && sub.getMnc() == 0) {
+                    Configuration config = mContext.getResources().getConfiguration();
+                    configuration.mcc = config.mcc;
+                    configuration.mnc = config.mnc;
+                    Timber.i("MmsConfigManager.load -- no mcc/mnc for sub: " + sub +
+                            " using mcc/mnc from main context: " + configuration.mcc + "/" +
+                            configuration.mnc);
+                } else {
+                    Timber.i("MmsConfigManager.load -- mcc/mnc for sub: " + sub);
+
+                    configuration.mcc = sub.getMcc();
+                    configuration.mnc = sub.getMnc();
+                }
+                Context subContext = context.createConfigurationContext(configuration);
+
+                int subId = sub.getSubscriptionId();
+                newConfigMap.put(subId, new MmsConfig(subContext, subId));
+            }
+            synchronized (mSubIdConfigMap) {
+                mSubIdConfigMap.clear();
+                mSubIdConfigMap.putAll(newConfigMap);
+            }
+        }
+    }
+
+}
diff --git a/android-smsmms/src/main/java/com/android/mms/service_alt/MmsConfigXmlProcessor.java b/android-smsmms/src/main/java/com/android/mms/service_alt/MmsConfigXmlProcessor.java
index b95cd80c6..097f8017f 100755
--- a/android-smsmms/src/main/java/com/android/mms/service_alt/MmsConfigXmlProcessor.java
+++ b/android-smsmms/src/main/java/com/android/mms/service_alt/MmsConfigXmlProcessor.java
@@ -1,195 +1,195 @@
-/*
- * Copyright (C) 2015 Jacob Klinker
- *
- * Licensed under the Apache License, Version 2.0 (the "License");
- * you may not use this file except in compliance with the License.
- * You may obtain a copy of the License at
- *
- * http://www.apache.org/licenses/LICENSE-2.0
- *
- * Unless required by applicable law or agreed to in writing, software
- * distributed under the License is distributed on an "AS IS" BASIS,
- * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
- * See the License for the specific language governing permissions and
- * limitations under the License.
- */
-
-package com.android.mms.service_alt;
-
-import android.content.ContentValues;
-import org.xmlpull.v1.XmlPullParser;
-import org.xmlpull.v1.XmlPullParserException;
-import timber.log.Timber;
-
-import java.io.IOException;
-
-/*
- * XML processor for mms_config.xml
- */
-public class MmsConfigXmlProcessor {
-
-    public interface MmsConfigHandler {
-        public void process(String key, String value, String type);
-    }
-
-    private static final String TAG_MMS_CONFIG = "mms_config";
-
-    // Handler to process one mms_config key/value pair
-    private MmsConfigHandler mMmsConfigHandler;
-
-    private final StringBuilder mLogStringBuilder = new StringBuilder();
-
-    private final XmlPullParser mInputParser;
-
-    private MmsConfigXmlProcessor(XmlPullParser parser) {
-        mInputParser = parser;
-        mMmsConfigHandler = null;
-    }
-
-    public static MmsConfigXmlProcessor get(XmlPullParser parser) {
-        return new MmsConfigXmlProcessor(parser);
-    }
-
-    public MmsConfigXmlProcessor setMmsConfigHandler(MmsConfigHandler handler) {
-        mMmsConfigHandler = handler;
-        return this;
-    }
-
-    /**
-     * Move XML parser forward to next event type or the end of doc
-     *
-     * @param eventType
-     * @return The final event type we meet
-     * @throws XmlPullParserException
-     * @throws IOException
-     */
-    private int advanceToNextEvent(int eventType) throws XmlPullParserException, IOException {
-        for (;;) {
-            int nextEvent = mInputParser.next();
-            if (nextEvent == eventType
-                    || nextEvent == XmlPullParser.END_DOCUMENT) {
-                return nextEvent;
-            }
-        }
-    }
-
-    public void process() {
-        try {
-            // Find the first element
-            if (advanceToNextEvent(XmlPullParser.START_TAG) != XmlPullParser.START_TAG) {
-                throw new XmlPullParserException("MmsConfigXmlProcessor: expecting start tag @"
-                        + xmlParserDebugContext());
-            }
-            // A single ContentValues object for holding the parsing result of
-            // an apn element
-            final ContentValues values = new ContentValues();
-            String tagName = mInputParser.getName();
-            // Top level tag can be "apns" (apns.xml, or APN OTA XML)
-            // or "mms_config" (mms_config.xml)
-            if (TAG_MMS_CONFIG.equals(tagName)) {
-                // mms_config.xml resource
-                processMmsConfig();
-            }
-        } catch (IOException e) {
-            Timber.e(e, "MmsConfigXmlProcessor: I/O failure " + e);
-        } catch (XmlPullParserException e) {
-            Timber.e(e, "MmsConfigXmlProcessor: parsing failure " + e);
-        }
-    }
-
-    private static String xmlParserEventString(int event) {
-        switch (event) {
-            case XmlPullParser.START_DOCUMENT: return "START_DOCUMENT";
-            case XmlPullParser.END_DOCUMENT: return "END_DOCUMENT";
-            case XmlPullParser.START_TAG: return "START_TAG";
-            case XmlPullParser.END_TAG: return "END_TAG";
-            case XmlPullParser.TEXT: return "TEXT";
-        }
-        return Integer.toString(event);
-    }
-
-    /**
-     * @return The debugging information of the parser's current position
-     */
-    private String xmlParserDebugContext() {
-        mLogStringBuilder.setLength(0);
-        if (mInputParser != null) {
-            try {
-                final int eventType = mInputParser.getEventType();
-                mLogStringBuilder.append(xmlParserEventString(eventType));
-                if (eventType == XmlPullParser.START_TAG
-                        || eventType == XmlPullParser.END_TAG
-                        || eventType == XmlPullParser.TEXT) {
-                    mLogStringBuilder.append('<').append(mInputParser.getName());
-                    for (int i = 0; i < mInputParser.getAttributeCount(); i++) {
-                        mLogStringBuilder.append(' ')
-                            .append(mInputParser.getAttributeName(i))
-                            .append('=')
-                            .append(mInputParser.getAttributeValue(i));
-                    }
-                    mLogStringBuilder.append("/>");
-                }
-                return mLogStringBuilder.toString();
-            } catch (XmlPullParserException e) {
-                Timber.e(e, "xmlParserDebugContext: " + e);
-            }
-        }
-        return "Unknown";
-    }
-
-    /**
-     * Process one mms_config.
-     *
-     * @throws IOException
-     * @throws XmlPullParserException
-     */
-    private void processMmsConfig()
-            throws IOException, XmlPullParserException {
-        // We are at the start tag
-        for (;;) {
-            int nextEvent;
-            // Skipping spaces
-            while ((nextEvent = mInputParser.next()) == XmlPullParser.TEXT);
-            if (nextEvent == XmlPullParser.START_TAG) {
-                // Parse one mms config key/value
-                processMmsConfigKeyValue();
-            } else if (nextEvent == XmlPullParser.END_TAG) {
-                break;
-            } else {
-                throw new XmlPullParserException("MmsConfig: expecting start or end tag @"
-                        + xmlParserDebugContext());
-            }
-        }
-    }
-
-    /**
-     * Process one mms_config key/value pair
-     *
-     * @throws IOException
-     * @throws XmlPullParserException
-     */
-    private void processMmsConfigKeyValue() throws IOException, XmlPullParserException {
-        final String key = mInputParser.getAttributeValue(null, "name");
-        // We are at the start tag, the name of the tag is the type
-        // e.g. <int name="key">value</int>
-        final String type = mInputParser.getName();
-        int nextEvent = mInputParser.next();
-        String value = null;
-        if (nextEvent == XmlPullParser.TEXT) {
-            value = mInputParser.getText();
-            nextEvent = mInputParser.next();
-        }
-        if (nextEvent != XmlPullParser.END_TAG) {
-            throw new XmlPullParserException("MmsConfigXmlProcessor: expecting end tag @"
-                    + xmlParserDebugContext());
-        }
-        if (MmsConfig.isValidKey(key, type)) {
-            // We are done parsing one mms_config key/value, call the handler
-            if (mMmsConfigHandler != null) {
-                mMmsConfigHandler.process(key, value, type);
-            }
-        } else {
-            Timber.w("MmsConfig: invalid key=" + key + " or type=" + type);
-        }
-    }
-}
+/*
+ * Copyright (C) 2015 Jacob Klinker
+ *
+ * Licensed under the Apache License, Version 2.0 (the "License");
+ * you may not use this file except in compliance with the License.
+ * You may obtain a copy of the License at
+ *
+ * http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing, software
+ * distributed under the License is distributed on an "AS IS" BASIS,
+ * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ * See the License for the specific language governing permissions and
+ * limitations under the License.
+ */
+
+package com.android.mms.service_alt;
+
+import android.content.ContentValues;
+import org.xmlpull.v1.XmlPullParser;
+import org.xmlpull.v1.XmlPullParserException;
+import timber.log.Timber;
+
+import java.io.IOException;
+
+/*
+ * XML processor for mms_config.xml
+ */
+public class MmsConfigXmlProcessor {
+
+    public interface MmsConfigHandler {
+        public void process(String key, String value, String type);
+    }
+
+    private static final String TAG_MMS_CONFIG = "mms_config";
+
+    // Handler to process one mms_config key/value pair
+    private MmsConfigHandler mMmsConfigHandler;
+
+    private final StringBuilder mLogStringBuilder = new StringBuilder();
+
+    private final XmlPullParser mInputParser;
+
+    private MmsConfigXmlProcessor(XmlPullParser parser) {
+        mInputParser = parser;
+        mMmsConfigHandler = null;
+    }
+
+    public static MmsConfigXmlProcessor get(XmlPullParser parser) {
+        return new MmsConfigXmlProcessor(parser);
+    }
+
+    public MmsConfigXmlProcessor setMmsConfigHandler(MmsConfigHandler handler) {
+        mMmsConfigHandler = handler;
+        return this;
+    }
+
+    /**
+     * Move XML parser forward to next event type or the end of doc
+     *
+     * @param eventType
+     * @return The final event type we meet
+     * @throws XmlPullParserException
+     * @throws IOException
+     */
+    private int advanceToNextEvent(int eventType) throws XmlPullParserException, IOException {
+        for (;;) {
+            int nextEvent = mInputParser.next();
+            if (nextEvent == eventType
+                    || nextEvent == XmlPullParser.END_DOCUMENT) {
+                return nextEvent;
+            }
+        }
+    }
+
+    public void process() {
+        try {
+            // Find the first element
+            if (advanceToNextEvent(XmlPullParser.START_TAG) != XmlPullParser.START_TAG) {
+                throw new XmlPullParserException("MmsConfigXmlProcessor: expecting start tag @"
+                        + xmlParserDebugContext());
+            }
+            // A single ContentValues object for holding the parsing result of
+            // an apn element
+            final ContentValues values = new ContentValues();
+            String tagName = mInputParser.getName();
+            // Top level tag can be "apns" (apns.xml, or APN OTA XML)
+            // or "mms_config" (mms_config.xml)
+            if (TAG_MMS_CONFIG.equals(tagName)) {
+                // mms_config.xml resource
+                processMmsConfig();
+            }
+        } catch (IOException e) {
+            Timber.e(e, "MmsConfigXmlProcessor: I/O failure " + e);
+        } catch (XmlPullParserException e) {
+            Timber.e(e, "MmsConfigXmlProcessor: parsing failure " + e);
+        }
+    }
+
+    private static String xmlParserEventString(int event) {
+        switch (event) {
+            case XmlPullParser.START_DOCUMENT: return "START_DOCUMENT";
+            case XmlPullParser.END_DOCUMENT: return "END_DOCUMENT";
+            case XmlPullParser.START_TAG: return "START_TAG";
+            case XmlPullParser.END_TAG: return "END_TAG";
+            case XmlPullParser.TEXT: return "TEXT";
+        }
+        return Integer.toString(event);
+    }
+
+    /**
+     * @return The debugging information of the parser's current position
+     */
+    private String xmlParserDebugContext() {
+        mLogStringBuilder.setLength(0);
+        if (mInputParser != null) {
+            try {
+                final int eventType = mInputParser.getEventType();
+                mLogStringBuilder.append(xmlParserEventString(eventType));
+                if (eventType == XmlPullParser.START_TAG
+                        || eventType == XmlPullParser.END_TAG
+                        || eventType == XmlPullParser.TEXT) {
+                    mLogStringBuilder.append('<').append(mInputParser.getName());
+                    for (int i = 0; i < mInputParser.getAttributeCount(); i++) {
+                        mLogStringBuilder.append(' ')
+                            .append(mInputParser.getAttributeName(i))
+                            .append('=')
+                            .append(mInputParser.getAttributeValue(i));
+                    }
+                    mLogStringBuilder.append("/>");
+                }
+                return mLogStringBuilder.toString();
+            } catch (XmlPullParserException e) {
+                Timber.e(e, "xmlParserDebugContext: " + e);
+            }
+        }
+        return "Unknown";
+    }
+
+    /**
+     * Process one mms_config.
+     *
+     * @throws IOException
+     * @throws XmlPullParserException
+     */
+    private void processMmsConfig()
+            throws IOException, XmlPullParserException {
+        // We are at the start tag
+        for (;;) {
+            int nextEvent;
+            // Skipping spaces
+            while ((nextEvent = mInputParser.next()) == XmlPullParser.TEXT);
+            if (nextEvent == XmlPullParser.START_TAG) {
+                // Parse one mms config key/value
+                processMmsConfigKeyValue();
+            } else if (nextEvent == XmlPullParser.END_TAG) {
+                break;
+            } else {
+                throw new XmlPullParserException("MmsConfig: expecting start or end tag @"
+                        + xmlParserDebugContext());
+            }
+        }
+    }
+
+    /**
+     * Process one mms_config key/value pair
+     *
+     * @throws IOException
+     * @throws XmlPullParserException
+     */
+    private void processMmsConfigKeyValue() throws IOException, XmlPullParserException {
+        final String key = mInputParser.getAttributeValue(null, "name");
+        // We are at the start tag, the name of the tag is the type
+        // e.g. <int name="key">value</int>
+        final String type = mInputParser.getName();
+        int nextEvent = mInputParser.next();
+        String value = null;
+        if (nextEvent == XmlPullParser.TEXT) {
+            value = mInputParser.getText();
+            nextEvent = mInputParser.next();
+        }
+        if (nextEvent != XmlPullParser.END_TAG) {
+            throw new XmlPullParserException("MmsConfigXmlProcessor: expecting end tag @"
+                    + xmlParserDebugContext());
+        }
+        if (MmsConfig.isValidKey(key, type)) {
+            // We are done parsing one mms_config key/value, call the handler
+            if (mMmsConfigHandler != null) {
+                mMmsConfigHandler.process(key, value, type);
+            }
+        } else {
+            Timber.w("MmsConfig: invalid key=" + key + " or type=" + type);
+        }
+    }
+}
diff --git a/android-smsmms/src/main/java/com/android/mms/service_alt/MmsHttpClient.java b/android-smsmms/src/main/java/com/android/mms/service_alt/MmsHttpClient.java
index aa31f9d8b..16166674a 100755
--- a/android-smsmms/src/main/java/com/android/mms/service_alt/MmsHttpClient.java
+++ b/android-smsmms/src/main/java/com/android/mms/service_alt/MmsHttpClient.java
@@ -1,452 +1,452 @@
-/*
- * Copyright (C) 2015 Jacob Klinker
- *
- * Licensed under the Apache License, Version 2.0 (the "License");
- * you may not use this file except in compliance with the License.
- * You may obtain a copy of the License at
- *
- * http://www.apache.org/licenses/LICENSE-2.0
- *
- * Unless required by applicable law or agreed to in writing, software
- * distributed under the License is distributed on an "AS IS" BASIS,
- * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
- * See the License for the specific language governing permissions and
- * limitations under the License.
- */
-
-package com.android.mms.service_alt;
-
-import android.content.Context;
-import android.text.TextUtils;
-import com.android.mms.service_alt.exception.MmsHttpException;
-import com.squareup.okhttp.ConnectionPool;
-import com.squareup.okhttp.ConnectionSpec;
-import com.squareup.okhttp.OkHttpClient;
-import com.squareup.okhttp.Protocol;
-import com.squareup.okhttp.Request;
-import com.squareup.okhttp.Response;
-import com.squareup.okhttp.internal.Internal;
-import com.squareup.okhttp.internal.huc.HttpURLConnectionImpl;
-import com.squareup.okhttp.internal.huc.HttpsURLConnectionImpl;
-import timber.log.Timber;
-
-import javax.net.SocketFactory;
-import javax.net.ssl.HostnameVerifier;
-import javax.net.ssl.HttpsURLConnection;
-import java.io.BufferedInputStream;
-import java.io.BufferedOutputStream;
-import java.io.ByteArrayOutputStream;
-import java.io.IOException;
-import java.io.InputStream;
-import java.io.OutputStream;
-import java.net.HttpURLConnection;
-import java.net.InetSocketAddress;
-import java.net.MalformedURLException;
-import java.net.ProtocolException;
-import java.net.Proxy;
-import java.net.ProxySelector;
-import java.net.SocketAddress;
-import java.net.URI;
-import java.net.URL;
-import java.util.ArrayList;
-import java.util.Arrays;
-import java.util.List;
-import java.util.Locale;
-import java.util.Map;
-import java.util.regex.Matcher;
-import java.util.regex.Pattern;
-
-/**
- * MMS HTTP client for sending and downloading MMS messages
- */
-public class MmsHttpClient {
-
-    public static final String METHOD_POST = "POST";
-    public static final String METHOD_GET = "GET";
-
-    private static final String HEADER_CONTENT_TYPE = "Content-Type";
-    private static final String HEADER_ACCEPT = "Accept";
-    private static final String HEADER_ACCEPT_LANGUAGE = "Accept-Language";
-    private static final String HEADER_USER_AGENT = "User-Agent";
-
-    // The "Accept" header value
-    private static final String HEADER_VALUE_ACCEPT =
-            "*/*, application/vnd.wap.mms-message, application/vnd.wap.sic";
-    // The "Content-Type" header value
-    private static final String HEADER_VALUE_CONTENT_TYPE_WITH_CHARSET =
-            "application/vnd.wap.mms-message; charset=utf-8";
-    private static final String HEADER_VALUE_CONTENT_TYPE_WITHOUT_CHARSET =
-            "application/vnd.wap.mms-message";
-
-    private final Context mContext;
-    private final SocketFactory mSocketFactory;
-    private final MmsNetworkManager mHostResolver;
-    private final ConnectionPool mConnectionPool;
-
-    /**
-     * Constructor
-     *
-     * @param context The Context object
-     * @param socketFactory The socket factory for creating an OKHttp client
-     * @param hostResolver The host name resolver for creating an OKHttp client
-     * @param connectionPool The connection pool for creating an OKHttp client
-     */
-    public MmsHttpClient(Context context, SocketFactory socketFactory, MmsNetworkManager hostResolver,
-            ConnectionPool connectionPool) {
-        mContext = context;
-        mSocketFactory = socketFactory;
-        mHostResolver = hostResolver;
-        mConnectionPool = connectionPool;
-    }
-
-    /**
-     * Execute an MMS HTTP request, either a POST (sending) or a GET (downloading)
-     *
-     * @param urlString The request URL, for sending it is usually the MMSC, and for downloading
-     *                  it is the message URL
-     * @param pdu For POST (sending) only, the PDU to send
-     * @param method HTTP method, POST for sending and GET for downloading
-     * @param isProxySet Is there a proxy for the MMSC
-     * @param proxyHost The proxy host
-     * @param proxyPort The proxy port
-     * @param mmsConfig The MMS config to use
-     * @return The HTTP response body
-     * @throws MmsHttpException For any failures
-     */
-    public byte[] execute(String urlString, byte[] pdu, String method, boolean isProxySet,
-            String proxyHost, int proxyPort, MmsConfig.Overridden mmsConfig)
-            throws MmsHttpException {
-        Timber.d("HTTP: " + method + " " + urlString
-                + (isProxySet ? (", proxy=" + proxyHost + ":" + proxyPort) : "")
-                + ", PDU size=" + (pdu != null ? pdu.length : 0));
-        checkMethod(method);
-        HttpURLConnection connection = null;
-        try {
-            Proxy proxy = null;
-            if (isProxySet) {
-                proxy = new Proxy(Proxy.Type.HTTP, new InetSocketAddress(proxyHost, proxyPort));
-            }
-            final URL url = new URL(urlString);
-            // Now get the connection
-            connection = openConnection(url, proxy);
-            connection.setDoInput(true);
-            connection.setConnectTimeout(mmsConfig.getHttpSocketTimeout());
-            // ------- COMMON HEADERS ---------
-            // Header: Accept
-            connection.setRequestProperty(HEADER_ACCEPT, HEADER_VALUE_ACCEPT);
-            // Header: Accept-Language
-            connection.setRequestProperty(
-                    HEADER_ACCEPT_LANGUAGE, getCurrentAcceptLanguage(Locale.getDefault()));
-            // Header: User-Agent
-            final String userAgent = mmsConfig.getUserAgent();
-            Timber.i("HTTP: User-Agent=" + userAgent);
-            connection.setRequestProperty(HEADER_USER_AGENT, userAgent);
-            // Header: x-wap-profile
-            final String uaProfUrlTagName = mmsConfig.getUaProfTagName();
-            final String uaProfUrl = mmsConfig.getUaProfUrl();
-            if (uaProfUrl != null) {
-                Timber.i("HTTP: UaProfUrl=" + uaProfUrl);
-                connection.setRequestProperty(uaProfUrlTagName, uaProfUrl);
-            }
-            // Add extra headers specified by mms_config.xml's httpparams
-            addExtraHeaders(connection, mmsConfig);
-            // Different stuff for GET and POST
-            if (METHOD_POST.equals(method)) {
-                if (pdu == null || pdu.length < 1) {
-                    Timber.e("HTTP: empty pdu");
-                    throw new MmsHttpException(0/*statusCode*/, "Sending empty PDU");
-                }
-                connection.setDoOutput(true);
-                connection.setRequestMethod(METHOD_POST);
-                if (mmsConfig.getSupportHttpCharsetHeader()) {
-                    connection.setRequestProperty(HEADER_CONTENT_TYPE,
-                            HEADER_VALUE_CONTENT_TYPE_WITH_CHARSET);
-                } else {
-                    connection.setRequestProperty(HEADER_CONTENT_TYPE,
-                            HEADER_VALUE_CONTENT_TYPE_WITHOUT_CHARSET);
-                }
-                logHttpHeaders(connection.getRequestProperties());
-                connection.setFixedLengthStreamingMode(pdu.length);
-                // Sending request body
-                final OutputStream out = new BufferedOutputStream(connection.getOutputStream());
-                out.write(pdu);
-                out.flush();
-                out.close();
-            } else if (METHOD_GET.equals(method)) {
-                logHttpHeaders(connection.getRequestProperties());
-                connection.setRequestMethod(METHOD_GET);
-            }
-            // Get response
-            final int responseCode = connection.getResponseCode();
-            final String responseMessage = connection.getResponseMessage();
-            Timber.d("HTTP: " + responseCode + " " + responseMessage);
-            logHttpHeaders(connection.getHeaderFields());
-            if (responseCode / 100 != 2) {
-                throw new MmsHttpException(responseCode, responseMessage);
-            }
-            final InputStream in = new BufferedInputStream(connection.getInputStream());
-            final ByteArrayOutputStream byteOut = new ByteArrayOutputStream();
-            final byte[] buf = new byte[4096];
-            int count = 0;
-            while ((count = in.read(buf)) > 0) {
-                byteOut.write(buf, 0, count);
-            }
-            in.close();
-            final byte[] responseBody = byteOut.toByteArray();
-            Timber.d("HTTP: response size="
-                    + (responseBody != null ? responseBody.length : 0));
-            return responseBody;
-        } catch (MalformedURLException e) {
-            Timber.e(e, "HTTP: invalid URL " + urlString);
-            throw new MmsHttpException(0/*statusCode*/, "Invalid URL " + urlString, e);
-        } catch (ProtocolException e) {
-            Timber.e(e, "HTTP: invalid URL protocol " + urlString);
-            throw new MmsHttpException(0/*statusCode*/, "Invalid URL protocol " + urlString, e);
-        } catch (IOException e) {
-            Timber.e(e, "HTTP: IO failure");
-            throw new MmsHttpException(0/*statusCode*/, e);
-        } finally {
-            if (connection != null) {
-                connection.disconnect();
-            }
-        }
-    }
-
-    /**
-     * Open an HTTP connection
-     *
-     * TODO: The following code is borrowed from android.net.Network.openConnection
-     * Once that method supports proxy, we should use that instead
-     * Also we should remove the associated HostResolver and ConnectionPool from
-     * MmsNetworkManager
-     *
-     * @param url The URL to connect to
-     * @param proxy The proxy to use
-     * @return The opened HttpURLConnection
-     * @throws MalformedURLException If URL is malformed
-     */
-    private HttpURLConnection openConnection(URL url, final Proxy proxy) throws MalformedURLException {
-        final String protocol = url.getProtocol();
-        OkHttpClient okHttpClient;
-        if (protocol.equals("http")) {
-            okHttpClient = new OkHttpClient();
-            okHttpClient.setFollowRedirects(false);
-            okHttpClient.setProtocols(Arrays.asList(Protocol.HTTP_1_1));
-            okHttpClient.setProxySelector(new ProxySelector() {
-                @Override
-                public List<Proxy> select(URI uri) {
-                    if (proxy != null) {
-                        return Arrays.asList(proxy);
-                    } else {
-                        return new ArrayList<Proxy>();
-                    }
-                }
-
-                @Override
-                public void connectFailed(URI uri, SocketAddress address, IOException failure) {
-
-                }
-            });
-            okHttpClient.setAuthenticator(new com.squareup.okhttp.Authenticator() {
-                @Override
-                public Request authenticate(Proxy proxy, Response response) throws IOException {
-                    return null;
-                }
-
-                @Override
-                public Request authenticateProxy(Proxy proxy, Response response) throws IOException {
-                    return null;
-                }
-            });
-            okHttpClient.setConnectionSpecs(Arrays.asList(ConnectionSpec.CLEARTEXT));
-            okHttpClient.setConnectionPool(new ConnectionPool(3, 60000));
-            okHttpClient.setSocketFactory(SocketFactory.getDefault());
-            Internal.instance.setNetwork(okHttpClient, mHostResolver);
-
-            if (proxy != null) {
-                okHttpClient.setProxy(proxy);
-            }
-
-            return new HttpURLConnectionImpl(url, okHttpClient);
-        } else if (protocol.equals("https")) {
-            okHttpClient = new OkHttpClient();
-            okHttpClient.setProtocols(Arrays.asList(Protocol.HTTP_1_1));
-            HostnameVerifier verifier = HttpsURLConnection.getDefaultHostnameVerifier();
-            okHttpClient.setHostnameVerifier(verifier);
-            okHttpClient.setSslSocketFactory(HttpsURLConnection.getDefaultSSLSocketFactory());
-            okHttpClient.setProxySelector(new ProxySelector() {
-                @Override
-                public List<Proxy> select(URI uri) {
-                    return Arrays.asList(proxy);
-                }
-
-                @Override
-                public void connectFailed(URI uri, SocketAddress address, IOException failure) {
-
-                }
-            });
-            okHttpClient.setAuthenticator(new com.squareup.okhttp.Authenticator() {
-                @Override
-                public Request authenticate(Proxy proxy, Response response) throws IOException {
-                    return null;
-                }
-
-                @Override
-                public Request authenticateProxy(Proxy proxy, Response response) throws IOException {
-                    return null;
-                }
-            });
-            okHttpClient.setConnectionSpecs(Arrays.asList(ConnectionSpec.CLEARTEXT));
-            okHttpClient.setConnectionPool(new ConnectionPool(3, 60000));
-            Internal.instance.setNetwork(okHttpClient, mHostResolver);
-
-            return new HttpsURLConnectionImpl(url, okHttpClient);
-        } else {
-            throw new MalformedURLException("Invalid URL or unrecognized protocol " + protocol);
-        }
-    }
-
-    private static void logHttpHeaders(Map<String, List<String>> headers) {
-        final StringBuilder sb = new StringBuilder();
-        if (headers != null) {
-            for (Map.Entry<String, List<String>> entry : headers.entrySet()) {
-                final String key = entry.getKey();
-                final List<String> values = entry.getValue();
-                if (values != null) {
-                    for (String value : values) {
-                        sb.append(key).append('=').append(value).append('\n');
-                    }
-                }
-            }
-            Timber.v("HTTP: headers\n" + sb.toString());
-        }
-    }
-
-    private static void checkMethod(String method) throws MmsHttpException {
-        if (!METHOD_GET.equals(method) && !METHOD_POST.equals(method)) {
-            throw new MmsHttpException(0/*statusCode*/, "Invalid method " + method);
-        }
-    }
-
-    private static final String ACCEPT_LANG_FOR_US_LOCALE = "en-US";
-
-    /**
-     * Return the Accept-Language header.  Use the current locale plus
-     * US if we are in a different locale than US.
-     * This code copied from the browser's WebSettings.java
-     *
-     * @return Current AcceptLanguage String.
-     */
-    public static String getCurrentAcceptLanguage(Locale locale) {
-        final StringBuilder buffer = new StringBuilder();
-        addLocaleToHttpAcceptLanguage(buffer, locale);
-
-        if (!Locale.US.equals(locale)) {
-            if (buffer.length() > 0) {
-                buffer.append(", ");
-            }
-            buffer.append(ACCEPT_LANG_FOR_US_LOCALE);
-        }
-
-        return buffer.toString();
-    }
-
-    /**
-     * Convert obsolete language codes, including Hebrew/Indonesian/Yiddish,
-     * to new standard.
-     */
-    private static String convertObsoleteLanguageCodeToNew(String langCode) {
-        if (langCode == null) {
-            return null;
-        }
-        if ("iw".equals(langCode)) {
-            // Hebrew
-            return "he";
-        } else if ("in".equals(langCode)) {
-            // Indonesian
-            return "id";
-        } else if ("ji".equals(langCode)) {
-            // Yiddish
-            return "yi";
-        }
-        return langCode;
-    }
-
-    private static void addLocaleToHttpAcceptLanguage(StringBuilder builder, Locale locale) {
-        final String language = convertObsoleteLanguageCodeToNew(locale.getLanguage());
-        if (language != null) {
-            builder.append(language);
-            final String country = locale.getCountry();
-            if (country != null) {
-                builder.append("-");
-                builder.append(country);
-            }
-        }
-    }
-
-    private static final Pattern MACRO_P = Pattern.compile("##(\\S+)##");
-    /**
-     * Resolve the macro in HTTP param value text
-     * For example, "something##LINE1##something" is resolved to "something9139531419something"
-     *
-     * @param value The HTTP param value possibly containing macros
-     * @return The HTTP param with macro resolved to real value
-     */
-    private static String resolveMacro(Context context, String value,
-            MmsConfig.Overridden mmsConfig) {
-        if (TextUtils.isEmpty(value)) {
-            return value;
-        }
-        final Matcher matcher = MACRO_P.matcher(value);
-        int nextStart = 0;
-        StringBuilder replaced = null;
-        while (matcher.find()) {
-            if (replaced == null) {
-                replaced = new StringBuilder();
-            }
-            final int matchedStart = matcher.start();
-            if (matchedStart > nextStart) {
-                replaced.append(value.substring(nextStart, matchedStart));
-            }
-            final String macro = matcher.group(1);
-            final String macroValue = mmsConfig.getHttpParamMacro(context, macro);
-            if (macroValue != null) {
-                replaced.append(macroValue);
-            } else {
-                Timber.w("HTTP: invalid macro " + macro);
-            }
-            nextStart = matcher.end();
-        }
-        if (replaced != null && nextStart < value.length()) {
-            replaced.append(value.substring(nextStart));
-        }
-        return replaced == null ? value : replaced.toString();
-    }
-
-    /**
-     * Add extra HTTP headers from mms_config.xml's httpParams, which is a list of key/value
-     * pairs separated by "|". Each key/value pair is separated by ":". Value may contain
-     * macros like "##LINE1##" or "##NAI##" which is resolved with methods in this class
-     *
-     * @param connection The HttpURLConnection that we add headers to
-     * @param mmsConfig The MmsConfig object
-     */
-    private void addExtraHeaders(HttpURLConnection connection, MmsConfig.Overridden mmsConfig) {
-        final String extraHttpParams = mmsConfig.getHttpParams();
-        if (!TextUtils.isEmpty(extraHttpParams)) {
-            // Parse the parameter list
-            String paramList[] = extraHttpParams.split("\\|");
-            for (String paramPair : paramList) {
-                String splitPair[] = paramPair.split(":", 2);
-                if (splitPair.length == 2) {
-                    final String name = splitPair[0].trim();
-                    final String value = resolveMacro(mContext, splitPair[1].trim(), mmsConfig);
-                    if (!TextUtils.isEmpty(name) && !TextUtils.isEmpty(value)) {
-                        // Add the header if the param is valid
-                        connection.setRequestProperty(name, value);
-                    }
-                }
-            }
-        }
-    }
-}
+/*
+ * Copyright (C) 2015 Jacob Klinker
+ *
+ * Licensed under the Apache License, Version 2.0 (the "License");
+ * you may not use this file except in compliance with the License.
+ * You may obtain a copy of the License at
+ *
+ * http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing, software
+ * distributed under the License is distributed on an "AS IS" BASIS,
+ * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ * See the License for the specific language governing permissions and
+ * limitations under the License.
+ */
+
+package com.android.mms.service_alt;
+
+import android.content.Context;
+import android.text.TextUtils;
+import com.android.mms.service_alt.exception.MmsHttpException;
+import com.squareup.okhttp.ConnectionPool;
+import com.squareup.okhttp.ConnectionSpec;
+import com.squareup.okhttp.OkHttpClient;
+import com.squareup.okhttp.Protocol;
+import com.squareup.okhttp.Request;
+import com.squareup.okhttp.Response;
+import com.squareup.okhttp.internal.Internal;
+import com.squareup.okhttp.internal.huc.HttpURLConnectionImpl;
+import com.squareup.okhttp.internal.huc.HttpsURLConnectionImpl;
+import timber.log.Timber;
+
+import javax.net.SocketFactory;
+import javax.net.ssl.HostnameVerifier;
+import javax.net.ssl.HttpsURLConnection;
+import java.io.BufferedInputStream;
+import java.io.BufferedOutputStream;
+import java.io.ByteArrayOutputStream;
+import java.io.IOException;
+import java.io.InputStream;
+import java.io.OutputStream;
+import java.net.HttpURLConnection;
+import java.net.InetSocketAddress;
+import java.net.MalformedURLException;
+import java.net.ProtocolException;
+import java.net.Proxy;
+import java.net.ProxySelector;
+import java.net.SocketAddress;
+import java.net.URI;
+import java.net.URL;
+import java.util.ArrayList;
+import java.util.Arrays;
+import java.util.List;
+import java.util.Locale;
+import java.util.Map;
+import java.util.regex.Matcher;
+import java.util.regex.Pattern;
+
+/**
+ * MMS HTTP client for sending and downloading MMS messages
+ */
+public class MmsHttpClient {
+
+    public static final String METHOD_POST = "POST";
+    public static final String METHOD_GET = "GET";
+
+    private static final String HEADER_CONTENT_TYPE = "Content-Type";
+    private static final String HEADER_ACCEPT = "Accept";
+    private static final String HEADER_ACCEPT_LANGUAGE = "Accept-Language";
+    private static final String HEADER_USER_AGENT = "User-Agent";
+
+    // The "Accept" header value
+    private static final String HEADER_VALUE_ACCEPT =
+            "*/*, application/vnd.wap.mms-message, application/vnd.wap.sic";
+    // The "Content-Type" header value
+    private static final String HEADER_VALUE_CONTENT_TYPE_WITH_CHARSET =
+            "application/vnd.wap.mms-message; charset=utf-8";
+    private static final String HEADER_VALUE_CONTENT_TYPE_WITHOUT_CHARSET =
+            "application/vnd.wap.mms-message";
+
+    private final Context mContext;
+    private final SocketFactory mSocketFactory;
+    private final MmsNetworkManager mHostResolver;
+    private final ConnectionPool mConnectionPool;
+
+    /**
+     * Constructor
+     *
+     * @param context The Context object
+     * @param socketFactory The socket factory for creating an OKHttp client
+     * @param hostResolver The host name resolver for creating an OKHttp client
+     * @param connectionPool The connection pool for creating an OKHttp client
+     */
+    public MmsHttpClient(Context context, SocketFactory socketFactory, MmsNetworkManager hostResolver,
+            ConnectionPool connectionPool) {
+        mContext = context;
+        mSocketFactory = socketFactory;
+        mHostResolver = hostResolver;
+        mConnectionPool = connectionPool;
+    }
+
+    /**
+     * Execute an MMS HTTP request, either a POST (sending) or a GET (downloading)
+     *
+     * @param urlString The request URL, for sending it is usually the MMSC, and for downloading
+     *                  it is the message URL
+     * @param pdu For POST (sending) only, the PDU to send
+     * @param method HTTP method, POST for sending and GET for downloading
+     * @param isProxySet Is there a proxy for the MMSC
+     * @param proxyHost The proxy host
+     * @param proxyPort The proxy port
+     * @param mmsConfig The MMS config to use
+     * @return The HTTP response body
+     * @throws MmsHttpException For any failures
+     */
+    public byte[] execute(String urlString, byte[] pdu, String method, boolean isProxySet,
+            String proxyHost, int proxyPort, MmsConfig.Overridden mmsConfig)
+            throws MmsHttpException {
+        Timber.d("HTTP: " + method + " " + urlString
+                + (isProxySet ? (", proxy=" + proxyHost + ":" + proxyPort) : "")
+                + ", PDU size=" + (pdu != null ? pdu.length : 0));
+        checkMethod(method);
+        HttpURLConnection connection = null;
+        try {
+            Proxy proxy = null;
+            if (isProxySet) {
+                proxy = new Proxy(Proxy.Type.HTTP, new InetSocketAddress(proxyHost, proxyPort));
+            }
+            final URL url = new URL(urlString);
+            // Now get the connection
+            connection = openConnection(url, proxy);
+            connection.setDoInput(true);
+            connection.setConnectTimeout(mmsConfig.getHttpSocketTimeout());
+            // ------- COMMON HEADERS ---------
+            // Header: Accept
+            connection.setRequestProperty(HEADER_ACCEPT, HEADER_VALUE_ACCEPT);
+            // Header: Accept-Language
+            connection.setRequestProperty(
+                    HEADER_ACCEPT_LANGUAGE, getCurrentAcceptLanguage(Locale.getDefault()));
+            // Header: User-Agent
+            final String userAgent = mmsConfig.getUserAgent();
+            Timber.i("HTTP: User-Agent=" + userAgent);
+            connection.setRequestProperty(HEADER_USER_AGENT, userAgent);
+            // Header: x-wap-profile
+            final String uaProfUrlTagName = mmsConfig.getUaProfTagName();
+            final String uaProfUrl = mmsConfig.getUaProfUrl();
+            if (uaProfUrl != null) {
+                Timber.i("HTTP: UaProfUrl=" + uaProfUrl);
+                connection.setRequestProperty(uaProfUrlTagName, uaProfUrl);
+            }
+            // Add extra headers specified by mms_config.xml's httpparams
+            addExtraHeaders(connection, mmsConfig);
+            // Different stuff for GET and POST
+            if (METHOD_POST.equals(method)) {
+                if (pdu == null || pdu.length < 1) {
+                    Timber.e("HTTP: empty pdu");
+                    throw new MmsHttpException(0/*statusCode*/, "Sending empty PDU");
+                }
+                connection.setDoOutput(true);
+                connection.setRequestMethod(METHOD_POST);
+                if (mmsConfig.getSupportHttpCharsetHeader()) {
+                    connection.setRequestProperty(HEADER_CONTENT_TYPE,
+                            HEADER_VALUE_CONTENT_TYPE_WITH_CHARSET);
+                } else {
+                    connection.setRequestProperty(HEADER_CONTENT_TYPE,
+                            HEADER_VALUE_CONTENT_TYPE_WITHOUT_CHARSET);
+                }
+                logHttpHeaders(connection.getRequestProperties());
+                connection.setFixedLengthStreamingMode(pdu.length);
+                // Sending request body
+                final OutputStream out = new BufferedOutputStream(connection.getOutputStream());
+                out.write(pdu);
+                out.flush();
+                out.close();
+            } else if (METHOD_GET.equals(method)) {
+                logHttpHeaders(connection.getRequestProperties());
+                connection.setRequestMethod(METHOD_GET);
+            }
+            // Get response
+            final int responseCode = connection.getResponseCode();
+            final String responseMessage = connection.getResponseMessage();
+            Timber.d("HTTP: " + responseCode + " " + responseMessage);
+            logHttpHeaders(connection.getHeaderFields());
+            if (responseCode / 100 != 2) {
+                throw new MmsHttpException(responseCode, responseMessage);
+            }
+            final InputStream in = new BufferedInputStream(connection.getInputStream());
+            final ByteArrayOutputStream byteOut = new ByteArrayOutputStream();
+            final byte[] buf = new byte[4096];
+            int count = 0;
+            while ((count = in.read(buf)) > 0) {
+                byteOut.write(buf, 0, count);
+            }
+            in.close();
+            final byte[] responseBody = byteOut.toByteArray();
+            Timber.d("HTTP: response size="
+                    + (responseBody != null ? responseBody.length : 0));
+            return responseBody;
+        } catch (MalformedURLException e) {
+            Timber.e(e, "HTTP: invalid URL " + urlString);
+            throw new MmsHttpException(0/*statusCode*/, "Invalid URL " + urlString, e);
+        } catch (ProtocolException e) {
+            Timber.e(e, "HTTP: invalid URL protocol " + urlString);
+            throw new MmsHttpException(0/*statusCode*/, "Invalid URL protocol " + urlString, e);
+        } catch (IOException e) {
+            Timber.e(e, "HTTP: IO failure");
+            throw new MmsHttpException(0/*statusCode*/, e);
+        } finally {
+            if (connection != null) {
+                connection.disconnect();
+            }
+        }
+    }
+
+    /**
+     * Open an HTTP connection
+     *
+     * TODO: The following code is borrowed from android.net.Network.openConnection
+     * Once that method supports proxy, we should use that instead
+     * Also we should remove the associated HostResolver and ConnectionPool from
+     * MmsNetworkManager
+     *
+     * @param url The URL to connect to
+     * @param proxy The proxy to use
+     * @return The opened HttpURLConnection
+     * @throws MalformedURLException If URL is malformed
+     */
+    private HttpURLConnection openConnection(URL url, final Proxy proxy) throws MalformedURLException {
+        final String protocol = url.getProtocol();
+        OkHttpClient okHttpClient;
+        if (protocol.equals("http")) {
+            okHttpClient = new OkHttpClient();
+            okHttpClient.setFollowRedirects(false);
+            okHttpClient.setProtocols(Arrays.asList(Protocol.HTTP_1_1));
+            okHttpClient.setProxySelector(new ProxySelector() {
+                @Override
+                public List<Proxy> select(URI uri) {
+                    if (proxy != null) {
+                        return Arrays.asList(proxy);
+                    } else {
+                        return new ArrayList<Proxy>();
+                    }
+                }
+
+                @Override
+                public void connectFailed(URI uri, SocketAddress address, IOException failure) {
+
+                }
+            });
+            okHttpClient.setAuthenticator(new com.squareup.okhttp.Authenticator() {
+                @Override
+                public Request authenticate(Proxy proxy, Response response) throws IOException {
+                    return null;
+                }
+
+                @Override
+                public Request authenticateProxy(Proxy proxy, Response response) throws IOException {
+                    return null;
+                }
+            });
+            okHttpClient.setConnectionSpecs(Arrays.asList(ConnectionSpec.CLEARTEXT));
+            okHttpClient.setConnectionPool(new ConnectionPool(3, 60000));
+            okHttpClient.setSocketFactory(SocketFactory.getDefault());
+            Internal.instance.setNetwork(okHttpClient, mHostResolver);
+
+            if (proxy != null) {
+                okHttpClient.setProxy(proxy);
+            }
+
+            return new HttpURLConnectionImpl(url, okHttpClient);
+        } else if (protocol.equals("https")) {
+            okHttpClient = new OkHttpClient();
+            okHttpClient.setProtocols(Arrays.asList(Protocol.HTTP_1_1));
+            HostnameVerifier verifier = HttpsURLConnection.getDefaultHostnameVerifier();
+            okHttpClient.setHostnameVerifier(verifier);
+            okHttpClient.setSslSocketFactory(HttpsURLConnection.getDefaultSSLSocketFactory());
+            okHttpClient.setProxySelector(new ProxySelector() {
+                @Override
+                public List<Proxy> select(URI uri) {
+                    return Arrays.asList(proxy);
+                }
+
+                @Override
+                public void connectFailed(URI uri, SocketAddress address, IOException failure) {
+
+                }
+            });
+            okHttpClient.setAuthenticator(new com.squareup.okhttp.Authenticator() {
+                @Override
+                public Request authenticate(Proxy proxy, Response response) throws IOException {
+                    return null;
+                }
+
+                @Override
+                public Request authenticateProxy(Proxy proxy, Response response) throws IOException {
+                    return null;
+                }
+            });
+            okHttpClient.setConnectionSpecs(Arrays.asList(ConnectionSpec.CLEARTEXT));
+            okHttpClient.setConnectionPool(new ConnectionPool(3, 60000));
+            Internal.instance.setNetwork(okHttpClient, mHostResolver);
+
+            return new HttpsURLConnectionImpl(url, okHttpClient);
+        } else {
+            throw new MalformedURLException("Invalid URL or unrecognized protocol " + protocol);
+        }
+    }
+
+    private static void logHttpHeaders(Map<String, List<String>> headers) {
+        final StringBuilder sb = new StringBuilder();
+        if (headers != null) {
+            for (Map.Entry<String, List<String>> entry : headers.entrySet()) {
+                final String key = entry.getKey();
+                final List<String> values = entry.getValue();
+                if (values != null) {
+                    for (String value : values) {
+                        sb.append(key).append('=').append(value).append('\n');
+                    }
+                }
+            }
+            Timber.v("HTTP: headers\n" + sb.toString());
+        }
+    }
+
+    private static void checkMethod(String method) throws MmsHttpException {
+        if (!METHOD_GET.equals(method) && !METHOD_POST.equals(method)) {
+            throw new MmsHttpException(0/*statusCode*/, "Invalid method " + method);
+        }
+    }
+
+    private static final String ACCEPT_LANG_FOR_US_LOCALE = "en-US";
+
+    /**
+     * Return the Accept-Language header.  Use the current locale plus
+     * US if we are in a different locale than US.
+     * This code copied from the browser's WebSettings.java
+     *
+     * @return Current AcceptLanguage String.
+     */
+    public static String getCurrentAcceptLanguage(Locale locale) {
+        final StringBuilder buffer = new StringBuilder();
+        addLocaleToHttpAcceptLanguage(buffer, locale);
+
+        if (!Locale.US.equals(locale)) {
+            if (buffer.length() > 0) {
+                buffer.append(", ");
+            }
+            buffer.append(ACCEPT_LANG_FOR_US_LOCALE);
+        }
+
+        return buffer.toString();
+    }
+
+    /**
+     * Convert obsolete language codes, including Hebrew/Indonesian/Yiddish,
+     * to new standard.
+     */
+    private static String convertObsoleteLanguageCodeToNew(String langCode) {
+        if (langCode == null) {
+            return null;
+        }
+        if ("iw".equals(langCode)) {
+            // Hebrew
+            return "he";
+        } else if ("in".equals(langCode)) {
+            // Indonesian
+            return "id";
+        } else if ("ji".equals(langCode)) {
+            // Yiddish
+            return "yi";
+        }
+        return langCode;
+    }
+
+    private static void addLocaleToHttpAcceptLanguage(StringBuilder builder, Locale locale) {
+        final String language = convertObsoleteLanguageCodeToNew(locale.getLanguage());
+        if (language != null) {
+            builder.append(language);
+            final String country = locale.getCountry();
+            if (country != null) {
+                builder.append("-");
+                builder.append(country);
+            }
+        }
+    }
+
+    private static final Pattern MACRO_P = Pattern.compile("##(\\S+)##");
+    /**
+     * Resolve the macro in HTTP param value text
+     * For example, "something##LINE1##something" is resolved to "something9139531419something"
+     *
+     * @param value The HTTP param value possibly containing macros
+     * @return The HTTP param with macro resolved to real value
+     */
+    private static String resolveMacro(Context context, String value,
+            MmsConfig.Overridden mmsConfig) {
+        if (TextUtils.isEmpty(value)) {
+            return value;
+        }
+        final Matcher matcher = MACRO_P.matcher(value);
+        int nextStart = 0;
+        StringBuilder replaced = null;
+        while (matcher.find()) {
+            if (replaced == null) {
+                replaced = new StringBuilder();
+            }
+            final int matchedStart = matcher.start();
+            if (matchedStart > nextStart) {
+                replaced.append(value.substring(nextStart, matchedStart));
+            }
+            final String macro = matcher.group(1);
+            final String macroValue = mmsConfig.getHttpParamMacro(context, macro);
+            if (macroValue != null) {
+                replaced.append(macroValue);
+            } else {
+                Timber.w("HTTP: invalid macro " + macro);
+            }
+            nextStart = matcher.end();
+        }
+        if (replaced != null && nextStart < value.length()) {
+            replaced.append(value.substring(nextStart));
+        }
+        return replaced == null ? value : replaced.toString();
+    }
+
+    /**
+     * Add extra HTTP headers from mms_config.xml's httpParams, which is a list of key/value
+     * pairs separated by "|". Each key/value pair is separated by ":". Value may contain
+     * macros like "##LINE1##" or "##NAI##" which is resolved with methods in this class
+     *
+     * @param connection The HttpURLConnection that we add headers to
+     * @param mmsConfig The MmsConfig object
+     */
+    private void addExtraHeaders(HttpURLConnection connection, MmsConfig.Overridden mmsConfig) {
+        final String extraHttpParams = mmsConfig.getHttpParams();
+        if (!TextUtils.isEmpty(extraHttpParams)) {
+            // Parse the parameter list
+            String paramList[] = extraHttpParams.split("\\|");
+            for (String paramPair : paramList) {
+                String splitPair[] = paramPair.split(":", 2);
+                if (splitPair.length == 2) {
+                    final String name = splitPair[0].trim();
+                    final String value = resolveMacro(mContext, splitPair[1].trim(), mmsConfig);
+                    if (!TextUtils.isEmpty(name) && !TextUtils.isEmpty(value)) {
+                        // Add the header if the param is valid
+                        connection.setRequestProperty(name, value);
+                    }
+                }
+            }
+        }
+    }
+}
diff --git a/android-smsmms/src/main/java/com/android/mms/service_alt/MmsNetworkManager.java b/android-smsmms/src/main/java/com/android/mms/service_alt/MmsNetworkManager.java
index ce3fe460e..12b25f3c9 100755
--- a/android-smsmms/src/main/java/com/android/mms/service_alt/MmsNetworkManager.java
+++ b/android-smsmms/src/main/java/com/android/mms/service_alt/MmsNetworkManager.java
@@ -1,327 +1,327 @@
-/*
- * Copyright (C) 2015 Jacob Klinker
- *
- * Licensed under the Apache License, Version 2.0 (the "License");
- * you may not use this file except in compliance with the License.
- * You may obtain a copy of the License at
- *
- * http://www.apache.org/licenses/LICENSE-2.0
- *
- * Unless required by applicable law or agreed to in writing, software
- * distributed under the License is distributed on an "AS IS" BASIS,
- * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
- * See the License for the specific language governing permissions and
- * limitations under the License.
- */
-
-package com.android.mms.service_alt;
-
-import android.content.Context;
-import android.net.ConnectivityManager;
-import android.net.Network;
-import android.net.NetworkCapabilities;
-import android.net.NetworkInfo;
-import android.net.NetworkRequest;
-import android.net.SSLCertificateSocketFactory;
-import android.os.Build;
-import android.os.SystemClock;
-import com.android.mms.service_alt.exception.MmsNetworkException;
-import com.squareup.okhttp.ConnectionPool;
-import timber.log.Timber;
-
-import java.net.InetAddress;
-import java.net.UnknownHostException;
-
-public class MmsNetworkManager implements com.squareup.okhttp.internal.Network {
-
-    // Timeout used to call ConnectivityManager.requestNetwork
-    private static final int NETWORK_REQUEST_TIMEOUT_MILLIS = 60 * 1000;
-    // Wait timeout for this class, a little bit longer than the above timeout
-    // to make sure we don't bail prematurely
-    private static final int NETWORK_ACQUIRE_TIMEOUT_MILLIS =
-            NETWORK_REQUEST_TIMEOUT_MILLIS + (5 * 1000);
-
-    // Borrowed from {@link android.net.Network}
-    private static final boolean httpKeepAlive =
-            Boolean.parseBoolean(System.getProperty("http.keepAlive", "true"));
-    private static final int httpMaxConnections =
-            httpKeepAlive ? Integer.parseInt(System.getProperty("http.maxConnections", "5")) : 0;
-    private static final long httpKeepAliveDurationMs =
-            Long.parseLong(System.getProperty("http.keepAliveDuration", "300000"));  // 5 minutes.
-
-    private final Context mContext;
-
-    // The requested MMS {@link android.net.Network} we are holding
-    // We need this when we unbind from it. This is also used to indicate if the
-    // MMS network is available.
-    private Network mNetwork;
-    // The current count of MMS requests that require the MMS network
-    // If mMmsRequestCount is 0, we should release the MMS network.
-    private int mMmsRequestCount;
-    // This is really just for using the capability
-    private NetworkRequest mNetworkRequest;
-    // The callback to register when we request MMS network
-    private ConnectivityManager.NetworkCallback mNetworkCallback;
-
-    private volatile ConnectivityManager mConnectivityManager;
-
-    // The OkHttp's ConnectionPool used by the HTTP client associated with this network manager
-    private ConnectionPool mConnectionPool;
-
-    // The MMS HTTP client for this network
-    private MmsHttpClient mMmsHttpClient;
-
-    // The SIM ID which we use to connect
-    private final int mSubId;
-
-    private boolean permissionError = false;
-
-    public MmsNetworkManager(Context context, int subId) {
-        mContext = context;
-        mNetworkCallback = null;
-        mNetwork = null;
-        mMmsRequestCount = 0;
-        mConnectivityManager = null;
-        mConnectionPool = null;
-        mMmsHttpClient = null;
-        mSubId = subId;
-
-        if (!MmsRequest.useWifi(context)) {
-            if (Build.VERSION.SDK_INT >= Build.VERSION_CODES.LOLLIPOP_MR1) {
-                mNetworkRequest = new NetworkRequest.Builder()
-                        .addTransportType(NetworkCapabilities.TRANSPORT_CELLULAR)
-                        .addCapability(NetworkCapabilities.NET_CAPABILITY_MMS)
-                        .setNetworkSpecifier(Integer.toString(mSubId))
-                        .build();
-            } else {
-                mNetworkRequest = new NetworkRequest.Builder()
-                        .addTransportType(NetworkCapabilities.TRANSPORT_CELLULAR)
-                        .addCapability(NetworkCapabilities.NET_CAPABILITY_MMS)
-                        .build();
-            }
-        } else {
-            mNetworkRequest = new NetworkRequest.Builder()
-                    .addCapability(NetworkCapabilities.NET_CAPABILITY_INTERNET)
-                    .build();
-        }
-
-        MmsConfigManager.getInstance().init(context);
-    }
-
-    /**
-     * Acquire the MMS network
-     *
-     * @throws MmsNetworkException if we fail to acquire it
-     */
-    public Network acquireNetwork() throws MmsNetworkException {
-        synchronized (this) {
-            mMmsRequestCount += 1;
-            if (mNetwork != null) {
-                // Already available
-                Timber.d("MmsNetworkManager: already available");
-                return mNetwork;
-            }
-            Timber.d("MmsNetworkManager: start new network request");
-            // Not available, so start a new request
-            newRequest();
-            final long shouldEnd = SystemClock.elapsedRealtime() + NETWORK_ACQUIRE_TIMEOUT_MILLIS;
-            long waitTime = NETWORK_ACQUIRE_TIMEOUT_MILLIS;
-            while (waitTime > 0) {
-                try {
-                    this.wait(waitTime);
-                } catch (InterruptedException e) {
-                    Timber.w("MmsNetworkManager: acquire network wait interrupted");
-                }
-                if (mNetwork != null || permissionError) {
-                    // Success
-                    return mNetwork;
-                }
-                // Calculate remaining waiting time to make sure we wait the full timeout period
-                waitTime = shouldEnd - SystemClock.elapsedRealtime();
-            }
-            // Timed out, so release the request and fail
-            Timber.d("MmsNetworkManager: timed out");
-            releaseRequestLocked(mNetworkCallback);
-            throw new MmsNetworkException("Acquiring network timed out");
-        }
-    }
-
-    /**
-     * Release the MMS network when nobody is holding on to it.
-     */
-    public void releaseNetwork() {
-        synchronized (this) {
-            if (mMmsRequestCount > 0) {
-                mMmsRequestCount -= 1;
-                Timber.d("MmsNetworkManager: release, count=" + mMmsRequestCount);
-                if (mMmsRequestCount < 1) {
-                    releaseRequestLocked(mNetworkCallback);
-                }
-            }
-        }
-    }
-
-    /**
-     * Start a new {@link NetworkRequest} for MMS
-     */
-    private void newRequest() {
-        final ConnectivityManager connectivityManager = getConnectivityManager();
-        mNetworkCallback = new ConnectivityManager.NetworkCallback() {
-
-            @Override
-            public void onAvailable(Network network) {
-                super.onAvailable(network);
-                Timber.d("NetworkCallbackListener.onAvailable: network=" + network);
-                synchronized (MmsNetworkManager.this) {
-                    mNetwork = network;
-                    MmsNetworkManager.this.notifyAll();
-                }
-            }
-
-            @Override
-            public void onLost(Network network) {
-                super.onLost(network);
-                Timber.d("NetworkCallbackListener.onLost: network=" + network);
-                synchronized (MmsNetworkManager.this) {
-                    releaseRequestLocked(this);
-                    MmsNetworkManager.this.notifyAll();
-                }
-            }
-
-//            @Override
-//            public void onUnavailable() {
-//                super.onUnavailable();
-//                Timber.d("NetworkCallbackListener.onUnavailable");
-//                synchronized (MmsNetworkManager.this) {
-//                    releaseRequestLocked(this);
-//                    MmsNetworkManager.this.notifyAll();
-//                }
-//            }
-        };
-
-        try {
-            connectivityManager.requestNetwork(
-                    mNetworkRequest, mNetworkCallback);
-        } catch (SecurityException e) {
-            Timber.e(e, "permission exception... skipping it for testing purposes");
-            permissionError = true;
-        }
-    }
-
-    /**
-     * Release the current {@link NetworkRequest} for MMS
-     *
-     * @param callback the {@link ConnectivityManager.NetworkCallback} to unregister
-     */
-    private void releaseRequestLocked(ConnectivityManager.NetworkCallback callback) {
-        if (callback != null) {
-            final ConnectivityManager connectivityManager = getConnectivityManager();
-
-            try {
-                connectivityManager.unregisterNetworkCallback(callback);
-            } catch (Exception e) {
-                Timber.e(e, "couldn't unregister");
-            }
-        }
-        resetLocked();
-    }
-
-    /**
-     * Reset the state
-     */
-    private void resetLocked() {
-        mNetworkCallback = null;
-        mNetwork = null;
-        mMmsRequestCount = 0;
-        // Currently we follow what android.net.Network does with ConnectionPool,
-        // which is per Network object. So if Network changes, we should clear
-        // out the ConnectionPool and thus the MmsHttpClient (since it is linked
-        // to a specific ConnectionPool).
-        mConnectionPool = null;
-        mMmsHttpClient = null;
-    }
-
-    private static final InetAddress[] EMPTY_ADDRESS_ARRAY = new InetAddress[0];
-
-    @Override
-    public InetAddress[] resolveInetAddresses(String host) throws UnknownHostException {
-        Network network = null;
-        synchronized (this) {
-            if (mNetwork == null) {
-                return EMPTY_ADDRESS_ARRAY;
-            }
-            network = mNetwork;
-        }
-        return network.getAllByName(host);
-    }
-
-    private ConnectivityManager getConnectivityManager() {
-        if (mConnectivityManager == null) {
-            mConnectivityManager = (ConnectivityManager) mContext.getSystemService(
-                    Context.CONNECTIVITY_SERVICE);
-        }
-        return mConnectivityManager;
-    }
-
-    private ConnectionPool getOrCreateConnectionPoolLocked() {
-        if (mConnectionPool == null) {
-            mConnectionPool = new ConnectionPool(httpMaxConnections, httpKeepAliveDurationMs);
-        }
-        return mConnectionPool;
-    }
-
-    /**
-     * Get an MmsHttpClient for the current network
-     *
-     * @return The MmsHttpClient instance
-     */
-    public MmsHttpClient getOrCreateHttpClient() {
-        synchronized (this) {
-            if (mMmsHttpClient == null) {
-                if (mNetwork != null) {
-                    // Create new MmsHttpClient for the current Network
-                    mMmsHttpClient = new MmsHttpClient(
-                            mContext,
-                            mNetwork.getSocketFactory(),
-                            MmsNetworkManager.this,
-                            getOrCreateConnectionPoolLocked());
-                } else if (permissionError) {
-                    mMmsHttpClient = new MmsHttpClient(
-                            mContext,
-                            new SSLCertificateSocketFactory(NETWORK_REQUEST_TIMEOUT_MILLIS),
-                            MmsNetworkManager.this,
-                            getOrCreateConnectionPoolLocked());
-                }
-            }
-            return mMmsHttpClient;
-        }
-    }
-
-    /**
-     * Get the APN name for the active network
-     *
-     * @return The APN name if available, otherwise null
-     */
-    public String getApnName() {
-        Network network = null;
-        synchronized (this) {
-            if (mNetwork == null) {
-                Timber.d("MmsNetworkManager: getApnName: network not available");
-                mNetworkRequest = new NetworkRequest.Builder()
-                        .addCapability(NetworkCapabilities.NET_CAPABILITY_INTERNET)
-                        .build();
-                return null;
-            }
-            network = mNetwork;
-        }
-        String apnName = null;
-        final ConnectivityManager connectivityManager = getConnectivityManager();
-        NetworkInfo mmsNetworkInfo = connectivityManager.getNetworkInfo(network);
-        if (mmsNetworkInfo != null) {
-            apnName = mmsNetworkInfo.getExtraInfo();
-        }
-        Timber.d("MmsNetworkManager: getApnName: " + apnName);
-        return apnName;
-    }
-
-}
+/*
+ * Copyright (C) 2015 Jacob Klinker
+ *
+ * Licensed under the Apache License, Version 2.0 (the "License");
+ * you may not use this file except in compliance with the License.
+ * You may obtain a copy of the License at
+ *
+ * http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing, software
+ * distributed under the License is distributed on an "AS IS" BASIS,
+ * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ * See the License for the specific language governing permissions and
+ * limitations under the License.
+ */
+
+package com.android.mms.service_alt;
+
+import android.content.Context;
+import android.net.ConnectivityManager;
+import android.net.Network;
+import android.net.NetworkCapabilities;
+import android.net.NetworkInfo;
+import android.net.NetworkRequest;
+import android.net.SSLCertificateSocketFactory;
+import android.os.Build;
+import android.os.SystemClock;
+import com.android.mms.service_alt.exception.MmsNetworkException;
+import com.squareup.okhttp.ConnectionPool;
+import timber.log.Timber;
+
+import java.net.InetAddress;
+import java.net.UnknownHostException;
+
+public class MmsNetworkManager implements com.squareup.okhttp.internal.Network {
+
+    // Timeout used to call ConnectivityManager.requestNetwork
+    private static final int NETWORK_REQUEST_TIMEOUT_MILLIS = 60 * 1000;
+    // Wait timeout for this class, a little bit longer than the above timeout
+    // to make sure we don't bail prematurely
+    private static final int NETWORK_ACQUIRE_TIMEOUT_MILLIS =
+            NETWORK_REQUEST_TIMEOUT_MILLIS + (5 * 1000);
+
+    // Borrowed from {@link android.net.Network}
+    private static final boolean httpKeepAlive =
+            Boolean.parseBoolean(System.getProperty("http.keepAlive", "true"));
+    private static final int httpMaxConnections =
+            httpKeepAlive ? Integer.parseInt(System.getProperty("http.maxConnections", "5")) : 0;
+    private static final long httpKeepAliveDurationMs =
+            Long.parseLong(System.getProperty("http.keepAliveDuration", "300000"));  // 5 minutes.
+
+    private final Context mContext;
+
+    // The requested MMS {@link android.net.Network} we are holding
+    // We need this when we unbind from it. This is also used to indicate if the
+    // MMS network is available.
+    private Network mNetwork;
+    // The current count of MMS requests that require the MMS network
+    // If mMmsRequestCount is 0, we should release the MMS network.
+    private int mMmsRequestCount;
+    // This is really just for using the capability
+    private NetworkRequest mNetworkRequest;
+    // The callback to register when we request MMS network
+    private ConnectivityManager.NetworkCallback mNetworkCallback;
+
+    private volatile ConnectivityManager mConnectivityManager;
+
+    // The OkHttp's ConnectionPool used by the HTTP client associated with this network manager
+    private ConnectionPool mConnectionPool;
+
+    // The MMS HTTP client for this network
+    private MmsHttpClient mMmsHttpClient;
+
+    // The SIM ID which we use to connect
+    private final int mSubId;
+
+    private boolean permissionError = false;
+
+    public MmsNetworkManager(Context context, int subId) {
+        mContext = context;
+        mNetworkCallback = null;
+        mNetwork = null;
+        mMmsRequestCount = 0;
+        mConnectivityManager = null;
+        mConnectionPool = null;
+        mMmsHttpClient = null;
+        mSubId = subId;
+
+        if (!MmsRequest.useWifi(context)) {
+            if (Build.VERSION.SDK_INT >= Build.VERSION_CODES.LOLLIPOP_MR1) {
+                mNetworkRequest = new NetworkRequest.Builder()
+                        .addTransportType(NetworkCapabilities.TRANSPORT_CELLULAR)
+                        .addCapability(NetworkCapabilities.NET_CAPABILITY_MMS)
+                        .setNetworkSpecifier(Integer.toString(mSubId))
+                        .build();
+            } else {
+                mNetworkRequest = new NetworkRequest.Builder()
+                        .addTransportType(NetworkCapabilities.TRANSPORT_CELLULAR)
+                        .addCapability(NetworkCapabilities.NET_CAPABILITY_MMS)
+                        .build();
+            }
+        } else {
+            mNetworkRequest = new NetworkRequest.Builder()
+                    .addCapability(NetworkCapabilities.NET_CAPABILITY_INTERNET)
+                    .build();
+        }
+
+        MmsConfigManager.getInstance().init(context);
+    }
+
+    /**
+     * Acquire the MMS network
+     *
+     * @throws MmsNetworkException if we fail to acquire it
+     */
+    public Network acquireNetwork() throws MmsNetworkException {
+        synchronized (this) {
+            mMmsRequestCount += 1;
+            if (mNetwork != null) {
+                // Already available
+                Timber.d("MmsNetworkManager: already available");
+                return mNetwork;
+            }
+            Timber.d("MmsNetworkManager: start new network request");
+            // Not available, so start a new request
+            newRequest();
+            final long shouldEnd = SystemClock.elapsedRealtime() + NETWORK_ACQUIRE_TIMEOUT_MILLIS;
+            long waitTime = NETWORK_ACQUIRE_TIMEOUT_MILLIS;
+            while (waitTime > 0) {
+                try {
+                    this.wait(waitTime);
+                } catch (InterruptedException e) {
+                    Timber.w("MmsNetworkManager: acquire network wait interrupted");
+                }
+                if (mNetwork != null || permissionError) {
+                    // Success
+                    return mNetwork;
+                }
+                // Calculate remaining waiting time to make sure we wait the full timeout period
+                waitTime = shouldEnd - SystemClock.elapsedRealtime();
+            }
+            // Timed out, so release the request and fail
+            Timber.d("MmsNetworkManager: timed out");
+            releaseRequestLocked(mNetworkCallback);
+            throw new MmsNetworkException("Acquiring network timed out");
+        }
+    }
+
+    /**
+     * Release the MMS network when nobody is holding on to it.
+     */
+    public void releaseNetwork() {
+        synchronized (this) {
+            if (mMmsRequestCount > 0) {
+                mMmsRequestCount -= 1;
+                Timber.d("MmsNetworkManager: release, count=" + mMmsRequestCount);
+                if (mMmsRequestCount < 1) {
+                    releaseRequestLocked(mNetworkCallback);
+                }
+            }
+        }
+    }
+
+    /**
+     * Start a new {@link NetworkRequest} for MMS
+     */
+    private void newRequest() {
+        final ConnectivityManager connectivityManager = getConnectivityManager();
+        mNetworkCallback = new ConnectivityManager.NetworkCallback() {
+
+            @Override
+            public void onAvailable(Network network) {
+                super.onAvailable(network);
+                Timber.d("NetworkCallbackListener.onAvailable: network=" + network);
+                synchronized (MmsNetworkManager.this) {
+                    mNetwork = network;
+                    MmsNetworkManager.this.notifyAll();
+                }
+            }
+
+            @Override
+            public void onLost(Network network) {
+                super.onLost(network);
+                Timber.d("NetworkCallbackListener.onLost: network=" + network);
+                synchronized (MmsNetworkManager.this) {
+                    releaseRequestLocked(this);
+                    MmsNetworkManager.this.notifyAll();
+                }
+            }
+
+//            @Override
+//            public void onUnavailable() {
+//                super.onUnavailable();
+//                Timber.d("NetworkCallbackListener.onUnavailable");
+//                synchronized (MmsNetworkManager.this) {
+//                    releaseRequestLocked(this);
+//                    MmsNetworkManager.this.notifyAll();
+//                }
+//            }
+        };
+
+        try {
+            connectivityManager.requestNetwork(
+                    mNetworkRequest, mNetworkCallback);
+        } catch (SecurityException e) {
+            Timber.e(e, "permission exception... skipping it for testing purposes");
+            permissionError = true;
+        }
+    }
+
+    /**
+     * Release the current {@link NetworkRequest} for MMS
+     *
+     * @param callback the {@link ConnectivityManager.NetworkCallback} to unregister
+     */
+    private void releaseRequestLocked(ConnectivityManager.NetworkCallback callback) {
+        if (callback != null) {
+            final ConnectivityManager connectivityManager = getConnectivityManager();
+
+            try {
+                connectivityManager.unregisterNetworkCallback(callback);
+            } catch (Exception e) {
+                Timber.e(e, "couldn't unregister");
+            }
+        }
+        resetLocked();
+    }
+
+    /**
+     * Reset the state
+     */
+    private void resetLocked() {
+        mNetworkCallback = null;
+        mNetwork = null;
+        mMmsRequestCount = 0;
+        // Currently we follow what android.net.Network does with ConnectionPool,
+        // which is per Network object. So if Network changes, we should clear
+        // out the ConnectionPool and thus the MmsHttpClient (since it is linked
+        // to a specific ConnectionPool).
+        mConnectionPool = null;
+        mMmsHttpClient = null;
+    }
+
+    private static final InetAddress[] EMPTY_ADDRESS_ARRAY = new InetAddress[0];
+
+    @Override
+    public InetAddress[] resolveInetAddresses(String host) throws UnknownHostException {
+        Network network = null;
+        synchronized (this) {
+            if (mNetwork == null) {
+                return EMPTY_ADDRESS_ARRAY;
+            }
+            network = mNetwork;
+        }
+        return network.getAllByName(host);
+    }
+
+    private ConnectivityManager getConnectivityManager() {
+        if (mConnectivityManager == null) {
+            mConnectivityManager = (ConnectivityManager) mContext.getSystemService(
+                    Context.CONNECTIVITY_SERVICE);
+        }
+        return mConnectivityManager;
+    }
+
+    private ConnectionPool getOrCreateConnectionPoolLocked() {
+        if (mConnectionPool == null) {
+            mConnectionPool = new ConnectionPool(httpMaxConnections, httpKeepAliveDurationMs);
+        }
+        return mConnectionPool;
+    }
+
+    /**
+     * Get an MmsHttpClient for the current network
+     *
+     * @return The MmsHttpClient instance
+     */
+    public MmsHttpClient getOrCreateHttpClient() {
+        synchronized (this) {
+            if (mMmsHttpClient == null) {
+                if (mNetwork != null) {
+                    // Create new MmsHttpClient for the current Network
+                    mMmsHttpClient = new MmsHttpClient(
+                            mContext,
+                            mNetwork.getSocketFactory(),
+                            MmsNetworkManager.this,
+                            getOrCreateConnectionPoolLocked());
+                } else if (permissionError) {
+                    mMmsHttpClient = new MmsHttpClient(
+                            mContext,
+                            new SSLCertificateSocketFactory(NETWORK_REQUEST_TIMEOUT_MILLIS),
+                            MmsNetworkManager.this,
+                            getOrCreateConnectionPoolLocked());
+                }
+            }
+            return mMmsHttpClient;
+        }
+    }
+
+    /**
+     * Get the APN name for the active network
+     *
+     * @return The APN name if available, otherwise null
+     */
+    public String getApnName() {
+        Network network = null;
+        synchronized (this) {
+            if (mNetwork == null) {
+                Timber.d("MmsNetworkManager: getApnName: network not available");
+                mNetworkRequest = new NetworkRequest.Builder()
+                        .addCapability(NetworkCapabilities.NET_CAPABILITY_INTERNET)
+                        .build();
+                return null;
+            }
+            network = mNetwork;
+        }
+        String apnName = null;
+        final ConnectivityManager connectivityManager = getConnectivityManager();
+        NetworkInfo mmsNetworkInfo = connectivityManager.getNetworkInfo(network);
+        if (mmsNetworkInfo != null) {
+            apnName = mmsNetworkInfo.getExtraInfo();
+        }
+        Timber.d("MmsNetworkManager: getApnName: " + apnName);
+        return apnName;
+    }
+
+}
diff --git a/android-smsmms/src/main/java/com/android/mms/service_alt/MmsRequest.java b/android-smsmms/src/main/java/com/android/mms/service_alt/MmsRequest.java
index 7ba80c072..7ebb76699 100755
--- a/android-smsmms/src/main/java/com/android/mms/service_alt/MmsRequest.java
+++ b/android-smsmms/src/main/java/com/android/mms/service_alt/MmsRequest.java
@@ -1,392 +1,392 @@
-/*
- * Copyright (C) 2015 Jacob Klinker
- *
- * Licensed under the Apache License, Version 2.0 (the "License");
- * you may not use this file except in compliance with the License.
- * You may obtain a copy of the License at
- *
- * http://www.apache.org/licenses/LICENSE-2.0
- *
- * Unless required by applicable law or agreed to in writing, software
- * distributed under the License is distributed on an "AS IS" BASIS,
- * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
- * See the License for the specific language governing permissions and
- * limitations under the License.
- */
-
-package com.android.mms.service_alt;
-
-import android.app.Activity;
-import android.app.PendingIntent;
-import android.content.Context;
-import android.content.Intent;
-import android.net.ConnectivityManager;
-import android.net.NetworkInfo;
-import android.net.Uri;
-import android.net.wifi.WifiManager;
-import android.os.Build;
-import android.os.Bundle;
-import android.provider.Settings;
-import android.service.carrier.CarrierMessagingService;
-import android.telephony.SmsManager;
-import android.telephony.TelephonyManager;
-import com.android.mms.service_alt.exception.ApnException;
-import com.android.mms.service_alt.exception.MmsHttpException;
-import com.klinker.android.send_message.Utils;
-import timber.log.Timber;
-
-/**
- * Base class for MMS requests. This has the common logic of sending/downloading MMS.
- */
-public abstract class MmsRequest {
-
-    private static final int RETRY_TIMES = 3;
-
-    /**
-     * Interface for certain functionalities from MmsService
-     */
-    public static interface RequestManager {
-        /**
-         * Enqueue an MMS request
-         *
-         * @param request the request to enqueue
-         */
-        public void addSimRequest(MmsRequest request);
-
-        /*
-         * @return Whether to auto persist received MMS
-         */
-        public boolean getAutoPersistingPref();
-
-        /**
-         * Read pdu (up to maxSize bytes) from supplied content uri
-         * @param contentUri content uri from which to read
-         * @param maxSize maximum number of bytes to read
-         * @return read pdu (else null in case of error or too big)
-         */
-        public byte[] readPduFromContentUri(final Uri contentUri, final int maxSize);
-
-        /**
-         * Write pdu to supplied content uri
-         * @param contentUri content uri to which bytes should be written
-         * @param pdu pdu bytes to write
-         * @return true in case of success (else false)
-         */
-        public boolean writePduToContentUri(final Uri contentUri, final byte[] pdu);
-    }
-
-    // The reference to the pending requests manager (i.e. the MmsService)
-    protected RequestManager mRequestManager;
-    // The SIM id
-    protected int mSubId;
-    // The creator app
-    protected String mCreator;
-    // MMS config
-    protected MmsConfig.Overridden mMmsConfig;
-    // MMS config overrides
-    protected Bundle mMmsConfigOverrides;
-
-    private boolean mobileDataEnabled;
-
-    public MmsRequest(RequestManager requestManager, int subId, String creator,
-            Bundle configOverrides) {
-        mRequestManager = requestManager;
-        mSubId = subId;
-        mCreator = creator;
-        mMmsConfigOverrides = configOverrides;
-        mMmsConfig = null;
-    }
-
-    public int getSubId() {
-        return mSubId;
-    }
-
-    private boolean ensureMmsConfigLoaded() {
-        if (mMmsConfig == null) {
-            final MmsConfig config;
-            if (Build.VERSION.SDK_INT >= Build.VERSION_CODES.LOLLIPOP_MR1) {
-                // Not yet retrieved from mms config manager. Try getting it.
-                config = MmsConfigManager.getInstance().getMmsConfigBySubId(mSubId);
-            } else {
-                config = MmsConfigManager.getInstance().getMmsConfig();
-            }
-
-            if (config != null) {
-                mMmsConfig = new MmsConfig.Overridden(config, mMmsConfigOverrides);
-            }
-        }
-        return mMmsConfig != null;
-    }
-
-    private static boolean inAirplaneMode(final Context context) {
-        return Settings.System.getInt(context.getContentResolver(),
-                Settings.Global.AIRPLANE_MODE_ON, 0) != 0;
-    }
-
-    private static boolean isMobileDataEnabled(final Context context, final int subId) {
-        final TelephonyManager telephonyManager =
-                (TelephonyManager) context.getSystemService(Context.TELEPHONY_SERVICE);
-        return Utils.isDataEnabled(telephonyManager, subId);
-    }
-
-    private static boolean isDataNetworkAvailable(final Context context, final int subId) {
-        return !inAirplaneMode(context) && isMobileDataEnabled(context, subId);
-    }
-
-    /**
-     * Execute the request
-     *
-     * @param context The context
-     * @param networkManager The network manager to use
-     */
-    public void execute(Context context, MmsNetworkManager networkManager) {
-        int result = SmsManager.MMS_ERROR_UNSPECIFIED;
-        int httpStatusCode = 0;
-        byte[] response = null;
-
-        WifiManager wifi = (WifiManager) context.getSystemService(Context.WIFI_SERVICE);
-        boolean isWifiEnabled = wifi.isWifiEnabled();
-
-        if (!useWifi(context)) {
-            wifi.setWifiEnabled(false);
-        }
-
-        mobileDataEnabled = Utils.isMobileDataEnabled(context);
-        Timber.v("mobile data enabled: " + mobileDataEnabled);
-
-        if (!mobileDataEnabled && !useWifi(context)) {
-            Timber.v("mobile data not enabled, so forcing it to enable");
-            Utils.setMobileDataEnabled(context, true);
-        }
-
-        if (!ensureMmsConfigLoaded()) { // Check mms config
-            Timber.e("MmsRequest: mms config is not loaded yet");
-            result = SmsManager.MMS_ERROR_CONFIGURATION_ERROR;
-        } else if (!prepareForHttpRequest()) { // Prepare request, like reading pdu data from user
-            Timber.e("MmsRequest: failed to prepare for request");
-            result = SmsManager.MMS_ERROR_IO_ERROR;
-        } else if (!isDataNetworkAvailable(context, mSubId)) {
-            Timber.e("MmsRequest: in airplane mode or mobile data disabled");
-            if (Build.VERSION.SDK_INT >= Build.VERSION_CODES.LOLLIPOP_MR1) {
-                result = SmsManager.MMS_ERROR_NO_DATA_NETWORK;
-            } else {
-                result = 8;
-            }
-        } else { // Execute
-            long retryDelaySecs = 2;
-            // Try multiple times of MMS HTTP request
-            for (int i = 0; i < RETRY_TIMES; i++) {
-                try {
-                    try {
-                        networkManager.acquireNetwork();
-                    } catch (Exception e) {
-                        Timber.e(e, "error acquiring network");
-                    }
-
-                    final String apnName = networkManager.getApnName();
-                    try {
-                        ApnSettings apn = null;
-                        try {
-                            apn = ApnSettings.load(context, apnName, mSubId);
-                        } catch (ApnException e) {
-                            // If no APN could be found, fall back to trying without the APN name
-                            if (apnName == null) {
-                                // If the APN name was already null then don't need to retry
-                                throw (e);
-                            }
-                            Timber.i("MmsRequest: No match with APN name:"
-                                    + apnName + ", try with no name");
-                            apn = ApnSettings.load(context, null, mSubId);
-                        }
-                        Timber.i("MmsRequest: using " + apn.toString());
-                        response = doHttp(context, networkManager, apn);
-                        result = Activity.RESULT_OK;
-                        // Success
-                        break;
-                    } finally {
-                        networkManager.releaseNetwork();
-                    }
-                } catch (ApnException e) {
-                    Timber.e(e, "MmsRequest: APN failure");
-                    result = SmsManager.MMS_ERROR_INVALID_APN;
-                    break;
-//                    } catch (MmsNetworkException e) {
-//                        Timber.e(e, "MmsRequest: MMS network acquiring failure");
-//                        result = SmsManager.MMS_ERROR_UNABLE_CONNECT_MMS;
-//                        // Retry
-                } catch (MmsHttpException e) {
-                    Timber.e(e, "MmsRequest: HTTP or network I/O failure");
-                    result = SmsManager.MMS_ERROR_HTTP_FAILURE;
-                    httpStatusCode = e.getStatusCode();
-                    // Retry
-                } catch (Exception e) {
-                    Timber.e(e, "MmsRequest: unexpected failure");
-                    result = SmsManager.MMS_ERROR_UNSPECIFIED;
-                    break;
-                }
-                try {
-                    Thread.sleep(retryDelaySecs * 1000, 0/*nano*/);
-                } catch (InterruptedException e) {
-                }
-                retryDelaySecs <<= 1;
-            }
-        }
-
-        if (!mobileDataEnabled) {
-            Timber.v("setting mobile data back to disabled");
-            Utils.setMobileDataEnabled(context, false);
-        }
-
-        if (!useWifi(context)) {
-            wifi.setWifiEnabled(isWifiEnabled);
-        }
-
-        processResult(context, result, response, httpStatusCode);
-    }
-
-    /**
-     * Process the result of the completed request, including updating the message status
-     * in database and sending back the result via pending intents.
-     *  @param context The context
-     * @param result The result code of execution
-     * @param response The response body
-     * @param httpStatusCode The optional http status code in case of http failure
-     */
-    public void processResult(Context context, int result, byte[] response, int httpStatusCode) {
-        final Uri messageUri = persistIfRequired(context, result, response);
-
-        // Return MMS HTTP request result via PendingIntent
-        final PendingIntent pendingIntent = getPendingIntent();
-        if (pendingIntent != null) {
-            boolean succeeded = true;
-            // Extra information to send back with the pending intent
-            Intent fillIn = new Intent();
-            if (response != null) {
-                succeeded = transferResponse(fillIn, response);
-            }
-            if (messageUri != null) {
-                fillIn.putExtra("uri", messageUri.toString());
-            }
-            if (result == SmsManager.MMS_ERROR_HTTP_FAILURE && httpStatusCode != 0) {
-                if (Build.VERSION.SDK_INT >= Build.VERSION_CODES.LOLLIPOP_MR1) {
-                    fillIn.putExtra(SmsManager.EXTRA_MMS_HTTP_STATUS, httpStatusCode);
-                } else {
-                    fillIn.putExtra("android.telephony.extra.MMS_HTTP_STATUS", httpStatusCode);
-                }
-            }
-            try {
-                if (!succeeded) {
-                    result = SmsManager.MMS_ERROR_IO_ERROR;
-                }
-                pendingIntent.send(context, result, fillIn);
-            } catch (PendingIntent.CanceledException e) {
-                Timber.e(e, "MmsRequest: sending pending intent canceled");
-            }
-        }
-
-        revokeUriPermission(context);
-    }
-
-    /**
-     * are we set up to use wifi? if so, send mms over it.
-     */
-    public static boolean useWifi(Context context) {
-        if (Utils.isMmsOverWifiEnabled(context)) {
-            ConnectivityManager mConnMgr = (ConnectivityManager) context.getSystemService(Context.CONNECTIVITY_SERVICE);
-            if (mConnMgr != null) {
-                NetworkInfo niWF = mConnMgr.getNetworkInfo(ConnectivityManager.TYPE_WIFI);
-                if ((niWF != null) && (niWF.isConnected())) {
-                    return true;
-                }
-            }
-        }
-        return false;
-    }
-
-    /**
-     * Returns true if sending / downloading using the carrier app has failed and completes the
-     * action using platform API's, otherwise false.
-     */
-    protected boolean maybeFallbackToRegularDelivery(int carrierMessagingAppResult) {
-        if (carrierMessagingAppResult
-                == CarrierMessagingService.SEND_STATUS_RETRY_ON_CARRIER_NETWORK
-                || carrierMessagingAppResult
-                        == CarrierMessagingService.DOWNLOAD_STATUS_RETRY_ON_CARRIER_NETWORK) {
-            Timber.d("Sending/downloading MMS by IP failed.");
-            mRequestManager.addSimRequest(MmsRequest.this);
-            return true;
-        } else {
-            return false;
-        }
-    }
-
-    /**
-     * Converts from {@code carrierMessagingAppResult} to a platform result code.
-     */
-    protected static int toSmsManagerResult(int carrierMessagingAppResult) {
-        switch (carrierMessagingAppResult) {
-            case CarrierMessagingService.SEND_STATUS_OK:
-                return Activity.RESULT_OK;
-            case CarrierMessagingService.SEND_STATUS_RETRY_ON_CARRIER_NETWORK:
-                return SmsManager.MMS_ERROR_RETRY;
-            default:
-                return SmsManager.MMS_ERROR_UNSPECIFIED;
-        }
-    }
-
-    /**
-     * Making the HTTP request to MMSC
-     *
-     * @param context The context
-     * @param netMgr The current {@link MmsNetworkManager}
-     * @param apn The APN setting
-     * @return The HTTP response data
-     * @throws MmsHttpException If any network error happens
-     */
-    protected abstract byte[] doHttp(Context context, MmsNetworkManager netMgr, ApnSettings apn)
-            throws MmsHttpException;
-
-    /**
-     * @return The PendingIntent associate with the MMS sending invocation
-     */
-    protected abstract PendingIntent getPendingIntent();
-
-    /**
-     * @return The queue should be used by this request, 0 is sending and 1 is downloading
-     */
-    protected abstract int getQueueType();
-
-    /**
-     * Persist message into telephony if required (i.e. when auto-persisting is on or
-     * the calling app is non-default sms app for sending)
-     *
-     * @param context The context
-     * @param result The result code of execution
-     * @param response The response body
-     * @return The persisted URI of the message or null if we don't persist or fail
-     */
-    protected abstract Uri persistIfRequired(Context context, int result, byte[] response);
-
-    /**
-     * Prepare to make the HTTP request - will download message for sending
-     * @return true if preparation succeeds (and request can proceed) else false
-     */
-    protected abstract boolean prepareForHttpRequest();
-
-    /**
-     * Transfer the received response to the caller
-     *
-     * @param fillIn the intent that will be returned to the caller
-     * @param response the pdu to transfer
-     * @return true if response transfer succeeds else false
-     */
-    protected abstract boolean transferResponse(Intent fillIn, byte[] response);
-
-    /**
-     * Revoke the content URI permission granted by the MMS app to the phone package.
-     *
-     * @param context The context
-     */
-    protected abstract void revokeUriPermission(Context context);
-
-}
+/*
+ * Copyright (C) 2015 Jacob Klinker
+ *
+ * Licensed under the Apache License, Version 2.0 (the "License");
+ * you may not use this file except in compliance with the License.
+ * You may obtain a copy of the License at
+ *
+ * http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing, software
+ * distributed under the License is distributed on an "AS IS" BASIS,
+ * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ * See the License for the specific language governing permissions and
+ * limitations under the License.
+ */
+
+package com.android.mms.service_alt;
+
+import android.app.Activity;
+import android.app.PendingIntent;
+import android.content.Context;
+import android.content.Intent;
+import android.net.ConnectivityManager;
+import android.net.NetworkInfo;
+import android.net.Uri;
+import android.net.wifi.WifiManager;
+import android.os.Build;
+import android.os.Bundle;
+import android.provider.Settings;
+import android.service.carrier.CarrierMessagingService;
+import android.telephony.SmsManager;
+import android.telephony.TelephonyManager;
+import com.android.mms.service_alt.exception.ApnException;
+import com.android.mms.service_alt.exception.MmsHttpException;
+import com.klinker.android.send_message.Utils;
+import timber.log.Timber;
+
+/**
+ * Base class for MMS requests. This has the common logic of sending/downloading MMS.
+ */
+public abstract class MmsRequest {
+
+    private static final int RETRY_TIMES = 3;
+
+    /**
+     * Interface for certain functionalities from MmsService
+     */
+    public static interface RequestManager {
+        /**
+         * Enqueue an MMS request
+         *
+         * @param request the request to enqueue
+         */
+        public void addSimRequest(MmsRequest request);
+
+        /*
+         * @return Whether to auto persist received MMS
+         */
+        public boolean getAutoPersistingPref();
+
+        /**
+         * Read pdu (up to maxSize bytes) from supplied content uri
+         * @param contentUri content uri from which to read
+         * @param maxSize maximum number of bytes to read
+         * @return read pdu (else null in case of error or too big)
+         */
+        public byte[] readPduFromContentUri(final Uri contentUri, final int maxSize);
+
+        /**
+         * Write pdu to supplied content uri
+         * @param contentUri content uri to which bytes should be written
+         * @param pdu pdu bytes to write
+         * @return true in case of success (else false)
+         */
+        public boolean writePduToContentUri(final Uri contentUri, final byte[] pdu);
+    }
+
+    // The reference to the pending requests manager (i.e. the MmsService)
+    protected RequestManager mRequestManager;
+    // The SIM id
+    protected int mSubId;
+    // The creator app
+    protected String mCreator;
+    // MMS config
+    protected MmsConfig.Overridden mMmsConfig;
+    // MMS config overrides
+    protected Bundle mMmsConfigOverrides;
+
+    private boolean mobileDataEnabled;
+
+    public MmsRequest(RequestManager requestManager, int subId, String creator,
+            Bundle configOverrides) {
+        mRequestManager = requestManager;
+        mSubId = subId;
+        mCreator = creator;
+        mMmsConfigOverrides = configOverrides;
+        mMmsConfig = null;
+    }
+
+    public int getSubId() {
+        return mSubId;
+    }
+
+    private boolean ensureMmsConfigLoaded() {
+        if (mMmsConfig == null) {
+            final MmsConfig config;
+            if (Build.VERSION.SDK_INT >= Build.VERSION_CODES.LOLLIPOP_MR1) {
+                // Not yet retrieved from mms config manager. Try getting it.
+                config = MmsConfigManager.getInstance().getMmsConfigBySubId(mSubId);
+            } else {
+                config = MmsConfigManager.getInstance().getMmsConfig();
+            }
+
+            if (config != null) {
+                mMmsConfig = new MmsConfig.Overridden(config, mMmsConfigOverrides);
+            }
+        }
+        return mMmsConfig != null;
+    }
+
+    private static boolean inAirplaneMode(final Context context) {
+        return Settings.System.getInt(context.getContentResolver(),
+                Settings.Global.AIRPLANE_MODE_ON, 0) != 0;
+    }
+
+    private static boolean isMobileDataEnabled(final Context context, final int subId) {
+        final TelephonyManager telephonyManager =
+                (TelephonyManager) context.getSystemService(Context.TELEPHONY_SERVICE);
+        return Utils.isDataEnabled(telephonyManager, subId);
+    }
+
+    private static boolean isDataNetworkAvailable(final Context context, final int subId) {
+        return !inAirplaneMode(context) && isMobileDataEnabled(context, subId);
+    }
+
+    /**
+     * Execute the request
+     *
+     * @param context The context
+     * @param networkManager The network manager to use
+     */
+    public void execute(Context context, MmsNetworkManager networkManager) {
+        int result = SmsManager.MMS_ERROR_UNSPECIFIED;
+        int httpStatusCode = 0;
+        byte[] response = null;
+
+        WifiManager wifi = (WifiManager) context.getSystemService(Context.WIFI_SERVICE);
+        boolean isWifiEnabled = wifi.isWifiEnabled();
+
+        if (!useWifi(context)) {
+            wifi.setWifiEnabled(false);
+        }
+
+        mobileDataEnabled = Utils.isMobileDataEnabled(context);
+        Timber.v("mobile data enabled: " + mobileDataEnabled);
+
+        if (!mobileDataEnabled && !useWifi(context)) {
+            Timber.v("mobile data not enabled, so forcing it to enable");
+            Utils.setMobileDataEnabled(context, true);
+        }
+
+        if (!ensureMmsConfigLoaded()) { // Check mms config
+            Timber.e("MmsRequest: mms config is not loaded yet");
+            result = SmsManager.MMS_ERROR_CONFIGURATION_ERROR;
+        } else if (!prepareForHttpRequest()) { // Prepare request, like reading pdu data from user
+            Timber.e("MmsRequest: failed to prepare for request");
+            result = SmsManager.MMS_ERROR_IO_ERROR;
+        } else if (!isDataNetworkAvailable(context, mSubId)) {
+            Timber.e("MmsRequest: in airplane mode or mobile data disabled");
+            if (Build.VERSION.SDK_INT >= Build.VERSION_CODES.LOLLIPOP_MR1) {
+                result = SmsManager.MMS_ERROR_NO_DATA_NETWORK;
+            } else {
+                result = 8;
+            }
+        } else { // Execute
+            long retryDelaySecs = 2;
+            // Try multiple times of MMS HTTP request
+            for (int i = 0; i < RETRY_TIMES; i++) {
+                try {
+                    try {
+                        networkManager.acquireNetwork();
+                    } catch (Exception e) {
+                        Timber.e(e, "error acquiring network");
+                    }
+
+                    final String apnName = networkManager.getApnName();
+                    try {
+                        ApnSettings apn = null;
+                        try {
+                            apn = ApnSettings.load(context, apnName, mSubId);
+                        } catch (ApnException e) {
+                            // If no APN could be found, fall back to trying without the APN name
+                            if (apnName == null) {
+                                // If the APN name was already null then don't need to retry
+                                throw (e);
+                            }
+                            Timber.i("MmsRequest: No match with APN name:"
+                                    + apnName + ", try with no name");
+                            apn = ApnSettings.load(context, null, mSubId);
+                        }
+                        Timber.i("MmsRequest: using " + apn.toString());
+                        response = doHttp(context, networkManager, apn);
+                        result = Activity.RESULT_OK;
+                        // Success
+                        break;
+                    } finally {
+                        networkManager.releaseNetwork();
+                    }
+                } catch (ApnException e) {
+                    Timber.e(e, "MmsRequest: APN failure");
+                    result = SmsManager.MMS_ERROR_INVALID_APN;
+                    break;
+//                    } catch (MmsNetworkException e) {
+//                        Timber.e(e, "MmsRequest: MMS network acquiring failure");
+//                        result = SmsManager.MMS_ERROR_UNABLE_CONNECT_MMS;
+//                        // Retry
+                } catch (MmsHttpException e) {
+                    Timber.e(e, "MmsRequest: HTTP or network I/O failure");
+                    result = SmsManager.MMS_ERROR_HTTP_FAILURE;
+                    httpStatusCode = e.getStatusCode();
+                    // Retry
+                } catch (Exception e) {
+                    Timber.e(e, "MmsRequest: unexpected failure");
+                    result = SmsManager.MMS_ERROR_UNSPECIFIED;
+                    break;
+                }
+                try {
+                    Thread.sleep(retryDelaySecs * 1000, 0/*nano*/);
+                } catch (InterruptedException e) {
+                }
+                retryDelaySecs <<= 1;
+            }
+        }
+
+        if (!mobileDataEnabled) {
+            Timber.v("setting mobile data back to disabled");
+            Utils.setMobileDataEnabled(context, false);
+        }
+
+        if (!useWifi(context)) {
+            wifi.setWifiEnabled(isWifiEnabled);
+        }
+
+        processResult(context, result, response, httpStatusCode);
+    }
+
+    /**
+     * Process the result of the completed request, including updating the message status
+     * in database and sending back the result via pending intents.
+     *  @param context The context
+     * @param result The result code of execution
+     * @param response The response body
+     * @param httpStatusCode The optional http status code in case of http failure
+     */
+    public void processResult(Context context, int result, byte[] response, int httpStatusCode) {
+        final Uri messageUri = persistIfRequired(context, result, response);
+
+        // Return MMS HTTP request result via PendingIntent
+        final PendingIntent pendingIntent = getPendingIntent();
+        if (pendingIntent != null) {
+            boolean succeeded = true;
+            // Extra information to send back with the pending intent
+            Intent fillIn = new Intent();
+            if (response != null) {
+                succeeded = transferResponse(fillIn, response);
+            }
+            if (messageUri != null) {
+                fillIn.putExtra("uri", messageUri.toString());
+            }
+            if (result == SmsManager.MMS_ERROR_HTTP_FAILURE && httpStatusCode != 0) {
+                if (Build.VERSION.SDK_INT >= Build.VERSION_CODES.LOLLIPOP_MR1) {
+                    fillIn.putExtra(SmsManager.EXTRA_MMS_HTTP_STATUS, httpStatusCode);
+                } else {
+                    fillIn.putExtra("android.telephony.extra.MMS_HTTP_STATUS", httpStatusCode);
+                }
+            }
+            try {
+                if (!succeeded) {
+                    result = SmsManager.MMS_ERROR_IO_ERROR;
+                }
+                pendingIntent.send(context, result, fillIn);
+            } catch (PendingIntent.CanceledException e) {
+                Timber.e(e, "MmsRequest: sending pending intent canceled");
+            }
+        }
+
+        revokeUriPermission(context);
+    }
+
+    /**
+     * are we set up to use wifi? if so, send mms over it.
+     */
+    public static boolean useWifi(Context context) {
+        if (Utils.isMmsOverWifiEnabled(context)) {
+            ConnectivityManager mConnMgr = (ConnectivityManager) context.getSystemService(Context.CONNECTIVITY_SERVICE);
+            if (mConnMgr != null) {
+                NetworkInfo niWF = mConnMgr.getNetworkInfo(ConnectivityManager.TYPE_WIFI);
+                if ((niWF != null) && (niWF.isConnected())) {
+                    return true;
+                }
+            }
+        }
+        return false;
+    }
+
+    /**
+     * Returns true if sending / downloading using the carrier app has failed and completes the
+     * action using platform API's, otherwise false.
+     */
+    protected boolean maybeFallbackToRegularDelivery(int carrierMessagingAppResult) {
+        if (carrierMessagingAppResult
+                == CarrierMessagingService.SEND_STATUS_RETRY_ON_CARRIER_NETWORK
+                || carrierMessagingAppResult
+                        == CarrierMessagingService.DOWNLOAD_STATUS_RETRY_ON_CARRIER_NETWORK) {
+            Timber.d("Sending/downloading MMS by IP failed.");
+            mRequestManager.addSimRequest(MmsRequest.this);
+            return true;
+        } else {
+            return false;
+        }
+    }
+
+    /**
+     * Converts from {@code carrierMessagingAppResult} to a platform result code.
+     */
+    protected static int toSmsManagerResult(int carrierMessagingAppResult) {
+        switch (carrierMessagingAppResult) {
+            case CarrierMessagingService.SEND_STATUS_OK:
+                return Activity.RESULT_OK;
+            case CarrierMessagingService.SEND_STATUS_RETRY_ON_CARRIER_NETWORK:
+                return SmsManager.MMS_ERROR_RETRY;
+            default:
+                return SmsManager.MMS_ERROR_UNSPECIFIED;
+        }
+    }
+
+    /**
+     * Making the HTTP request to MMSC
+     *
+     * @param context The context
+     * @param netMgr The current {@link MmsNetworkManager}
+     * @param apn The APN setting
+     * @return The HTTP response data
+     * @throws MmsHttpException If any network error happens
+     */
+    protected abstract byte[] doHttp(Context context, MmsNetworkManager netMgr, ApnSettings apn)
+            throws MmsHttpException;
+
+    /**
+     * @return The PendingIntent associate with the MMS sending invocation
+     */
+    protected abstract PendingIntent getPendingIntent();
+
+    /**
+     * @return The queue should be used by this request, 0 is sending and 1 is downloading
+     */
+    protected abstract int getQueueType();
+
+    /**
+     * Persist message into telephony if required (i.e. when auto-persisting is on or
+     * the calling app is non-default sms app for sending)
+     *
+     * @param context The context
+     * @param result The result code of execution
+     * @param response The response body
+     * @return The persisted URI of the message or null if we don't persist or fail
+     */
+    protected abstract Uri persistIfRequired(Context context, int result, byte[] response);
+
+    /**
+     * Prepare to make the HTTP request - will download message for sending
+     * @return true if preparation succeeds (and request can proceed) else false
+     */
+    protected abstract boolean prepareForHttpRequest();
+
+    /**
+     * Transfer the received response to the caller
+     *
+     * @param fillIn the intent that will be returned to the caller
+     * @param response the pdu to transfer
+     * @return true if response transfer succeeds else false
+     */
+    protected abstract boolean transferResponse(Intent fillIn, byte[] response);
+
+    /**
+     * Revoke the content URI permission granted by the MMS app to the phone package.
+     *
+     * @param context The context
+     */
+    protected abstract void revokeUriPermission(Context context);
+
+}
diff --git a/android-smsmms/src/main/java/com/android/mms/service_alt/PhoneUtils.java b/android-smsmms/src/main/java/com/android/mms/service_alt/PhoneUtils.java
index afdee1125..e0bcf7293 100755
--- a/android-smsmms/src/main/java/com/android/mms/service_alt/PhoneUtils.java
+++ b/android-smsmms/src/main/java/com/android/mms/service_alt/PhoneUtils.java
@@ -1,101 +1,101 @@
-/*
- * Copyright (C) 2015 Jacob Klinker
- *
- * Licensed under the Apache License, Version 2.0 (the "License");
- * you may not use this file except in compliance with the License.
- * You may obtain a copy of the License at
- *
- * http://www.apache.org/licenses/LICENSE-2.0
- *
- * Unless required by applicable law or agreed to in writing, software
- * distributed under the License is distributed on an "AS IS" BASIS,
- * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
- * See the License for the specific language governing permissions and
- * limitations under the License.
- */
-
-package com.android.mms.service_alt;
-
-import android.telephony.TelephonyManager;
-import android.text.TextUtils;
-import com.android.i18n.phonenumbers.NumberParseException;
-import com.android.i18n.phonenumbers.PhoneNumberUtil;
-import com.android.i18n.phonenumbers.Phonenumber;
-import timber.log.Timber;
-
-import java.lang.reflect.Method;
-import java.util.Locale;
-
-/**
- * Utility to handle phone numbers.
- */
-public class PhoneUtils {
-
-    /**
-     * Get a canonical national format phone number. If parsing fails, just return the
-     * original number.
-     *
-     * @param telephonyManager
-     * @param subId The SIM ID associated with this number
-     * @param phoneText The input phone number text
-     * @return The formatted number or the original phone number if failed to parse
-     */
-    public static String getNationalNumber(TelephonyManager telephonyManager, int subId,
-            String phoneText) {
-        final String country = getSimOrDefaultLocaleCountry(telephonyManager, subId);
-        final PhoneNumberUtil phoneNumberUtil = PhoneNumberUtil.getInstance();
-        final Phonenumber.PhoneNumber parsed = getParsedNumber(phoneNumberUtil, phoneText, country);
-        if (parsed == null) {
-            return phoneText;
-        }
-        return phoneNumberUtil
-                .format(parsed, PhoneNumberUtil.PhoneNumberFormat.NATIONAL)
-                .replaceAll("\\D", "");
-    }
-
-    // Parse the input number into internal format
-    private static Phonenumber.PhoneNumber getParsedNumber(PhoneNumberUtil phoneNumberUtil,
-            String phoneText, String country) {
-        try {
-            final Phonenumber.PhoneNumber phoneNumber = phoneNumberUtil.parse(phoneText, country);
-            if (phoneNumberUtil.isValidNumber(phoneNumber)) {
-                return phoneNumber;
-            } else {
-                Timber.e("getParsedNumber: not a valid phone number"
-                        + " for country " + country);
-                return null;
-            }
-        } catch (final NumberParseException e) {
-            Timber.e("getParsedNumber: Not able to parse phone number");
-            return null;
-        }
-    }
-
-    // Get the country/region either from the SIM ID or from locale
-    private static String getSimOrDefaultLocaleCountry(TelephonyManager telephonyManager,
-            int subId) {
-        String country = getSimCountry(telephonyManager, subId);
-        if (TextUtils.isEmpty(country)) {
-            country = Locale.getDefault().getCountry();
-        }
-
-        return country;
-    }
-
-    // Get country/region from SIM ID
-    private static String getSimCountry(TelephonyManager telephonyManager, int subId) {
-        String country = "";
-
-        try {
-            Method method = telephonyManager.getClass().getMethod("getSimCountryIso", int.class);
-            country = (String) method.invoke(telephonyManager, subId);
-        } catch (Exception e) {
-            country = telephonyManager.getSimCountryIso();
-        }
-
-        if (TextUtils.isEmpty(country)) {
-            return null;
-        }
-        return country.toUpperCase();
-    }
-}
+/*
+ * Copyright (C) 2015 Jacob Klinker
+ *
+ * Licensed under the Apache License, Version 2.0 (the "License");
+ * you may not use this file except in compliance with the License.
+ * You may obtain a copy of the License at
+ *
+ * http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing, software
+ * distributed under the License is distributed on an "AS IS" BASIS,
+ * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ * See the License for the specific language governing permissions and
+ * limitations under the License.
+ */
+
+package com.android.mms.service_alt;
+
+import android.telephony.TelephonyManager;
+import android.text.TextUtils;
+import com.android.i18n.phonenumbers.NumberParseException;
+import com.android.i18n.phonenumbers.PhoneNumberUtil;
+import com.android.i18n.phonenumbers.Phonenumber;
+import timber.log.Timber;
+
+import java.lang.reflect.Method;
+import java.util.Locale;
+
+/**
+ * Utility to handle phone numbers.
+ */
+public class PhoneUtils {
+
+    /**
+     * Get a canonical national format phone number. If parsing fails, just return the
+     * original number.
+     *
+     * @param telephonyManager
+     * @param subId The SIM ID associated with this number
+     * @param phoneText The input phone number text
+     * @return The formatted number or the original phone number if failed to parse
+     */
+    public static String getNationalNumber(TelephonyManager telephonyManager, int subId,
+            String phoneText) {
+        final String country = getSimOrDefaultLocaleCountry(telephonyManager, subId);
+        final PhoneNumberUtil phoneNumberUtil = PhoneNumberUtil.getInstance();
+        final Phonenumber.PhoneNumber parsed = getParsedNumber(phoneNumberUtil, phoneText, country);
+        if (parsed == null) {
+            return phoneText;
+        }
+        return phoneNumberUtil
+                .format(parsed, PhoneNumberUtil.PhoneNumberFormat.NATIONAL)
+                .replaceAll("\\D", "");
+    }
+
+    // Parse the input number into internal format
+    private static Phonenumber.PhoneNumber getParsedNumber(PhoneNumberUtil phoneNumberUtil,
+            String phoneText, String country) {
+        try {
+            final Phonenumber.PhoneNumber phoneNumber = phoneNumberUtil.parse(phoneText, country);
+            if (phoneNumberUtil.isValidNumber(phoneNumber)) {
+                return phoneNumber;
+            } else {
+                Timber.e("getParsedNumber: not a valid phone number"
+                        + " for country " + country);
+                return null;
+            }
+        } catch (final NumberParseException e) {
+            Timber.e("getParsedNumber: Not able to parse phone number");
+            return null;
+        }
+    }
+
+    // Get the country/region either from the SIM ID or from locale
+    private static String getSimOrDefaultLocaleCountry(TelephonyManager telephonyManager,
+            int subId) {
+        String country = getSimCountry(telephonyManager, subId);
+        if (TextUtils.isEmpty(country)) {
+            country = Locale.getDefault().getCountry();
+        }
+
+        return country;
+    }
+
+    // Get country/region from SIM ID
+    private static String getSimCountry(TelephonyManager telephonyManager, int subId) {
+        String country = "";
+
+        try {
+            Method method = telephonyManager.getClass().getMethod("getSimCountryIso", int.class);
+            country = (String) method.invoke(telephonyManager, subId);
+        } catch (Exception e) {
+            country = telephonyManager.getSimCountryIso();
+        }
+
+        if (TextUtils.isEmpty(country)) {
+            return null;
+        }
+        return country.toUpperCase();
+    }
+}
diff --git a/android-smsmms/src/main/java/com/android/mms/service_alt/SubscriptionIdChecker.java b/android-smsmms/src/main/java/com/android/mms/service_alt/SubscriptionIdChecker.java
index afff0de0b..fd793dc97 100755
--- a/android-smsmms/src/main/java/com/android/mms/service_alt/SubscriptionIdChecker.java
+++ b/android-smsmms/src/main/java/com/android/mms/service_alt/SubscriptionIdChecker.java
@@ -1,49 +1,49 @@
-
-package com.android.mms.service_alt;
-
-import android.content.Context;
-import android.database.Cursor;
-import android.database.sqlite.SQLiteException;
-import android.os.Build;
-import android.provider.Telephony;
-import com.google.android.mms.util_alt.SqliteWrapper;
-import timber.log.Timber;
-
-class SubscriptionIdChecker {
-
-    private static SubscriptionIdChecker sInstance;
-    private boolean mCanUseSubscriptionId = false;
-
-    // I met a device which does not have Telephony.Mms.SUBSCRIPTION_ID event if it's API Level is 22.
-    private void check(Context context) {
-        if (Build.VERSION.SDK_INT >= Build.VERSION_CODES.LOLLIPOP_MR1) {
-            Cursor c = null;
-            try {
-                c = SqliteWrapper.query(context, context.getContentResolver(),
-                        Telephony.Mms.CONTENT_URI,
-                        new String[]{Telephony.Mms.SUBSCRIPTION_ID}, null, null, null);
-                if (c != null) {
-                    mCanUseSubscriptionId = true;
-                }
-            } catch (SQLiteException e) {
-                Timber.e("SubscriptionIdChecker.check() fail");
-            } finally {
-                if (c != null) {
-                    c.close();
-                }
-            }
-        }
-    }
-
-    static synchronized SubscriptionIdChecker getInstance(Context context) {
-        if (sInstance == null) {
-            sInstance = new SubscriptionIdChecker();
-            sInstance.check(context);
-        }
-        return sInstance;
-    }
-
-    boolean canUseSubscriptionId() {
-        return mCanUseSubscriptionId;
-    }
-}
+
+package com.android.mms.service_alt;
+
+import android.content.Context;
+import android.database.Cursor;
+import android.database.sqlite.SQLiteException;
+import android.os.Build;
+import android.provider.Telephony;
+import com.google.android.mms.util_alt.SqliteWrapper;
+import timber.log.Timber;
+
+class SubscriptionIdChecker {
+
+    private static SubscriptionIdChecker sInstance;
+    private boolean mCanUseSubscriptionId = false;
+
+    // I met a device which does not have Telephony.Mms.SUBSCRIPTION_ID event if it's API Level is 22.
+    private void check(Context context) {
+        if (Build.VERSION.SDK_INT >= Build.VERSION_CODES.LOLLIPOP_MR1) {
+            Cursor c = null;
+            try {
+                c = SqliteWrapper.query(context, context.getContentResolver(),
+                        Telephony.Mms.CONTENT_URI,
+                        new String[]{Telephony.Mms.SUBSCRIPTION_ID}, null, null, null);
+                if (c != null) {
+                    mCanUseSubscriptionId = true;
+                }
+            } catch (SQLiteException e) {
+                Timber.e("SubscriptionIdChecker.check() fail");
+            } finally {
+                if (c != null) {
+                    c.close();
+                }
+            }
+        }
+    }
+
+    static synchronized SubscriptionIdChecker getInstance(Context context) {
+        if (sInstance == null) {
+            sInstance = new SubscriptionIdChecker();
+            sInstance.check(context);
+        }
+        return sInstance;
+    }
+
+    boolean canUseSubscriptionId() {
+        return mCanUseSubscriptionId;
+    }
+}
diff --git a/android-smsmms/src/main/java/com/android/mms/service_alt/SystemPropertiesProxy.java b/android-smsmms/src/main/java/com/android/mms/service_alt/SystemPropertiesProxy.java
index 56aa4699e..07d258400 100755
--- a/android-smsmms/src/main/java/com/android/mms/service_alt/SystemPropertiesProxy.java
+++ b/android-smsmms/src/main/java/com/android/mms/service_alt/SystemPropertiesProxy.java
@@ -1,295 +1,295 @@
-/*
- * Copyright (C) 2015 Jacob Klinker
- *
- * Licensed under the Apache License, Version 2.0 (the "License");
- * you may not use this file except in compliance with the License.
- * You may obtain a copy of the License at
- *
- * http://www.apache.org/licenses/LICENSE-2.0
- *
- * Unless required by applicable law or agreed to in writing, software
- * distributed under the License is distributed on an "AS IS" BASIS,
- * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
- * See the License for the specific language governing permissions and
- * limitations under the License.
- */
-
-package com.android.mms.service_alt;
-
-import android.content.Context;
-import dalvik.system.DexFile;
-
-import java.io.File;
-import java.lang.reflect.Method;
-
-public class SystemPropertiesProxy {
-
-    /**
-     * This class cannot be instantiated
-     */
-    private SystemPropertiesProxy() {
-
-    }
-
-    /**
-     * Get the value for the given key.
-     *
-     * @return an empty string if the key isn't found
-     * @throws IllegalArgumentException if the key exceeds 32 characters
-     */
-    public static String get(Context context, String key) throws IllegalArgumentException {
-
-        String ret = "";
-
-        try {
-
-            ClassLoader cl = context.getClassLoader();
-            @SuppressWarnings("rawtypes")
-            Class SystemProperties = cl.loadClass("android.os.SystemProperties");
-
-            //Parameters Types
-            @SuppressWarnings("rawtypes")
-            Class[] paramTypes = new Class[1];
-            paramTypes[0] = String.class;
-
-            Method get = SystemProperties.getMethod("get", paramTypes);
-
-            //Parameters
-            Object[] params = new Object[1];
-            params[0] = new String(key);
-
-            ret = (String) get.invoke(SystemProperties, params);
-
-        } catch (IllegalArgumentException iAE) {
-            throw iAE;
-        } catch (Exception e) {
-            ret = "";
-            //TODO
-        }
-
-        return ret;
-
-    }
-
-    /**
-     * Get the value for the given key.
-     *
-     * @return if the key isn't found, return def if it isn't null, or an empty string otherwise
-     * @throws IllegalArgumentException if the key exceeds 32 characters
-     */
-    public static String get(Context context, String key, String def) throws IllegalArgumentException {
-
-        String ret = def;
-
-        try {
-
-            ClassLoader cl = context.getClassLoader();
-            @SuppressWarnings("rawtypes")
-            Class SystemProperties = cl.loadClass("android.os.SystemProperties");
-
-            //Parameters Types
-            @SuppressWarnings("rawtypes")
-            Class[] paramTypes = new Class[2];
-            paramTypes[0] = String.class;
-            paramTypes[1] = String.class;
-
-            Method get = SystemProperties.getMethod("get", paramTypes);
-
-            //Parameters
-            Object[] params = new Object[2];
-            params[0] = new String(key);
-            params[1] = new String(def);
-
-            ret = (String) get.invoke(SystemProperties, params);
-
-        } catch (IllegalArgumentException iAE) {
-            throw iAE;
-        } catch (Exception e) {
-            ret = def;
-            //TODO
-        }
-
-        return ret;
-
-    }
-
-    /**
-     * Get the value for the given key, and return as an integer.
-     *
-     * @param key the key to lookup
-     * @param def a default value to return
-     * @return the key parsed as an integer, or def if the key isn't found or
-     * cannot be parsed
-     * @throws IllegalArgumentException if the key exceeds 32 characters
-     */
-    public static Integer getInt(Context context, String key, int def) throws IllegalArgumentException {
-
-        Integer ret = def;
-
-        try {
-
-            ClassLoader cl = context.getClassLoader();
-            @SuppressWarnings("rawtypes")
-            Class SystemProperties = cl.loadClass("android.os.SystemProperties");
-
-            //Parameters Types
-            @SuppressWarnings("rawtypes")
-            Class[] paramTypes = new Class[2];
-            paramTypes[0] = String.class;
-            paramTypes[1] = int.class;
-
-            Method getInt = SystemProperties.getMethod("getInt", paramTypes);
-
-            //Parameters
-            Object[] params = new Object[2];
-            params[0] = new String(key);
-            params[1] = new Integer(def);
-
-            ret = (Integer) getInt.invoke(SystemProperties, params);
-
-        } catch (IllegalArgumentException iAE) {
-            throw iAE;
-        } catch (Exception e) {
-            ret = def;
-            //TODO
-        }
-
-        return ret;
-
-    }
-
-    /**
-     * Get the value for the given key, and return as a long.
-     *
-     * @param key the key to lookup
-     * @param def a default value to return
-     * @return the key parsed as a long, or def if the key isn't found or
-     * cannot be parsed
-     * @throws IllegalArgumentException if the key exceeds 32 characters
-     */
-    public static Long getLong(Context context, String key, long def) throws IllegalArgumentException {
-
-        Long ret = def;
-
-        try {
-
-            ClassLoader cl = context.getClassLoader();
-            @SuppressWarnings("rawtypes")
-            Class SystemProperties = cl.loadClass("android.os.SystemProperties");
-
-            //Parameters Types
-            @SuppressWarnings("rawtypes")
-            Class[] paramTypes = new Class[2];
-            paramTypes[0] = String.class;
-            paramTypes[1] = long.class;
-
-            Method getLong = SystemProperties.getMethod("getLong", paramTypes);
-
-            //Parameters
-            Object[] params = new Object[2];
-            params[0] = new String(key);
-            params[1] = new Long(def);
-
-            ret = (Long) getLong.invoke(SystemProperties, params);
-
-        } catch (IllegalArgumentException iAE) {
-            throw iAE;
-        } catch (Exception e) {
-            ret = def;
-            //TODO
-        }
-
-        return ret;
-
-    }
-
-    /**
-     * Get the value for the given key, returned as a boolean.
-     * Values 'n', 'no', '0', 'false' or 'off' are considered false.
-     * Values 'y', 'yes', '1', 'true' or 'on' are considered true.
-     * (case insensitive).
-     * If the key does not exist, or has any other value, then the default
-     * result is returned.
-     *
-     * @param key the key to lookup
-     * @param def a default value to return
-     * @return the key parsed as a boolean, or def if the key isn't found or is
-     * not able to be parsed as a boolean.
-     * @throws IllegalArgumentException if the key exceeds 32 characters
-     */
-    public static Boolean getBoolean(Context context, String key, boolean def) throws IllegalArgumentException {
-
-        Boolean ret = def;
-
-        try {
-
-            ClassLoader cl = context.getClassLoader();
-            @SuppressWarnings("rawtypes")
-            Class SystemProperties = cl.loadClass("android.os.SystemProperties");
-
-            //Parameters Types
-            @SuppressWarnings("rawtypes")
-            Class[] paramTypes = new Class[2];
-            paramTypes[0] = String.class;
-            paramTypes[1] = boolean.class;
-
-            Method getBoolean = SystemProperties.getMethod("getBoolean", paramTypes);
-
-            //Parameters
-            Object[] params = new Object[2];
-            params[0] = new String(key);
-            params[1] = new Boolean(def);
-
-            ret = (Boolean) getBoolean.invoke(SystemProperties, params);
-
-        } catch (IllegalArgumentException iAE) {
-            throw iAE;
-        } catch (Exception e) {
-            ret = def;
-            //TODO
-        }
-
-        return ret;
-
-    }
-
-    /**
-     * Set the value for the given key.
-     *
-     * @throws IllegalArgumentException if the key exceeds 32 characters
-     * @throws IllegalArgumentException if the value exceeds 92 characters
-     */
-    public static void set(Context context, String key, String val) throws IllegalArgumentException {
-
-        try {
-
-            @SuppressWarnings("unused")
-            DexFile df = new DexFile(new File("/system/app/Settings.apk"));
-            @SuppressWarnings("unused")
-            ClassLoader cl = context.getClassLoader();
-            @SuppressWarnings("rawtypes")
-            Class SystemProperties = Class.forName("android.os.SystemProperties");
-
-            //Parameters Types
-            @SuppressWarnings("rawtypes")
-            Class[] paramTypes = new Class[2];
-            paramTypes[0] = String.class;
-            paramTypes[1] = String.class;
-
-            Method set = SystemProperties.getMethod("set", paramTypes);
-
-            //Parameters
-            Object[] params = new Object[2];
-            params[0] = new String(key);
-            params[1] = new String(val);
-
-            set.invoke(SystemProperties, params);
-
-        } catch (IllegalArgumentException iAE) {
-            throw iAE;
-        } catch (Exception e) {
-            //TODO
-        }
-
-    }
-}
+/*
+ * Copyright (C) 2015 Jacob Klinker
+ *
+ * Licensed under the Apache License, Version 2.0 (the "License");
+ * you may not use this file except in compliance with the License.
+ * You may obtain a copy of the License at
+ *
+ * http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing, software
+ * distributed under the License is distributed on an "AS IS" BASIS,
+ * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ * See the License for the specific language governing permissions and
+ * limitations under the License.
+ */
+
+package com.android.mms.service_alt;
+
+import android.content.Context;
+import dalvik.system.DexFile;
+
+import java.io.File;
+import java.lang.reflect.Method;
+
+public class SystemPropertiesProxy {
+
+    /**
+     * This class cannot be instantiated
+     */
+    private SystemPropertiesProxy() {
+
+    }
+
+    /**
+     * Get the value for the given key.
+     *
+     * @return an empty string if the key isn't found
+     * @throws IllegalArgumentException if the key exceeds 32 characters
+     */
+    public static String get(Context context, String key) throws IllegalArgumentException {
+
+        String ret = "";
+
+        try {
+
+            ClassLoader cl = context.getClassLoader();
+            @SuppressWarnings("rawtypes")
+            Class SystemProperties = cl.loadClass("android.os.SystemProperties");
+
+            //Parameters Types
+            @SuppressWarnings("rawtypes")
+            Class[] paramTypes = new Class[1];
+            paramTypes[0] = String.class;
+
+            Method get = SystemProperties.getMethod("get", paramTypes);
+
+            //Parameters
+            Object[] params = new Object[1];
+            params[0] = new String(key);
+
+            ret = (String) get.invoke(SystemProperties, params);
+
+        } catch (IllegalArgumentException iAE) {
+            throw iAE;
+        } catch (Exception e) {
+            ret = "";
+            //TODO
+        }
+
+        return ret;
+
+    }
+
+    /**
+     * Get the value for the given key.
+     *
+     * @return if the key isn't found, return def if it isn't null, or an empty string otherwise
+     * @throws IllegalArgumentException if the key exceeds 32 characters
+     */
+    public static String get(Context context, String key, String def) throws IllegalArgumentException {
+
+        String ret = def;
+
+        try {
+
+            ClassLoader cl = context.getClassLoader();
+            @SuppressWarnings("rawtypes")
+            Class SystemProperties = cl.loadClass("android.os.SystemProperties");
+
+            //Parameters Types
+            @SuppressWarnings("rawtypes")
+            Class[] paramTypes = new Class[2];
+            paramTypes[0] = String.class;
+            paramTypes[1] = String.class;
+
+            Method get = SystemProperties.getMethod("get", paramTypes);
+
+            //Parameters
+            Object[] params = new Object[2];
+            params[0] = new String(key);
+            params[1] = new String(def);
+
+            ret = (String) get.invoke(SystemProperties, params);
+
+        } catch (IllegalArgumentException iAE) {
+            throw iAE;
+        } catch (Exception e) {
+            ret = def;
+            //TODO
+        }
+
+        return ret;
+
+    }
+
+    /**
+     * Get the value for the given key, and return as an integer.
+     *
+     * @param key the key to lookup
+     * @param def a default value to return
+     * @return the key parsed as an integer, or def if the key isn't found or
+     * cannot be parsed
+     * @throws IllegalArgumentException if the key exceeds 32 characters
+     */
+    public static Integer getInt(Context context, String key, int def) throws IllegalArgumentException {
+
+        Integer ret = def;
+
+        try {
+
+            ClassLoader cl = context.getClassLoader();
+            @SuppressWarnings("rawtypes")
+            Class SystemProperties = cl.loadClass("android.os.SystemProperties");
+
+            //Parameters Types
+            @SuppressWarnings("rawtypes")
+            Class[] paramTypes = new Class[2];
+            paramTypes[0] = String.class;
+            paramTypes[1] = int.class;
+
+            Method getInt = SystemProperties.getMethod("getInt", paramTypes);
+
+            //Parameters
+            Object[] params = new Object[2];
+            params[0] = new String(key);
+            params[1] = new Integer(def);
+
+            ret = (Integer) getInt.invoke(SystemProperties, params);
+
+        } catch (IllegalArgumentException iAE) {
+            throw iAE;
+        } catch (Exception e) {
+            ret = def;
+            //TODO
+        }
+
+        return ret;
+
+    }
+
+    /**
+     * Get the value for the given key, and return as a long.
+     *
+     * @param key the key to lookup
+     * @param def a default value to return
+     * @return the key parsed as a long, or def if the key isn't found or
+     * cannot be parsed
+     * @throws IllegalArgumentException if the key exceeds 32 characters
+     */
+    public static Long getLong(Context context, String key, long def) throws IllegalArgumentException {
+
+        Long ret = def;
+
+        try {
+
+            ClassLoader cl = context.getClassLoader();
+            @SuppressWarnings("rawtypes")
+            Class SystemProperties = cl.loadClass("android.os.SystemProperties");
+
+            //Parameters Types
+            @SuppressWarnings("rawtypes")
+            Class[] paramTypes = new Class[2];
+            paramTypes[0] = String.class;
+            paramTypes[1] = long.class;
+
+            Method getLong = SystemProperties.getMethod("getLong", paramTypes);
+
+            //Parameters
+            Object[] params = new Object[2];
+            params[0] = new String(key);
+            params[1] = new Long(def);
+
+            ret = (Long) getLong.invoke(SystemProperties, params);
+
+        } catch (IllegalArgumentException iAE) {
+            throw iAE;
+        } catch (Exception e) {
+            ret = def;
+            //TODO
+        }
+
+        return ret;
+
+    }
+
+    /**
+     * Get the value for the given key, returned as a boolean.
+     * Values 'n', 'no', '0', 'false' or 'off' are considered false.
+     * Values 'y', 'yes', '1', 'true' or 'on' are considered true.
+     * (case insensitive).
+     * If the key does not exist, or has any other value, then the default
+     * result is returned.
+     *
+     * @param key the key to lookup
+     * @param def a default value to return
+     * @return the key parsed as a boolean, or def if the key isn't found or is
+     * not able to be parsed as a boolean.
+     * @throws IllegalArgumentException if the key exceeds 32 characters
+     */
+    public static Boolean getBoolean(Context context, String key, boolean def) throws IllegalArgumentException {
+
+        Boolean ret = def;
+
+        try {
+
+            ClassLoader cl = context.getClassLoader();
+            @SuppressWarnings("rawtypes")
+            Class SystemProperties = cl.loadClass("android.os.SystemProperties");
+
+            //Parameters Types
+            @SuppressWarnings("rawtypes")
+            Class[] paramTypes = new Class[2];
+            paramTypes[0] = String.class;
+            paramTypes[1] = boolean.class;
+
+            Method getBoolean = SystemProperties.getMethod("getBoolean", paramTypes);
+
+            //Parameters
+            Object[] params = new Object[2];
+            params[0] = new String(key);
+            params[1] = new Boolean(def);
+
+            ret = (Boolean) getBoolean.invoke(SystemProperties, params);
+
+        } catch (IllegalArgumentException iAE) {
+            throw iAE;
+        } catch (Exception e) {
+            ret = def;
+            //TODO
+        }
+
+        return ret;
+
+    }
+
+    /**
+     * Set the value for the given key.
+     *
+     * @throws IllegalArgumentException if the key exceeds 32 characters
+     * @throws IllegalArgumentException if the value exceeds 92 characters
+     */
+    public static void set(Context context, String key, String val) throws IllegalArgumentException {
+
+        try {
+
+            @SuppressWarnings("unused")
+            DexFile df = new DexFile(new File("/system/app/Settings.apk"));
+            @SuppressWarnings("unused")
+            ClassLoader cl = context.getClassLoader();
+            @SuppressWarnings("rawtypes")
+            Class SystemProperties = Class.forName("android.os.SystemProperties");
+
+            //Parameters Types
+            @SuppressWarnings("rawtypes")
+            Class[] paramTypes = new Class[2];
+            paramTypes[0] = String.class;
+            paramTypes[1] = String.class;
+
+            Method set = SystemProperties.getMethod("set", paramTypes);
+
+            //Parameters
+            Object[] params = new Object[2];
+            params[0] = new String(key);
+            params[1] = new String(val);
+
+            set.invoke(SystemProperties, params);
+
+        } catch (IllegalArgumentException iAE) {
+            throw iAE;
+        } catch (Exception e) {
+            //TODO
+        }
+
+    }
+}
diff --git a/android-smsmms/src/main/java/com/android/mms/service_alt/exception/ApnException.java b/android-smsmms/src/main/java/com/android/mms/service_alt/exception/ApnException.java
index fde1dcc37..46f5019d2 100755
--- a/android-smsmms/src/main/java/com/android/mms/service_alt/exception/ApnException.java
+++ b/android-smsmms/src/main/java/com/android/mms/service_alt/exception/ApnException.java
@@ -1,39 +1,39 @@
-/*
- * Copyright (C) 2014 The Android Open Source Project
- *
- * Licensed under the Apache License, Version 2.0 (the "License");
- * you may not use this file except in compliance with the License.
- * You may obtain a copy of the License at
- *
- *      http://www.apache.org/licenses/LICENSE-2.0
- *
- * Unless required by applicable law or agreed to in writing, software
- * distributed under the License is distributed on an "AS IS" BASIS,
- * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
- * See the License for the specific language governing permissions and
- * limitations under the License.
- */
-
-package com.android.mms.service_alt.exception;
-
-/**
- * APN exception
- */
-public class ApnException extends Exception {
-
-    public ApnException() {
-        super();
-    }
-
-    public ApnException(String message) {
-        super(message);
-    }
-
-    public ApnException(Throwable cause) {
-        super(cause);
-    }
-
-    public ApnException(String message, Throwable cause) {
-        super(message, cause);
-    }
-}
+/*
+ * Copyright (C) 2014 The Android Open Source Project
+ *
+ * Licensed under the Apache License, Version 2.0 (the "License");
+ * you may not use this file except in compliance with the License.
+ * You may obtain a copy of the License at
+ *
+ *      http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing, software
+ * distributed under the License is distributed on an "AS IS" BASIS,
+ * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ * See the License for the specific language governing permissions and
+ * limitations under the License.
+ */
+
+package com.android.mms.service_alt.exception;
+
+/**
+ * APN exception
+ */
+public class ApnException extends Exception {
+
+    public ApnException() {
+        super();
+    }
+
+    public ApnException(String message) {
+        super(message);
+    }
+
+    public ApnException(Throwable cause) {
+        super(cause);
+    }
+
+    public ApnException(String message, Throwable cause) {
+        super(message, cause);
+    }
+}
diff --git a/android-smsmms/src/main/java/com/android/mms/service_alt/exception/MmsHttpException.java b/android-smsmms/src/main/java/com/android/mms/service_alt/exception/MmsHttpException.java
index e3b96b33e..6b072f127 100755
--- a/android-smsmms/src/main/java/com/android/mms/service_alt/exception/MmsHttpException.java
+++ b/android-smsmms/src/main/java/com/android/mms/service_alt/exception/MmsHttpException.java
@@ -1,50 +1,50 @@
-/*
- * Copyright (C) 2014 The Android Open Source Project
- *
- * Licensed under the Apache License, Version 2.0 (the "License");
- * you may not use this file except in compliance with the License.
- * You may obtain a copy of the License at
- *
- *      http://www.apache.org/licenses/LICENSE-2.0
- *
- * Unless required by applicable law or agreed to in writing, software
- * distributed under the License is distributed on an "AS IS" BASIS,
- * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
- * See the License for the specific language governing permissions and
- * limitations under the License.
- */
-
-package com.android.mms.service_alt.exception;
-
-/**
- * HTTP exception
- */
-public class MmsHttpException extends Exception {
-    // Optional HTTP status code. 0 means ignore. Otherwise this
-    // should be a valid HTTP status code.
-    private final int mStatusCode;
-
-    public MmsHttpException(int statusCode) {
-        super();
-        mStatusCode = statusCode;
-    }
-
-    public MmsHttpException(int statusCode, String message) {
-        super(message);
-        mStatusCode = statusCode;
-    }
-
-    public MmsHttpException(int statusCode, Throwable cause) {
-        super(cause);
-        mStatusCode = statusCode;
-    }
-
-    public MmsHttpException(int statusCode, String message, Throwable cause) {
-        super(message, cause);
-        mStatusCode = statusCode;
-    }
-
-    public int getStatusCode() {
-        return mStatusCode;
-    }
-}
+/*
+ * Copyright (C) 2014 The Android Open Source Project
+ *
+ * Licensed under the Apache License, Version 2.0 (the "License");
+ * you may not use this file except in compliance with the License.
+ * You may obtain a copy of the License at
+ *
+ *      http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing, software
+ * distributed under the License is distributed on an "AS IS" BASIS,
+ * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ * See the License for the specific language governing permissions and
+ * limitations under the License.
+ */
+
+package com.android.mms.service_alt.exception;
+
+/**
+ * HTTP exception
+ */
+public class MmsHttpException extends Exception {
+    // Optional HTTP status code. 0 means ignore. Otherwise this
+    // should be a valid HTTP status code.
+    private final int mStatusCode;
+
+    public MmsHttpException(int statusCode) {
+        super();
+        mStatusCode = statusCode;
+    }
+
+    public MmsHttpException(int statusCode, String message) {
+        super(message);
+        mStatusCode = statusCode;
+    }
+
+    public MmsHttpException(int statusCode, Throwable cause) {
+        super(cause);
+        mStatusCode = statusCode;
+    }
+
+    public MmsHttpException(int statusCode, String message, Throwable cause) {
+        super(message, cause);
+        mStatusCode = statusCode;
+    }
+
+    public int getStatusCode() {
+        return mStatusCode;
+    }
+}
diff --git a/android-smsmms/src/main/java/com/android/mms/service_alt/exception/MmsNetworkException.java b/android-smsmms/src/main/java/com/android/mms/service_alt/exception/MmsNetworkException.java
index c754a4e07..02f7d5bcd 100755
--- a/android-smsmms/src/main/java/com/android/mms/service_alt/exception/MmsNetworkException.java
+++ b/android-smsmms/src/main/java/com/android/mms/service_alt/exception/MmsNetworkException.java
@@ -1,39 +1,39 @@
-/*
- * Copyright (C) 2014 The Android Open Source Project
- *
- * Licensed under the Apache License, Version 2.0 (the "License");
- * you may not use this file except in compliance with the License.
- * You may obtain a copy of the License at
- *
- *      http://www.apache.org/licenses/LICENSE-2.0
- *
- * Unless required by applicable law or agreed to in writing, software
- * distributed under the License is distributed on an "AS IS" BASIS,
- * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
- * See the License for the specific language governing permissions and
- * limitations under the License.
- */
-
-package com.android.mms.service_alt.exception;
-
-/**
- * MMS network exception
- */
-public class MmsNetworkException extends Exception {
-
-    public MmsNetworkException() {
-        super();
-    }
-
-    public MmsNetworkException(String message) {
-        super(message);
-    }
-
-    public MmsNetworkException(Throwable cause) {
-        super(cause);
-    }
-
-    public MmsNetworkException(String message, Throwable cause) {
-        super(message, cause);
-    }
-}
+/*
+ * Copyright (C) 2014 The Android Open Source Project
+ *
+ * Licensed under the Apache License, Version 2.0 (the "License");
+ * you may not use this file except in compliance with the License.
+ * You may obtain a copy of the License at
+ *
+ *      http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing, software
+ * distributed under the License is distributed on an "AS IS" BASIS,
+ * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ * See the License for the specific language governing permissions and
+ * limitations under the License.
+ */
+
+package com.android.mms.service_alt.exception;
+
+/**
+ * MMS network exception
+ */
+public class MmsNetworkException extends Exception {
+
+    public MmsNetworkException() {
+        super();
+    }
+
+    public MmsNetworkException(String message) {
+        super(message);
+    }
+
+    public MmsNetworkException(Throwable cause) {
+        super(cause);
+    }
+
+    public MmsNetworkException(String message, Throwable cause) {
+        super(message, cause);
+    }
+}
diff --git a/android-smsmms/src/main/java/com/android/mms/transaction/AbstractRetryScheme.java b/android-smsmms/src/main/java/com/android/mms/transaction/AbstractRetryScheme.java
index 31875a8c4..1c25b2fa1 100755
--- a/android-smsmms/src/main/java/com/android/mms/transaction/AbstractRetryScheme.java
+++ b/android-smsmms/src/main/java/com/android/mms/transaction/AbstractRetryScheme.java
@@ -1,32 +1,32 @@
-/*
- * Copyright (C) 2008 Esmertec AG.
- * Copyright (C) 2008 The Android Open Source Project
- *
- * Licensed under the Apache License, Version 2.0 (the "License");
- * you may not use this file except in compliance with the License.
- * You may obtain a copy of the License at
- *
- *      http://www.apache.org/licenses/LICENSE-2.0
- *
- * Unless required by applicable law or agreed to in writing, software
- * distributed under the License is distributed on an "AS IS" BASIS,
- * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
- * See the License for the specific language governing permissions and
- * limitations under the License.
- */
-
-package com.android.mms.transaction;
-
-public abstract class AbstractRetryScheme {
-    public static final int OUTGOING = 1;
-    public static final int INCOMING = 2;
-
-    protected int mRetriedTimes;
-
-    public AbstractRetryScheme(int retriedTimes) {
-        mRetriedTimes = retriedTimes;
-    }
-
-    abstract public int getRetryLimit();
-    abstract public long getWaitingInterval();
-}
+/*
+ * Copyright (C) 2008 Esmertec AG.
+ * Copyright (C) 2008 The Android Open Source Project
+ *
+ * Licensed under the Apache License, Version 2.0 (the "License");
+ * you may not use this file except in compliance with the License.
+ * You may obtain a copy of the License at
+ *
+ *      http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing, software
+ * distributed under the License is distributed on an "AS IS" BASIS,
+ * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ * See the License for the specific language governing permissions and
+ * limitations under the License.
+ */
+
+package com.android.mms.transaction;
+
+public abstract class AbstractRetryScheme {
+    public static final int OUTGOING = 1;
+    public static final int INCOMING = 2;
+
+    protected int mRetriedTimes;
+
+    public AbstractRetryScheme(int retriedTimes) {
+        mRetriedTimes = retriedTimes;
+    }
+
+    abstract public int getRetryLimit();
+    abstract public long getWaitingInterval();
+}
diff --git a/android-smsmms/src/main/java/com/android/mms/transaction/DefaultRetryScheme.java b/android-smsmms/src/main/java/com/android/mms/transaction/DefaultRetryScheme.java
index 087927742..a1b6aa31d 100755
--- a/android-smsmms/src/main/java/com/android/mms/transaction/DefaultRetryScheme.java
+++ b/android-smsmms/src/main/java/com/android/mms/transaction/DefaultRetryScheme.java
@@ -1,55 +1,55 @@
-/*
- * Copyright 2014 Jacob Klinker
- *
- * Licensed under the Apache License, Version 2.0 (the "License");
- * you may not use this file except in compliance with the License.
- * You may obtain a copy of the License at
- *
- *     http://www.apache.org/licenses/LICENSE-2.0
- *
- * Unless required by applicable law or agreed to in writing, software
- * distributed under the License is distributed on an "AS IS" BASIS,
- * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
- * See the License for the specific language governing permissions and
- * limitations under the License.
- */
-
-package com.android.mms.transaction;
-
-import android.content.Context;
-import android.util.Config;
-import timber.log.Timber;
-
-/**
- * Default retry scheme, based on specs.
- */
-public class DefaultRetryScheme extends AbstractRetryScheme {
-    private static final boolean DEBUG = false;
-    private static final boolean LOCAL_LOGV = DEBUG ? Config.LOGD : Config.LOGV;
-
-    private static final int[] sDefaultRetryScheme = {
-        0, 1 * 60 * 1000, 5 * 60 * 1000, 10 * 60 * 1000, 30 * 60 * 1000};
-
-    public DefaultRetryScheme(Context context, int retriedTimes) {
-        super(retriedTimes);
-
-        mRetriedTimes = mRetriedTimes < 0 ? 0 : mRetriedTimes;
-        mRetriedTimes = mRetriedTimes >= sDefaultRetryScheme.length
-                ? sDefaultRetryScheme.length - 1 : mRetriedTimes;
-
-        // TODO Get retry scheme from preference.
-    }
-
-    @Override
-    public int getRetryLimit() {
-        return sDefaultRetryScheme.length;
-    }
-
-    @Override
-    public long getWaitingInterval() {
-        if (LOCAL_LOGV) {
-            Timber.v("Next int: " + sDefaultRetryScheme[mRetriedTimes]);
-        }
-        return sDefaultRetryScheme[mRetriedTimes];
-    }
-}
+/*
+ * Copyright 2014 Jacob Klinker
+ *
+ * Licensed under the Apache License, Version 2.0 (the "License");
+ * you may not use this file except in compliance with the License.
+ * You may obtain a copy of the License at
+ *
+ *     http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing, software
+ * distributed under the License is distributed on an "AS IS" BASIS,
+ * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ * See the License for the specific language governing permissions and
+ * limitations under the License.
+ */
+
+package com.android.mms.transaction;
+
+import android.content.Context;
+import android.util.Config;
+import timber.log.Timber;
+
+/**
+ * Default retry scheme, based on specs.
+ */
+public class DefaultRetryScheme extends AbstractRetryScheme {
+    private static final boolean DEBUG = false;
+    private static final boolean LOCAL_LOGV = DEBUG ? Config.LOGD : Config.LOGV;
+
+    private static final int[] sDefaultRetryScheme = {
+        0, 1 * 60 * 1000, 5 * 60 * 1000, 10 * 60 * 1000, 30 * 60 * 1000};
+
+    public DefaultRetryScheme(Context context, int retriedTimes) {
+        super(retriedTimes);
+
+        mRetriedTimes = mRetriedTimes < 0 ? 0 : mRetriedTimes;
+        mRetriedTimes = mRetriedTimes >= sDefaultRetryScheme.length
+                ? sDefaultRetryScheme.length - 1 : mRetriedTimes;
+
+        // TODO Get retry scheme from preference.
+    }
+
+    @Override
+    public int getRetryLimit() {
+        return sDefaultRetryScheme.length;
+    }
+
+    @Override
+    public long getWaitingInterval() {
+        if (LOCAL_LOGV) {
+            Timber.v("Next int: " + sDefaultRetryScheme[mRetriedTimes]);
+        }
+        return sDefaultRetryScheme[mRetriedTimes];
+    }
+}
diff --git a/android-smsmms/src/main/java/com/android/mms/transaction/DownloadManager.java b/android-smsmms/src/main/java/com/android/mms/transaction/DownloadManager.java
index 698817ca6..8b0a5a724 100755
--- a/android-smsmms/src/main/java/com/android/mms/transaction/DownloadManager.java
+++ b/android-smsmms/src/main/java/com/android/mms/transaction/DownloadManager.java
@@ -1,142 +1,142 @@
-
-package com.android.mms.transaction;
-
-import android.app.PendingIntent;
-import android.content.BroadcastReceiver;
-import android.content.ContentResolver;
-import android.content.Context;
-import android.content.Intent;
-import android.content.IntentFilter;
-import android.database.Cursor;
-import android.database.sqlite.SqliteWrapper;
-import android.net.Uri;
-import android.os.Bundle;
-import android.os.PowerManager;
-import android.provider.Telephony;
-import android.telephony.SmsManager;
-import android.text.TextUtils;
-import com.android.mms.MmsConfig;
-import com.klinker.android.send_message.BroadcastUtils;
-import com.klinker.android.send_message.MmsReceivedReceiver;
-import com.klinker.android.send_message.SmsManagerFactory;
-
-import timber.log.Timber;
-
-import java.io.File;
-import java.util.Random;
-import java.util.UUID;
-import java.util.concurrent.ConcurrentHashMap;
-
-/**
- * In order to avoid downloading duplicate MMS.
- * We should manage to call SMSManager.downloadMultimediaMessage().
- */
-public class DownloadManager {
-    private static DownloadManager ourInstance = new DownloadManager();
-    private static final ConcurrentHashMap<String, MmsDownloadReceiver> mMap = new ConcurrentHashMap<>();
-
-    public static DownloadManager getInstance() {
-        return ourInstance;
-    }
-
-    private DownloadManager() {
-
-    }
-
-    public void downloadMultimediaMessage(final Context context, final String location, Uri uri, boolean byPush, int subscriptionId) {
-        if (location == null || mMap.get(location) != null) {
-            return;
-        }
-
-        // TransactionService can keep uri and location in memory while SmsManager download Mms.
-        if (!isNotificationExist(context, location)) {
-            return;
-        }
-
-        MmsDownloadReceiver receiver = new MmsDownloadReceiver();
-        mMap.put(location, receiver);
-
-        // Use unique action in order to avoid cancellation of notifying download result.
-        context.getApplicationContext().registerReceiver(receiver, new IntentFilter(receiver.mAction));
-
-        Timber.v("receiving with system method");
-        final String fileName = "download." + String.valueOf(Math.abs(new Random().nextLong())) + ".dat";
-        File mDownloadFile = new File(context.getCacheDir(), fileName);
-        Uri contentUri = (new Uri.Builder())
-                .authority(context.getPackageName() + ".MmsFileProvider")
-                .path(fileName)
-                .scheme(ContentResolver.SCHEME_CONTENT)
-                .build();
-        Intent download = new Intent(receiver.mAction);
-        download.putExtra(MmsReceivedReceiver.EXTRA_FILE_PATH, mDownloadFile.getPath());
-        download.putExtra(MmsReceivedReceiver.EXTRA_LOCATION_URL, location);
-        download.putExtra(MmsReceivedReceiver.EXTRA_TRIGGER_PUSH, byPush);
-        download.putExtra(MmsReceivedReceiver.EXTRA_URI, uri);
-        final PendingIntent pendingIntent = PendingIntent.getBroadcast(
-                context, 0, download, PendingIntent.FLAG_CANCEL_CURRENT);
-
-        final SmsManager smsManager = SmsManagerFactory.INSTANCE.createSmsManager(subscriptionId);
-        Bundle configOverrides = new Bundle();
-        String httpParams = MmsConfig.getHttpParams();
-        if (!TextUtils.isEmpty(httpParams)) {
-            configOverrides.putString(SmsManager.MMS_CONFIG_HTTP_PARAMS, httpParams);
-        }
-
-        grantUriPermission(context, contentUri);
-        smsManager.downloadMultimediaMessage(context, location, contentUri, configOverrides, pendingIntent);
-    }
-
-    private void grantUriPermission(Context context, Uri contentUri) {
-        context.grantUriPermission(context.getPackageName() + ".MmsFileProvider",
-                contentUri,
-                Intent.FLAG_GRANT_WRITE_URI_PERMISSION);
-    }
-
-    private static class MmsDownloadReceiver extends BroadcastReceiver {
-        private static final String ACTION_PREFIX = "com.android.mms.transaction.DownloadManager$MmsDownloadReceiver.";
-        private final String mAction;
-
-        MmsDownloadReceiver() {
-            mAction = ACTION_PREFIX + UUID.randomUUID().toString();
-        }
-
-        @Override
-        public void onReceive(Context context, Intent intent) {
-            context.unregisterReceiver(this);
-
-            PowerManager pm = (PowerManager)context.getSystemService(Context.POWER_SERVICE);
-            PowerManager.WakeLock wakeLock = pm.newWakeLock(PowerManager.PARTIAL_WAKE_LOCK, "MMS DownloadReceiver");
-            wakeLock.acquire(60 * 1000);
-
-            Intent newIntent = (Intent) intent.clone();
-            newIntent.setAction(MmsReceivedReceiver.MMS_RECEIVED);
-            BroadcastUtils.sendExplicitBroadcast(context, newIntent, MmsReceivedReceiver.MMS_RECEIVED);
-        }
-    }
-
-    public static void finishDownload(String location) {
-        if (location != null) {
-            mMap.remove(location);
-        }
-    }
-
-    private static boolean isNotificationExist(Context context, String location) {
-        String selection = Telephony.Mms.CONTENT_LOCATION + " = ?";
-        String[] selectionArgs = new String[] { location };
-        Cursor c = SqliteWrapper.query(
-                context, context.getContentResolver(),
-                Telephony.Mms.CONTENT_URI, new String[] { Telephony.Mms._ID },
-                selection, selectionArgs, null);
-        if (c != null) {
-            try {
-                if (c.getCount() > 0) {
-                    return true;
-                }
-            } finally {
-                c.close();
-            }
-        }
-
-        return false;
-    }
-}
+
+package com.android.mms.transaction;
+
+import android.app.PendingIntent;
+import android.content.BroadcastReceiver;
+import android.content.ContentResolver;
+import android.content.Context;
+import android.content.Intent;
+import android.content.IntentFilter;
+import android.database.Cursor;
+import android.database.sqlite.SqliteWrapper;
+import android.net.Uri;
+import android.os.Bundle;
+import android.os.PowerManager;
+import android.provider.Telephony;
+import android.telephony.SmsManager;
+import android.text.TextUtils;
+import com.android.mms.MmsConfig;
+import com.klinker.android.send_message.BroadcastUtils;
+import com.klinker.android.send_message.MmsReceivedReceiver;
+import com.klinker.android.send_message.SmsManagerFactory;
+
+import timber.log.Timber;
+
+import java.io.File;
+import java.util.Random;
+import java.util.UUID;
+import java.util.concurrent.ConcurrentHashMap;
+
+/**
+ * In order to avoid downloading duplicate MMS.
+ * We should manage to call SMSManager.downloadMultimediaMessage().
+ */
+public class DownloadManager {
+    private static DownloadManager ourInstance = new DownloadManager();
+    private static final ConcurrentHashMap<String, MmsDownloadReceiver> mMap = new ConcurrentHashMap<>();
+
+    public static DownloadManager getInstance() {
+        return ourInstance;
+    }
+
+    private DownloadManager() {
+
+    }
+
+    public void downloadMultimediaMessage(final Context context, final String location, Uri uri, boolean byPush, int subscriptionId) {
+        if (location == null || mMap.get(location) != null) {
+            return;
+        }
+
+        // TransactionService can keep uri and location in memory while SmsManager download Mms.
+        if (!isNotificationExist(context, location)) {
+            return;
+        }
+
+        MmsDownloadReceiver receiver = new MmsDownloadReceiver();
+        mMap.put(location, receiver);
+
+        // Use unique action in order to avoid cancellation of notifying download result.
+        context.getApplicationContext().registerReceiver(receiver, new IntentFilter(receiver.mAction));
+
+        Timber.v("receiving with system method");
+        final String fileName = "download." + String.valueOf(Math.abs(new Random().nextLong())) + ".dat";
+        File mDownloadFile = new File(context.getCacheDir(), fileName);
+        Uri contentUri = (new Uri.Builder())
+                .authority(context.getPackageName() + ".MmsFileProvider")
+                .path(fileName)
+                .scheme(ContentResolver.SCHEME_CONTENT)
+                .build();
+        Intent download = new Intent(receiver.mAction);
+        download.putExtra(MmsReceivedReceiver.EXTRA_FILE_PATH, mDownloadFile.getPath());
+        download.putExtra(MmsReceivedReceiver.EXTRA_LOCATION_URL, location);
+        download.putExtra(MmsReceivedReceiver.EXTRA_TRIGGER_PUSH, byPush);
+        download.putExtra(MmsReceivedReceiver.EXTRA_URI, uri);
+        final PendingIntent pendingIntent = PendingIntent.getBroadcast(
+                context, 0, download, PendingIntent.FLAG_CANCEL_CURRENT);
+
+        final SmsManager smsManager = SmsManagerFactory.INSTANCE.createSmsManager(subscriptionId);
+        Bundle configOverrides = new Bundle();
+        String httpParams = MmsConfig.getHttpParams();
+        if (!TextUtils.isEmpty(httpParams)) {
+            configOverrides.putString(SmsManager.MMS_CONFIG_HTTP_PARAMS, httpParams);
+        }
+
+        grantUriPermission(context, contentUri);
+        smsManager.downloadMultimediaMessage(context, location, contentUri, configOverrides, pendingIntent);
+    }
+
+    private void grantUriPermission(Context context, Uri contentUri) {
+        context.grantUriPermission(context.getPackageName() + ".MmsFileProvider",
+                contentUri,
+                Intent.FLAG_GRANT_WRITE_URI_PERMISSION);
+    }
+
+    private static class MmsDownloadReceiver extends BroadcastReceiver {
+        private static final String ACTION_PREFIX = "com.android.mms.transaction.DownloadManager$MmsDownloadReceiver.";
+        private final String mAction;
+
+        MmsDownloadReceiver() {
+            mAction = ACTION_PREFIX + UUID.randomUUID().toString();
+        }
+
+        @Override
+        public void onReceive(Context context, Intent intent) {
+            context.unregisterReceiver(this);
+
+            PowerManager pm = (PowerManager)context.getSystemService(Context.POWER_SERVICE);
+            PowerManager.WakeLock wakeLock = pm.newWakeLock(PowerManager.PARTIAL_WAKE_LOCK, "MMS DownloadReceiver");
+            wakeLock.acquire(60 * 1000);
+
+            Intent newIntent = (Intent) intent.clone();
+            newIntent.setAction(MmsReceivedReceiver.MMS_RECEIVED);
+            BroadcastUtils.sendExplicitBroadcast(context, newIntent, MmsReceivedReceiver.MMS_RECEIVED);
+        }
+    }
+
+    public static void finishDownload(String location) {
+        if (location != null) {
+            mMap.remove(location);
+        }
+    }
+
+    private static boolean isNotificationExist(Context context, String location) {
+        String selection = Telephony.Mms.CONTENT_LOCATION + " = ?";
+        String[] selectionArgs = new String[] { location };
+        Cursor c = SqliteWrapper.query(
+                context, context.getContentResolver(),
+                Telephony.Mms.CONTENT_URI, new String[] { Telephony.Mms._ID },
+                selection, selectionArgs, null);
+        if (c != null) {
+            try {
+                if (c.getCount() > 0) {
+                    return true;
+                }
+            } finally {
+                c.close();
+            }
+        }
+
+        return false;
+    }
+}
diff --git a/android-smsmms/src/main/java/com/android/mms/transaction/HttpUtils.java b/android-smsmms/src/main/java/com/android/mms/transaction/HttpUtils.java
index 44457c308..872fb98d2 100755
--- a/android-smsmms/src/main/java/com/android/mms/transaction/HttpUtils.java
+++ b/android-smsmms/src/main/java/com/android/mms/transaction/HttpUtils.java
@@ -1,356 +1,356 @@
-/*
- * Copyright 2014 Jacob Klinker
- *
- * Licensed under the Apache License, Version 2.0 (the "License");
- * you may not use this file except in compliance with the License.
- * You may obtain a copy of the License at
- *
- *     http://www.apache.org/licenses/LICENSE-2.0
- *
- * Unless required by applicable law or agreed to in writing, software
- * distributed under the License is distributed on an "AS IS" BASIS,
- * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
- * See the License for the specific language governing permissions and
- * limitations under the License.
- */
-
-package com.android.mms.transaction;
-
-import android.content.Context;
-import android.net.http.AndroidHttpClient;
-import android.telephony.TelephonyManager;
-import android.text.TextUtils;
-import android.util.Config;
-import com.android.mms.MmsConfig;
-import org.apache.http.HttpEntity;
-import org.apache.http.HttpHost;
-import org.apache.http.HttpRequest;
-import org.apache.http.HttpResponse;
-import org.apache.http.StatusLine;
-import org.apache.http.client.methods.HttpGet;
-import org.apache.http.client.methods.HttpPost;
-import org.apache.http.conn.params.ConnRouteParams;
-import org.apache.http.params.HttpConnectionParams;
-import org.apache.http.params.HttpParams;
-import org.apache.http.params.HttpProtocolParams;
-import timber.log.Timber;
-
-import java.io.DataInputStream;
-import java.io.IOException;
-import java.net.SocketException;
-import java.net.URI;
-import java.net.URISyntaxException;
-import java.util.Locale;
-
-public class HttpUtils {
-
-    private static final boolean DEBUG = false;
-    private static final boolean LOCAL_LOGV = DEBUG ? Config.LOGD : Config.LOGV;
-
-    public static final int HTTP_POST_METHOD = 1;
-    public static final int HTTP_GET_METHOD = 2;
-
-    private static final int MMS_READ_BUFFER = 4096;
-
-    // This is the value to use for the "Accept-Language" header.
-    // Once it becomes possible for the user to change the locale
-    // setting, this should no longer be static.  We should call
-    // getHttpAcceptLanguage instead.
-    private static final String HDR_VALUE_ACCEPT_LANGUAGE;
-
-    static {
-        HDR_VALUE_ACCEPT_LANGUAGE = getCurrentAcceptLanguage(Locale.getDefault());
-    }
-
-    // Definition for necessary HTTP headers.
-    private static final String HDR_KEY_ACCEPT = "Accept";
-    private static final String HDR_KEY_ACCEPT_LANGUAGE = "Accept-Language";
-
-    private static final String HDR_VALUE_ACCEPT =
-        "*/*, application/vnd.wap.mms-message, application/vnd.wap.sic";
-
-    private HttpUtils() {
-        // To forbidden instantiate this class.
-    }
-
-    /**
-     * A helper method to send or retrieve data through HTTP protocol.
-     *
-     * @param token The token to identify the sending progress.
-     * @param url The URL used in a GET request. Null when the method is
-     *         HTTP_POST_METHOD.
-     * @param pdu The data to be POST. Null when the method is HTTP_GET_METHOD.
-     * @param method HTTP_POST_METHOD or HTTP_GET_METHOD.
-     * @return A byte array which contains the response data.
-     *         If an HTTP error code is returned, an IOException will be thrown.
-     * @throws java.io.IOException if any error occurred on network interface or
-     *         an HTTP error code(&gt;=400) returned from the server.
-     */
-    public static byte[] httpConnection(Context context, long token,
-            String url, byte[] pdu, int method, boolean isProxySet,
-            String proxyHost, int proxyPort) throws IOException {
-        if (url == null) {
-            throw new IllegalArgumentException("URL must not be null.");
-        }
-
-        Timber.v("httpConnection: params list");
-        Timber.v("\ttoken\t\t= " + token);
-        Timber.v("\turl\t\t= " + url);
-        Timber.v("\tmethod\t\t= " + ((method == HTTP_POST_METHOD) ? "POST"
-                : ((method == HTTP_GET_METHOD) ? "GET" : "UNKNOWN")));
-        Timber.v("\tisProxySet\t= " + isProxySet);
-        Timber.v("\tproxyHost\t= " + proxyHost);
-        Timber.v("\tproxyPort\t= " + proxyPort);
-        // TODO Print out binary data more readable.
-        //Timber.v("\tpdu\t\t= " + Arrays.toString(pdu));
-
-        AndroidHttpClient client = null;
-
-        try {
-            // Make sure to use a proxy which supports CONNECT.
-            URI hostUrl = new URI(url);
-            HttpHost target = new HttpHost(
-                    hostUrl.getHost(), hostUrl.getPort(),
-                    HttpHost.DEFAULT_SCHEME_NAME);
-
-            client = createHttpClient(context);
-            HttpRequest req = null;
-            switch(method) {
-                case HTTP_POST_METHOD:
-                    ProgressCallbackEntity entity = new ProgressCallbackEntity(
-                                                        context, token, pdu);
-                    // Set request content type.
-                    entity.setContentType("application/vnd.wap.mms-message");
-
-                    HttpPost post = new HttpPost(url);
-                    post.setEntity(entity);
-                    req = post;
-                    break;
-                case HTTP_GET_METHOD:
-                    req = new HttpGet(url);
-                    break;
-                default:
-                    Timber.e("Unknown HTTP method: " + method
-                            + ". Must be one of POST[" + HTTP_POST_METHOD
-                            + "] or GET[" + HTTP_GET_METHOD + "].");
-                    return null;
-            }
-
-            // Set route parameters for the request.
-            HttpParams params = client.getParams();
-            if (isProxySet) {
-                ConnRouteParams.setDefaultProxy(
-                        params, new HttpHost(proxyHost, proxyPort));
-            }
-            req.setParams(params);
-
-            // Set necessary HTTP headers for MMS transmission.
-            req.addHeader(HDR_KEY_ACCEPT, HDR_VALUE_ACCEPT);
-            {
-                String xWapProfileTagName = MmsConfig.getUaProfTagName();
-                String xWapProfileUrl = MmsConfig.getUaProfUrl();
-                if (xWapProfileUrl != null) {
-                    Timber.d("[HttpUtils] httpConn: xWapProfUrl=" + xWapProfileUrl);
-                    req.addHeader(xWapProfileTagName, xWapProfileUrl);
-                }
-            }
-
-            // Extra http parameters. Split by '|' to get a list of value pairs.
-            // Separate each pair by the first occurrence of ':' to obtain a name and
-            // value. Replace the occurrence of the string returned by
-            // MmsConfig.getHttpParamsLine1Key() with the users telephone number inside
-            // the value.
-            String extraHttpParams = MmsConfig.getHttpParams();
-
-            if (extraHttpParams != null) {
-                String line1Number = ((TelephonyManager)context
-                        .getSystemService(Context.TELEPHONY_SERVICE))
-                        .getLine1Number();
-                String line1Key = MmsConfig.getHttpParamsLine1Key();
-                String paramList[] = extraHttpParams.split("\\|");
-
-                for (String paramPair : paramList) {
-                    String splitPair[] = paramPair.split(":", 2);
-
-                    if (splitPair.length == 2) {
-                        String name = splitPair[0].trim();
-                        String value = splitPair[1].trim();
-
-                        if (line1Key != null) {
-                            value = value.replace(line1Key, line1Number);
-                        }
-                        if (!TextUtils.isEmpty(name) && !TextUtils.isEmpty(value)) {
-                            req.addHeader(name, value);
-                        }
-                    }
-                }
-            }
-            req.addHeader(HDR_KEY_ACCEPT_LANGUAGE, HDR_VALUE_ACCEPT_LANGUAGE);
-
-            HttpResponse response = client.execute(target, req);
-            StatusLine status = response.getStatusLine();
-            if (status.getStatusCode() != 200) { // HTTP 200 is success.
-                throw new IOException("HTTP error: " + status.getReasonPhrase());
-            }
-
-            HttpEntity entity = response.getEntity();
-            byte[] body = null;
-            if (entity != null) {
-                try {
-                    if (entity.getContentLength() > 0) {
-                        body = new byte[(int) entity.getContentLength()];
-                        DataInputStream dis = new DataInputStream(entity.getContent());
-                        try {
-                            dis.readFully(body);
-                        } finally {
-                            try {
-                                dis.close();
-                            } catch (IOException e) {
-                                Timber.e("Error closing input stream: " + e.getMessage());
-                            }
-                        }
-                    }
-                    if (entity.isChunked()) {
-                        Timber.v("httpConnection: transfer encoding is chunked");
-                        int bytesTobeRead = MmsConfig.getMaxMessageSize();
-                        byte[] tempBody = new byte[bytesTobeRead];
-                        DataInputStream dis = new DataInputStream(entity.getContent());
-                        try {
-                            int bytesRead = 0;
-                            int offset = 0;
-                            boolean readError = false;
-                            do {
-                                try {
-                                    bytesRead = dis.read(tempBody, offset, bytesTobeRead);
-                                } catch (IOException e) {
-                                    readError = true;
-                                    Timber.e("httpConnection: error reading input stream" + e.getMessage());
-                                    break;
-                                }
-                                if (bytesRead > 0) {
-                                    bytesTobeRead -= bytesRead;
-                                    offset += bytesRead;
-                                }
-                            } while (bytesRead >= 0 && bytesTobeRead > 0);
-                            if (bytesRead == -1 && offset > 0 && !readError) {
-                                // offset is same as total number of bytes read
-                                // bytesRead will be -1 if the data was read till the eof
-                                body = new byte[offset];
-                                System.arraycopy(tempBody, 0, body, 0, offset);
-                                Timber.v("httpConnection: Chunked response length [" + Integer.toString(offset) + "]");
-                            } else {
-                                Timber.e("httpConnection: Response entity too large or empty");
-                            }
-                        } finally {
-                            try {
-                                dis.close();
-                            } catch (IOException e) {
-                                Timber.e("Error closing input stream: " + e.getMessage());
-                            }
-                        }
-                    }
-                } finally {
-                    if (entity != null) {
-                        entity.consumeContent();
-                    }
-                }
-            }
-            return body;
-        } catch (URISyntaxException e) {
-            handleHttpConnectionException(e, url);
-        } catch (IllegalStateException e) {
-            handleHttpConnectionException(e, url);
-        } catch (IllegalArgumentException e) {
-            handleHttpConnectionException(e, url);
-        } catch (SocketException e) {
-            handleHttpConnectionException(e, url);
-        } catch (Exception e) {
-            handleHttpConnectionException(e, url);
-        }
-        finally {
-            if (client != null) {
-                client.close();
-            }
-        }
-        return null;
-    }
-
-    private static void handleHttpConnectionException(Exception exception, String url)
-            throws IOException {
-        // Inner exception should be logged to make life easier.
-        Timber.e("Url: " + url + "\n" + exception.getMessage());
-        IOException e = new IOException(exception.getMessage());
-        e.initCause(exception);
-        throw e;
-    }
-
-    private static AndroidHttpClient createHttpClient(Context context) {
-        String userAgent = MmsConfig.getUserAgent();
-        AndroidHttpClient client = AndroidHttpClient.newInstance(userAgent, context);
-        HttpParams params = client.getParams();
-        HttpProtocolParams.setContentCharset(params, "UTF-8");
-
-        // set the socket timeout
-        int soTimeout = MmsConfig.getHttpSocketTimeout();
-
-        Timber.d("[HttpUtils] createHttpClient w/ socket timeout " + soTimeout + " ms, " + ", UA=" + userAgent);
-        HttpConnectionParams.setSoTimeout(params, soTimeout);
-        return client;
-    }
-
-    private static final String ACCEPT_LANG_FOR_US_LOCALE = "en-US";
-
-    /**
-     * Return the Accept-Language header.  Use the current locale plus
-     * US if we are in a different locale than US.
-     * This code copied from the browser's WebSettings.java
-     * @return Current AcceptLanguage String.
-     */
-    public static String getCurrentAcceptLanguage(Locale locale) {
-        StringBuilder buffer = new StringBuilder();
-        addLocaleToHttpAcceptLanguage(buffer, locale);
-
-        if (!Locale.US.equals(locale)) {
-            if (buffer.length() > 0) {
-                buffer.append(", ");
-            }
-            buffer.append(ACCEPT_LANG_FOR_US_LOCALE);
-        }
-
-        return buffer.toString();
-    }
-
-    /**
-     * Convert obsolete language codes, including Hebrew/Indonesian/Yiddish,
-     * to new standard.
-     */
-    private static String convertObsoleteLanguageCodeToNew(String langCode) {
-        if (langCode == null) {
-            return null;
-        }
-        if ("iw".equals(langCode)) {
-            // Hebrew
-            return "he";
-        } else if ("in".equals(langCode)) {
-            // Indonesian
-            return "id";
-        } else if ("ji".equals(langCode)) {
-            // Yiddish
-            return "yi";
-        }
-        return langCode;
-    }
-
-    private static void addLocaleToHttpAcceptLanguage(StringBuilder builder,
-                                                      Locale locale) {
-        String language = convertObsoleteLanguageCodeToNew(locale.getLanguage());
-        if (language != null) {
-            builder.append(language);
-            String country = locale.getCountry();
-            if (country != null) {
-                builder.append("-");
-                builder.append(country);
-            }
-        }
-    }
-}
+/*
+ * Copyright 2014 Jacob Klinker
+ *
+ * Licensed under the Apache License, Version 2.0 (the "License");
+ * you may not use this file except in compliance with the License.
+ * You may obtain a copy of the License at
+ *
+ *     http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing, software
+ * distributed under the License is distributed on an "AS IS" BASIS,
+ * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ * See the License for the specific language governing permissions and
+ * limitations under the License.
+ */
+
+package com.android.mms.transaction;
+
+import android.content.Context;
+import android.net.http.AndroidHttpClient;
+import android.telephony.TelephonyManager;
+import android.text.TextUtils;
+import android.util.Config;
+import com.android.mms.MmsConfig;
+import org.apache.http.HttpEntity;
+import org.apache.http.HttpHost;
+import org.apache.http.HttpRequest;
+import org.apache.http.HttpResponse;
+import org.apache.http.StatusLine;
+import org.apache.http.client.methods.HttpGet;
+import org.apache.http.client.methods.HttpPost;
+import org.apache.http.conn.params.ConnRouteParams;
+import org.apache.http.params.HttpConnectionParams;
+import org.apache.http.params.HttpParams;
+import org.apache.http.params.HttpProtocolParams;
+import timber.log.Timber;
+
+import java.io.DataInputStream;
+import java.io.IOException;
+import java.net.SocketException;
+import java.net.URI;
+import java.net.URISyntaxException;
+import java.util.Locale;
+
+public class HttpUtils {
+
+    private static final boolean DEBUG = false;
+    private static final boolean LOCAL_LOGV = DEBUG ? Config.LOGD : Config.LOGV;
+
+    public static final int HTTP_POST_METHOD = 1;
+    public static final int HTTP_GET_METHOD = 2;
+
+    private static final int MMS_READ_BUFFER = 4096;
+
+    // This is the value to use for the "Accept-Language" header.
+    // Once it becomes possible for the user to change the locale
+    // setting, this should no longer be static.  We should call
+    // getHttpAcceptLanguage instead.
+    private static final String HDR_VALUE_ACCEPT_LANGUAGE;
+
+    static {
+        HDR_VALUE_ACCEPT_LANGUAGE = getCurrentAcceptLanguage(Locale.getDefault());
+    }
+
+    // Definition for necessary HTTP headers.
+    private static final String HDR_KEY_ACCEPT = "Accept";
+    private static final String HDR_KEY_ACCEPT_LANGUAGE = "Accept-Language";
+
+    private static final String HDR_VALUE_ACCEPT =
+        "*/*, application/vnd.wap.mms-message, application/vnd.wap.sic";
+
+    private HttpUtils() {
+        // To forbidden instantiate this class.
+    }
+
+    /**
+     * A helper method to send or retrieve data through HTTP protocol.
+     *
+     * @param token The token to identify the sending progress.
+     * @param url The URL used in a GET request. Null when the method is
+     *         HTTP_POST_METHOD.
+     * @param pdu The data to be POST. Null when the method is HTTP_GET_METHOD.
+     * @param method HTTP_POST_METHOD or HTTP_GET_METHOD.
+     * @return A byte array which contains the response data.
+     *         If an HTTP error code is returned, an IOException will be thrown.
+     * @throws java.io.IOException if any error occurred on network interface or
+     *         an HTTP error code(&gt;=400) returned from the server.
+     */
+    public static byte[] httpConnection(Context context, long token,
+            String url, byte[] pdu, int method, boolean isProxySet,
+            String proxyHost, int proxyPort) throws IOException {
+        if (url == null) {
+            throw new IllegalArgumentException("URL must not be null.");
+        }
+
+        Timber.v("httpConnection: params list");
+        Timber.v("\ttoken\t\t= " + token);
+        Timber.v("\turl\t\t= " + url);
+        Timber.v("\tmethod\t\t= " + ((method == HTTP_POST_METHOD) ? "POST"
+                : ((method == HTTP_GET_METHOD) ? "GET" : "UNKNOWN")));
+        Timber.v("\tisProxySet\t= " + isProxySet);
+        Timber.v("\tproxyHost\t= " + proxyHost);
+        Timber.v("\tproxyPort\t= " + proxyPort);
+        // TODO Print out binary data more readable.
+        //Timber.v("\tpdu\t\t= " + Arrays.toString(pdu));
+
+        AndroidHttpClient client = null;
+
+        try {
+            // Make sure to use a proxy which supports CONNECT.
+            URI hostUrl = new URI(url);
+            HttpHost target = new HttpHost(
+                    hostUrl.getHost(), hostUrl.getPort(),
+                    HttpHost.DEFAULT_SCHEME_NAME);
+
+            client = createHttpClient(context);
+            HttpRequest req = null;
+            switch(method) {
+                case HTTP_POST_METHOD:
+                    ProgressCallbackEntity entity = new ProgressCallbackEntity(
+                                                        context, token, pdu);
+                    // Set request content type.
+                    entity.setContentType("application/vnd.wap.mms-message");
+
+                    HttpPost post = new HttpPost(url);
+                    post.setEntity(entity);
+                    req = post;
+                    break;
+                case HTTP_GET_METHOD:
+                    req = new HttpGet(url);
+                    break;
+                default:
+                    Timber.e("Unknown HTTP method: " + method
+                            + ". Must be one of POST[" + HTTP_POST_METHOD
+                            + "] or GET[" + HTTP_GET_METHOD + "].");
+                    return null;
+            }
+
+            // Set route parameters for the request.
+            HttpParams params = client.getParams();
+            if (isProxySet) {
+                ConnRouteParams.setDefaultProxy(
+                        params, new HttpHost(proxyHost, proxyPort));
+            }
+            req.setParams(params);
+
+            // Set necessary HTTP headers for MMS transmission.
+            req.addHeader(HDR_KEY_ACCEPT, HDR_VALUE_ACCEPT);
+            {
+                String xWapProfileTagName = MmsConfig.getUaProfTagName();
+                String xWapProfileUrl = MmsConfig.getUaProfUrl();
+                if (xWapProfileUrl != null) {
+                    Timber.d("[HttpUtils] httpConn: xWapProfUrl=" + xWapProfileUrl);
+                    req.addHeader(xWapProfileTagName, xWapProfileUrl);
+                }
+            }
+
+            // Extra http parameters. Split by '|' to get a list of value pairs.
+            // Separate each pair by the first occurrence of ':' to obtain a name and
+            // value. Replace the occurrence of the string returned by
+            // MmsConfig.getHttpParamsLine1Key() with the users telephone number inside
+            // the value.
+            String extraHttpParams = MmsConfig.getHttpParams();
+
+            if (extraHttpParams != null) {
+                String line1Number = ((TelephonyManager)context
+                        .getSystemService(Context.TELEPHONY_SERVICE))
+                        .getLine1Number();
+                String line1Key = MmsConfig.getHttpParamsLine1Key();
+                String paramList[] = extraHttpParams.split("\\|");
+
+                for (String paramPair : paramList) {
+                    String splitPair[] = paramPair.split(":", 2);
+
+                    if (splitPair.length == 2) {
+                        String name = splitPair[0].trim();
+                        String value = splitPair[1].trim();
+
+                        if (line1Key != null) {
+                            value = value.replace(line1Key, line1Number);
+                        }
+                        if (!TextUtils.isEmpty(name) && !TextUtils.isEmpty(value)) {
+                            req.addHeader(name, value);
+                        }
+                    }
+                }
+            }
+            req.addHeader(HDR_KEY_ACCEPT_LANGUAGE, HDR_VALUE_ACCEPT_LANGUAGE);
+
+            HttpResponse response = client.execute(target, req);
+            StatusLine status = response.getStatusLine();
+            if (status.getStatusCode() != 200) { // HTTP 200 is success.
+                throw new IOException("HTTP error: " + status.getReasonPhrase());
+            }
+
+            HttpEntity entity = response.getEntity();
+            byte[] body = null;
+            if (entity != null) {
+                try {
+                    if (entity.getContentLength() > 0) {
+                        body = new byte[(int) entity.getContentLength()];
+                        DataInputStream dis = new DataInputStream(entity.getContent());
+                        try {
+                            dis.readFully(body);
+                        } finally {
+                            try {
+                                dis.close();
+                            } catch (IOException e) {
+                                Timber.e("Error closing input stream: " + e.getMessage());
+                            }
+                        }
+                    }
+                    if (entity.isChunked()) {
+                        Timber.v("httpConnection: transfer encoding is chunked");
+                        int bytesTobeRead = MmsConfig.getMaxMessageSize();
+                        byte[] tempBody = new byte[bytesTobeRead];
+                        DataInputStream dis = new DataInputStream(entity.getContent());
+                        try {
+                            int bytesRead = 0;
+                            int offset = 0;
+                            boolean readError = false;
+                            do {
+                                try {
+                                    bytesRead = dis.read(tempBody, offset, bytesTobeRead);
+                                } catch (IOException e) {
+                                    readError = true;
+                                    Timber.e("httpConnection: error reading input stream" + e.getMessage());
+                                    break;
+                                }
+                                if (bytesRead > 0) {
+                                    bytesTobeRead -= bytesRead;
+                                    offset += bytesRead;
+                                }
+                            } while (bytesRead >= 0 && bytesTobeRead > 0);
+                            if (bytesRead == -1 && offset > 0 && !readError) {
+                                // offset is same as total number of bytes read
+                                // bytesRead will be -1 if the data was read till the eof
+                                body = new byte[offset];
+                                System.arraycopy(tempBody, 0, body, 0, offset);
+                                Timber.v("httpConnection: Chunked response length [" + Integer.toString(offset) + "]");
+                            } else {
+                                Timber.e("httpConnection: Response entity too large or empty");
+                            }
+                        } finally {
+                            try {
+                                dis.close();
+                            } catch (IOException e) {
+                                Timber.e("Error closing input stream: " + e.getMessage());
+                            }
+                        }
+                    }
+                } finally {
+                    if (entity != null) {
+                        entity.consumeContent();
+                    }
+                }
+            }
+            return body;
+        } catch (URISyntaxException e) {
+            handleHttpConnectionException(e, url);
+        } catch (IllegalStateException e) {
+            handleHttpConnectionException(e, url);
+        } catch (IllegalArgumentException e) {
+            handleHttpConnectionException(e, url);
+        } catch (SocketException e) {
+            handleHttpConnectionException(e, url);
+        } catch (Exception e) {
+            handleHttpConnectionException(e, url);
+        }
+        finally {
+            if (client != null) {
+                client.close();
+            }
+        }
+        return null;
+    }
+
+    private static void handleHttpConnectionException(Exception exception, String url)
+            throws IOException {
+        // Inner exception should be logged to make life easier.
+        Timber.e("Url: " + url + "\n" + exception.getMessage());
+        IOException e = new IOException(exception.getMessage());
+        e.initCause(exception);
+        throw e;
+    }
+
+    private static AndroidHttpClient createHttpClient(Context context) {
+        String userAgent = MmsConfig.getUserAgent();
+        AndroidHttpClient client = AndroidHttpClient.newInstance(userAgent, context);
+        HttpParams params = client.getParams();
+        HttpProtocolParams.setContentCharset(params, "UTF-8");
+
+        // set the socket timeout
+        int soTimeout = MmsConfig.getHttpSocketTimeout();
+
+        Timber.d("[HttpUtils] createHttpClient w/ socket timeout " + soTimeout + " ms, " + ", UA=" + userAgent);
+        HttpConnectionParams.setSoTimeout(params, soTimeout);
+        return client;
+    }
+
+    private static final String ACCEPT_LANG_FOR_US_LOCALE = "en-US";
+
+    /**
+     * Return the Accept-Language header.  Use the current locale plus
+     * US if we are in a different locale than US.
+     * This code copied from the browser's WebSettings.java
+     * @return Current AcceptLanguage String.
+     */
+    public static String getCurrentAcceptLanguage(Locale locale) {
+        StringBuilder buffer = new StringBuilder();
+        addLocaleToHttpAcceptLanguage(buffer, locale);
+
+        if (!Locale.US.equals(locale)) {
+            if (buffer.length() > 0) {
+                buffer.append(", ");
+            }
+            buffer.append(ACCEPT_LANG_FOR_US_LOCALE);
+        }
+
+        return buffer.toString();
+    }
+
+    /**
+     * Convert obsolete language codes, including Hebrew/Indonesian/Yiddish,
+     * to new standard.
+     */
+    private static String convertObsoleteLanguageCodeToNew(String langCode) {
+        if (langCode == null) {
+            return null;
+        }
+        if ("iw".equals(langCode)) {
+            // Hebrew
+            return "he";
+        } else if ("in".equals(langCode)) {
+            // Indonesian
+            return "id";
+        } else if ("ji".equals(langCode)) {
+            // Yiddish
+            return "yi";
+        }
+        return langCode;
+    }
+
+    private static void addLocaleToHttpAcceptLanguage(StringBuilder builder,
+                                                      Locale locale) {
+        String language = convertObsoleteLanguageCodeToNew(locale.getLanguage());
+        if (language != null) {
+            builder.append(language);
+            String country = locale.getCountry();
+            if (country != null) {
+                builder.append("-");
+                builder.append(country);
+            }
+        }
+    }
+}
diff --git a/android-smsmms/src/main/java/com/android/mms/transaction/MessageStatusReceiver.java b/android-smsmms/src/main/java/com/android/mms/transaction/MessageStatusReceiver.java
index dbb9b44ad..90d70a891 100755
--- a/android-smsmms/src/main/java/com/android/mms/transaction/MessageStatusReceiver.java
+++ b/android-smsmms/src/main/java/com/android/mms/transaction/MessageStatusReceiver.java
@@ -1,35 +1,35 @@
-/*
- * Copyright (C) 2007 Esmertec AG.
- * Copyright (C) 2007 The Android Open Source Project
- *
- * Licensed under the Apache License, Version 2.0 (the "License");
- * you may not use this file except in compliance with the License.
- * You may obtain a copy of the License at
- *
- *      http://www.apache.org/licenses/LICENSE-2.0
- *
- * Unless required by applicable law or agreed to in writing, software
- * distributed under the License is distributed on an "AS IS" BASIS,
- * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
- * See the License for the specific language governing permissions and
- * limitations under the License.
- */
-
-package com.android.mms.transaction;
-
-import android.content.BroadcastReceiver;
-import android.content.Context;
-import android.content.Intent;
-
-public class MessageStatusReceiver extends BroadcastReceiver {
-    public static final String MESSAGE_STATUS_RECEIVED_ACTION =
-            "com.android.mms.transaction.MessageStatusReceiver.MESSAGE_STATUS_RECEIVED";
-
-    @Override
-    public void onReceive(Context context, Intent intent) {
-        if (MESSAGE_STATUS_RECEIVED_ACTION.equals(intent.getAction())) {
-            intent.setClass(context, MessageStatusService.class);
-            context.startService(intent);
-       }
-    }
-}
+/*
+ * Copyright (C) 2007 Esmertec AG.
+ * Copyright (C) 2007 The Android Open Source Project
+ *
+ * Licensed under the Apache License, Version 2.0 (the "License");
+ * you may not use this file except in compliance with the License.
+ * You may obtain a copy of the License at
+ *
+ *      http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing, software
+ * distributed under the License is distributed on an "AS IS" BASIS,
+ * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ * See the License for the specific language governing permissions and
+ * limitations under the License.
+ */
+
+package com.android.mms.transaction;
+
+import android.content.BroadcastReceiver;
+import android.content.Context;
+import android.content.Intent;
+
+public class MessageStatusReceiver extends BroadcastReceiver {
+    public static final String MESSAGE_STATUS_RECEIVED_ACTION =
+            "com.android.mms.transaction.MessageStatusReceiver.MESSAGE_STATUS_RECEIVED";
+
+    @Override
+    public void onReceive(Context context, Intent intent) {
+        if (MESSAGE_STATUS_RECEIVED_ACTION.equals(intent.getAction())) {
+            intent.setClass(context, MessageStatusService.class);
+            context.startService(intent);
+       }
+    }
+}
diff --git a/android-smsmms/src/main/java/com/android/mms/transaction/MessageStatusService.java b/android-smsmms/src/main/java/com/android/mms/transaction/MessageStatusService.java
index d41506165..90fc62108 100755
--- a/android-smsmms/src/main/java/com/android/mms/transaction/MessageStatusService.java
+++ b/android-smsmms/src/main/java/com/android/mms/transaction/MessageStatusService.java
@@ -1,112 +1,112 @@
-/*
- * Copyright 2014 Jacob Klinker
- *
- * Licensed under the Apache License, Version 2.0 (the "License");
- * you may not use this file except in compliance with the License.
- * You may obtain a copy of the License at
- *
- *     http://www.apache.org/licenses/LICENSE-2.0
- *
- * Unless required by applicable law or agreed to in writing, software
- * distributed under the License is distributed on an "AS IS" BASIS,
- * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
- * See the License for the specific language governing permissions and
- * limitations under the License.
- */
-
-package com.android.mms.transaction;
-
-import android.app.IntentService;
-import android.content.ContentUris;
-import android.content.ContentValues;
-import android.content.Context;
-import android.content.Intent;
-import android.database.Cursor;
-import android.database.sqlite.SqliteWrapper;
-import android.net.Uri;
-import android.provider.Telephony.Sms;
-import android.provider.Telephony.Sms.Inbox;
-import android.telephony.SmsMessage;
-import timber.log.Timber;
-
-/**
- * Service that gets started by the MessageStatusReceiver when a message status report is
- * received.
- */
-public class MessageStatusService extends IntentService {
-    private static final String[] ID_PROJECTION = new String[] { Sms._ID };
-    private static final Uri STATUS_URI = Uri.parse("content://sms/status");
-
-    public MessageStatusService() {
-        // Class name will be the thread name.
-        super(MessageStatusService.class.getName());
-
-        // Intent should be redelivered if the process gets killed before completing the job.
-        setIntentRedelivery(true);
-    }
-
-    @Override
-    protected void onHandleIntent(Intent intent) {
-        // This method is called on a worker thread.
-
-        String messageUri = intent.getDataString();
-        if (messageUri == null) {
-            messageUri = intent.getStringExtra("message_uri");
-            if (messageUri == null) {
-                return;
-            }
-        }
-
-        byte[] pdu = intent.getByteArrayExtra("pdu");
-        String format = intent.getStringExtra("format");
-
-        SmsMessage message = updateMessageStatus(this, Uri.parse(messageUri), pdu, format);
-    }
-
-    private SmsMessage updateMessageStatus(Context context, Uri messageUri, byte[] pdu,
-            String format) {
-        SmsMessage message = SmsMessage.createFromPdu(pdu);
-        if (message == null) {
-            return null;
-        }
-        // Create a "status/#" URL and use it to update the
-        // message's status in the database.
-        Cursor cursor = SqliteWrapper.query(context, context.getContentResolver(),
-                            messageUri, ID_PROJECTION, null, null, null);
-        if (cursor == null) {
-            return null;
-        }
-
-        try {
-            if (cursor.moveToFirst()) {
-                int messageId = cursor.getInt(0);
-
-                Uri updateUri = ContentUris.withAppendedId(STATUS_URI, messageId);
-                int status = message.getStatus();
-                boolean isStatusReport = message.isStatusReportMessage();
-                ContentValues contentValues = new ContentValues(2);
-
-                log("updateMessageStatus: msgUrl=" + messageUri + ", status=" + status
-                        + ", isStatusReport=" + isStatusReport);
-
-                contentValues.put(Sms.STATUS, status);
-                contentValues.put(Inbox.DATE_SENT, System.currentTimeMillis());
-                SqliteWrapper.update(context, context.getContentResolver(),
-                                    updateUri, contentValues, null, null);
-            } else {
-                error("Can't find message for status update: " + messageUri);
-            }
-        } finally {
-            cursor.close();
-        }
-        return message;
-    }
-
-    private void error(String message) {
-        Timber.e("[MessageStatusReceiver] " + message);
-    }
-
-    private void log(String message) {
-        Timber.d("[MessageStatusReceiver] " + message);
-    }
-}
+/*
+ * Copyright 2014 Jacob Klinker
+ *
+ * Licensed under the Apache License, Version 2.0 (the "License");
+ * you may not use this file except in compliance with the License.
+ * You may obtain a copy of the License at
+ *
+ *     http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing, software
+ * distributed under the License is distributed on an "AS IS" BASIS,
+ * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ * See the License for the specific language governing permissions and
+ * limitations under the License.
+ */
+
+package com.android.mms.transaction;
+
+import android.app.IntentService;
+import android.content.ContentUris;
+import android.content.ContentValues;
+import android.content.Context;
+import android.content.Intent;
+import android.database.Cursor;
+import android.database.sqlite.SqliteWrapper;
+import android.net.Uri;
+import android.provider.Telephony.Sms;
+import android.provider.Telephony.Sms.Inbox;
+import android.telephony.SmsMessage;
+import timber.log.Timber;
+
+/**
+ * Service that gets started by the MessageStatusReceiver when a message status report is
+ * received.
+ */
+public class MessageStatusService extends IntentService {
+    private static final String[] ID_PROJECTION = new String[] { Sms._ID };
+    private static final Uri STATUS_URI = Uri.parse("content://sms/status");
+
+    public MessageStatusService() {
+        // Class name will be the thread name.
+        super(MessageStatusService.class.getName());
+
+        // Intent should be redelivered if the process gets killed before completing the job.
+        setIntentRedelivery(true);
+    }
+
+    @Override
+    protected void onHandleIntent(Intent intent) {
+        // This method is called on a worker thread.
+
+        String messageUri = intent.getDataString();
+        if (messageUri == null) {
+            messageUri = intent.getStringExtra("message_uri");
+            if (messageUri == null) {
+                return;
+            }
+        }
+
+        byte[] pdu = intent.getByteArrayExtra("pdu");
+        String format = intent.getStringExtra("format");
+
+        SmsMessage message = updateMessageStatus(this, Uri.parse(messageUri), pdu, format);
+    }
+
+    private SmsMessage updateMessageStatus(Context context, Uri messageUri, byte[] pdu,
+            String format) {
+        SmsMessage message = SmsMessage.createFromPdu(pdu);
+        if (message == null) {
+            return null;
+        }
+        // Create a "status/#" URL and use it to update the
+        // message's status in the database.
+        Cursor cursor = SqliteWrapper.query(context, context.getContentResolver(),
+                            messageUri, ID_PROJECTION, null, null, null);
+        if (cursor == null) {
+            return null;
+        }
+
+        try {
+            if (cursor.moveToFirst()) {
+                int messageId = cursor.getInt(0);
+
+                Uri updateUri = ContentUris.withAppendedId(STATUS_URI, messageId);
+                int status = message.getStatus();
+                boolean isStatusReport = message.isStatusReportMessage();
+                ContentValues contentValues = new ContentValues(2);
+
+                log("updateMessageStatus: msgUrl=" + messageUri + ", status=" + status
+                        + ", isStatusReport=" + isStatusReport);
+
+                contentValues.put(Sms.STATUS, status);
+                contentValues.put(Inbox.DATE_SENT, System.currentTimeMillis());
+                SqliteWrapper.update(context, context.getContentResolver(),
+                                    updateUri, contentValues, null, null);
+            } else {
+                error("Can't find message for status update: " + messageUri);
+            }
+        } finally {
+            cursor.close();
+        }
+        return message;
+    }
+
+    private void error(String message) {
+        Timber.e("[MessageStatusReceiver] " + message);
+    }
+
+    private void log(String message) {
+        Timber.d("[MessageStatusReceiver] " + message);
+    }
+}
diff --git a/android-smsmms/src/main/java/com/android/mms/transaction/MmsPushOutboxMessages.java b/android-smsmms/src/main/java/com/android/mms/transaction/MmsPushOutboxMessages.java
index bee69171d..e3ee6ae83 100755
--- a/android-smsmms/src/main/java/com/android/mms/transaction/MmsPushOutboxMessages.java
+++ b/android-smsmms/src/main/java/com/android/mms/transaction/MmsPushOutboxMessages.java
@@ -1,43 +1,43 @@
-/*
- * Copyright 2014 Jacob Klinker
- *
- * Licensed under the Apache License, Version 2.0 (the "License");
- * you may not use this file except in compliance with the License.
- * You may obtain a copy of the License at
- *
- *     http://www.apache.org/licenses/LICENSE-2.0
- *
- * Unless required by applicable law or agreed to in writing, software
- * distributed under the License is distributed on an "AS IS" BASIS,
- * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
- * See the License for the specific language governing permissions and
- * limitations under the License.
- */
-package com.android.mms.transaction;
-
-import android.content.BroadcastReceiver;
-import android.content.Context;
-import android.content.Intent;
-import timber.log.Timber;
-
-/**
- * MmsPushOutboxMessages listens for MMS_SEND_OUTBOX_MSG intent .
- * {@link android.intent.action.MMS_SEND_OUTBOX_MSG},
- * and wakes up the mms service when it receives it.
- * This will tricker the mms service to send any messages stored
- * in the outbox.
- */
-public class MmsPushOutboxMessages extends BroadcastReceiver {
-    private static final String INTENT_MMS_SEND_OUTBOX_MSG = "android.intent.action.MMS_SEND_OUTBOX_MSG";
-
-    @Override
-    public void onReceive(Context context, Intent intent) {
-        Timber.v("Received the MMS_SEND_OUTBOX_MSG intent: " + intent);
-        String action = intent.getAction();
-        if(action.equalsIgnoreCase(INTENT_MMS_SEND_OUTBOX_MSG)){
-            Timber.d("Now waking up the MMS service");
-            context.startService(new Intent(context, TransactionService.class));
-        }
-    }
-
-}
+/*
+ * Copyright 2014 Jacob Klinker
+ *
+ * Licensed under the Apache License, Version 2.0 (the "License");
+ * you may not use this file except in compliance with the License.
+ * You may obtain a copy of the License at
+ *
+ *     http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing, software
+ * distributed under the License is distributed on an "AS IS" BASIS,
+ * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ * See the License for the specific language governing permissions and
+ * limitations under the License.
+ */
+package com.android.mms.transaction;
+
+import android.content.BroadcastReceiver;
+import android.content.Context;
+import android.content.Intent;
+import timber.log.Timber;
+
+/**
+ * MmsPushOutboxMessages listens for MMS_SEND_OUTBOX_MSG intent .
+ * {@link android.intent.action.MMS_SEND_OUTBOX_MSG},
+ * and wakes up the mms service when it receives it.
+ * This will tricker the mms service to send any messages stored
+ * in the outbox.
+ */
+public class MmsPushOutboxMessages extends BroadcastReceiver {
+    private static final String INTENT_MMS_SEND_OUTBOX_MSG = "android.intent.action.MMS_SEND_OUTBOX_MSG";
+
+    @Override
+    public void onReceive(Context context, Intent intent) {
+        Timber.v("Received the MMS_SEND_OUTBOX_MSG intent: " + intent);
+        String action = intent.getAction();
+        if(action.equalsIgnoreCase(INTENT_MMS_SEND_OUTBOX_MSG)){
+            Timber.d("Now waking up the MMS service");
+            context.startService(new Intent(context, TransactionService.class));
+        }
+    }
+
+}
diff --git a/android-smsmms/src/main/java/com/android/mms/transaction/MmsSystemEventReceiver.java b/android-smsmms/src/main/java/com/android/mms/transaction/MmsSystemEventReceiver.java
index b0e125fd7..37ec30a92 100755
--- a/android-smsmms/src/main/java/com/android/mms/transaction/MmsSystemEventReceiver.java
+++ b/android-smsmms/src/main/java/com/android/mms/transaction/MmsSystemEventReceiver.java
@@ -1,99 +1,99 @@
-/*
- * Copyright 2014 Jacob Klinker
- *
- * Licensed under the Apache License, Version 2.0 (the "License");
- * you may not use this file except in compliance with the License.
- * You may obtain a copy of the License at
- *
- *     http://www.apache.org/licenses/LICENSE-2.0
- *
- * Unless required by applicable law or agreed to in writing, software
- * distributed under the License is distributed on an "AS IS" BASIS,
- * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
- * See the License for the specific language governing permissions and
- * limitations under the License.
- */
-
-package com.android.mms.transaction;
-
-import android.content.BroadcastReceiver;
-import android.content.Context;
-import android.content.Intent;
-import android.net.ConnectivityManager;
-import android.net.NetworkInfo;
-import android.net.Uri;
-import android.provider.Telephony.Mms;
-import com.klinker.android.send_message.Utils;
-import timber.log.Timber;
-
-/**
- * MmsSystemEventReceiver receives the
- * and performs a series of operations which may include:
- * <ul>
- * <li>Show/hide the icon in notification area which is used to indicate
- * whether there is new incoming message.</li>
- * <li>Resend the MM's in the outbox.</li>
- * </ul>
- */
-public class MmsSystemEventReceiver extends BroadcastReceiver {
-    private static ConnectivityManager mConnMgr = null;
-
-    public static void wakeUpService(Context context) {
-    }
-
-    @Override
-    public void onReceive(Context context, Intent intent) {
-        Timber.v("Intent received: " + intent);
-
-        if (!Utils.isDefaultSmsApp(context)) {
-            Timber.v("not default sms app, cancelling");
-            return;
-        }
-
-        String action = intent.getAction();
-        if (action.equals(Mms.Intents.CONTENT_CHANGED_ACTION)) {
-            Uri changed = (Uri) intent.getParcelableExtra(Mms.Intents.DELETED_CONTENTS);
-        } else if (action.equals(ConnectivityManager.CONNECTIVITY_ACTION)) {
-            if (mConnMgr == null) {
-                mConnMgr = (ConnectivityManager) context
-                        .getSystemService(Context.CONNECTIVITY_SERVICE);
-            }
-
-            if (Utils.isMmsOverWifiEnabled(context)) {
-                NetworkInfo niWF = mConnMgr.getNetworkInfo(ConnectivityManager.TYPE_WIFI);
-                if ((niWF != null) && (niWF.isConnected())) {
-                    Timber.v("TYPE_WIFI connected");
-                    wakeUpService(context);
-                }
-            } else {
-                boolean mobileDataEnabled = Utils.isMobileDataEnabled(context);
-                if (!mobileDataEnabled) {
-                    Timber.v("mobile data turned off, bailing");
-                    //Utils.setMobileDataEnabled(context, true);
-                    return;
-                }
-                NetworkInfo mmsNetworkInfo = mConnMgr.getNetworkInfo(ConnectivityManager.TYPE_MOBILE_MMS);
-                if (mmsNetworkInfo == null) {
-                    return;
-                }
-                boolean available = mmsNetworkInfo.isAvailable();
-                boolean isConnected = mmsNetworkInfo.isConnected();
-
-                Timber.v("TYPE_MOBILE_MMS available = " + available + ", isConnected = " + isConnected);
-
-                // Wake up transact service when MMS data is available and isn't connected.
-                if (available && !isConnected) {
-                    wakeUpService(context);
-                }
-            }
-        } else if (action.equals(Intent.ACTION_BOOT_COMPLETED)) {
-            // We should check whether there are unread incoming
-            // messages in the Inbox and then update the notification icon.
-            // Called on the UI thread so don't block.
-
-            // Scan and send pending Mms once after boot completed since
-            // ACTION_ANY_DATA_CONNECTION_STATE_CHANGED wasn't registered in a whole life cycle
-            wakeUpService(context);
-        }
-    }
-}
+/*
+ * Copyright 2014 Jacob Klinker
+ *
+ * Licensed under the Apache License, Version 2.0 (the "License");
+ * you may not use this file except in compliance with the License.
+ * You may obtain a copy of the License at
+ *
+ *     http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing, software
+ * distributed under the License is distributed on an "AS IS" BASIS,
+ * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ * See the License for the specific language governing permissions and
+ * limitations under the License.
+ */
+
+package com.android.mms.transaction;
+
+import android.content.BroadcastReceiver;
+import android.content.Context;
+import android.content.Intent;
+import android.net.ConnectivityManager;
+import android.net.NetworkInfo;
+import android.net.Uri;
+import android.provider.Telephony.Mms;
+import com.klinker.android.send_message.Utils;
+import timber.log.Timber;
+
+/**
+ * MmsSystemEventReceiver receives the
+ * and performs a series of operations which may include:
+ * <ul>
+ * <li>Show/hide the icon in notification area which is used to indicate
+ * whether there is new incoming message.</li>
+ * <li>Resend the MM's in the outbox.</li>
+ * </ul>
+ */
+public class MmsSystemEventReceiver extends BroadcastReceiver {
+    private static ConnectivityManager mConnMgr = null;
+
+    public static void wakeUpService(Context context) {
+    }
+
+    @Override
+    public void onReceive(Context context, Intent intent) {
+        Timber.v("Intent received: " + intent);
+
+        if (!Utils.isDefaultSmsApp(context)) {
+            Timber.v("not default sms app, cancelling");
+            return;
+        }
+
+        String action = intent.getAction();
+        if (action.equals(Mms.Intents.CONTENT_CHANGED_ACTION)) {
+            Uri changed = (Uri) intent.getParcelableExtra(Mms.Intents.DELETED_CONTENTS);
+        } else if (action.equals(ConnectivityManager.CONNECTIVITY_ACTION)) {
+            if (mConnMgr == null) {
+                mConnMgr = (ConnectivityManager) context
+                        .getSystemService(Context.CONNECTIVITY_SERVICE);
+            }
+
+            if (Utils.isMmsOverWifiEnabled(context)) {
+                NetworkInfo niWF = mConnMgr.getNetworkInfo(ConnectivityManager.TYPE_WIFI);
+                if ((niWF != null) && (niWF.isConnected())) {
+                    Timber.v("TYPE_WIFI connected");
+                    wakeUpService(context);
+                }
+            } else {
+                boolean mobileDataEnabled = Utils.isMobileDataEnabled(context);
+                if (!mobileDataEnabled) {
+                    Timber.v("mobile data turned off, bailing");
+                    //Utils.setMobileDataEnabled(context, true);
+                    return;
+                }
+                NetworkInfo mmsNetworkInfo = mConnMgr.getNetworkInfo(ConnectivityManager.TYPE_MOBILE_MMS);
+                if (mmsNetworkInfo == null) {
+                    return;
+                }
+                boolean available = mmsNetworkInfo.isAvailable();
+                boolean isConnected = mmsNetworkInfo.isConnected();
+
+                Timber.v("TYPE_MOBILE_MMS available = " + available + ", isConnected = " + isConnected);
+
+                // Wake up transact service when MMS data is available and isn't connected.
+                if (available && !isConnected) {
+                    wakeUpService(context);
+                }
+            }
+        } else if (action.equals(Intent.ACTION_BOOT_COMPLETED)) {
+            // We should check whether there are unread incoming
+            // messages in the Inbox and then update the notification icon.
+            // Called on the UI thread so don't block.
+
+            // Scan and send pending Mms once after boot completed since
+            // ACTION_ANY_DATA_CONNECTION_STATE_CHANGED wasn't registered in a whole life cycle
+            wakeUpService(context);
+        }
+    }
+}
diff --git a/android-smsmms/src/main/java/com/android/mms/transaction/NotificationTransaction.java b/android-smsmms/src/main/java/com/android/mms/transaction/NotificationTransaction.java
index 1b03c0bab..1fc3cc0f0 100755
--- a/android-smsmms/src/main/java/com/android/mms/transaction/NotificationTransaction.java
+++ b/android-smsmms/src/main/java/com/android/mms/transaction/NotificationTransaction.java
@@ -1,275 +1,275 @@
-/*
- * Copyright 2014 Jacob Klinker
- *
- * Licensed under the Apache License, Version 2.0 (the "License");
- * you may not use this file except in compliance with the License.
- * You may obtain a copy of the License at
- *
- *     http://www.apache.org/licenses/LICENSE-2.0
- *
- * Unless required by applicable law or agreed to in writing, software
- * distributed under the License is distributed on an "AS IS" BASIS,
- * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
- * See the License for the specific language governing permissions and
- * limitations under the License.
- */
-
-package com.android.mms.transaction;
-
-import android.app.Service;
-import android.content.ContentValues;
-import android.content.Context;
-import android.content.Intent;
-import android.database.sqlite.SqliteWrapper;
-import android.net.Uri;
-import android.os.Looper;
-import android.preference.PreferenceManager;
-import android.provider.Telephony.Mms;
-import android.provider.Telephony.Mms.Inbox;
-import android.provider.Telephony.Threads;
-import android.telephony.TelephonyManager;
-
-import com.android.mms.MmsConfig;
-import com.android.mms.util.DownloadManager;
-import com.google.android.mms.MmsException;
-import com.google.android.mms.pdu_alt.GenericPdu;
-import com.google.android.mms.pdu_alt.NotificationInd;
-import com.google.android.mms.pdu_alt.NotifyRespInd;
-import com.google.android.mms.pdu_alt.PduComposer;
-import com.google.android.mms.pdu_alt.PduHeaders;
-import com.google.android.mms.pdu_alt.PduParser;
-import com.google.android.mms.pdu_alt.PduPersister;
-import com.google.android.mms.pdu_alt.RetrieveConf;
-import com.klinker.android.send_message.BroadcastUtils;
-
-import java.io.IOException;
-
-import timber.log.Timber;
-
-import static com.android.mms.transaction.TransactionState.FAILED;
-import static com.android.mms.transaction.TransactionState.INITIALIZED;
-import static com.android.mms.transaction.TransactionState.SUCCESS;
-import static com.google.android.mms.pdu_alt.PduHeaders.MESSAGE_TYPE_RETRIEVE_CONF;
-import static com.google.android.mms.pdu_alt.PduHeaders.STATUS_DEFERRED;
-import static com.google.android.mms.pdu_alt.PduHeaders.STATUS_RETRIEVED;
-import static com.google.android.mms.pdu_alt.PduHeaders.STATUS_UNRECOGNIZED;
-
-/**
- * The NotificationTransaction is responsible for handling multimedia
- * message notifications (M-Notification.ind).  It:
- *
- * <ul>
- * <li>Composes the notification response (M-NotifyResp.ind).
- * <li>Sends the notification response to the MMSC server.
- * <li>Stores the notification indication.
- * <li>Notifies the TransactionService about succesful completion.
- * </ul>
- *
- * NOTE: This MMS client handles all notifications with a <b>deferred
- * retrieval</b> response.  The transaction service, upon succesful
- * completion of this transaction, will trigger a retrieve transaction
- * in case the client is in immediate retrieve mode.
- */
-public class NotificationTransaction extends Transaction implements Runnable {
-    private static final boolean LOCAL_LOGV = false;
-
-    private Uri mUri;
-    private NotificationInd mNotificationInd;
-    private String mContentLocation;
-
-    public NotificationTransaction(
-            Context context, int serviceId,
-            TransactionSettings connectionSettings, String uriString) {
-        super(context, serviceId, connectionSettings);
-
-        mUri = Uri.parse(uriString);
-
-        try {
-            mNotificationInd = (NotificationInd)
-                    PduPersister.getPduPersister(context).load(mUri);
-        } catch (MmsException e) {
-            Timber.e(e, "Failed to load NotificationInd from: " + uriString);
-            throw new IllegalArgumentException();
-        }
-
-        mContentLocation = new String(mNotificationInd.getContentLocation());
-        mId = mContentLocation;
-
-        // Attach the transaction to the instance of RetryScheduler.
-        attach(RetryScheduler.getInstance(context));
-    }
-
-    /**
-     * This constructor is only used for test purposes.
-     */
-    public NotificationTransaction(
-            Context context, int serviceId,
-            TransactionSettings connectionSettings, NotificationInd ind) {
-        super(context, serviceId, connectionSettings);
-
-        try {
-            // Save the pdu. If we can start downloading the real pdu immediately, don't allow
-            // persist() to create a thread for the notificationInd because it causes UI jank.
-            mUri = PduPersister.getPduPersister(context).persist(ind, Inbox.CONTENT_URI,
-                    PduPersister.DUMMY_THREAD_ID, !allowAutoDownload(mContext), true, null);
-        } catch (MmsException e) {
-            Timber.e(e, "Failed to save NotificationInd in constructor.");
-            throw new IllegalArgumentException();
-        }
-
-        mNotificationInd = ind;
-        mId = new String(mNotificationInd.getContentLocation());
-    }
-
-    /*
-     * (non-Javadoc)
-     * @see com.google.android.mms.pdu.Transaction#process()
-     */
-    @Override
-    public void process() {
-        new Thread(this, "NotificationTransaction").start();
-    }
-
-    public static boolean allowAutoDownload(Context context) {
-        try { Looper.prepare(); } catch (Exception e) { }
-        boolean autoDownload = PreferenceManager.getDefaultSharedPreferences(context).getBoolean("auto_download_mms", true);
-        boolean dataSuspended = (((TelephonyManager) context.getSystemService(Service.TELEPHONY_SERVICE)).getDataState() ==
-                TelephonyManager.DATA_SUSPENDED);
-        return autoDownload && !dataSuspended;
-    }
-
-    public void run() {
-        try { Looper.prepare(); } catch (Exception e) {}
-        DownloadManager.init(mContext);
-        DownloadManager downloadManager = DownloadManager.getInstance();
-        boolean autoDownload = allowAutoDownload(mContext);
-        try {
-            if (LOCAL_LOGV) {
-                Timber.v("Notification transaction launched: " + this);
-            }
-
-            // By default, we set status to STATUS_DEFERRED because we
-            // should response MMSC with STATUS_DEFERRED when we cannot
-            // download a MM immediately.
-            int status = STATUS_DEFERRED;
-            // Don't try to download when data is suspended, as it will fail, so defer download
-            if (!autoDownload) {
-                downloadManager.markState(mUri, DownloadManager.STATE_UNSTARTED);
-                sendNotifyRespInd(status);
-                return;
-            }
-
-            downloadManager.markState(mUri, DownloadManager.STATE_DOWNLOADING);
-
-            if (LOCAL_LOGV) {
-                Timber.v("Content-Location: " + mContentLocation);
-            }
-
-            byte[] retrieveConfData = null;
-            // We should catch exceptions here to response MMSC
-            // with STATUS_DEFERRED.
-            try {
-                retrieveConfData = getPdu(mContentLocation);
-            } catch (IOException e) {
-                mTransactionState.setState(FAILED);
-            }
-
-            if (retrieveConfData != null) {
-                GenericPdu pdu = new PduParser(retrieveConfData).parse();
-                if ((pdu == null) || (pdu.getMessageType() != MESSAGE_TYPE_RETRIEVE_CONF)) {
-                    Timber.e("Invalid M-RETRIEVE.CONF PDU. " +
-                            (pdu != null ? "message type: " + pdu.getMessageType() : "null pdu"));
-                    mTransactionState.setState(FAILED);
-                    status = STATUS_UNRECOGNIZED;
-                } else {
-                    // Save the received PDU (must be a M-RETRIEVE.CONF).
-                    PduPersister p = PduPersister.getPduPersister(mContext);
-                    Uri uri = p.persist(pdu, Inbox.CONTENT_URI, PduPersister.DUMMY_THREAD_ID,
-                            true, true, null);
-
-                    RetrieveConf retrieveConf = (RetrieveConf) pdu;
-
-                    // Use local time instead of PDU time
-                    ContentValues values = new ContentValues(2);
-                    values.put(Mms.DATE, System.currentTimeMillis() / 1000L);
-                    try {
-                        values.put(Mms.DATE_SENT, retrieveConf.getDate());
-                    } catch (Exception ignored) {
-                    }
-                    SqliteWrapper.update(mContext, mContext.getContentResolver(),
-                            uri, values, null, null);
-
-                    // We have successfully downloaded the new MM. Delete the
-                    // M-NotifyResp.ind from Inbox.
-                    SqliteWrapper.delete(mContext, mContext.getContentResolver(),
-                                         mUri, null, null);
-                    Timber.v("NotificationTransaction received new mms message: " + uri);
-                    // Delete obsolete threads
-                    SqliteWrapper.delete(mContext, mContext.getContentResolver(),
-                            Threads.OBSOLETE_THREADS_URI, null, null);
-
-                    // Notify observers with newly received MM.
-                    mUri = uri;
-                    status = STATUS_RETRIEVED;
-                    BroadcastUtils.sendExplicitBroadcast(
-                            mContext,
-                            new Intent(),
-                            com.klinker.android.send_message.Transaction.NOTIFY_OF_MMS);
-                }
-            }
-
-            if (LOCAL_LOGV) {
-                Timber.v("status=0x" + Integer.toHexString(status));
-            }
-
-            // Check the status and update the result state of this Transaction.
-            switch (status) {
-                case STATUS_RETRIEVED:
-                    mTransactionState.setState(SUCCESS);
-                    break;
-                case STATUS_DEFERRED:
-                    // STATUS_DEFERRED, may be a failed immediate retrieval.
-                    if (mTransactionState.getState() == INITIALIZED) {
-                        mTransactionState.setState(SUCCESS);
-                    }
-                    break;
-            }
-
-            sendNotifyRespInd(status);
-        } catch (Throwable t) {
-            Timber.e(t, "error");
-        } finally {
-            mTransactionState.setContentUri(mUri);
-            if (!autoDownload) {
-                // Always mark the transaction successful for deferred
-                // download since any error here doesn't make sense.
-                mTransactionState.setState(SUCCESS);
-            }
-            if (mTransactionState.getState() != SUCCESS) {
-                mTransactionState.setState(FAILED);
-                Timber.e("NotificationTransaction failed.");
-            }
-            notifyObservers();
-        }
-    }
-
-    private void sendNotifyRespInd(int status) throws MmsException, IOException {
-        // Create the M-NotifyResp.ind
-        NotifyRespInd notifyRespInd = new NotifyRespInd(
-                PduHeaders.CURRENT_MMS_VERSION,
-                mNotificationInd.getTransactionId(),
-                status);
-
-        // Pack M-NotifyResp.ind and send it
-        if(MmsConfig.getNotifyWapMMSC()) {
-            sendPdu(new PduComposer(mContext, notifyRespInd).make(), mContentLocation);
-        } else {
-            sendPdu(new PduComposer(mContext, notifyRespInd).make());
-        }
-    }
-
-    @Override
-    public int getType() {
-        return NOTIFICATION_TRANSACTION;
-    }
-}
+/*
+ * Copyright 2014 Jacob Klinker
+ *
+ * Licensed under the Apache License, Version 2.0 (the "License");
+ * you may not use this file except in compliance with the License.
+ * You may obtain a copy of the License at
+ *
+ *     http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing, software
+ * distributed under the License is distributed on an "AS IS" BASIS,
+ * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ * See the License for the specific language governing permissions and
+ * limitations under the License.
+ */
+
+package com.android.mms.transaction;
+
+import android.app.Service;
+import android.content.ContentValues;
+import android.content.Context;
+import android.content.Intent;
+import android.database.sqlite.SqliteWrapper;
+import android.net.Uri;
+import android.os.Looper;
+import android.preference.PreferenceManager;
+import android.provider.Telephony.Mms;
+import android.provider.Telephony.Mms.Inbox;
+import android.provider.Telephony.Threads;
+import android.telephony.TelephonyManager;
+
+import com.android.mms.MmsConfig;
+import com.android.mms.util.DownloadManager;
+import com.google.android.mms.MmsException;
+import com.google.android.mms.pdu_alt.GenericPdu;
+import com.google.android.mms.pdu_alt.NotificationInd;
+import com.google.android.mms.pdu_alt.NotifyRespInd;
+import com.google.android.mms.pdu_alt.PduComposer;
+import com.google.android.mms.pdu_alt.PduHeaders;
+import com.google.android.mms.pdu_alt.PduParser;
+import com.google.android.mms.pdu_alt.PduPersister;
+import com.google.android.mms.pdu_alt.RetrieveConf;
+import com.klinker.android.send_message.BroadcastUtils;
+
+import java.io.IOException;
+
+import timber.log.Timber;
+
+import static com.android.mms.transaction.TransactionState.FAILED;
+import static com.android.mms.transaction.TransactionState.INITIALIZED;
+import static com.android.mms.transaction.TransactionState.SUCCESS;
+import static com.google.android.mms.pdu_alt.PduHeaders.MESSAGE_TYPE_RETRIEVE_CONF;
+import static com.google.android.mms.pdu_alt.PduHeaders.STATUS_DEFERRED;
+import static com.google.android.mms.pdu_alt.PduHeaders.STATUS_RETRIEVED;
+import static com.google.android.mms.pdu_alt.PduHeaders.STATUS_UNRECOGNIZED;
+
+/**
+ * The NotificationTransaction is responsible for handling multimedia
+ * message notifications (M-Notification.ind).  It:
+ *
+ * <ul>
+ * <li>Composes the notification response (M-NotifyResp.ind).
+ * <li>Sends the notification response to the MMSC server.
+ * <li>Stores the notification indication.
+ * <li>Notifies the TransactionService about succesful completion.
+ * </ul>
+ *
+ * NOTE: This MMS client handles all notifications with a <b>deferred
+ * retrieval</b> response.  The transaction service, upon succesful
+ * completion of this transaction, will trigger a retrieve transaction
+ * in case the client is in immediate retrieve mode.
+ */
+public class NotificationTransaction extends Transaction implements Runnable {
+    private static final boolean LOCAL_LOGV = false;
+
+    private Uri mUri;
+    private NotificationInd mNotificationInd;
+    private String mContentLocation;
+
+    public NotificationTransaction(
+            Context context, int serviceId,
+            TransactionSettings connectionSettings, String uriString) {
+        super(context, serviceId, connectionSettings);
+
+        mUri = Uri.parse(uriString);
+
+        try {
+            mNotificationInd = (NotificationInd)
+                    PduPersister.getPduPersister(context).load(mUri);
+        } catch (MmsException e) {
+            Timber.e(e, "Failed to load NotificationInd from: " + uriString);
+            throw new IllegalArgumentException();
+        }
+
+        mContentLocation = new String(mNotificationInd.getContentLocation());
+        mId = mContentLocation;
+
+        // Attach the transaction to the instance of RetryScheduler.
+        attach(RetryScheduler.getInstance(context));
+    }
+
+    /**
+     * This constructor is only used for test purposes.
+     */
+    public NotificationTransaction(
+            Context context, int serviceId,
+            TransactionSettings connectionSettings, NotificationInd ind) {
+        super(context, serviceId, connectionSettings);
+
+        try {
+            // Save the pdu. If we can start downloading the real pdu immediately, don't allow
+            // persist() to create a thread for the notificationInd because it causes UI jank.
+            mUri = PduPersister.getPduPersister(context).persist(ind, Inbox.CONTENT_URI,
+                    PduPersister.DUMMY_THREAD_ID, !allowAutoDownload(mContext), true, null);
+        } catch (MmsException e) {
+            Timber.e(e, "Failed to save NotificationInd in constructor.");
+            throw new IllegalArgumentException();
+        }
+
+        mNotificationInd = ind;
+        mId = new String(mNotificationInd.getContentLocation());
+    }
+
+    /*
+     * (non-Javadoc)
+     * @see com.google.android.mms.pdu.Transaction#process()
+     */
+    @Override
+    public void process() {
+        new Thread(this, "NotificationTransaction").start();
+    }
+
+    public static boolean allowAutoDownload(Context context) {
+        try { Looper.prepare(); } catch (Exception e) { }
+        boolean autoDownload = PreferenceManager.getDefaultSharedPreferences(context).getBoolean("auto_download_mms", true);
+        boolean dataSuspended = (((TelephonyManager) context.getSystemService(Service.TELEPHONY_SERVICE)).getDataState() ==
+                TelephonyManager.DATA_SUSPENDED);
+        return autoDownload && !dataSuspended;
+    }
+
+    public void run() {
+        try { Looper.prepare(); } catch (Exception e) {}
+        DownloadManager.init(mContext);
+        DownloadManager downloadManager = DownloadManager.getInstance();
+        boolean autoDownload = allowAutoDownload(mContext);
+        try {
+            if (LOCAL_LOGV) {
+                Timber.v("Notification transaction launched: " + this);
+            }
+
+            // By default, we set status to STATUS_DEFERRED because we
+            // should response MMSC with STATUS_DEFERRED when we cannot
+            // download a MM immediately.
+            int status = STATUS_DEFERRED;
+            // Don't try to download when data is suspended, as it will fail, so defer download
+            if (!autoDownload) {
+                downloadManager.markState(mUri, DownloadManager.STATE_UNSTARTED);
+                sendNotifyRespInd(status);
+                return;
+            }
+
+            downloadManager.markState(mUri, DownloadManager.STATE_DOWNLOADING);
+
+            if (LOCAL_LOGV) {
+                Timber.v("Content-Location: " + mContentLocation);
+            }
+
+            byte[] retrieveConfData = null;
+            // We should catch exceptions here to response MMSC
+            // with STATUS_DEFERRED.
+            try {
+                retrieveConfData = getPdu(mContentLocation);
+            } catch (IOException e) {
+                mTransactionState.setState(FAILED);
+            }
+
+            if (retrieveConfData != null) {
+                GenericPdu pdu = new PduParser(retrieveConfData).parse();
+                if ((pdu == null) || (pdu.getMessageType() != MESSAGE_TYPE_RETRIEVE_CONF)) {
+                    Timber.e("Invalid M-RETRIEVE.CONF PDU. " +
+                            (pdu != null ? "message type: " + pdu.getMessageType() : "null pdu"));
+                    mTransactionState.setState(FAILED);
+                    status = STATUS_UNRECOGNIZED;
+                } else {
+                    // Save the received PDU (must be a M-RETRIEVE.CONF).
+                    PduPersister p = PduPersister.getPduPersister(mContext);
+                    Uri uri = p.persist(pdu, Inbox.CONTENT_URI, PduPersister.DUMMY_THREAD_ID,
+                            true, true, null);
+
+                    RetrieveConf retrieveConf = (RetrieveConf) pdu;
+
+                    // Use local time instead of PDU time
+                    ContentValues values = new ContentValues(2);
+                    values.put(Mms.DATE, System.currentTimeMillis() / 1000L);
+                    try {
+                        values.put(Mms.DATE_SENT, retrieveConf.getDate());
+                    } catch (Exception ignored) {
+                    }
+                    SqliteWrapper.update(mContext, mContext.getContentResolver(),
+                            uri, values, null, null);
+
+                    // We have successfully downloaded the new MM. Delete the
+                    // M-NotifyResp.ind from Inbox.
+                    SqliteWrapper.delete(mContext, mContext.getContentResolver(),
+                                         mUri, null, null);
+                    Timber.v("NotificationTransaction received new mms message: " + uri);
+                    // Delete obsolete threads
+                    SqliteWrapper.delete(mContext, mContext.getContentResolver(),
+                            Threads.OBSOLETE_THREADS_URI, null, null);
+
+                    // Notify observers with newly received MM.
+                    mUri = uri;
+                    status = STATUS_RETRIEVED;
+                    BroadcastUtils.sendExplicitBroadcast(
+                            mContext,
+                            new Intent(),
+                            com.klinker.android.send_message.Transaction.NOTIFY_OF_MMS);
+                }
+            }
+
+            if (LOCAL_LOGV) {
+                Timber.v("status=0x" + Integer.toHexString(status));
+            }
+
+            // Check the status and update the result state of this Transaction.
+            switch (status) {
+                case STATUS_RETRIEVED:
+                    mTransactionState.setState(SUCCESS);
+                    break;
+                case STATUS_DEFERRED:
+                    // STATUS_DEFERRED, may be a failed immediate retrieval.
+                    if (mTransactionState.getState() == INITIALIZED) {
+                        mTransactionState.setState(SUCCESS);
+                    }
+                    break;
+            }
+
+            sendNotifyRespInd(status);
+        } catch (Throwable t) {
+            Timber.e(t, "error");
+        } finally {
+            mTransactionState.setContentUri(mUri);
+            if (!autoDownload) {
+                // Always mark the transaction successful for deferred
+                // download since any error here doesn't make sense.
+                mTransactionState.setState(SUCCESS);
+            }
+            if (mTransactionState.getState() != SUCCESS) {
+                mTransactionState.setState(FAILED);
+                Timber.e("NotificationTransaction failed.");
+            }
+            notifyObservers();
+        }
+    }
+
+    private void sendNotifyRespInd(int status) throws MmsException, IOException {
+        // Create the M-NotifyResp.ind
+        NotifyRespInd notifyRespInd = new NotifyRespInd(
+                PduHeaders.CURRENT_MMS_VERSION,
+                mNotificationInd.getTransactionId(),
+                status);
+
+        // Pack M-NotifyResp.ind and send it
+        if(MmsConfig.getNotifyWapMMSC()) {
+            sendPdu(new PduComposer(mContext, notifyRespInd).make(), mContentLocation);
+        } else {
+            sendPdu(new PduComposer(mContext, notifyRespInd).make());
+        }
+    }
+
+    @Override
+    public int getType() {
+        return NOTIFICATION_TRANSACTION;
+    }
+}
diff --git a/android-smsmms/src/main/java/com/android/mms/transaction/Observable.java b/android-smsmms/src/main/java/com/android/mms/transaction/Observable.java
index a56cb12ae..308665771 100755
--- a/android-smsmms/src/main/java/com/android/mms/transaction/Observable.java
+++ b/android-smsmms/src/main/java/com/android/mms/transaction/Observable.java
@@ -1,78 +1,78 @@
-/*
- * Copyright (C) 2007-2008 Esmertec AG.
- * Copyright (C) 2007-2008 The Android Open Source Project
- *
- * Licensed under the Apache License, Version 2.0 (the "License");
- * you may not use this file except in compliance with the License.
- * You may obtain a copy of the License at
- *
- *      http://www.apache.org/licenses/LICENSE-2.0
- *
- * Unless required by applicable law or agreed to in writing, software
- * distributed under the License is distributed on an "AS IS" BASIS,
- * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
- * See the License for the specific language governing permissions and
- * limitations under the License.
- */
-
-package com.android.mms.transaction;
-
-import java.util.ArrayList;
-import java.util.Iterator;
-
-
-/**
- * An interface to represent the state of an observable Transaction.
- */
-public abstract class Observable {
-    private final ArrayList<Observer> mObservers;
-    private Iterator<Observer> mIterator;
-
-    public Observable() {
-        mObservers = new ArrayList<Observer>();
-    }
-
-    /**
-     * This method is implemented by the observable to represent its
-     * current state.
-     *
-     * @return A TransactionState object.
-     */
-    abstract public TransactionState getState();
-
-    /**
-     * Attach an observer to this object.
-     *
-     * @param observer The observer object to be attached to.
-     */
-    public void attach(Observer observer) {
-        mObservers.add(observer);
-    }
-
-    /**
-     * Detach an observer from this object.
-     *
-     * @param observer The observer object to be detached from.
-     */
-    public void detach(Observer observer) {
-        if (mIterator != null) {
-            mIterator.remove();
-        } else {
-            mObservers.remove(observer);
-        }
-    }
-
-    /**
-     * Notify all observers that a status change has occurred.
-     */
-    public void notifyObservers() {
-        mIterator = mObservers.iterator();
-        try {
-            while (mIterator.hasNext()) {
-                mIterator.next().update(this);
-            }
-        } finally {
-            mIterator = null;
-        }
-    }
-}
+/*
+ * Copyright (C) 2007-2008 Esmertec AG.
+ * Copyright (C) 2007-2008 The Android Open Source Project
+ *
+ * Licensed under the Apache License, Version 2.0 (the "License");
+ * you may not use this file except in compliance with the License.
+ * You may obtain a copy of the License at
+ *
+ *      http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing, software
+ * distributed under the License is distributed on an "AS IS" BASIS,
+ * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ * See the License for the specific language governing permissions and
+ * limitations under the License.
+ */
+
+package com.android.mms.transaction;
+
+import java.util.ArrayList;
+import java.util.Iterator;
+
+
+/**
+ * An interface to represent the state of an observable Transaction.
+ */
+public abstract class Observable {
+    private final ArrayList<Observer> mObservers;
+    private Iterator<Observer> mIterator;
+
+    public Observable() {
+        mObservers = new ArrayList<Observer>();
+    }
+
+    /**
+     * This method is implemented by the observable to represent its
+     * current state.
+     *
+     * @return A TransactionState object.
+     */
+    abstract public TransactionState getState();
+
+    /**
+     * Attach an observer to this object.
+     *
+     * @param observer The observer object to be attached to.
+     */
+    public void attach(Observer observer) {
+        mObservers.add(observer);
+    }
+
+    /**
+     * Detach an observer from this object.
+     *
+     * @param observer The observer object to be detached from.
+     */
+    public void detach(Observer observer) {
+        if (mIterator != null) {
+            mIterator.remove();
+        } else {
+            mObservers.remove(observer);
+        }
+    }
+
+    /**
+     * Notify all observers that a status change has occurred.
+     */
+    public void notifyObservers() {
+        mIterator = mObservers.iterator();
+        try {
+            while (mIterator.hasNext()) {
+                mIterator.next().update(this);
+            }
+        } finally {
+            mIterator = null;
+        }
+    }
+}
diff --git a/android-smsmms/src/main/java/com/android/mms/transaction/Observer.java b/android-smsmms/src/main/java/com/android/mms/transaction/Observer.java
index ff65c77db..508ab2da5 100755
--- a/android-smsmms/src/main/java/com/android/mms/transaction/Observer.java
+++ b/android-smsmms/src/main/java/com/android/mms/transaction/Observer.java
@@ -1,32 +1,32 @@
-/*
- * Copyright (C) 2007 Esmertec AG.
- * Copyright (C) 2007 The Android Open Source Project
- *
- * Licensed under the Apache License, Version 2.0 (the "License");
- * you may not use this file except in compliance with the License.
- * You may obtain a copy of the License at
- *
- *      http://www.apache.org/licenses/LICENSE-2.0
- *
- * Unless required by applicable law or agreed to in writing, software
- * distributed under the License is distributed on an "AS IS" BASIS,
- * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
- * See the License for the specific language governing permissions and
- * limitations under the License.
- */
-
-package com.android.mms.transaction;
-
-/**
- * An interface for observing the state of a Transaction.
- */
-public interface Observer {
-
-    /**
-     * Update the state of the observable.
-     *
-     * @param observable An observable object.
-     */
-    void update(Observable observable);
-
-}
+/*
+ * Copyright (C) 2007 Esmertec AG.
+ * Copyright (C) 2007 The Android Open Source Project
+ *
+ * Licensed under the Apache License, Version 2.0 (the "License");
+ * you may not use this file except in compliance with the License.
+ * You may obtain a copy of the License at
+ *
+ *      http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing, software
+ * distributed under the License is distributed on an "AS IS" BASIS,
+ * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ * See the License for the specific language governing permissions and
+ * limitations under the License.
+ */
+
+package com.android.mms.transaction;
+
+/**
+ * An interface for observing the state of a Transaction.
+ */
+public interface Observer {
+
+    /**
+     * Update the state of the observable.
+     *
+     * @param observable An observable object.
+     */
+    void update(Observable observable);
+
+}
diff --git a/android-smsmms/src/main/java/com/android/mms/transaction/ProgressCallbackEntity.java b/android-smsmms/src/main/java/com/android/mms/transaction/ProgressCallbackEntity.java
index 7fc3a9c63..d0d0c409c 100755
--- a/android-smsmms/src/main/java/com/android/mms/transaction/ProgressCallbackEntity.java
+++ b/android-smsmms/src/main/java/com/android/mms/transaction/ProgressCallbackEntity.java
@@ -1,89 +1,89 @@
-/*
- * Copyright (C) 2008 Esmertec AG.
- * Copyright (C) 2008 The Android Open Source Project
- *
- * Licensed under the Apache License, Version 2.0 (the "License");
- * you may not use this file except in compliance with the License.
- * You may obtain a copy of the License at
- *
- *      http://www.apache.org/licenses/LICENSE-2.0
- *
- * Unless required by applicable law or agreed to in writing, software
- * distributed under the License is distributed on an "AS IS" BASIS,
- * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
- * See the License for the specific language governing permissions and
- * limitations under the License.
- */
-
-package com.android.mms.transaction;
-
-import android.content.Context;
-import android.content.Intent;
-import com.klinker.android.send_message.BroadcastUtils;
-import org.apache.http.entity.ByteArrayEntity;
-
-import java.io.IOException;
-import java.io.OutputStream;
-
-public class ProgressCallbackEntity extends ByteArrayEntity {
-    private static final int DEFAULT_PIECE_SIZE = 4096;
-
-    public static final String PROGRESS_STATUS_ACTION = "com.android.mms.PROGRESS_STATUS";
-    public static final int PROGRESS_START    = -1;
-    public static final int PROGRESS_ABORT    = -2;
-    public static final int PROGRESS_COMPLETE = 100;
-
-    private final Context mContext;
-    private final byte[] mContent;
-    private final long mToken;
-
-    public ProgressCallbackEntity(Context context, long token, byte[] b) {
-        super(b);
-
-        mContext = context;
-        mContent = b;
-        mToken = token;
-    }
-
-    @Override
-    public void writeTo(final OutputStream outstream) throws IOException {
-        if (outstream == null) {
-            throw new IllegalArgumentException("Output stream may not be null");
-        }
-
-        boolean completed = false;
-        try {
-            broadcastProgressIfNeeded(PROGRESS_START);
-
-            int pos = 0, totalLen = mContent.length;
-            while (pos < totalLen) {
-                int len = totalLen - pos;
-                if (len > DEFAULT_PIECE_SIZE) {
-                    len = DEFAULT_PIECE_SIZE;
-                }
-                outstream.write(mContent, pos, len);
-                outstream.flush();
-
-                pos += len;
-
-                broadcastProgressIfNeeded(100 * pos / totalLen);
-            }
-
-            broadcastProgressIfNeeded(PROGRESS_COMPLETE);
-            completed = true;
-        } finally {
-            if (!completed) {
-                broadcastProgressIfNeeded(PROGRESS_ABORT);
-            }
-        }
-    }
-
-    private void broadcastProgressIfNeeded(int progress) {
-        if (mToken > 0) {
-            Intent intent = new Intent(PROGRESS_STATUS_ACTION);
-            intent.putExtra("progress", progress);
-            intent.putExtra("token", mToken);
-            BroadcastUtils.sendExplicitBroadcast(mContext, intent, PROGRESS_STATUS_ACTION);
-        }
-    }
-}
+/*
+ * Copyright (C) 2008 Esmertec AG.
+ * Copyright (C) 2008 The Android Open Source Project
+ *
+ * Licensed under the Apache License, Version 2.0 (the "License");
+ * you may not use this file except in compliance with the License.
+ * You may obtain a copy of the License at
+ *
+ *      http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing, software
+ * distributed under the License is distributed on an "AS IS" BASIS,
+ * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ * See the License for the specific language governing permissions and
+ * limitations under the License.
+ */
+
+package com.android.mms.transaction;
+
+import android.content.Context;
+import android.content.Intent;
+import com.klinker.android.send_message.BroadcastUtils;
+import org.apache.http.entity.ByteArrayEntity;
+
+import java.io.IOException;
+import java.io.OutputStream;
+
+public class ProgressCallbackEntity extends ByteArrayEntity {
+    private static final int DEFAULT_PIECE_SIZE = 4096;
+
+    public static final String PROGRESS_STATUS_ACTION = "com.android.mms.PROGRESS_STATUS";
+    public static final int PROGRESS_START    = -1;
+    public static final int PROGRESS_ABORT    = -2;
+    public static final int PROGRESS_COMPLETE = 100;
+
+    private final Context mContext;
+    private final byte[] mContent;
+    private final long mToken;
+
+    public ProgressCallbackEntity(Context context, long token, byte[] b) {
+        super(b);
+
+        mContext = context;
+        mContent = b;
+        mToken = token;
+    }
+
+    @Override
+    public void writeTo(final OutputStream outstream) throws IOException {
+        if (outstream == null) {
+            throw new IllegalArgumentException("Output stream may not be null");
+        }
+
+        boolean completed = false;
+        try {
+            broadcastProgressIfNeeded(PROGRESS_START);
+
+            int pos = 0, totalLen = mContent.length;
+            while (pos < totalLen) {
+                int len = totalLen - pos;
+                if (len > DEFAULT_PIECE_SIZE) {
+                    len = DEFAULT_PIECE_SIZE;
+                }
+                outstream.write(mContent, pos, len);
+                outstream.flush();
+
+                pos += len;
+
+                broadcastProgressIfNeeded(100 * pos / totalLen);
+            }
+
+            broadcastProgressIfNeeded(PROGRESS_COMPLETE);
+            completed = true;
+        } finally {
+            if (!completed) {
+                broadcastProgressIfNeeded(PROGRESS_ABORT);
+            }
+        }
+    }
+
+    private void broadcastProgressIfNeeded(int progress) {
+        if (mToken > 0) {
+            Intent intent = new Intent(PROGRESS_STATUS_ACTION);
+            intent.putExtra("progress", progress);
+            intent.putExtra("token", mToken);
+            BroadcastUtils.sendExplicitBroadcast(mContext, intent, PROGRESS_STATUS_ACTION);
+        }
+    }
+}
diff --git a/android-smsmms/src/main/java/com/android/mms/transaction/PushReceiver.java b/android-smsmms/src/main/java/com/android/mms/transaction/PushReceiver.java
index 722b2f834..c19971429 100755
--- a/android-smsmms/src/main/java/com/android/mms/transaction/PushReceiver.java
+++ b/android-smsmms/src/main/java/com/android/mms/transaction/PushReceiver.java
@@ -1,272 +1,272 @@
-/*
- * Copyright 2014 Jacob Klinker
- *
- * Licensed under the Apache License, Version 2.0 (the "License");
- * you may not use this file except in compliance with the License.
- * You may obtain a copy of the License at
- *
- *     http://www.apache.org/licenses/LICENSE-2.0
- *
- * Unless required by applicable law or agreed to in writing, software
- * distributed under the License is distributed on an "AS IS" BASIS,
- * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
- * See the License for the specific language governing permissions and
- * limitations under the License.
- */
-
-package com.android.mms.transaction;
-
-import android.content.BroadcastReceiver;
-import android.content.ContentResolver;
-import android.content.ContentValues;
-import android.content.Context;
-import android.content.Intent;
-import android.database.Cursor;
-import android.database.DatabaseUtils;
-import android.database.sqlite.SqliteWrapper;
-import android.net.Uri;
-import android.os.AsyncTask;
-import android.provider.Telephony.Mms;
-import android.provider.Telephony.Mms.Inbox;
-
-import com.android.mms.MmsConfig;
-import com.google.android.mms.ContentType;
-import com.google.android.mms.MmsException;
-import com.google.android.mms.pdu_alt.DeliveryInd;
-import com.google.android.mms.pdu_alt.GenericPdu;
-import com.google.android.mms.pdu_alt.NotificationInd;
-import com.google.android.mms.pdu_alt.PduHeaders;
-import com.google.android.mms.pdu_alt.PduParser;
-import com.google.android.mms.pdu_alt.PduPersister;
-import com.google.android.mms.pdu_alt.ReadOrigInd;
-import com.klinker.android.send_message.Utils;
-
-import java.util.HashSet;
-import java.util.Set;
-import java.util.concurrent.ExecutorService;
-import java.util.concurrent.Executors;
-
-import timber.log.Timber;
-
-import static android.provider.Telephony.Sms.Intents.WAP_PUSH_DELIVER_ACTION;
-import static android.provider.Telephony.Sms.Intents.WAP_PUSH_RECEIVED_ACTION;
-import static com.google.android.mms.pdu_alt.PduHeaders.MESSAGE_TYPE_DELIVERY_IND;
-import static com.google.android.mms.pdu_alt.PduHeaders.MESSAGE_TYPE_NOTIFICATION_IND;
-import static com.google.android.mms.pdu_alt.PduHeaders.MESSAGE_TYPE_READ_ORIG_IND;
-
-/**
- * Receives Intent.WAP_PUSH_RECEIVED_ACTION intents and starts the
- * TransactionService by passing the push-data to it.
- */
-public class PushReceiver extends BroadcastReceiver {
-
-    static final String[] PROJECTION = new String[]{Mms.CONTENT_LOCATION, Mms.LOCKED};
-
-    static final int COLUMN_CONTENT_LOCATION = 0;
-
-    private static Set<String> downloadedUrls = new HashSet<String>();
-    private static final ExecutorService PUSH_RECEIVER_EXECUTOR = Executors.newSingleThreadExecutor();
-
-    private class ReceivePushTask extends AsyncTask<Intent, Void, Void> {
-        private Context mContext;
-        private PendingResult pendingResult;
-
-        private ReceivePushTask(Context context, PendingResult pendingResult) {
-            mContext = context;
-            this.pendingResult = pendingResult;
-        }
-
-        @Override
-        protected Void doInBackground(Intent... intents) {
-            Timber.v("receiving a new mms message");
-            Intent intent = intents[0];
-
-            // Get raw PDU push-data from the message and parse it
-            byte[] pushData = intent.getByteArrayExtra("data");
-            PduParser parser = new PduParser(pushData);
-            GenericPdu pdu = parser.parse();
-
-            if (pdu == null) {
-                Timber.e("Invalid PUSH data");
-                return null;
-            }
-
-            PduPersister p = PduPersister.getPduPersister(mContext);
-            ContentResolver cr = mContext.getContentResolver();
-            int type = pdu.getMessageType();
-            long threadId;
-
-            try {
-                switch (type) {
-                    case MESSAGE_TYPE_DELIVERY_IND:
-                    case MESSAGE_TYPE_READ_ORIG_IND: {
-                        threadId = findThreadId(mContext, pdu, type);
-                        if (threadId == -1) {
-                            // The associated SendReq isn't found, therefore skip
-                            // processing this PDU.
-                            break;
-                        }
-
-                        Uri uri = p.persist(pdu, Uri.parse("content://mms/inbox"),
-                                PduPersister.DUMMY_THREAD_ID, true, true, null);
-                        // Update thread ID for ReadOrigInd & DeliveryInd.
-                        ContentValues values = new ContentValues(1);
-                        values.put(Mms.THREAD_ID, threadId);
-                        SqliteWrapper.update(mContext, cr, uri, values, null, null);
-                        break;
-                    }
-                    case MESSAGE_TYPE_NOTIFICATION_IND: {
-                        NotificationInd nInd = (NotificationInd) pdu;
-
-                        if (MmsConfig.getTransIdEnabled()) {
-                            byte[] contentLocation = nInd.getContentLocation();
-                            if ('=' == contentLocation[contentLocation.length - 1]) {
-                                byte[] transactionId = nInd.getTransactionId();
-                                byte[] contentLocationWithId = new byte[contentLocation.length
-                                        + transactionId.length];
-                                System.arraycopy(contentLocation, 0, contentLocationWithId,
-                                        0, contentLocation.length);
-                                System.arraycopy(transactionId, 0, contentLocationWithId,
-                                        contentLocation.length, transactionId.length);
-                                nInd.setContentLocation(contentLocationWithId);
-                            }
-                        }
-
-                        if (!isDuplicateNotification(mContext, nInd)) {
-                            // Save the pdu. If we can start downloading the real pdu immediately,
-                            // don't allow persist() to create a thread for the notificationInd
-                            // because it causes UI jank.
-                            Uri uri = p.persist(pdu, Inbox.CONTENT_URI,
-                                    PduPersister.DUMMY_THREAD_ID, true, true, null);
-
-                            String location = getContentLocation(mContext, uri);
-                            if (downloadedUrls.contains(location)) {
-                                Timber.v("already added this download, don't download again");
-                                return null;
-                            } else {
-                                downloadedUrls.add(location);
-                            }
-
-                            int subId = intent.getIntExtra("subscription", Utils.getDefaultSubscriptionId());
-                            DownloadManager.getInstance().downloadMultimediaMessage(mContext, location, uri, true, subId);
-                        } else {
-                            Timber.v("Skip downloading duplicate message: " + new String(nInd.getContentLocation()));
-                        }
-                        break;
-                    }
-                    default:
-                        Timber.e("Received unrecognized PDU.");
-                }
-            } catch (MmsException e) {
-                Timber.e(e, "Failed to save the data from PUSH: type=" + type);
-            } catch (RuntimeException e) {
-                Timber.e(e, "Unexpected RuntimeException.");
-            }
-
-            Timber.v("PUSH Intent processed.");
-
-            return null;
-        }
-
-        @Override
-        protected void onPostExecute(Void aVoid) {
-            pendingResult.finish();
-        }
-    }
-
-    @Override
-    public void onReceive(Context context, Intent intent) {
-        Timber.v(intent.getAction() + " " + intent.getType());
-        if ((intent.getAction().equals(WAP_PUSH_DELIVER_ACTION) || intent.getAction().equals(WAP_PUSH_RECEIVED_ACTION))
-                && ContentType.MMS_MESSAGE.equals(intent.getType())) {
-            Timber.v("Received PUSH Intent: " + intent);
-
-            MmsConfig.init(context);
-            new ReceivePushTask(context, goAsync()).executeOnExecutor(PUSH_RECEIVER_EXECUTOR, intent);
-
-            Timber.v(context.getPackageName() + " received and aborted");
-        }
-    }
-
-    public static String getContentLocation(Context context, Uri uri) throws MmsException {
-        Cursor cursor = SqliteWrapper.query(context, context.getContentResolver(),
-                uri, PROJECTION, null, null, null);
-
-        if (cursor != null) {
-            try {
-                if ((cursor.getCount() == 1) && cursor.moveToFirst()) {
-                    String location = cursor.getString(COLUMN_CONTENT_LOCATION);
-                    cursor.close();
-                    return location;
-                }
-            } finally {
-                cursor.close();
-            }
-        }
-
-        throw new MmsException("Cannot get X-Mms-Content-Location from: " + uri);
-    }
-
-    private static long findThreadId(Context context, GenericPdu pdu, int type) {
-        String messageId;
-
-        if (type == MESSAGE_TYPE_DELIVERY_IND) {
-            messageId = new String(((DeliveryInd) pdu).getMessageId());
-        } else {
-            messageId = new String(((ReadOrigInd) pdu).getMessageId());
-        }
-
-        StringBuilder sb = new StringBuilder('(');
-        sb.append(Mms.MESSAGE_ID);
-        sb.append('=');
-        sb.append(DatabaseUtils.sqlEscapeString(messageId));
-        sb.append(" AND ");
-        sb.append(Mms.MESSAGE_TYPE);
-        sb.append('=');
-        sb.append(PduHeaders.MESSAGE_TYPE_SEND_REQ);
-        // TODO ContentResolver.query() appends closing ')' to the selection argument
-        // sb.append(')');
-
-        Cursor cursor = SqliteWrapper.query(context, context.getContentResolver(),
-                Mms.CONTENT_URI, new String[]{Mms.THREAD_ID},
-                sb.toString(), null, null);
-        if (cursor != null) {
-            try {
-                if ((cursor.getCount() == 1) && cursor.moveToFirst()) {
-                    long id = cursor.getLong(0);
-                    cursor.close();
-                    return id;
-                }
-            } finally {
-                cursor.close();
-            }
-        }
-
-        return -1;
-    }
-
-    private static boolean isDuplicateNotification(Context context, NotificationInd nInd) {
-        byte[] rawLocation = nInd.getContentLocation();
-        if (rawLocation != null) {
-            String location = new String(rawLocation);
-            String selection = Mms.CONTENT_LOCATION + " = ?";
-            String[] selectionArgs = new String[]{location};
-            Cursor cursor = SqliteWrapper.query(
-                    context, context.getContentResolver(),
-                    Mms.CONTENT_URI, new String[]{Mms._ID},
-                    selection, selectionArgs, null);
-            if (cursor != null) {
-                try {
-                    if (cursor.getCount() > 0) {
-                        // We already received the same notification before.
-                        cursor.close();
-                        //return true;
-                    }
-                } finally {
-                    cursor.close();
-                }
-            }
-        }
-        return false;
-    }
-}
+/*
+ * Copyright 2014 Jacob Klinker
+ *
+ * Licensed under the Apache License, Version 2.0 (the "License");
+ * you may not use this file except in compliance with the License.
+ * You may obtain a copy of the License at
+ *
+ *     http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing, software
+ * distributed under the License is distributed on an "AS IS" BASIS,
+ * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ * See the License for the specific language governing permissions and
+ * limitations under the License.
+ */
+
+package com.android.mms.transaction;
+
+import android.content.BroadcastReceiver;
+import android.content.ContentResolver;
+import android.content.ContentValues;
+import android.content.Context;
+import android.content.Intent;
+import android.database.Cursor;
+import android.database.DatabaseUtils;
+import android.database.sqlite.SqliteWrapper;
+import android.net.Uri;
+import android.os.AsyncTask;
+import android.provider.Telephony.Mms;
+import android.provider.Telephony.Mms.Inbox;
+
+import com.android.mms.MmsConfig;
+import com.google.android.mms.ContentType;
+import com.google.android.mms.MmsException;
+import com.google.android.mms.pdu_alt.DeliveryInd;
+import com.google.android.mms.pdu_alt.GenericPdu;
+import com.google.android.mms.pdu_alt.NotificationInd;
+import com.google.android.mms.pdu_alt.PduHeaders;
+import com.google.android.mms.pdu_alt.PduParser;
+import com.google.android.mms.pdu_alt.PduPersister;
+import com.google.android.mms.pdu_alt.ReadOrigInd;
+import com.klinker.android.send_message.Utils;
+
+import java.util.HashSet;
+import java.util.Set;
+import java.util.concurrent.ExecutorService;
+import java.util.concurrent.Executors;
+
+import timber.log.Timber;
+
+import static android.provider.Telephony.Sms.Intents.WAP_PUSH_DELIVER_ACTION;
+import static android.provider.Telephony.Sms.Intents.WAP_PUSH_RECEIVED_ACTION;
+import static com.google.android.mms.pdu_alt.PduHeaders.MESSAGE_TYPE_DELIVERY_IND;
+import static com.google.android.mms.pdu_alt.PduHeaders.MESSAGE_TYPE_NOTIFICATION_IND;
+import static com.google.android.mms.pdu_alt.PduHeaders.MESSAGE_TYPE_READ_ORIG_IND;
+
+/**
+ * Receives Intent.WAP_PUSH_RECEIVED_ACTION intents and starts the
+ * TransactionService by passing the push-data to it.
+ */
+public class PushReceiver extends BroadcastReceiver {
+
+    static final String[] PROJECTION = new String[]{Mms.CONTENT_LOCATION, Mms.LOCKED};
+
+    static final int COLUMN_CONTENT_LOCATION = 0;
+
+    private static Set<String> downloadedUrls = new HashSet<String>();
+    private static final ExecutorService PUSH_RECEIVER_EXECUTOR = Executors.newSingleThreadExecutor();
+
+    private class ReceivePushTask extends AsyncTask<Intent, Void, Void> {
+        private Context mContext;
+        private PendingResult pendingResult;
+
+        private ReceivePushTask(Context context, PendingResult pendingResult) {
+            mContext = context;
+            this.pendingResult = pendingResult;
+        }
+
+        @Override
+        protected Void doInBackground(Intent... intents) {
+            Timber.v("receiving a new mms message");
+            Intent intent = intents[0];
+
+            // Get raw PDU push-data from the message and parse it
+            byte[] pushData = intent.getByteArrayExtra("data");
+            PduParser parser = new PduParser(pushData);
+            GenericPdu pdu = parser.parse();
+
+            if (pdu == null) {
+                Timber.e("Invalid PUSH data");
+                return null;
+            }
+
+            PduPersister p = PduPersister.getPduPersister(mContext);
+            ContentResolver cr = mContext.getContentResolver();
+            int type = pdu.getMessageType();
+            long threadId;
+
+            try {
+                switch (type) {
+                    case MESSAGE_TYPE_DELIVERY_IND:
+                    case MESSAGE_TYPE_READ_ORIG_IND: {
+                        threadId = findThreadId(mContext, pdu, type);
+                        if (threadId == -1) {
+                            // The associated SendReq isn't found, therefore skip
+                            // processing this PDU.
+                            break;
+                        }
+
+                        Uri uri = p.persist(pdu, Uri.parse("content://mms/inbox"),
+                                PduPersister.DUMMY_THREAD_ID, true, true, null);
+                        // Update thread ID for ReadOrigInd & DeliveryInd.
+                        ContentValues values = new ContentValues(1);
+                        values.put(Mms.THREAD_ID, threadId);
+                        SqliteWrapper.update(mContext, cr, uri, values, null, null);
+                        break;
+                    }
+                    case MESSAGE_TYPE_NOTIFICATION_IND: {
+                        NotificationInd nInd = (NotificationInd) pdu;
+
+                        if (MmsConfig.getTransIdEnabled()) {
+                            byte[] contentLocation = nInd.getContentLocation();
+                            if ('=' == contentLocation[contentLocation.length - 1]) {
+                                byte[] transactionId = nInd.getTransactionId();
+                                byte[] contentLocationWithId = new byte[contentLocation.length
+                                        + transactionId.length];
+                                System.arraycopy(contentLocation, 0, contentLocationWithId,
+                                        0, contentLocation.length);
+                                System.arraycopy(transactionId, 0, contentLocationWithId,
+                                        contentLocation.length, transactionId.length);
+                                nInd.setContentLocation(contentLocationWithId);
+                            }
+                        }
+
+                        if (!isDuplicateNotification(mContext, nInd)) {
+                            // Save the pdu. If we can start downloading the real pdu immediately,
+                            // don't allow persist() to create a thread for the notificationInd
+                            // because it causes UI jank.
+                            Uri uri = p.persist(pdu, Inbox.CONTENT_URI,
+                                    PduPersister.DUMMY_THREAD_ID, true, true, null);
+
+                            String location = getContentLocation(mContext, uri);
+                            if (downloadedUrls.contains(location)) {
+                                Timber.v("already added this download, don't download again");
+                                return null;
+                            } else {
+                                downloadedUrls.add(location);
+                            }
+
+                            int subId = intent.getIntExtra("subscription", Utils.getDefaultSubscriptionId());
+                            DownloadManager.getInstance().downloadMultimediaMessage(mContext, location, uri, true, subId);
+                        } else {
+                            Timber.v("Skip downloading duplicate message: " + new String(nInd.getContentLocation()));
+                        }
+                        break;
+                    }
+                    default:
+                        Timber.e("Received unrecognized PDU.");
+                }
+            } catch (MmsException e) {
+                Timber.e(e, "Failed to save the data from PUSH: type=" + type);
+            } catch (RuntimeException e) {
+                Timber.e(e, "Unexpected RuntimeException.");
+            }
+
+            Timber.v("PUSH Intent processed.");
+
+            return null;
+        }
+
+        @Override
+        protected void onPostExecute(Void aVoid) {
+            pendingResult.finish();
+        }
+    }
+
+    @Override
+    public void onReceive(Context context, Intent intent) {
+        Timber.v(intent.getAction() + " " + intent.getType());
+        if ((intent.getAction().equals(WAP_PUSH_DELIVER_ACTION) || intent.getAction().equals(WAP_PUSH_RECEIVED_ACTION))
+                && ContentType.MMS_MESSAGE.equals(intent.getType())) {
+            Timber.v("Received PUSH Intent: " + intent);
+
+            MmsConfig.init(context);
+            new ReceivePushTask(context, goAsync()).executeOnExecutor(PUSH_RECEIVER_EXECUTOR, intent);
+
+            Timber.v(context.getPackageName() + " received and aborted");
+        }
+    }
+
+    public static String getContentLocation(Context context, Uri uri) throws MmsException {
+        Cursor cursor = SqliteWrapper.query(context, context.getContentResolver(),
+                uri, PROJECTION, null, null, null);
+
+        if (cursor != null) {
+            try {
+                if ((cursor.getCount() == 1) && cursor.moveToFirst()) {
+                    String location = cursor.getString(COLUMN_CONTENT_LOCATION);
+                    cursor.close();
+                    return location;
+                }
+            } finally {
+                cursor.close();
+            }
+        }
+
+        throw new MmsException("Cannot get X-Mms-Content-Location from: " + uri);
+    }
+
+    private static long findThreadId(Context context, GenericPdu pdu, int type) {
+        String messageId;
+
+        if (type == MESSAGE_TYPE_DELIVERY_IND) {
+            messageId = new String(((DeliveryInd) pdu).getMessageId());
+        } else {
+            messageId = new String(((ReadOrigInd) pdu).getMessageId());
+        }
+
+        StringBuilder sb = new StringBuilder('(');
+        sb.append(Mms.MESSAGE_ID);
+        sb.append('=');
+        sb.append(DatabaseUtils.sqlEscapeString(messageId));
+        sb.append(" AND ");
+        sb.append(Mms.MESSAGE_TYPE);
+        sb.append('=');
+        sb.append(PduHeaders.MESSAGE_TYPE_SEND_REQ);
+        // TODO ContentResolver.query() appends closing ')' to the selection argument
+        // sb.append(')');
+
+        Cursor cursor = SqliteWrapper.query(context, context.getContentResolver(),
+                Mms.CONTENT_URI, new String[]{Mms.THREAD_ID},
+                sb.toString(), null, null);
+        if (cursor != null) {
+            try {
+                if ((cursor.getCount() == 1) && cursor.moveToFirst()) {
+                    long id = cursor.getLong(0);
+                    cursor.close();
+                    return id;
+                }
+            } finally {
+                cursor.close();
+            }
+        }
+
+        return -1;
+    }
+
+    private static boolean isDuplicateNotification(Context context, NotificationInd nInd) {
+        byte[] rawLocation = nInd.getContentLocation();
+        if (rawLocation != null) {
+            String location = new String(rawLocation);
+            String selection = Mms.CONTENT_LOCATION + " = ?";
+            String[] selectionArgs = new String[]{location};
+            Cursor cursor = SqliteWrapper.query(
+                    context, context.getContentResolver(),
+                    Mms.CONTENT_URI, new String[]{Mms._ID},
+                    selection, selectionArgs, null);
+            if (cursor != null) {
+                try {
+                    if (cursor.getCount() > 0) {
+                        // We already received the same notification before.
+                        cursor.close();
+                        //return true;
+                    }
+                } finally {
+                    cursor.close();
+                }
+            }
+        }
+        return false;
+    }
+}
diff --git a/android-smsmms/src/main/java/com/android/mms/transaction/ReadRecTransaction.java b/android-smsmms/src/main/java/com/android/mms/transaction/ReadRecTransaction.java
index 6226c9f91..244b41f6c 100755
--- a/android-smsmms/src/main/java/com/android/mms/transaction/ReadRecTransaction.java
+++ b/android-smsmms/src/main/java/com/android/mms/transaction/ReadRecTransaction.java
@@ -1,114 +1,114 @@
-/*
- * Copyright 2014 Jacob Klinker
- *
- * Licensed under the Apache License, Version 2.0 (the "License");
- * you may not use this file except in compliance with the License.
- * You may obtain a copy of the License at
- *
- *     http://www.apache.org/licenses/LICENSE-2.0
- *
- * Unless required by applicable law or agreed to in writing, software
- * distributed under the License is distributed on an "AS IS" BASIS,
- * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
- * See the License for the specific language governing permissions and
- * limitations under the License.
- */
-
-package com.android.mms.transaction;
-
-import android.content.Context;
-import android.net.Uri;
-import android.provider.Telephony.Mms.Sent;
-import com.google.android.mms.MmsException;
-import com.google.android.mms.pdu_alt.EncodedStringValue;
-import com.google.android.mms.pdu_alt.PduComposer;
-import com.google.android.mms.pdu_alt.PduPersister;
-import com.google.android.mms.pdu_alt.ReadRecInd;
-import com.klinker.android.send_message.Utils;
-import timber.log.Timber;
-
-import java.io.IOException;
-
-/**
- * The ReadRecTransaction is responsible for sending read report
- * notifications (M-read-rec.ind) to clients that have requested them.
- * It:
- *
- * <ul>
- * <li>Loads the read report indication from storage (Outbox).
- * <li>Packs M-read-rec.ind and sends it.
- * <li>Notifies the TransactionService about succesful completion.
- * </ul>
- */
-public class ReadRecTransaction extends Transaction implements Runnable{
-    private static final boolean LOCAL_LOGV = false;
-
-    private Thread mThread;
-    private final Uri mReadReportURI;
-
-    public ReadRecTransaction(Context context,
-            int transId,
-            TransactionSettings connectionSettings,
-            String uri) {
-        super(context, transId, connectionSettings);
-        mReadReportURI = Uri.parse(uri);
-        mId = uri;
-
-        // Attach the transaction to the instance of RetryScheduler.
-        attach(RetryScheduler.getInstance(context));
-    }
-
-    /*
-     * (non-Javadoc)
-     * @see com.android.mms.Transaction#process()
-     */
-    @Override
-    public void process() {
-        mThread = new Thread(this, "ReadRecTransaction");
-        mThread.start();
-    }
-
-    public void run() {
-        PduPersister persister = PduPersister.getPduPersister(mContext);
-
-        try {
-            // Load M-read-rec.ind from outbox
-            ReadRecInd readRecInd = (ReadRecInd) persister.load(mReadReportURI);
-
-            // insert the 'from' address per spec
-            String lineNumber = Utils.getMyPhoneNumber(mContext);
-            readRecInd.setFrom(new EncodedStringValue(lineNumber));
-
-            // Pack M-read-rec.ind and send it
-            byte[] postingData = new PduComposer(mContext, readRecInd).make();
-            sendPdu(postingData);
-
-            Uri uri = persister.move(mReadReportURI, Sent.CONTENT_URI);
-            mTransactionState.setState(TransactionState.SUCCESS);
-            mTransactionState.setContentUri(uri);
-        } catch (IOException e) {
-            if (LOCAL_LOGV) {
-                Timber.v(e, "Failed to send M-Read-Rec.Ind.");
-            }
-        } catch (MmsException e) {
-            if (LOCAL_LOGV) {
-                Timber.v(e, "Failed to load message from Outbox.");
-            }
-        } catch (RuntimeException e) {
-            if (LOCAL_LOGV) {
-                Timber.e(e, "Unexpected RuntimeException.");
-            }
-        } finally {
-            if (mTransactionState.getState() != TransactionState.SUCCESS) {
-                mTransactionState.setState(TransactionState.FAILED);
-                mTransactionState.setContentUri(mReadReportURI);
-            }
-            notifyObservers();
-        }
-    }
-
-    @Override
-    public int getType() {
-        return READREC_TRANSACTION;
-    }
-}
+/*
+ * Copyright 2014 Jacob Klinker
+ *
+ * Licensed under the Apache License, Version 2.0 (the "License");
+ * you may not use this file except in compliance with the License.
+ * You may obtain a copy of the License at
+ *
+ *     http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing, software
+ * distributed under the License is distributed on an "AS IS" BASIS,
+ * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ * See the License for the specific language governing permissions and
+ * limitations under the License.
+ */
+
+package com.android.mms.transaction;
+
+import android.content.Context;
+import android.net.Uri;
+import android.provider.Telephony.Mms.Sent;
+import com.google.android.mms.MmsException;
+import com.google.android.mms.pdu_alt.EncodedStringValue;
+import com.google.android.mms.pdu_alt.PduComposer;
+import com.google.android.mms.pdu_alt.PduPersister;
+import com.google.android.mms.pdu_alt.ReadRecInd;
+import com.klinker.android.send_message.Utils;
+import timber.log.Timber;
+
+import java.io.IOException;
+
+/**
+ * The ReadRecTransaction is responsible for sending read report
+ * notifications (M-read-rec.ind) to clients that have requested them.
+ * It:
+ *
+ * <ul>
+ * <li>Loads the read report indication from storage (Outbox).
+ * <li>Packs M-read-rec.ind and sends it.
+ * <li>Notifies the TransactionService about succesful completion.
+ * </ul>
+ */
+public class ReadRecTransaction extends Transaction implements Runnable{
+    private static final boolean LOCAL_LOGV = false;
+
+    private Thread mThread;
+    private final Uri mReadReportURI;
+
+    public ReadRecTransaction(Context context,
+            int transId,
+            TransactionSettings connectionSettings,
+            String uri) {
+        super(context, transId, connectionSettings);
+        mReadReportURI = Uri.parse(uri);
+        mId = uri;
+
+        // Attach the transaction to the instance of RetryScheduler.
+        attach(RetryScheduler.getInstance(context));
+    }
+
+    /*
+     * (non-Javadoc)
+     * @see com.android.mms.Transaction#process()
+     */
+    @Override
+    public void process() {
+        mThread = new Thread(this, "ReadRecTransaction");
+        mThread.start();
+    }
+
+    public void run() {
+        PduPersister persister = PduPersister.getPduPersister(mContext);
+
+        try {
+            // Load M-read-rec.ind from outbox
+            ReadRecInd readRecInd = (ReadRecInd) persister.load(mReadReportURI);
+
+            // insert the 'from' address per spec
+            String lineNumber = Utils.getMyPhoneNumber(mContext);
+            readRecInd.setFrom(new EncodedStringValue(lineNumber));
+
+            // Pack M-read-rec.ind and send it
+            byte[] postingData = new PduComposer(mContext, readRecInd).make();
+            sendPdu(postingData);
+
+            Uri uri = persister.move(mReadReportURI, Sent.CONTENT_URI);
+            mTransactionState.setState(TransactionState.SUCCESS);
+            mTransactionState.setContentUri(uri);
+        } catch (IOException e) {
+            if (LOCAL_LOGV) {
+                Timber.v(e, "Failed to send M-Read-Rec.Ind.");
+            }
+        } catch (MmsException e) {
+            if (LOCAL_LOGV) {
+                Timber.v(e, "Failed to load message from Outbox.");
+            }
+        } catch (RuntimeException e) {
+            if (LOCAL_LOGV) {
+                Timber.e(e, "Unexpected RuntimeException.");
+            }
+        } finally {
+            if (mTransactionState.getState() != TransactionState.SUCCESS) {
+                mTransactionState.setState(TransactionState.FAILED);
+                mTransactionState.setContentUri(mReadReportURI);
+            }
+            notifyObservers();
+        }
+    }
+
+    @Override
+    public int getType() {
+        return READREC_TRANSACTION;
+    }
+}
diff --git a/android-smsmms/src/main/java/com/android/mms/transaction/RetrieveTransaction.java b/android-smsmms/src/main/java/com/android/mms/transaction/RetrieveTransaction.java
index 4de1c9b8a..2a4bd57bf 100755
--- a/android-smsmms/src/main/java/com/android/mms/transaction/RetrieveTransaction.java
+++ b/android-smsmms/src/main/java/com/android/mms/transaction/RetrieveTransaction.java
@@ -1,317 +1,317 @@
-/*
- * Copyright 2014 Jacob Klinker
- *
- * Licensed under the Apache License, Version 2.0 (the "License");
- * you may not use this file except in compliance with the License.
- * You may obtain a copy of the License at
- *
- *     http://www.apache.org/licenses/LICENSE-2.0
- *
- * Unless required by applicable law or agreed to in writing, software
- * distributed under the License is distributed on an "AS IS" BASIS,
- * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
- * See the License for the specific language governing permissions and
- * limitations under the License.
- */
-
-package com.android.mms.transaction;
-
-import android.content.ContentValues;
-import android.content.Context;
-import android.database.Cursor;
-import android.database.sqlite.SqliteWrapper;
-import android.net.Uri;
-import android.provider.Telephony.Mms;
-import android.provider.Telephony.Mms.Inbox;
-import android.text.TextUtils;
-
-import com.android.mms.MmsConfig;
-import com.android.mms.util.DownloadManager;
-import com.google.android.mms.MmsException;
-import com.google.android.mms.pdu_alt.AcknowledgeInd;
-import com.google.android.mms.pdu_alt.EncodedStringValue;
-import com.google.android.mms.pdu_alt.PduComposer;
-import com.google.android.mms.pdu_alt.PduHeaders;
-import com.google.android.mms.pdu_alt.PduParser;
-import com.google.android.mms.pdu_alt.PduPersister;
-import com.google.android.mms.pdu_alt.RetrieveConf;
-import com.klinker.android.send_message.Utils;
-
-import java.io.IOException;
-
-import timber.log.Timber;
-
-/**
- * The RetrieveTransaction is responsible for retrieving multimedia
- * messages (M-Retrieve.conf) from the MMSC server.  It:
- *
- * <ul>
- * <li>Sends a GET request to the MMSC server.
- * <li>Retrieves the binary M-Retrieve.conf data and parses it.
- * <li>Persists the retrieve multimedia message.
- * <li>Determines whether an acknowledgement is required.
- * <li>Creates appropriate M-Acknowledge.ind and sends it to MMSC server.
- * <li>Notifies the TransactionService about succesful completion.
- * </ul>
- */
-public class RetrieveTransaction extends Transaction implements Runnable {
-    private static final boolean LOCAL_LOGV = false;
-
-    private final Uri mUri;
-    private final String mContentLocation;
-    private boolean mLocked;
-
-    static final String[] PROJECTION = new String[] {
-        Mms.CONTENT_LOCATION,
-        Mms.LOCKED
-    };
-
-    // The indexes of the columns which must be consistent with above PROJECTION.
-    static final int COLUMN_CONTENT_LOCATION      = 0;
-    static final int COLUMN_LOCKED                = 1;
-
-    public RetrieveTransaction(Context context, int serviceId,
-            TransactionSettings connectionSettings, String uri)
-            throws MmsException {
-        super(context, serviceId, connectionSettings);
-
-        if (uri.startsWith("content://")) {
-            mUri = Uri.parse(uri); // The Uri of the M-Notification.ind
-            mId = mContentLocation = getContentLocation(context, mUri);
-            if (LOCAL_LOGV) {
-                Timber.v("X-Mms-Content-Location: " + mContentLocation);
-            }
-        } else {
-            throw new IllegalArgumentException(
-                    "Initializing from X-Mms-Content-Location is abandoned!");
-        }
-
-        // Attach the transaction to the instance of RetryScheduler.
-        attach(RetryScheduler.getInstance(context));
-    }
-
-    public String getContentLocation(Context context, Uri uri)
-            throws MmsException {
-        Cursor cursor = SqliteWrapper.query(context, context.getContentResolver(),
-                            uri, PROJECTION, null, null, null);
-        mLocked = false;
-
-        if (cursor != null) {
-            try {
-                if ((cursor.getCount() == 1) && cursor.moveToFirst()) {
-                    // Get the locked flag from the M-Notification.ind so it can be transferred
-                    // to the real message after the download.
-                    mLocked = cursor.getInt(COLUMN_LOCKED) == 1;
-                    String location = cursor.getString(COLUMN_CONTENT_LOCATION);
-                    cursor.close();
-                    return location;
-                }
-            } finally {
-                cursor.close();
-            }
-        }
-
-        throw new MmsException("Cannot get X-Mms-Content-Location from: " + uri);
-    }
-
-    /*
-     * (non-Javadoc)
-     * @see com.android.mms.transaction.Transaction#process()
-     */
-    @Override
-    public void process() {
-        new Thread(this, "RetrieveTransaction").start();
-    }
-
-    public void run() {
-//        if (Build.VERSION.SDK_INT >= Build.VERSION_CODES.LOLLIPOP) {
-//            DownloadRequest request = new DownloadRequest(mContentLocation, mUri, null, null, null);
-//            MmsNetworkManager manager = new MmsNetworkManager(mContext);
-//            request.execute(mContext, manager);
-//        } else {
-            try {
-                // Change the downloading state of the M-Notification.ind.
-                DownloadManager.init(mContext.getApplicationContext());
-                DownloadManager.getInstance().markState(
-                        mUri, DownloadManager.STATE_DOWNLOADING);
-
-                // Send GET request to MMSC and retrieve the response data.
-                byte[] resp = getPdu(mContentLocation);
-
-                // Parse M-Retrieve.conf
-                RetrieveConf retrieveConf = (RetrieveConf) new PduParser(resp).parse();
-                if (null == retrieveConf) {
-                    throw new MmsException("Invalid M-Retrieve.conf PDU.");
-                }
-
-                Uri msgUri = null;
-                if (isDuplicateMessage(mContext, retrieveConf)) {
-                    // Mark this transaction as failed to prevent duplicate
-                    // notification to user.
-                    mTransactionState.setState(TransactionState.FAILED);
-                    mTransactionState.setContentUri(mUri);
-                } else {
-                    // Store M-Retrieve.conf into Inbox
-                    PduPersister persister = PduPersister.getPduPersister(mContext);
-                    msgUri = persister.persist(retrieveConf, Inbox.CONTENT_URI,
-                            PduPersister.DUMMY_THREAD_ID, true, true, null);
-
-                    // Use local time instead of PDU time
-                    ContentValues values = new ContentValues(3);
-                    values.put(Mms.DATE, System.currentTimeMillis() / 1000L);
-                    try {
-                        values.put(Mms.DATE_SENT, retrieveConf.getDate());
-                    } catch (Exception ignored) {
-                    }
-                    values.put(Mms.MESSAGE_SIZE, resp.length);
-                    SqliteWrapper.update(mContext, mContext.getContentResolver(),
-                            msgUri, values, null, null);
-
-                    // The M-Retrieve.conf has been successfully downloaded.
-                    mTransactionState.setState(TransactionState.SUCCESS);
-                    mTransactionState.setContentUri(msgUri);
-                    // Remember the location the message was downloaded from.
-                    // Since it's not critical, it won't fail the transaction.
-                    // Copy over the locked flag from the M-Notification.ind in case
-                    // the user locked the message before activating the download.
-                    updateContentLocation(mContext, msgUri, mContentLocation, mLocked);
-                }
-
-                // Delete the corresponding M-Notification.ind.
-                SqliteWrapper.delete(mContext, mContext.getContentResolver(),
-                        mUri, null, null);
-
-                // Send ACK to the Proxy-Relay to indicate we have fetched the
-                // MM successfully.
-                // Don't mark the transaction as failed if we failed to send it.
-                sendAcknowledgeInd(retrieveConf);
-            } catch (Throwable t) {
-                Timber.e(t, "error");
-                if ("HTTP error: Not Found".equals(t.getMessage())) {
-                    // Delete the expired M-Notification.ind.
-                    SqliteWrapper.delete(mContext, mContext.getContentResolver(),
-                            mUri, null, null);
-                }
-            } finally {
-                if (mTransactionState.getState() != TransactionState.SUCCESS) {
-                    mTransactionState.setState(TransactionState.FAILED);
-                    mTransactionState.setContentUri(mUri);
-                    Timber.e("Retrieval failed.");
-                }
-                notifyObservers();
-            }
-//        }
-    }
-
-    private static boolean isDuplicateMessage(Context context, RetrieveConf rc) {
-        byte[] rawMessageId = rc.getMessageId();
-        if (rawMessageId != null) {
-            String messageId = new String(rawMessageId);
-            String selection = "(" + Mms.MESSAGE_ID + " = ? AND "
-                                   + Mms.MESSAGE_TYPE + " = ?)";
-            String[] selectionArgs = new String[] { messageId,
-                    String.valueOf(PduHeaders.MESSAGE_TYPE_RETRIEVE_CONF) };
-
-            Cursor cursor = SqliteWrapper.query(
-                    context, context.getContentResolver(),
-                    Mms.CONTENT_URI, new String[] { Mms._ID, Mms.SUBJECT, Mms.SUBJECT_CHARSET },
-                    selection, selectionArgs, null);
-
-            if (cursor != null) {
-                try {
-                    if (cursor.getCount() > 0) {
-                        // A message with identical message ID and type found.
-                        // Do some additional checks to be sure it's a duplicate.
-                        boolean dup = isDuplicateMessageExtra(cursor, rc);
-                        if (!cursor.isClosed()) {
-                            cursor.close();
-                        }
-
-                        return dup;
-                    }
-                } finally {
-                    cursor.close();
-                }
-            }
-        }
-        return false;
-    }
-
-    private static boolean isDuplicateMessageExtra(Cursor cursor, RetrieveConf rc) {
-        // Compare message subjects, taking encoding into account
-        EncodedStringValue encodedSubjectReceived = null;
-        EncodedStringValue encodedSubjectStored = null;
-        String subjectReceived = null;
-        String subjectStored = null;
-        String subject = null;
-
-        encodedSubjectReceived = rc.getSubject();
-        if (encodedSubjectReceived != null) {
-            subjectReceived = encodedSubjectReceived.getString();
-        }
-
-        for (cursor.moveToFirst(); !cursor.isAfterLast(); cursor.moveToNext()) {
-            int subjectIdx = cursor.getColumnIndex(Mms.SUBJECT);
-            int charsetIdx = cursor.getColumnIndex(Mms.SUBJECT_CHARSET);
-            subject = cursor.getString(subjectIdx);
-            int charset = cursor.getInt(charsetIdx);
-            if (subject != null) {
-                encodedSubjectStored = new EncodedStringValue(charset, PduPersister
-                        .getBytes(subject));
-            }
-            if (encodedSubjectStored == null && encodedSubjectReceived == null) {
-                // Both encoded subjects are null - return true
-                return true;
-            } else if (encodedSubjectStored != null && encodedSubjectReceived != null) {
-                subjectStored = encodedSubjectStored.getString();
-                if (!TextUtils.isEmpty(subjectStored) && !TextUtils.isEmpty(subjectReceived)) {
-                    // Both decoded subjects are non-empty - compare them
-                    return subjectStored.equals(subjectReceived);
-                } else if (TextUtils.isEmpty(subjectStored) && TextUtils.isEmpty(subjectReceived)) {
-                    // Both decoded subjects are "" - return true
-                    return true;
-                }
-            }
-        }
-
-        return false;
-    }
-
-    private void sendAcknowledgeInd(RetrieveConf rc) throws MmsException, IOException {
-        // Send M-Acknowledge.ind to MMSC if required.
-        // If the Transaction-ID isn't set in the M-Retrieve.conf, it means
-        // the MMS proxy-relay doesn't require an ACK.
-        byte[] tranId = rc.getTransactionId();
-        if (tranId != null) {
-            // Create M-Acknowledge.ind
-            AcknowledgeInd acknowledgeInd = new AcknowledgeInd(
-                    PduHeaders.CURRENT_MMS_VERSION, tranId);
-
-            // insert the 'from' address per spec
-            String lineNumber = Utils.getMyPhoneNumber(mContext);
-            acknowledgeInd.setFrom(new EncodedStringValue(lineNumber));
-
-            // Pack M-Acknowledge.ind and send it
-            if(MmsConfig.getNotifyWapMMSC()) {
-                sendPdu(new PduComposer(mContext, acknowledgeInd).make(), mContentLocation);
-            } else {
-                sendPdu(new PduComposer(mContext, acknowledgeInd).make());
-            }
-        }
-    }
-
-    private static void updateContentLocation(Context context, Uri uri,
-                                              String contentLocation,
-                                              boolean locked) {
-        ContentValues values = new ContentValues(2);
-        values.put(Mms.CONTENT_LOCATION, contentLocation);
-        values.put(Mms.LOCKED, locked);     // preserve the state of the M-Notification.ind lock.
-        SqliteWrapper.update(context, context.getContentResolver(),
-                             uri, values, null, null);
-    }
-
-    @Override
-    public int getType() {
-        return RETRIEVE_TRANSACTION;
-    }
-}
+/*
+ * Copyright 2014 Jacob Klinker
+ *
+ * Licensed under the Apache License, Version 2.0 (the "License");
+ * you may not use this file except in compliance with the License.
+ * You may obtain a copy of the License at
+ *
+ *     http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing, software
+ * distributed under the License is distributed on an "AS IS" BASIS,
+ * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ * See the License for the specific language governing permissions and
+ * limitations under the License.
+ */
+
+package com.android.mms.transaction;
+
+import android.content.ContentValues;
+import android.content.Context;
+import android.database.Cursor;
+import android.database.sqlite.SqliteWrapper;
+import android.net.Uri;
+import android.provider.Telephony.Mms;
+import android.provider.Telephony.Mms.Inbox;
+import android.text.TextUtils;
+
+import com.android.mms.MmsConfig;
+import com.android.mms.util.DownloadManager;
+import com.google.android.mms.MmsException;
+import com.google.android.mms.pdu_alt.AcknowledgeInd;
+import com.google.android.mms.pdu_alt.EncodedStringValue;
+import com.google.android.mms.pdu_alt.PduComposer;
+import com.google.android.mms.pdu_alt.PduHeaders;
+import com.google.android.mms.pdu_alt.PduParser;
+import com.google.android.mms.pdu_alt.PduPersister;
+import com.google.android.mms.pdu_alt.RetrieveConf;
+import com.klinker.android.send_message.Utils;
+
+import java.io.IOException;
+
+import timber.log.Timber;
+
+/**
+ * The RetrieveTransaction is responsible for retrieving multimedia
+ * messages (M-Retrieve.conf) from the MMSC server.  It:
+ *
+ * <ul>
+ * <li>Sends a GET request to the MMSC server.
+ * <li>Retrieves the binary M-Retrieve.conf data and parses it.
+ * <li>Persists the retrieve multimedia message.
+ * <li>Determines whether an acknowledgement is required.
+ * <li>Creates appropriate M-Acknowledge.ind and sends it to MMSC server.
+ * <li>Notifies the TransactionService about succesful completion.
+ * </ul>
+ */
+public class RetrieveTransaction extends Transaction implements Runnable {
+    private static final boolean LOCAL_LOGV = false;
+
+    private final Uri mUri;
+    private final String mContentLocation;
+    private boolean mLocked;
+
+    static final String[] PROJECTION = new String[] {
+        Mms.CONTENT_LOCATION,
+        Mms.LOCKED
+    };
+
+    // The indexes of the columns which must be consistent with above PROJECTION.
+    static final int COLUMN_CONTENT_LOCATION      = 0;
+    static final int COLUMN_LOCKED                = 1;
+
+    public RetrieveTransaction(Context context, int serviceId,
+            TransactionSettings connectionSettings, String uri)
+            throws MmsException {
+        super(context, serviceId, connectionSettings);
+
+        if (uri.startsWith("content://")) {
+            mUri = Uri.parse(uri); // The Uri of the M-Notification.ind
+            mId = mContentLocation = getContentLocation(context, mUri);
+            if (LOCAL_LOGV) {
+                Timber.v("X-Mms-Content-Location: " + mContentLocation);
+            }
+        } else {
+            throw new IllegalArgumentException(
+                    "Initializing from X-Mms-Content-Location is abandoned!");
+        }
+
+        // Attach the transaction to the instance of RetryScheduler.
+        attach(RetryScheduler.getInstance(context));
+    }
+
+    public String getContentLocation(Context context, Uri uri)
+            throws MmsException {
+        Cursor cursor = SqliteWrapper.query(context, context.getContentResolver(),
+                            uri, PROJECTION, null, null, null);
+        mLocked = false;
+
+        if (cursor != null) {
+            try {
+                if ((cursor.getCount() == 1) && cursor.moveToFirst()) {
+                    // Get the locked flag from the M-Notification.ind so it can be transferred
+                    // to the real message after the download.
+                    mLocked = cursor.getInt(COLUMN_LOCKED) == 1;
+                    String location = cursor.getString(COLUMN_CONTENT_LOCATION);
+                    cursor.close();
+                    return location;
+                }
+            } finally {
+                cursor.close();
+            }
+        }
+
+        throw new MmsException("Cannot get X-Mms-Content-Location from: " + uri);
+    }
+
+    /*
+     * (non-Javadoc)
+     * @see com.android.mms.transaction.Transaction#process()
+     */
+    @Override
+    public void process() {
+        new Thread(this, "RetrieveTransaction").start();
+    }
+
+    public void run() {
+//        if (Build.VERSION.SDK_INT >= Build.VERSION_CODES.LOLLIPOP) {
+//            DownloadRequest request = new DownloadRequest(mContentLocation, mUri, null, null, null);
+//            MmsNetworkManager manager = new MmsNetworkManager(mContext);
+//            request.execute(mContext, manager);
+//        } else {
+            try {
+                // Change the downloading state of the M-Notification.ind.
+                DownloadManager.init(mContext.getApplicationContext());
+                DownloadManager.getInstance().markState(
+                        mUri, DownloadManager.STATE_DOWNLOADING);
+
+                // Send GET request to MMSC and retrieve the response data.
+                byte[] resp = getPdu(mContentLocation);
+
+                // Parse M-Retrieve.conf
+                RetrieveConf retrieveConf = (RetrieveConf) new PduParser(resp).parse();
+                if (null == retrieveConf) {
+                    throw new MmsException("Invalid M-Retrieve.conf PDU.");
+                }
+
+                Uri msgUri = null;
+                if (isDuplicateMessage(mContext, retrieveConf)) {
+                    // Mark this transaction as failed to prevent duplicate
+                    // notification to user.
+                    mTransactionState.setState(TransactionState.FAILED);
+                    mTransactionState.setContentUri(mUri);
+                } else {
+                    // Store M-Retrieve.conf into Inbox
+                    PduPersister persister = PduPersister.getPduPersister(mContext);
+                    msgUri = persister.persist(retrieveConf, Inbox.CONTENT_URI,
+                            PduPersister.DUMMY_THREAD_ID, true, true, null);
+
+                    // Use local time instead of PDU time
+                    ContentValues values = new ContentValues(3);
+                    values.put(Mms.DATE, System.currentTimeMillis() / 1000L);
+                    try {
+                        values.put(Mms.DATE_SENT, retrieveConf.getDate());
+                    } catch (Exception ignored) {
+                    }
+                    values.put(Mms.MESSAGE_SIZE, resp.length);
+                    SqliteWrapper.update(mContext, mContext.getContentResolver(),
+                            msgUri, values, null, null);
+
+                    // The M-Retrieve.conf has been successfully downloaded.
+                    mTransactionState.setState(TransactionState.SUCCESS);
+                    mTransactionState.setContentUri(msgUri);
+                    // Remember the location the message was downloaded from.
+                    // Since it's not critical, it won't fail the transaction.
+                    // Copy over the locked flag from the M-Notification.ind in case
+                    // the user locked the message before activating the download.
+                    updateContentLocation(mContext, msgUri, mContentLocation, mLocked);
+                }
+
+                // Delete the corresponding M-Notification.ind.
+                SqliteWrapper.delete(mContext, mContext.getContentResolver(),
+                        mUri, null, null);
+
+                // Send ACK to the Proxy-Relay to indicate we have fetched the
+                // MM successfully.
+                // Don't mark the transaction as failed if we failed to send it.
+                sendAcknowledgeInd(retrieveConf);
+            } catch (Throwable t) {
+                Timber.e(t, "error");
+                if ("HTTP error: Not Found".equals(t.getMessage())) {
+                    // Delete the expired M-Notification.ind.
+                    SqliteWrapper.delete(mContext, mContext.getContentResolver(),
+                            mUri, null, null);
+                }
+            } finally {
+                if (mTransactionState.getState() != TransactionState.SUCCESS) {
+                    mTransactionState.setState(TransactionState.FAILED);
+                    mTransactionState.setContentUri(mUri);
+                    Timber.e("Retrieval failed.");
+                }
+                notifyObservers();
+            }
+//        }
+    }
+
+    private static boolean isDuplicateMessage(Context context, RetrieveConf rc) {
+        byte[] rawMessageId = rc.getMessageId();
+        if (rawMessageId != null) {
+            String messageId = new String(rawMessageId);
+            String selection = "(" + Mms.MESSAGE_ID + " = ? AND "
+                                   + Mms.MESSAGE_TYPE + " = ?)";
+            String[] selectionArgs = new String[] { messageId,
+                    String.valueOf(PduHeaders.MESSAGE_TYPE_RETRIEVE_CONF) };
+
+            Cursor cursor = SqliteWrapper.query(
+                    context, context.getContentResolver(),
+                    Mms.CONTENT_URI, new String[] { Mms._ID, Mms.SUBJECT, Mms.SUBJECT_CHARSET },
+                    selection, selectionArgs, null);
+
+            if (cursor != null) {
+                try {
+                    if (cursor.getCount() > 0) {
+                        // A message with identical message ID and type found.
+                        // Do some additional checks to be sure it's a duplicate.
+                        boolean dup = isDuplicateMessageExtra(cursor, rc);
+                        if (!cursor.isClosed()) {
+                            cursor.close();
+                        }
+
+                        return dup;
+                    }
+                } finally {
+                    cursor.close();
+                }
+            }
+        }
+        return false;
+    }
+
+    private static boolean isDuplicateMessageExtra(Cursor cursor, RetrieveConf rc) {
+        // Compare message subjects, taking encoding into account
+        EncodedStringValue encodedSubjectReceived = null;
+        EncodedStringValue encodedSubjectStored = null;
+        String subjectReceived = null;
+        String subjectStored = null;
+        String subject = null;
+
+        encodedSubjectReceived = rc.getSubject();
+        if (encodedSubjectReceived != null) {
+            subjectReceived = encodedSubjectReceived.getString();
+        }
+
+        for (cursor.moveToFirst(); !cursor.isAfterLast(); cursor.moveToNext()) {
+            int subjectIdx = cursor.getColumnIndex(Mms.SUBJECT);
+            int charsetIdx = cursor.getColumnIndex(Mms.SUBJECT_CHARSET);
+            subject = cursor.getString(subjectIdx);
+            int charset = cursor.getInt(charsetIdx);
+            if (subject != null) {
+                encodedSubjectStored = new EncodedStringValue(charset, PduPersister
+                        .getBytes(subject));
+            }
+            if (encodedSubjectStored == null && encodedSubjectReceived == null) {
+                // Both encoded subjects are null - return true
+                return true;
+            } else if (encodedSubjectStored != null && encodedSubjectReceived != null) {
+                subjectStored = encodedSubjectStored.getString();
+                if (!TextUtils.isEmpty(subjectStored) && !TextUtils.isEmpty(subjectReceived)) {
+                    // Both decoded subjects are non-empty - compare them
+                    return subjectStored.equals(subjectReceived);
+                } else if (TextUtils.isEmpty(subjectStored) && TextUtils.isEmpty(subjectReceived)) {
+                    // Both decoded subjects are "" - return true
+                    return true;
+                }
+            }
+        }
+
+        return false;
+    }
+
+    private void sendAcknowledgeInd(RetrieveConf rc) throws MmsException, IOException {
+        // Send M-Acknowledge.ind to MMSC if required.
+        // If the Transaction-ID isn't set in the M-Retrieve.conf, it means
+        // the MMS proxy-relay doesn't require an ACK.
+        byte[] tranId = rc.getTransactionId();
+        if (tranId != null) {
+            // Create M-Acknowledge.ind
+            AcknowledgeInd acknowledgeInd = new AcknowledgeInd(
+                    PduHeaders.CURRENT_MMS_VERSION, tranId);
+
+            // insert the 'from' address per spec
+            String lineNumber = Utils.getMyPhoneNumber(mContext);
+            acknowledgeInd.setFrom(new EncodedStringValue(lineNumber));
+
+            // Pack M-Acknowledge.ind and send it
+            if(MmsConfig.getNotifyWapMMSC()) {
+                sendPdu(new PduComposer(mContext, acknowledgeInd).make(), mContentLocation);
+            } else {
+                sendPdu(new PduComposer(mContext, acknowledgeInd).make());
+            }
+        }
+    }
+
+    private static void updateContentLocation(Context context, Uri uri,
+                                              String contentLocation,
+                                              boolean locked) {
+        ContentValues values = new ContentValues(2);
+        values.put(Mms.CONTENT_LOCATION, contentLocation);
+        values.put(Mms.LOCKED, locked);     // preserve the state of the M-Notification.ind lock.
+        SqliteWrapper.update(context, context.getContentResolver(),
+                             uri, values, null, null);
+    }
+
+    @Override
+    public int getType() {
+        return RETRIEVE_TRANSACTION;
+    }
+}
diff --git a/android-smsmms/src/main/java/com/android/mms/transaction/RetryScheduler.java b/android-smsmms/src/main/java/com/android/mms/transaction/RetryScheduler.java
index 455581810..6c2918f0d 100755
--- a/android-smsmms/src/main/java/com/android/mms/transaction/RetryScheduler.java
+++ b/android-smsmms/src/main/java/com/android/mms/transaction/RetryScheduler.java
@@ -1,324 +1,324 @@
-/*
- * Copyright 2014 Jacob Klinker
- *
- * Licensed under the Apache License, Version 2.0 (the "License");
- * you may not use this file except in compliance with the License.
- * You may obtain a copy of the License at
- *
- *     http://www.apache.org/licenses/LICENSE-2.0
- *
- * Unless required by applicable law or agreed to in writing, software
- * distributed under the License is distributed on an "AS IS" BASIS,
- * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
- * See the License for the specific language governing permissions and
- * limitations under the License.
- */
-
-package com.android.mms.transaction;
-
-import android.app.AlarmManager;
-import android.app.PendingIntent;
-import android.content.ContentResolver;
-import android.content.ContentUris;
-import android.content.ContentValues;
-import android.content.Context;
-import android.content.Intent;
-import android.database.Cursor;
-import android.database.sqlite.SqliteWrapper;
-import android.net.ConnectivityManager;
-import android.net.NetworkInfo;
-import android.net.Uri;
-import android.provider.Telephony.Mms;
-import android.provider.Telephony.MmsSms;
-import android.provider.Telephony.MmsSms.PendingMessages;
-import com.android.mms.util.DownloadManager;
-import com.google.android.mms.pdu_alt.PduHeaders;
-import com.google.android.mms.pdu_alt.PduPersister;
-import com.klinker.android.send_message.BroadcastUtils;
-import com.klinker.android.send_message.R;
-import timber.log.Timber;
-
-public class RetryScheduler implements Observer {
-    private static final boolean LOCAL_LOGV = false;
-
-    private final Context mContext;
-    private final ContentResolver mContentResolver;
-
-    private RetryScheduler(Context context) {
-        mContext = context;
-        mContentResolver = context.getContentResolver();
-    }
-
-    private static RetryScheduler sInstance;
-    public static RetryScheduler getInstance(Context context) {
-        if (sInstance == null) {
-            sInstance = new RetryScheduler(context);
-        }
-        return sInstance;
-    }
-
-    private boolean isConnected() {
-        ConnectivityManager mConnMgr = (ConnectivityManager)
-                mContext.getSystemService(Context.CONNECTIVITY_SERVICE);
-        NetworkInfo ni = mConnMgr.getNetworkInfo(ConnectivityManager.TYPE_MOBILE_MMS);
-        return (ni == null ? false : ni.isConnected());
-    }
-
-    public void update(Observable observable) {
-        try {
-            Transaction t = (Transaction) observable;
-
-            Timber.v("[RetryScheduler] update " + observable);
-
-            // We are only supposed to handle M-Notification.ind, M-Send.req
-            // and M-ReadRec.ind.
-            if ((t instanceof NotificationTransaction)
-                    || (t instanceof RetrieveTransaction)
-                    || (t instanceof ReadRecTransaction)
-                    || (t instanceof SendTransaction)) {
-                try {
-                    TransactionState state = t.getState();
-                    if (state.getState() == TransactionState.FAILED) {
-                        Uri uri = state.getContentUri();
-                        if (uri != null) {
-                            scheduleRetry(uri);
-                        }
-                    }
-                } finally {
-                    t.detach(this);
-                }
-            }
-        } finally {
-            if (isConnected()) {
-                setRetryAlarm(mContext);
-            }
-        }
-    }
-
-    private void scheduleRetry(Uri uri) {
-        long msgId = ContentUris.parseId(uri);
-
-        Uri.Builder uriBuilder = PendingMessages.CONTENT_URI.buildUpon();
-        uriBuilder.appendQueryParameter("protocol", "mms");
-        uriBuilder.appendQueryParameter("message", String.valueOf(msgId));
-
-        Cursor cursor = SqliteWrapper.query(mContext, mContentResolver,
-                uriBuilder.build(), null, null, null, null);
-
-        if (cursor != null) {
-            try {
-                if ((cursor.getCount() == 1) && cursor.moveToFirst()) {
-                    int msgType = cursor.getInt(cursor.getColumnIndexOrThrow(
-                            PendingMessages.MSG_TYPE));
-
-                    int retryIndex = cursor.getInt(cursor.getColumnIndexOrThrow(
-                            PendingMessages.RETRY_INDEX)) + 1; // Count this time.
-
-                    // TODO Should exactly understand what was happened.
-                    int errorType = MmsSms.ERR_TYPE_GENERIC;
-
-                    DefaultRetryScheme scheme = new DefaultRetryScheme(mContext, retryIndex);
-
-                    ContentValues values = new ContentValues(4);
-                    long current = System.currentTimeMillis();
-                    boolean isRetryDownloading =
-                            (msgType == PduHeaders.MESSAGE_TYPE_NOTIFICATION_IND);
-                    boolean retry = true;
-                    int respStatus = getResponseStatus(msgId);
-                    int errorString = 0;
-                    if (!isRetryDownloading) {
-                        // Send Transaction case
-                        switch (respStatus) {
-                            case PduHeaders.RESPONSE_STATUS_ERROR_SENDING_ADDRESS_UNRESOLVED:
-                                errorString = R.string.invalid_destination;
-                                break;
-                            case PduHeaders.RESPONSE_STATUS_ERROR_SERVICE_DENIED:
-                            case PduHeaders.RESPONSE_STATUS_ERROR_PERMANENT_SERVICE_DENIED:
-                                errorString = R.string.service_not_activated;
-                                break;
-                            case PduHeaders.RESPONSE_STATUS_ERROR_NETWORK_PROBLEM:
-                                errorString = R.string.service_network_problem;
-                                break;
-                            case PduHeaders.RESPONSE_STATUS_ERROR_TRANSIENT_MESSAGE_NOT_FOUND:
-                            case PduHeaders.RESPONSE_STATUS_ERROR_PERMANENT_MESSAGE_NOT_FOUND:
-                                errorString = R.string.service_message_not_found;
-                                break;
-                        }
-                        if (errorString != 0) {
-                            DownloadManager.init(mContext.getApplicationContext());
-                            DownloadManager.getInstance().showErrorCodeToast(errorString);
-                            retry = false;
-                        }
-                    } else {
-                        // apply R880 IOT issue (Conformance 11.6 Retrieve Invalid Message)
-                        // Notification Transaction case
-                        respStatus = getRetrieveStatus(msgId);
-                        if (respStatus ==
-                                PduHeaders.RESPONSE_STATUS_ERROR_PERMANENT_MESSAGE_NOT_FOUND) {
-                            DownloadManager.init(mContext.getApplicationContext());
-                            DownloadManager.getInstance().showErrorCodeToast(
-                                    R.string.service_message_not_found);
-                            SqliteWrapper.delete(mContext, mContext.getContentResolver(), uri,
-                                    null, null);
-                            retry = false;
-                            return;
-                        }
-                    }
-                    if ((retryIndex < scheme.getRetryLimit()) && retry) {
-                        long retryAt = current + scheme.getWaitingInterval();
-
-                        Timber.v("scheduleRetry: retry for " + uri + " is scheduled at "
-                            + (retryAt - System.currentTimeMillis()) + "ms from now");
-
-                        values.put(PendingMessages.DUE_TIME, retryAt);
-
-                        if (isRetryDownloading) {
-                            // Downloading process is transiently failed.
-                            DownloadManager.init(mContext.getApplicationContext());
-                            DownloadManager.getInstance().markState(
-                                    uri, DownloadManager.STATE_TRANSIENT_FAILURE);
-                        }
-                    } else {
-                        errorType = MmsSms.ERR_TYPE_GENERIC_PERMANENT;
-                        if (isRetryDownloading) {
-                            Cursor c = SqliteWrapper.query(mContext, mContext.getContentResolver(), uri,
-                                    new String[] { Mms.THREAD_ID }, null, null, null);
-
-                            long threadId = -1;
-                            if (c != null) {
-                                try {
-                                    if (c.moveToFirst()) {
-                                        threadId = c.getLong(0);
-                                    }
-                                } finally {
-                                    c.close();
-                                }
-                            }
-
-                            if (threadId != -1) {
-                                // Downloading process is permanently failed.
-                                markMmsFailed(mContext);
-                            }
-
-                            DownloadManager.init(mContext.getApplicationContext());
-                            DownloadManager.getInstance().markState(
-                                    uri, DownloadManager.STATE_PERMANENT_FAILURE);
-                        } else {
-                            // Mark the failed message as unread.
-                            ContentValues readValues = new ContentValues(1);
-                            readValues.put(Mms.READ, 0);
-                            SqliteWrapper.update(mContext, mContext.getContentResolver(),
-                                    uri, readValues, null, null);
-                            markMmsFailed(mContext);
-                        }
-                    }
-
-                    values.put(PendingMessages.ERROR_TYPE,  errorType);
-                    values.put(PendingMessages.RETRY_INDEX, retryIndex);
-                    values.put(PendingMessages.LAST_TRY,    current);
-
-                    int columnIndex = cursor.getColumnIndexOrThrow(
-                            PendingMessages._ID);
-                    long id = cursor.getLong(columnIndex);
-                    SqliteWrapper.update(mContext, mContentResolver,
-                            PendingMessages.CONTENT_URI,
-                            values, PendingMessages._ID + "=" + id, null);
-                } else if (LOCAL_LOGV) {
-                    Timber.v("Cannot found correct pending status for: " + msgId);
-                }
-            } finally {
-                cursor.close();
-            }
-        }
-    }
-
-    private void markMmsFailed(final Context context) {
-        Cursor query = context.getContentResolver().query(Mms.CONTENT_URI, new String[]{Mms._ID}, null, null, "date desc");
-
-        try {
-            query.moveToFirst();
-            String id = query.getString(query.getColumnIndex(Mms._ID));
-            query.close();
-
-            // mark message as failed
-            ContentValues values = new ContentValues();
-            values.put(Mms.MESSAGE_BOX, Mms.MESSAGE_BOX_FAILED);
-            String where = Mms._ID + " = '" + id + "'";
-            context.getContentResolver().update(Mms.CONTENT_URI, values, where, null);
-
-            BroadcastUtils.sendExplicitBroadcast(
-                    mContext, new Intent(), com.klinker.android.send_message.Transaction.REFRESH);
-            BroadcastUtils.sendExplicitBroadcast(
-                    mContext,
-                    new Intent(),
-                    com.klinker.android.send_message.Transaction.NOTIFY_SMS_FAILURE);
-
-            // broadcast that mms has failed and you can notify user from there if you would like
-            BroadcastUtils.sendExplicitBroadcast(
-                    mContext, new Intent(), com.klinker.android.send_message.Transaction.MMS_ERROR);
-        } catch (Exception e) {
-        }
-    }
-
-    private int getResponseStatus(long msgID) {
-        int respStatus = 0;
-        Cursor cursor = SqliteWrapper.query(mContext, mContentResolver,
-                Mms.Outbox.CONTENT_URI, null, Mms._ID + "=" + msgID, null, null);
-        try {
-            if (cursor.moveToFirst()) {
-                respStatus = cursor.getInt(cursor.getColumnIndexOrThrow(Mms.RESPONSE_STATUS));
-            }
-        } finally {
-            cursor.close();
-        }
-        if (respStatus != 0) {
-            Timber.e("Response status is: " + respStatus);
-        }
-        return respStatus;
-    }
-
-    // apply R880 IOT issue (Conformance 11.6 Retrieve Invalid Message)
-    private int getRetrieveStatus(long msgID) {
-        int retrieveStatus = 0;
-        Cursor cursor = SqliteWrapper.query(mContext, mContentResolver,
-                Mms.Inbox.CONTENT_URI, null, Mms._ID + "=" + msgID, null, null);
-        try {
-            if (cursor.moveToFirst()) {
-                retrieveStatus = cursor.getInt(cursor.getColumnIndexOrThrow(
-                            Mms.RESPONSE_STATUS));
-            }
-        } finally {
-            cursor.close();
-        }
-        if (retrieveStatus != 0) {
-            Timber.v("Retrieve status is: " + retrieveStatus);
-        }
-        return retrieveStatus;
-    }
-
-    public static void setRetryAlarm(Context context) {
-        Cursor cursor = PduPersister.getPduPersister(context).getPendingMessages(
-                Long.MAX_VALUE);
-        if (cursor != null) {
-            try {
-                if (cursor.moveToFirst()) {
-                    // The result of getPendingMessages() is order by due time.
-                    long retryAt = cursor.getLong(cursor.getColumnIndexOrThrow(
-                            PendingMessages.DUE_TIME));
-
-                    Intent service = new Intent(TransactionService.ACTION_ONALARM,
-                                        null, context, TransactionService.class);
-                    PendingIntent operation = PendingIntent.getService(
-                            context, 0, service, PendingIntent.FLAG_ONE_SHOT);
-                    AlarmManager am = (AlarmManager) context.getSystemService(
-                            Context.ALARM_SERVICE);
-                    am.set(AlarmManager.RTC, retryAt, operation);
-
-                    Timber.v("Next retry is scheduled at" + (retryAt - System.currentTimeMillis()) + "ms from now");
-                }
-            } finally {
-                cursor.close();
-            }
-        }
-    }
-}
+/*
+ * Copyright 2014 Jacob Klinker
+ *
+ * Licensed under the Apache License, Version 2.0 (the "License");
+ * you may not use this file except in compliance with the License.
+ * You may obtain a copy of the License at
+ *
+ *     http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing, software
+ * distributed under the License is distributed on an "AS IS" BASIS,
+ * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ * See the License for the specific language governing permissions and
+ * limitations under the License.
+ */
+
+package com.android.mms.transaction;
+
+import android.app.AlarmManager;
+import android.app.PendingIntent;
+import android.content.ContentResolver;
+import android.content.ContentUris;
+import android.content.ContentValues;
+import android.content.Context;
+import android.content.Intent;
+import android.database.Cursor;
+import android.database.sqlite.SqliteWrapper;
+import android.net.ConnectivityManager;
+import android.net.NetworkInfo;
+import android.net.Uri;
+import android.provider.Telephony.Mms;
+import android.provider.Telephony.MmsSms;
+import android.provider.Telephony.MmsSms.PendingMessages;
+import com.android.mms.util.DownloadManager;
+import com.google.android.mms.pdu_alt.PduHeaders;
+import com.google.android.mms.pdu_alt.PduPersister;
+import com.klinker.android.send_message.BroadcastUtils;
+import com.klinker.android.send_message.R;
+import timber.log.Timber;
+
+public class RetryScheduler implements Observer {
+    private static final boolean LOCAL_LOGV = false;
+
+    private final Context mContext;
+    private final ContentResolver mContentResolver;
+
+    private RetryScheduler(Context context) {
+        mContext = context;
+        mContentResolver = context.getContentResolver();
+    }
+
+    private static RetryScheduler sInstance;
+    public static RetryScheduler getInstance(Context context) {
+        if (sInstance == null) {
+            sInstance = new RetryScheduler(context);
+        }
+        return sInstance;
+    }
+
+    private boolean isConnected() {
+        ConnectivityManager mConnMgr = (ConnectivityManager)
+                mContext.getSystemService(Context.CONNECTIVITY_SERVICE);
+        NetworkInfo ni = mConnMgr.getNetworkInfo(ConnectivityManager.TYPE_MOBILE_MMS);
+        return (ni == null ? false : ni.isConnected());
+    }
+
+    public void update(Observable observable) {
+        try {
+            Transaction t = (Transaction) observable;
+
+            Timber.v("[RetryScheduler] update " + observable);
+
+            // We are only supposed to handle M-Notification.ind, M-Send.req
+            // and M-ReadRec.ind.
+            if ((t instanceof NotificationTransaction)
+                    || (t instanceof RetrieveTransaction)
+                    || (t instanceof ReadRecTransaction)
+                    || (t instanceof SendTransaction)) {
+                try {
+                    TransactionState state = t.getState();
+                    if (state.getState() == TransactionState.FAILED) {
+                        Uri uri = state.getContentUri();
+                        if (uri != null) {
+                            scheduleRetry(uri);
+                        }
+                    }
+                } finally {
+                    t.detach(this);
+                }
+            }
+        } finally {
+            if (isConnected()) {
+                setRetryAlarm(mContext);
+            }
+        }
+    }
+
+    private void scheduleRetry(Uri uri) {
+        long msgId = ContentUris.parseId(uri);
+
+        Uri.Builder uriBuilder = PendingMessages.CONTENT_URI.buildUpon();
+        uriBuilder.appendQueryParameter("protocol", "mms");
+        uriBuilder.appendQueryParameter("message", String.valueOf(msgId));
+
+        Cursor cursor = SqliteWrapper.query(mContext, mContentResolver,
+                uriBuilder.build(), null, null, null, null);
+
+        if (cursor != null) {
+            try {
+                if ((cursor.getCount() == 1) && cursor.moveToFirst()) {
+                    int msgType = cursor.getInt(cursor.getColumnIndexOrThrow(
+                            PendingMessages.MSG_TYPE));
+
+                    int retryIndex = cursor.getInt(cursor.getColumnIndexOrThrow(
+                            PendingMessages.RETRY_INDEX)) + 1; // Count this time.
+
+                    // TODO Should exactly understand what was happened.
+                    int errorType = MmsSms.ERR_TYPE_GENERIC;
+
+                    DefaultRetryScheme scheme = new DefaultRetryScheme(mContext, retryIndex);
+
+                    ContentValues values = new ContentValues(4);
+                    long current = System.currentTimeMillis();
+                    boolean isRetryDownloading =
+                            (msgType == PduHeaders.MESSAGE_TYPE_NOTIFICATION_IND);
+                    boolean retry = true;
+                    int respStatus = getResponseStatus(msgId);
+                    int errorString = 0;
+                    if (!isRetryDownloading) {
+                        // Send Transaction case
+                        switch (respStatus) {
+                            case PduHeaders.RESPONSE_STATUS_ERROR_SENDING_ADDRESS_UNRESOLVED:
+                                errorString = R.string.invalid_destination;
+                                break;
+                            case PduHeaders.RESPONSE_STATUS_ERROR_SERVICE_DENIED:
+                            case PduHeaders.RESPONSE_STATUS_ERROR_PERMANENT_SERVICE_DENIED:
+                                errorString = R.string.service_not_activated;
+                                break;
+                            case PduHeaders.RESPONSE_STATUS_ERROR_NETWORK_PROBLEM:
+                                errorString = R.string.service_network_problem;
+                                break;
+                            case PduHeaders.RESPONSE_STATUS_ERROR_TRANSIENT_MESSAGE_NOT_FOUND:
+                            case PduHeaders.RESPONSE_STATUS_ERROR_PERMANENT_MESSAGE_NOT_FOUND:
+                                errorString = R.string.service_message_not_found;
+                                break;
+                        }
+                        if (errorString != 0) {
+                            DownloadManager.init(mContext.getApplicationContext());
+                            DownloadManager.getInstance().showErrorCodeToast(errorString);
+                            retry = false;
+                        }
+                    } else {
+                        // apply R880 IOT issue (Conformance 11.6 Retrieve Invalid Message)
+                        // Notification Transaction case
+                        respStatus = getRetrieveStatus(msgId);
+                        if (respStatus ==
+                                PduHeaders.RESPONSE_STATUS_ERROR_PERMANENT_MESSAGE_NOT_FOUND) {
+                            DownloadManager.init(mContext.getApplicationContext());
+                            DownloadManager.getInstance().showErrorCodeToast(
+                                    R.string.service_message_not_found);
+                            SqliteWrapper.delete(mContext, mContext.getContentResolver(), uri,
+                                    null, null);
+                            retry = false;
+                            return;
+                        }
+                    }
+                    if ((retryIndex < scheme.getRetryLimit()) && retry) {
+                        long retryAt = current + scheme.getWaitingInterval();
+
+                        Timber.v("scheduleRetry: retry for " + uri + " is scheduled at "
+                            + (retryAt - System.currentTimeMillis()) + "ms from now");
+
+                        values.put(PendingMessages.DUE_TIME, retryAt);
+
+                        if (isRetryDownloading) {
+                            // Downloading process is transiently failed.
+                            DownloadManager.init(mContext.getApplicationContext());
+                            DownloadManager.getInstance().markState(
+                                    uri, DownloadManager.STATE_TRANSIENT_FAILURE);
+                        }
+                    } else {
+                        errorType = MmsSms.ERR_TYPE_GENERIC_PERMANENT;
+                        if (isRetryDownloading) {
+                            Cursor c = SqliteWrapper.query(mContext, mContext.getContentResolver(), uri,
+                                    new String[] { Mms.THREAD_ID }, null, null, null);
+
+                            long threadId = -1;
+                            if (c != null) {
+                                try {
+                                    if (c.moveToFirst()) {
+                                        threadId = c.getLong(0);
+                                    }
+                                } finally {
+                                    c.close();
+                                }
+                            }
+
+                            if (threadId != -1) {
+                                // Downloading process is permanently failed.
+                                markMmsFailed(mContext);
+                            }
+
+                            DownloadManager.init(mContext.getApplicationContext());
+                            DownloadManager.getInstance().markState(
+                                    uri, DownloadManager.STATE_PERMANENT_FAILURE);
+                        } else {
+                            // Mark the failed message as unread.
+                            ContentValues readValues = new ContentValues(1);
+                            readValues.put(Mms.READ, 0);
+                            SqliteWrapper.update(mContext, mContext.getContentResolver(),
+                                    uri, readValues, null, null);
+                            markMmsFailed(mContext);
+                        }
+                    }
+
+                    values.put(PendingMessages.ERROR_TYPE,  errorType);
+                    values.put(PendingMessages.RETRY_INDEX, retryIndex);
+                    values.put(PendingMessages.LAST_TRY,    current);
+
+                    int columnIndex = cursor.getColumnIndexOrThrow(
+                            PendingMessages._ID);
+                    long id = cursor.getLong(columnIndex);
+                    SqliteWrapper.update(mContext, mContentResolver,
+                            PendingMessages.CONTENT_URI,
+                            values, PendingMessages._ID + "=" + id, null);
+                } else if (LOCAL_LOGV) {
+                    Timber.v("Cannot found correct pending status for: " + msgId);
+                }
+            } finally {
+                cursor.close();
+            }
+        }
+    }
+
+    private void markMmsFailed(final Context context) {
+        Cursor query = context.getContentResolver().query(Mms.CONTENT_URI, new String[]{Mms._ID}, null, null, "date desc");
+
+        try {
+            query.moveToFirst();
+            String id = query.getString(query.getColumnIndex(Mms._ID));
+            query.close();
+
+            // mark message as failed
+            ContentValues values = new ContentValues();
+            values.put(Mms.MESSAGE_BOX, Mms.MESSAGE_BOX_FAILED);
+            String where = Mms._ID + " = '" + id + "'";
+            context.getContentResolver().update(Mms.CONTENT_URI, values, where, null);
+
+            BroadcastUtils.sendExplicitBroadcast(
+                    mContext, new Intent(), com.klinker.android.send_message.Transaction.REFRESH);
+            BroadcastUtils.sendExplicitBroadcast(
+                    mContext,
+                    new Intent(),
+                    com.klinker.android.send_message.Transaction.NOTIFY_SMS_FAILURE);
+
+            // broadcast that mms has failed and you can notify user from there if you would like
+            BroadcastUtils.sendExplicitBroadcast(
+                    mContext, new Intent(), com.klinker.android.send_message.Transaction.MMS_ERROR);
+        } catch (Exception e) {
+        }
+    }
+
+    private int getResponseStatus(long msgID) {
+        int respStatus = 0;
+        Cursor cursor = SqliteWrapper.query(mContext, mContentResolver,
+                Mms.Outbox.CONTENT_URI, null, Mms._ID + "=" + msgID, null, null);
+        try {
+            if (cursor.moveToFirst()) {
+                respStatus = cursor.getInt(cursor.getColumnIndexOrThrow(Mms.RESPONSE_STATUS));
+            }
+        } finally {
+            cursor.close();
+        }
+        if (respStatus != 0) {
+            Timber.e("Response status is: " + respStatus);
+        }
+        return respStatus;
+    }
+
+    // apply R880 IOT issue (Conformance 11.6 Retrieve Invalid Message)
+    private int getRetrieveStatus(long msgID) {
+        int retrieveStatus = 0;
+        Cursor cursor = SqliteWrapper.query(mContext, mContentResolver,
+                Mms.Inbox.CONTENT_URI, null, Mms._ID + "=" + msgID, null, null);
+        try {
+            if (cursor.moveToFirst()) {
+                retrieveStatus = cursor.getInt(cursor.getColumnIndexOrThrow(
+                            Mms.RESPONSE_STATUS));
+            }
+        } finally {
+            cursor.close();
+        }
+        if (retrieveStatus != 0) {
+            Timber.v("Retrieve status is: " + retrieveStatus);
+        }
+        return retrieveStatus;
+    }
+
+    public static void setRetryAlarm(Context context) {
+        Cursor cursor = PduPersister.getPduPersister(context).getPendingMessages(
+                Long.MAX_VALUE);
+        if (cursor != null) {
+            try {
+                if (cursor.moveToFirst()) {
+                    // The result of getPendingMessages() is order by due time.
+                    long retryAt = cursor.getLong(cursor.getColumnIndexOrThrow(
+                            PendingMessages.DUE_TIME));
+
+                    Intent service = new Intent(TransactionService.ACTION_ONALARM,
+                                        null, context, TransactionService.class);
+                    PendingIntent operation = PendingIntent.getService(
+                            context, 0, service, PendingIntent.FLAG_ONE_SHOT);
+                    AlarmManager am = (AlarmManager) context.getSystemService(
+                            Context.ALARM_SERVICE);
+                    am.set(AlarmManager.RTC, retryAt, operation);
+
+                    Timber.v("Next retry is scheduled at" + (retryAt - System.currentTimeMillis()) + "ms from now");
+                }
+            } finally {
+                cursor.close();
+            }
+        }
+    }
+}
diff --git a/android-smsmms/src/main/java/com/android/mms/transaction/SendTransaction.java b/android-smsmms/src/main/java/com/android/mms/transaction/SendTransaction.java
index 851334a2b..6860b3fbc 100755
--- a/android-smsmms/src/main/java/com/android/mms/transaction/SendTransaction.java
+++ b/android-smsmms/src/main/java/com/android/mms/transaction/SendTransaction.java
@@ -1,185 +1,185 @@
-/*
- * Copyright 2014 Jacob Klinker
- *
- * Licensed under the Apache License, Version 2.0 (the "License");
- * you may not use this file except in compliance with the License.
- * You may obtain a copy of the License at
- *
- *     http://www.apache.org/licenses/LICENSE-2.0
- *
- * Unless required by applicable law or agreed to in writing, software
- * distributed under the License is distributed on an "AS IS" BASIS,
- * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
- * See the License for the specific language governing permissions and
- * limitations under the License.
- */
-
-package com.android.mms.transaction;
-
-import android.content.ContentUris;
-import android.content.ContentValues;
-import android.content.Context;
-import android.content.Intent;
-import android.database.sqlite.SqliteWrapper;
-import android.net.Uri;
-import android.provider.Telephony.Mms;
-import android.provider.Telephony.Mms.Sent;
-import android.text.TextUtils;
-import com.android.mms.util.RateController;
-import com.android.mms.util.SendingProgressTokenManager;
-import com.google.android.mms.pdu_alt.EncodedStringValue;
-import com.google.android.mms.pdu_alt.PduComposer;
-import com.google.android.mms.pdu_alt.PduHeaders;
-import com.google.android.mms.pdu_alt.PduParser;
-import com.google.android.mms.pdu_alt.PduPersister;
-import com.google.android.mms.pdu_alt.SendConf;
-import com.google.android.mms.pdu_alt.SendReq;
-import com.klinker.android.send_message.BroadcastUtils;
-import com.klinker.android.send_message.Utils;
-import timber.log.Timber;
-
-import java.util.Arrays;
-
-/**
- * The SendTransaction is responsible for sending multimedia messages
- * (M-Send.req) to the MMSC server.  It:
- *
- * <ul>
- * <li>Loads the multimedia message from storage (Outbox).
- * <li>Packs M-Send.req and sends it.
- * <li>Retrieves confirmation data from the server  (M-Send.conf).
- * <li>Parses confirmation message and handles it.
- * <li>Moves sent multimedia message from Outbox to Sent.
- * <li>Notifies the TransactionService about successful completion.
- * </ul>
- */
-public class SendTransaction extends Transaction implements Runnable {
-    private Thread mThread;
-    public final Uri mSendReqURI;
-
-    public SendTransaction(Context context,
-            int transId, TransactionSettings connectionSettings, String uri) {
-        super(context, transId, connectionSettings);
-        mSendReqURI = Uri.parse(uri);
-        mId = uri;
-
-        // Attach the transaction to the instance of RetryScheduler.
-        attach(RetryScheduler.getInstance(context));
-    }
-
-    /*
-     * (non-Javadoc)
-     * @see com.android.mms.Transaction#process()
-     */
-    @Override
-    public void process() {
-        mThread = new Thread(this, "SendTransaction");
-        mThread.start();
-    }
-
-    public void run() {
-        StringBuilder builder = new StringBuilder();
-        try {
-            RateController.init(mContext);
-            RateController rateCtlr = RateController.getInstance();
-            if (rateCtlr.isLimitSurpassed() && !rateCtlr.isAllowedByUser()) {
-                Timber.e("Sending rate limit surpassed.");
-                return;
-            }
-
-            // Load M-Send.req from outbox
-            PduPersister persister = PduPersister.getPduPersister(mContext);
-            SendReq sendReq = (SendReq) persister.load(mSendReqURI);
-
-            // Update the 'date' field of the PDU right before sending it.
-            long date = System.currentTimeMillis() / 1000L;
-            sendReq.setDate(date);
-
-            // Persist the new date value into database.
-            ContentValues values = new ContentValues(1);
-            values.put(Mms.DATE, date);
-            SqliteWrapper.update(mContext, mContext.getContentResolver(),
-                                 mSendReqURI, values, null, null);
-
-            // fix bug 2100169: insert the 'from' address per spec
-            String lineNumber = Utils.getMyPhoneNumber(mContext);
-            if (!TextUtils.isEmpty(lineNumber)) {
-                sendReq.setFrom(new EncodedStringValue(lineNumber));
-            }
-
-            // Pack M-Send.req, send it, retrieve confirmation data, and parse it
-            long tokenKey = ContentUris.parseId(mSendReqURI);
-            byte[] response = sendPdu(SendingProgressTokenManager.get(tokenKey),
-                                      new PduComposer(mContext, sendReq).make());
-            SendingProgressTokenManager.remove(tokenKey);
-
-            String respStr = new String(response);
-            builder.append("[SendTransaction] run: send mms msg (" + mId + "), resp=" + respStr);
-            Timber.d("[SendTransaction] run: send mms msg (" + mId + "), resp=" + respStr);
-
-            SendConf conf = (SendConf) new PduParser(response).parse();
-            if (conf == null) {
-                Timber.e("No M-Send.conf received.");
-                builder.append("No M-Send.conf received.\n");
-            }
-
-            // Check whether the responding Transaction-ID is consistent
-            // with the sent one.
-            byte[] reqId = sendReq.getTransactionId();
-            byte[] confId = conf.getTransactionId();
-            if (!Arrays.equals(reqId, confId)) {
-                Timber.e("Inconsistent Transaction-ID: req="
-                        + new String(reqId) + ", conf=" + new String(confId));
-                builder.append("Inconsistent Transaction-ID: req="
-                        + new String(reqId) + ", conf=" + new String(confId) + "\n");
-                return;
-            }
-
-            // From now on, we won't save the whole M-Send.conf into
-            // our database. Instead, we just save some interesting fields
-            // into the related M-Send.req.
-            values = new ContentValues(2);
-            int respStatus = conf.getResponseStatus();
-            values.put(Mms.RESPONSE_STATUS, respStatus);
-
-            if (respStatus != PduHeaders.RESPONSE_STATUS_OK) {
-                SqliteWrapper.update(mContext, mContext.getContentResolver(),
-                                     mSendReqURI, values, null, null);
-                Timber.e("Server returned an error code: " + respStatus);
-                builder.append("Server returned an error code: " + respStatus + "\n");
-                return;
-            }
-
-            String messageId = PduPersister.toIsoString(conf.getMessageId());
-            values.put(Mms.MESSAGE_ID, messageId);
-            SqliteWrapper.update(mContext, mContext.getContentResolver(),
-                                 mSendReqURI, values, null, null);
-
-            // Move M-Send.req from Outbox into Sent.
-            Uri uri = persister.move(mSendReqURI, Sent.CONTENT_URI);
-
-            mTransactionState.setState(TransactionState.SUCCESS);
-            mTransactionState.setContentUri(uri);
-        } catch (Throwable t) {
-            Timber.e(t, "error");
-        } finally {
-            if (mTransactionState.getState() != TransactionState.SUCCESS) {
-                mTransactionState.setState(TransactionState.FAILED);
-                mTransactionState.setContentUri(mSendReqURI);
-                Timber.e("Delivery failed.");
-                builder.append("Delivery failed\n");
-
-                Intent intent = new Intent(com.klinker.android.send_message.Transaction.MMS_ERROR);
-                intent.putExtra("stack", builder.toString());
-                BroadcastUtils.sendExplicitBroadcast(
-                        mContext, intent, com.klinker.android.send_message.Transaction.MMS_ERROR);
-            }
-            notifyObservers();
-        }
-    }
-
-    @Override
-    public int getType() {
-        return SEND_TRANSACTION;
-    }
-}
+/*
+ * Copyright 2014 Jacob Klinker
+ *
+ * Licensed under the Apache License, Version 2.0 (the "License");
+ * you may not use this file except in compliance with the License.
+ * You may obtain a copy of the License at
+ *
+ *     http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing, software
+ * distributed under the License is distributed on an "AS IS" BASIS,
+ * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ * See the License for the specific language governing permissions and
+ * limitations under the License.
+ */
+
+package com.android.mms.transaction;
+
+import android.content.ContentUris;
+import android.content.ContentValues;
+import android.content.Context;
+import android.content.Intent;
+import android.database.sqlite.SqliteWrapper;
+import android.net.Uri;
+import android.provider.Telephony.Mms;
+import android.provider.Telephony.Mms.Sent;
+import android.text.TextUtils;
+import com.android.mms.util.RateController;
+import com.android.mms.util.SendingProgressTokenManager;
+import com.google.android.mms.pdu_alt.EncodedStringValue;
+import com.google.android.mms.pdu_alt.PduComposer;
+import com.google.android.mms.pdu_alt.PduHeaders;
+import com.google.android.mms.pdu_alt.PduParser;
+import com.google.android.mms.pdu_alt.PduPersister;
+import com.google.android.mms.pdu_alt.SendConf;
+import com.google.android.mms.pdu_alt.SendReq;
+import com.klinker.android.send_message.BroadcastUtils;
+import com.klinker.android.send_message.Utils;
+import timber.log.Timber;
+
+import java.util.Arrays;
+
+/**
+ * The SendTransaction is responsible for sending multimedia messages
+ * (M-Send.req) to the MMSC server.  It:
+ *
+ * <ul>
+ * <li>Loads the multimedia message from storage (Outbox).
+ * <li>Packs M-Send.req and sends it.
+ * <li>Retrieves confirmation data from the server  (M-Send.conf).
+ * <li>Parses confirmation message and handles it.
+ * <li>Moves sent multimedia message from Outbox to Sent.
+ * <li>Notifies the TransactionService about successful completion.
+ * </ul>
+ */
+public class SendTransaction extends Transaction implements Runnable {
+    private Thread mThread;
+    public final Uri mSendReqURI;
+
+    public SendTransaction(Context context,
+            int transId, TransactionSettings connectionSettings, String uri) {
+        super(context, transId, connectionSettings);
+        mSendReqURI = Uri.parse(uri);
+        mId = uri;
+
+        // Attach the transaction to the instance of RetryScheduler.
+        attach(RetryScheduler.getInstance(context));
+    }
+
+    /*
+     * (non-Javadoc)
+     * @see com.android.mms.Transaction#process()
+     */
+    @Override
+    public void process() {
+        mThread = new Thread(this, "SendTransaction");
+        mThread.start();
+    }
+
+    public void run() {
+        StringBuilder builder = new StringBuilder();
+        try {
+            RateController.init(mContext);
+            RateController rateCtlr = RateController.getInstance();
+            if (rateCtlr.isLimitSurpassed() && !rateCtlr.isAllowedByUser()) {
+                Timber.e("Sending rate limit surpassed.");
+                return;
+            }
+
+            // Load M-Send.req from outbox
+            PduPersister persister = PduPersister.getPduPersister(mContext);
+            SendReq sendReq = (SendReq) persister.load(mSendReqURI);
+
+            // Update the 'date' field of the PDU right before sending it.
+            long date = System.currentTimeMillis() / 1000L;
+            sendReq.setDate(date);
+
+            // Persist the new date value into database.
+            ContentValues values = new ContentValues(1);
+            values.put(Mms.DATE, date);
+            SqliteWrapper.update(mContext, mContext.getContentResolver(),
+                                 mSendReqURI, values, null, null);
+
+            // fix bug 2100169: insert the 'from' address per spec
+            String lineNumber = Utils.getMyPhoneNumber(mContext);
+            if (!TextUtils.isEmpty(lineNumber)) {
+                sendReq.setFrom(new EncodedStringValue(lineNumber));
+            }
+
+            // Pack M-Send.req, send it, retrieve confirmation data, and parse it
+            long tokenKey = ContentUris.parseId(mSendReqURI);
+            byte[] response = sendPdu(SendingProgressTokenManager.get(tokenKey),
+                                      new PduComposer(mContext, sendReq).make());
+            SendingProgressTokenManager.remove(tokenKey);
+
+            String respStr = new String(response);
+            builder.append("[SendTransaction] run: send mms msg (" + mId + "), resp=" + respStr);
+            Timber.d("[SendTransaction] run: send mms msg (" + mId + "), resp=" + respStr);
+
+            SendConf conf = (SendConf) new PduParser(response).parse();
+            if (conf == null) {
+                Timber.e("No M-Send.conf received.");
+                builder.append("No M-Send.conf received.\n");
+            }
+
+            // Check whether the responding Transaction-ID is consistent
+            // with the sent one.
+            byte[] reqId = sendReq.getTransactionId();
+            byte[] confId = conf.getTransactionId();
+            if (!Arrays.equals(reqId, confId)) {
+                Timber.e("Inconsistent Transaction-ID: req="
+                        + new String(reqId) + ", conf=" + new String(confId));
+                builder.append("Inconsistent Transaction-ID: req="
+                        + new String(reqId) + ", conf=" + new String(confId) + "\n");
+                return;
+            }
+
+            // From now on, we won't save the whole M-Send.conf into
+            // our database. Instead, we just save some interesting fields
+            // into the related M-Send.req.
+            values = new ContentValues(2);
+            int respStatus = conf.getResponseStatus();
+            values.put(Mms.RESPONSE_STATUS, respStatus);
+
+            if (respStatus != PduHeaders.RESPONSE_STATUS_OK) {
+                SqliteWrapper.update(mContext, mContext.getContentResolver(),
+                                     mSendReqURI, values, null, null);
+                Timber.e("Server returned an error code: " + respStatus);
+                builder.append("Server returned an error code: " + respStatus + "\n");
+                return;
+            }
+
+            String messageId = PduPersister.toIsoString(conf.getMessageId());
+            values.put(Mms.MESSAGE_ID, messageId);
+            SqliteWrapper.update(mContext, mContext.getContentResolver(),
+                                 mSendReqURI, values, null, null);
+
+            // Move M-Send.req from Outbox into Sent.
+            Uri uri = persister.move(mSendReqURI, Sent.CONTENT_URI);
+
+            mTransactionState.setState(TransactionState.SUCCESS);
+            mTransactionState.setContentUri(uri);
+        } catch (Throwable t) {
+            Timber.e(t, "error");
+        } finally {
+            if (mTransactionState.getState() != TransactionState.SUCCESS) {
+                mTransactionState.setState(TransactionState.FAILED);
+                mTransactionState.setContentUri(mSendReqURI);
+                Timber.e("Delivery failed.");
+                builder.append("Delivery failed\n");
+
+                Intent intent = new Intent(com.klinker.android.send_message.Transaction.MMS_ERROR);
+                intent.putExtra("stack", builder.toString());
+                BroadcastUtils.sendExplicitBroadcast(
+                        mContext, intent, com.klinker.android.send_message.Transaction.MMS_ERROR);
+            }
+            notifyObservers();
+        }
+    }
+
+    @Override
+    public int getType() {
+        return SEND_TRANSACTION;
+    }
+}
diff --git a/android-smsmms/src/main/java/com/android/mms/transaction/Transaction.java b/android-smsmms/src/main/java/com/android/mms/transaction/Transaction.java
index 3a8b3ca6c..63c2b7c2d 100755
--- a/android-smsmms/src/main/java/com/android/mms/transaction/Transaction.java
+++ b/android-smsmms/src/main/java/com/android/mms/transaction/Transaction.java
@@ -1,262 +1,262 @@
-/*
- * Copyright 2014 Jacob Klinker
- *
- * Licensed under the Apache License, Version 2.0 (the "License");
- * you may not use this file except in compliance with the License.
- * You may obtain a copy of the License at
- *
- *     http://www.apache.org/licenses/LICENSE-2.0
- *
- * Unless required by applicable law or agreed to in writing, software
- * distributed under the License is distributed on an "AS IS" BASIS,
- * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
- * See the License for the specific language governing permissions and
- * limitations under the License.
- */
-
-package com.android.mms.transaction;
-
-import android.content.Context;
-import android.net.ConnectivityManager;
-import android.net.NetworkInfo;
-import com.android.mms.util.SendingProgressTokenManager;
-import com.google.android.mms.MmsException;
-import com.klinker.android.send_message.Utils;
-
-import java.io.IOException;
-
-/**
- * Transaction is an abstract class for notification transaction, send transaction
- * and other transactions described in MMS spec.
- * It provides the interfaces of them and some common methods for them.
- */
-public abstract class Transaction extends Observable {
-    private final int mServiceId;
-
-    protected Context mContext;
-    protected String mId;
-    protected TransactionState mTransactionState;
-    protected TransactionSettings mTransactionSettings;
-
-    /**
-     * Identifies push requests.
-     */
-    public static final int NOTIFICATION_TRANSACTION = 0;
-    /**
-     * Identifies deferred retrieve requests.
-     */
-    public static final int RETRIEVE_TRANSACTION     = 1;
-    /**
-     * Identifies send multimedia message requests.
-     */
-    public static final int SEND_TRANSACTION         = 2;
-    /**
-     * Identifies send read report requests.
-     */
-    public static final int READREC_TRANSACTION      = 3;
-
-    public Transaction(Context context, int serviceId,
-            TransactionSettings settings) {
-        mContext = context;
-        mTransactionState = new TransactionState();
-        mServiceId = serviceId;
-        mTransactionSettings = settings;
-    }
-
-    /**
-     * Returns the transaction state of this transaction.
-     *
-     * @return Current state of the Transaction.
-     */
-    @Override
-    public TransactionState getState() {
-        return mTransactionState;
-    }
-
-    /**
-     * An instance of Transaction encapsulates the actions required
-     * during a MMS Client transaction.
-     */
-    public abstract void process();
-
-    /**
-     * Used to determine whether a transaction is equivalent to this instance.
-     *
-     * @param transaction the transaction which is compared to this instance.
-     * @return true if transaction is equivalent to this instance, false otherwise.
-     */
-    public boolean isEquivalent(Transaction transaction) {
-        return mId.equals(transaction.mId);
-    }
-
-    /**
-     * Get the service-id of this transaction which was assigned by the framework.
-     * @return the service-id of the transaction
-     */
-    public int getServiceId() {
-        return mServiceId;
-    }
-
-    public TransactionSettings getConnectionSettings() {
-        return mTransactionSettings;
-    }
-    public void setConnectionSettings(TransactionSettings settings) {
-        mTransactionSettings = settings;
-    }
-
-    /**
-     * A common method to send a PDU to MMSC.
-     *
-     * @param pdu A byte array which contains the data of the PDU.
-     * @return A byte array which contains the response data.
-     *         If an HTTP error code is returned, an IOException will be thrown.
-     * @throws java.io.IOException if any error occurred on network interface or
-     *         an HTTP error code(>=400) returned from the server.
-     * @throws com.google.android.mms.MmsException if pdu is null.
-     */
-    protected byte[] sendPdu(byte[] pdu) throws IOException, MmsException {
-        return sendPdu(SendingProgressTokenManager.NO_TOKEN, pdu,
-                mTransactionSettings.getMmscUrl());
-    }
-
-    /**
-     * A common method to send a PDU to MMSC.
-     *
-     * @param pdu A byte array which contains the data of the PDU.
-     * @param mmscUrl Url of the recipient MMSC.
-     * @return A byte array which contains the response data.
-     *         If an HTTP error code is returned, an IOException will be thrown.
-     * @throws java.io.IOException if any error occurred on network interface or
-     *         an HTTP error code(>=400) returned from the server.
-     * @throws com.google.android.mms.MmsException if pdu is null.
-     */
-    protected byte[] sendPdu(byte[] pdu, String mmscUrl) throws IOException, MmsException {
-        return sendPdu(SendingProgressTokenManager.NO_TOKEN, pdu, mmscUrl);
-    }
-
-    /**
-     * A common method to send a PDU to MMSC.
-     *
-     * @param token The token to identify the sending progress.
-     * @param pdu A byte array which contains the data of the PDU.
-     * @return A byte array which contains the response data.
-     *         If an HTTP error code is returned, an IOException will be thrown.
-     * @throws java.io.IOException if any error occurred on network interface or
-     *         an HTTP error code(>=400) returned from the server.
-     * @throws com.google.android.mms.MmsException if pdu is null.
-     */
-    protected byte[] sendPdu(long token, byte[] pdu) throws IOException, MmsException {
-        return sendPdu(token, pdu, mTransactionSettings.getMmscUrl());
-    }
-
-    /**
-     * A common method to send a PDU to MMSC.
-     *
-     * @param token The token to identify the sending progress.
-     * @param pdu A byte array which contains the data of the PDU.
-     * @param mmscUrl Url of the recipient MMSC.
-     * @return A byte array which contains the response data.
-     *         If an HTTP error code is returned, an IOException will be thrown.
-     * @throws java.io.IOException if any error occurred on network interface or
-     *         an HTTP error code(>=400) returned from the server.
-     * @throws com.google.android.mms.MmsException if pdu is null.
-     */
-    protected byte[] sendPdu(final long token, final byte[] pdu,
-                             final String mmscUrl) throws IOException, MmsException {
-        if (pdu == null) {
-            throw new MmsException();
-        }
-
-        if (mmscUrl == null) {
-            throw new IOException("Cannot establish route: mmscUrl is null");
-        }
-
-        if (useWifi(mContext)) {
-            return HttpUtils.httpConnection(
-                    mContext, token,
-                    mmscUrl,
-                    pdu, HttpUtils.HTTP_POST_METHOD,
-                    false, null, 0);
-        }
-
-        return Utils.ensureRouteToMmsNetwork(mContext, mmscUrl, mTransactionSettings.getProxyAddress(), new Utils.Task<byte[]>() {
-            @Override
-            public byte[] run() throws IOException {
-                return HttpUtils.httpConnection(
-                        mContext, token,
-                        mmscUrl,
-                        pdu, HttpUtils.HTTP_POST_METHOD,
-                        mTransactionSettings.isProxySet(),
-                        mTransactionSettings.getProxyAddress(),
-                        mTransactionSettings.getProxyPort());
-            }
-        });
-    }
-
-    /**
-     * A common method to retrieve a PDU from MMSC.
-     *
-     * @param url The URL of the message which we are going to retrieve.
-     * @return A byte array which contains the data of the PDU.
-     *         If the status code is not correct, an IOException will be thrown.
-     * @throws java.io.IOException if any error occurred on network interface or
-     *         an HTTP error code(>=400) returned from the server.
-     */
-    protected byte[] getPdu(final String url) throws IOException {
-        if (url == null) {
-            throw new IOException("Cannot establish route: url is null");
-        }
-
-        if (useWifi(mContext)) {
-            return HttpUtils.httpConnection(
-                    mContext,
-                    SendingProgressTokenManager.NO_TOKEN,
-                    url,
-                    null,
-                    HttpUtils.HTTP_GET_METHOD,
-                    false,
-                    null,
-                    0);
-        }
-
-        return Utils.ensureRouteToMmsNetwork(mContext, url, mTransactionSettings.getProxyAddress(), new Utils.Task<byte[]>() {
-            @Override
-            public byte[] run() throws IOException {
-                return HttpUtils.httpConnection(
-                        mContext,
-                        SendingProgressTokenManager.NO_TOKEN,
-                        url,
-                        null,
-                        HttpUtils.HTTP_GET_METHOD,
-                        mTransactionSettings.isProxySet(),
-                        mTransactionSettings.getProxyAddress(),
-                        mTransactionSettings.getProxyPort());
-            }
-        });
-    }
-
-    public static boolean useWifi(Context context) {
-        if (Utils.isMmsOverWifiEnabled(context)) {
-            ConnectivityManager mConnMgr = (ConnectivityManager) context.getSystemService(Context.CONNECTIVITY_SERVICE);
-            if (mConnMgr != null) {
-                NetworkInfo niWF = mConnMgr.getNetworkInfo(ConnectivityManager.TYPE_WIFI);
-                if ((niWF != null) && (niWF.isConnected())) {
-                    return true;
-                }
-            }
-        }
-        return false;
-    }
-
-    @Override
-    public String toString() {
-        return getClass().getName() + ": serviceId=" + mServiceId;
-    }
-
-    /**
-     * Get the type of the transaction.
-     *
-     * @return Transaction type in integer.
-     */
-    abstract public int getType();
-}
+/*
+ * Copyright 2014 Jacob Klinker
+ *
+ * Licensed under the Apache License, Version 2.0 (the "License");
+ * you may not use this file except in compliance with the License.
+ * You may obtain a copy of the License at
+ *
+ *     http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing, software
+ * distributed under the License is distributed on an "AS IS" BASIS,
+ * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ * See the License for the specific language governing permissions and
+ * limitations under the License.
+ */
+
+package com.android.mms.transaction;
+
+import android.content.Context;
+import android.net.ConnectivityManager;
+import android.net.NetworkInfo;
+import com.android.mms.util.SendingProgressTokenManager;
+import com.google.android.mms.MmsException;
+import com.klinker.android.send_message.Utils;
+
+import java.io.IOException;
+
+/**
+ * Transaction is an abstract class for notification transaction, send transaction
+ * and other transactions described in MMS spec.
+ * It provides the interfaces of them and some common methods for them.
+ */
+public abstract class Transaction extends Observable {
+    private final int mServiceId;
+
+    protected Context mContext;
+    protected String mId;
+    protected TransactionState mTransactionState;
+    protected TransactionSettings mTransactionSettings;
+
+    /**
+     * Identifies push requests.
+     */
+    public static final int NOTIFICATION_TRANSACTION = 0;
+    /**
+     * Identifies deferred retrieve requests.
+     */
+    public static final int RETRIEVE_TRANSACTION     = 1;
+    /**
+     * Identifies send multimedia message requests.
+     */
+    public static final int SEND_TRANSACTION         = 2;
+    /**
+     * Identifies send read report requests.
+     */
+    public static final int READREC_TRANSACTION      = 3;
+
+    public Transaction(Context context, int serviceId,
+            TransactionSettings settings) {
+        mContext = context;
+        mTransactionState = new TransactionState();
+        mServiceId = serviceId;
+        mTransactionSettings = settings;
+    }
+
+    /**
+     * Returns the transaction state of this transaction.
+     *
+     * @return Current state of the Transaction.
+     */
+    @Override
+    public TransactionState getState() {
+        return mTransactionState;
+    }
+
+    /**
+     * An instance of Transaction encapsulates the actions required
+     * during a MMS Client transaction.
+     */
+    public abstract void process();
+
+    /**
+     * Used to determine whether a transaction is equivalent to this instance.
+     *
+     * @param transaction the transaction which is compared to this instance.
+     * @return true if transaction is equivalent to this instance, false otherwise.
+     */
+    public boolean isEquivalent(Transaction transaction) {
+        return mId.equals(transaction.mId);
+    }
+
+    /**
+     * Get the service-id of this transaction which was assigned by the framework.
+     * @return the service-id of the transaction
+     */
+    public int getServiceId() {
+        return mServiceId;
+    }
+
+    public TransactionSettings getConnectionSettings() {
+        return mTransactionSettings;
+    }
+    public void setConnectionSettings(TransactionSettings settings) {
+        mTransactionSettings = settings;
+    }
+
+    /**
+     * A common method to send a PDU to MMSC.
+     *
+     * @param pdu A byte array which contains the data of the PDU.
+     * @return A byte array which contains the response data.
+     *         If an HTTP error code is returned, an IOException will be thrown.
+     * @throws java.io.IOException if any error occurred on network interface or
+     *         an HTTP error code(>=400) returned from the server.
+     * @throws com.google.android.mms.MmsException if pdu is null.
+     */
+    protected byte[] sendPdu(byte[] pdu) throws IOException, MmsException {
+        return sendPdu(SendingProgressTokenManager.NO_TOKEN, pdu,
+                mTransactionSettings.getMmscUrl());
+    }
+
+    /**
+     * A common method to send a PDU to MMSC.
+     *
+     * @param pdu A byte array which contains the data of the PDU.
+     * @param mmscUrl Url of the recipient MMSC.
+     * @return A byte array which contains the response data.
+     *         If an HTTP error code is returned, an IOException will be thrown.
+     * @throws java.io.IOException if any error occurred on network interface or
+     *         an HTTP error code(>=400) returned from the server.
+     * @throws com.google.android.mms.MmsException if pdu is null.
+     */
+    protected byte[] sendPdu(byte[] pdu, String mmscUrl) throws IOException, MmsException {
+        return sendPdu(SendingProgressTokenManager.NO_TOKEN, pdu, mmscUrl);
+    }
+
+    /**
+     * A common method to send a PDU to MMSC.
+     *
+     * @param token The token to identify the sending progress.
+     * @param pdu A byte array which contains the data of the PDU.
+     * @return A byte array which contains the response data.
+     *         If an HTTP error code is returned, an IOException will be thrown.
+     * @throws java.io.IOException if any error occurred on network interface or
+     *         an HTTP error code(>=400) returned from the server.
+     * @throws com.google.android.mms.MmsException if pdu is null.
+     */
+    protected byte[] sendPdu(long token, byte[] pdu) throws IOException, MmsException {
+        return sendPdu(token, pdu, mTransactionSettings.getMmscUrl());
+    }
+
+    /**
+     * A common method to send a PDU to MMSC.
+     *
+     * @param token The token to identify the sending progress.
+     * @param pdu A byte array which contains the data of the PDU.
+     * @param mmscUrl Url of the recipient MMSC.
+     * @return A byte array which contains the response data.
+     *         If an HTTP error code is returned, an IOException will be thrown.
+     * @throws java.io.IOException if any error occurred on network interface or
+     *         an HTTP error code(>=400) returned from the server.
+     * @throws com.google.android.mms.MmsException if pdu is null.
+     */
+    protected byte[] sendPdu(final long token, final byte[] pdu,
+                             final String mmscUrl) throws IOException, MmsException {
+        if (pdu == null) {
+            throw new MmsException();
+        }
+
+        if (mmscUrl == null) {
+            throw new IOException("Cannot establish route: mmscUrl is null");
+        }
+
+        if (useWifi(mContext)) {
+            return HttpUtils.httpConnection(
+                    mContext, token,
+                    mmscUrl,
+                    pdu, HttpUtils.HTTP_POST_METHOD,
+                    false, null, 0);
+        }
+
+        return Utils.ensureRouteToMmsNetwork(mContext, mmscUrl, mTransactionSettings.getProxyAddress(), new Utils.Task<byte[]>() {
+            @Override
+            public byte[] run() throws IOException {
+                return HttpUtils.httpConnection(
+                        mContext, token,
+                        mmscUrl,
+                        pdu, HttpUtils.HTTP_POST_METHOD,
+                        mTransactionSettings.isProxySet(),
+                        mTransactionSettings.getProxyAddress(),
+                        mTransactionSettings.getProxyPort());
+            }
+        });
+    }
+
+    /**
+     * A common method to retrieve a PDU from MMSC.
+     *
+     * @param url The URL of the message which we are going to retrieve.
+     * @return A byte array which contains the data of the PDU.
+     *         If the status code is not correct, an IOException will be thrown.
+     * @throws java.io.IOException if any error occurred on network interface or
+     *         an HTTP error code(>=400) returned from the server.
+     */
+    protected byte[] getPdu(final String url) throws IOException {
+        if (url == null) {
+            throw new IOException("Cannot establish route: url is null");
+        }
+
+        if (useWifi(mContext)) {
+            return HttpUtils.httpConnection(
+                    mContext,
+                    SendingProgressTokenManager.NO_TOKEN,
+                    url,
+                    null,
+                    HttpUtils.HTTP_GET_METHOD,
+                    false,
+                    null,
+                    0);
+        }
+
+        return Utils.ensureRouteToMmsNetwork(mContext, url, mTransactionSettings.getProxyAddress(), new Utils.Task<byte[]>() {
+            @Override
+            public byte[] run() throws IOException {
+                return HttpUtils.httpConnection(
+                        mContext,
+                        SendingProgressTokenManager.NO_TOKEN,
+                        url,
+                        null,
+                        HttpUtils.HTTP_GET_METHOD,
+                        mTransactionSettings.isProxySet(),
+                        mTransactionSettings.getProxyAddress(),
+                        mTransactionSettings.getProxyPort());
+            }
+        });
+    }
+
+    public static boolean useWifi(Context context) {
+        if (Utils.isMmsOverWifiEnabled(context)) {
+            ConnectivityManager mConnMgr = (ConnectivityManager) context.getSystemService(Context.CONNECTIVITY_SERVICE);
+            if (mConnMgr != null) {
+                NetworkInfo niWF = mConnMgr.getNetworkInfo(ConnectivityManager.TYPE_WIFI);
+                if ((niWF != null) && (niWF.isConnected())) {
+                    return true;
+                }
+            }
+        }
+        return false;
+    }
+
+    @Override
+    public String toString() {
+        return getClass().getName() + ": serviceId=" + mServiceId;
+    }
+
+    /**
+     * Get the type of the transaction.
+     *
+     * @return Transaction type in integer.
+     */
+    abstract public int getType();
+}
diff --git a/android-smsmms/src/main/java/com/android/mms/transaction/TransactionBundle.java b/android-smsmms/src/main/java/com/android/mms/transaction/TransactionBundle.java
index 448421f8b..17cbf8e9b 100755
--- a/android-smsmms/src/main/java/com/android/mms/transaction/TransactionBundle.java
+++ b/android-smsmms/src/main/java/com/android/mms/transaction/TransactionBundle.java
@@ -1,156 +1,156 @@
-/*
- * Copyright 2014 Jacob Klinker
- *
- * Licensed under the Apache License, Version 2.0 (the "License");
- * you may not use this file except in compliance with the License.
- * You may obtain a copy of the License at
- *
- *     http://www.apache.org/licenses/LICENSE-2.0
- *
- * Unless required by applicable law or agreed to in writing, software
- * distributed under the License is distributed on an "AS IS" BASIS,
- * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
- * See the License for the specific language governing permissions and
- * limitations under the License.
- */
-
-package com.android.mms.transaction;
-
-import android.os.Bundle;
-
-/**
- * A wrapper around the Bundle instances used to start the TransactionService.
- * It provides high-level APIs to set the information required for the latter to
- * instantiate transactions.
- */
-public class TransactionBundle {
-    /**
-     * Key for the transaction-type.
-     * Allowed values for this key are: TYPE_PUSH_TRANSACTION, TYPE_RETRIEVE_TRANSACTION,
-     * TYPE_SEND_TRANSACTION, and TYPE_READREC_TRANSACTION.
-     */
-    public static final String TRANSACTION_TYPE = "type";
-
-    /**
-     * Key of the push-data.
-     * Used when TRANSACTION_TYPE is TYPE_PUSH_TRANSACTION.
-     */
-    private static final String PUSH_DATA = "mms-push-data";
-
-    public static final String LOLLIPOP_RECEIVING = "receive_with_new_method";
-
-    /**
-     * Key of the MMSC server URL.
-     */
-    private static final String MMSC_URL = "mmsc-url";
-
-    /**
-     * Key of the HTTP Proxy address.
-     */
-    private static final String PROXY_ADDRESS = "proxy-address";
-
-    /**
-     * Key of the HTTP Proxy port.
-     */
-    private static final String PROXY_PORT = "proxy-port";
-
-    /**
-     * Key of the URI.
-     * Indicates the URL of the M-Retrieve.conf in TYPE_RETRIEVE_TRANSACTION, or the
-     * Uri of the M-Send.req/M-Read-Rec.ind in TYPE_SEND_TRANSACTION and
-     * TYPE_READREC_TRANSACTION, respectively.
-     */
-    public static final String URI = "uri";
-
-    /**
-     * This is the real Bundle to be sent to the TransactionService upon calling
-     * startService.
-     */
-    private final Bundle mBundle;
-
-    /**
-     * Private constructor.
-     *
-     * @param transactionType
-     */
-    private TransactionBundle(int transactionType) {
-        mBundle = new Bundle();
-        mBundle.putInt(TRANSACTION_TYPE, transactionType);
-    }
-
-    /**
-     * Constructor of a bundle used for TransactionBundle instances of type
-     * TYPE_RETRIEVE_TRANSACTION, TYPE_SEND_TRANSACTION, and TYPE_READREC_TRANSACTION.
-     *
-     * @param transactionType
-     * @param uri The relevant URI for this transaction. Indicates the URL of the
-     * M-Retrieve.conf in TYPE_RETRIEVE_TRANSACTION, or the Uri of the
-     * M-Send.req/M-Read-Rec.ind in TYPE_SEND_TRANSACTION and
-     * TYPE_READREC_TRANSACTION, respectively.
-     */
-    public TransactionBundle(int transactionType, String uri) {
-        this(transactionType);
-        mBundle.putString(URI, uri);
-    }
-
-    /**
-     * Constructor of a transaction bundle used for incoming bundle instances.
-     *
-     * @param bundle The incoming bundle
-     */
-    public TransactionBundle(Bundle bundle) {
-        mBundle = bundle;
-    }
-
-    public void setConnectionSettings(String mmscUrl,
-            String proxyAddress,
-            int proxyPort) {
-        mBundle.putString(MMSC_URL, mmscUrl);
-        mBundle.putString(PROXY_ADDRESS, proxyAddress);
-        mBundle.putInt(PROXY_PORT, proxyPort);
-    }
-
-    public void setConnectionSettings(TransactionSettings settings) {
-        setConnectionSettings(
-                settings.getMmscUrl(),
-                settings.getProxyAddress(),
-                settings.getProxyPort());
-    }
-
-    public Bundle getBundle() {
-        return mBundle;
-    }
-
-    public int getTransactionType() {
-        return mBundle.getInt(TRANSACTION_TYPE);
-    }
-
-    public String getUri() {
-        return mBundle.getString(URI);
-    }
-
-    public byte[] getPushData() {
-        return mBundle.getByteArray(PUSH_DATA);
-    }
-
-    public String getMmscUrl() {
-        return mBundle.getString(MMSC_URL);
-    }
-
-    public String getProxyAddress() {
-        return mBundle.getString(PROXY_ADDRESS);
-    }
-
-    public int getProxyPort() {
-        return mBundle.getInt(PROXY_PORT);
-    }
-
-    @Override
-    public String toString() {
-        return "transactionType: " + getTransactionType() +
-            " uri: " + getUri() +
-            " mmscUrl: " + getMmscUrl() +
-            " proxyAddress: " + getProxyAddress() +
-            " proxyPort: " + getProxyPort();
-    }
-}
+/*
+ * Copyright 2014 Jacob Klinker
+ *
+ * Licensed under the Apache License, Version 2.0 (the "License");
+ * you may not use this file except in compliance with the License.
+ * You may obtain a copy of the License at
+ *
+ *     http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing, software
+ * distributed under the License is distributed on an "AS IS" BASIS,
+ * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ * See the License for the specific language governing permissions and
+ * limitations under the License.
+ */
+
+package com.android.mms.transaction;
+
+import android.os.Bundle;
+
+/**
+ * A wrapper around the Bundle instances used to start the TransactionService.
+ * It provides high-level APIs to set the information required for the latter to
+ * instantiate transactions.
+ */
+public class TransactionBundle {
+    /**
+     * Key for the transaction-type.
+     * Allowed values for this key are: TYPE_PUSH_TRANSACTION, TYPE_RETRIEVE_TRANSACTION,
+     * TYPE_SEND_TRANSACTION, and TYPE_READREC_TRANSACTION.
+     */
+    public static final String TRANSACTION_TYPE = "type";
+
+    /**
+     * Key of the push-data.
+     * Used when TRANSACTION_TYPE is TYPE_PUSH_TRANSACTION.
+     */
+    private static final String PUSH_DATA = "mms-push-data";
+
+    public static final String LOLLIPOP_RECEIVING = "receive_with_new_method";
+
+    /**
+     * Key of the MMSC server URL.
+     */
+    private static final String MMSC_URL = "mmsc-url";
+
+    /**
+     * Key of the HTTP Proxy address.
+     */
+    private static final String PROXY_ADDRESS = "proxy-address";
+
+    /**
+     * Key of the HTTP Proxy port.
+     */
+    private static final String PROXY_PORT = "proxy-port";
+
+    /**
+     * Key of the URI.
+     * Indicates the URL of the M-Retrieve.conf in TYPE_RETRIEVE_TRANSACTION, or the
+     * Uri of the M-Send.req/M-Read-Rec.ind in TYPE_SEND_TRANSACTION and
+     * TYPE_READREC_TRANSACTION, respectively.
+     */
+    public static final String URI = "uri";
+
+    /**
+     * This is the real Bundle to be sent to the TransactionService upon calling
+     * startService.
+     */
+    private final Bundle mBundle;
+
+    /**
+     * Private constructor.
+     *
+     * @param transactionType
+     */
+    private TransactionBundle(int transactionType) {
+        mBundle = new Bundle();
+        mBundle.putInt(TRANSACTION_TYPE, transactionType);
+    }
+
+    /**
+     * Constructor of a bundle used for TransactionBundle instances of type
+     * TYPE_RETRIEVE_TRANSACTION, TYPE_SEND_TRANSACTION, and TYPE_READREC_TRANSACTION.
+     *
+     * @param transactionType
+     * @param uri The relevant URI for this transaction. Indicates the URL of the
+     * M-Retrieve.conf in TYPE_RETRIEVE_TRANSACTION, or the Uri of the
+     * M-Send.req/M-Read-Rec.ind in TYPE_SEND_TRANSACTION and
+     * TYPE_READREC_TRANSACTION, respectively.
+     */
+    public TransactionBundle(int transactionType, String uri) {
+        this(transactionType);
+        mBundle.putString(URI, uri);
+    }
+
+    /**
+     * Constructor of a transaction bundle used for incoming bundle instances.
+     *
+     * @param bundle The incoming bundle
+     */
+    public TransactionBundle(Bundle bundle) {
+        mBundle = bundle;
+    }
+
+    public void setConnectionSettings(String mmscUrl,
+            String proxyAddress,
+            int proxyPort) {
+        mBundle.putString(MMSC_URL, mmscUrl);
+        mBundle.putString(PROXY_ADDRESS, proxyAddress);
+        mBundle.putInt(PROXY_PORT, proxyPort);
+    }
+
+    public void setConnectionSettings(TransactionSettings settings) {
+        setConnectionSettings(
+                settings.getMmscUrl(),
+                settings.getProxyAddress(),
+                settings.getProxyPort());
+    }
+
+    public Bundle getBundle() {
+        return mBundle;
+    }
+
+    public int getTransactionType() {
+        return mBundle.getInt(TRANSACTION_TYPE);
+    }
+
+    public String getUri() {
+        return mBundle.getString(URI);
+    }
+
+    public byte[] getPushData() {
+        return mBundle.getByteArray(PUSH_DATA);
+    }
+
+    public String getMmscUrl() {
+        return mBundle.getString(MMSC_URL);
+    }
+
+    public String getProxyAddress() {
+        return mBundle.getString(PROXY_ADDRESS);
+    }
+
+    public int getProxyPort() {
+        return mBundle.getInt(PROXY_PORT);
+    }
+
+    @Override
+    public String toString() {
+        return "transactionType: " + getTransactionType() +
+            " uri: " + getUri() +
+            " mmscUrl: " + getMmscUrl() +
+            " proxyAddress: " + getProxyAddress() +
+            " proxyPort: " + getProxyPort();
+    }
+}
diff --git a/android-smsmms/src/main/java/com/android/mms/transaction/TransactionService.java b/android-smsmms/src/main/java/com/android/mms/transaction/TransactionService.java
index 78146c9ea..799cf7701 100755
--- a/android-smsmms/src/main/java/com/android/mms/transaction/TransactionService.java
+++ b/android-smsmms/src/main/java/com/android/mms/transaction/TransactionService.java
@@ -1,942 +1,942 @@
-/*
- * Copyright 2014 Jacob Klinker
- *
- * Licensed under the Apache License, Version 2.0 (the "License");
- * you may not use this file except in compliance with the License.
- * You may obtain a copy of the License at
- *
- *     http://www.apache.org/licenses/LICENSE-2.0
- *
- * Unless required by applicable law or agreed to in writing, software
- * distributed under the License is distributed on an "AS IS" BASIS,
- * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
- * See the License for the specific language governing permissions and
- * limitations under the License.
- */
-
-package com.android.mms.transaction;
-
-import android.app.Service;
-import android.content.BroadcastReceiver;
-import android.content.ContentUris;
-import android.content.ContentValues;
-import android.content.Context;
-import android.content.Intent;
-import android.content.IntentFilter;
-import android.database.Cursor;
-import android.database.sqlite.SqliteWrapper;
-import android.net.ConnectivityManager;
-import android.net.NetworkInfo;
-import android.net.Uri;
-import android.os.Build;
-import android.os.Handler;
-import android.os.HandlerThread;
-import android.os.IBinder;
-import android.os.Looper;
-import android.os.Message;
-import android.os.PowerManager;
-import android.provider.Telephony.Mms;
-import android.provider.Telephony.MmsSms;
-import android.provider.Telephony.MmsSms.PendingMessages;
-import android.text.TextUtils;
-import android.widget.Toast;
-import com.android.mms.util.RateController;
-import com.google.android.mms.MmsException;
-import com.google.android.mms.pdu_alt.GenericPdu;
-import com.google.android.mms.pdu_alt.NotificationInd;
-import com.google.android.mms.pdu_alt.PduHeaders;
-import com.google.android.mms.pdu_alt.PduParser;
-import com.google.android.mms.pdu_alt.PduPersister;
-import com.klinker.android.send_message.BroadcastUtils;
-import com.klinker.android.send_message.R;
-import com.klinker.android.send_message.Utils;
-import timber.log.Timber;
-
-import java.io.IOException;
-import java.util.ArrayList;
-
-/**
- * The TransactionService of the MMS Client is responsible for handling requests
- * to initiate client-transactions sent from:
- * <ul>
- * <li>The Proxy-Relay (Through Push messages)</li>
- * <li>The composer/viewer activities of the MMS Client (Through intents)</li>
- * </ul>
- * The TransactionService runs locally in the same process as the application.
- * It contains a HandlerThread to which messages are posted from the
- * intent-receivers of this application.
- * <p/>
- * <b>IMPORTANT</b>: This is currently the only instance in the system in
- * which simultaneous connectivity to both the mobile data network and
- * a Wi-Fi network is allowed. This makes the code for handling network
- * connectivity somewhat different than it is in other applications. In
- * particular, we want to be able to send or receive MMS messages when
- * a Wi-Fi connection is active (which implies that there is no connection
- * to the mobile data network). This has two main consequences:
- * <ul>
- * <li>Testing for current network connectivity ({@link android.net.NetworkInfo#isConnected()} is
- * not sufficient. Instead, the correct test is for network availability
- * ({@link android.net.NetworkInfo#isAvailable()}).</li>
- * <li>If the mobile data network is not in the connected state, but it is available,
- * we must initiate setup of the mobile data connection, and defer handling
- * the MMS transaction until the connection is established.</li>
- * </ul>
- */
-public class TransactionService extends Service implements Observer {
-
-    /**
-     * Used to identify notification intents broadcasted by the
-     * TransactionService when a Transaction is completed.
-     */
-    public static final String TRANSACTION_COMPLETED_ACTION =
-            "android.intent.action.TRANSACTION_COMPLETED_ACTION";
-
-    /**
-     * Action for the Intent which is sent by Alarm service to launch
-     * TransactionService.
-     */
-    public static final String ACTION_ONALARM = "android.intent.action.ACTION_ONALARM";
-
-    /**
-     * Action for the Intent which is sent when the user turns on the auto-retrieve setting.
-     * This service gets started to auto-retrieve any undownloaded messages.
-     */
-    public static final String ACTION_ENABLE_AUTO_RETRIEVE
-            = "android.intent.action.ACTION_ENABLE_AUTO_RETRIEVE";
-
-    /**
-     * Used as extra key in notification intents broadcasted by the TransactionService
-     * when a Transaction is completed (TRANSACTION_COMPLETED_ACTION intents).
-     * Allowed values for this key are: TransactionState.INITIALIZED,
-     * TransactionState.SUCCESS, TransactionState.FAILED.
-     */
-    public static final String STATE = "state";
-
-    /**
-     * Used as extra key in notification intents broadcasted by the TransactionService
-     * when a Transaction is completed (TRANSACTION_COMPLETED_ACTION intents).
-     * Allowed values for this key are any valid content uri.
-     */
-    public static final String STATE_URI = "uri";
-
-    private static final int EVENT_TRANSACTION_REQUEST = 1;
-    private static final int EVENT_CONTINUE_MMS_CONNECTIVITY = 3;
-    private static final int EVENT_HANDLE_NEXT_PENDING_TRANSACTION = 4;
-    private static final int EVENT_NEW_INTENT = 5;
-    private static final int EVENT_QUIT = 100;
-
-    private static final int TOAST_MSG_QUEUED = 1;
-    private static final int TOAST_DOWNLOAD_LATER = 2;
-    private static final int TOAST_NO_APN = 3;
-    private static final int TOAST_NONE = -1;
-
-    // How often to extend the use of the MMS APN while a transaction
-    // is still being processed.
-    private static final int APN_EXTENSION_WAIT = 30 * 1000;
-
-    private ServiceHandler mServiceHandler;
-    private Looper mServiceLooper;
-    private final ArrayList<Transaction> mProcessing  = new ArrayList<Transaction>();
-    private final ArrayList<Transaction> mPending  = new ArrayList<Transaction>();
-    private ConnectivityManager mConnMgr;
-    private ConnectivityBroadcastReceiver mReceiver;
-    private boolean mobileDataEnabled;
-    private boolean lollipopReceiving = false;
-
-    private PowerManager.WakeLock mWakeLock;
-
-    public Handler mToastHandler = new Handler() {
-        @Override
-        public void handleMessage(Message msg) {
-            String str = null;
-
-            if (msg.what == TOAST_MSG_QUEUED) {
-                str = getString(R.string.message_queued);
-            } else if (msg.what == TOAST_DOWNLOAD_LATER) {
-                str = getString(R.string.download_later);
-            } else if (msg.what == TOAST_NO_APN) {
-                str = getString(R.string.no_apn);
-            }
-
-            if (str != null) {
-                Toast.makeText(TransactionService.this, str,
-                        Toast.LENGTH_LONG).show();
-            }
-        }
-    };
-
-    @Override
-    public void onCreate() {
-        Timber.v("Creating TransactionService");
-
-        if (!Utils.isDefaultSmsApp(this)) {
-            Timber.v("not default app, so exiting");
-            stopSelf();
-            return;
-        }
-
-        initServiceHandler();
-
-        mReceiver = new ConnectivityBroadcastReceiver();
-        IntentFilter intentFilter = new IntentFilter();
-        intentFilter.addAction(ConnectivityManager.CONNECTIVITY_ACTION);
-        registerReceiver(mReceiver, intentFilter);
-    }
-
-    private void initServiceHandler() {
-        // Start up the thread running the service.  Note that we create a
-        // separate thread because the service normally runs in the process's
-        // main thread, which we don't want to block.
-        HandlerThread thread = new HandlerThread("TransactionService");
-        thread.start();
-
-        mServiceLooper = thread.getLooper();
-        mServiceHandler = new ServiceHandler(mServiceLooper);
-    }
-
-    @Override
-    public int onStartCommand(final Intent intent, int flags, int startId) {
-        if (intent != null) {
-//            if (intent.getBooleanExtra(TransactionBundle.LOLLIPOP_RECEIVING, false)) {
-//                lollipopReceiving = true;
-//                new Thread(new Runnable() {
-//                    @Override
-//                    public void run() {
-//                        Timber.v("starting receiving with new lollipop method");
-//                        try { Thread.sleep(60000); } catch (Exception e) { }
-//                        Timber.v("done sleeping, lets try and grab the message");
-//                        Uri contentUri = Uri.parse(intent.getStringExtra(TransactionBundle.URI));
-//                        String downloadLocation = null;
-//                        Cursor locationQuery = getContentResolver().query(contentUri, new String[]{Telephony.Mms.CONTENT_LOCATION, Telephony.Mms._ID}, null, null, "date desc");
-//
-//                        if (locationQuery != null && locationQuery.moveToFirst()) {
-//                            Timber.v("grabbing content location url");
-//                            downloadLocation = locationQuery.getString(locationQuery.getColumnIndex(Telephony.Mms.CONTENT_LOCATION));
-//                        }
-//
-//                        Timber.v("creating request with url: " + downloadLocation);
-//                        DownloadRequest request = new DownloadRequest(downloadLocation, contentUri, null, null, null);
-//                        MmsNetworkManager manager = new MmsNetworkManager(TransactionService.this);
-//                        request.execute(TransactionService.this, manager);
-//                        stopSelf();
-//                    }
-//                }).start();
-//                return START_NOT_STICKY;
-//            }
-
-            if (mServiceHandler == null) {
-                initServiceHandler();
-            }
-
-            Message msg = mServiceHandler.obtainMessage(EVENT_NEW_INTENT);
-            msg.arg1 = startId;
-            msg.obj = intent;
-            mServiceHandler.sendMessage(msg);
-        }
-        return Service.START_NOT_STICKY;
-    }
-
-    private boolean isNetworkAvailable() {
-        if (mConnMgr == null) {
-            return false;
-        } else if (Utils.isMmsOverWifiEnabled(this)) {
-            NetworkInfo niWF = mConnMgr.getNetworkInfo(ConnectivityManager.TYPE_WIFI);
-            return (niWF == null ? false : niWF.isConnected());
-        } else {
-            NetworkInfo ni = mConnMgr.getNetworkInfo(ConnectivityManager.TYPE_MOBILE_MMS);
-            return (ni == null ? false : ni.isAvailable());
-        }
-    }
-
-    public void onNewIntent(Intent intent, int serviceId) {
-        try {
-            mobileDataEnabled = Utils.isMobileDataEnabled(this);
-        } catch (Exception e) {
-            mobileDataEnabled = true;
-        }
-        mConnMgr = (ConnectivityManager) getSystemService(Context.CONNECTIVITY_SERVICE);
-        if (!mobileDataEnabled) {
-            Utils.setMobileDataEnabled(this, true);
-        }
-        if (mConnMgr == null) {
-            endMmsConnectivity();
-            stopSelf(serviceId);
-            return;
-        }
-
-        boolean noNetwork = !isNetworkAvailable();
-
-        Timber.v("onNewIntent: serviceId: " + serviceId + ": " + intent.getExtras() + " intent=" + intent);
-        Timber.v("    networkAvailable=" + !noNetwork);
-
-        String action = intent.getAction();
-        if (ACTION_ONALARM.equals(action) || ACTION_ENABLE_AUTO_RETRIEVE.equals(action) ||
-                (intent.getExtras() == null)) {
-            // Scan database to find all pending operations.
-            Cursor cursor = PduPersister.getPduPersister(this).getPendingMessages(
-                    System.currentTimeMillis());
-            if (cursor != null) {
-                try {
-                    int count = cursor.getCount();
-
-                    Timber.v("onNewIntent: cursor.count=" + count + " action=" + action);
-
-                    if (count == 0) {
-                        Timber.v("onNewIntent: no pending messages. Stopping service.");
-                        RetryScheduler.setRetryAlarm(this);
-                        stopSelfIfIdle(serviceId);
-                        return;
-                    }
-
-                    int columnIndexOfMsgId = cursor.getColumnIndexOrThrow(PendingMessages.MSG_ID);
-                    int columnIndexOfMsgType = cursor.getColumnIndexOrThrow(
-                            PendingMessages.MSG_TYPE);
-
-                    while (cursor.moveToNext()) {
-                        int msgType = cursor.getInt(columnIndexOfMsgType);
-                        int transactionType = getTransactionType(msgType);
-
-                        try {
-                            Uri uri = ContentUris.withAppendedId(Mms.CONTENT_URI,
-                                    cursor.getLong(columnIndexOfMsgId));
-                            com.android.mms.transaction.DownloadManager.getInstance().
-                                    downloadMultimediaMessage(this, PushReceiver.getContentLocation(this, uri), uri, false,  Utils.getDefaultSubscriptionId());
-
-                            // can't handle many messages at once.
-                            break;
-                        } catch (MmsException e) {
-                            e.printStackTrace();
-                        }
-                    }
-                } finally {
-                    cursor.close();
-                }
-            } else {
-                Timber.v("onNewIntent: no pending messages. Stopping service.");
-                RetryScheduler.setRetryAlarm(this);
-                stopSelfIfIdle(serviceId);
-            }
-        } else {
-            Timber.v("onNewIntent: launch transaction...");
-            // For launching NotificationTransaction and test purpose.
-            TransactionBundle args = new TransactionBundle(intent.getExtras());
-            launchTransaction(serviceId, args, noNetwork);
-        }
-    }
-
-    private void stopSelfIfIdle(int startId) {
-        synchronized (mProcessing) {
-            if (mProcessing.isEmpty() && mPending.isEmpty()) {
-                Timber.v("stopSelfIfIdle: STOP!");
-
-                stopSelf(startId);
-            }
-        }
-    }
-
-    private static boolean isTransientFailure(int type) {
-        return type > MmsSms.NO_ERROR && type < MmsSms.ERR_TYPE_GENERIC_PERMANENT;
-    }
-
-    private int getTransactionType(int msgType) {
-        switch (msgType) {
-            case PduHeaders.MESSAGE_TYPE_NOTIFICATION_IND:
-                return Transaction.RETRIEVE_TRANSACTION;
-            case PduHeaders.MESSAGE_TYPE_READ_REC_IND:
-                return Transaction.READREC_TRANSACTION;
-            case PduHeaders.MESSAGE_TYPE_SEND_REQ:
-                return Transaction.SEND_TRANSACTION;
-            default:
-                Timber.w("Unrecognized MESSAGE_TYPE: " + msgType);
-                return -1;
-        }
-    }
-
-    private void launchTransaction(int serviceId, TransactionBundle txnBundle, boolean noNetwork) {
-        if (noNetwork) {
-            Timber.w("launchTransaction: no network error!");
-            onNetworkUnavailable(serviceId, txnBundle.getTransactionType());
-            return;
-        }
-        Message msg = mServiceHandler.obtainMessage(EVENT_TRANSACTION_REQUEST);
-        msg.arg1 = serviceId;
-        msg.obj = txnBundle;
-
-        Timber.v("launchTransaction: sending message " + msg);
-        mServiceHandler.sendMessage(msg);
-    }
-
-    private void onNetworkUnavailable(int serviceId, int transactionType) {
-        Timber.v("onNetworkUnavailable: sid=" + serviceId + ", type=" + transactionType);
-
-        int toastType = TOAST_NONE;
-        if (transactionType == Transaction.RETRIEVE_TRANSACTION) {
-            toastType = TOAST_DOWNLOAD_LATER;
-        } else if (transactionType == Transaction.SEND_TRANSACTION) {
-            toastType = TOAST_MSG_QUEUED;
-        }
-        if (toastType != TOAST_NONE) {
-            mToastHandler.sendEmptyMessage(toastType);
-        }
-        stopSelf(serviceId);
-    }
-
-    @Override
-    public void onDestroy() {
-        Timber.v("Destroying TransactionService");
-        if (!mPending.isEmpty()) {
-            Timber.w("TransactionService exiting with transaction still pending");
-        }
-
-        releaseWakeLock();
-
-        try {
-            unregisterReceiver(mReceiver);
-        } catch (Exception e) {
-        }
-
-        mServiceHandler.sendEmptyMessage(EVENT_QUIT);
-
-        if (!mobileDataEnabled && !lollipopReceiving) {
-            Timber.v("disabling mobile data");
-            Utils.setMobileDataEnabled(TransactionService.this, false);
-        }
-    }
-
-    @Override
-    public IBinder onBind(Intent intent) {
-        return null;
-    }
-
-    /**
-     * Handle status change of Transaction (The Observable).
-     */
-    public void update(Observable observable) {
-        Transaction transaction = (Transaction) observable;
-        int serviceId = transaction.getServiceId();
-
-        Timber.v("update transaction " + serviceId);
-
-        try {
-            synchronized (mProcessing) {
-                mProcessing.remove(transaction);
-                if (mPending.size() > 0) {
-                    Timber.v("update: handle next pending transaction...");
-                    Message msg = mServiceHandler.obtainMessage(
-                            EVENT_HANDLE_NEXT_PENDING_TRANSACTION,
-                            transaction.getConnectionSettings());
-                    mServiceHandler.sendMessage(msg);
-                }
-                else if (mProcessing.isEmpty()) {
-                    Timber.v("update: endMmsConnectivity");
-                    endMmsConnectivity();
-                } else {
-                    Timber.v("update: mProcessing is not empty");
-                }
-            }
-
-            Intent intent = new Intent(TRANSACTION_COMPLETED_ACTION);
-            TransactionState state = transaction.getState();
-            int result = state.getState();
-            intent.putExtra(STATE, result);
-
-            switch (result) {
-                case TransactionState.SUCCESS:
-                    Timber.v("Transaction complete: " + serviceId);
-
-                    intent.putExtra(STATE_URI, state.getContentUri());
-
-                    // Notify user in the system-wide notification area.
-                    switch (transaction.getType()) {
-                        case Transaction.NOTIFICATION_TRANSACTION:
-                        case Transaction.RETRIEVE_TRANSACTION:
-                            // We're already in a non-UI thread called from
-                            // NotificationTransacation.run(), so ok to block here.
-//                            long threadId = MessagingNotification.getThreadId(
-//                                    this, state.getContentUri());
-//                            MessagingNotification.blockingUpdateNewMessageIndicator(this,
-//                                    threadId,
-//                                    false);
-//                            MessagingNotification.updateDownloadFailedNotification(this);
-                            break;
-                        case Transaction.SEND_TRANSACTION:
-                            RateController.init(getApplicationContext());
-                            RateController.getInstance().update();
-                            break;
-                    }
-                    break;
-                case TransactionState.FAILED:
-                    Timber.v("Transaction failed: " + serviceId);
-                    break;
-                default:
-                    Timber.v("Transaction state unknown: " + serviceId + " " + result);
-                    break;
-            }
-
-            Timber.v("update: broadcast transaction result " + result);
-            // Broadcast the result of the transaction.
-            BroadcastUtils.sendExplicitBroadcast(this, intent, TRANSACTION_COMPLETED_ACTION);
-        } finally {
-            transaction.detach(this);
-            stopSelfIfIdle(serviceId);
-        }
-    }
-
-    private synchronized void createWakeLock() {
-        // Create a new wake lock if we haven't made one yet.
-        if (mWakeLock == null) {
-            PowerManager pm = (PowerManager)getSystemService(Context.POWER_SERVICE);
-            mWakeLock = pm.newWakeLock(PowerManager.PARTIAL_WAKE_LOCK, "MMS Connectivity");
-            mWakeLock.setReferenceCounted(false);
-        }
-    }
-
-    private void acquireWakeLock() {
-        // It's okay to double-acquire this because we are not using it
-        // in reference-counted mode.
-        Timber.v("mms acquireWakeLock");
-        mWakeLock.acquire();
-    }
-
-    private void releaseWakeLock() {
-        // Don't release the wake lock if it hasn't been created and acquired.
-        if (mWakeLock != null && mWakeLock.isHeld()) {
-            Timber.v("mms releaseWakeLock");
-            mWakeLock.release();
-        }
-    }
-
-    protected int beginMmsConnectivity() throws IOException {
-        Timber.v("beginMmsConnectivity");
-        // Take a wake lock so we don't fall asleep before the message is downloaded.
-        createWakeLock();
-
-        if (Utils.isMmsOverWifiEnabled(this)) {
-            NetworkInfo niWF = mConnMgr.getNetworkInfo(ConnectivityManager.TYPE_WIFI);
-            if ((niWF != null) && (niWF.isConnected())) {
-                Timber.v("beginMmsConnectivity: Wifi active");
-                return 0;
-            }
-        }
-
-        int result = mConnMgr.startUsingNetworkFeature(ConnectivityManager.TYPE_MOBILE, "enableMMS");
-
-        Timber.v("beginMmsConnectivity: result=" + result);
-
-        switch (result) {
-            case 0:
-            case 1:
-                acquireWakeLock();
-                return result;
-        }
-
-        throw new IOException("Cannot establish MMS connectivity");
-    }
-
-    protected void endMmsConnectivity() {
-        try {
-            Timber.v("endMmsConnectivity");
-
-            // cancel timer for renewal of lease
-            mServiceHandler.removeMessages(EVENT_CONTINUE_MMS_CONNECTIVITY);
-            if (mConnMgr != null && Build.VERSION.SDK_INT < Build.VERSION_CODES.M) {
-                mConnMgr.stopUsingNetworkFeature(
-                        ConnectivityManager.TYPE_MOBILE,
-                        "enableMMS");
-            }
-        } finally {
-            releaseWakeLock();
-        }
-    }
-
-    private final class ServiceHandler extends Handler {
-        public ServiceHandler(Looper looper) {
-            super(looper);
-        }
-
-        private String decodeMessage(Message msg) {
-            if (msg.what == EVENT_QUIT) {
-                return "EVENT_QUIT";
-            } else if (msg.what == EVENT_CONTINUE_MMS_CONNECTIVITY) {
-                return "EVENT_CONTINUE_MMS_CONNECTIVITY";
-            } else if (msg.what == EVENT_TRANSACTION_REQUEST) {
-                return "EVENT_TRANSACTION_REQUEST";
-            } else if (msg.what == EVENT_HANDLE_NEXT_PENDING_TRANSACTION) {
-                return "EVENT_HANDLE_NEXT_PENDING_TRANSACTION";
-            } else if (msg.what == EVENT_NEW_INTENT) {
-                return "EVENT_NEW_INTENT";
-            }
-            return "unknown message.what";
-        }
-
-        private String decodeTransactionType(int transactionType) {
-            if (transactionType == Transaction.NOTIFICATION_TRANSACTION) {
-                return "NOTIFICATION_TRANSACTION";
-            } else if (transactionType == Transaction.RETRIEVE_TRANSACTION) {
-                return "RETRIEVE_TRANSACTION";
-            } else if (transactionType == Transaction.SEND_TRANSACTION) {
-                return "SEND_TRANSACTION";
-            } else if (transactionType == Transaction.READREC_TRANSACTION) {
-                return "READREC_TRANSACTION";
-            }
-            return "invalid transaction type";
-        }
-
-        /**
-         * Handle incoming transaction requests.
-         * The incoming requests are initiated by the MMSC Server or by the
-         * MMS Client itself.
-         */
-        @Override
-        public void handleMessage(Message msg) {
-            Timber.v("Handling incoming message: " + msg + " = " + decodeMessage(msg));
-
-            Transaction transaction = null;
-
-            switch (msg.what) {
-                case EVENT_NEW_INTENT:
-                    onNewIntent((Intent)msg.obj, msg.arg1);
-                    break;
-
-                case EVENT_QUIT:
-                    getLooper().quit();
-                    return;
-
-                case EVENT_CONTINUE_MMS_CONNECTIVITY:
-                    synchronized (mProcessing) {
-                        if (mProcessing.isEmpty()) {
-                            return;
-                        }
-                    }
-
-                    Timber.v("handle EVENT_CONTINUE_MMS_CONNECTIVITY event...");
-
-                    try {
-                        int result = beginMmsConnectivity();
-                        if (result != 0) {
-                            Timber.v("Extending MMS connectivity returned " + result +
-                                    " instead of APN_ALREADY_ACTIVE");
-                            // Just wait for connectivity startup without
-                            // any new request of APN switch.
-                            return;
-                        }
-                    } catch (IOException e) {
-                        Timber.w("Attempt to extend use of MMS connectivity failed");
-                        return;
-                    }
-
-                    // Restart timer
-                    renewMmsConnectivity();
-                    return;
-
-                case EVENT_TRANSACTION_REQUEST:
-                    int serviceId = msg.arg1;
-                    try {
-                        TransactionBundle args = (TransactionBundle) msg.obj;
-                        TransactionSettings transactionSettings;
-
-                        Timber.v("EVENT_TRANSACTION_REQUEST MmscUrl=" +
-                                args.getMmscUrl() + " proxy port: " + args.getProxyAddress());
-
-                        // Set the connection settings for this transaction.
-                        // If these have not been set in args, load the default settings.
-                        String mmsc = args.getMmscUrl();
-                        if (mmsc != null) {
-                            transactionSettings = new TransactionSettings(
-                                    mmsc, args.getProxyAddress(), args.getProxyPort());
-                        } else {
-                            transactionSettings = new TransactionSettings(
-                                                    TransactionService.this, null);
-                        }
-
-                        int transactionType = args.getTransactionType();
-
-                        Timber.v("handle EVENT_TRANSACTION_REQUEST: transactionType=" +
-                                transactionType + " " + decodeTransactionType(transactionType));
-
-                        // Create appropriate transaction
-                        switch (transactionType) {
-                            case Transaction.NOTIFICATION_TRANSACTION:
-                                String uri = args.getUri();
-                                if (uri != null) {
-                                    transaction = new NotificationTransaction(
-                                            TransactionService.this, serviceId,
-                                            transactionSettings, uri);
-                                } else {
-                                    // Now it's only used for test purpose.
-                                    byte[] pushData = args.getPushData();
-                                    PduParser parser = new PduParser(pushData);
-                                    GenericPdu ind = parser.parse();
-
-                                    int type = PduHeaders.MESSAGE_TYPE_NOTIFICATION_IND;
-                                    if ((ind != null) && (ind.getMessageType() == type)) {
-                                        transaction = new NotificationTransaction(
-                                                TransactionService.this, serviceId,
-                                                transactionSettings, (NotificationInd) ind);
-                                    } else {
-                                        Timber.e("Invalid PUSH data.");
-                                        transaction = null;
-                                        return;
-                                    }
-                                }
-                                break;
-                            case Transaction.RETRIEVE_TRANSACTION:
-                                transaction = new RetrieveTransaction(
-                                        TransactionService.this, serviceId,
-                                        transactionSettings, args.getUri());
-
-                                Uri u = Uri.parse(args.getUri());
-                                com.android.mms.transaction.DownloadManager.getInstance().
-                                        downloadMultimediaMessage(TransactionService.this,
-                                                ((RetrieveTransaction) transaction).getContentLocation(TransactionService.this, u), u, false, Utils.getDefaultSubscriptionId());
-                                return;
-
-
-                        }
-
-                        if (!processTransaction(transaction)) {
-                            transaction = null;
-                            return;
-                        }
-
-                        Timber.v("Started processing of incoming message: " + msg);
-                    } catch (Exception ex) {
-                        Timber.w(ex, "Exception occurred while handling message: " + msg);
-
-                        if (transaction != null) {
-                            try {
-                                transaction.detach(TransactionService.this);
-                                if (mProcessing.contains(transaction)) {
-                                    synchronized (mProcessing) {
-                                        mProcessing.remove(transaction);
-                                    }
-                                }
-                            } catch (Throwable t) {
-                                Timber.e(t, "Unexpected Throwable.");
-                            } finally {
-                                // Set transaction to null to allow stopping the
-                                // transaction service.
-                                transaction = null;
-                            }
-                        }
-                    } finally {
-                        if (transaction == null) {
-                            Timber.v("Transaction was null. Stopping self: " + serviceId);
-                            endMmsConnectivity();
-                            stopSelf(serviceId);
-                        }
-                    }
-                    return;
-                case EVENT_HANDLE_NEXT_PENDING_TRANSACTION:
-                    processPendingTransaction(transaction, (TransactionSettings) msg.obj);
-                    return;
-                default:
-                    Timber.w("what=" + msg.what);
-                    return;
-            }
-        }
-
-        public void markAllPendingTransactionsAsFailed() {
-            synchronized (mProcessing) {
-                while (mPending.size() != 0) {
-                    Transaction transaction = mPending.remove(0);
-                    transaction.mTransactionState.setState(TransactionState.FAILED);
-                    if (transaction instanceof SendTransaction) {
-                        Uri uri = ((SendTransaction)transaction).mSendReqURI;
-                        transaction.mTransactionState.setContentUri(uri);
-                        int respStatus = PduHeaders.RESPONSE_STATUS_ERROR_NETWORK_PROBLEM;
-                        ContentValues values = new ContentValues(1);
-                        values.put(Mms.RESPONSE_STATUS, respStatus);
-
-                        SqliteWrapper.update(TransactionService.this,
-                                TransactionService.this.getContentResolver(),
-                                uri, values, null, null);
-                    }
-                    transaction.notifyObservers();
-                }
-            }
-        }
-
-        public void processPendingTransaction(Transaction transaction,
-                                               TransactionSettings settings) {
-
-            Timber.v("processPendingTxn: transaction=" + transaction);
-
-            int numProcessTransaction = 0;
-            synchronized (mProcessing) {
-                if (mPending.size() != 0) {
-                    transaction = mPending.remove(0);
-                }
-                numProcessTransaction = mProcessing.size();
-            }
-
-            if (transaction != null) {
-                if (settings != null) {
-                    transaction.setConnectionSettings(settings);
-                }
-
-                /*
-                 * Process deferred transaction
-                 */
-                try {
-                    int serviceId = transaction.getServiceId();
-
-                    Timber.v("processPendingTxn: process " + serviceId);
-
-                    if (processTransaction(transaction)) {
-                        Timber.v("Started deferred processing of transaction  " + transaction);
-                    } else {
-                        transaction = null;
-                        stopSelf(serviceId);
-                    }
-                } catch (IOException e) {
-                    Timber.w(e, e.getMessage());
-                }
-            } else {
-                if (numProcessTransaction == 0) {
-                    Timber.v("processPendingTxn: no more transaction, endMmsConnectivity");
-                    endMmsConnectivity();
-                }
-            }
-        }
-
-        /**
-         * Internal method to begin processing a transaction.
-         * @param transaction the transaction. Must not be {@code null}.
-         * @return {@code true} if process has begun or will begin. {@code false}
-         * if the transaction should be discarded.
-         * @throws java.io.IOException if connectivity for MMS traffic could not be
-         * established.
-         */
-        private boolean processTransaction(Transaction transaction) throws IOException {
-            // Check if transaction already processing
-            synchronized (mProcessing) {
-                for (Transaction t : mPending) {
-                    if (t.isEquivalent(transaction)) {
-                        Timber.v("Transaction already pending: " + transaction.getServiceId());
-                        return true;
-                    }
-                }
-                for (Transaction t : mProcessing) {
-                    if (t.isEquivalent(transaction)) {
-                        Timber.v("Duplicated transaction: " + transaction.getServiceId());
-                        return true;
-                    }
-                }
-
-                /*
-                * Make sure that the network connectivity necessary
-                * for MMS traffic is enabled. If it is not, we need
-                * to defer processing the transaction until
-                * connectivity is established.
-                */
-                Timber.v("processTransaction: call beginMmsConnectivity...");
-                int connectivityResult = beginMmsConnectivity();
-                if (connectivityResult == 1) {
-                    mPending.add(transaction);
-                    Timber.v("processTransaction: connResult=APN_REQUEST_STARTED, " +
-                            "defer transaction pending MMS connectivity");
-                    return true;
-                }
-                // If there is already a transaction in processing list, because of the previous
-                // beginMmsConnectivity call and there is another transaction just at a time,
-                // when the pdp is connected, there will be a case of adding the new transaction
-                // to the Processing list. But Processing list is never traversed to
-                // resend, resulting in transaction not completed/sent.
-                if (mProcessing.size() > 0) {
-                    Timber.v("Adding transaction to 'mPending' list: " + transaction);
-                    mPending.add(transaction);
-                    return true;
-                } else {
-                    Timber.v("Adding transaction to 'mProcessing' list: " + transaction);
-                    mProcessing.add(transaction);
-               }
-            }
-
-            // Set a timer to keep renewing our "lease" on the MMS connection
-            sendMessageDelayed(obtainMessage(EVENT_CONTINUE_MMS_CONNECTIVITY), APN_EXTENSION_WAIT);
-
-            Timber.v("processTransaction: starting transaction " + transaction);
-
-            // Attach to transaction and process it
-            transaction.attach(TransactionService.this);
-            transaction.process();
-            return true;
-        }
-    }
-
-    private void renewMmsConnectivity() {
-        // Set a timer to keep renewing our "lease" on the MMS connection
-        mServiceHandler.sendMessageDelayed(
-                mServiceHandler.obtainMessage(EVENT_CONTINUE_MMS_CONNECTIVITY),
-                           APN_EXTENSION_WAIT);
-    }
-
-    private class ConnectivityBroadcastReceiver extends BroadcastReceiver {
-        @Override
-        public void onReceive(Context context, Intent intent) {
-            String action = intent.getAction();
-            Timber.w("ConnectivityBroadcastReceiver.onReceive() action: " + action);
-
-            if (!action.equals(ConnectivityManager.CONNECTIVITY_ACTION)) {
-                return;
-            }
-
-            NetworkInfo mmsNetworkInfo = null;
-
-            if (mConnMgr != null && Utils.isMobileDataEnabled(context)) {
-                mmsNetworkInfo = mConnMgr.getNetworkInfo(ConnectivityManager.TYPE_MOBILE_MMS);
-            } else {
-                Timber.v("mConnMgr is null, bail");
-            }
-
-            /*
-             * If we are being informed that connectivity has been established
-             * to allow MMS traffic, then proceed with processing the pending
-             * transaction, if any.
-             */
-
-            Timber.v("Handle ConnectivityBroadcastReceiver.onReceive(): " + mmsNetworkInfo);
-
-            // Check availability of the mobile network.
-            if (mmsNetworkInfo == null) {
-                Timber.v("mms type is null or mobile data is turned off, bail");
-            } else {
-                // This is a very specific fix to handle the case where the phone receives an
-                // incoming call during the time we're trying to setup the mms connection.
-                // When the call ends, restart the process of mms connectivity.
-                if ("2GVoiceCallEnded".equals(mmsNetworkInfo.getReason())) {
-                    Timber.v("   reason is " + "2GVoiceCallEnded" + ", retrying mms connectivity");
-                    renewMmsConnectivity();
-                    return;
-                }
-
-                if (mmsNetworkInfo.isConnected()) {
-                    TransactionSettings settings = new TransactionSettings(
-                            TransactionService.this, mmsNetworkInfo.getExtraInfo());
-                    // If this APN doesn't have an MMSC, mark everything as failed and bail.
-                    if (TextUtils.isEmpty(settings.getMmscUrl())) {
-                        Timber.v("   empty MMSC url, bail");
-                        BroadcastUtils.sendExplicitBroadcast(
-                                TransactionService.this,
-                                new Intent(),
-                                com.klinker.android.send_message.Transaction.MMS_ERROR);
-                        mServiceHandler.markAllPendingTransactionsAsFailed();
-                        endMmsConnectivity();
-                        stopSelf();
-                        return;
-                    }
-                    mServiceHandler.processPendingTransaction(null, settings);
-                } else {
-                    Timber.v("   TYPE_MOBILE_MMS not connected, bail");
-
-                    // Retry mms connectivity once it's possible to connect
-                    if (mmsNetworkInfo.isAvailable()) {
-                        Timber.v("   retrying mms connectivity for it's available");
-                        renewMmsConnectivity();
-                    }
-                }
-            }
-        }
-    }
-}
+/*
+ * Copyright 2014 Jacob Klinker
+ *
+ * Licensed under the Apache License, Version 2.0 (the "License");
+ * you may not use this file except in compliance with the License.
+ * You may obtain a copy of the License at
+ *
+ *     http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing, software
+ * distributed under the License is distributed on an "AS IS" BASIS,
+ * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ * See the License for the specific language governing permissions and
+ * limitations under the License.
+ */
+
+package com.android.mms.transaction;
+
+import android.app.Service;
+import android.content.BroadcastReceiver;
+import android.content.ContentUris;
+import android.content.ContentValues;
+import android.content.Context;
+import android.content.Intent;
+import android.content.IntentFilter;
+import android.database.Cursor;
+import android.database.sqlite.SqliteWrapper;
+import android.net.ConnectivityManager;
+import android.net.NetworkInfo;
+import android.net.Uri;
+import android.os.Build;
+import android.os.Handler;
+import android.os.HandlerThread;
+import android.os.IBinder;
+import android.os.Looper;
+import android.os.Message;
+import android.os.PowerManager;
+import android.provider.Telephony.Mms;
+import android.provider.Telephony.MmsSms;
+import android.provider.Telephony.MmsSms.PendingMessages;
+import android.text.TextUtils;
+import android.widget.Toast;
+import com.android.mms.util.RateController;
+import com.google.android.mms.MmsException;
+import com.google.android.mms.pdu_alt.GenericPdu;
+import com.google.android.mms.pdu_alt.NotificationInd;
+import com.google.android.mms.pdu_alt.PduHeaders;
+import com.google.android.mms.pdu_alt.PduParser;
+import com.google.android.mms.pdu_alt.PduPersister;
+import com.klinker.android.send_message.BroadcastUtils;
+import com.klinker.android.send_message.R;
+import com.klinker.android.send_message.Utils;
+import timber.log.Timber;
+
+import java.io.IOException;
+import java.util.ArrayList;
+
+/**
+ * The TransactionService of the MMS Client is responsible for handling requests
+ * to initiate client-transactions sent from:
+ * <ul>
+ * <li>The Proxy-Relay (Through Push messages)</li>
+ * <li>The composer/viewer activities of the MMS Client (Through intents)</li>
+ * </ul>
+ * The TransactionService runs locally in the same process as the application.
+ * It contains a HandlerThread to which messages are posted from the
+ * intent-receivers of this application.
+ * <p/>
+ * <b>IMPORTANT</b>: This is currently the only instance in the system in
+ * which simultaneous connectivity to both the mobile data network and
+ * a Wi-Fi network is allowed. This makes the code for handling network
+ * connectivity somewhat different than it is in other applications. In
+ * particular, we want to be able to send or receive MMS messages when
+ * a Wi-Fi connection is active (which implies that there is no connection
+ * to the mobile data network). This has two main consequences:
+ * <ul>
+ * <li>Testing for current network connectivity ({@link android.net.NetworkInfo#isConnected()} is
+ * not sufficient. Instead, the correct test is for network availability
+ * ({@link android.net.NetworkInfo#isAvailable()}).</li>
+ * <li>If the mobile data network is not in the connected state, but it is available,
+ * we must initiate setup of the mobile data connection, and defer handling
+ * the MMS transaction until the connection is established.</li>
+ * </ul>
+ */
+public class TransactionService extends Service implements Observer {
+
+    /**
+     * Used to identify notification intents broadcasted by the
+     * TransactionService when a Transaction is completed.
+     */
+    public static final String TRANSACTION_COMPLETED_ACTION =
+            "android.intent.action.TRANSACTION_COMPLETED_ACTION";
+
+    /**
+     * Action for the Intent which is sent by Alarm service to launch
+     * TransactionService.
+     */
+    public static final String ACTION_ONALARM = "android.intent.action.ACTION_ONALARM";
+
+    /**
+     * Action for the Intent which is sent when the user turns on the auto-retrieve setting.
+     * This service gets started to auto-retrieve any undownloaded messages.
+     */
+    public static final String ACTION_ENABLE_AUTO_RETRIEVE
+            = "android.intent.action.ACTION_ENABLE_AUTO_RETRIEVE";
+
+    /**
+     * Used as extra key in notification intents broadcasted by the TransactionService
+     * when a Transaction is completed (TRANSACTION_COMPLETED_ACTION intents).
+     * Allowed values for this key are: TransactionState.INITIALIZED,
+     * TransactionState.SUCCESS, TransactionState.FAILED.
+     */
+    public static final String STATE = "state";
+
+    /**
+     * Used as extra key in notification intents broadcasted by the TransactionService
+     * when a Transaction is completed (TRANSACTION_COMPLETED_ACTION intents).
+     * Allowed values for this key are any valid content uri.
+     */
+    public static final String STATE_URI = "uri";
+
+    private static final int EVENT_TRANSACTION_REQUEST = 1;
+    private static final int EVENT_CONTINUE_MMS_CONNECTIVITY = 3;
+    private static final int EVENT_HANDLE_NEXT_PENDING_TRANSACTION = 4;
+    private static final int EVENT_NEW_INTENT = 5;
+    private static final int EVENT_QUIT = 100;
+
+    private static final int TOAST_MSG_QUEUED = 1;
+    private static final int TOAST_DOWNLOAD_LATER = 2;
+    private static final int TOAST_NO_APN = 3;
+    private static final int TOAST_NONE = -1;
+
+    // How often to extend the use of the MMS APN while a transaction
+    // is still being processed.
+    private static final int APN_EXTENSION_WAIT = 30 * 1000;
+
+    private ServiceHandler mServiceHandler;
+    private Looper mServiceLooper;
+    private final ArrayList<Transaction> mProcessing  = new ArrayList<Transaction>();
+    private final ArrayList<Transaction> mPending  = new ArrayList<Transaction>();
+    private ConnectivityManager mConnMgr;
+    private ConnectivityBroadcastReceiver mReceiver;
+    private boolean mobileDataEnabled;
+    private boolean lollipopReceiving = false;
+
+    private PowerManager.WakeLock mWakeLock;
+
+    public Handler mToastHandler = new Handler() {
+        @Override
+        public void handleMessage(Message msg) {
+            String str = null;
+
+            if (msg.what == TOAST_MSG_QUEUED) {
+                str = getString(R.string.message_queued);
+            } else if (msg.what == TOAST_DOWNLOAD_LATER) {
+                str = getString(R.string.download_later);
+            } else if (msg.what == TOAST_NO_APN) {
+                str = getString(R.string.no_apn);
+            }
+
+            if (str != null) {
+                Toast.makeText(TransactionService.this, str,
+                        Toast.LENGTH_LONG).show();
+            }
+        }
+    };
+
+    @Override
+    public void onCreate() {
+        Timber.v("Creating TransactionService");
+
+        if (!Utils.isDefaultSmsApp(this)) {
+            Timber.v("not default app, so exiting");
+            stopSelf();
+            return;
+        }
+
+        initServiceHandler();
+
+        mReceiver = new ConnectivityBroadcastReceiver();
+        IntentFilter intentFilter = new IntentFilter();
+        intentFilter.addAction(ConnectivityManager.CONNECTIVITY_ACTION);
+        registerReceiver(mReceiver, intentFilter);
+    }
+
+    private void initServiceHandler() {
+        // Start up the thread running the service.  Note that we create a
+        // separate thread because the service normally runs in the process's
+        // main thread, which we don't want to block.
+        HandlerThread thread = new HandlerThread("TransactionService");
+        thread.start();
+
+        mServiceLooper = thread.getLooper();
+        mServiceHandler = new ServiceHandler(mServiceLooper);
+    }
+
+    @Override
+    public int onStartCommand(final Intent intent, int flags, int startId) {
+        if (intent != null) {
+//            if (intent.getBooleanExtra(TransactionBundle.LOLLIPOP_RECEIVING, false)) {
+//                lollipopReceiving = true;
+//                new Thread(new Runnable() {
+//                    @Override
+//                    public void run() {
+//                        Timber.v("starting receiving with new lollipop method");
+//                        try { Thread.sleep(60000); } catch (Exception e) { }
+//                        Timber.v("done sleeping, lets try and grab the message");
+//                        Uri contentUri = Uri.parse(intent.getStringExtra(TransactionBundle.URI));
+//                        String downloadLocation = null;
+//                        Cursor locationQuery = getContentResolver().query(contentUri, new String[]{Telephony.Mms.CONTENT_LOCATION, Telephony.Mms._ID}, null, null, "date desc");
+//
+//                        if (locationQuery != null && locationQuery.moveToFirst()) {
+//                            Timber.v("grabbing content location url");
+//                            downloadLocation = locationQuery.getString(locationQuery.getColumnIndex(Telephony.Mms.CONTENT_LOCATION));
+//                        }
+//
+//                        Timber.v("creating request with url: " + downloadLocation);
+//                        DownloadRequest request = new DownloadRequest(downloadLocation, contentUri, null, null, null);
+//                        MmsNetworkManager manager = new MmsNetworkManager(TransactionService.this);
+//                        request.execute(TransactionService.this, manager);
+//                        stopSelf();
+//                    }
+//                }).start();
+//                return START_NOT_STICKY;
+//            }
+
+            if (mServiceHandler == null) {
+                initServiceHandler();
+            }
+
+            Message msg = mServiceHandler.obtainMessage(EVENT_NEW_INTENT);
+            msg.arg1 = startId;
+            msg.obj = intent;
+            mServiceHandler.sendMessage(msg);
+        }
+        return Service.START_NOT_STICKY;
+    }
+
+    private boolean isNetworkAvailable() {
+        if (mConnMgr == null) {
+            return false;
+        } else if (Utils.isMmsOverWifiEnabled(this)) {
+            NetworkInfo niWF = mConnMgr.getNetworkInfo(ConnectivityManager.TYPE_WIFI);
+            return (niWF == null ? false : niWF.isConnected());
+        } else {
+            NetworkInfo ni = mConnMgr.getNetworkInfo(ConnectivityManager.TYPE_MOBILE_MMS);
+            return (ni == null ? false : ni.isAvailable());
+        }
+    }
+
+    public void onNewIntent(Intent intent, int serviceId) {
+        try {
+            mobileDataEnabled = Utils.isMobileDataEnabled(this);
+        } catch (Exception e) {
+            mobileDataEnabled = true;
+        }
+        mConnMgr = (ConnectivityManager) getSystemService(Context.CONNECTIVITY_SERVICE);
+        if (!mobileDataEnabled) {
+            Utils.setMobileDataEnabled(this, true);
+        }
+        if (mConnMgr == null) {
+            endMmsConnectivity();
+            stopSelf(serviceId);
+            return;
+        }
+
+        boolean noNetwork = !isNetworkAvailable();
+
+        Timber.v("onNewIntent: serviceId: " + serviceId + ": " + intent.getExtras() + " intent=" + intent);
+        Timber.v("    networkAvailable=" + !noNetwork);
+
+        String action = intent.getAction();
+        if (ACTION_ONALARM.equals(action) || ACTION_ENABLE_AUTO_RETRIEVE.equals(action) ||
+                (intent.getExtras() == null)) {
+            // Scan database to find all pending operations.
+            Cursor cursor = PduPersister.getPduPersister(this).getPendingMessages(
+                    System.currentTimeMillis());
+            if (cursor != null) {
+                try {
+                    int count = cursor.getCount();
+
+                    Timber.v("onNewIntent: cursor.count=" + count + " action=" + action);
+
+                    if (count == 0) {
+                        Timber.v("onNewIntent: no pending messages. Stopping service.");
+                        RetryScheduler.setRetryAlarm(this);
+                        stopSelfIfIdle(serviceId);
+                        return;
+                    }
+
+                    int columnIndexOfMsgId = cursor.getColumnIndexOrThrow(PendingMessages.MSG_ID);
+                    int columnIndexOfMsgType = cursor.getColumnIndexOrThrow(
+                            PendingMessages.MSG_TYPE);
+
+                    while (cursor.moveToNext()) {
+                        int msgType = cursor.getInt(columnIndexOfMsgType);
+                        int transactionType = getTransactionType(msgType);
+
+                        try {
+                            Uri uri = ContentUris.withAppendedId(Mms.CONTENT_URI,
+                                    cursor.getLong(columnIndexOfMsgId));
+                            com.android.mms.transaction.DownloadManager.getInstance().
+                                    downloadMultimediaMessage(this, PushReceiver.getContentLocation(this, uri), uri, false,  Utils.getDefaultSubscriptionId());
+
+                            // can't handle many messages at once.
+                            break;
+                        } catch (MmsException e) {
+                            e.printStackTrace();
+                        }
+                    }
+                } finally {
+                    cursor.close();
+                }
+            } else {
+                Timber.v("onNewIntent: no pending messages. Stopping service.");
+                RetryScheduler.setRetryAlarm(this);
+                stopSelfIfIdle(serviceId);
+            }
+        } else {
+            Timber.v("onNewIntent: launch transaction...");
+            // For launching NotificationTransaction and test purpose.
+            TransactionBundle args = new TransactionBundle(intent.getExtras());
+            launchTransaction(serviceId, args, noNetwork);
+        }
+    }
+
+    private void stopSelfIfIdle(int startId) {
+        synchronized (mProcessing) {
+            if (mProcessing.isEmpty() && mPending.isEmpty()) {
+                Timber.v("stopSelfIfIdle: STOP!");
+
+                stopSelf(startId);
+            }
+        }
+    }
+
+    private static boolean isTransientFailure(int type) {
+        return type > MmsSms.NO_ERROR && type < MmsSms.ERR_TYPE_GENERIC_PERMANENT;
+    }
+
+    private int getTransactionType(int msgType) {
+        switch (msgType) {
+            case PduHeaders.MESSAGE_TYPE_NOTIFICATION_IND:
+                return Transaction.RETRIEVE_TRANSACTION;
+            case PduHeaders.MESSAGE_TYPE_READ_REC_IND:
+                return Transaction.READREC_TRANSACTION;
+            case PduHeaders.MESSAGE_TYPE_SEND_REQ:
+                return Transaction.SEND_TRANSACTION;
+            default:
+                Timber.w("Unrecognized MESSAGE_TYPE: " + msgType);
+                return -1;
+        }
+    }
+
+    private void launchTransaction(int serviceId, TransactionBundle txnBundle, boolean noNetwork) {
+        if (noNetwork) {
+            Timber.w("launchTransaction: no network error!");
+            onNetworkUnavailable(serviceId, txnBundle.getTransactionType());
+            return;
+        }
+        Message msg = mServiceHandler.obtainMessage(EVENT_TRANSACTION_REQUEST);
+        msg.arg1 = serviceId;
+        msg.obj = txnBundle;
+
+        Timber.v("launchTransaction: sending message " + msg);
+        mServiceHandler.sendMessage(msg);
+    }
+
+    private void onNetworkUnavailable(int serviceId, int transactionType) {
+        Timber.v("onNetworkUnavailable: sid=" + serviceId + ", type=" + transactionType);
+
+        int toastType = TOAST_NONE;
+        if (transactionType == Transaction.RETRIEVE_TRANSACTION) {
+            toastType = TOAST_DOWNLOAD_LATER;
+        } else if (transactionType == Transaction.SEND_TRANSACTION) {
+            toastType = TOAST_MSG_QUEUED;
+        }
+        if (toastType != TOAST_NONE) {
+            mToastHandler.sendEmptyMessage(toastType);
+        }
+        stopSelf(serviceId);
+    }
+
+    @Override
+    public void onDestroy() {
+        Timber.v("Destroying TransactionService");
+        if (!mPending.isEmpty()) {
+            Timber.w("TransactionService exiting with transaction still pending");
+        }
+
+        releaseWakeLock();
+
+        try {
+            unregisterReceiver(mReceiver);
+        } catch (Exception e) {
+        }
+
+        mServiceHandler.sendEmptyMessage(EVENT_QUIT);
+
+        if (!mobileDataEnabled && !lollipopReceiving) {
+            Timber.v("disabling mobile data");
+            Utils.setMobileDataEnabled(TransactionService.this, false);
+        }
+    }
+
+    @Override
+    public IBinder onBind(Intent intent) {
+        return null;
+    }
+
+    /**
+     * Handle status change of Transaction (The Observable).
+     */
+    public void update(Observable observable) {
+        Transaction transaction = (Transaction) observable;
+        int serviceId = transaction.getServiceId();
+
+        Timber.v("update transaction " + serviceId);
+
+        try {
+            synchronized (mProcessing) {
+                mProcessing.remove(transaction);
+                if (mPending.size() > 0) {
+                    Timber.v("update: handle next pending transaction...");
+                    Message msg = mServiceHandler.obtainMessage(
+                            EVENT_HANDLE_NEXT_PENDING_TRANSACTION,
+                            transaction.getConnectionSettings());
+                    mServiceHandler.sendMessage(msg);
+                }
+                else if (mProcessing.isEmpty()) {
+                    Timber.v("update: endMmsConnectivity");
+                    endMmsConnectivity();
+                } else {
+                    Timber.v("update: mProcessing is not empty");
+                }
+            }
+
+            Intent intent = new Intent(TRANSACTION_COMPLETED_ACTION);
+            TransactionState state = transaction.getState();
+            int result = state.getState();
+            intent.putExtra(STATE, result);
+
+            switch (result) {
+                case TransactionState.SUCCESS:
+                    Timber.v("Transaction complete: " + serviceId);
+
+                    intent.putExtra(STATE_URI, state.getContentUri());
+
+                    // Notify user in the system-wide notification area.
+                    switch (transaction.getType()) {
+                        case Transaction.NOTIFICATION_TRANSACTION:
+                        case Transaction.RETRIEVE_TRANSACTION:
+                            // We're already in a non-UI thread called from
+                            // NotificationTransacation.run(), so ok to block here.
+//                            long threadId = MessagingNotification.getThreadId(
+//                                    this, state.getContentUri());
+//                            MessagingNotification.blockingUpdateNewMessageIndicator(this,
+//                                    threadId,
+//                                    false);
+//                            MessagingNotification.updateDownloadFailedNotification(this);
+                            break;
+                        case Transaction.SEND_TRANSACTION:
+                            RateController.init(getApplicationContext());
+                            RateController.getInstance().update();
+                            break;
+                    }
+                    break;
+                case TransactionState.FAILED:
+                    Timber.v("Transaction failed: " + serviceId);
+                    break;
+                default:
+                    Timber.v("Transaction state unknown: " + serviceId + " " + result);
+                    break;
+            }
+
+            Timber.v("update: broadcast transaction result " + result);
+            // Broadcast the result of the transaction.
+            BroadcastUtils.sendExplicitBroadcast(this, intent, TRANSACTION_COMPLETED_ACTION);
+        } finally {
+            transaction.detach(this);
+            stopSelfIfIdle(serviceId);
+        }
+    }
+
+    private synchronized void createWakeLock() {
+        // Create a new wake lock if we haven't made one yet.
+        if (mWakeLock == null) {
+            PowerManager pm = (PowerManager)getSystemService(Context.POWER_SERVICE);
+            mWakeLock = pm.newWakeLock(PowerManager.PARTIAL_WAKE_LOCK, "MMS Connectivity");
+            mWakeLock.setReferenceCounted(false);
+        }
+    }
+
+    private void acquireWakeLock() {
+        // It's okay to double-acquire this because we are not using it
+        // in reference-counted mode.
+        Timber.v("mms acquireWakeLock");
+        mWakeLock.acquire();
+    }
+
+    private void releaseWakeLock() {
+        // Don't release the wake lock if it hasn't been created and acquired.
+        if (mWakeLock != null && mWakeLock.isHeld()) {
+            Timber.v("mms releaseWakeLock");
+            mWakeLock.release();
+        }
+    }
+
+    protected int beginMmsConnectivity() throws IOException {
+        Timber.v("beginMmsConnectivity");
+        // Take a wake lock so we don't fall asleep before the message is downloaded.
+        createWakeLock();
+
+        if (Utils.isMmsOverWifiEnabled(this)) {
+            NetworkInfo niWF = mConnMgr.getNetworkInfo(ConnectivityManager.TYPE_WIFI);
+            if ((niWF != null) && (niWF.isConnected())) {
+                Timber.v("beginMmsConnectivity: Wifi active");
+                return 0;
+            }
+        }
+
+        int result = mConnMgr.startUsingNetworkFeature(ConnectivityManager.TYPE_MOBILE, "enableMMS");
+
+        Timber.v("beginMmsConnectivity: result=" + result);
+
+        switch (result) {
+            case 0:
+            case 1:
+                acquireWakeLock();
+                return result;
+        }
+
+        throw new IOException("Cannot establish MMS connectivity");
+    }
+
+    protected void endMmsConnectivity() {
+        try {
+            Timber.v("endMmsConnectivity");
+
+            // cancel timer for renewal of lease
+            mServiceHandler.removeMessages(EVENT_CONTINUE_MMS_CONNECTIVITY);
+            if (mConnMgr != null && Build.VERSION.SDK_INT < Build.VERSION_CODES.M) {
+                mConnMgr.stopUsingNetworkFeature(
+                        ConnectivityManager.TYPE_MOBILE,
+                        "enableMMS");
+            }
+        } finally {
+            releaseWakeLock();
+        }
+    }
+
+    private final class ServiceHandler extends Handler {
+        public ServiceHandler(Looper looper) {
+            super(looper);
+        }
+
+        private String decodeMessage(Message msg) {
+            if (msg.what == EVENT_QUIT) {
+                return "EVENT_QUIT";
+            } else if (msg.what == EVENT_CONTINUE_MMS_CONNECTIVITY) {
+                return "EVENT_CONTINUE_MMS_CONNECTIVITY";
+            } else if (msg.what == EVENT_TRANSACTION_REQUEST) {
+                return "EVENT_TRANSACTION_REQUEST";
+            } else if (msg.what == EVENT_HANDLE_NEXT_PENDING_TRANSACTION) {
+                return "EVENT_HANDLE_NEXT_PENDING_TRANSACTION";
+            } else if (msg.what == EVENT_NEW_INTENT) {
+                return "EVENT_NEW_INTENT";
+            }
+            return "unknown message.what";
+        }
+
+        private String decodeTransactionType(int transactionType) {
+            if (transactionType == Transaction.NOTIFICATION_TRANSACTION) {
+                return "NOTIFICATION_TRANSACTION";
+            } else if (transactionType == Transaction.RETRIEVE_TRANSACTION) {
+                return "RETRIEVE_TRANSACTION";
+            } else if (transactionType == Transaction.SEND_TRANSACTION) {
+                return "SEND_TRANSACTION";
+            } else if (transactionType == Transaction.READREC_TRANSACTION) {
+                return "READREC_TRANSACTION";
+            }
+            return "invalid transaction type";
+        }
+
+        /**
+         * Handle incoming transaction requests.
+         * The incoming requests are initiated by the MMSC Server or by the
+         * MMS Client itself.
+         */
+        @Override
+        public void handleMessage(Message msg) {
+            Timber.v("Handling incoming message: " + msg + " = " + decodeMessage(msg));
+
+            Transaction transaction = null;
+
+            switch (msg.what) {
+                case EVENT_NEW_INTENT:
+                    onNewIntent((Intent)msg.obj, msg.arg1);
+                    break;
+
+                case EVENT_QUIT:
+                    getLooper().quit();
+                    return;
+
+                case EVENT_CONTINUE_MMS_CONNECTIVITY:
+                    synchronized (mProcessing) {
+                        if (mProcessing.isEmpty()) {
+                            return;
+                        }
+                    }
+
+                    Timber.v("handle EVENT_CONTINUE_MMS_CONNECTIVITY event...");
+
+                    try {
+                        int result = beginMmsConnectivity();
+                        if (result != 0) {
+                            Timber.v("Extending MMS connectivity returned " + result +
+                                    " instead of APN_ALREADY_ACTIVE");
+                            // Just wait for connectivity startup without
+                            // any new request of APN switch.
+                            return;
+                        }
+                    } catch (IOException e) {
+                        Timber.w("Attempt to extend use of MMS connectivity failed");
+                        return;
+                    }
+
+                    // Restart timer
+                    renewMmsConnectivity();
+                    return;
+
+                case EVENT_TRANSACTION_REQUEST:
+                    int serviceId = msg.arg1;
+                    try {
+                        TransactionBundle args = (TransactionBundle) msg.obj;
+                        TransactionSettings transactionSettings;
+
+                        Timber.v("EVENT_TRANSACTION_REQUEST MmscUrl=" +
+                                args.getMmscUrl() + " proxy port: " + args.getProxyAddress());
+
+                        // Set the connection settings for this transaction.
+                        // If these have not been set in args, load the default settings.
+                        String mmsc = args.getMmscUrl();
+                        if (mmsc != null) {
+                            transactionSettings = new TransactionSettings(
+                                    mmsc, args.getProxyAddress(), args.getProxyPort());
+                        } else {
+                            transactionSettings = new TransactionSettings(
+                                                    TransactionService.this, null);
+                        }
+
+                        int transactionType = args.getTransactionType();
+
+                        Timber.v("handle EVENT_TRANSACTION_REQUEST: transactionType=" +
+                                transactionType + " " + decodeTransactionType(transactionType));
+
+                        // Create appropriate transaction
+                        switch (transactionType) {
+                            case Transaction.NOTIFICATION_TRANSACTION:
+                                String uri = args.getUri();
+                                if (uri != null) {
+                                    transaction = new NotificationTransaction(
+                                            TransactionService.this, serviceId,
+                                            transactionSettings, uri);
+                                } else {
+                                    // Now it's only used for test purpose.
+                                    byte[] pushData = args.getPushData();
+                                    PduParser parser = new PduParser(pushData);
+                                    GenericPdu ind = parser.parse();
+
+                                    int type = PduHeaders.MESSAGE_TYPE_NOTIFICATION_IND;
+                                    if ((ind != null) && (ind.getMessageType() == type)) {
+                                        transaction = new NotificationTransaction(
+                                                TransactionService.this, serviceId,
+                                                transactionSettings, (NotificationInd) ind);
+                                    } else {
+                                        Timber.e("Invalid PUSH data.");
+                                        transaction = null;
+                                        return;
+                                    }
+                                }
+                                break;
+                            case Transaction.RETRIEVE_TRANSACTION:
+                                transaction = new RetrieveTransaction(
+                                        TransactionService.this, serviceId,
+                                        transactionSettings, args.getUri());
+
+                                Uri u = Uri.parse(args.getUri());
+                                com.android.mms.transaction.DownloadManager.getInstance().
+                                        downloadMultimediaMessage(TransactionService.this,
+                                                ((RetrieveTransaction) transaction).getContentLocation(TransactionService.this, u), u, false, Utils.getDefaultSubscriptionId());
+                                return;
+
+
+                        }
+
+                        if (!processTransaction(transaction)) {
+                            transaction = null;
+                            return;
+                        }
+
+                        Timber.v("Started processing of incoming message: " + msg);
+                    } catch (Exception ex) {
+                        Timber.w(ex, "Exception occurred while handling message: " + msg);
+
+                        if (transaction != null) {
+                            try {
+                                transaction.detach(TransactionService.this);
+                                if (mProcessing.contains(transaction)) {
+                                    synchronized (mProcessing) {
+                                        mProcessing.remove(transaction);
+                                    }
+                                }
+                            } catch (Throwable t) {
+                                Timber.e(t, "Unexpected Throwable.");
+                            } finally {
+                                // Set transaction to null to allow stopping the
+                                // transaction service.
+                                transaction = null;
+                            }
+                        }
+                    } finally {
+                        if (transaction == null) {
+                            Timber.v("Transaction was null. Stopping self: " + serviceId);
+                            endMmsConnectivity();
+                            stopSelf(serviceId);
+                        }
+                    }
+                    return;
+                case EVENT_HANDLE_NEXT_PENDING_TRANSACTION:
+                    processPendingTransaction(transaction, (TransactionSettings) msg.obj);
+                    return;
+                default:
+                    Timber.w("what=" + msg.what);
+                    return;
+            }
+        }
+
+        public void markAllPendingTransactionsAsFailed() {
+            synchronized (mProcessing) {
+                while (mPending.size() != 0) {
+                    Transaction transaction = mPending.remove(0);
+                    transaction.mTransactionState.setState(TransactionState.FAILED);
+                    if (transaction instanceof SendTransaction) {
+                        Uri uri = ((SendTransaction)transaction).mSendReqURI;
+                        transaction.mTransactionState.setContentUri(uri);
+                        int respStatus = PduHeaders.RESPONSE_STATUS_ERROR_NETWORK_PROBLEM;
+                        ContentValues values = new ContentValues(1);
+                        values.put(Mms.RESPONSE_STATUS, respStatus);
+
+                        SqliteWrapper.update(TransactionService.this,
+                                TransactionService.this.getContentResolver(),
+                                uri, values, null, null);
+                    }
+                    transaction.notifyObservers();
+                }
+            }
+        }
+
+        public void processPendingTransaction(Transaction transaction,
+                                               TransactionSettings settings) {
+
+            Timber.v("processPendingTxn: transaction=" + transaction);
+
+            int numProcessTransaction = 0;
+            synchronized (mProcessing) {
+                if (mPending.size() != 0) {
+                    transaction = mPending.remove(0);
+                }
+                numProcessTransaction = mProcessing.size();
+            }
+
+            if (transaction != null) {
+                if (settings != null) {
+                    transaction.setConnectionSettings(settings);
+                }
+
+                /*
+                 * Process deferred transaction
+                 */
+                try {
+                    int serviceId = transaction.getServiceId();
+
+                    Timber.v("processPendingTxn: process " + serviceId);
+
+                    if (processTransaction(transaction)) {
+                        Timber.v("Started deferred processing of transaction  " + transaction);
+                    } else {
+                        transaction = null;
+                        stopSelf(serviceId);
+                    }
+                } catch (IOException e) {
+                    Timber.w(e, e.getMessage());
+                }
+            } else {
+                if (numProcessTransaction == 0) {
+                    Timber.v("processPendingTxn: no more transaction, endMmsConnectivity");
+                    endMmsConnectivity();
+                }
+            }
+        }
+
+        /**
+         * Internal method to begin processing a transaction.
+         * @param transaction the transaction. Must not be {@code null}.
+         * @return {@code true} if process has begun or will begin. {@code false}
+         * if the transaction should be discarded.
+         * @throws java.io.IOException if connectivity for MMS traffic could not be
+         * established.
+         */
+        private boolean processTransaction(Transaction transaction) throws IOException {
+            // Check if transaction already processing
+            synchronized (mProcessing) {
+                for (Transaction t : mPending) {
+                    if (t.isEquivalent(transaction)) {
+                        Timber.v("Transaction already pending: " + transaction.getServiceId());
+                        return true;
+                    }
+                }
+                for (Transaction t : mProcessing) {
+                    if (t.isEquivalent(transaction)) {
+                        Timber.v("Duplicated transaction: " + transaction.getServiceId());
+                        return true;
+                    }
+                }
+
+                /*
+                * Make sure that the network connectivity necessary
+                * for MMS traffic is enabled. If it is not, we need
+                * to defer processing the transaction until
+                * connectivity is established.
+                */
+                Timber.v("processTransaction: call beginMmsConnectivity...");
+                int connectivityResult = beginMmsConnectivity();
+                if (connectivityResult == 1) {
+                    mPending.add(transaction);
+                    Timber.v("processTransaction: connResult=APN_REQUEST_STARTED, " +
+                            "defer transaction pending MMS connectivity");
+                    return true;
+                }
+                // If there is already a transaction in processing list, because of the previous
+                // beginMmsConnectivity call and there is another transaction just at a time,
+                // when the pdp is connected, there will be a case of adding the new transaction
+                // to the Processing list. But Processing list is never traversed to
+                // resend, resulting in transaction not completed/sent.
+                if (mProcessing.size() > 0) {
+                    Timber.v("Adding transaction to 'mPending' list: " + transaction);
+                    mPending.add(transaction);
+                    return true;
+                } else {
+                    Timber.v("Adding transaction to 'mProcessing' list: " + transaction);
+                    mProcessing.add(transaction);
+               }
+            }
+
+            // Set a timer to keep renewing our "lease" on the MMS connection
+            sendMessageDelayed(obtainMessage(EVENT_CONTINUE_MMS_CONNECTIVITY), APN_EXTENSION_WAIT);
+
+            Timber.v("processTransaction: starting transaction " + transaction);
+
+            // Attach to transaction and process it
+            transaction.attach(TransactionService.this);
+            transaction.process();
+            return true;
+        }
+    }
+
+    private void renewMmsConnectivity() {
+        // Set a timer to keep renewing our "lease" on the MMS connection
+        mServiceHandler.sendMessageDelayed(
+                mServiceHandler.obtainMessage(EVENT_CONTINUE_MMS_CONNECTIVITY),
+                           APN_EXTENSION_WAIT);
+    }
+
+    private class ConnectivityBroadcastReceiver extends BroadcastReceiver {
+        @Override
+        public void onReceive(Context context, Intent intent) {
+            String action = intent.getAction();
+            Timber.w("ConnectivityBroadcastReceiver.onReceive() action: " + action);
+
+            if (!action.equals(ConnectivityManager.CONNECTIVITY_ACTION)) {
+                return;
+            }
+
+            NetworkInfo mmsNetworkInfo = null;
+
+            if (mConnMgr != null && Utils.isMobileDataEnabled(context)) {
+                mmsNetworkInfo = mConnMgr.getNetworkInfo(ConnectivityManager.TYPE_MOBILE_MMS);
+            } else {
+                Timber.v("mConnMgr is null, bail");
+            }
+
+            /*
+             * If we are being informed that connectivity has been established
+             * to allow MMS traffic, then proceed with processing the pending
+             * transaction, if any.
+             */
+
+            Timber.v("Handle ConnectivityBroadcastReceiver.onReceive(): " + mmsNetworkInfo);
+
+            // Check availability of the mobile network.
+            if (mmsNetworkInfo == null) {
+                Timber.v("mms type is null or mobile data is turned off, bail");
+            } else {
+                // This is a very specific fix to handle the case where the phone receives an
+                // incoming call during the time we're trying to setup the mms connection.
+                // When the call ends, restart the process of mms connectivity.
+                if ("2GVoiceCallEnded".equals(mmsNetworkInfo.getReason())) {
+                    Timber.v("   reason is " + "2GVoiceCallEnded" + ", retrying mms connectivity");
+                    renewMmsConnectivity();
+                    return;
+                }
+
+                if (mmsNetworkInfo.isConnected()) {
+                    TransactionSettings settings = new TransactionSettings(
+                            TransactionService.this, mmsNetworkInfo.getExtraInfo());
+                    // If this APN doesn't have an MMSC, mark everything as failed and bail.
+                    if (TextUtils.isEmpty(settings.getMmscUrl())) {
+                        Timber.v("   empty MMSC url, bail");
+                        BroadcastUtils.sendExplicitBroadcast(
+                                TransactionService.this,
+                                new Intent(),
+                                com.klinker.android.send_message.Transaction.MMS_ERROR);
+                        mServiceHandler.markAllPendingTransactionsAsFailed();
+                        endMmsConnectivity();
+                        stopSelf();
+                        return;
+                    }
+                    mServiceHandler.processPendingTransaction(null, settings);
+                } else {
+                    Timber.v("   TYPE_MOBILE_MMS not connected, bail");
+
+                    // Retry mms connectivity once it's possible to connect
+                    if (mmsNetworkInfo.isAvailable()) {
+                        Timber.v("   retrying mms connectivity for it's available");
+                        renewMmsConnectivity();
+                    }
+                }
+            }
+        }
+    }
+}
diff --git a/android-smsmms/src/main/java/com/android/mms/transaction/TransactionSettings.java b/android-smsmms/src/main/java/com/android/mms/transaction/TransactionSettings.java
index 242fb417d..334d10479 100755
--- a/android-smsmms/src/main/java/com/android/mms/transaction/TransactionSettings.java
+++ b/android-smsmms/src/main/java/com/android/mms/transaction/TransactionSettings.java
@@ -1,202 +1,202 @@
-/*
- * Copyright 2014 Jacob Klinker
- *
- * Licensed under the Apache License, Version 2.0 (the "License");
- * you may not use this file except in compliance with the License.
- * You may obtain a copy of the License at
- *
- *     http://www.apache.org/licenses/LICENSE-2.0
- *
- * Unless required by applicable law or agreed to in writing, software
- * distributed under the License is distributed on an "AS IS" BASIS,
- * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
- * See the License for the specific language governing permissions and
- * limitations under the License.
- */
-
-package com.android.mms.transaction;
-
-import android.content.Context;
-import android.net.NetworkUtilsHelper;
-import android.provider.Telephony;
-import android.text.TextUtils;
-import com.android.mms.MmsConfig;
-import com.klinker.android.send_message.Transaction;
-import com.klinker.android.send_message.Utils;
-import timber.log.Timber;
-
-/**
- * Container of transaction settings. Instances of this class are contained
- * within Transaction instances to allow overriding of the default APN
- * settings or of the MMS Client.
- */
-public class TransactionSettings {
-    private String mServiceCenter;
-    private String mProxyAddress;
-    private int mProxyPort = -1;
-
-    private static final String[] APN_PROJECTION = {
-            Telephony.Carriers.TYPE,            // 0
-            Telephony.Carriers.MMSC,            // 1
-            Telephony.Carriers.MMSPROXY,        // 2
-            Telephony.Carriers.MMSPORT          // 3
-    };
-    private static final int COLUMN_TYPE         = 0;
-    private static final int COLUMN_MMSC         = 1;
-    private static final int COLUMN_MMSPROXY     = 2;
-    private static final int COLUMN_MMSPORT      = 3;
-
-    /**
-     * Constructor that uses the default settings of the MMS Client.
-     *
-     * @param context The context of the MMS Client
-     */
-    public TransactionSettings(Context context, String apnName) {
-        Timber.v("TransactionSettings: apnName: " + apnName);
-//        String selection = "current" + " IS NOT NULL";
-//        String[] selectionArgs = null;
-//        if (!TextUtils.isEmpty(apnName)) {
-//            selection += " AND " + "apn" + "=?";
-//            selectionArgs = new String[]{ apnName.trim() };
-//        }
-//
-//        Cursor cursor;
-//
-//        try {
-//            cursor = SqliteWrapper.query(context, context.getContentResolver(),
-//                                Telephony.Carriers.CONTENT_URI,
-//                                APN_PROJECTION, selection, selectionArgs, null);
-//
-//                Timber.v("TransactionSettings looking for apn: " + selection + " returned: " +
-//                        (cursor == null ? "null cursor" : (cursor.getCount() + " hits")));
-//        } catch (SecurityException e) {
-//            Timber.e(e, "exception thrown");
-//            cursor = null;
-//        }
-//
-//        if (cursor == null) {
-//            Timber.e("Apn is not found in Database!");
-        if (Transaction.Companion.getSettings() == null) {
-            Transaction.Companion.setSettings(Utils.getDefaultSendSettings(context));
-        }
-
-        mServiceCenter = NetworkUtilsHelper.trimV4AddrZeros(Transaction.Companion.getSettings().getMmsc());
-        mProxyAddress = NetworkUtilsHelper.trimV4AddrZeros(Transaction.Companion.getSettings().getProxy());
-
-        // Set up the agent, profile url and tag name to be used in the mms request if they are attached in settings
-        String agent = Transaction.Companion.getSettings().getAgent();
-        if (agent != null && !agent.trim().equals("")) {
-            MmsConfig.setUserAgent(agent);
-            Timber.v("set user agent");
-        }
-
-        String uaProfUrl = Transaction.Companion.getSettings().getUserProfileUrl();
-        if (uaProfUrl != null && !uaProfUrl.trim().equals("")) {
-            MmsConfig.setUaProfUrl(uaProfUrl);
-            Timber.v("set user agent profile url");
-        }
-
-        String uaProfTagName = Transaction.Companion.getSettings().getUaProfTagName();
-        if (uaProfTagName != null && !uaProfTagName.trim().equals("")) {
-            MmsConfig.setUaProfTagName(uaProfTagName);
-            Timber.v("set user agent profile tag name");
-        }
-
-        if (isProxySet()) {
-            try {
-                mProxyPort = Integer.parseInt(Transaction.Companion.getSettings().getPort());
-            } catch (NumberFormatException e) {
-                Timber.e(e, "could not get proxy: " + Transaction.Companion.getSettings().getPort());
-            }
-        }
-//        }
-
-//        boolean sawValidApn = false;
-//        try {
-//            while (cursor.moveToNext() && TextUtils.isEmpty(mServiceCenter)) {
-//                // Read values from APN settings
-//                if (isValidApnType(cursor.getString(COLUMN_TYPE), "mms")) {
-//                    sawValidApn = true;
-//
-//                    String mmsc = cursor.getString(COLUMN_MMSC);
-//                    if (mmsc == null) {
-//                        continue;
-//                    }
-//
-//                    mServiceCenter = NetworkUtils.trimV4AddrZeros(mmsc.trim());
-//                    mProxyAddress = NetworkUtils.trimV4AddrZeros(
-//                            cursor.getString(COLUMN_MMSPROXY));
-//                    if (isProxySet()) {
-//                        String portString = cursor.getString(COLUMN_MMSPORT);
-//                        try {
-//                            mProxyPort = Integer.parseInt(portString);
-//                        } catch (NumberFormatException e) {
-//                            if (TextUtils.isEmpty(portString)) {
-//                                Timber.w("mms port not set!");
-//                            } else {
-//                                Timber.e(e, "Bad port number format: " + portString);
-//                            }
-//                        }
-//                    }
-//                }
-//            }
-//        } finally {
-//            cursor.close();
-//        }
-//
-//        Timber.v("APN setting: MMSC: " + mServiceCenter + " looked for: " + selection);
-//
-//        if (sawValidApn && TextUtils.isEmpty(mServiceCenter)) {
-//            Timber.e("Invalid APN setting: MMSC is empty");
-//        }
-    }
-
-    /**
-     * Constructor that overrides the default settings of the MMS Client.
-     *
-     * @param mmscUrl The MMSC URL
-     * @param proxyAddr The proxy address
-     * @param proxyPort The port used by the proxy address
-     * immediately start a SendTransaction upon completion of a NotificationTransaction,
-     * false otherwise.
-     */
-    public TransactionSettings(String mmscUrl, String proxyAddr, int proxyPort) {
-        mServiceCenter = mmscUrl != null ? mmscUrl.trim() : null;
-        mProxyAddress = proxyAddr;
-        mProxyPort = proxyPort;
-
-            Timber.v("TransactionSettings: " + mServiceCenter
-                    + " proxyAddress: " + mProxyAddress
-                    + " proxyPort: " + mProxyPort);
-   }
-
-    public String getMmscUrl() {
-        return mServiceCenter;
-    }
-
-    public String getProxyAddress() {
-        return mProxyAddress;
-    }
-
-    public int getProxyPort() {
-        return mProxyPort;
-    }
-
-    public boolean isProxySet() {
-        return (mProxyAddress != null) && (mProxyAddress.trim().length() != 0);
-    }
-
-    static private boolean isValidApnType(String types, String requestType) {
-        // If APN type is unspecified, assume APN_TYPE_ALL.
-        if (TextUtils.isEmpty(types)) {
-            return true;
-        }
-
-        for (String t : types.split(",")) {
-            if (t.equals(requestType) || t.equals("*")) {
-                return true;
-            }
-        }
-        return false;
-    }
-}
+/*
+ * Copyright 2014 Jacob Klinker
+ *
+ * Licensed under the Apache License, Version 2.0 (the "License");
+ * you may not use this file except in compliance with the License.
+ * You may obtain a copy of the License at
+ *
+ *     http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing, software
+ * distributed under the License is distributed on an "AS IS" BASIS,
+ * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ * See the License for the specific language governing permissions and
+ * limitations under the License.
+ */
+
+package com.android.mms.transaction;
+
+import android.content.Context;
+import android.net.NetworkUtilsHelper;
+import android.provider.Telephony;
+import android.text.TextUtils;
+import com.android.mms.MmsConfig;
+import com.klinker.android.send_message.Transaction;
+import com.klinker.android.send_message.Utils;
+import timber.log.Timber;
+
+/**
+ * Container of transaction settings. Instances of this class are contained
+ * within Transaction instances to allow overriding of the default APN
+ * settings or of the MMS Client.
+ */
+public class TransactionSettings {
+    private String mServiceCenter;
+    private String mProxyAddress;
+    private int mProxyPort = -1;
+
+    private static final String[] APN_PROJECTION = {
+            Telephony.Carriers.TYPE,            // 0
+            Telephony.Carriers.MMSC,            // 1
+            Telephony.Carriers.MMSPROXY,        // 2
+            Telephony.Carriers.MMSPORT          // 3
+    };
+    private static final int COLUMN_TYPE         = 0;
+    private static final int COLUMN_MMSC         = 1;
+    private static final int COLUMN_MMSPROXY     = 2;
+    private static final int COLUMN_MMSPORT      = 3;
+
+    /**
+     * Constructor that uses the default settings of the MMS Client.
+     *
+     * @param context The context of the MMS Client
+     */
+    public TransactionSettings(Context context, String apnName) {
+        Timber.v("TransactionSettings: apnName: " + apnName);
+//        String selection = "current" + " IS NOT NULL";
+//        String[] selectionArgs = null;
+//        if (!TextUtils.isEmpty(apnName)) {
+//            selection += " AND " + "apn" + "=?";
+//            selectionArgs = new String[]{ apnName.trim() };
+//        }
+//
+//        Cursor cursor;
+//
+//        try {
+//            cursor = SqliteWrapper.query(context, context.getContentResolver(),
+//                                Telephony.Carriers.CONTENT_URI,
+//                                APN_PROJECTION, selection, selectionArgs, null);
+//
+//                Timber.v("TransactionSettings looking for apn: " + selection + " returned: " +
+//                        (cursor == null ? "null cursor" : (cursor.getCount() + " hits")));
+//        } catch (SecurityException e) {
+//            Timber.e(e, "exception thrown");
+//            cursor = null;
+//        }
+//
+//        if (cursor == null) {
+//            Timber.e("Apn is not found in Database!");
+        if (Transaction.Companion.getSettings() == null) {
+            Transaction.Companion.setSettings(Utils.getDefaultSendSettings(context));
+        }
+
+        mServiceCenter = NetworkUtilsHelper.trimV4AddrZeros(Transaction.Companion.getSettings().getMmsc());
+        mProxyAddress = NetworkUtilsHelper.trimV4AddrZeros(Transaction.Companion.getSettings().getProxy());
+
+        // Set up the agent, profile url and tag name to be used in the mms request if they are attached in settings
+        String agent = Transaction.Companion.getSettings().getAgent();
+        if (agent != null && !agent.trim().equals("")) {
+            MmsConfig.setUserAgent(agent);
+            Timber.v("set user agent");
+        }
+
+        String uaProfUrl = Transaction.Companion.getSettings().getUserProfileUrl();
+        if (uaProfUrl != null && !uaProfUrl.trim().equals("")) {
+            MmsConfig.setUaProfUrl(uaProfUrl);
+            Timber.v("set user agent profile url");
+        }
+
+        String uaProfTagName = Transaction.Companion.getSettings().getUaProfTagName();
+        if (uaProfTagName != null && !uaProfTagName.trim().equals("")) {
+            MmsConfig.setUaProfTagName(uaProfTagName);
+            Timber.v("set user agent profile tag name");
+        }
+
+        if (isProxySet()) {
+            try {
+                mProxyPort = Integer.parseInt(Transaction.Companion.getSettings().getPort());
+            } catch (NumberFormatException e) {
+                Timber.e(e, "could not get proxy: " + Transaction.Companion.getSettings().getPort());
+            }
+        }
+//        }
+
+//        boolean sawValidApn = false;
+//        try {
+//            while (cursor.moveToNext() && TextUtils.isEmpty(mServiceCenter)) {
+//                // Read values from APN settings
+//                if (isValidApnType(cursor.getString(COLUMN_TYPE), "mms")) {
+//                    sawValidApn = true;
+//
+//                    String mmsc = cursor.getString(COLUMN_MMSC);
+//                    if (mmsc == null) {
+//                        continue;
+//                    }
+//
+//                    mServiceCenter = NetworkUtils.trimV4AddrZeros(mmsc.trim());
+//                    mProxyAddress = NetworkUtils.trimV4AddrZeros(
+//                            cursor.getString(COLUMN_MMSPROXY));
+//                    if (isProxySet()) {
+//                        String portString = cursor.getString(COLUMN_MMSPORT);
+//                        try {
+//                            mProxyPort = Integer.parseInt(portString);
+//                        } catch (NumberFormatException e) {
+//                            if (TextUtils.isEmpty(portString)) {
+//                                Timber.w("mms port not set!");
+//                            } else {
+//                                Timber.e(e, "Bad port number format: " + portString);
+//                            }
+//                        }
+//                    }
+//                }
+//            }
+//        } finally {
+//            cursor.close();
+//        }
+//
+//        Timber.v("APN setting: MMSC: " + mServiceCenter + " looked for: " + selection);
+//
+//        if (sawValidApn && TextUtils.isEmpty(mServiceCenter)) {
+//            Timber.e("Invalid APN setting: MMSC is empty");
+//        }
+    }
+
+    /**
+     * Constructor that overrides the default settings of the MMS Client.
+     *
+     * @param mmscUrl The MMSC URL
+     * @param proxyAddr The proxy address
+     * @param proxyPort The port used by the proxy address
+     * immediately start a SendTransaction upon completion of a NotificationTransaction,
+     * false otherwise.
+     */
+    public TransactionSettings(String mmscUrl, String proxyAddr, int proxyPort) {
+        mServiceCenter = mmscUrl != null ? mmscUrl.trim() : null;
+        mProxyAddress = proxyAddr;
+        mProxyPort = proxyPort;
+
+            Timber.v("TransactionSettings: " + mServiceCenter
+                    + " proxyAddress: " + mProxyAddress
+                    + " proxyPort: " + mProxyPort);
+   }
+
+    public String getMmscUrl() {
+        return mServiceCenter;
+    }
+
+    public String getProxyAddress() {
+        return mProxyAddress;
+    }
+
+    public int getProxyPort() {
+        return mProxyPort;
+    }
+
+    public boolean isProxySet() {
+        return (mProxyAddress != null) && (mProxyAddress.trim().length() != 0);
+    }
+
+    static private boolean isValidApnType(String types, String requestType) {
+        // If APN type is unspecified, assume APN_TYPE_ALL.
+        if (TextUtils.isEmpty(types)) {
+            return true;
+        }
+
+        for (String t : types.split(",")) {
+            if (t.equals(requestType) || t.equals("*")) {
+                return true;
+            }
+        }
+        return false;
+    }
+}
diff --git a/android-smsmms/src/main/java/com/android/mms/transaction/TransactionState.java b/android-smsmms/src/main/java/com/android/mms/transaction/TransactionState.java
index ff42d1d92..f2bafd0b8 100755
--- a/android-smsmms/src/main/java/com/android/mms/transaction/TransactionState.java
+++ b/android-smsmms/src/main/java/com/android/mms/transaction/TransactionState.java
@@ -1,89 +1,89 @@
-/*
- * Copyright (C) 2007 Esmertec AG.
- * Copyright (C) 2007 The Android Open Source Project
- *
- * Licensed under the Apache License, Version 2.0 (the "License");
- * you may not use this file except in compliance with the License.
- * You may obtain a copy of the License at
- *
- *      http://www.apache.org/licenses/LICENSE-2.0
- *
- * Unless required by applicable law or agreed to in writing, software
- * distributed under the License is distributed on an "AS IS" BASIS,
- * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
- * See the License for the specific language governing permissions and
- * limitations under the License.
- */
-
-package com.android.mms.transaction;
-
-import android.net.Uri;
-
-/**
- * TransactionState intends to encapsulate all the informations which would
- * be known by the observers of transactions. To encapsulate Transaction-
- * State into an intent, it should implement Parcelable interface.
- */
-public class TransactionState {
-    /**
-     * Result code indicates the Transaction has not started.
-     */
-    public static final int INITIALIZED = 0;
-    /**
-     * Result code indicates the Transaction successfully complete.
-     */
-    public static final int SUCCESS = 1;
-    /**
-     * Result code indicates the Transaction failed.
-     */
-    public static final int FAILED  = 2;
-
-    private Uri mContentUri;
-    private int mState;
-
-    public TransactionState() {
-        mState = INITIALIZED;
-        mContentUri = null;
-    }
-
-    /**
-     * To represent the current state(or the result of processing) to the
-     * ones who wants to know the state.
-     *
-     * @return Current state of the Transaction.
-     */
-    public synchronized int getState() {
-        return mState;
-    }
-
-    /**
-     * To set the state of transaction. This method is only invoked by
-     * the transactions.
-     *
-     * @param state The current state of transaction.
-     */
-    synchronized void setState(int state) {
-        if ((state < INITIALIZED) && (state > FAILED)) {
-            throw new IllegalArgumentException("Bad state: " + state);
-        }
-        mState = state;
-    }
-
-    /**
-     * To represent the result uri of transaction such as uri of MM.
-     *
-     * @return Result uri.
-     */
-    public synchronized Uri getContentUri() {
-        return mContentUri;
-    }
-
-    /**
-     * To set the result uri. This method is only invoked by the transactions.
-     *
-     * @param uri The result uri.
-     */
-    synchronized void setContentUri(Uri uri) {
-        mContentUri = uri;
-    }
-}
+/*
+ * Copyright (C) 2007 Esmertec AG.
+ * Copyright (C) 2007 The Android Open Source Project
+ *
+ * Licensed under the Apache License, Version 2.0 (the "License");
+ * you may not use this file except in compliance with the License.
+ * You may obtain a copy of the License at
+ *
+ *      http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing, software
+ * distributed under the License is distributed on an "AS IS" BASIS,
+ * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ * See the License for the specific language governing permissions and
+ * limitations under the License.
+ */
+
+package com.android.mms.transaction;
+
+import android.net.Uri;
+
+/**
+ * TransactionState intends to encapsulate all the informations which would
+ * be known by the observers of transactions. To encapsulate Transaction-
+ * State into an intent, it should implement Parcelable interface.
+ */
+public class TransactionState {
+    /**
+     * Result code indicates the Transaction has not started.
+     */
+    public static final int INITIALIZED = 0;
+    /**
+     * Result code indicates the Transaction successfully complete.
+     */
+    public static final int SUCCESS = 1;
+    /**
+     * Result code indicates the Transaction failed.
+     */
+    public static final int FAILED  = 2;
+
+    private Uri mContentUri;
+    private int mState;
+
+    public TransactionState() {
+        mState = INITIALIZED;
+        mContentUri = null;
+    }
+
+    /**
+     * To represent the current state(or the result of processing) to the
+     * ones who wants to know the state.
+     *
+     * @return Current state of the Transaction.
+     */
+    public synchronized int getState() {
+        return mState;
+    }
+
+    /**
+     * To set the state of transaction. This method is only invoked by
+     * the transactions.
+     *
+     * @param state The current state of transaction.
+     */
+    synchronized void setState(int state) {
+        if ((state < INITIALIZED) && (state > FAILED)) {
+            throw new IllegalArgumentException("Bad state: " + state);
+        }
+        mState = state;
+    }
+
+    /**
+     * To represent the result uri of transaction such as uri of MM.
+     *
+     * @return Result uri.
+     */
+    public synchronized Uri getContentUri() {
+        return mContentUri;
+    }
+
+    /**
+     * To set the result uri. This method is only invoked by the transactions.
+     *
+     * @param uri The result uri.
+     */
+    synchronized void setContentUri(Uri uri) {
+        mContentUri = uri;
+    }
+}
diff --git a/android-smsmms/src/main/java/com/android/mms/util/DownloadManager.java b/android-smsmms/src/main/java/com/android/mms/util/DownloadManager.java
index af793abff..fcc119f57 100755
--- a/android-smsmms/src/main/java/com/android/mms/util/DownloadManager.java
+++ b/android-smsmms/src/main/java/com/android/mms/util/DownloadManager.java
@@ -1,216 +1,216 @@
-/*
- * Copyright 2014 Jacob Klinker
- *
- * Licensed under the Apache License, Version 2.0 (the "License");
- * you may not use this file except in compliance with the License.
- * You may obtain a copy of the License at
- *
- *     http://www.apache.org/licenses/LICENSE-2.0
- *
- * Unless required by applicable law or agreed to in writing, software
- * distributed under the License is distributed on an "AS IS" BASIS,
- * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
- * See the License for the specific language governing permissions and
- * limitations under the License.
- */
-
-package com.android.mms.util;
-
-import android.content.ContentValues;
-import android.content.Context;
-import android.content.SharedPreferences;
-import android.database.Cursor;
-import android.database.sqlite.SqliteWrapper;
-import android.net.Uri;
-import android.os.Handler;
-import android.os.Looper;
-import android.preference.PreferenceManager;
-import android.provider.Telephony.Mms;
-import android.widget.Toast;
-import com.android.internal.telephony.TelephonyProperties;
-import com.android.mms.service_alt.SystemPropertiesProxy;
-import com.google.android.mms.MmsException;
-import com.google.android.mms.pdu_alt.EncodedStringValue;
-import com.google.android.mms.pdu_alt.NotificationInd;
-import com.google.android.mms.pdu_alt.PduPersister;
-import com.klinker.android.send_message.R;
-import timber.log.Timber;
-
-public class DownloadManager {
-    private static final boolean LOCAL_LOGV = false;
-
-    public static final int DEFERRED_MASK           = 0x04;
-
-    public static final int STATE_UNKNOWN           = 0x00;
-    public static final int STATE_UNSTARTED         = 0x80;
-    public static final int STATE_DOWNLOADING       = 0x81;
-    public static final int STATE_TRANSIENT_FAILURE = 0x82;
-    public static final int STATE_PERMANENT_FAILURE = 0x87;
-    public static final int STATE_PRE_DOWNLOADING   = 0x88;
-    // TransactionService will skip downloading Mms if auto-download is off
-    public static final int STATE_SKIP_RETRYING     = 0x89;
-
-    private final Context mContext;
-    private final Handler mHandler;
-    private final SharedPreferences mPreferences;
-    private boolean mAutoDownload;
-
-    private static DownloadManager sInstance;
-
-    private DownloadManager(Context context) {
-        mContext = context;
-        mHandler = new Handler(Looper.getMainLooper());
-        mPreferences = PreferenceManager.getDefaultSharedPreferences(context);
-
-        mAutoDownload = getAutoDownloadState(context, mPreferences);
-        if (LOCAL_LOGV) {
-            Timber.v("mAutoDownload ------> " + mAutoDownload);
-        }
-    }
-
-    public boolean isAuto() {
-        return mAutoDownload;
-    }
-
-    public static void init(Context context) {
-        if (LOCAL_LOGV) {
-            Timber.v("DownloadManager.init()");
-        }
-
-        if (sInstance != null) {
-            Timber.w("Already initialized.");
-        }
-        sInstance = new DownloadManager(context);
-    }
-
-    public static DownloadManager getInstance() {
-        if (sInstance == null) {
-            throw new IllegalStateException("Uninitialized.");
-        }
-        return sInstance;
-    }
-
-    static boolean getAutoDownloadState(Context context, SharedPreferences prefs) {
-        return getAutoDownloadState(prefs, isRoaming(context));
-    }
-
-    static boolean getAutoDownloadState(SharedPreferences prefs, boolean roaming) {
-        boolean autoDownload = prefs.getBoolean("auto_download_mms", true);
-
-        if (LOCAL_LOGV) {
-            Timber.v("auto download without roaming -> " + autoDownload);
-        }
-
-        if (autoDownload) {
-            boolean alwaysAuto = true;
-
-            if (LOCAL_LOGV) {
-                Timber.v("auto download during roaming -> " + alwaysAuto);
-            }
-
-            if (!roaming || alwaysAuto) {
-                return true;
-            }
-        }
-        return false;
-    }
-
-    static boolean isRoaming(Context context) {
-        // TODO: fix and put in Telephony layer
-        String roaming = SystemPropertiesProxy.get(context,
-                TelephonyProperties.PROPERTY_OPERATOR_ISROAMING, null);
-        if (LOCAL_LOGV) {
-            Timber.v("roaming ------> " + roaming);
-        }
-        return "true".equals(roaming);
-    }
-
-    public void markState(final Uri uri, int state) {
-        // Notify user if the message has expired.
-        try {
-            NotificationInd nInd = (NotificationInd) PduPersister.getPduPersister(mContext)
-                    .load(uri);
-            if ((nInd.getExpiry() < System.currentTimeMillis() / 1000L)
-                    && (state == STATE_DOWNLOADING || state == STATE_PRE_DOWNLOADING)) {
-                mHandler.post(new Runnable() {
-                    public void run() {
-                        Toast.makeText(mContext, R.string.service_message_not_found,
-                                Toast.LENGTH_LONG).show();
-                    }
-                });
-                SqliteWrapper.delete(mContext, mContext.getContentResolver(), uri, null, null);
-                return;
-            }
-        } catch(MmsException e) {
-            Timber.e(e, e.getMessage());
-            return;
-        }
-
-        // Notify user if downloading permanently failed.
-        if (state == STATE_PERMANENT_FAILURE) {
-            mHandler.post(new Runnable() {
-                public void run() {
-                    try {
-                        Toast.makeText(mContext, getMessage(uri),
-                                Toast.LENGTH_LONG).show();
-                    } catch (MmsException e) {
-                        Timber.e(e, e.getMessage());
-                    }
-                }
-            });
-        } else if (!mAutoDownload) {
-            state |= DEFERRED_MASK;
-        }
-
-        // Use the STATUS field to store the state of downloading process
-        // because it's useless for M-Notification.ind.
-        ContentValues values = new ContentValues(1);
-        values.put(Mms.STATUS, state);
-        SqliteWrapper.update(mContext, mContext.getContentResolver(),
-                    uri, values, null, null);
-    }
-
-    public void showErrorCodeToast(int errorStr) {
-        final int errStr = errorStr;
-        mHandler.post(new Runnable() {
-            public void run() {
-                try {
-                    Toast.makeText(mContext, errStr, Toast.LENGTH_LONG).show();
-                } catch (Exception e) {
-                    Timber.e("Caught an exception in showErrorCodeToast");
-                }
-            }
-        });
-    }
-
-    private String getMessage(Uri uri) throws MmsException {
-        NotificationInd ind = (NotificationInd) PduPersister
-                .getPduPersister(mContext).load(uri);
-
-        EncodedStringValue v = ind.getSubject();
-        String subject = (v != null) ? v.getString()
-                : mContext.getString(R.string.no_subject);
-
-        String from = mContext.getString(R.string.unknown_sender);
-
-        return mContext.getString(R.string.dl_failure_notification, subject, from);
-    }
-
-    public int getState(Uri uri) {
-        Cursor cursor = SqliteWrapper.query(mContext, mContext.getContentResolver(),
-                            uri, new String[] {Mms.STATUS}, null, null, null);
-
-        if (cursor != null) {
-            try {
-                if (cursor.moveToFirst()) {
-                    int state = cursor.getInt(0) & ~DEFERRED_MASK;
-                    cursor.close();
-                    return state;
-                }
-            } finally {
-                cursor.close();
-            }
-        }
-        return STATE_UNSTARTED;
-    }
-}
+/*
+ * Copyright 2014 Jacob Klinker
+ *
+ * Licensed under the Apache License, Version 2.0 (the "License");
+ * you may not use this file except in compliance with the License.
+ * You may obtain a copy of the License at
+ *
+ *     http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing, software
+ * distributed under the License is distributed on an "AS IS" BASIS,
+ * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ * See the License for the specific language governing permissions and
+ * limitations under the License.
+ */
+
+package com.android.mms.util;
+
+import android.content.ContentValues;
+import android.content.Context;
+import android.content.SharedPreferences;
+import android.database.Cursor;
+import android.database.sqlite.SqliteWrapper;
+import android.net.Uri;
+import android.os.Handler;
+import android.os.Looper;
+import android.preference.PreferenceManager;
+import android.provider.Telephony.Mms;
+import android.widget.Toast;
+import com.android.internal.telephony.TelephonyProperties;
+import com.android.mms.service_alt.SystemPropertiesProxy;
+import com.google.android.mms.MmsException;
+import com.google.android.mms.pdu_alt.EncodedStringValue;
+import com.google.android.mms.pdu_alt.NotificationInd;
+import com.google.android.mms.pdu_alt.PduPersister;
+import com.klinker.android.send_message.R;
+import timber.log.Timber;
+
+public class DownloadManager {
+    private static final boolean LOCAL_LOGV = false;
+
+    public static final int DEFERRED_MASK           = 0x04;
+
+    public static final int STATE_UNKNOWN           = 0x00;
+    public static final int STATE_UNSTARTED         = 0x80;
+    public static final int STATE_DOWNLOADING       = 0x81;
+    public static final int STATE_TRANSIENT_FAILURE = 0x82;
+    public static final int STATE_PERMANENT_FAILURE = 0x87;
+    public static final int STATE_PRE_DOWNLOADING   = 0x88;
+    // TransactionService will skip downloading Mms if auto-download is off
+    public static final int STATE_SKIP_RETRYING     = 0x89;
+
+    private final Context mContext;
+    private final Handler mHandler;
+    private final SharedPreferences mPreferences;
+    private boolean mAutoDownload;
+
+    private static DownloadManager sInstance;
+
+    private DownloadManager(Context context) {
+        mContext = context;
+        mHandler = new Handler(Looper.getMainLooper());
+        mPreferences = PreferenceManager.getDefaultSharedPreferences(context);
+
+        mAutoDownload = getAutoDownloadState(context, mPreferences);
+        if (LOCAL_LOGV) {
+            Timber.v("mAutoDownload ------> " + mAutoDownload);
+        }
+    }
+
+    public boolean isAuto() {
+        return mAutoDownload;
+    }
+
+    public static void init(Context context) {
+        if (LOCAL_LOGV) {
+            Timber.v("DownloadManager.init()");
+        }
+
+        if (sInstance != null) {
+            Timber.w("Already initialized.");
+        }
+        sInstance = new DownloadManager(context);
+    }
+
+    public static DownloadManager getInstance() {
+        if (sInstance == null) {
+            throw new IllegalStateException("Uninitialized.");
+        }
+        return sInstance;
+    }
+
+    static boolean getAutoDownloadState(Context context, SharedPreferences prefs) {
+        return getAutoDownloadState(prefs, isRoaming(context));
+    }
+
+    static boolean getAutoDownloadState(SharedPreferences prefs, boolean roaming) {
+        boolean autoDownload = prefs.getBoolean("auto_download_mms", true);
+
+        if (LOCAL_LOGV) {
+            Timber.v("auto download without roaming -> " + autoDownload);
+        }
+
+        if (autoDownload) {
+            boolean alwaysAuto = true;
+
+            if (LOCAL_LOGV) {
+                Timber.v("auto download during roaming -> " + alwaysAuto);
+            }
+
+            if (!roaming || alwaysAuto) {
+                return true;
+            }
+        }
+        return false;
+    }
+
+    static boolean isRoaming(Context context) {
+        // TODO: fix and put in Telephony layer
+        String roaming = SystemPropertiesProxy.get(context,
+                TelephonyProperties.PROPERTY_OPERATOR_ISROAMING, null);
+        if (LOCAL_LOGV) {
+            Timber.v("roaming ------> " + roaming);
+        }
+        return "true".equals(roaming);
+    }
+
+    public void markState(final Uri uri, int state) {
+        // Notify user if the message has expired.
+        try {
+            NotificationInd nInd = (NotificationInd) PduPersister.getPduPersister(mContext)
+                    .load(uri);
+            if ((nInd.getExpiry() < System.currentTimeMillis() / 1000L)
+                    && (state == STATE_DOWNLOADING || state == STATE_PRE_DOWNLOADING)) {
+                mHandler.post(new Runnable() {
+                    public void run() {
+                        Toast.makeText(mContext, R.string.service_message_not_found,
+                                Toast.LENGTH_LONG).show();
+                    }
+                });
+                SqliteWrapper.delete(mContext, mContext.getContentResolver(), uri, null, null);
+                return;
+            }
+        } catch(MmsException e) {
+            Timber.e(e, e.getMessage());
+            return;
+        }
+
+        // Notify user if downloading permanently failed.
+        if (state == STATE_PERMANENT_FAILURE) {
+            mHandler.post(new Runnable() {
+                public void run() {
+                    try {
+                        Toast.makeText(mContext, getMessage(uri),
+                                Toast.LENGTH_LONG).show();
+                    } catch (MmsException e) {
+                        Timber.e(e, e.getMessage());
+                    }
+                }
+            });
+        } else if (!mAutoDownload) {
+            state |= DEFERRED_MASK;
+        }
+
+        // Use the STATUS field to store the state of downloading process
+        // because it's useless for M-Notification.ind.
+        ContentValues values = new ContentValues(1);
+        values.put(Mms.STATUS, state);
+        SqliteWrapper.update(mContext, mContext.getContentResolver(),
+                    uri, values, null, null);
+    }
+
+    public void showErrorCodeToast(int errorStr) {
+        final int errStr = errorStr;
+        mHandler.post(new Runnable() {
+            public void run() {
+                try {
+                    Toast.makeText(mContext, errStr, Toast.LENGTH_LONG).show();
+                } catch (Exception e) {
+                    Timber.e("Caught an exception in showErrorCodeToast");
+                }
+            }
+        });
+    }
+
+    private String getMessage(Uri uri) throws MmsException {
+        NotificationInd ind = (NotificationInd) PduPersister
+                .getPduPersister(mContext).load(uri);
+
+        EncodedStringValue v = ind.getSubject();
+        String subject = (v != null) ? v.getString()
+                : mContext.getString(R.string.no_subject);
+
+        String from = mContext.getString(R.string.unknown_sender);
+
+        return mContext.getString(R.string.dl_failure_notification, subject, from);
+    }
+
+    public int getState(Uri uri) {
+        Cursor cursor = SqliteWrapper.query(mContext, mContext.getContentResolver(),
+                            uri, new String[] {Mms.STATUS}, null, null, null);
+
+        if (cursor != null) {
+            try {
+                if (cursor.moveToFirst()) {
+                    int state = cursor.getInt(0) & ~DEFERRED_MASK;
+                    cursor.close();
+                    return state;
+                }
+            } finally {
+                cursor.close();
+            }
+        }
+        return STATE_UNSTARTED;
+    }
+}
diff --git a/android-smsmms/src/main/java/com/android/mms/util/RateController.java b/android-smsmms/src/main/java/com/android/mms/util/RateController.java
index fa4365dcb..a747b562e 100755
--- a/android-smsmms/src/main/java/com/android/mms/util/RateController.java
+++ b/android-smsmms/src/main/java/com/android/mms/util/RateController.java
@@ -1,158 +1,158 @@
-/*
- * Copyright 2014 Jacob Klinker
- *
- * Licensed under the Apache License, Version 2.0 (the "License");
- * you may not use this file except in compliance with the License.
- * You may obtain a copy of the License at
- *
- *     http://www.apache.org/licenses/LICENSE-2.0
- *
- * Unless required by applicable law or agreed to in writing, software
- * distributed under the License is distributed on an "AS IS" BASIS,
- * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
- * See the License for the specific language governing permissions and
- * limitations under the License.
- */
-
-package com.android.mms.util;
-
-import android.content.BroadcastReceiver;
-import android.content.ContentValues;
-import android.content.Context;
-import android.content.Intent;
-import android.content.IntentFilter;
-import android.database.Cursor;
-import android.database.sqlite.SqliteWrapper;
-import android.provider.Telephony.Mms.Rate;
-import timber.log.Timber;
-
-public class RateController {
-    private static final boolean LOCAL_LOGV = false;
-
-    private static final int RATE_LIMIT = 100;
-    private static final long ONE_HOUR = 1000 * 60 * 60;
-
-    private static final int NO_ANSWER  = 0;
-    private static final int ANSWER_YES = 1;
-    private static final int ANSWER_NO  = 2;
-
-    public static final int ANSWER_TIMEOUT = 20000;
-    public static final String RATE_LIMIT_SURPASSED_ACTION =
-        "com.android.mms.RATE_LIMIT_SURPASSED";
-    public static final String RATE_LIMIT_CONFIRMED_ACTION =
-        "com.android.mms.RATE_LIMIT_CONFIRMED";
-
-    private static RateController sInstance;
-    private static boolean sMutexLock;
-
-    private final Context mContext;
-    private int mAnswer;
-
-    private final BroadcastReceiver mBroadcastReceiver = new BroadcastReceiver() {
-        @Override
-        public void onReceive(Context context, Intent intent) {
-            if (LOCAL_LOGV) {
-                Timber.v("Intent received: " + intent);
-            }
-
-            if (RATE_LIMIT_CONFIRMED_ACTION.equals(intent.getAction())) {
-                synchronized (this) {
-                    mAnswer = intent.getBooleanExtra("answer", false)
-                                            ? ANSWER_YES : ANSWER_NO;
-                    notifyAll();
-                }
-            }
-        }
-    };
-
-    private RateController(Context context) {
-        mContext = context;
-    }
-
-    public static void init(Context context) {
-        if (LOCAL_LOGV) {
-            Timber.v("RateController.init()");
-        }
-
-        if (sInstance != null) {
-            Timber.w("Already initialized.");
-            return;
-        }
-        sInstance = new RateController(context);
-    }
-
-    public static RateController getInstance() {
-        if (sInstance == null) {
-            throw new IllegalStateException("Uninitialized.");
-        }
-        return sInstance;
-    }
-
-    public final void update() {
-        ContentValues values = new ContentValues(1);
-        values.put(Rate.SENT_TIME, System.currentTimeMillis());
-        SqliteWrapper.insert(mContext, mContext.getContentResolver(),
-                             Rate.CONTENT_URI, values);
-    }
-
-    public final boolean isLimitSurpassed() {
-        long oneHourAgo = System.currentTimeMillis() - ONE_HOUR;
-        Cursor c = SqliteWrapper.query(mContext, mContext.getContentResolver(),
-                Rate.CONTENT_URI, new String[] { "COUNT(*) AS rate" },
-                Rate.SENT_TIME + ">" + oneHourAgo, null, null);
-        if (c != null) {
-            try {
-                if (c.moveToFirst()) {
-                    boolean limit = c.getInt(0) >= RATE_LIMIT;
-                    c.close();
-                    return limit;
-                }
-            } finally {
-                c.close();
-            }
-        }
-        return false;
-    }
-
-    synchronized public boolean isAllowedByUser() {
-        while (sMutexLock) {
-            try {
-                wait();
-            } catch (InterruptedException e) {
-                 // Ignore it.
-            }
-        }
-        sMutexLock = true;
-
-        mContext.registerReceiver(mBroadcastReceiver,
-                new IntentFilter(RATE_LIMIT_CONFIRMED_ACTION));
-
-        mAnswer = NO_ANSWER;
-        try {
-            Intent intent = new Intent(RATE_LIMIT_SURPASSED_ACTION);
-            // Using NEW_TASK here is necessary because we're calling
-            // startActivity from outside an activity.
-            intent.addFlags(Intent.FLAG_ACTIVITY_NEW_TASK);
-            mContext.startActivity(intent);
-            return waitForAnswer() == ANSWER_YES;
-        } finally {
-            mContext.unregisterReceiver(mBroadcastReceiver);
-            sMutexLock = false;
-            notifyAll();
-        }
-    }
-
-    synchronized private int waitForAnswer() {
-        for (int t = 0; (mAnswer == NO_ANSWER) && (t < ANSWER_TIMEOUT); t += 1000) {
-            try {
-                if (LOCAL_LOGV) {
-                    Timber.v("Waiting for answer..." + t / 1000);
-                }
-                wait(1000L);
-            } catch (InterruptedException e) {
-                 // Ignore it.
-            }
-        }
-        return mAnswer;
-    }
-}
+/*
+ * Copyright 2014 Jacob Klinker
+ *
+ * Licensed under the Apache License, Version 2.0 (the "License");
+ * you may not use this file except in compliance with the License.
+ * You may obtain a copy of the License at
+ *
+ *     http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing, software
+ * distributed under the License is distributed on an "AS IS" BASIS,
+ * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ * See the License for the specific language governing permissions and
+ * limitations under the License.
+ */
+
+package com.android.mms.util;
+
+import android.content.BroadcastReceiver;
+import android.content.ContentValues;
+import android.content.Context;
+import android.content.Intent;
+import android.content.IntentFilter;
+import android.database.Cursor;
+import android.database.sqlite.SqliteWrapper;
+import android.provider.Telephony.Mms.Rate;
+import timber.log.Timber;
+
+public class RateController {
+    private static final boolean LOCAL_LOGV = false;
+
+    private static final int RATE_LIMIT = 100;
+    private static final long ONE_HOUR = 1000 * 60 * 60;
+
+    private static final int NO_ANSWER  = 0;
+    private static final int ANSWER_YES = 1;
+    private static final int ANSWER_NO  = 2;
+
+    public static final int ANSWER_TIMEOUT = 20000;
+    public static final String RATE_LIMIT_SURPASSED_ACTION =
+        "com.android.mms.RATE_LIMIT_SURPASSED";
+    public static final String RATE_LIMIT_CONFIRMED_ACTION =
+        "com.android.mms.RATE_LIMIT_CONFIRMED";
+
+    private static RateController sInstance;
+    private static boolean sMutexLock;
+
+    private final Context mContext;
+    private int mAnswer;
+
+    private final BroadcastReceiver mBroadcastReceiver = new BroadcastReceiver() {
+        @Override
+        public void onReceive(Context context, Intent intent) {
+            if (LOCAL_LOGV) {
+                Timber.v("Intent received: " + intent);
+            }
+
+            if (RATE_LIMIT_CONFIRMED_ACTION.equals(intent.getAction())) {
+                synchronized (this) {
+                    mAnswer = intent.getBooleanExtra("answer", false)
+                                            ? ANSWER_YES : ANSWER_NO;
+                    notifyAll();
+                }
+            }
+        }
+    };
+
+    private RateController(Context context) {
+        mContext = context;
+    }
+
+    public static void init(Context context) {
+        if (LOCAL_LOGV) {
+            Timber.v("RateController.init()");
+        }
+
+        if (sInstance != null) {
+            Timber.w("Already initialized.");
+            return;
+        }
+        sInstance = new RateController(context);
+    }
+
+    public static RateController getInstance() {
+        if (sInstance == null) {
+            throw new IllegalStateException("Uninitialized.");
+        }
+        return sInstance;
+    }
+
+    public final void update() {
+        ContentValues values = new ContentValues(1);
+        values.put(Rate.SENT_TIME, System.currentTimeMillis());
+        SqliteWrapper.insert(mContext, mContext.getContentResolver(),
+                             Rate.CONTENT_URI, values);
+    }
+
+    public final boolean isLimitSurpassed() {
+        long oneHourAgo = System.currentTimeMillis() - ONE_HOUR;
+        Cursor c = SqliteWrapper.query(mContext, mContext.getContentResolver(),
+                Rate.CONTENT_URI, new String[] { "COUNT(*) AS rate" },
+                Rate.SENT_TIME + ">" + oneHourAgo, null, null);
+        if (c != null) {
+            try {
+                if (c.moveToFirst()) {
+                    boolean limit = c.getInt(0) >= RATE_LIMIT;
+                    c.close();
+                    return limit;
+                }
+            } finally {
+                c.close();
+            }
+        }
+        return false;
+    }
+
+    synchronized public boolean isAllowedByUser() {
+        while (sMutexLock) {
+            try {
+                wait();
+            } catch (InterruptedException e) {
+                 // Ignore it.
+            }
+        }
+        sMutexLock = true;
+
+        mContext.registerReceiver(mBroadcastReceiver,
+                new IntentFilter(RATE_LIMIT_CONFIRMED_ACTION));
+
+        mAnswer = NO_ANSWER;
+        try {
+            Intent intent = new Intent(RATE_LIMIT_SURPASSED_ACTION);
+            // Using NEW_TASK here is necessary because we're calling
+            // startActivity from outside an activity.
+            intent.addFlags(Intent.FLAG_ACTIVITY_NEW_TASK);
+            mContext.startActivity(intent);
+            return waitForAnswer() == ANSWER_YES;
+        } finally {
+            mContext.unregisterReceiver(mBroadcastReceiver);
+            sMutexLock = false;
+            notifyAll();
+        }
+    }
+
+    synchronized private int waitForAnswer() {
+        for (int t = 0; (mAnswer == NO_ANSWER) && (t < ANSWER_TIMEOUT); t += 1000) {
+            try {
+                if (LOCAL_LOGV) {
+                    Timber.v("Waiting for answer..." + t / 1000);
+                }
+                wait(1000L);
+            } catch (InterruptedException e) {
+                 // Ignore it.
+            }
+        }
+        return mAnswer;
+    }
+}
diff --git a/android-smsmms/src/main/java/com/android/mms/util/SendingProgressTokenManager.java b/android-smsmms/src/main/java/com/android/mms/util/SendingProgressTokenManager.java
index a0d4dcc00..6ebbc0dc4 100755
--- a/android-smsmms/src/main/java/com/android/mms/util/SendingProgressTokenManager.java
+++ b/android-smsmms/src/main/java/com/android/mms/util/SendingProgressTokenManager.java
@@ -1,54 +1,54 @@
-/*
- * Copyright 2014 Jacob Klinker
- *
- * Licensed under the Apache License, Version 2.0 (the "License");
- * you may not use this file except in compliance with the License.
- * You may obtain a copy of the License at
- *
- *     http://www.apache.org/licenses/LICENSE-2.0
- *
- * Unless required by applicable law or agreed to in writing, software
- * distributed under the License is distributed on an "AS IS" BASIS,
- * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
- * See the License for the specific language governing permissions and
- * limitations under the License.
- */
-
-package com.android.mms.util;
-
-import timber.log.Timber;
-
-import java.util.HashMap;
-
-public class SendingProgressTokenManager {
-    private static final boolean LOCAL_LOGV = false;
-    private static final HashMap<Object, Long> TOKEN_POOL;
-
-    public static final long NO_TOKEN = -1L;
-
-    static {
-        TOKEN_POOL = new HashMap<Object, Long>();
-    }
-
-    synchronized public static long get(Object key) {
-        Long token = TOKEN_POOL.get(key);
-        if (LOCAL_LOGV) {
-            Timber.v("TokenManager.get(" + key + ") -> " + token);
-        }
-        return token != null ? token : NO_TOKEN;
-    }
-
-    synchronized public static void put(Object key, long token) {
-        if (LOCAL_LOGV) {
-            Timber.v("TokenManager.put(" + key + ", " + token + ")");
-        }
-        TOKEN_POOL.put(key, token);
-    }
-
-    synchronized public static void remove(Object key) {
-        if (LOCAL_LOGV) {
-            Timber.v("TokenManager.remove(" + key + ")");
-        }
-        TOKEN_POOL.remove(key);
-    }
-}
+/*
+ * Copyright 2014 Jacob Klinker
+ *
+ * Licensed under the Apache License, Version 2.0 (the "License");
+ * you may not use this file except in compliance with the License.
+ * You may obtain a copy of the License at
+ *
+ *     http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing, software
+ * distributed under the License is distributed on an "AS IS" BASIS,
+ * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ * See the License for the specific language governing permissions and
+ * limitations under the License.
+ */
+
+package com.android.mms.util;
+
+import timber.log.Timber;
+
+import java.util.HashMap;
+
+public class SendingProgressTokenManager {
+    private static final boolean LOCAL_LOGV = false;
+    private static final HashMap<Object, Long> TOKEN_POOL;
+
+    public static final long NO_TOKEN = -1L;
+
+    static {
+        TOKEN_POOL = new HashMap<Object, Long>();
+    }
+
+    synchronized public static long get(Object key) {
+        Long token = TOKEN_POOL.get(key);
+        if (LOCAL_LOGV) {
+            Timber.v("TokenManager.get(" + key + ") -> " + token);
+        }
+        return token != null ? token : NO_TOKEN;
+    }
+
+    synchronized public static void put(Object key, long token) {
+        if (LOCAL_LOGV) {
+            Timber.v("TokenManager.put(" + key + ", " + token + ")");
+        }
+        TOKEN_POOL.put(key, token);
+    }
+
+    synchronized public static void remove(Object key) {
+        if (LOCAL_LOGV) {
+            Timber.v("TokenManager.remove(" + key + ")");
+        }
+        TOKEN_POOL.remove(key);
+    }
+}
diff --git a/android-smsmms/src/main/java/com/google/android/mms/ContentType.java b/android-smsmms/src/main/java/com/google/android/mms/ContentType.java
index 9dad6c5e9..0a9e43bfa 100755
--- a/android-smsmms/src/main/java/com/google/android/mms/ContentType.java
+++ b/android-smsmms/src/main/java/com/google/android/mms/ContentType.java
@@ -1,241 +1,241 @@
-/*
- * Copyright (C) 2007-2008 Esmertec AG.
- * Copyright (C) 2007-2008 The Android Open Source Project
- * Copyright (c) 2013, The Linux Foundation. All rights reserved.
- *
- * Licensed under the Apache License, Version 2.0 (the "License");
- * you may not use this file except in compliance with the License.
- * You may obtain a copy of the License at
- *
- *      http://www.apache.org/licenses/LICENSE-2.0
- *
- * Unless required by applicable law or agreed to in writing, software
- * distributed under the License is distributed on an "AS IS" BASIS,
- * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
- * See the License for the specific language governing permissions and
- * limitations under the License.
- */
-
-package com.google.android.mms;
-
-import java.util.ArrayList;
-
-public class ContentType {
-    public static final String MMS_MESSAGE       = "application/vnd.wap.mms-message";
-    // The phony content type for generic PDUs (e.g. ReadOrig.ind,
-    // Notification.ind, Delivery.ind).
-    public static final String MMS_GENERIC       = "application/vnd.wap.mms-generic";
-    public static final String MULTIPART_MIXED   = "application/vnd.wap.multipart.mixed";
-    public static final String MULTIPART_RELATED = "application/vnd.wap.multipart.related";
-    public static final String MULTIPART_ALTERNATIVE = "application/vnd.wap.multipart.alternative";
-    public static final String MULTIPART_SIGNED = "multipart/signed";
-
-    public static final String TEXT_PLAIN        = "text/plain";
-    public static final String TEXT_HTML         = "text/html";
-    public static final String TEXT_VCALENDAR    = "text/x-vCalendar";
-    public static final String TEXT_VCARD        = "text/x-vCard";
-
-    public static final String IMAGE_UNSPECIFIED = "image/*";
-    public static final String IMAGE_JPEG        = "image/jpeg";
-    public static final String IMAGE_JPG         = "image/jpg";
-    public static final String IMAGE_GIF         = "image/gif";
-    public static final String IMAGE_WBMP        = "image/vnd.wap.wbmp";
-    public static final String IMAGE_PNG         = "image/png";
-    public static final String IMAGE_X_MS_BMP    = "image/x-ms-bmp";
-
-    public static final String AUDIO_UNSPECIFIED = "audio/*";
-    public static final String AUDIO_AAC         = "audio/aac";
-    public static final String AUDIO_AAC_MP4     = "audio/aac_mp4";
-    public static final String AUDIO_QCELP       = "audio/qcelp";
-    public static final String AUDIO_EVRC        = "audio/evrc";
-    public static final String AUDIO_AMR         = "audio/amr";
-    public static final String AUDIO_IMELODY     = "audio/imelody";
-    public static final String AUDIO_MID         = "audio/mid";
-    public static final String AUDIO_MIDI        = "audio/midi";
-    public static final String AUDIO_MP3         = "audio/mp3";
-    public static final String AUDIO_MPEG3       = "audio/mpeg3";
-    public static final String AUDIO_MPEG        = "audio/mpeg";
-    public static final String AUDIO_MPG         = "audio/mpg";
-    public static final String AUDIO_MP4         = "audio/mp4";
-    public static final String AUDIO_X_MID       = "audio/x-mid";
-    public static final String AUDIO_X_MIDI      = "audio/x-midi";
-    public static final String AUDIO_X_MP3       = "audio/x-mp3";
-    public static final String AUDIO_X_MPEG3     = "audio/x-mpeg3";
-    public static final String AUDIO_X_MPEG      = "audio/x-mpeg";
-    public static final String AUDIO_X_MPG       = "audio/x-mpg";
-    public static final String AUDIO_3GPP        = "audio/3gpp";
-    public static final String AUDIO_X_WAV       = "audio/x-wav";
-    public static final String AUDIO_OGG         = "application/ogg";
-
-    public static final String VIDEO_UNSPECIFIED = "video/*";
-    public static final String VIDEO_3GPP        = "video/3gpp";
-    public static final String VIDEO_3G2         = "video/3gpp2";
-    public static final String VIDEO_H263        = "video/h263";
-    public static final String VIDEO_MP4         = "video/mp4";
-
-    public static final String APP_SMIL          = "application/smil";
-    public static final String APP_WAP_XHTML     = "application/vnd.wap.xhtml+xml";
-    public static final String APP_XHTML         = "application/xhtml+xml";
-
-    public static final String APP_DRM_CONTENT   = "application/vnd.oma.drm.content";
-    public static final String APP_DRM_MESSAGE   = "application/vnd.oma.drm.message";
-
-    private static final ArrayList<String> sSupportedContentTypes = new ArrayList<String>();
-    private static final ArrayList<String> sSupportedImageTypes = new ArrayList<String>();
-    private static final ArrayList<String> sSupportedAudioTypes = new ArrayList<String>();
-    private static final ArrayList<String> sSupportedVideoTypes = new ArrayList<String>();
-
-    static {
-        sSupportedContentTypes.add(TEXT_PLAIN);
-        sSupportedContentTypes.add(TEXT_HTML);
-        sSupportedContentTypes.add(TEXT_VCALENDAR);
-        sSupportedContentTypes.add(TEXT_VCARD);
-
-        sSupportedContentTypes.add(IMAGE_JPEG);
-        sSupportedContentTypes.add(IMAGE_GIF);
-        sSupportedContentTypes.add(IMAGE_WBMP);
-        sSupportedContentTypes.add(IMAGE_PNG);
-        sSupportedContentTypes.add(IMAGE_JPG);
-        sSupportedContentTypes.add(IMAGE_X_MS_BMP);
-        //supportedContentTypes.add(IMAGE_SVG); not yet supported.
-
-        sSupportedContentTypes.add(AUDIO_AAC);
-        sSupportedContentTypes.add(AUDIO_AAC_MP4);
-        sSupportedContentTypes.add(AUDIO_QCELP);
-        sSupportedContentTypes.add(AUDIO_EVRC);
-        sSupportedContentTypes.add(AUDIO_AMR);
-        sSupportedContentTypes.add(AUDIO_IMELODY);
-        sSupportedContentTypes.add(AUDIO_MID);
-        sSupportedContentTypes.add(AUDIO_MIDI);
-        sSupportedContentTypes.add(AUDIO_MP3);
-        sSupportedContentTypes.add(AUDIO_MP4);
-        sSupportedContentTypes.add(AUDIO_MPEG3);
-        sSupportedContentTypes.add(AUDIO_MPEG);
-        sSupportedContentTypes.add(AUDIO_MPG);
-        sSupportedContentTypes.add(AUDIO_X_MID);
-        sSupportedContentTypes.add(AUDIO_X_MIDI);
-        sSupportedContentTypes.add(AUDIO_X_MP3);
-        sSupportedContentTypes.add(AUDIO_X_MPEG3);
-        sSupportedContentTypes.add(AUDIO_X_MPEG);
-        sSupportedContentTypes.add(AUDIO_X_MPG);
-        sSupportedContentTypes.add(AUDIO_X_WAV);
-        sSupportedContentTypes.add(AUDIO_3GPP);
-        sSupportedContentTypes.add(AUDIO_OGG);
-
-        sSupportedContentTypes.add(VIDEO_3GPP);
-        sSupportedContentTypes.add(VIDEO_3G2);
-        sSupportedContentTypes.add(VIDEO_H263);
-        sSupportedContentTypes.add(VIDEO_MP4);
-
-        sSupportedContentTypes.add(APP_SMIL);
-        sSupportedContentTypes.add(APP_WAP_XHTML);
-        sSupportedContentTypes.add(APP_XHTML);
-
-        sSupportedContentTypes.add(APP_DRM_CONTENT);
-        sSupportedContentTypes.add(APP_DRM_MESSAGE);
-
-        // add supported image types
-        sSupportedImageTypes.add(IMAGE_JPEG);
-        sSupportedImageTypes.add(IMAGE_GIF);
-        sSupportedImageTypes.add(IMAGE_WBMP);
-        sSupportedImageTypes.add(IMAGE_PNG);
-        sSupportedImageTypes.add(IMAGE_JPG);
-        sSupportedImageTypes.add(IMAGE_X_MS_BMP);
-
-        // add supported audio types
-        sSupportedAudioTypes.add(AUDIO_AAC);
-        sSupportedAudioTypes.add(AUDIO_AAC_MP4);
-        sSupportedAudioTypes.add(AUDIO_QCELP);
-        sSupportedAudioTypes.add(AUDIO_EVRC);
-        sSupportedAudioTypes.add(AUDIO_AMR);
-        sSupportedAudioTypes.add(AUDIO_IMELODY);
-        sSupportedAudioTypes.add(AUDIO_MID);
-        sSupportedAudioTypes.add(AUDIO_MIDI);
-        sSupportedAudioTypes.add(AUDIO_MP3);
-        sSupportedAudioTypes.add(AUDIO_MPEG3);
-        sSupportedAudioTypes.add(AUDIO_MPEG);
-        sSupportedAudioTypes.add(AUDIO_MPG);
-        sSupportedAudioTypes.add(AUDIO_MP4);
-        sSupportedAudioTypes.add(AUDIO_X_MID);
-        sSupportedAudioTypes.add(AUDIO_X_MIDI);
-        sSupportedAudioTypes.add(AUDIO_X_MP3);
-        sSupportedAudioTypes.add(AUDIO_X_MPEG3);
-        sSupportedAudioTypes.add(AUDIO_X_MPEG);
-        sSupportedAudioTypes.add(AUDIO_X_MPG);
-        sSupportedAudioTypes.add(AUDIO_X_WAV);
-        sSupportedAudioTypes.add(AUDIO_3GPP);
-        sSupportedAudioTypes.add(AUDIO_OGG);
-
-        // add supported video types
-        sSupportedVideoTypes.add(VIDEO_3GPP);
-        sSupportedVideoTypes.add(VIDEO_3G2);
-        sSupportedVideoTypes.add(VIDEO_H263);
-        sSupportedVideoTypes.add(VIDEO_MP4);
-    }
-
-    // This class should never be instantiated.
-    private ContentType() {
-    }
-
-    public static boolean isSupportedType(String contentType) {
-        return (null != contentType) && sSupportedContentTypes.contains(contentType);
-    }
-
-    public static boolean isSupportedImageType(String contentType) {
-        return isImageType(contentType) && isSupportedType(contentType);
-    }
-
-    public static boolean isSupportedAudioType(String contentType) {
-        return isAudioType(contentType) && isSupportedType(contentType);
-    }
-
-    public static boolean isSupportedVideoType(String contentType) {
-        return isVideoType(contentType) && isSupportedType(contentType);
-    }
-
-    public static boolean isTextType(String contentType) {
-        return (null != contentType) && contentType.startsWith("text/");
-    }
-
-    public static boolean isImageType(String contentType) {
-        return (null != contentType) && contentType.startsWith("image/");
-    }
-
-    public static boolean isAudioType(String contentType) {
-        return (null != contentType) && contentType.startsWith("audio/");
-    }
-
-    public static boolean isVideoType(String contentType) {
-        return (null != contentType) && contentType.startsWith("video/");
-    }
-
-    public static boolean isDrmType(String contentType) {
-        return (null != contentType)
-                && (contentType.equals(APP_DRM_CONTENT)
-                        || contentType.equals(APP_DRM_MESSAGE));
-    }
-
-    public static boolean isUnspecified(String contentType) {
-        return (null != contentType) && contentType.endsWith("*");
-    }
-
-    @SuppressWarnings("unchecked")
-    public static ArrayList<String> getImageTypes() {
-        return (ArrayList<String>) sSupportedImageTypes.clone();
-    }
-
-    @SuppressWarnings("unchecked")
-    public static ArrayList<String> getAudioTypes() {
-        return (ArrayList<String>) sSupportedAudioTypes.clone();
-    }
-
-    @SuppressWarnings("unchecked")
-    public static ArrayList<String> getVideoTypes() {
-        return (ArrayList<String>) sSupportedVideoTypes.clone();
-    }
-
-    @SuppressWarnings("unchecked")
-    public static ArrayList<String> getSupportedTypes() {
-        return (ArrayList<String>) sSupportedContentTypes.clone();
-    }
-}
+/*
+ * Copyright (C) 2007-2008 Esmertec AG.
+ * Copyright (C) 2007-2008 The Android Open Source Project
+ * Copyright (c) 2013, The Linux Foundation. All rights reserved.
+ *
+ * Licensed under the Apache License, Version 2.0 (the "License");
+ * you may not use this file except in compliance with the License.
+ * You may obtain a copy of the License at
+ *
+ *      http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing, software
+ * distributed under the License is distributed on an "AS IS" BASIS,
+ * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ * See the License for the specific language governing permissions and
+ * limitations under the License.
+ */
+
+package com.google.android.mms;
+
+import java.util.ArrayList;
+
+public class ContentType {
+    public static final String MMS_MESSAGE       = "application/vnd.wap.mms-message";
+    // The phony content type for generic PDUs (e.g. ReadOrig.ind,
+    // Notification.ind, Delivery.ind).
+    public static final String MMS_GENERIC       = "application/vnd.wap.mms-generic";
+    public static final String MULTIPART_MIXED   = "application/vnd.wap.multipart.mixed";
+    public static final String MULTIPART_RELATED = "application/vnd.wap.multipart.related";
+    public static final String MULTIPART_ALTERNATIVE = "application/vnd.wap.multipart.alternative";
+    public static final String MULTIPART_SIGNED = "multipart/signed";
+
+    public static final String TEXT_PLAIN        = "text/plain";
+    public static final String TEXT_HTML         = "text/html";
+    public static final String TEXT_VCALENDAR    = "text/x-vCalendar";
+    public static final String TEXT_VCARD        = "text/x-vCard";
+
+    public static final String IMAGE_UNSPECIFIED = "image/*";
+    public static final String IMAGE_JPEG        = "image/jpeg";
+    public static final String IMAGE_JPG         = "image/jpg";
+    public static final String IMAGE_GIF         = "image/gif";
+    public static final String IMAGE_WBMP        = "image/vnd.wap.wbmp";
+    public static final String IMAGE_PNG         = "image/png";
+    public static final String IMAGE_X_MS_BMP    = "image/x-ms-bmp";
+
+    public static final String AUDIO_UNSPECIFIED = "audio/*";
+    public static final String AUDIO_AAC         = "audio/aac";
+    public static final String AUDIO_AAC_MP4     = "audio/aac_mp4";
+    public static final String AUDIO_QCELP       = "audio/qcelp";
+    public static final String AUDIO_EVRC        = "audio/evrc";
+    public static final String AUDIO_AMR         = "audio/amr";
+    public static final String AUDIO_IMELODY     = "audio/imelody";
+    public static final String AUDIO_MID         = "audio/mid";
+    public static final String AUDIO_MIDI        = "audio/midi";
+    public static final String AUDIO_MP3         = "audio/mp3";
+    public static final String AUDIO_MPEG3       = "audio/mpeg3";
+    public static final String AUDIO_MPEG        = "audio/mpeg";
+    public static final String AUDIO_MPG         = "audio/mpg";
+    public static final String AUDIO_MP4         = "audio/mp4";
+    public static final String AUDIO_X_MID       = "audio/x-mid";
+    public static final String AUDIO_X_MIDI      = "audio/x-midi";
+    public static final String AUDIO_X_MP3       = "audio/x-mp3";
+    public static final String AUDIO_X_MPEG3     = "audio/x-mpeg3";
+    public static final String AUDIO_X_MPEG      = "audio/x-mpeg";
+    public static final String AUDIO_X_MPG       = "audio/x-mpg";
+    public static final String AUDIO_3GPP        = "audio/3gpp";
+    public static final String AUDIO_X_WAV       = "audio/x-wav";
+    public static final String AUDIO_OGG         = "application/ogg";
+
+    public static final String VIDEO_UNSPECIFIED = "video/*";
+    public static final String VIDEO_3GPP        = "video/3gpp";
+    public static final String VIDEO_3G2         = "video/3gpp2";
+    public static final String VIDEO_H263        = "video/h263";
+    public static final String VIDEO_MP4         = "video/mp4";
+
+    public static final String APP_SMIL          = "application/smil";
+    public static final String APP_WAP_XHTML     = "application/vnd.wap.xhtml+xml";
+    public static final String APP_XHTML         = "application/xhtml+xml";
+
+    public static final String APP_DRM_CONTENT   = "application/vnd.oma.drm.content";
+    public static final String APP_DRM_MESSAGE   = "application/vnd.oma.drm.message";
+
+    private static final ArrayList<String> sSupportedContentTypes = new ArrayList<String>();
+    private static final ArrayList<String> sSupportedImageTypes = new ArrayList<String>();
+    private static final ArrayList<String> sSupportedAudioTypes = new ArrayList<String>();
+    private static final ArrayList<String> sSupportedVideoTypes = new ArrayList<String>();
+
+    static {
+        sSupportedContentTypes.add(TEXT_PLAIN);
+        sSupportedContentTypes.add(TEXT_HTML);
+        sSupportedContentTypes.add(TEXT_VCALENDAR);
+        sSupportedContentTypes.add(TEXT_VCARD);
+
+        sSupportedContentTypes.add(IMAGE_JPEG);
+        sSupportedContentTypes.add(IMAGE_GIF);
+        sSupportedContentTypes.add(IMAGE_WBMP);
+        sSupportedContentTypes.add(IMAGE_PNG);
+        sSupportedContentTypes.add(IMAGE_JPG);
+        sSupportedContentTypes.add(IMAGE_X_MS_BMP);
+        //supportedContentTypes.add(IMAGE_SVG); not yet supported.
+
+        sSupportedContentTypes.add(AUDIO_AAC);
+        sSupportedContentTypes.add(AUDIO_AAC_MP4);
+        sSupportedContentTypes.add(AUDIO_QCELP);
+        sSupportedContentTypes.add(AUDIO_EVRC);
+        sSupportedContentTypes.add(AUDIO_AMR);
+        sSupportedContentTypes.add(AUDIO_IMELODY);
+        sSupportedContentTypes.add(AUDIO_MID);
+        sSupportedContentTypes.add(AUDIO_MIDI);
+        sSupportedContentTypes.add(AUDIO_MP3);
+        sSupportedContentTypes.add(AUDIO_MP4);
+        sSupportedContentTypes.add(AUDIO_MPEG3);
+        sSupportedContentTypes.add(AUDIO_MPEG);
+        sSupportedContentTypes.add(AUDIO_MPG);
+        sSupportedContentTypes.add(AUDIO_X_MID);
+        sSupportedContentTypes.add(AUDIO_X_MIDI);
+        sSupportedContentTypes.add(AUDIO_X_MP3);
+        sSupportedContentTypes.add(AUDIO_X_MPEG3);
+        sSupportedContentTypes.add(AUDIO_X_MPEG);
+        sSupportedContentTypes.add(AUDIO_X_MPG);
+        sSupportedContentTypes.add(AUDIO_X_WAV);
+        sSupportedContentTypes.add(AUDIO_3GPP);
+        sSupportedContentTypes.add(AUDIO_OGG);
+
+        sSupportedContentTypes.add(VIDEO_3GPP);
+        sSupportedContentTypes.add(VIDEO_3G2);
+        sSupportedContentTypes.add(VIDEO_H263);
+        sSupportedContentTypes.add(VIDEO_MP4);
+
+        sSupportedContentTypes.add(APP_SMIL);
+        sSupportedContentTypes.add(APP_WAP_XHTML);
+        sSupportedContentTypes.add(APP_XHTML);
+
+        sSupportedContentTypes.add(APP_DRM_CONTENT);
+        sSupportedContentTypes.add(APP_DRM_MESSAGE);
+
+        // add supported image types
+        sSupportedImageTypes.add(IMAGE_JPEG);
+        sSupportedImageTypes.add(IMAGE_GIF);
+        sSupportedImageTypes.add(IMAGE_WBMP);
+        sSupportedImageTypes.add(IMAGE_PNG);
+        sSupportedImageTypes.add(IMAGE_JPG);
+        sSupportedImageTypes.add(IMAGE_X_MS_BMP);
+
+        // add supported audio types
+        sSupportedAudioTypes.add(AUDIO_AAC);
+        sSupportedAudioTypes.add(AUDIO_AAC_MP4);
+        sSupportedAudioTypes.add(AUDIO_QCELP);
+        sSupportedAudioTypes.add(AUDIO_EVRC);
+        sSupportedAudioTypes.add(AUDIO_AMR);
+        sSupportedAudioTypes.add(AUDIO_IMELODY);
+        sSupportedAudioTypes.add(AUDIO_MID);
+        sSupportedAudioTypes.add(AUDIO_MIDI);
+        sSupportedAudioTypes.add(AUDIO_MP3);
+        sSupportedAudioTypes.add(AUDIO_MPEG3);
+        sSupportedAudioTypes.add(AUDIO_MPEG);
+        sSupportedAudioTypes.add(AUDIO_MPG);
+        sSupportedAudioTypes.add(AUDIO_MP4);
+        sSupportedAudioTypes.add(AUDIO_X_MID);
+        sSupportedAudioTypes.add(AUDIO_X_MIDI);
+        sSupportedAudioTypes.add(AUDIO_X_MP3);
+        sSupportedAudioTypes.add(AUDIO_X_MPEG3);
+        sSupportedAudioTypes.add(AUDIO_X_MPEG);
+        sSupportedAudioTypes.add(AUDIO_X_MPG);
+        sSupportedAudioTypes.add(AUDIO_X_WAV);
+        sSupportedAudioTypes.add(AUDIO_3GPP);
+        sSupportedAudioTypes.add(AUDIO_OGG);
+
+        // add supported video types
+        sSupportedVideoTypes.add(VIDEO_3GPP);
+        sSupportedVideoTypes.add(VIDEO_3G2);
+        sSupportedVideoTypes.add(VIDEO_H263);
+        sSupportedVideoTypes.add(VIDEO_MP4);
+    }
+
+    // This class should never be instantiated.
+    private ContentType() {
+    }
+
+    public static boolean isSupportedType(String contentType) {
+        return (null != contentType) && sSupportedContentTypes.contains(contentType);
+    }
+
+    public static boolean isSupportedImageType(String contentType) {
+        return isImageType(contentType) && isSupportedType(contentType);
+    }
+
+    public static boolean isSupportedAudioType(String contentType) {
+        return isAudioType(contentType) && isSupportedType(contentType);
+    }
+
+    public static boolean isSupportedVideoType(String contentType) {
+        return isVideoType(contentType) && isSupportedType(contentType);
+    }
+
+    public static boolean isTextType(String contentType) {
+        return (null != contentType) && contentType.startsWith("text/");
+    }
+
+    public static boolean isImageType(String contentType) {
+        return (null != contentType) && contentType.startsWith("image/");
+    }
+
+    public static boolean isAudioType(String contentType) {
+        return (null != contentType) && contentType.startsWith("audio/");
+    }
+
+    public static boolean isVideoType(String contentType) {
+        return (null != contentType) && contentType.startsWith("video/");
+    }
+
+    public static boolean isDrmType(String contentType) {
+        return (null != contentType)
+                && (contentType.equals(APP_DRM_CONTENT)
+                        || contentType.equals(APP_DRM_MESSAGE));
+    }
+
+    public static boolean isUnspecified(String contentType) {
+        return (null != contentType) && contentType.endsWith("*");
+    }
+
+    @SuppressWarnings("unchecked")
+    public static ArrayList<String> getImageTypes() {
+        return (ArrayList<String>) sSupportedImageTypes.clone();
+    }
+
+    @SuppressWarnings("unchecked")
+    public static ArrayList<String> getAudioTypes() {
+        return (ArrayList<String>) sSupportedAudioTypes.clone();
+    }
+
+    @SuppressWarnings("unchecked")
+    public static ArrayList<String> getVideoTypes() {
+        return (ArrayList<String>) sSupportedVideoTypes.clone();
+    }
+
+    @SuppressWarnings("unchecked")
+    public static ArrayList<String> getSupportedTypes() {
+        return (ArrayList<String>) sSupportedContentTypes.clone();
+    }
+}
diff --git a/android-smsmms/src/main/java/com/google/android/mms/InvalidHeaderValueException.java b/android-smsmms/src/main/java/com/google/android/mms/InvalidHeaderValueException.java
index 73d78328e..e37a7bde2 100755
--- a/android-smsmms/src/main/java/com/google/android/mms/InvalidHeaderValueException.java
+++ b/android-smsmms/src/main/java/com/google/android/mms/InvalidHeaderValueException.java
@@ -1,41 +1,41 @@
-/*
- * Copyright (C) 2007 Esmertec AG.
- * Copyright (C) 2007 The Android Open Source Project
- *
- * Licensed under the Apache License, Version 2.0 (the "License");
- * you may not use this file except in compliance with the License.
- * You may obtain a copy of the License at
- *
- *      http://www.apache.org/licenses/LICENSE-2.0
- *
- * Unless required by applicable law or agreed to in writing, software
- * distributed under the License is distributed on an "AS IS" BASIS,
- * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
- * See the License for the specific language governing permissions and
- * limitations under the License.
- */
-
-package com.google.android.mms;
-
-/**
- * Thrown when an invalid header value was set.
- */
-public class InvalidHeaderValueException extends MmsException {
-    private static final long serialVersionUID = -2053384496042052262L;
-
-    /**
-     * Constructs an InvalidHeaderValueException with no detailed message.
-     */
-    public InvalidHeaderValueException() {
-        super();
-    }
-
-    /**
-     * Constructs an InvalidHeaderValueException with the specified detailed message.
-     *
-     * @param message the detailed message.
-     */
-    public InvalidHeaderValueException(String message) {
-        super(message);
-    }
-}
+/*
+ * Copyright (C) 2007 Esmertec AG.
+ * Copyright (C) 2007 The Android Open Source Project
+ *
+ * Licensed under the Apache License, Version 2.0 (the "License");
+ * you may not use this file except in compliance with the License.
+ * You may obtain a copy of the License at
+ *
+ *      http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing, software
+ * distributed under the License is distributed on an "AS IS" BASIS,
+ * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ * See the License for the specific language governing permissions and
+ * limitations under the License.
+ */
+
+package com.google.android.mms;
+
+/**
+ * Thrown when an invalid header value was set.
+ */
+public class InvalidHeaderValueException extends MmsException {
+    private static final long serialVersionUID = -2053384496042052262L;
+
+    /**
+     * Constructs an InvalidHeaderValueException with no detailed message.
+     */
+    public InvalidHeaderValueException() {
+        super();
+    }
+
+    /**
+     * Constructs an InvalidHeaderValueException with the specified detailed message.
+     *
+     * @param message the detailed message.
+     */
+    public InvalidHeaderValueException(String message) {
+        super(message);
+    }
+}
diff --git a/android-smsmms/src/main/java/com/google/android/mms/MMSPart.kt b/android-smsmms/src/main/java/com/google/android/mms/MMSPart.kt
index 053f4f1a6..c08fdf60d 100755
--- a/android-smsmms/src/main/java/com/google/android/mms/MMSPart.kt
+++ b/android-smsmms/src/main/java/com/google/android/mms/MMSPart.kt
@@ -1,7 +1,7 @@
-package com.google.android.mms
-
-class MMSPart @JvmOverloads constructor(
-        var name: String = "",
-        var mimeType: String = "",
-        var data: ByteArray? = null
+package com.google.android.mms
+
+class MMSPart @JvmOverloads constructor(
+        var name: String = "",
+        var mimeType: String = "",
+        var data: ByteArray? = null
 )
\ No newline at end of file
diff --git a/android-smsmms/src/main/java/com/google/android/mms/MmsException.java b/android-smsmms/src/main/java/com/google/android/mms/MmsException.java
index 6ca0c7eab..6fb304329 100755
--- a/android-smsmms/src/main/java/com/google/android/mms/MmsException.java
+++ b/android-smsmms/src/main/java/com/google/android/mms/MmsException.java
@@ -1,60 +1,60 @@
-/*
- * Copyright (C) 2007 Esmertec AG.
- * Copyright (C) 2007 The Android Open Source Project
- *
- * Licensed under the Apache License, Version 2.0 (the "License");
- * you may not use this file except in compliance with the License.
- * You may obtain a copy of the License at
- *
- *      http://www.apache.org/licenses/LICENSE-2.0
- *
- * Unless required by applicable law or agreed to in writing, software
- * distributed under the License is distributed on an "AS IS" BASIS,
- * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
- * See the License for the specific language governing permissions and
- * limitations under the License.
- */
-
-package com.google.android.mms;
-
-/**
- * A generic exception that is thrown by the Mms client.
- */
-public class MmsException extends Exception {
-    private static final long serialVersionUID = -7323249827281485390L;
-
-    /**
-     * Creates a new MmsException.
-     */
-    public MmsException() {
-        super();
-    }
-
-    /**
-     * Creates a new MmsException with the specified detail message.
-     *
-     * @param message the detail message.
-     */
-    public MmsException(String message) {
-        super(message);
-    }
-
-    /**
-     * Creates a new MmsException with the specified cause.
-     *
-     * @param cause the cause.
-     */
-    public MmsException(Throwable cause) {
-        super(cause);
-    }
-
-    /**
-     * Creates a new MmsException with the specified detail message and cause.
-     *
-     * @param message the detail message.
-     * @param cause the cause.
-     */
-    public MmsException(String message, Throwable cause) {
-        super(message, cause);
-    }
-}
+/*
+ * Copyright (C) 2007 Esmertec AG.
+ * Copyright (C) 2007 The Android Open Source Project
+ *
+ * Licensed under the Apache License, Version 2.0 (the "License");
+ * you may not use this file except in compliance with the License.
+ * You may obtain a copy of the License at
+ *
+ *      http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing, software
+ * distributed under the License is distributed on an "AS IS" BASIS,
+ * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ * See the License for the specific language governing permissions and
+ * limitations under the License.
+ */
+
+package com.google.android.mms;
+
+/**
+ * A generic exception that is thrown by the Mms client.
+ */
+public class MmsException extends Exception {
+    private static final long serialVersionUID = -7323249827281485390L;
+
+    /**
+     * Creates a new MmsException.
+     */
+    public MmsException() {
+        super();
+    }
+
+    /**
+     * Creates a new MmsException with the specified detail message.
+     *
+     * @param message the detail message.
+     */
+    public MmsException(String message) {
+        super(message);
+    }
+
+    /**
+     * Creates a new MmsException with the specified cause.
+     *
+     * @param cause the cause.
+     */
+    public MmsException(Throwable cause) {
+        super(cause);
+    }
+
+    /**
+     * Creates a new MmsException with the specified detail message and cause.
+     *
+     * @param message the detail message.
+     * @param cause the cause.
+     */
+    public MmsException(String message, Throwable cause) {
+        super(message, cause);
+    }
+}
diff --git a/android-smsmms/src/main/java/com/google/android/mms/pdu_alt/AcknowledgeInd.java b/android-smsmms/src/main/java/com/google/android/mms/pdu_alt/AcknowledgeInd.java
index c3a5e5d6c..8c364688c 100755
--- a/android-smsmms/src/main/java/com/google/android/mms/pdu_alt/AcknowledgeInd.java
+++ b/android-smsmms/src/main/java/com/google/android/mms/pdu_alt/AcknowledgeInd.java
@@ -1,88 +1,88 @@
-/*
- * Copyright (C) 2015 Jacob Klinker
- *
- * Licensed under the Apache License, Version 2.0 (the "License");
- * you may not use this file except in compliance with the License.
- * You may obtain a copy of the License at
- *
- * http://www.apache.org/licenses/LICENSE-2.0
- *
- * Unless required by applicable law or agreed to in writing, software
- * distributed under the License is distributed on an "AS IS" BASIS,
- * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
- * See the License for the specific language governing permissions and
- * limitations under the License.
- */
-
-package com.google.android.mms.pdu_alt;
-
-import com.google.android.mms.InvalidHeaderValueException;
-
-/**
- * M-Acknowledge.ind PDU.
- */
-public class AcknowledgeInd extends GenericPdu {
-    /**
-     * Constructor, used when composing a M-Acknowledge.ind pdu.
-     *
-     * @param mmsVersion current viersion of mms
-     * @param transactionId the transaction-id value
-     * @throws InvalidHeaderValueException if parameters are invalid.
-     *         NullPointerException if transactionId is null.
-     */
-    public AcknowledgeInd(int mmsVersion, byte[] transactionId)
-            throws InvalidHeaderValueException {
-        super();
-
-        setMessageType(PduHeaders.MESSAGE_TYPE_ACKNOWLEDGE_IND);
-        setMmsVersion(mmsVersion);
-        setTransactionId(transactionId);
-    }
-
-    /**
-     * Constructor with given headers.
-     *
-     * @param headers Headers for this PDU.
-     */
-    AcknowledgeInd(PduHeaders headers) {
-        super(headers);
-    }
-
-    /**
-     * Get X-Mms-Report-Allowed field value.
-     *
-     * @return the X-Mms-Report-Allowed value
-     */
-    public int getReportAllowed() {
-        return mPduHeaders.getOctet(PduHeaders.REPORT_ALLOWED);
-    }
-
-    /**
-     * Set X-Mms-Report-Allowed field value.
-     *
-     * @param value the value
-     * @throws InvalidHeaderValueException if the value is invalid.
-     */
-    public void setReportAllowed(int value) throws InvalidHeaderValueException {
-        mPduHeaders.setOctet(value, PduHeaders.REPORT_ALLOWED);
-    }
-
-    /**
-     * Get X-Mms-Transaction-Id field value.
-     *
-     * @return the X-Mms-Report-Allowed value
-     */
-    public byte[] getTransactionId() {
-        return mPduHeaders.getTextString(PduHeaders.TRANSACTION_ID);
-    }
-
-    /**
-     * Set X-Mms-Transaction-Id field value.
-     *
-     * @param value the value
-     * @throws NullPointerException if the value is null.
-     */
-    public void setTransactionId(byte[] value) {
-        mPduHeaders.setTextString(value, PduHeaders.TRANSACTION_ID);
-    }
-}
+/*
+ * Copyright (C) 2015 Jacob Klinker
+ *
+ * Licensed under the Apache License, Version 2.0 (the "License");
+ * you may not use this file except in compliance with the License.
+ * You may obtain a copy of the License at
+ *
+ * http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing, software
+ * distributed under the License is distributed on an "AS IS" BASIS,
+ * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ * See the License for the specific language governing permissions and
+ * limitations under the License.
+ */
+
+package com.google.android.mms.pdu_alt;
+
+import com.google.android.mms.InvalidHeaderValueException;
+
+/**
+ * M-Acknowledge.ind PDU.
+ */
+public class AcknowledgeInd extends GenericPdu {
+    /**
+     * Constructor, used when composing a M-Acknowledge.ind pdu.
+     *
+     * @param mmsVersion current viersion of mms
+     * @param transactionId the transaction-id value
+     * @throws InvalidHeaderValueException if parameters are invalid.
+     *         NullPointerException if transactionId is null.
+     */
+    public AcknowledgeInd(int mmsVersion, byte[] transactionId)
+            throws InvalidHeaderValueException {
+        super();
+
+        setMessageType(PduHeaders.MESSAGE_TYPE_ACKNOWLEDGE_IND);
+        setMmsVersion(mmsVersion);
+        setTransactionId(transactionId);
+    }
+
+    /**
+     * Constructor with given headers.
+     *
+     * @param headers Headers for this PDU.
+     */
+    AcknowledgeInd(PduHeaders headers) {
+        super(headers);
+    }
+
+    /**
+     * Get X-Mms-Report-Allowed field value.
+     *
+     * @return the X-Mms-Report-Allowed value
+     */
+    public int getReportAllowed() {
+        return mPduHeaders.getOctet(PduHeaders.REPORT_ALLOWED);
+    }
+
+    /**
+     * Set X-Mms-Report-Allowed field value.
+     *
+     * @param value the value
+     * @throws InvalidHeaderValueException if the value is invalid.
+     */
+    public void setReportAllowed(int value) throws InvalidHeaderValueException {
+        mPduHeaders.setOctet(value, PduHeaders.REPORT_ALLOWED);
+    }
+
+    /**
+     * Get X-Mms-Transaction-Id field value.
+     *
+     * @return the X-Mms-Report-Allowed value
+     */
+    public byte[] getTransactionId() {
+        return mPduHeaders.getTextString(PduHeaders.TRANSACTION_ID);
+    }
+
+    /**
+     * Set X-Mms-Transaction-Id field value.
+     *
+     * @param value the value
+     * @throws NullPointerException if the value is null.
+     */
+    public void setTransactionId(byte[] value) {
+        mPduHeaders.setTextString(value, PduHeaders.TRANSACTION_ID);
+    }
+}
diff --git a/android-smsmms/src/main/java/com/google/android/mms/pdu_alt/Base64.java b/android-smsmms/src/main/java/com/google/android/mms/pdu_alt/Base64.java
index 03741c355..e23d62ef7 100755
--- a/android-smsmms/src/main/java/com/google/android/mms/pdu_alt/Base64.java
+++ b/android-smsmms/src/main/java/com/google/android/mms/pdu_alt/Base64.java
@@ -1,166 +1,166 @@
-/*
- * Copyright (C) 2015 Jacob Klinker
- *
- * Licensed under the Apache License, Version 2.0 (the "License");
- * you may not use this file except in compliance with the License.
- * You may obtain a copy of the License at
- *
- * http://www.apache.org/licenses/LICENSE-2.0
- *
- * Unless required by applicable law or agreed to in writing, software
- * distributed under the License is distributed on an "AS IS" BASIS,
- * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
- * See the License for the specific language governing permissions and
- * limitations under the License.
- */
-
-package com.google.android.mms.pdu_alt;
-
-public class Base64 {
-    /**
-     * Used to get the number of Quadruples.
-     */
-    static final int FOURBYTE = 4;
-
-    /**
-     * Byte used to pad output.
-     */
-    static final byte PAD = (byte) '=';
-
-    /**
-     * The base length.
-     */
-    static final int BASELENGTH = 255;
-
-    // Create arrays to hold the base64 characters
-    private static byte[] base64Alphabet = new byte[BASELENGTH];
-
-    // Populating the character arrays
-    static {
-        for (int i = 0; i < BASELENGTH; i++) {
-            base64Alphabet[i] = (byte) -1;
-        }
-        for (int i = 'Z'; i >= 'A'; i--) {
-            base64Alphabet[i] = (byte) (i - 'A');
-        }
-        for (int i = 'z'; i >= 'a'; i--) {
-            base64Alphabet[i] = (byte) (i - 'a' + 26);
-        }
-        for (int i = '9'; i >= '0'; i--) {
-            base64Alphabet[i] = (byte) (i - '0' + 52);
-        }
-
-        base64Alphabet['+'] = 62;
-        base64Alphabet['/'] = 63;
-    }
-
-    /**
-     * Decodes Base64 data into octects
-     *
-     * @param base64Data Byte array containing Base64 data
-     * @return Array containing decoded data.
-     */
-    public static byte[] decodeBase64(byte[] base64Data) {
-        // RFC 2045 requires that we discard ALL non-Base64 characters
-        base64Data = discardNonBase64(base64Data);
-
-        // handle the edge case, so we don't have to worry about it later
-        if (base64Data.length == 0) {
-            return new byte[0];
-        }
-
-        int numberQuadruple = base64Data.length / FOURBYTE;
-        byte decodedData[] = null;
-        byte b1 = 0, b2 = 0, b3 = 0, b4 = 0, marker0 = 0, marker1 = 0;
-
-        // Throw away anything not in base64Data
-
-        int encodedIndex = 0;
-        int dataIndex = 0;
-        {
-            // this sizes the output array properly - rlw
-            int lastData = base64Data.length;
-            // ignore the '=' padding
-            while (base64Data[lastData - 1] == PAD) {
-                if (--lastData == 0) {
-                    return new byte[0];
-                }
-            }
-            decodedData = new byte[lastData - numberQuadruple];
-        }
-
-        for (int i = 0; i < numberQuadruple; i++) {
-            dataIndex = i * 4;
-            marker0 = base64Data[dataIndex + 2];
-            marker1 = base64Data[dataIndex + 3];
-
-            b1 = base64Alphabet[base64Data[dataIndex]];
-            b2 = base64Alphabet[base64Data[dataIndex + 1]];
-
-            if (marker0 != PAD && marker1 != PAD) {
-                //No PAD e.g 3cQl
-                b3 = base64Alphabet[marker0];
-                b4 = base64Alphabet[marker1];
-
-                decodedData[encodedIndex] = (byte) (b1 << 2 | b2 >> 4);
-                decodedData[encodedIndex + 1] =
-                    (byte) (((b2 & 0xf) << 4) | ((b3 >> 2) & 0xf));
-                decodedData[encodedIndex + 2] = (byte) (b3 << 6 | b4);
-            } else if (marker0 == PAD) {
-                //Two PAD e.g. 3c[Pad][Pad]
-                decodedData[encodedIndex] = (byte) (b1 << 2 | b2 >> 4);
-            } else if (marker1 == PAD) {
-                //One PAD e.g. 3cQ[Pad]
-                b3 = base64Alphabet[marker0];
-
-                decodedData[encodedIndex] = (byte) (b1 << 2 | b2 >> 4);
-                decodedData[encodedIndex + 1] =
-                    (byte) (((b2 & 0xf) << 4) | ((b3 >> 2) & 0xf));
-            }
-            encodedIndex += 3;
-        }
-        return decodedData;
-    }
-
-    /**
-     * Check octect wheter it is a base64 encoding.
-     *
-     * @param octect to be checked byte
-     * @return ture if it is base64 encoding, false otherwise.
-     */
-    private static boolean isBase64(byte octect) {
-        if (octect == PAD) {
-            return true;
-        } else if (base64Alphabet[octect] == -1) {
-            return false;
-        } else {
-            return true;
-        }
-    }
-
-    /**
-     * Discards any characters outside of the base64 alphabet, per
-     * the requirements on page 25 of RFC 2045 - "Any characters
-     * outside of the base64 alphabet are to be ignored in base64
-     * encoded data."
-     *
-     * @param data The base-64 encoded data to groom
-     * @return The data, less non-base64 characters (see RFC 2045).
-     */
-    static byte[] discardNonBase64(byte[] data) {
-        byte groomedData[] = new byte[data.length];
-        int bytesCopied = 0;
-
-        for (int i = 0; i < data.length; i++) {
-            if (isBase64(data[i])) {
-                groomedData[bytesCopied++] = data[i];
-            }
-        }
-
-        byte packedData[] = new byte[bytesCopied];
-
-        System.arraycopy(groomedData, 0, packedData, 0, bytesCopied);
-
-        return packedData;
-    }
-}
+/*
+ * Copyright (C) 2015 Jacob Klinker
+ *
+ * Licensed under the Apache License, Version 2.0 (the "License");
+ * you may not use this file except in compliance with the License.
+ * You may obtain a copy of the License at
+ *
+ * http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing, software
+ * distributed under the License is distributed on an "AS IS" BASIS,
+ * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ * See the License for the specific language governing permissions and
+ * limitations under the License.
+ */
+
+package com.google.android.mms.pdu_alt;
+
+public class Base64 {
+    /**
+     * Used to get the number of Quadruples.
+     */
+    static final int FOURBYTE = 4;
+
+    /**
+     * Byte used to pad output.
+     */
+    static final byte PAD = (byte) '=';
+
+    /**
+     * The base length.
+     */
+    static final int BASELENGTH = 255;
+
+    // Create arrays to hold the base64 characters
+    private static byte[] base64Alphabet = new byte[BASELENGTH];
+
+    // Populating the character arrays
+    static {
+        for (int i = 0; i < BASELENGTH; i++) {
+            base64Alphabet[i] = (byte) -1;
+        }
+        for (int i = 'Z'; i >= 'A'; i--) {
+            base64Alphabet[i] = (byte) (i - 'A');
+        }
+        for (int i = 'z'; i >= 'a'; i--) {
+            base64Alphabet[i] = (byte) (i - 'a' + 26);
+        }
+        for (int i = '9'; i >= '0'; i--) {
+            base64Alphabet[i] = (byte) (i - '0' + 52);
+        }
+
+        base64Alphabet['+'] = 62;
+        base64Alphabet['/'] = 63;
+    }
+
+    /**
+     * Decodes Base64 data into octects
+     *
+     * @param base64Data Byte array containing Base64 data
+     * @return Array containing decoded data.
+     */
+    public static byte[] decodeBase64(byte[] base64Data) {
+        // RFC 2045 requires that we discard ALL non-Base64 characters
+        base64Data = discardNonBase64(base64Data);
+
+        // handle the edge case, so we don't have to worry about it later
+        if (base64Data.length == 0) {
+            return new byte[0];
+        }
+
+        int numberQuadruple = base64Data.length / FOURBYTE;
+        byte decodedData[] = null;
+        byte b1 = 0, b2 = 0, b3 = 0, b4 = 0, marker0 = 0, marker1 = 0;
+
+        // Throw away anything not in base64Data
+
+        int encodedIndex = 0;
+        int dataIndex = 0;
+        {
+            // this sizes the output array properly - rlw
+            int lastData = base64Data.length;
+            // ignore the '=' padding
+            while (base64Data[lastData - 1] == PAD) {
+                if (--lastData == 0) {
+                    return new byte[0];
+                }
+            }
+            decodedData = new byte[lastData - numberQuadruple];
+        }
+
+        for (int i = 0; i < numberQuadruple; i++) {
+            dataIndex = i * 4;
+            marker0 = base64Data[dataIndex + 2];
+            marker1 = base64Data[dataIndex + 3];
+
+            b1 = base64Alphabet[base64Data[dataIndex]];
+            b2 = base64Alphabet[base64Data[dataIndex + 1]];
+
+            if (marker0 != PAD && marker1 != PAD) {
+                //No PAD e.g 3cQl
+                b3 = base64Alphabet[marker0];
+                b4 = base64Alphabet[marker1];
+
+                decodedData[encodedIndex] = (byte) (b1 << 2 | b2 >> 4);
+                decodedData[encodedIndex + 1] =
+                    (byte) (((b2 & 0xf) << 4) | ((b3 >> 2) & 0xf));
+                decodedData[encodedIndex + 2] = (byte) (b3 << 6 | b4);
+            } else if (marker0 == PAD) {
+                //Two PAD e.g. 3c[Pad][Pad]
+                decodedData[encodedIndex] = (byte) (b1 << 2 | b2 >> 4);
+            } else if (marker1 == PAD) {
+                //One PAD e.g. 3cQ[Pad]
+                b3 = base64Alphabet[marker0];
+
+                decodedData[encodedIndex] = (byte) (b1 << 2 | b2 >> 4);
+                decodedData[encodedIndex + 1] =
+                    (byte) (((b2 & 0xf) << 4) | ((b3 >> 2) & 0xf));
+            }
+            encodedIndex += 3;
+        }
+        return decodedData;
+    }
+
+    /**
+     * Check octect wheter it is a base64 encoding.
+     *
+     * @param octect to be checked byte
+     * @return ture if it is base64 encoding, false otherwise.
+     */
+    private static boolean isBase64(byte octect) {
+        if (octect == PAD) {
+            return true;
+        } else if (base64Alphabet[octect] == -1) {
+            return false;
+        } else {
+            return true;
+        }
+    }
+
+    /**
+     * Discards any characters outside of the base64 alphabet, per
+     * the requirements on page 25 of RFC 2045 - "Any characters
+     * outside of the base64 alphabet are to be ignored in base64
+     * encoded data."
+     *
+     * @param data The base-64 encoded data to groom
+     * @return The data, less non-base64 characters (see RFC 2045).
+     */
+    static byte[] discardNonBase64(byte[] data) {
+        byte groomedData[] = new byte[data.length];
+        int bytesCopied = 0;
+
+        for (int i = 0; i < data.length; i++) {
+            if (isBase64(data[i])) {
+                groomedData[bytesCopied++] = data[i];
+            }
+        }
+
+        byte packedData[] = new byte[bytesCopied];
+
+        System.arraycopy(groomedData, 0, packedData, 0, bytesCopied);
+
+        return packedData;
+    }
+}
diff --git a/android-smsmms/src/main/java/com/google/android/mms/pdu_alt/CharacterSets.java b/android-smsmms/src/main/java/com/google/android/mms/pdu_alt/CharacterSets.java
index fa4aa9137..e002b0247 100755
--- a/android-smsmms/src/main/java/com/google/android/mms/pdu_alt/CharacterSets.java
+++ b/android-smsmms/src/main/java/com/google/android/mms/pdu_alt/CharacterSets.java
@@ -1,171 +1,171 @@
-/*
- * Copyright (C) 2015 Jacob Klinker
- *
- * Licensed under the Apache License, Version 2.0 (the "License");
- * you may not use this file except in compliance with the License.
- * You may obtain a copy of the License at
- *
- * http://www.apache.org/licenses/LICENSE-2.0
- *
- * Unless required by applicable law or agreed to in writing, software
- * distributed under the License is distributed on an "AS IS" BASIS,
- * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
- * See the License for the specific language governing permissions and
- * limitations under the License.
- */
-
-package com.google.android.mms.pdu_alt;
-
-import java.io.UnsupportedEncodingException;
-import java.util.HashMap;
-
-public class CharacterSets {
-    /**
-     * IANA assigned MIB enum numbers.
-     *
-     * From wap-230-wsp-20010705-a.pdf
-     * Any-charset = <Octet 128>
-     * Equivalent to the special RFC2616 charset value "*"
-     */
-    public static final int ANY_CHARSET = 0x00;
-    public static final int US_ASCII    = 0x03;
-    public static final int ISO_8859_1  = 0x04;
-    public static final int ISO_8859_2  = 0x05;
-    public static final int ISO_8859_3  = 0x06;
-    public static final int ISO_8859_4  = 0x07;
-    public static final int ISO_8859_5  = 0x08;
-    public static final int ISO_8859_6  = 0x09;
-    public static final int ISO_8859_7  = 0x0A;
-    public static final int ISO_8859_8  = 0x0B;
-    public static final int ISO_8859_9  = 0x0C;
-    public static final int SHIFT_JIS   = 0x11;
-    public static final int UTF_8       = 0x6A;
-    public static final int BIG5        = 0x07EA;
-    public static final int UCS2        = 0x03E8;
-    public static final int UTF_16      = 0x03F7;
-
-    /**
-     * If the encoding of given data is unsupported, use UTF_8 to decode it.
-     */
-    public static final int DEFAULT_CHARSET = UTF_8;
-
-    /**
-     * Array of MIB enum numbers.
-     */
-    private static final int[] MIBENUM_NUMBERS = {
-        ANY_CHARSET,
-        US_ASCII,
-        ISO_8859_1,
-        ISO_8859_2,
-        ISO_8859_3,
-        ISO_8859_4,
-        ISO_8859_5,
-        ISO_8859_6,
-        ISO_8859_7,
-        ISO_8859_8,
-        ISO_8859_9,
-        SHIFT_JIS,
-        UTF_8,
-        BIG5,
-        UCS2,
-        UTF_16,
-    };
-
-    /**
-     * The Well-known-charset Mime name.
-     */
-    public static final String MIMENAME_ANY_CHARSET = "*";
-    public static final String MIMENAME_US_ASCII    = "us-ascii";
-    public static final String MIMENAME_ISO_8859_1  = "iso-8859-1";
-    public static final String MIMENAME_ISO_8859_2  = "iso-8859-2";
-    public static final String MIMENAME_ISO_8859_3  = "iso-8859-3";
-    public static final String MIMENAME_ISO_8859_4  = "iso-8859-4";
-    public static final String MIMENAME_ISO_8859_5  = "iso-8859-5";
-    public static final String MIMENAME_ISO_8859_6  = "iso-8859-6";
-    public static final String MIMENAME_ISO_8859_7  = "iso-8859-7";
-    public static final String MIMENAME_ISO_8859_8  = "iso-8859-8";
-    public static final String MIMENAME_ISO_8859_9  = "iso-8859-9";
-    public static final String MIMENAME_SHIFT_JIS   = "shift_JIS";
-    public static final String MIMENAME_UTF_8       = "utf-8";
-    public static final String MIMENAME_BIG5        = "big5";
-    public static final String MIMENAME_UCS2        = "iso-10646-ucs-2";
-    public static final String MIMENAME_UTF_16      = "utf-16";
-
-    public static final String DEFAULT_CHARSET_NAME = MIMENAME_UTF_8;
-
-    /**
-     * Array of the names of character sets.
-     */
-    private static final String[] MIME_NAMES = {
-        MIMENAME_ANY_CHARSET,
-        MIMENAME_US_ASCII,
-        MIMENAME_ISO_8859_1,
-        MIMENAME_ISO_8859_2,
-        MIMENAME_ISO_8859_3,
-        MIMENAME_ISO_8859_4,
-        MIMENAME_ISO_8859_5,
-        MIMENAME_ISO_8859_6,
-        MIMENAME_ISO_8859_7,
-        MIMENAME_ISO_8859_8,
-        MIMENAME_ISO_8859_9,
-        MIMENAME_SHIFT_JIS,
-        MIMENAME_UTF_8,
-        MIMENAME_BIG5,
-        MIMENAME_UCS2,
-        MIMENAME_UTF_16,
-    };
-
-    private static final HashMap<Integer, String> MIBENUM_TO_NAME_MAP;
-    private static final HashMap<String, Integer> NAME_TO_MIBENUM_MAP;
-
-    static {
-        // Create the HashMaps.
-        MIBENUM_TO_NAME_MAP = new HashMap<Integer, String>();
-        NAME_TO_MIBENUM_MAP = new HashMap<String, Integer>();
-        assert(MIBENUM_NUMBERS.length == MIME_NAMES.length);
-        int count = MIBENUM_NUMBERS.length - 1;
-        for(int i = 0; i <= count; i++) {
-            MIBENUM_TO_NAME_MAP.put(MIBENUM_NUMBERS[i], MIME_NAMES[i]);
-            NAME_TO_MIBENUM_MAP.put(MIME_NAMES[i], MIBENUM_NUMBERS[i]);
-        }
-    }
-
-    private CharacterSets() {} // Non-instantiatable
-
-    /**
-     * Map an MIBEnum number to the name of the charset which this number
-     * is assigned to by IANA.
-     *
-     * @param mibEnumValue An IANA assigned MIBEnum number.
-     * @return The name string of the charset.
-     * @throws UnsupportedEncodingException
-     */
-    public static String getMimeName(int mibEnumValue)
-            throws UnsupportedEncodingException {
-        String name = MIBENUM_TO_NAME_MAP.get(mibEnumValue);
-        if (name == null) {
-            throw new UnsupportedEncodingException();
-        }
-        return name;
-    }
-
-    /**
-     * Map a well-known charset name to its assigned MIBEnum number.
-     *
-     * @param mimeName The charset name.
-     * @return The MIBEnum number assigned by IANA for this charset.
-     * @throws UnsupportedEncodingException
-     */
-    public static int getMibEnumValue(String mimeName)
-            throws UnsupportedEncodingException {
-        if(null == mimeName) {
-            return -1;
-        }
-
-        Integer mibEnumValue = NAME_TO_MIBENUM_MAP.get(mimeName);
-        if (mibEnumValue == null) {
-            throw new UnsupportedEncodingException();
-        }
-        return mibEnumValue;
-    }
-}
+/*
+ * Copyright (C) 2015 Jacob Klinker
+ *
+ * Licensed under the Apache License, Version 2.0 (the "License");
+ * you may not use this file except in compliance with the License.
+ * You may obtain a copy of the License at
+ *
+ * http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing, software
+ * distributed under the License is distributed on an "AS IS" BASIS,
+ * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ * See the License for the specific language governing permissions and
+ * limitations under the License.
+ */
+
+package com.google.android.mms.pdu_alt;
+
+import java.io.UnsupportedEncodingException;
+import java.util.HashMap;
+
+public class CharacterSets {
+    /**
+     * IANA assigned MIB enum numbers.
+     *
+     * From wap-230-wsp-20010705-a.pdf
+     * Any-charset = <Octet 128>
+     * Equivalent to the special RFC2616 charset value "*"
+     */
+    public static final int ANY_CHARSET = 0x00;
+    public static final int US_ASCII    = 0x03;
+    public static final int ISO_8859_1  = 0x04;
+    public static final int ISO_8859_2  = 0x05;
+    public static final int ISO_8859_3  = 0x06;
+    public static final int ISO_8859_4  = 0x07;
+    public static final int ISO_8859_5  = 0x08;
+    public static final int ISO_8859_6  = 0x09;
+    public static final int ISO_8859_7  = 0x0A;
+    public static final int ISO_8859_8  = 0x0B;
+    public static final int ISO_8859_9  = 0x0C;
+    public static final int SHIFT_JIS   = 0x11;
+    public static final int UTF_8       = 0x6A;
+    public static final int BIG5        = 0x07EA;
+    public static final int UCS2        = 0x03E8;
+    public static final int UTF_16      = 0x03F7;
+
+    /**
+     * If the encoding of given data is unsupported, use UTF_8 to decode it.
+     */
+    public static final int DEFAULT_CHARSET = UTF_8;
+
+    /**
+     * Array of MIB enum numbers.
+     */
+    private static final int[] MIBENUM_NUMBERS = {
+        ANY_CHARSET,
+        US_ASCII,
+        ISO_8859_1,
+        ISO_8859_2,
+        ISO_8859_3,
+        ISO_8859_4,
+        ISO_8859_5,
+        ISO_8859_6,
+        ISO_8859_7,
+        ISO_8859_8,
+        ISO_8859_9,
+        SHIFT_JIS,
+        UTF_8,
+        BIG5,
+        UCS2,
+        UTF_16,
+    };
+
+    /**
+     * The Well-known-charset Mime name.
+     */
+    public static final String MIMENAME_ANY_CHARSET = "*";
+    public static final String MIMENAME_US_ASCII    = "us-ascii";
+    public static final String MIMENAME_ISO_8859_1  = "iso-8859-1";
+    public static final String MIMENAME_ISO_8859_2  = "iso-8859-2";
+    public static final String MIMENAME_ISO_8859_3  = "iso-8859-3";
+    public static final String MIMENAME_ISO_8859_4  = "iso-8859-4";
+    public static final String MIMENAME_ISO_8859_5  = "iso-8859-5";
+    public static final String MIMENAME_ISO_8859_6  = "iso-8859-6";
+    public static final String MIMENAME_ISO_8859_7  = "iso-8859-7";
+    public static final String MIMENAME_ISO_8859_8  = "iso-8859-8";
+    public static final String MIMENAME_ISO_8859_9  = "iso-8859-9";
+    public static final String MIMENAME_SHIFT_JIS   = "shift_JIS";
+    public static final String MIMENAME_UTF_8       = "utf-8";
+    public static final String MIMENAME_BIG5        = "big5";
+    public static final String MIMENAME_UCS2        = "iso-10646-ucs-2";
+    public static final String MIMENAME_UTF_16      = "utf-16";
+
+    public static final String DEFAULT_CHARSET_NAME = MIMENAME_UTF_8;
+
+    /**
+     * Array of the names of character sets.
+     */
+    private static final String[] MIME_NAMES = {
+        MIMENAME_ANY_CHARSET,
+        MIMENAME_US_ASCII,
+        MIMENAME_ISO_8859_1,
+        MIMENAME_ISO_8859_2,
+        MIMENAME_ISO_8859_3,
+        MIMENAME_ISO_8859_4,
+        MIMENAME_ISO_8859_5,
+        MIMENAME_ISO_8859_6,
+        MIMENAME_ISO_8859_7,
+        MIMENAME_ISO_8859_8,
+        MIMENAME_ISO_8859_9,
+        MIMENAME_SHIFT_JIS,
+        MIMENAME_UTF_8,
+        MIMENAME_BIG5,
+        MIMENAME_UCS2,
+        MIMENAME_UTF_16,
+    };
+
+    private static final HashMap<Integer, String> MIBENUM_TO_NAME_MAP;
+    private static final HashMap<String, Integer> NAME_TO_MIBENUM_MAP;
+
+    static {
+        // Create the HashMaps.
+        MIBENUM_TO_NAME_MAP = new HashMap<Integer, String>();
+        NAME_TO_MIBENUM_MAP = new HashMap<String, Integer>();
+        assert(MIBENUM_NUMBERS.length == MIME_NAMES.length);
+        int count = MIBENUM_NUMBERS.length - 1;
+        for(int i = 0; i <= count; i++) {
+            MIBENUM_TO_NAME_MAP.put(MIBENUM_NUMBERS[i], MIME_NAMES[i]);
+            NAME_TO_MIBENUM_MAP.put(MIME_NAMES[i], MIBENUM_NUMBERS[i]);
+        }
+    }
+
+    private CharacterSets() {} // Non-instantiatable
+
+    /**
+     * Map an MIBEnum number to the name of the charset which this number
+     * is assigned to by IANA.
+     *
+     * @param mibEnumValue An IANA assigned MIBEnum number.
+     * @return The name string of the charset.
+     * @throws UnsupportedEncodingException
+     */
+    public static String getMimeName(int mibEnumValue)
+            throws UnsupportedEncodingException {
+        String name = MIBENUM_TO_NAME_MAP.get(mibEnumValue);
+        if (name == null) {
+            throw new UnsupportedEncodingException();
+        }
+        return name;
+    }
+
+    /**
+     * Map a well-known charset name to its assigned MIBEnum number.
+     *
+     * @param mimeName The charset name.
+     * @return The MIBEnum number assigned by IANA for this charset.
+     * @throws UnsupportedEncodingException
+     */
+    public static int getMibEnumValue(String mimeName)
+            throws UnsupportedEncodingException {
+        if(null == mimeName) {
+            return -1;
+        }
+
+        Integer mibEnumValue = NAME_TO_MIBENUM_MAP.get(mimeName);
+        if (mibEnumValue == null) {
+            throw new UnsupportedEncodingException();
+        }
+        return mibEnumValue;
+    }
+}
diff --git a/android-smsmms/src/main/java/com/google/android/mms/pdu_alt/DeliveryInd.java b/android-smsmms/src/main/java/com/google/android/mms/pdu_alt/DeliveryInd.java
index 149abe882..245031e91 100755
--- a/android-smsmms/src/main/java/com/google/android/mms/pdu_alt/DeliveryInd.java
+++ b/android-smsmms/src/main/java/com/google/android/mms/pdu_alt/DeliveryInd.java
@@ -1,137 +1,137 @@
-/*
- * Copyright (C) 2015 Jacob Klinker
- *
- * Licensed under the Apache License, Version 2.0 (the "License");
- * you may not use this file except in compliance with the License.
- * You may obtain a copy of the License at
- *
- * http://www.apache.org/licenses/LICENSE-2.0
- *
- * Unless required by applicable law or agreed to in writing, software
- * distributed under the License is distributed on an "AS IS" BASIS,
- * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
- * See the License for the specific language governing permissions and
- * limitations under the License.
- */
-
-package com.google.android.mms.pdu_alt;
-
-import com.google.android.mms.InvalidHeaderValueException;
-
-/**
- * M-Delivery.Ind Pdu.
- */
-public class DeliveryInd extends GenericPdu {
-    /**
-     * Empty constructor.
-     * Since the Pdu corresponding to this class is constructed
-     * by the Proxy-Relay server, this class is only instantiated
-     * by the Pdu Parser.
-     *
-     * @throws InvalidHeaderValueException if error occurs.
-     */
-    public DeliveryInd() throws InvalidHeaderValueException {
-        super();
-        setMessageType(PduHeaders.MESSAGE_TYPE_DELIVERY_IND);
-    }
-
-    /**
-     * Constructor with given headers.
-     *
-     * @param headers Headers for this PDU.
-     */
-    DeliveryInd(PduHeaders headers) {
-        super(headers);
-    }
-
-    /**
-     * Get Date value.
-     *
-     * @return the value
-     */
-    public long getDate() {
-        return mPduHeaders.getLongInteger(PduHeaders.DATE);
-    }
-
-    /**
-     * Set Date value.
-     *
-     * @param value the value
-     */
-    public void setDate(long value) {
-        mPduHeaders.setLongInteger(value, PduHeaders.DATE);
-    }
-
-    /**
-     * Get Message-ID value.
-     *
-     * @return the value
-     */
-    public byte[] getMessageId() {
-        return mPduHeaders.getTextString(PduHeaders.MESSAGE_ID);
-    }
-
-    /**
-     * Set Message-ID value.
-     *
-     * @param value the value, should not be null
-     * @throws NullPointerException if the value is null.
-     */
-    public void setMessageId(byte[] value) {
-        mPduHeaders.setTextString(value, PduHeaders.MESSAGE_ID);
-    }
-
-    /**
-     * Get Status value.
-     *
-     * @return the value
-     */
-    public int getStatus() {
-        return mPduHeaders.getOctet(PduHeaders.STATUS);
-    }
-
-    /**
-     * Set Status value.
-     *
-     * @param value the value
-     * @throws InvalidHeaderValueException if the value is invalid.
-     */
-    public void setStatus(int value) throws InvalidHeaderValueException {
-        mPduHeaders.setOctet(value, PduHeaders.STATUS);
-    }
-
-    /**
-     * Get To value.
-     *
-     * @return the value
-     */
-    public EncodedStringValue[] getTo() {
-        return mPduHeaders.getEncodedStringValues(PduHeaders.TO);
-    }
-
-    /**
-     * set To value.
-     *
-     * @param value the value
-     * @throws NullPointerException if the value is null.
-     */
-    public void setTo(EncodedStringValue[] value) {
-        mPduHeaders.setEncodedStringValues(value, PduHeaders.TO);
-    }
-
-    /*
-     * Optional, not supported header fields:
-     *
-     *     public byte[] getApplicId() {return null;}
-     *     public void setApplicId(byte[] value) {}
-     *
-     *     public byte[] getAuxApplicId() {return null;}
-     *     public void getAuxApplicId(byte[] value) {}
-     *
-     *     public byte[] getReplyApplicId() {return 0x00;}
-     *     public void setReplyApplicId(byte[] value) {}
-     *
-     *     public EncodedStringValue getStatusText() {return null;}
-     *     public void setStatusText(EncodedStringValue value) {}
-     */
-}
+/*
+ * Copyright (C) 2015 Jacob Klinker
+ *
+ * Licensed under the Apache License, Version 2.0 (the "License");
+ * you may not use this file except in compliance with the License.
+ * You may obtain a copy of the License at
+ *
+ * http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing, software
+ * distributed under the License is distributed on an "AS IS" BASIS,
+ * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ * See the License for the specific language governing permissions and
+ * limitations under the License.
+ */
+
+package com.google.android.mms.pdu_alt;
+
+import com.google.android.mms.InvalidHeaderValueException;
+
+/**
+ * M-Delivery.Ind Pdu.
+ */
+public class DeliveryInd extends GenericPdu {
+    /**
+     * Empty constructor.
+     * Since the Pdu corresponding to this class is constructed
+     * by the Proxy-Relay server, this class is only instantiated
+     * by the Pdu Parser.
+     *
+     * @throws InvalidHeaderValueException if error occurs.
+     */
+    public DeliveryInd() throws InvalidHeaderValueException {
+        super();
+        setMessageType(PduHeaders.MESSAGE_TYPE_DELIVERY_IND);
+    }
+
+    /**
+     * Constructor with given headers.
+     *
+     * @param headers Headers for this PDU.
+     */
+    DeliveryInd(PduHeaders headers) {
+        super(headers);
+    }
+
+    /**
+     * Get Date value.
+     *
+     * @return the value
+     */
+    public long getDate() {
+        return mPduHeaders.getLongInteger(PduHeaders.DATE);
+    }
+
+    /**
+     * Set Date value.
+     *
+     * @param value the value
+     */
+    public void setDate(long value) {
+        mPduHeaders.setLongInteger(value, PduHeaders.DATE);
+    }
+
+    /**
+     * Get Message-ID value.
+     *
+     * @return the value
+     */
+    public byte[] getMessageId() {
+        return mPduHeaders.getTextString(PduHeaders.MESSAGE_ID);
+    }
+
+    /**
+     * Set Message-ID value.
+     *
+     * @param value the value, should not be null
+     * @throws NullPointerException if the value is null.
+     */
+    public void setMessageId(byte[] value) {
+        mPduHeaders.setTextString(value, PduHeaders.MESSAGE_ID);
+    }
+
+    /**
+     * Get Status value.
+     *
+     * @return the value
+     */
+    public int getStatus() {
+        return mPduHeaders.getOctet(PduHeaders.STATUS);
+    }
+
+    /**
+     * Set Status value.
+     *
+     * @param value the value
+     * @throws InvalidHeaderValueException if the value is invalid.
+     */
+    public void setStatus(int value) throws InvalidHeaderValueException {
+        mPduHeaders.setOctet(value, PduHeaders.STATUS);
+    }
+
+    /**
+     * Get To value.
+     *
+     * @return the value
+     */
+    public EncodedStringValue[] getTo() {
+        return mPduHeaders.getEncodedStringValues(PduHeaders.TO);
+    }
+
+    /**
+     * set To value.
+     *
+     * @param value the value
+     * @throws NullPointerException if the value is null.
+     */
+    public void setTo(EncodedStringValue[] value) {
+        mPduHeaders.setEncodedStringValues(value, PduHeaders.TO);
+    }
+
+    /*
+     * Optional, not supported header fields:
+     *
+     *     public byte[] getApplicId() {return null;}
+     *     public void setApplicId(byte[] value) {}
+     *
+     *     public byte[] getAuxApplicId() {return null;}
+     *     public void getAuxApplicId(byte[] value) {}
+     *
+     *     public byte[] getReplyApplicId() {return 0x00;}
+     *     public void setReplyApplicId(byte[] value) {}
+     *
+     *     public EncodedStringValue getStatusText() {return null;}
+     *     public void setStatusText(EncodedStringValue value) {}
+     */
+}
diff --git a/android-smsmms/src/main/java/com/google/android/mms/pdu_alt/EncodedStringValue.java b/android-smsmms/src/main/java/com/google/android/mms/pdu_alt/EncodedStringValue.java
index 26de8f6b4..7a72bd10d 100755
--- a/android-smsmms/src/main/java/com/google/android/mms/pdu_alt/EncodedStringValue.java
+++ b/android-smsmms/src/main/java/com/google/android/mms/pdu_alt/EncodedStringValue.java
@@ -1,281 +1,281 @@
-/*
- * Copyright (C) 2015 Jacob Klinker
- *
- * Licensed under the Apache License, Version 2.0 (the "License");
- * you may not use this file except in compliance with the License.
- * You may obtain a copy of the License at
- *
- * http://www.apache.org/licenses/LICENSE-2.0
- *
- * Unless required by applicable law or agreed to in writing, software
- * distributed under the License is distributed on an "AS IS" BASIS,
- * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
- * See the License for the specific language governing permissions and
- * limitations under the License.
- */
-
-package com.google.android.mms.pdu_alt;
-
-import timber.log.Timber;
-
-import java.io.ByteArrayOutputStream;
-import java.io.IOException;
-import java.io.UnsupportedEncodingException;
-import java.util.ArrayList;
-
-/**
- * Encoded-string-value = Text-string | Value-length Char-set Text-string
- */
-public class EncodedStringValue implements Cloneable {
-    private static final boolean LOCAL_LOGV = false;
-
-    /**
-     * The Char-set value.
-     */
-    private int mCharacterSet;
-
-    /**
-     * The Text-string value.
-     */
-    private byte[] mData;
-
-    /**
-     * Constructor.
-     *
-     * @param charset the Char-set value
-     * @param data the Text-string value
-     * @throws NullPointerException if Text-string value is null.
-     */
-    public EncodedStringValue(int charset, byte[] data) {
-        // TODO: CharSet needs to be validated against MIBEnum.
-        if(null == data) {
-            throw new NullPointerException("EncodedStringValue: Text-string is null.");
-        }
-
-        mCharacterSet = charset;
-        mData = new byte[data.length];
-        System.arraycopy(data, 0, mData, 0, data.length);
-    }
-
-    /**
-     * Constructor.
-     *
-     * @param data the Text-string value
-     * @throws NullPointerException if Text-string value is null.
-     */
-    public EncodedStringValue(byte[] data) {
-        this(CharacterSets.DEFAULT_CHARSET, data);
-    }
-
-    public EncodedStringValue(String data) {
-        try {
-            mData = data.getBytes(CharacterSets.DEFAULT_CHARSET_NAME);
-            mCharacterSet = CharacterSets.DEFAULT_CHARSET;
-        } catch (UnsupportedEncodingException e) {
-            Timber.e(e, "Default encoding must be supported.");
-        }
-    }
-
-    /**
-     * Get Char-set value.
-     *
-     * @return the value
-     */
-    public int getCharacterSet() {
-        return mCharacterSet;
-    }
-
-    /**
-     * Set Char-set value.
-     *
-     * @param charset the Char-set value
-     */
-    public void setCharacterSet(int charset) {
-        // TODO: CharSet needs to be validated against MIBEnum.
-        mCharacterSet = charset;
-    }
-
-    /**
-     * Get Text-string value.
-     *
-     * @return the value
-     */
-    public byte[] getTextString() {
-        byte[] byteArray = new byte[mData.length];
-
-        System.arraycopy(mData, 0, byteArray, 0, mData.length);
-        return byteArray;
-    }
-
-    /**
-     * Set Text-string value.
-     *
-     * @param textString the Text-string value
-     * @throws NullPointerException if Text-string value is null.
-     */
-    public void setTextString(byte[] textString) {
-        if(null == textString) {
-            throw new NullPointerException("EncodedStringValue: Text-string is null.");
-        }
-
-        mData = new byte[textString.length];
-        System.arraycopy(textString, 0, mData, 0, textString.length);
-    }
-
-    /**
-     * Convert this object to a {@link String}. If the encoding of
-     * the EncodedStringValue is null or unsupported, it will be
-     * treated as iso-8859-1 encoding.
-     *
-     * @return The decoded String.
-     */
-    public String getString()  {
-        if (CharacterSets.ANY_CHARSET == mCharacterSet) {
-            return new String(mData); // system default encoding.
-        } else {
-            try {
-                String name = CharacterSets.getMimeName(mCharacterSet);
-                return new String(mData, name);
-            } catch (UnsupportedEncodingException e) {
-            	if (LOCAL_LOGV) {
-            		Timber.v(e, e.getMessage());
-            	}
-            	try {
-                    return new String(mData, CharacterSets.MIMENAME_ISO_8859_1);
-                } catch (UnsupportedEncodingException f) {
-                    return new String(mData); // system default encoding.
-                }
-            }
-        }
-    }
-
-    /**
-     * Append to Text-string.
-     *
-     * @param textString the textString to append
-     * @throws NullPointerException if the text String is null
-     *                      or an IOException occured.
-     */
-    public void appendTextString(byte[] textString) {
-        if(null == textString) {
-            throw new NullPointerException("Text-string is null.");
-        }
-
-        if(null == mData) {
-            mData = new byte[textString.length];
-            System.arraycopy(textString, 0, mData, 0, textString.length);
-        } else {
-            ByteArrayOutputStream newTextString = new ByteArrayOutputStream();
-            try {
-                newTextString.write(mData);
-                newTextString.write(textString);
-            } catch (IOException e) {
-                Timber.e(e, "logging error");
-                e.printStackTrace();
-                throw new NullPointerException(
-                        "appendTextString: failed when write a new Text-string");
-            }
-
-            mData = newTextString.toByteArray();
-        }
-    }
-
-    /*
-     * (non-Javadoc)
-     * @see java.lang.Object#clone()
-     */
-    @Override
-    public Object clone() throws CloneNotSupportedException {
-        super.clone();
-        int len = mData.length;
-        byte[] dstBytes = new byte[len];
-        System.arraycopy(mData, 0, dstBytes, 0, len);
-
-        try {
-            return new EncodedStringValue(mCharacterSet, dstBytes);
-        } catch (Exception e) {
-            Timber.e(e, "logging error");
-            e.printStackTrace();
-            throw new CloneNotSupportedException(e.getMessage());
-        }
-    }
-
-    /**
-     * Split this encoded string around matches of the given pattern.
-     *
-     * @param pattern the delimiting pattern
-     * @return the array of encoded strings computed by splitting this encoded
-     *         string around matches of the given pattern
-     */
-    public EncodedStringValue[] split(String pattern) {
-        String[] temp = getString().split(pattern);
-        EncodedStringValue[] ret = new EncodedStringValue[temp.length];
-        for (int i = 0; i < ret.length; ++i) {
-            try {
-                ret[i] = new EncodedStringValue(mCharacterSet,
-                        temp[i].getBytes());
-            } catch (NullPointerException e) {
-                // Can't arrive here
-                return null;
-            }
-        }
-        return ret;
-    }
-
-    /**
-     * Extract an EncodedStringValue[] from a given String.
-     */
-    public static EncodedStringValue[] extract(String src) {
-        String[] values = src.split(";");
-
-        ArrayList<EncodedStringValue> list = new ArrayList<EncodedStringValue>();
-        for (int i = 0; i < values.length; i++) {
-            if (values[i].length() > 0) {
-                list.add(new EncodedStringValue(values[i]));
-            }
-        }
-
-        int len = list.size();
-        if (len > 0) {
-            return list.toArray(new EncodedStringValue[len]);
-        } else {
-            return null;
-        }
-    }
-
-    /**
-     * Concatenate an EncodedStringValue[] into a single String.
-     */
-    public static String concat(EncodedStringValue[] addr) {
-        StringBuilder sb = new StringBuilder();
-        int maxIndex = addr.length - 1;
-        for (int i = 0; i <= maxIndex; i++) {
-            sb.append(addr[i].getString());
-            if (i < maxIndex) {
-                sb.append(";");
-            }
-        }
-
-        return sb.toString();
-    }
-
-    public static EncodedStringValue copy(EncodedStringValue value) {
-        if (value == null) {
-            return null;
-        }
-
-        return new EncodedStringValue(value.mCharacterSet, value.mData);
-    }
-
-    public static EncodedStringValue[] encodeStrings(String[] array) {
-        int count = array.length;
-        if (count > 0) {
-            EncodedStringValue[] encodedArray = new EncodedStringValue[count];
-            for (int i = 0; i < count; i++) {
-                encodedArray[i] = new EncodedStringValue(array[i]);
-            }
-            return encodedArray;
-        }
-        return null;
-    }
-}
+/*
+ * Copyright (C) 2015 Jacob Klinker
+ *
+ * Licensed under the Apache License, Version 2.0 (the "License");
+ * you may not use this file except in compliance with the License.
+ * You may obtain a copy of the License at
+ *
+ * http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing, software
+ * distributed under the License is distributed on an "AS IS" BASIS,
+ * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ * See the License for the specific language governing permissions and
+ * limitations under the License.
+ */
+
+package com.google.android.mms.pdu_alt;
+
+import timber.log.Timber;
+
+import java.io.ByteArrayOutputStream;
+import java.io.IOException;
+import java.io.UnsupportedEncodingException;
+import java.util.ArrayList;
+
+/**
+ * Encoded-string-value = Text-string | Value-length Char-set Text-string
+ */
+public class EncodedStringValue implements Cloneable {
+    private static final boolean LOCAL_LOGV = false;
+
+    /**
+     * The Char-set value.
+     */
+    private int mCharacterSet;
+
+    /**
+     * The Text-string value.
+     */
+    private byte[] mData;
+
+    /**
+     * Constructor.
+     *
+     * @param charset the Char-set value
+     * @param data the Text-string value
+     * @throws NullPointerException if Text-string value is null.
+     */
+    public EncodedStringValue(int charset, byte[] data) {
+        // TODO: CharSet needs to be validated against MIBEnum.
+        if(null == data) {
+            throw new NullPointerException("EncodedStringValue: Text-string is null.");
+        }
+
+        mCharacterSet = charset;
+        mData = new byte[data.length];
+        System.arraycopy(data, 0, mData, 0, data.length);
+    }
+
+    /**
+     * Constructor.
+     *
+     * @param data the Text-string value
+     * @throws NullPointerException if Text-string value is null.
+     */
+    public EncodedStringValue(byte[] data) {
+        this(CharacterSets.DEFAULT_CHARSET, data);
+    }
+
+    public EncodedStringValue(String data) {
+        try {
+            mData = data.getBytes(CharacterSets.DEFAULT_CHARSET_NAME);
+            mCharacterSet = CharacterSets.DEFAULT_CHARSET;
+        } catch (UnsupportedEncodingException e) {
+            Timber.e(e, "Default encoding must be supported.");
+        }
+    }
+
+    /**
+     * Get Char-set value.
+     *
+     * @return the value
+     */
+    public int getCharacterSet() {
+        return mCharacterSet;
+    }
+
+    /**
+     * Set Char-set value.
+     *
+     * @param charset the Char-set value
+     */
+    public void setCharacterSet(int charset) {
+        // TODO: CharSet needs to be validated against MIBEnum.
+        mCharacterSet = charset;
+    }
+
+    /**
+     * Get Text-string value.
+     *
+     * @return the value
+     */
+    public byte[] getTextString() {
+        byte[] byteArray = new byte[mData.length];
+
+        System.arraycopy(mData, 0, byteArray, 0, mData.length);
+        return byteArray;
+    }
+
+    /**
+     * Set Text-string value.
+     *
+     * @param textString the Text-string value
+     * @throws NullPointerException if Text-string value is null.
+     */
+    public void setTextString(byte[] textString) {
+        if(null == textString) {
+            throw new NullPointerException("EncodedStringValue: Text-string is null.");
+        }
+
+        mData = new byte[textString.length];
+        System.arraycopy(textString, 0, mData, 0, textString.length);
+    }
+
+    /**
+     * Convert this object to a {@link String}. If the encoding of
+     * the EncodedStringValue is null or unsupported, it will be
+     * treated as iso-8859-1 encoding.
+     *
+     * @return The decoded String.
+     */
+    public String getString()  {
+        if (CharacterSets.ANY_CHARSET == mCharacterSet) {
+            return new String(mData); // system default encoding.
+        } else {
+            try {
+                String name = CharacterSets.getMimeName(mCharacterSet);
+                return new String(mData, name);
+            } catch (UnsupportedEncodingException e) {
+            	if (LOCAL_LOGV) {
+            		Timber.v(e, e.getMessage());
+            	}
+            	try {
+                    return new String(mData, CharacterSets.MIMENAME_ISO_8859_1);
+                } catch (UnsupportedEncodingException f) {
+                    return new String(mData); // system default encoding.
+                }
+            }
+        }
+    }
+
+    /**
+     * Append to Text-string.
+     *
+     * @param textString the textString to append
+     * @throws NullPointerException if the text String is null
+     *                      or an IOException occured.
+     */
+    public void appendTextString(byte[] textString) {
+        if(null == textString) {
+            throw new NullPointerException("Text-string is null.");
+        }
+
+        if(null == mData) {
+            mData = new byte[textString.length];
+            System.arraycopy(textString, 0, mData, 0, textString.length);
+        } else {
+            ByteArrayOutputStream newTextString = new ByteArrayOutputStream();
+            try {
+                newTextString.write(mData);
+                newTextString.write(textString);
+            } catch (IOException e) {
+                Timber.e(e, "logging error");
+                e.printStackTrace();
+                throw new NullPointerException(
+                        "appendTextString: failed when write a new Text-string");
+            }
+
+            mData = newTextString.toByteArray();
+        }
+    }
+
+    /*
+     * (non-Javadoc)
+     * @see java.lang.Object#clone()
+     */
+    @Override
+    public Object clone() throws CloneNotSupportedException {
+        super.clone();
+        int len = mData.length;
+        byte[] dstBytes = new byte[len];
+        System.arraycopy(mData, 0, dstBytes, 0, len);
+
+        try {
+            return new EncodedStringValue(mCharacterSet, dstBytes);
+        } catch (Exception e) {
+            Timber.e(e, "logging error");
+            e.printStackTrace();
+            throw new CloneNotSupportedException(e.getMessage());
+        }
+    }
+
+    /**
+     * Split this encoded string around matches of the given pattern.
+     *
+     * @param pattern the delimiting pattern
+     * @return the array of encoded strings computed by splitting this encoded
+     *         string around matches of the given pattern
+     */
+    public EncodedStringValue[] split(String pattern) {
+        String[] temp = getString().split(pattern);
+        EncodedStringValue[] ret = new EncodedStringValue[temp.length];
+        for (int i = 0; i < ret.length; ++i) {
+            try {
+                ret[i] = new EncodedStringValue(mCharacterSet,
+                        temp[i].getBytes());
+            } catch (NullPointerException e) {
+                // Can't arrive here
+                return null;
+            }
+        }
+        return ret;
+    }
+
+    /**
+     * Extract an EncodedStringValue[] from a given String.
+     */
+    public static EncodedStringValue[] extract(String src) {
+        String[] values = src.split(";");
+
+        ArrayList<EncodedStringValue> list = new ArrayList<EncodedStringValue>();
+        for (int i = 0; i < values.length; i++) {
+            if (values[i].length() > 0) {
+                list.add(new EncodedStringValue(values[i]));
+            }
+        }
+
+        int len = list.size();
+        if (len > 0) {
+            return list.toArray(new EncodedStringValue[len]);
+        } else {
+            return null;
+        }
+    }
+
+    /**
+     * Concatenate an EncodedStringValue[] into a single String.
+     */
+    public static String concat(EncodedStringValue[] addr) {
+        StringBuilder sb = new StringBuilder();
+        int maxIndex = addr.length - 1;
+        for (int i = 0; i <= maxIndex; i++) {
+            sb.append(addr[i].getString());
+            if (i < maxIndex) {
+                sb.append(";");
+            }
+        }
+
+        return sb.toString();
+    }
+
+    public static EncodedStringValue copy(EncodedStringValue value) {
+        if (value == null) {
+            return null;
+        }
+
+        return new EncodedStringValue(value.mCharacterSet, value.mData);
+    }
+
+    public static EncodedStringValue[] encodeStrings(String[] array) {
+        int count = array.length;
+        if (count > 0) {
+            EncodedStringValue[] encodedArray = new EncodedStringValue[count];
+            for (int i = 0; i < count; i++) {
+                encodedArray[i] = new EncodedStringValue(array[i]);
+            }
+            return encodedArray;
+        }
+        return null;
+    }
+}
diff --git a/android-smsmms/src/main/java/com/google/android/mms/pdu_alt/GenericPdu.java b/android-smsmms/src/main/java/com/google/android/mms/pdu_alt/GenericPdu.java
index f918a3c12..b5e02359f 100755
--- a/android-smsmms/src/main/java/com/google/android/mms/pdu_alt/GenericPdu.java
+++ b/android-smsmms/src/main/java/com/google/android/mms/pdu_alt/GenericPdu.java
@@ -1,112 +1,112 @@
-/*
- * Copyright (C) 2015 Jacob Klinker
- *
- * Licensed under the Apache License, Version 2.0 (the "License");
- * you may not use this file except in compliance with the License.
- * You may obtain a copy of the License at
- *
- * http://www.apache.org/licenses/LICENSE-2.0
- *
- * Unless required by applicable law or agreed to in writing, software
- * distributed under the License is distributed on an "AS IS" BASIS,
- * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
- * See the License for the specific language governing permissions and
- * limitations under the License.
- */
-
-package com.google.android.mms.pdu_alt;
-
-import com.google.android.mms.InvalidHeaderValueException;
-
-public class GenericPdu {
-    /**
-     * The headers of pdu.
-     */
-    PduHeaders mPduHeaders = null;
-
-    /**
-     * Constructor.
-     */
-    public GenericPdu() {
-        mPduHeaders = new PduHeaders();
-    }
-
-    /**
-     * Constructor.
-     *
-     * @param headers Headers for this PDU.
-     */
-    GenericPdu(PduHeaders headers) {
-        mPduHeaders = headers;
-    }
-
-    /**
-     * Get the headers of this PDU.
-     *
-     * @return A PduHeaders of this PDU.
-     */
-    PduHeaders getPduHeaders() {
-        return mPduHeaders;
-    }
-
-    /**
-     * Get X-Mms-Message-Type field value.
-     *
-     * @return the X-Mms-Report-Allowed value
-     */
-    public int getMessageType() {
-        return mPduHeaders.getOctet(PduHeaders.MESSAGE_TYPE);
-    }
-
-    /**
-     * Set X-Mms-Message-Type field value.
-     *
-     * @param value the value
-     * @throws InvalidHeaderValueException if the value is invalid.
-     *         RuntimeException if field's value is not Octet.
-     */
-    public void setMessageType(int value) throws InvalidHeaderValueException {
-        mPduHeaders.setOctet(value, PduHeaders.MESSAGE_TYPE);
-    }
-
-    /**
-     * Get X-Mms-MMS-Version field value.
-     *
-     * @return the X-Mms-MMS-Version value
-     */
-    public int getMmsVersion() {
-        return mPduHeaders.getOctet(PduHeaders.MMS_VERSION);
-    }
-
-    /**
-     * Set X-Mms-MMS-Version field value.
-     *
-     * @param value the value
-     * @throws InvalidHeaderValueException if the value is invalid.
-     *         RuntimeException if field's value is not Octet.
-     */
-    public void setMmsVersion(int value) throws InvalidHeaderValueException {
-        mPduHeaders.setOctet(value, PduHeaders.MMS_VERSION);
-    }
-
-    /**
-     * Get From value.
-     * From-value = Value-length
-     *      (Address-present-token Encoded-string-value | Insert-address-token)
-     *
-     * @return the value
-     */
-    public EncodedStringValue getFrom() {
-       return mPduHeaders.getEncodedStringValue(PduHeaders.FROM);
-    }
-
-    /**
-     * Set From value.
-     *
-     * @param value the value
-     * @throws NullPointerException if the value is null.
-     */
-    public void setFrom(EncodedStringValue value) {
-        mPduHeaders.setEncodedStringValue(value, PduHeaders.FROM);
-    }
-}
+/*
+ * Copyright (C) 2015 Jacob Klinker
+ *
+ * Licensed under the Apache License, Version 2.0 (the "License");
+ * you may not use this file except in compliance with the License.
+ * You may obtain a copy of the License at
+ *
+ * http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing, software
+ * distributed under the License is distributed on an "AS IS" BASIS,
+ * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ * See the License for the specific language governing permissions and
+ * limitations under the License.
+ */
+
+package com.google.android.mms.pdu_alt;
+
+import com.google.android.mms.InvalidHeaderValueException;
+
+public class GenericPdu {
+    /**
+     * The headers of pdu.
+     */
+    PduHeaders mPduHeaders = null;
+
+    /**
+     * Constructor.
+     */
+    public GenericPdu() {
+        mPduHeaders = new PduHeaders();
+    }
+
+    /**
+     * Constructor.
+     *
+     * @param headers Headers for this PDU.
+     */
+    GenericPdu(PduHeaders headers) {
+        mPduHeaders = headers;
+    }
+
+    /**
+     * Get the headers of this PDU.
+     *
+     * @return A PduHeaders of this PDU.
+     */
+    PduHeaders getPduHeaders() {
+        return mPduHeaders;
+    }
+
+    /**
+     * Get X-Mms-Message-Type field value.
+     *
+     * @return the X-Mms-Report-Allowed value
+     */
+    public int getMessageType() {
+        return mPduHeaders.getOctet(PduHeaders.MESSAGE_TYPE);
+    }
+
+    /**
+     * Set X-Mms-Message-Type field value.
+     *
+     * @param value the value
+     * @throws InvalidHeaderValueException if the value is invalid.
+     *         RuntimeException if field's value is not Octet.
+     */
+    public void setMessageType(int value) throws InvalidHeaderValueException {
+        mPduHeaders.setOctet(value, PduHeaders.MESSAGE_TYPE);
+    }
+
+    /**
+     * Get X-Mms-MMS-Version field value.
+     *
+     * @return the X-Mms-MMS-Version value
+     */
+    public int getMmsVersion() {
+        return mPduHeaders.getOctet(PduHeaders.MMS_VERSION);
+    }
+
+    /**
+     * Set X-Mms-MMS-Version field value.
+     *
+     * @param value the value
+     * @throws InvalidHeaderValueException if the value is invalid.
+     *         RuntimeException if field's value is not Octet.
+     */
+    public void setMmsVersion(int value) throws InvalidHeaderValueException {
+        mPduHeaders.setOctet(value, PduHeaders.MMS_VERSION);
+    }
+
+    /**
+     * Get From value.
+     * From-value = Value-length
+     *      (Address-present-token Encoded-string-value | Insert-address-token)
+     *
+     * @return the value
+     */
+    public EncodedStringValue getFrom() {
+       return mPduHeaders.getEncodedStringValue(PduHeaders.FROM);
+    }
+
+    /**
+     * Set From value.
+     *
+     * @param value the value
+     * @throws NullPointerException if the value is null.
+     */
+    public void setFrom(EncodedStringValue value) {
+        mPduHeaders.setEncodedStringValue(value, PduHeaders.FROM);
+    }
+}
diff --git a/android-smsmms/src/main/java/com/google/android/mms/pdu_alt/MultimediaMessagePdu.java b/android-smsmms/src/main/java/com/google/android/mms/pdu_alt/MultimediaMessagePdu.java
index c99dc8482..34882ed93 100755
--- a/android-smsmms/src/main/java/com/google/android/mms/pdu_alt/MultimediaMessagePdu.java
+++ b/android-smsmms/src/main/java/com/google/android/mms/pdu_alt/MultimediaMessagePdu.java
@@ -1,149 +1,149 @@
-/*
- * Copyright (C) 2015 Jacob Klinker
- *
- * Licensed under the Apache License, Version 2.0 (the "License");
- * you may not use this file except in compliance with the License.
- * You may obtain a copy of the License at
- *
- * http://www.apache.org/licenses/LICENSE-2.0
- *
- * Unless required by applicable law or agreed to in writing, software
- * distributed under the License is distributed on an "AS IS" BASIS,
- * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
- * See the License for the specific language governing permissions and
- * limitations under the License.
- */
-
-package com.google.android.mms.pdu_alt;
-
-import com.google.android.mms.InvalidHeaderValueException;
-
-/**
- * Multimedia message PDU.
- */
-public class MultimediaMessagePdu extends GenericPdu{
-    /**
-     * The body.
-     */
-    private PduBody mMessageBody;
-
-    /**
-     * Constructor.
-     */
-    public MultimediaMessagePdu() {
-        super();
-    }
-
-    /**
-     * Constructor.
-     *
-     * @param header the header of this PDU
-     * @param body the body of this PDU
-     */
-    public MultimediaMessagePdu(PduHeaders header, PduBody body) {
-        super(header);
-        mMessageBody = body;
-    }
-
-    /**
-     * Constructor with given headers.
-     *
-     * @param headers Headers for this PDU.
-     */
-    MultimediaMessagePdu(PduHeaders headers) {
-        super(headers);
-    }
-
-    /**
-     * Get body of the PDU.
-     *
-     * @return the body
-     */
-    public PduBody getBody() {
-        return mMessageBody;
-    }
-
-    /**
-     * Set body of the PDU.
-     *
-     * @param body the body
-     */
-    public void setBody(PduBody body) {
-        mMessageBody = body;
-    }
-
-    /**
-     * Get subject.
-     *
-     * @return the value
-     */
-    public EncodedStringValue getSubject() {
-        return mPduHeaders.getEncodedStringValue(PduHeaders.SUBJECT);
-    }
-
-    /**
-     * Set subject.
-     *
-     * @param value the value
-     * @throws NullPointerException if the value is null.
-     */
-    public void setSubject(EncodedStringValue value) {
-        mPduHeaders.setEncodedStringValue(value, PduHeaders.SUBJECT);
-    }
-
-    /**
-     * Get To value.
-     *
-     * @return the value
-     */
-    public EncodedStringValue[] getTo() {
-        return mPduHeaders.getEncodedStringValues(PduHeaders.TO);
-    }
-
-    /**
-     * Add a "To" value.
-     *
-     * @param value the value
-     * @throws NullPointerException if the value is null.
-     */
-    public void addTo(EncodedStringValue value) {
-        mPduHeaders.appendEncodedStringValue(value, PduHeaders.TO);
-    }
-
-    /**
-     * Get X-Mms-Priority value.
-     *
-     * @return the value
-     */
-    public int getPriority() {
-        return mPduHeaders.getOctet(PduHeaders.PRIORITY);
-    }
-
-    /**
-     * Set X-Mms-Priority value.
-     *
-     * @param value the value
-     * @throws InvalidHeaderValueException if the value is invalid.
-     */
-    public void setPriority(int value) throws InvalidHeaderValueException {
-        mPduHeaders.setOctet(value, PduHeaders.PRIORITY);
-    }
-
-    /**
-     * Get Date value.
-     *
-     * @return the value
-     */
-    public long getDate() {
-        return mPduHeaders.getLongInteger(PduHeaders.DATE);
-    }
-
-    /**
-     * Set Date value in seconds.
-     *
-     * @param value the value
-     */
-    public void setDate(long value) {
-        mPduHeaders.setLongInteger(value, PduHeaders.DATE);
-    }
-}
+/*
+ * Copyright (C) 2015 Jacob Klinker
+ *
+ * Licensed under the Apache License, Version 2.0 (the "License");
+ * you may not use this file except in compliance with the License.
+ * You may obtain a copy of the License at
+ *
+ * http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing, software
+ * distributed under the License is distributed on an "AS IS" BASIS,
+ * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ * See the License for the specific language governing permissions and
+ * limitations under the License.
+ */
+
+package com.google.android.mms.pdu_alt;
+
+import com.google.android.mms.InvalidHeaderValueException;
+
+/**
+ * Multimedia message PDU.
+ */
+public class MultimediaMessagePdu extends GenericPdu{
+    /**
+     * The body.
+     */
+    private PduBody mMessageBody;
+
+    /**
+     * Constructor.
+     */
+    public MultimediaMessagePdu() {
+        super();
+    }
+
+    /**
+     * Constructor.
+     *
+     * @param header the header of this PDU
+     * @param body the body of this PDU
+     */
+    public MultimediaMessagePdu(PduHeaders header, PduBody body) {
+        super(header);
+        mMessageBody = body;
+    }
+
+    /**
+     * Constructor with given headers.
+     *
+     * @param headers Headers for this PDU.
+     */
+    MultimediaMessagePdu(PduHeaders headers) {
+        super(headers);
+    }
+
+    /**
+     * Get body of the PDU.
+     *
+     * @return the body
+     */
+    public PduBody getBody() {
+        return mMessageBody;
+    }
+
+    /**
+     * Set body of the PDU.
+     *
+     * @param body the body
+     */
+    public void setBody(PduBody body) {
+        mMessageBody = body;
+    }
+
+    /**
+     * Get subject.
+     *
+     * @return the value
+     */
+    public EncodedStringValue getSubject() {
+        return mPduHeaders.getEncodedStringValue(PduHeaders.SUBJECT);
+    }
+
+    /**
+     * Set subject.
+     *
+     * @param value the value
+     * @throws NullPointerException if the value is null.
+     */
+    public void setSubject(EncodedStringValue value) {
+        mPduHeaders.setEncodedStringValue(value, PduHeaders.SUBJECT);
+    }
+
+    /**
+     * Get To value.
+     *
+     * @return the value
+     */
+    public EncodedStringValue[] getTo() {
+        return mPduHeaders.getEncodedStringValues(PduHeaders.TO);
+    }
+
+    /**
+     * Add a "To" value.
+     *
+     * @param value the value
+     * @throws NullPointerException if the value is null.
+     */
+    public void addTo(EncodedStringValue value) {
+        mPduHeaders.appendEncodedStringValue(value, PduHeaders.TO);
+    }
+
+    /**
+     * Get X-Mms-Priority value.
+     *
+     * @return the value
+     */
+    public int getPriority() {
+        return mPduHeaders.getOctet(PduHeaders.PRIORITY);
+    }
+
+    /**
+     * Set X-Mms-Priority value.
+     *
+     * @param value the value
+     * @throws InvalidHeaderValueException if the value is invalid.
+     */
+    public void setPriority(int value) throws InvalidHeaderValueException {
+        mPduHeaders.setOctet(value, PduHeaders.PRIORITY);
+    }
+
+    /**
+     * Get Date value.
+     *
+     * @return the value
+     */
+    public long getDate() {
+        return mPduHeaders.getLongInteger(PduHeaders.DATE);
+    }
+
+    /**
+     * Set Date value in seconds.
+     *
+     * @param value the value
+     */
+    public void setDate(long value) {
+        mPduHeaders.setLongInteger(value, PduHeaders.DATE);
+    }
+}
diff --git a/android-smsmms/src/main/java/com/google/android/mms/pdu_alt/NotificationInd.java b/android-smsmms/src/main/java/com/google/android/mms/pdu_alt/NotificationInd.java
index a45afc8f4..1ded2bd19 100755
--- a/android-smsmms/src/main/java/com/google/android/mms/pdu_alt/NotificationInd.java
+++ b/android-smsmms/src/main/java/com/google/android/mms/pdu_alt/NotificationInd.java
@@ -1,284 +1,284 @@
-/*
- * Copyright (C) 2015 Jacob Klinker
- *
- * Licensed under the Apache License, Version 2.0 (the "License");
- * you may not use this file except in compliance with the License.
- * You may obtain a copy of the License at
- *
- * http://www.apache.org/licenses/LICENSE-2.0
- *
- * Unless required by applicable law or agreed to in writing, software
- * distributed under the License is distributed on an "AS IS" BASIS,
- * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
- * See the License for the specific language governing permissions and
- * limitations under the License.
- */
-
-package com.google.android.mms.pdu_alt;
-
-import com.google.android.mms.InvalidHeaderValueException;
-
-/**
- * M-Notification.ind PDU.
- */
-public class NotificationInd extends GenericPdu {
-    /**
-     * Empty constructor.
-     * Since the Pdu corresponding to this class is constructed
-     * by the Proxy-Relay server, this class is only instantiated
-     * by the Pdu Parser.
-     *
-     * @throws InvalidHeaderValueException if error occurs.
-     *         RuntimeException if an undeclared error occurs.
-     */
-    public NotificationInd() throws InvalidHeaderValueException {
-        super();
-        setMessageType(PduHeaders.MESSAGE_TYPE_NOTIFICATION_IND);
-    }
-
-    /**
-     * Constructor with given headers.
-     *
-     * @param headers Headers for this PDU.
-     */
-    NotificationInd(PduHeaders headers) {
-        super(headers);
-    }
-
-    /**
-     * Get X-Mms-Content-Class Value.
-     *
-     * @return the value
-     */
-    public int getContentClass() {
-        return mPduHeaders.getOctet(PduHeaders.CONTENT_CLASS);
-    }
-
-    /**
-     * Set X-Mms-Content-Class Value.
-     *
-     * @param value the value
-     * @throws InvalidHeaderValueException if the value is invalid.
-     *         RuntimeException if an undeclared error occurs.
-     */
-    public void setContentClass(int value) throws InvalidHeaderValueException {
-        mPduHeaders.setOctet(value, PduHeaders.CONTENT_CLASS);
-    }
-
-    /**
-     * Get X-Mms-Content-Location value.
-     * When used in a PDU other than M-Mbox-Delete.conf and M-Delete.conf:
-     * Content-location-value = Uri-value
-     *
-     * @return the value
-     */
-    public byte[] getContentLocation() {
-        return mPduHeaders.getTextString(PduHeaders.CONTENT_LOCATION);
-    }
-
-    /**
-     * Set X-Mms-Content-Location value.
-     *
-     * @param value the value
-     * @throws NullPointerException if the value is null.
-     *         RuntimeException if an undeclared error occurs.
-     */
-    public void setContentLocation(byte[] value) {
-        mPduHeaders.setTextString(value, PduHeaders.CONTENT_LOCATION);
-    }
-
-    /**
-     * Get X-Mms-Expiry value.
-     *
-     * Expiry-value = Value-length
-     *      (Absolute-token Date-value | Relative-token Delta-seconds-value)
-     *
-     * @return the value
-     */
-    public long getExpiry() {
-        return mPduHeaders.getLongInteger(PduHeaders.EXPIRY);
-    }
-
-    /**
-     * Set X-Mms-Expiry value.
-     *
-     * @param value the value
-     * @throws RuntimeException if an undeclared error occurs.
-     */
-    public void setExpiry(long value) {
-        mPduHeaders.setLongInteger(value, PduHeaders.EXPIRY);
-    }
-
-    /**
-     * Get From value.
-     * From-value = Value-length
-     *      (Address-present-token Encoded-string-value | Insert-address-token)
-     *
-     * @return the value
-     */
-    public EncodedStringValue getFrom() {
-       return mPduHeaders.getEncodedStringValue(PduHeaders.FROM);
-    }
-
-    /**
-     * Set From value.
-     *
-     * @param value the value
-     * @throws NullPointerException if the value is null.
-     *         RuntimeException if an undeclared error occurs.
-     */
-    public void setFrom(EncodedStringValue value) {
-        mPduHeaders.setEncodedStringValue(value, PduHeaders.FROM);
-    }
-
-    /**
-     * Get X-Mms-Message-Class value.
-     * Message-class-value = Class-identifier | Token-text
-     * Class-identifier = Personal | Advertisement | Informational | Auto
-     *
-     * @return the value
-     */
-    public byte[] getMessageClass() {
-        return mPduHeaders.getTextString(PduHeaders.MESSAGE_CLASS);
-    }
-
-    /**
-     * Set X-Mms-Message-Class value.
-     *
-     * @param value the value
-     * @throws NullPointerException if the value is null.
-     *         RuntimeException if an undeclared error occurs.
-     */
-    public void setMessageClass(byte[] value) {
-        mPduHeaders.setTextString(value, PduHeaders.MESSAGE_CLASS);
-    }
-
-    /**
-     * Get X-Mms-Message-Size value.
-     * Message-size-value = Long-integer
-     *
-     * @return the value
-     */
-    public long getMessageSize() {
-        return mPduHeaders.getLongInteger(PduHeaders.MESSAGE_SIZE);
-    }
-
-    /**
-     * Set X-Mms-Message-Size value.
-     *
-     * @param value the value
-     * @throws RuntimeException if an undeclared error occurs.
-     */
-    public void setMessageSize(long value) {
-        mPduHeaders.setLongInteger(value, PduHeaders.MESSAGE_SIZE);
-    }
-
-    /**
-     * Get subject.
-     *
-     * @return the value
-     */
-    public EncodedStringValue getSubject() {
-        return mPduHeaders.getEncodedStringValue(PduHeaders.SUBJECT);
-    }
-
-    /**
-     * Set subject.
-     *
-     * @param value the value
-     * @throws NullPointerException if the value is null.
-     *         RuntimeException if an undeclared error occurs.
-     */
-    public void setSubject(EncodedStringValue value) {
-        mPduHeaders.setEncodedStringValue(value, PduHeaders.SUBJECT);
-    }
-
-    /**
-     * Get X-Mms-Transaction-Id.
-     *
-     * @return the value
-     */
-    public byte[] getTransactionId() {
-        return mPduHeaders.getTextString(PduHeaders.TRANSACTION_ID);
-    }
-
-    /**
-     * Set X-Mms-Transaction-Id.
-     *
-     * @param value the value
-     * @throws NullPointerException if the value is null.
-     *         RuntimeException if an undeclared error occurs.
-     */
-    public void setTransactionId(byte[] value) {
-        mPduHeaders.setTextString(value, PduHeaders.TRANSACTION_ID);
-    }
-
-    /**
-     * Get X-Mms-Delivery-Report Value.
-     *
-     * @return the value
-     */
-    public int getDeliveryReport() {
-        return mPduHeaders.getOctet(PduHeaders.DELIVERY_REPORT);
-    }
-
-    /**
-     * Set X-Mms-Delivery-Report Value.
-     *
-     * @param value the value
-     * @throws InvalidHeaderValueException if the value is invalid.
-     *         RuntimeException if an undeclared error occurs.
-     */
-    public void setDeliveryReport(int value) throws InvalidHeaderValueException {
-        mPduHeaders.setOctet(value, PduHeaders.DELIVERY_REPORT);
-    }
-
-    /*
-     * Optional, not supported header fields:
-     *
-     *     public byte[] getApplicId() {return null;}
-     *     public void setApplicId(byte[] value) {}
-     *
-     *     public byte[] getAuxApplicId() {return null;}
-     *     public void getAuxApplicId(byte[] value) {}
-     *
-     *     public byte getDrmContent() {return 0x00;}
-     *     public void setDrmContent(byte value) {}
-     *
-     *     public byte getDistributionIndicator() {return 0x00;}
-     *     public void setDistributionIndicator(byte value) {}
-     *
-     *     public ElementDescriptorValue getElementDescriptor() {return null;}
-     *     public void getElementDescriptor(ElementDescriptorValue value) {}
-     *
-     *     public byte getPriority() {return 0x00;}
-     *     public void setPriority(byte value) {}
-     *
-     *     public byte getRecommendedRetrievalMode() {return 0x00;}
-     *     public void setRecommendedRetrievalMode(byte value) {}
-     *
-     *     public byte getRecommendedRetrievalModeText() {return 0x00;}
-     *     public void setRecommendedRetrievalModeText(byte value) {}
-     *
-     *     public byte[] getReplaceId() {return 0x00;}
-     *     public void setReplaceId(byte[] value) {}
-     *
-     *     public byte[] getReplyApplicId() {return 0x00;}
-     *     public void setReplyApplicId(byte[] value) {}
-     *
-     *     public byte getReplyCharging() {return 0x00;}
-     *     public void setReplyCharging(byte value) {}
-     *
-     *     public byte getReplyChargingDeadline() {return 0x00;}
-     *     public void setReplyChargingDeadline(byte value) {}
-     *
-     *     public byte[] getReplyChargingId() {return 0x00;}
-     *     public void setReplyChargingId(byte[] value) {}
-     *
-     *     public long getReplyChargingSize() {return 0;}
-     *     public void setReplyChargingSize(long value) {}
-     *
-     *     public byte getStored() {return 0x00;}
-     *     public void setStored(byte value) {}
-     */
-}
+/*
+ * Copyright (C) 2015 Jacob Klinker
+ *
+ * Licensed under the Apache License, Version 2.0 (the "License");
+ * you may not use this file except in compliance with the License.
+ * You may obtain a copy of the License at
+ *
+ * http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing, software
+ * distributed under the License is distributed on an "AS IS" BASIS,
+ * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ * See the License for the specific language governing permissions and
+ * limitations under the License.
+ */
+
+package com.google.android.mms.pdu_alt;
+
+import com.google.android.mms.InvalidHeaderValueException;
+
+/**
+ * M-Notification.ind PDU.
+ */
+public class NotificationInd extends GenericPdu {
+    /**
+     * Empty constructor.
+     * Since the Pdu corresponding to this class is constructed
+     * by the Proxy-Relay server, this class is only instantiated
+     * by the Pdu Parser.
+     *
+     * @throws InvalidHeaderValueException if error occurs.
+     *         RuntimeException if an undeclared error occurs.
+     */
+    public NotificationInd() throws InvalidHeaderValueException {
+        super();
+        setMessageType(PduHeaders.MESSAGE_TYPE_NOTIFICATION_IND);
+    }
+
+    /**
+     * Constructor with given headers.
+     *
+     * @param headers Headers for this PDU.
+     */
+    NotificationInd(PduHeaders headers) {
+        super(headers);
+    }
+
+    /**
+     * Get X-Mms-Content-Class Value.
+     *
+     * @return the value
+     */
+    public int getContentClass() {
+        return mPduHeaders.getOctet(PduHeaders.CONTENT_CLASS);
+    }
+
+    /**
+     * Set X-Mms-Content-Class Value.
+     *
+     * @param value the value
+     * @throws InvalidHeaderValueException if the value is invalid.
+     *         RuntimeException if an undeclared error occurs.
+     */
+    public void setContentClass(int value) throws InvalidHeaderValueException {
+        mPduHeaders.setOctet(value, PduHeaders.CONTENT_CLASS);
+    }
+
+    /**
+     * Get X-Mms-Content-Location value.
+     * When used in a PDU other than M-Mbox-Delete.conf and M-Delete.conf:
+     * Content-location-value = Uri-value
+     *
+     * @return the value
+     */
+    public byte[] getContentLocation() {
+        return mPduHeaders.getTextString(PduHeaders.CONTENT_LOCATION);
+    }
+
+    /**
+     * Set X-Mms-Content-Location value.
+     *
+     * @param value the value
+     * @throws NullPointerException if the value is null.
+     *         RuntimeException if an undeclared error occurs.
+     */
+    public void setContentLocation(byte[] value) {
+        mPduHeaders.setTextString(value, PduHeaders.CONTENT_LOCATION);
+    }
+
+    /**
+     * Get X-Mms-Expiry value.
+     *
+     * Expiry-value = Value-length
+     *      (Absolute-token Date-value | Relative-token Delta-seconds-value)
+     *
+     * @return the value
+     */
+    public long getExpiry() {
+        return mPduHeaders.getLongInteger(PduHeaders.EXPIRY);
+    }
+
+    /**
+     * Set X-Mms-Expiry value.
+     *
+     * @param value the value
+     * @throws RuntimeException if an undeclared error occurs.
+     */
+    public void setExpiry(long value) {
+        mPduHeaders.setLongInteger(value, PduHeaders.EXPIRY);
+    }
+
+    /**
+     * Get From value.
+     * From-value = Value-length
+     *      (Address-present-token Encoded-string-value | Insert-address-token)
+     *
+     * @return the value
+     */
+    public EncodedStringValue getFrom() {
+       return mPduHeaders.getEncodedStringValue(PduHeaders.FROM);
+    }
+
+    /**
+     * Set From value.
+     *
+     * @param value the value
+     * @throws NullPointerException if the value is null.
+     *         RuntimeException if an undeclared error occurs.
+     */
+    public void setFrom(EncodedStringValue value) {
+        mPduHeaders.setEncodedStringValue(value, PduHeaders.FROM);
+    }
+
+    /**
+     * Get X-Mms-Message-Class value.
+     * Message-class-value = Class-identifier | Token-text
+     * Class-identifier = Personal | Advertisement | Informational | Auto
+     *
+     * @return the value
+     */
+    public byte[] getMessageClass() {
+        return mPduHeaders.getTextString(PduHeaders.MESSAGE_CLASS);
+    }
+
+    /**
+     * Set X-Mms-Message-Class value.
+     *
+     * @param value the value
+     * @throws NullPointerException if the value is null.
+     *         RuntimeException if an undeclared error occurs.
+     */
+    public void setMessageClass(byte[] value) {
+        mPduHeaders.setTextString(value, PduHeaders.MESSAGE_CLASS);
+    }
+
+    /**
+     * Get X-Mms-Message-Size value.
+     * Message-size-value = Long-integer
+     *
+     * @return the value
+     */
+    public long getMessageSize() {
+        return mPduHeaders.getLongInteger(PduHeaders.MESSAGE_SIZE);
+    }
+
+    /**
+     * Set X-Mms-Message-Size value.
+     *
+     * @param value the value
+     * @throws RuntimeException if an undeclared error occurs.
+     */
+    public void setMessageSize(long value) {
+        mPduHeaders.setLongInteger(value, PduHeaders.MESSAGE_SIZE);
+    }
+
+    /**
+     * Get subject.
+     *
+     * @return the value
+     */
+    public EncodedStringValue getSubject() {
+        return mPduHeaders.getEncodedStringValue(PduHeaders.SUBJECT);
+    }
+
+    /**
+     * Set subject.
+     *
+     * @param value the value
+     * @throws NullPointerException if the value is null.
+     *         RuntimeException if an undeclared error occurs.
+     */
+    public void setSubject(EncodedStringValue value) {
+        mPduHeaders.setEncodedStringValue(value, PduHeaders.SUBJECT);
+    }
+
+    /**
+     * Get X-Mms-Transaction-Id.
+     *
+     * @return the value
+     */
+    public byte[] getTransactionId() {
+        return mPduHeaders.getTextString(PduHeaders.TRANSACTION_ID);
+    }
+
+    /**
+     * Set X-Mms-Transaction-Id.
+     *
+     * @param value the value
+     * @throws NullPointerException if the value is null.
+     *         RuntimeException if an undeclared error occurs.
+     */
+    public void setTransactionId(byte[] value) {
+        mPduHeaders.setTextString(value, PduHeaders.TRANSACTION_ID);
+    }
+
+    /**
+     * Get X-Mms-Delivery-Report Value.
+     *
+     * @return the value
+     */
+    public int getDeliveryReport() {
+        return mPduHeaders.getOctet(PduHeaders.DELIVERY_REPORT);
+    }
+
+    /**
+     * Set X-Mms-Delivery-Report Value.
+     *
+     * @param value the value
+     * @throws InvalidHeaderValueException if the value is invalid.
+     *         RuntimeException if an undeclared error occurs.
+     */
+    public void setDeliveryReport(int value) throws InvalidHeaderValueException {
+        mPduHeaders.setOctet(value, PduHeaders.DELIVERY_REPORT);
+    }
+
+    /*
+     * Optional, not supported header fields:
+     *
+     *     public byte[] getApplicId() {return null;}
+     *     public void setApplicId(byte[] value) {}
+     *
+     *     public byte[] getAuxApplicId() {return null;}
+     *     public void getAuxApplicId(byte[] value) {}
+     *
+     *     public byte getDrmContent() {return 0x00;}
+     *     public void setDrmContent(byte value) {}
+     *
+     *     public byte getDistributionIndicator() {return 0x00;}
+     *     public void setDistributionIndicator(byte value) {}
+     *
+     *     public ElementDescriptorValue getElementDescriptor() {return null;}
+     *     public void getElementDescriptor(ElementDescriptorValue value) {}
+     *
+     *     public byte getPriority() {return 0x00;}
+     *     public void setPriority(byte value) {}
+     *
+     *     public byte getRecommendedRetrievalMode() {return 0x00;}
+     *     public void setRecommendedRetrievalMode(byte value) {}
+     *
+     *     public byte getRecommendedRetrievalModeText() {return 0x00;}
+     *     public void setRecommendedRetrievalModeText(byte value) {}
+     *
+     *     public byte[] getReplaceId() {return 0x00;}
+     *     public void setReplaceId(byte[] value) {}
+     *
+     *     public byte[] getReplyApplicId() {return 0x00;}
+     *     public void setReplyApplicId(byte[] value) {}
+     *
+     *     public byte getReplyCharging() {return 0x00;}
+     *     public void setReplyCharging(byte value) {}
+     *
+     *     public byte getReplyChargingDeadline() {return 0x00;}
+     *     public void setReplyChargingDeadline(byte value) {}
+     *
+     *     public byte[] getReplyChargingId() {return 0x00;}
+     *     public void setReplyChargingId(byte[] value) {}
+     *
+     *     public long getReplyChargingSize() {return 0;}
+     *     public void setReplyChargingSize(long value) {}
+     *
+     *     public byte getStored() {return 0x00;}
+     *     public void setStored(byte value) {}
+     */
+}
diff --git a/android-smsmms/src/main/java/com/google/android/mms/pdu_alt/NotifyRespInd.java b/android-smsmms/src/main/java/com/google/android/mms/pdu_alt/NotifyRespInd.java
index 2bd613046..c6ea694d6 100755
--- a/android-smsmms/src/main/java/com/google/android/mms/pdu_alt/NotifyRespInd.java
+++ b/android-smsmms/src/main/java/com/google/android/mms/pdu_alt/NotifyRespInd.java
@@ -1,113 +1,113 @@
-/*
- * Copyright (C) 2015 Jacob Klinker
- *
- * Licensed under the Apache License, Version 2.0 (the "License");
- * you may not use this file except in compliance with the License.
- * You may obtain a copy of the License at
- *
- * http://www.apache.org/licenses/LICENSE-2.0
- *
- * Unless required by applicable law or agreed to in writing, software
- * distributed under the License is distributed on an "AS IS" BASIS,
- * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
- * See the License for the specific language governing permissions and
- * limitations under the License.
- */
-
-package com.google.android.mms.pdu_alt;
-
-import com.google.android.mms.InvalidHeaderValueException;
-
-/**
- * M-NofifyResp.ind PDU.
- */
-public class NotifyRespInd extends GenericPdu {
-    /**
-     * Constructor, used when composing a M-NotifyResp.ind pdu.
-     *
-     * @param mmsVersion current version of mms
-     * @param transactionId the transaction-id value
-     * @param status the status value
-     * @throws InvalidHeaderValueException if parameters are invalid.
-     *         NullPointerException if transactionId is null.
-     *         RuntimeException if an undeclared error occurs.
-     */
-    public NotifyRespInd(int mmsVersion,
-                         byte[] transactionId,
-                         int status) throws InvalidHeaderValueException {
-        super();
-        setMessageType(PduHeaders.MESSAGE_TYPE_NOTIFYRESP_IND);
-        setMmsVersion(mmsVersion);
-        setTransactionId(transactionId);
-        setStatus(status);
-    }
-
-    /**
-     * Constructor with given headers.
-     *
-     * @param headers Headers for this PDU.
-     */
-    NotifyRespInd(PduHeaders headers) {
-        super(headers);
-    }
-
-    /**
-     * Get X-Mms-Report-Allowed field value.
-     *
-     * @return the X-Mms-Report-Allowed value
-     */
-    public int getReportAllowed() {
-        return mPduHeaders.getOctet(PduHeaders.REPORT_ALLOWED);
-    }
-
-    /**
-     * Set X-Mms-Report-Allowed field value.
-     *
-     * @param value the value
-     * @throws InvalidHeaderValueException if the value is invalid.
-     *         RuntimeException if an undeclared error occurs.
-     */
-    public void setReportAllowed(int value) throws InvalidHeaderValueException {
-        mPduHeaders.setOctet(value, PduHeaders.REPORT_ALLOWED);
-    }
-
-    /**
-     * Set X-Mms-Status field value.
-     *
-     * @param value the value
-     * @throws InvalidHeaderValueException if the value is invalid.
-     *         RuntimeException if an undeclared error occurs.
-     */
-    public void setStatus(int value) throws InvalidHeaderValueException {
-        mPduHeaders.setOctet(value, PduHeaders.STATUS);
-    }
-
-    /**
-     * GetX-Mms-Status field value.
-     *
-     * @return the X-Mms-Status value
-     */
-    public int getStatus() {
-        return mPduHeaders.getOctet(PduHeaders.STATUS);
-    }
-
-    /**
-     * Get X-Mms-Transaction-Id field value.
-     *
-     * @return the X-Mms-Report-Allowed value
-     */
-    public byte[] getTransactionId() {
-        return mPduHeaders.getTextString(PduHeaders.TRANSACTION_ID);
-    }
-
-    /**
-     * Set X-Mms-Transaction-Id field value.
-     *
-     * @param value the value
-     * @throws NullPointerException if the value is null.
-     *         RuntimeException if an undeclared error occurs.
-     */
-    public void setTransactionId(byte[] value) {
-            mPduHeaders.setTextString(value, PduHeaders.TRANSACTION_ID);
-    }
-}
+/*
+ * Copyright (C) 2015 Jacob Klinker
+ *
+ * Licensed under the Apache License, Version 2.0 (the "License");
+ * you may not use this file except in compliance with the License.
+ * You may obtain a copy of the License at
+ *
+ * http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing, software
+ * distributed under the License is distributed on an "AS IS" BASIS,
+ * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ * See the License for the specific language governing permissions and
+ * limitations under the License.
+ */
+
+package com.google.android.mms.pdu_alt;
+
+import com.google.android.mms.InvalidHeaderValueException;
+
+/**
+ * M-NofifyResp.ind PDU.
+ */
+public class NotifyRespInd extends GenericPdu {
+    /**
+     * Constructor, used when composing a M-NotifyResp.ind pdu.
+     *
+     * @param mmsVersion current version of mms
+     * @param transactionId the transaction-id value
+     * @param status the status value
+     * @throws InvalidHeaderValueException if parameters are invalid.
+     *         NullPointerException if transactionId is null.
+     *         RuntimeException if an undeclared error occurs.
+     */
+    public NotifyRespInd(int mmsVersion,
+                         byte[] transactionId,
+                         int status) throws InvalidHeaderValueException {
+        super();
+        setMessageType(PduHeaders.MESSAGE_TYPE_NOTIFYRESP_IND);
+        setMmsVersion(mmsVersion);
+        setTransactionId(transactionId);
+        setStatus(status);
+    }
+
+    /**
+     * Constructor with given headers.
+     *
+     * @param headers Headers for this PDU.
+     */
+    NotifyRespInd(PduHeaders headers) {
+        super(headers);
+    }
+
+    /**
+     * Get X-Mms-Report-Allowed field value.
+     *
+     * @return the X-Mms-Report-Allowed value
+     */
+    public int getReportAllowed() {
+        return mPduHeaders.getOctet(PduHeaders.REPORT_ALLOWED);
+    }
+
+    /**
+     * Set X-Mms-Report-Allowed field value.
+     *
+     * @param value the value
+     * @throws InvalidHeaderValueException if the value is invalid.
+     *         RuntimeException if an undeclared error occurs.
+     */
+    public void setReportAllowed(int value) throws InvalidHeaderValueException {
+        mPduHeaders.setOctet(value, PduHeaders.REPORT_ALLOWED);
+    }
+
+    /**
+     * Set X-Mms-Status field value.
+     *
+     * @param value the value
+     * @throws InvalidHeaderValueException if the value is invalid.
+     *         RuntimeException if an undeclared error occurs.
+     */
+    public void setStatus(int value) throws InvalidHeaderValueException {
+        mPduHeaders.setOctet(value, PduHeaders.STATUS);
+    }
+
+    /**
+     * GetX-Mms-Status field value.
+     *
+     * @return the X-Mms-Status value
+     */
+    public int getStatus() {
+        return mPduHeaders.getOctet(PduHeaders.STATUS);
+    }
+
+    /**
+     * Get X-Mms-Transaction-Id field value.
+     *
+     * @return the X-Mms-Report-Allowed value
+     */
+    public byte[] getTransactionId() {
+        return mPduHeaders.getTextString(PduHeaders.TRANSACTION_ID);
+    }
+
+    /**
+     * Set X-Mms-Transaction-Id field value.
+     *
+     * @param value the value
+     * @throws NullPointerException if the value is null.
+     *         RuntimeException if an undeclared error occurs.
+     */
+    public void setTransactionId(byte[] value) {
+            mPduHeaders.setTextString(value, PduHeaders.TRANSACTION_ID);
+    }
+}
diff --git a/android-smsmms/src/main/java/com/google/android/mms/pdu_alt/PduBody.java b/android-smsmms/src/main/java/com/google/android/mms/pdu_alt/PduBody.java
index a5a9ffb08..608bdf7dc 100755
--- a/android-smsmms/src/main/java/com/google/android/mms/pdu_alt/PduBody.java
+++ b/android-smsmms/src/main/java/com/google/android/mms/pdu_alt/PduBody.java
@@ -1,190 +1,190 @@
-/*
- * Copyright (C) 2015 Jacob Klinker
- *
- * Licensed under the Apache License, Version 2.0 (the "License");
- * you may not use this file except in compliance with the License.
- * You may obtain a copy of the License at
- *
- * http://www.apache.org/licenses/LICENSE-2.0
- *
- * Unless required by applicable law or agreed to in writing, software
- * distributed under the License is distributed on an "AS IS" BASIS,
- * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
- * See the License for the specific language governing permissions and
- * limitations under the License.
- */
-
-package com.google.android.mms.pdu_alt;
-
-import java.util.HashMap;
-import java.util.Map;
-import java.util.Vector;
-
-public class PduBody {
-    private Vector<PduPart> mParts;
-
-    private Map<String, PduPart> mPartMapByContentId;
-    private Map<String, PduPart> mPartMapByContentLocation;
-    private Map<String, PduPart> mPartMapByName;
-    private Map<String, PduPart> mPartMapByFileName;
-
-    /**
-     * Constructor.
-     */
-    public PduBody() {
-        mParts = new Vector<>();
-
-        mPartMapByContentId = new HashMap<>();
-        mPartMapByContentLocation  = new HashMap<>();
-        mPartMapByName = new HashMap<>();
-        mPartMapByFileName = new HashMap<>();
-    }
-
-    private void putPartToMaps(PduPart part) {
-        // Put part to mPartMapByContentId.
-        byte[] contentId = part.getContentId();
-        if(null != contentId) {
-            mPartMapByContentId.put(new String(contentId), part);
-        }
-
-        // Put part to mPartMapByContentLocation.
-        byte[] contentLocation = part.getContentLocation();
-        if(null != contentLocation) {
-            String clc = new String(contentLocation);
-            mPartMapByContentLocation.put(clc, part);
-        }
-
-        // Put part to mPartMapByName.
-        byte[] name = part.getName();
-        if(null != name) {
-            String clc = new String(name);
-            mPartMapByName.put(clc, part);
-        }
-
-        // Put part to mPartMapByFileName.
-        byte[] fileName = part.getFilename();
-        if(null != fileName) {
-            String clc = new String(fileName);
-            mPartMapByFileName.put(clc, part);
-        }
-    }
-
-    /**
-     * Appends the specified part to the end of this body.
-     *
-     * @param part part to be appended
-     * @return true when success, false when fail
-     * @throws NullPointerException when part is null
-     */
-    public boolean addPart(PduPart part) {
-        if(null == part) {
-            throw new NullPointerException();
-        }
-
-        putPartToMaps(part);
-        return mParts.add(part);
-    }
-
-    /**
-     * Inserts the specified part at the specified position.
-     *
-     * @param index index at which the specified part is to be inserted
-     * @param part part to be inserted
-     * @throws NullPointerException when part is null
-     */
-    public void addPart(int index, PduPart part) {
-        if(null == part) {
-            throw new NullPointerException();
-        }
-
-        putPartToMaps(part);
-        mParts.add(index, part);
-    }
-
-    /**
-     * Removes the part at the specified position.
-     *
-     * @param index index of the part to return
-     * @return part at the specified index
-     */
-    public PduPart removePart(int index) {
-        return mParts.remove(index);
-    }
-
-    /**
-     * Remove all of the parts.
-     */
-    public void removeAll() {
-        mParts.clear();
-    }
-
-    /**
-     * Get the part at the specified position.
-     *
-     * @param index index of the part to return
-     * @return part at the specified index
-     */
-    public PduPart getPart(int index) {
-        return mParts.get(index);
-    }
-
-    /**
-     * Get the index of the specified part.
-     *
-     * @param part the part object
-     * @return index the index of the first occurrence of the part in this body
-     */
-    public int getPartIndex(PduPart part) {
-        return mParts.indexOf(part);
-    }
-
-    /**
-     * Get the number of parts.
-     *
-     * @return the number of parts
-     */
-    public int getPartsNum() {
-        return mParts.size();
-    }
-
-    /**
-     * Get pdu part by content id.
-     *
-     * @param cid the value of content id.
-     * @return the pdu part.
-     */
-    public PduPart getPartByContentId(String cid) {
-        return mPartMapByContentId.get(cid);
-    }
-
-    /**
-     * Get pdu part by Content-Location. Content-Location of part is
-     * the same as filename and name(param of content-type).
-     *
-     * @param contentLocation the value of filename.
-     * @return the pdu part.
-     */
-    public PduPart getPartByContentLocation(String contentLocation) {
-        return mPartMapByContentLocation.get(contentLocation);
-    }
-
-    /**
-     * Get pdu part by name.
-     *
-     * @param name the value of filename.
-     * @return the pdu part.
-     */
-    public PduPart getPartByName(String name) {
-        return mPartMapByName.get(name);
-    }
-
-    /**
-     * Get pdu part by filename.
-     *
-     * @param filename the value of filename.
-     * @return the pdu part.
-     */
-    public PduPart getPartByFileName(String filename) {
-        return mPartMapByFileName.get(filename);
-    }
-}
+/*
+ * Copyright (C) 2015 Jacob Klinker
+ *
+ * Licensed under the Apache License, Version 2.0 (the "License");
+ * you may not use this file except in compliance with the License.
+ * You may obtain a copy of the License at
+ *
+ * http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing, software
+ * distributed under the License is distributed on an "AS IS" BASIS,
+ * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ * See the License for the specific language governing permissions and
+ * limitations under the License.
+ */
+
+package com.google.android.mms.pdu_alt;
+
+import java.util.HashMap;
+import java.util.Map;
+import java.util.Vector;
+
+public class PduBody {
+    private Vector<PduPart> mParts;
+
+    private Map<String, PduPart> mPartMapByContentId;
+    private Map<String, PduPart> mPartMapByContentLocation;
+    private Map<String, PduPart> mPartMapByName;
+    private Map<String, PduPart> mPartMapByFileName;
+
+    /**
+     * Constructor.
+     */
+    public PduBody() {
+        mParts = new Vector<>();
+
+        mPartMapByContentId = new HashMap<>();
+        mPartMapByContentLocation  = new HashMap<>();
+        mPartMapByName = new HashMap<>();
+        mPartMapByFileName = new HashMap<>();
+    }
+
+    private void putPartToMaps(PduPart part) {
+        // Put part to mPartMapByContentId.
+        byte[] contentId = part.getContentId();
+        if(null != contentId) {
+            mPartMapByContentId.put(new String(contentId), part);
+        }
+
+        // Put part to mPartMapByContentLocation.
+        byte[] contentLocation = part.getContentLocation();
+        if(null != contentLocation) {
+            String clc = new String(contentLocation);
+            mPartMapByContentLocation.put(clc, part);
+        }
+
+        // Put part to mPartMapByName.
+        byte[] name = part.getName();
+        if(null != name) {
+            String clc = new String(name);
+            mPartMapByName.put(clc, part);
+        }
+
+        // Put part to mPartMapByFileName.
+        byte[] fileName = part.getFilename();
+        if(null != fileName) {
+            String clc = new String(fileName);
+            mPartMapByFileName.put(clc, part);
+        }
+    }
+
+    /**
+     * Appends the specified part to the end of this body.
+     *
+     * @param part part to be appended
+     * @return true when success, false when fail
+     * @throws NullPointerException when part is null
+     */
+    public boolean addPart(PduPart part) {
+        if(null == part) {
+            throw new NullPointerException();
+        }
+
+        putPartToMaps(part);
+        return mParts.add(part);
+    }
+
+    /**
+     * Inserts the specified part at the specified position.
+     *
+     * @param index index at which the specified part is to be inserted
+     * @param part part to be inserted
+     * @throws NullPointerException when part is null
+     */
+    public void addPart(int index, PduPart part) {
+        if(null == part) {
+            throw new NullPointerException();
+        }
+
+        putPartToMaps(part);
+        mParts.add(index, part);
+    }
+
+    /**
+     * Removes the part at the specified position.
+     *
+     * @param index index of the part to return
+     * @return part at the specified index
+     */
+    public PduPart removePart(int index) {
+        return mParts.remove(index);
+    }
+
+    /**
+     * Remove all of the parts.
+     */
+    public void removeAll() {
+        mParts.clear();
+    }
+
+    /**
+     * Get the part at the specified position.
+     *
+     * @param index index of the part to return
+     * @return part at the specified index
+     */
+    public PduPart getPart(int index) {
+        return mParts.get(index);
+    }
+
+    /**
+     * Get the index of the specified part.
+     *
+     * @param part the part object
+     * @return index the index of the first occurrence of the part in this body
+     */
+    public int getPartIndex(PduPart part) {
+        return mParts.indexOf(part);
+    }
+
+    /**
+     * Get the number of parts.
+     *
+     * @return the number of parts
+     */
+    public int getPartsNum() {
+        return mParts.size();
+    }
+
+    /**
+     * Get pdu part by content id.
+     *
+     * @param cid the value of content id.
+     * @return the pdu part.
+     */
+    public PduPart getPartByContentId(String cid) {
+        return mPartMapByContentId.get(cid);
+    }
+
+    /**
+     * Get pdu part by Content-Location. Content-Location of part is
+     * the same as filename and name(param of content-type).
+     *
+     * @param contentLocation the value of filename.
+     * @return the pdu part.
+     */
+    public PduPart getPartByContentLocation(String contentLocation) {
+        return mPartMapByContentLocation.get(contentLocation);
+    }
+
+    /**
+     * Get pdu part by name.
+     *
+     * @param name the value of filename.
+     * @return the pdu part.
+     */
+    public PduPart getPartByName(String name) {
+        return mPartMapByName.get(name);
+    }
+
+    /**
+     * Get pdu part by filename.
+     *
+     * @param filename the value of filename.
+     * @return the pdu part.
+     */
+    public PduPart getPartByFileName(String filename) {
+        return mPartMapByFileName.get(filename);
+    }
+}
diff --git a/android-smsmms/src/main/java/com/google/android/mms/pdu_alt/PduComposer.java b/android-smsmms/src/main/java/com/google/android/mms/pdu_alt/PduComposer.java
index 8e9f5edb5..a3860a0b0 100755
--- a/android-smsmms/src/main/java/com/google/android/mms/pdu_alt/PduComposer.java
+++ b/android-smsmms/src/main/java/com/google/android/mms/pdu_alt/PduComposer.java
@@ -1,1186 +1,1186 @@
-/*
- * Copyright (C) 2015 Jacob Klinker
- *
- * Licensed under the Apache License, Version 2.0 (the "License");
- * you may not use this file except in compliance with the License.
- * You may obtain a copy of the License at
- *
- * http://www.apache.org/licenses/LICENSE-2.0
- *
- * Unless required by applicable law or agreed to in writing, software
- * distributed under the License is distributed on an "AS IS" BASIS,
- * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
- * See the License for the specific language governing permissions and
- * limitations under the License.
- */
-
-package com.google.android.mms.pdu_alt;
-
-import android.content.ContentResolver;
-import android.content.Context;
-import android.text.TextUtils;
-import timber.log.Timber;
-
-import java.io.ByteArrayOutputStream;
-import java.io.FileNotFoundException;
-import java.io.IOException;
-import java.io.InputStream;
-import java.util.Arrays;
-import java.util.HashMap;
-
-public class PduComposer {
-    /**
-     * Address type.
-     */
-    static private final int PDU_PHONE_NUMBER_ADDRESS_TYPE = 1;
-    static private final int PDU_EMAIL_ADDRESS_TYPE = 2;
-    static private final int PDU_IPV4_ADDRESS_TYPE = 3;
-    static private final int PDU_IPV6_ADDRESS_TYPE = 4;
-    static private final int PDU_UNKNOWN_ADDRESS_TYPE = 5;
-
-    /**
-     * Address regular expression string.
-     */
-    static final String REGEXP_PHONE_NUMBER_ADDRESS_TYPE = "\\+?[0-9|\\.|\\-]+";
-    static final String REGEXP_EMAIL_ADDRESS_TYPE = "[a-zA-Z| ]*\\<{0,1}[a-zA-Z| ]+@{1}" +
-            "[a-zA-Z| ]+\\.{1}[a-zA-Z| ]+\\>{0,1}";
-    static final String REGEXP_IPV6_ADDRESS_TYPE =
-        "[a-fA-F]{4}\\:{1}[a-fA-F0-9]{4}\\:{1}[a-fA-F0-9]{4}\\:{1}" +
-        "[a-fA-F0-9]{4}\\:{1}[a-fA-F0-9]{4}\\:{1}[a-fA-F0-9]{4}\\:{1}" +
-        "[a-fA-F0-9]{4}\\:{1}[a-fA-F0-9]{4}";
-    static final String REGEXP_IPV4_ADDRESS_TYPE = "[0-9]{1,3}\\.{1}[0-9]{1,3}\\.{1}" +
-            "[0-9]{1,3}\\.{1}[0-9]{1,3}";
-
-    /**
-     * The postfix strings of address.
-     */
-    static final String STRING_PHONE_NUMBER_ADDRESS_TYPE = "/TYPE=PLMN";
-    static final String STRING_IPV4_ADDRESS_TYPE = "/TYPE=IPV4";
-    static final String STRING_IPV6_ADDRESS_TYPE = "/TYPE=IPV6";
-
-    /**
-     * Error values.
-     */
-    static private final int PDU_COMPOSE_SUCCESS = 0;
-    static private final int PDU_COMPOSE_CONTENT_ERROR = 1;
-    static private final int PDU_COMPOSE_FIELD_NOT_SET = 2;
-    static private final int PDU_COMPOSE_FIELD_NOT_SUPPORTED = 3;
-
-    /**
-     * WAP values defined in WSP spec.
-     */
-    static private final int QUOTED_STRING_FLAG = 34;
-    static private final int END_STRING_FLAG = 0;
-    static private final int LENGTH_QUOTE = 31;
-    static private final int TEXT_MAX = 127;
-    static private final int SHORT_INTEGER_MAX = 127;
-    static private final int LONG_INTEGER_LENGTH_MAX = 8;
-
-    /**
-     * Block size when read data from InputStream.
-     */
-    static private final int PDU_COMPOSER_BLOCK_SIZE = 1024;
-
-    /**
-     * The output message.
-     */
-    protected ByteArrayOutputStream mMessage = null;
-
-    /**
-     * The PDU.
-     */
-    private GenericPdu mPdu = null;
-
-    /**
-     * Current visiting position of the mMessage.
-     */
-    protected int mPosition = 0;
-
-    /**
-     * Message compose buffer stack.
-     */
-    private BufferStack mStack = null;
-
-    /**
-     * Content resolver.
-     */
-    private final ContentResolver mResolver;
-
-    /**
-     * Header of this pdu.
-     */
-    private PduHeaders mPduHeader = null;
-
-    /**
-     * Map of all content type
-     */
-    private static HashMap<String, Integer> mContentTypeMap = null;
-
-    static {
-        mContentTypeMap = new HashMap<String, Integer>();
-
-        int i;
-        for (i = 0; i < PduContentTypes.contentTypes.length; i++) {
-            mContentTypeMap.put(PduContentTypes.contentTypes[i], i);
-        }
-    }
-
-    /**
-     * Constructor.
-     *
-     * @param context the context
-     * @param pdu the pdu to be composed
-     */
-    public PduComposer(Context context, GenericPdu pdu) {
-        mPdu = pdu;
-        mResolver = context.getContentResolver();
-        mPduHeader = pdu.getPduHeaders();
-        mStack = new BufferStack();
-        mMessage = new ByteArrayOutputStream();
-        mPosition = 0;
-    }
-
-    /**
-     * Make the message. No need to check whether mandatory fields are set,
-     * because the constructors of outgoing pdus are taking care of this.
-     *
-     * @return OutputStream of maked message. Return null if
-     *         the PDU is invalid.
-     */
-    public byte[] make() {
-        // Get Message-type.
-        int type = mPdu.getMessageType();
-
-        /* make the message */
-        switch (type) {
-            case PduHeaders.MESSAGE_TYPE_SEND_REQ:
-                if (makeSendReqPdu() != PDU_COMPOSE_SUCCESS) {
-                    return null;
-                }
-                break;
-            case PduHeaders.MESSAGE_TYPE_NOTIFYRESP_IND:
-                if (makeNotifyResp() != PDU_COMPOSE_SUCCESS) {
-                    return null;
-                }
-                break;
-            case PduHeaders.MESSAGE_TYPE_ACKNOWLEDGE_IND:
-                if (makeAckInd() != PDU_COMPOSE_SUCCESS) {
-                    return null;
-                }
-                break;
-            case PduHeaders.MESSAGE_TYPE_READ_REC_IND:
-                if (makeReadRecInd() != PDU_COMPOSE_SUCCESS) {
-                    return null;
-                }
-                break;
-            default:
-                return null;
-        }
-
-        return mMessage.toByteArray();
-    }
-
-    /**
-     *  Copy buf to mMessage.
-     */
-    protected void arraycopy(byte[] buf, int pos, int length) {
-        mMessage.write(buf, pos, length);
-        mPosition = mPosition + length;
-    }
-
-    /**
-     * Append a byte to mMessage.
-     */
-    protected void append(int value) {
-        mMessage.write(value);
-        mPosition ++;
-    }
-
-    /**
-     * Append short integer value to mMessage.
-     * This implementation doesn't check the validity of parameter, since it
-     * assumes that the values are validated in the GenericPdu setter methods.
-     */
-    protected void appendShortInteger(int value) {
-        /*
-         * From WAP-230-WSP-20010705-a:
-         * Short-integer = OCTET
-         * ; Integers in range 0-127 shall be encoded as a one octet value
-         * ; with the most significant bit set to one (1xxx xxxx) and with
-         * ; the value in the remaining least significant bits.
-         * In our implementation, only low 7 bits are stored and otherwise
-         * bits are ignored.
-         */
-        append((value | 0x80) & 0xff);
-    }
-
-    /**
-     * Append an octet number between 128 and 255 into mMessage.
-     * NOTE:
-     * A value between 0 and 127 should be appended by using appendShortInteger.
-     * This implementation doesn't check the validity of parameter, since it
-     * assumes that the values are validated in the GenericPdu setter methods.
-     */
-    protected void appendOctet(int number) {
-        append(number);
-    }
-
-    /**
-     * Append a short length into mMessage.
-     * This implementation doesn't check the validity of parameter, since it
-     * assumes that the values are validated in the GenericPdu setter methods.
-     */
-    protected void appendShortLength(int value) {
-        /*
-         * From WAP-230-WSP-20010705-a:
-         * Short-length = <Any octet 0-30>
-         */
-        append(value);
-    }
-
-    /**
-     * Append long integer into mMessage. it's used for really long integers.
-     * This implementation doesn't check the validity of parameter, since it
-     * assumes that the values are validated in the GenericPdu setter methods.
-     */
-    protected void appendLongInteger(long longInt) {
-        /*
-         * From WAP-230-WSP-20010705-a:
-         * Long-integer = Short-length Multi-octet-integer
-         * ; The Short-length indicates the length of the Multi-octet-integer
-         * Multi-octet-integer = 1*30 OCTET
-         * ; The content octets shall be an unsigned integer value with the
-         * ; most significant octet encoded first (big-endian representation).
-         * ; The minimum number of octets must be used to encode the value.
-         */
-        int size;
-        long temp = longInt;
-
-        // Count the length of the long integer.
-        for(size = 0; (temp != 0) && (size < LONG_INTEGER_LENGTH_MAX); size++) {
-            temp = (temp >>> 8);
-        }
-
-        // Set Length.
-        appendShortLength(size);
-
-        // Count and set the long integer.
-        int i;
-        int shift = (size -1) * 8;
-
-        for (i = 0; i < size; i++) {
-            append((int)((longInt >>> shift) & 0xff));
-            shift = shift - 8;
-        }
-    }
-
-    /**
-     * Append text string into mMessage.
-     * This implementation doesn't check the validity of parameter, since it
-     * assumes that the values are validated in the GenericPdu setter methods.
-     */
-    protected void appendTextString(byte[] text) {
-        /*
-         * From WAP-230-WSP-20010705-a:
-         * Text-string = [Quote] *TEXT End-of-string
-         * ; If the first character in the TEXT is in the range of 128-255,
-         * ; a Quote character must precede it. Otherwise the Quote character
-         * ;must be omitted. The Quote is not part of the contents.
-         */
-        if (((text[0])&0xff) > TEXT_MAX) { // No need to check for <= 255
-            append(TEXT_MAX);
-        }
-
-        arraycopy(text, 0, text.length);
-        append(0);
-    }
-
-    /**
-     * Append text string into mMessage.
-     * This implementation doesn't check the validity of parameter, since it
-     * assumes that the values are validated in the GenericPdu setter methods.
-     */
-    protected void appendTextString(String str) {
-        /*
-         * From WAP-230-WSP-20010705-a:
-         * Text-string = [Quote] *TEXT End-of-string
-         * ; If the first character in the TEXT is in the range of 128-255,
-         * ; a Quote character must precede it. Otherwise the Quote character
-         * ;must be omitted. The Quote is not part of the contents.
-         */
-        appendTextString(str.getBytes());
-    }
-
-    /**
-     * Append encoded string value to mMessage.
-     * This implementation doesn't check the validity of parameter, since it
-     * assumes that the values are validated in the GenericPdu setter methods.
-     */
-    protected void appendEncodedString(EncodedStringValue enStr) {
-        /*
-         * From OMA-TS-MMS-ENC-V1_3-20050927-C:
-         * Encoded-string-value = Text-string | Value-length Char-set Text-string
-         */
-        assert(enStr != null);
-
-        int charset = enStr.getCharacterSet();
-        byte[] textString = enStr.getTextString();
-        if (null == textString) {
-            return;
-        }
-
-        /*
-         * In the implementation of EncodedStringValue, the charset field will
-         * never be 0. It will always be composed as
-         * Encoded-string-value = Value-length Char-set Text-string
-         */
-        mStack.newbuf();
-        PositionMarker start = mStack.mark();
-
-        appendShortInteger(charset);
-        appendTextString(textString);
-
-        int len = start.getLength();
-        mStack.pop();
-        appendValueLength(len);
-        mStack.copy();
-    }
-
-    /**
-     * Append uintvar integer into mMessage.
-     * This implementation doesn't check the validity of parameter, since it
-     * assumes that the values are validated in the GenericPdu setter methods.
-     */
-    protected void appendUintvarInteger(long value) {
-        /*
-         * From WAP-230-WSP-20010705-a:
-         * To encode a large unsigned integer, split it into 7-bit fragments
-         * and place them in the payloads of multiple octets. The most significant
-         * bits are placed in the first octets with the least significant bits
-         * ending up in the last octet. All octets MUST set the Continue bit to 1
-         * except the last octet, which MUST set the Continue bit to 0.
-         */
-        int i;
-        long max = SHORT_INTEGER_MAX;
-
-        for (i = 0; i < 5; i++) {
-            if (value < max) {
-                break;
-            }
-
-            max = (max << 7) | 0x7fl;
-        }
-
-        while(i > 0) {
-            long temp = value >>> (i * 7);
-            temp = temp & 0x7f;
-
-            append((int)((temp | 0x80) & 0xff));
-
-            i--;
-        }
-
-        append((int)(value & 0x7f));
-    }
-
-    /**
-     * Append date value into mMessage.
-     * This implementation doesn't check the validity of parameter, since it
-     * assumes that the values are validated in the GenericPdu setter methods.
-     */
-    protected void appendDateValue(long date) {
-        /*
-         * From OMA-TS-MMS-ENC-V1_3-20050927-C:
-         * Date-value = Long-integer
-         */
-        appendLongInteger(date);
-    }
-
-    /**
-     * Append value length to mMessage.
-     * This implementation doesn't check the validity of parameter, since it
-     * assumes that the values are validated in the GenericPdu setter methods.
-     */
-    protected void appendValueLength(long value) {
-        /*
-         * From WAP-230-WSP-20010705-a:
-         * Value-length = Short-length | (Length-quote Length)
-         * ; Value length is used to indicate the length of the value to follow
-         * Short-length = <Any octet 0-30>
-         * Length-quote = <Octet 31>
-         * Length = Uintvar-integer
-         */
-        if (value < LENGTH_QUOTE) {
-            appendShortLength((int) value);
-            return;
-        }
-
-        append(LENGTH_QUOTE);
-        appendUintvarInteger(value);
-    }
-
-    /**
-     * Append quoted string to mMessage.
-     * This implementation doesn't check the validity of parameter, since it
-     * assumes that the values are validated in the GenericPdu setter methods.
-     */
-    protected void appendQuotedString(byte[] text) {
-        /*
-         * From WAP-230-WSP-20010705-a:
-         * Quoted-string = <Octet 34> *TEXT End-of-string
-         * ;The TEXT encodes an RFC2616 Quoted-string with the enclosing
-         * ;quotation-marks <"> removed.
-         */
-        append(QUOTED_STRING_FLAG);
-        arraycopy(text, 0, text.length);
-        append(END_STRING_FLAG);
-    }
-
-    /**
-     * Append quoted string to mMessage.
-     * This implementation doesn't check the validity of parameter, since it
-     * assumes that the values are validated in the GenericPdu setter methods.
-     */
-    protected void appendQuotedString(String str) {
-        /*
-         * From WAP-230-WSP-20010705-a:
-         * Quoted-string = <Octet 34> *TEXT End-of-string
-         * ;The TEXT encodes an RFC2616 Quoted-string with the enclosing
-         * ;quotation-marks <"> removed.
-         */
-        appendQuotedString(str.getBytes());
-    }
-
-    private EncodedStringValue appendAddressType(EncodedStringValue address) {
-        EncodedStringValue temp = null;
-
-        try {
-            int addressType = checkAddressType(address.getString());
-            temp = EncodedStringValue.copy(address);
-            if (PDU_PHONE_NUMBER_ADDRESS_TYPE == addressType) {
-                // Phone number.
-                temp.appendTextString(STRING_PHONE_NUMBER_ADDRESS_TYPE.getBytes());
-            } else if (PDU_IPV4_ADDRESS_TYPE == addressType) {
-                // Ipv4 address.
-                temp.appendTextString(STRING_IPV4_ADDRESS_TYPE.getBytes());
-            } else if (PDU_IPV6_ADDRESS_TYPE == addressType) {
-                // Ipv6 address.
-                temp.appendTextString(STRING_IPV6_ADDRESS_TYPE.getBytes());
-            }
-        } catch (NullPointerException e) {
-            return null;
-        }
-
-        return temp;
-    }
-
-    /**
-     * Append header to mMessage.
-     */
-    private int appendHeader(int field) {
-        switch (field) {
-            case PduHeaders.MMS_VERSION:
-                appendOctet(field);
-
-                int version = mPduHeader.getOctet(field);
-                if (0 == version) {
-                    appendShortInteger(PduHeaders.CURRENT_MMS_VERSION);
-                } else {
-                    appendShortInteger(version);
-                }
-
-                break;
-
-            case PduHeaders.MESSAGE_ID:
-            case PduHeaders.TRANSACTION_ID:
-                byte[] textString = mPduHeader.getTextString(field);
-                if (null == textString) {
-                    return PDU_COMPOSE_FIELD_NOT_SET;
-                }
-
-                appendOctet(field);
-                appendTextString(textString);
-                break;
-
-            case PduHeaders.TO:
-            case PduHeaders.BCC:
-            case PduHeaders.CC:
-                EncodedStringValue[] addr = mPduHeader.getEncodedStringValues(field);
-
-                if (null == addr) {
-                    return PDU_COMPOSE_FIELD_NOT_SET;
-                }
-
-                EncodedStringValue temp;
-                for (int i = 0; i < addr.length; i++) {
-                    temp = appendAddressType(addr[i]);
-                    if (temp == null) {
-                        return PDU_COMPOSE_CONTENT_ERROR;
-                    }
-
-                    appendOctet(field);
-                    appendEncodedString(temp);
-                }
-                break;
-
-            case PduHeaders.FROM:
-                // Value-length (Address-present-token Encoded-string-value | Insert-address-token)
-                appendOctet(field);
-
-                EncodedStringValue from = mPduHeader.getEncodedStringValue(field);
-                if ((from == null)
-                        || TextUtils.isEmpty(from.getString())
-                        || new String(from.getTextString()).equals(
-                                PduHeaders.FROM_INSERT_ADDRESS_TOKEN_STR)) {
-                    // Length of from = 1
-                    append(1);
-                    // Insert-address-token = <Octet 129>
-                    append(PduHeaders.FROM_INSERT_ADDRESS_TOKEN);
-                } else {
-                    mStack.newbuf();
-                    PositionMarker fstart = mStack.mark();
-
-                    // Address-present-token = <Octet 128>
-                    append(PduHeaders.FROM_ADDRESS_PRESENT_TOKEN);
-
-                    temp = appendAddressType(from);
-                    if (temp == null) {
-                        return PDU_COMPOSE_CONTENT_ERROR;
-                    }
-
-                    appendEncodedString(temp);
-
-                    int flen = fstart.getLength();
-                    mStack.pop();
-                    appendValueLength(flen);
-                    mStack.copy();
-                }
-                break;
-
-            case PduHeaders.READ_STATUS:
-            case PduHeaders.STATUS:
-            case PduHeaders.REPORT_ALLOWED:
-            case PduHeaders.PRIORITY:
-            case PduHeaders.DELIVERY_REPORT:
-            case PduHeaders.READ_REPORT:
-                int octet = mPduHeader.getOctet(field);
-                if (0 == octet) {
-                    return PDU_COMPOSE_FIELD_NOT_SET;
-                }
-
-                appendOctet(field);
-                appendOctet(octet);
-                break;
-
-            case PduHeaders.DATE:
-                long date = mPduHeader.getLongInteger(field);
-                if (-1 == date) {
-                    return PDU_COMPOSE_FIELD_NOT_SET;
-                }
-
-                appendOctet(field);
-                appendDateValue(date);
-                break;
-
-            case PduHeaders.SUBJECT:
-                EncodedStringValue enString =
-                    mPduHeader.getEncodedStringValue(field);
-                if (null == enString) {
-                    return PDU_COMPOSE_FIELD_NOT_SET;
-                }
-
-                appendOctet(field);
-                appendEncodedString(enString);
-                break;
-
-            case PduHeaders.MESSAGE_CLASS:
-                byte[] messageClass = mPduHeader.getTextString(field);
-                if (null == messageClass) {
-                    return PDU_COMPOSE_FIELD_NOT_SET;
-                }
-
-                appendOctet(field);
-                if (Arrays.equals(messageClass,
-                        PduHeaders.MESSAGE_CLASS_ADVERTISEMENT_STR.getBytes())) {
-                    appendOctet(PduHeaders.MESSAGE_CLASS_ADVERTISEMENT);
-                } else if (Arrays.equals(messageClass,
-                        PduHeaders.MESSAGE_CLASS_AUTO_STR.getBytes())) {
-                    appendOctet(PduHeaders.MESSAGE_CLASS_AUTO);
-                } else if (Arrays.equals(messageClass,
-                        PduHeaders.MESSAGE_CLASS_PERSONAL_STR.getBytes())) {
-                    appendOctet(PduHeaders.MESSAGE_CLASS_PERSONAL);
-                } else if (Arrays.equals(messageClass,
-                        PduHeaders.MESSAGE_CLASS_INFORMATIONAL_STR.getBytes())) {
-                    appendOctet(PduHeaders.MESSAGE_CLASS_INFORMATIONAL);
-                } else {
-                    appendTextString(messageClass);
-                }
-                break;
-
-            case PduHeaders.EXPIRY:
-                long expiry = mPduHeader.getLongInteger(field);
-                if (-1 == expiry) {
-                    return PDU_COMPOSE_FIELD_NOT_SET;
-                }
-
-                appendOctet(field);
-
-                mStack.newbuf();
-                PositionMarker expiryStart = mStack.mark();
-
-                append(PduHeaders.VALUE_RELATIVE_TOKEN);
-                appendLongInteger(expiry);
-
-                int expiryLength = expiryStart.getLength();
-                mStack.pop();
-                appendValueLength(expiryLength);
-                mStack.copy();
-                break;
-
-            default:
-                return PDU_COMPOSE_FIELD_NOT_SUPPORTED;
-        }
-
-        return PDU_COMPOSE_SUCCESS;
-    }
-
-    /**
-     * Make ReadRec.Ind.
-     */
-    private int makeReadRecInd() {
-        if (mMessage == null) {
-            mMessage = new ByteArrayOutputStream();
-            mPosition = 0;
-        }
-
-        // X-Mms-Message-Type
-        appendOctet(PduHeaders.MESSAGE_TYPE);
-        appendOctet(PduHeaders.MESSAGE_TYPE_READ_REC_IND);
-
-        // X-Mms-MMS-Version
-        if (appendHeader(PduHeaders.MMS_VERSION) != PDU_COMPOSE_SUCCESS) {
-            return PDU_COMPOSE_CONTENT_ERROR;
-        }
-
-        // Message-ID
-        if (appendHeader(PduHeaders.MESSAGE_ID) != PDU_COMPOSE_SUCCESS) {
-            return PDU_COMPOSE_CONTENT_ERROR;
-        }
-
-        // To
-        if (appendHeader(PduHeaders.TO) != PDU_COMPOSE_SUCCESS) {
-            return PDU_COMPOSE_CONTENT_ERROR;
-        }
-
-        // From
-        if (appendHeader(PduHeaders.FROM) != PDU_COMPOSE_SUCCESS) {
-            return PDU_COMPOSE_CONTENT_ERROR;
-        }
-
-        // Date Optional
-        appendHeader(PduHeaders.DATE);
-
-        // X-Mms-Read-Status
-        if (appendHeader(PduHeaders.READ_STATUS) != PDU_COMPOSE_SUCCESS) {
-            return PDU_COMPOSE_CONTENT_ERROR;
-        }
-
-        // X-Mms-Applic-ID Optional(not support)
-        // X-Mms-Reply-Applic-ID Optional(not support)
-        // X-Mms-Aux-Applic-Info Optional(not support)
-
-        return PDU_COMPOSE_SUCCESS;
-    }
-
-    /**
-     * Make NotifyResp.Ind.
-     */
-    private int makeNotifyResp() {
-        if (mMessage == null) {
-            mMessage = new ByteArrayOutputStream();
-            mPosition = 0;
-        }
-
-        //    X-Mms-Message-Type
-        appendOctet(PduHeaders.MESSAGE_TYPE);
-        appendOctet(PduHeaders.MESSAGE_TYPE_NOTIFYRESP_IND);
-
-        // X-Mms-Transaction-ID
-        if (appendHeader(PduHeaders.TRANSACTION_ID) != PDU_COMPOSE_SUCCESS) {
-            return PDU_COMPOSE_CONTENT_ERROR;
-        }
-
-        // X-Mms-MMS-Version
-        if (appendHeader(PduHeaders.MMS_VERSION) != PDU_COMPOSE_SUCCESS) {
-            return PDU_COMPOSE_CONTENT_ERROR;
-        }
-
-        //  X-Mms-Status
-        if (appendHeader(PduHeaders.STATUS) != PDU_COMPOSE_SUCCESS) {
-            return PDU_COMPOSE_CONTENT_ERROR;
-        }
-
-        // X-Mms-Report-Allowed Optional (not support)
-        return PDU_COMPOSE_SUCCESS;
-    }
-
-    /**
-     * Make Acknowledge.Ind.
-     */
-    private int makeAckInd() {
-        if (mMessage == null) {
-            mMessage = new ByteArrayOutputStream();
-            mPosition = 0;
-        }
-
-        //    X-Mms-Message-Type
-        appendOctet(PduHeaders.MESSAGE_TYPE);
-        appendOctet(PduHeaders.MESSAGE_TYPE_ACKNOWLEDGE_IND);
-
-        // X-Mms-Transaction-ID
-        if (appendHeader(PduHeaders.TRANSACTION_ID) != PDU_COMPOSE_SUCCESS) {
-            return PDU_COMPOSE_CONTENT_ERROR;
-        }
-
-        //     X-Mms-MMS-Version
-        if (appendHeader(PduHeaders.MMS_VERSION) != PDU_COMPOSE_SUCCESS) {
-            return PDU_COMPOSE_CONTENT_ERROR;
-        }
-
-        // X-Mms-Report-Allowed Optional
-        appendHeader(PduHeaders.REPORT_ALLOWED);
-
-        return PDU_COMPOSE_SUCCESS;
-    }
-
-    /**
-     * Make Send.req.
-     */
-    private int makeSendReqPdu() {
-        if (mMessage == null) {
-            mMessage = new ByteArrayOutputStream();
-            mPosition = 0;
-        }
-
-        // X-Mms-Message-Type
-        appendOctet(PduHeaders.MESSAGE_TYPE);
-        appendOctet(PduHeaders.MESSAGE_TYPE_SEND_REQ);
-
-        // X-Mms-Transaction-ID
-        appendOctet(PduHeaders.TRANSACTION_ID);
-
-        byte[] trid = mPduHeader.getTextString(PduHeaders.TRANSACTION_ID);
-        if (trid == null) {
-            // Transaction-ID should be set(by Transaction) before make().
-            throw new IllegalArgumentException("Transaction-ID is null.");
-        }
-        appendTextString(trid);
-
-        //  X-Mms-MMS-Version
-        if (appendHeader(PduHeaders.MMS_VERSION) != PDU_COMPOSE_SUCCESS) {
-            return PDU_COMPOSE_CONTENT_ERROR;
-        }
-
-        // Date Date-value Optional.
-        appendHeader(PduHeaders.DATE);
-
-        // From
-        if (appendHeader(PduHeaders.FROM) != PDU_COMPOSE_SUCCESS) {
-            return PDU_COMPOSE_CONTENT_ERROR;
-        }
-
-        boolean recipient = false;
-
-        // To
-        if (appendHeader(PduHeaders.TO) != PDU_COMPOSE_CONTENT_ERROR) {
-            recipient = true;
-        }
-
-        // Cc
-        if (appendHeader(PduHeaders.CC) != PDU_COMPOSE_CONTENT_ERROR) {
-            recipient = true;
-        }
-
-        // Bcc
-        if (appendHeader(PduHeaders.BCC) != PDU_COMPOSE_CONTENT_ERROR) {
-            recipient = true;
-        }
-
-        // Need at least one of "cc", "bcc" and "to".
-        if (false == recipient) {
-            return PDU_COMPOSE_CONTENT_ERROR;
-        }
-
-        // Subject Optional
-        appendHeader(PduHeaders.SUBJECT);
-
-        // X-Mms-Message-Class Optional
-        // Message-class-value = Class-identifier | Token-text
-        appendHeader(PduHeaders.MESSAGE_CLASS);
-
-        // X-Mms-Expiry Optional
-        appendHeader(PduHeaders.EXPIRY);
-
-        // X-Mms-Priority Optional
-        appendHeader(PduHeaders.PRIORITY);
-
-        // X-Mms-Delivery-Report Optional
-        appendHeader(PduHeaders.DELIVERY_REPORT);
-
-        // X-Mms-Read-Report Optional
-        appendHeader(PduHeaders.READ_REPORT);
-
-        //    Content-Type
-        appendOctet(PduHeaders.CONTENT_TYPE);
-
-        //  Message body
-        return makeMessageBody();
-    }
-
-    /**
-     * Make message body.
-     */
-    private int makeMessageBody() {
-        // 1. add body informations
-        mStack.newbuf();  // Switching buffer because we need to
-
-        PositionMarker ctStart = mStack.mark();
-
-        // This contentTypeIdentifier should be used for type of attachment...
-        String contentType = new String(mPduHeader.getTextString(PduHeaders.CONTENT_TYPE));
-        Integer contentTypeIdentifier = mContentTypeMap.get(contentType);
-        if (contentTypeIdentifier == null) {
-            // content type is mandatory
-            return PDU_COMPOSE_CONTENT_ERROR;
-        }
-
-        appendShortInteger(contentTypeIdentifier.intValue());
-
-        // content-type parameter: start
-        PduBody body = ((SendReq) mPdu).getBody();
-        if (null == body || body.getPartsNum() == 0) {
-            // empty message
-            appendUintvarInteger(0);
-            mStack.pop();
-            mStack.copy();
-            return PDU_COMPOSE_SUCCESS;
-        }
-
-        PduPart part;
-        try {
-            part = body.getPart(0);
-
-            byte[] start = part.getContentId();
-            if (start != null) {
-                appendOctet(PduPart.P_DEP_START);
-                if (('<' == start[0]) && ('>' == start[start.length - 1])) {
-                    appendTextString(start);
-                } else {
-                    appendTextString("<" + new String(start) + ">");
-                }
-            }
-
-            // content-type parameter: type
-            appendOctet(PduPart.P_CT_MR_TYPE);
-            appendTextString(part.getContentType());
-        }
-        catch (ArrayIndexOutOfBoundsException e){
-            Timber.e(e, "logging error");
-            e.printStackTrace();
-        }
-
-        int ctLength = ctStart.getLength();
-        mStack.pop();
-        appendValueLength(ctLength);
-        mStack.copy();
-
-        // 3. add content
-        int partNum = body.getPartsNum();
-        appendUintvarInteger(partNum);
-        for (int i = 0; i < partNum; i++) {
-            part = body.getPart(i);
-            mStack.newbuf();  // Leaving space for header lengh and data length
-            PositionMarker attachment = mStack.mark();
-
-            mStack.newbuf();  // Leaving space for Content-Type length
-            PositionMarker contentTypeBegin = mStack.mark();
-
-            byte[] partContentType = part.getContentType();
-
-            if (partContentType == null) {
-                // content type is mandatory
-                return PDU_COMPOSE_CONTENT_ERROR;
-            }
-
-            // content-type value
-            Integer partContentTypeIdentifier =
-                mContentTypeMap.get(new String(partContentType));
-            if (partContentTypeIdentifier == null) {
-                appendTextString(partContentType);
-            } else {
-                appendShortInteger(partContentTypeIdentifier.intValue());
-            }
-
-            /* Content-type parameter : name.
-             * The value of name, filename, content-location is the same.
-             * Just one of them is enough for this PDU.
-             */
-            byte[] name = part.getName();
-
-            if (null == name) {
-                name = part.getFilename();
-
-                if (null == name) {
-                    name = part.getContentLocation();
-
-                    if (null == name) {
-                        /* at lease one of name, filename, Content-location
-                         * should be available.
-                         */
-                        return PDU_COMPOSE_CONTENT_ERROR;
-                    }
-                }
-            }
-            appendOctet(PduPart.P_DEP_NAME);
-            appendTextString(name);
-
-            // content-type parameter : charset
-            int charset = part.getCharset();
-            if (charset != 0) {
-                appendOctet(PduPart.P_CHARSET);
-                appendShortInteger(charset);
-            }
-
-            int contentTypeLength = contentTypeBegin.getLength();
-            mStack.pop();
-            appendValueLength(contentTypeLength);
-            mStack.copy();
-
-            // content id
-            byte[] contentId = part.getContentId();
-
-            if (null != contentId) {
-                appendOctet(PduPart.P_CONTENT_ID);
-                if (('<' == contentId[0]) && ('>' == contentId[contentId.length - 1])) {
-                    appendQuotedString(contentId);
-                } else {
-                    appendQuotedString("<" + new String(contentId) + ">");
-                }
-            }
-
-            // content-location
-            byte[] contentLocation = part.getContentLocation();
-            if (null != contentLocation) {
-            	appendOctet(PduPart.P_CONTENT_LOCATION);
-            	appendTextString(contentLocation);
-            }
-
-            // content
-            int headerLength = attachment.getLength();
-
-            int dataLength = 0; // Just for safety...
-            byte[] partData = part.getData();
-
-            if (partData != null) {
-                arraycopy(partData, 0, partData.length);
-                dataLength = partData.length;
-            } else {
-                InputStream cr = null;
-                try {
-                    byte[] buffer = new byte[PDU_COMPOSER_BLOCK_SIZE];
-                    cr = mResolver.openInputStream(part.getDataUri());
-                    int len = 0;
-                    while ((len = cr.read(buffer)) != -1) {
-                        mMessage.write(buffer, 0, len);
-                        mPosition += len;
-                        dataLength += len;
-                    }
-                } catch (FileNotFoundException e) {
-                    return PDU_COMPOSE_CONTENT_ERROR;
-                } catch (IOException e) {
-                    return PDU_COMPOSE_CONTENT_ERROR;
-                } catch (RuntimeException e) {
-                    return PDU_COMPOSE_CONTENT_ERROR;
-                } finally {
-                    if (cr != null) {
-                        try {
-                            cr.close();
-                        } catch (IOException e) {
-                        }
-                    }
-                }
-            }
-
-            if (dataLength != (attachment.getLength() - headerLength)) {
-                throw new RuntimeException("BUG: Length sanity check failed");
-            }
-
-            mStack.pop();
-            appendUintvarInteger(headerLength);
-            appendUintvarInteger(dataLength);
-            mStack.copy();
-        }
-
-        return PDU_COMPOSE_SUCCESS;
-    }
-
-    /**
-     *  Record current message informations.
-     */
-    static private class LengthRecordNode {
-        ByteArrayOutputStream currentMessage = null;
-        public int currentPosition = 0;
-
-        public LengthRecordNode next = null;
-    }
-
-    /**
-     * Mark current message position and stact size.
-     */
-    private class PositionMarker {
-        private int c_pos;   // Current position
-        private int currentStackSize;  // Current stack size
-
-        int getLength() {
-            // If these assert fails, likely that you are finding the
-            // size of buffer that is deep in BufferStack you can only
-            // find the length of the buffer that is on top
-            if (currentStackSize != mStack.stackSize) {
-                throw new RuntimeException("BUG: Invalid call to getLength()");
-            }
-
-            return mPosition - c_pos;
-        }
-    }
-
-    /**
-     * This implementation can be OPTIMIZED to use only
-     * 2 buffers. This optimization involves changing BufferStack
-     * only... Its usage (interface) will not change.
-     */
-    private class BufferStack {
-        private LengthRecordNode stack = null;
-        private LengthRecordNode toCopy = null;
-
-        int stackSize = 0;
-
-        /**
-         *  Create a new message buffer and push it into the stack.
-         */
-        void newbuf() {
-            // You can't create a new buff when toCopy != null
-            // That is after calling pop() and before calling copy()
-            // If you do, it is a bug
-            if (toCopy != null) {
-                throw new RuntimeException("BUG: Invalid newbuf() before copy()");
-            }
-
-            LengthRecordNode temp = new LengthRecordNode();
-
-            temp.currentMessage = mMessage;
-            temp.currentPosition = mPosition;
-
-            temp.next = stack;
-            stack = temp;
-
-            stackSize = stackSize + 1;
-
-            mMessage = new ByteArrayOutputStream();
-            mPosition = 0;
-        }
-
-        /**
-         *  Pop the message before and record current message in the stack.
-         */
-        void pop() {
-            ByteArrayOutputStream currentMessage = mMessage;
-            int currentPosition = mPosition;
-
-            mMessage = stack.currentMessage;
-            mPosition = stack.currentPosition;
-
-            toCopy = stack;
-            // Re using the top element of the stack to avoid memory allocation
-
-            stack = stack.next;
-            stackSize = stackSize - 1;
-
-            toCopy.currentMessage = currentMessage;
-            toCopy.currentPosition = currentPosition;
-        }
-
-        /**
-         *  Append current message to the message before.
-         */
-        void copy() {
-            arraycopy(toCopy.currentMessage.toByteArray(), 0,
-                    toCopy.currentPosition);
-
-            toCopy = null;
-        }
-
-        /**
-         *  Mark current message position
-         */
-        PositionMarker mark() {
-            PositionMarker m = new PositionMarker();
-
-            m.c_pos = mPosition;
-            m.currentStackSize = stackSize;
-
-            return m;
-        }
-    }
-
-    /**
-     * Check address type.
-     *
-     * @param address address string without the postfix stinng type,
-     *        such as "/TYPE=PLMN", "/TYPE=IPv6" and "/TYPE=IPv4"
-     * @return PDU_PHONE_NUMBER_ADDRESS_TYPE if it is phone number,
-     *         PDU_EMAIL_ADDRESS_TYPE if it is email address,
-     *         PDU_IPV4_ADDRESS_TYPE if it is ipv4 address,
-     *         PDU_IPV6_ADDRESS_TYPE if it is ipv6 address,
-     *         PDU_UNKNOWN_ADDRESS_TYPE if it is unknown.
-     */
-    protected static int checkAddressType(String address) {
-        /**
-         * From OMA-TS-MMS-ENC-V1_3-20050927-C.pdf, section 8.
-         * address = ( e-mail / device-address / alphanum-shortcode / num-shortcode)
-         * e-mail = mailbox; to the definition of mailbox as described in
-         * section 3.4 of [RFC2822], but excluding the
-         * obsolete definitions as indicated by the "obs-" prefix.
-         * device-address = ( global-phone-number "/TYPE=PLMN" )
-         * / ( ipv4 "/TYPE=IPv4" ) / ( ipv6 "/TYPE=IPv6" )
-         * / ( escaped-value "/TYPE=" address-type )
-         *
-         * global-phone-number = ["+"] 1*( DIGIT / written-sep )
-         * written-sep =("-"/".")
-         *
-         * ipv4 = 1*3DIGIT 3( "." 1*3DIGIT ) ; IPv4 address value
-         *
-         * ipv6 = 4HEXDIG 7( ":" 4HEXDIG ) ; IPv6 address per RFC 2373
-         */
-
-        if (null == address) {
-            return PDU_UNKNOWN_ADDRESS_TYPE;
-        }
-
-        if (address.matches(REGEXP_IPV4_ADDRESS_TYPE)) {
-            // Ipv4 address.
-            return PDU_IPV4_ADDRESS_TYPE;
-        }else if (address.matches(REGEXP_PHONE_NUMBER_ADDRESS_TYPE)) {
-            // Phone number.
-            return PDU_PHONE_NUMBER_ADDRESS_TYPE;
-        } else if (address.matches(REGEXP_EMAIL_ADDRESS_TYPE)) {
-            // Email address.
-            return PDU_EMAIL_ADDRESS_TYPE;
-        } else if (address.matches(REGEXP_IPV6_ADDRESS_TYPE)) {
-            // Ipv6 address.
-            return PDU_IPV6_ADDRESS_TYPE;
-        } else {
-            // Unknown address.
-            return PDU_UNKNOWN_ADDRESS_TYPE;
-        }
-    }
-}
+/*
+ * Copyright (C) 2015 Jacob Klinker
+ *
+ * Licensed under the Apache License, Version 2.0 (the "License");
+ * you may not use this file except in compliance with the License.
+ * You may obtain a copy of the License at
+ *
+ * http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing, software
+ * distributed under the License is distributed on an "AS IS" BASIS,
+ * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ * See the License for the specific language governing permissions and
+ * limitations under the License.
+ */
+
+package com.google.android.mms.pdu_alt;
+
+import android.content.ContentResolver;
+import android.content.Context;
+import android.text.TextUtils;
+import timber.log.Timber;
+
+import java.io.ByteArrayOutputStream;
+import java.io.FileNotFoundException;
+import java.io.IOException;
+import java.io.InputStream;
+import java.util.Arrays;
+import java.util.HashMap;
+
+public class PduComposer {
+    /**
+     * Address type.
+     */
+    static private final int PDU_PHONE_NUMBER_ADDRESS_TYPE = 1;
+    static private final int PDU_EMAIL_ADDRESS_TYPE = 2;
+    static private final int PDU_IPV4_ADDRESS_TYPE = 3;
+    static private final int PDU_IPV6_ADDRESS_TYPE = 4;
+    static private final int PDU_UNKNOWN_ADDRESS_TYPE = 5;
+
+    /**
+     * Address regular expression string.
+     */
+    static final String REGEXP_PHONE_NUMBER_ADDRESS_TYPE = "\\+?[0-9|\\.|\\-]+";
+    static final String REGEXP_EMAIL_ADDRESS_TYPE = "[a-zA-Z| ]*\\<{0,1}[a-zA-Z| ]+@{1}" +
+            "[a-zA-Z| ]+\\.{1}[a-zA-Z| ]+\\>{0,1}";
+    static final String REGEXP_IPV6_ADDRESS_TYPE =
+        "[a-fA-F]{4}\\:{1}[a-fA-F0-9]{4}\\:{1}[a-fA-F0-9]{4}\\:{1}" +
+        "[a-fA-F0-9]{4}\\:{1}[a-fA-F0-9]{4}\\:{1}[a-fA-F0-9]{4}\\:{1}" +
+        "[a-fA-F0-9]{4}\\:{1}[a-fA-F0-9]{4}";
+    static final String REGEXP_IPV4_ADDRESS_TYPE = "[0-9]{1,3}\\.{1}[0-9]{1,3}\\.{1}" +
+            "[0-9]{1,3}\\.{1}[0-9]{1,3}";
+
+    /**
+     * The postfix strings of address.
+     */
+    static final String STRING_PHONE_NUMBER_ADDRESS_TYPE = "/TYPE=PLMN";
+    static final String STRING_IPV4_ADDRESS_TYPE = "/TYPE=IPV4";
+    static final String STRING_IPV6_ADDRESS_TYPE = "/TYPE=IPV6";
+
+    /**
+     * Error values.
+     */
+    static private final int PDU_COMPOSE_SUCCESS = 0;
+    static private final int PDU_COMPOSE_CONTENT_ERROR = 1;
+    static private final int PDU_COMPOSE_FIELD_NOT_SET = 2;
+    static private final int PDU_COMPOSE_FIELD_NOT_SUPPORTED = 3;
+
+    /**
+     * WAP values defined in WSP spec.
+     */
+    static private final int QUOTED_STRING_FLAG = 34;
+    static private final int END_STRING_FLAG = 0;
+    static private final int LENGTH_QUOTE = 31;
+    static private final int TEXT_MAX = 127;
+    static private final int SHORT_INTEGER_MAX = 127;
+    static private final int LONG_INTEGER_LENGTH_MAX = 8;
+
+    /**
+     * Block size when read data from InputStream.
+     */
+    static private final int PDU_COMPOSER_BLOCK_SIZE = 1024;
+
+    /**
+     * The output message.
+     */
+    protected ByteArrayOutputStream mMessage = null;
+
+    /**
+     * The PDU.
+     */
+    private GenericPdu mPdu = null;
+
+    /**
+     * Current visiting position of the mMessage.
+     */
+    protected int mPosition = 0;
+
+    /**
+     * Message compose buffer stack.
+     */
+    private BufferStack mStack = null;
+
+    /**
+     * Content resolver.
+     */
+    private final ContentResolver mResolver;
+
+    /**
+     * Header of this pdu.
+     */
+    private PduHeaders mPduHeader = null;
+
+    /**
+     * Map of all content type
+     */
+    private static HashMap<String, Integer> mContentTypeMap = null;
+
+    static {
+        mContentTypeMap = new HashMap<String, Integer>();
+
+        int i;
+        for (i = 0; i < PduContentTypes.contentTypes.length; i++) {
+            mContentTypeMap.put(PduContentTypes.contentTypes[i], i);
+        }
+    }
+
+    /**
+     * Constructor.
+     *
+     * @param context the context
+     * @param pdu the pdu to be composed
+     */
+    public PduComposer(Context context, GenericPdu pdu) {
+        mPdu = pdu;
+        mResolver = context.getContentResolver();
+        mPduHeader = pdu.getPduHeaders();
+        mStack = new BufferStack();
+        mMessage = new ByteArrayOutputStream();
+        mPosition = 0;
+    }
+
+    /**
+     * Make the message. No need to check whether mandatory fields are set,
+     * because the constructors of outgoing pdus are taking care of this.
+     *
+     * @return OutputStream of maked message. Return null if
+     *         the PDU is invalid.
+     */
+    public byte[] make() {
+        // Get Message-type.
+        int type = mPdu.getMessageType();
+
+        /* make the message */
+        switch (type) {
+            case PduHeaders.MESSAGE_TYPE_SEND_REQ:
+                if (makeSendReqPdu() != PDU_COMPOSE_SUCCESS) {
+                    return null;
+                }
+                break;
+            case PduHeaders.MESSAGE_TYPE_NOTIFYRESP_IND:
+                if (makeNotifyResp() != PDU_COMPOSE_SUCCESS) {
+                    return null;
+                }
+                break;
+            case PduHeaders.MESSAGE_TYPE_ACKNOWLEDGE_IND:
+                if (makeAckInd() != PDU_COMPOSE_SUCCESS) {
+                    return null;
+                }
+                break;
+            case PduHeaders.MESSAGE_TYPE_READ_REC_IND:
+                if (makeReadRecInd() != PDU_COMPOSE_SUCCESS) {
+                    return null;
+                }
+                break;
+            default:
+                return null;
+        }
+
+        return mMessage.toByteArray();
+    }
+
+    /**
+     *  Copy buf to mMessage.
+     */
+    protected void arraycopy(byte[] buf, int pos, int length) {
+        mMessage.write(buf, pos, length);
+        mPosition = mPosition + length;
+    }
+
+    /**
+     * Append a byte to mMessage.
+     */
+    protected void append(int value) {
+        mMessage.write(value);
+        mPosition ++;
+    }
+
+    /**
+     * Append short integer value to mMessage.
+     * This implementation doesn't check the validity of parameter, since it
+     * assumes that the values are validated in the GenericPdu setter methods.
+     */
+    protected void appendShortInteger(int value) {
+        /*
+         * From WAP-230-WSP-20010705-a:
+         * Short-integer = OCTET
+         * ; Integers in range 0-127 shall be encoded as a one octet value
+         * ; with the most significant bit set to one (1xxx xxxx) and with
+         * ; the value in the remaining least significant bits.
+         * In our implementation, only low 7 bits are stored and otherwise
+         * bits are ignored.
+         */
+        append((value | 0x80) & 0xff);
+    }
+
+    /**
+     * Append an octet number between 128 and 255 into mMessage.
+     * NOTE:
+     * A value between 0 and 127 should be appended by using appendShortInteger.
+     * This implementation doesn't check the validity of parameter, since it
+     * assumes that the values are validated in the GenericPdu setter methods.
+     */
+    protected void appendOctet(int number) {
+        append(number);
+    }
+
+    /**
+     * Append a short length into mMessage.
+     * This implementation doesn't check the validity of parameter, since it
+     * assumes that the values are validated in the GenericPdu setter methods.
+     */
+    protected void appendShortLength(int value) {
+        /*
+         * From WAP-230-WSP-20010705-a:
+         * Short-length = <Any octet 0-30>
+         */
+        append(value);
+    }
+
+    /**
+     * Append long integer into mMessage. it's used for really long integers.
+     * This implementation doesn't check the validity of parameter, since it
+     * assumes that the values are validated in the GenericPdu setter methods.
+     */
+    protected void appendLongInteger(long longInt) {
+        /*
+         * From WAP-230-WSP-20010705-a:
+         * Long-integer = Short-length Multi-octet-integer
+         * ; The Short-length indicates the length of the Multi-octet-integer
+         * Multi-octet-integer = 1*30 OCTET
+         * ; The content octets shall be an unsigned integer value with the
+         * ; most significant octet encoded first (big-endian representation).
+         * ; The minimum number of octets must be used to encode the value.
+         */
+        int size;
+        long temp = longInt;
+
+        // Count the length of the long integer.
+        for(size = 0; (temp != 0) && (size < LONG_INTEGER_LENGTH_MAX); size++) {
+            temp = (temp >>> 8);
+        }
+
+        // Set Length.
+        appendShortLength(size);
+
+        // Count and set the long integer.
+        int i;
+        int shift = (size -1) * 8;
+
+        for (i = 0; i < size; i++) {
+            append((int)((longInt >>> shift) & 0xff));
+            shift = shift - 8;
+        }
+    }
+
+    /**
+     * Append text string into mMessage.
+     * This implementation doesn't check the validity of parameter, since it
+     * assumes that the values are validated in the GenericPdu setter methods.
+     */
+    protected void appendTextString(byte[] text) {
+        /*
+         * From WAP-230-WSP-20010705-a:
+         * Text-string = [Quote] *TEXT End-of-string
+         * ; If the first character in the TEXT is in the range of 128-255,
+         * ; a Quote character must precede it. Otherwise the Quote character
+         * ;must be omitted. The Quote is not part of the contents.
+         */
+        if (((text[0])&0xff) > TEXT_MAX) { // No need to check for <= 255
+            append(TEXT_MAX);
+        }
+
+        arraycopy(text, 0, text.length);
+        append(0);
+    }
+
+    /**
+     * Append text string into mMessage.
+     * This implementation doesn't check the validity of parameter, since it
+     * assumes that the values are validated in the GenericPdu setter methods.
+     */
+    protected void appendTextString(String str) {
+        /*
+         * From WAP-230-WSP-20010705-a:
+         * Text-string = [Quote] *TEXT End-of-string
+         * ; If the first character in the TEXT is in the range of 128-255,
+         * ; a Quote character must precede it. Otherwise the Quote character
+         * ;must be omitted. The Quote is not part of the contents.
+         */
+        appendTextString(str.getBytes());
+    }
+
+    /**
+     * Append encoded string value to mMessage.
+     * This implementation doesn't check the validity of parameter, since it
+     * assumes that the values are validated in the GenericPdu setter methods.
+     */
+    protected void appendEncodedString(EncodedStringValue enStr) {
+        /*
+         * From OMA-TS-MMS-ENC-V1_3-20050927-C:
+         * Encoded-string-value = Text-string | Value-length Char-set Text-string
+         */
+        assert(enStr != null);
+
+        int charset = enStr.getCharacterSet();
+        byte[] textString = enStr.getTextString();
+        if (null == textString) {
+            return;
+        }
+
+        /*
+         * In the implementation of EncodedStringValue, the charset field will
+         * never be 0. It will always be composed as
+         * Encoded-string-value = Value-length Char-set Text-string
+         */
+        mStack.newbuf();
+        PositionMarker start = mStack.mark();
+
+        appendShortInteger(charset);
+        appendTextString(textString);
+
+        int len = start.getLength();
+        mStack.pop();
+        appendValueLength(len);
+        mStack.copy();
+    }
+
+    /**
+     * Append uintvar integer into mMessage.
+     * This implementation doesn't check the validity of parameter, since it
+     * assumes that the values are validated in the GenericPdu setter methods.
+     */
+    protected void appendUintvarInteger(long value) {
+        /*
+         * From WAP-230-WSP-20010705-a:
+         * To encode a large unsigned integer, split it into 7-bit fragments
+         * and place them in the payloads of multiple octets. The most significant
+         * bits are placed in the first octets with the least significant bits
+         * ending up in the last octet. All octets MUST set the Continue bit to 1
+         * except the last octet, which MUST set the Continue bit to 0.
+         */
+        int i;
+        long max = SHORT_INTEGER_MAX;
+
+        for (i = 0; i < 5; i++) {
+            if (value < max) {
+                break;
+            }
+
+            max = (max << 7) | 0x7fl;
+        }
+
+        while(i > 0) {
+            long temp = value >>> (i * 7);
+            temp = temp & 0x7f;
+
+            append((int)((temp | 0x80) & 0xff));
+
+            i--;
+        }
+
+        append((int)(value & 0x7f));
+    }
+
+    /**
+     * Append date value into mMessage.
+     * This implementation doesn't check the validity of parameter, since it
+     * assumes that the values are validated in the GenericPdu setter methods.
+     */
+    protected void appendDateValue(long date) {
+        /*
+         * From OMA-TS-MMS-ENC-V1_3-20050927-C:
+         * Date-value = Long-integer
+         */
+        appendLongInteger(date);
+    }
+
+    /**
+     * Append value length to mMessage.
+     * This implementation doesn't check the validity of parameter, since it
+     * assumes that the values are validated in the GenericPdu setter methods.
+     */
+    protected void appendValueLength(long value) {
+        /*
+         * From WAP-230-WSP-20010705-a:
+         * Value-length = Short-length | (Length-quote Length)
+         * ; Value length is used to indicate the length of the value to follow
+         * Short-length = <Any octet 0-30>
+         * Length-quote = <Octet 31>
+         * Length = Uintvar-integer
+         */
+        if (value < LENGTH_QUOTE) {
+            appendShortLength((int) value);
+            return;
+        }
+
+        append(LENGTH_QUOTE);
+        appendUintvarInteger(value);
+    }
+
+    /**
+     * Append quoted string to mMessage.
+     * This implementation doesn't check the validity of parameter, since it
+     * assumes that the values are validated in the GenericPdu setter methods.
+     */
+    protected void appendQuotedString(byte[] text) {
+        /*
+         * From WAP-230-WSP-20010705-a:
+         * Quoted-string = <Octet 34> *TEXT End-of-string
+         * ;The TEXT encodes an RFC2616 Quoted-string with the enclosing
+         * ;quotation-marks <"> removed.
+         */
+        append(QUOTED_STRING_FLAG);
+        arraycopy(text, 0, text.length);
+        append(END_STRING_FLAG);
+    }
+
+    /**
+     * Append quoted string to mMessage.
+     * This implementation doesn't check the validity of parameter, since it
+     * assumes that the values are validated in the GenericPdu setter methods.
+     */
+    protected void appendQuotedString(String str) {
+        /*
+         * From WAP-230-WSP-20010705-a:
+         * Quoted-string = <Octet 34> *TEXT End-of-string
+         * ;The TEXT encodes an RFC2616 Quoted-string with the enclosing
+         * ;quotation-marks <"> removed.
+         */
+        appendQuotedString(str.getBytes());
+    }
+
+    private EncodedStringValue appendAddressType(EncodedStringValue address) {
+        EncodedStringValue temp = null;
+
+        try {
+            int addressType = checkAddressType(address.getString());
+            temp = EncodedStringValue.copy(address);
+            if (PDU_PHONE_NUMBER_ADDRESS_TYPE == addressType) {
+                // Phone number.
+                temp.appendTextString(STRING_PHONE_NUMBER_ADDRESS_TYPE.getBytes());
+            } else if (PDU_IPV4_ADDRESS_TYPE == addressType) {
+                // Ipv4 address.
+                temp.appendTextString(STRING_IPV4_ADDRESS_TYPE.getBytes());
+            } else if (PDU_IPV6_ADDRESS_TYPE == addressType) {
+                // Ipv6 address.
+                temp.appendTextString(STRING_IPV6_ADDRESS_TYPE.getBytes());
+            }
+        } catch (NullPointerException e) {
+            return null;
+        }
+
+        return temp;
+    }
+
+    /**
+     * Append header to mMessage.
+     */
+    private int appendHeader(int field) {
+        switch (field) {
+            case PduHeaders.MMS_VERSION:
+                appendOctet(field);
+
+                int version = mPduHeader.getOctet(field);
+                if (0 == version) {
+                    appendShortInteger(PduHeaders.CURRENT_MMS_VERSION);
+                } else {
+                    appendShortInteger(version);
+                }
+
+                break;
+
+            case PduHeaders.MESSAGE_ID:
+            case PduHeaders.TRANSACTION_ID:
+                byte[] textString = mPduHeader.getTextString(field);
+                if (null == textString) {
+                    return PDU_COMPOSE_FIELD_NOT_SET;
+                }
+
+                appendOctet(field);
+                appendTextString(textString);
+                break;
+
+            case PduHeaders.TO:
+            case PduHeaders.BCC:
+            case PduHeaders.CC:
+                EncodedStringValue[] addr = mPduHeader.getEncodedStringValues(field);
+
+                if (null == addr) {
+                    return PDU_COMPOSE_FIELD_NOT_SET;
+                }
+
+                EncodedStringValue temp;
+                for (int i = 0; i < addr.length; i++) {
+                    temp = appendAddressType(addr[i]);
+                    if (temp == null) {
+                        return PDU_COMPOSE_CONTENT_ERROR;
+                    }
+
+                    appendOctet(field);
+                    appendEncodedString(temp);
+                }
+                break;
+
+            case PduHeaders.FROM:
+                // Value-length (Address-present-token Encoded-string-value | Insert-address-token)
+                appendOctet(field);
+
+                EncodedStringValue from = mPduHeader.getEncodedStringValue(field);
+                if ((from == null)
+                        || TextUtils.isEmpty(from.getString())
+                        || new String(from.getTextString()).equals(
+                                PduHeaders.FROM_INSERT_ADDRESS_TOKEN_STR)) {
+                    // Length of from = 1
+                    append(1);
+                    // Insert-address-token = <Octet 129>
+                    append(PduHeaders.FROM_INSERT_ADDRESS_TOKEN);
+                } else {
+                    mStack.newbuf();
+                    PositionMarker fstart = mStack.mark();
+
+                    // Address-present-token = <Octet 128>
+                    append(PduHeaders.FROM_ADDRESS_PRESENT_TOKEN);
+
+                    temp = appendAddressType(from);
+                    if (temp == null) {
+                        return PDU_COMPOSE_CONTENT_ERROR;
+                    }
+
+                    appendEncodedString(temp);
+
+                    int flen = fstart.getLength();
+                    mStack.pop();
+                    appendValueLength(flen);
+                    mStack.copy();
+                }
+                break;
+
+            case PduHeaders.READ_STATUS:
+            case PduHeaders.STATUS:
+            case PduHeaders.REPORT_ALLOWED:
+            case PduHeaders.PRIORITY:
+            case PduHeaders.DELIVERY_REPORT:
+            case PduHeaders.READ_REPORT:
+                int octet = mPduHeader.getOctet(field);
+                if (0 == octet) {
+                    return PDU_COMPOSE_FIELD_NOT_SET;
+                }
+
+                appendOctet(field);
+                appendOctet(octet);
+                break;
+
+            case PduHeaders.DATE:
+                long date = mPduHeader.getLongInteger(field);
+                if (-1 == date) {
+                    return PDU_COMPOSE_FIELD_NOT_SET;
+                }
+
+                appendOctet(field);
+                appendDateValue(date);
+                break;
+
+            case PduHeaders.SUBJECT:
+                EncodedStringValue enString =
+                    mPduHeader.getEncodedStringValue(field);
+                if (null == enString) {
+                    return PDU_COMPOSE_FIELD_NOT_SET;
+                }
+
+                appendOctet(field);
+                appendEncodedString(enString);
+                break;
+
+            case PduHeaders.MESSAGE_CLASS:
+                byte[] messageClass = mPduHeader.getTextString(field);
+                if (null == messageClass) {
+                    return PDU_COMPOSE_FIELD_NOT_SET;
+                }
+
+                appendOctet(field);
+                if (Arrays.equals(messageClass,
+                        PduHeaders.MESSAGE_CLASS_ADVERTISEMENT_STR.getBytes())) {
+                    appendOctet(PduHeaders.MESSAGE_CLASS_ADVERTISEMENT);
+                } else if (Arrays.equals(messageClass,
+                        PduHeaders.MESSAGE_CLASS_AUTO_STR.getBytes())) {
+                    appendOctet(PduHeaders.MESSAGE_CLASS_AUTO);
+                } else if (Arrays.equals(messageClass,
+                        PduHeaders.MESSAGE_CLASS_PERSONAL_STR.getBytes())) {
+                    appendOctet(PduHeaders.MESSAGE_CLASS_PERSONAL);
+                } else if (Arrays.equals(messageClass,
+                        PduHeaders.MESSAGE_CLASS_INFORMATIONAL_STR.getBytes())) {
+                    appendOctet(PduHeaders.MESSAGE_CLASS_INFORMATIONAL);
+                } else {
+                    appendTextString(messageClass);
+                }
+                break;
+
+            case PduHeaders.EXPIRY:
+                long expiry = mPduHeader.getLongInteger(field);
+                if (-1 == expiry) {
+                    return PDU_COMPOSE_FIELD_NOT_SET;
+                }
+
+                appendOctet(field);
+
+                mStack.newbuf();
+                PositionMarker expiryStart = mStack.mark();
+
+                append(PduHeaders.VALUE_RELATIVE_TOKEN);
+                appendLongInteger(expiry);
+
+                int expiryLength = expiryStart.getLength();
+                mStack.pop();
+                appendValueLength(expiryLength);
+                mStack.copy();
+                break;
+
+            default:
+                return PDU_COMPOSE_FIELD_NOT_SUPPORTED;
+        }
+
+        return PDU_COMPOSE_SUCCESS;
+    }
+
+    /**
+     * Make ReadRec.Ind.
+     */
+    private int makeReadRecInd() {
+        if (mMessage == null) {
+            mMessage = new ByteArrayOutputStream();
+            mPosition = 0;
+        }
+
+        // X-Mms-Message-Type
+        appendOctet(PduHeaders.MESSAGE_TYPE);
+        appendOctet(PduHeaders.MESSAGE_TYPE_READ_REC_IND);
+
+        // X-Mms-MMS-Version
+        if (appendHeader(PduHeaders.MMS_VERSION) != PDU_COMPOSE_SUCCESS) {
+            return PDU_COMPOSE_CONTENT_ERROR;
+        }
+
+        // Message-ID
+        if (appendHeader(PduHeaders.MESSAGE_ID) != PDU_COMPOSE_SUCCESS) {
+            return PDU_COMPOSE_CONTENT_ERROR;
+        }
+
+        // To
+        if (appendHeader(PduHeaders.TO) != PDU_COMPOSE_SUCCESS) {
+            return PDU_COMPOSE_CONTENT_ERROR;
+        }
+
+        // From
+        if (appendHeader(PduHeaders.FROM) != PDU_COMPOSE_SUCCESS) {
+            return PDU_COMPOSE_CONTENT_ERROR;
+        }
+
+        // Date Optional
+        appendHeader(PduHeaders.DATE);
+
+        // X-Mms-Read-Status
+        if (appendHeader(PduHeaders.READ_STATUS) != PDU_COMPOSE_SUCCESS) {
+            return PDU_COMPOSE_CONTENT_ERROR;
+        }
+
+        // X-Mms-Applic-ID Optional(not support)
+        // X-Mms-Reply-Applic-ID Optional(not support)
+        // X-Mms-Aux-Applic-Info Optional(not support)
+
+        return PDU_COMPOSE_SUCCESS;
+    }
+
+    /**
+     * Make NotifyResp.Ind.
+     */
+    private int makeNotifyResp() {
+        if (mMessage == null) {
+            mMessage = new ByteArrayOutputStream();
+            mPosition = 0;
+        }
+
+        //    X-Mms-Message-Type
+        appendOctet(PduHeaders.MESSAGE_TYPE);
+        appendOctet(PduHeaders.MESSAGE_TYPE_NOTIFYRESP_IND);
+
+        // X-Mms-Transaction-ID
+        if (appendHeader(PduHeaders.TRANSACTION_ID) != PDU_COMPOSE_SUCCESS) {
+            return PDU_COMPOSE_CONTENT_ERROR;
+        }
+
+        // X-Mms-MMS-Version
+        if (appendHeader(PduHeaders.MMS_VERSION) != PDU_COMPOSE_SUCCESS) {
+            return PDU_COMPOSE_CONTENT_ERROR;
+        }
+
+        //  X-Mms-Status
+        if (appendHeader(PduHeaders.STATUS) != PDU_COMPOSE_SUCCESS) {
+            return PDU_COMPOSE_CONTENT_ERROR;
+        }
+
+        // X-Mms-Report-Allowed Optional (not support)
+        return PDU_COMPOSE_SUCCESS;
+    }
+
+    /**
+     * Make Acknowledge.Ind.
+     */
+    private int makeAckInd() {
+        if (mMessage == null) {
+            mMessage = new ByteArrayOutputStream();
+            mPosition = 0;
+        }
+
+        //    X-Mms-Message-Type
+        appendOctet(PduHeaders.MESSAGE_TYPE);
+        appendOctet(PduHeaders.MESSAGE_TYPE_ACKNOWLEDGE_IND);
+
+        // X-Mms-Transaction-ID
+        if (appendHeader(PduHeaders.TRANSACTION_ID) != PDU_COMPOSE_SUCCESS) {
+            return PDU_COMPOSE_CONTENT_ERROR;
+        }
+
+        //     X-Mms-MMS-Version
+        if (appendHeader(PduHeaders.MMS_VERSION) != PDU_COMPOSE_SUCCESS) {
+            return PDU_COMPOSE_CONTENT_ERROR;
+        }
+
+        // X-Mms-Report-Allowed Optional
+        appendHeader(PduHeaders.REPORT_ALLOWED);
+
+        return PDU_COMPOSE_SUCCESS;
+    }
+
+    /**
+     * Make Send.req.
+     */
+    private int makeSendReqPdu() {
+        if (mMessage == null) {
+            mMessage = new ByteArrayOutputStream();
+            mPosition = 0;
+        }
+
+        // X-Mms-Message-Type
+        appendOctet(PduHeaders.MESSAGE_TYPE);
+        appendOctet(PduHeaders.MESSAGE_TYPE_SEND_REQ);
+
+        // X-Mms-Transaction-ID
+        appendOctet(PduHeaders.TRANSACTION_ID);
+
+        byte[] trid = mPduHeader.getTextString(PduHeaders.TRANSACTION_ID);
+        if (trid == null) {
+            // Transaction-ID should be set(by Transaction) before make().
+            throw new IllegalArgumentException("Transaction-ID is null.");
+        }
+        appendTextString(trid);
+
+        //  X-Mms-MMS-Version
+        if (appendHeader(PduHeaders.MMS_VERSION) != PDU_COMPOSE_SUCCESS) {
+            return PDU_COMPOSE_CONTENT_ERROR;
+        }
+
+        // Date Date-value Optional.
+        appendHeader(PduHeaders.DATE);
+
+        // From
+        if (appendHeader(PduHeaders.FROM) != PDU_COMPOSE_SUCCESS) {
+            return PDU_COMPOSE_CONTENT_ERROR;
+        }
+
+        boolean recipient = false;
+
+        // To
+        if (appendHeader(PduHeaders.TO) != PDU_COMPOSE_CONTENT_ERROR) {
+            recipient = true;
+        }
+
+        // Cc
+        if (appendHeader(PduHeaders.CC) != PDU_COMPOSE_CONTENT_ERROR) {
+            recipient = true;
+        }
+
+        // Bcc
+        if (appendHeader(PduHeaders.BCC) != PDU_COMPOSE_CONTENT_ERROR) {
+            recipient = true;
+        }
+
+        // Need at least one of "cc", "bcc" and "to".
+        if (false == recipient) {
+            return PDU_COMPOSE_CONTENT_ERROR;
+        }
+
+        // Subject Optional
+        appendHeader(PduHeaders.SUBJECT);
+
+        // X-Mms-Message-Class Optional
+        // Message-class-value = Class-identifier | Token-text
+        appendHeader(PduHeaders.MESSAGE_CLASS);
+
+        // X-Mms-Expiry Optional
+        appendHeader(PduHeaders.EXPIRY);
+
+        // X-Mms-Priority Optional
+        appendHeader(PduHeaders.PRIORITY);
+
+        // X-Mms-Delivery-Report Optional
+        appendHeader(PduHeaders.DELIVERY_REPORT);
+
+        // X-Mms-Read-Report Optional
+        appendHeader(PduHeaders.READ_REPORT);
+
+        //    Content-Type
+        appendOctet(PduHeaders.CONTENT_TYPE);
+
+        //  Message body
+        return makeMessageBody();
+    }
+
+    /**
+     * Make message body.
+     */
+    private int makeMessageBody() {
+        // 1. add body informations
+        mStack.newbuf();  // Switching buffer because we need to
+
+        PositionMarker ctStart = mStack.mark();
+
+        // This contentTypeIdentifier should be used for type of attachment...
+        String contentType = new String(mPduHeader.getTextString(PduHeaders.CONTENT_TYPE));
+        Integer contentTypeIdentifier = mContentTypeMap.get(contentType);
+        if (contentTypeIdentifier == null) {
+            // content type is mandatory
+            return PDU_COMPOSE_CONTENT_ERROR;
+        }
+
+        appendShortInteger(contentTypeIdentifier.intValue());
+
+        // content-type parameter: start
+        PduBody body = ((SendReq) mPdu).getBody();
+        if (null == body || body.getPartsNum() == 0) {
+            // empty message
+            appendUintvarInteger(0);
+            mStack.pop();
+            mStack.copy();
+            return PDU_COMPOSE_SUCCESS;
+        }
+
+        PduPart part;
+        try {
+            part = body.getPart(0);
+
+            byte[] start = part.getContentId();
+            if (start != null) {
+                appendOctet(PduPart.P_DEP_START);
+                if (('<' == start[0]) && ('>' == start[start.length - 1])) {
+                    appendTextString(start);
+                } else {
+                    appendTextString("<" + new String(start) + ">");
+                }
+            }
+
+            // content-type parameter: type
+            appendOctet(PduPart.P_CT_MR_TYPE);
+            appendTextString(part.getContentType());
+        }
+        catch (ArrayIndexOutOfBoundsException e){
+            Timber.e(e, "logging error");
+            e.printStackTrace();
+        }
+
+        int ctLength = ctStart.getLength();
+        mStack.pop();
+        appendValueLength(ctLength);
+        mStack.copy();
+
+        // 3. add content
+        int partNum = body.getPartsNum();
+        appendUintvarInteger(partNum);
+        for (int i = 0; i < partNum; i++) {
+            part = body.getPart(i);
+            mStack.newbuf();  // Leaving space for header lengh and data length
+            PositionMarker attachment = mStack.mark();
+
+            mStack.newbuf();  // Leaving space for Content-Type length
+            PositionMarker contentTypeBegin = mStack.mark();
+
+            byte[] partContentType = part.getContentType();
+
+            if (partContentType == null) {
+                // content type is mandatory
+                return PDU_COMPOSE_CONTENT_ERROR;
+            }
+
+            // content-type value
+            Integer partContentTypeIdentifier =
+                mContentTypeMap.get(new String(partContentType));
+            if (partContentTypeIdentifier == null) {
+                appendTextString(partContentType);
+            } else {
+                appendShortInteger(partContentTypeIdentifier.intValue());
+            }
+
+            /* Content-type parameter : name.
+             * The value of name, filename, content-location is the same.
+             * Just one of them is enough for this PDU.
+             */
+            byte[] name = part.getName();
+
+            if (null == name) {
+                name = part.getFilename();
+
+                if (null == name) {
+                    name = part.getContentLocation();
+
+                    if (null == name) {
+                        /* at lease one of name, filename, Content-location
+                         * should be available.
+                         */
+                        return PDU_COMPOSE_CONTENT_ERROR;
+                    }
+                }
+            }
+            appendOctet(PduPart.P_DEP_NAME);
+            appendTextString(name);
+
+            // content-type parameter : charset
+            int charset = part.getCharset();
+            if (charset != 0) {
+                appendOctet(PduPart.P_CHARSET);
+                appendShortInteger(charset);
+            }
+
+            int contentTypeLength = contentTypeBegin.getLength();
+            mStack.pop();
+            appendValueLength(contentTypeLength);
+            mStack.copy();
+
+            // content id
+            byte[] contentId = part.getContentId();
+
+            if (null != contentId) {
+                appendOctet(PduPart.P_CONTENT_ID);
+                if (('<' == contentId[0]) && ('>' == contentId[contentId.length - 1])) {
+                    appendQuotedString(contentId);
+                } else {
+                    appendQuotedString("<" + new String(contentId) + ">");
+                }
+            }
+
+            // content-location
+            byte[] contentLocation = part.getContentLocation();
+            if (null != contentLocation) {
+            	appendOctet(PduPart.P_CONTENT_LOCATION);
+            	appendTextString(contentLocation);
+            }
+
+            // content
+            int headerLength = attachment.getLength();
+
+            int dataLength = 0; // Just for safety...
+            byte[] partData = part.getData();
+
+            if (partData != null) {
+                arraycopy(partData, 0, partData.length);
+                dataLength = partData.length;
+            } else {
+                InputStream cr = null;
+                try {
+                    byte[] buffer = new byte[PDU_COMPOSER_BLOCK_SIZE];
+                    cr = mResolver.openInputStream(part.getDataUri());
+                    int len = 0;
+                    while ((len = cr.read(buffer)) != -1) {
+                        mMessage.write(buffer, 0, len);
+                        mPosition += len;
+                        dataLength += len;
+                    }
+                } catch (FileNotFoundException e) {
+                    return PDU_COMPOSE_CONTENT_ERROR;
+                } catch (IOException e) {
+                    return PDU_COMPOSE_CONTENT_ERROR;
+                } catch (RuntimeException e) {
+                    return PDU_COMPOSE_CONTENT_ERROR;
+                } finally {
+                    if (cr != null) {
+                        try {
+                            cr.close();
+                        } catch (IOException e) {
+                        }
+                    }
+                }
+            }
+
+            if (dataLength != (attachment.getLength() - headerLength)) {
+                throw new RuntimeException("BUG: Length sanity check failed");
+            }
+
+            mStack.pop();
+            appendUintvarInteger(headerLength);
+            appendUintvarInteger(dataLength);
+            mStack.copy();
+        }
+
+        return PDU_COMPOSE_SUCCESS;
+    }
+
+    /**
+     *  Record current message informations.
+     */
+    static private class LengthRecordNode {
+        ByteArrayOutputStream currentMessage = null;
+        public int currentPosition = 0;
+
+        public LengthRecordNode next = null;
+    }
+
+    /**
+     * Mark current message position and stact size.
+     */
+    private class PositionMarker {
+        private int c_pos;   // Current position
+        private int currentStackSize;  // Current stack size
+
+        int getLength() {
+            // If these assert fails, likely that you are finding the
+            // size of buffer that is deep in BufferStack you can only
+            // find the length of the buffer that is on top
+            if (currentStackSize != mStack.stackSize) {
+                throw new RuntimeException("BUG: Invalid call to getLength()");
+            }
+
+            return mPosition - c_pos;
+        }
+    }
+
+    /**
+     * This implementation can be OPTIMIZED to use only
+     * 2 buffers. This optimization involves changing BufferStack
+     * only... Its usage (interface) will not change.
+     */
+    private class BufferStack {
+        private LengthRecordNode stack = null;
+        private LengthRecordNode toCopy = null;
+
+        int stackSize = 0;
+
+        /**
+         *  Create a new message buffer and push it into the stack.
+         */
+        void newbuf() {
+            // You can't create a new buff when toCopy != null
+            // That is after calling pop() and before calling copy()
+            // If you do, it is a bug
+            if (toCopy != null) {
+                throw new RuntimeException("BUG: Invalid newbuf() before copy()");
+            }
+
+            LengthRecordNode temp = new LengthRecordNode();
+
+            temp.currentMessage = mMessage;
+            temp.currentPosition = mPosition;
+
+            temp.next = stack;
+            stack = temp;
+
+            stackSize = stackSize + 1;
+
+            mMessage = new ByteArrayOutputStream();
+            mPosition = 0;
+        }
+
+        /**
+         *  Pop the message before and record current message in the stack.
+         */
+        void pop() {
+            ByteArrayOutputStream currentMessage = mMessage;
+            int currentPosition = mPosition;
+
+            mMessage = stack.currentMessage;
+            mPosition = stack.currentPosition;
+
+            toCopy = stack;
+            // Re using the top element of the stack to avoid memory allocation
+
+            stack = stack.next;
+            stackSize = stackSize - 1;
+
+            toCopy.currentMessage = currentMessage;
+            toCopy.currentPosition = currentPosition;
+        }
+
+        /**
+         *  Append current message to the message before.
+         */
+        void copy() {
+            arraycopy(toCopy.currentMessage.toByteArray(), 0,
+                    toCopy.currentPosition);
+
+            toCopy = null;
+        }
+
+        /**
+         *  Mark current message position
+         */
+        PositionMarker mark() {
+            PositionMarker m = new PositionMarker();
+
+            m.c_pos = mPosition;
+            m.currentStackSize = stackSize;
+
+            return m;
+        }
+    }
+
+    /**
+     * Check address type.
+     *
+     * @param address address string without the postfix stinng type,
+     *        such as "/TYPE=PLMN", "/TYPE=IPv6" and "/TYPE=IPv4"
+     * @return PDU_PHONE_NUMBER_ADDRESS_TYPE if it is phone number,
+     *         PDU_EMAIL_ADDRESS_TYPE if it is email address,
+     *         PDU_IPV4_ADDRESS_TYPE if it is ipv4 address,
+     *         PDU_IPV6_ADDRESS_TYPE if it is ipv6 address,
+     *         PDU_UNKNOWN_ADDRESS_TYPE if it is unknown.
+     */
+    protected static int checkAddressType(String address) {
+        /**
+         * From OMA-TS-MMS-ENC-V1_3-20050927-C.pdf, section 8.
+         * address = ( e-mail / device-address / alphanum-shortcode / num-shortcode)
+         * e-mail = mailbox; to the definition of mailbox as described in
+         * section 3.4 of [RFC2822], but excluding the
+         * obsolete definitions as indicated by the "obs-" prefix.
+         * device-address = ( global-phone-number "/TYPE=PLMN" )
+         * / ( ipv4 "/TYPE=IPv4" ) / ( ipv6 "/TYPE=IPv6" )
+         * / ( escaped-value "/TYPE=" address-type )
+         *
+         * global-phone-number = ["+"] 1*( DIGIT / written-sep )
+         * written-sep =("-"/".")
+         *
+         * ipv4 = 1*3DIGIT 3( "." 1*3DIGIT ) ; IPv4 address value
+         *
+         * ipv6 = 4HEXDIG 7( ":" 4HEXDIG ) ; IPv6 address per RFC 2373
+         */
+
+        if (null == address) {
+            return PDU_UNKNOWN_ADDRESS_TYPE;
+        }
+
+        if (address.matches(REGEXP_IPV4_ADDRESS_TYPE)) {
+            // Ipv4 address.
+            return PDU_IPV4_ADDRESS_TYPE;
+        }else if (address.matches(REGEXP_PHONE_NUMBER_ADDRESS_TYPE)) {
+            // Phone number.
+            return PDU_PHONE_NUMBER_ADDRESS_TYPE;
+        } else if (address.matches(REGEXP_EMAIL_ADDRESS_TYPE)) {
+            // Email address.
+            return PDU_EMAIL_ADDRESS_TYPE;
+        } else if (address.matches(REGEXP_IPV6_ADDRESS_TYPE)) {
+            // Ipv6 address.
+            return PDU_IPV6_ADDRESS_TYPE;
+        } else {
+            // Unknown address.
+            return PDU_UNKNOWN_ADDRESS_TYPE;
+        }
+    }
+}
diff --git a/android-smsmms/src/main/java/com/google/android/mms/pdu_alt/PduContentTypes.java b/android-smsmms/src/main/java/com/google/android/mms/pdu_alt/PduContentTypes.java
index 0ec898700..de04964f4 100755
--- a/android-smsmms/src/main/java/com/google/android/mms/pdu_alt/PduContentTypes.java
+++ b/android-smsmms/src/main/java/com/google/android/mms/pdu_alt/PduContentTypes.java
@@ -1,109 +1,109 @@
-/*
- * Copyright (C) 2015 Jacob Klinker
- *
- * Licensed under the Apache License, Version 2.0 (the "License");
- * you may not use this file except in compliance with the License.
- * You may obtain a copy of the License at
- *
- * http://www.apache.org/licenses/LICENSE-2.0
- *
- * Unless required by applicable law or agreed to in writing, software
- * distributed under the License is distributed on an "AS IS" BASIS,
- * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
- * See the License for the specific language governing permissions and
- * limitations under the License.
- */
-
-package com.google.android.mms.pdu_alt;
-
-public class PduContentTypes {
-    /**
-     * All content types. From:
-     * http://www.openmobilealliance.org/tech/omna/omna-wsp-content-type.htm
-     */
-    static final String[] contentTypes = {
-        "*/*",                                        /* 0x00 */
-        "text/*",                                     /* 0x01 */
-        "text/html",                                  /* 0x02 */
-        "text/plain",                                 /* 0x03 */
-        "text/x-hdml",                                /* 0x04 */
-        "text/x-ttml",                                /* 0x05 */
-        "text/x-vCalendar",                           /* 0x06 */
-        "text/x-vCard",                               /* 0x07 */
-        "text/vnd.wap.wml",                           /* 0x08 */
-        "text/vnd.wap.wmlscript",                     /* 0x09 */
-        "text/vnd.wap.wta-event",                     /* 0x0A */
-        "multipart/*",                                /* 0x0B */
-        "multipart/mixed",                            /* 0x0C */
-        "multipart/form-data",                        /* 0x0D */
-        "multipart/byterantes",                       /* 0x0E */
-        "multipart/alternative",                      /* 0x0F */
-        "application/*",                              /* 0x10 */
-        "application/java-vm",                        /* 0x11 */
-        "application/x-www-form-urlencoded",          /* 0x12 */
-        "application/x-hdmlc",                        /* 0x13 */
-        "application/vnd.wap.wmlc",                   /* 0x14 */
-        "application/vnd.wap.wmlscriptc",             /* 0x15 */
-        "application/vnd.wap.wta-eventc",             /* 0x16 */
-        "application/vnd.wap.uaprof",                 /* 0x17 */
-        "application/vnd.wap.wtls-ca-certificate",    /* 0x18 */
-        "application/vnd.wap.wtls-user-certificate",  /* 0x19 */
-        "application/x-x509-ca-cert",                 /* 0x1A */
-        "application/x-x509-user-cert",               /* 0x1B */
-        "image/*",                                    /* 0x1C */
-        "image/gif",                                  /* 0x1D */
-        "image/jpeg",                                 /* 0x1E */
-        "image/tiff",                                 /* 0x1F */
-        "image/png",                                  /* 0x20 */
-        "image/vnd.wap.wbmp",                         /* 0x21 */
-        "application/vnd.wap.multipart.*",            /* 0x22 */
-        "application/vnd.wap.multipart.mixed",        /* 0x23 */
-        "application/vnd.wap.multipart.form-data",    /* 0x24 */
-        "application/vnd.wap.multipart.byteranges",   /* 0x25 */
-        "application/vnd.wap.multipart.alternative",  /* 0x26 */
-        "application/xml",                            /* 0x27 */
-        "text/xml",                                   /* 0x28 */
-        "application/vnd.wap.wbxml",                  /* 0x29 */
-        "application/x-x968-cross-cert",              /* 0x2A */
-        "application/x-x968-ca-cert",                 /* 0x2B */
-        "application/x-x968-user-cert",               /* 0x2C */
-        "text/vnd.wap.si",                            /* 0x2D */
-        "application/vnd.wap.sic",                    /* 0x2E */
-        "text/vnd.wap.sl",                            /* 0x2F */
-        "application/vnd.wap.slc",                    /* 0x30 */
-        "text/vnd.wap.co",                            /* 0x31 */
-        "application/vnd.wap.coc",                    /* 0x32 */
-        "application/vnd.wap.multipart.related",      /* 0x33 */
-        "application/vnd.wap.sia",                    /* 0x34 */
-        "text/vnd.wap.connectivity-xml",              /* 0x35 */
-        "application/vnd.wap.connectivity-wbxml",     /* 0x36 */
-        "application/pkcs7-mime",                     /* 0x37 */
-        "application/vnd.wap.hashed-certificate",     /* 0x38 */
-        "application/vnd.wap.signed-certificate",     /* 0x39 */
-        "application/vnd.wap.cert-response",          /* 0x3A */
-        "application/xhtml+xml",                      /* 0x3B */
-        "application/wml+xml",                        /* 0x3C */
-        "text/css",                                   /* 0x3D */
-        "application/vnd.wap.mms-message",            /* 0x3E */
-        "application/vnd.wap.rollover-certificate",   /* 0x3F */
-        "application/vnd.wap.locc+wbxml",             /* 0x40 */
-        "application/vnd.wap.loc+xml",                /* 0x41 */
-        "application/vnd.syncml.dm+wbxml",            /* 0x42 */
-        "application/vnd.syncml.dm+xml",              /* 0x43 */
-        "application/vnd.syncml.notification",        /* 0x44 */
-        "application/vnd.wap.xhtml+xml",              /* 0x45 */
-        "application/vnd.wv.csp.cir",                 /* 0x46 */
-        "application/vnd.oma.dd+xml",                 /* 0x47 */
-        "application/vnd.oma.drm.message",            /* 0x48 */
-        "application/vnd.oma.drm.content",            /* 0x49 */
-        "application/vnd.oma.drm.rights+xml",         /* 0x4A */
-        "application/vnd.oma.drm.rights+wbxml",       /* 0x4B */
-        "application/vnd.wv.csp+xml",                 /* 0x4C */
-        "application/vnd.wv.csp+wbxml",               /* 0x4D */
-        "application/vnd.syncml.ds.notification",     /* 0x4E */
-        "audio/*",                                    /* 0x4F */
-        "video/*",                                    /* 0x50 */
-        "application/vnd.oma.dd2+xml",                /* 0x51 */
-        "application/mikey"                           /* 0x52 */
-    };
-}
+/*
+ * Copyright (C) 2015 Jacob Klinker
+ *
+ * Licensed under the Apache License, Version 2.0 (the "License");
+ * you may not use this file except in compliance with the License.
+ * You may obtain a copy of the License at
+ *
+ * http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing, software
+ * distributed under the License is distributed on an "AS IS" BASIS,
+ * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ * See the License for the specific language governing permissions and
+ * limitations under the License.
+ */
+
+package com.google.android.mms.pdu_alt;
+
+public class PduContentTypes {
+    /**
+     * All content types. From:
+     * http://www.openmobilealliance.org/tech/omna/omna-wsp-content-type.htm
+     */
+    static final String[] contentTypes = {
+        "*/*",                                        /* 0x00 */
+        "text/*",                                     /* 0x01 */
+        "text/html",                                  /* 0x02 */
+        "text/plain",                                 /* 0x03 */
+        "text/x-hdml",                                /* 0x04 */
+        "text/x-ttml",                                /* 0x05 */
+        "text/x-vCalendar",                           /* 0x06 */
+        "text/x-vCard",                               /* 0x07 */
+        "text/vnd.wap.wml",                           /* 0x08 */
+        "text/vnd.wap.wmlscript",                     /* 0x09 */
+        "text/vnd.wap.wta-event",                     /* 0x0A */
+        "multipart/*",                                /* 0x0B */
+        "multipart/mixed",                            /* 0x0C */
+        "multipart/form-data",                        /* 0x0D */
+        "multipart/byterantes",                       /* 0x0E */
+        "multipart/alternative",                      /* 0x0F */
+        "application/*",                              /* 0x10 */
+        "application/java-vm",                        /* 0x11 */
+        "application/x-www-form-urlencoded",          /* 0x12 */
+        "application/x-hdmlc",                        /* 0x13 */
+        "application/vnd.wap.wmlc",                   /* 0x14 */
+        "application/vnd.wap.wmlscriptc",             /* 0x15 */
+        "application/vnd.wap.wta-eventc",             /* 0x16 */
+        "application/vnd.wap.uaprof",                 /* 0x17 */
+        "application/vnd.wap.wtls-ca-certificate",    /* 0x18 */
+        "application/vnd.wap.wtls-user-certificate",  /* 0x19 */
+        "application/x-x509-ca-cert",                 /* 0x1A */
+        "application/x-x509-user-cert",               /* 0x1B */
+        "image/*",                                    /* 0x1C */
+        "image/gif",                                  /* 0x1D */
+        "image/jpeg",                                 /* 0x1E */
+        "image/tiff",                                 /* 0x1F */
+        "image/png",                                  /* 0x20 */
+        "image/vnd.wap.wbmp",                         /* 0x21 */
+        "application/vnd.wap.multipart.*",            /* 0x22 */
+        "application/vnd.wap.multipart.mixed",        /* 0x23 */
+        "application/vnd.wap.multipart.form-data",    /* 0x24 */
+        "application/vnd.wap.multipart.byteranges",   /* 0x25 */
+        "application/vnd.wap.multipart.alternative",  /* 0x26 */
+        "application/xml",                            /* 0x27 */
+        "text/xml",                                   /* 0x28 */
+        "application/vnd.wap.wbxml",                  /* 0x29 */
+        "application/x-x968-cross-cert",              /* 0x2A */
+        "application/x-x968-ca-cert",                 /* 0x2B */
+        "application/x-x968-user-cert",               /* 0x2C */
+        "text/vnd.wap.si",                            /* 0x2D */
+        "application/vnd.wap.sic",                    /* 0x2E */
+        "text/vnd.wap.sl",                            /* 0x2F */
+        "application/vnd.wap.slc",                    /* 0x30 */
+        "text/vnd.wap.co",                            /* 0x31 */
+        "application/vnd.wap.coc",                    /* 0x32 */
+        "application/vnd.wap.multipart.related",      /* 0x33 */
+        "application/vnd.wap.sia",                    /* 0x34 */
+        "text/vnd.wap.connectivity-xml",              /* 0x35 */
+        "application/vnd.wap.connectivity-wbxml",     /* 0x36 */
+        "application/pkcs7-mime",                     /* 0x37 */
+        "application/vnd.wap.hashed-certificate",     /* 0x38 */
+        "application/vnd.wap.signed-certificate",     /* 0x39 */
+        "application/vnd.wap.cert-response",          /* 0x3A */
+        "application/xhtml+xml",                      /* 0x3B */
+        "application/wml+xml",                        /* 0x3C */
+        "text/css",                                   /* 0x3D */
+        "application/vnd.wap.mms-message",            /* 0x3E */
+        "application/vnd.wap.rollover-certificate",   /* 0x3F */
+        "application/vnd.wap.locc+wbxml",             /* 0x40 */
+        "application/vnd.wap.loc+xml",                /* 0x41 */
+        "application/vnd.syncml.dm+wbxml",            /* 0x42 */
+        "application/vnd.syncml.dm+xml",              /* 0x43 */
+        "application/vnd.syncml.notification",        /* 0x44 */
+        "application/vnd.wap.xhtml+xml",              /* 0x45 */
+        "application/vnd.wv.csp.cir",                 /* 0x46 */
+        "application/vnd.oma.dd+xml",                 /* 0x47 */
+        "application/vnd.oma.drm.message",            /* 0x48 */
+        "application/vnd.oma.drm.content",            /* 0x49 */
+        "application/vnd.oma.drm.rights+xml",         /* 0x4A */
+        "application/vnd.oma.drm.rights+wbxml",       /* 0x4B */
+        "application/vnd.wv.csp+xml",                 /* 0x4C */
+        "application/vnd.wv.csp+wbxml",               /* 0x4D */
+        "application/vnd.syncml.ds.notification",     /* 0x4E */
+        "audio/*",                                    /* 0x4F */
+        "video/*",                                    /* 0x50 */
+        "application/vnd.oma.dd2+xml",                /* 0x51 */
+        "application/mikey"                           /* 0x52 */
+    };
+}
diff --git a/android-smsmms/src/main/java/com/google/android/mms/pdu_alt/PduHeaders.java b/android-smsmms/src/main/java/com/google/android/mms/pdu_alt/PduHeaders.java
index 853f9f67b..430aec6a8 100755
--- a/android-smsmms/src/main/java/com/google/android/mms/pdu_alt/PduHeaders.java
+++ b/android-smsmms/src/main/java/com/google/android/mms/pdu_alt/PduHeaders.java
@@ -1,720 +1,720 @@
-/*
- * Copyright (C) 2015 Jacob Klinker
- *
- * Licensed under the Apache License, Version 2.0 (the "License");
- * you may not use this file except in compliance with the License.
- * You may obtain a copy of the License at
- *
- * http://www.apache.org/licenses/LICENSE-2.0
- *
- * Unless required by applicable law or agreed to in writing, software
- * distributed under the License is distributed on an "AS IS" BASIS,
- * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
- * See the License for the specific language governing permissions and
- * limitations under the License.
- */
-
-package com.google.android.mms.pdu_alt;
-
-import com.google.android.mms.InvalidHeaderValueException;
-
-import java.util.ArrayList;
-import java.util.HashMap;
-
-public class PduHeaders {
-    /**
-     * All pdu header fields.
-     */
-    public static final int BCC                             = 0x81;
-    public static final int CC                              = 0x82;
-    public static final int CONTENT_LOCATION                = 0x83;
-    public static final int CONTENT_TYPE                    = 0x84;
-    public static final int DATE                            = 0x85;
-    public static final int DELIVERY_REPORT                 = 0x86;
-    public static final int DELIVERY_TIME                   = 0x87;
-    public static final int EXPIRY                          = 0x88;
-    public static final int FROM                            = 0x89;
-    public static final int MESSAGE_CLASS                   = 0x8A;
-    public static final int MESSAGE_ID                      = 0x8B;
-    public static final int MESSAGE_TYPE                    = 0x8C;
-    public static final int MMS_VERSION                     = 0x8D;
-    public static final int MESSAGE_SIZE                    = 0x8E;
-    public static final int PRIORITY                        = 0x8F;
-
-    public static final int READ_REPLY                      = 0x90;
-    public static final int READ_REPORT                     = 0x90;
-    public static final int REPORT_ALLOWED                  = 0x91;
-    public static final int RESPONSE_STATUS                 = 0x92;
-    public static final int RESPONSE_TEXT                   = 0x93;
-    public static final int SENDER_VISIBILITY               = 0x94;
-    public static final int STATUS                          = 0x95;
-    public static final int SUBJECT                         = 0x96;
-    public static final int TO                              = 0x97;
-    public static final int TRANSACTION_ID                  = 0x98;
-    public static final int RETRIEVE_STATUS                 = 0x99;
-    public static final int RETRIEVE_TEXT                   = 0x9A;
-    public static final int READ_STATUS                     = 0x9B;
-    public static final int REPLY_CHARGING                  = 0x9C;
-    public static final int REPLY_CHARGING_DEADLINE         = 0x9D;
-    public static final int REPLY_CHARGING_ID               = 0x9E;
-    public static final int REPLY_CHARGING_SIZE             = 0x9F;
-
-    public static final int PREVIOUSLY_SENT_BY              = 0xA0;
-    public static final int PREVIOUSLY_SENT_DATE            = 0xA1;
-    public static final int STORE                           = 0xA2;
-    public static final int MM_STATE                        = 0xA3;
-    public static final int MM_FLAGS                        = 0xA4;
-    public static final int STORE_STATUS                    = 0xA5;
-    public static final int STORE_STATUS_TEXT               = 0xA6;
-    public static final int STORED                          = 0xA7;
-    public static final int ATTRIBUTES                      = 0xA8;
-    public static final int TOTALS                          = 0xA9;
-    public static final int MBOX_TOTALS                     = 0xAA;
-    public static final int QUOTAS                          = 0xAB;
-    public static final int MBOX_QUOTAS                     = 0xAC;
-    public static final int MESSAGE_COUNT                   = 0xAD;
-    public static final int CONTENT                         = 0xAE;
-    public static final int START                           = 0xAF;
-
-    public static final int ADDITIONAL_HEADERS              = 0xB0;
-    public static final int DISTRIBUTION_INDICATOR          = 0xB1;
-    public static final int ELEMENT_DESCRIPTOR              = 0xB2;
-    public static final int LIMIT                           = 0xB3;
-    public static final int RECOMMENDED_RETRIEVAL_MODE      = 0xB4;
-    public static final int RECOMMENDED_RETRIEVAL_MODE_TEXT = 0xB5;
-    public static final int STATUS_TEXT                     = 0xB6;
-    public static final int APPLIC_ID                       = 0xB7;
-    public static final int REPLY_APPLIC_ID                 = 0xB8;
-    public static final int AUX_APPLIC_ID                   = 0xB9;
-    public static final int CONTENT_CLASS                   = 0xBA;
-    public static final int DRM_CONTENT                     = 0xBB;
-    public static final int ADAPTATION_ALLOWED              = 0xBC;
-    public static final int REPLACE_ID                      = 0xBD;
-    public static final int CANCEL_ID                       = 0xBE;
-    public static final int CANCEL_STATUS                   = 0xBF;
-
-    /**
-     * X-Mms-Message-Type field types.
-     */
-    public static final int MESSAGE_TYPE_SEND_REQ           = 0x80;
-    public static final int MESSAGE_TYPE_SEND_CONF          = 0x81;
-    public static final int MESSAGE_TYPE_NOTIFICATION_IND   = 0x82;
-    public static final int MESSAGE_TYPE_NOTIFYRESP_IND     = 0x83;
-    public static final int MESSAGE_TYPE_RETRIEVE_CONF      = 0x84;
-    public static final int MESSAGE_TYPE_ACKNOWLEDGE_IND    = 0x85;
-    public static final int MESSAGE_TYPE_DELIVERY_IND       = 0x86;
-    public static final int MESSAGE_TYPE_READ_REC_IND       = 0x87;
-    public static final int MESSAGE_TYPE_READ_ORIG_IND      = 0x88;
-    public static final int MESSAGE_TYPE_FORWARD_REQ        = 0x89;
-    public static final int MESSAGE_TYPE_FORWARD_CONF       = 0x8A;
-    public static final int MESSAGE_TYPE_MBOX_STORE_REQ     = 0x8B;
-    public static final int MESSAGE_TYPE_MBOX_STORE_CONF    = 0x8C;
-    public static final int MESSAGE_TYPE_MBOX_VIEW_REQ      = 0x8D;
-    public static final int MESSAGE_TYPE_MBOX_VIEW_CONF     = 0x8E;
-    public static final int MESSAGE_TYPE_MBOX_UPLOAD_REQ    = 0x8F;
-    public static final int MESSAGE_TYPE_MBOX_UPLOAD_CONF   = 0x90;
-    public static final int MESSAGE_TYPE_MBOX_DELETE_REQ    = 0x91;
-    public static final int MESSAGE_TYPE_MBOX_DELETE_CONF   = 0x92;
-    public static final int MESSAGE_TYPE_MBOX_DESCR         = 0x93;
-    public static final int MESSAGE_TYPE_DELETE_REQ         = 0x94;
-    public static final int MESSAGE_TYPE_DELETE_CONF        = 0x95;
-    public static final int MESSAGE_TYPE_CANCEL_REQ         = 0x96;
-    public static final int MESSAGE_TYPE_CANCEL_CONF        = 0x97;
-
-    /**
-     *  X-Mms-Delivery-Report |
-     *  X-Mms-Read-Report |
-     *  X-Mms-Report-Allowed |
-     *  X-Mms-Sender-Visibility |
-     *  X-Mms-Store |
-     *  X-Mms-Stored |
-     *  X-Mms-Totals |
-     *  X-Mms-Quotas |
-     *  X-Mms-Distribution-Indicator |
-     *  X-Mms-DRM-Content |
-     *  X-Mms-Adaptation-Allowed |
-     *  field types.
-     */
-    public static final int VALUE_YES                       = 0x80;
-    public static final int VALUE_NO                        = 0x81;
-
-    /**
-     *  Delivery-Time |
-     *  Expiry and Reply-Charging-Deadline |
-     *  field type components.
-     */
-    public static final int VALUE_ABSOLUTE_TOKEN            = 0x80;
-    public static final int VALUE_RELATIVE_TOKEN            = 0x81;
-
-    /**
-     * X-Mms-MMS-Version field types.
-     */
-    public static final int MMS_VERSION_1_3                 = ((1 << 4) | 3);
-    public static final int MMS_VERSION_1_2                 = ((1 << 4) | 2);
-    public static final int MMS_VERSION_1_1                 = ((1 << 4) | 1);
-    public static final int MMS_VERSION_1_0                 = ((1 << 4) | 0);
-
-    // Current version is 1.2.
-    public static final int CURRENT_MMS_VERSION             = MMS_VERSION_1_2;
-
-    /**
-     *  From field type components.
-     */
-    public static final int FROM_ADDRESS_PRESENT_TOKEN      = 0x80;
-    public static final int FROM_INSERT_ADDRESS_TOKEN       = 0x81;
-
-    public static final String FROM_ADDRESS_PRESENT_TOKEN_STR = "address-present-token";
-    public static final String FROM_INSERT_ADDRESS_TOKEN_STR = "insert-address-token";
-
-    /**
-     *  X-Mms-Status Field.
-     */
-    public static final int STATUS_EXPIRED                  = 0x80;
-    public static final int STATUS_RETRIEVED                = 0x81;
-    public static final int STATUS_REJECTED                 = 0x82;
-    public static final int STATUS_DEFERRED                 = 0x83;
-    public static final int STATUS_UNRECOGNIZED             = 0x84;
-    public static final int STATUS_INDETERMINATE            = 0x85;
-    public static final int STATUS_FORWARDED                = 0x86;
-    public static final int STATUS_UNREACHABLE              = 0x87;
-
-    /**
-     *  MM-Flags field type components.
-     */
-    public static final int MM_FLAGS_ADD_TOKEN              = 0x80;
-    public static final int MM_FLAGS_REMOVE_TOKEN           = 0x81;
-    public static final int MM_FLAGS_FILTER_TOKEN           = 0x82;
-
-    /**
-     *  X-Mms-Message-Class field types.
-     */
-    public static final int MESSAGE_CLASS_PERSONAL          = 0x80;
-    public static final int MESSAGE_CLASS_ADVERTISEMENT     = 0x81;
-    public static final int MESSAGE_CLASS_INFORMATIONAL     = 0x82;
-    public static final int MESSAGE_CLASS_AUTO              = 0x83;
-
-    public static final String MESSAGE_CLASS_PERSONAL_STR = "personal";
-    public static final String MESSAGE_CLASS_ADVERTISEMENT_STR = "advertisement";
-    public static final String MESSAGE_CLASS_INFORMATIONAL_STR = "informational";
-    public static final String MESSAGE_CLASS_AUTO_STR = "auto";
-
-    /**
-     *  X-Mms-Priority field types.
-     */
-    public static final int PRIORITY_LOW                    = 0x80;
-    public static final int PRIORITY_NORMAL                 = 0x81;
-    public static final int PRIORITY_HIGH                   = 0x82;
-
-    /**
-     *  X-Mms-Response-Status field types.
-     */
-    public static final int RESPONSE_STATUS_OK                   = 0x80;
-    public static final int RESPONSE_STATUS_ERROR_UNSPECIFIED    = 0x81;
-    public static final int RESPONSE_STATUS_ERROR_SERVICE_DENIED = 0x82;
-
-    public static final int RESPONSE_STATUS_ERROR_MESSAGE_FORMAT_CORRUPT     = 0x83;
-    public static final int RESPONSE_STATUS_ERROR_SENDING_ADDRESS_UNRESOLVED = 0x84;
-
-    public static final int RESPONSE_STATUS_ERROR_MESSAGE_NOT_FOUND    = 0x85;
-    public static final int RESPONSE_STATUS_ERROR_NETWORK_PROBLEM      = 0x86;
-    public static final int RESPONSE_STATUS_ERROR_CONTENT_NOT_ACCEPTED = 0x87;
-    public static final int RESPONSE_STATUS_ERROR_UNSUPPORTED_MESSAGE  = 0x88;
-    public static final int RESPONSE_STATUS_ERROR_TRANSIENT_FAILURE    = 0xC0;
-
-    public static final int RESPONSE_STATUS_ERROR_TRANSIENT_SENDNG_ADDRESS_UNRESOLVED = 0xC1;
-    public static final int RESPONSE_STATUS_ERROR_TRANSIENT_MESSAGE_NOT_FOUND         = 0xC2;
-    public static final int RESPONSE_STATUS_ERROR_TRANSIENT_NETWORK_PROBLEM           = 0xC3;
-    public static final int RESPONSE_STATUS_ERROR_TRANSIENT_PARTIAL_SUCCESS           = 0xC4;
-
-    public static final int RESPONSE_STATUS_ERROR_PERMANENT_FAILURE                             = 0xE0;
-    public static final int RESPONSE_STATUS_ERROR_PERMANENT_SERVICE_DENIED                      = 0xE1;
-    public static final int RESPONSE_STATUS_ERROR_PERMANENT_MESSAGE_FORMAT_CORRUPT              = 0xE2;
-    public static final int RESPONSE_STATUS_ERROR_PERMANENT_SENDING_ADDRESS_UNRESOLVED          = 0xE3;
-    public static final int RESPONSE_STATUS_ERROR_PERMANENT_MESSAGE_NOT_FOUND                   = 0xE4;
-    public static final int RESPONSE_STATUS_ERROR_PERMANENT_CONTENT_NOT_ACCEPTED                = 0xE5;
-    public static final int RESPONSE_STATUS_ERROR_PERMANENT_REPLY_CHARGING_LIMITATIONS_NOT_MET  = 0xE6;
-    public static final int RESPONSE_STATUS_ERROR_PERMANENT_REPLY_CHARGING_REQUEST_NOT_ACCEPTED = 0xE6;
-    public static final int RESPONSE_STATUS_ERROR_PERMANENT_REPLY_CHARGING_FORWARDING_DENIED    = 0xE8;
-    public static final int RESPONSE_STATUS_ERROR_PERMANENT_REPLY_CHARGING_NOT_SUPPORTED        = 0xE9;
-    public static final int RESPONSE_STATUS_ERROR_PERMANENT_ADDRESS_HIDING_NOT_SUPPORTED        = 0xEA;
-    public static final int RESPONSE_STATUS_ERROR_PERMANENT_LACK_OF_PREPAID                     = 0xEB;
-    public static final int RESPONSE_STATUS_ERROR_PERMANENT_END                                 = 0xFF;
-
-    /**
-     *  X-Mms-Retrieve-Status field types.
-     */
-    public static final int RETRIEVE_STATUS_OK                                  = 0x80;
-    public static final int RETRIEVE_STATUS_ERROR_TRANSIENT_FAILURE             = 0xC0;
-    public static final int RETRIEVE_STATUS_ERROR_TRANSIENT_MESSAGE_NOT_FOUND   = 0xC1;
-    public static final int RETRIEVE_STATUS_ERROR_TRANSIENT_NETWORK_PROBLEM     = 0xC2;
-    public static final int RETRIEVE_STATUS_ERROR_PERMANENT_FAILURE             = 0xE0;
-    public static final int RETRIEVE_STATUS_ERROR_PERMANENT_SERVICE_DENIED      = 0xE1;
-    public static final int RETRIEVE_STATUS_ERROR_PERMANENT_MESSAGE_NOT_FOUND   = 0xE2;
-    public static final int RETRIEVE_STATUS_ERROR_PERMANENT_CONTENT_UNSUPPORTED = 0xE3;
-    public static final int RETRIEVE_STATUS_ERROR_END                           = 0xFF;
-
-    /**
-     *  X-Mms-Sender-Visibility field types.
-     */
-    public static final int SENDER_VISIBILITY_HIDE          = 0x80;
-    public static final int SENDER_VISIBILITY_SHOW          = 0x81;
-
-    /**
-     *  X-Mms-Read-Status field types.
-     */
-    public static final int READ_STATUS_READ                        = 0x80;
-    public static final int READ_STATUS__DELETED_WITHOUT_BEING_READ = 0x81;
-
-    /**
-     *  X-Mms-Cancel-Status field types.
-     */
-    public static final int CANCEL_STATUS_REQUEST_SUCCESSFULLY_RECEIVED = 0x80;
-    public static final int CANCEL_STATUS_REQUEST_CORRUPTED             = 0x81;
-
-    /**
-     *  X-Mms-Reply-Charging field types.
-     */
-    public static final int REPLY_CHARGING_REQUESTED           = 0x80;
-    public static final int REPLY_CHARGING_REQUESTED_TEXT_ONLY = 0x81;
-    public static final int REPLY_CHARGING_ACCEPTED            = 0x82;
-    public static final int REPLY_CHARGING_ACCEPTED_TEXT_ONLY  = 0x83;
-
-    /**
-     *  X-Mms-MM-State field types.
-     */
-    public static final int MM_STATE_DRAFT                  = 0x80;
-    public static final int MM_STATE_SENT                   = 0x81;
-    public static final int MM_STATE_NEW                    = 0x82;
-    public static final int MM_STATE_RETRIEVED              = 0x83;
-    public static final int MM_STATE_FORWARDED              = 0x84;
-
-    /**
-     * X-Mms-Recommended-Retrieval-Mode field types.
-     */
-    public static final int RECOMMENDED_RETRIEVAL_MODE_MANUAL = 0x80;
-
-    /**
-     *  X-Mms-Content-Class field types.
-     */
-    public static final int CONTENT_CLASS_TEXT              = 0x80;
-    public static final int CONTENT_CLASS_IMAGE_BASIC       = 0x81;
-    public static final int CONTENT_CLASS_IMAGE_RICH        = 0x82;
-    public static final int CONTENT_CLASS_VIDEO_BASIC       = 0x83;
-    public static final int CONTENT_CLASS_VIDEO_RICH        = 0x84;
-    public static final int CONTENT_CLASS_MEGAPIXEL         = 0x85;
-    public static final int CONTENT_CLASS_CONTENT_BASIC     = 0x86;
-    public static final int CONTENT_CLASS_CONTENT_RICH      = 0x87;
-
-    /**
-     *  X-Mms-Store-Status field types.
-     */
-    public static final int STORE_STATUS_SUCCESS                                = 0x80;
-    public static final int STORE_STATUS_ERROR_TRANSIENT_FAILURE                = 0xC0;
-    public static final int STORE_STATUS_ERROR_TRANSIENT_NETWORK_PROBLEM        = 0xC1;
-    public static final int STORE_STATUS_ERROR_PERMANENT_FAILURE                = 0xE0;
-    public static final int STORE_STATUS_ERROR_PERMANENT_SERVICE_DENIED         = 0xE1;
-    public static final int STORE_STATUS_ERROR_PERMANENT_MESSAGE_FORMAT_CORRUPT = 0xE2;
-    public static final int STORE_STATUS_ERROR_PERMANENT_MESSAGE_NOT_FOUND      = 0xE3;
-    public static final int STORE_STATUS_ERROR_PERMANENT_MMBOX_FULL             = 0xE4;
-    public static final int STORE_STATUS_ERROR_END                              = 0xFF;
-
-    /**
-     * The map contains the value of all headers.
-     */
-    private HashMap<Integer, Object> mHeaderMap = null;
-
-    /**
-     * Constructor of PduHeaders.
-     */
-    public PduHeaders() {
-        mHeaderMap = new HashMap<Integer, Object>();
-    }
-
-    /**
-     * Get octet value by header field.
-     *
-     * @param field the field
-     * @return the octet value of the pdu header
-     *          with specified header field. Return 0 if
-     *          the value is not set.
-     */
-    protected int getOctet(int field) {
-        Integer octet = (Integer) mHeaderMap.get(field);
-        if (null == octet) {
-            return 0;
-        }
-
-        return octet;
-    }
-
-    /**
-     * Set octet value to pdu header by header field.
-     *
-     * @param value the value
-     * @param field the field
-     * @throws InvalidHeaderValueException if the value is invalid.
-     */
-    protected void setOctet(int value, int field)
-            throws InvalidHeaderValueException{
-        /**
-         * Check whether this field can be set for specific
-         * header and check validity of the field.
-         */
-        switch (field) {
-            case REPORT_ALLOWED:
-            case ADAPTATION_ALLOWED:
-            case DELIVERY_REPORT:
-            case DRM_CONTENT:
-            case DISTRIBUTION_INDICATOR:
-            case QUOTAS:
-            case READ_REPORT:
-            case STORE:
-            case STORED:
-            case TOTALS:
-            case SENDER_VISIBILITY:
-                if ((VALUE_YES != value) && (VALUE_NO != value)) {
-                    // Invalid value.
-                    throw new InvalidHeaderValueException("Invalid Octet value!");
-                }
-                break;
-            case READ_STATUS:
-                if ((READ_STATUS_READ != value) &&
-                        (READ_STATUS__DELETED_WITHOUT_BEING_READ != value)) {
-                    // Invalid value.
-                    throw new InvalidHeaderValueException("Invalid Octet value!");
-                }
-                break;
-            case CANCEL_STATUS:
-                if ((CANCEL_STATUS_REQUEST_SUCCESSFULLY_RECEIVED != value) &&
-                        (CANCEL_STATUS_REQUEST_CORRUPTED != value)) {
-                    // Invalid value.
-                    throw new InvalidHeaderValueException("Invalid Octet value!");
-                }
-                break;
-            case PRIORITY:
-                if ((value < PRIORITY_LOW) || (value > PRIORITY_HIGH)) {
-                    // Invalid value.
-                    throw new InvalidHeaderValueException("Invalid Octet value!");
-                }
-                break;
-            case STATUS:
-                if ((value < STATUS_EXPIRED) || (value > STATUS_UNREACHABLE)) {
-                    // Invalid value.
-                    throw new InvalidHeaderValueException("Invalid Octet value!");
-                }
-                break;
-            case REPLY_CHARGING:
-                if ((value < REPLY_CHARGING_REQUESTED)
-                        || (value > REPLY_CHARGING_ACCEPTED_TEXT_ONLY)) {
-                    // Invalid value.
-                    throw new InvalidHeaderValueException("Invalid Octet value!");
-                }
-                break;
-            case MM_STATE:
-                if ((value < MM_STATE_DRAFT) || (value > MM_STATE_FORWARDED)) {
-                    // Invalid value.
-                    throw new InvalidHeaderValueException("Invalid Octet value!");
-                }
-                break;
-            case RECOMMENDED_RETRIEVAL_MODE:
-                if (RECOMMENDED_RETRIEVAL_MODE_MANUAL != value) {
-                    // Invalid value.
-                    throw new InvalidHeaderValueException("Invalid Octet value!");
-                }
-                break;
-            case CONTENT_CLASS:
-                if ((value < CONTENT_CLASS_TEXT)
-                        || (value > CONTENT_CLASS_CONTENT_RICH)) {
-                    // Invalid value.
-                    throw new InvalidHeaderValueException("Invalid Octet value!");
-                }
-                break;
-            case RETRIEVE_STATUS:
-                // According to oma-ts-mms-enc-v1_3, section 7.3.50, we modify the invalid value.
-                if ((value > RETRIEVE_STATUS_ERROR_TRANSIENT_NETWORK_PROBLEM) &&
-                        (value < RETRIEVE_STATUS_ERROR_PERMANENT_FAILURE)) {
-                    value = RETRIEVE_STATUS_ERROR_TRANSIENT_FAILURE;
-                } else if ((value > RETRIEVE_STATUS_ERROR_PERMANENT_CONTENT_UNSUPPORTED) &&
-                        (value <= RETRIEVE_STATUS_ERROR_END)) {
-                    value = RETRIEVE_STATUS_ERROR_PERMANENT_FAILURE;
-                } else if ((value < RETRIEVE_STATUS_OK) ||
-                        ((value > RETRIEVE_STATUS_OK) &&
-                                (value < RETRIEVE_STATUS_ERROR_TRANSIENT_FAILURE)) ||
-                                (value > RETRIEVE_STATUS_ERROR_END)) {
-                    value = RETRIEVE_STATUS_ERROR_PERMANENT_FAILURE;
-                }
-                break;
-            case STORE_STATUS:
-                // According to oma-ts-mms-enc-v1_3, section 7.3.58, we modify the invalid value.
-                if ((value > STORE_STATUS_ERROR_TRANSIENT_NETWORK_PROBLEM) &&
-                        (value < STORE_STATUS_ERROR_PERMANENT_FAILURE)) {
-                    value = STORE_STATUS_ERROR_TRANSIENT_FAILURE;
-                } else if ((value > STORE_STATUS_ERROR_PERMANENT_MMBOX_FULL) &&
-                        (value <= STORE_STATUS_ERROR_END)) {
-                    value = STORE_STATUS_ERROR_PERMANENT_FAILURE;
-                } else if ((value < STORE_STATUS_SUCCESS) ||
-                        ((value > STORE_STATUS_SUCCESS) &&
-                                (value < STORE_STATUS_ERROR_TRANSIENT_FAILURE)) ||
-                                (value > STORE_STATUS_ERROR_END)) {
-                    value = STORE_STATUS_ERROR_PERMANENT_FAILURE;
-                }
-                break;
-            case RESPONSE_STATUS:
-                // According to oma-ts-mms-enc-v1_3, section 7.3.48, we modify the invalid value.
-                if ((value > RESPONSE_STATUS_ERROR_TRANSIENT_PARTIAL_SUCCESS) &&
-                        (value < RESPONSE_STATUS_ERROR_PERMANENT_FAILURE)) {
-                    value = RESPONSE_STATUS_ERROR_TRANSIENT_FAILURE;
-                } else if (((value > RESPONSE_STATUS_ERROR_PERMANENT_LACK_OF_PREPAID) &&
-                        (value <= RESPONSE_STATUS_ERROR_PERMANENT_END)) ||
-                        (value < RESPONSE_STATUS_OK) ||
-                        ((value > RESPONSE_STATUS_ERROR_UNSUPPORTED_MESSAGE) &&
-                                (value < RESPONSE_STATUS_ERROR_TRANSIENT_FAILURE)) ||
-                                (value > RESPONSE_STATUS_ERROR_PERMANENT_END)) {
-                    value = RESPONSE_STATUS_ERROR_PERMANENT_FAILURE;
-                }
-                break;
-            case MMS_VERSION:
-                if ((value < MMS_VERSION_1_0)|| (value > MMS_VERSION_1_3)) {
-                    value = CURRENT_MMS_VERSION; // Current version is the default value.
-                }
-                break;
-            case MESSAGE_TYPE:
-                if ((value < MESSAGE_TYPE_SEND_REQ) || (value > MESSAGE_TYPE_CANCEL_CONF)) {
-                    // Invalid value.
-                    throw new InvalidHeaderValueException("Invalid Octet value!");
-                }
-                break;
-            default:
-                // This header value should not be Octect.
-                throw new RuntimeException("Invalid header field!");
-        }
-        mHeaderMap.put(field, value);
-    }
-
-    /**
-     * Get TextString value by header field.
-     *
-     * @param field the field
-     * @return the TextString value of the pdu header
-     *          with specified header field
-     */
-    protected byte[] getTextString(int field) {
-        return (byte[]) mHeaderMap.get(field);
-    }
-
-    /**
-     * Set TextString value to pdu header by header field.
-     *
-     * @param value the value
-     * @param field the field
-     * @return the TextString value of the pdu header
-     *          with specified header field
-     * @throws NullPointerException if the value is null.
-     */
-    protected void setTextString(byte[] value, int field) {
-        /**
-         * Check whether this field can be set for specific
-         * header and check validity of the field.
-         */
-        if (null == value) {
-            throw new NullPointerException();
-        }
-
-        switch (field) {
-            case TRANSACTION_ID:
-            case REPLY_CHARGING_ID:
-            case AUX_APPLIC_ID:
-            case APPLIC_ID:
-            case REPLY_APPLIC_ID:
-            case MESSAGE_ID:
-            case REPLACE_ID:
-            case CANCEL_ID:
-            case CONTENT_LOCATION:
-            case MESSAGE_CLASS:
-            case CONTENT_TYPE:
-                break;
-            default:
-                // This header value should not be Text-String.
-                throw new RuntimeException("Invalid header field!");
-        }
-        mHeaderMap.put(field, value);
-    }
-
-    /**
-     * Get EncodedStringValue value by header field.
-     *
-     * @param field the field
-     * @return the EncodedStringValue value of the pdu header
-     *          with specified header field
-     */
-    protected EncodedStringValue getEncodedStringValue(int field) {
-        return (EncodedStringValue) mHeaderMap.get(field);
-    }
-
-    /**
-     * Get TO, CC or BCC header value.
-     *
-     * @param field the field
-     * @return the EncodeStringValue array of the pdu header
-     *          with specified header field
-     */
-    protected EncodedStringValue[] getEncodedStringValues(int field) {
-        ArrayList<EncodedStringValue> list =
-                (ArrayList<EncodedStringValue>) mHeaderMap.get(field);
-        if (null == list) {
-            return null;
-        }
-        EncodedStringValue[] values = new EncodedStringValue[list.size()];
-        return list.toArray(values);
-    }
-
-    /**
-     * Set EncodedStringValue value to pdu header by header field.
-     *
-     * @param value the value
-     * @param field the field
-     * @return the EncodedStringValue value of the pdu header
-     *          with specified header field
-     * @throws NullPointerException if the value is null.
-     */
-    protected void setEncodedStringValue(EncodedStringValue value, int field) {
-        /**
-         * Check whether this field can be set for specific
-         * header and check validity of the field.
-         */
-        if (null == value) {
-            throw new NullPointerException();
-        }
-
-        switch (field) {
-            case SUBJECT:
-            case RECOMMENDED_RETRIEVAL_MODE_TEXT:
-            case RETRIEVE_TEXT:
-            case STATUS_TEXT:
-            case STORE_STATUS_TEXT:
-            case RESPONSE_TEXT:
-            case FROM:
-            case PREVIOUSLY_SENT_BY:
-            case MM_FLAGS:
-                break;
-            default:
-                // This header value should not be Encoded-String-Value.
-                throw new RuntimeException("Invalid header field!");
-        }
-
-        mHeaderMap.put(field, value);
-    }
-
-    /**
-     * Set TO, CC or BCC header value.
-     *
-     * @param value the value
-     * @param field the field
-     * @return the EncodedStringValue value array of the pdu header
-     *          with specified header field
-     * @throws NullPointerException if the value is null.
-     */
-    protected void setEncodedStringValues(EncodedStringValue[] value, int field) {
-        /**
-         * Check whether this field can be set for specific
-         * header and check validity of the field.
-         */
-        if (null == value) {
-            throw new NullPointerException();
-        }
-
-        switch (field) {
-            case BCC:
-            case CC:
-            case TO:
-                break;
-            default:
-                // This header value should not be Encoded-String-Value.
-                throw new RuntimeException("Invalid header field!");
-        }
-
-        ArrayList<EncodedStringValue> list = new ArrayList<EncodedStringValue>();
-        for (int i = 0; i < value.length; i++) {
-            list.add(value[i]);
-        }
-        mHeaderMap.put(field, list);
-    }
-
-    /**
-     * Append one EncodedStringValue to another.
-     *
-     * @param value the EncodedStringValue to append
-     * @param field the field
-     * @throws NullPointerException if the value is null.
-     */
-    protected void appendEncodedStringValue(EncodedStringValue value,
-                                    int field) {
-        if (null == value) {
-            throw new NullPointerException();
-        }
-
-        switch (field) {
-            case BCC:
-            case CC:
-            case TO:
-                break;
-            default:
-                throw new RuntimeException("Invalid header field!");
-        }
-
-        ArrayList<EncodedStringValue> list =
-            (ArrayList<EncodedStringValue>) mHeaderMap.get(field);
-        if (null == list) {
-            list  = new ArrayList<EncodedStringValue>();
-        }
-        list.add(value);
-        mHeaderMap.put(field, list);
-    }
-
-    /**
-     * Get LongInteger value by header field.
-     *
-     * @param field the field
-     * @return the LongInteger value of the pdu header
-     *          with specified header field. if return -1, the
-     *          field is not existed in pdu header.
-     */
-    protected long getLongInteger(int field) {
-        Long longInteger = (Long) mHeaderMap.get(field);
-        if (null == longInteger) {
-            return -1;
-        }
-
-        return longInteger.longValue();
-    }
-
-    /**
-     * Set LongInteger value to pdu header by header field.
-     *
-     * @param value the value
-     * @param field the field
-     */
-    protected void setLongInteger(long value, int field) {
-        /**
-         * Check whether this field can be set for specific
-         * header and check validity of the field.
-         */
-        switch (field) {
-            case DATE:
-            case REPLY_CHARGING_SIZE:
-            case MESSAGE_SIZE:
-            case MESSAGE_COUNT:
-            case START:
-            case LIMIT:
-            case DELIVERY_TIME:
-            case EXPIRY:
-            case REPLY_CHARGING_DEADLINE:
-            case PREVIOUSLY_SENT_DATE:
-                break;
-            default:
-                // This header value should not be LongInteger.
-                throw new RuntimeException("Invalid header field!");
-        }
-        mHeaderMap.put(field, value);
-    }
-}
+/*
+ * Copyright (C) 2015 Jacob Klinker
+ *
+ * Licensed under the Apache License, Version 2.0 (the "License");
+ * you may not use this file except in compliance with the License.
+ * You may obtain a copy of the License at
+ *
+ * http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing, software
+ * distributed under the License is distributed on an "AS IS" BASIS,
+ * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ * See the License for the specific language governing permissions and
+ * limitations under the License.
+ */
+
+package com.google.android.mms.pdu_alt;
+
+import com.google.android.mms.InvalidHeaderValueException;
+
+import java.util.ArrayList;
+import java.util.HashMap;
+
+public class PduHeaders {
+    /**
+     * All pdu header fields.
+     */
+    public static final int BCC                             = 0x81;
+    public static final int CC                              = 0x82;
+    public static final int CONTENT_LOCATION                = 0x83;
+    public static final int CONTENT_TYPE                    = 0x84;
+    public static final int DATE                            = 0x85;
+    public static final int DELIVERY_REPORT                 = 0x86;
+    public static final int DELIVERY_TIME                   = 0x87;
+    public static final int EXPIRY                          = 0x88;
+    public static final int FROM                            = 0x89;
+    public static final int MESSAGE_CLASS                   = 0x8A;
+    public static final int MESSAGE_ID                      = 0x8B;
+    public static final int MESSAGE_TYPE                    = 0x8C;
+    public static final int MMS_VERSION                     = 0x8D;
+    public static final int MESSAGE_SIZE                    = 0x8E;
+    public static final int PRIORITY                        = 0x8F;
+
+    public static final int READ_REPLY                      = 0x90;
+    public static final int READ_REPORT                     = 0x90;
+    public static final int REPORT_ALLOWED                  = 0x91;
+    public static final int RESPONSE_STATUS                 = 0x92;
+    public static final int RESPONSE_TEXT                   = 0x93;
+    public static final int SENDER_VISIBILITY               = 0x94;
+    public static final int STATUS                          = 0x95;
+    public static final int SUBJECT                         = 0x96;
+    public static final int TO                              = 0x97;
+    public static final int TRANSACTION_ID                  = 0x98;
+    public static final int RETRIEVE_STATUS                 = 0x99;
+    public static final int RETRIEVE_TEXT                   = 0x9A;
+    public static final int READ_STATUS                     = 0x9B;
+    public static final int REPLY_CHARGING                  = 0x9C;
+    public static final int REPLY_CHARGING_DEADLINE         = 0x9D;
+    public static final int REPLY_CHARGING_ID               = 0x9E;
+    public static final int REPLY_CHARGING_SIZE             = 0x9F;
+
+    public static final int PREVIOUSLY_SENT_BY              = 0xA0;
+    public static final int PREVIOUSLY_SENT_DATE            = 0xA1;
+    public static final int STORE                           = 0xA2;
+    public static final int MM_STATE                        = 0xA3;
+    public static final int MM_FLAGS                        = 0xA4;
+    public static final int STORE_STATUS                    = 0xA5;
+    public static final int STORE_STATUS_TEXT               = 0xA6;
+    public static final int STORED                          = 0xA7;
+    public static final int ATTRIBUTES                      = 0xA8;
+    public static final int TOTALS                          = 0xA9;
+    public static final int MBOX_TOTALS                     = 0xAA;
+    public static final int QUOTAS                          = 0xAB;
+    public static final int MBOX_QUOTAS                     = 0xAC;
+    public static final int MESSAGE_COUNT                   = 0xAD;
+    public static final int CONTENT                         = 0xAE;
+    public static final int START                           = 0xAF;
+
+    public static final int ADDITIONAL_HEADERS              = 0xB0;
+    public static final int DISTRIBUTION_INDICATOR          = 0xB1;
+    public static final int ELEMENT_DESCRIPTOR              = 0xB2;
+    public static final int LIMIT                           = 0xB3;
+    public static final int RECOMMENDED_RETRIEVAL_MODE      = 0xB4;
+    public static final int RECOMMENDED_RETRIEVAL_MODE_TEXT = 0xB5;
+    public static final int STATUS_TEXT                     = 0xB6;
+    public static final int APPLIC_ID                       = 0xB7;
+    public static final int REPLY_APPLIC_ID                 = 0xB8;
+    public static final int AUX_APPLIC_ID                   = 0xB9;
+    public static final int CONTENT_CLASS                   = 0xBA;
+    public static final int DRM_CONTENT                     = 0xBB;
+    public static final int ADAPTATION_ALLOWED              = 0xBC;
+    public static final int REPLACE_ID                      = 0xBD;
+    public static final int CANCEL_ID                       = 0xBE;
+    public static final int CANCEL_STATUS                   = 0xBF;
+
+    /**
+     * X-Mms-Message-Type field types.
+     */
+    public static final int MESSAGE_TYPE_SEND_REQ           = 0x80;
+    public static final int MESSAGE_TYPE_SEND_CONF          = 0x81;
+    public static final int MESSAGE_TYPE_NOTIFICATION_IND   = 0x82;
+    public static final int MESSAGE_TYPE_NOTIFYRESP_IND     = 0x83;
+    public static final int MESSAGE_TYPE_RETRIEVE_CONF      = 0x84;
+    public static final int MESSAGE_TYPE_ACKNOWLEDGE_IND    = 0x85;
+    public static final int MESSAGE_TYPE_DELIVERY_IND       = 0x86;
+    public static final int MESSAGE_TYPE_READ_REC_IND       = 0x87;
+    public static final int MESSAGE_TYPE_READ_ORIG_IND      = 0x88;
+    public static final int MESSAGE_TYPE_FORWARD_REQ        = 0x89;
+    public static final int MESSAGE_TYPE_FORWARD_CONF       = 0x8A;
+    public static final int MESSAGE_TYPE_MBOX_STORE_REQ     = 0x8B;
+    public static final int MESSAGE_TYPE_MBOX_STORE_CONF    = 0x8C;
+    public static final int MESSAGE_TYPE_MBOX_VIEW_REQ      = 0x8D;
+    public static final int MESSAGE_TYPE_MBOX_VIEW_CONF     = 0x8E;
+    public static final int MESSAGE_TYPE_MBOX_UPLOAD_REQ    = 0x8F;
+    public static final int MESSAGE_TYPE_MBOX_UPLOAD_CONF   = 0x90;
+    public static final int MESSAGE_TYPE_MBOX_DELETE_REQ    = 0x91;
+    public static final int MESSAGE_TYPE_MBOX_DELETE_CONF   = 0x92;
+    public static final int MESSAGE_TYPE_MBOX_DESCR         = 0x93;
+    public static final int MESSAGE_TYPE_DELETE_REQ         = 0x94;
+    public static final int MESSAGE_TYPE_DELETE_CONF        = 0x95;
+    public static final int MESSAGE_TYPE_CANCEL_REQ         = 0x96;
+    public static final int MESSAGE_TYPE_CANCEL_CONF        = 0x97;
+
+    /**
+     *  X-Mms-Delivery-Report |
+     *  X-Mms-Read-Report |
+     *  X-Mms-Report-Allowed |
+     *  X-Mms-Sender-Visibility |
+     *  X-Mms-Store |
+     *  X-Mms-Stored |
+     *  X-Mms-Totals |
+     *  X-Mms-Quotas |
+     *  X-Mms-Distribution-Indicator |
+     *  X-Mms-DRM-Content |
+     *  X-Mms-Adaptation-Allowed |
+     *  field types.
+     */
+    public static final int VALUE_YES                       = 0x80;
+    public static final int VALUE_NO                        = 0x81;
+
+    /**
+     *  Delivery-Time |
+     *  Expiry and Reply-Charging-Deadline |
+     *  field type components.
+     */
+    public static final int VALUE_ABSOLUTE_TOKEN            = 0x80;
+    public static final int VALUE_RELATIVE_TOKEN            = 0x81;
+
+    /**
+     * X-Mms-MMS-Version field types.
+     */
+    public static final int MMS_VERSION_1_3                 = ((1 << 4) | 3);
+    public static final int MMS_VERSION_1_2                 = ((1 << 4) | 2);
+    public static final int MMS_VERSION_1_1                 = ((1 << 4) | 1);
+    public static final int MMS_VERSION_1_0                 = ((1 << 4) | 0);
+
+    // Current version is 1.2.
+    public static final int CURRENT_MMS_VERSION             = MMS_VERSION_1_2;
+
+    /**
+     *  From field type components.
+     */
+    public static final int FROM_ADDRESS_PRESENT_TOKEN      = 0x80;
+    public static final int FROM_INSERT_ADDRESS_TOKEN       = 0x81;
+
+    public static final String FROM_ADDRESS_PRESENT_TOKEN_STR = "address-present-token";
+    public static final String FROM_INSERT_ADDRESS_TOKEN_STR = "insert-address-token";
+
+    /**
+     *  X-Mms-Status Field.
+     */
+    public static final int STATUS_EXPIRED                  = 0x80;
+    public static final int STATUS_RETRIEVED                = 0x81;
+    public static final int STATUS_REJECTED                 = 0x82;
+    public static final int STATUS_DEFERRED                 = 0x83;
+    public static final int STATUS_UNRECOGNIZED             = 0x84;
+    public static final int STATUS_INDETERMINATE            = 0x85;
+    public static final int STATUS_FORWARDED                = 0x86;
+    public static final int STATUS_UNREACHABLE              = 0x87;
+
+    /**
+     *  MM-Flags field type components.
+     */
+    public static final int MM_FLAGS_ADD_TOKEN              = 0x80;
+    public static final int MM_FLAGS_REMOVE_TOKEN           = 0x81;
+    public static final int MM_FLAGS_FILTER_TOKEN           = 0x82;
+
+    /**
+     *  X-Mms-Message-Class field types.
+     */
+    public static final int MESSAGE_CLASS_PERSONAL          = 0x80;
+    public static final int MESSAGE_CLASS_ADVERTISEMENT     = 0x81;
+    public static final int MESSAGE_CLASS_INFORMATIONAL     = 0x82;
+    public static final int MESSAGE_CLASS_AUTO              = 0x83;
+
+    public static final String MESSAGE_CLASS_PERSONAL_STR = "personal";
+    public static final String MESSAGE_CLASS_ADVERTISEMENT_STR = "advertisement";
+    public static final String MESSAGE_CLASS_INFORMATIONAL_STR = "informational";
+    public static final String MESSAGE_CLASS_AUTO_STR = "auto";
+
+    /**
+     *  X-Mms-Priority field types.
+     */
+    public static final int PRIORITY_LOW                    = 0x80;
+    public static final int PRIORITY_NORMAL                 = 0x81;
+    public static final int PRIORITY_HIGH                   = 0x82;
+
+    /**
+     *  X-Mms-Response-Status field types.
+     */
+    public static final int RESPONSE_STATUS_OK                   = 0x80;
+    public static final int RESPONSE_STATUS_ERROR_UNSPECIFIED    = 0x81;
+    public static final int RESPONSE_STATUS_ERROR_SERVICE_DENIED = 0x82;
+
+    public static final int RESPONSE_STATUS_ERROR_MESSAGE_FORMAT_CORRUPT     = 0x83;
+    public static final int RESPONSE_STATUS_ERROR_SENDING_ADDRESS_UNRESOLVED = 0x84;
+
+    public static final int RESPONSE_STATUS_ERROR_MESSAGE_NOT_FOUND    = 0x85;
+    public static final int RESPONSE_STATUS_ERROR_NETWORK_PROBLEM      = 0x86;
+    public static final int RESPONSE_STATUS_ERROR_CONTENT_NOT_ACCEPTED = 0x87;
+    public static final int RESPONSE_STATUS_ERROR_UNSUPPORTED_MESSAGE  = 0x88;
+    public static final int RESPONSE_STATUS_ERROR_TRANSIENT_FAILURE    = 0xC0;
+
+    public static final int RESPONSE_STATUS_ERROR_TRANSIENT_SENDNG_ADDRESS_UNRESOLVED = 0xC1;
+    public static final int RESPONSE_STATUS_ERROR_TRANSIENT_MESSAGE_NOT_FOUND         = 0xC2;
+    public static final int RESPONSE_STATUS_ERROR_TRANSIENT_NETWORK_PROBLEM           = 0xC3;
+    public static final int RESPONSE_STATUS_ERROR_TRANSIENT_PARTIAL_SUCCESS           = 0xC4;
+
+    public static final int RESPONSE_STATUS_ERROR_PERMANENT_FAILURE                             = 0xE0;
+    public static final int RESPONSE_STATUS_ERROR_PERMANENT_SERVICE_DENIED                      = 0xE1;
+    public static final int RESPONSE_STATUS_ERROR_PERMANENT_MESSAGE_FORMAT_CORRUPT              = 0xE2;
+    public static final int RESPONSE_STATUS_ERROR_PERMANENT_SENDING_ADDRESS_UNRESOLVED          = 0xE3;
+    public static final int RESPONSE_STATUS_ERROR_PERMANENT_MESSAGE_NOT_FOUND                   = 0xE4;
+    public static final int RESPONSE_STATUS_ERROR_PERMANENT_CONTENT_NOT_ACCEPTED                = 0xE5;
+    public static final int RESPONSE_STATUS_ERROR_PERMANENT_REPLY_CHARGING_LIMITATIONS_NOT_MET  = 0xE6;
+    public static final int RESPONSE_STATUS_ERROR_PERMANENT_REPLY_CHARGING_REQUEST_NOT_ACCEPTED = 0xE6;
+    public static final int RESPONSE_STATUS_ERROR_PERMANENT_REPLY_CHARGING_FORWARDING_DENIED    = 0xE8;
+    public static final int RESPONSE_STATUS_ERROR_PERMANENT_REPLY_CHARGING_NOT_SUPPORTED        = 0xE9;
+    public static final int RESPONSE_STATUS_ERROR_PERMANENT_ADDRESS_HIDING_NOT_SUPPORTED        = 0xEA;
+    public static final int RESPONSE_STATUS_ERROR_PERMANENT_LACK_OF_PREPAID                     = 0xEB;
+    public static final int RESPONSE_STATUS_ERROR_PERMANENT_END                                 = 0xFF;
+
+    /**
+     *  X-Mms-Retrieve-Status field types.
+     */
+    public static final int RETRIEVE_STATUS_OK                                  = 0x80;
+    public static final int RETRIEVE_STATUS_ERROR_TRANSIENT_FAILURE             = 0xC0;
+    public static final int RETRIEVE_STATUS_ERROR_TRANSIENT_MESSAGE_NOT_FOUND   = 0xC1;
+    public static final int RETRIEVE_STATUS_ERROR_TRANSIENT_NETWORK_PROBLEM     = 0xC2;
+    public static final int RETRIEVE_STATUS_ERROR_PERMANENT_FAILURE             = 0xE0;
+    public static final int RETRIEVE_STATUS_ERROR_PERMANENT_SERVICE_DENIED      = 0xE1;
+    public static final int RETRIEVE_STATUS_ERROR_PERMANENT_MESSAGE_NOT_FOUND   = 0xE2;
+    public static final int RETRIEVE_STATUS_ERROR_PERMANENT_CONTENT_UNSUPPORTED = 0xE3;
+    public static final int RETRIEVE_STATUS_ERROR_END                           = 0xFF;
+
+    /**
+     *  X-Mms-Sender-Visibility field types.
+     */
+    public static final int SENDER_VISIBILITY_HIDE          = 0x80;
+    public static final int SENDER_VISIBILITY_SHOW          = 0x81;
+
+    /**
+     *  X-Mms-Read-Status field types.
+     */
+    public static final int READ_STATUS_READ                        = 0x80;
+    public static final int READ_STATUS__DELETED_WITHOUT_BEING_READ = 0x81;
+
+    /**
+     *  X-Mms-Cancel-Status field types.
+     */
+    public static final int CANCEL_STATUS_REQUEST_SUCCESSFULLY_RECEIVED = 0x80;
+    public static final int CANCEL_STATUS_REQUEST_CORRUPTED             = 0x81;
+
+    /**
+     *  X-Mms-Reply-Charging field types.
+     */
+    public static final int REPLY_CHARGING_REQUESTED           = 0x80;
+    public static final int REPLY_CHARGING_REQUESTED_TEXT_ONLY = 0x81;
+    public static final int REPLY_CHARGING_ACCEPTED            = 0x82;
+    public static final int REPLY_CHARGING_ACCEPTED_TEXT_ONLY  = 0x83;
+
+    /**
+     *  X-Mms-MM-State field types.
+     */
+    public static final int MM_STATE_DRAFT                  = 0x80;
+    public static final int MM_STATE_SENT                   = 0x81;
+    public static final int MM_STATE_NEW                    = 0x82;
+    public static final int MM_STATE_RETRIEVED              = 0x83;
+    public static final int MM_STATE_FORWARDED              = 0x84;
+
+    /**
+     * X-Mms-Recommended-Retrieval-Mode field types.
+     */
+    public static final int RECOMMENDED_RETRIEVAL_MODE_MANUAL = 0x80;
+
+    /**
+     *  X-Mms-Content-Class field types.
+     */
+    public static final int CONTENT_CLASS_TEXT              = 0x80;
+    public static final int CONTENT_CLASS_IMAGE_BASIC       = 0x81;
+    public static final int CONTENT_CLASS_IMAGE_RICH        = 0x82;
+    public static final int CONTENT_CLASS_VIDEO_BASIC       = 0x83;
+    public static final int CONTENT_CLASS_VIDEO_RICH        = 0x84;
+    public static final int CONTENT_CLASS_MEGAPIXEL         = 0x85;
+    public static final int CONTENT_CLASS_CONTENT_BASIC     = 0x86;
+    public static final int CONTENT_CLASS_CONTENT_RICH      = 0x87;
+
+    /**
+     *  X-Mms-Store-Status field types.
+     */
+    public static final int STORE_STATUS_SUCCESS                                = 0x80;
+    public static final int STORE_STATUS_ERROR_TRANSIENT_FAILURE                = 0xC0;
+    public static final int STORE_STATUS_ERROR_TRANSIENT_NETWORK_PROBLEM        = 0xC1;
+    public static final int STORE_STATUS_ERROR_PERMANENT_FAILURE                = 0xE0;
+    public static final int STORE_STATUS_ERROR_PERMANENT_SERVICE_DENIED         = 0xE1;
+    public static final int STORE_STATUS_ERROR_PERMANENT_MESSAGE_FORMAT_CORRUPT = 0xE2;
+    public static final int STORE_STATUS_ERROR_PERMANENT_MESSAGE_NOT_FOUND      = 0xE3;
+    public static final int STORE_STATUS_ERROR_PERMANENT_MMBOX_FULL             = 0xE4;
+    public static final int STORE_STATUS_ERROR_END                              = 0xFF;
+
+    /**
+     * The map contains the value of all headers.
+     */
+    private HashMap<Integer, Object> mHeaderMap = null;
+
+    /**
+     * Constructor of PduHeaders.
+     */
+    public PduHeaders() {
+        mHeaderMap = new HashMap<Integer, Object>();
+    }
+
+    /**
+     * Get octet value by header field.
+     *
+     * @param field the field
+     * @return the octet value of the pdu header
+     *          with specified header field. Return 0 if
+     *          the value is not set.
+     */
+    protected int getOctet(int field) {
+        Integer octet = (Integer) mHeaderMap.get(field);
+        if (null == octet) {
+            return 0;
+        }
+
+        return octet;
+    }
+
+    /**
+     * Set octet value to pdu header by header field.
+     *
+     * @param value the value
+     * @param field the field
+     * @throws InvalidHeaderValueException if the value is invalid.
+     */
+    protected void setOctet(int value, int field)
+            throws InvalidHeaderValueException{
+        /**
+         * Check whether this field can be set for specific
+         * header and check validity of the field.
+         */
+        switch (field) {
+            case REPORT_ALLOWED:
+            case ADAPTATION_ALLOWED:
+            case DELIVERY_REPORT:
+            case DRM_CONTENT:
+            case DISTRIBUTION_INDICATOR:
+            case QUOTAS:
+            case READ_REPORT:
+            case STORE:
+            case STORED:
+            case TOTALS:
+            case SENDER_VISIBILITY:
+                if ((VALUE_YES != value) && (VALUE_NO != value)) {
+                    // Invalid value.
+                    throw new InvalidHeaderValueException("Invalid Octet value!");
+                }
+                break;
+            case READ_STATUS:
+                if ((READ_STATUS_READ != value) &&
+                        (READ_STATUS__DELETED_WITHOUT_BEING_READ != value)) {
+                    // Invalid value.
+                    throw new InvalidHeaderValueException("Invalid Octet value!");
+                }
+                break;
+            case CANCEL_STATUS:
+                if ((CANCEL_STATUS_REQUEST_SUCCESSFULLY_RECEIVED != value) &&
+                        (CANCEL_STATUS_REQUEST_CORRUPTED != value)) {
+                    // Invalid value.
+                    throw new InvalidHeaderValueException("Invalid Octet value!");
+                }
+                break;
+            case PRIORITY:
+                if ((value < PRIORITY_LOW) || (value > PRIORITY_HIGH)) {
+                    // Invalid value.
+                    throw new InvalidHeaderValueException("Invalid Octet value!");
+                }
+                break;
+            case STATUS:
+                if ((value < STATUS_EXPIRED) || (value > STATUS_UNREACHABLE)) {
+                    // Invalid value.
+                    throw new InvalidHeaderValueException("Invalid Octet value!");
+                }
+                break;
+            case REPLY_CHARGING:
+                if ((value < REPLY_CHARGING_REQUESTED)
+                        || (value > REPLY_CHARGING_ACCEPTED_TEXT_ONLY)) {
+                    // Invalid value.
+                    throw new InvalidHeaderValueException("Invalid Octet value!");
+                }
+                break;
+            case MM_STATE:
+                if ((value < MM_STATE_DRAFT) || (value > MM_STATE_FORWARDED)) {
+                    // Invalid value.
+                    throw new InvalidHeaderValueException("Invalid Octet value!");
+                }
+                break;
+            case RECOMMENDED_RETRIEVAL_MODE:
+                if (RECOMMENDED_RETRIEVAL_MODE_MANUAL != value) {
+                    // Invalid value.
+                    throw new InvalidHeaderValueException("Invalid Octet value!");
+                }
+                break;
+            case CONTENT_CLASS:
+                if ((value < CONTENT_CLASS_TEXT)
+                        || (value > CONTENT_CLASS_CONTENT_RICH)) {
+                    // Invalid value.
+                    throw new InvalidHeaderValueException("Invalid Octet value!");
+                }
+                break;
+            case RETRIEVE_STATUS:
+                // According to oma-ts-mms-enc-v1_3, section 7.3.50, we modify the invalid value.
+                if ((value > RETRIEVE_STATUS_ERROR_TRANSIENT_NETWORK_PROBLEM) &&
+                        (value < RETRIEVE_STATUS_ERROR_PERMANENT_FAILURE)) {
+                    value = RETRIEVE_STATUS_ERROR_TRANSIENT_FAILURE;
+                } else if ((value > RETRIEVE_STATUS_ERROR_PERMANENT_CONTENT_UNSUPPORTED) &&
+                        (value <= RETRIEVE_STATUS_ERROR_END)) {
+                    value = RETRIEVE_STATUS_ERROR_PERMANENT_FAILURE;
+                } else if ((value < RETRIEVE_STATUS_OK) ||
+                        ((value > RETRIEVE_STATUS_OK) &&
+                                (value < RETRIEVE_STATUS_ERROR_TRANSIENT_FAILURE)) ||
+                                (value > RETRIEVE_STATUS_ERROR_END)) {
+                    value = RETRIEVE_STATUS_ERROR_PERMANENT_FAILURE;
+                }
+                break;
+            case STORE_STATUS:
+                // According to oma-ts-mms-enc-v1_3, section 7.3.58, we modify the invalid value.
+                if ((value > STORE_STATUS_ERROR_TRANSIENT_NETWORK_PROBLEM) &&
+                        (value < STORE_STATUS_ERROR_PERMANENT_FAILURE)) {
+                    value = STORE_STATUS_ERROR_TRANSIENT_FAILURE;
+                } else if ((value > STORE_STATUS_ERROR_PERMANENT_MMBOX_FULL) &&
+                        (value <= STORE_STATUS_ERROR_END)) {
+                    value = STORE_STATUS_ERROR_PERMANENT_FAILURE;
+                } else if ((value < STORE_STATUS_SUCCESS) ||
+                        ((value > STORE_STATUS_SUCCESS) &&
+                                (value < STORE_STATUS_ERROR_TRANSIENT_FAILURE)) ||
+                                (value > STORE_STATUS_ERROR_END)) {
+                    value = STORE_STATUS_ERROR_PERMANENT_FAILURE;
+                }
+                break;
+            case RESPONSE_STATUS:
+                // According to oma-ts-mms-enc-v1_3, section 7.3.48, we modify the invalid value.
+                if ((value > RESPONSE_STATUS_ERROR_TRANSIENT_PARTIAL_SUCCESS) &&
+                        (value < RESPONSE_STATUS_ERROR_PERMANENT_FAILURE)) {
+                    value = RESPONSE_STATUS_ERROR_TRANSIENT_FAILURE;
+                } else if (((value > RESPONSE_STATUS_ERROR_PERMANENT_LACK_OF_PREPAID) &&
+                        (value <= RESPONSE_STATUS_ERROR_PERMANENT_END)) ||
+                        (value < RESPONSE_STATUS_OK) ||
+                        ((value > RESPONSE_STATUS_ERROR_UNSUPPORTED_MESSAGE) &&
+                                (value < RESPONSE_STATUS_ERROR_TRANSIENT_FAILURE)) ||
+                                (value > RESPONSE_STATUS_ERROR_PERMANENT_END)) {
+                    value = RESPONSE_STATUS_ERROR_PERMANENT_FAILURE;
+                }
+                break;
+            case MMS_VERSION:
+                if ((value < MMS_VERSION_1_0)|| (value > MMS_VERSION_1_3)) {
+                    value = CURRENT_MMS_VERSION; // Current version is the default value.
+                }
+                break;
+            case MESSAGE_TYPE:
+                if ((value < MESSAGE_TYPE_SEND_REQ) || (value > MESSAGE_TYPE_CANCEL_CONF)) {
+                    // Invalid value.
+                    throw new InvalidHeaderValueException("Invalid Octet value!");
+                }
+                break;
+            default:
+                // This header value should not be Octect.
+                throw new RuntimeException("Invalid header field!");
+        }
+        mHeaderMap.put(field, value);
+    }
+
+    /**
+     * Get TextString value by header field.
+     *
+     * @param field the field
+     * @return the TextString value of the pdu header
+     *          with specified header field
+     */
+    protected byte[] getTextString(int field) {
+        return (byte[]) mHeaderMap.get(field);
+    }
+
+    /**
+     * Set TextString value to pdu header by header field.
+     *
+     * @param value the value
+     * @param field the field
+     * @return the TextString value of the pdu header
+     *          with specified header field
+     * @throws NullPointerException if the value is null.
+     */
+    protected void setTextString(byte[] value, int field) {
+        /**
+         * Check whether this field can be set for specific
+         * header and check validity of the field.
+         */
+        if (null == value) {
+            throw new NullPointerException();
+        }
+
+        switch (field) {
+            case TRANSACTION_ID:
+            case REPLY_CHARGING_ID:
+            case AUX_APPLIC_ID:
+            case APPLIC_ID:
+            case REPLY_APPLIC_ID:
+            case MESSAGE_ID:
+            case REPLACE_ID:
+            case CANCEL_ID:
+            case CONTENT_LOCATION:
+            case MESSAGE_CLASS:
+            case CONTENT_TYPE:
+                break;
+            default:
+                // This header value should not be Text-String.
+                throw new RuntimeException("Invalid header field!");
+        }
+        mHeaderMap.put(field, value);
+    }
+
+    /**
+     * Get EncodedStringValue value by header field.
+     *
+     * @param field the field
+     * @return the EncodedStringValue value of the pdu header
+     *          with specified header field
+     */
+    protected EncodedStringValue getEncodedStringValue(int field) {
+        return (EncodedStringValue) mHeaderMap.get(field);
+    }
+
+    /**
+     * Get TO, CC or BCC header value.
+     *
+     * @param field the field
+     * @return the EncodeStringValue array of the pdu header
+     *          with specified header field
+     */
+    protected EncodedStringValue[] getEncodedStringValues(int field) {
+        ArrayList<EncodedStringValue> list =
+                (ArrayList<EncodedStringValue>) mHeaderMap.get(field);
+        if (null == list) {
+            return null;
+        }
+        EncodedStringValue[] values = new EncodedStringValue[list.size()];
+        return list.toArray(values);
+    }
+
+    /**
+     * Set EncodedStringValue value to pdu header by header field.
+     *
+     * @param value the value
+     * @param field the field
+     * @return the EncodedStringValue value of the pdu header
+     *          with specified header field
+     * @throws NullPointerException if the value is null.
+     */
+    protected void setEncodedStringValue(EncodedStringValue value, int field) {
+        /**
+         * Check whether this field can be set for specific
+         * header and check validity of the field.
+         */
+        if (null == value) {
+            throw new NullPointerException();
+        }
+
+        switch (field) {
+            case SUBJECT:
+            case RECOMMENDED_RETRIEVAL_MODE_TEXT:
+            case RETRIEVE_TEXT:
+            case STATUS_TEXT:
+            case STORE_STATUS_TEXT:
+            case RESPONSE_TEXT:
+            case FROM:
+            case PREVIOUSLY_SENT_BY:
+            case MM_FLAGS:
+                break;
+            default:
+                // This header value should not be Encoded-String-Value.
+                throw new RuntimeException("Invalid header field!");
+        }
+
+        mHeaderMap.put(field, value);
+    }
+
+    /**
+     * Set TO, CC or BCC header value.
+     *
+     * @param value the value
+     * @param field the field
+     * @return the EncodedStringValue value array of the pdu header
+     *          with specified header field
+     * @throws NullPointerException if the value is null.
+     */
+    protected void setEncodedStringValues(EncodedStringValue[] value, int field) {
+        /**
+         * Check whether this field can be set for specific
+         * header and check validity of the field.
+         */
+        if (null == value) {
+            throw new NullPointerException();
+        }
+
+        switch (field) {
+            case BCC:
+            case CC:
+            case TO:
+                break;
+            default:
+                // This header value should not be Encoded-String-Value.
+                throw new RuntimeException("Invalid header field!");
+        }
+
+        ArrayList<EncodedStringValue> list = new ArrayList<EncodedStringValue>();
+        for (int i = 0; i < value.length; i++) {
+            list.add(value[i]);
+        }
+        mHeaderMap.put(field, list);
+    }
+
+    /**
+     * Append one EncodedStringValue to another.
+     *
+     * @param value the EncodedStringValue to append
+     * @param field the field
+     * @throws NullPointerException if the value is null.
+     */
+    protected void appendEncodedStringValue(EncodedStringValue value,
+                                    int field) {
+        if (null == value) {
+            throw new NullPointerException();
+        }
+
+        switch (field) {
+            case BCC:
+            case CC:
+            case TO:
+                break;
+            default:
+                throw new RuntimeException("Invalid header field!");
+        }
+
+        ArrayList<EncodedStringValue> list =
+            (ArrayList<EncodedStringValue>) mHeaderMap.get(field);
+        if (null == list) {
+            list  = new ArrayList<EncodedStringValue>();
+        }
+        list.add(value);
+        mHeaderMap.put(field, list);
+    }
+
+    /**
+     * Get LongInteger value by header field.
+     *
+     * @param field the field
+     * @return the LongInteger value of the pdu header
+     *          with specified header field. if return -1, the
+     *          field is not existed in pdu header.
+     */
+    protected long getLongInteger(int field) {
+        Long longInteger = (Long) mHeaderMap.get(field);
+        if (null == longInteger) {
+            return -1;
+        }
+
+        return longInteger.longValue();
+    }
+
+    /**
+     * Set LongInteger value to pdu header by header field.
+     *
+     * @param value the value
+     * @param field the field
+     */
+    protected void setLongInteger(long value, int field) {
+        /**
+         * Check whether this field can be set for specific
+         * header and check validity of the field.
+         */
+        switch (field) {
+            case DATE:
+            case REPLY_CHARGING_SIZE:
+            case MESSAGE_SIZE:
+            case MESSAGE_COUNT:
+            case START:
+            case LIMIT:
+            case DELIVERY_TIME:
+            case EXPIRY:
+            case REPLY_CHARGING_DEADLINE:
+            case PREVIOUSLY_SENT_DATE:
+                break;
+            default:
+                // This header value should not be LongInteger.
+                throw new RuntimeException("Invalid header field!");
+        }
+        mHeaderMap.put(field, value);
+    }
+}
diff --git a/android-smsmms/src/main/java/com/google/android/mms/pdu_alt/PduParser.java b/android-smsmms/src/main/java/com/google/android/mms/pdu_alt/PduParser.java
index 654de146d..6dc2c1be2 100755
--- a/android-smsmms/src/main/java/com/google/android/mms/pdu_alt/PduParser.java
+++ b/android-smsmms/src/main/java/com/google/android/mms/pdu_alt/PduParser.java
@@ -1,2016 +1,2016 @@
-/*
- * Copyright (C) 2015 Jacob Klinker
- *
- * Licensed under the Apache License, Version 2.0 (the "License");
- * you may not use this file except in compliance with the License.
- * You may obtain a copy of the License at
- *
- * http://www.apache.org/licenses/LICENSE-2.0
- *
- * Unless required by applicable law or agreed to in writing, software
- * distributed under the License is distributed on an "AS IS" BASIS,
- * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
- * See the License for the specific language governing permissions and
- * limitations under the License.
- */
-
-package com.google.android.mms.pdu_alt;
-
-import com.google.android.mms.ContentType;
-import com.google.android.mms.InvalidHeaderValueException;
-import timber.log.Timber;
-
-import java.io.ByteArrayInputStream;
-import java.io.ByteArrayOutputStream;
-import java.io.UnsupportedEncodingException;
-import java.util.Arrays;
-import java.util.HashMap;
-
-public class PduParser {
-    /**
-     *  The next are WAP values defined in WSP specification.
-     */
-    private static final int QUOTE = 127;
-    private static final int LENGTH_QUOTE = 31;
-    private static final int TEXT_MIN = 32;
-    private static final int TEXT_MAX = 127;
-    private static final int SHORT_INTEGER_MAX = 127;
-    private static final int SHORT_LENGTH_MAX = 30;
-    private static final int LONG_INTEGER_LENGTH_MAX = 8;
-    private static final int QUOTED_STRING_FLAG = 34;
-    private static final int END_STRING_FLAG = 0x00;
-    //The next two are used by the interface "parseWapString" to
-    //distinguish Text-String and Quoted-String.
-    private static final int TYPE_TEXT_STRING = 0;
-    private static final int TYPE_QUOTED_STRING = 1;
-    private static final int TYPE_TOKEN_STRING = 2;
-
-    /**
-     * Specify the part position.
-     */
-    private static final int THE_FIRST_PART = 0;
-    private static final int THE_LAST_PART = 1;
-
-    /**
-     * The pdu data.
-     */
-    private ByteArrayInputStream mPduDataStream = null;
-
-    /**
-     * Store pdu headers
-     */
-    private PduHeaders mHeaders = null;
-
-    /**
-     * Store pdu parts.
-     */
-    private PduBody mBody = null;
-
-    /**
-     * Store the "type" parameter in "Content-Type" header field.
-     */
-    private static byte[] mTypeParam = null;
-
-    /**
-     * Store the "start" parameter in "Content-Type" header field.
-     */
-    private static byte[] mStartParam = null;
-
-    /**
-     * The log tag.
-     */
-    private static final boolean LOCAL_LOGV = false;
-
-    /**
-     * Whether to parse content-disposition part header
-     */
-    private final boolean mParseContentDisposition;
-
-    /**
-     * Constructor.
-     *
-     * @param pduDataStream pdu data to be parsed
-     * @param parseContentDisposition whether to parse the Content-Disposition part header
-     */
-    public PduParser(byte[] pduDataStream, boolean parseContentDisposition) {
-        mPduDataStream = new ByteArrayInputStream(pduDataStream);
-        mParseContentDisposition = parseContentDisposition;
-    }
-
-    /**
-     * Constructor. Default the parsing content disposition.
-     *
-     * @param pduDataStream pdu data to be parsed.
-     */
-    public PduParser(byte[] pduDataStream) {
-        this(pduDataStream, true);
-    }
-
-    /**
-     * Parse the pdu.
-     *
-     * @return the pdu structure if parsing successfully.
-     *         null if parsing error happened or mandatory fields are not set.
-     */
-    public GenericPdu parse(){
-        if (mPduDataStream == null) {
-            return null;
-        }
-
-        /* parse headers */
-        mHeaders = parseHeaders(mPduDataStream);
-        if (null == mHeaders) {
-            // Parse headers failed.
-            return null;
-        }
-
-        /* get the message type */
-        int messageType = mHeaders.getOctet(PduHeaders.MESSAGE_TYPE);
-
-        /* check mandatory header fields */
-        if (false == checkMandatoryHeader(mHeaders)) {
-            log("check mandatory headers failed!");
-            return null;
-        }
-
-        if ((PduHeaders.MESSAGE_TYPE_SEND_REQ == messageType) ||
-                (PduHeaders.MESSAGE_TYPE_RETRIEVE_CONF == messageType)) {
-            /* need to parse the parts */
-            mBody = parseParts(mPduDataStream);
-            if (null == mBody) {
-                // Parse parts failed.
-                return null;
-            }
-        }
-
-        switch (messageType) {
-            case PduHeaders.MESSAGE_TYPE_SEND_REQ:
-                if (LOCAL_LOGV) {
-                    Timber.v("parse: MESSAGE_TYPE_SEND_REQ");
-                }
-                SendReq sendReq = new SendReq(mHeaders, mBody);
-                return sendReq;
-            case PduHeaders.MESSAGE_TYPE_SEND_CONF:
-                if (LOCAL_LOGV) {
-                    Timber.v("parse: MESSAGE_TYPE_SEND_CONF");
-                }
-                SendConf sendConf = new SendConf(mHeaders);
-                return sendConf;
-            case PduHeaders.MESSAGE_TYPE_NOTIFICATION_IND:
-                if (LOCAL_LOGV) {
-                    Timber.v("parse: MESSAGE_TYPE_NOTIFICATION_IND");
-                }
-                NotificationInd notificationInd =
-                    new NotificationInd(mHeaders);
-                return notificationInd;
-            case PduHeaders.MESSAGE_TYPE_NOTIFYRESP_IND:
-                if (LOCAL_LOGV) {
-                    Timber.v("parse: MESSAGE_TYPE_NOTIFYRESP_IND");
-                }
-                NotifyRespInd notifyRespInd =
-                    new NotifyRespInd(mHeaders);
-                return notifyRespInd;
-            case PduHeaders.MESSAGE_TYPE_RETRIEVE_CONF:
-                if (LOCAL_LOGV) {
-                    Timber.v("parse: MESSAGE_TYPE_RETRIEVE_CONF");
-                }
-                RetrieveConf retrieveConf =
-                    new RetrieveConf(mHeaders, mBody);
-
-                byte[] contentType = retrieveConf.getContentType();
-                if (null == contentType) {
-                    return null;
-                }
-                String ctTypeStr = new String(contentType);
-                if (ctTypeStr.equals(ContentType.MULTIPART_MIXED)
-                        || ctTypeStr.equals(ContentType.MULTIPART_RELATED)
-                        || ctTypeStr.equals(ContentType.MULTIPART_ALTERNATIVE)) {
-                    // The MMS content type must be "application/vnd.wap.multipart.mixed"
-                    // or "application/vnd.wap.multipart.related"
-                    // or "application/vnd.wap.multipart.alternative"
-                    return retrieveConf;
-                } else if (ctTypeStr.equals(ContentType.MULTIPART_ALTERNATIVE)) {
-                    // "application/vnd.wap.multipart.alternative"
-                    // should take only the first part.
-                    PduPart firstPart = mBody.getPart(0);
-                    mBody.removeAll();
-                    mBody.addPart(0, firstPart);
-                    return retrieveConf;
-                } else if (ctTypeStr.equals(ContentType.MULTIPART_SIGNED)) {
-                    // multipart/signed
-                    return retrieveConf;
-                } else {
-                    Timber.v("Unsupported ContentType: " + ctTypeStr);
-                }
-                return null;
-            case PduHeaders.MESSAGE_TYPE_DELIVERY_IND:
-                if (LOCAL_LOGV) {
-                    Timber.v("parse: MESSAGE_TYPE_DELIVERY_IND");
-                }
-                DeliveryInd deliveryInd =
-                    new DeliveryInd(mHeaders);
-                return deliveryInd;
-            case PduHeaders.MESSAGE_TYPE_ACKNOWLEDGE_IND:
-                if (LOCAL_LOGV) {
-                    Timber.v("parse: MESSAGE_TYPE_ACKNOWLEDGE_IND");
-                }
-                AcknowledgeInd acknowledgeInd =
-                    new AcknowledgeInd(mHeaders);
-                return acknowledgeInd;
-            case PduHeaders.MESSAGE_TYPE_READ_ORIG_IND:
-                if (LOCAL_LOGV) {
-                    Timber.v("parse: MESSAGE_TYPE_READ_ORIG_IND");
-                }
-                ReadOrigInd readOrigInd =
-                    new ReadOrigInd(mHeaders);
-                return readOrigInd;
-            case PduHeaders.MESSAGE_TYPE_READ_REC_IND:
-                if (LOCAL_LOGV) {
-                    Timber.v("parse: MESSAGE_TYPE_READ_REC_IND");
-                }
-                ReadRecInd readRecInd =
-                    new ReadRecInd(mHeaders);
-                return readRecInd;
-            default:
-                log("Parser doesn't support this message type in this version!");
-            return null;
-        }
-    }
-
-    /**
-     * Parse pdu headers.
-     *
-     * @param pduDataStream pdu data input stream
-     * @return headers in PduHeaders structure, null when parse fail
-     */
-    protected PduHeaders parseHeaders(ByteArrayInputStream pduDataStream){
-        if (pduDataStream == null) {
-            return null;
-        }
-        boolean keepParsing = true;
-        PduHeaders headers = new PduHeaders();
-
-        while (keepParsing && (pduDataStream.available() > 0)) {
-            pduDataStream.mark(1);
-            int headerField = extractByteValue(pduDataStream);
-            /* parse custom text header */
-            if ((headerField >= TEXT_MIN) && (headerField <= TEXT_MAX)) {
-                pduDataStream.reset();
-                byte [] bVal = parseWapString(pduDataStream, TYPE_TEXT_STRING);
-                if (LOCAL_LOGV) {
-                    Timber.v("TextHeader: " + new String(bVal));
-                }
-                /* we should ignore it at the moment */
-                continue;
-            }
-            switch (headerField) {
-                case PduHeaders.MESSAGE_TYPE:
-                {
-                    int messageType = extractByteValue(pduDataStream);
-                    if (LOCAL_LOGV) {
-                        Timber.v("parseHeaders: messageType: " + messageType);
-                    }
-                    switch (messageType) {
-                        // We don't support these kind of messages now.
-                        case PduHeaders.MESSAGE_TYPE_FORWARD_REQ:
-                        case PduHeaders.MESSAGE_TYPE_FORWARD_CONF:
-                        case PduHeaders.MESSAGE_TYPE_MBOX_STORE_REQ:
-                        case PduHeaders.MESSAGE_TYPE_MBOX_STORE_CONF:
-                        case PduHeaders.MESSAGE_TYPE_MBOX_VIEW_REQ:
-                        case PduHeaders.MESSAGE_TYPE_MBOX_VIEW_CONF:
-                        case PduHeaders.MESSAGE_TYPE_MBOX_UPLOAD_REQ:
-                        case PduHeaders.MESSAGE_TYPE_MBOX_UPLOAD_CONF:
-                        case PduHeaders.MESSAGE_TYPE_MBOX_DELETE_REQ:
-                        case PduHeaders.MESSAGE_TYPE_MBOX_DELETE_CONF:
-                        case PduHeaders.MESSAGE_TYPE_MBOX_DESCR:
-                        case PduHeaders.MESSAGE_TYPE_DELETE_REQ:
-                        case PduHeaders.MESSAGE_TYPE_DELETE_CONF:
-                        case PduHeaders.MESSAGE_TYPE_CANCEL_REQ:
-                        case PduHeaders.MESSAGE_TYPE_CANCEL_CONF:
-                            return null;
-                    }
-                    try {
-                        headers.setOctet(messageType, headerField);
-                    } catch(InvalidHeaderValueException e) {
-                        log("Set invalid Octet value: " + messageType +
-                                " into the header filed: " + headerField);
-                        return null;
-                    } catch(RuntimeException e) {
-                        log(headerField + "is not Octet header field!");
-                        return null;
-                    }
-                    break;
-                }
-                /* Octect value */
-                case PduHeaders.REPORT_ALLOWED:
-                case PduHeaders.ADAPTATION_ALLOWED:
-                case PduHeaders.DELIVERY_REPORT:
-                case PduHeaders.DRM_CONTENT:
-                case PduHeaders.DISTRIBUTION_INDICATOR:
-                case PduHeaders.QUOTAS:
-                case PduHeaders.READ_REPORT:
-                case PduHeaders.STORE:
-                case PduHeaders.STORED:
-                case PduHeaders.TOTALS:
-                case PduHeaders.SENDER_VISIBILITY:
-                case PduHeaders.READ_STATUS:
-                case PduHeaders.CANCEL_STATUS:
-                case PduHeaders.PRIORITY:
-                case PduHeaders.STATUS:
-                case PduHeaders.REPLY_CHARGING:
-                case PduHeaders.MM_STATE:
-                case PduHeaders.RECOMMENDED_RETRIEVAL_MODE:
-                case PduHeaders.CONTENT_CLASS:
-                case PduHeaders.RETRIEVE_STATUS:
-                case PduHeaders.STORE_STATUS:
-                    /**
-                     * The following field has a different value when
-                     * used in the M-Mbox-Delete.conf and M-Delete.conf PDU.
-                     * For now we ignore this fact, since we do not support these PDUs
-                     */
-                case PduHeaders.RESPONSE_STATUS:
-                {
-                    int value = extractByteValue(pduDataStream);
-                    if (LOCAL_LOGV) {
-                        Timber.v("parseHeaders: byte: " + headerField + " value: " + value);
-                    }
-
-                    try {
-                        headers.setOctet(value, headerField);
-                    } catch(InvalidHeaderValueException e) {
-                        log("Set invalid Octet value: " + value +
-                                " into the header filed: " + headerField);
-                        return null;
-                    } catch(RuntimeException e) {
-                        log(headerField + "is not Octet header field!");
-                        return null;
-                    }
-                    break;
-                }
-
-                /* Long-Integer */
-                case PduHeaders.DATE:
-                case PduHeaders.REPLY_CHARGING_SIZE:
-                case PduHeaders.MESSAGE_SIZE:
-                {
-                    try {
-                        long value = parseLongInteger(pduDataStream);
-                        if (LOCAL_LOGV) {
-                            Timber.v("parseHeaders: longint: " + headerField + " value: " +
-                                    value);
-                        }
-                        headers.setLongInteger(value, headerField);
-                    } catch(RuntimeException e) {
-                        log(headerField + "is not Long-Integer header field!");
-                        return null;
-                    }
-                    break;
-                }
-
-                /* Integer-Value */
-                case PduHeaders.MESSAGE_COUNT:
-                case PduHeaders.START:
-                case PduHeaders.LIMIT:
-                {
-                    try {
-                        long value = parseIntegerValue(pduDataStream);
-                        if (LOCAL_LOGV) {
-                            Timber.v("parseHeaders: int: " + headerField + " value: " +
-                                    value);
-                        }
-                        headers.setLongInteger(value, headerField);
-                    } catch(RuntimeException e) {
-                        log(headerField + "is not Long-Integer header field!");
-                        return null;
-                    }
-                    break;
-                }
-
-                /* Text-String */
-                case PduHeaders.TRANSACTION_ID:
-                case PduHeaders.REPLY_CHARGING_ID:
-                case PduHeaders.AUX_APPLIC_ID:
-                case PduHeaders.APPLIC_ID:
-                case PduHeaders.REPLY_APPLIC_ID:
-                    /**
-                     * The next three header fields are email addresses
-                     * as defined in RFC2822,
-                     * not including the characters "<" and ">"
-                     */
-                case PduHeaders.MESSAGE_ID:
-                case PduHeaders.REPLACE_ID:
-                case PduHeaders.CANCEL_ID:
-                    /**
-                     * The following field has a different value when
-                     * used in the M-Mbox-Delete.conf and M-Delete.conf PDU.
-                     * For now we ignore this fact, since we do not support these PDUs
-                     */
-                case PduHeaders.CONTENT_LOCATION:
-                {
-                    byte[] value = parseWapString(pduDataStream, TYPE_TEXT_STRING);
-                    if (null != value) {
-                        try {
-                            if (LOCAL_LOGV) {
-                                Timber.v("parseHeaders: string: " + headerField + " value: " +
-                                        new String(value));
-                            }
-                            headers.setTextString(value, headerField);
-                        } catch(NullPointerException e) {
-                            log("null pointer error!");
-                        } catch(RuntimeException e) {
-                            log(headerField + "is not Text-String header field!");
-                            return null;
-                        }
-                    }
-                    break;
-                }
-
-                /* Encoded-string-value */
-                case PduHeaders.SUBJECT:
-                case PduHeaders.RECOMMENDED_RETRIEVAL_MODE_TEXT:
-                case PduHeaders.RETRIEVE_TEXT:
-                case PduHeaders.STATUS_TEXT:
-                case PduHeaders.STORE_STATUS_TEXT:
-                    /* the next one is not support
-                     * M-Mbox-Delete.conf and M-Delete.conf now */
-                case PduHeaders.RESPONSE_TEXT:
-                {
-                    EncodedStringValue value =
-                        parseEncodedStringValue(pduDataStream);
-                    if (null != value) {
-                        try {
-                            if (LOCAL_LOGV) {
-                                Timber.v("parseHeaders: encoded string: " + headerField
-                                        + " value: " + value.getString());
-                            }
-                            headers.setEncodedStringValue(value, headerField);
-                        } catch(NullPointerException e) {
-                            log("null pointer error!");
-                        } catch (RuntimeException e) {
-                            log(headerField + "is not Encoded-String-Value header field!");
-                            return null;
-                        }
-                    }
-                    break;
-                }
-
-                /* Addressing model */
-                case PduHeaders.BCC:
-                case PduHeaders.CC:
-                case PduHeaders.TO:
-                {
-                    EncodedStringValue value =
-                        parseEncodedStringValue(pduDataStream);
-                    if (null != value) {
-                        byte[] address = value.getTextString();
-                        if (null != address) {
-                            String str = new String(address);
-                            if (LOCAL_LOGV) {
-                                Timber.v("parseHeaders: (to/cc/bcc) address: " + headerField
-                                        + " value: " + str);
-                            }
-                            int endIndex = str.indexOf("/");
-                            if (endIndex > 0) {
-                                str = str.substring(0, endIndex);
-                            }
-                            try {
-                                value.setTextString(str.getBytes());
-                            } catch(NullPointerException e) {
-                                log("null pointer error!");
-                                return null;
-                            }
-                        }
-
-                        try {
-                            headers.appendEncodedStringValue(value, headerField);
-                        } catch(NullPointerException e) {
-                            log("null pointer error!");
-                        } catch(RuntimeException e) {
-                            log(headerField + "is not Encoded-String-Value header field!");
-                            return null;
-                        }
-                    }
-                    break;
-                }
-
-                /* Value-length
-                 * (Absolute-token Date-value | Relative-token Delta-seconds-value) */
-                case PduHeaders.DELIVERY_TIME:
-                case PduHeaders.EXPIRY:
-                case PduHeaders.REPLY_CHARGING_DEADLINE:
-                {
-                    /* parse Value-length */
-                    parseValueLength(pduDataStream);
-
-                    /* Absolute-token or Relative-token */
-                    int token = extractByteValue(pduDataStream);
-
-                    /* Date-value or Delta-seconds-value */
-                    long timeValue;
-                    try {
-                        timeValue = parseLongInteger(pduDataStream);
-                    } catch(RuntimeException e) {
-                        log(headerField + "is not Long-Integer header field!");
-                        return null;
-                    }
-                    if (PduHeaders.VALUE_RELATIVE_TOKEN == token) {
-                        /* need to convert the Delta-seconds-value
-                         * into Date-value */
-                        timeValue = System.currentTimeMillis()/1000 + timeValue;
-                    }
-
-                    try {
-                        if (LOCAL_LOGV) {
-                            Timber.v("parseHeaders: time value: " + headerField
-                                    + " value: " + timeValue);
-                        }
-                        headers.setLongInteger(timeValue, headerField);
-                    } catch(RuntimeException e) {
-                        log(headerField + "is not Long-Integer header field!");
-                        return null;
-                    }
-                    break;
-                }
-
-                case PduHeaders.FROM: {
-                    /* From-value =
-                     * Value-length
-                     * (Address-present-token Encoded-string-value | Insert-address-token)
-                     */
-                    EncodedStringValue from = null;
-                    parseValueLength(pduDataStream); /* parse value-length */
-
-                    /* Address-present-token or Insert-address-token */
-                    int fromToken = extractByteValue(pduDataStream);
-
-                    /* Address-present-token or Insert-address-token */
-                    if (PduHeaders.FROM_ADDRESS_PRESENT_TOKEN == fromToken) {
-                        /* Encoded-string-value */
-                        from = parseEncodedStringValue(pduDataStream);
-                        if (null != from) {
-                            byte[] address = from.getTextString();
-                            if (null != address) {
-                                String str = new String(address);
-                                int endIndex = str.indexOf("/");
-                                if (endIndex > 0) {
-                                    str = str.substring(0, endIndex);
-                                }
-                                try {
-                                    from.setTextString(str.getBytes());
-                                } catch(NullPointerException e) {
-                                    log("null pointer error!");
-                                    return null;
-                                }
-                            }
-                        }
-                    } else {
-                        try {
-                            from = new EncodedStringValue(
-                                    PduHeaders.FROM_INSERT_ADDRESS_TOKEN_STR.getBytes());
-                        } catch(NullPointerException e) {
-                            log(headerField + "is not Encoded-String-Value header field!");
-                            return null;
-                        }
-                    }
-
-                    try {
-                        if (LOCAL_LOGV) {
-                            Timber.v("parseHeaders: from address: " + headerField
-                                    + " value: " + from.getString());
-                        }
-                        headers.setEncodedStringValue(from, PduHeaders.FROM);
-                    } catch(NullPointerException e) {
-                        log("null pointer error!");
-                    } catch(RuntimeException e) {
-                        log(headerField + "is not Encoded-String-Value header field!");
-                        return null;
-                    }
-                    break;
-                }
-
-                case PduHeaders.MESSAGE_CLASS: {
-                    /* Message-class-value = Class-identifier | Token-text */
-                    pduDataStream.mark(1);
-                    int messageClass = extractByteValue(pduDataStream);
-                    if (LOCAL_LOGV) {
-                        Timber.v("parseHeaders: MESSAGE_CLASS: " + headerField
-                                + " value: " + messageClass);
-                    }
-
-                    if (messageClass >= PduHeaders.MESSAGE_CLASS_PERSONAL) {
-                        /* Class-identifier */
-                        try {
-                            if (PduHeaders.MESSAGE_CLASS_PERSONAL == messageClass) {
-                                headers.setTextString(
-                                        PduHeaders.MESSAGE_CLASS_PERSONAL_STR.getBytes(),
-                                        PduHeaders.MESSAGE_CLASS);
-                            } else if (PduHeaders.MESSAGE_CLASS_ADVERTISEMENT == messageClass) {
-                                headers.setTextString(
-                                        PduHeaders.MESSAGE_CLASS_ADVERTISEMENT_STR.getBytes(),
-                                        PduHeaders.MESSAGE_CLASS);
-                            } else if (PduHeaders.MESSAGE_CLASS_INFORMATIONAL == messageClass) {
-                                headers.setTextString(
-                                        PduHeaders.MESSAGE_CLASS_INFORMATIONAL_STR.getBytes(),
-                                        PduHeaders.MESSAGE_CLASS);
-                            } else if (PduHeaders.MESSAGE_CLASS_AUTO == messageClass) {
-                                headers.setTextString(
-                                        PduHeaders.MESSAGE_CLASS_AUTO_STR.getBytes(),
-                                        PduHeaders.MESSAGE_CLASS);
-                            }
-                        } catch(NullPointerException e) {
-                            log("null pointer error!");
-                        } catch(RuntimeException e) {
-                            log(headerField + "is not Text-String header field!");
-                            return null;
-                        }
-                    } else {
-                        /* Token-text */
-                        pduDataStream.reset();
-                        byte[] messageClassString = parseWapString(pduDataStream, TYPE_TEXT_STRING);
-                        if (null != messageClassString) {
-                            try {
-                                headers.setTextString(messageClassString, PduHeaders.MESSAGE_CLASS);
-                            } catch(NullPointerException e) {
-                                log("null pointer error!");
-                            } catch(RuntimeException e) {
-                                log(headerField + "is not Text-String header field!");
-                                return null;
-                            }
-                        }
-                    }
-                    break;
-                }
-
-                case PduHeaders.MMS_VERSION: {
-                    int version = parseShortInteger(pduDataStream);
-
-                    try {
-                        if (LOCAL_LOGV) {
-                            Timber.v("parseHeaders: MMS_VERSION: " + headerField
-                                    + " value: " + version);
-                        }
-                        headers.setOctet(version, PduHeaders.MMS_VERSION);
-                    } catch(InvalidHeaderValueException e) {
-                        log("Set invalid Octet value: " + version +
-                                " into the header filed: " + headerField);
-                        return null;
-                    } catch(RuntimeException e) {
-                        log(headerField + "is not Octet header field!");
-                        return null;
-                    }
-                    break;
-                }
-
-                case PduHeaders.PREVIOUSLY_SENT_BY: {
-                    /* Previously-sent-by-value =
-                     * Value-length Forwarded-count-value Encoded-string-value */
-                    /* parse value-length */
-                    parseValueLength(pduDataStream);
-
-                    /* parse Forwarded-count-value */
-                    try {
-                        parseIntegerValue(pduDataStream);
-                    } catch(RuntimeException e) {
-                        log(headerField + " is not Integer-Value");
-                        return null;
-                    }
-
-                    /* parse Encoded-string-value */
-                    EncodedStringValue previouslySentBy =
-                        parseEncodedStringValue(pduDataStream);
-                    if (null != previouslySentBy) {
-                        try {
-                            if (LOCAL_LOGV) {
-                                Timber.v("parseHeaders: PREVIOUSLY_SENT_BY: " + headerField
-                                        + " value: " + previouslySentBy.getString());
-                            }
-                            headers.setEncodedStringValue(previouslySentBy,
-                                    PduHeaders.PREVIOUSLY_SENT_BY);
-                        } catch(NullPointerException e) {
-                            log("null pointer error!");
-                        } catch(RuntimeException e) {
-                            log(headerField + "is not Encoded-String-Value header field!");
-                            return null;
-                        }
-                    }
-                    break;
-                }
-
-                case PduHeaders.PREVIOUSLY_SENT_DATE: {
-                    /* Previously-sent-date-value =
-                     * Value-length Forwarded-count-value Date-value */
-                    /* parse value-length */
-                    parseValueLength(pduDataStream);
-
-                    /* parse Forwarded-count-value */
-                    try {
-                        parseIntegerValue(pduDataStream);
-                    } catch(RuntimeException e) {
-                        log(headerField + " is not Integer-Value");
-                        return null;
-                    }
-
-                    /* Date-value */
-                    try {
-                        long perviouslySentDate = parseLongInteger(pduDataStream);
-                        if (LOCAL_LOGV) {
-                            Timber.v("parseHeaders: PREVIOUSLY_SENT_DATE: " + headerField
-                                    + " value: " + perviouslySentDate);
-                        }
-                        headers.setLongInteger(perviouslySentDate,
-                                PduHeaders.PREVIOUSLY_SENT_DATE);
-                    } catch(RuntimeException e) {
-                        log(headerField + "is not Long-Integer header field!");
-                        return null;
-                    }
-                    break;
-                }
-
-                case PduHeaders.MM_FLAGS: {
-                    /* MM-flags-value =
-                     * Value-length
-                     * ( Add-token | Remove-token | Filter-token )
-                     * Encoded-string-value
-                     */
-                    if (LOCAL_LOGV) {
-                        Timber.v("parseHeaders: MM_FLAGS: " + headerField
-                                + " NOT REALLY SUPPORTED");
-                    }
-
-                    /* parse Value-length */
-                    parseValueLength(pduDataStream);
-
-                    /* Add-token | Remove-token | Filter-token */
-                    extractByteValue(pduDataStream);
-
-                    /* Encoded-string-value */
-                    parseEncodedStringValue(pduDataStream);
-
-                    /* not store this header filed in "headers",
-                     * because now PduHeaders doesn't support it */
-                    break;
-                }
-
-                /* Value-length
-                 * (Message-total-token | Size-total-token) Integer-Value */
-                case PduHeaders.MBOX_TOTALS:
-                case PduHeaders.MBOX_QUOTAS:
-                {
-                    if (LOCAL_LOGV) {
-                        Timber.v("parseHeaders: MBOX_TOTALS: " + headerField);
-                    }
-                    /* Value-length */
-                    parseValueLength(pduDataStream);
-
-                    /* Message-total-token | Size-total-token */
-                    extractByteValue(pduDataStream);
-
-                    /*Integer-Value*/
-                    try {
-                        parseIntegerValue(pduDataStream);
-                    } catch(RuntimeException e) {
-                        log(headerField + " is not Integer-Value");
-                        return null;
-                    }
-
-                    /* not store these headers filed in "headers",
-                    because now PduHeaders doesn't support them */
-                    break;
-                }
-
-                case PduHeaders.ELEMENT_DESCRIPTOR: {
-                    if (LOCAL_LOGV) {
-                        Timber.v("parseHeaders: ELEMENT_DESCRIPTOR: " + headerField);
-                    }
-                    parseContentType(pduDataStream, null);
-
-                    /* not store this header filed in "headers",
-                    because now PduHeaders doesn't support it */
-                    break;
-                }
-
-                case PduHeaders.CONTENT_TYPE: {
-                    HashMap<Integer, Object> map =
-                        new HashMap<Integer, Object>();
-                    byte[] contentType =
-                        parseContentType(pduDataStream, map);
-
-                    if (null != contentType) {
-                        try {
-                            if (LOCAL_LOGV) {
-                                Timber.v("parseHeaders: CONTENT_TYPE: " + headerField + contentType.toString());
-                            }
-                            headers.setTextString(contentType, PduHeaders.CONTENT_TYPE);
-                        } catch(NullPointerException e) {
-                            log("null pointer error!");
-                        } catch(RuntimeException e) {
-                            log(headerField + "is not Text-String header field!");
-                            return null;
-                        }
-                    }
-
-                    /* get start parameter */
-                    mStartParam = (byte[]) map.get(PduPart.P_START);
-
-                    /* get charset parameter */
-                    mTypeParam= (byte[]) map.get(PduPart.P_TYPE);
-
-                    keepParsing = false;
-                    break;
-                }
-
-                case PduHeaders.CONTENT:
-                case PduHeaders.ADDITIONAL_HEADERS:
-                case PduHeaders.ATTRIBUTES:
-                default: {
-                    if (LOCAL_LOGV) {
-                        Timber.v("parseHeaders: Unknown header: " + headerField);
-                    }
-                    log("Unknown header");
-                }
-            }
-        }
-
-        return headers;
-    }
-
-    /**
-     * Parse pdu parts.
-     *
-     * @param pduDataStream pdu data input stream
-     * @return parts in PduBody structure
-     */
-    protected PduBody parseParts(ByteArrayInputStream pduDataStream) {
-        if (pduDataStream == null) {
-            return null;
-        }
-
-        int count = parseUnsignedInt(pduDataStream); // get the number of parts
-        PduBody body = new PduBody();
-
-        for (int i = 0 ; i < count ; i++) {
-            int headerLength = parseUnsignedInt(pduDataStream);
-            int dataLength = parseUnsignedInt(pduDataStream);
-            PduPart part = new PduPart();
-            int startPos = pduDataStream.available();
-            if (startPos <= 0) {
-                // Invalid part.
-                return null;
-            }
-
-            /* parse part's content-type */
-            HashMap<Integer, Object> map = new HashMap<Integer, Object>();
-            byte[] contentType = parseContentType(pduDataStream, map);
-            if (null != contentType) {
-                part.setContentType(contentType);
-            } else {
-                part.setContentType((PduContentTypes.contentTypes[0]).getBytes()); //"*/*"
-            }
-
-            /* get name parameter */
-            byte[] name = (byte[]) map.get(PduPart.P_NAME);
-            if (null != name) {
-                part.setName(name);
-            }
-
-            /* get charset parameter */
-            Integer charset = (Integer) map.get(PduPart.P_CHARSET);
-            if (null != charset) {
-                part.setCharset(charset);
-            }
-
-            /* parse part's headers */
-            int endPos = pduDataStream.available();
-            int partHeaderLen = headerLength - (startPos - endPos);
-            if (partHeaderLen > 0) {
-                if (false == parsePartHeaders(pduDataStream, part, partHeaderLen)) {
-                    // Parse part header faild.
-                    return null;
-                }
-            } else if (partHeaderLen < 0) {
-                // Invalid length of content-type.
-                return null;
-            }
-
-            /* FIXME: check content-id, name, filename and content location,
-             * if not set anyone of them, generate a default content-location
-             */
-            if ((null == part.getContentLocation())
-                    && (null == part.getName())
-                    && (null == part.getFilename())
-                    && (null == part.getContentId())) {
-                part.setContentLocation(Long.toOctalString(
-                        System.currentTimeMillis()).getBytes());
-            }
-
-            /* get part's data */
-            if (dataLength > 0) {
-                byte[] partData = new byte[dataLength];
-                String partContentType = new String(part.getContentType());
-                pduDataStream.read(partData, 0, dataLength);
-                if (partContentType.equalsIgnoreCase(ContentType.MULTIPART_ALTERNATIVE)) {
-                    // parse "multipart/vnd.wap.multipart.alternative".
-                    PduBody childBody = parseParts(new ByteArrayInputStream(partData));
-                    // take the first part of children.
-                    part = childBody.getPart(0);
-                } else {
-                    // Check Content-Transfer-Encoding.
-                    byte[] partDataEncoding = part.getContentTransferEncoding();
-                    if (null != partDataEncoding) {
-                        String encoding = new String(partDataEncoding);
-                        if (encoding.equalsIgnoreCase(PduPart.P_BASE64)) {
-                            // Decode "base64" into "binary".
-                            partData = Base64.decodeBase64(partData);
-                        } else if (encoding.equalsIgnoreCase(PduPart.P_QUOTED_PRINTABLE)) {
-                            // Decode "quoted-printable" into "binary".
-                            partData = QuotedPrintable.decodeQuotedPrintable(partData);
-                        } else {
-                            // "binary" is the default encoding.
-                        }
-                    }
-                    if (null == partData) {
-                        log("Decode part data error!");
-                        return null;
-                    }
-                    part.setData(partData);
-                }
-            }
-
-            /* add this part to body */
-            if (THE_FIRST_PART == checkPartPosition(part)) {
-                /* this is the first part */
-                body.addPart(0, part);
-            } else {
-                /* add the part to the end */
-                body.addPart(part);
-            }
-        }
-
-        return body;
-    }
-
-    /**
-     * Log status.
-     *
-     * @param text log information
-     */
-    private static void log(String text) {
-        if (LOCAL_LOGV) {
-            Timber.v(text);
-        }
-    }
-
-    /**
-     * Parse unsigned integer.
-     *
-     * @param pduDataStream pdu data input stream
-     * @return the integer, -1 when failed
-     */
-    protected static int parseUnsignedInt(ByteArrayInputStream pduDataStream) {
-        /**
-         * From wap-230-wsp-20010705-a.pdf
-         * The maximum size of a uintvar is 32 bits.
-         * So it will be encoded in no more than 5 octets.
-         */
-        assert(null != pduDataStream);
-        int result = 0;
-        int temp = pduDataStream.read();
-        if (temp == -1) {
-            return temp;
-        }
-
-        while((temp & 0x80) != 0) {
-            result = result << 7;
-            result |= temp & 0x7F;
-            temp = pduDataStream.read();
-            if (temp == -1) {
-                return temp;
-            }
-        }
-
-        result = result << 7;
-        result |= temp & 0x7F;
-
-        return result;
-    }
-
-    /**
-     * Parse value length.
-     *
-     * @param pduDataStream pdu data input stream
-     * @return the integer
-     */
-    protected static int parseValueLength(ByteArrayInputStream pduDataStream) {
-        /**
-         * From wap-230-wsp-20010705-a.pdf
-         * Value-length = Short-length | (Length-quote Length)
-         * Short-length = <Any octet 0-30>
-         * Length-quote = <Octet 31>
-         * Length = Uintvar-integer
-         * Uintvar-integer = 1*5 OCTET
-         */
-        assert(null != pduDataStream);
-        int temp = pduDataStream.read();
-        assert(-1 != temp);
-        int first = temp & 0xFF;
-
-        if (first <= SHORT_LENGTH_MAX) {
-            return first;
-        } else if (first == LENGTH_QUOTE) {
-            return parseUnsignedInt(pduDataStream);
-        }
-
-        throw new RuntimeException ("Value length > LENGTH_QUOTE!");
-    }
-
-    /**
-     * Parse encoded string value.
-     *
-     * @param pduDataStream pdu data input stream
-     * @return the EncodedStringValue
-     */
-    protected static EncodedStringValue parseEncodedStringValue(ByteArrayInputStream pduDataStream){
-        /**
-         * From OMA-TS-MMS-ENC-V1_3-20050927-C.pdf
-         * Encoded-string-value = Text-string | Value-length Char-set Text-string
-         */
-        assert(null != pduDataStream);
-        pduDataStream.mark(1);
-        EncodedStringValue returnValue = null;
-        int charset = 0;
-        int temp = pduDataStream.read();
-        assert(-1 != temp);
-        int first = temp & 0xFF;
-        if (first == 0) {
-            return new EncodedStringValue("");
-        }
-
-        pduDataStream.reset();
-        if (first < TEXT_MIN) {
-            parseValueLength(pduDataStream);
-
-            charset = parseShortInteger(pduDataStream); //get the "Charset"
-        }
-
-        byte[] textString = parseWapString(pduDataStream, TYPE_TEXT_STRING);
-
-        try {
-            if (0 != charset) {
-                returnValue = new EncodedStringValue(charset, textString);
-            } else {
-                returnValue = new EncodedStringValue(textString);
-            }
-        } catch(Exception e) {
-            return null;
-        }
-
-        return returnValue;
-    }
-
-    /**
-     * Parse Text-String or Quoted-String.
-     *
-     * @param pduDataStream pdu data input stream
-     * @param stringType TYPE_TEXT_STRING or TYPE_QUOTED_STRING
-     * @return the string without End-of-string in byte array
-     */
-    protected static byte[] parseWapString(ByteArrayInputStream pduDataStream,
-            int stringType) {
-        assert(null != pduDataStream);
-        /**
-         * From wap-230-wsp-20010705-a.pdf
-         * Text-string = [Quote] *TEXT End-of-string
-         * If the first character in the TEXT is in the range of 128-255,
-         * a Quote character must precede it.
-         * Otherwise the Quote character must be omitted.
-         * The Quote is not part of the contents.
-         * Quote = <Octet 127>
-         * End-of-string = <Octet 0>
-         *
-         * Quoted-string = <Octet 34> *TEXT End-of-string
-         *
-         * Token-text = Token End-of-string
-         */
-
-        // Mark supposed beginning of Text-string
-        // We will have to mark again if first char is QUOTE or QUOTED_STRING_FLAG
-        pduDataStream.mark(1);
-
-        // Check first char
-        int temp = pduDataStream.read();
-        assert(-1 != temp);
-        if ((TYPE_QUOTED_STRING == stringType) &&
-                (QUOTED_STRING_FLAG == temp)) {
-            // Mark again if QUOTED_STRING_FLAG and ignore it
-            pduDataStream.mark(1);
-        } else if ((TYPE_TEXT_STRING == stringType) &&
-                (QUOTE == temp)) {
-            // Mark again if QUOTE and ignore it
-            pduDataStream.mark(1);
-        } else {
-            // Otherwise go back to origin
-            pduDataStream.reset();
-        }
-
-        // We are now definitely at the beginning of string
-        /**
-         * Return *TOKEN or *TEXT (Text-String without QUOTE,
-         * Quoted-String without QUOTED_STRING_FLAG and without End-of-string)
-         */
-        return getWapString(pduDataStream, stringType);
-    }
-
-    /**
-     * Check TOKEN data defined in RFC2616.
-     * @param ch checking data
-     * @return true when ch is TOKEN, false when ch is not TOKEN
-     */
-    protected static boolean isTokenCharacter(int ch) {
-        /**
-         * Token      = 1*<any CHAR except CTLs or separators>
-         * separators = "("(40) | ")"(41) | "<"(60) | ">"(62) | "@"(64)
-         *            | ","(44) | ";"(59) | ":"(58) | "\"(92) | <">(34)
-         *            | "/"(47) | "["(91) | "]"(93) | "?"(63) | "="(61)
-         *            | "{"(123) | "}"(125) | SP(32) | HT(9)
-         * CHAR       = <any US-ASCII character (octets 0 - 127)>
-         * CTL        = <any US-ASCII control character
-         *            (octets 0 - 31) and DEL (127)>
-         * SP         = <US-ASCII SP, space (32)>
-         * HT         = <US-ASCII HT, horizontal-tab (9)>
-         */
-        if((ch < 33) || (ch > 126)) {
-            return false;
-        }
-
-        switch(ch) {
-            case '"': /* '"' */
-            case '(': /* '(' */
-            case ')': /* ')' */
-            case ',': /* ',' */
-            case '/': /* '/' */
-            case ':': /* ':' */
-            case ';': /* ';' */
-            case '<': /* '<' */
-            case '=': /* '=' */
-            case '>': /* '>' */
-            case '?': /* '?' */
-            case '@': /* '@' */
-            case '[': /* '[' */
-            case '\\': /* '\' */
-            case ']': /* ']' */
-            case '{': /* '{' */
-            case '}': /* '}' */
-                return false;
-        }
-
-        return true;
-    }
-
-    /**
-     * Check TEXT data defined in RFC2616.
-     * @param ch checking data
-     * @return true when ch is TEXT, false when ch is not TEXT
-     */
-    protected static boolean isText(int ch) {
-        /**
-         * TEXT = <any OCTET except CTLs,
-         *      but including LWS>
-         * CTL  = <any US-ASCII control character
-         *      (octets 0 - 31) and DEL (127)>
-         * LWS  = [CRLF] 1*( SP | HT )
-         * CRLF = CR LF
-         * CR   = <US-ASCII CR, carriage return (13)>
-         * LF   = <US-ASCII LF, linefeed (10)>
-         */
-        if(((ch >= 32) && (ch <= 126)) || ((ch >= 128) && (ch <= 255))) {
-            return true;
-        }
-
-        switch(ch) {
-            case '\t': /* '\t' */
-            case '\n': /* '\n' */
-            case '\r': /* '\r' */
-                return true;
-        }
-
-        return false;
-    }
-
-    protected static byte[] getWapString(ByteArrayInputStream pduDataStream,
-            int stringType) {
-        assert(null != pduDataStream);
-        ByteArrayOutputStream out = new ByteArrayOutputStream();
-        int temp = pduDataStream.read();
-        assert(-1 != temp);
-        while((-1 != temp) && ('\0' != temp)) {
-            // check each of the character
-            if (stringType == TYPE_TOKEN_STRING) {
-                if (isTokenCharacter(temp)) {
-                    out.write(temp);
-                }
-            } else {
-                if (isText(temp)) {
-                    out.write(temp);
-                }
-            }
-
-            temp = pduDataStream.read();
-            assert(-1 != temp);
-        }
-
-        if (out.size() > 0) {
-            return out.toByteArray();
-        }
-
-        return null;
-    }
-
-    /**
-     * Extract a byte value from the input stream.
-     *
-     * @param pduDataStream pdu data input stream
-     * @return the byte
-     */
-    protected static int extractByteValue(ByteArrayInputStream pduDataStream) {
-        assert(null != pduDataStream);
-        int temp = pduDataStream.read();
-        assert(-1 != temp);
-        return temp & 0xFF;
-    }
-
-    /**
-     * Parse Short-Integer.
-     *
-     * @param pduDataStream pdu data input stream
-     * @return the byte
-     */
-    protected static int parseShortInteger(ByteArrayInputStream pduDataStream) {
-        /**
-         * From wap-230-wsp-20010705-a.pdf
-         * Short-integer = OCTET
-         * Integers in range 0-127 shall be encoded as a one
-         * octet value with the most significant bit set to one (1xxx xxxx)
-         * and with the value in the remaining least significant bits.
-         */
-        assert(null != pduDataStream);
-        int temp = pduDataStream.read();
-        assert(-1 != temp);
-        return temp & 0x7F;
-    }
-
-    /**
-     * Parse Long-Integer.
-     *
-     * @param pduDataStream pdu data input stream
-     * @return long integer
-     */
-    protected static long parseLongInteger(ByteArrayInputStream pduDataStream) {
-        /**
-         * From wap-230-wsp-20010705-a.pdf
-         * Long-integer = Short-length Multi-octet-integer
-         * The Short-length indicates the length of the Multi-octet-integer
-         * Multi-octet-integer = 1*30 OCTET
-         * The content octets shall be an unsigned integer value
-         * with the most significant octet encoded first (big-endian representation).
-         * The minimum number of octets must be used to encode the value.
-         * Short-length = <Any octet 0-30>
-         */
-        assert(null != pduDataStream);
-        int temp = pduDataStream.read();
-        assert(-1 != temp);
-        int count = temp & 0xFF;
-
-        if (count > LONG_INTEGER_LENGTH_MAX) {
-            throw new RuntimeException("Octet count greater than 8 and I can't represent that!");
-        }
-
-        long result = 0;
-
-        for (int i = 0 ; i < count ; i++) {
-            temp = pduDataStream.read();
-            assert(-1 != temp);
-            result <<= 8;
-            result += (temp & 0xFF);
-        }
-
-        return result;
-    }
-
-    /**
-     * Parse Integer-Value.
-     *
-     * @param pduDataStream pdu data input stream
-     * @return long integer
-     */
-    protected static long parseIntegerValue(ByteArrayInputStream pduDataStream) {
-        /**
-         * From wap-230-wsp-20010705-a.pdf
-         * Integer-Value = Short-integer | Long-integer
-         */
-        assert(null != pduDataStream);
-        pduDataStream.mark(1);
-        int temp = pduDataStream.read();
-        assert(-1 != temp);
-        pduDataStream.reset();
-        if (temp > SHORT_INTEGER_MAX) {
-            return parseShortInteger(pduDataStream);
-        } else {
-            return parseLongInteger(pduDataStream);
-        }
-    }
-
-    /**
-     * To skip length of the wap value.
-     *
-     * @param pduDataStream pdu data input stream
-     * @param length area size
-     * @return the values in this area
-     */
-    protected static int skipWapValue(ByteArrayInputStream pduDataStream, int length) {
-        assert(null != pduDataStream);
-        byte[] area = new byte[length];
-        int readLen = pduDataStream.read(area, 0, length);
-        if (readLen < length) { //The actually read length is lower than the length
-            return -1;
-        } else {
-            return readLen;
-        }
-    }
-
-    /**
-     * Parse content type parameters. For now we just support
-     * four parameters used in mms: "type", "start", "name", "charset".
-     *
-     * @param pduDataStream pdu data input stream
-     * @param map to store parameters of Content-Type field
-     * @param length length of all the parameters
-     */
-    protected static void parseContentTypeParams(ByteArrayInputStream pduDataStream,
-            HashMap<Integer, Object> map, Integer length) {
-        /**
-         * From wap-230-wsp-20010705-a.pdf
-         * Parameter = Typed-parameter | Untyped-parameter
-         * Typed-parameter = Well-known-parameter-token Typed-value
-         * the actual expected type of the value is implied by the well-known parameter
-         * Well-known-parameter-token = Integer-value
-         * the code values used for parameters are specified in the Assigned Numbers appendix
-         * Typed-value = Compact-value | Text-value
-         * In addition to the expected type, there may be no value.
-         * If the value cannot be encoded using the expected type, it shall be encoded as text.
-         * Compact-value = Integer-value |
-         * Date-value | Delta-seconds-value | Q-value | Version-value |
-         * Uri-value
-         * Untyped-parameter = Token-text Untyped-value
-         * the type of the value is unknown, but it shall be encoded as an integer,
-         * if that is possible.
-         * Untyped-value = Integer-value | Text-value
-         */
-        assert(null != pduDataStream);
-        assert(length > 0);
-
-        int startPos = pduDataStream.available();
-        int tempPos = 0;
-        int lastLen = length;
-        while(0 < lastLen) {
-            int param = pduDataStream.read();
-            assert(-1 != param);
-            lastLen--;
-
-            switch (param) {
-                /**
-                 * From rfc2387, chapter 3.1
-                 * The type parameter must be specified and its value is the MIME media
-                 * type of the "root" body part. It permits a MIME user agent to
-                 * determine the content-type without reference to the enclosed body
-                 * part. If the value of the type parameter and the root body part's
-                 * content-type differ then the User Agent's behavior is undefined.
-                 *
-                 * From wap-230-wsp-20010705-a.pdf
-                 * type = Constrained-encoding
-                 * Constrained-encoding = Extension-Media | Short-integer
-                 * Extension-media = *TEXT End-of-string
-                 */
-                case PduPart.P_TYPE:
-                case PduPart.P_CT_MR_TYPE:
-                    pduDataStream.mark(1);
-                    int first = extractByteValue(pduDataStream);
-                    pduDataStream.reset();
-                    if (first > TEXT_MAX) {
-                        // Short-integer (well-known type)
-                        int index = parseShortInteger(pduDataStream);
-
-                        if (index < PduContentTypes.contentTypes.length) {
-                            byte[] type = (PduContentTypes.contentTypes[index]).getBytes();
-                            map.put(PduPart.P_TYPE, type);
-                        } else {
-                            //not support this type, ignore it.
-                        }
-                    } else {
-                        // Text-String (extension-media)
-                        byte[] type = parseWapString(pduDataStream, TYPE_TEXT_STRING);
-                        if ((null != type) && (null != map)) {
-                            map.put(PduPart.P_TYPE, type);
-                        }
-                    }
-
-                    tempPos = pduDataStream.available();
-                    lastLen = length - (startPos - tempPos);
-                    break;
-
-                    /**
-                     * From oma-ts-mms-conf-v1_3.pdf, chapter 10.2.3.
-                     * Start Parameter Referring to Presentation
-                     *
-                     * From rfc2387, chapter 3.2
-                     * The start parameter, if given, is the content-ID of the compound
-                     * object's "root". If not present the "root" is the first body part in
-                     * the Multipart/Related entity. The "root" is the element the
-                     * applications processes first.
-                     *
-                     * From wap-230-wsp-20010705-a.pdf
-                     * start = Text-String
-                     */
-                case PduPart.P_START:
-                case PduPart.P_DEP_START:
-                    byte[] start = parseWapString(pduDataStream, TYPE_TEXT_STRING);
-                    if ((null != start) && (null != map)) {
-                        map.put(PduPart.P_START, start);
-                    }
-
-                    tempPos = pduDataStream.available();
-                    lastLen = length - (startPos - tempPos);
-                    break;
-
-                    /**
-                     * From oma-ts-mms-conf-v1_3.pdf
-                     * In creation, the character set SHALL be either us-ascii
-                     * (IANA MIBenum 3) or utf-8 (IANA MIBenum 106)[Unicode].
-                     * In retrieval, both us-ascii and utf-8 SHALL be supported.
-                     *
-                     * From wap-230-wsp-20010705-a.pdf
-                     * charset = Well-known-charset|Text-String
-                     * Well-known-charset = Any-charset | Integer-value
-                     * Both are encoded using values from Character Set
-                     * Assignments table in Assigned Numbers
-                     * Any-charset = <Octet 128>
-                     * Equivalent to the special RFC2616 charset value "*"
-                     */
-                case PduPart.P_CHARSET:
-                    pduDataStream.mark(1);
-                    int firstValue = extractByteValue(pduDataStream);
-                    pduDataStream.reset();
-                    //Check first char
-                    if (((firstValue > TEXT_MIN) && (firstValue < TEXT_MAX)) ||
-                            (END_STRING_FLAG == firstValue)) {
-                        //Text-String (extension-charset)
-                        byte[] charsetStr = parseWapString(pduDataStream, TYPE_TEXT_STRING);
-                        try {
-                            int charsetInt = CharacterSets.getMibEnumValue(
-                                    new String(charsetStr));
-                            map.put(PduPart.P_CHARSET, charsetInt);
-                        } catch (UnsupportedEncodingException e) {
-                            // Not a well-known charset, use "*".
-                            Timber.e(e, Arrays.toString(charsetStr));
-                            map.put(PduPart.P_CHARSET, CharacterSets.ANY_CHARSET);
-                        }
-                    } else {
-                        //Well-known-charset
-                        int charset = (int) parseIntegerValue(pduDataStream);
-                        if (map != null) {
-                            map.put(PduPart.P_CHARSET, charset);
-                        }
-                    }
-
-                    tempPos = pduDataStream.available();
-                    lastLen = length - (startPos - tempPos);
-                    break;
-
-                    /**
-                     * From oma-ts-mms-conf-v1_3.pdf
-                     * A name for multipart object SHALL be encoded using name-parameter
-                     * for Content-Type header in WSP multipart headers.
-                     *
-                     * From wap-230-wsp-20010705-a.pdf
-                     * name = Text-String
-                     */
-                case PduPart.P_DEP_NAME:
-                case PduPart.P_NAME:
-                    byte[] name = parseWapString(pduDataStream, TYPE_TEXT_STRING);
-                    if ((null != name) && (null != map)) {
-                        map.put(PduPart.P_NAME, name);
-                    }
-
-                    tempPos = pduDataStream.available();
-                    lastLen = length - (startPos - tempPos);
-                    break;
-                default:
-                    if (LOCAL_LOGV) {
-                        Timber.v("Not supported Content-Type parameter");
-                    }
-                if (-1 == skipWapValue(pduDataStream, lastLen)) {
-                    Timber.e("Corrupt Content-Type");
-                } else {
-                    lastLen = 0;
-                }
-                break;
-            }
-        }
-
-        if (0 != lastLen) {
-            Timber.e("Corrupt Content-Type");
-        }
-    }
-
-    /**
-     * Parse content type.
-     *
-     * @param pduDataStream pdu data input stream
-     * @param map to store parameters in Content-Type header field
-     * @return Content-Type value
-     */
-    protected static byte[] parseContentType(ByteArrayInputStream pduDataStream,
-            HashMap<Integer, Object> map) {
-        /**
-         * From wap-230-wsp-20010705-a.pdf
-         * Content-type-value = Constrained-media | Content-general-form
-         * Content-general-form = Value-length Media-type
-         * Media-type = (Well-known-media | Extension-Media) *(Parameter)
-         */
-        assert(null != pduDataStream);
-
-        byte[] contentType = null;
-        pduDataStream.mark(1);
-        int temp = pduDataStream.read();
-        assert(-1 != temp);
-        pduDataStream.reset();
-
-        int cur = (temp & 0xFF);
-
-        if (cur < TEXT_MIN) {
-            int length = parseValueLength(pduDataStream);
-            int startPos = pduDataStream.available();
-            pduDataStream.mark(1);
-            temp = pduDataStream.read();
-            assert(-1 != temp);
-            pduDataStream.reset();
-            int first = (temp & 0xFF);
-
-            if ((first >= TEXT_MIN) && (first <= TEXT_MAX)) {
-                contentType = parseWapString(pduDataStream, TYPE_TEXT_STRING);
-            } else if (first > TEXT_MAX) {
-                int index = parseShortInteger(pduDataStream);
-
-                if (index < PduContentTypes.contentTypes.length) { //well-known type
-                    contentType = (PduContentTypes.contentTypes[index]).getBytes();
-                } else {
-                    pduDataStream.reset();
-                    contentType = parseWapString(pduDataStream, TYPE_TEXT_STRING);
-                }
-            } else {
-                Timber.e("Corrupt content-type");
-                return (PduContentTypes.contentTypes[0]).getBytes(); //"*/*"
-            }
-
-            int endPos = pduDataStream.available();
-            int parameterLen = length - (startPos - endPos);
-            if (parameterLen > 0) {//have parameters
-                parseContentTypeParams(pduDataStream, map, parameterLen);
-            }
-
-            if (parameterLen < 0) {
-                Timber.e("Corrupt MMS message");
-                return (PduContentTypes.contentTypes[0]).getBytes(); //"*/*"
-            }
-        } else if (cur <= TEXT_MAX) {
-            contentType = parseWapString(pduDataStream, TYPE_TEXT_STRING);
-        } else {
-            contentType =
-                (PduContentTypes.contentTypes[parseShortInteger(pduDataStream)]).getBytes();
-        }
-
-        return contentType;
-    }
-
-    /**
-     * Parse part's headers.
-     *
-     * @param pduDataStream pdu data input stream
-     * @param part to store the header informations of the part
-     * @param length length of the headers
-     * @return true if parse successfully, false otherwise
-     */
-    protected boolean parsePartHeaders(ByteArrayInputStream pduDataStream,
-            PduPart part, int length) {
-        assert(null != pduDataStream);
-        assert(null != part);
-        assert(length > 0);
-
-        /**
-         * From oma-ts-mms-conf-v1_3.pdf, chapter 10.2.
-         * A name for multipart object SHALL be encoded using name-parameter
-         * for Content-Type header in WSP multipart headers.
-         * In decoding, name-parameter of Content-Type SHALL be used if available.
-         * If name-parameter of Content-Type is not available,
-         * filename parameter of Content-Disposition header SHALL be used if available.
-         * If neither name-parameter of Content-Type header nor filename parameter
-         * of Content-Disposition header is available,
-         * Content-Location header SHALL be used if available.
-         *
-         * Within SMIL part the reference to the media object parts SHALL use
-         * either Content-ID or Content-Location mechanism [RFC2557]
-         * and the corresponding WSP part headers in media object parts
-         * contain the corresponding definitions.
-         */
-        int startPos = pduDataStream.available();
-        int tempPos = 0;
-        int lastLen = length;
-        while(0 < lastLen) {
-            int header = pduDataStream.read();
-            assert(-1 != header);
-            lastLen--;
-
-            if (header > TEXT_MAX) {
-                // Number assigned headers.
-                switch (header) {
-                    case PduPart.P_CONTENT_LOCATION:
-                        /**
-                         * From wap-230-wsp-20010705-a.pdf, chapter 8.4.2.21
-                         * Content-location-value = Uri-value
-                         */
-                        byte[] contentLocation = parseWapString(pduDataStream, TYPE_TEXT_STRING);
-                        if (null != contentLocation) {
-                            part.setContentLocation(contentLocation);
-                        }
-
-                        tempPos = pduDataStream.available();
-                        lastLen = length - (startPos - tempPos);
-                        break;
-                    case PduPart.P_CONTENT_ID:
-                        /**
-                         * From wap-230-wsp-20010705-a.pdf, chapter 8.4.2.21
-                         * Content-ID-value = Quoted-string
-                         */
-                        byte[] contentId = parseWapString(pduDataStream, TYPE_QUOTED_STRING);
-                        if (null != contentId) {
-                            part.setContentId(contentId);
-                        }
-
-                        tempPos = pduDataStream.available();
-                        lastLen = length - (startPos - tempPos);
-                        break;
-                    case PduPart.P_DEP_CONTENT_DISPOSITION:
-                    case PduPart.P_CONTENT_DISPOSITION:
-                        /**
-                         * From wap-230-wsp-20010705-a.pdf, chapter 8.4.2.21
-                         * Content-disposition-value = Value-length Disposition *(Parameter)
-                         * Disposition = Form-data | Attachment | Inline | Token-text
-                         * Form-data = <Octet 128>
-                         * Attachment = <Octet 129>
-                         * Inline = <Octet 130>
-                         */
-
-                        /*
-                         * some carrier mmsc servers do not support content_disposition
-                         * field correctly
-                         */
-                        if (mParseContentDisposition) {
-                            int len = parseValueLength(pduDataStream);
-                            pduDataStream.mark(1);
-                            int thisStartPos = pduDataStream.available();
-                            int thisEndPos = 0;
-                            int value = pduDataStream.read();
-
-                            if (value == PduPart.P_DISPOSITION_FROM_DATA ) {
-                                part.setContentDisposition(PduPart.DISPOSITION_FROM_DATA);
-                            } else if (value == PduPart.P_DISPOSITION_ATTACHMENT) {
-                                part.setContentDisposition(PduPart.DISPOSITION_ATTACHMENT);
-                            } else if (value == PduPart.P_DISPOSITION_INLINE) {
-                                part.setContentDisposition(PduPart.DISPOSITION_INLINE);
-                            } else {
-                                pduDataStream.reset();
-                                /* Token-text */
-                                part.setContentDisposition(parseWapString(pduDataStream
-                                        , TYPE_TEXT_STRING));
-                            }
-
-                            /* get filename parameter and skip other parameters */
-                            thisEndPos = pduDataStream.available();
-                            if (thisStartPos - thisEndPos < len) {
-                                value = pduDataStream.read();
-                                if (value == PduPart.P_FILENAME) { //filename is text-string
-                                    part.setFilename(parseWapString(pduDataStream
-                                            , TYPE_TEXT_STRING));
-                                }
-
-                                /* skip other parameters */
-                                thisEndPos = pduDataStream.available();
-                                if (thisStartPos - thisEndPos < len) {
-                                    int last = len - (thisStartPos - thisEndPos);
-                                    byte[] temp = new byte[last];
-                                    pduDataStream.read(temp, 0, last);
-                                }
-                            }
-
-                            tempPos = pduDataStream.available();
-                            lastLen = length - (startPos - tempPos);
-                        }
-                        break;
-                    default:
-                        if (LOCAL_LOGV) {
-                            Timber.v("Not supported Part headers: " + header);
-                        }
-                    if (-1 == skipWapValue(pduDataStream, lastLen)) {
-                        Timber.e("Corrupt Part headers");
-                        return false;
-                    }
-                    lastLen = 0;
-                    break;
-                }
-            } else if ((header >= TEXT_MIN) && (header <= TEXT_MAX)) {
-                // Not assigned header.
-                byte[] tempHeader = parseWapString(pduDataStream, TYPE_TEXT_STRING);
-                byte[] tempValue = parseWapString(pduDataStream, TYPE_TEXT_STRING);
-
-                // Check the header whether it is "Content-Transfer-Encoding".
-                if (true ==
-                    PduPart.CONTENT_TRANSFER_ENCODING.equalsIgnoreCase(new String(tempHeader))) {
-                    part.setContentTransferEncoding(tempValue);
-                }
-
-                tempPos = pduDataStream.available();
-                lastLen = length - (startPos - tempPos);
-            } else {
-                if (LOCAL_LOGV) {
-                    Timber.v("Not supported Part headers: " + header);
-                }
-                // Skip all headers of this part.
-                if (-1 == skipWapValue(pduDataStream, lastLen)) {
-                    Timber.e("Corrupt Part headers");
-                    return false;
-                }
-                lastLen = 0;
-            }
-        }
-
-        if (0 != lastLen) {
-            Timber.e("Corrupt Part headers");
-            return false;
-        }
-
-        return true;
-    }
-
-    /**
-     * Check the position of a specified part.
-     *
-     * @param part the part to be checked
-     * @return part position, THE_FIRST_PART when it's the
-     * first one, THE_LAST_PART when it's the last one.
-     */
-    private static int checkPartPosition(PduPart part) {
-        assert(null != part);
-        if ((null == mTypeParam) &&
-                (null == mStartParam)) {
-            return THE_LAST_PART;
-        }
-
-        /* check part's content-id */
-        if (null != mStartParam) {
-            byte[] contentId = part.getContentId();
-            if (null != contentId) {
-                if (true == Arrays.equals(mStartParam, contentId)) {
-                    return THE_FIRST_PART;
-                }
-            }
-        }
-
-        /* check part's content-type */
-        if (null != mTypeParam) {
-            byte[] contentType = part.getContentType();
-            if (null != contentType) {
-                if (true == Arrays.equals(mTypeParam, contentType)) {
-                    return THE_FIRST_PART;
-                }
-            }
-        }
-
-        return THE_LAST_PART;
-    }
-
-    /**
-     * Check mandatory headers of a pdu.
-     *
-     * @param headers pdu headers
-     * @return true if the pdu has all of the mandatory headers, false otherwise.
-     */
-    protected static boolean checkMandatoryHeader(PduHeaders headers) {
-        if (null == headers) {
-            return false;
-        }
-
-        /* get message type */
-        int messageType = headers.getOctet(PduHeaders.MESSAGE_TYPE);
-
-        /* check Mms-Version field */
-        int mmsVersion = headers.getOctet(PduHeaders.MMS_VERSION);
-        if (0 == mmsVersion) {
-            // Every message should have Mms-Version field.
-            return false;
-        }
-
-        /* check mandatory header fields */
-        switch (messageType) {
-            case PduHeaders.MESSAGE_TYPE_SEND_REQ:
-                // Content-Type field.
-                byte[] srContentType = headers.getTextString(PduHeaders.CONTENT_TYPE);
-                if (null == srContentType) {
-                    return false;
-                }
-
-                // From field.
-                EncodedStringValue srFrom = headers.getEncodedStringValue(PduHeaders.FROM);
-                if (null == srFrom) {
-                    return false;
-                }
-
-                // Transaction-Id field.
-                byte[] srTransactionId = headers.getTextString(PduHeaders.TRANSACTION_ID);
-                if (null == srTransactionId) {
-                    return false;
-                }
-
-                break;
-            case PduHeaders.MESSAGE_TYPE_SEND_CONF:
-                // Response-Status field.
-                int scResponseStatus = headers.getOctet(PduHeaders.RESPONSE_STATUS);
-                if (0 == scResponseStatus) {
-                    return false;
-                }
-
-                // Transaction-Id field.
-                byte[] scTransactionId = headers.getTextString(PduHeaders.TRANSACTION_ID);
-                if (null == scTransactionId) {
-                    return false;
-                }
-
-                break;
-            case PduHeaders.MESSAGE_TYPE_NOTIFICATION_IND:
-                // Content-Location field.
-                byte[] niContentLocation = headers.getTextString(PduHeaders.CONTENT_LOCATION);
-                if (null == niContentLocation) {
-                    return false;
-                }
-
-                // Expiry field.
-                long niExpiry = headers.getLongInteger(PduHeaders.EXPIRY);
-                if (-1 == niExpiry) {
-                    return false;
-                }
-
-                // Message-Class field.
-                byte[] niMessageClass = headers.getTextString(PduHeaders.MESSAGE_CLASS);
-                if (null == niMessageClass) {
-                    return false;
-                }
-
-                // Message-Size field.
-                long niMessageSize = headers.getLongInteger(PduHeaders.MESSAGE_SIZE);
-                if (-1 == niMessageSize) {
-                    return false;
-                }
-
-                // Transaction-Id field.
-                byte[] niTransactionId = headers.getTextString(PduHeaders.TRANSACTION_ID);
-                if (null == niTransactionId) {
-                    return false;
-                }
-
-                break;
-            case PduHeaders.MESSAGE_TYPE_NOTIFYRESP_IND:
-                // Status field.
-                int nriStatus = headers.getOctet(PduHeaders.STATUS);
-                if (0 == nriStatus) {
-                    return false;
-                }
-
-                // Transaction-Id field.
-                byte[] nriTransactionId = headers.getTextString(PduHeaders.TRANSACTION_ID);
-                if (null == nriTransactionId) {
-                    return false;
-                }
-
-                break;
-            case PduHeaders.MESSAGE_TYPE_RETRIEVE_CONF:
-                // Content-Type field.
-                byte[] rcContentType = headers.getTextString(PduHeaders.CONTENT_TYPE);
-                if (null == rcContentType) {
-                    return false;
-                }
-
-                // Date field.
-                long rcDate = headers.getLongInteger(PduHeaders.DATE);
-                if (-1 == rcDate) {
-                    return false;
-                }
-
-                break;
-            case PduHeaders.MESSAGE_TYPE_DELIVERY_IND:
-                // Date field.
-                long diDate = headers.getLongInteger(PduHeaders.DATE);
-                if (-1 == diDate) {
-                    return false;
-                }
-
-                // Message-Id field.
-                byte[] diMessageId = headers.getTextString(PduHeaders.MESSAGE_ID);
-                if (null == diMessageId) {
-                    return false;
-                }
-
-                // Status field.
-                int diStatus = headers.getOctet(PduHeaders.STATUS);
-                if (0 == diStatus) {
-                    return false;
-                }
-
-                // To field.
-                EncodedStringValue[] diTo = headers.getEncodedStringValues(PduHeaders.TO);
-                if (null == diTo) {
-                    return false;
-                }
-
-                break;
-            case PduHeaders.MESSAGE_TYPE_ACKNOWLEDGE_IND:
-                // Transaction-Id field.
-                byte[] aiTransactionId = headers.getTextString(PduHeaders.TRANSACTION_ID);
-                if (null == aiTransactionId) {
-                    return false;
-                }
-
-                break;
-            case PduHeaders.MESSAGE_TYPE_READ_ORIG_IND:
-                // Date field.
-                long roDate = headers.getLongInteger(PduHeaders.DATE);
-                if (-1 == roDate) {
-                    return false;
-                }
-
-                // From field.
-                EncodedStringValue roFrom = headers.getEncodedStringValue(PduHeaders.FROM);
-                if (null == roFrom) {
-                    return false;
-                }
-
-                // Message-Id field.
-                byte[] roMessageId = headers.getTextString(PduHeaders.MESSAGE_ID);
-                if (null == roMessageId) {
-                    return false;
-                }
-
-                // Read-Status field.
-                int roReadStatus = headers.getOctet(PduHeaders.READ_STATUS);
-                if (0 == roReadStatus) {
-                    return false;
-                }
-
-                // To field.
-                EncodedStringValue[] roTo = headers.getEncodedStringValues(PduHeaders.TO);
-                if (null == roTo) {
-                    return false;
-                }
-
-                break;
-            case PduHeaders.MESSAGE_TYPE_READ_REC_IND:
-                // From field.
-                EncodedStringValue rrFrom = headers.getEncodedStringValue(PduHeaders.FROM);
-                if (null == rrFrom) {
-                    return false;
-                }
-
-                // Message-Id field.
-                byte[] rrMessageId = headers.getTextString(PduHeaders.MESSAGE_ID);
-                if (null == rrMessageId) {
-                    return false;
-                }
-
-                // Read-Status field.
-                int rrReadStatus = headers.getOctet(PduHeaders.READ_STATUS);
-                if (0 == rrReadStatus) {
-                    return false;
-                }
-
-                // To field.
-                EncodedStringValue[] rrTo = headers.getEncodedStringValues(PduHeaders.TO);
-                if (null == rrTo) {
-                    return false;
-                }
-
-                break;
-            default:
-                // Parser doesn't support this message type in this version.
-                return false;
-        }
-
-        return true;
-    }
-}
+/*
+ * Copyright (C) 2015 Jacob Klinker
+ *
+ * Licensed under the Apache License, Version 2.0 (the "License");
+ * you may not use this file except in compliance with the License.
+ * You may obtain a copy of the License at
+ *
+ * http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing, software
+ * distributed under the License is distributed on an "AS IS" BASIS,
+ * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ * See the License for the specific language governing permissions and
+ * limitations under the License.
+ */
+
+package com.google.android.mms.pdu_alt;
+
+import com.google.android.mms.ContentType;
+import com.google.android.mms.InvalidHeaderValueException;
+import timber.log.Timber;
+
+import java.io.ByteArrayInputStream;
+import java.io.ByteArrayOutputStream;
+import java.io.UnsupportedEncodingException;
+import java.util.Arrays;
+import java.util.HashMap;
+
+public class PduParser {
+    /**
+     *  The next are WAP values defined in WSP specification.
+     */
+    private static final int QUOTE = 127;
+    private static final int LENGTH_QUOTE = 31;
+    private static final int TEXT_MIN = 32;
+    private static final int TEXT_MAX = 127;
+    private static final int SHORT_INTEGER_MAX = 127;
+    private static final int SHORT_LENGTH_MAX = 30;
+    private static final int LONG_INTEGER_LENGTH_MAX = 8;
+    private static final int QUOTED_STRING_FLAG = 34;
+    private static final int END_STRING_FLAG = 0x00;
+    //The next two are used by the interface "parseWapString" to
+    //distinguish Text-String and Quoted-String.
+    private static final int TYPE_TEXT_STRING = 0;
+    private static final int TYPE_QUOTED_STRING = 1;
+    private static final int TYPE_TOKEN_STRING = 2;
+
+    /**
+     * Specify the part position.
+     */
+    private static final int THE_FIRST_PART = 0;
+    private static final int THE_LAST_PART = 1;
+
+    /**
+     * The pdu data.
+     */
+    private ByteArrayInputStream mPduDataStream = null;
+
+    /**
+     * Store pdu headers
+     */
+    private PduHeaders mHeaders = null;
+
+    /**
+     * Store pdu parts.
+     */
+    private PduBody mBody = null;
+
+    /**
+     * Store the "type" parameter in "Content-Type" header field.
+     */
+    private static byte[] mTypeParam = null;
+
+    /**
+     * Store the "start" parameter in "Content-Type" header field.
+     */
+    private static byte[] mStartParam = null;
+
+    /**
+     * The log tag.
+     */
+    private static final boolean LOCAL_LOGV = false;
+
+    /**
+     * Whether to parse content-disposition part header
+     */
+    private final boolean mParseContentDisposition;
+
+    /**
+     * Constructor.
+     *
+     * @param pduDataStream pdu data to be parsed
+     * @param parseContentDisposition whether to parse the Content-Disposition part header
+     */
+    public PduParser(byte[] pduDataStream, boolean parseContentDisposition) {
+        mPduDataStream = new ByteArrayInputStream(pduDataStream);
+        mParseContentDisposition = parseContentDisposition;
+    }
+
+    /**
+     * Constructor. Default the parsing content disposition.
+     *
+     * @param pduDataStream pdu data to be parsed.
+     */
+    public PduParser(byte[] pduDataStream) {
+        this(pduDataStream, true);
+    }
+
+    /**
+     * Parse the pdu.
+     *
+     * @return the pdu structure if parsing successfully.
+     *         null if parsing error happened or mandatory fields are not set.
+     */
+    public GenericPdu parse(){
+        if (mPduDataStream == null) {
+            return null;
+        }
+
+        /* parse headers */
+        mHeaders = parseHeaders(mPduDataStream);
+        if (null == mHeaders) {
+            // Parse headers failed.
+            return null;
+        }
+
+        /* get the message type */
+        int messageType = mHeaders.getOctet(PduHeaders.MESSAGE_TYPE);
+
+        /* check mandatory header fields */
+        if (false == checkMandatoryHeader(mHeaders)) {
+            log("check mandatory headers failed!");
+            return null;
+        }
+
+        if ((PduHeaders.MESSAGE_TYPE_SEND_REQ == messageType) ||
+                (PduHeaders.MESSAGE_TYPE_RETRIEVE_CONF == messageType)) {
+            /* need to parse the parts */
+            mBody = parseParts(mPduDataStream);
+            if (null == mBody) {
+                // Parse parts failed.
+                return null;
+            }
+        }
+
+        switch (messageType) {
+            case PduHeaders.MESSAGE_TYPE_SEND_REQ:
+                if (LOCAL_LOGV) {
+                    Timber.v("parse: MESSAGE_TYPE_SEND_REQ");
+                }
+                SendReq sendReq = new SendReq(mHeaders, mBody);
+                return sendReq;
+            case PduHeaders.MESSAGE_TYPE_SEND_CONF:
+                if (LOCAL_LOGV) {
+                    Timber.v("parse: MESSAGE_TYPE_SEND_CONF");
+                }
+                SendConf sendConf = new SendConf(mHeaders);
+                return sendConf;
+            case PduHeaders.MESSAGE_TYPE_NOTIFICATION_IND:
+                if (LOCAL_LOGV) {
+                    Timber.v("parse: MESSAGE_TYPE_NOTIFICATION_IND");
+                }
+                NotificationInd notificationInd =
+                    new NotificationInd(mHeaders);
+                return notificationInd;
+            case PduHeaders.MESSAGE_TYPE_NOTIFYRESP_IND:
+                if (LOCAL_LOGV) {
+                    Timber.v("parse: MESSAGE_TYPE_NOTIFYRESP_IND");
+                }
+                NotifyRespInd notifyRespInd =
+                    new NotifyRespInd(mHeaders);
+                return notifyRespInd;
+            case PduHeaders.MESSAGE_TYPE_RETRIEVE_CONF:
+                if (LOCAL_LOGV) {
+                    Timber.v("parse: MESSAGE_TYPE_RETRIEVE_CONF");
+                }
+                RetrieveConf retrieveConf =
+                    new RetrieveConf(mHeaders, mBody);
+
+                byte[] contentType = retrieveConf.getContentType();
+                if (null == contentType) {
+                    return null;
+                }
+                String ctTypeStr = new String(contentType);
+                if (ctTypeStr.equals(ContentType.MULTIPART_MIXED)
+                        || ctTypeStr.equals(ContentType.MULTIPART_RELATED)
+                        || ctTypeStr.equals(ContentType.MULTIPART_ALTERNATIVE)) {
+                    // The MMS content type must be "application/vnd.wap.multipart.mixed"
+                    // or "application/vnd.wap.multipart.related"
+                    // or "application/vnd.wap.multipart.alternative"
+                    return retrieveConf;
+                } else if (ctTypeStr.equals(ContentType.MULTIPART_ALTERNATIVE)) {
+                    // "application/vnd.wap.multipart.alternative"
+                    // should take only the first part.
+                    PduPart firstPart = mBody.getPart(0);
+                    mBody.removeAll();
+                    mBody.addPart(0, firstPart);
+                    return retrieveConf;
+                } else if (ctTypeStr.equals(ContentType.MULTIPART_SIGNED)) {
+                    // multipart/signed
+                    return retrieveConf;
+                } else {
+                    Timber.v("Unsupported ContentType: " + ctTypeStr);
+                }
+                return null;
+            case PduHeaders.MESSAGE_TYPE_DELIVERY_IND:
+                if (LOCAL_LOGV) {
+                    Timber.v("parse: MESSAGE_TYPE_DELIVERY_IND");
+                }
+                DeliveryInd deliveryInd =
+                    new DeliveryInd(mHeaders);
+                return deliveryInd;
+            case PduHeaders.MESSAGE_TYPE_ACKNOWLEDGE_IND:
+                if (LOCAL_LOGV) {
+                    Timber.v("parse: MESSAGE_TYPE_ACKNOWLEDGE_IND");
+                }
+                AcknowledgeInd acknowledgeInd =
+                    new AcknowledgeInd(mHeaders);
+                return acknowledgeInd;
+            case PduHeaders.MESSAGE_TYPE_READ_ORIG_IND:
+                if (LOCAL_LOGV) {
+                    Timber.v("parse: MESSAGE_TYPE_READ_ORIG_IND");
+                }
+                ReadOrigInd readOrigInd =
+                    new ReadOrigInd(mHeaders);
+                return readOrigInd;
+            case PduHeaders.MESSAGE_TYPE_READ_REC_IND:
+                if (LOCAL_LOGV) {
+                    Timber.v("parse: MESSAGE_TYPE_READ_REC_IND");
+                }
+                ReadRecInd readRecInd =
+                    new ReadRecInd(mHeaders);
+                return readRecInd;
+            default:
+                log("Parser doesn't support this message type in this version!");
+            return null;
+        }
+    }
+
+    /**
+     * Parse pdu headers.
+     *
+     * @param pduDataStream pdu data input stream
+     * @return headers in PduHeaders structure, null when parse fail
+     */
+    protected PduHeaders parseHeaders(ByteArrayInputStream pduDataStream){
+        if (pduDataStream == null) {
+            return null;
+        }
+        boolean keepParsing = true;
+        PduHeaders headers = new PduHeaders();
+
+        while (keepParsing && (pduDataStream.available() > 0)) {
+            pduDataStream.mark(1);
+            int headerField = extractByteValue(pduDataStream);
+            /* parse custom text header */
+            if ((headerField >= TEXT_MIN) && (headerField <= TEXT_MAX)) {
+                pduDataStream.reset();
+                byte [] bVal = parseWapString(pduDataStream, TYPE_TEXT_STRING);
+                if (LOCAL_LOGV) {
+                    Timber.v("TextHeader: " + new String(bVal));
+                }
+                /* we should ignore it at the moment */
+                continue;
+            }
+            switch (headerField) {
+                case PduHeaders.MESSAGE_TYPE:
+                {
+                    int messageType = extractByteValue(pduDataStream);
+                    if (LOCAL_LOGV) {
+                        Timber.v("parseHeaders: messageType: " + messageType);
+                    }
+                    switch (messageType) {
+                        // We don't support these kind of messages now.
+                        case PduHeaders.MESSAGE_TYPE_FORWARD_REQ:
+                        case PduHeaders.MESSAGE_TYPE_FORWARD_CONF:
+                        case PduHeaders.MESSAGE_TYPE_MBOX_STORE_REQ:
+                        case PduHeaders.MESSAGE_TYPE_MBOX_STORE_CONF:
+                        case PduHeaders.MESSAGE_TYPE_MBOX_VIEW_REQ:
+                        case PduHeaders.MESSAGE_TYPE_MBOX_VIEW_CONF:
+                        case PduHeaders.MESSAGE_TYPE_MBOX_UPLOAD_REQ:
+                        case PduHeaders.MESSAGE_TYPE_MBOX_UPLOAD_CONF:
+                        case PduHeaders.MESSAGE_TYPE_MBOX_DELETE_REQ:
+                        case PduHeaders.MESSAGE_TYPE_MBOX_DELETE_CONF:
+                        case PduHeaders.MESSAGE_TYPE_MBOX_DESCR:
+                        case PduHeaders.MESSAGE_TYPE_DELETE_REQ:
+                        case PduHeaders.MESSAGE_TYPE_DELETE_CONF:
+                        case PduHeaders.MESSAGE_TYPE_CANCEL_REQ:
+                        case PduHeaders.MESSAGE_TYPE_CANCEL_CONF:
+                            return null;
+                    }
+                    try {
+                        headers.setOctet(messageType, headerField);
+                    } catch(InvalidHeaderValueException e) {
+                        log("Set invalid Octet value: " + messageType +
+                                " into the header filed: " + headerField);
+                        return null;
+                    } catch(RuntimeException e) {
+                        log(headerField + "is not Octet header field!");
+                        return null;
+                    }
+                    break;
+                }
+                /* Octect value */
+                case PduHeaders.REPORT_ALLOWED:
+                case PduHeaders.ADAPTATION_ALLOWED:
+                case PduHeaders.DELIVERY_REPORT:
+                case PduHeaders.DRM_CONTENT:
+                case PduHeaders.DISTRIBUTION_INDICATOR:
+                case PduHeaders.QUOTAS:
+                case PduHeaders.READ_REPORT:
+                case PduHeaders.STORE:
+                case PduHeaders.STORED:
+                case PduHeaders.TOTALS:
+                case PduHeaders.SENDER_VISIBILITY:
+                case PduHeaders.READ_STATUS:
+                case PduHeaders.CANCEL_STATUS:
+                case PduHeaders.PRIORITY:
+                case PduHeaders.STATUS:
+                case PduHeaders.REPLY_CHARGING:
+                case PduHeaders.MM_STATE:
+                case PduHeaders.RECOMMENDED_RETRIEVAL_MODE:
+                case PduHeaders.CONTENT_CLASS:
+                case PduHeaders.RETRIEVE_STATUS:
+                case PduHeaders.STORE_STATUS:
+                    /**
+                     * The following field has a different value when
+                     * used in the M-Mbox-Delete.conf and M-Delete.conf PDU.
+                     * For now we ignore this fact, since we do not support these PDUs
+                     */
+                case PduHeaders.RESPONSE_STATUS:
+                {
+                    int value = extractByteValue(pduDataStream);
+                    if (LOCAL_LOGV) {
+                        Timber.v("parseHeaders: byte: " + headerField + " value: " + value);
+                    }
+
+                    try {
+                        headers.setOctet(value, headerField);
+                    } catch(InvalidHeaderValueException e) {
+                        log("Set invalid Octet value: " + value +
+                                " into the header filed: " + headerField);
+                        return null;
+                    } catch(RuntimeException e) {
+                        log(headerField + "is not Octet header field!");
+                        return null;
+                    }
+                    break;
+                }
+
+                /* Long-Integer */
+                case PduHeaders.DATE:
+                case PduHeaders.REPLY_CHARGING_SIZE:
+                case PduHeaders.MESSAGE_SIZE:
+                {
+                    try {
+                        long value = parseLongInteger(pduDataStream);
+                        if (LOCAL_LOGV) {
+                            Timber.v("parseHeaders: longint: " + headerField + " value: " +
+                                    value);
+                        }
+                        headers.setLongInteger(value, headerField);
+                    } catch(RuntimeException e) {
+                        log(headerField + "is not Long-Integer header field!");
+                        return null;
+                    }
+                    break;
+                }
+
+                /* Integer-Value */
+                case PduHeaders.MESSAGE_COUNT:
+                case PduHeaders.START:
+                case PduHeaders.LIMIT:
+                {
+                    try {
+                        long value = parseIntegerValue(pduDataStream);
+                        if (LOCAL_LOGV) {
+                            Timber.v("parseHeaders: int: " + headerField + " value: " +
+                                    value);
+                        }
+                        headers.setLongInteger(value, headerField);
+                    } catch(RuntimeException e) {
+                        log(headerField + "is not Long-Integer header field!");
+                        return null;
+                    }
+                    break;
+                }
+
+                /* Text-String */
+                case PduHeaders.TRANSACTION_ID:
+                case PduHeaders.REPLY_CHARGING_ID:
+                case PduHeaders.AUX_APPLIC_ID:
+                case PduHeaders.APPLIC_ID:
+                case PduHeaders.REPLY_APPLIC_ID:
+                    /**
+                     * The next three header fields are email addresses
+                     * as defined in RFC2822,
+                     * not including the characters "<" and ">"
+                     */
+                case PduHeaders.MESSAGE_ID:
+                case PduHeaders.REPLACE_ID:
+                case PduHeaders.CANCEL_ID:
+                    /**
+                     * The following field has a different value when
+                     * used in the M-Mbox-Delete.conf and M-Delete.conf PDU.
+                     * For now we ignore this fact, since we do not support these PDUs
+                     */
+                case PduHeaders.CONTENT_LOCATION:
+                {
+                    byte[] value = parseWapString(pduDataStream, TYPE_TEXT_STRING);
+                    if (null != value) {
+                        try {
+                            if (LOCAL_LOGV) {
+                                Timber.v("parseHeaders: string: " + headerField + " value: " +
+                                        new String(value));
+                            }
+                            headers.setTextString(value, headerField);
+                        } catch(NullPointerException e) {
+                            log("null pointer error!");
+                        } catch(RuntimeException e) {
+                            log(headerField + "is not Text-String header field!");
+                            return null;
+                        }
+                    }
+                    break;
+                }
+
+                /* Encoded-string-value */
+                case PduHeaders.SUBJECT:
+                case PduHeaders.RECOMMENDED_RETRIEVAL_MODE_TEXT:
+                case PduHeaders.RETRIEVE_TEXT:
+                case PduHeaders.STATUS_TEXT:
+                case PduHeaders.STORE_STATUS_TEXT:
+                    /* the next one is not support
+                     * M-Mbox-Delete.conf and M-Delete.conf now */
+                case PduHeaders.RESPONSE_TEXT:
+                {
+                    EncodedStringValue value =
+                        parseEncodedStringValue(pduDataStream);
+                    if (null != value) {
+                        try {
+                            if (LOCAL_LOGV) {
+                                Timber.v("parseHeaders: encoded string: " + headerField
+                                        + " value: " + value.getString());
+                            }
+                            headers.setEncodedStringValue(value, headerField);
+                        } catch(NullPointerException e) {
+                            log("null pointer error!");
+                        } catch (RuntimeException e) {
+                            log(headerField + "is not Encoded-String-Value header field!");
+                            return null;
+                        }
+                    }
+                    break;
+                }
+
+                /* Addressing model */
+                case PduHeaders.BCC:
+                case PduHeaders.CC:
+                case PduHeaders.TO:
+                {
+                    EncodedStringValue value =
+                        parseEncodedStringValue(pduDataStream);
+                    if (null != value) {
+                        byte[] address = value.getTextString();
+                        if (null != address) {
+                            String str = new String(address);
+                            if (LOCAL_LOGV) {
+                                Timber.v("parseHeaders: (to/cc/bcc) address: " + headerField
+                                        + " value: " + str);
+                            }
+                            int endIndex = str.indexOf("/");
+                            if (endIndex > 0) {
+                                str = str.substring(0, endIndex);
+                            }
+                            try {
+                                value.setTextString(str.getBytes());
+                            } catch(NullPointerException e) {
+                                log("null pointer error!");
+                                return null;
+                            }
+                        }
+
+                        try {
+                            headers.appendEncodedStringValue(value, headerField);
+                        } catch(NullPointerException e) {
+                            log("null pointer error!");
+                        } catch(RuntimeException e) {
+                            log(headerField + "is not Encoded-String-Value header field!");
+                            return null;
+                        }
+                    }
+                    break;
+                }
+
+                /* Value-length
+                 * (Absolute-token Date-value | Relative-token Delta-seconds-value) */
+                case PduHeaders.DELIVERY_TIME:
+                case PduHeaders.EXPIRY:
+                case PduHeaders.REPLY_CHARGING_DEADLINE:
+                {
+                    /* parse Value-length */
+                    parseValueLength(pduDataStream);
+
+                    /* Absolute-token or Relative-token */
+                    int token = extractByteValue(pduDataStream);
+
+                    /* Date-value or Delta-seconds-value */
+                    long timeValue;
+                    try {
+                        timeValue = parseLongInteger(pduDataStream);
+                    } catch(RuntimeException e) {
+                        log(headerField + "is not Long-Integer header field!");
+                        return null;
+                    }
+                    if (PduHeaders.VALUE_RELATIVE_TOKEN == token) {
+                        /* need to convert the Delta-seconds-value
+                         * into Date-value */
+                        timeValue = System.currentTimeMillis()/1000 + timeValue;
+                    }
+
+                    try {
+                        if (LOCAL_LOGV) {
+                            Timber.v("parseHeaders: time value: " + headerField
+                                    + " value: " + timeValue);
+                        }
+                        headers.setLongInteger(timeValue, headerField);
+                    } catch(RuntimeException e) {
+                        log(headerField + "is not Long-Integer header field!");
+                        return null;
+                    }
+                    break;
+                }
+
+                case PduHeaders.FROM: {
+                    /* From-value =
+                     * Value-length
+                     * (Address-present-token Encoded-string-value | Insert-address-token)
+                     */
+                    EncodedStringValue from = null;
+                    parseValueLength(pduDataStream); /* parse value-length */
+
+                    /* Address-present-token or Insert-address-token */
+                    int fromToken = extractByteValue(pduDataStream);
+
+                    /* Address-present-token or Insert-address-token */
+                    if (PduHeaders.FROM_ADDRESS_PRESENT_TOKEN == fromToken) {
+                        /* Encoded-string-value */
+                        from = parseEncodedStringValue(pduDataStream);
+                        if (null != from) {
+                            byte[] address = from.getTextString();
+                            if (null != address) {
+                                String str = new String(address);
+                                int endIndex = str.indexOf("/");
+                                if (endIndex > 0) {
+                                    str = str.substring(0, endIndex);
+                                }
+                                try {
+                                    from.setTextString(str.getBytes());
+                                } catch(NullPointerException e) {
+                                    log("null pointer error!");
+                                    return null;
+                                }
+                            }
+                        }
+                    } else {
+                        try {
+                            from = new EncodedStringValue(
+                                    PduHeaders.FROM_INSERT_ADDRESS_TOKEN_STR.getBytes());
+                        } catch(NullPointerException e) {
+                            log(headerField + "is not Encoded-String-Value header field!");
+                            return null;
+                        }
+                    }
+
+                    try {
+                        if (LOCAL_LOGV) {
+                            Timber.v("parseHeaders: from address: " + headerField
+                                    + " value: " + from.getString());
+                        }
+                        headers.setEncodedStringValue(from, PduHeaders.FROM);
+                    } catch(NullPointerException e) {
+                        log("null pointer error!");
+                    } catch(RuntimeException e) {
+                        log(headerField + "is not Encoded-String-Value header field!");
+                        return null;
+                    }
+                    break;
+                }
+
+                case PduHeaders.MESSAGE_CLASS: {
+                    /* Message-class-value = Class-identifier | Token-text */
+                    pduDataStream.mark(1);
+                    int messageClass = extractByteValue(pduDataStream);
+                    if (LOCAL_LOGV) {
+                        Timber.v("parseHeaders: MESSAGE_CLASS: " + headerField
+                                + " value: " + messageClass);
+                    }
+
+                    if (messageClass >= PduHeaders.MESSAGE_CLASS_PERSONAL) {
+                        /* Class-identifier */
+                        try {
+                            if (PduHeaders.MESSAGE_CLASS_PERSONAL == messageClass) {
+                                headers.setTextString(
+                                        PduHeaders.MESSAGE_CLASS_PERSONAL_STR.getBytes(),
+                                        PduHeaders.MESSAGE_CLASS);
+                            } else if (PduHeaders.MESSAGE_CLASS_ADVERTISEMENT == messageClass) {
+                                headers.setTextString(
+                                        PduHeaders.MESSAGE_CLASS_ADVERTISEMENT_STR.getBytes(),
+                                        PduHeaders.MESSAGE_CLASS);
+                            } else if (PduHeaders.MESSAGE_CLASS_INFORMATIONAL == messageClass) {
+                                headers.setTextString(
+                                        PduHeaders.MESSAGE_CLASS_INFORMATIONAL_STR.getBytes(),
+                                        PduHeaders.MESSAGE_CLASS);
+                            } else if (PduHeaders.MESSAGE_CLASS_AUTO == messageClass) {
+                                headers.setTextString(
+                                        PduHeaders.MESSAGE_CLASS_AUTO_STR.getBytes(),
+                                        PduHeaders.MESSAGE_CLASS);
+                            }
+                        } catch(NullPointerException e) {
+                            log("null pointer error!");
+                        } catch(RuntimeException e) {
+                            log(headerField + "is not Text-String header field!");
+                            return null;
+                        }
+                    } else {
+                        /* Token-text */
+                        pduDataStream.reset();
+                        byte[] messageClassString = parseWapString(pduDataStream, TYPE_TEXT_STRING);
+                        if (null != messageClassString) {
+                            try {
+                                headers.setTextString(messageClassString, PduHeaders.MESSAGE_CLASS);
+                            } catch(NullPointerException e) {
+                                log("null pointer error!");
+                            } catch(RuntimeException e) {
+                                log(headerField + "is not Text-String header field!");
+                                return null;
+                            }
+                        }
+                    }
+                    break;
+                }
+
+                case PduHeaders.MMS_VERSION: {
+                    int version = parseShortInteger(pduDataStream);
+
+                    try {
+                        if (LOCAL_LOGV) {
+                            Timber.v("parseHeaders: MMS_VERSION: " + headerField
+                                    + " value: " + version);
+                        }
+                        headers.setOctet(version, PduHeaders.MMS_VERSION);
+                    } catch(InvalidHeaderValueException e) {
+                        log("Set invalid Octet value: " + version +
+                                " into the header filed: " + headerField);
+                        return null;
+                    } catch(RuntimeException e) {
+                        log(headerField + "is not Octet header field!");
+                        return null;
+                    }
+                    break;
+                }
+
+                case PduHeaders.PREVIOUSLY_SENT_BY: {
+                    /* Previously-sent-by-value =
+                     * Value-length Forwarded-count-value Encoded-string-value */
+                    /* parse value-length */
+                    parseValueLength(pduDataStream);
+
+                    /* parse Forwarded-count-value */
+                    try {
+                        parseIntegerValue(pduDataStream);
+                    } catch(RuntimeException e) {
+                        log(headerField + " is not Integer-Value");
+                        return null;
+                    }
+
+                    /* parse Encoded-string-value */
+                    EncodedStringValue previouslySentBy =
+                        parseEncodedStringValue(pduDataStream);
+                    if (null != previouslySentBy) {
+                        try {
+                            if (LOCAL_LOGV) {
+                                Timber.v("parseHeaders: PREVIOUSLY_SENT_BY: " + headerField
+                                        + " value: " + previouslySentBy.getString());
+                            }
+                            headers.setEncodedStringValue(previouslySentBy,
+                                    PduHeaders.PREVIOUSLY_SENT_BY);
+                        } catch(NullPointerException e) {
+                            log("null pointer error!");
+                        } catch(RuntimeException e) {
+                            log(headerField + "is not Encoded-String-Value header field!");
+                            return null;
+                        }
+                    }
+                    break;
+                }
+
+                case PduHeaders.PREVIOUSLY_SENT_DATE: {
+                    /* Previously-sent-date-value =
+                     * Value-length Forwarded-count-value Date-value */
+                    /* parse value-length */
+                    parseValueLength(pduDataStream);
+
+                    /* parse Forwarded-count-value */
+                    try {
+                        parseIntegerValue(pduDataStream);
+                    } catch(RuntimeException e) {
+                        log(headerField + " is not Integer-Value");
+                        return null;
+                    }
+
+                    /* Date-value */
+                    try {
+                        long perviouslySentDate = parseLongInteger(pduDataStream);
+                        if (LOCAL_LOGV) {
+                            Timber.v("parseHeaders: PREVIOUSLY_SENT_DATE: " + headerField
+                                    + " value: " + perviouslySentDate);
+                        }
+                        headers.setLongInteger(perviouslySentDate,
+                                PduHeaders.PREVIOUSLY_SENT_DATE);
+                    } catch(RuntimeException e) {
+                        log(headerField + "is not Long-Integer header field!");
+                        return null;
+                    }
+                    break;
+                }
+
+                case PduHeaders.MM_FLAGS: {
+                    /* MM-flags-value =
+                     * Value-length
+                     * ( Add-token | Remove-token | Filter-token )
+                     * Encoded-string-value
+                     */
+                    if (LOCAL_LOGV) {
+                        Timber.v("parseHeaders: MM_FLAGS: " + headerField
+                                + " NOT REALLY SUPPORTED");
+                    }
+
+                    /* parse Value-length */
+                    parseValueLength(pduDataStream);
+
+                    /* Add-token | Remove-token | Filter-token */
+                    extractByteValue(pduDataStream);
+
+                    /* Encoded-string-value */
+                    parseEncodedStringValue(pduDataStream);
+
+                    /* not store this header filed in "headers",
+                     * because now PduHeaders doesn't support it */
+                    break;
+                }
+
+                /* Value-length
+                 * (Message-total-token | Size-total-token) Integer-Value */
+                case PduHeaders.MBOX_TOTALS:
+                case PduHeaders.MBOX_QUOTAS:
+                {
+                    if (LOCAL_LOGV) {
+                        Timber.v("parseHeaders: MBOX_TOTALS: " + headerField);
+                    }
+                    /* Value-length */
+                    parseValueLength(pduDataStream);
+
+                    /* Message-total-token | Size-total-token */
+                    extractByteValue(pduDataStream);
+
+                    /*Integer-Value*/
+                    try {
+                        parseIntegerValue(pduDataStream);
+                    } catch(RuntimeException e) {
+                        log(headerField + " is not Integer-Value");
+                        return null;
+                    }
+
+                    /* not store these headers filed in "headers",
+                    because now PduHeaders doesn't support them */
+                    break;
+                }
+
+                case PduHeaders.ELEMENT_DESCRIPTOR: {
+                    if (LOCAL_LOGV) {
+                        Timber.v("parseHeaders: ELEMENT_DESCRIPTOR: " + headerField);
+                    }
+                    parseContentType(pduDataStream, null);
+
+                    /* not store this header filed in "headers",
+                    because now PduHeaders doesn't support it */
+                    break;
+                }
+
+                case PduHeaders.CONTENT_TYPE: {
+                    HashMap<Integer, Object> map =
+                        new HashMap<Integer, Object>();
+                    byte[] contentType =
+                        parseContentType(pduDataStream, map);
+
+                    if (null != contentType) {
+                        try {
+                            if (LOCAL_LOGV) {
+                                Timber.v("parseHeaders: CONTENT_TYPE: " + headerField + contentType.toString());
+                            }
+                            headers.setTextString(contentType, PduHeaders.CONTENT_TYPE);
+                        } catch(NullPointerException e) {
+                            log("null pointer error!");
+                        } catch(RuntimeException e) {
+                            log(headerField + "is not Text-String header field!");
+                            return null;
+                        }
+                    }
+
+                    /* get start parameter */
+                    mStartParam = (byte[]) map.get(PduPart.P_START);
+
+                    /* get charset parameter */
+                    mTypeParam= (byte[]) map.get(PduPart.P_TYPE);
+
+                    keepParsing = false;
+                    break;
+                }
+
+                case PduHeaders.CONTENT:
+                case PduHeaders.ADDITIONAL_HEADERS:
+                case PduHeaders.ATTRIBUTES:
+                default: {
+                    if (LOCAL_LOGV) {
+                        Timber.v("parseHeaders: Unknown header: " + headerField);
+                    }
+                    log("Unknown header");
+                }
+            }
+        }
+
+        return headers;
+    }
+
+    /**
+     * Parse pdu parts.
+     *
+     * @param pduDataStream pdu data input stream
+     * @return parts in PduBody structure
+     */
+    protected PduBody parseParts(ByteArrayInputStream pduDataStream) {
+        if (pduDataStream == null) {
+            return null;
+        }
+
+        int count = parseUnsignedInt(pduDataStream); // get the number of parts
+        PduBody body = new PduBody();
+
+        for (int i = 0 ; i < count ; i++) {
+            int headerLength = parseUnsignedInt(pduDataStream);
+            int dataLength = parseUnsignedInt(pduDataStream);
+            PduPart part = new PduPart();
+            int startPos = pduDataStream.available();
+            if (startPos <= 0) {
+                // Invalid part.
+                return null;
+            }
+
+            /* parse part's content-type */
+            HashMap<Integer, Object> map = new HashMap<Integer, Object>();
+            byte[] contentType = parseContentType(pduDataStream, map);
+            if (null != contentType) {
+                part.setContentType(contentType);
+            } else {
+                part.setContentType((PduContentTypes.contentTypes[0]).getBytes()); //"*/*"
+            }
+
+            /* get name parameter */
+            byte[] name = (byte[]) map.get(PduPart.P_NAME);
+            if (null != name) {
+                part.setName(name);
+            }
+
+            /* get charset parameter */
+            Integer charset = (Integer) map.get(PduPart.P_CHARSET);
+            if (null != charset) {
+                part.setCharset(charset);
+            }
+
+            /* parse part's headers */
+            int endPos = pduDataStream.available();
+            int partHeaderLen = headerLength - (startPos - endPos);
+            if (partHeaderLen > 0) {
+                if (false == parsePartHeaders(pduDataStream, part, partHeaderLen)) {
+                    // Parse part header faild.
+                    return null;
+                }
+            } else if (partHeaderLen < 0) {
+                // Invalid length of content-type.
+                return null;
+            }
+
+            /* FIXME: check content-id, name, filename and content location,
+             * if not set anyone of them, generate a default content-location
+             */
+            if ((null == part.getContentLocation())
+                    && (null == part.getName())
+                    && (null == part.getFilename())
+                    && (null == part.getContentId())) {
+                part.setContentLocation(Long.toOctalString(
+                        System.currentTimeMillis()).getBytes());
+            }
+
+            /* get part's data */
+            if (dataLength > 0) {
+                byte[] partData = new byte[dataLength];
+                String partContentType = new String(part.getContentType());
+                pduDataStream.read(partData, 0, dataLength);
+                if (partContentType.equalsIgnoreCase(ContentType.MULTIPART_ALTERNATIVE)) {
+                    // parse "multipart/vnd.wap.multipart.alternative".
+                    PduBody childBody = parseParts(new ByteArrayInputStream(partData));
+                    // take the first part of children.
+                    part = childBody.getPart(0);
+                } else {
+                    // Check Content-Transfer-Encoding.
+                    byte[] partDataEncoding = part.getContentTransferEncoding();
+                    if (null != partDataEncoding) {
+                        String encoding = new String(partDataEncoding);
+                        if (encoding.equalsIgnoreCase(PduPart.P_BASE64)) {
+                            // Decode "base64" into "binary".
+                            partData = Base64.decodeBase64(partData);
+                        } else if (encoding.equalsIgnoreCase(PduPart.P_QUOTED_PRINTABLE)) {
+                            // Decode "quoted-printable" into "binary".
+                            partData = QuotedPrintable.decodeQuotedPrintable(partData);
+                        } else {
+                            // "binary" is the default encoding.
+                        }
+                    }
+                    if (null == partData) {
+                        log("Decode part data error!");
+                        return null;
+                    }
+                    part.setData(partData);
+                }
+            }
+
+            /* add this part to body */
+            if (THE_FIRST_PART == checkPartPosition(part)) {
+                /* this is the first part */
+                body.addPart(0, part);
+            } else {
+                /* add the part to the end */
+                body.addPart(part);
+            }
+        }
+
+        return body;
+    }
+
+    /**
+     * Log status.
+     *
+     * @param text log information
+     */
+    private static void log(String text) {
+        if (LOCAL_LOGV) {
+            Timber.v(text);
+        }
+    }
+
+    /**
+     * Parse unsigned integer.
+     *
+     * @param pduDataStream pdu data input stream
+     * @return the integer, -1 when failed
+     */
+    protected static int parseUnsignedInt(ByteArrayInputStream pduDataStream) {
+        /**
+         * From wap-230-wsp-20010705-a.pdf
+         * The maximum size of a uintvar is 32 bits.
+         * So it will be encoded in no more than 5 octets.
+         */
+        assert(null != pduDataStream);
+        int result = 0;
+        int temp = pduDataStream.read();
+        if (temp == -1) {
+            return temp;
+        }
+
+        while((temp & 0x80) != 0) {
+            result = result << 7;
+            result |= temp & 0x7F;
+            temp = pduDataStream.read();
+            if (temp == -1) {
+                return temp;
+            }
+        }
+
+        result = result << 7;
+        result |= temp & 0x7F;
+
+        return result;
+    }
+
+    /**
+     * Parse value length.
+     *
+     * @param pduDataStream pdu data input stream
+     * @return the integer
+     */
+    protected static int parseValueLength(ByteArrayInputStream pduDataStream) {
+        /**
+         * From wap-230-wsp-20010705-a.pdf
+         * Value-length = Short-length | (Length-quote Length)
+         * Short-length = <Any octet 0-30>
+         * Length-quote = <Octet 31>
+         * Length = Uintvar-integer
+         * Uintvar-integer = 1*5 OCTET
+         */
+        assert(null != pduDataStream);
+        int temp = pduDataStream.read();
+        assert(-1 != temp);
+        int first = temp & 0xFF;
+
+        if (first <= SHORT_LENGTH_MAX) {
+            return first;
+        } else if (first == LENGTH_QUOTE) {
+            return parseUnsignedInt(pduDataStream);
+        }
+
+        throw new RuntimeException ("Value length > LENGTH_QUOTE!");
+    }
+
+    /**
+     * Parse encoded string value.
+     *
+     * @param pduDataStream pdu data input stream
+     * @return the EncodedStringValue
+     */
+    protected static EncodedStringValue parseEncodedStringValue(ByteArrayInputStream pduDataStream){
+        /**
+         * From OMA-TS-MMS-ENC-V1_3-20050927-C.pdf
+         * Encoded-string-value = Text-string | Value-length Char-set Text-string
+         */
+        assert(null != pduDataStream);
+        pduDataStream.mark(1);
+        EncodedStringValue returnValue = null;
+        int charset = 0;
+        int temp = pduDataStream.read();
+        assert(-1 != temp);
+        int first = temp & 0xFF;
+        if (first == 0) {
+            return new EncodedStringValue("");
+        }
+
+        pduDataStream.reset();
+        if (first < TEXT_MIN) {
+            parseValueLength(pduDataStream);
+
+            charset = parseShortInteger(pduDataStream); //get the "Charset"
+        }
+
+        byte[] textString = parseWapString(pduDataStream, TYPE_TEXT_STRING);
+
+        try {
+            if (0 != charset) {
+                returnValue = new EncodedStringValue(charset, textString);
+            } else {
+                returnValue = new EncodedStringValue(textString);
+            }
+        } catch(Exception e) {
+            return null;
+        }
+
+        return returnValue;
+    }
+
+    /**
+     * Parse Text-String or Quoted-String.
+     *
+     * @param pduDataStream pdu data input stream
+     * @param stringType TYPE_TEXT_STRING or TYPE_QUOTED_STRING
+     * @return the string without End-of-string in byte array
+     */
+    protected static byte[] parseWapString(ByteArrayInputStream pduDataStream,
+            int stringType) {
+        assert(null != pduDataStream);
+        /**
+         * From wap-230-wsp-20010705-a.pdf
+         * Text-string = [Quote] *TEXT End-of-string
+         * If the first character in the TEXT is in the range of 128-255,
+         * a Quote character must precede it.
+         * Otherwise the Quote character must be omitted.
+         * The Quote is not part of the contents.
+         * Quote = <Octet 127>
+         * End-of-string = <Octet 0>
+         *
+         * Quoted-string = <Octet 34> *TEXT End-of-string
+         *
+         * Token-text = Token End-of-string
+         */
+
+        // Mark supposed beginning of Text-string
+        // We will have to mark again if first char is QUOTE or QUOTED_STRING_FLAG
+        pduDataStream.mark(1);
+
+        // Check first char
+        int temp = pduDataStream.read();
+        assert(-1 != temp);
+        if ((TYPE_QUOTED_STRING == stringType) &&
+                (QUOTED_STRING_FLAG == temp)) {
+            // Mark again if QUOTED_STRING_FLAG and ignore it
+            pduDataStream.mark(1);
+        } else if ((TYPE_TEXT_STRING == stringType) &&
+                (QUOTE == temp)) {
+            // Mark again if QUOTE and ignore it
+            pduDataStream.mark(1);
+        } else {
+            // Otherwise go back to origin
+            pduDataStream.reset();
+        }
+
+        // We are now definitely at the beginning of string
+        /**
+         * Return *TOKEN or *TEXT (Text-String without QUOTE,
+         * Quoted-String without QUOTED_STRING_FLAG and without End-of-string)
+         */
+        return getWapString(pduDataStream, stringType);
+    }
+
+    /**
+     * Check TOKEN data defined in RFC2616.
+     * @param ch checking data
+     * @return true when ch is TOKEN, false when ch is not TOKEN
+     */
+    protected static boolean isTokenCharacter(int ch) {
+        /**
+         * Token      = 1*<any CHAR except CTLs or separators>
+         * separators = "("(40) | ")"(41) | "<"(60) | ">"(62) | "@"(64)
+         *            | ","(44) | ";"(59) | ":"(58) | "\"(92) | <">(34)
+         *            | "/"(47) | "["(91) | "]"(93) | "?"(63) | "="(61)
+         *            | "{"(123) | "}"(125) | SP(32) | HT(9)
+         * CHAR       = <any US-ASCII character (octets 0 - 127)>
+         * CTL        = <any US-ASCII control character
+         *            (octets 0 - 31) and DEL (127)>
+         * SP         = <US-ASCII SP, space (32)>
+         * HT         = <US-ASCII HT, horizontal-tab (9)>
+         */
+        if((ch < 33) || (ch > 126)) {
+            return false;
+        }
+
+        switch(ch) {
+            case '"': /* '"' */
+            case '(': /* '(' */
+            case ')': /* ')' */
+            case ',': /* ',' */
+            case '/': /* '/' */
+            case ':': /* ':' */
+            case ';': /* ';' */
+            case '<': /* '<' */
+            case '=': /* '=' */
+            case '>': /* '>' */
+            case '?': /* '?' */
+            case '@': /* '@' */
+            case '[': /* '[' */
+            case '\\': /* '\' */
+            case ']': /* ']' */
+            case '{': /* '{' */
+            case '}': /* '}' */
+                return false;
+        }
+
+        return true;
+    }
+
+    /**
+     * Check TEXT data defined in RFC2616.
+     * @param ch checking data
+     * @return true when ch is TEXT, false when ch is not TEXT
+     */
+    protected static boolean isText(int ch) {
+        /**
+         * TEXT = <any OCTET except CTLs,
+         *      but including LWS>
+         * CTL  = <any US-ASCII control character
+         *      (octets 0 - 31) and DEL (127)>
+         * LWS  = [CRLF] 1*( SP | HT )
+         * CRLF = CR LF
+         * CR   = <US-ASCII CR, carriage return (13)>
+         * LF   = <US-ASCII LF, linefeed (10)>
+         */
+        if(((ch >= 32) && (ch <= 126)) || ((ch >= 128) && (ch <= 255))) {
+            return true;
+        }
+
+        switch(ch) {
+            case '\t': /* '\t' */
+            case '\n': /* '\n' */
+            case '\r': /* '\r' */
+                return true;
+        }
+
+        return false;
+    }
+
+    protected static byte[] getWapString(ByteArrayInputStream pduDataStream,
+            int stringType) {
+        assert(null != pduDataStream);
+        ByteArrayOutputStream out = new ByteArrayOutputStream();
+        int temp = pduDataStream.read();
+        assert(-1 != temp);
+        while((-1 != temp) && ('\0' != temp)) {
+            // check each of the character
+            if (stringType == TYPE_TOKEN_STRING) {
+                if (isTokenCharacter(temp)) {
+                    out.write(temp);
+                }
+            } else {
+                if (isText(temp)) {
+                    out.write(temp);
+                }
+            }
+
+            temp = pduDataStream.read();
+            assert(-1 != temp);
+        }
+
+        if (out.size() > 0) {
+            return out.toByteArray();
+        }
+
+        return null;
+    }
+
+    /**
+     * Extract a byte value from the input stream.
+     *
+     * @param pduDataStream pdu data input stream
+     * @return the byte
+     */
+    protected static int extractByteValue(ByteArrayInputStream pduDataStream) {
+        assert(null != pduDataStream);
+        int temp = pduDataStream.read();
+        assert(-1 != temp);
+        return temp & 0xFF;
+    }
+
+    /**
+     * Parse Short-Integer.
+     *
+     * @param pduDataStream pdu data input stream
+     * @return the byte
+     */
+    protected static int parseShortInteger(ByteArrayInputStream pduDataStream) {
+        /**
+         * From wap-230-wsp-20010705-a.pdf
+         * Short-integer = OCTET
+         * Integers in range 0-127 shall be encoded as a one
+         * octet value with the most significant bit set to one (1xxx xxxx)
+         * and with the value in the remaining least significant bits.
+         */
+        assert(null != pduDataStream);
+        int temp = pduDataStream.read();
+        assert(-1 != temp);
+        return temp & 0x7F;
+    }
+
+    /**
+     * Parse Long-Integer.
+     *
+     * @param pduDataStream pdu data input stream
+     * @return long integer
+     */
+    protected static long parseLongInteger(ByteArrayInputStream pduDataStream) {
+        /**
+         * From wap-230-wsp-20010705-a.pdf
+         * Long-integer = Short-length Multi-octet-integer
+         * The Short-length indicates the length of the Multi-octet-integer
+         * Multi-octet-integer = 1*30 OCTET
+         * The content octets shall be an unsigned integer value
+         * with the most significant octet encoded first (big-endian representation).
+         * The minimum number of octets must be used to encode the value.
+         * Short-length = <Any octet 0-30>
+         */
+        assert(null != pduDataStream);
+        int temp = pduDataStream.read();
+        assert(-1 != temp);
+        int count = temp & 0xFF;
+
+        if (count > LONG_INTEGER_LENGTH_MAX) {
+            throw new RuntimeException("Octet count greater than 8 and I can't represent that!");
+        }
+
+        long result = 0;
+
+        for (int i = 0 ; i < count ; i++) {
+            temp = pduDataStream.read();
+            assert(-1 != temp);
+            result <<= 8;
+            result += (temp & 0xFF);
+        }
+
+        return result;
+    }
+
+    /**
+     * Parse Integer-Value.
+     *
+     * @param pduDataStream pdu data input stream
+     * @return long integer
+     */
+    protected static long parseIntegerValue(ByteArrayInputStream pduDataStream) {
+        /**
+         * From wap-230-wsp-20010705-a.pdf
+         * Integer-Value = Short-integer | Long-integer
+         */
+        assert(null != pduDataStream);
+        pduDataStream.mark(1);
+        int temp = pduDataStream.read();
+        assert(-1 != temp);
+        pduDataStream.reset();
+        if (temp > SHORT_INTEGER_MAX) {
+            return parseShortInteger(pduDataStream);
+        } else {
+            return parseLongInteger(pduDataStream);
+        }
+    }
+
+    /**
+     * To skip length of the wap value.
+     *
+     * @param pduDataStream pdu data input stream
+     * @param length area size
+     * @return the values in this area
+     */
+    protected static int skipWapValue(ByteArrayInputStream pduDataStream, int length) {
+        assert(null != pduDataStream);
+        byte[] area = new byte[length];
+        int readLen = pduDataStream.read(area, 0, length);
+        if (readLen < length) { //The actually read length is lower than the length
+            return -1;
+        } else {
+            return readLen;
+        }
+    }
+
+    /**
+     * Parse content type parameters. For now we just support
+     * four parameters used in mms: "type", "start", "name", "charset".
+     *
+     * @param pduDataStream pdu data input stream
+     * @param map to store parameters of Content-Type field
+     * @param length length of all the parameters
+     */
+    protected static void parseContentTypeParams(ByteArrayInputStream pduDataStream,
+            HashMap<Integer, Object> map, Integer length) {
+        /**
+         * From wap-230-wsp-20010705-a.pdf
+         * Parameter = Typed-parameter | Untyped-parameter
+         * Typed-parameter = Well-known-parameter-token Typed-value
+         * the actual expected type of the value is implied by the well-known parameter
+         * Well-known-parameter-token = Integer-value
+         * the code values used for parameters are specified in the Assigned Numbers appendix
+         * Typed-value = Compact-value | Text-value
+         * In addition to the expected type, there may be no value.
+         * If the value cannot be encoded using the expected type, it shall be encoded as text.
+         * Compact-value = Integer-value |
+         * Date-value | Delta-seconds-value | Q-value | Version-value |
+         * Uri-value
+         * Untyped-parameter = Token-text Untyped-value
+         * the type of the value is unknown, but it shall be encoded as an integer,
+         * if that is possible.
+         * Untyped-value = Integer-value | Text-value
+         */
+        assert(null != pduDataStream);
+        assert(length > 0);
+
+        int startPos = pduDataStream.available();
+        int tempPos = 0;
+        int lastLen = length;
+        while(0 < lastLen) {
+            int param = pduDataStream.read();
+            assert(-1 != param);
+            lastLen--;
+
+            switch (param) {
+                /**
+                 * From rfc2387, chapter 3.1
+                 * The type parameter must be specified and its value is the MIME media
+                 * type of the "root" body part. It permits a MIME user agent to
+                 * determine the content-type without reference to the enclosed body
+                 * part. If the value of the type parameter and the root body part's
+                 * content-type differ then the User Agent's behavior is undefined.
+                 *
+                 * From wap-230-wsp-20010705-a.pdf
+                 * type = Constrained-encoding
+                 * Constrained-encoding = Extension-Media | Short-integer
+                 * Extension-media = *TEXT End-of-string
+                 */
+                case PduPart.P_TYPE:
+                case PduPart.P_CT_MR_TYPE:
+                    pduDataStream.mark(1);
+                    int first = extractByteValue(pduDataStream);
+                    pduDataStream.reset();
+                    if (first > TEXT_MAX) {
+                        // Short-integer (well-known type)
+                        int index = parseShortInteger(pduDataStream);
+
+                        if (index < PduContentTypes.contentTypes.length) {
+                            byte[] type = (PduContentTypes.contentTypes[index]).getBytes();
+                            map.put(PduPart.P_TYPE, type);
+                        } else {
+                            //not support this type, ignore it.
+                        }
+                    } else {
+                        // Text-String (extension-media)
+                        byte[] type = parseWapString(pduDataStream, TYPE_TEXT_STRING);
+                        if ((null != type) && (null != map)) {
+                            map.put(PduPart.P_TYPE, type);
+                        }
+                    }
+
+                    tempPos = pduDataStream.available();
+                    lastLen = length - (startPos - tempPos);
+                    break;
+
+                    /**
+                     * From oma-ts-mms-conf-v1_3.pdf, chapter 10.2.3.
+                     * Start Parameter Referring to Presentation
+                     *
+                     * From rfc2387, chapter 3.2
+                     * The start parameter, if given, is the content-ID of the compound
+                     * object's "root". If not present the "root" is the first body part in
+                     * the Multipart/Related entity. The "root" is the element the
+                     * applications processes first.
+                     *
+                     * From wap-230-wsp-20010705-a.pdf
+                     * start = Text-String
+                     */
+                case PduPart.P_START:
+                case PduPart.P_DEP_START:
+                    byte[] start = parseWapString(pduDataStream, TYPE_TEXT_STRING);
+                    if ((null != start) && (null != map)) {
+                        map.put(PduPart.P_START, start);
+                    }
+
+                    tempPos = pduDataStream.available();
+                    lastLen = length - (startPos - tempPos);
+                    break;
+
+                    /**
+                     * From oma-ts-mms-conf-v1_3.pdf
+                     * In creation, the character set SHALL be either us-ascii
+                     * (IANA MIBenum 3) or utf-8 (IANA MIBenum 106)[Unicode].
+                     * In retrieval, both us-ascii and utf-8 SHALL be supported.
+                     *
+                     * From wap-230-wsp-20010705-a.pdf
+                     * charset = Well-known-charset|Text-String
+                     * Well-known-charset = Any-charset | Integer-value
+                     * Both are encoded using values from Character Set
+                     * Assignments table in Assigned Numbers
+                     * Any-charset = <Octet 128>
+                     * Equivalent to the special RFC2616 charset value "*"
+                     */
+                case PduPart.P_CHARSET:
+                    pduDataStream.mark(1);
+                    int firstValue = extractByteValue(pduDataStream);
+                    pduDataStream.reset();
+                    //Check first char
+                    if (((firstValue > TEXT_MIN) && (firstValue < TEXT_MAX)) ||
+                            (END_STRING_FLAG == firstValue)) {
+                        //Text-String (extension-charset)
+                        byte[] charsetStr = parseWapString(pduDataStream, TYPE_TEXT_STRING);
+                        try {
+                            int charsetInt = CharacterSets.getMibEnumValue(
+                                    new String(charsetStr));
+                            map.put(PduPart.P_CHARSET, charsetInt);
+                        } catch (UnsupportedEncodingException e) {
+                            // Not a well-known charset, use "*".
+                            Timber.e(e, Arrays.toString(charsetStr));
+                            map.put(PduPart.P_CHARSET, CharacterSets.ANY_CHARSET);
+                        }
+                    } else {
+                        //Well-known-charset
+                        int charset = (int) parseIntegerValue(pduDataStream);
+                        if (map != null) {
+                            map.put(PduPart.P_CHARSET, charset);
+                        }
+                    }
+
+                    tempPos = pduDataStream.available();
+                    lastLen = length - (startPos - tempPos);
+                    break;
+
+                    /**
+                     * From oma-ts-mms-conf-v1_3.pdf
+                     * A name for multipart object SHALL be encoded using name-parameter
+                     * for Content-Type header in WSP multipart headers.
+                     *
+                     * From wap-230-wsp-20010705-a.pdf
+                     * name = Text-String
+                     */
+                case PduPart.P_DEP_NAME:
+                case PduPart.P_NAME:
+                    byte[] name = parseWapString(pduDataStream, TYPE_TEXT_STRING);
+                    if ((null != name) && (null != map)) {
+                        map.put(PduPart.P_NAME, name);
+                    }
+
+                    tempPos = pduDataStream.available();
+                    lastLen = length - (startPos - tempPos);
+                    break;
+                default:
+                    if (LOCAL_LOGV) {
+                        Timber.v("Not supported Content-Type parameter");
+                    }
+                if (-1 == skipWapValue(pduDataStream, lastLen)) {
+                    Timber.e("Corrupt Content-Type");
+                } else {
+                    lastLen = 0;
+                }
+                break;
+            }
+        }
+
+        if (0 != lastLen) {
+            Timber.e("Corrupt Content-Type");
+        }
+    }
+
+    /**
+     * Parse content type.
+     *
+     * @param pduDataStream pdu data input stream
+     * @param map to store parameters in Content-Type header field
+     * @return Content-Type value
+     */
+    protected static byte[] parseContentType(ByteArrayInputStream pduDataStream,
+            HashMap<Integer, Object> map) {
+        /**
+         * From wap-230-wsp-20010705-a.pdf
+         * Content-type-value = Constrained-media | Content-general-form
+         * Content-general-form = Value-length Media-type
+         * Media-type = (Well-known-media | Extension-Media) *(Parameter)
+         */
+        assert(null != pduDataStream);
+
+        byte[] contentType = null;
+        pduDataStream.mark(1);
+        int temp = pduDataStream.read();
+        assert(-1 != temp);
+        pduDataStream.reset();
+
+        int cur = (temp & 0xFF);
+
+        if (cur < TEXT_MIN) {
+            int length = parseValueLength(pduDataStream);
+            int startPos = pduDataStream.available();
+            pduDataStream.mark(1);
+            temp = pduDataStream.read();
+            assert(-1 != temp);
+            pduDataStream.reset();
+            int first = (temp & 0xFF);
+
+            if ((first >= TEXT_MIN) && (first <= TEXT_MAX)) {
+                contentType = parseWapString(pduDataStream, TYPE_TEXT_STRING);
+            } else if (first > TEXT_MAX) {
+                int index = parseShortInteger(pduDataStream);
+
+                if (index < PduContentTypes.contentTypes.length) { //well-known type
+                    contentType = (PduContentTypes.contentTypes[index]).getBytes();
+                } else {
+                    pduDataStream.reset();
+                    contentType = parseWapString(pduDataStream, TYPE_TEXT_STRING);
+                }
+            } else {
+                Timber.e("Corrupt content-type");
+                return (PduContentTypes.contentTypes[0]).getBytes(); //"*/*"
+            }
+
+            int endPos = pduDataStream.available();
+            int parameterLen = length - (startPos - endPos);
+            if (parameterLen > 0) {//have parameters
+                parseContentTypeParams(pduDataStream, map, parameterLen);
+            }
+
+            if (parameterLen < 0) {
+                Timber.e("Corrupt MMS message");
+                return (PduContentTypes.contentTypes[0]).getBytes(); //"*/*"
+            }
+        } else if (cur <= TEXT_MAX) {
+            contentType = parseWapString(pduDataStream, TYPE_TEXT_STRING);
+        } else {
+            contentType =
+                (PduContentTypes.contentTypes[parseShortInteger(pduDataStream)]).getBytes();
+        }
+
+        return contentType;
+    }
+
+    /**
+     * Parse part's headers.
+     *
+     * @param pduDataStream pdu data input stream
+     * @param part to store the header informations of the part
+     * @param length length of the headers
+     * @return true if parse successfully, false otherwise
+     */
+    protected boolean parsePartHeaders(ByteArrayInputStream pduDataStream,
+            PduPart part, int length) {
+        assert(null != pduDataStream);
+        assert(null != part);
+        assert(length > 0);
+
+        /**
+         * From oma-ts-mms-conf-v1_3.pdf, chapter 10.2.
+         * A name for multipart object SHALL be encoded using name-parameter
+         * for Content-Type header in WSP multipart headers.
+         * In decoding, name-parameter of Content-Type SHALL be used if available.
+         * If name-parameter of Content-Type is not available,
+         * filename parameter of Content-Disposition header SHALL be used if available.
+         * If neither name-parameter of Content-Type header nor filename parameter
+         * of Content-Disposition header is available,
+         * Content-Location header SHALL be used if available.
+         *
+         * Within SMIL part the reference to the media object parts SHALL use
+         * either Content-ID or Content-Location mechanism [RFC2557]
+         * and the corresponding WSP part headers in media object parts
+         * contain the corresponding definitions.
+         */
+        int startPos = pduDataStream.available();
+        int tempPos = 0;
+        int lastLen = length;
+        while(0 < lastLen) {
+            int header = pduDataStream.read();
+            assert(-1 != header);
+            lastLen--;
+
+            if (header > TEXT_MAX) {
+                // Number assigned headers.
+                switch (header) {
+                    case PduPart.P_CONTENT_LOCATION:
+                        /**
+                         * From wap-230-wsp-20010705-a.pdf, chapter 8.4.2.21
+                         * Content-location-value = Uri-value
+                         */
+                        byte[] contentLocation = parseWapString(pduDataStream, TYPE_TEXT_STRING);
+                        if (null != contentLocation) {
+                            part.setContentLocation(contentLocation);
+                        }
+
+                        tempPos = pduDataStream.available();
+                        lastLen = length - (startPos - tempPos);
+                        break;
+                    case PduPart.P_CONTENT_ID:
+                        /**
+                         * From wap-230-wsp-20010705-a.pdf, chapter 8.4.2.21
+                         * Content-ID-value = Quoted-string
+                         */
+                        byte[] contentId = parseWapString(pduDataStream, TYPE_QUOTED_STRING);
+                        if (null != contentId) {
+                            part.setContentId(contentId);
+                        }
+
+                        tempPos = pduDataStream.available();
+                        lastLen = length - (startPos - tempPos);
+                        break;
+                    case PduPart.P_DEP_CONTENT_DISPOSITION:
+                    case PduPart.P_CONTENT_DISPOSITION:
+                        /**
+                         * From wap-230-wsp-20010705-a.pdf, chapter 8.4.2.21
+                         * Content-disposition-value = Value-length Disposition *(Parameter)
+                         * Disposition = Form-data | Attachment | Inline | Token-text
+                         * Form-data = <Octet 128>
+                         * Attachment = <Octet 129>
+                         * Inline = <Octet 130>
+                         */
+
+                        /*
+                         * some carrier mmsc servers do not support content_disposition
+                         * field correctly
+                         */
+                        if (mParseContentDisposition) {
+                            int len = parseValueLength(pduDataStream);
+                            pduDataStream.mark(1);
+                            int thisStartPos = pduDataStream.available();
+                            int thisEndPos = 0;
+                            int value = pduDataStream.read();
+
+                            if (value == PduPart.P_DISPOSITION_FROM_DATA ) {
+                                part.setContentDisposition(PduPart.DISPOSITION_FROM_DATA);
+                            } else if (value == PduPart.P_DISPOSITION_ATTACHMENT) {
+                                part.setContentDisposition(PduPart.DISPOSITION_ATTACHMENT);
+                            } else if (value == PduPart.P_DISPOSITION_INLINE) {
+                                part.setContentDisposition(PduPart.DISPOSITION_INLINE);
+                            } else {
+                                pduDataStream.reset();
+                                /* Token-text */
+                                part.setContentDisposition(parseWapString(pduDataStream
+                                        , TYPE_TEXT_STRING));
+                            }
+
+                            /* get filename parameter and skip other parameters */
+                            thisEndPos = pduDataStream.available();
+                            if (thisStartPos - thisEndPos < len) {
+                                value = pduDataStream.read();
+                                if (value == PduPart.P_FILENAME) { //filename is text-string
+                                    part.setFilename(parseWapString(pduDataStream
+                                            , TYPE_TEXT_STRING));
+                                }
+
+                                /* skip other parameters */
+                                thisEndPos = pduDataStream.available();
+                                if (thisStartPos - thisEndPos < len) {
+                                    int last = len - (thisStartPos - thisEndPos);
+                                    byte[] temp = new byte[last];
+                                    pduDataStream.read(temp, 0, last);
+                                }
+                            }
+
+                            tempPos = pduDataStream.available();
+                            lastLen = length - (startPos - tempPos);
+                        }
+                        break;
+                    default:
+                        if (LOCAL_LOGV) {
+                            Timber.v("Not supported Part headers: " + header);
+                        }
+                    if (-1 == skipWapValue(pduDataStream, lastLen)) {
+                        Timber.e("Corrupt Part headers");
+                        return false;
+                    }
+                    lastLen = 0;
+                    break;
+                }
+            } else if ((header >= TEXT_MIN) && (header <= TEXT_MAX)) {
+                // Not assigned header.
+                byte[] tempHeader = parseWapString(pduDataStream, TYPE_TEXT_STRING);
+                byte[] tempValue = parseWapString(pduDataStream, TYPE_TEXT_STRING);
+
+                // Check the header whether it is "Content-Transfer-Encoding".
+                if (true ==
+                    PduPart.CONTENT_TRANSFER_ENCODING.equalsIgnoreCase(new String(tempHeader))) {
+                    part.setContentTransferEncoding(tempValue);
+                }
+
+                tempPos = pduDataStream.available();
+                lastLen = length - (startPos - tempPos);
+            } else {
+                if (LOCAL_LOGV) {
+                    Timber.v("Not supported Part headers: " + header);
+                }
+                // Skip all headers of this part.
+                if (-1 == skipWapValue(pduDataStream, lastLen)) {
+                    Timber.e("Corrupt Part headers");
+                    return false;
+                }
+                lastLen = 0;
+            }
+        }
+
+        if (0 != lastLen) {
+            Timber.e("Corrupt Part headers");
+            return false;
+        }
+
+        return true;
+    }
+
+    /**
+     * Check the position of a specified part.
+     *
+     * @param part the part to be checked
+     * @return part position, THE_FIRST_PART when it's the
+     * first one, THE_LAST_PART when it's the last one.
+     */
+    private static int checkPartPosition(PduPart part) {
+        assert(null != part);
+        if ((null == mTypeParam) &&
+                (null == mStartParam)) {
+            return THE_LAST_PART;
+        }
+
+        /* check part's content-id */
+        if (null != mStartParam) {
+            byte[] contentId = part.getContentId();
+            if (null != contentId) {
+                if (true == Arrays.equals(mStartParam, contentId)) {
+                    return THE_FIRST_PART;
+                }
+            }
+        }
+
+        /* check part's content-type */
+        if (null != mTypeParam) {
+            byte[] contentType = part.getContentType();
+            if (null != contentType) {
+                if (true == Arrays.equals(mTypeParam, contentType)) {
+                    return THE_FIRST_PART;
+                }
+            }
+        }
+
+        return THE_LAST_PART;
+    }
+
+    /**
+     * Check mandatory headers of a pdu.
+     *
+     * @param headers pdu headers
+     * @return true if the pdu has all of the mandatory headers, false otherwise.
+     */
+    protected static boolean checkMandatoryHeader(PduHeaders headers) {
+        if (null == headers) {
+            return false;
+        }
+
+        /* get message type */
+        int messageType = headers.getOctet(PduHeaders.MESSAGE_TYPE);
+
+        /* check Mms-Version field */
+        int mmsVersion = headers.getOctet(PduHeaders.MMS_VERSION);
+        if (0 == mmsVersion) {
+            // Every message should have Mms-Version field.
+            return false;
+        }
+
+        /* check mandatory header fields */
+        switch (messageType) {
+            case PduHeaders.MESSAGE_TYPE_SEND_REQ:
+                // Content-Type field.
+                byte[] srContentType = headers.getTextString(PduHeaders.CONTENT_TYPE);
+                if (null == srContentType) {
+                    return false;
+                }
+
+                // From field.
+                EncodedStringValue srFrom = headers.getEncodedStringValue(PduHeaders.FROM);
+                if (null == srFrom) {
+                    return false;
+                }
+
+                // Transaction-Id field.
+                byte[] srTransactionId = headers.getTextString(PduHeaders.TRANSACTION_ID);
+                if (null == srTransactionId) {
+                    return false;
+                }
+
+                break;
+            case PduHeaders.MESSAGE_TYPE_SEND_CONF:
+                // Response-Status field.
+                int scResponseStatus = headers.getOctet(PduHeaders.RESPONSE_STATUS);
+                if (0 == scResponseStatus) {
+                    return false;
+                }
+
+                // Transaction-Id field.
+                byte[] scTransactionId = headers.getTextString(PduHeaders.TRANSACTION_ID);
+                if (null == scTransactionId) {
+                    return false;
+                }
+
+                break;
+            case PduHeaders.MESSAGE_TYPE_NOTIFICATION_IND:
+                // Content-Location field.
+                byte[] niContentLocation = headers.getTextString(PduHeaders.CONTENT_LOCATION);
+                if (null == niContentLocation) {
+                    return false;
+                }
+
+                // Expiry field.
+                long niExpiry = headers.getLongInteger(PduHeaders.EXPIRY);
+                if (-1 == niExpiry) {
+                    return false;
+                }
+
+                // Message-Class field.
+                byte[] niMessageClass = headers.getTextString(PduHeaders.MESSAGE_CLASS);
+                if (null == niMessageClass) {
+                    return false;
+                }
+
+                // Message-Size field.
+                long niMessageSize = headers.getLongInteger(PduHeaders.MESSAGE_SIZE);
+                if (-1 == niMessageSize) {
+                    return false;
+                }
+
+                // Transaction-Id field.
+                byte[] niTransactionId = headers.getTextString(PduHeaders.TRANSACTION_ID);
+                if (null == niTransactionId) {
+                    return false;
+                }
+
+                break;
+            case PduHeaders.MESSAGE_TYPE_NOTIFYRESP_IND:
+                // Status field.
+                int nriStatus = headers.getOctet(PduHeaders.STATUS);
+                if (0 == nriStatus) {
+                    return false;
+                }
+
+                // Transaction-Id field.
+                byte[] nriTransactionId = headers.getTextString(PduHeaders.TRANSACTION_ID);
+                if (null == nriTransactionId) {
+                    return false;
+                }
+
+                break;
+            case PduHeaders.MESSAGE_TYPE_RETRIEVE_CONF:
+                // Content-Type field.
+                byte[] rcContentType = headers.getTextString(PduHeaders.CONTENT_TYPE);
+                if (null == rcContentType) {
+                    return false;
+                }
+
+                // Date field.
+                long rcDate = headers.getLongInteger(PduHeaders.DATE);
+                if (-1 == rcDate) {
+                    return false;
+                }
+
+                break;
+            case PduHeaders.MESSAGE_TYPE_DELIVERY_IND:
+                // Date field.
+                long diDate = headers.getLongInteger(PduHeaders.DATE);
+                if (-1 == diDate) {
+                    return false;
+                }
+
+                // Message-Id field.
+                byte[] diMessageId = headers.getTextString(PduHeaders.MESSAGE_ID);
+                if (null == diMessageId) {
+                    return false;
+                }
+
+                // Status field.
+                int diStatus = headers.getOctet(PduHeaders.STATUS);
+                if (0 == diStatus) {
+                    return false;
+                }
+
+                // To field.
+                EncodedStringValue[] diTo = headers.getEncodedStringValues(PduHeaders.TO);
+                if (null == diTo) {
+                    return false;
+                }
+
+                break;
+            case PduHeaders.MESSAGE_TYPE_ACKNOWLEDGE_IND:
+                // Transaction-Id field.
+                byte[] aiTransactionId = headers.getTextString(PduHeaders.TRANSACTION_ID);
+                if (null == aiTransactionId) {
+                    return false;
+                }
+
+                break;
+            case PduHeaders.MESSAGE_TYPE_READ_ORIG_IND:
+                // Date field.
+                long roDate = headers.getLongInteger(PduHeaders.DATE);
+                if (-1 == roDate) {
+                    return false;
+                }
+
+                // From field.
+                EncodedStringValue roFrom = headers.getEncodedStringValue(PduHeaders.FROM);
+                if (null == roFrom) {
+                    return false;
+                }
+
+                // Message-Id field.
+                byte[] roMessageId = headers.getTextString(PduHeaders.MESSAGE_ID);
+                if (null == roMessageId) {
+                    return false;
+                }
+
+                // Read-Status field.
+                int roReadStatus = headers.getOctet(PduHeaders.READ_STATUS);
+                if (0 == roReadStatus) {
+                    return false;
+                }
+
+                // To field.
+                EncodedStringValue[] roTo = headers.getEncodedStringValues(PduHeaders.TO);
+                if (null == roTo) {
+                    return false;
+                }
+
+                break;
+            case PduHeaders.MESSAGE_TYPE_READ_REC_IND:
+                // From field.
+                EncodedStringValue rrFrom = headers.getEncodedStringValue(PduHeaders.FROM);
+                if (null == rrFrom) {
+                    return false;
+                }
+
+                // Message-Id field.
+                byte[] rrMessageId = headers.getTextString(PduHeaders.MESSAGE_ID);
+                if (null == rrMessageId) {
+                    return false;
+                }
+
+                // Read-Status field.
+                int rrReadStatus = headers.getOctet(PduHeaders.READ_STATUS);
+                if (0 == rrReadStatus) {
+                    return false;
+                }
+
+                // To field.
+                EncodedStringValue[] rrTo = headers.getEncodedStringValues(PduHeaders.TO);
+                if (null == rrTo) {
+                    return false;
+                }
+
+                break;
+            default:
+                // Parser doesn't support this message type in this version.
+                return false;
+        }
+
+        return true;
+    }
+}
diff --git a/android-smsmms/src/main/java/com/google/android/mms/pdu_alt/PduPart.java b/android-smsmms/src/main/java/com/google/android/mms/pdu_alt/PduPart.java
index 9cb631f6c..c943f93f4 100755
--- a/android-smsmms/src/main/java/com/google/android/mms/pdu_alt/PduPart.java
+++ b/android-smsmms/src/main/java/com/google/android/mms/pdu_alt/PduPart.java
@@ -1,411 +1,411 @@
-/*
- * Copyright (C) 2015 Jacob Klinker
- *
- * Licensed under the Apache License, Version 2.0 (the "License");
- * you may not use this file except in compliance with the License.
- * You may obtain a copy of the License at
- *
- * http://www.apache.org/licenses/LICENSE-2.0
- *
- * Unless required by applicable law or agreed to in writing, software
- * distributed under the License is distributed on an "AS IS" BASIS,
- * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
- * See the License for the specific language governing permissions and
- * limitations under the License.
- */
-
-package com.google.android.mms.pdu_alt;
-
-import android.net.Uri;
-
-import java.util.HashMap;
-import java.util.Map;
-
-/**
- * The pdu part.
- */
-public class PduPart {
-    /**
-     * Well-Known Parameters.
-     */
-    public static final int P_Q                  = 0x80;
-    public static final int P_CHARSET            = 0x81;
-    public static final int P_LEVEL              = 0x82;
-    public static final int P_TYPE               = 0x83;
-    public static final int P_DEP_NAME           = 0x85;
-    public static final int P_DEP_FILENAME       = 0x86;
-    public static final int P_DIFFERENCES        = 0x87;
-    public static final int P_PADDING            = 0x88;
-    // This value of "TYPE" s used with Content-Type: multipart/related
-    public static final int P_CT_MR_TYPE         = 0x89;
-    public static final int P_DEP_START          = 0x8A;
-    public static final int P_DEP_START_INFO     = 0x8B;
-    public static final int P_DEP_COMMENT        = 0x8C;
-    public static final int P_DEP_DOMAIN         = 0x8D;
-    public static final int P_MAX_AGE            = 0x8E;
-    public static final int P_DEP_PATH           = 0x8F;
-    public static final int P_SECURE             = 0x90;
-    public static final int P_SEC                = 0x91;
-    public static final int P_MAC                = 0x92;
-    public static final int P_CREATION_DATE      = 0x93;
-    public static final int P_MODIFICATION_DATE  = 0x94;
-    public static final int P_READ_DATE          = 0x95;
-    public static final int P_SIZE               = 0x96;
-    public static final int P_NAME               = 0x97;
-    public static final int P_FILENAME           = 0x98;
-    public static final int P_START              = 0x99;
-    public static final int P_START_INFO         = 0x9A;
-    public static final int P_COMMENT            = 0x9B;
-    public static final int P_DOMAIN             = 0x9C;
-    public static final int P_PATH               = 0x9D;
-
-    /**
-     *  Header field names.
-     */
-     public static final int P_CONTENT_TYPE       = 0x91;
-     public static final int P_CONTENT_LOCATION   = 0x8E;
-     public static final int P_CONTENT_ID         = 0xC0;
-     public static final int P_DEP_CONTENT_DISPOSITION = 0xAE;
-     public static final int P_CONTENT_DISPOSITION = 0xC5;
-    // The next header is unassigned header, use reserved header(0x48) value.
-     public static final int P_CONTENT_TRANSFER_ENCODING = 0xC8;
-
-     /**
-      * Content=Transfer-Encoding string.
-      */
-     public static final String CONTENT_TRANSFER_ENCODING =
-             "Content-Transfer-Encoding";
-
-     /**
-      * Value of Content-Transfer-Encoding.
-      */
-     public static final String P_BINARY = "binary";
-     public static final String P_7BIT = "7bit";
-     public static final String P_8BIT = "8bit";
-     public static final String P_BASE64 = "base64";
-     public static final String P_QUOTED_PRINTABLE = "quoted-printable";
-
-     /**
-      * Value of disposition can be set to PduPart when the value is octet in
-      * the PDU.
-      * "from-data" instead of Form-data<Octet 128>.
-      * "attachment" instead of Attachment<Octet 129>.
-      * "inline" instead of Inline<Octet 130>.
-      */
-     static final byte[] DISPOSITION_FROM_DATA = "from-data".getBytes();
-     static final byte[] DISPOSITION_ATTACHMENT = "attachment".getBytes();
-     static final byte[] DISPOSITION_INLINE = "inline".getBytes();
-
-     /**
-      * Content-Disposition value.
-      */
-     public static final int P_DISPOSITION_FROM_DATA  = 0x80;
-     public static final int P_DISPOSITION_ATTACHMENT = 0x81;
-     public static final int P_DISPOSITION_INLINE     = 0x82;
-
-     /**
-      * Header of part.
-      */
-     private Map<Integer, Object> mPartHeader = null;
-
-     /**
-      * Data uri.
-      */
-     private Uri mUri = null;
-
-     /**
-      * Part data.
-      */
-     private byte[] mPartData = null;
-
-     /**
-      * Empty Constructor.
-      */
-     public PduPart() {
-         mPartHeader = new HashMap<Integer, Object>();
-     }
-
-     /**
-      * Set part data. The data are stored as byte array.
-      *
-      * @param data the data
-      */
-     public void setData(byte[] data) {
-         if(data == null) {
-            return;
-        }
-
-         mPartData = new byte[data.length];
-         System.arraycopy(data, 0, mPartData, 0, data.length);
-     }
-
-     /**
-      * @return A copy of the part data or null if the data wasn't set or
-      *         the data is stored as Uri.
-      * @see #getDataUri
-      */
-     public byte[] getData() {
-         if(mPartData == null) {
-            return null;
-         }
-
-         byte[] byteArray = new byte[mPartData.length];
-         System.arraycopy(mPartData, 0, byteArray, 0, mPartData.length);
-         return byteArray;
-     }
-
-    /**
-     * @return The length of the data, if this object have data, else 0.
-     */
-     public int getDataLength() {
-         if(mPartData != null){
-             return mPartData.length;
-         } else {
-             return 0;
-         }
-     }
-
-
-     /**
-      * Set data uri. The data are stored as Uri.
-      *
-      * @param uri the uri
-      */
-     public void setDataUri(Uri uri) {
-         mUri = uri;
-     }
-
-     /**
-      * @return The Uri of the part data or null if the data wasn't set or
-      *         the data is stored as byte array.
-      * @see #getData
-      */
-     public Uri getDataUri() {
-         return mUri;
-     }
-
-     /**
-      * Set Content-id value
-      *
-      * @param contentId the content-id value
-      * @throws NullPointerException if the value is null.
-      */
-     public void setContentId(byte[] contentId) {
-         if((contentId == null) || (contentId.length == 0)) {
-             throw new IllegalArgumentException(
-                     "Content-Id may not be null or empty.");
-         }
-
-         if ((contentId.length > 1)
-                 && ((char) contentId[0] == '<')
-                 && ((char) contentId[contentId.length - 1] == '>')) {
-             mPartHeader.put(P_CONTENT_ID, contentId);
-             return;
-         }
-
-         // Insert beginning '<' and trailing '>' for Content-Id.
-         byte[] buffer = new byte[contentId.length + 2];
-         buffer[0] = (byte) (0xff & '<');
-         buffer[buffer.length - 1] = (byte) (0xff & '>');
-         System.arraycopy(contentId, 0, buffer, 1, contentId.length);
-         mPartHeader.put(P_CONTENT_ID, buffer);
-     }
-
-     /**
-      * Get Content-id value.
-      *
-      * @return the value
-      */
-     public byte[] getContentId() {
-         return (byte[]) mPartHeader.get(P_CONTENT_ID);
-     }
-
-     /**
-      * Set Char-set value.
-      *
-      * @param charset the value
-      */
-     public void setCharset(int charset) {
-         mPartHeader.put(P_CHARSET, charset);
-     }
-
-     /**
-      * Get Char-set value
-      *
-      * @return the charset value. Return 0 if charset was not set.
-      */
-     public int getCharset() {
-         Integer charset = (Integer) mPartHeader.get(P_CHARSET);
-         if(charset == null) {
-             return 0;
-         } else {
-             return charset.intValue();
-         }
-     }
-
-     /**
-      * Set Content-Location value.
-      *
-      * @param contentLocation the value
-      * @throws NullPointerException if the value is null.
-      */
-     public void setContentLocation(byte[] contentLocation) {
-         if(contentLocation == null) {
-             throw new NullPointerException("null content-location");
-         }
-
-         mPartHeader.put(P_CONTENT_LOCATION, contentLocation);
-     }
-
-     /**
-      * Get Content-Location value.
-      *
-      * @return the value
-      *     return PduPart.disposition[0] instead of <Octet 128> (Form-data).
-      *     return PduPart.disposition[1] instead of <Octet 129> (Attachment).
-      *     return PduPart.disposition[2] instead of <Octet 130> (Inline).
-      */
-     public byte[] getContentLocation() {
-         return (byte[]) mPartHeader.get(P_CONTENT_LOCATION);
-     }
-
-     /**
-      * Set Content-Disposition value.
-      * Use PduPart.disposition[0] instead of <Octet 128> (Form-data).
-      * Use PduPart.disposition[1] instead of <Octet 129> (Attachment).
-      * Use PduPart.disposition[2] instead of <Octet 130> (Inline).
-      *
-      * @param contentDisposition the value
-      * @throws NullPointerException if the value is null.
-      */
-     public void setContentDisposition(byte[] contentDisposition) {
-         if(contentDisposition == null) {
-             throw new NullPointerException("null content-disposition");
-         }
-
-         mPartHeader.put(P_CONTENT_DISPOSITION, contentDisposition);
-     }
-
-     /**
-      * Get Content-Disposition value.
-      *
-      * @return the value
-      */
-     public byte[] getContentDisposition() {
-         return (byte[]) mPartHeader.get(P_CONTENT_DISPOSITION);
-     }
-
-     /**
-      *  Set Content-Type value.
-      *
-      *  @param contentType the value
-      *  @throws NullPointerException if the value is null.
-      */
-     public void setContentType(byte[] contentType) {
-         if(contentType == null) {
-             throw new NullPointerException("null content-type");
-         }
-
-         mPartHeader.put(P_CONTENT_TYPE, contentType);
-     }
-
-     /**
-      * Get Content-Type value of part.
-      *
-      * @return the value
-      */
-     public byte[] getContentType() {
-         return (byte[]) mPartHeader.get(P_CONTENT_TYPE);
-     }
-
-     /**
-      * Set Content-Transfer-Encoding value
-      *
-      * @param contentTransferEncoding the content-id value
-      * @throws NullPointerException if the value is null.
-      */
-     public void setContentTransferEncoding(byte[] contentTransferEncoding) {
-         if(contentTransferEncoding == null) {
-             throw new NullPointerException("null content-transfer-encoding");
-         }
-
-         mPartHeader.put(P_CONTENT_TRANSFER_ENCODING, contentTransferEncoding);
-     }
-
-     /**
-      * Get Content-Transfer-Encoding value.
-      *
-      * @return the value
-      */
-     public byte[] getContentTransferEncoding() {
-         return (byte[]) mPartHeader.get(P_CONTENT_TRANSFER_ENCODING);
-     }
-
-     /**
-      * Set Content-type parameter: name.
-      *
-      * @param name the name value
-      * @throws NullPointerException if the value is null.
-      */
-     public void setName(byte[] name) {
-         if(null == name) {
-             throw new NullPointerException("null content-id");
-         }
-
-         mPartHeader.put(P_NAME, name);
-     }
-
-     /**
-      *  Get content-type parameter: name.
-      *
-      *  @return the name
-      */
-     public byte[] getName() {
-         return (byte[]) mPartHeader.get(P_NAME);
-     }
-
-     /**
-      * Get Content-disposition parameter: filename
-      *
-      * @param fileName the filename value
-      * @throws NullPointerException if the value is null.
-      */
-     public void setFilename(byte[] fileName) {
-         if(null == fileName) {
-             throw new NullPointerException("null content-id");
-         }
-
-         mPartHeader.put(P_FILENAME, fileName);
-     }
-
-     /**
-      * Set Content-disposition parameter: filename
-      *
-      * @return the filename
-      */
-     public byte[] getFilename() {
-         return (byte[]) mPartHeader.get(P_FILENAME);
-     }
-
-    public String generateLocation() {
-        // Assumption: At least one of the content-location / name / filename
-        // or content-id should be set. This is guaranteed by the PduParser
-        // for incoming messages and by MM composer for outgoing messages.
-        byte[] location = (byte[]) mPartHeader.get(P_NAME);
-        if(null == location) {
-            location = (byte[]) mPartHeader.get(P_FILENAME);
-
-            if (null == location) {
-                location = (byte[]) mPartHeader.get(P_CONTENT_LOCATION);
-            }
-        }
-
-        if (null == location) {
-            byte[] contentId = (byte[]) mPartHeader.get(P_CONTENT_ID);
-            return "cid:" + new String(contentId);
-        } else {
-            return new String(location);
-        }
-    }
-}
-
+/*
+ * Copyright (C) 2015 Jacob Klinker
+ *
+ * Licensed under the Apache License, Version 2.0 (the "License");
+ * you may not use this file except in compliance with the License.
+ * You may obtain a copy of the License at
+ *
+ * http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing, software
+ * distributed under the License is distributed on an "AS IS" BASIS,
+ * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ * See the License for the specific language governing permissions and
+ * limitations under the License.
+ */
+
+package com.google.android.mms.pdu_alt;
+
+import android.net.Uri;
+
+import java.util.HashMap;
+import java.util.Map;
+
+/**
+ * The pdu part.
+ */
+public class PduPart {
+    /**
+     * Well-Known Parameters.
+     */
+    public static final int P_Q                  = 0x80;
+    public static final int P_CHARSET            = 0x81;
+    public static final int P_LEVEL              = 0x82;
+    public static final int P_TYPE               = 0x83;
+    public static final int P_DEP_NAME           = 0x85;
+    public static final int P_DEP_FILENAME       = 0x86;
+    public static final int P_DIFFERENCES        = 0x87;
+    public static final int P_PADDING            = 0x88;
+    // This value of "TYPE" s used with Content-Type: multipart/related
+    public static final int P_CT_MR_TYPE         = 0x89;
+    public static final int P_DEP_START          = 0x8A;
+    public static final int P_DEP_START_INFO     = 0x8B;
+    public static final int P_DEP_COMMENT        = 0x8C;
+    public static final int P_DEP_DOMAIN         = 0x8D;
+    public static final int P_MAX_AGE            = 0x8E;
+    public static final int P_DEP_PATH           = 0x8F;
+    public static final int P_SECURE             = 0x90;
+    public static final int P_SEC                = 0x91;
+    public static final int P_MAC                = 0x92;
+    public static final int P_CREATION_DATE      = 0x93;
+    public static final int P_MODIFICATION_DATE  = 0x94;
+    public static final int P_READ_DATE          = 0x95;
+    public static final int P_SIZE               = 0x96;
+    public static final int P_NAME               = 0x97;
+    public static final int P_FILENAME           = 0x98;
+    public static final int P_START              = 0x99;
+    public static final int P_START_INFO         = 0x9A;
+    public static final int P_COMMENT            = 0x9B;
+    public static final int P_DOMAIN             = 0x9C;
+    public static final int P_PATH               = 0x9D;
+
+    /**
+     *  Header field names.
+     */
+     public static final int P_CONTENT_TYPE       = 0x91;
+     public static final int P_CONTENT_LOCATION   = 0x8E;
+     public static final int P_CONTENT_ID         = 0xC0;
+     public static final int P_DEP_CONTENT_DISPOSITION = 0xAE;
+     public static final int P_CONTENT_DISPOSITION = 0xC5;
+    // The next header is unassigned header, use reserved header(0x48) value.
+     public static final int P_CONTENT_TRANSFER_ENCODING = 0xC8;
+
+     /**
+      * Content=Transfer-Encoding string.
+      */
+     public static final String CONTENT_TRANSFER_ENCODING =
+             "Content-Transfer-Encoding";
+
+     /**
+      * Value of Content-Transfer-Encoding.
+      */
+     public static final String P_BINARY = "binary";
+     public static final String P_7BIT = "7bit";
+     public static final String P_8BIT = "8bit";
+     public static final String P_BASE64 = "base64";
+     public static final String P_QUOTED_PRINTABLE = "quoted-printable";
+
+     /**
+      * Value of disposition can be set to PduPart when the value is octet in
+      * the PDU.
+      * "from-data" instead of Form-data<Octet 128>.
+      * "attachment" instead of Attachment<Octet 129>.
+      * "inline" instead of Inline<Octet 130>.
+      */
+     static final byte[] DISPOSITION_FROM_DATA = "from-data".getBytes();
+     static final byte[] DISPOSITION_ATTACHMENT = "attachment".getBytes();
+     static final byte[] DISPOSITION_INLINE = "inline".getBytes();
+
+     /**
+      * Content-Disposition value.
+      */
+     public static final int P_DISPOSITION_FROM_DATA  = 0x80;
+     public static final int P_DISPOSITION_ATTACHMENT = 0x81;
+     public static final int P_DISPOSITION_INLINE     = 0x82;
+
+     /**
+      * Header of part.
+      */
+     private Map<Integer, Object> mPartHeader = null;
+
+     /**
+      * Data uri.
+      */
+     private Uri mUri = null;
+
+     /**
+      * Part data.
+      */
+     private byte[] mPartData = null;
+
+     /**
+      * Empty Constructor.
+      */
+     public PduPart() {
+         mPartHeader = new HashMap<Integer, Object>();
+     }
+
+     /**
+      * Set part data. The data are stored as byte array.
+      *
+      * @param data the data
+      */
+     public void setData(byte[] data) {
+         if(data == null) {
+            return;
+        }
+
+         mPartData = new byte[data.length];
+         System.arraycopy(data, 0, mPartData, 0, data.length);
+     }
+
+     /**
+      * @return A copy of the part data or null if the data wasn't set or
+      *         the data is stored as Uri.
+      * @see #getDataUri
+      */
+     public byte[] getData() {
+         if(mPartData == null) {
+            return null;
+         }
+
+         byte[] byteArray = new byte[mPartData.length];
+         System.arraycopy(mPartData, 0, byteArray, 0, mPartData.length);
+         return byteArray;
+     }
+
+    /**
+     * @return The length of the data, if this object have data, else 0.
+     */
+     public int getDataLength() {
+         if(mPartData != null){
+             return mPartData.length;
+         } else {
+             return 0;
+         }
+     }
+
+
+     /**
+      * Set data uri. The data are stored as Uri.
+      *
+      * @param uri the uri
+      */
+     public void setDataUri(Uri uri) {
+         mUri = uri;
+     }
+
+     /**
+      * @return The Uri of the part data or null if the data wasn't set or
+      *         the data is stored as byte array.
+      * @see #getData
+      */
+     public Uri getDataUri() {
+         return mUri;
+     }
+
+     /**
+      * Set Content-id value
+      *
+      * @param contentId the content-id value
+      * @throws NullPointerException if the value is null.
+      */
+     public void setContentId(byte[] contentId) {
+         if((contentId == null) || (contentId.length == 0)) {
+             throw new IllegalArgumentException(
+                     "Content-Id may not be null or empty.");
+         }
+
+         if ((contentId.length > 1)
+                 && ((char) contentId[0] == '<')
+                 && ((char) contentId[contentId.length - 1] == '>')) {
+             mPartHeader.put(P_CONTENT_ID, contentId);
+             return;
+         }
+
+         // Insert beginning '<' and trailing '>' for Content-Id.
+         byte[] buffer = new byte[contentId.length + 2];
+         buffer[0] = (byte) (0xff & '<');
+         buffer[buffer.length - 1] = (byte) (0xff & '>');
+         System.arraycopy(contentId, 0, buffer, 1, contentId.length);
+         mPartHeader.put(P_CONTENT_ID, buffer);
+     }
+
+     /**
+      * Get Content-id value.
+      *
+      * @return the value
+      */
+     public byte[] getContentId() {
+         return (byte[]) mPartHeader.get(P_CONTENT_ID);
+     }
+
+     /**
+      * Set Char-set value.
+      *
+      * @param charset the value
+      */
+     public void setCharset(int charset) {
+         mPartHeader.put(P_CHARSET, charset);
+     }
+
+     /**
+      * Get Char-set value
+      *
+      * @return the charset value. Return 0 if charset was not set.
+      */
+     public int getCharset() {
+         Integer charset = (Integer) mPartHeader.get(P_CHARSET);
+         if(charset == null) {
+             return 0;
+         } else {
+             return charset.intValue();
+         }
+     }
+
+     /**
+      * Set Content-Location value.
+      *
+      * @param contentLocation the value
+      * @throws NullPointerException if the value is null.
+      */
+     public void setContentLocation(byte[] contentLocation) {
+         if(contentLocation == null) {
+             throw new NullPointerException("null content-location");
+         }
+
+         mPartHeader.put(P_CONTENT_LOCATION, contentLocation);
+     }
+
+     /**
+      * Get Content-Location value.
+      *
+      * @return the value
+      *     return PduPart.disposition[0] instead of <Octet 128> (Form-data).
+      *     return PduPart.disposition[1] instead of <Octet 129> (Attachment).
+      *     return PduPart.disposition[2] instead of <Octet 130> (Inline).
+      */
+     public byte[] getContentLocation() {
+         return (byte[]) mPartHeader.get(P_CONTENT_LOCATION);
+     }
+
+     /**
+      * Set Content-Disposition value.
+      * Use PduPart.disposition[0] instead of <Octet 128> (Form-data).
+      * Use PduPart.disposition[1] instead of <Octet 129> (Attachment).
+      * Use PduPart.disposition[2] instead of <Octet 130> (Inline).
+      *
+      * @param contentDisposition the value
+      * @throws NullPointerException if the value is null.
+      */
+     public void setContentDisposition(byte[] contentDisposition) {
+         if(contentDisposition == null) {
+             throw new NullPointerException("null content-disposition");
+         }
+
+         mPartHeader.put(P_CONTENT_DISPOSITION, contentDisposition);
+     }
+
+     /**
+      * Get Content-Disposition value.
+      *
+      * @return the value
+      */
+     public byte[] getContentDisposition() {
+         return (byte[]) mPartHeader.get(P_CONTENT_DISPOSITION);
+     }
+
+     /**
+      *  Set Content-Type value.
+      *
+      *  @param contentType the value
+      *  @throws NullPointerException if the value is null.
+      */
+     public void setContentType(byte[] contentType) {
+         if(contentType == null) {
+             throw new NullPointerException("null content-type");
+         }
+
+         mPartHeader.put(P_CONTENT_TYPE, contentType);
+     }
+
+     /**
+      * Get Content-Type value of part.
+      *
+      * @return the value
+      */
+     public byte[] getContentType() {
+         return (byte[]) mPartHeader.get(P_CONTENT_TYPE);
+     }
+
+     /**
+      * Set Content-Transfer-Encoding value
+      *
+      * @param contentTransferEncoding the content-id value
+      * @throws NullPointerException if the value is null.
+      */
+     public void setContentTransferEncoding(byte[] contentTransferEncoding) {
+         if(contentTransferEncoding == null) {
+             throw new NullPointerException("null content-transfer-encoding");
+         }
+
+         mPartHeader.put(P_CONTENT_TRANSFER_ENCODING, contentTransferEncoding);
+     }
+
+     /**
+      * Get Content-Transfer-Encoding value.
+      *
+      * @return the value
+      */
+     public byte[] getContentTransferEncoding() {
+         return (byte[]) mPartHeader.get(P_CONTENT_TRANSFER_ENCODING);
+     }
+
+     /**
+      * Set Content-type parameter: name.
+      *
+      * @param name the name value
+      * @throws NullPointerException if the value is null.
+      */
+     public void setName(byte[] name) {
+         if(null == name) {
+             throw new NullPointerException("null content-id");
+         }
+
+         mPartHeader.put(P_NAME, name);
+     }
+
+     /**
+      *  Get content-type parameter: name.
+      *
+      *  @return the name
+      */
+     public byte[] getName() {
+         return (byte[]) mPartHeader.get(P_NAME);
+     }
+
+     /**
+      * Get Content-disposition parameter: filename
+      *
+      * @param fileName the filename value
+      * @throws NullPointerException if the value is null.
+      */
+     public void setFilename(byte[] fileName) {
+         if(null == fileName) {
+             throw new NullPointerException("null content-id");
+         }
+
+         mPartHeader.put(P_FILENAME, fileName);
+     }
+
+     /**
+      * Set Content-disposition parameter: filename
+      *
+      * @return the filename
+      */
+     public byte[] getFilename() {
+         return (byte[]) mPartHeader.get(P_FILENAME);
+     }
+
+    public String generateLocation() {
+        // Assumption: At least one of the content-location / name / filename
+        // or content-id should be set. This is guaranteed by the PduParser
+        // for incoming messages and by MM composer for outgoing messages.
+        byte[] location = (byte[]) mPartHeader.get(P_NAME);
+        if(null == location) {
+            location = (byte[]) mPartHeader.get(P_FILENAME);
+
+            if (null == location) {
+                location = (byte[]) mPartHeader.get(P_CONTENT_LOCATION);
+            }
+        }
+
+        if (null == location) {
+            byte[] contentId = (byte[]) mPartHeader.get(P_CONTENT_ID);
+            return "cid:" + new String(contentId);
+        } else {
+            return new String(location);
+        }
+    }
+}
+
diff --git a/android-smsmms/src/main/java/com/google/android/mms/pdu_alt/PduPersister.java b/android-smsmms/src/main/java/com/google/android/mms/pdu_alt/PduPersister.java
index 07bcb551f..d64479682 100755
--- a/android-smsmms/src/main/java/com/google/android/mms/pdu_alt/PduPersister.java
+++ b/android-smsmms/src/main/java/com/google/android/mms/pdu_alt/PduPersister.java
@@ -1,1611 +1,1611 @@
-/*
- * Copyright (C) 2015 Jacob Klinker
- *
- * Licensed under the Apache License, Version 2.0 (the "License");
- * you may not use this file except in compliance with the License.
- * You may obtain a copy of the License at
- *
- * http://www.apache.org/licenses/LICENSE-2.0
- *
- * Unless required by applicable law or agreed to in writing, software
- * distributed under the License is distributed on an "AS IS" BASIS,
- * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
- * See the License for the specific language governing permissions and
- * limitations under the License.
- */
-
-package com.google.android.mms.pdu_alt;
-
-import android.Manifest;
-import android.content.ContentResolver;
-import android.content.ContentUris;
-import android.content.ContentValues;
-import android.content.Context;
-import android.content.pm.PackageManager;
-import android.database.Cursor;
-import android.database.DatabaseUtils;
-import android.database.sqlite.SQLiteException;
-import android.drm.DrmManagerClient;
-import android.net.Uri;
-import android.os.Build;
-import android.provider.MediaStore;
-import android.provider.Telephony.Mms;
-import android.provider.Telephony.Mms.Addr;
-import android.provider.Telephony.Mms.Part;
-import android.provider.Telephony.MmsSms;
-import android.provider.Telephony.MmsSms.PendingMessages;
-import android.provider.Telephony.Threads;
-import android.telephony.PhoneNumberUtils;
-import android.telephony.TelephonyManager;
-import android.text.TextUtils;
-import com.google.android.mms.ContentType;
-import com.google.android.mms.InvalidHeaderValueException;
-import com.google.android.mms.MmsException;
-import com.google.android.mms.util_alt.DownloadDrmHelper;
-import com.google.android.mms.util_alt.DrmConvertSession;
-import com.google.android.mms.util_alt.PduCache;
-import com.google.android.mms.util_alt.PduCacheEntry;
-import com.google.android.mms.util_alt.SqliteWrapper;
-import timber.log.Timber;
-
-import java.io.ByteArrayOutputStream;
-import java.io.File;
-import java.io.FileNotFoundException;
-import java.io.IOException;
-import java.io.InputStream;
-import java.io.OutputStream;
-import java.io.UnsupportedEncodingException;
-import java.util.ArrayList;
-import java.util.HashMap;
-import java.util.HashSet;
-import java.util.Map.Entry;
-import java.util.Set;
-
-/**
- * This class is the high-level manager of PDU storage.
- */
-public class PduPersister {
-    private static final boolean LOCAL_LOGV = false;
-
-    public static final long DUMMY_THREAD_ID = Long.MAX_VALUE;
-    private static final int DEFAULT_SUBSCRIPTION = 0;
-    private static final int MAX_TEXT_BODY_SIZE = 300 * 1024;
-
-    /**
-     * The uri of temporary drm objects.
-     */
-    public static final String TEMPORARY_DRM_OBJECT_URI =
-            "content://mms/" + Long.MAX_VALUE + "/part";
-    /**
-     * Indicate that we transiently failed to process a MM.
-     */
-    public static final int PROC_STATUS_TRANSIENT_FAILURE = 1;
-    /**
-     * Indicate that we permanently failed to process a MM.
-     */
-    public static final int PROC_STATUS_PERMANENTLY_FAILURE = 2;
-    /**
-     * Indicate that we have successfully processed a MM.
-     */
-    public static final int PROC_STATUS_COMPLETED = 3;
-
-    private static PduPersister sPersister;
-    private static final PduCache PDU_CACHE_INSTANCE;
-
-    private static final int[] ADDRESS_FIELDS = new int[]{
-            PduHeaders.BCC,
-            PduHeaders.CC,
-            PduHeaders.FROM,
-            PduHeaders.TO
-    };
-
-    private static final String[] PDU_PROJECTION = new String[]{
-            Mms._ID,
-            Mms.MESSAGE_BOX,
-            Mms.THREAD_ID,
-            Mms.RETRIEVE_TEXT,
-            Mms.SUBJECT,
-            Mms.CONTENT_LOCATION,
-            Mms.CONTENT_TYPE,
-            Mms.MESSAGE_CLASS,
-            Mms.MESSAGE_ID,
-            Mms.RESPONSE_TEXT,
-            Mms.TRANSACTION_ID,
-            Mms.CONTENT_CLASS,
-            Mms.DELIVERY_REPORT,
-            Mms.MESSAGE_TYPE,
-            Mms.MMS_VERSION,
-            Mms.PRIORITY,
-            Mms.READ_REPORT,
-            Mms.READ_STATUS,
-            Mms.REPORT_ALLOWED,
-            Mms.RETRIEVE_STATUS,
-            Mms.STATUS,
-            Mms.DATE,
-            Mms.DELIVERY_TIME,
-            Mms.EXPIRY,
-            Mms.MESSAGE_SIZE,
-            Mms.SUBJECT_CHARSET,
-            Mms.RETRIEVE_TEXT_CHARSET,
-    };
-
-    private static final int PDU_COLUMN_ID = 0;
-    private static final int PDU_COLUMN_MESSAGE_BOX = 1;
-    private static final int PDU_COLUMN_THREAD_ID = 2;
-    private static final int PDU_COLUMN_RETRIEVE_TEXT = 3;
-    private static final int PDU_COLUMN_SUBJECT = 4;
-    private static final int PDU_COLUMN_CONTENT_LOCATION = 5;
-    private static final int PDU_COLUMN_CONTENT_TYPE = 6;
-    private static final int PDU_COLUMN_MESSAGE_CLASS = 7;
-    private static final int PDU_COLUMN_MESSAGE_ID = 8;
-    private static final int PDU_COLUMN_RESPONSE_TEXT = 9;
-    private static final int PDU_COLUMN_TRANSACTION_ID = 10;
-    private static final int PDU_COLUMN_CONTENT_CLASS = 11;
-    private static final int PDU_COLUMN_DELIVERY_REPORT = 12;
-    private static final int PDU_COLUMN_MESSAGE_TYPE = 13;
-    private static final int PDU_COLUMN_MMS_VERSION = 14;
-    private static final int PDU_COLUMN_PRIORITY = 15;
-    private static final int PDU_COLUMN_READ_REPORT = 16;
-    private static final int PDU_COLUMN_READ_STATUS = 17;
-    private static final int PDU_COLUMN_REPORT_ALLOWED = 18;
-    private static final int PDU_COLUMN_RETRIEVE_STATUS = 19;
-    private static final int PDU_COLUMN_STATUS = 20;
-    private static final int PDU_COLUMN_DATE = 21;
-    private static final int PDU_COLUMN_DELIVERY_TIME = 22;
-    private static final int PDU_COLUMN_EXPIRY = 23;
-    private static final int PDU_COLUMN_MESSAGE_SIZE = 24;
-    private static final int PDU_COLUMN_SUBJECT_CHARSET = 25;
-    private static final int PDU_COLUMN_RETRIEVE_TEXT_CHARSET = 26;
-
-    private static final String[] PART_PROJECTION = new String[]{
-            Part._ID,
-            Part.CHARSET,
-            Part.CONTENT_DISPOSITION,
-            Part.CONTENT_ID,
-            Part.CONTENT_LOCATION,
-            Part.CONTENT_TYPE,
-            Part.FILENAME,
-            Part.NAME,
-            Part.TEXT
-    };
-
-    private static final int PART_COLUMN_ID = 0;
-    private static final int PART_COLUMN_CHARSET = 1;
-    private static final int PART_COLUMN_CONTENT_DISPOSITION = 2;
-    private static final int PART_COLUMN_CONTENT_ID = 3;
-    private static final int PART_COLUMN_CONTENT_LOCATION = 4;
-    private static final int PART_COLUMN_CONTENT_TYPE = 5;
-    private static final int PART_COLUMN_FILENAME = 6;
-    private static final int PART_COLUMN_NAME = 7;
-    private static final int PART_COLUMN_TEXT = 8;
-
-    private static final HashMap<Uri, Integer> MESSAGE_BOX_MAP;
-    // These map are used for convenience in persist() and load().
-    private static final HashMap<Integer, Integer> CHARSET_COLUMN_INDEX_MAP;
-    private static final HashMap<Integer, Integer> ENCODED_STRING_COLUMN_INDEX_MAP;
-    private static final HashMap<Integer, Integer> TEXT_STRING_COLUMN_INDEX_MAP;
-    private static final HashMap<Integer, Integer> OCTET_COLUMN_INDEX_MAP;
-    private static final HashMap<Integer, Integer> LONG_COLUMN_INDEX_MAP;
-    private static final HashMap<Integer, String> CHARSET_COLUMN_NAME_MAP;
-    private static final HashMap<Integer, String> ENCODED_STRING_COLUMN_NAME_MAP;
-    private static final HashMap<Integer, String> TEXT_STRING_COLUMN_NAME_MAP;
-    private static final HashMap<Integer, String> OCTET_COLUMN_NAME_MAP;
-    private static final HashMap<Integer, String> LONG_COLUMN_NAME_MAP;
-
-    static {
-        MESSAGE_BOX_MAP = new HashMap<Uri, Integer>();
-        MESSAGE_BOX_MAP.put(Mms.Inbox.CONTENT_URI, Mms.MESSAGE_BOX_INBOX);
-        MESSAGE_BOX_MAP.put(Mms.Sent.CONTENT_URI, Mms.MESSAGE_BOX_SENT);
-        MESSAGE_BOX_MAP.put(Mms.Draft.CONTENT_URI, Mms.MESSAGE_BOX_DRAFTS);
-        MESSAGE_BOX_MAP.put(Mms.Outbox.CONTENT_URI, Mms.MESSAGE_BOX_OUTBOX);
-
-        CHARSET_COLUMN_INDEX_MAP = new HashMap<Integer, Integer>();
-        CHARSET_COLUMN_INDEX_MAP.put(PduHeaders.SUBJECT, PDU_COLUMN_SUBJECT_CHARSET);
-        CHARSET_COLUMN_INDEX_MAP.put(PduHeaders.RETRIEVE_TEXT, PDU_COLUMN_RETRIEVE_TEXT_CHARSET);
-
-        CHARSET_COLUMN_NAME_MAP = new HashMap<Integer, String>();
-        CHARSET_COLUMN_NAME_MAP.put(PduHeaders.SUBJECT, Mms.SUBJECT_CHARSET);
-        CHARSET_COLUMN_NAME_MAP.put(PduHeaders.RETRIEVE_TEXT, Mms.RETRIEVE_TEXT_CHARSET);
-
-        // Encoded string field code -> column index/name map.
-        ENCODED_STRING_COLUMN_INDEX_MAP = new HashMap<Integer, Integer>();
-        ENCODED_STRING_COLUMN_INDEX_MAP.put(PduHeaders.RETRIEVE_TEXT, PDU_COLUMN_RETRIEVE_TEXT);
-        ENCODED_STRING_COLUMN_INDEX_MAP.put(PduHeaders.SUBJECT, PDU_COLUMN_SUBJECT);
-
-        ENCODED_STRING_COLUMN_NAME_MAP = new HashMap<Integer, String>();
-        ENCODED_STRING_COLUMN_NAME_MAP.put(PduHeaders.RETRIEVE_TEXT, Mms.RETRIEVE_TEXT);
-        ENCODED_STRING_COLUMN_NAME_MAP.put(PduHeaders.SUBJECT, Mms.SUBJECT);
-
-        // Text string field code -> column index/name map.
-        TEXT_STRING_COLUMN_INDEX_MAP = new HashMap<Integer, Integer>();
-        TEXT_STRING_COLUMN_INDEX_MAP.put(PduHeaders.CONTENT_LOCATION, PDU_COLUMN_CONTENT_LOCATION);
-        TEXT_STRING_COLUMN_INDEX_MAP.put(PduHeaders.CONTENT_TYPE, PDU_COLUMN_CONTENT_TYPE);
-        TEXT_STRING_COLUMN_INDEX_MAP.put(PduHeaders.MESSAGE_CLASS, PDU_COLUMN_MESSAGE_CLASS);
-        TEXT_STRING_COLUMN_INDEX_MAP.put(PduHeaders.MESSAGE_ID, PDU_COLUMN_MESSAGE_ID);
-        TEXT_STRING_COLUMN_INDEX_MAP.put(PduHeaders.RESPONSE_TEXT, PDU_COLUMN_RESPONSE_TEXT);
-        TEXT_STRING_COLUMN_INDEX_MAP.put(PduHeaders.TRANSACTION_ID, PDU_COLUMN_TRANSACTION_ID);
-
-        TEXT_STRING_COLUMN_NAME_MAP = new HashMap<Integer, String>();
-        TEXT_STRING_COLUMN_NAME_MAP.put(PduHeaders.CONTENT_LOCATION, Mms.CONTENT_LOCATION);
-        TEXT_STRING_COLUMN_NAME_MAP.put(PduHeaders.CONTENT_TYPE, Mms.CONTENT_TYPE);
-        TEXT_STRING_COLUMN_NAME_MAP.put(PduHeaders.MESSAGE_CLASS, Mms.MESSAGE_CLASS);
-        TEXT_STRING_COLUMN_NAME_MAP.put(PduHeaders.MESSAGE_ID, Mms.MESSAGE_ID);
-        TEXT_STRING_COLUMN_NAME_MAP.put(PduHeaders.RESPONSE_TEXT, Mms.RESPONSE_TEXT);
-        TEXT_STRING_COLUMN_NAME_MAP.put(PduHeaders.TRANSACTION_ID, Mms.TRANSACTION_ID);
-
-        // Octet field code -> column index/name map.
-        OCTET_COLUMN_INDEX_MAP = new HashMap<Integer, Integer>();
-        OCTET_COLUMN_INDEX_MAP.put(PduHeaders.CONTENT_CLASS, PDU_COLUMN_CONTENT_CLASS);
-        OCTET_COLUMN_INDEX_MAP.put(PduHeaders.DELIVERY_REPORT, PDU_COLUMN_DELIVERY_REPORT);
-        OCTET_COLUMN_INDEX_MAP.put(PduHeaders.MESSAGE_TYPE, PDU_COLUMN_MESSAGE_TYPE);
-        OCTET_COLUMN_INDEX_MAP.put(PduHeaders.MMS_VERSION, PDU_COLUMN_MMS_VERSION);
-        OCTET_COLUMN_INDEX_MAP.put(PduHeaders.PRIORITY, PDU_COLUMN_PRIORITY);
-        OCTET_COLUMN_INDEX_MAP.put(PduHeaders.READ_REPORT, PDU_COLUMN_READ_REPORT);
-        OCTET_COLUMN_INDEX_MAP.put(PduHeaders.READ_STATUS, PDU_COLUMN_READ_STATUS);
-        OCTET_COLUMN_INDEX_MAP.put(PduHeaders.REPORT_ALLOWED, PDU_COLUMN_REPORT_ALLOWED);
-        OCTET_COLUMN_INDEX_MAP.put(PduHeaders.RETRIEVE_STATUS, PDU_COLUMN_RETRIEVE_STATUS);
-        OCTET_COLUMN_INDEX_MAP.put(PduHeaders.STATUS, PDU_COLUMN_STATUS);
-
-        OCTET_COLUMN_NAME_MAP = new HashMap<Integer, String>();
-        OCTET_COLUMN_NAME_MAP.put(PduHeaders.CONTENT_CLASS, Mms.CONTENT_CLASS);
-        OCTET_COLUMN_NAME_MAP.put(PduHeaders.DELIVERY_REPORT, Mms.DELIVERY_REPORT);
-        OCTET_COLUMN_NAME_MAP.put(PduHeaders.MESSAGE_TYPE, Mms.MESSAGE_TYPE);
-        OCTET_COLUMN_NAME_MAP.put(PduHeaders.MMS_VERSION, Mms.MMS_VERSION);
-        OCTET_COLUMN_NAME_MAP.put(PduHeaders.PRIORITY, Mms.PRIORITY);
-        OCTET_COLUMN_NAME_MAP.put(PduHeaders.READ_REPORT, Mms.READ_REPORT);
-        OCTET_COLUMN_NAME_MAP.put(PduHeaders.READ_STATUS, Mms.READ_STATUS);
-        OCTET_COLUMN_NAME_MAP.put(PduHeaders.REPORT_ALLOWED, Mms.REPORT_ALLOWED);
-        OCTET_COLUMN_NAME_MAP.put(PduHeaders.RETRIEVE_STATUS, Mms.RETRIEVE_STATUS);
-        OCTET_COLUMN_NAME_MAP.put(PduHeaders.STATUS, Mms.STATUS);
-
-        // Long field code -> column index/name map.
-        LONG_COLUMN_INDEX_MAP = new HashMap<Integer, Integer>();
-        LONG_COLUMN_INDEX_MAP.put(PduHeaders.DATE, PDU_COLUMN_DATE);
-        LONG_COLUMN_INDEX_MAP.put(PduHeaders.DELIVERY_TIME, PDU_COLUMN_DELIVERY_TIME);
-        LONG_COLUMN_INDEX_MAP.put(PduHeaders.EXPIRY, PDU_COLUMN_EXPIRY);
-        LONG_COLUMN_INDEX_MAP.put(PduHeaders.MESSAGE_SIZE, PDU_COLUMN_MESSAGE_SIZE);
-
-        LONG_COLUMN_NAME_MAP = new HashMap<Integer, String>();
-        LONG_COLUMN_NAME_MAP.put(PduHeaders.DATE, Mms.DATE);
-        LONG_COLUMN_NAME_MAP.put(PduHeaders.DELIVERY_TIME, Mms.DELIVERY_TIME);
-        LONG_COLUMN_NAME_MAP.put(PduHeaders.EXPIRY, Mms.EXPIRY);
-        LONG_COLUMN_NAME_MAP.put(PduHeaders.MESSAGE_SIZE, Mms.MESSAGE_SIZE);
-
-        PDU_CACHE_INSTANCE = PduCache.getInstance();
-    }
-
-    private final Context mContext;
-    private final ContentResolver mContentResolver;
-    private final DrmManagerClient mDrmManagerClient;
-    private final TelephonyManager mTelephonyManager;
-
-    private PduPersister(Context context) {
-        mContext = context;
-        mContentResolver = context.getContentResolver();
-        mDrmManagerClient = new DrmManagerClient(context);
-        mTelephonyManager = (TelephonyManager) context
-                .getSystemService(Context.TELEPHONY_SERVICE);
-    }
-
-    /**
-     * Get(or create if not exist) an instance of PduPersister
-     */
-    public static PduPersister getPduPersister(Context context) {
-        if ((sPersister == null)) {
-            sPersister = new PduPersister(context);
-        } else if (!context.equals(sPersister.mContext)) {
-            sPersister.release();
-            sPersister = new PduPersister(context);
-        }
-
-        return sPersister;
-    }
-
-    private void setEncodedStringValueToHeaders(
-            Cursor c, int columnIndex,
-            PduHeaders headers, int mapColumn) {
-        String s = c.getString(columnIndex);
-        if ((s != null) && (s.length() > 0)) {
-            int charsetColumnIndex = CHARSET_COLUMN_INDEX_MAP.get(mapColumn);
-            int charset = c.getInt(charsetColumnIndex);
-            EncodedStringValue value = new EncodedStringValue(
-                    charset, getBytes(s));
-            headers.setEncodedStringValue(value, mapColumn);
-        }
-    }
-
-    private void setTextStringToHeaders(
-            Cursor c, int columnIndex,
-            PduHeaders headers, int mapColumn) {
-        String s = c.getString(columnIndex);
-        if (s != null) {
-            headers.setTextString(getBytes(s), mapColumn);
-        }
-    }
-
-    private void setOctetToHeaders(
-            Cursor c, int columnIndex,
-            PduHeaders headers, int mapColumn) throws InvalidHeaderValueException {
-        if (!c.isNull(columnIndex)) {
-            int b = c.getInt(columnIndex);
-            headers.setOctet(b, mapColumn);
-        }
-    }
-
-    private void setLongToHeaders(
-            Cursor c, int columnIndex,
-            PduHeaders headers, int mapColumn) {
-        if (!c.isNull(columnIndex)) {
-            long l = c.getLong(columnIndex);
-            headers.setLongInteger(l, mapColumn);
-        }
-    }
-
-    private Integer getIntegerFromPartColumn(Cursor c, int columnIndex) {
-        if (!c.isNull(columnIndex)) {
-            return c.getInt(columnIndex);
-        }
-        return null;
-    }
-
-    private byte[] getByteArrayFromPartColumn(Cursor c, int columnIndex) {
-        if (!c.isNull(columnIndex)) {
-            return getBytes(c.getString(columnIndex));
-        }
-        return null;
-    }
-
-    private PduPart[] loadParts(long msgId) throws MmsException {
-        Cursor c = SqliteWrapper.query(mContext, mContentResolver,
-                Uri.parse("content://mms/" + msgId + "/part"),
-                PART_PROJECTION, null, null, null);
-
-        PduPart[] parts = null;
-
-        try {
-            if ((c == null) || (c.getCount() == 0)) {
-                if (LOCAL_LOGV) {
-                    Timber.v("loadParts(" + msgId + "): no part to load.");
-                }
-                return null;
-            }
-
-            int partCount = c.getCount();
-            int partIdx = 0;
-            parts = new PduPart[partCount];
-            while (c.moveToNext()) {
-                PduPart part = new PduPart();
-                Integer charset = getIntegerFromPartColumn(
-                        c, PART_COLUMN_CHARSET);
-                if (charset != null) {
-                    part.setCharset(charset);
-                }
-
-                byte[] contentDisposition = getByteArrayFromPartColumn(
-                        c, PART_COLUMN_CONTENT_DISPOSITION);
-                if (contentDisposition != null) {
-                    part.setContentDisposition(contentDisposition);
-                }
-
-                byte[] contentId = getByteArrayFromPartColumn(
-                        c, PART_COLUMN_CONTENT_ID);
-                if (contentId != null) {
-                    part.setContentId(contentId);
-                }
-
-                byte[] contentLocation = getByteArrayFromPartColumn(
-                        c, PART_COLUMN_CONTENT_LOCATION);
-                if (contentLocation != null) {
-                    part.setContentLocation(contentLocation);
-                }
-
-                byte[] contentType = getByteArrayFromPartColumn(
-                        c, PART_COLUMN_CONTENT_TYPE);
-                if (contentType != null) {
-                    part.setContentType(contentType);
-                } else {
-                    throw new MmsException("Content-Type must be set.");
-                }
-
-                byte[] fileName = getByteArrayFromPartColumn(
-                        c, PART_COLUMN_FILENAME);
-                if (fileName != null) {
-                    part.setFilename(fileName);
-                }
-
-                byte[] name = getByteArrayFromPartColumn(
-                        c, PART_COLUMN_NAME);
-                if (name != null) {
-                    part.setName(name);
-                }
-
-                // Construct a Uri for this part.
-                long partId = c.getLong(PART_COLUMN_ID);
-                Uri partURI = Uri.parse("content://mms/part/" + partId);
-                part.setDataUri(partURI);
-
-                // For images/audio/video, we won't keep their data in Part
-                // because their renderer accept Uri as source.
-                String type = toIsoString(contentType);
-                if (!ContentType.isImageType(type)
-                        && !ContentType.isAudioType(type)
-                        && !ContentType.isVideoType(type)) {
-                    ByteArrayOutputStream baos = new ByteArrayOutputStream();
-                    InputStream is = null;
-
-                    // Store simple string values directly in the database instead of an
-                    // external file.  This makes the text searchable and retrieval slightly
-                    // faster.
-                    if (ContentType.TEXT_PLAIN.equals(type) || ContentType.APP_SMIL.equals(type)
-                            || ContentType.TEXT_HTML.equals(type)) {
-                        String text = c.getString(PART_COLUMN_TEXT);
-                        byte[] blob = new EncodedStringValue(text != null ? text : "")
-                                .getTextString();
-                        baos.write(blob, 0, blob.length);
-                    } else {
-
-                        try {
-                            is = mContentResolver.openInputStream(partURI);
-
-                            byte[] buffer = new byte[256];
-                            int len = is.read(buffer);
-                            while (len >= 0) {
-                                baos.write(buffer, 0, len);
-                                len = is.read(buffer);
-                            }
-                        } catch (IOException e) {
-                            Timber.e(e, "Failed to load part data");
-                            c.close();
-                            throw new MmsException(e);
-                        } finally {
-                            if (is != null) {
-                                try {
-                                    is.close();
-                                } catch (IOException e) {
-                                    Timber.e(e, "Failed to close stream");
-                                } // Ignore
-                            }
-                        }
-                    }
-                    part.setData(baos.toByteArray());
-                }
-                parts[partIdx++] = part;
-            }
-        } finally {
-            if (c != null) {
-                c.close();
-            }
-        }
-
-        return parts;
-    }
-
-    private void loadAddress(long msgId, PduHeaders headers) {
-        Cursor c = SqliteWrapper.query(mContext, mContentResolver,
-                Uri.parse("content://mms/" + msgId + "/addr"),
-                new String[]{Addr.ADDRESS, Addr.CHARSET, Addr.TYPE},
-                null, null, null);
-
-        if (c != null) {
-            try {
-                while (c.moveToNext()) {
-                    String addr = c.getString(0);
-                    if (!TextUtils.isEmpty(addr)) {
-                        int addrType = c.getInt(2);
-                        switch (addrType) {
-                            case PduHeaders.FROM:
-                                headers.setEncodedStringValue(
-                                        new EncodedStringValue(c.getInt(1), getBytes(addr)),
-                                        addrType);
-                                break;
-                            case PduHeaders.TO:
-                            case PduHeaders.CC:
-                            case PduHeaders.BCC:
-                                headers.appendEncodedStringValue(
-                                        new EncodedStringValue(c.getInt(1), getBytes(addr)),
-                                        addrType);
-                                break;
-                            default:
-                                Timber.e("Unknown address type: " + addrType);
-                                break;
-                        }
-                    }
-                }
-            } finally {
-                c.close();
-            }
-        }
-    }
-
-    /**
-     * Load a PDU from storage by given Uri.
-     *
-     * @param uri The Uri of the PDU to be loaded.
-     * @return A generic PDU object, it may be cast to dedicated PDU.
-     * @throws MmsException Failed to load some fields of a PDU.
-     */
-    public GenericPdu load(Uri uri) throws MmsException {
-        GenericPdu pdu = null;
-        PduCacheEntry cacheEntry = null;
-        int msgBox = 0;
-        long threadId = DUMMY_THREAD_ID;
-        try {
-            synchronized (PDU_CACHE_INSTANCE) {
-                if (PDU_CACHE_INSTANCE.isUpdating(uri)) {
-                    if (LOCAL_LOGV) {
-                        Timber.v("load: " + uri + " blocked by isUpdating()");
-                    }
-                    try {
-                        PDU_CACHE_INSTANCE.wait();
-                    } catch (InterruptedException e) {
-                        Timber.e(e, "load: ");
-                    }
-                    cacheEntry = PDU_CACHE_INSTANCE.get(uri);
-                    if (cacheEntry != null) {
-                        return cacheEntry.getPdu();
-                    }
-                }
-                // Tell the cache to indicate to other callers that this item
-                // is currently being updated.
-                PDU_CACHE_INSTANCE.setUpdating(uri, true);
-            }
-
-            Cursor c = SqliteWrapper.query(mContext, mContentResolver, uri,
-                    PDU_PROJECTION, null, null, null);
-            PduHeaders headers = new PduHeaders();
-            Set<Entry<Integer, Integer>> set;
-            long msgId = ContentUris.parseId(uri);
-
-            try {
-                if ((c == null) || (c.getCount() != 1) || !c.moveToFirst()) {
-                    throw new MmsException("Bad uri: " + uri);
-                }
-
-                msgBox = c.getInt(PDU_COLUMN_MESSAGE_BOX);
-                threadId = c.getLong(PDU_COLUMN_THREAD_ID);
-
-                set = ENCODED_STRING_COLUMN_INDEX_MAP.entrySet();
-                for (Entry<Integer, Integer> e : set) {
-                    setEncodedStringValueToHeaders(
-                            c, e.getValue(), headers, e.getKey());
-                }
-
-                set = TEXT_STRING_COLUMN_INDEX_MAP.entrySet();
-                for (Entry<Integer, Integer> e : set) {
-                    setTextStringToHeaders(
-                            c, e.getValue(), headers, e.getKey());
-                }
-
-                set = OCTET_COLUMN_INDEX_MAP.entrySet();
-                for (Entry<Integer, Integer> e : set) {
-                    setOctetToHeaders(
-                            c, e.getValue(), headers, e.getKey());
-                }
-
-                set = LONG_COLUMN_INDEX_MAP.entrySet();
-                for (Entry<Integer, Integer> e : set) {
-                    setLongToHeaders(
-                            c, e.getValue(), headers, e.getKey());
-                }
-            } finally {
-                if (c != null) {
-                    c.close();
-                }
-            }
-
-            // Check whether 'msgId' has been assigned a valid value.
-            if (msgId == -1L) {
-                throw new MmsException("Error! ID of the message: -1.");
-            }
-
-            // Load address information of the MM.
-            loadAddress(msgId, headers);
-
-            int msgType = headers.getOctet(PduHeaders.MESSAGE_TYPE);
-            PduBody body = new PduBody();
-
-            // For PDU which type is M_retrieve.conf or Send.req, we should
-            // load multiparts and put them into the body of the PDU.
-            if ((msgType == PduHeaders.MESSAGE_TYPE_RETRIEVE_CONF)
-                    || (msgType == PduHeaders.MESSAGE_TYPE_SEND_REQ)) {
-                PduPart[] parts = loadParts(msgId);
-                if (parts != null) {
-                    int partsNum = parts.length;
-                    for (int i = 0; i < partsNum; i++) {
-                        body.addPart(parts[i]);
-                    }
-                }
-            }
-
-            switch (msgType) {
-                case PduHeaders.MESSAGE_TYPE_NOTIFICATION_IND:
-                    pdu = new NotificationInd(headers);
-                    break;
-                case PduHeaders.MESSAGE_TYPE_DELIVERY_IND:
-                    pdu = new DeliveryInd(headers);
-                    break;
-                case PduHeaders.MESSAGE_TYPE_READ_ORIG_IND:
-                    pdu = new ReadOrigInd(headers);
-                    break;
-                case PduHeaders.MESSAGE_TYPE_RETRIEVE_CONF:
-                    pdu = new RetrieveConf(headers, body);
-                    break;
-                case PduHeaders.MESSAGE_TYPE_SEND_REQ:
-                    pdu = new SendReq(headers, body);
-                    break;
-                case PduHeaders.MESSAGE_TYPE_ACKNOWLEDGE_IND:
-                    pdu = new AcknowledgeInd(headers);
-                    break;
-                case PduHeaders.MESSAGE_TYPE_NOTIFYRESP_IND:
-                    pdu = new NotifyRespInd(headers);
-                    break;
-                case PduHeaders.MESSAGE_TYPE_READ_REC_IND:
-                    pdu = new ReadRecInd(headers);
-                    break;
-                case PduHeaders.MESSAGE_TYPE_SEND_CONF:
-                case PduHeaders.MESSAGE_TYPE_FORWARD_REQ:
-                case PduHeaders.MESSAGE_TYPE_FORWARD_CONF:
-                case PduHeaders.MESSAGE_TYPE_MBOX_STORE_REQ:
-                case PduHeaders.MESSAGE_TYPE_MBOX_STORE_CONF:
-                case PduHeaders.MESSAGE_TYPE_MBOX_VIEW_REQ:
-                case PduHeaders.MESSAGE_TYPE_MBOX_VIEW_CONF:
-                case PduHeaders.MESSAGE_TYPE_MBOX_UPLOAD_REQ:
-                case PduHeaders.MESSAGE_TYPE_MBOX_UPLOAD_CONF:
-                case PduHeaders.MESSAGE_TYPE_MBOX_DELETE_REQ:
-                case PduHeaders.MESSAGE_TYPE_MBOX_DELETE_CONF:
-                case PduHeaders.MESSAGE_TYPE_MBOX_DESCR:
-                case PduHeaders.MESSAGE_TYPE_DELETE_REQ:
-                case PduHeaders.MESSAGE_TYPE_DELETE_CONF:
-                case PduHeaders.MESSAGE_TYPE_CANCEL_REQ:
-                case PduHeaders.MESSAGE_TYPE_CANCEL_CONF:
-                    throw new MmsException(
-                            "Unsupported PDU type: " + Integer.toHexString(msgType));
-
-                default:
-                    throw new MmsException(
-                            "Unrecognized PDU type: " + Integer.toHexString(msgType));
-            }
-        } finally {
-            synchronized (PDU_CACHE_INSTANCE) {
-                if (pdu != null) {
-                    assert (PDU_CACHE_INSTANCE.get(uri) == null);
-                    // Update the cache entry with the real info
-                    cacheEntry = new PduCacheEntry(pdu, msgBox, threadId);
-                    PDU_CACHE_INSTANCE.put(uri, cacheEntry);
-                }
-                PDU_CACHE_INSTANCE.setUpdating(uri, false);
-                PDU_CACHE_INSTANCE.notifyAll(); // tell anybody waiting on this entry to go ahead
-            }
-        }
-        return pdu;
-    }
-
-    private void persistAddress(long msgId, int type, EncodedStringValue[] array) {
-        ContentValues values = new ContentValues(3);
-
-        for (EncodedStringValue addr : array) {
-            values.clear(); // Clear all values first.
-            values.put(Addr.ADDRESS, toIsoString(addr.getTextString()));
-            values.put(Addr.CHARSET, addr.getCharacterSet());
-            values.put(Addr.TYPE, type);
-
-            Uri uri = Uri.parse("content://mms/" + msgId + "/addr");
-            SqliteWrapper.insert(mContext, mContentResolver, uri, values);
-        }
-    }
-
-    private static String getPartContentType(PduPart part) {
-        return part.getContentType() == null ? null : toIsoString(part.getContentType());
-    }
-
-    public Uri persistPart(PduPart part, long msgId, HashMap<Uri, InputStream> preOpenedFiles)
-            throws MmsException {
-        Uri uri = Uri.parse("content://mms/" + msgId + "/part");
-        ContentValues values = new ContentValues(8);
-
-        int charset = part.getCharset();
-        if (charset != 0) {
-            values.put(Part.CHARSET, charset);
-        }
-
-        String contentType = getPartContentType(part);
-        if (contentType != null) {
-            // There is no "image/jpg" in Android (and it's an invalid mimetype).
-            // Change it to "image/jpeg"
-            if (ContentType.IMAGE_JPG.equals(contentType)) {
-                contentType = ContentType.IMAGE_JPEG;
-            }
-
-            values.put(Part.CONTENT_TYPE, contentType);
-            // To ensure the SMIL part is always the first part.
-            if (ContentType.APP_SMIL.equals(contentType)) {
-                values.put(Part.SEQ, -1);
-            }
-        } else {
-            throw new MmsException("MIME type of the part must be set.");
-        }
-
-        if (part.getFilename() != null) {
-            String fileName = new String(part.getFilename());
-            values.put(Part.FILENAME, fileName);
-        }
-
-        if (part.getName() != null) {
-            String name = new String(part.getName());
-            values.put(Part.NAME, name);
-        }
-
-        Object value = null;
-        if (part.getContentDisposition() != null) {
-            value = toIsoString(part.getContentDisposition());
-            values.put(Part.CONTENT_DISPOSITION, (String) value);
-        }
-
-        if (part.getContentId() != null) {
-            value = toIsoString(part.getContentId());
-            values.put(Part.CONTENT_ID, (String) value);
-        }
-
-        if (part.getContentLocation() != null) {
-            value = toIsoString(part.getContentLocation());
-            values.put(Part.CONTENT_LOCATION, (String) value);
-        }
-
-        Uri res = SqliteWrapper.insert(mContext, mContentResolver, uri, values);
-        if (res == null) {
-            throw new MmsException("Failed to persist part, return null.");
-        }
-
-        persistData(part, res, contentType, preOpenedFiles);
-        // After successfully store the data, we should update
-        // the dataUri of the part.
-        part.setDataUri(res);
-
-        return res;
-    }
-
-    private static String cutString(String src, int expectSize) {
-        if (src.length() == 0) {
-            return "";
-        }
-
-        StringBuilder builder = new StringBuilder(expectSize);
-        final int length = src.length();
-        for (int i = 0, size = 0; i < length; i = Character.offsetByCodePoints(src, i, 1)) {
-            int codePoint = Character.codePointAt(src, i);
-            if (Character.charCount(codePoint) == 1) {
-                size += 1;
-                if (size > expectSize) {
-                    break;
-                }
-                builder.append((char) codePoint);
-            } else {
-                char[] chars = Character.toChars(codePoint);
-                size += chars.length;
-                if (size > expectSize) {
-                    break;
-                }
-                builder.append(chars);
-            }
-        }
-        return builder.toString();
-    }
-
-    /**
-     * Save data of the part into storage. The source data may be given
-     * by a byte[] or a Uri. If it's a byte[], directly save it
-     * into storage, otherwise load source data from the dataUri and then
-     * save it. If the data is an image, we may scale down it according
-     * to user preference.
-     *
-     * @param part           The PDU part which contains data to be saved.
-     * @param uri            The URI of the part.
-     * @param contentType    The MIME type of the part.
-     * @param preOpenedFiles if not null, a map of preopened InputStreams for the parts.
-     * @throws MmsException Cannot find source data or error occurred
-     *                      while saving the data.
-     */
-    private void persistData(PduPart part, Uri uri,
-                             String contentType, HashMap<Uri, InputStream> preOpenedFiles)
-            throws MmsException {
-        OutputStream os = null;
-        InputStream is = null;
-        DrmConvertSession drmConvertSession = null;
-        Uri dataUri = null;
-        String path = null;
-
-        try {
-            byte[] data = part.getData();
-            if (ContentType.TEXT_PLAIN.equals(contentType)
-                    || ContentType.APP_SMIL.equals(contentType)
-                    || ContentType.TEXT_HTML.equals(contentType)) {
-                ContentValues cv = new ContentValues();
-                if (data == null) {
-                    data = new String("").getBytes(CharacterSets.DEFAULT_CHARSET_NAME);
-                }
-                String dataText = new EncodedStringValue(data).getString();
-                cv.put(Part.TEXT, dataText);
-                if (mContentResolver.update(uri, cv, null, null) != 1) {
-                    if (data.length > MAX_TEXT_BODY_SIZE) {
-                        ContentValues cv2 = new ContentValues();
-                        cv2.put(Part.TEXT, cutString(dataText, MAX_TEXT_BODY_SIZE));
-                        if (mContentResolver.update(uri, cv2, null, null) != 1) {
-                            throw new MmsException("unable to update " + uri.toString());
-                        }
-                    } else {
-                        throw new MmsException("unable to update " + uri.toString());
-                    }
-                }
-            } else {
-                boolean isDrm = DownloadDrmHelper.isDrmConvertNeeded(contentType);
-                if (isDrm) {
-                    if (uri != null) {
-                        try {
-                            path = convertUriToPath(mContext, uri);
-                            if (LOCAL_LOGV) {
-                                Timber.v("drm uri: " + uri + " path: " + path);
-                            }
-                            File f = new File(path);
-                            long len = f.length();
-                            if (LOCAL_LOGV) {
-                                Timber.v("drm path: " + path + " len: " + len);
-                            }
-                            if (len > 0) {
-                                // we're not going to re-persist and re-encrypt an already
-                                // converted drm file
-                                return;
-                            }
-                        } catch (Exception e) {
-                            Timber.e(e, "Can't get file info for: " + part.getDataUri());
-                        }
-                    }
-                    // We haven't converted the file yet, start the conversion
-                    drmConvertSession = DrmConvertSession.open(mContext, contentType);
-                    if (drmConvertSession == null) {
-                        throw new MmsException("Mimetype " + contentType +
-                                " can not be converted.");
-                    }
-                }
-                // uri can look like:
-                // content://mms/part/98
-                os = mContentResolver.openOutputStream(uri);
-                if (data == null) {
-                    dataUri = part.getDataUri();
-                    if ((dataUri == null) || (dataUri == uri)) {
-                        Timber.w("Can't find data for this part.");
-                        return;
-                    }
-                    // dataUri can look like:
-                    // content://com.google.android.gallery3d.provider/picasa/item/5720646660183715586
-                    if (preOpenedFiles != null && preOpenedFiles.containsKey(dataUri)) {
-                        is = preOpenedFiles.get(dataUri);
-                    }
-                    if (is == null) {
-                        is = mContentResolver.openInputStream(dataUri);
-                    }
-
-                    if (LOCAL_LOGV) {
-                        Timber.v("Saving data to: " + uri);
-                    }
-
-                    byte[] buffer = new byte[8192];
-                    for (int len = 0; (len = is.read(buffer)) != -1; ) {
-                        if (!isDrm) {
-                            os.write(buffer, 0, len);
-                        } else {
-                            byte[] convertedData = drmConvertSession.convert(buffer, len);
-                            if (convertedData != null) {
-                                os.write(convertedData, 0, convertedData.length);
-                            } else {
-                                throw new MmsException("Error converting drm data.");
-                            }
-                        }
-                    }
-                } else {
-                    if (LOCAL_LOGV) {
-                        Timber.v("Saving data to: " + uri);
-                    }
-                    if (!isDrm) {
-                        os.write(data);
-                    } else {
-                        dataUri = uri;
-                        byte[] convertedData = drmConvertSession.convert(data, data.length);
-                        if (convertedData != null) {
-                            os.write(convertedData, 0, convertedData.length);
-                        } else {
-                            throw new MmsException("Error converting drm data.");
-                        }
-                    }
-                }
-            }
-        } catch (FileNotFoundException e) {
-            Timber.e(e, "Failed to open Input/Output stream.");
-            throw new MmsException(e);
-        } catch (IOException e) {
-            Timber.e(e, "Failed to read/write data.");
-            throw new MmsException(e);
-        } finally {
-            if (os != null) {
-                try {
-                    os.close();
-                } catch (IOException e) {
-                    Timber.e(e, "IOException while closing: " + os);
-                } // Ignore
-            }
-            if (is != null) {
-                try {
-                    is.close();
-                } catch (IOException e) {
-                    Timber.e(e, "IOException while closing: " + is);
-                } // Ignore
-            }
-            if (drmConvertSession != null) {
-                drmConvertSession.close(path);
-
-                // Reset the permissions on the encrypted part file so everyone has only read
-                // permission.
-                File f = new File(path);
-                ContentValues values = new ContentValues(0);
-                SqliteWrapper.update(mContext, mContentResolver,
-                        Uri.parse("content://mms/resetFilePerm/" + f.getName()),
-                        values, null, null);
-            }
-        }
-    }
-
-    /**
-     * This method expects uri in the following format
-     * content://media/<table_name>/<row_index> (or)
-     * file://sdcard/test.mp4
-     * http://test.com/test.mp4
-     * <p>
-     * Here <table_name> shall be "video" or "audio" or "images"
-     * <row_index> the index of the content in given table
-     */
-    static public String convertUriToPath(Context context, Uri uri) {
-        String path = null;
-        if (null != uri) {
-            String scheme = uri.getScheme();
-            if (null == scheme || scheme.equals("") ||
-                    scheme.equals(ContentResolver.SCHEME_FILE)) {
-                path = uri.getPath();
-
-            } else if (scheme.equals("http")) {
-                path = uri.toString();
-
-            } else if (scheme.equals(ContentResolver.SCHEME_CONTENT)) {
-                String[] projection = new String[]{MediaStore.MediaColumns.DATA};
-                Cursor cursor = null;
-                try {
-                    cursor = context.getContentResolver().query(uri, projection, null,
-                            null, null);
-                    if (null == cursor || 0 == cursor.getCount() || !cursor.moveToFirst()) {
-                        throw new IllegalArgumentException("Given Uri could not be found" +
-                                " in media store");
-                    }
-                    int pathIndex = cursor.getColumnIndexOrThrow(MediaStore.MediaColumns.DATA);
-                    path = cursor.getString(pathIndex);
-                } catch (SQLiteException e) {
-                    throw new IllegalArgumentException("Given Uri is not formatted in a way " +
-                            "so that it can be found in media store.");
-                } finally {
-                    if (null != cursor) {
-                        cursor.close();
-                    }
-                }
-            } else {
-                throw new IllegalArgumentException("Given Uri scheme is not supported");
-            }
-        }
-        return path;
-    }
-
-    private void updateAddress(
-            long msgId, int type, EncodedStringValue[] array) {
-        // Delete old address information and then insert new ones.
-        SqliteWrapper.delete(mContext, mContentResolver,
-                Uri.parse("content://mms/" + msgId + "/addr"),
-                Addr.TYPE + "=" + type, null);
-
-        persistAddress(msgId, type, array);
-    }
-
-    /**
-     * Update headers of a SendReq.
-     *
-     * @param uri     The PDU which need to be updated.
-     * @param sendReq New headers.
-     * @throws MmsException Bad URI or updating failed.
-     */
-    public void updateHeaders(Uri uri, SendReq sendReq) {
-        synchronized (PDU_CACHE_INSTANCE) {
-            // If the cache item is getting updated, wait until it's done updating before
-            // purging it.
-            if (PDU_CACHE_INSTANCE.isUpdating(uri)) {
-                if (LOCAL_LOGV) {
-                    Timber.v("updateHeaders: " + uri + " blocked by isUpdating()");
-                }
-                try {
-                    PDU_CACHE_INSTANCE.wait();
-                } catch (InterruptedException e) {
-                    Timber.e(e, "updateHeaders: ");
-                }
-            }
-        }
-        PDU_CACHE_INSTANCE.purge(uri);
-
-        ContentValues values = new ContentValues(10);
-        byte[] contentType = sendReq.getContentType();
-        if (contentType != null) {
-            values.put(Mms.CONTENT_TYPE, toIsoString(contentType));
-        }
-
-        long date = sendReq.getDate();
-        if (date != -1) {
-            values.put(Mms.DATE, date);
-        }
-
-        int deliveryReport = sendReq.getDeliveryReport();
-        if (deliveryReport != 0) {
-            values.put(Mms.DELIVERY_REPORT, deliveryReport);
-        }
-
-        long expiry = sendReq.getExpiry();
-        if (expiry != -1) {
-            values.put(Mms.EXPIRY, expiry);
-        }
-
-        byte[] msgClass = sendReq.getMessageClass();
-        if (msgClass != null) {
-            values.put(Mms.MESSAGE_CLASS, toIsoString(msgClass));
-        }
-
-        int priority = sendReq.getPriority();
-        if (priority != 0) {
-            values.put(Mms.PRIORITY, priority);
-        }
-
-        int readReport = sendReq.getReadReport();
-        if (readReport != 0) {
-            values.put(Mms.READ_REPORT, readReport);
-        }
-
-        byte[] transId = sendReq.getTransactionId();
-        if (transId != null) {
-            values.put(Mms.TRANSACTION_ID, toIsoString(transId));
-        }
-
-        EncodedStringValue subject = sendReq.getSubject();
-        if (subject != null) {
-            values.put(Mms.SUBJECT, toIsoString(subject.getTextString()));
-            values.put(Mms.SUBJECT_CHARSET, subject.getCharacterSet());
-        } else {
-            values.put(Mms.SUBJECT, "");
-        }
-
-        long messageSize = sendReq.getMessageSize();
-        if (messageSize > 0) {
-            values.put(Mms.MESSAGE_SIZE, messageSize);
-        }
-
-        PduHeaders headers = sendReq.getPduHeaders();
-        HashSet<String> recipients = new HashSet<String>();
-        for (int addrType : ADDRESS_FIELDS) {
-            EncodedStringValue[] array = null;
-            if (addrType == PduHeaders.FROM) {
-                EncodedStringValue v = headers.getEncodedStringValue(addrType);
-                if (v != null) {
-                    array = new EncodedStringValue[1];
-                    array[0] = v;
-                }
-            } else {
-                array = headers.getEncodedStringValues(addrType);
-            }
-
-            if (array != null) {
-                long msgId = ContentUris.parseId(uri);
-                updateAddress(msgId, addrType, array);
-                if (addrType == PduHeaders.TO) {
-                    for (EncodedStringValue v : array) {
-                        if (v != null) {
-                            recipients.add(v.getString());
-                        }
-                    }
-                }
-            }
-        }
-        if (!recipients.isEmpty()) {
-            long threadId = Threads.getOrCreateThreadId(mContext, recipients);
-            values.put(Mms.THREAD_ID, threadId);
-        }
-
-        SqliteWrapper.update(mContext, mContentResolver, uri, values, null, null);
-    }
-
-    private void updatePart(Uri uri, PduPart part, HashMap<Uri, InputStream> preOpenedFiles)
-            throws MmsException {
-        ContentValues values = new ContentValues(7);
-
-        int charset = part.getCharset();
-        if (charset != 0) {
-            values.put(Part.CHARSET, charset);
-        }
-
-        String contentType = null;
-        if (part.getContentType() != null) {
-            contentType = toIsoString(part.getContentType());
-            values.put(Part.CONTENT_TYPE, contentType);
-        } else {
-            throw new MmsException("MIME type of the part must be set.");
-        }
-
-        if (part.getFilename() != null) {
-            String fileName = new String(part.getFilename());
-            values.put(Part.FILENAME, fileName);
-        }
-
-        if (part.getName() != null) {
-            String name = new String(part.getName());
-            values.put(Part.NAME, name);
-        }
-
-        Object value = null;
-        if (part.getContentDisposition() != null) {
-            value = toIsoString(part.getContentDisposition());
-            values.put(Part.CONTENT_DISPOSITION, (String) value);
-        }
-
-        if (part.getContentId() != null) {
-            value = toIsoString(part.getContentId());
-            values.put(Part.CONTENT_ID, (String) value);
-        }
-
-        if (part.getContentLocation() != null) {
-            value = toIsoString(part.getContentLocation());
-            values.put(Part.CONTENT_LOCATION, (String) value);
-        }
-
-        SqliteWrapper.update(mContext, mContentResolver, uri, values, null, null);
-
-        // Only update the data when:
-        // 1. New binary data supplied or
-        // 2. The Uri of the part is different from the current one.
-        if ((part.getData() != null)
-                || (uri != part.getDataUri())) {
-            persistData(part, uri, contentType, preOpenedFiles);
-        }
-    }
-
-    /**
-     * Update all parts of a PDU.
-     *
-     * @param uri            The PDU which need to be updated.
-     * @param body           New message body of the PDU.
-     * @param preOpenedFiles if not null, a map of preopened InputStreams for the parts.
-     * @throws MmsException Bad URI or updating failed.
-     */
-    public void updateParts(Uri uri, PduBody body, HashMap<Uri, InputStream> preOpenedFiles)
-            throws MmsException {
-        try {
-            PduCacheEntry cacheEntry;
-            synchronized (PDU_CACHE_INSTANCE) {
-                if (PDU_CACHE_INSTANCE.isUpdating(uri)) {
-                    if (LOCAL_LOGV) {
-                        Timber.v("updateParts: " + uri + " blocked by isUpdating()");
-                    }
-                    try {
-                        PDU_CACHE_INSTANCE.wait();
-                    } catch (InterruptedException e) {
-                        Timber.e(e, "updateParts: ");
-                    }
-                    cacheEntry = PDU_CACHE_INSTANCE.get(uri);
-                    if (cacheEntry != null) {
-                        ((MultimediaMessagePdu) cacheEntry.getPdu()).setBody(body);
-                    }
-                }
-                // Tell the cache to indicate to other callers that this item
-                // is currently being updated.
-                PDU_CACHE_INSTANCE.setUpdating(uri, true);
-            }
-
-            ArrayList<PduPart> toBeCreated = new ArrayList<PduPart>();
-            HashMap<Uri, PduPart> toBeUpdated = new HashMap<Uri, PduPart>();
-
-            int partsNum = body.getPartsNum();
-            StringBuilder filter = new StringBuilder().append('(');
-            for (int i = 0; i < partsNum; i++) {
-                PduPart part = body.getPart(i);
-                Uri partUri = part.getDataUri();
-                if ((partUri == null) || !partUri.getAuthority().startsWith("mms")) {
-                    toBeCreated.add(part);
-                } else {
-                    toBeUpdated.put(partUri, part);
-
-                    // Don't use 'i > 0' to determine whether we should append
-                    // 'AND' since 'i = 0' may be skipped in another branch.
-                    if (filter.length() > 1) {
-                        filter.append(" AND ");
-                    }
-
-                    filter.append(Part._ID);
-                    filter.append("!=");
-                    DatabaseUtils.appendEscapedSQLString(filter, partUri.getLastPathSegment());
-                }
-            }
-            filter.append(')');
-
-            long msgId = ContentUris.parseId(uri);
-
-            // Remove the parts which doesn't exist anymore.
-            SqliteWrapper.delete(mContext, mContentResolver,
-                    Uri.parse(Mms.CONTENT_URI + "/" + msgId + "/part"),
-                    filter.length() > 2 ? filter.toString() : null, null);
-
-            // Create new parts which didn't exist before.
-            for (PduPart part : toBeCreated) {
-                persistPart(part, msgId, preOpenedFiles);
-            }
-
-            // Update the modified parts.
-            for (Entry<Uri, PduPart> e : toBeUpdated.entrySet()) {
-                updatePart(e.getKey(), e.getValue(), preOpenedFiles);
-            }
-        } finally {
-            synchronized (PDU_CACHE_INSTANCE) {
-                PDU_CACHE_INSTANCE.setUpdating(uri, false);
-                PDU_CACHE_INSTANCE.notifyAll();
-            }
-        }
-    }
-
-    /**
-     * Persist a PDU object to specific location in the storage.
-     *
-     * @param pdu             The PDU object to be stored.
-     * @param uri             Where to store the given PDU object.
-     * @param threadId
-     * @param createThreadId  if true, this function may create a thread id for the recipients
-     * @param groupMmsEnabled if true, all of the recipients addressed in the PDU will be used
-     *                        to create the associated thread. When false, only the sender will be used in finding or
-     *                        creating the appropriate thread or conversation.
-     * @param preOpenedFiles  if not null, a map of preopened InputStreams for the parts.
-     * @return A Uri which can be used to access the stored PDU.
-     */
-
-    public Uri persist(GenericPdu pdu, Uri uri, long threadId, boolean createThreadId, boolean groupMmsEnabled,
-                       HashMap<Uri, InputStream> preOpenedFiles) throws MmsException {
-
-        if (uri == null) {
-            throw new MmsException("Uri may not be null.");
-        }
-
-        long msgId = -1;
-        try {
-            msgId = ContentUris.parseId(uri);
-        } catch (NumberFormatException e) {
-            // the uri ends with "inbox" or something else like that
-        }
-
-        boolean existingUri = msgId != -1;
-
-        if (!existingUri && MESSAGE_BOX_MAP.get(uri) == null) {
-            throw new MmsException(
-                    "Bad destination, must be one of "
-                            + "content://mms/inbox, content://mms/sent, "
-                            + "content://mms/drafts, content://mms/outbox, "
-                            + "content://mms/temp.");
-        }
-        synchronized (PDU_CACHE_INSTANCE) {
-            // If the cache item is getting updated, wait until it's done updating before
-            // purging it.
-            if (PDU_CACHE_INSTANCE.isUpdating(uri)) {
-                if (LOCAL_LOGV) {
-                    Timber.v("persist: " + uri + " blocked by isUpdating()");
-                }
-                try {
-                    PDU_CACHE_INSTANCE.wait();
-                } catch (InterruptedException e) {
-                    Timber.e(e, "persist1: ");
-                }
-            }
-        }
-        PDU_CACHE_INSTANCE.purge(uri);
-
-        PduHeaders header = pdu.getPduHeaders();
-        PduBody body = null;
-        ContentValues values = new ContentValues();
-        Set<Entry<Integer, String>> set;
-
-        set = ENCODED_STRING_COLUMN_NAME_MAP.entrySet();
-        for (Entry<Integer, String> e : set) {
-            int field = e.getKey();
-            EncodedStringValue encodedString = header.getEncodedStringValue(field);
-            if (encodedString != null) {
-                String charsetColumn = CHARSET_COLUMN_NAME_MAP.get(field);
-                values.put(e.getValue(), toIsoString(encodedString.getTextString()));
-                values.put(charsetColumn, encodedString.getCharacterSet());
-            }
-        }
-
-        set = TEXT_STRING_COLUMN_NAME_MAP.entrySet();
-        for (Entry<Integer, String> e : set) {
-            byte[] text = header.getTextString(e.getKey());
-            if (text != null) {
-                values.put(e.getValue(), toIsoString(text));
-            }
-        }
-
-        set = OCTET_COLUMN_NAME_MAP.entrySet();
-        for (Entry<Integer, String> e : set) {
-            int b = header.getOctet(e.getKey());
-            if (b != 0) {
-                values.put(e.getValue(), b);
-            }
-        }
-
-        set = LONG_COLUMN_NAME_MAP.entrySet();
-        for (Entry<Integer, String> e : set) {
-            long l = header.getLongInteger(e.getKey());
-            if (l != -1L) {
-                values.put(e.getValue(), l);
-            }
-        }
-
-        HashMap<Integer, EncodedStringValue[]> addressMap =
-                new HashMap<Integer, EncodedStringValue[]>(ADDRESS_FIELDS.length);
-        // Save address information.
-        for (int addrType : ADDRESS_FIELDS) {
-            EncodedStringValue[] array = null;
-            if (addrType == PduHeaders.FROM) {
-                EncodedStringValue v = header.getEncodedStringValue(addrType);
-                if (v != null) {
-                    array = new EncodedStringValue[1];
-                    array[0] = v;
-                }
-            } else {
-                array = header.getEncodedStringValues(addrType);
-            }
-            addressMap.put(addrType, array);
-        }
-
-        HashSet<String> recipients = new HashSet<String>();
-        int msgType = pdu.getMessageType();
-        // Here we only allocate thread ID for M-Notification.ind,
-        // M-Retrieve.conf and M-Send.req.
-        // Some of other PDU types may be allocated a thread ID outside
-        // this scope.
-        if ((msgType == PduHeaders.MESSAGE_TYPE_NOTIFICATION_IND)
-                || (msgType == PduHeaders.MESSAGE_TYPE_RETRIEVE_CONF)
-                || (msgType == PduHeaders.MESSAGE_TYPE_SEND_REQ)) {
-            switch (msgType) {
-                case PduHeaders.MESSAGE_TYPE_NOTIFICATION_IND:
-                case PduHeaders.MESSAGE_TYPE_RETRIEVE_CONF:
-                    loadRecipients(PduHeaders.FROM, recipients, addressMap, false);
-
-                    // For received messages when group MMS is enabled, we want to associate this
-                    // message with the thread composed of all the recipients -- all but our own
-                    // number, that is. This includes the person who sent the
-                    // message or the FROM field (above) in addition to the other people the message
-                    // was addressed to or the TO field. Our own number is in that TO field and
-                    // we have to ignore it in loadRecipients.
-                    if (groupMmsEnabled) {
-                        loadRecipients(PduHeaders.TO, recipients, addressMap, true);
-
-                        // Also load any numbers in the CC field to address group messaging
-                        // compatibility issues with devices that place numbers in this field
-                        // for group messages.
-                        loadRecipients(PduHeaders.CC, recipients, addressMap, true);
-                    }
-                    break;
-                case PduHeaders.MESSAGE_TYPE_SEND_REQ:
-                    loadRecipients(PduHeaders.TO, recipients, addressMap, false);
-                    break;
-            }
-            if (threadId == DUMMY_THREAD_ID && createThreadId && !recipients.isEmpty()) {
-                // Given all the recipients associated with this message, find (or create) the
-                // correct thread.
-                threadId = Threads.getOrCreateThreadId(mContext, recipients);
-            }
-            values.put(Mms.THREAD_ID, threadId);
-        }
-
-        // Save parts first to avoid inconsistent message is loaded
-        // while saving the parts.
-        long dummyId = System.currentTimeMillis(); // Dummy ID of the msg.
-
-        // Sum up the total message size
-        int messageSize = 0;
-
-        // Get body if the PDU is a RetrieveConf or SendReq.
-        if (pdu instanceof MultimediaMessagePdu) {
-            body = ((MultimediaMessagePdu) pdu).getBody();
-            // Start saving parts if necessary.
-            if (body != null) {
-                for (int i = 0; i < body.getPartsNum(); i++) {
-                    PduPart part = body.getPart(i);
-                    messageSize += part.getDataLength();
-                    persistPart(part, dummyId, preOpenedFiles);
-                }
-            }
-        }
-
-        // The message-size might already have been inserted when parsing the
-        // PDU header. If not, then we insert the message size as well.
-        if (values.getAsInteger(Mms.MESSAGE_SIZE) == null) {
-            values.put(Mms.MESSAGE_SIZE, messageSize);
-        }
-
-        Uri res = null;
-        if (existingUri) {
-            res = uri;
-            SqliteWrapper.update(mContext, mContentResolver, res, values, null, null);
-        } else {
-            res = SqliteWrapper.insert(mContext, mContentResolver, uri, values);
-            if (res == null) {
-                throw new MmsException("persist() failed: return null.");
-            }
-            // Get the real ID of the PDU and update all parts which were
-            // saved with the dummy ID.
-            msgId = ContentUris.parseId(res);
-        }
-
-        values = new ContentValues(1);
-        values.put(Part.MSG_ID, msgId);
-        SqliteWrapper.update(mContext, mContentResolver,
-                Uri.parse("content://mms/" + dummyId + "/part"),
-                values, null, null);
-        // We should return the longest URI of the persisted PDU, for
-        // example, if input URI is "content://mms/inbox" and the _ID of
-        // persisted PDU is '8', we should return "content://mms/inbox/8"
-        // instead of "content://mms/8".
-        // FIXME: Should the MmsProvider be responsible for this???
-        if (!existingUri) {
-            res = Uri.parse(uri + "/" + msgId);
-        }
-
-        // Save address information.
-        for (int addrType : ADDRESS_FIELDS) {
-            EncodedStringValue[] array = addressMap.get(addrType);
-            if (array != null) {
-                persistAddress(msgId, addrType, array);
-            }
-        }
-
-        return res;
-    }
-
-    /**
-     * For a given address type, extract the recipients from the headers.
-     *
-     * @param addressType     can be PduHeaders.FROM, PduHeaders.TO or PduHeaders.CC
-     * @param recipients      a HashSet that is loaded with the recipients from the FROM, TO or CC headers
-     * @param addressMap      a HashMap of the addresses from the ADDRESS_FIELDS header
-     * @param excludeMyNumber if true, the number of this phone will be excluded from recipients
-     */
-    private void loadRecipients(int addressType, HashSet<String> recipients,
-                                HashMap<Integer, EncodedStringValue[]> addressMap, boolean excludeMyNumber) {
-        EncodedStringValue[] array = addressMap.get(addressType);
-        if (array == null) {
-            return;
-        }
-        // If the TO recipients is only a single address, then we can skip loadRecipients when
-        // we're excluding our own number because we know that address is our own.
-        // NOTE: this is not true for project fi users. To fix it, we'll add the final check for the
-        //       TO type. project fi will use the cc field instead.
-        if (excludeMyNumber && array.length == 1 && addressType == PduHeaders.TO) {
-            return;
-        }
-        String myNumber = excludeMyNumber ? mTelephonyManager.getLine1Number() : null;
-        for (EncodedStringValue v : array) {
-            if (v != null) {
-                String number = v.getString();
-                if ((myNumber == null || !PhoneNumberUtils.compare(number, myNumber)) &&
-                        !recipients.contains(number)) {
-                    // Only add numbers which aren't my own number.
-                    recipients.add(number);
-                }
-            }
-        }
-    }
-
-    /**
-     * Move a PDU object from one location to another.
-     *
-     * @param from Specify the PDU object to be moved.
-     * @param to   The destination location, should be one of the following:
-     *             "content://mms/inbox", "content://mms/sent",
-     *             "content://mms/drafts", "content://mms/outbox",
-     *             "content://mms/trash".
-     * @return New Uri of the moved PDU.
-     * @throws MmsException Error occurred while moving the message.
-     */
-    public Uri move(Uri from, Uri to) throws MmsException {
-        // Check whether the 'msgId' has been assigned a valid value.
-        long msgId = ContentUris.parseId(from);
-        if (msgId == -1L) {
-            throw new MmsException("Error! ID of the message: -1.");
-        }
-
-        // Get corresponding int value of destination box.
-        Integer msgBox = MESSAGE_BOX_MAP.get(to);
-        if (msgBox == null) {
-            throw new MmsException(
-                    "Bad destination, must be one of "
-                            + "content://mms/inbox, content://mms/sent, "
-                            + "content://mms/drafts, content://mms/outbox, "
-                            + "content://mms/temp.");
-        }
-
-        ContentValues values = new ContentValues(1);
-        values.put(Mms.MESSAGE_BOX, msgBox);
-        SqliteWrapper.update(mContext, mContentResolver, from, values, null, null);
-        return ContentUris.withAppendedId(to, msgId);
-    }
-
-    /**
-     * Wrap a byte[] into a String.
-     */
-    public static String toIsoString(byte[] bytes) {
-        try {
-            return new String(bytes, CharacterSets.MIMENAME_ISO_8859_1);
-        } catch (UnsupportedEncodingException e) {
-            // Impossible to reach here!
-            Timber.e(e, "ISO_8859_1 must be supported!");
-            return "";
-        }
-    }
-
-    /**
-     * Unpack a given String into a byte[].
-     */
-    public static byte[] getBytes(String data) {
-        try {
-            return data.getBytes(CharacterSets.MIMENAME_ISO_8859_1);
-        } catch (UnsupportedEncodingException e) {
-            // Impossible to reach here!
-            Timber.e(e, "ISO_8859_1 must be supported!");
-            return new byte[0];
-        }
-    }
-
-    /**
-     * Remove all objects in the temporary path.
-     */
-    public void release() {
-        Uri uri = Uri.parse(TEMPORARY_DRM_OBJECT_URI);
-        SqliteWrapper.delete(mContext, mContentResolver, uri, null, null);
-    }
-
-    /**
-     * Find all messages to be sent or downloaded before certain time.
-     */
-    public Cursor getPendingMessages(long dueTime) {
-        if (!checkReadSmsPermissions()) {
-            Timber.w("No read sms permissions have been granted");
-            return null;
-        }
-        Uri.Builder uriBuilder = PendingMessages.CONTENT_URI.buildUpon();
-        uriBuilder.appendQueryParameter("protocol", "mms");
-
-        String selection = PendingMessages.ERROR_TYPE + " < ?"
-                + " AND " + PendingMessages.DUE_TIME + " <= ?";
-
-        String[] selectionArgs = new String[]{
-                String.valueOf(MmsSms.ERR_TYPE_GENERIC_PERMANENT),
-                String.valueOf(dueTime)
-        };
-
-        return SqliteWrapper.query(mContext, mContentResolver,
-                uriBuilder.build(), null, selection, selectionArgs,
-                PendingMessages.DUE_TIME);
-    }
-
-    /**
-     * Check if read permissions for SMS have been granted
-     */
-    private boolean checkReadSmsPermissions() {
-        return Build.VERSION.SDK_INT < Build.VERSION_CODES.M ||
-                mContext.checkSelfPermission(Manifest.permission.READ_SMS) ==
-                        PackageManager.PERMISSION_GRANTED;
-    }
-}
+/*
+ * Copyright (C) 2015 Jacob Klinker
+ *
+ * Licensed under the Apache License, Version 2.0 (the "License");
+ * you may not use this file except in compliance with the License.
+ * You may obtain a copy of the License at
+ *
+ * http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing, software
+ * distributed under the License is distributed on an "AS IS" BASIS,
+ * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ * See the License for the specific language governing permissions and
+ * limitations under the License.
+ */
+
+package com.google.android.mms.pdu_alt;
+
+import android.Manifest;
+import android.content.ContentResolver;
+import android.content.ContentUris;
+import android.content.ContentValues;
+import android.content.Context;
+import android.content.pm.PackageManager;
+import android.database.Cursor;
+import android.database.DatabaseUtils;
+import android.database.sqlite.SQLiteException;
+import android.drm.DrmManagerClient;
+import android.net.Uri;
+import android.os.Build;
+import android.provider.MediaStore;
+import android.provider.Telephony.Mms;
+import android.provider.Telephony.Mms.Addr;
+import android.provider.Telephony.Mms.Part;
+import android.provider.Telephony.MmsSms;
+import android.provider.Telephony.MmsSms.PendingMessages;
+import android.provider.Telephony.Threads;
+import android.telephony.PhoneNumberUtils;
+import android.telephony.TelephonyManager;
+import android.text.TextUtils;
+import com.google.android.mms.ContentType;
+import com.google.android.mms.InvalidHeaderValueException;
+import com.google.android.mms.MmsException;
+import com.google.android.mms.util_alt.DownloadDrmHelper;
+import com.google.android.mms.util_alt.DrmConvertSession;
+import com.google.android.mms.util_alt.PduCache;
+import com.google.android.mms.util_alt.PduCacheEntry;
+import com.google.android.mms.util_alt.SqliteWrapper;
+import timber.log.Timber;
+
+import java.io.ByteArrayOutputStream;
+import java.io.File;
+import java.io.FileNotFoundException;
+import java.io.IOException;
+import java.io.InputStream;
+import java.io.OutputStream;
+import java.io.UnsupportedEncodingException;
+import java.util.ArrayList;
+import java.util.HashMap;
+import java.util.HashSet;
+import java.util.Map.Entry;
+import java.util.Set;
+
+/**
+ * This class is the high-level manager of PDU storage.
+ */
+public class PduPersister {
+    private static final boolean LOCAL_LOGV = false;
+
+    public static final long DUMMY_THREAD_ID = Long.MAX_VALUE;
+    private static final int DEFAULT_SUBSCRIPTION = 0;
+    private static final int MAX_TEXT_BODY_SIZE = 300 * 1024;
+
+    /**
+     * The uri of temporary drm objects.
+     */
+    public static final String TEMPORARY_DRM_OBJECT_URI =
+            "content://mms/" + Long.MAX_VALUE + "/part";
+    /**
+     * Indicate that we transiently failed to process a MM.
+     */
+    public static final int PROC_STATUS_TRANSIENT_FAILURE = 1;
+    /**
+     * Indicate that we permanently failed to process a MM.
+     */
+    public static final int PROC_STATUS_PERMANENTLY_FAILURE = 2;
+    /**
+     * Indicate that we have successfully processed a MM.
+     */
+    public static final int PROC_STATUS_COMPLETED = 3;
+
+    private static PduPersister sPersister;
+    private static final PduCache PDU_CACHE_INSTANCE;
+
+    private static final int[] ADDRESS_FIELDS = new int[]{
+            PduHeaders.BCC,
+            PduHeaders.CC,
+            PduHeaders.FROM,
+            PduHeaders.TO
+    };
+
+    private static final String[] PDU_PROJECTION = new String[]{
+            Mms._ID,
+            Mms.MESSAGE_BOX,
+            Mms.THREAD_ID,
+            Mms.RETRIEVE_TEXT,
+            Mms.SUBJECT,
+            Mms.CONTENT_LOCATION,
+            Mms.CONTENT_TYPE,
+            Mms.MESSAGE_CLASS,
+            Mms.MESSAGE_ID,
+            Mms.RESPONSE_TEXT,
+            Mms.TRANSACTION_ID,
+            Mms.CONTENT_CLASS,
+            Mms.DELIVERY_REPORT,
+            Mms.MESSAGE_TYPE,
+            Mms.MMS_VERSION,
+            Mms.PRIORITY,
+            Mms.READ_REPORT,
+            Mms.READ_STATUS,
+            Mms.REPORT_ALLOWED,
+            Mms.RETRIEVE_STATUS,
+            Mms.STATUS,
+            Mms.DATE,
+            Mms.DELIVERY_TIME,
+            Mms.EXPIRY,
+            Mms.MESSAGE_SIZE,
+            Mms.SUBJECT_CHARSET,
+            Mms.RETRIEVE_TEXT_CHARSET,
+    };
+
+    private static final int PDU_COLUMN_ID = 0;
+    private static final int PDU_COLUMN_MESSAGE_BOX = 1;
+    private static final int PDU_COLUMN_THREAD_ID = 2;
+    private static final int PDU_COLUMN_RETRIEVE_TEXT = 3;
+    private static final int PDU_COLUMN_SUBJECT = 4;
+    private static final int PDU_COLUMN_CONTENT_LOCATION = 5;
+    private static final int PDU_COLUMN_CONTENT_TYPE = 6;
+    private static final int PDU_COLUMN_MESSAGE_CLASS = 7;
+    private static final int PDU_COLUMN_MESSAGE_ID = 8;
+    private static final int PDU_COLUMN_RESPONSE_TEXT = 9;
+    private static final int PDU_COLUMN_TRANSACTION_ID = 10;
+    private static final int PDU_COLUMN_CONTENT_CLASS = 11;
+    private static final int PDU_COLUMN_DELIVERY_REPORT = 12;
+    private static final int PDU_COLUMN_MESSAGE_TYPE = 13;
+    private static final int PDU_COLUMN_MMS_VERSION = 14;
+    private static final int PDU_COLUMN_PRIORITY = 15;
+    private static final int PDU_COLUMN_READ_REPORT = 16;
+    private static final int PDU_COLUMN_READ_STATUS = 17;
+    private static final int PDU_COLUMN_REPORT_ALLOWED = 18;
+    private static final int PDU_COLUMN_RETRIEVE_STATUS = 19;
+    private static final int PDU_COLUMN_STATUS = 20;
+    private static final int PDU_COLUMN_DATE = 21;
+    private static final int PDU_COLUMN_DELIVERY_TIME = 22;
+    private static final int PDU_COLUMN_EXPIRY = 23;
+    private static final int PDU_COLUMN_MESSAGE_SIZE = 24;
+    private static final int PDU_COLUMN_SUBJECT_CHARSET = 25;
+    private static final int PDU_COLUMN_RETRIEVE_TEXT_CHARSET = 26;
+
+    private static final String[] PART_PROJECTION = new String[]{
+            Part._ID,
+            Part.CHARSET,
+            Part.CONTENT_DISPOSITION,
+            Part.CONTENT_ID,
+            Part.CONTENT_LOCATION,
+            Part.CONTENT_TYPE,
+            Part.FILENAME,
+            Part.NAME,
+            Part.TEXT
+    };
+
+    private static final int PART_COLUMN_ID = 0;
+    private static final int PART_COLUMN_CHARSET = 1;
+    private static final int PART_COLUMN_CONTENT_DISPOSITION = 2;
+    private static final int PART_COLUMN_CONTENT_ID = 3;
+    private static final int PART_COLUMN_CONTENT_LOCATION = 4;
+    private static final int PART_COLUMN_CONTENT_TYPE = 5;
+    private static final int PART_COLUMN_FILENAME = 6;
+    private static final int PART_COLUMN_NAME = 7;
+    private static final int PART_COLUMN_TEXT = 8;
+
+    private static final HashMap<Uri, Integer> MESSAGE_BOX_MAP;
+    // These map are used for convenience in persist() and load().
+    private static final HashMap<Integer, Integer> CHARSET_COLUMN_INDEX_MAP;
+    private static final HashMap<Integer, Integer> ENCODED_STRING_COLUMN_INDEX_MAP;
+    private static final HashMap<Integer, Integer> TEXT_STRING_COLUMN_INDEX_MAP;
+    private static final HashMap<Integer, Integer> OCTET_COLUMN_INDEX_MAP;
+    private static final HashMap<Integer, Integer> LONG_COLUMN_INDEX_MAP;
+    private static final HashMap<Integer, String> CHARSET_COLUMN_NAME_MAP;
+    private static final HashMap<Integer, String> ENCODED_STRING_COLUMN_NAME_MAP;
+    private static final HashMap<Integer, String> TEXT_STRING_COLUMN_NAME_MAP;
+    private static final HashMap<Integer, String> OCTET_COLUMN_NAME_MAP;
+    private static final HashMap<Integer, String> LONG_COLUMN_NAME_MAP;
+
+    static {
+        MESSAGE_BOX_MAP = new HashMap<Uri, Integer>();
+        MESSAGE_BOX_MAP.put(Mms.Inbox.CONTENT_URI, Mms.MESSAGE_BOX_INBOX);
+        MESSAGE_BOX_MAP.put(Mms.Sent.CONTENT_URI, Mms.MESSAGE_BOX_SENT);
+        MESSAGE_BOX_MAP.put(Mms.Draft.CONTENT_URI, Mms.MESSAGE_BOX_DRAFTS);
+        MESSAGE_BOX_MAP.put(Mms.Outbox.CONTENT_URI, Mms.MESSAGE_BOX_OUTBOX);
+
+        CHARSET_COLUMN_INDEX_MAP = new HashMap<Integer, Integer>();
+        CHARSET_COLUMN_INDEX_MAP.put(PduHeaders.SUBJECT, PDU_COLUMN_SUBJECT_CHARSET);
+        CHARSET_COLUMN_INDEX_MAP.put(PduHeaders.RETRIEVE_TEXT, PDU_COLUMN_RETRIEVE_TEXT_CHARSET);
+
+        CHARSET_COLUMN_NAME_MAP = new HashMap<Integer, String>();
+        CHARSET_COLUMN_NAME_MAP.put(PduHeaders.SUBJECT, Mms.SUBJECT_CHARSET);
+        CHARSET_COLUMN_NAME_MAP.put(PduHeaders.RETRIEVE_TEXT, Mms.RETRIEVE_TEXT_CHARSET);
+
+        // Encoded string field code -> column index/name map.
+        ENCODED_STRING_COLUMN_INDEX_MAP = new HashMap<Integer, Integer>();
+        ENCODED_STRING_COLUMN_INDEX_MAP.put(PduHeaders.RETRIEVE_TEXT, PDU_COLUMN_RETRIEVE_TEXT);
+        ENCODED_STRING_COLUMN_INDEX_MAP.put(PduHeaders.SUBJECT, PDU_COLUMN_SUBJECT);
+
+        ENCODED_STRING_COLUMN_NAME_MAP = new HashMap<Integer, String>();
+        ENCODED_STRING_COLUMN_NAME_MAP.put(PduHeaders.RETRIEVE_TEXT, Mms.RETRIEVE_TEXT);
+        ENCODED_STRING_COLUMN_NAME_MAP.put(PduHeaders.SUBJECT, Mms.SUBJECT);
+
+        // Text string field code -> column index/name map.
+        TEXT_STRING_COLUMN_INDEX_MAP = new HashMap<Integer, Integer>();
+        TEXT_STRING_COLUMN_INDEX_MAP.put(PduHeaders.CONTENT_LOCATION, PDU_COLUMN_CONTENT_LOCATION);
+        TEXT_STRING_COLUMN_INDEX_MAP.put(PduHeaders.CONTENT_TYPE, PDU_COLUMN_CONTENT_TYPE);
+        TEXT_STRING_COLUMN_INDEX_MAP.put(PduHeaders.MESSAGE_CLASS, PDU_COLUMN_MESSAGE_CLASS);
+        TEXT_STRING_COLUMN_INDEX_MAP.put(PduHeaders.MESSAGE_ID, PDU_COLUMN_MESSAGE_ID);
+        TEXT_STRING_COLUMN_INDEX_MAP.put(PduHeaders.RESPONSE_TEXT, PDU_COLUMN_RESPONSE_TEXT);
+        TEXT_STRING_COLUMN_INDEX_MAP.put(PduHeaders.TRANSACTION_ID, PDU_COLUMN_TRANSACTION_ID);
+
+        TEXT_STRING_COLUMN_NAME_MAP = new HashMap<Integer, String>();
+        TEXT_STRING_COLUMN_NAME_MAP.put(PduHeaders.CONTENT_LOCATION, Mms.CONTENT_LOCATION);
+        TEXT_STRING_COLUMN_NAME_MAP.put(PduHeaders.CONTENT_TYPE, Mms.CONTENT_TYPE);
+        TEXT_STRING_COLUMN_NAME_MAP.put(PduHeaders.MESSAGE_CLASS, Mms.MESSAGE_CLASS);
+        TEXT_STRING_COLUMN_NAME_MAP.put(PduHeaders.MESSAGE_ID, Mms.MESSAGE_ID);
+        TEXT_STRING_COLUMN_NAME_MAP.put(PduHeaders.RESPONSE_TEXT, Mms.RESPONSE_TEXT);
+        TEXT_STRING_COLUMN_NAME_MAP.put(PduHeaders.TRANSACTION_ID, Mms.TRANSACTION_ID);
+
+        // Octet field code -> column index/name map.
+        OCTET_COLUMN_INDEX_MAP = new HashMap<Integer, Integer>();
+        OCTET_COLUMN_INDEX_MAP.put(PduHeaders.CONTENT_CLASS, PDU_COLUMN_CONTENT_CLASS);
+        OCTET_COLUMN_INDEX_MAP.put(PduHeaders.DELIVERY_REPORT, PDU_COLUMN_DELIVERY_REPORT);
+        OCTET_COLUMN_INDEX_MAP.put(PduHeaders.MESSAGE_TYPE, PDU_COLUMN_MESSAGE_TYPE);
+        OCTET_COLUMN_INDEX_MAP.put(PduHeaders.MMS_VERSION, PDU_COLUMN_MMS_VERSION);
+        OCTET_COLUMN_INDEX_MAP.put(PduHeaders.PRIORITY, PDU_COLUMN_PRIORITY);
+        OCTET_COLUMN_INDEX_MAP.put(PduHeaders.READ_REPORT, PDU_COLUMN_READ_REPORT);
+        OCTET_COLUMN_INDEX_MAP.put(PduHeaders.READ_STATUS, PDU_COLUMN_READ_STATUS);
+        OCTET_COLUMN_INDEX_MAP.put(PduHeaders.REPORT_ALLOWED, PDU_COLUMN_REPORT_ALLOWED);
+        OCTET_COLUMN_INDEX_MAP.put(PduHeaders.RETRIEVE_STATUS, PDU_COLUMN_RETRIEVE_STATUS);
+        OCTET_COLUMN_INDEX_MAP.put(PduHeaders.STATUS, PDU_COLUMN_STATUS);
+
+        OCTET_COLUMN_NAME_MAP = new HashMap<Integer, String>();
+        OCTET_COLUMN_NAME_MAP.put(PduHeaders.CONTENT_CLASS, Mms.CONTENT_CLASS);
+        OCTET_COLUMN_NAME_MAP.put(PduHeaders.DELIVERY_REPORT, Mms.DELIVERY_REPORT);
+        OCTET_COLUMN_NAME_MAP.put(PduHeaders.MESSAGE_TYPE, Mms.MESSAGE_TYPE);
+        OCTET_COLUMN_NAME_MAP.put(PduHeaders.MMS_VERSION, Mms.MMS_VERSION);
+        OCTET_COLUMN_NAME_MAP.put(PduHeaders.PRIORITY, Mms.PRIORITY);
+        OCTET_COLUMN_NAME_MAP.put(PduHeaders.READ_REPORT, Mms.READ_REPORT);
+        OCTET_COLUMN_NAME_MAP.put(PduHeaders.READ_STATUS, Mms.READ_STATUS);
+        OCTET_COLUMN_NAME_MAP.put(PduHeaders.REPORT_ALLOWED, Mms.REPORT_ALLOWED);
+        OCTET_COLUMN_NAME_MAP.put(PduHeaders.RETRIEVE_STATUS, Mms.RETRIEVE_STATUS);
+        OCTET_COLUMN_NAME_MAP.put(PduHeaders.STATUS, Mms.STATUS);
+
+        // Long field code -> column index/name map.
+        LONG_COLUMN_INDEX_MAP = new HashMap<Integer, Integer>();
+        LONG_COLUMN_INDEX_MAP.put(PduHeaders.DATE, PDU_COLUMN_DATE);
+        LONG_COLUMN_INDEX_MAP.put(PduHeaders.DELIVERY_TIME, PDU_COLUMN_DELIVERY_TIME);
+        LONG_COLUMN_INDEX_MAP.put(PduHeaders.EXPIRY, PDU_COLUMN_EXPIRY);
+        LONG_COLUMN_INDEX_MAP.put(PduHeaders.MESSAGE_SIZE, PDU_COLUMN_MESSAGE_SIZE);
+
+        LONG_COLUMN_NAME_MAP = new HashMap<Integer, String>();
+        LONG_COLUMN_NAME_MAP.put(PduHeaders.DATE, Mms.DATE);
+        LONG_COLUMN_NAME_MAP.put(PduHeaders.DELIVERY_TIME, Mms.DELIVERY_TIME);
+        LONG_COLUMN_NAME_MAP.put(PduHeaders.EXPIRY, Mms.EXPIRY);
+        LONG_COLUMN_NAME_MAP.put(PduHeaders.MESSAGE_SIZE, Mms.MESSAGE_SIZE);
+
+        PDU_CACHE_INSTANCE = PduCache.getInstance();
+    }
+
+    private final Context mContext;
+    private final ContentResolver mContentResolver;
+    private final DrmManagerClient mDrmManagerClient;
+    private final TelephonyManager mTelephonyManager;
+
+    private PduPersister(Context context) {
+        mContext = context;
+        mContentResolver = context.getContentResolver();
+        mDrmManagerClient = new DrmManagerClient(context);
+        mTelephonyManager = (TelephonyManager) context
+                .getSystemService(Context.TELEPHONY_SERVICE);
+    }
+
+    /**
+     * Get(or create if not exist) an instance of PduPersister
+     */
+    public static PduPersister getPduPersister(Context context) {
+        if ((sPersister == null)) {
+            sPersister = new PduPersister(context);
+        } else if (!context.equals(sPersister.mContext)) {
+            sPersister.release();
+            sPersister = new PduPersister(context);
+        }
+
+        return sPersister;
+    }
+
+    private void setEncodedStringValueToHeaders(
+            Cursor c, int columnIndex,
+            PduHeaders headers, int mapColumn) {
+        String s = c.getString(columnIndex);
+        if ((s != null) && (s.length() > 0)) {
+            int charsetColumnIndex = CHARSET_COLUMN_INDEX_MAP.get(mapColumn);
+            int charset = c.getInt(charsetColumnIndex);
+            EncodedStringValue value = new EncodedStringValue(
+                    charset, getBytes(s));
+            headers.setEncodedStringValue(value, mapColumn);
+        }
+    }
+
+    private void setTextStringToHeaders(
+            Cursor c, int columnIndex,
+            PduHeaders headers, int mapColumn) {
+        String s = c.getString(columnIndex);
+        if (s != null) {
+            headers.setTextString(getBytes(s), mapColumn);
+        }
+    }
+
+    private void setOctetToHeaders(
+            Cursor c, int columnIndex,
+            PduHeaders headers, int mapColumn) throws InvalidHeaderValueException {
+        if (!c.isNull(columnIndex)) {
+            int b = c.getInt(columnIndex);
+            headers.setOctet(b, mapColumn);
+        }
+    }
+
+    private void setLongToHeaders(
+            Cursor c, int columnIndex,
+            PduHeaders headers, int mapColumn) {
+        if (!c.isNull(columnIndex)) {
+            long l = c.getLong(columnIndex);
+            headers.setLongInteger(l, mapColumn);
+        }
+    }
+
+    private Integer getIntegerFromPartColumn(Cursor c, int columnIndex) {
+        if (!c.isNull(columnIndex)) {
+            return c.getInt(columnIndex);
+        }
+        return null;
+    }
+
+    private byte[] getByteArrayFromPartColumn(Cursor c, int columnIndex) {
+        if (!c.isNull(columnIndex)) {
+            return getBytes(c.getString(columnIndex));
+        }
+        return null;
+    }
+
+    private PduPart[] loadParts(long msgId) throws MmsException {
+        Cursor c = SqliteWrapper.query(mContext, mContentResolver,
+                Uri.parse("content://mms/" + msgId + "/part"),
+                PART_PROJECTION, null, null, null);
+
+        PduPart[] parts = null;
+
+        try {
+            if ((c == null) || (c.getCount() == 0)) {
+                if (LOCAL_LOGV) {
+                    Timber.v("loadParts(" + msgId + "): no part to load.");
+                }
+                return null;
+            }
+
+            int partCount = c.getCount();
+            int partIdx = 0;
+            parts = new PduPart[partCount];
+            while (c.moveToNext()) {
+                PduPart part = new PduPart();
+                Integer charset = getIntegerFromPartColumn(
+                        c, PART_COLUMN_CHARSET);
+                if (charset != null) {
+                    part.setCharset(charset);
+                }
+
+                byte[] contentDisposition = getByteArrayFromPartColumn(
+                        c, PART_COLUMN_CONTENT_DISPOSITION);
+                if (contentDisposition != null) {
+                    part.setContentDisposition(contentDisposition);
+                }
+
+                byte[] contentId = getByteArrayFromPartColumn(
+                        c, PART_COLUMN_CONTENT_ID);
+                if (contentId != null) {
+                    part.setContentId(contentId);
+                }
+
+                byte[] contentLocation = getByteArrayFromPartColumn(
+                        c, PART_COLUMN_CONTENT_LOCATION);
+                if (contentLocation != null) {
+                    part.setContentLocation(contentLocation);
+                }
+
+                byte[] contentType = getByteArrayFromPartColumn(
+                        c, PART_COLUMN_CONTENT_TYPE);
+                if (contentType != null) {
+                    part.setContentType(contentType);
+                } else {
+                    throw new MmsException("Content-Type must be set.");
+                }
+
+                byte[] fileName = getByteArrayFromPartColumn(
+                        c, PART_COLUMN_FILENAME);
+                if (fileName != null) {
+                    part.setFilename(fileName);
+                }
+
+                byte[] name = getByteArrayFromPartColumn(
+                        c, PART_COLUMN_NAME);
+                if (name != null) {
+                    part.setName(name);
+                }
+
+                // Construct a Uri for this part.
+                long partId = c.getLong(PART_COLUMN_ID);
+                Uri partURI = Uri.parse("content://mms/part/" + partId);
+                part.setDataUri(partURI);
+
+                // For images/audio/video, we won't keep their data in Part
+                // because their renderer accept Uri as source.
+                String type = toIsoString(contentType);
+                if (!ContentType.isImageType(type)
+                        && !ContentType.isAudioType(type)
+                        && !ContentType.isVideoType(type)) {
+                    ByteArrayOutputStream baos = new ByteArrayOutputStream();
+                    InputStream is = null;
+
+                    // Store simple string values directly in the database instead of an
+                    // external file.  This makes the text searchable and retrieval slightly
+                    // faster.
+                    if (ContentType.TEXT_PLAIN.equals(type) || ContentType.APP_SMIL.equals(type)
+                            || ContentType.TEXT_HTML.equals(type)) {
+                        String text = c.getString(PART_COLUMN_TEXT);
+                        byte[] blob = new EncodedStringValue(text != null ? text : "")
+                                .getTextString();
+                        baos.write(blob, 0, blob.length);
+                    } else {
+
+                        try {
+                            is = mContentResolver.openInputStream(partURI);
+
+                            byte[] buffer = new byte[256];
+                            int len = is.read(buffer);
+                            while (len >= 0) {
+                                baos.write(buffer, 0, len);
+                                len = is.read(buffer);
+                            }
+                        } catch (IOException e) {
+                            Timber.e(e, "Failed to load part data");
+                            c.close();
+                            throw new MmsException(e);
+                        } finally {
+                            if (is != null) {
+                                try {
+                                    is.close();
+                                } catch (IOException e) {
+                                    Timber.e(e, "Failed to close stream");
+                                } // Ignore
+                            }
+                        }
+                    }
+                    part.setData(baos.toByteArray());
+                }
+                parts[partIdx++] = part;
+            }
+        } finally {
+            if (c != null) {
+                c.close();
+            }
+        }
+
+        return parts;
+    }
+
+    private void loadAddress(long msgId, PduHeaders headers) {
+        Cursor c = SqliteWrapper.query(mContext, mContentResolver,
+                Uri.parse("content://mms/" + msgId + "/addr"),
+                new String[]{Addr.ADDRESS, Addr.CHARSET, Addr.TYPE},
+                null, null, null);
+
+        if (c != null) {
+            try {
+                while (c.moveToNext()) {
+                    String addr = c.getString(0);
+                    if (!TextUtils.isEmpty(addr)) {
+                        int addrType = c.getInt(2);
+                        switch (addrType) {
+                            case PduHeaders.FROM:
+                                headers.setEncodedStringValue(
+                                        new EncodedStringValue(c.getInt(1), getBytes(addr)),
+                                        addrType);
+                                break;
+                            case PduHeaders.TO:
+                            case PduHeaders.CC:
+                            case PduHeaders.BCC:
+                                headers.appendEncodedStringValue(
+                                        new EncodedStringValue(c.getInt(1), getBytes(addr)),
+                                        addrType);
+                                break;
+                            default:
+                                Timber.e("Unknown address type: " + addrType);
+                                break;
+                        }
+                    }
+                }
+            } finally {
+                c.close();
+            }
+        }
+    }
+
+    /**
+     * Load a PDU from storage by given Uri.
+     *
+     * @param uri The Uri of the PDU to be loaded.
+     * @return A generic PDU object, it may be cast to dedicated PDU.
+     * @throws MmsException Failed to load some fields of a PDU.
+     */
+    public GenericPdu load(Uri uri) throws MmsException {
+        GenericPdu pdu = null;
+        PduCacheEntry cacheEntry = null;
+        int msgBox = 0;
+        long threadId = DUMMY_THREAD_ID;
+        try {
+            synchronized (PDU_CACHE_INSTANCE) {
+                if (PDU_CACHE_INSTANCE.isUpdating(uri)) {
+                    if (LOCAL_LOGV) {
+                        Timber.v("load: " + uri + " blocked by isUpdating()");
+                    }
+                    try {
+                        PDU_CACHE_INSTANCE.wait();
+                    } catch (InterruptedException e) {
+                        Timber.e(e, "load: ");
+                    }
+                    cacheEntry = PDU_CACHE_INSTANCE.get(uri);
+                    if (cacheEntry != null) {
+                        return cacheEntry.getPdu();
+                    }
+                }
+                // Tell the cache to indicate to other callers that this item
+                // is currently being updated.
+                PDU_CACHE_INSTANCE.setUpdating(uri, true);
+            }
+
+            Cursor c = SqliteWrapper.query(mContext, mContentResolver, uri,
+                    PDU_PROJECTION, null, null, null);
+            PduHeaders headers = new PduHeaders();
+            Set<Entry<Integer, Integer>> set;
+            long msgId = ContentUris.parseId(uri);
+
+            try {
+                if ((c == null) || (c.getCount() != 1) || !c.moveToFirst()) {
+                    throw new MmsException("Bad uri: " + uri);
+                }
+
+                msgBox = c.getInt(PDU_COLUMN_MESSAGE_BOX);
+                threadId = c.getLong(PDU_COLUMN_THREAD_ID);
+
+                set = ENCODED_STRING_COLUMN_INDEX_MAP.entrySet();
+                for (Entry<Integer, Integer> e : set) {
+                    setEncodedStringValueToHeaders(
+                            c, e.getValue(), headers, e.getKey());
+                }
+
+                set = TEXT_STRING_COLUMN_INDEX_MAP.entrySet();
+                for (Entry<Integer, Integer> e : set) {
+                    setTextStringToHeaders(
+                            c, e.getValue(), headers, e.getKey());
+                }
+
+                set = OCTET_COLUMN_INDEX_MAP.entrySet();
+                for (Entry<Integer, Integer> e : set) {
+                    setOctetToHeaders(
+                            c, e.getValue(), headers, e.getKey());
+                }
+
+                set = LONG_COLUMN_INDEX_MAP.entrySet();
+                for (Entry<Integer, Integer> e : set) {
+                    setLongToHeaders(
+                            c, e.getValue(), headers, e.getKey());
+                }
+            } finally {
+                if (c != null) {
+                    c.close();
+                }
+            }
+
+            // Check whether 'msgId' has been assigned a valid value.
+            if (msgId == -1L) {
+                throw new MmsException("Error! ID of the message: -1.");
+            }
+
+            // Load address information of the MM.
+            loadAddress(msgId, headers);
+
+            int msgType = headers.getOctet(PduHeaders.MESSAGE_TYPE);
+            PduBody body = new PduBody();
+
+            // For PDU which type is M_retrieve.conf or Send.req, we should
+            // load multiparts and put them into the body of the PDU.
+            if ((msgType == PduHeaders.MESSAGE_TYPE_RETRIEVE_CONF)
+                    || (msgType == PduHeaders.MESSAGE_TYPE_SEND_REQ)) {
+                PduPart[] parts = loadParts(msgId);
+                if (parts != null) {
+                    int partsNum = parts.length;
+                    for (int i = 0; i < partsNum; i++) {
+                        body.addPart(parts[i]);
+                    }
+                }
+            }
+
+            switch (msgType) {
+                case PduHeaders.MESSAGE_TYPE_NOTIFICATION_IND:
+                    pdu = new NotificationInd(headers);
+                    break;
+                case PduHeaders.MESSAGE_TYPE_DELIVERY_IND:
+                    pdu = new DeliveryInd(headers);
+                    break;
+                case PduHeaders.MESSAGE_TYPE_READ_ORIG_IND:
+                    pdu = new ReadOrigInd(headers);
+                    break;
+                case PduHeaders.MESSAGE_TYPE_RETRIEVE_CONF:
+                    pdu = new RetrieveConf(headers, body);
+                    break;
+                case PduHeaders.MESSAGE_TYPE_SEND_REQ:
+                    pdu = new SendReq(headers, body);
+                    break;
+                case PduHeaders.MESSAGE_TYPE_ACKNOWLEDGE_IND:
+                    pdu = new AcknowledgeInd(headers);
+                    break;
+                case PduHeaders.MESSAGE_TYPE_NOTIFYRESP_IND:
+                    pdu = new NotifyRespInd(headers);
+                    break;
+                case PduHeaders.MESSAGE_TYPE_READ_REC_IND:
+                    pdu = new ReadRecInd(headers);
+                    break;
+                case PduHeaders.MESSAGE_TYPE_SEND_CONF:
+                case PduHeaders.MESSAGE_TYPE_FORWARD_REQ:
+                case PduHeaders.MESSAGE_TYPE_FORWARD_CONF:
+                case PduHeaders.MESSAGE_TYPE_MBOX_STORE_REQ:
+                case PduHeaders.MESSAGE_TYPE_MBOX_STORE_CONF:
+                case PduHeaders.MESSAGE_TYPE_MBOX_VIEW_REQ:
+                case PduHeaders.MESSAGE_TYPE_MBOX_VIEW_CONF:
+                case PduHeaders.MESSAGE_TYPE_MBOX_UPLOAD_REQ:
+                case PduHeaders.MESSAGE_TYPE_MBOX_UPLOAD_CONF:
+                case PduHeaders.MESSAGE_TYPE_MBOX_DELETE_REQ:
+                case PduHeaders.MESSAGE_TYPE_MBOX_DELETE_CONF:
+                case PduHeaders.MESSAGE_TYPE_MBOX_DESCR:
+                case PduHeaders.MESSAGE_TYPE_DELETE_REQ:
+                case PduHeaders.MESSAGE_TYPE_DELETE_CONF:
+                case PduHeaders.MESSAGE_TYPE_CANCEL_REQ:
+                case PduHeaders.MESSAGE_TYPE_CANCEL_CONF:
+                    throw new MmsException(
+                            "Unsupported PDU type: " + Integer.toHexString(msgType));
+
+                default:
+                    throw new MmsException(
+                            "Unrecognized PDU type: " + Integer.toHexString(msgType));
+            }
+        } finally {
+            synchronized (PDU_CACHE_INSTANCE) {
+                if (pdu != null) {
+                    assert (PDU_CACHE_INSTANCE.get(uri) == null);
+                    // Update the cache entry with the real info
+                    cacheEntry = new PduCacheEntry(pdu, msgBox, threadId);
+                    PDU_CACHE_INSTANCE.put(uri, cacheEntry);
+                }
+                PDU_CACHE_INSTANCE.setUpdating(uri, false);
+                PDU_CACHE_INSTANCE.notifyAll(); // tell anybody waiting on this entry to go ahead
+            }
+        }
+        return pdu;
+    }
+
+    private void persistAddress(long msgId, int type, EncodedStringValue[] array) {
+        ContentValues values = new ContentValues(3);
+
+        for (EncodedStringValue addr : array) {
+            values.clear(); // Clear all values first.
+            values.put(Addr.ADDRESS, toIsoString(addr.getTextString()));
+            values.put(Addr.CHARSET, addr.getCharacterSet());
+            values.put(Addr.TYPE, type);
+
+            Uri uri = Uri.parse("content://mms/" + msgId + "/addr");
+            SqliteWrapper.insert(mContext, mContentResolver, uri, values);
+        }
+    }
+
+    private static String getPartContentType(PduPart part) {
+        return part.getContentType() == null ? null : toIsoString(part.getContentType());
+    }
+
+    public Uri persistPart(PduPart part, long msgId, HashMap<Uri, InputStream> preOpenedFiles)
+            throws MmsException {
+        Uri uri = Uri.parse("content://mms/" + msgId + "/part");
+        ContentValues values = new ContentValues(8);
+
+        int charset = part.getCharset();
+        if (charset != 0) {
+            values.put(Part.CHARSET, charset);
+        }
+
+        String contentType = getPartContentType(part);
+        if (contentType != null) {
+            // There is no "image/jpg" in Android (and it's an invalid mimetype).
+            // Change it to "image/jpeg"
+            if (ContentType.IMAGE_JPG.equals(contentType)) {
+                contentType = ContentType.IMAGE_JPEG;
+            }
+
+            values.put(Part.CONTENT_TYPE, contentType);
+            // To ensure the SMIL part is always the first part.
+            if (ContentType.APP_SMIL.equals(contentType)) {
+                values.put(Part.SEQ, -1);
+            }
+        } else {
+            throw new MmsException("MIME type of the part must be set.");
+        }
+
+        if (part.getFilename() != null) {
+            String fileName = new String(part.getFilename());
+            values.put(Part.FILENAME, fileName);
+        }
+
+        if (part.getName() != null) {
+            String name = new String(part.getName());
+            values.put(Part.NAME, name);
+        }
+
+        Object value = null;
+        if (part.getContentDisposition() != null) {
+            value = toIsoString(part.getContentDisposition());
+            values.put(Part.CONTENT_DISPOSITION, (String) value);
+        }
+
+        if (part.getContentId() != null) {
+            value = toIsoString(part.getContentId());
+            values.put(Part.CONTENT_ID, (String) value);
+        }
+
+        if (part.getContentLocation() != null) {
+            value = toIsoString(part.getContentLocation());
+            values.put(Part.CONTENT_LOCATION, (String) value);
+        }
+
+        Uri res = SqliteWrapper.insert(mContext, mContentResolver, uri, values);
+        if (res == null) {
+            throw new MmsException("Failed to persist part, return null.");
+        }
+
+        persistData(part, res, contentType, preOpenedFiles);
+        // After successfully store the data, we should update
+        // the dataUri of the part.
+        part.setDataUri(res);
+
+        return res;
+    }
+
+    private static String cutString(String src, int expectSize) {
+        if (src.length() == 0) {
+            return "";
+        }
+
+        StringBuilder builder = new StringBuilder(expectSize);
+        final int length = src.length();
+        for (int i = 0, size = 0; i < length; i = Character.offsetByCodePoints(src, i, 1)) {
+            int codePoint = Character.codePointAt(src, i);
+            if (Character.charCount(codePoint) == 1) {
+                size += 1;
+                if (size > expectSize) {
+                    break;
+                }
+                builder.append((char) codePoint);
+            } else {
+                char[] chars = Character.toChars(codePoint);
+                size += chars.length;
+                if (size > expectSize) {
+                    break;
+                }
+                builder.append(chars);
+            }
+        }
+        return builder.toString();
+    }
+
+    /**
+     * Save data of the part into storage. The source data may be given
+     * by a byte[] or a Uri. If it's a byte[], directly save it
+     * into storage, otherwise load source data from the dataUri and then
+     * save it. If the data is an image, we may scale down it according
+     * to user preference.
+     *
+     * @param part           The PDU part which contains data to be saved.
+     * @param uri            The URI of the part.
+     * @param contentType    The MIME type of the part.
+     * @param preOpenedFiles if not null, a map of preopened InputStreams for the parts.
+     * @throws MmsException Cannot find source data or error occurred
+     *                      while saving the data.
+     */
+    private void persistData(PduPart part, Uri uri,
+                             String contentType, HashMap<Uri, InputStream> preOpenedFiles)
+            throws MmsException {
+        OutputStream os = null;
+        InputStream is = null;
+        DrmConvertSession drmConvertSession = null;
+        Uri dataUri = null;
+        String path = null;
+
+        try {
+            byte[] data = part.getData();
+            if (ContentType.TEXT_PLAIN.equals(contentType)
+                    || ContentType.APP_SMIL.equals(contentType)
+                    || ContentType.TEXT_HTML.equals(contentType)) {
+                ContentValues cv = new ContentValues();
+                if (data == null) {
+                    data = new String("").getBytes(CharacterSets.DEFAULT_CHARSET_NAME);
+                }
+                String dataText = new EncodedStringValue(data).getString();
+                cv.put(Part.TEXT, dataText);
+                if (mContentResolver.update(uri, cv, null, null) != 1) {
+                    if (data.length > MAX_TEXT_BODY_SIZE) {
+                        ContentValues cv2 = new ContentValues();
+                        cv2.put(Part.TEXT, cutString(dataText, MAX_TEXT_BODY_SIZE));
+                        if (mContentResolver.update(uri, cv2, null, null) != 1) {
+                            throw new MmsException("unable to update " + uri.toString());
+                        }
+                    } else {
+                        throw new MmsException("unable to update " + uri.toString());
+                    }
+                }
+            } else {
+                boolean isDrm = DownloadDrmHelper.isDrmConvertNeeded(contentType);
+                if (isDrm) {
+                    if (uri != null) {
+                        try {
+                            path = convertUriToPath(mContext, uri);
+                            if (LOCAL_LOGV) {
+                                Timber.v("drm uri: " + uri + " path: " + path);
+                            }
+                            File f = new File(path);
+                            long len = f.length();
+                            if (LOCAL_LOGV) {
+                                Timber.v("drm path: " + path + " len: " + len);
+                            }
+                            if (len > 0) {
+                                // we're not going to re-persist and re-encrypt an already
+                                // converted drm file
+                                return;
+                            }
+                        } catch (Exception e) {
+                            Timber.e(e, "Can't get file info for: " + part.getDataUri());
+                        }
+                    }
+                    // We haven't converted the file yet, start the conversion
+                    drmConvertSession = DrmConvertSession.open(mContext, contentType);
+                    if (drmConvertSession == null) {
+                        throw new MmsException("Mimetype " + contentType +
+                                " can not be converted.");
+                    }
+                }
+                // uri can look like:
+                // content://mms/part/98
+                os = mContentResolver.openOutputStream(uri);
+                if (data == null) {
+                    dataUri = part.getDataUri();
+                    if ((dataUri == null) || (dataUri == uri)) {
+                        Timber.w("Can't find data for this part.");
+                        return;
+                    }
+                    // dataUri can look like:
+                    // content://com.google.android.gallery3d.provider/picasa/item/5720646660183715586
+                    if (preOpenedFiles != null && preOpenedFiles.containsKey(dataUri)) {
+                        is = preOpenedFiles.get(dataUri);
+                    }
+                    if (is == null) {
+                        is = mContentResolver.openInputStream(dataUri);
+                    }
+
+                    if (LOCAL_LOGV) {
+                        Timber.v("Saving data to: " + uri);
+                    }
+
+                    byte[] buffer = new byte[8192];
+                    for (int len = 0; (len = is.read(buffer)) != -1; ) {
+                        if (!isDrm) {
+                            os.write(buffer, 0, len);
+                        } else {
+                            byte[] convertedData = drmConvertSession.convert(buffer, len);
+                            if (convertedData != null) {
+                                os.write(convertedData, 0, convertedData.length);
+                            } else {
+                                throw new MmsException("Error converting drm data.");
+                            }
+                        }
+                    }
+                } else {
+                    if (LOCAL_LOGV) {
+                        Timber.v("Saving data to: " + uri);
+                    }
+                    if (!isDrm) {
+                        os.write(data);
+                    } else {
+                        dataUri = uri;
+                        byte[] convertedData = drmConvertSession.convert(data, data.length);
+                        if (convertedData != null) {
+                            os.write(convertedData, 0, convertedData.length);
+                        } else {
+                            throw new MmsException("Error converting drm data.");
+                        }
+                    }
+                }
+            }
+        } catch (FileNotFoundException e) {
+            Timber.e(e, "Failed to open Input/Output stream.");
+            throw new MmsException(e);
+        } catch (IOException e) {
+            Timber.e(e, "Failed to read/write data.");
+            throw new MmsException(e);
+        } finally {
+            if (os != null) {
+                try {
+                    os.close();
+                } catch (IOException e) {
+                    Timber.e(e, "IOException while closing: " + os);
+                } // Ignore
+            }
+            if (is != null) {
+                try {
+                    is.close();
+                } catch (IOException e) {
+                    Timber.e(e, "IOException while closing: " + is);
+                } // Ignore
+            }
+            if (drmConvertSession != null) {
+                drmConvertSession.close(path);
+
+                // Reset the permissions on the encrypted part file so everyone has only read
+                // permission.
+                File f = new File(path);
+                ContentValues values = new ContentValues(0);
+                SqliteWrapper.update(mContext, mContentResolver,
+                        Uri.parse("content://mms/resetFilePerm/" + f.getName()),
+                        values, null, null);
+            }
+        }
+    }
+
+    /**
+     * This method expects uri in the following format
+     * content://media/<table_name>/<row_index> (or)
+     * file://sdcard/test.mp4
+     * http://test.com/test.mp4
+     * <p>
+     * Here <table_name> shall be "video" or "audio" or "images"
+     * <row_index> the index of the content in given table
+     */
+    static public String convertUriToPath(Context context, Uri uri) {
+        String path = null;
+        if (null != uri) {
+            String scheme = uri.getScheme();
+            if (null == scheme || scheme.equals("") ||
+                    scheme.equals(ContentResolver.SCHEME_FILE)) {
+                path = uri.getPath();
+
+            } else if (scheme.equals("http")) {
+                path = uri.toString();
+
+            } else if (scheme.equals(ContentResolver.SCHEME_CONTENT)) {
+                String[] projection = new String[]{MediaStore.MediaColumns.DATA};
+                Cursor cursor = null;
+                try {
+                    cursor = context.getContentResolver().query(uri, projection, null,
+                            null, null);
+                    if (null == cursor || 0 == cursor.getCount() || !cursor.moveToFirst()) {
+                        throw new IllegalArgumentException("Given Uri could not be found" +
+                                " in media store");
+                    }
+                    int pathIndex = cursor.getColumnIndexOrThrow(MediaStore.MediaColumns.DATA);
+                    path = cursor.getString(pathIndex);
+                } catch (SQLiteException e) {
+                    throw new IllegalArgumentException("Given Uri is not formatted in a way " +
+                            "so that it can be found in media store.");
+                } finally {
+                    if (null != cursor) {
+                        cursor.close();
+                    }
+                }
+            } else {
+                throw new IllegalArgumentException("Given Uri scheme is not supported");
+            }
+        }
+        return path;
+    }
+
+    private void updateAddress(
+            long msgId, int type, EncodedStringValue[] array) {
+        // Delete old address information and then insert new ones.
+        SqliteWrapper.delete(mContext, mContentResolver,
+                Uri.parse("content://mms/" + msgId + "/addr"),
+                Addr.TYPE + "=" + type, null);
+
+        persistAddress(msgId, type, array);
+    }
+
+    /**
+     * Update headers of a SendReq.
+     *
+     * @param uri     The PDU which need to be updated.
+     * @param sendReq New headers.
+     * @throws MmsException Bad URI or updating failed.
+     */
+    public void updateHeaders(Uri uri, SendReq sendReq) {
+        synchronized (PDU_CACHE_INSTANCE) {
+            // If the cache item is getting updated, wait until it's done updating before
+            // purging it.
+            if (PDU_CACHE_INSTANCE.isUpdating(uri)) {
+                if (LOCAL_LOGV) {
+                    Timber.v("updateHeaders: " + uri + " blocked by isUpdating()");
+                }
+                try {
+                    PDU_CACHE_INSTANCE.wait();
+                } catch (InterruptedException e) {
+                    Timber.e(e, "updateHeaders: ");
+                }
+            }
+        }
+        PDU_CACHE_INSTANCE.purge(uri);
+
+        ContentValues values = new ContentValues(10);
+        byte[] contentType = sendReq.getContentType();
+        if (contentType != null) {
+            values.put(Mms.CONTENT_TYPE, toIsoString(contentType));
+        }
+
+        long date = sendReq.getDate();
+        if (date != -1) {
+            values.put(Mms.DATE, date);
+        }
+
+        int deliveryReport = sendReq.getDeliveryReport();
+        if (deliveryReport != 0) {
+            values.put(Mms.DELIVERY_REPORT, deliveryReport);
+        }
+
+        long expiry = sendReq.getExpiry();
+        if (expiry != -1) {
+            values.put(Mms.EXPIRY, expiry);
+        }
+
+        byte[] msgClass = sendReq.getMessageClass();
+        if (msgClass != null) {
+            values.put(Mms.MESSAGE_CLASS, toIsoString(msgClass));
+        }
+
+        int priority = sendReq.getPriority();
+        if (priority != 0) {
+            values.put(Mms.PRIORITY, priority);
+        }
+
+        int readReport = sendReq.getReadReport();
+        if (readReport != 0) {
+            values.put(Mms.READ_REPORT, readReport);
+        }
+
+        byte[] transId = sendReq.getTransactionId();
+        if (transId != null) {
+            values.put(Mms.TRANSACTION_ID, toIsoString(transId));
+        }
+
+        EncodedStringValue subject = sendReq.getSubject();
+        if (subject != null) {
+            values.put(Mms.SUBJECT, toIsoString(subject.getTextString()));
+            values.put(Mms.SUBJECT_CHARSET, subject.getCharacterSet());
+        } else {
+            values.put(Mms.SUBJECT, "");
+        }
+
+        long messageSize = sendReq.getMessageSize();
+        if (messageSize > 0) {
+            values.put(Mms.MESSAGE_SIZE, messageSize);
+        }
+
+        PduHeaders headers = sendReq.getPduHeaders();
+        HashSet<String> recipients = new HashSet<String>();
+        for (int addrType : ADDRESS_FIELDS) {
+            EncodedStringValue[] array = null;
+            if (addrType == PduHeaders.FROM) {
+                EncodedStringValue v = headers.getEncodedStringValue(addrType);
+                if (v != null) {
+                    array = new EncodedStringValue[1];
+                    array[0] = v;
+                }
+            } else {
+                array = headers.getEncodedStringValues(addrType);
+            }
+
+            if (array != null) {
+                long msgId = ContentUris.parseId(uri);
+                updateAddress(msgId, addrType, array);
+                if (addrType == PduHeaders.TO) {
+                    for (EncodedStringValue v : array) {
+                        if (v != null) {
+                            recipients.add(v.getString());
+                        }
+                    }
+                }
+            }
+        }
+        if (!recipients.isEmpty()) {
+            long threadId = Threads.getOrCreateThreadId(mContext, recipients);
+            values.put(Mms.THREAD_ID, threadId);
+        }
+
+        SqliteWrapper.update(mContext, mContentResolver, uri, values, null, null);
+    }
+
+    private void updatePart(Uri uri, PduPart part, HashMap<Uri, InputStream> preOpenedFiles)
+            throws MmsException {
+        ContentValues values = new ContentValues(7);
+
+        int charset = part.getCharset();
+        if (charset != 0) {
+            values.put(Part.CHARSET, charset);
+        }
+
+        String contentType = null;
+        if (part.getContentType() != null) {
+            contentType = toIsoString(part.getContentType());
+            values.put(Part.CONTENT_TYPE, contentType);
+        } else {
+            throw new MmsException("MIME type of the part must be set.");
+        }
+
+        if (part.getFilename() != null) {
+            String fileName = new String(part.getFilename());
+            values.put(Part.FILENAME, fileName);
+        }
+
+        if (part.getName() != null) {
+            String name = new String(part.getName());
+            values.put(Part.NAME, name);
+        }
+
+        Object value = null;
+        if (part.getContentDisposition() != null) {
+            value = toIsoString(part.getContentDisposition());
+            values.put(Part.CONTENT_DISPOSITION, (String) value);
+        }
+
+        if (part.getContentId() != null) {
+            value = toIsoString(part.getContentId());
+            values.put(Part.CONTENT_ID, (String) value);
+        }
+
+        if (part.getContentLocation() != null) {
+            value = toIsoString(part.getContentLocation());
+            values.put(Part.CONTENT_LOCATION, (String) value);
+        }
+
+        SqliteWrapper.update(mContext, mContentResolver, uri, values, null, null);
+
+        // Only update the data when:
+        // 1. New binary data supplied or
+        // 2. The Uri of the part is different from the current one.
+        if ((part.getData() != null)
+                || (uri != part.getDataUri())) {
+            persistData(part, uri, contentType, preOpenedFiles);
+        }
+    }
+
+    /**
+     * Update all parts of a PDU.
+     *
+     * @param uri            The PDU which need to be updated.
+     * @param body           New message body of the PDU.
+     * @param preOpenedFiles if not null, a map of preopened InputStreams for the parts.
+     * @throws MmsException Bad URI or updating failed.
+     */
+    public void updateParts(Uri uri, PduBody body, HashMap<Uri, InputStream> preOpenedFiles)
+            throws MmsException {
+        try {
+            PduCacheEntry cacheEntry;
+            synchronized (PDU_CACHE_INSTANCE) {
+                if (PDU_CACHE_INSTANCE.isUpdating(uri)) {
+                    if (LOCAL_LOGV) {
+                        Timber.v("updateParts: " + uri + " blocked by isUpdating()");
+                    }
+                    try {
+                        PDU_CACHE_INSTANCE.wait();
+                    } catch (InterruptedException e) {
+                        Timber.e(e, "updateParts: ");
+                    }
+                    cacheEntry = PDU_CACHE_INSTANCE.get(uri);
+                    if (cacheEntry != null) {
+                        ((MultimediaMessagePdu) cacheEntry.getPdu()).setBody(body);
+                    }
+                }
+                // Tell the cache to indicate to other callers that this item
+                // is currently being updated.
+                PDU_CACHE_INSTANCE.setUpdating(uri, true);
+            }
+
+            ArrayList<PduPart> toBeCreated = new ArrayList<PduPart>();
+            HashMap<Uri, PduPart> toBeUpdated = new HashMap<Uri, PduPart>();
+
+            int partsNum = body.getPartsNum();
+            StringBuilder filter = new StringBuilder().append('(');
+            for (int i = 0; i < partsNum; i++) {
+                PduPart part = body.getPart(i);
+                Uri partUri = part.getDataUri();
+                if ((partUri == null) || !partUri.getAuthority().startsWith("mms")) {
+                    toBeCreated.add(part);
+                } else {
+                    toBeUpdated.put(partUri, part);
+
+                    // Don't use 'i > 0' to determine whether we should append
+                    // 'AND' since 'i = 0' may be skipped in another branch.
+                    if (filter.length() > 1) {
+                        filter.append(" AND ");
+                    }
+
+                    filter.append(Part._ID);
+                    filter.append("!=");
+                    DatabaseUtils.appendEscapedSQLString(filter, partUri.getLastPathSegment());
+                }
+            }
+            filter.append(')');
+
+            long msgId = ContentUris.parseId(uri);
+
+            // Remove the parts which doesn't exist anymore.
+            SqliteWrapper.delete(mContext, mContentResolver,
+                    Uri.parse(Mms.CONTENT_URI + "/" + msgId + "/part"),
+                    filter.length() > 2 ? filter.toString() : null, null);
+
+            // Create new parts which didn't exist before.
+            for (PduPart part : toBeCreated) {
+                persistPart(part, msgId, preOpenedFiles);
+            }
+
+            // Update the modified parts.
+            for (Entry<Uri, PduPart> e : toBeUpdated.entrySet()) {
+                updatePart(e.getKey(), e.getValue(), preOpenedFiles);
+            }
+        } finally {
+            synchronized (PDU_CACHE_INSTANCE) {
+                PDU_CACHE_INSTANCE.setUpdating(uri, false);
+                PDU_CACHE_INSTANCE.notifyAll();
+            }
+        }
+    }
+
+    /**
+     * Persist a PDU object to specific location in the storage.
+     *
+     * @param pdu             The PDU object to be stored.
+     * @param uri             Where to store the given PDU object.
+     * @param threadId
+     * @param createThreadId  if true, this function may create a thread id for the recipients
+     * @param groupMmsEnabled if true, all of the recipients addressed in the PDU will be used
+     *                        to create the associated thread. When false, only the sender will be used in finding or
+     *                        creating the appropriate thread or conversation.
+     * @param preOpenedFiles  if not null, a map of preopened InputStreams for the parts.
+     * @return A Uri which can be used to access the stored PDU.
+     */
+
+    public Uri persist(GenericPdu pdu, Uri uri, long threadId, boolean createThreadId, boolean groupMmsEnabled,
+                       HashMap<Uri, InputStream> preOpenedFiles) throws MmsException {
+
+        if (uri == null) {
+            throw new MmsException("Uri may not be null.");
+        }
+
+        long msgId = -1;
+        try {
+            msgId = ContentUris.parseId(uri);
+        } catch (NumberFormatException e) {
+            // the uri ends with "inbox" or something else like that
+        }
+
+        boolean existingUri = msgId != -1;
+
+        if (!existingUri && MESSAGE_BOX_MAP.get(uri) == null) {
+            throw new MmsException(
+                    "Bad destination, must be one of "
+                            + "content://mms/inbox, content://mms/sent, "
+                            + "content://mms/drafts, content://mms/outbox, "
+                            + "content://mms/temp.");
+        }
+        synchronized (PDU_CACHE_INSTANCE) {
+            // If the cache item is getting updated, wait until it's done updating before
+            // purging it.
+            if (PDU_CACHE_INSTANCE.isUpdating(uri)) {
+                if (LOCAL_LOGV) {
+                    Timber.v("persist: " + uri + " blocked by isUpdating()");
+                }
+                try {
+                    PDU_CACHE_INSTANCE.wait();
+                } catch (InterruptedException e) {
+                    Timber.e(e, "persist1: ");
+                }
+            }
+        }
+        PDU_CACHE_INSTANCE.purge(uri);
+
+        PduHeaders header = pdu.getPduHeaders();
+        PduBody body = null;
+        ContentValues values = new ContentValues();
+        Set<Entry<Integer, String>> set;
+
+        set = ENCODED_STRING_COLUMN_NAME_MAP.entrySet();
+        for (Entry<Integer, String> e : set) {
+            int field = e.getKey();
+            EncodedStringValue encodedString = header.getEncodedStringValue(field);
+            if (encodedString != null) {
+                String charsetColumn = CHARSET_COLUMN_NAME_MAP.get(field);
+                values.put(e.getValue(), toIsoString(encodedString.getTextString()));
+                values.put(charsetColumn, encodedString.getCharacterSet());
+            }
+        }
+
+        set = TEXT_STRING_COLUMN_NAME_MAP.entrySet();
+        for (Entry<Integer, String> e : set) {
+            byte[] text = header.getTextString(e.getKey());
+            if (text != null) {
+                values.put(e.getValue(), toIsoString(text));
+            }
+        }
+
+        set = OCTET_COLUMN_NAME_MAP.entrySet();
+        for (Entry<Integer, String> e : set) {
+            int b = header.getOctet(e.getKey());
+            if (b != 0) {
+                values.put(e.getValue(), b);
+            }
+        }
+
+        set = LONG_COLUMN_NAME_MAP.entrySet();
+        for (Entry<Integer, String> e : set) {
+            long l = header.getLongInteger(e.getKey());
+            if (l != -1L) {
+                values.put(e.getValue(), l);
+            }
+        }
+
+        HashMap<Integer, EncodedStringValue[]> addressMap =
+                new HashMap<Integer, EncodedStringValue[]>(ADDRESS_FIELDS.length);
+        // Save address information.
+        for (int addrType : ADDRESS_FIELDS) {
+            EncodedStringValue[] array = null;
+            if (addrType == PduHeaders.FROM) {
+                EncodedStringValue v = header.getEncodedStringValue(addrType);
+                if (v != null) {
+                    array = new EncodedStringValue[1];
+                    array[0] = v;
+                }
+            } else {
+                array = header.getEncodedStringValues(addrType);
+            }
+            addressMap.put(addrType, array);
+        }
+
+        HashSet<String> recipients = new HashSet<String>();
+        int msgType = pdu.getMessageType();
+        // Here we only allocate thread ID for M-Notification.ind,
+        // M-Retrieve.conf and M-Send.req.
+        // Some of other PDU types may be allocated a thread ID outside
+        // this scope.
+        if ((msgType == PduHeaders.MESSAGE_TYPE_NOTIFICATION_IND)
+                || (msgType == PduHeaders.MESSAGE_TYPE_RETRIEVE_CONF)
+                || (msgType == PduHeaders.MESSAGE_TYPE_SEND_REQ)) {
+            switch (msgType) {
+                case PduHeaders.MESSAGE_TYPE_NOTIFICATION_IND:
+                case PduHeaders.MESSAGE_TYPE_RETRIEVE_CONF:
+                    loadRecipients(PduHeaders.FROM, recipients, addressMap, false);
+
+                    // For received messages when group MMS is enabled, we want to associate this
+                    // message with the thread composed of all the recipients -- all but our own
+                    // number, that is. This includes the person who sent the
+                    // message or the FROM field (above) in addition to the other people the message
+                    // was addressed to or the TO field. Our own number is in that TO field and
+                    // we have to ignore it in loadRecipients.
+                    if (groupMmsEnabled) {
+                        loadRecipients(PduHeaders.TO, recipients, addressMap, true);
+
+                        // Also load any numbers in the CC field to address group messaging
+                        // compatibility issues with devices that place numbers in this field
+                        // for group messages.
+                        loadRecipients(PduHeaders.CC, recipients, addressMap, true);
+                    }
+                    break;
+                case PduHeaders.MESSAGE_TYPE_SEND_REQ:
+                    loadRecipients(PduHeaders.TO, recipients, addressMap, false);
+                    break;
+            }
+            if (threadId == DUMMY_THREAD_ID && createThreadId && !recipients.isEmpty()) {
+                // Given all the recipients associated with this message, find (or create) the
+                // correct thread.
+                threadId = Threads.getOrCreateThreadId(mContext, recipients);
+            }
+            values.put(Mms.THREAD_ID, threadId);
+        }
+
+        // Save parts first to avoid inconsistent message is loaded
+        // while saving the parts.
+        long dummyId = System.currentTimeMillis(); // Dummy ID of the msg.
+
+        // Sum up the total message size
+        int messageSize = 0;
+
+        // Get body if the PDU is a RetrieveConf or SendReq.
+        if (pdu instanceof MultimediaMessagePdu) {
+            body = ((MultimediaMessagePdu) pdu).getBody();
+            // Start saving parts if necessary.
+            if (body != null) {
+                for (int i = 0; i < body.getPartsNum(); i++) {
+                    PduPart part = body.getPart(i);
+                    messageSize += part.getDataLength();
+                    persistPart(part, dummyId, preOpenedFiles);
+                }
+            }
+        }
+
+        // The message-size might already have been inserted when parsing the
+        // PDU header. If not, then we insert the message size as well.
+        if (values.getAsInteger(Mms.MESSAGE_SIZE) == null) {
+            values.put(Mms.MESSAGE_SIZE, messageSize);
+        }
+
+        Uri res = null;
+        if (existingUri) {
+            res = uri;
+            SqliteWrapper.update(mContext, mContentResolver, res, values, null, null);
+        } else {
+            res = SqliteWrapper.insert(mContext, mContentResolver, uri, values);
+            if (res == null) {
+                throw new MmsException("persist() failed: return null.");
+            }
+            // Get the real ID of the PDU and update all parts which were
+            // saved with the dummy ID.
+            msgId = ContentUris.parseId(res);
+        }
+
+        values = new ContentValues(1);
+        values.put(Part.MSG_ID, msgId);
+        SqliteWrapper.update(mContext, mContentResolver,
+                Uri.parse("content://mms/" + dummyId + "/part"),
+                values, null, null);
+        // We should return the longest URI of the persisted PDU, for
+        // example, if input URI is "content://mms/inbox" and the _ID of
+        // persisted PDU is '8', we should return "content://mms/inbox/8"
+        // instead of "content://mms/8".
+        // FIXME: Should the MmsProvider be responsible for this???
+        if (!existingUri) {
+            res = Uri.parse(uri + "/" + msgId);
+        }
+
+        // Save address information.
+        for (int addrType : ADDRESS_FIELDS) {
+            EncodedStringValue[] array = addressMap.get(addrType);
+            if (array != null) {
+                persistAddress(msgId, addrType, array);
+            }
+        }
+
+        return res;
+    }
+
+    /**
+     * For a given address type, extract the recipients from the headers.
+     *
+     * @param addressType     can be PduHeaders.FROM, PduHeaders.TO or PduHeaders.CC
+     * @param recipients      a HashSet that is loaded with the recipients from the FROM, TO or CC headers
+     * @param addressMap      a HashMap of the addresses from the ADDRESS_FIELDS header
+     * @param excludeMyNumber if true, the number of this phone will be excluded from recipients
+     */
+    private void loadRecipients(int addressType, HashSet<String> recipients,
+                                HashMap<Integer, EncodedStringValue[]> addressMap, boolean excludeMyNumber) {
+        EncodedStringValue[] array = addressMap.get(addressType);
+        if (array == null) {
+            return;
+        }
+        // If the TO recipients is only a single address, then we can skip loadRecipients when
+        // we're excluding our own number because we know that address is our own.
+        // NOTE: this is not true for project fi users. To fix it, we'll add the final check for the
+        //       TO type. project fi will use the cc field instead.
+        if (excludeMyNumber && array.length == 1 && addressType == PduHeaders.TO) {
+            return;
+        }
+        String myNumber = excludeMyNumber ? mTelephonyManager.getLine1Number() : null;
+        for (EncodedStringValue v : array) {
+            if (v != null) {
+                String number = v.getString();
+                if ((myNumber == null || !PhoneNumberUtils.compare(number, myNumber)) &&
+                        !recipients.contains(number)) {
+                    // Only add numbers which aren't my own number.
+                    recipients.add(number);
+                }
+            }
+        }
+    }
+
+    /**
+     * Move a PDU object from one location to another.
+     *
+     * @param from Specify the PDU object to be moved.
+     * @param to   The destination location, should be one of the following:
+     *             "content://mms/inbox", "content://mms/sent",
+     *             "content://mms/drafts", "content://mms/outbox",
+     *             "content://mms/trash".
+     * @return New Uri of the moved PDU.
+     * @throws MmsException Error occurred while moving the message.
+     */
+    public Uri move(Uri from, Uri to) throws MmsException {
+        // Check whether the 'msgId' has been assigned a valid value.
+        long msgId = ContentUris.parseId(from);
+        if (msgId == -1L) {
+            throw new MmsException("Error! ID of the message: -1.");
+        }
+
+        // Get corresponding int value of destination box.
+        Integer msgBox = MESSAGE_BOX_MAP.get(to);
+        if (msgBox == null) {
+            throw new MmsException(
+                    "Bad destination, must be one of "
+                            + "content://mms/inbox, content://mms/sent, "
+                            + "content://mms/drafts, content://mms/outbox, "
+                            + "content://mms/temp.");
+        }
+
+        ContentValues values = new ContentValues(1);
+        values.put(Mms.MESSAGE_BOX, msgBox);
+        SqliteWrapper.update(mContext, mContentResolver, from, values, null, null);
+        return ContentUris.withAppendedId(to, msgId);
+    }
+
+    /**
+     * Wrap a byte[] into a String.
+     */
+    public static String toIsoString(byte[] bytes) {
+        try {
+            return new String(bytes, CharacterSets.MIMENAME_ISO_8859_1);
+        } catch (UnsupportedEncodingException e) {
+            // Impossible to reach here!
+            Timber.e(e, "ISO_8859_1 must be supported!");
+            return "";
+        }
+    }
+
+    /**
+     * Unpack a given String into a byte[].
+     */
+    public static byte[] getBytes(String data) {
+        try {
+            return data.getBytes(CharacterSets.MIMENAME_ISO_8859_1);
+        } catch (UnsupportedEncodingException e) {
+            // Impossible to reach here!
+            Timber.e(e, "ISO_8859_1 must be supported!");
+            return new byte[0];
+        }
+    }
+
+    /**
+     * Remove all objects in the temporary path.
+     */
+    public void release() {
+        Uri uri = Uri.parse(TEMPORARY_DRM_OBJECT_URI);
+        SqliteWrapper.delete(mContext, mContentResolver, uri, null, null);
+    }
+
+    /**
+     * Find all messages to be sent or downloaded before certain time.
+     */
+    public Cursor getPendingMessages(long dueTime) {
+        if (!checkReadSmsPermissions()) {
+            Timber.w("No read sms permissions have been granted");
+            return null;
+        }
+        Uri.Builder uriBuilder = PendingMessages.CONTENT_URI.buildUpon();
+        uriBuilder.appendQueryParameter("protocol", "mms");
+
+        String selection = PendingMessages.ERROR_TYPE + " < ?"
+                + " AND " + PendingMessages.DUE_TIME + " <= ?";
+
+        String[] selectionArgs = new String[]{
+                String.valueOf(MmsSms.ERR_TYPE_GENERIC_PERMANENT),
+                String.valueOf(dueTime)
+        };
+
+        return SqliteWrapper.query(mContext, mContentResolver,
+                uriBuilder.build(), null, selection, selectionArgs,
+                PendingMessages.DUE_TIME);
+    }
+
+    /**
+     * Check if read permissions for SMS have been granted
+     */
+    private boolean checkReadSmsPermissions() {
+        return Build.VERSION.SDK_INT < Build.VERSION_CODES.M ||
+                mContext.checkSelfPermission(Manifest.permission.READ_SMS) ==
+                        PackageManager.PERMISSION_GRANTED;
+    }
+}
diff --git a/android-smsmms/src/main/java/com/google/android/mms/pdu_alt/QuotedPrintable.java b/android-smsmms/src/main/java/com/google/android/mms/pdu_alt/QuotedPrintable.java
index 3a504c605..a8a1d3b0d 100755
--- a/android-smsmms/src/main/java/com/google/android/mms/pdu_alt/QuotedPrintable.java
+++ b/android-smsmms/src/main/java/com/google/android/mms/pdu_alt/QuotedPrintable.java
@@ -1,67 +1,67 @@
-/*
- * Copyright (C) 2015 Jacob Klinker
- *
- * Licensed under the Apache License, Version 2.0 (the "License");
- * you may not use this file except in compliance with the License.
- * You may obtain a copy of the License at
- *
- * http://www.apache.org/licenses/LICENSE-2.0
- *
- * Unless required by applicable law or agreed to in writing, software
- * distributed under the License is distributed on an "AS IS" BASIS,
- * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
- * See the License for the specific language governing permissions and
- * limitations under the License.
- */
-
-package com.google.android.mms.pdu_alt;
-
-import java.io.ByteArrayOutputStream;
-
-public class QuotedPrintable {
-    private static byte ESCAPE_CHAR = '=';
-
-    /**
-     * Decodes an array quoted-printable characters into an array of original bytes.
-     * Escaped characters are converted back to their original representation.
-     *
-     * <p>
-     * This function implements a subset of
-     * quoted-printable encoding specification (rule #1 and rule #2)
-     * as defined in RFC 1521.
-     * </p>
-     *
-     * @param bytes array of quoted-printable characters
-     * @return array of original bytes,
-     *         null if quoted-printable decoding is unsuccessful.
-     */
-    public static final byte[] decodeQuotedPrintable(byte[] bytes) {
-        if (bytes == null) {
-            return null;
-        }
-        ByteArrayOutputStream buffer = new ByteArrayOutputStream();
-        for (int i = 0; i < bytes.length; i++) {
-            int b = bytes[i];
-            if (b == ESCAPE_CHAR) {
-                try {
-                    if('\r' == (char)bytes[i + 1] &&
-                            '\n' == (char)bytes[i + 2]) {
-                        i += 2;
-                        continue;
-                    }
-                    int u = Character.digit((char) bytes[++i], 16);
-                    int l = Character.digit((char) bytes[++i], 16);
-                    if (u == -1 || l == -1) {
-                        return null;
-                    }
-                    buffer.write((char) ((u << 4) + l));
-                } catch (ArrayIndexOutOfBoundsException e) {
-                    return null;
-                }
-            } else {
-                buffer.write(b);
-            }
-        }
-        return buffer.toByteArray();
-    }
-}
+/*
+ * Copyright (C) 2015 Jacob Klinker
+ *
+ * Licensed under the Apache License, Version 2.0 (the "License");
+ * you may not use this file except in compliance with the License.
+ * You may obtain a copy of the License at
+ *
+ * http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing, software
+ * distributed under the License is distributed on an "AS IS" BASIS,
+ * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ * See the License for the specific language governing permissions and
+ * limitations under the License.
+ */
+
+package com.google.android.mms.pdu_alt;
+
+import java.io.ByteArrayOutputStream;
+
+public class QuotedPrintable {
+    private static byte ESCAPE_CHAR = '=';
+
+    /**
+     * Decodes an array quoted-printable characters into an array of original bytes.
+     * Escaped characters are converted back to their original representation.
+     *
+     * <p>
+     * This function implements a subset of
+     * quoted-printable encoding specification (rule #1 and rule #2)
+     * as defined in RFC 1521.
+     * </p>
+     *
+     * @param bytes array of quoted-printable characters
+     * @return array of original bytes,
+     *         null if quoted-printable decoding is unsuccessful.
+     */
+    public static final byte[] decodeQuotedPrintable(byte[] bytes) {
+        if (bytes == null) {
+            return null;
+        }
+        ByteArrayOutputStream buffer = new ByteArrayOutputStream();
+        for (int i = 0; i < bytes.length; i++) {
+            int b = bytes[i];
+            if (b == ESCAPE_CHAR) {
+                try {
+                    if('\r' == (char)bytes[i + 1] &&
+                            '\n' == (char)bytes[i + 2]) {
+                        i += 2;
+                        continue;
+                    }
+                    int u = Character.digit((char) bytes[++i], 16);
+                    int l = Character.digit((char) bytes[++i], 16);
+                    if (u == -1 || l == -1) {
+                        return null;
+                    }
+                    buffer.write((char) ((u << 4) + l));
+                } catch (ArrayIndexOutOfBoundsException e) {
+                    return null;
+                }
+            } else {
+                buffer.write(b);
+            }
+        }
+        return buffer.toByteArray();
+    }
+}
diff --git a/android-smsmms/src/main/java/com/google/android/mms/pdu_alt/ReadOrigInd.java b/android-smsmms/src/main/java/com/google/android/mms/pdu_alt/ReadOrigInd.java
index 42b22377e..ccdb3dede 100755
--- a/android-smsmms/src/main/java/com/google/android/mms/pdu_alt/ReadOrigInd.java
+++ b/android-smsmms/src/main/java/com/google/android/mms/pdu_alt/ReadOrigInd.java
@@ -1,152 +1,152 @@
-/*
- * Copyright (C) 2015 Jacob Klinker
- *
- * Licensed under the Apache License, Version 2.0 (the "License");
- * you may not use this file except in compliance with the License.
- * You may obtain a copy of the License at
- *
- * http://www.apache.org/licenses/LICENSE-2.0
- *
- * Unless required by applicable law or agreed to in writing, software
- * distributed under the License is distributed on an "AS IS" BASIS,
- * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
- * See the License for the specific language governing permissions and
- * limitations under the License.
- */
-
-package com.google.android.mms.pdu_alt;
-
-import com.google.android.mms.InvalidHeaderValueException;
-
-public class ReadOrigInd extends GenericPdu {
-    /**
-     * Empty constructor.
-     * Since the Pdu corresponding to this class is constructed
-     * by the Proxy-Relay server, this class is only instantiated
-     * by the Pdu Parser.
-     *
-     * @throws InvalidHeaderValueException if error occurs.
-     */
-    public ReadOrigInd() throws InvalidHeaderValueException {
-        super();
-        setMessageType(PduHeaders.MESSAGE_TYPE_READ_ORIG_IND);
-    }
-
-    /**
-     * Constructor with given headers.
-     *
-     * @param headers Headers for this PDU.
-     */
-    ReadOrigInd(PduHeaders headers) {
-        super(headers);
-    }
-
-    /**
-     * Get Date value.
-     *
-     * @return the value
-     */
-    public long getDate() {
-        return mPduHeaders.getLongInteger(PduHeaders.DATE);
-    }
-
-    /**
-     * Set Date value.
-     *
-     * @param value the value
-     */
-    public void setDate(long value) {
-        mPduHeaders.setLongInteger(value, PduHeaders.DATE);
-    }
-
-    /**
-     * Get From value.
-     * From-value = Value-length
-     *      (Address-present-token Encoded-string-value | Insert-address-token)
-     *
-     * @return the value
-     */
-    public EncodedStringValue getFrom() {
-       return mPduHeaders.getEncodedStringValue(PduHeaders.FROM);
-    }
-
-    /**
-     * Set From value.
-     *
-     * @param value the value
-     * @throws NullPointerException if the value is null.
-     */
-    public void setFrom(EncodedStringValue value) {
-        mPduHeaders.setEncodedStringValue(value, PduHeaders.FROM);
-    }
-
-    /**
-     * Get Message-ID value.
-     *
-     * @return the value
-     */
-    public byte[] getMessageId() {
-        return mPduHeaders.getTextString(PduHeaders.MESSAGE_ID);
-    }
-
-    /**
-     * Set Message-ID value.
-     *
-     * @param value the value
-     * @throws NullPointerException if the value is null.
-     */
-    public void setMessageId(byte[] value) {
-        mPduHeaders.setTextString(value, PduHeaders.MESSAGE_ID);
-    }
-
-    /**
-     * Get X-MMS-Read-status value.
-     *
-     * @return the value
-     */
-    public int getReadStatus() {
-        return mPduHeaders.getOctet(PduHeaders.READ_STATUS);
-    }
-
-    /**
-     * Set X-MMS-Read-status value.
-     *
-     * @param value the value
-     * @throws InvalidHeaderValueException if the value is invalid.
-     */
-    public void setReadStatus(int value) throws InvalidHeaderValueException {
-        mPduHeaders.setOctet(value, PduHeaders.READ_STATUS);
-    }
-
-    /**
-     * Get To value.
-     *
-     * @return the value
-     */
-    public EncodedStringValue[] getTo() {
-        return mPduHeaders.getEncodedStringValues(PduHeaders.TO);
-    }
-
-    /**
-     * Set To value.
-     *
-     * @param value the value
-     * @throws NullPointerException if the value is null.
-     */
-    public void setTo(EncodedStringValue[] value) {
-        mPduHeaders.setEncodedStringValues(value, PduHeaders.TO);
-    }
-
-    /*
-     * Optional, not supported header fields:
-     *
-     *     public byte[] getApplicId() {return null;}
-     *     public void setApplicId(byte[] value) {}
-     *
-     *     public byte[] getAuxApplicId() {return null;}
-     *     public void getAuxApplicId(byte[] value) {}
-     *
-     *     public byte[] getReplyApplicId() {return 0x00;}
-     *     public void setReplyApplicId(byte[] value) {}
-     */
-}
+/*
+ * Copyright (C) 2015 Jacob Klinker
+ *
+ * Licensed under the Apache License, Version 2.0 (the "License");
+ * you may not use this file except in compliance with the License.
+ * You may obtain a copy of the License at
+ *
+ * http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing, software
+ * distributed under the License is distributed on an "AS IS" BASIS,
+ * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ * See the License for the specific language governing permissions and
+ * limitations under the License.
+ */
+
+package com.google.android.mms.pdu_alt;
+
+import com.google.android.mms.InvalidHeaderValueException;
+
+public class ReadOrigInd extends GenericPdu {
+    /**
+     * Empty constructor.
+     * Since the Pdu corresponding to this class is constructed
+     * by the Proxy-Relay server, this class is only instantiated
+     * by the Pdu Parser.
+     *
+     * @throws InvalidHeaderValueException if error occurs.
+     */
+    public ReadOrigInd() throws InvalidHeaderValueException {
+        super();
+        setMessageType(PduHeaders.MESSAGE_TYPE_READ_ORIG_IND);
+    }
+
+    /**
+     * Constructor with given headers.
+     *
+     * @param headers Headers for this PDU.
+     */
+    ReadOrigInd(PduHeaders headers) {
+        super(headers);
+    }
+
+    /**
+     * Get Date value.
+     *
+     * @return the value
+     */
+    public long getDate() {
+        return mPduHeaders.getLongInteger(PduHeaders.DATE);
+    }
+
+    /**
+     * Set Date value.
+     *
+     * @param value the value
+     */
+    public void setDate(long value) {
+        mPduHeaders.setLongInteger(value, PduHeaders.DATE);
+    }
+
+    /**
+     * Get From value.
+     * From-value = Value-length
+     *      (Address-present-token Encoded-string-value | Insert-address-token)
+     *
+     * @return the value
+     */
+    public EncodedStringValue getFrom() {
+       return mPduHeaders.getEncodedStringValue(PduHeaders.FROM);
+    }
+
+    /**
+     * Set From value.
+     *
+     * @param value the value
+     * @throws NullPointerException if the value is null.
+     */
+    public void setFrom(EncodedStringValue value) {
+        mPduHeaders.setEncodedStringValue(value, PduHeaders.FROM);
+    }
+
+    /**
+     * Get Message-ID value.
+     *
+     * @return the value
+     */
+    public byte[] getMessageId() {
+        return mPduHeaders.getTextString(PduHeaders.MESSAGE_ID);
+    }
+
+    /**
+     * Set Message-ID value.
+     *
+     * @param value the value
+     * @throws NullPointerException if the value is null.
+     */
+    public void setMessageId(byte[] value) {
+        mPduHeaders.setTextString(value, PduHeaders.MESSAGE_ID);
+    }
+
+    /**
+     * Get X-MMS-Read-status value.
+     *
+     * @return the value
+     */
+    public int getReadStatus() {
+        return mPduHeaders.getOctet(PduHeaders.READ_STATUS);
+    }
+
+    /**
+     * Set X-MMS-Read-status value.
+     *
+     * @param value the value
+     * @throws InvalidHeaderValueException if the value is invalid.
+     */
+    public void setReadStatus(int value) throws InvalidHeaderValueException {
+        mPduHeaders.setOctet(value, PduHeaders.READ_STATUS);
+    }
+
+    /**
+     * Get To value.
+     *
+     * @return the value
+     */
+    public EncodedStringValue[] getTo() {
+        return mPduHeaders.getEncodedStringValues(PduHeaders.TO);
+    }
+
+    /**
+     * Set To value.
+     *
+     * @param value the value
+     * @throws NullPointerException if the value is null.
+     */
+    public void setTo(EncodedStringValue[] value) {
+        mPduHeaders.setEncodedStringValues(value, PduHeaders.TO);
+    }
+
+    /*
+     * Optional, not supported header fields:
+     *
+     *     public byte[] getApplicId() {return null;}
+     *     public void setApplicId(byte[] value) {}
+     *
+     *     public byte[] getAuxApplicId() {return null;}
+     *     public void getAuxApplicId(byte[] value) {}
+     *
+     *     public byte[] getReplyApplicId() {return 0x00;}
+     *     public void setReplyApplicId(byte[] value) {}
+     */
+}
diff --git a/android-smsmms/src/main/java/com/google/android/mms/pdu_alt/ReadRecInd.java b/android-smsmms/src/main/java/com/google/android/mms/pdu_alt/ReadRecInd.java
index b4de988fb..ac751f2ab 100755
--- a/android-smsmms/src/main/java/com/google/android/mms/pdu_alt/ReadRecInd.java
+++ b/android-smsmms/src/main/java/com/google/android/mms/pdu_alt/ReadRecInd.java
@@ -1,143 +1,143 @@
-/*
- * Copyright (C) 2015 Jacob Klinker
- *
- * Licensed under the Apache License, Version 2.0 (the "License");
- * you may not use this file except in compliance with the License.
- * You may obtain a copy of the License at
- *
- * http://www.apache.org/licenses/LICENSE-2.0
- *
- * Unless required by applicable law or agreed to in writing, software
- * distributed under the License is distributed on an "AS IS" BASIS,
- * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
- * See the License for the specific language governing permissions and
- * limitations under the License.
- */
-
-package com.google.android.mms.pdu_alt;
-
-import com.google.android.mms.InvalidHeaderValueException;
-
-public class ReadRecInd extends GenericPdu {
-    /**
-     * Constructor, used when composing a M-ReadRec.ind pdu.
-     *
-     * @param from the from value
-     * @param messageId the message ID value
-     * @param mmsVersion current viersion of mms
-     * @param readStatus the read status value
-     * @param to the to value
-     * @throws InvalidHeaderValueException if parameters are invalid.
-     *         NullPointerException if messageId or to is null.
-     */
-    public ReadRecInd(EncodedStringValue from,
-                      byte[] messageId,
-                      int mmsVersion,
-                      int readStatus,
-                      EncodedStringValue[] to) throws InvalidHeaderValueException {
-        super();
-        setMessageType(PduHeaders.MESSAGE_TYPE_READ_REC_IND);
-        setFrom(from);
-        setMessageId(messageId);
-        setMmsVersion(mmsVersion);
-        setTo(to);
-        setReadStatus(readStatus);
-    }
-
-    /**
-     * Constructor with given headers.
-     *
-     * @param headers Headers for this PDU.
-     */
-    ReadRecInd(PduHeaders headers) {
-        super(headers);
-    }
-
-    /**
-     * Get Date value.
-     *
-     * @return the value
-     */
-    public long getDate() {
-        return mPduHeaders.getLongInteger(PduHeaders.DATE);
-    }
-
-    /**
-     * Set Date value.
-     *
-     * @param value the value
-     */
-    public void setDate(long value) {
-        mPduHeaders.setLongInteger(value, PduHeaders.DATE);
-    }
-
-    /**
-     * Get Message-ID value.
-     *
-     * @return the value
-     */
-    public byte[] getMessageId() {
-        return mPduHeaders.getTextString(PduHeaders.MESSAGE_ID);
-    }
-
-    /**
-     * Set Message-ID value.
-     *
-     * @param value the value
-     * @throws NullPointerException if the value is null.
-     */
-    public void setMessageId(byte[] value) {
-        mPduHeaders.setTextString(value, PduHeaders.MESSAGE_ID);
-    }
-
-    /**
-     * Get To value.
-     *
-     * @return the value
-     */
-    public EncodedStringValue[] getTo() {
-        return mPduHeaders.getEncodedStringValues(PduHeaders.TO);
-    }
-
-    /**
-     * Set To value.
-     *
-     * @param value the value
-     * @throws NullPointerException if the value is null.
-     */
-    public void setTo(EncodedStringValue[] value) {
-        mPduHeaders.setEncodedStringValues(value, PduHeaders.TO);
-    }
-
-    /**
-     * Get X-MMS-Read-status value.
-     *
-     * @return the value
-     */
-    public int getReadStatus() {
-        return mPduHeaders.getOctet(PduHeaders.READ_STATUS);
-    }
-
-    /**
-     * Set X-MMS-Read-status value.
-     *
-     * @param value the value
-     * @throws InvalidHeaderValueException if the value is invalid.
-     */
-    public void setReadStatus(int value) throws InvalidHeaderValueException {
-        mPduHeaders.setOctet(value, PduHeaders.READ_STATUS);
-    }
-
-    /*
-     * Optional, not supported header fields:
-     *
-     *     public byte[] getApplicId() {return null;}
-     *     public void setApplicId(byte[] value) {}
-     *
-     *     public byte[] getAuxApplicId() {return null;}
-     *     public void getAuxApplicId(byte[] value) {}
-     *
-     *     public byte[] getReplyApplicId() {return 0x00;}
-     *     public void setReplyApplicId(byte[] value) {}
-     */
-}
+/*
+ * Copyright (C) 2015 Jacob Klinker
+ *
+ * Licensed under the Apache License, Version 2.0 (the "License");
+ * you may not use this file except in compliance with the License.
+ * You may obtain a copy of the License at
+ *
+ * http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing, software
+ * distributed under the License is distributed on an "AS IS" BASIS,
+ * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ * See the License for the specific language governing permissions and
+ * limitations under the License.
+ */
+
+package com.google.android.mms.pdu_alt;
+
+import com.google.android.mms.InvalidHeaderValueException;
+
+public class ReadRecInd extends GenericPdu {
+    /**
+     * Constructor, used when composing a M-ReadRec.ind pdu.
+     *
+     * @param from the from value
+     * @param messageId the message ID value
+     * @param mmsVersion current viersion of mms
+     * @param readStatus the read status value
+     * @param to the to value
+     * @throws InvalidHeaderValueException if parameters are invalid.
+     *         NullPointerException if messageId or to is null.
+     */
+    public ReadRecInd(EncodedStringValue from,
+                      byte[] messageId,
+                      int mmsVersion,
+                      int readStatus,
+                      EncodedStringValue[] to) throws InvalidHeaderValueException {
+        super();
+        setMessageType(PduHeaders.MESSAGE_TYPE_READ_REC_IND);
+        setFrom(from);
+        setMessageId(messageId);
+        setMmsVersion(mmsVersion);
+        setTo(to);
+        setReadStatus(readStatus);
+    }
+
+    /**
+     * Constructor with given headers.
+     *
+     * @param headers Headers for this PDU.
+     */
+    ReadRecInd(PduHeaders headers) {
+        super(headers);
+    }
+
+    /**
+     * Get Date value.
+     *
+     * @return the value
+     */
+    public long getDate() {
+        return mPduHeaders.getLongInteger(PduHeaders.DATE);
+    }
+
+    /**
+     * Set Date value.
+     *
+     * @param value the value
+     */
+    public void setDate(long value) {
+        mPduHeaders.setLongInteger(value, PduHeaders.DATE);
+    }
+
+    /**
+     * Get Message-ID value.
+     *
+     * @return the value
+     */
+    public byte[] getMessageId() {
+        return mPduHeaders.getTextString(PduHeaders.MESSAGE_ID);
+    }
+
+    /**
+     * Set Message-ID value.
+     *
+     * @param value the value
+     * @throws NullPointerException if the value is null.
+     */
+    public void setMessageId(byte[] value) {
+        mPduHeaders.setTextString(value, PduHeaders.MESSAGE_ID);
+    }
+
+    /**
+     * Get To value.
+     *
+     * @return the value
+     */
+    public EncodedStringValue[] getTo() {
+        return mPduHeaders.getEncodedStringValues(PduHeaders.TO);
+    }
+
+    /**
+     * Set To value.
+     *
+     * @param value the value
+     * @throws NullPointerException if the value is null.
+     */
+    public void setTo(EncodedStringValue[] value) {
+        mPduHeaders.setEncodedStringValues(value, PduHeaders.TO);
+    }
+
+    /**
+     * Get X-MMS-Read-status value.
+     *
+     * @return the value
+     */
+    public int getReadStatus() {
+        return mPduHeaders.getOctet(PduHeaders.READ_STATUS);
+    }
+
+    /**
+     * Set X-MMS-Read-status value.
+     *
+     * @param value the value
+     * @throws InvalidHeaderValueException if the value is invalid.
+     */
+    public void setReadStatus(int value) throws InvalidHeaderValueException {
+        mPduHeaders.setOctet(value, PduHeaders.READ_STATUS);
+    }
+
+    /*
+     * Optional, not supported header fields:
+     *
+     *     public byte[] getApplicId() {return null;}
+     *     public void setApplicId(byte[] value) {}
+     *
+     *     public byte[] getAuxApplicId() {return null;}
+     *     public void getAuxApplicId(byte[] value) {}
+     *
+     *     public byte[] getReplyApplicId() {return 0x00;}
+     *     public void setReplyApplicId(byte[] value) {}
+     */
+}
diff --git a/android-smsmms/src/main/java/com/google/android/mms/pdu_alt/RetrieveConf.java b/android-smsmms/src/main/java/com/google/android/mms/pdu_alt/RetrieveConf.java
index 24f4769e8..65ec5f433 100755
--- a/android-smsmms/src/main/java/com/google/android/mms/pdu_alt/RetrieveConf.java
+++ b/android-smsmms/src/main/java/com/google/android/mms/pdu_alt/RetrieveConf.java
@@ -1,299 +1,299 @@
-/*
- * Copyright (C) 2015 Jacob Klinker
- *
- * Licensed under the Apache License, Version 2.0 (the "License");
- * you may not use this file except in compliance with the License.
- * You may obtain a copy of the License at
- *
- * http://www.apache.org/licenses/LICENSE-2.0
- *
- * Unless required by applicable law or agreed to in writing, software
- * distributed under the License is distributed on an "AS IS" BASIS,
- * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
- * See the License for the specific language governing permissions and
- * limitations under the License.
- */
-
-package com.google.android.mms.pdu_alt;
-
-import com.google.android.mms.InvalidHeaderValueException;
-
-/**
- * M-Retrive.conf Pdu.
- */
-public class RetrieveConf extends MultimediaMessagePdu {
-    /**
-     * Empty constructor.
-     * Since the Pdu corresponding to this class is constructed
-     * by the Proxy-Relay server, this class is only instantiated
-     * by the Pdu Parser.
-     *
-     * @throws InvalidHeaderValueException if error occurs.
-     */
-    public RetrieveConf() throws InvalidHeaderValueException {
-        super();
-        setMessageType(PduHeaders.MESSAGE_TYPE_RETRIEVE_CONF);
-    }
-
-    /**
-     * Constructor with given headers.
-     *
-     * @param headers Headers for this PDU.
-     */
-    RetrieveConf(PduHeaders headers) {
-        super(headers);
-    }
-
-    /**
-     * Constructor with given headers and body
-     *
-     * @param headers Headers for this PDU.
-     * @param body Body of this PDu.
-     */
-    RetrieveConf(PduHeaders headers, PduBody body) {
-        super(headers, body);
-    }
-
-    /**
-     * Get CC value.
-     *
-     * @return the value
-     */
-    public EncodedStringValue[] getCc() {
-        return mPduHeaders.getEncodedStringValues(PduHeaders.CC);
-    }
-
-    /**
-     * Add a "CC" value.
-     *
-     * @param value the value
-     * @throws NullPointerException if the value is null.
-     */
-    public void addCc(EncodedStringValue value) {
-        mPduHeaders.appendEncodedStringValue(value, PduHeaders.CC);
-    }
-
-    /**
-     * Get Content-type value.
-     *
-     * @return the value
-     */
-    public byte[] getContentType() {
-        return mPduHeaders.getTextString(PduHeaders.CONTENT_TYPE);
-    }
-
-    /**
-     * Set Content-type value.
-     *
-     * @param value the value
-     * @throws NullPointerException if the value is null.
-     */
-    public void setContentType(byte[] value) {
-        mPduHeaders.setTextString(value, PduHeaders.CONTENT_TYPE);
-    }
-
-    /**
-     * Get X-Mms-Delivery-Report value.
-     *
-     * @return the value
-     */
-    public int getDeliveryReport() {
-        return mPduHeaders.getOctet(PduHeaders.DELIVERY_REPORT);
-    }
-
-    /**
-     * Set X-Mms-Delivery-Report value.
-     *
-     * @param value the value
-     * @throws InvalidHeaderValueException if the value is invalid.
-     */
-    public void setDeliveryReport(int value) throws InvalidHeaderValueException {
-        mPduHeaders.setOctet(value, PduHeaders.DELIVERY_REPORT);
-    }
-
-    /**
-     * Get From value.
-     * From-value = Value-length
-     *      (Address-present-token Encoded-string-value | Insert-address-token)
-     *
-     * @return the value
-     */
-    public EncodedStringValue getFrom() {
-       return mPduHeaders.getEncodedStringValue(PduHeaders.FROM);
-    }
-
-    /**
-     * Set From value.
-     *
-     * @param value the value
-     * @throws NullPointerException if the value is null.
-     */
-    public void setFrom(EncodedStringValue value) {
-        mPduHeaders.setEncodedStringValue(value, PduHeaders.FROM);
-    }
-
-    /**
-     * Get X-Mms-Message-Class value.
-     * Message-class-value = Class-identifier | Token-text
-     * Class-identifier = Personal | Advertisement | Informational | Auto
-     *
-     * @return the value
-     */
-    public byte[] getMessageClass() {
-        return mPduHeaders.getTextString(PduHeaders.MESSAGE_CLASS);
-    }
-
-    /**
-     * Set X-Mms-Message-Class value.
-     *
-     * @param value the value
-     * @throws NullPointerException if the value is null.
-     */
-    public void setMessageClass(byte[] value) {
-        mPduHeaders.setTextString(value, PduHeaders.MESSAGE_CLASS);
-    }
-
-    /**
-     * Get Message-ID value.
-     *
-     * @return the value
-     */
-    public byte[] getMessageId() {
-        return mPduHeaders.getTextString(PduHeaders.MESSAGE_ID);
-    }
-
-    /**
-     * Set Message-ID value.
-     *
-     * @param value the value
-     * @throws NullPointerException if the value is null.
-     */
-    public void setMessageId(byte[] value) {
-        mPduHeaders.setTextString(value, PduHeaders.MESSAGE_ID);
-    }
-
-    /**
-     * Get X-Mms-Read-Report value.
-     *
-     * @return the value
-     */
-    public int getReadReport() {
-        return mPduHeaders.getOctet(PduHeaders.READ_REPORT);
-    }
-
-    /**
-     * Set X-Mms-Read-Report value.
-     *
-     * @param value the value
-     * @throws InvalidHeaderValueException if the value is invalid.
-     */
-    public void setReadReport(int value) throws InvalidHeaderValueException {
-        mPduHeaders.setOctet(value, PduHeaders.READ_REPORT);
-    }
-
-    /**
-     * Get X-Mms-Retrieve-Status value.
-     *
-     * @return the value
-     */
-    public int getRetrieveStatus() {
-        return mPduHeaders.getOctet(PduHeaders.RETRIEVE_STATUS);
-    }
-
-    /**
-     * Set X-Mms-Retrieve-Status value.
-     *
-     * @param value the value
-     * @throws InvalidHeaderValueException if the value is invalid.
-     */
-    public void setRetrieveStatus(int value) throws InvalidHeaderValueException {
-        mPduHeaders.setOctet(value, PduHeaders.RETRIEVE_STATUS);
-    }
-
-    /**
-     * Get X-Mms-Retrieve-Text value.
-     *
-     * @return the value
-     */
-    public EncodedStringValue getRetrieveText() {
-        return mPduHeaders.getEncodedStringValue(PduHeaders.RETRIEVE_TEXT);
-    }
-
-    /**
-     * Set X-Mms-Retrieve-Text value.
-     *
-     * @param value the value
-     * @throws NullPointerException if the value is null.
-     */
-    public void setRetrieveText(EncodedStringValue value) {
-        mPduHeaders.setEncodedStringValue(value, PduHeaders.RETRIEVE_TEXT);
-    }
-
-    /**
-     * Get X-Mms-Transaction-Id.
-     *
-     * @return the value
-     */
-    public byte[] getTransactionId() {
-        return mPduHeaders.getTextString(PduHeaders.TRANSACTION_ID);
-    }
-
-    /**
-     * Set X-Mms-Transaction-Id.
-     *
-     * @param value the value
-     * @throws NullPointerException if the value is null.
-     */
-    public void setTransactionId(byte[] value) {
-        mPduHeaders.setTextString(value, PduHeaders.TRANSACTION_ID);
-    }
-
-    /*
-     * Optional, not supported header fields:
-     *
-     *     public byte[] getApplicId() {return null;}
-     *     public void setApplicId(byte[] value) {}
-     *
-     *     public byte[] getAuxApplicId() {return null;}
-     *     public void getAuxApplicId(byte[] value) {}
-     *
-     *     public byte getContentClass() {return 0x00;}
-     *     public void setApplicId(byte value) {}
-     *
-     *     public byte getDrmContent() {return 0x00;}
-     *     public void setDrmContent(byte value) {}
-     *
-     *     public byte getDistributionIndicator() {return 0x00;}
-     *     public void setDistributionIndicator(byte value) {}
-     *
-     *     public PreviouslySentByValue getPreviouslySentBy() {return null;}
-     *     public void setPreviouslySentBy(PreviouslySentByValue value) {}
-     *
-     *     public PreviouslySentDateValue getPreviouslySentDate() {}
-     *     public void setPreviouslySentDate(PreviouslySentDateValue value) {}
-     *
-     *     public MmFlagsValue getMmFlags() {return null;}
-     *     public void setMmFlags(MmFlagsValue value) {}
-     *
-     *     public MmStateValue getMmState() {return null;}
-     *     public void getMmState(MmStateValue value) {}
-     *
-     *     public byte[] getReplaceId() {return 0x00;}
-     *     public void setReplaceId(byte[] value) {}
-     *
-     *     public byte[] getReplyApplicId() {return 0x00;}
-     *     public void setReplyApplicId(byte[] value) {}
-     *
-     *     public byte getReplyCharging() {return 0x00;}
-     *     public void setReplyCharging(byte value) {}
-     *
-     *     public byte getReplyChargingDeadline() {return 0x00;}
-     *     public void setReplyChargingDeadline(byte value) {}
-     *
-     *     public byte[] getReplyChargingId() {return 0x00;}
-     *     public void setReplyChargingId(byte[] value) {}
-     *
-     *     public long getReplyChargingSize() {return 0;}
-     *     public void setReplyChargingSize(long value) {}
-     */
-}
+/*
+ * Copyright (C) 2015 Jacob Klinker
+ *
+ * Licensed under the Apache License, Version 2.0 (the "License");
+ * you may not use this file except in compliance with the License.
+ * You may obtain a copy of the License at
+ *
+ * http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing, software
+ * distributed under the License is distributed on an "AS IS" BASIS,
+ * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ * See the License for the specific language governing permissions and
+ * limitations under the License.
+ */
+
+package com.google.android.mms.pdu_alt;
+
+import com.google.android.mms.InvalidHeaderValueException;
+
+/**
+ * M-Retrive.conf Pdu.
+ */
+public class RetrieveConf extends MultimediaMessagePdu {
+    /**
+     * Empty constructor.
+     * Since the Pdu corresponding to this class is constructed
+     * by the Proxy-Relay server, this class is only instantiated
+     * by the Pdu Parser.
+     *
+     * @throws InvalidHeaderValueException if error occurs.
+     */
+    public RetrieveConf() throws InvalidHeaderValueException {
+        super();
+        setMessageType(PduHeaders.MESSAGE_TYPE_RETRIEVE_CONF);
+    }
+
+    /**
+     * Constructor with given headers.
+     *
+     * @param headers Headers for this PDU.
+     */
+    RetrieveConf(PduHeaders headers) {
+        super(headers);
+    }
+
+    /**
+     * Constructor with given headers and body
+     *
+     * @param headers Headers for this PDU.
+     * @param body Body of this PDu.
+     */
+    RetrieveConf(PduHeaders headers, PduBody body) {
+        super(headers, body);
+    }
+
+    /**
+     * Get CC value.
+     *
+     * @return the value
+     */
+    public EncodedStringValue[] getCc() {
+        return mPduHeaders.getEncodedStringValues(PduHeaders.CC);
+    }
+
+    /**
+     * Add a "CC" value.
+     *
+     * @param value the value
+     * @throws NullPointerException if the value is null.
+     */
+    public void addCc(EncodedStringValue value) {
+        mPduHeaders.appendEncodedStringValue(value, PduHeaders.CC);
+    }
+
+    /**
+     * Get Content-type value.
+     *
+     * @return the value
+     */
+    public byte[] getContentType() {
+        return mPduHeaders.getTextString(PduHeaders.CONTENT_TYPE);
+    }
+
+    /**
+     * Set Content-type value.
+     *
+     * @param value the value
+     * @throws NullPointerException if the value is null.
+     */
+    public void setContentType(byte[] value) {
+        mPduHeaders.setTextString(value, PduHeaders.CONTENT_TYPE);
+    }
+
+    /**
+     * Get X-Mms-Delivery-Report value.
+     *
+     * @return the value
+     */
+    public int getDeliveryReport() {
+        return mPduHeaders.getOctet(PduHeaders.DELIVERY_REPORT);
+    }
+
+    /**
+     * Set X-Mms-Delivery-Report value.
+     *
+     * @param value the value
+     * @throws InvalidHeaderValueException if the value is invalid.
+     */
+    public void setDeliveryReport(int value) throws InvalidHeaderValueException {
+        mPduHeaders.setOctet(value, PduHeaders.DELIVERY_REPORT);
+    }
+
+    /**
+     * Get From value.
+     * From-value = Value-length
+     *      (Address-present-token Encoded-string-value | Insert-address-token)
+     *
+     * @return the value
+     */
+    public EncodedStringValue getFrom() {
+       return mPduHeaders.getEncodedStringValue(PduHeaders.FROM);
+    }
+
+    /**
+     * Set From value.
+     *
+     * @param value the value
+     * @throws NullPointerException if the value is null.
+     */
+    public void setFrom(EncodedStringValue value) {
+        mPduHeaders.setEncodedStringValue(value, PduHeaders.FROM);
+    }
+
+    /**
+     * Get X-Mms-Message-Class value.
+     * Message-class-value = Class-identifier | Token-text
+     * Class-identifier = Personal | Advertisement | Informational | Auto
+     *
+     * @return the value
+     */
+    public byte[] getMessageClass() {
+        return mPduHeaders.getTextString(PduHeaders.MESSAGE_CLASS);
+    }
+
+    /**
+     * Set X-Mms-Message-Class value.
+     *
+     * @param value the value
+     * @throws NullPointerException if the value is null.
+     */
+    public void setMessageClass(byte[] value) {
+        mPduHeaders.setTextString(value, PduHeaders.MESSAGE_CLASS);
+    }
+
+    /**
+     * Get Message-ID value.
+     *
+     * @return the value
+     */
+    public byte[] getMessageId() {
+        return mPduHeaders.getTextString(PduHeaders.MESSAGE_ID);
+    }
+
+    /**
+     * Set Message-ID value.
+     *
+     * @param value the value
+     * @throws NullPointerException if the value is null.
+     */
+    public void setMessageId(byte[] value) {
+        mPduHeaders.setTextString(value, PduHeaders.MESSAGE_ID);
+    }
+
+    /**
+     * Get X-Mms-Read-Report value.
+     *
+     * @return the value
+     */
+    public int getReadReport() {
+        return mPduHeaders.getOctet(PduHeaders.READ_REPORT);
+    }
+
+    /**
+     * Set X-Mms-Read-Report value.
+     *
+     * @param value the value
+     * @throws InvalidHeaderValueException if the value is invalid.
+     */
+    public void setReadReport(int value) throws InvalidHeaderValueException {
+        mPduHeaders.setOctet(value, PduHeaders.READ_REPORT);
+    }
+
+    /**
+     * Get X-Mms-Retrieve-Status value.
+     *
+     * @return the value
+     */
+    public int getRetrieveStatus() {
+        return mPduHeaders.getOctet(PduHeaders.RETRIEVE_STATUS);
+    }
+
+    /**
+     * Set X-Mms-Retrieve-Status value.
+     *
+     * @param value the value
+     * @throws InvalidHeaderValueException if the value is invalid.
+     */
+    public void setRetrieveStatus(int value) throws InvalidHeaderValueException {
+        mPduHeaders.setOctet(value, PduHeaders.RETRIEVE_STATUS);
+    }
+
+    /**
+     * Get X-Mms-Retrieve-Text value.
+     *
+     * @return the value
+     */
+    public EncodedStringValue getRetrieveText() {
+        return mPduHeaders.getEncodedStringValue(PduHeaders.RETRIEVE_TEXT);
+    }
+
+    /**
+     * Set X-Mms-Retrieve-Text value.
+     *
+     * @param value the value
+     * @throws NullPointerException if the value is null.
+     */
+    public void setRetrieveText(EncodedStringValue value) {
+        mPduHeaders.setEncodedStringValue(value, PduHeaders.RETRIEVE_TEXT);
+    }
+
+    /**
+     * Get X-Mms-Transaction-Id.
+     *
+     * @return the value
+     */
+    public byte[] getTransactionId() {
+        return mPduHeaders.getTextString(PduHeaders.TRANSACTION_ID);
+    }
+
+    /**
+     * Set X-Mms-Transaction-Id.
+     *
+     * @param value the value
+     * @throws NullPointerException if the value is null.
+     */
+    public void setTransactionId(byte[] value) {
+        mPduHeaders.setTextString(value, PduHeaders.TRANSACTION_ID);
+    }
+
+    /*
+     * Optional, not supported header fields:
+     *
+     *     public byte[] getApplicId() {return null;}
+     *     public void setApplicId(byte[] value) {}
+     *
+     *     public byte[] getAuxApplicId() {return null;}
+     *     public void getAuxApplicId(byte[] value) {}
+     *
+     *     public byte getContentClass() {return 0x00;}
+     *     public void setApplicId(byte value) {}
+     *
+     *     public byte getDrmContent() {return 0x00;}
+     *     public void setDrmContent(byte value) {}
+     *
+     *     public byte getDistributionIndicator() {return 0x00;}
+     *     public void setDistributionIndicator(byte value) {}
+     *
+     *     public PreviouslySentByValue getPreviouslySentBy() {return null;}
+     *     public void setPreviouslySentBy(PreviouslySentByValue value) {}
+     *
+     *     public PreviouslySentDateValue getPreviouslySentDate() {}
+     *     public void setPreviouslySentDate(PreviouslySentDateValue value) {}
+     *
+     *     public MmFlagsValue getMmFlags() {return null;}
+     *     public void setMmFlags(MmFlagsValue value) {}
+     *
+     *     public MmStateValue getMmState() {return null;}
+     *     public void getMmState(MmStateValue value) {}
+     *
+     *     public byte[] getReplaceId() {return 0x00;}
+     *     public void setReplaceId(byte[] value) {}
+     *
+     *     public byte[] getReplyApplicId() {return 0x00;}
+     *     public void setReplyApplicId(byte[] value) {}
+     *
+     *     public byte getReplyCharging() {return 0x00;}
+     *     public void setReplyCharging(byte value) {}
+     *
+     *     public byte getReplyChargingDeadline() {return 0x00;}
+     *     public void setReplyChargingDeadline(byte value) {}
+     *
+     *     public byte[] getReplyChargingId() {return 0x00;}
+     *     public void setReplyChargingId(byte[] value) {}
+     *
+     *     public long getReplyChargingSize() {return 0;}
+     *     public void setReplyChargingSize(long value) {}
+     */
+}
diff --git a/android-smsmms/src/main/java/com/google/android/mms/pdu_alt/SendConf.java b/android-smsmms/src/main/java/com/google/android/mms/pdu_alt/SendConf.java
index 0269cc655..f14cbc25d 100755
--- a/android-smsmms/src/main/java/com/google/android/mms/pdu_alt/SendConf.java
+++ b/android-smsmms/src/main/java/com/google/android/mms/pdu_alt/SendConf.java
@@ -1,116 +1,116 @@
-/*
- * Copyright (C) 2015 Jacob Klinker
- *
- * Licensed under the Apache License, Version 2.0 (the "License");
- * you may not use this file except in compliance with the License.
- * You may obtain a copy of the License at
- *
- * http://www.apache.org/licenses/LICENSE-2.0
- *
- * Unless required by applicable law or agreed to in writing, software
- * distributed under the License is distributed on an "AS IS" BASIS,
- * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
- * See the License for the specific language governing permissions and
- * limitations under the License.
- */
-
-package com.google.android.mms.pdu_alt;
-
-import com.google.android.mms.InvalidHeaderValueException;
-
-public class SendConf extends GenericPdu {
-    /**
-     * Empty constructor.
-     * Since the Pdu corresponding to this class is constructed
-     * by the Proxy-Relay server, this class is only instantiated
-     * by the Pdu Parser.
-     *
-     * @throws InvalidHeaderValueException if error occurs.
-     */
-    public SendConf() throws InvalidHeaderValueException {
-        super();
-        setMessageType(PduHeaders.MESSAGE_TYPE_SEND_CONF);
-    }
-
-    /**
-     * Constructor with given headers.
-     *
-     * @param headers Headers for this PDU.
-     */
-    SendConf(PduHeaders headers) {
-        super(headers);
-    }
-
-    /**
-     * Get Message-ID value.
-     *
-     * @return the value
-     */
-    public byte[] getMessageId() {
-        return mPduHeaders.getTextString(PduHeaders.MESSAGE_ID);
-    }
-
-    /**
-     * Set Message-ID value.
-     *
-     * @param value the value
-     * @throws NullPointerException if the value is null.
-     */
-    public void setMessageId(byte[] value) {
-        mPduHeaders.setTextString(value, PduHeaders.MESSAGE_ID);
-    }
-
-    /**
-     * Get X-Mms-Response-Status.
-     *
-     * @return the value
-     */
-    public int getResponseStatus() {
-        return mPduHeaders.getOctet(PduHeaders.RESPONSE_STATUS);
-    }
-
-    /**
-     * Set X-Mms-Response-Status.
-     *
-     * @param value the values
-     * @throws InvalidHeaderValueException if the value is invalid.
-     */
-    public void setResponseStatus(int value) throws InvalidHeaderValueException {
-        mPduHeaders.setOctet(value, PduHeaders.RESPONSE_STATUS);
-    }
-
-    /**
-     * Get X-Mms-Transaction-Id field value.
-     *
-     * @return the X-Mms-Report-Allowed value
-     */
-    public byte[] getTransactionId() {
-        return mPduHeaders.getTextString(PduHeaders.TRANSACTION_ID);
-    }
-
-    /**
-     * Set X-Mms-Transaction-Id field value.
-     *
-     * @param value the value
-     * @throws NullPointerException if the value is null.
-     */
-    public void setTransactionId(byte[] value) {
-            mPduHeaders.setTextString(value, PduHeaders.TRANSACTION_ID);
-    }
-
-    /*
-     * Optional, not supported header fields:
-     *
-     *    public byte[] getContentLocation() {return null;}
-     *    public void setContentLocation(byte[] value) {}
-     *
-     *    public EncodedStringValue getResponseText() {return null;}
-     *    public void setResponseText(EncodedStringValue value) {}
-     *
-     *    public byte getStoreStatus() {return 0x00;}
-     *    public void setStoreStatus(byte value) {}
-     *
-     *    public byte[] getStoreStatusText() {return null;}
-     *    public void setStoreStatusText(byte[] value) {}
-     */
-}
+/*
+ * Copyright (C) 2015 Jacob Klinker
+ *
+ * Licensed under the Apache License, Version 2.0 (the "License");
+ * you may not use this file except in compliance with the License.
+ * You may obtain a copy of the License at
+ *
+ * http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing, software
+ * distributed under the License is distributed on an "AS IS" BASIS,
+ * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ * See the License for the specific language governing permissions and
+ * limitations under the License.
+ */
+
+package com.google.android.mms.pdu_alt;
+
+import com.google.android.mms.InvalidHeaderValueException;
+
+public class SendConf extends GenericPdu {
+    /**
+     * Empty constructor.
+     * Since the Pdu corresponding to this class is constructed
+     * by the Proxy-Relay server, this class is only instantiated
+     * by the Pdu Parser.
+     *
+     * @throws InvalidHeaderValueException if error occurs.
+     */
+    public SendConf() throws InvalidHeaderValueException {
+        super();
+        setMessageType(PduHeaders.MESSAGE_TYPE_SEND_CONF);
+    }
+
+    /**
+     * Constructor with given headers.
+     *
+     * @param headers Headers for this PDU.
+     */
+    SendConf(PduHeaders headers) {
+        super(headers);
+    }
+
+    /**
+     * Get Message-ID value.
+     *
+     * @return the value
+     */
+    public byte[] getMessageId() {
+        return mPduHeaders.getTextString(PduHeaders.MESSAGE_ID);
+    }
+
+    /**
+     * Set Message-ID value.
+     *
+     * @param value the value
+     * @throws NullPointerException if the value is null.
+     */
+    public void setMessageId(byte[] value) {
+        mPduHeaders.setTextString(value, PduHeaders.MESSAGE_ID);
+    }
+
+    /**
+     * Get X-Mms-Response-Status.
+     *
+     * @return the value
+     */
+    public int getResponseStatus() {
+        return mPduHeaders.getOctet(PduHeaders.RESPONSE_STATUS);
+    }
+
+    /**
+     * Set X-Mms-Response-Status.
+     *
+     * @param value the values
+     * @throws InvalidHeaderValueException if the value is invalid.
+     */
+    public void setResponseStatus(int value) throws InvalidHeaderValueException {
+        mPduHeaders.setOctet(value, PduHeaders.RESPONSE_STATUS);
+    }
+
+    /**
+     * Get X-Mms-Transaction-Id field value.
+     *
+     * @return the X-Mms-Report-Allowed value
+     */
+    public byte[] getTransactionId() {
+        return mPduHeaders.getTextString(PduHeaders.TRANSACTION_ID);
+    }
+
+    /**
+     * Set X-Mms-Transaction-Id field value.
+     *
+     * @param value the value
+     * @throws NullPointerException if the value is null.
+     */
+    public void setTransactionId(byte[] value) {
+            mPduHeaders.setTextString(value, PduHeaders.TRANSACTION_ID);
+    }
+
+    /*
+     * Optional, not supported header fields:
+     *
+     *    public byte[] getContentLocation() {return null;}
+     *    public void setContentLocation(byte[] value) {}
+     *
+     *    public EncodedStringValue getResponseText() {return null;}
+     *    public void setResponseText(EncodedStringValue value) {}
+     *
+     *    public byte getStoreStatus() {return 0x00;}
+     *    public void setStoreStatus(byte value) {}
+     *
+     *    public byte[] getStoreStatusText() {return null;}
+     *    public void setStoreStatusText(byte[] value) {}
+     */
+}
diff --git a/android-smsmms/src/main/java/com/google/android/mms/pdu_alt/SendReq.java b/android-smsmms/src/main/java/com/google/android/mms/pdu_alt/SendReq.java
index 47bf0150e..db579754f 100755
--- a/android-smsmms/src/main/java/com/google/android/mms/pdu_alt/SendReq.java
+++ b/android-smsmms/src/main/java/com/google/android/mms/pdu_alt/SendReq.java
@@ -1,342 +1,342 @@
-/*
- * Copyright (C) 2015 Jacob Klinker
- *
- * Licensed under the Apache License, Version 2.0 (the "License");
- * you may not use this file except in compliance with the License.
- * You may obtain a copy of the License at
- *
- * http://www.apache.org/licenses/LICENSE-2.0
- *
- * Unless required by applicable law or agreed to in writing, software
- * distributed under the License is distributed on an "AS IS" BASIS,
- * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
- * See the License for the specific language governing permissions and
- * limitations under the License.
- */
-
-package com.google.android.mms.pdu_alt;
-
-import com.google.android.mms.InvalidHeaderValueException;
-import timber.log.Timber;
-
-public class SendReq extends MultimediaMessagePdu {
-
-    public SendReq() {
-        super();
-
-        try {
-            setMessageType(PduHeaders.MESSAGE_TYPE_SEND_REQ);
-            setMmsVersion(PduHeaders.CURRENT_MMS_VERSION);
-            // FIXME: Content-type must be decided according to whether
-            // SMIL part present.
-            setContentType("application/vnd.wap.multipart.related".getBytes());
-            setFrom(new EncodedStringValue(PduHeaders.FROM_INSERT_ADDRESS_TOKEN_STR.getBytes()));
-            setTransactionId(generateTransactionId());
-        } catch (InvalidHeaderValueException e) {
-            // Impossible to reach here since all headers we set above are valid.
-            Timber.e(e, "Unexpected InvalidHeaderValueException.");
-            throw new RuntimeException(e);
-        }
-    }
-
-    private byte[] generateTransactionId() {
-        String transactionId = "T" + Long.toHexString(System.currentTimeMillis());
-        return transactionId.getBytes();
-    }
-
-    /**
-     * Constructor, used when composing a M-Send.req pdu.
-     *
-     * @param contentType the content type value
-     * @param from the from value
-     * @param mmsVersion current viersion of mms
-     * @param transactionId the transaction-id value
-     * @throws InvalidHeaderValueException if parameters are invalid.
-     *         NullPointerException if contentType, form or transactionId is null.
-     */
-    public SendReq(byte[] contentType,
-                   EncodedStringValue from,
-                   int mmsVersion,
-                   byte[] transactionId) throws InvalidHeaderValueException {
-        super();
-        setMessageType(PduHeaders.MESSAGE_TYPE_SEND_REQ);
-        setContentType(contentType);
-        setFrom(from);
-        setMmsVersion(mmsVersion);
-        setTransactionId(transactionId);
-    }
-
-    /**
-     * Constructor with given headers.
-     *
-     * @param headers Headers for this PDU.
-     */
-    SendReq(PduHeaders headers) {
-        super(headers);
-    }
-
-    /**
-     * Constructor with given headers and body
-     *
-     * @param headers Headers for this PDU.
-     * @param body Body of this PDu.
-     */
-    SendReq(PduHeaders headers, PduBody body) {
-        super(headers, body);
-    }
-
-    /**
-     * Get Bcc value.
-     *
-     * @return the value
-     */
-    public EncodedStringValue[] getBcc() {
-        return mPduHeaders.getEncodedStringValues(PduHeaders.BCC);
-    }
-
-    /**
-     * Add a "BCC" value.
-     *
-     * @param value the value
-     * @throws NullPointerException if the value is null.
-     */
-    public void addBcc(EncodedStringValue value) {
-        mPduHeaders.appendEncodedStringValue(value, PduHeaders.BCC);
-    }
-
-    /**
-     * Set "BCC" value.
-     *
-     * @param value the value
-     * @throws NullPointerException if the value is null.
-     */
-    public void setBcc(EncodedStringValue[] value) {
-        mPduHeaders.setEncodedStringValues(value, PduHeaders.BCC);
-    }
-
-    /**
-     * Get CC value.
-     *
-     * @return the value
-     */
-    public EncodedStringValue[] getCc() {
-        return mPduHeaders.getEncodedStringValues(PduHeaders.CC);
-    }
-
-    /**
-     * Add a "CC" value.
-     *
-     * @param value the value
-     * @throws NullPointerException if the value is null.
-     */
-    public void addCc(EncodedStringValue value) {
-        mPduHeaders.appendEncodedStringValue(value, PduHeaders.CC);
-    }
-
-    /**
-     * Set "CC" value.
-     *
-     * @param value the value
-     * @throws NullPointerException if the value is null.
-     */
-    public void setCc(EncodedStringValue[] value) {
-        mPduHeaders.setEncodedStringValues(value, PduHeaders.CC);
-    }
-
-    /**
-     * Get Content-type value.
-     *
-     * @return the value
-     */
-    public byte[] getContentType() {
-        return mPduHeaders.getTextString(PduHeaders.CONTENT_TYPE);
-    }
-
-    /**
-     * Set Content-type value.
-     *
-     * @param value the value
-     * @throws NullPointerException if the value is null.
-     */
-    public void setContentType(byte[] value) {
-        mPduHeaders.setTextString(value, PduHeaders.CONTENT_TYPE);
-    }
-
-    /**
-     * Get X-Mms-Delivery-Report value.
-     *
-     * @return the value
-     */
-    public int getDeliveryReport() {
-        return mPduHeaders.getOctet(PduHeaders.DELIVERY_REPORT);
-    }
-
-    /**
-     * Set X-Mms-Delivery-Report value.
-     *
-     * @param value the value
-     * @throws InvalidHeaderValueException if the value is invalid.
-     */
-    public void setDeliveryReport(int value) throws InvalidHeaderValueException {
-        mPduHeaders.setOctet(value, PduHeaders.DELIVERY_REPORT);
-    }
-
-    /**
-     * Get X-Mms-Expiry value.
-     *
-     * Expiry-value = Value-length
-     *      (Absolute-token Date-value | Relative-token Delta-seconds-value)
-     *
-     * @return the value
-     */
-    public long getExpiry() {
-        return mPduHeaders.getLongInteger(PduHeaders.EXPIRY);
-    }
-
-    /**
-     * Set X-Mms-Expiry value.
-     *
-     * @param value the value
-     */
-    public void setExpiry(long value) {
-        mPduHeaders.setLongInteger(value, PduHeaders.EXPIRY);
-    }
-
-    /**
-     * Get X-Mms-MessageSize value.
-     *
-     * Expiry-value = size of message
-     *
-     * @return the value
-     */
-    public long getMessageSize() {
-        return mPduHeaders.getLongInteger(PduHeaders.MESSAGE_SIZE);
-    }
-
-    /**
-     * Set X-Mms-MessageSize value.
-     *
-     * @param value the value
-     */
-    public void setMessageSize(long value) {
-        mPduHeaders.setLongInteger(value, PduHeaders.MESSAGE_SIZE);
-    }
-
-    /**
-     * Get X-Mms-Message-Class value.
-     * Message-class-value = Class-identifier | Token-text
-     * Class-identifier = Personal | Advertisement | Informational | Auto
-     *
-     * @return the value
-     */
-    public byte[] getMessageClass() {
-        return mPduHeaders.getTextString(PduHeaders.MESSAGE_CLASS);
-    }
-
-    /**
-     * Set X-Mms-Message-Class value.
-     *
-     * @param value the value
-     * @throws NullPointerException if the value is null.
-     */
-    public void setMessageClass(byte[] value) {
-        mPduHeaders.setTextString(value, PduHeaders.MESSAGE_CLASS);
-    }
-
-    /**
-     * Get X-Mms-Read-Report value.
-     *
-     * @return the value
-     */
-    public int getReadReport() {
-        return mPduHeaders.getOctet(PduHeaders.READ_REPORT);
-    }
-
-    /**
-     * Set X-Mms-Read-Report value.
-     *
-     * @param value the value
-     * @throws InvalidHeaderValueException if the value is invalid.
-     */
-    public void setReadReport(int value) throws InvalidHeaderValueException {
-        mPduHeaders.setOctet(value, PduHeaders.READ_REPORT);
-    }
-
-    /**
-     * Set "To" value.
-     *
-     * @param value the value
-     * @throws NullPointerException if the value is null.
-     */
-    public void setTo(EncodedStringValue[] value) {
-        mPduHeaders.setEncodedStringValues(value, PduHeaders.TO);
-    }
-
-    /**
-     * Get X-Mms-Transaction-Id field value.
-     *
-     * @return the X-Mms-Report-Allowed value
-     */
-    public byte[] getTransactionId() {
-        return mPduHeaders.getTextString(PduHeaders.TRANSACTION_ID);
-    }
-
-    /**
-     * Set X-Mms-Transaction-Id field value.
-     *
-     * @param value the value
-     * @throws NullPointerException if the value is null.
-     */
-    public void setTransactionId(byte[] value) {
-        mPduHeaders.setTextString(value, PduHeaders.TRANSACTION_ID);
-    }
-
-    /*
-     * Optional, not supported header fields:
-     *
-     *     public byte getAdaptationAllowed() {return 0};
-     *     public void setAdaptationAllowed(btye value) {};
-     *
-     *     public byte[] getApplicId() {return null;}
-     *     public void setApplicId(byte[] value) {}
-     *
-     *     public byte[] getAuxApplicId() {return null;}
-     *     public void getAuxApplicId(byte[] value) {}
-     *
-     *     public byte getContentClass() {return 0x00;}
-     *     public void setApplicId(byte value) {}
-     *
-     *     public long getDeliveryTime() {return 0};
-     *     public void setDeliveryTime(long value) {};
-     *
-     *     public byte getDrmContent() {return 0x00;}
-     *     public void setDrmContent(byte value) {}
-     *
-     *     public MmFlagsValue getMmFlags() {return null;}
-     *     public void setMmFlags(MmFlagsValue value) {}
-     *
-     *     public MmStateValue getMmState() {return null;}
-     *     public void getMmState(MmStateValue value) {}
-     *
-     *     public byte[] getReplyApplicId() {return 0x00;}
-     *     public void setReplyApplicId(byte[] value) {}
-     *
-     *     public byte getReplyCharging() {return 0x00;}
-     *     public void setReplyCharging(byte value) {}
-     *
-     *     public byte getReplyChargingDeadline() {return 0x00;}
-     *     public void setReplyChargingDeadline(byte value) {}
-     *
-     *     public byte[] getReplyChargingId() {return 0x00;}
-     *     public void setReplyChargingId(byte[] value) {}
-     *
-     *     public long getReplyChargingSize() {return 0;}
-     *     public void setReplyChargingSize(long value) {}
-     *
-     *     public byte[] getReplyApplicId() {return 0x00;}
-     *     public void setReplyApplicId(byte[] value) {}
-     *
-     *     public byte getStore() {return 0x00;}
-     *     public void setStore(byte value) {}
-     */
-}
+/*
+ * Copyright (C) 2015 Jacob Klinker
+ *
+ * Licensed under the Apache License, Version 2.0 (the "License");
+ * you may not use this file except in compliance with the License.
+ * You may obtain a copy of the License at
+ *
+ * http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing, software
+ * distributed under the License is distributed on an "AS IS" BASIS,
+ * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ * See the License for the specific language governing permissions and
+ * limitations under the License.
+ */
+
+package com.google.android.mms.pdu_alt;
+
+import com.google.android.mms.InvalidHeaderValueException;
+import timber.log.Timber;
+
+public class SendReq extends MultimediaMessagePdu {
+
+    public SendReq() {
+        super();
+
+        try {
+            setMessageType(PduHeaders.MESSAGE_TYPE_SEND_REQ);
+            setMmsVersion(PduHeaders.CURRENT_MMS_VERSION);
+            // FIXME: Content-type must be decided according to whether
+            // SMIL part present.
+            setContentType("application/vnd.wap.multipart.related".getBytes());
+            setFrom(new EncodedStringValue(PduHeaders.FROM_INSERT_ADDRESS_TOKEN_STR.getBytes()));
+            setTransactionId(generateTransactionId());
+        } catch (InvalidHeaderValueException e) {
+            // Impossible to reach here since all headers we set above are valid.
+            Timber.e(e, "Unexpected InvalidHeaderValueException.");
+            throw new RuntimeException(e);
+        }
+    }
+
+    private byte[] generateTransactionId() {
+        String transactionId = "T" + Long.toHexString(System.currentTimeMillis());
+        return transactionId.getBytes();
+    }
+
+    /**
+     * Constructor, used when composing a M-Send.req pdu.
+     *
+     * @param contentType the content type value
+     * @param from the from value
+     * @param mmsVersion current viersion of mms
+     * @param transactionId the transaction-id value
+     * @throws InvalidHeaderValueException if parameters are invalid.
+     *         NullPointerException if contentType, form or transactionId is null.
+     */
+    public SendReq(byte[] contentType,
+                   EncodedStringValue from,
+                   int mmsVersion,
+                   byte[] transactionId) throws InvalidHeaderValueException {
+        super();
+        setMessageType(PduHeaders.MESSAGE_TYPE_SEND_REQ);
+        setContentType(contentType);
+        setFrom(from);
+        setMmsVersion(mmsVersion);
+        setTransactionId(transactionId);
+    }
+
+    /**
+     * Constructor with given headers.
+     *
+     * @param headers Headers for this PDU.
+     */
+    SendReq(PduHeaders headers) {
+        super(headers);
+    }
+
+    /**
+     * Constructor with given headers and body
+     *
+     * @param headers Headers for this PDU.
+     * @param body Body of this PDu.
+     */
+    SendReq(PduHeaders headers, PduBody body) {
+        super(headers, body);
+    }
+
+    /**
+     * Get Bcc value.
+     *
+     * @return the value
+     */
+    public EncodedStringValue[] getBcc() {
+        return mPduHeaders.getEncodedStringValues(PduHeaders.BCC);
+    }
+
+    /**
+     * Add a "BCC" value.
+     *
+     * @param value the value
+     * @throws NullPointerException if the value is null.
+     */
+    public void addBcc(EncodedStringValue value) {
+        mPduHeaders.appendEncodedStringValue(value, PduHeaders.BCC);
+    }
+
+    /**
+     * Set "BCC" value.
+     *
+     * @param value the value
+     * @throws NullPointerException if the value is null.
+     */
+    public void setBcc(EncodedStringValue[] value) {
+        mPduHeaders.setEncodedStringValues(value, PduHeaders.BCC);
+    }
+
+    /**
+     * Get CC value.
+     *
+     * @return the value
+     */
+    public EncodedStringValue[] getCc() {
+        return mPduHeaders.getEncodedStringValues(PduHeaders.CC);
+    }
+
+    /**
+     * Add a "CC" value.
+     *
+     * @param value the value
+     * @throws NullPointerException if the value is null.
+     */
+    public void addCc(EncodedStringValue value) {
+        mPduHeaders.appendEncodedStringValue(value, PduHeaders.CC);
+    }
+
+    /**
+     * Set "CC" value.
+     *
+     * @param value the value
+     * @throws NullPointerException if the value is null.
+     */
+    public void setCc(EncodedStringValue[] value) {
+        mPduHeaders.setEncodedStringValues(value, PduHeaders.CC);
+    }
+
+    /**
+     * Get Content-type value.
+     *
+     * @return the value
+     */
+    public byte[] getContentType() {
+        return mPduHeaders.getTextString(PduHeaders.CONTENT_TYPE);
+    }
+
+    /**
+     * Set Content-type value.
+     *
+     * @param value the value
+     * @throws NullPointerException if the value is null.
+     */
+    public void setContentType(byte[] value) {
+        mPduHeaders.setTextString(value, PduHeaders.CONTENT_TYPE);
+    }
+
+    /**
+     * Get X-Mms-Delivery-Report value.
+     *
+     * @return the value
+     */
+    public int getDeliveryReport() {
+        return mPduHeaders.getOctet(PduHeaders.DELIVERY_REPORT);
+    }
+
+    /**
+     * Set X-Mms-Delivery-Report value.
+     *
+     * @param value the value
+     * @throws InvalidHeaderValueException if the value is invalid.
+     */
+    public void setDeliveryReport(int value) throws InvalidHeaderValueException {
+        mPduHeaders.setOctet(value, PduHeaders.DELIVERY_REPORT);
+    }
+
+    /**
+     * Get X-Mms-Expiry value.
+     *
+     * Expiry-value = Value-length
+     *      (Absolute-token Date-value | Relative-token Delta-seconds-value)
+     *
+     * @return the value
+     */
+    public long getExpiry() {
+        return mPduHeaders.getLongInteger(PduHeaders.EXPIRY);
+    }
+
+    /**
+     * Set X-Mms-Expiry value.
+     *
+     * @param value the value
+     */
+    public void setExpiry(long value) {
+        mPduHeaders.setLongInteger(value, PduHeaders.EXPIRY);
+    }
+
+    /**
+     * Get X-Mms-MessageSize value.
+     *
+     * Expiry-value = size of message
+     *
+     * @return the value
+     */
+    public long getMessageSize() {
+        return mPduHeaders.getLongInteger(PduHeaders.MESSAGE_SIZE);
+    }
+
+    /**
+     * Set X-Mms-MessageSize value.
+     *
+     * @param value the value
+     */
+    public void setMessageSize(long value) {
+        mPduHeaders.setLongInteger(value, PduHeaders.MESSAGE_SIZE);
+    }
+
+    /**
+     * Get X-Mms-Message-Class value.
+     * Message-class-value = Class-identifier | Token-text
+     * Class-identifier = Personal | Advertisement | Informational | Auto
+     *
+     * @return the value
+     */
+    public byte[] getMessageClass() {
+        return mPduHeaders.getTextString(PduHeaders.MESSAGE_CLASS);
+    }
+
+    /**
+     * Set X-Mms-Message-Class value.
+     *
+     * @param value the value
+     * @throws NullPointerException if the value is null.
+     */
+    public void setMessageClass(byte[] value) {
+        mPduHeaders.setTextString(value, PduHeaders.MESSAGE_CLASS);
+    }
+
+    /**
+     * Get X-Mms-Read-Report value.
+     *
+     * @return the value
+     */
+    public int getReadReport() {
+        return mPduHeaders.getOctet(PduHeaders.READ_REPORT);
+    }
+
+    /**
+     * Set X-Mms-Read-Report value.
+     *
+     * @param value the value
+     * @throws InvalidHeaderValueException if the value is invalid.
+     */
+    public void setReadReport(int value) throws InvalidHeaderValueException {
+        mPduHeaders.setOctet(value, PduHeaders.READ_REPORT);
+    }
+
+    /**
+     * Set "To" value.
+     *
+     * @param value the value
+     * @throws NullPointerException if the value is null.
+     */
+    public void setTo(EncodedStringValue[] value) {
+        mPduHeaders.setEncodedStringValues(value, PduHeaders.TO);
+    }
+
+    /**
+     * Get X-Mms-Transaction-Id field value.
+     *
+     * @return the X-Mms-Report-Allowed value
+     */
+    public byte[] getTransactionId() {
+        return mPduHeaders.getTextString(PduHeaders.TRANSACTION_ID);
+    }
+
+    /**
+     * Set X-Mms-Transaction-Id field value.
+     *
+     * @param value the value
+     * @throws NullPointerException if the value is null.
+     */
+    public void setTransactionId(byte[] value) {
+        mPduHeaders.setTextString(value, PduHeaders.TRANSACTION_ID);
+    }
+
+    /*
+     * Optional, not supported header fields:
+     *
+     *     public byte getAdaptationAllowed() {return 0};
+     *     public void setAdaptationAllowed(btye value) {};
+     *
+     *     public byte[] getApplicId() {return null;}
+     *     public void setApplicId(byte[] value) {}
+     *
+     *     public byte[] getAuxApplicId() {return null;}
+     *     public void getAuxApplicId(byte[] value) {}
+     *
+     *     public byte getContentClass() {return 0x00;}
+     *     public void setApplicId(byte value) {}
+     *
+     *     public long getDeliveryTime() {return 0};
+     *     public void setDeliveryTime(long value) {};
+     *
+     *     public byte getDrmContent() {return 0x00;}
+     *     public void setDrmContent(byte value) {}
+     *
+     *     public MmFlagsValue getMmFlags() {return null;}
+     *     public void setMmFlags(MmFlagsValue value) {}
+     *
+     *     public MmStateValue getMmState() {return null;}
+     *     public void getMmState(MmStateValue value) {}
+     *
+     *     public byte[] getReplyApplicId() {return 0x00;}
+     *     public void setReplyApplicId(byte[] value) {}
+     *
+     *     public byte getReplyCharging() {return 0x00;}
+     *     public void setReplyCharging(byte value) {}
+     *
+     *     public byte getReplyChargingDeadline() {return 0x00;}
+     *     public void setReplyChargingDeadline(byte value) {}
+     *
+     *     public byte[] getReplyChargingId() {return 0x00;}
+     *     public void setReplyChargingId(byte[] value) {}
+     *
+     *     public long getReplyChargingSize() {return 0;}
+     *     public void setReplyChargingSize(long value) {}
+     *
+     *     public byte[] getReplyApplicId() {return 0x00;}
+     *     public void setReplyApplicId(byte[] value) {}
+     *
+     *     public byte getStore() {return 0x00;}
+     *     public void setStore(byte value) {}
+     */
+}
diff --git a/android-smsmms/src/main/java/com/google/android/mms/smil/SmilHelper.java b/android-smsmms/src/main/java/com/google/android/mms/smil/SmilHelper.java
index 27053dfdd..1bf0b6db8 100755
--- a/android-smsmms/src/main/java/com/google/android/mms/smil/SmilHelper.java
+++ b/android-smsmms/src/main/java/com/google/android/mms/smil/SmilHelper.java
@@ -1,121 +1,121 @@
-package com.google.android.mms.smil;
-
-import com.android.mms.dom.smil.SmilDocumentImpl;
-import com.google.android.mms.ContentType;
-import com.google.android.mms.pdu_alt.PduBody;
-import com.google.android.mms.pdu_alt.PduPart;
-import org.w3c.dom.smil.SMILDocument;
-import org.w3c.dom.smil.SMILElement;
-import org.w3c.dom.smil.SMILLayoutElement;
-import org.w3c.dom.smil.SMILMediaElement;
-import org.w3c.dom.smil.SMILParElement;
-import timber.log.Timber;
-
-
-public class SmilHelper {
-
-    public static final String ELEMENT_TAG_TEXT = "text";
-    public static final String ELEMENT_TAG_IMAGE = "img";
-    public static final String ELEMENT_TAG_AUDIO = "audio";
-    public static final String ELEMENT_TAG_VIDEO = "video";
-    public static final String ELEMENT_TAG_VCARD = "vcard";
-
-    public static SMILDocument createSmilDocument(PduBody pb) {
-
-        SMILDocument document = new SmilDocumentImpl();
-
-        // Create root element.
-        SMILElement smil = (SMILElement) document.createElement("smil");
-        smil.setAttribute("xmlns", "http://www.w3.org/2001/SMIL20/Language");
-        document.appendChild(smil);
-
-        // Create <head> and <layout> element.
-        SMILElement head = (SMILElement) document.createElement("head");
-        smil.appendChild(head);
-
-        SMILLayoutElement layout = (SMILLayoutElement) document.createElement("layout");
-        head.appendChild(layout);
-
-        // Create <body> element and add a empty <par>.
-        SMILElement body = (SMILElement) document.createElement("body");
-        smil.appendChild(body);
-        SMILParElement par = addPar(document);
-
-        // Create media objects for the parts in PDU.
-        int partsNum = pb.getPartsNum();
-        if (partsNum == 0) {
-            return document;
-        }
-
-        boolean hasText = false;
-        boolean hasMedia = false;
-        for (int i = 0; i < partsNum; i++) {
-            // Create new <par> element.
-            if ((par == null) || (hasMedia && hasText)) {
-                par = addPar(document);
-                hasText = false;
-                hasMedia = false;
-            }
-
-            PduPart part = pb.getPart(i);
-            String contentType = new String(part.getContentType());
-
-            if (contentType.equals(ContentType.TEXT_PLAIN)
-                    || contentType.equalsIgnoreCase(ContentType.APP_WAP_XHTML)
-                    || contentType.equals(ContentType.TEXT_HTML)) {
-                SMILMediaElement textElement = createMediaElement(
-                        ELEMENT_TAG_TEXT, document, part.generateLocation());
-                par.appendChild(textElement);
-                hasText = true;
-            } else if (ContentType.isImageType(contentType)) {
-                SMILMediaElement imageElement = createMediaElement(
-                        ELEMENT_TAG_IMAGE, document, part.generateLocation());
-                par.appendChild(imageElement);
-                hasMedia = true;
-            } else if (ContentType.isVideoType(contentType)) {
-                SMILMediaElement videoElement = createMediaElement(
-                        ELEMENT_TAG_VIDEO, document, part.generateLocation());
-                par.appendChild(videoElement);
-                hasMedia = true;
-            } else if (ContentType.isAudioType(contentType)) {
-                SMILMediaElement audioElement = createMediaElement(
-                        ELEMENT_TAG_AUDIO, document, part.generateLocation());
-                par.appendChild(audioElement);
-                hasMedia = true;
-            } else if (contentType.equals(ContentType.TEXT_VCARD)) {
-                SMILMediaElement textElement = createMediaElement(
-                        ELEMENT_TAG_VCARD, document, part.generateLocation());
-                par.appendChild(textElement);
-                hasMedia = true;
-            } else {
-                Timber.e("creating_smil_document", "unknown mimetype");
-            }
-        }
-
-        return document;
-    }
-
-    public static SMILParElement addPar(SMILDocument document) {
-        SMILParElement par = (SMILParElement) document.createElement("par");
-        // Set duration to eight seconds by default.
-        par.setDur(8.0f);
-        document.getBody().appendChild(par);
-        return par;
-    }
-
-    public static SMILMediaElement createMediaElement(
-            String tag, SMILDocument document, String src) {
-        SMILMediaElement mediaElement =
-                (SMILMediaElement) document.createElement(tag);
-        mediaElement.setSrc(escapeXML(src));
-        return mediaElement;
-    }
-
-    public static String escapeXML(String str) {
-        return str.replaceAll("&","&amp;")
-                .replaceAll("<", "&lt;")
-                .replaceAll(">", "&gt;")
-                .replaceAll("\"", "&quot;")
-                .replaceAll("'", "&apos;");
-    }
-}
+package com.google.android.mms.smil;
+
+import com.android.mms.dom.smil.SmilDocumentImpl;
+import com.google.android.mms.ContentType;
+import com.google.android.mms.pdu_alt.PduBody;
+import com.google.android.mms.pdu_alt.PduPart;
+import org.w3c.dom.smil.SMILDocument;
+import org.w3c.dom.smil.SMILElement;
+import org.w3c.dom.smil.SMILLayoutElement;
+import org.w3c.dom.smil.SMILMediaElement;
+import org.w3c.dom.smil.SMILParElement;
+import timber.log.Timber;
+
+
+public class SmilHelper {
+
+    public static final String ELEMENT_TAG_TEXT = "text";
+    public static final String ELEMENT_TAG_IMAGE = "img";
+    public static final String ELEMENT_TAG_AUDIO = "audio";
+    public static final String ELEMENT_TAG_VIDEO = "video";
+    public static final String ELEMENT_TAG_VCARD = "vcard";
+
+    public static SMILDocument createSmilDocument(PduBody pb) {
+
+        SMILDocument document = new SmilDocumentImpl();
+
+        // Create root element.
+        SMILElement smil = (SMILElement) document.createElement("smil");
+        smil.setAttribute("xmlns", "http://www.w3.org/2001/SMIL20/Language");
+        document.appendChild(smil);
+
+        // Create <head> and <layout> element.
+        SMILElement head = (SMILElement) document.createElement("head");
+        smil.appendChild(head);
+
+        SMILLayoutElement layout = (SMILLayoutElement) document.createElement("layout");
+        head.appendChild(layout);
+
+        // Create <body> element and add a empty <par>.
+        SMILElement body = (SMILElement) document.createElement("body");
+        smil.appendChild(body);
+        SMILParElement par = addPar(document);
+
+        // Create media objects for the parts in PDU.
+        int partsNum = pb.getPartsNum();
+        if (partsNum == 0) {
+            return document;
+        }
+
+        boolean hasText = false;
+        boolean hasMedia = false;
+        for (int i = 0; i < partsNum; i++) {
+            // Create new <par> element.
+            if ((par == null) || (hasMedia && hasText)) {
+                par = addPar(document);
+                hasText = false;
+                hasMedia = false;
+            }
+
+            PduPart part = pb.getPart(i);
+            String contentType = new String(part.getContentType());
+
+            if (contentType.equals(ContentType.TEXT_PLAIN)
+                    || contentType.equalsIgnoreCase(ContentType.APP_WAP_XHTML)
+                    || contentType.equals(ContentType.TEXT_HTML)) {
+                SMILMediaElement textElement = createMediaElement(
+                        ELEMENT_TAG_TEXT, document, part.generateLocation());
+                par.appendChild(textElement);
+                hasText = true;
+            } else if (ContentType.isImageType(contentType)) {
+                SMILMediaElement imageElement = createMediaElement(
+                        ELEMENT_TAG_IMAGE, document, part.generateLocation());
+                par.appendChild(imageElement);
+                hasMedia = true;
+            } else if (ContentType.isVideoType(contentType)) {
+                SMILMediaElement videoElement = createMediaElement(
+                        ELEMENT_TAG_VIDEO, document, part.generateLocation());
+                par.appendChild(videoElement);
+                hasMedia = true;
+            } else if (ContentType.isAudioType(contentType)) {
+                SMILMediaElement audioElement = createMediaElement(
+                        ELEMENT_TAG_AUDIO, document, part.generateLocation());
+                par.appendChild(audioElement);
+                hasMedia = true;
+            } else if (contentType.equals(ContentType.TEXT_VCARD)) {
+                SMILMediaElement textElement = createMediaElement(
+                        ELEMENT_TAG_VCARD, document, part.generateLocation());
+                par.appendChild(textElement);
+                hasMedia = true;
+            } else {
+                Timber.e("creating_smil_document", "unknown mimetype");
+            }
+        }
+
+        return document;
+    }
+
+    public static SMILParElement addPar(SMILDocument document) {
+        SMILParElement par = (SMILParElement) document.createElement("par");
+        // Set duration to eight seconds by default.
+        par.setDur(8.0f);
+        document.getBody().appendChild(par);
+        return par;
+    }
+
+    public static SMILMediaElement createMediaElement(
+            String tag, SMILDocument document, String src) {
+        SMILMediaElement mediaElement =
+                (SMILMediaElement) document.createElement(tag);
+        mediaElement.setSrc(escapeXML(src));
+        return mediaElement;
+    }
+
+    public static String escapeXML(String str) {
+        return str.replaceAll("&","&amp;")
+                .replaceAll("<", "&lt;")
+                .replaceAll(">", "&gt;")
+                .replaceAll("\"", "&quot;")
+                .replaceAll("'", "&apos;");
+    }
+}
diff --git a/android-smsmms/src/main/java/com/google/android/mms/util_alt/AbstractCache.java b/android-smsmms/src/main/java/com/google/android/mms/util_alt/AbstractCache.java
index 69123232a..56a161a0c 100755
--- a/android-smsmms/src/main/java/com/google/android/mms/util_alt/AbstractCache.java
+++ b/android-smsmms/src/main/java/com/google/android/mms/util_alt/AbstractCache.java
@@ -1,109 +1,109 @@
-/*
- * Copyright (C) 2015 Jacob Klinker
- *
- * Licensed under the Apache License, Version 2.0 (the "License");
- * you may not use this file except in compliance with the License.
- * You may obtain a copy of the License at
- *
- * http://www.apache.org/licenses/LICENSE-2.0
- *
- * Unless required by applicable law or agreed to in writing, software
- * distributed under the License is distributed on an "AS IS" BASIS,
- * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
- * See the License for the specific language governing permissions and
- * limitations under the License.
- */
-
-package com.google.android.mms.util_alt;
-
-import timber.log.Timber;
-
-import java.util.HashMap;
-
-public abstract class AbstractCache<K, V> {
-    private static final boolean DEBUG = false;
-    private static final boolean LOCAL_LOGV = false;
-
-    private static final int MAX_CACHED_ITEMS  = 500;
-
-    private final HashMap<K, CacheEntry<V>> mCacheMap;
-
-    protected AbstractCache() {
-        mCacheMap = new HashMap<K, CacheEntry<V>>();
-    }
-
-    public boolean put(K key, V value) {
-        if (LOCAL_LOGV) {
-            Timber.v("Trying to put " + key + " into cache.");
-        }
-
-        if (mCacheMap.size() >= MAX_CACHED_ITEMS) {
-            // TODO Should remove the oldest or least hit cached entry
-            // and then cache the new one.
-            if (LOCAL_LOGV) {
-                Timber.v("Failed! size limitation reached.");
-            }
-            return false;
-        }
-
-        if (key != null) {
-            CacheEntry<V> cacheEntry = new CacheEntry<V>();
-            cacheEntry.value = value;
-            mCacheMap.put(key, cacheEntry);
-
-            if (LOCAL_LOGV) {
-                Timber.v(key + " cached, " + mCacheMap.size() + " items total.");
-            }
-            return true;
-        }
-        return false;
-    }
-
-    public V get(K key) {
-        if (LOCAL_LOGV) {
-            Timber.v("Trying to get " + key + " from cache.");
-        }
-
-        if (key != null) {
-            CacheEntry<V> cacheEntry = mCacheMap.get(key);
-            if (cacheEntry != null) {
-                cacheEntry.hit++;
-                if (LOCAL_LOGV) {
-                    Timber.v(key + " hit " + cacheEntry.hit + " times.");
-                }
-                return cacheEntry.value;
-            }
-        }
-        return null;
-    }
-
-    public V purge(K key) {
-        if (LOCAL_LOGV) {
-            Timber.v("Trying to purge " + key);
-        }
-
-        CacheEntry<V> v = mCacheMap.remove(key);
-
-        if (LOCAL_LOGV) {
-            Timber.v(mCacheMap.size() + " items cached.");
-        }
-
-        return v != null ? v.value : null;
-    }
-
-    public void purgeAll() {
-        if (LOCAL_LOGV) {
-            Timber.v("Purging cache, " + mCacheMap.size() + " items dropped.");
-        }
-        mCacheMap.clear();
-    }
-
-    public int size() {
-        return mCacheMap.size();
-    }
-
-    private static class CacheEntry<V> {
-        int hit;
-        V value;
-    }
-}
+/*
+ * Copyright (C) 2015 Jacob Klinker
+ *
+ * Licensed under the Apache License, Version 2.0 (the "License");
+ * you may not use this file except in compliance with the License.
+ * You may obtain a copy of the License at
+ *
+ * http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing, software
+ * distributed under the License is distributed on an "AS IS" BASIS,
+ * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ * See the License for the specific language governing permissions and
+ * limitations under the License.
+ */
+
+package com.google.android.mms.util_alt;
+
+import timber.log.Timber;
+
+import java.util.HashMap;
+
+public abstract class AbstractCache<K, V> {
+    private static final boolean DEBUG = false;
+    private static final boolean LOCAL_LOGV = false;
+
+    private static final int MAX_CACHED_ITEMS  = 500;
+
+    private final HashMap<K, CacheEntry<V>> mCacheMap;
+
+    protected AbstractCache() {
+        mCacheMap = new HashMap<K, CacheEntry<V>>();
+    }
+
+    public boolean put(K key, V value) {
+        if (LOCAL_LOGV) {
+            Timber.v("Trying to put " + key + " into cache.");
+        }
+
+        if (mCacheMap.size() >= MAX_CACHED_ITEMS) {
+            // TODO Should remove the oldest or least hit cached entry
+            // and then cache the new one.
+            if (LOCAL_LOGV) {
+                Timber.v("Failed! size limitation reached.");
+            }
+            return false;
+        }
+
+        if (key != null) {
+            CacheEntry<V> cacheEntry = new CacheEntry<V>();
+            cacheEntry.value = value;
+            mCacheMap.put(key, cacheEntry);
+
+            if (LOCAL_LOGV) {
+                Timber.v(key + " cached, " + mCacheMap.size() + " items total.");
+            }
+            return true;
+        }
+        return false;
+    }
+
+    public V get(K key) {
+        if (LOCAL_LOGV) {
+            Timber.v("Trying to get " + key + " from cache.");
+        }
+
+        if (key != null) {
+            CacheEntry<V> cacheEntry = mCacheMap.get(key);
+            if (cacheEntry != null) {
+                cacheEntry.hit++;
+                if (LOCAL_LOGV) {
+                    Timber.v(key + " hit " + cacheEntry.hit + " times.");
+                }
+                return cacheEntry.value;
+            }
+        }
+        return null;
+    }
+
+    public V purge(K key) {
+        if (LOCAL_LOGV) {
+            Timber.v("Trying to purge " + key);
+        }
+
+        CacheEntry<V> v = mCacheMap.remove(key);
+
+        if (LOCAL_LOGV) {
+            Timber.v(mCacheMap.size() + " items cached.");
+        }
+
+        return v != null ? v.value : null;
+    }
+
+    public void purgeAll() {
+        if (LOCAL_LOGV) {
+            Timber.v("Purging cache, " + mCacheMap.size() + " items dropped.");
+        }
+        mCacheMap.clear();
+    }
+
+    public int size() {
+        return mCacheMap.size();
+    }
+
+    private static class CacheEntry<V> {
+        int hit;
+        V value;
+    }
+}
diff --git a/android-smsmms/src/main/java/com/google/android/mms/util_alt/DownloadDrmHelper.java b/android-smsmms/src/main/java/com/google/android/mms/util_alt/DownloadDrmHelper.java
index bb039b2f3..c8d975b84 100755
--- a/android-smsmms/src/main/java/com/google/android/mms/util_alt/DownloadDrmHelper.java
+++ b/android-smsmms/src/main/java/com/google/android/mms/util_alt/DownloadDrmHelper.java
@@ -1,107 +1,107 @@
-/*
- * Copyright (C) 2015 Jacob Klinker
- *
- * Licensed under the Apache License, Version 2.0 (the "License");
- * you may not use this file except in compliance with the License.
- * You may obtain a copy of the License at
- *
- * http://www.apache.org/licenses/LICENSE-2.0
- *
- * Unless required by applicable law or agreed to in writing, software
- * distributed under the License is distributed on an "AS IS" BASIS,
- * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
- * See the License for the specific language governing permissions and
- * limitations under the License.
- */
-
-package com.google.android.mms.util_alt;
-
-import android.content.Context;
-import android.drm.DrmManagerClient;
-import timber.log.Timber;
-
-public class DownloadDrmHelper {
-
-
-    /** The MIME type of special DRM files */
-    public static final String MIMETYPE_DRM_MESSAGE = "application/vnd.oma.drm.message";
-
-    /** The extensions of special DRM files */
-    public static final String EXTENSION_DRM_MESSAGE = ".dm";
-
-    public static final String EXTENSION_INTERNAL_FWDL = ".fl";
-
-    /**
-     * Checks if the Media Type is a DRM Media Type
-     *
-     * @param mimetype Media Type to check
-     * @return True if the Media Type is DRM else false
-     */
-    public static boolean isDrmMimeType(Context context, String mimetype) {
-        boolean result = false;
-        if (context != null) {
-            try {
-                DrmManagerClient drmClient = new DrmManagerClient(context);
-                if (drmClient != null && mimetype != null && mimetype.length() > 0) {
-                    result = drmClient.canHandle("", mimetype);
-                }
-            } catch (IllegalArgumentException e) {
-                Timber.w("DrmManagerClient instance could not be created, context is Illegal.");
-            } catch (IllegalStateException e) {
-                Timber.w("DrmManagerClient didn't initialize properly.");
-            }
-        }
-        return result;
-    }
-
-    /**
-     * Checks if the Media Type needs to be DRM converted
-     *
-     * @param mimetype Media type of the content
-     * @return True if convert is needed else false
-     */
-    public static boolean isDrmConvertNeeded(String mimetype) {
-        return MIMETYPE_DRM_MESSAGE.equals(mimetype);
-    }
-
-    /**
-     * Modifies the file extension for a DRM Forward Lock file NOTE: This
-     * function shouldn't be called if the file shouldn't be DRM converted
-     */
-    public static String modifyDrmFwLockFileExtension(String filename) {
-        if (filename != null) {
-            int extensionIndex;
-            extensionIndex = filename.lastIndexOf(".");
-            if (extensionIndex != -1) {
-                filename = filename.substring(0, extensionIndex);
-            }
-            filename = filename.concat(EXTENSION_INTERNAL_FWDL);
-        }
-        return filename;
-    }
-
-    /**
-     * Gets the original mime type of DRM protected content.
-     *
-     * @param context The context
-     * @param path Path to the file
-     * @param containingMime The current mime type of of the file i.e. the
-     *            containing mime type
-     * @return The original mime type of the file if DRM protected else the
-     *         currentMime
-     */
-    public static String getOriginalMimeType(Context context, String path, String containingMime) {
-        String result = containingMime;
-        DrmManagerClient drmClient = new DrmManagerClient(context);
-        try {
-            if (drmClient.canHandle(path, null)) {
-                result = drmClient.getOriginalMimeType(path);
-            }
-        } catch (IllegalArgumentException ex) {
-            Timber.w("Can't get original mime type since path is null or empty string.");
-        } catch (IllegalStateException ex) {
-            Timber.w("DrmManagerClient didn't initialize properly.");
-        }
-        return result;
-    }
-}
+/*
+ * Copyright (C) 2015 Jacob Klinker
+ *
+ * Licensed under the Apache License, Version 2.0 (the "License");
+ * you may not use this file except in compliance with the License.
+ * You may obtain a copy of the License at
+ *
+ * http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing, software
+ * distributed under the License is distributed on an "AS IS" BASIS,
+ * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ * See the License for the specific language governing permissions and
+ * limitations under the License.
+ */
+
+package com.google.android.mms.util_alt;
+
+import android.content.Context;
+import android.drm.DrmManagerClient;
+import timber.log.Timber;
+
+public class DownloadDrmHelper {
+
+
+    /** The MIME type of special DRM files */
+    public static final String MIMETYPE_DRM_MESSAGE = "application/vnd.oma.drm.message";
+
+    /** The extensions of special DRM files */
+    public static final String EXTENSION_DRM_MESSAGE = ".dm";
+
+    public static final String EXTENSION_INTERNAL_FWDL = ".fl";
+
+    /**
+     * Checks if the Media Type is a DRM Media Type
+     *
+     * @param mimetype Media Type to check
+     * @return True if the Media Type is DRM else false
+     */
+    public static boolean isDrmMimeType(Context context, String mimetype) {
+        boolean result = false;
+        if (context != null) {
+            try {
+                DrmManagerClient drmClient = new DrmManagerClient(context);
+                if (drmClient != null && mimetype != null && mimetype.length() > 0) {
+                    result = drmClient.canHandle("", mimetype);
+                }
+            } catch (IllegalArgumentException e) {
+                Timber.w("DrmManagerClient instance could not be created, context is Illegal.");
+            } catch (IllegalStateException e) {
+                Timber.w("DrmManagerClient didn't initialize properly.");
+            }
+        }
+        return result;
+    }
+
+    /**
+     * Checks if the Media Type needs to be DRM converted
+     *
+     * @param mimetype Media type of the content
+     * @return True if convert is needed else false
+     */
+    public static boolean isDrmConvertNeeded(String mimetype) {
+        return MIMETYPE_DRM_MESSAGE.equals(mimetype);
+    }
+
+    /**
+     * Modifies the file extension for a DRM Forward Lock file NOTE: This
+     * function shouldn't be called if the file shouldn't be DRM converted
+     */
+    public static String modifyDrmFwLockFileExtension(String filename) {
+        if (filename != null) {
+            int extensionIndex;
+            extensionIndex = filename.lastIndexOf(".");
+            if (extensionIndex != -1) {
+                filename = filename.substring(0, extensionIndex);
+            }
+            filename = filename.concat(EXTENSION_INTERNAL_FWDL);
+        }
+        return filename;
+    }
+
+    /**
+     * Gets the original mime type of DRM protected content.
+     *
+     * @param context The context
+     * @param path Path to the file
+     * @param containingMime The current mime type of of the file i.e. the
+     *            containing mime type
+     * @return The original mime type of the file if DRM protected else the
+     *         currentMime
+     */
+    public static String getOriginalMimeType(Context context, String path, String containingMime) {
+        String result = containingMime;
+        DrmManagerClient drmClient = new DrmManagerClient(context);
+        try {
+            if (drmClient.canHandle(path, null)) {
+                result = drmClient.getOriginalMimeType(path);
+            }
+        } catch (IllegalArgumentException ex) {
+            Timber.w("Can't get original mime type since path is null or empty string.");
+        } catch (IllegalStateException ex) {
+            Timber.w("DrmManagerClient didn't initialize properly.");
+        }
+        return result;
+    }
+}
diff --git a/android-smsmms/src/main/java/com/google/android/mms/util_alt/DrmConvertSession.java b/android-smsmms/src/main/java/com/google/android/mms/util_alt/DrmConvertSession.java
index 3c38ed7fc..c69100edf 100755
--- a/android-smsmms/src/main/java/com/google/android/mms/util_alt/DrmConvertSession.java
+++ b/android-smsmms/src/main/java/com/google/android/mms/util_alt/DrmConvertSession.java
@@ -1,173 +1,173 @@
-/*
- * Copyright (C) 2015 Jacob Klinker
- *
- * Licensed under the Apache License, Version 2.0 (the "License");
- * you may not use this file except in compliance with the License.
- * You may obtain a copy of the License at
- *
- * http://www.apache.org/licenses/LICENSE-2.0
- *
- * Unless required by applicable law or agreed to in writing, software
- * distributed under the License is distributed on an "AS IS" BASIS,
- * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
- * See the License for the specific language governing permissions and
- * limitations under the License.
- */
-package com.google.android.mms.util_alt;
-
-import android.content.Context;
-import android.drm.DrmConvertedStatus;
-import android.drm.DrmManagerClient;
-import timber.log.Timber;
-
-import java.io.FileNotFoundException;
-import java.io.IOException;
-import java.io.RandomAccessFile;
-
-
-public class DrmConvertSession {
-    private DrmManagerClient mDrmClient;
-    private int mConvertSessionId;
-
-    private static final int STATUS_UNKNOWN_ERROR = 491;
-    private static final int STATUS_NOT_ACCEPTABLE = 406;
-    private static final int STATUS_SUCCESS = 200;
-    private static final int STATUS_FILE_ERROR = 492;
-
-    private DrmConvertSession(DrmManagerClient drmClient, int convertSessionId) {
-        mDrmClient = drmClient;
-        mConvertSessionId = convertSessionId;
-    }
-
-    /**
-     * Start of converting a file.
-     *
-     * @param context The context of the application running the convert session.
-     * @param mimeType Mimetype of content that shall be converted.
-     * @return A convert session or null in case an error occurs.
-     */
-    public static DrmConvertSession open(Context context, String mimeType) {
-        DrmManagerClient drmClient = null;
-        int convertSessionId = -1;
-        if (context != null && mimeType != null && !mimeType.equals("")) {
-            try {
-                drmClient = new DrmManagerClient(context);
-                try {
-                    convertSessionId = drmClient.openConvertSession(mimeType);
-                } catch (IllegalArgumentException e) {
-                    Timber.w("Conversion of Mimetype: " + mimeType
-                            + " is not supported.", e);
-                } catch (IllegalStateException e) {
-                    Timber.w(e, "Could not access Open DrmFramework.");
-                }
-            } catch (IllegalArgumentException e) {
-                Timber.w("DrmManagerClient instance could not be created, context is Illegal.");
-            } catch (IllegalStateException e) {
-                Timber.w("DrmManagerClient didn't initialize properly.");
-            }
-        }
-
-        if (drmClient == null || convertSessionId < 0) {
-            return null;
-        } else {
-            return new DrmConvertSession(drmClient, convertSessionId);
-        }
-    }
-    /**
-     * Convert a buffer of data to protected format.
-     *
-     * @param inBuffer Buffer filled with data to convert.
-     * @param size The number of bytes that shall be converted.
-     * @return A Buffer filled with converted data, if execution is ok, in all
-     *         other case null.
-     */
-    public byte [] convert(byte[] inBuffer, int size) {
-        byte[] result = null;
-        if (inBuffer != null) {
-            DrmConvertedStatus convertedStatus = null;
-            try {
-                if (size != inBuffer.length) {
-                    byte[] buf = new byte[size];
-                    System.arraycopy(inBuffer, 0, buf, 0, size);
-                    convertedStatus = mDrmClient.convertData(mConvertSessionId, buf);
-                } else {
-                    convertedStatus = mDrmClient.convertData(mConvertSessionId, inBuffer);
-                }
-
-                if (convertedStatus != null &&
-                        convertedStatus.statusCode == DrmConvertedStatus.STATUS_OK &&
-                        convertedStatus.convertedData != null) {
-                    result = convertedStatus.convertedData;
-                }
-            } catch (IllegalArgumentException e) {
-                Timber.w("Buffer with data to convert is illegal. Convertsession: "
-                        + mConvertSessionId, e);
-            } catch (IllegalStateException e) {
-                Timber.w("Could not convert data. Convertsession: " +
-                        mConvertSessionId, e);
-            }
-        } else {
-            throw new IllegalArgumentException("Parameter inBuffer is null");
-        }
-        return result;
-    }
-
-    /**
-     * Ends a conversion session of a file.
-     *
-     * @param filename The filename of the converted file.
-     * @return STATUS_SUCCESS if execution is ok.
-     *         STATUS_FILE_ERROR in case converted file can not
-     *         be accessed. STATUS_NOT_ACCEPTABLE if a problem
-     *         occurs when accessing drm framework.
-     *         STATUS_UNKNOWN_ERROR if a general error occurred.
-     */
-    public int close(String filename) {
-        DrmConvertedStatus convertedStatus = null;
-        int result = STATUS_UNKNOWN_ERROR;
-        if (mDrmClient != null && mConvertSessionId >= 0) {
-            try {
-                convertedStatus = mDrmClient.closeConvertSession(mConvertSessionId);
-                if (convertedStatus == null ||
-                        convertedStatus.statusCode != DrmConvertedStatus.STATUS_OK ||
-                        convertedStatus.convertedData == null) {
-                    result = STATUS_NOT_ACCEPTABLE;
-                } else {
-                    RandomAccessFile rndAccessFile = null;
-                    try {
-                        rndAccessFile = new RandomAccessFile(filename, "rw");
-                        rndAccessFile.seek(convertedStatus.offset);
-                        rndAccessFile.write(convertedStatus.convertedData);
-                        result = STATUS_SUCCESS;
-                    } catch (FileNotFoundException e) {
-                        result = STATUS_FILE_ERROR;
-                        Timber.w(e, "File: " + filename + " could not be found.");
-                    } catch (IOException e) {
-                        result = STATUS_FILE_ERROR;
-                        Timber.w(e, "Could not access File: " + filename + " .");
-                    } catch (IllegalArgumentException e) {
-                        result = STATUS_FILE_ERROR;
-                        Timber.w(e, "Could not open file in mode: rw");
-                    } catch (SecurityException e) {
-                        Timber.w("Access to File: " + filename +
-                                " was denied denied by SecurityManager.", e);
-                    } finally {
-                        if (rndAccessFile != null) {
-                            try {
-                                rndAccessFile.close();
-                            } catch (IOException e) {
-                                result = STATUS_FILE_ERROR;
-                                Timber.w("Failed to close File:" + filename
-                                        + ".", e);
-                            }
-                        }
-                    }
-                }
-            } catch (IllegalStateException e) {
-                Timber.w("Could not close convertsession. Convertsession: " +
-                        mConvertSessionId, e);
-            }
-        }
-        return result;
-    }
-}
+/*
+ * Copyright (C) 2015 Jacob Klinker
+ *
+ * Licensed under the Apache License, Version 2.0 (the "License");
+ * you may not use this file except in compliance with the License.
+ * You may obtain a copy of the License at
+ *
+ * http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing, software
+ * distributed under the License is distributed on an "AS IS" BASIS,
+ * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ * See the License for the specific language governing permissions and
+ * limitations under the License.
+ */
+package com.google.android.mms.util_alt;
+
+import android.content.Context;
+import android.drm.DrmConvertedStatus;
+import android.drm.DrmManagerClient;
+import timber.log.Timber;
+
+import java.io.FileNotFoundException;
+import java.io.IOException;
+import java.io.RandomAccessFile;
+
+
+public class DrmConvertSession {
+    private DrmManagerClient mDrmClient;
+    private int mConvertSessionId;
+
+    private static final int STATUS_UNKNOWN_ERROR = 491;
+    private static final int STATUS_NOT_ACCEPTABLE = 406;
+    private static final int STATUS_SUCCESS = 200;
+    private static final int STATUS_FILE_ERROR = 492;
+
+    private DrmConvertSession(DrmManagerClient drmClient, int convertSessionId) {
+        mDrmClient = drmClient;
+        mConvertSessionId = convertSessionId;
+    }
+
+    /**
+     * Start of converting a file.
+     *
+     * @param context The context of the application running the convert session.
+     * @param mimeType Mimetype of content that shall be converted.
+     * @return A convert session or null in case an error occurs.
+     */
+    public static DrmConvertSession open(Context context, String mimeType) {
+        DrmManagerClient drmClient = null;
+        int convertSessionId = -1;
+        if (context != null && mimeType != null && !mimeType.equals("")) {
+            try {
+                drmClient = new DrmManagerClient(context);
+                try {
+                    convertSessionId = drmClient.openConvertSession(mimeType);
+                } catch (IllegalArgumentException e) {
+                    Timber.w("Conversion of Mimetype: " + mimeType
+                            + " is not supported.", e);
+                } catch (IllegalStateException e) {
+                    Timber.w(e, "Could not access Open DrmFramework.");
+                }
+            } catch (IllegalArgumentException e) {
+                Timber.w("DrmManagerClient instance could not be created, context is Illegal.");
+            } catch (IllegalStateException e) {
+                Timber.w("DrmManagerClient didn't initialize properly.");
+            }
+        }
+
+        if (drmClient == null || convertSessionId < 0) {
+            return null;
+        } else {
+            return new DrmConvertSession(drmClient, convertSessionId);
+        }
+    }
+    /**
+     * Convert a buffer of data to protected format.
+     *
+     * @param inBuffer Buffer filled with data to convert.
+     * @param size The number of bytes that shall be converted.
+     * @return A Buffer filled with converted data, if execution is ok, in all
+     *         other case null.
+     */
+    public byte [] convert(byte[] inBuffer, int size) {
+        byte[] result = null;
+        if (inBuffer != null) {
+            DrmConvertedStatus convertedStatus = null;
+            try {
+                if (size != inBuffer.length) {
+                    byte[] buf = new byte[size];
+                    System.arraycopy(inBuffer, 0, buf, 0, size);
+                    convertedStatus = mDrmClient.convertData(mConvertSessionId, buf);
+                } else {
+                    convertedStatus = mDrmClient.convertData(mConvertSessionId, inBuffer);
+                }
+
+                if (convertedStatus != null &&
+                        convertedStatus.statusCode == DrmConvertedStatus.STATUS_OK &&
+                        convertedStatus.convertedData != null) {
+                    result = convertedStatus.convertedData;
+                }
+            } catch (IllegalArgumentException e) {
+                Timber.w("Buffer with data to convert is illegal. Convertsession: "
+                        + mConvertSessionId, e);
+            } catch (IllegalStateException e) {
+                Timber.w("Could not convert data. Convertsession: " +
+                        mConvertSessionId, e);
+            }
+        } else {
+            throw new IllegalArgumentException("Parameter inBuffer is null");
+        }
+        return result;
+    }
+
+    /**
+     * Ends a conversion session of a file.
+     *
+     * @param filename The filename of the converted file.
+     * @return STATUS_SUCCESS if execution is ok.
+     *         STATUS_FILE_ERROR in case converted file can not
+     *         be accessed. STATUS_NOT_ACCEPTABLE if a problem
+     *         occurs when accessing drm framework.
+     *         STATUS_UNKNOWN_ERROR if a general error occurred.
+     */
+    public int close(String filename) {
+        DrmConvertedStatus convertedStatus = null;
+        int result = STATUS_UNKNOWN_ERROR;
+        if (mDrmClient != null && mConvertSessionId >= 0) {
+            try {
+                convertedStatus = mDrmClient.closeConvertSession(mConvertSessionId);
+                if (convertedStatus == null ||
+                        convertedStatus.statusCode != DrmConvertedStatus.STATUS_OK ||
+                        convertedStatus.convertedData == null) {
+                    result = STATUS_NOT_ACCEPTABLE;
+                } else {
+                    RandomAccessFile rndAccessFile = null;
+                    try {
+                        rndAccessFile = new RandomAccessFile(filename, "rw");
+                        rndAccessFile.seek(convertedStatus.offset);
+                        rndAccessFile.write(convertedStatus.convertedData);
+                        result = STATUS_SUCCESS;
+                    } catch (FileNotFoundException e) {
+                        result = STATUS_FILE_ERROR;
+                        Timber.w(e, "File: " + filename + " could not be found.");
+                    } catch (IOException e) {
+                        result = STATUS_FILE_ERROR;
+                        Timber.w(e, "Could not access File: " + filename + " .");
+                    } catch (IllegalArgumentException e) {
+                        result = STATUS_FILE_ERROR;
+                        Timber.w(e, "Could not open file in mode: rw");
+                    } catch (SecurityException e) {
+                        Timber.w("Access to File: " + filename +
+                                " was denied denied by SecurityManager.", e);
+                    } finally {
+                        if (rndAccessFile != null) {
+                            try {
+                                rndAccessFile.close();
+                            } catch (IOException e) {
+                                result = STATUS_FILE_ERROR;
+                                Timber.w("Failed to close File:" + filename
+                                        + ".", e);
+                            }
+                        }
+                    }
+                }
+            } catch (IllegalStateException e) {
+                Timber.w("Could not close convertsession. Convertsession: " +
+                        mConvertSessionId, e);
+            }
+        }
+        return result;
+    }
+}
diff --git a/android-smsmms/src/main/java/com/google/android/mms/util_alt/PduCache.java b/android-smsmms/src/main/java/com/google/android/mms/util_alt/PduCache.java
index d677ece90..e67e40e5a 100755
--- a/android-smsmms/src/main/java/com/google/android/mms/util_alt/PduCache.java
+++ b/android-smsmms/src/main/java/com/google/android/mms/util_alt/PduCache.java
@@ -1,259 +1,259 @@
-/*
- * Copyright (C) 2015 Jacob Klinker
- *
- * Licensed under the Apache License, Version 2.0 (the "License");
- * you may not use this file except in compliance with the License.
- * You may obtain a copy of the License at
- *
- * http://www.apache.org/licenses/LICENSE-2.0
- *
- * Unless required by applicable law or agreed to in writing, software
- * distributed under the License is distributed on an "AS IS" BASIS,
- * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
- * See the License for the specific language governing permissions and
- * limitations under the License.
- */
-
-package com.google.android.mms.util_alt;
-
-import android.content.ContentUris;
-import android.content.UriMatcher;
-import android.net.Uri;
-import android.provider.Telephony.Mms;
-import timber.log.Timber;
-
-import java.util.HashMap;
-import java.util.HashSet;
-
-public final class PduCache extends AbstractCache<Uri, PduCacheEntry> {
-
-    private static final boolean LOCAL_LOGV = false;
-
-    private static final int MMS_ALL             = 0;
-    private static final int MMS_ALL_ID          = 1;
-    private static final int MMS_INBOX           = 2;
-    private static final int MMS_INBOX_ID        = 3;
-    private static final int MMS_SENT            = 4;
-    private static final int MMS_SENT_ID         = 5;
-    private static final int MMS_DRAFTS          = 6;
-    private static final int MMS_DRAFTS_ID       = 7;
-    private static final int MMS_OUTBOX          = 8;
-    private static final int MMS_OUTBOX_ID       = 9;
-    private static final int MMS_CONVERSATION    = 10;
-    private static final int MMS_CONVERSATION_ID = 11;
-
-    private static final UriMatcher URI_MATCHER;
-    private static final HashMap<Integer, Integer> MATCH_TO_MSGBOX_ID_MAP;
-
-    private static PduCache sInstance;
-
-    static {
-        URI_MATCHER = new UriMatcher(UriMatcher.NO_MATCH);
-        URI_MATCHER.addURI("mms", null,         MMS_ALL);
-        URI_MATCHER.addURI("mms", "#",          MMS_ALL_ID);
-        URI_MATCHER.addURI("mms", "inbox",      MMS_INBOX);
-        URI_MATCHER.addURI("mms", "inbox/#",    MMS_INBOX_ID);
-        URI_MATCHER.addURI("mms", "sent",       MMS_SENT);
-        URI_MATCHER.addURI("mms", "sent/#",     MMS_SENT_ID);
-        URI_MATCHER.addURI("mms", "drafts",     MMS_DRAFTS);
-        URI_MATCHER.addURI("mms", "drafts/#",   MMS_DRAFTS_ID);
-        URI_MATCHER.addURI("mms", "outbox",     MMS_OUTBOX);
-        URI_MATCHER.addURI("mms", "outbox/#",   MMS_OUTBOX_ID);
-        URI_MATCHER.addURI("mms-sms", "conversations",   MMS_CONVERSATION);
-        URI_MATCHER.addURI("mms-sms", "conversations/#", MMS_CONVERSATION_ID);
-
-        MATCH_TO_MSGBOX_ID_MAP = new HashMap<Integer, Integer>();
-        MATCH_TO_MSGBOX_ID_MAP.put(MMS_INBOX,  Mms.MESSAGE_BOX_INBOX);
-        MATCH_TO_MSGBOX_ID_MAP.put(MMS_SENT,   Mms.MESSAGE_BOX_SENT);
-        MATCH_TO_MSGBOX_ID_MAP.put(MMS_DRAFTS, Mms.MESSAGE_BOX_DRAFTS);
-        MATCH_TO_MSGBOX_ID_MAP.put(MMS_OUTBOX, Mms.MESSAGE_BOX_OUTBOX);
-    }
-
-    private final HashMap<Integer, HashSet<Uri>> mMessageBoxes;
-    private final HashMap<Long, HashSet<Uri>> mThreads;
-    private final HashSet<Uri> mUpdating;
-
-    private PduCache() {
-        mMessageBoxes = new HashMap<Integer, HashSet<Uri>>();
-        mThreads = new HashMap<Long, HashSet<Uri>>();
-        mUpdating = new HashSet<Uri>();
-    }
-
-    synchronized public static final PduCache getInstance() {
-        if (sInstance == null) {
-            if (LOCAL_LOGV) {
-                Timber.v("Constructing new PduCache instance.");
-            }
-            sInstance = new PduCache();
-        }
-        return sInstance;
-    }
-
-    @Override
-    synchronized public boolean put(Uri uri, PduCacheEntry entry) {
-        int msgBoxId = entry.getMessageBox();
-        HashSet<Uri> msgBox = mMessageBoxes.get(msgBoxId);
-        if (msgBox == null) {
-            msgBox = new HashSet<Uri>();
-            mMessageBoxes.put(msgBoxId, msgBox);
-        }
-
-        long threadId = entry.getThreadId();
-        HashSet<Uri> thread = mThreads.get(threadId);
-        if (thread == null) {
-            thread = new HashSet<Uri>();
-            mThreads.put(threadId, thread);
-        }
-
-        Uri finalKey = normalizeKey(uri);
-        boolean result = super.put(finalKey, entry);
-        if (result) {
-            msgBox.add(finalKey);
-            thread.add(finalKey);
-        }
-        setUpdating(uri, false);
-        return result;
-    }
-
-    synchronized public void setUpdating(Uri uri, boolean updating) {
-        if (updating) {
-            mUpdating.add(uri);
-        } else {
-            mUpdating.remove(uri);
-        }
-    }
-
-    synchronized public boolean isUpdating(Uri uri) {
-        return mUpdating.contains(uri);
-    }
-
-    @Override
-    synchronized public PduCacheEntry purge(Uri uri) {
-        int match = URI_MATCHER.match(uri);
-        switch (match) {
-            case MMS_ALL_ID:
-                return purgeSingleEntry(uri);
-            case MMS_INBOX_ID:
-            case MMS_SENT_ID:
-            case MMS_DRAFTS_ID:
-            case MMS_OUTBOX_ID:
-                String msgId = uri.getLastPathSegment();
-                return purgeSingleEntry(Uri.withAppendedPath(Mms.CONTENT_URI, msgId));
-            // Implicit batch of purge, return null.
-            case MMS_ALL:
-            case MMS_CONVERSATION:
-                purgeAll();
-                return null;
-            case MMS_INBOX:
-            case MMS_SENT:
-            case MMS_DRAFTS:
-            case MMS_OUTBOX:
-                purgeByMessageBox(MATCH_TO_MSGBOX_ID_MAP.get(match));
-                return null;
-            case MMS_CONVERSATION_ID:
-                purgeByThreadId(ContentUris.parseId(uri));
-                return null;
-            default:
-                return null;
-        }
-    }
-
-    private PduCacheEntry purgeSingleEntry(Uri key) {
-        mUpdating.remove(key);
-        PduCacheEntry entry = super.purge(key);
-        if (entry != null) {
-            removeFromThreads(key, entry);
-            removeFromMessageBoxes(key, entry);
-            return entry;
-        }
-        return null;
-    }
-
-    @Override
-    synchronized public void purgeAll() {
-        super.purgeAll();
-
-        mMessageBoxes.clear();
-        mThreads.clear();
-        mUpdating.clear();
-    }
-
-    /**
-     * @param uri The Uri to be normalized.
-     * @return Uri The normalized key of cached entry.
-     */
-    private Uri normalizeKey(Uri uri) {
-        int match = URI_MATCHER.match(uri);
-        Uri normalizedKey = null;
-
-        switch (match) {
-            case MMS_ALL_ID:
-                normalizedKey = uri;
-                break;
-            case MMS_INBOX_ID:
-            case MMS_SENT_ID:
-            case MMS_DRAFTS_ID:
-            case MMS_OUTBOX_ID:
-                String msgId = uri.getLastPathSegment();
-                normalizedKey = Uri.withAppendedPath(Mms.CONTENT_URI, msgId);
-                break;
-            default:
-                return null;
-        }
-
-        if (LOCAL_LOGV) {
-            Timber.v(uri + " -> " + normalizedKey);
-        }
-        return normalizedKey;
-    }
-
-    private void purgeByMessageBox(Integer msgBoxId) {
-        if (LOCAL_LOGV) {
-            Timber.v("Purge cache in message box: " + msgBoxId);
-        }
-
-        if (msgBoxId != null) {
-            HashSet<Uri> msgBox = mMessageBoxes.remove(msgBoxId);
-            if (msgBox != null) {
-                for (Uri key : msgBox) {
-                    mUpdating.remove(key);
-                    PduCacheEntry entry = super.purge(key);
-                    if (entry != null) {
-                        removeFromThreads(key, entry);
-                    }
-                }
-            }
-        }
-    }
-
-    private void removeFromThreads(Uri key, PduCacheEntry entry) {
-        HashSet<Uri> thread = mThreads.get(entry.getThreadId());
-        if (thread != null) {
-            thread.remove(key);
-        }
-    }
-
-    private void purgeByThreadId(long threadId) {
-        if (LOCAL_LOGV) {
-            Timber.v("Purge cache in thread: " + threadId);
-        }
-
-        HashSet<Uri> thread = mThreads.remove(threadId);
-        if (thread != null) {
-            for (Uri key : thread) {
-                mUpdating.remove(key);
-                PduCacheEntry entry = super.purge(key);
-                if (entry != null) {
-                    removeFromMessageBoxes(key, entry);
-                }
-            }
-        }
-    }
-
-    private void removeFromMessageBoxes(Uri key, PduCacheEntry entry) {
-        HashSet<Uri> msgBox = mThreads.get(Long.valueOf(entry.getMessageBox()));
-        if (msgBox != null) {
-            msgBox.remove(key);
-        }
-    }
-}
+/*
+ * Copyright (C) 2015 Jacob Klinker
+ *
+ * Licensed under the Apache License, Version 2.0 (the "License");
+ * you may not use this file except in compliance with the License.
+ * You may obtain a copy of the License at
+ *
+ * http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing, software
+ * distributed under the License is distributed on an "AS IS" BASIS,
+ * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ * See the License for the specific language governing permissions and
+ * limitations under the License.
+ */
+
+package com.google.android.mms.util_alt;
+
+import android.content.ContentUris;
+import android.content.UriMatcher;
+import android.net.Uri;
+import android.provider.Telephony.Mms;
+import timber.log.Timber;
+
+import java.util.HashMap;
+import java.util.HashSet;
+
+public final class PduCache extends AbstractCache<Uri, PduCacheEntry> {
+
+    private static final boolean LOCAL_LOGV = false;
+
+    private static final int MMS_ALL             = 0;
+    private static final int MMS_ALL_ID          = 1;
+    private static final int MMS_INBOX           = 2;
+    private static final int MMS_INBOX_ID        = 3;
+    private static final int MMS_SENT            = 4;
+    private static final int MMS_SENT_ID         = 5;
+    private static final int MMS_DRAFTS          = 6;
+    private static final int MMS_DRAFTS_ID       = 7;
+    private static final int MMS_OUTBOX          = 8;
+    private static final int MMS_OUTBOX_ID       = 9;
+    private static final int MMS_CONVERSATION    = 10;
+    private static final int MMS_CONVERSATION_ID = 11;
+
+    private static final UriMatcher URI_MATCHER;
+    private static final HashMap<Integer, Integer> MATCH_TO_MSGBOX_ID_MAP;
+
+    private static PduCache sInstance;
+
+    static {
+        URI_MATCHER = new UriMatcher(UriMatcher.NO_MATCH);
+        URI_MATCHER.addURI("mms", null,         MMS_ALL);
+        URI_MATCHER.addURI("mms", "#",          MMS_ALL_ID);
+        URI_MATCHER.addURI("mms", "inbox",      MMS_INBOX);
+        URI_MATCHER.addURI("mms", "inbox/#",    MMS_INBOX_ID);
+        URI_MATCHER.addURI("mms", "sent",       MMS_SENT);
+        URI_MATCHER.addURI("mms", "sent/#",     MMS_SENT_ID);
+        URI_MATCHER.addURI("mms", "drafts",     MMS_DRAFTS);
+        URI_MATCHER.addURI("mms", "drafts/#",   MMS_DRAFTS_ID);
+        URI_MATCHER.addURI("mms", "outbox",     MMS_OUTBOX);
+        URI_MATCHER.addURI("mms", "outbox/#",   MMS_OUTBOX_ID);
+        URI_MATCHER.addURI("mms-sms", "conversations",   MMS_CONVERSATION);
+        URI_MATCHER.addURI("mms-sms", "conversations/#", MMS_CONVERSATION_ID);
+
+        MATCH_TO_MSGBOX_ID_MAP = new HashMap<Integer, Integer>();
+        MATCH_TO_MSGBOX_ID_MAP.put(MMS_INBOX,  Mms.MESSAGE_BOX_INBOX);
+        MATCH_TO_MSGBOX_ID_MAP.put(MMS_SENT,   Mms.MESSAGE_BOX_SENT);
+        MATCH_TO_MSGBOX_ID_MAP.put(MMS_DRAFTS, Mms.MESSAGE_BOX_DRAFTS);
+        MATCH_TO_MSGBOX_ID_MAP.put(MMS_OUTBOX, Mms.MESSAGE_BOX_OUTBOX);
+    }
+
+    private final HashMap<Integer, HashSet<Uri>> mMessageBoxes;
+    private final HashMap<Long, HashSet<Uri>> mThreads;
+    private final HashSet<Uri> mUpdating;
+
+    private PduCache() {
+        mMessageBoxes = new HashMap<Integer, HashSet<Uri>>();
+        mThreads = new HashMap<Long, HashSet<Uri>>();
+        mUpdating = new HashSet<Uri>();
+    }
+
+    synchronized public static final PduCache getInstance() {
+        if (sInstance == null) {
+            if (LOCAL_LOGV) {
+                Timber.v("Constructing new PduCache instance.");
+            }
+            sInstance = new PduCache();
+        }
+        return sInstance;
+    }
+
+    @Override
+    synchronized public boolean put(Uri uri, PduCacheEntry entry) {
+        int msgBoxId = entry.getMessageBox();
+        HashSet<Uri> msgBox = mMessageBoxes.get(msgBoxId);
+        if (msgBox == null) {
+            msgBox = new HashSet<Uri>();
+            mMessageBoxes.put(msgBoxId, msgBox);
+        }
+
+        long threadId = entry.getThreadId();
+        HashSet<Uri> thread = mThreads.get(threadId);
+        if (thread == null) {
+            thread = new HashSet<Uri>();
+            mThreads.put(threadId, thread);
+        }
+
+        Uri finalKey = normalizeKey(uri);
+        boolean result = super.put(finalKey, entry);
+        if (result) {
+            msgBox.add(finalKey);
+            thread.add(finalKey);
+        }
+        setUpdating(uri, false);
+        return result;
+    }
+
+    synchronized public void setUpdating(Uri uri, boolean updating) {
+        if (updating) {
+            mUpdating.add(uri);
+        } else {
+            mUpdating.remove(uri);
+        }
+    }
+
+    synchronized public boolean isUpdating(Uri uri) {
+        return mUpdating.contains(uri);
+    }
+
+    @Override
+    synchronized public PduCacheEntry purge(Uri uri) {
+        int match = URI_MATCHER.match(uri);
+        switch (match) {
+            case MMS_ALL_ID:
+                return purgeSingleEntry(uri);
+            case MMS_INBOX_ID:
+            case MMS_SENT_ID:
+            case MMS_DRAFTS_ID:
+            case MMS_OUTBOX_ID:
+                String msgId = uri.getLastPathSegment();
+                return purgeSingleEntry(Uri.withAppendedPath(Mms.CONTENT_URI, msgId));
+            // Implicit batch of purge, return null.
+            case MMS_ALL:
+            case MMS_CONVERSATION:
+                purgeAll();
+                return null;
+            case MMS_INBOX:
+            case MMS_SENT:
+            case MMS_DRAFTS:
+            case MMS_OUTBOX:
+                purgeByMessageBox(MATCH_TO_MSGBOX_ID_MAP.get(match));
+                return null;
+            case MMS_CONVERSATION_ID:
+                purgeByThreadId(ContentUris.parseId(uri));
+                return null;
+            default:
+                return null;
+        }
+    }
+
+    private PduCacheEntry purgeSingleEntry(Uri key) {
+        mUpdating.remove(key);
+        PduCacheEntry entry = super.purge(key);
+        if (entry != null) {
+            removeFromThreads(key, entry);
+            removeFromMessageBoxes(key, entry);
+            return entry;
+        }
+        return null;
+    }
+
+    @Override
+    synchronized public void purgeAll() {
+        super.purgeAll();
+
+        mMessageBoxes.clear();
+        mThreads.clear();
+        mUpdating.clear();
+    }
+
+    /**
+     * @param uri The Uri to be normalized.
+     * @return Uri The normalized key of cached entry.
+     */
+    private Uri normalizeKey(Uri uri) {
+        int match = URI_MATCHER.match(uri);
+        Uri normalizedKey = null;
+
+        switch (match) {
+            case MMS_ALL_ID:
+                normalizedKey = uri;
+                break;
+            case MMS_INBOX_ID:
+            case MMS_SENT_ID:
+            case MMS_DRAFTS_ID:
+            case MMS_OUTBOX_ID:
+                String msgId = uri.getLastPathSegment();
+                normalizedKey = Uri.withAppendedPath(Mms.CONTENT_URI, msgId);
+                break;
+            default:
+                return null;
+        }
+
+        if (LOCAL_LOGV) {
+            Timber.v(uri + " -> " + normalizedKey);
+        }
+        return normalizedKey;
+    }
+
+    private void purgeByMessageBox(Integer msgBoxId) {
+        if (LOCAL_LOGV) {
+            Timber.v("Purge cache in message box: " + msgBoxId);
+        }
+
+        if (msgBoxId != null) {
+            HashSet<Uri> msgBox = mMessageBoxes.remove(msgBoxId);
+            if (msgBox != null) {
+                for (Uri key : msgBox) {
+                    mUpdating.remove(key);
+                    PduCacheEntry entry = super.purge(key);
+                    if (entry != null) {
+                        removeFromThreads(key, entry);
+                    }
+                }
+            }
+        }
+    }
+
+    private void removeFromThreads(Uri key, PduCacheEntry entry) {
+        HashSet<Uri> thread = mThreads.get(entry.getThreadId());
+        if (thread != null) {
+            thread.remove(key);
+        }
+    }
+
+    private void purgeByThreadId(long threadId) {
+        if (LOCAL_LOGV) {
+            Timber.v("Purge cache in thread: " + threadId);
+        }
+
+        HashSet<Uri> thread = mThreads.remove(threadId);
+        if (thread != null) {
+            for (Uri key : thread) {
+                mUpdating.remove(key);
+                PduCacheEntry entry = super.purge(key);
+                if (entry != null) {
+                    removeFromMessageBoxes(key, entry);
+                }
+            }
+        }
+    }
+
+    private void removeFromMessageBoxes(Uri key, PduCacheEntry entry) {
+        HashSet<Uri> msgBox = mThreads.get(Long.valueOf(entry.getMessageBox()));
+        if (msgBox != null) {
+            msgBox.remove(key);
+        }
+    }
+}
diff --git a/android-smsmms/src/main/java/com/google/android/mms/util_alt/PduCacheEntry.java b/android-smsmms/src/main/java/com/google/android/mms/util_alt/PduCacheEntry.java
index 44ecb58ea..2fcbdf49a 100755
--- a/android-smsmms/src/main/java/com/google/android/mms/util_alt/PduCacheEntry.java
+++ b/android-smsmms/src/main/java/com/google/android/mms/util_alt/PduCacheEntry.java
@@ -1,43 +1,43 @@
-/*
- * Copyright (C) 2015 Jacob Klinker
- *
- * Licensed under the Apache License, Version 2.0 (the "License");
- * you may not use this file except in compliance with the License.
- * You may obtain a copy of the License at
- *
- * http://www.apache.org/licenses/LICENSE-2.0
- *
- * Unless required by applicable law or agreed to in writing, software
- * distributed under the License is distributed on an "AS IS" BASIS,
- * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
- * See the License for the specific language governing permissions and
- * limitations under the License.
- */
-
-package com.google.android.mms.util_alt;
-
-import com.google.android.mms.pdu_alt.GenericPdu;
-
-public final class PduCacheEntry {
-    private final GenericPdu mPdu;
-    private final int mMessageBox;
-    private final long mThreadId;
-
-    public PduCacheEntry(GenericPdu pdu, int msgBox, long threadId) {
-        mPdu = pdu;
-        mMessageBox = msgBox;
-        mThreadId = threadId;
-    }
-
-    public GenericPdu getPdu() {
-        return mPdu;
-    }
-
-    public int getMessageBox() {
-        return mMessageBox;
-    }
-
-    public long getThreadId() {
-        return mThreadId;
-    }
-}
+/*
+ * Copyright (C) 2015 Jacob Klinker
+ *
+ * Licensed under the Apache License, Version 2.0 (the "License");
+ * you may not use this file except in compliance with the License.
+ * You may obtain a copy of the License at
+ *
+ * http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing, software
+ * distributed under the License is distributed on an "AS IS" BASIS,
+ * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ * See the License for the specific language governing permissions and
+ * limitations under the License.
+ */
+
+package com.google.android.mms.util_alt;
+
+import com.google.android.mms.pdu_alt.GenericPdu;
+
+public final class PduCacheEntry {
+    private final GenericPdu mPdu;
+    private final int mMessageBox;
+    private final long mThreadId;
+
+    public PduCacheEntry(GenericPdu pdu, int msgBox, long threadId) {
+        mPdu = pdu;
+        mMessageBox = msgBox;
+        mThreadId = threadId;
+    }
+
+    public GenericPdu getPdu() {
+        return mPdu;
+    }
+
+    public int getMessageBox() {
+        return mMessageBox;
+    }
+
+    public long getThreadId() {
+        return mThreadId;
+    }
+}
diff --git a/android-smsmms/src/main/java/com/google/android/mms/util_alt/SqliteWrapper.java b/android-smsmms/src/main/java/com/google/android/mms/util_alt/SqliteWrapper.java
index 462cf468d..d58c53d01 100755
--- a/android-smsmms/src/main/java/com/google/android/mms/util_alt/SqliteWrapper.java
+++ b/android-smsmms/src/main/java/com/google/android/mms/util_alt/SqliteWrapper.java
@@ -1,118 +1,118 @@
-/*
- * Copyright (C) 2015 Jacob Klinker
- *
- * Licensed under the Apache License, Version 2.0 (the "License");
- * you may not use this file except in compliance with the License.
- * You may obtain a copy of the License at
- *
- * http://www.apache.org/licenses/LICENSE-2.0
- *
- * Unless required by applicable law or agreed to in writing, software
- * distributed under the License is distributed on an "AS IS" BASIS,
- * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
- * See the License for the specific language governing permissions and
- * limitations under the License.
- */
-
-package com.google.android.mms.util_alt;
-
-import android.app.ActivityManager;
-import android.content.ContentResolver;
-import android.content.ContentValues;
-import android.content.Context;
-import android.database.Cursor;
-import android.database.sqlite.SQLiteException;
-import android.net.Uri;
-import android.widget.Toast;
-import timber.log.Timber;
-
-public final class SqliteWrapper {
-    private static final String SQLITE_EXCEPTION_DETAIL_MESSAGE
-                = "unable to open database file";
-
-    private SqliteWrapper() {
-        // Forbidden being instantiated.
-    }
-
-    // FIXME: It looks like outInfo.lowMemory does not work well as we expected.
-    // after run command: adb shell fillup -p 100, outInfo.lowMemory is still false.
-    private static boolean isLowMemory(Context context) {
-        if (null == context) {
-            return false;
-        }
-
-        ActivityManager am = (ActivityManager)
-                        context.getSystemService(Context.ACTIVITY_SERVICE);
-        ActivityManager.MemoryInfo outInfo = new ActivityManager.MemoryInfo();
-        am.getMemoryInfo(outInfo);
-
-        return outInfo.lowMemory;
-    }
-
-    // FIXME: need to optimize this method.
-    private static boolean isLowMemory(SQLiteException e) {
-        return e.getMessage().equals(SQLITE_EXCEPTION_DETAIL_MESSAGE);
-    }
-
-    public static void checkSQLiteException(Context context, SQLiteException e) {
-        if (isLowMemory(e)) {
-            Toast.makeText(context, "Low Memory",
-                    Toast.LENGTH_SHORT).show();
-        } else {
-            throw e;
-        }
-    }
-
-    public static Cursor query(Context context, ContentResolver resolver, Uri uri,
-            String[] projection, String selection, String[] selectionArgs, String sortOrder) {
-        try {
-            return resolver.query(uri, projection, selection, selectionArgs, sortOrder);
-        } catch (SQLiteException e) {
-            Timber.e(e, "Catch a SQLiteException when query: ");
-            checkSQLiteException(context, e);
-            return null;
-        }
-    }
-
-    public static boolean requery(Context context, Cursor cursor) {
-        try {
-            return cursor.requery();
-        } catch (SQLiteException e) {
-            Timber.e(e, "Catch a SQLiteException when requery: ");
-            checkSQLiteException(context, e);
-            return false;
-        }
-    }
-    public static int update(Context context, ContentResolver resolver, Uri uri,
-            ContentValues values, String where, String[] selectionArgs) {
-        try {
-            return resolver.update(uri, values, where, selectionArgs);
-        } catch (SQLiteException e) {
-            Timber.e(e, "Catch a SQLiteException when update: ");
-            checkSQLiteException(context, e);
-            return -1;
-        }
-    }
-
-    public static int delete(Context context, ContentResolver resolver, Uri uri,
-            String where, String[] selectionArgs) {
-        try {
-            return resolver.delete(uri, where, selectionArgs);
-        } catch (SQLiteException e) {
-            Timber.e(e, "Catch a SQLiteException when delete: ");
-            checkSQLiteException(context, e);
-            return -1;
-        }
-    }
-
-    public static Uri insert(Context context, ContentResolver resolver,
-            Uri uri, ContentValues values) {
-        try {
-            return resolver.insert(uri, values);
-        } catch (SQLiteException e) {
-            Timber.e(e, "Catch a SQLiteException when insert: ");
-            checkSQLiteException(context, e);
-            return null;
-        }
-    }
-}
+/*
+ * Copyright (C) 2015 Jacob Klinker
+ *
+ * Licensed under the Apache License, Version 2.0 (the "License");
+ * you may not use this file except in compliance with the License.
+ * You may obtain a copy of the License at
+ *
+ * http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing, software
+ * distributed under the License is distributed on an "AS IS" BASIS,
+ * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ * See the License for the specific language governing permissions and
+ * limitations under the License.
+ */
+
+package com.google.android.mms.util_alt;
+
+import android.app.ActivityManager;
+import android.content.ContentResolver;
+import android.content.ContentValues;
+import android.content.Context;
+import android.database.Cursor;
+import android.database.sqlite.SQLiteException;
+import android.net.Uri;
+import android.widget.Toast;
+import timber.log.Timber;
+
+public final class SqliteWrapper {
+    private static final String SQLITE_EXCEPTION_DETAIL_MESSAGE
+                = "unable to open database file";
+
+    private SqliteWrapper() {
+        // Forbidden being instantiated.
+    }
+
+    // FIXME: It looks like outInfo.lowMemory does not work well as we expected.
+    // after run command: adb shell fillup -p 100, outInfo.lowMemory is still false.
+    private static boolean isLowMemory(Context context) {
+        if (null == context) {
+            return false;
+        }
+
+        ActivityManager am = (ActivityManager)
+                        context.getSystemService(Context.ACTIVITY_SERVICE);
+        ActivityManager.MemoryInfo outInfo = new ActivityManager.MemoryInfo();
+        am.getMemoryInfo(outInfo);
+
+        return outInfo.lowMemory;
+    }
+
+    // FIXME: need to optimize this method.
+    private static boolean isLowMemory(SQLiteException e) {
+        return e.getMessage().equals(SQLITE_EXCEPTION_DETAIL_MESSAGE);
+    }
+
+    public static void checkSQLiteException(Context context, SQLiteException e) {
+        if (isLowMemory(e)) {
+            Toast.makeText(context, "Low Memory",
+                    Toast.LENGTH_SHORT).show();
+        } else {
+            throw e;
+        }
+    }
+
+    public static Cursor query(Context context, ContentResolver resolver, Uri uri,
+            String[] projection, String selection, String[] selectionArgs, String sortOrder) {
+        try {
+            return resolver.query(uri, projection, selection, selectionArgs, sortOrder);
+        } catch (SQLiteException e) {
+            Timber.e(e, "Catch a SQLiteException when query: ");
+            checkSQLiteException(context, e);
+            return null;
+        }
+    }
+
+    public static boolean requery(Context context, Cursor cursor) {
+        try {
+            return cursor.requery();
+        } catch (SQLiteException e) {
+            Timber.e(e, "Catch a SQLiteException when requery: ");
+            checkSQLiteException(context, e);
+            return false;
+        }
+    }
+    public static int update(Context context, ContentResolver resolver, Uri uri,
+            ContentValues values, String where, String[] selectionArgs) {
+        try {
+            return resolver.update(uri, values, where, selectionArgs);
+        } catch (SQLiteException e) {
+            Timber.e(e, "Catch a SQLiteException when update: ");
+            checkSQLiteException(context, e);
+            return -1;
+        }
+    }
+
+    public static int delete(Context context, ContentResolver resolver, Uri uri,
+            String where, String[] selectionArgs) {
+        try {
+            return resolver.delete(uri, where, selectionArgs);
+        } catch (SQLiteException e) {
+            Timber.e(e, "Catch a SQLiteException when delete: ");
+            checkSQLiteException(context, e);
+            return -1;
+        }
+    }
+
+    public static Uri insert(Context context, ContentResolver resolver,
+            Uri uri, ContentValues values) {
+        try {
+            return resolver.insert(uri, values);
+        } catch (SQLiteException e) {
+            Timber.e(e, "Catch a SQLiteException when insert: ");
+            checkSQLiteException(context, e);
+            return null;
+        }
+    }
+}
diff --git a/android-smsmms/src/main/java/com/klinker/android/send_message/BroadcastUtils.java b/android-smsmms/src/main/java/com/klinker/android/send_message/BroadcastUtils.java
index 077d183a2..df58c8e0b 100755
--- a/android-smsmms/src/main/java/com/klinker/android/send_message/BroadcastUtils.java
+++ b/android-smsmms/src/main/java/com/klinker/android/send_message/BroadcastUtils.java
@@ -1,41 +1,41 @@
-package com.klinker.android.send_message;
-
-import android.content.Context;
-import android.content.Intent;
-import android.content.pm.ActivityInfo;
-import android.content.pm.PackageInfo;
-import android.content.pm.PackageManager;
-
-/**
- * Utility for helping with Android O changes. This means that we need to explicitly send broadcasts
- * to the correct receiver instead of implicitly. This is done by attaching the class and package
- * name to the intent based on the provided action.
- */
-public class BroadcastUtils {
-
-    public static void sendExplicitBroadcast(Context context, Intent intent, String action) {
-        addClassName(context, intent, action);
-        intent.setAction(action);
-        context.sendBroadcast(intent);
-    }
-
-    public static void addClassName(Context context, Intent intent, String action) {
-        PackageManager pm = context.getPackageManager();
-
-        try {
-            PackageInfo packageInfo =
-                    pm.getPackageInfo(context.getPackageName(), PackageManager.GET_RECEIVERS);
-
-            ActivityInfo[] receivers = packageInfo.receivers;
-            for (ActivityInfo receiver : receivers) {
-                if (receiver.taskAffinity.equals(action)) {
-                    intent.setClassName(receiver.packageName, receiver.name);
-                }
-            }
-        } catch (Exception e) {
-            e.printStackTrace();
-        }
-
-        intent.setPackage(context.getPackageName());
-    }
-}
+package com.klinker.android.send_message;
+
+import android.content.Context;
+import android.content.Intent;
+import android.content.pm.ActivityInfo;
+import android.content.pm.PackageInfo;
+import android.content.pm.PackageManager;
+
+/**
+ * Utility for helping with Android O changes. This means that we need to explicitly send broadcasts
+ * to the correct receiver instead of implicitly. This is done by attaching the class and package
+ * name to the intent based on the provided action.
+ */
+public class BroadcastUtils {
+
+    public static void sendExplicitBroadcast(Context context, Intent intent, String action) {
+        addClassName(context, intent, action);
+        intent.setAction(action);
+        context.sendBroadcast(intent);
+    }
+
+    public static void addClassName(Context context, Intent intent, String action) {
+        PackageManager pm = context.getPackageManager();
+
+        try {
+            PackageInfo packageInfo =
+                    pm.getPackageInfo(context.getPackageName(), PackageManager.GET_RECEIVERS);
+
+            ActivityInfo[] receivers = packageInfo.receivers;
+            for (ActivityInfo receiver : receivers) {
+                if (receiver.taskAffinity.equals(action)) {
+                    intent.setClassName(receiver.packageName, receiver.name);
+                }
+            }
+        } catch (Exception e) {
+            e.printStackTrace();
+        }
+
+        intent.setPackage(context.getPackageName());
+    }
+}
diff --git a/android-smsmms/src/main/java/com/klinker/android/send_message/MmsFileProvider.java b/android-smsmms/src/main/java/com/klinker/android/send_message/MmsFileProvider.java
index 1f55738b5..5af007b54 100755
--- a/android-smsmms/src/main/java/com/klinker/android/send_message/MmsFileProvider.java
+++ b/android-smsmms/src/main/java/com/klinker/android/send_message/MmsFileProvider.java
@@ -1,74 +1,74 @@
-/*
- * Copyright (C) 2015 Jacob Klinker
- *
- * Licensed under the Apache License, Version 2.0 (the "License");
- * you may not use this file except in compliance with the License.
- * You may obtain a copy of the License at
- *
- * http://www.apache.org/licenses/LICENSE-2.0
- *
- * Unless required by applicable law or agreed to in writing, software
- * distributed under the License is distributed on an "AS IS" BASIS,
- * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
- * See the License for the specific language governing permissions and
- * limitations under the License.
- */
-
-package com.klinker.android.send_message;
-
-import android.content.ContentProvider;
-import android.content.ContentValues;
-import android.database.Cursor;
-import android.net.Uri;
-import android.os.ParcelFileDescriptor;
-import android.text.TextUtils;
-
-import java.io.File;
-import java.io.FileNotFoundException;
-
-public class MmsFileProvider extends ContentProvider {
-    @Override
-    public boolean onCreate() {
-        return true;
-    }
-
-    @Override
-    public Cursor query(Uri uri, String[] projection, String selection, String[] selectionArgs, String sortOrder) {
-        // Don't support queries.
-        return null;
-    }
-
-    @Override
-    public Uri insert(Uri uri, ContentValues values) {
-        // Don't support inserts.
-        return null;
-    }
-
-    @Override
-    public int delete(Uri uri, String selection, String[] selectionArgs) {
-        // Don't support deletes.
-        return 0;
-    }
-
-    @Override
-    public int update(Uri uri, ContentValues values, String selection, String[] selectionArgs) {
-        // Don't support updates.
-        return 0;
-    }
-
-    @Override
-    public String getType(Uri uri) {
-        // For this sample, assume all files have no type.
-        return null;
-    }
-
-    @Override
-    public ParcelFileDescriptor openFile(Uri uri, String fileMode) throws FileNotFoundException {
-        File file = new File(getContext().getCacheDir(), uri.getPath());
-        int mode = (TextUtils.equals(fileMode, "r") ? ParcelFileDescriptor.MODE_READ_ONLY :
-                ParcelFileDescriptor.MODE_WRITE_ONLY
-                        |ParcelFileDescriptor.MODE_TRUNCATE
-                        |ParcelFileDescriptor.MODE_CREATE);
-        return ParcelFileDescriptor.open(file, mode);
-    }
+/*
+ * Copyright (C) 2015 Jacob Klinker
+ *
+ * Licensed under the Apache License, Version 2.0 (the "License");
+ * you may not use this file except in compliance with the License.
+ * You may obtain a copy of the License at
+ *
+ * http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing, software
+ * distributed under the License is distributed on an "AS IS" BASIS,
+ * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ * See the License for the specific language governing permissions and
+ * limitations under the License.
+ */
+
+package com.klinker.android.send_message;
+
+import android.content.ContentProvider;
+import android.content.ContentValues;
+import android.database.Cursor;
+import android.net.Uri;
+import android.os.ParcelFileDescriptor;
+import android.text.TextUtils;
+
+import java.io.File;
+import java.io.FileNotFoundException;
+
+public class MmsFileProvider extends ContentProvider {
+    @Override
+    public boolean onCreate() {
+        return true;
+    }
+
+    @Override
+    public Cursor query(Uri uri, String[] projection, String selection, String[] selectionArgs, String sortOrder) {
+        // Don't support queries.
+        return null;
+    }
+
+    @Override
+    public Uri insert(Uri uri, ContentValues values) {
+        // Don't support inserts.
+        return null;
+    }
+
+    @Override
+    public int delete(Uri uri, String selection, String[] selectionArgs) {
+        // Don't support deletes.
+        return 0;
+    }
+
+    @Override
+    public int update(Uri uri, ContentValues values, String selection, String[] selectionArgs) {
+        // Don't support updates.
+        return 0;
+    }
+
+    @Override
+    public String getType(Uri uri) {
+        // For this sample, assume all files have no type.
+        return null;
+    }
+
+    @Override
+    public ParcelFileDescriptor openFile(Uri uri, String fileMode) throws FileNotFoundException {
+        File file = new File(getContext().getCacheDir(), uri.getPath());
+        int mode = (TextUtils.equals(fileMode, "r") ? ParcelFileDescriptor.MODE_READ_ONLY :
+                ParcelFileDescriptor.MODE_WRITE_ONLY
+                        |ParcelFileDescriptor.MODE_TRUNCATE
+                        |ParcelFileDescriptor.MODE_CREATE);
+        return ParcelFileDescriptor.open(file, mode);
+    }
 }
\ No newline at end of file
diff --git a/android-smsmms/src/main/java/com/klinker/android/send_message/MmsReceivedReceiver.java b/android-smsmms/src/main/java/com/klinker/android/send_message/MmsReceivedReceiver.java
index b8da3699a..b19f909e0 100755
--- a/android-smsmms/src/main/java/com/klinker/android/send_message/MmsReceivedReceiver.java
+++ b/android-smsmms/src/main/java/com/klinker/android/send_message/MmsReceivedReceiver.java
@@ -1,369 +1,369 @@
-/*
- * Copyright (C) 2015 Jacob Klinker
- *
- * Licensed under the Apache License, Version 2.0 (the "License");
- * you may not use this file except in compliance with the License.
- * You may obtain a copy of the License at
- *
- * http://www.apache.org/licenses/LICENSE-2.0
- *
- * Unless required by applicable law or agreed to in writing, software
- * distributed under the License is distributed on an "AS IS" BASIS,
- * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
- * See the License for the specific language governing permissions and
- * limitations under the License.
- */
-
-package com.klinker.android.send_message;
-
-import android.content.BroadcastReceiver;
-import android.content.Context;
-import android.content.Intent;
-import android.net.Uri;
-import android.os.AsyncTask;
-import android.provider.Telephony;
-import android.telephony.SmsManager;
-import com.android.mms.service_alt.DownloadRequest;
-import com.android.mms.service_alt.MmsConfig;
-import com.android.mms.transaction.DownloadManager;
-import com.android.mms.transaction.HttpUtils;
-import com.android.mms.transaction.TransactionSettings;
-import com.android.mms.util.SendingProgressTokenManager;
-import com.google.android.mms.MmsException;
-import com.google.android.mms.pdu_alt.EncodedStringValue;
-import com.google.android.mms.pdu_alt.GenericPdu;
-import com.google.android.mms.pdu_alt.NotificationInd;
-import com.google.android.mms.pdu_alt.NotifyRespInd;
-import com.google.android.mms.pdu_alt.PduComposer;
-import com.google.android.mms.pdu_alt.PduHeaders;
-import com.google.android.mms.pdu_alt.PduParser;
-import com.google.android.mms.pdu_alt.PduPersister;
-import com.google.android.mms.pdu_alt.RetrieveConf;
-import com.google.android.mms.util_alt.SqliteWrapper;
-import timber.log.Timber;
-
-import java.io.File;
-import java.io.FileInputStream;
-import java.io.FileNotFoundException;
-import java.io.IOException;
-import java.util.ArrayList;
-import java.util.List;
-import java.util.concurrent.ExecutorService;
-import java.util.concurrent.Executors;
-
-import static com.google.android.mms.pdu_alt.PduHeaders.STATUS_RETRIEVED;
-
-public class MmsReceivedReceiver extends BroadcastReceiver {
-    public static final String MMS_RECEIVED = "com.klinker.android.messaging.MMS_RECEIVED";
-    public static final String EXTRA_FILE_PATH = "file_path";
-    public static final String EXTRA_LOCATION_URL = "location_url";
-    public static final String EXTRA_TRIGGER_PUSH = "trigger_push";
-    public static final String EXTRA_URI = "notification_ind_uri";
-
-    private static final String LOCATION_SELECTION =
-            Telephony.Mms.MESSAGE_TYPE + "=? AND " + Telephony.Mms.CONTENT_LOCATION + " =?";
-
-    private static final ExecutorService RECEIVE_NOTIFICATION_EXECUTOR = Executors.newSingleThreadExecutor();
-
-    public MmscInformation getMmscInfoForReceptionAck() {
-        // Override this and provide the MMSC to send the ACK to.
-        // some carriers will download duplicate MMS messages without this ACK. When using the
-        // system sending method, apparently Google does not do this for us. Not sure why.
-        // You might have to have users manually enter their APN settings if you cannot get them
-        // from the system somehow.
-
-        return null;
-    }
-
-    @Override
-    public void onReceive(Context context, Intent intent) {
-        Timber.v("MMS has finished downloading, persisting it to the database");
-
-        String path = intent.getStringExtra(EXTRA_FILE_PATH);
-        Timber.v(path);
-
-        FileInputStream reader = null;
-        Uri messageUri = null;
-        String errorMessage = null;
-
-        try {
-            File mDownloadFile = new File(path);
-            final int nBytes = (int) mDownloadFile.length();
-            reader = new FileInputStream(mDownloadFile);
-            final byte[] response = new byte[nBytes];
-            reader.read(response, 0, nBytes);
-
-            List<CommonAsyncTask> tasks = getNotificationTask(context, intent, response);
-
-            messageUri = DownloadRequest.persist(context, response,
-                    new MmsConfig.Overridden(new MmsConfig(context), null),
-                    intent.getStringExtra(EXTRA_LOCATION_URL),
-                    Utils.getDefaultSubscriptionId(), null);
-
-            Timber.v("response saved successfully");
-            Timber.v("response length: " + response.length);
-            mDownloadFile.delete();
-
-            if (tasks != null) {
-                Timber.v("running the common async notifier for download");
-                for (CommonAsyncTask task : tasks)
-                    task.executeOnExecutor(RECEIVE_NOTIFICATION_EXECUTOR);
-            }
-        } catch (FileNotFoundException e) {
-            errorMessage = "MMS received, file not found exception";
-            Timber.e(e, errorMessage);
-        } catch (IOException e) {
-            errorMessage = "MMS received, io exception";
-            Timber.e(e, errorMessage);
-        } finally {
-            if (reader != null) {
-                try {
-                    reader.close();
-                } catch (IOException e) {
-                    errorMessage = "MMS received, io exception";
-                    Timber.e(e, "MMS received, io exception");
-                }
-            }
-        }
-
-        handleHttpError(context, intent);
-        DownloadManager.finishDownload(intent.getStringExtra(EXTRA_LOCATION_URL));
-
-        if (messageUri != null) {
-            onMessageReceived(messageUri);
-        }
-
-        if (errorMessage != null) {
-            onError(errorMessage);
-        }
-    }
-
-    protected void onMessageReceived(Uri messageUri) {
-        // Override this in a custom receiver, if you want access to the message, outside of the
-        // internal SMS/MMS database
-    }
-
-    protected void onError(String error) {
-
-    }
-
-    private void handleHttpError(Context context, Intent intent) {
-        final int httpError = intent.getIntExtra(SmsManager.EXTRA_MMS_HTTP_STATUS, 0);
-        if (httpError == 404 ||
-                httpError == 400) {
-            // Delete the corresponding NotificationInd
-            SqliteWrapper.delete(context,
-                    context.getContentResolver(),
-                    Telephony.Mms.CONTENT_URI,
-                    LOCATION_SELECTION,
-                    new String[]{
-                            Integer.toString(PduHeaders.MESSAGE_TYPE_NOTIFICATION_IND),
-                            intent.getStringExtra(EXTRA_LOCATION_URL)
-                    });
-        }
-    }
-
-    private static NotificationInd getNotificationInd(Context context, Intent intent) throws MmsException {
-        return (NotificationInd) PduPersister.getPduPersister(context).load((Uri) intent.getParcelableExtra(EXTRA_URI));
-    }
-
-    private static abstract class CommonAsyncTask extends AsyncTask<Void, Void, Void> {
-        protected final Context mContext;
-        protected final TransactionSettings mTransactionSettings;
-        final NotificationInd mNotificationInd;
-        final String mContentLocation;
-
-        CommonAsyncTask(Context context, TransactionSettings settings, NotificationInd ind) {
-            mContext = context;
-            mTransactionSettings = settings;
-            mNotificationInd = ind;
-            mContentLocation = new String(ind.getContentLocation());
-        }
-
-        /**
-         * A common method to send a PDU to MMSC.
-         *
-         * @param pdu A byte array which contains the data of the PDU.
-         * @param mmscUrl Url of the recipient MMSC.
-         * @return A byte array which contains the response data.
-         *         If an HTTP error code is returned, an IOException will be thrown.
-         * @throws java.io.IOException if any error occurred on network interface or
-         *         an HTTP error code(>=400) returned from the server.
-         * @throws com.google.android.mms.MmsException if pdu is null.
-         */
-        byte[] sendPdu(byte[] pdu, String mmscUrl) throws IOException, MmsException {
-            return sendPdu(SendingProgressTokenManager.NO_TOKEN, pdu, mmscUrl);
-        }
-
-        /**
-         * A common method to send a PDU to MMSC.
-         *
-         * @param pdu A byte array which contains the data of the PDU.
-         * @return A byte array which contains the response data.
-         *         If an HTTP error code is returned, an IOException will be thrown.
-         * @throws java.io.IOException if any error occurred on network interface or
-         *         an HTTP error code(>=400) returned from the server.
-         * @throws com.google.android.mms.MmsException if pdu is null.
-         */
-        byte[] sendPdu(byte[] pdu) throws IOException, MmsException {
-            return sendPdu(SendingProgressTokenManager.NO_TOKEN, pdu,
-                    mTransactionSettings.getMmscUrl());
-        }
-
-        /**
-         * A common method to send a PDU to MMSC.
-         *
-         * @param token The token to identify the sending progress.
-         * @param pdu A byte array which contains the data of the PDU.
-         * @param mmscUrl Url of the recipient MMSC.
-         * @return A byte array which contains the response data.
-         *         If an HTTP error code is returned, an IOException will be thrown.
-         * @throws java.io.IOException if any error occurred on network interface or
-         *         an HTTP error code(>=400) returned from the server.
-         * @throws com.google.android.mms.MmsException if pdu is null.
-         */
-        private byte[] sendPdu(long token, byte[] pdu,
-                       String mmscUrl) throws IOException, MmsException {
-            if (pdu == null) {
-                throw new MmsException();
-            }
-
-            if (mmscUrl == null) {
-                throw new IOException("Cannot establish route: mmscUrl is null");
-            }
-
-            if (com.android.mms.transaction.Transaction.useWifi(mContext)) {
-                return HttpUtils.httpConnection(
-                        mContext, token,
-                        mmscUrl,
-                        pdu, HttpUtils.HTTP_POST_METHOD,
-                        false, null, 0);
-            }
-
-            Utils.ensureRouteToHost(mContext, mmscUrl, mTransactionSettings.getProxyAddress());
-            return HttpUtils.httpConnection(
-                    mContext, token,
-                    mmscUrl,
-                    pdu, HttpUtils.HTTP_POST_METHOD,
-                    mTransactionSettings.isProxySet(),
-                    mTransactionSettings.getProxyAddress(),
-                    mTransactionSettings.getProxyPort());
-        }
-    }
-
-    private static class NotifyRespTask extends CommonAsyncTask {
-        NotifyRespTask(Context context, NotificationInd ind, TransactionSettings settings) {
-            super(context, settings, ind);
-        }
-
-        @Override
-        protected Void doInBackground(Void... params) {
-            // Create the M-NotifyResp.ind
-            NotifyRespInd notifyRespInd;
-            try {
-                notifyRespInd = new NotifyRespInd(
-                        PduHeaders.CURRENT_MMS_VERSION,
-                        mNotificationInd.getTransactionId(),
-                        STATUS_RETRIEVED);
-
-                // Pack M-NotifyResp.ind and send it
-                if(com.android.mms.MmsConfig.getNotifyWapMMSC()) {
-                    sendPdu(new PduComposer(mContext, notifyRespInd).make(), mContentLocation);
-                } else {
-                    sendPdu(new PduComposer(mContext, notifyRespInd).make());
-                }
-            } catch (MmsException | IOException e) {
-                Timber.e(e, "error");
-            }
-            return null;
-        }
-    }
-
-    private static class AcknowledgeIndTask extends CommonAsyncTask {
-        private final RetrieveConf mRetrieveConf;
-
-        AcknowledgeIndTask(Context context, NotificationInd ind, TransactionSettings settings, RetrieveConf rc) {
-            super(context, settings, ind);
-            mRetrieveConf = rc;
-        }
-
-        @Override
-        protected Void doInBackground(Void... params) {
-            // Send M-Acknowledge.ind to MMSC if required.
-            // If the Transaction-ID isn't set in the M-Retrieve.conf, it means
-            // the MMS proxy-relay doesn't require an ACK.
-            byte[] tranId = mRetrieveConf.getTransactionId();
-            if (tranId != null) {
-                Timber.v("sending ACK to MMSC: " + mTransactionSettings.getMmscUrl());
-                // Create M-Acknowledge.ind
-                com.google.android.mms.pdu_alt.AcknowledgeInd acknowledgeInd;
-
-                try {
-                    acknowledgeInd = new com.google.android.mms.pdu_alt.AcknowledgeInd(
-                            PduHeaders.CURRENT_MMS_VERSION, tranId);
-
-                    // insert the 'from' address per spec
-                    String lineNumber = Utils.getMyPhoneNumber(mContext);
-                    acknowledgeInd.setFrom(new EncodedStringValue(lineNumber));
-
-                    // Pack M-Acknowledge.ind and send it
-                    if(com.android.mms.MmsConfig.getNotifyWapMMSC()) {
-                        sendPdu(new PduComposer(mContext, acknowledgeInd).make(), mContentLocation);
-                    } else {
-                        sendPdu(new PduComposer(mContext, acknowledgeInd).make());
-                    }
-                } catch (IOException | MmsException e) {
-                    Timber.e(e, "error");
-                }
-            }
-            return null;
-        }
-    }
-
-    private List<CommonAsyncTask> getNotificationTask(Context context, Intent intent, byte[] response) {
-        if (response.length == 0) {
-            Timber.v("MmsReceivedReceiver.sendNotification blank response");
-            return null;
-        }
-
-        if (getMmscInfoForReceptionAck() == null) {
-            Timber.v("No MMSC information set, so no notification tasks will be able to complete");
-            return null;
-        }
-
-        final GenericPdu pdu =
-                (new PduParser(response, new MmsConfig.Overridden(new MmsConfig(context), null).
-                        getSupportMmsContentDisposition())).parse();
-        if (pdu == null || !(pdu instanceof RetrieveConf)) {
-            Timber.e("MmsReceivedReceiver.sendNotification failed to parse pdu");
-            return null;
-        }
-
-        try {
-            final NotificationInd ind = getNotificationInd(context, intent);
-            final MmscInformation mmsc = getMmscInfoForReceptionAck();
-            final TransactionSettings transactionSettings = new TransactionSettings(mmsc.mmscUrl, mmsc.mmsProxy, mmsc.proxyPort);
-
-            final List<CommonAsyncTask> responseTasks = new ArrayList<>();
-            responseTasks.add(new AcknowledgeIndTask(context, ind, transactionSettings, (RetrieveConf) pdu));
-            responseTasks.add(new NotifyRespTask(context, ind, transactionSettings));
-
-            return responseTasks;
-        } catch (MmsException e) {
-            Timber.e(e, "error");
-            return null;
-        }
-    }
-
-    public static class MmscInformation {
-        String mmscUrl;
-        String mmsProxy;
-        int proxyPort;
-
-        public MmscInformation(String mmscUrl, String mmsProxy, int proxyPort) {
-            this.mmscUrl = mmscUrl;
-            this.mmsProxy = mmsProxy;
-            this.proxyPort = proxyPort;
-        }
-    }
-}
+/*
+ * Copyright (C) 2015 Jacob Klinker
+ *
+ * Licensed under the Apache License, Version 2.0 (the "License");
+ * you may not use this file except in compliance with the License.
+ * You may obtain a copy of the License at
+ *
+ * http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing, software
+ * distributed under the License is distributed on an "AS IS" BASIS,
+ * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ * See the License for the specific language governing permissions and
+ * limitations under the License.
+ */
+
+package com.klinker.android.send_message;
+
+import android.content.BroadcastReceiver;
+import android.content.Context;
+import android.content.Intent;
+import android.net.Uri;
+import android.os.AsyncTask;
+import android.provider.Telephony;
+import android.telephony.SmsManager;
+import com.android.mms.service_alt.DownloadRequest;
+import com.android.mms.service_alt.MmsConfig;
+import com.android.mms.transaction.DownloadManager;
+import com.android.mms.transaction.HttpUtils;
+import com.android.mms.transaction.TransactionSettings;
+import com.android.mms.util.SendingProgressTokenManager;
+import com.google.android.mms.MmsException;
+import com.google.android.mms.pdu_alt.EncodedStringValue;
+import com.google.android.mms.pdu_alt.GenericPdu;
+import com.google.android.mms.pdu_alt.NotificationInd;
+import com.google.android.mms.pdu_alt.NotifyRespInd;
+import com.google.android.mms.pdu_alt.PduComposer;
+import com.google.android.mms.pdu_alt.PduHeaders;
+import com.google.android.mms.pdu_alt.PduParser;
+import com.google.android.mms.pdu_alt.PduPersister;
+import com.google.android.mms.pdu_alt.RetrieveConf;
+import com.google.android.mms.util_alt.SqliteWrapper;
+import timber.log.Timber;
+
+import java.io.File;
+import java.io.FileInputStream;
+import java.io.FileNotFoundException;
+import java.io.IOException;
+import java.util.ArrayList;
+import java.util.List;
+import java.util.concurrent.ExecutorService;
+import java.util.concurrent.Executors;
+
+import static com.google.android.mms.pdu_alt.PduHeaders.STATUS_RETRIEVED;
+
+public class MmsReceivedReceiver extends BroadcastReceiver {
+    public static final String MMS_RECEIVED = "com.klinker.android.messaging.MMS_RECEIVED";
+    public static final String EXTRA_FILE_PATH = "file_path";
+    public static final String EXTRA_LOCATION_URL = "location_url";
+    public static final String EXTRA_TRIGGER_PUSH = "trigger_push";
+    public static final String EXTRA_URI = "notification_ind_uri";
+
+    private static final String LOCATION_SELECTION =
+            Telephony.Mms.MESSAGE_TYPE + "=? AND " + Telephony.Mms.CONTENT_LOCATION + " =?";
+
+    private static final ExecutorService RECEIVE_NOTIFICATION_EXECUTOR = Executors.newSingleThreadExecutor();
+
+    public MmscInformation getMmscInfoForReceptionAck() {
+        // Override this and provide the MMSC to send the ACK to.
+        // some carriers will download duplicate MMS messages without this ACK. When using the
+        // system sending method, apparently Google does not do this for us. Not sure why.
+        // You might have to have users manually enter their APN settings if you cannot get them
+        // from the system somehow.
+
+        return null;
+    }
+
+    @Override
+    public void onReceive(Context context, Intent intent) {
+        Timber.v("MMS has finished downloading, persisting it to the database");
+
+        String path = intent.getStringExtra(EXTRA_FILE_PATH);
+        Timber.v(path);
+
+        FileInputStream reader = null;
+        Uri messageUri = null;
+        String errorMessage = null;
+
+        try {
+            File mDownloadFile = new File(path);
+            final int nBytes = (int) mDownloadFile.length();
+            reader = new FileInputStream(mDownloadFile);
+            final byte[] response = new byte[nBytes];
+            reader.read(response, 0, nBytes);
+
+            List<CommonAsyncTask> tasks = getNotificationTask(context, intent, response);
+
+            messageUri = DownloadRequest.persist(context, response,
+                    new MmsConfig.Overridden(new MmsConfig(context), null),
+                    intent.getStringExtra(EXTRA_LOCATION_URL),
+                    Utils.getDefaultSubscriptionId(), null);
+
+            Timber.v("response saved successfully");
+            Timber.v("response length: " + response.length);
+            mDownloadFile.delete();
+
+            if (tasks != null) {
+                Timber.v("running the common async notifier for download");
+                for (CommonAsyncTask task : tasks)
+                    task.executeOnExecutor(RECEIVE_NOTIFICATION_EXECUTOR);
+            }
+        } catch (FileNotFoundException e) {
+            errorMessage = "MMS received, file not found exception";
+            Timber.e(e, errorMessage);
+        } catch (IOException e) {
+            errorMessage = "MMS received, io exception";
+            Timber.e(e, errorMessage);
+        } finally {
+            if (reader != null) {
+                try {
+                    reader.close();
+                } catch (IOException e) {
+                    errorMessage = "MMS received, io exception";
+                    Timber.e(e, "MMS received, io exception");
+                }
+            }
+        }
+
+        handleHttpError(context, intent);
+        DownloadManager.finishDownload(intent.getStringExtra(EXTRA_LOCATION_URL));
+
+        if (messageUri != null) {
+            onMessageReceived(messageUri);
+        }
+
+        if (errorMessage != null) {
+            onError(errorMessage);
+        }
+    }
+
+    protected void onMessageReceived(Uri messageUri) {
+        // Override this in a custom receiver, if you want access to the message, outside of the
+        // internal SMS/MMS database
+    }
+
+    protected void onError(String error) {
+
+    }
+
+    private void handleHttpError(Context context, Intent intent) {
+        final int httpError = intent.getIntExtra(SmsManager.EXTRA_MMS_HTTP_STATUS, 0);
+        if (httpError == 404 ||
+                httpError == 400) {
+            // Delete the corresponding NotificationInd
+            SqliteWrapper.delete(context,
+                    context.getContentResolver(),
+                    Telephony.Mms.CONTENT_URI,
+                    LOCATION_SELECTION,
+                    new String[]{
+                            Integer.toString(PduHeaders.MESSAGE_TYPE_NOTIFICATION_IND),
+                            intent.getStringExtra(EXTRA_LOCATION_URL)
+                    });
+        }
+    }
+
+    private static NotificationInd getNotificationInd(Context context, Intent intent) throws MmsException {
+        return (NotificationInd) PduPersister.getPduPersister(context).load((Uri) intent.getParcelableExtra(EXTRA_URI));
+    }
+
+    private static abstract class CommonAsyncTask extends AsyncTask<Void, Void, Void> {
+        protected final Context mContext;
+        protected final TransactionSettings mTransactionSettings;
+        final NotificationInd mNotificationInd;
+        final String mContentLocation;
+
+        CommonAsyncTask(Context context, TransactionSettings settings, NotificationInd ind) {
+            mContext = context;
+            mTransactionSettings = settings;
+            mNotificationInd = ind;
+            mContentLocation = new String(ind.getContentLocation());
+        }
+
+        /**
+         * A common method to send a PDU to MMSC.
+         *
+         * @param pdu A byte array which contains the data of the PDU.
+         * @param mmscUrl Url of the recipient MMSC.
+         * @return A byte array which contains the response data.
+         *         If an HTTP error code is returned, an IOException will be thrown.
+         * @throws java.io.IOException if any error occurred on network interface or
+         *         an HTTP error code(>=400) returned from the server.
+         * @throws com.google.android.mms.MmsException if pdu is null.
+         */
+        byte[] sendPdu(byte[] pdu, String mmscUrl) throws IOException, MmsException {
+            return sendPdu(SendingProgressTokenManager.NO_TOKEN, pdu, mmscUrl);
+        }
+
+        /**
+         * A common method to send a PDU to MMSC.
+         *
+         * @param pdu A byte array which contains the data of the PDU.
+         * @return A byte array which contains the response data.
+         *         If an HTTP error code is returned, an IOException will be thrown.
+         * @throws java.io.IOException if any error occurred on network interface or
+         *         an HTTP error code(>=400) returned from the server.
+         * @throws com.google.android.mms.MmsException if pdu is null.
+         */
+        byte[] sendPdu(byte[] pdu) throws IOException, MmsException {
+            return sendPdu(SendingProgressTokenManager.NO_TOKEN, pdu,
+                    mTransactionSettings.getMmscUrl());
+        }
+
+        /**
+         * A common method to send a PDU to MMSC.
+         *
+         * @param token The token to identify the sending progress.
+         * @param pdu A byte array which contains the data of the PDU.
+         * @param mmscUrl Url of the recipient MMSC.
+         * @return A byte array which contains the response data.
+         *         If an HTTP error code is returned, an IOException will be thrown.
+         * @throws java.io.IOException if any error occurred on network interface or
+         *         an HTTP error code(>=400) returned from the server.
+         * @throws com.google.android.mms.MmsException if pdu is null.
+         */
+        private byte[] sendPdu(long token, byte[] pdu,
+                       String mmscUrl) throws IOException, MmsException {
+            if (pdu == null) {
+                throw new MmsException();
+            }
+
+            if (mmscUrl == null) {
+                throw new IOException("Cannot establish route: mmscUrl is null");
+            }
+
+            if (com.android.mms.transaction.Transaction.useWifi(mContext)) {
+                return HttpUtils.httpConnection(
+                        mContext, token,
+                        mmscUrl,
+                        pdu, HttpUtils.HTTP_POST_METHOD,
+                        false, null, 0);
+            }
+
+            Utils.ensureRouteToHost(mContext, mmscUrl, mTransactionSettings.getProxyAddress());
+            return HttpUtils.httpConnection(
+                    mContext, token,
+                    mmscUrl,
+                    pdu, HttpUtils.HTTP_POST_METHOD,
+                    mTransactionSettings.isProxySet(),
+                    mTransactionSettings.getProxyAddress(),
+                    mTransactionSettings.getProxyPort());
+        }
+    }
+
+    private static class NotifyRespTask extends CommonAsyncTask {
+        NotifyRespTask(Context context, NotificationInd ind, TransactionSettings settings) {
+            super(context, settings, ind);
+        }
+
+        @Override
+        protected Void doInBackground(Void... params) {
+            // Create the M-NotifyResp.ind
+            NotifyRespInd notifyRespInd;
+            try {
+                notifyRespInd = new NotifyRespInd(
+                        PduHeaders.CURRENT_MMS_VERSION,
+                        mNotificationInd.getTransactionId(),
+                        STATUS_RETRIEVED);
+
+                // Pack M-NotifyResp.ind and send it
+                if(com.android.mms.MmsConfig.getNotifyWapMMSC()) {
+                    sendPdu(new PduComposer(mContext, notifyRespInd).make(), mContentLocation);
+                } else {
+                    sendPdu(new PduComposer(mContext, notifyRespInd).make());
+                }
+            } catch (MmsException | IOException e) {
+                Timber.e(e, "error");
+            }
+            return null;
+        }
+    }
+
+    private static class AcknowledgeIndTask extends CommonAsyncTask {
+        private final RetrieveConf mRetrieveConf;
+
+        AcknowledgeIndTask(Context context, NotificationInd ind, TransactionSettings settings, RetrieveConf rc) {
+            super(context, settings, ind);
+            mRetrieveConf = rc;
+        }
+
+        @Override
+        protected Void doInBackground(Void... params) {
+            // Send M-Acknowledge.ind to MMSC if required.
+            // If the Transaction-ID isn't set in the M-Retrieve.conf, it means
+            // the MMS proxy-relay doesn't require an ACK.
+            byte[] tranId = mRetrieveConf.getTransactionId();
+            if (tranId != null) {
+                Timber.v("sending ACK to MMSC: " + mTransactionSettings.getMmscUrl());
+                // Create M-Acknowledge.ind
+                com.google.android.mms.pdu_alt.AcknowledgeInd acknowledgeInd;
+
+                try {
+                    acknowledgeInd = new com.google.android.mms.pdu_alt.AcknowledgeInd(
+                            PduHeaders.CURRENT_MMS_VERSION, tranId);
+
+                    // insert the 'from' address per spec
+                    String lineNumber = Utils.getMyPhoneNumber(mContext);
+                    acknowledgeInd.setFrom(new EncodedStringValue(lineNumber));
+
+                    // Pack M-Acknowledge.ind and send it
+                    if(com.android.mms.MmsConfig.getNotifyWapMMSC()) {
+                        sendPdu(new PduComposer(mContext, acknowledgeInd).make(), mContentLocation);
+                    } else {
+                        sendPdu(new PduComposer(mContext, acknowledgeInd).make());
+                    }
+                } catch (IOException | MmsException e) {
+                    Timber.e(e, "error");
+                }
+            }
+            return null;
+        }
+    }
+
+    private List<CommonAsyncTask> getNotificationTask(Context context, Intent intent, byte[] response) {
+        if (response.length == 0) {
+            Timber.v("MmsReceivedReceiver.sendNotification blank response");
+            return null;
+        }
+
+        if (getMmscInfoForReceptionAck() == null) {
+            Timber.v("No MMSC information set, so no notification tasks will be able to complete");
+            return null;
+        }
+
+        final GenericPdu pdu =
+                (new PduParser(response, new MmsConfig.Overridden(new MmsConfig(context), null).
+                        getSupportMmsContentDisposition())).parse();
+        if (pdu == null || !(pdu instanceof RetrieveConf)) {
+            Timber.e("MmsReceivedReceiver.sendNotification failed to parse pdu");
+            return null;
+        }
+
+        try {
+            final NotificationInd ind = getNotificationInd(context, intent);
+            final MmscInformation mmsc = getMmscInfoForReceptionAck();
+            final TransactionSettings transactionSettings = new TransactionSettings(mmsc.mmscUrl, mmsc.mmsProxy, mmsc.proxyPort);
+
+            final List<CommonAsyncTask> responseTasks = new ArrayList<>();
+            responseTasks.add(new AcknowledgeIndTask(context, ind, transactionSettings, (RetrieveConf) pdu));
+            responseTasks.add(new NotifyRespTask(context, ind, transactionSettings));
+
+            return responseTasks;
+        } catch (MmsException e) {
+            Timber.e(e, "error");
+            return null;
+        }
+    }
+
+    public static class MmscInformation {
+        String mmscUrl;
+        String mmsProxy;
+        int proxyPort;
+
+        public MmscInformation(String mmscUrl, String mmsProxy, int proxyPort) {
+            this.mmscUrl = mmscUrl;
+            this.mmsProxy = mmsProxy;
+            this.proxyPort = proxyPort;
+        }
+    }
+}
diff --git a/android-smsmms/src/main/java/com/klinker/android/send_message/Settings.kt b/android-smsmms/src/main/java/com/klinker/android/send_message/Settings.kt
index 73fcb3a73..b195e2dbf 100755
--- a/android-smsmms/src/main/java/com/klinker/android/send_message/Settings.kt
+++ b/android-smsmms/src/main/java/com/klinker/android/send_message/Settings.kt
@@ -1,32 +1,32 @@
-/*
- * Copyright 2013 Jacob Klinker
- *
- * Licensed under the Apache License, Version 2.0 (the "License");
- * you may not use this file except in compliance with the License.
- * You may obtain a copy of the License at
- *
- *      http://www.apache.org/licenses/LICENSE-2.0
- *
- * Unless required by applicable law or agreed to in writing, software
- * distributed under the License is distributed on an "AS IS" BASIS,
- * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
- * See the License for the specific language governing permissions and
- * limitations under the License.
- */
-
-package com.klinker.android.send_message
-
-/**
- * Class to house all of the settings that can be used to send a message
- */
-class Settings @JvmOverloads constructor(
-        // MMS options
-        var mmsc: String? = "",
-        var proxy: String? = "",
-        var port: String? = "0",
-        var agent: String? = "",
-        var userProfileUrl: String? = "",
-        var uaProfTagName: String? = "",
-
-        // SMS options
-        var stripUnicode: Boolean = false)
+/*
+ * Copyright 2013 Jacob Klinker
+ *
+ * Licensed under the Apache License, Version 2.0 (the "License");
+ * you may not use this file except in compliance with the License.
+ * You may obtain a copy of the License at
+ *
+ *      http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing, software
+ * distributed under the License is distributed on an "AS IS" BASIS,
+ * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ * See the License for the specific language governing permissions and
+ * limitations under the License.
+ */
+
+package com.klinker.android.send_message
+
+/**
+ * Class to house all of the settings that can be used to send a message
+ */
+class Settings @JvmOverloads constructor(
+        // MMS options
+        var mmsc: String? = "",
+        var proxy: String? = "",
+        var port: String? = "0",
+        var agent: String? = "",
+        var userProfileUrl: String? = "",
+        var uaProfTagName: String? = "",
+
+        // SMS options
+        var stripUnicode: Boolean = false)
diff --git a/android-smsmms/src/main/java/com/klinker/android/send_message/SmsManagerFactory.kt b/android-smsmms/src/main/java/com/klinker/android/send_message/SmsManagerFactory.kt
index 10d078e43..9b3baff29 100755
--- a/android-smsmms/src/main/java/com/klinker/android/send_message/SmsManagerFactory.kt
+++ b/android-smsmms/src/main/java/com/klinker/android/send_message/SmsManagerFactory.kt
@@ -1,21 +1,21 @@
-package com.klinker.android.send_message
-
-import android.os.Build
-import android.telephony.SmsManager
-
-object SmsManagerFactory {
-
-    fun createSmsManager(subscriptionId: Int): SmsManager {
-        var manager: SmsManager? = null
-
-        if (subscriptionId != -1 && Build.VERSION.SDK_INT >= 22) {
-            try {
-                manager = SmsManager.getSmsManagerForSubscriptionId(subscriptionId)
-            } catch (e: Exception) {
-                e.printStackTrace()
-            }
-        }
-
-        return manager ?: SmsManager.getDefault()
-    }
-}
+package com.klinker.android.send_message
+
+import android.os.Build
+import android.telephony.SmsManager
+
+object SmsManagerFactory {
+
+    fun createSmsManager(subscriptionId: Int): SmsManager {
+        var manager: SmsManager? = null
+
+        if (subscriptionId != -1 && Build.VERSION.SDK_INT >= 22) {
+            try {
+                manager = SmsManager.getSmsManagerForSubscriptionId(subscriptionId)
+            } catch (e: Exception) {
+                e.printStackTrace()
+            }
+        }
+
+        return manager ?: SmsManager.getDefault()
+    }
+}
diff --git a/android-smsmms/src/main/java/com/klinker/android/send_message/StripAccents.java b/android-smsmms/src/main/java/com/klinker/android/send_message/StripAccents.java
index cbfa7267f..cfb2c6f4e 100755
--- a/android-smsmms/src/main/java/com/klinker/android/send_message/StripAccents.java
+++ b/android-smsmms/src/main/java/com/klinker/android/send_message/StripAccents.java
@@ -1,48 +1,48 @@
-/*
- * Copyright 2013 Jacob Klinker
- *
- * Licensed under the Apache License, Version 2.0 (the "License");
- * you may not use this file except in compliance with the License.
- * You may obtain a copy of the License at
- *
- *      http://www.apache.org/licenses/LICENSE-2.0
- *
- * Unless required by applicable law or agreed to in writing, software
- * distributed under the License is distributed on an "AS IS" BASIS,
- * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
- * See the License for the specific language governing permissions and
- * limitations under the License.
- */
-
-package com.klinker.android.send_message;
-
-import android.telephony.SmsMessage;
-
-public class StripAccents {
-
-    public static String characters = "\u03B1\u03B2\u03B3\u03B4\u03B5\u03B6\u03B7\u03B8\u03B9\u03BA\u03BB\u03BC\u03BD" +
-            "\u03BE\u03BF\u03C0\u03C1\u03C3\u03C2\u03C4\u03C5\u03C6\u03C7\u03C8\u03C9\u03AC\u03AD" +
-            "\u03AE\u03AF\u03CC\u03CD\u03CE\u03CA\u03CB\u0390\u03B0\u0391\u0392\u0395\u0396\u0397\u0399" +
-            "\u039A\u039C\u039D\u039F\u03A1\u03A4\u03A5\u03A7\u0386\u0388\u0389\u038A\u038C\u038F\u03AA" +
-            "\u03AB\u0170\u0171\u0150\u0151\u0105\u0107\u0119\u0142\u0144\u015B\u017A\u017C\u0104\u0106" +
-            "\u0118\u0141\u0143\u015A\u0179\u017B\u00C0\u00C2\u00C3\u00C8\u00CA\u00CC\u00CE\u00D2\u00D5" +
-            "\u00D9\u00DB\u00E2\u00E3\u00EA\u00EE\u00F5\u00FA\u00FB\u00E7\u011B\u0161\u010D\u0159\u017E\u010F" +
-            "\u0165\u0148\u00E1\u00ED\u00E9\u00F3\u00FD\u016F\u011A\u0160\u010C\u0158\u017D\u010E\u0164\u0147" +
-            "\u00C1\u00C9\u00CD\u00D3\u00DD\u00DA\u016E\u0155\u013A\u013E\u00F4\u0154\u0139\u013D\u00D4\u00CF\u00EF\u00EB\u00CB";
-
-    public static String gsm = "AB\u0393\u0394EZH\u0398IK\u039BMN\u039EO\u03A0P\u03A3\u03A3TY\u03A6X\u03A8\u03A9AEHIOY" +
-            "\u03A9IYIYABEZHIKMNOPTYXAEHIO\u03A9IY\u00DC\u00FC\u00D6\u00F6acelnszzACELNSZZAAAEEIIOOUU" +
-            "aaeiouucescrzdtnaieoyuESCRZDTNAEIOYUUrlloRLLOIIee";
-
-    public static String stripAccents(String s) {
-        int[] messageData = SmsMessage.calculateLength(s, false);
-
-        if (messageData[0] != 1) {
-            for (int i = 0; i < characters.length(); i++) {
-                s = s.replaceAll(characters.substring(i, i + 1), gsm.substring(i, i + 1));
-            }
-        }
-
-        return s;
-    }
-}
+/*
+ * Copyright 2013 Jacob Klinker
+ *
+ * Licensed under the Apache License, Version 2.0 (the "License");
+ * you may not use this file except in compliance with the License.
+ * You may obtain a copy of the License at
+ *
+ *      http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing, software
+ * distributed under the License is distributed on an "AS IS" BASIS,
+ * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ * See the License for the specific language governing permissions and
+ * limitations under the License.
+ */
+
+package com.klinker.android.send_message;
+
+import android.telephony.SmsMessage;
+
+public class StripAccents {
+
+    public static String characters = "\u03B1\u03B2\u03B3\u03B4\u03B5\u03B6\u03B7\u03B8\u03B9\u03BA\u03BB\u03BC\u03BD" +
+            "\u03BE\u03BF\u03C0\u03C1\u03C3\u03C2\u03C4\u03C5\u03C6\u03C7\u03C8\u03C9\u03AC\u03AD" +
+            "\u03AE\u03AF\u03CC\u03CD\u03CE\u03CA\u03CB\u0390\u03B0\u0391\u0392\u0395\u0396\u0397\u0399" +
+            "\u039A\u039C\u039D\u039F\u03A1\u03A4\u03A5\u03A7\u0386\u0388\u0389\u038A\u038C\u038F\u03AA" +
+            "\u03AB\u0170\u0171\u0150\u0151\u0105\u0107\u0119\u0142\u0144\u015B\u017A\u017C\u0104\u0106" +
+            "\u0118\u0141\u0143\u015A\u0179\u017B\u00C0\u00C2\u00C3\u00C8\u00CA\u00CC\u00CE\u00D2\u00D5" +
+            "\u00D9\u00DB\u00E2\u00E3\u00EA\u00EE\u00F5\u00FA\u00FB\u00E7\u011B\u0161\u010D\u0159\u017E\u010F" +
+            "\u0165\u0148\u00E1\u00ED\u00E9\u00F3\u00FD\u016F\u011A\u0160\u010C\u0158\u017D\u010E\u0164\u0147" +
+            "\u00C1\u00C9\u00CD\u00D3\u00DD\u00DA\u016E\u0155\u013A\u013E\u00F4\u0154\u0139\u013D\u00D4\u00CF\u00EF\u00EB\u00CB";
+
+    public static String gsm = "AB\u0393\u0394EZH\u0398IK\u039BMN\u039EO\u03A0P\u03A3\u03A3TY\u03A6X\u03A8\u03A9AEHIOY" +
+            "\u03A9IYIYABEZHIKMNOPTYXAEHIO\u03A9IY\u00DC\u00FC\u00D6\u00F6acelnszzACELNSZZAAAEEIIOOUU" +
+            "aaeiouucescrzdtnaieoyuESCRZDTNAEIOYUUrlloRLLOIIee";
+
+    public static String stripAccents(String s) {
+        int[] messageData = SmsMessage.calculateLength(s, false);
+
+        if (messageData[0] != 1) {
+            for (int i = 0; i < characters.length(); i++) {
+                s = s.replaceAll(characters.substring(i, i + 1), gsm.substring(i, i + 1));
+            }
+        }
+
+        return s;
+    }
+}
diff --git a/android-smsmms/src/main/java/com/klinker/android/send_message/Transaction.kt b/android-smsmms/src/main/java/com/klinker/android/send_message/Transaction.kt
index e7169cbef..427e97cc1 100755
--- a/android-smsmms/src/main/java/com/klinker/android/send_message/Transaction.kt
+++ b/android-smsmms/src/main/java/com/klinker/android/send_message/Transaction.kt
@@ -1,205 +1,205 @@
-/*
- * Copyright 2013 Jacob Klinker
- *
- * Licensed under the Apache License, Version 2.0 (the "License");
- * you may not use this file except in compliance with the License.
- * You may obtain a copy of the License at
- *
- *      http://www.apache.org/licenses/LICENSE-2.0
- *
- * Unless required by applicable law or agreed to in writing, software
- * distributed under the License is distributed on an "AS IS" BASIS,
- * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
- * See the License for the specific language governing permissions and
- * limitations under the License.
- */
-
-package com.klinker.android.send_message
-
-import android.app.PendingIntent
-import android.content.ContentResolver
-import android.content.Context
-import android.content.Intent
-import android.net.Uri
-import android.telephony.SmsManager
-import androidx.core.os.bundleOf
-import com.android.mms.MmsConfig
-import com.android.mms.dom.smil.parser.SmilXmlSerializer
-import com.android.mms.util.DownloadManager
-import com.android.mms.util.RateController
-import com.google.android.mms.ContentType
-import com.google.android.mms.InvalidHeaderValueException
-import com.google.android.mms.MMSPart
-import com.google.android.mms.pdu_alt.CharacterSets
-import com.google.android.mms.pdu_alt.EncodedStringValue
-import com.google.android.mms.pdu_alt.PduBody
-import com.google.android.mms.pdu_alt.PduComposer
-import com.google.android.mms.pdu_alt.PduHeaders
-import com.google.android.mms.pdu_alt.PduPart
-import com.google.android.mms.pdu_alt.PduPersister
-import com.google.android.mms.pdu_alt.SendReq
-import com.google.android.mms.smil.SmilHelper
-import timber.log.Timber
-import java.io.ByteArrayOutputStream
-import java.io.File
-import java.io.FileOutputStream
-import java.io.IOException
-import java.util.*
-
-/**
- * Class to process transaction requests for sending
- *
- * @author Jake Klinker
- */
-class Transaction @JvmOverloads constructor(private val context: Context, settings: Settings = Settings()) {
-
-    companion object {
-        var settings: Settings = Settings()
-
-        const val MMS_SENT = "com.moez.QKSMS.MMS_SENT"
-        const val EXTRA_CONTENT_URI = "content_uri"
-        const val EXTRA_FILE_PATH = "file_path"
-
-        const val NOTIFY_SMS_FAILURE = "com.moez.QKSMS.NOTIFY_SMS_FAILURE"
-        const val MMS_UPDATED = "com.moez.QKSMS.MMS_UPDATED"
-        const val MMS_ERROR = "com.klinker.android.send_message.MMS_ERROR"
-        const val REFRESH = "com.klinker.android.send_message.REFRESH"
-        const val MMS_PROGRESS = "com.klinker.android.send_message.MMS_PROGRESS"
-        const val NOTIFY_OF_DELIVERY = "com.klinker.android.send_message.NOTIFY_DELIVERY"
-        const val NOTIFY_OF_MMS = "com.klinker.android.messaging.NEW_MMS_DOWNLOADED"
-
-
-        const val DEFAULT_EXPIRY_TIME = (7 * 24 * 60 * 60).toLong()
-        const val DEFAULT_PRIORITY = PduHeaders.PRIORITY_NORMAL
-    }
-
-    init {
-        Transaction.settings = settings
-    }
-
-    /**
-     * Called to send a new message depending on settings and provided Message object
-     * If you want to send message as mms, call this from the UI thread
-     *
-     * @param threadId is the thread id of who to send the message to (can also be set to Transaction.NO_THREAD_ID)
-     */
-    fun sendNewMessage(subId: Int, threadId: Long, addresses: List<String>, parts: List<MMSPart>, subject: String?, existingUri: Uri?) {
-        RateController.init(context)
-        DownloadManager.init(context)
-
-        Timber.v("sending mms")
-        try {
-            val fileName = "send." + Math.abs(Random().nextLong()).toString() + ".dat"
-            val sendFile = File(context.cacheDir, fileName)
-
-            val sendReq = buildPdu(context, addresses, subject, parts)
-            val persister = PduPersister.getPduPersister(context)
-            val messageUri = existingUri ?: persister.persist(sendReq, Uri.parse("content://mms/outbox"), threadId, true, true, null)
-
-            val sentIntent = Intent(MMS_SENT)
-            BroadcastUtils.addClassName(context, sentIntent, MMS_SENT)
-
-            sentIntent.putExtra(EXTRA_CONTENT_URI, messageUri.toString())
-            sentIntent.putExtra(EXTRA_FILE_PATH, sendFile.path)
-            val sentPI = PendingIntent.getBroadcast(context, 0, sentIntent, PendingIntent.FLAG_CANCEL_CURRENT)
-
-            val updatedIntent = Intent(MMS_UPDATED).putExtra("uri", messageUri.toString())
-            BroadcastUtils.addClassName(context, updatedIntent, MMS_UPDATED)
-            context.sendBroadcast(updatedIntent)
-
-            val contentUri: Uri? = try {
-                FileOutputStream(sendFile).use { writer ->
-                    writer.write(PduComposer(context, sendReq).make())
-                    Uri.Builder()
-                            .authority(context.packageName + ".MmsFileProvider")
-                            .path(fileName)
-                            .scheme(ContentResolver.SCHEME_CONTENT)
-                            .build()
-                }
-            } catch (e: IOException) {
-                Timber.e(e, "Error writing send file")
-                null
-            }
-
-            val configOverrides = bundleOf(
-                    Pair(SmsManager.MMS_CONFIG_GROUP_MMS_ENABLED, true),
-                    Pair(SmsManager.MMS_CONFIG_MAX_MESSAGE_SIZE, MmsConfig.getMaxMessageSize()))
-
-            MmsConfig.getHttpParams()
-                    ?.takeIf { it.isNotEmpty() }
-                    ?.let { configOverrides.putString(SmsManager.MMS_CONFIG_HTTP_PARAMS, it) }
-
-            if (contentUri != null) {
-                SmsManagerFactory.createSmsManager(subId).sendMultimediaMessage(context, contentUri, null, configOverrides, sentPI)
-            } else {
-                Timber.e("Error writing sending Mms")
-                try {
-                    sentPI.send(SmsManager.MMS_ERROR_IO_ERROR)
-                } catch (e: PendingIntent.CanceledException) {
-                    Timber.e(e)
-                }
-
-            }
-        } catch (e: Exception) {
-            Timber.e(e, "Error using system sending method")
-        }
-
-    }
-
-    private fun buildPdu(context: Context, recipients: List<String>, subject: String?, parts: List<MMSPart>): SendReq {
-        val req = SendReq()
-
-        Utils.getMyPhoneNumber(context)?.takeIf(String::isNotEmpty)?.let(::EncodedStringValue)?.let(req::setFrom) // From
-        recipients.map(::EncodedStringValue).forEach(req::addTo) // To
-        subject?.takeIf(String::isNotEmpty)?.let(::EncodedStringValue)?.let(req::setSubject) // Subject
-
-        req.date = System.currentTimeMillis() / 1000
-        req.body = PduBody()
-
-        // Parts
-        parts.map(this::partToPduPart).forEach { req.body.addPart(it) }
-
-        // SMIL document for compatibility
-        req.body.addPart(0, PduPart().apply {
-            contentId = "smil".toByteArray()
-            contentLocation = "smil.xml".toByteArray()
-            contentType = ContentType.APP_SMIL.toByteArray()
-            data = ByteArrayOutputStream()
-                    .apply { SmilXmlSerializer.serialize(SmilHelper.createSmilDocument(req.body), this) }
-                    .toByteArray()
-        })
-
-        req.messageSize = parts.mapNotNull { it.data?.size }.sum().toLong()
-        req.messageClass = PduHeaders.MESSAGE_CLASS_PERSONAL_STR.toByteArray()
-        req.expiry = DEFAULT_EXPIRY_TIME
-
-        try {
-            req.priority = DEFAULT_PRIORITY
-            req.deliveryReport = PduHeaders.VALUE_NO
-            req.readReport = PduHeaders.VALUE_NO
-        } catch (e: InvalidHeaderValueException) {
-            Timber.w(e)
-        }
-
-        return req
-    }
-
-    private fun partToPduPart(part: MMSPart): PduPart = PduPart().apply {
-        val filename = part.name
-
-        // Set Charset if it's a text media.
-        if (part.mimeType.startsWith("text")) {
-            charset = CharacterSets.UTF_8
-        }
-
-        // Set Content-Type.
-        contentType = part.mimeType.toByteArray()
-
-        // Set Content-Location.
-        contentLocation = filename.toByteArray()
-        val index = filename.lastIndexOf(".")
-        contentId = (if (index == -1) filename else filename.substring(0, index)).toByteArray()
-        data = part.data
-    }
-
+/*
+ * Copyright 2013 Jacob Klinker
+ *
+ * Licensed under the Apache License, Version 2.0 (the "License");
+ * you may not use this file except in compliance with the License.
+ * You may obtain a copy of the License at
+ *
+ *      http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing, software
+ * distributed under the License is distributed on an "AS IS" BASIS,
+ * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ * See the License for the specific language governing permissions and
+ * limitations under the License.
+ */
+
+package com.klinker.android.send_message
+
+import android.app.PendingIntent
+import android.content.ContentResolver
+import android.content.Context
+import android.content.Intent
+import android.net.Uri
+import android.telephony.SmsManager
+import androidx.core.os.bundleOf
+import com.android.mms.MmsConfig
+import com.android.mms.dom.smil.parser.SmilXmlSerializer
+import com.android.mms.util.DownloadManager
+import com.android.mms.util.RateController
+import com.google.android.mms.ContentType
+import com.google.android.mms.InvalidHeaderValueException
+import com.google.android.mms.MMSPart
+import com.google.android.mms.pdu_alt.CharacterSets
+import com.google.android.mms.pdu_alt.EncodedStringValue
+import com.google.android.mms.pdu_alt.PduBody
+import com.google.android.mms.pdu_alt.PduComposer
+import com.google.android.mms.pdu_alt.PduHeaders
+import com.google.android.mms.pdu_alt.PduPart
+import com.google.android.mms.pdu_alt.PduPersister
+import com.google.android.mms.pdu_alt.SendReq
+import com.google.android.mms.smil.SmilHelper
+import timber.log.Timber
+import java.io.ByteArrayOutputStream
+import java.io.File
+import java.io.FileOutputStream
+import java.io.IOException
+import java.util.*
+
+/**
+ * Class to process transaction requests for sending
+ *
+ * @author Jake Klinker
+ */
+class Transaction @JvmOverloads constructor(private val context: Context, settings: Settings = Settings()) {
+
+    companion object {
+        var settings: Settings = Settings()
+
+        const val MMS_SENT = "com.moez.QKSMS.MMS_SENT"
+        const val EXTRA_CONTENT_URI = "content_uri"
+        const val EXTRA_FILE_PATH = "file_path"
+
+        const val NOTIFY_SMS_FAILURE = "com.moez.QKSMS.NOTIFY_SMS_FAILURE"
+        const val MMS_UPDATED = "com.moez.QKSMS.MMS_UPDATED"
+        const val MMS_ERROR = "com.klinker.android.send_message.MMS_ERROR"
+        const val REFRESH = "com.klinker.android.send_message.REFRESH"
+        const val MMS_PROGRESS = "com.klinker.android.send_message.MMS_PROGRESS"
+        const val NOTIFY_OF_DELIVERY = "com.klinker.android.send_message.NOTIFY_DELIVERY"
+        const val NOTIFY_OF_MMS = "com.klinker.android.messaging.NEW_MMS_DOWNLOADED"
+
+
+        const val DEFAULT_EXPIRY_TIME = (7 * 24 * 60 * 60).toLong()
+        const val DEFAULT_PRIORITY = PduHeaders.PRIORITY_NORMAL
+    }
+
+    init {
+        Transaction.settings = settings
+    }
+
+    /**
+     * Called to send a new message depending on settings and provided Message object
+     * If you want to send message as mms, call this from the UI thread
+     *
+     * @param threadId is the thread id of who to send the message to (can also be set to Transaction.NO_THREAD_ID)
+     */
+    fun sendNewMessage(subId: Int, threadId: Long, addresses: List<String>, parts: List<MMSPart>, subject: String?, existingUri: Uri?) {
+        RateController.init(context)
+        DownloadManager.init(context)
+
+        Timber.v("sending mms")
+        try {
+            val fileName = "send." + Math.abs(Random().nextLong()).toString() + ".dat"
+            val sendFile = File(context.cacheDir, fileName)
+
+            val sendReq = buildPdu(context, addresses, subject, parts)
+            val persister = PduPersister.getPduPersister(context)
+            val messageUri = existingUri ?: persister.persist(sendReq, Uri.parse("content://mms/outbox"), threadId, true, true, null)
+
+            val sentIntent = Intent(MMS_SENT)
+            BroadcastUtils.addClassName(context, sentIntent, MMS_SENT)
+
+            sentIntent.putExtra(EXTRA_CONTENT_URI, messageUri.toString())
+            sentIntent.putExtra(EXTRA_FILE_PATH, sendFile.path)
+            val sentPI = PendingIntent.getBroadcast(context, 0, sentIntent, PendingIntent.FLAG_CANCEL_CURRENT)
+
+            val updatedIntent = Intent(MMS_UPDATED).putExtra("uri", messageUri.toString())
+            BroadcastUtils.addClassName(context, updatedIntent, MMS_UPDATED)
+            context.sendBroadcast(updatedIntent)
+
+            val contentUri: Uri? = try {
+                FileOutputStream(sendFile).use { writer ->
+                    writer.write(PduComposer(context, sendReq).make())
+                    Uri.Builder()
+                            .authority(context.packageName + ".MmsFileProvider")
+                            .path(fileName)
+                            .scheme(ContentResolver.SCHEME_CONTENT)
+                            .build()
+                }
+            } catch (e: IOException) {
+                Timber.e(e, "Error writing send file")
+                null
+            }
+
+            val configOverrides = bundleOf(
+                    Pair(SmsManager.MMS_CONFIG_GROUP_MMS_ENABLED, true),
+                    Pair(SmsManager.MMS_CONFIG_MAX_MESSAGE_SIZE, MmsConfig.getMaxMessageSize()))
+
+            MmsConfig.getHttpParams()
+                    ?.takeIf { it.isNotEmpty() }
+                    ?.let { configOverrides.putString(SmsManager.MMS_CONFIG_HTTP_PARAMS, it) }
+
+            if (contentUri != null) {
+                SmsManagerFactory.createSmsManager(subId).sendMultimediaMessage(context, contentUri, null, configOverrides, sentPI)
+            } else {
+                Timber.e("Error writing sending Mms")
+                try {
+                    sentPI.send(SmsManager.MMS_ERROR_IO_ERROR)
+                } catch (e: PendingIntent.CanceledException) {
+                    Timber.e(e)
+                }
+
+            }
+        } catch (e: Exception) {
+            Timber.e(e, "Error using system sending method")
+        }
+
+    }
+
+    private fun buildPdu(context: Context, recipients: List<String>, subject: String?, parts: List<MMSPart>): SendReq {
+        val req = SendReq()
+
+        Utils.getMyPhoneNumber(context)?.takeIf(String::isNotEmpty)?.let(::EncodedStringValue)?.let(req::setFrom) // From
+        recipients.map(::EncodedStringValue).forEach(req::addTo) // To
+        subject?.takeIf(String::isNotEmpty)?.let(::EncodedStringValue)?.let(req::setSubject) // Subject
+
+        req.date = System.currentTimeMillis() / 1000
+        req.body = PduBody()
+
+        // Parts
+        parts.map(this::partToPduPart).forEach { req.body.addPart(it) }
+
+        // SMIL document for compatibility
+        req.body.addPart(0, PduPart().apply {
+            contentId = "smil".toByteArray()
+            contentLocation = "smil.xml".toByteArray()
+            contentType = ContentType.APP_SMIL.toByteArray()
+            data = ByteArrayOutputStream()
+                    .apply { SmilXmlSerializer.serialize(SmilHelper.createSmilDocument(req.body), this) }
+                    .toByteArray()
+        })
+
+        req.messageSize = parts.mapNotNull { it.data?.size }.sum().toLong()
+        req.messageClass = PduHeaders.MESSAGE_CLASS_PERSONAL_STR.toByteArray()
+        req.expiry = DEFAULT_EXPIRY_TIME
+
+        try {
+            req.priority = DEFAULT_PRIORITY
+            req.deliveryReport = PduHeaders.VALUE_NO
+            req.readReport = PduHeaders.VALUE_NO
+        } catch (e: InvalidHeaderValueException) {
+            Timber.w(e)
+        }
+
+        return req
+    }
+
+    private fun partToPduPart(part: MMSPart): PduPart = PduPart().apply {
+        val filename = part.name
+
+        // Set Charset if it's a text media.
+        if (part.mimeType.startsWith("text")) {
+            charset = CharacterSets.UTF_8
+        }
+
+        // Set Content-Type.
+        contentType = part.mimeType.toByteArray()
+
+        // Set Content-Location.
+        contentLocation = filename.toByteArray()
+        val index = filename.lastIndexOf(".")
+        contentId = (if (index == -1) filename else filename.substring(0, index)).toByteArray()
+        data = part.data
+    }
+
 }
\ No newline at end of file
diff --git a/android-smsmms/src/main/java/com/klinker/android/send_message/Utils.java b/android-smsmms/src/main/java/com/klinker/android/send_message/Utils.java
index 2fc446932..2070a90e2 100755
--- a/android-smsmms/src/main/java/com/klinker/android/send_message/Utils.java
+++ b/android-smsmms/src/main/java/com/klinker/android/send_message/Utils.java
@@ -1,390 +1,390 @@
-package com.klinker.android.send_message;
-
-import android.annotation.TargetApi;
-import android.content.Context;
-import android.content.SharedPreferences;
-import android.database.Cursor;
-import android.net.ConnectivityManager;
-import android.net.Network;
-import android.net.Uri;
-import android.os.Build;
-import android.preference.PreferenceManager;
-import android.provider.Telephony;
-import android.telephony.SmsManager;
-import android.telephony.SmsMessage;
-import android.telephony.TelephonyManager;
-import android.text.TextUtils;
-import com.android.mms.service_alt.MmsNetworkManager;
-import com.android.mms.service_alt.exception.MmsNetworkException;
-import com.google.android.mms.util_alt.SqliteWrapper;
-import timber.log.Timber;
-
-import java.io.IOException;
-import java.lang.reflect.Method;
-import java.net.InetAddress;
-import java.net.UnknownHostException;
-import java.util.HashSet;
-import java.util.Random;
-import java.util.Set;
-import java.util.regex.Matcher;
-import java.util.regex.Pattern;
-
-/**
- * Common methods to be used for data connectivity/sending messages ect
- *
- * @author Jake Klinker
- */
-public class Utils {
-    /**
-     * characters to compare against when checking for 160 character sending compatibility
-     */
-    public static final String GSM_CHARACTERS_REGEX = "^[A-Za-z0-9 \\r\\n@Ł$ĽčéůěňÇŘřĹĺ\u0394_\u03A6\u0393\u039B\u03A9\u03A0\u03A8\u03A3\u0398\u039EĆćßÉ!\"#$%&'()*+,\\-./:;<=>?ĄÄÖŃܧżäöńüŕ^{}\\\\\\[~\\]|\u20AC]*$";
-    public static final int DEFAULT_SUBSCRIPTION_ID = 1;
-
-    /**
-     * Gets the current users phone number
-     *
-     * @param context is the context of the activity or service
-     * @return a string of the phone number on the device
-     */
-    public static String getMyPhoneNumber(Context context) {
-        TelephonyManager mTelephonyMgr;
-        mTelephonyMgr = (TelephonyManager)
-                context.getSystemService(Context.TELEPHONY_SERVICE);
-        return mTelephonyMgr.getLine1Number();
-    }
-
-    public interface Task<T> {
-        T run() throws IOException;
-    }
-
-    public static <T> T ensureRouteToMmsNetwork(Context context, String url, String proxy, Task<T> task) throws IOException {
-        if (Build.VERSION.SDK_INT >= Build.VERSION_CODES.M) {
-            return ensureRouteToMmsNetworkMarshmallow(context, task);
-        } else {
-            return ensureRouteToMmsNetworkLollipop(context, task);
-        }
-    }
-
-    @TargetApi(Build.VERSION_CODES.M)
-    private static <T> T ensureRouteToMmsNetworkMarshmallow(Context context, Task<T> task) throws IOException {
-        final MmsNetworkManager networkManager = new MmsNetworkManager(context.getApplicationContext(), Utils.getDefaultSubscriptionId());
-        final ConnectivityManager connectivityManager = (ConnectivityManager) context.getSystemService(Context.CONNECTIVITY_SERVICE);
-        Network network = null;
-        try {
-            network = networkManager.acquireNetwork();
-            connectivityManager.bindProcessToNetwork(network);
-            return task.run();
-        } catch (MmsNetworkException e) {
-            throw new IOException(e);
-        } finally {
-            if (network != null) {
-                connectivityManager.bindProcessToNetwork(null);
-            }
-            networkManager.releaseNetwork();
-        }
-    }
-
-    @TargetApi(Build.VERSION_CODES.LOLLIPOP)
-    private static <T> T ensureRouteToMmsNetworkLollipop(Context context, Task<T> task) throws IOException {
-        final MmsNetworkManager networkManager = new MmsNetworkManager(context.getApplicationContext(), Utils.getDefaultSubscriptionId());
-        Network network = null;
-        try {
-            network = networkManager.acquireNetwork();
-            ConnectivityManager.setProcessDefaultNetwork(network);
-            return task.run();
-        } catch (MmsNetworkException e) {
-            throw new IOException(e);
-        } finally {
-            if (network != null) {
-                ConnectivityManager.setProcessDefaultNetwork(null);
-            }
-            networkManager.releaseNetwork();
-        }
-    }
-
-    /**
-     * Ensures that the host MMSC is reachable
-     *
-     * @param context is the context of the activity or service
-     * @param url     is the MMSC to check
-     * @param proxy   is the proxy of the APN to check
-     * @throws java.io.IOException when route cannot be established
-     */
-    public static void ensureRouteToHost(Context context, String url, String proxy) throws IOException {
-        ConnectivityManager connMgr =
-                (ConnectivityManager) context.getSystemService(Context.CONNECTIVITY_SERVICE);
-
-        InetAddress inetAddr;
-        if (proxy != null && proxy.trim().length() != 0) {
-            try {
-                inetAddr = InetAddress.getByName(proxy);
-            } catch (UnknownHostException e) {
-                throw new IOException("Cannot establish route for " + url +
-                        ": Unknown proxy " + proxy);
-            }
-            try {
-                Method requestRoute = ConnectivityManager.class.getMethod("requestRouteToHostAddress", Integer.TYPE, InetAddress.class);
-                if (!((Boolean) requestRoute.invoke(connMgr, ConnectivityManager.TYPE_MOBILE_MMS, inetAddr))) {
-                    throw new IOException("Cannot establish route to proxy " + inetAddr);
-                }
-            } catch (Exception e) {
-                Timber.e(e, "Cannot establishh route to proxy " + inetAddr);
-            }
-        } else {
-            Uri uri = Uri.parse(url);
-            try {
-                inetAddr = InetAddress.getByName(uri.getHost());
-            } catch (UnknownHostException e) {
-                throw new IOException("Cannot establish route for " + url + ": Unknown host");
-            }
-            try {
-                Method requestRoute = ConnectivityManager.class.getMethod("requestRouteToHostAddress", Integer.TYPE, InetAddress.class);
-                if (!((Boolean) requestRoute.invoke(connMgr, ConnectivityManager.TYPE_MOBILE_MMS, inetAddr))) {
-                    throw new IOException("Cannot establish route to proxy " + inetAddr);
-                }
-            } catch (Exception e) {
-                Timber.e(e, "Cannot establishh route to proxy " + inetAddr + " for " + url);
-            }
-        }
-    }
-
-    /**
-     * Checks whether or not mobile data is enabled and returns the result
-     *
-     * @param context is the context of the activity or service
-     * @return true if data is enabled or false if disabled
-     */
-    public static Boolean isMobileDataEnabled(Context context) {
-        ConnectivityManager cm = (ConnectivityManager) context.getSystemService(Context.CONNECTIVITY_SERVICE);
-
-        try {
-            Class<?> c = Class.forName(cm.getClass().getName());
-            Method m = c.getDeclaredMethod("getMobileDataEnabled");
-            m.setAccessible(true);
-            return (Boolean) m.invoke(cm);
-        } catch (Exception e) {
-            Timber.e(e, "exception thrown");
-            return null;
-        }
-    }
-
-    /**
-     * Checks mobile data enabled based on telephonymanager
-     *
-     * @param telephonyManager the telephony manager
-     */
-    public static boolean isDataEnabled(TelephonyManager telephonyManager) {
-        try {
-            Class<?> c = telephonyManager.getClass();
-            Method m = c.getMethod("getDataEnabled");
-            return (boolean) m.invoke(telephonyManager);
-        } catch (Exception e) {
-            Timber.e(e, "exception thrown");
-            return true;
-        }
-    }
-
-    /**
-     * Checks mobile data enabled based on telephonymanager and sim card
-     *
-     * @param telephonyManager the telephony manager
-     * @param subId the sim card id
-     */
-    public static boolean isDataEnabled(TelephonyManager telephonyManager, int subId) {
-        try {
-            Class<?> c = telephonyManager.getClass();
-            Method m = c.getMethod("getDataEnabled", int.class);
-            return (boolean) m.invoke(telephonyManager, subId);
-        } catch (Exception e) {
-            Timber.e(e, "exception thrown");
-            return isDataEnabled(telephonyManager);
-        }
-    }
-
-    /**
-     * Toggles mobile data
-     *
-     * @param context is the context of the activity or service
-     * @param enabled is whether to enable or disable data
-     */
-    public static void setMobileDataEnabled(Context context, boolean enabled) {
-        // TODO find a better way to do this on lollipop!
-        // This will actually not work due to no permission for android.permission.MODIFY_PHONE_STATE, which
-        // is a system level permission and cannot be accessed for third party apps.
-        try {
-            TelephonyManager tm = (TelephonyManager) context
-                    .getSystemService(Context.TELEPHONY_SERVICE);
-            Class c = Class.forName(tm.getClass().getName());
-            Method m = c.getDeclaredMethod("getITelephony");
-            m.setAccessible(true);
-            Object telephonyService = m.invoke(tm);
-            c = Class.forName(telephonyService.getClass().getName());
-            m = c.getDeclaredMethod("setDataEnabled", Boolean.TYPE);
-            m.setAccessible(true);
-            m.invoke(telephonyService, enabled);
-        } catch (Exception e) {
-            Timber.e(e, "error enabling data on lollipop");
-        }
-
-    }
-
-    /**
-     * Gets the number of pages in the SMS based on settings and the length of string
-     *
-     * @param settings is the settings object to check against
-     * @param text     is the text from the message object to be sent
-     * @return the number of pages required to hold message
-     */
-    public static int getNumPages(Settings settings, String text) {
-        if (settings.getStripUnicode()) {
-            text = StripAccents.stripAccents(text);
-        }
-
-        int[] data = SmsMessage.calculateLength(text, false);
-        return data[0];
-    }
-
-    /**
-     * Gets the current thread_id or creates a new one for the given recipient
-     * @param context is the context of the activity or service
-     * @param recipient is the person message is being sent to
-     * @return the thread_id to use in the database
-     */
-    public static long getOrCreateThreadId(Context context, String recipient) {
-        Set<String> recipients = new HashSet<String>();
-
-        recipients.add(recipient);
-        return getOrCreateThreadId(context, recipients);
-    }
-
-    /**
-     * Gets the current thread_id or creates a new one for the given recipient
-     * @param context is the context of the activity or service
-     * @param recipients is the set of people message is being sent to
-     * @return the thread_id to use in the database
-     */
-    public static long getOrCreateThreadId(
-            Context context, Set<String> recipients) {
-        Uri.Builder uriBuilder = Uri.parse("content://mms-sms/threadID").buildUpon();
-
-        for (String recipient : recipients) {
-            if (isEmailAddress(recipient)) {
-                recipient = extractAddrSpec(recipient);
-            }
-
-            uriBuilder.appendQueryParameter("recipient", recipient);
-        }
-
-        Uri uri = uriBuilder.build();
-        Cursor cursor = SqliteWrapper.query(context, context.getContentResolver(),
-                uri, new String[]{"_id"}, null, null, null);
-        if (cursor != null) {
-            try {
-                if (cursor.moveToFirst()) {
-                    long id = cursor.getLong(0);
-                    cursor.close();
-                    return id;
-                }
-            } finally {
-                cursor.close();
-            }
-        }
-
-        Random random = new Random();
-        return random.nextLong();
-        //throw new IllegalArgumentException("Unable to find or allocate a thread ID.");
-    }
-
-    public static boolean doesThreadIdExist(Context context, long threadId) {
-        Uri uri = Uri.parse("content://mms-sms/conversations/" + threadId + "/");
-
-        Cursor cursor = context.getContentResolver().query(uri, new String[] {"_id"}, null, null, null);
-        if (cursor != null && cursor.moveToFirst()) {
-            cursor.close();
-            return true;
-        } else {
-            return false;
-        }
-    }
-
-    private static boolean isEmailAddress(String address) {
-        if (TextUtils.isEmpty(address)) {
-            return false;
-        }
-
-        String s = extractAddrSpec(address);
-        Matcher match = EMAIL_ADDRESS_PATTERN.matcher(s);
-        return match.matches();
-    }
-
-    private static final Pattern EMAIL_ADDRESS_PATTERN
-            = Pattern.compile(
-            "[a-zA-Z0-9\\+\\.\\_\\%\\-]{1,256}" +
-                    "\\@" +
-                    "[a-zA-Z0-9][a-zA-Z0-9\\-]{0,64}" +
-                    "(" +
-                    "\\." +
-                    "[a-zA-Z0-9][a-zA-Z0-9\\-]{0,25}" +
-                    ")+"
-    );
-
-    private static final Pattern NAME_ADDR_EMAIL_PATTERN =
-            Pattern.compile("\\s*(\"[^\"]*\"|[^<>\"]+)\\s*<([^<>]+)>\\s*");
-
-    private static String extractAddrSpec(String address) {
-        Matcher match = NAME_ADDR_EMAIL_PATTERN.matcher(address);
-
-        if (match.matches()) {
-            return match.group(2);
-        }
-        return address;
-    }
-
-    /**
-     * Gets the default settings from a shared preferences file associated with your app
-     * @param context is the context of the activity or service
-     * @return the settings object to send with
-     */
-    public static Settings getDefaultSendSettings(Context context) {
-        SharedPreferences sharedPrefs = PreferenceManager.getDefaultSharedPreferences(context);
-        Settings sendSettings = new Settings();
-
-        sendSettings.setMmsc(sharedPrefs.getString("mmsc_url", ""));
-        sendSettings.setProxy(sharedPrefs.getString("mms_proxy", ""));
-        sendSettings.setPort(sharedPrefs.getString("mms_port", ""));
-        sendSettings.setAgent(sharedPrefs.getString("mms_agent", ""));
-        sendSettings.setUserProfileUrl(sharedPrefs.getString("mms_user_agent_profile_url", ""));
-        sendSettings.setUaProfTagName(sharedPrefs.getString("mms_user_agent_tag_name", ""));
-        sendSettings.setStripUnicode(sharedPrefs.getBoolean("strip_unicode", false));
-
-        return sendSettings;
-    }
-
-    /**
-     * Determines whether or not the app is the default SMS app on a device
-     * @param context
-     * @return true if app is default
-     */
-    public static boolean isDefaultSmsApp(Context context) {
-        return context.getPackageName().equals(Telephony.Sms.getDefaultSmsPackage(context));
-
-    }
-
-    /**
-     * Determins whether or not the app has enabled MMS over WiFi
-     * @param context
-     * @return true if enabled
-     */
-    public static boolean isMmsOverWifiEnabled(Context context) {
-        return PreferenceManager.getDefaultSharedPreferences(context).getBoolean("mms_over_wifi", false);
-    }
-
-    public static int getDefaultSubscriptionId() {
-        if (Build.VERSION.SDK_INT >= Build.VERSION_CODES.LOLLIPOP_MR1) {
-            return SmsManager.getDefaultSmsSubscriptionId();
-        } else {
-            return DEFAULT_SUBSCRIPTION_ID;
-        }
-    }
-}
+package com.klinker.android.send_message;
+
+import android.annotation.TargetApi;
+import android.content.Context;
+import android.content.SharedPreferences;
+import android.database.Cursor;
+import android.net.ConnectivityManager;
+import android.net.Network;
+import android.net.Uri;
+import android.os.Build;
+import android.preference.PreferenceManager;
+import android.provider.Telephony;
+import android.telephony.SmsManager;
+import android.telephony.SmsMessage;
+import android.telephony.TelephonyManager;
+import android.text.TextUtils;
+import com.android.mms.service_alt.MmsNetworkManager;
+import com.android.mms.service_alt.exception.MmsNetworkException;
+import com.google.android.mms.util_alt.SqliteWrapper;
+import timber.log.Timber;
+
+import java.io.IOException;
+import java.lang.reflect.Method;
+import java.net.InetAddress;
+import java.net.UnknownHostException;
+import java.util.HashSet;
+import java.util.Random;
+import java.util.Set;
+import java.util.regex.Matcher;
+import java.util.regex.Pattern;
+
+/**
+ * Common methods to be used for data connectivity/sending messages ect
+ *
+ * @author Jake Klinker
+ */
+public class Utils {
+    /**
+     * characters to compare against when checking for 160 character sending compatibility
+     */
+    public static final String GSM_CHARACTERS_REGEX = "^[A-Za-z0-9 \\r\\n@Ł$ĽčéůěňÇŘřĹĺ\u0394_\u03A6\u0393\u039B\u03A9\u03A0\u03A8\u03A3\u0398\u039EĆćßÉ!\"#$%&'()*+,\\-./:;<=>?ĄÄÖŃܧżäöńüŕ^{}\\\\\\[~\\]|\u20AC]*$";
+    public static final int DEFAULT_SUBSCRIPTION_ID = 1;
+
+    /**
+     * Gets the current users phone number
+     *
+     * @param context is the context of the activity or service
+     * @return a string of the phone number on the device
+     */
+    public static String getMyPhoneNumber(Context context) {
+        TelephonyManager mTelephonyMgr;
+        mTelephonyMgr = (TelephonyManager)
+                context.getSystemService(Context.TELEPHONY_SERVICE);
+        return mTelephonyMgr.getLine1Number();
+    }
+
+    public interface Task<T> {
+        T run() throws IOException;
+    }
+
+    public static <T> T ensureRouteToMmsNetwork(Context context, String url, String proxy, Task<T> task) throws IOException {
+        if (Build.VERSION.SDK_INT >= Build.VERSION_CODES.M) {
+            return ensureRouteToMmsNetworkMarshmallow(context, task);
+        } else {
+            return ensureRouteToMmsNetworkLollipop(context, task);
+        }
+    }
+
+    @TargetApi(Build.VERSION_CODES.M)
+    private static <T> T ensureRouteToMmsNetworkMarshmallow(Context context, Task<T> task) throws IOException {
+        final MmsNetworkManager networkManager = new MmsNetworkManager(context.getApplicationContext(), Utils.getDefaultSubscriptionId());
+        final ConnectivityManager connectivityManager = (ConnectivityManager) context.getSystemService(Context.CONNECTIVITY_SERVICE);
+        Network network = null;
+        try {
+            network = networkManager.acquireNetwork();
+            connectivityManager.bindProcessToNetwork(network);
+            return task.run();
+        } catch (MmsNetworkException e) {
+            throw new IOException(e);
+        } finally {
+            if (network != null) {
+                connectivityManager.bindProcessToNetwork(null);
+            }
+            networkManager.releaseNetwork();
+        }
+    }
+
+    @TargetApi(Build.VERSION_CODES.LOLLIPOP)
+    private static <T> T ensureRouteToMmsNetworkLollipop(Context context, Task<T> task) throws IOException {
+        final MmsNetworkManager networkManager = new MmsNetworkManager(context.getApplicationContext(), Utils.getDefaultSubscriptionId());
+        Network network = null;
+        try {
+            network = networkManager.acquireNetwork();
+            ConnectivityManager.setProcessDefaultNetwork(network);
+            return task.run();
+        } catch (MmsNetworkException e) {
+            throw new IOException(e);
+        } finally {
+            if (network != null) {
+                ConnectivityManager.setProcessDefaultNetwork(null);
+            }
+            networkManager.releaseNetwork();
+        }
+    }
+
+    /**
+     * Ensures that the host MMSC is reachable
+     *
+     * @param context is the context of the activity or service
+     * @param url     is the MMSC to check
+     * @param proxy   is the proxy of the APN to check
+     * @throws java.io.IOException when route cannot be established
+     */
+    public static void ensureRouteToHost(Context context, String url, String proxy) throws IOException {
+        ConnectivityManager connMgr =
+                (ConnectivityManager) context.getSystemService(Context.CONNECTIVITY_SERVICE);
+
+        InetAddress inetAddr;
+        if (proxy != null && proxy.trim().length() != 0) {
+            try {
+                inetAddr = InetAddress.getByName(proxy);
+            } catch (UnknownHostException e) {
+                throw new IOException("Cannot establish route for " + url +
+                        ": Unknown proxy " + proxy);
+            }
+            try {
+                Method requestRoute = ConnectivityManager.class.getMethod("requestRouteToHostAddress", Integer.TYPE, InetAddress.class);
+                if (!((Boolean) requestRoute.invoke(connMgr, ConnectivityManager.TYPE_MOBILE_MMS, inetAddr))) {
+                    throw new IOException("Cannot establish route to proxy " + inetAddr);
+                }
+            } catch (Exception e) {
+                Timber.e(e, "Cannot establishh route to proxy " + inetAddr);
+            }
+        } else {
+            Uri uri = Uri.parse(url);
+            try {
+                inetAddr = InetAddress.getByName(uri.getHost());
+            } catch (UnknownHostException e) {
+                throw new IOException("Cannot establish route for " + url + ": Unknown host");
+            }
+            try {
+                Method requestRoute = ConnectivityManager.class.getMethod("requestRouteToHostAddress", Integer.TYPE, InetAddress.class);
+                if (!((Boolean) requestRoute.invoke(connMgr, ConnectivityManager.TYPE_MOBILE_MMS, inetAddr))) {
+                    throw new IOException("Cannot establish route to proxy " + inetAddr);
+                }
+            } catch (Exception e) {
+                Timber.e(e, "Cannot establishh route to proxy " + inetAddr + " for " + url);
+            }
+        }
+    }
+
+    /**
+     * Checks whether or not mobile data is enabled and returns the result
+     *
+     * @param context is the context of the activity or service
+     * @return true if data is enabled or false if disabled
+     */
+    public static Boolean isMobileDataEnabled(Context context) {
+        ConnectivityManager cm = (ConnectivityManager) context.getSystemService(Context.CONNECTIVITY_SERVICE);
+
+        try {
+            Class<?> c = Class.forName(cm.getClass().getName());
+            Method m = c.getDeclaredMethod("getMobileDataEnabled");
+            m.setAccessible(true);
+            return (Boolean) m.invoke(cm);
+        } catch (Exception e) {
+            Timber.e(e, "exception thrown");
+            return null;
+        }
+    }
+
+    /**
+     * Checks mobile data enabled based on telephonymanager
+     *
+     * @param telephonyManager the telephony manager
+     */
+    public static boolean isDataEnabled(TelephonyManager telephonyManager) {
+        try {
+            Class<?> c = telephonyManager.getClass();
+            Method m = c.getMethod("getDataEnabled");
+            return (boolean) m.invoke(telephonyManager);
+        } catch (Exception e) {
+            Timber.e(e, "exception thrown");
+            return true;
+        }
+    }
+
+    /**
+     * Checks mobile data enabled based on telephonymanager and sim card
+     *
+     * @param telephonyManager the telephony manager
+     * @param subId the sim card id
+     */
+    public static boolean isDataEnabled(TelephonyManager telephonyManager, int subId) {
+        try {
+            Class<?> c = telephonyManager.getClass();
+            Method m = c.getMethod("getDataEnabled", int.class);
+            return (boolean) m.invoke(telephonyManager, subId);
+        } catch (Exception e) {
+            Timber.e(e, "exception thrown");
+            return isDataEnabled(telephonyManager);
+        }
+    }
+
+    /**
+     * Toggles mobile data
+     *
+     * @param context is the context of the activity or service
+     * @param enabled is whether to enable or disable data
+     */
+    public static void setMobileDataEnabled(Context context, boolean enabled) {
+        // TODO find a better way to do this on lollipop!
+        // This will actually not work due to no permission for android.permission.MODIFY_PHONE_STATE, which
+        // is a system level permission and cannot be accessed for third party apps.
+        try {
+            TelephonyManager tm = (TelephonyManager) context
+                    .getSystemService(Context.TELEPHONY_SERVICE);
+            Class c = Class.forName(tm.getClass().getName());
+            Method m = c.getDeclaredMethod("getITelephony");
+            m.setAccessible(true);
+            Object telephonyService = m.invoke(tm);
+            c = Class.forName(telephonyService.getClass().getName());
+            m = c.getDeclaredMethod("setDataEnabled", Boolean.TYPE);
+            m.setAccessible(true);
+            m.invoke(telephonyService, enabled);
+        } catch (Exception e) {
+            Timber.e(e, "error enabling data on lollipop");
+        }
+
+    }
+
+    /**
+     * Gets the number of pages in the SMS based on settings and the length of string
+     *
+     * @param settings is the settings object to check against
+     * @param text     is the text from the message object to be sent
+     * @return the number of pages required to hold message
+     */
+    public static int getNumPages(Settings settings, String text) {
+        if (settings.getStripUnicode()) {
+            text = StripAccents.stripAccents(text);
+        }
+
+        int[] data = SmsMessage.calculateLength(text, false);
+        return data[0];
+    }
+
+    /**
+     * Gets the current thread_id or creates a new one for the given recipient
+     * @param context is the context of the activity or service
+     * @param recipient is the person message is being sent to
+     * @return the thread_id to use in the database
+     */
+    public static long getOrCreateThreadId(Context context, String recipient) {
+        Set<String> recipients = new HashSet<String>();
+
+        recipients.add(recipient);
+        return getOrCreateThreadId(context, recipients);
+    }
+
+    /**
+     * Gets the current thread_id or creates a new one for the given recipient
+     * @param context is the context of the activity or service
+     * @param recipients is the set of people message is being sent to
+     * @return the thread_id to use in the database
+     */
+    public static long getOrCreateThreadId(
+            Context context, Set<String> recipients) {
+        Uri.Builder uriBuilder = Uri.parse("content://mms-sms/threadID").buildUpon();
+
+        for (String recipient : recipients) {
+            if (isEmailAddress(recipient)) {
+                recipient = extractAddrSpec(recipient);
+            }
+
+            uriBuilder.appendQueryParameter("recipient", recipient);
+        }
+
+        Uri uri = uriBuilder.build();
+        Cursor cursor = SqliteWrapper.query(context, context.getContentResolver(),
+                uri, new String[]{"_id"}, null, null, null);
+        if (cursor != null) {
+            try {
+                if (cursor.moveToFirst()) {
+                    long id = cursor.getLong(0);
+                    cursor.close();
+                    return id;
+                }
+            } finally {
+                cursor.close();
+            }
+        }
+
+        Random random = new Random();
+        return random.nextLong();
+        //throw new IllegalArgumentException("Unable to find or allocate a thread ID.");
+    }
+
+    public static boolean doesThreadIdExist(Context context, long threadId) {
+        Uri uri = Uri.parse("content://mms-sms/conversations/" + threadId + "/");
+
+        Cursor cursor = context.getContentResolver().query(uri, new String[] {"_id"}, null, null, null);
+        if (cursor != null && cursor.moveToFirst()) {
+            cursor.close();
+            return true;
+        } else {
+            return false;
+        }
+    }
+
+    private static boolean isEmailAddress(String address) {
+        if (TextUtils.isEmpty(address)) {
+            return false;
+        }
+
+        String s = extractAddrSpec(address);
+        Matcher match = EMAIL_ADDRESS_PATTERN.matcher(s);
+        return match.matches();
+    }
+
+    private static final Pattern EMAIL_ADDRESS_PATTERN
+            = Pattern.compile(
+            "[a-zA-Z0-9\\+\\.\\_\\%\\-]{1,256}" +
+                    "\\@" +
+                    "[a-zA-Z0-9][a-zA-Z0-9\\-]{0,64}" +
+                    "(" +
+                    "\\." +
+                    "[a-zA-Z0-9][a-zA-Z0-9\\-]{0,25}" +
+                    ")+"
+    );
+
+    private static final Pattern NAME_ADDR_EMAIL_PATTERN =
+            Pattern.compile("\\s*(\"[^\"]*\"|[^<>\"]+)\\s*<([^<>]+)>\\s*");
+
+    private static String extractAddrSpec(String address) {
+        Matcher match = NAME_ADDR_EMAIL_PATTERN.matcher(address);
+
+        if (match.matches()) {
+            return match.group(2);
+        }
+        return address;
+    }
+
+    /**
+     * Gets the default settings from a shared preferences file associated with your app
+     * @param context is the context of the activity or service
+     * @return the settings object to send with
+     */
+    public static Settings getDefaultSendSettings(Context context) {
+        SharedPreferences sharedPrefs = PreferenceManager.getDefaultSharedPreferences(context);
+        Settings sendSettings = new Settings();
+
+        sendSettings.setMmsc(sharedPrefs.getString("mmsc_url", ""));
+        sendSettings.setProxy(sharedPrefs.getString("mms_proxy", ""));
+        sendSettings.setPort(sharedPrefs.getString("mms_port", ""));
+        sendSettings.setAgent(sharedPrefs.getString("mms_agent", ""));
+        sendSettings.setUserProfileUrl(sharedPrefs.getString("mms_user_agent_profile_url", ""));
+        sendSettings.setUaProfTagName(sharedPrefs.getString("mms_user_agent_tag_name", ""));
+        sendSettings.setStripUnicode(sharedPrefs.getBoolean("strip_unicode", false));
+
+        return sendSettings;
+    }
+
+    /**
+     * Determines whether or not the app is the default SMS app on a device
+     * @param context
+     * @return true if app is default
+     */
+    public static boolean isDefaultSmsApp(Context context) {
+        return context.getPackageName().equals(Telephony.Sms.getDefaultSmsPackage(context));
+
+    }
+
+    /**
+     * Determins whether or not the app has enabled MMS over WiFi
+     * @param context
+     * @return true if enabled
+     */
+    public static boolean isMmsOverWifiEnabled(Context context) {
+        return PreferenceManager.getDefaultSharedPreferences(context).getBoolean("mms_over_wifi", false);
+    }
+
+    public static int getDefaultSubscriptionId() {
+        if (Build.VERSION.SDK_INT >= Build.VERSION_CODES.LOLLIPOP_MR1) {
+            return SmsManager.getDefaultSmsSubscriptionId();
+        } else {
+            return DEFAULT_SUBSCRIPTION_ID;
+        }
+    }
+}
diff --git a/android-smsmms/src/main/java/org/w3c/dom/events/DocumentEvent.java b/android-smsmms/src/main/java/org/w3c/dom/events/DocumentEvent.java
index 76644bc5a..0d2d72001 100755
--- a/android-smsmms/src/main/java/org/w3c/dom/events/DocumentEvent.java
+++ b/android-smsmms/src/main/java/org/w3c/dom/events/DocumentEvent.java
@@ -1,56 +1,56 @@
-/*
- * Copyright (c) 2000 World Wide Web Consortium,
- * (Massachusetts Institute of Technology, Institut National de
- * Recherche en Informatique et en Automatique, Keio University). All
- * Rights Reserved. This program is distributed under the W3C's Software
- * Intellectual Property License. This program is distributed in the
- * hope that it will be useful, but WITHOUT ANY WARRANTY; without even
- * the implied warranty of MERCHANTABILITY or FITNESS FOR A PARTICULAR
- * PURPOSE.
- * See W3C License http://www.w3.org/Consortium/Legal/ for more details.
- */
-
-package org.w3c.dom.events;
-
-import org.w3c.dom.DOMException;
-
-/**
- *  The <code>DocumentEvent</code> interface provides a mechanism by which the 
- * user can create an Event of a type supported by the implementation. It is 
- * expected that the <code>DocumentEvent</code> interface will be 
- * implemented on the same object which implements the <code>Document</code> 
- * interface in an implementation which supports the Event model. 
- * <p>See also the <a href='http://www.w3.org/TR/2000/REC-DOM-Level-2-Events-20001113'>Document Object Model (DOM) Level 2 Events Specification</a>.
- * @since DOM Level 2
- */
-public interface DocumentEvent {
-    /**
-     * 
-     * @param eventType The <code>eventType</code> parameter specifies the 
-     *   type of <code>Event</code> interface to be created. If the 
-     *   <code>Event</code> interface specified is supported by the 
-     *   implementation this method will return a new <code>Event</code> of 
-     *   the interface type requested. If the <code>Event</code> is to be 
-     *   dispatched via the <code>dispatchEvent</code> method the 
-     *   appropriate event init method must be called after creation in 
-     *   order to initialize the <code>Event</code>'s values. As an example, 
-     *   a user wishing to synthesize some kind of <code>UIEvent</code> 
-     *   would call <code>createEvent</code> with the parameter "UIEvents". 
-     *   The <code>initUIEvent</code> method could then be called on the 
-     *   newly created <code>UIEvent</code> to set the specific type of 
-     *   UIEvent to be dispatched and set its context information.The 
-     *   <code>createEvent</code> method is used in creating 
-     *   <code>Event</code>s when it is either inconvenient or unnecessary 
-     *   for the user to create an <code>Event</code> themselves. In cases 
-     *   where the implementation provided <code>Event</code> is 
-     *   insufficient, users may supply their own <code>Event</code> 
-     *   implementations for use with the <code>dispatchEvent</code> method.
-     * @return The newly created <code>Event</code>
-     * @exception DOMException
-     *   NOT_SUPPORTED_ERR: Raised if the implementation does not support the 
-     *   type of <code>Event</code> interface requested
-     */
-    public Event createEvent(String eventType)
-                             throws DOMException;
-
-}
+/*
+ * Copyright (c) 2000 World Wide Web Consortium,
+ * (Massachusetts Institute of Technology, Institut National de
+ * Recherche en Informatique et en Automatique, Keio University). All
+ * Rights Reserved. This program is distributed under the W3C's Software
+ * Intellectual Property License. This program is distributed in the
+ * hope that it will be useful, but WITHOUT ANY WARRANTY; without even
+ * the implied warranty of MERCHANTABILITY or FITNESS FOR A PARTICULAR
+ * PURPOSE.
+ * See W3C License http://www.w3.org/Consortium/Legal/ for more details.
+ */
+
+package org.w3c.dom.events;
+
+import org.w3c.dom.DOMException;
+
+/**
+ *  The <code>DocumentEvent</code> interface provides a mechanism by which the 
+ * user can create an Event of a type supported by the implementation. It is 
+ * expected that the <code>DocumentEvent</code> interface will be 
+ * implemented on the same object which implements the <code>Document</code> 
+ * interface in an implementation which supports the Event model. 
+ * <p>See also the <a href='http://www.w3.org/TR/2000/REC-DOM-Level-2-Events-20001113'>Document Object Model (DOM) Level 2 Events Specification</a>.
+ * @since DOM Level 2
+ */
+public interface DocumentEvent {
+    /**
+     * 
+     * @param eventType The <code>eventType</code> parameter specifies the 
+     *   type of <code>Event</code> interface to be created. If the 
+     *   <code>Event</code> interface specified is supported by the 
+     *   implementation this method will return a new <code>Event</code> of 
+     *   the interface type requested. If the <code>Event</code> is to be 
+     *   dispatched via the <code>dispatchEvent</code> method the 
+     *   appropriate event init method must be called after creation in 
+     *   order to initialize the <code>Event</code>'s values. As an example, 
+     *   a user wishing to synthesize some kind of <code>UIEvent</code> 
+     *   would call <code>createEvent</code> with the parameter "UIEvents". 
+     *   The <code>initUIEvent</code> method could then be called on the 
+     *   newly created <code>UIEvent</code> to set the specific type of 
+     *   UIEvent to be dispatched and set its context information.The 
+     *   <code>createEvent</code> method is used in creating 
+     *   <code>Event</code>s when it is either inconvenient or unnecessary 
+     *   for the user to create an <code>Event</code> themselves. In cases 
+     *   where the implementation provided <code>Event</code> is 
+     *   insufficient, users may supply their own <code>Event</code> 
+     *   implementations for use with the <code>dispatchEvent</code> method.
+     * @return The newly created <code>Event</code>
+     * @exception DOMException
+     *   NOT_SUPPORTED_ERR: Raised if the implementation does not support the 
+     *   type of <code>Event</code> interface requested
+     */
+    public Event createEvent(String eventType)
+                             throws DOMException;
+
+}
diff --git a/android-smsmms/src/main/java/org/w3c/dom/events/Event.java b/android-smsmms/src/main/java/org/w3c/dom/events/Event.java
index 14a9239ed..6b29c4eec 100755
--- a/android-smsmms/src/main/java/org/w3c/dom/events/Event.java
+++ b/android-smsmms/src/main/java/org/w3c/dom/events/Event.java
@@ -1,141 +1,141 @@
-/*
- * Copyright (c) 2000 World Wide Web Consortium,
- * (Massachusetts Institute of Technology, Institut National de
- * Recherche en Informatique et en Automatique, Keio University). All
- * Rights Reserved. This program is distributed under the W3C's Software
- * Intellectual Property License. This program is distributed in the
- * hope that it will be useful, but WITHOUT ANY WARRANTY; without even
- * the implied warranty of MERCHANTABILITY or FITNESS FOR A PARTICULAR
- * PURPOSE.
- * See W3C License http://www.w3.org/Consortium/Legal/ for more details.
- */
-
-package org.w3c.dom.events;
-
-/**
- * The <code>Event</code> interface is used to provide contextual information 
- * about an event to the handler processing the event. An object which 
- * implements the <code>Event</code> interface is generally passed as the 
- * first parameter to an event handler. More specific context information is 
- * passed to event handlers by deriving additional interfaces from 
- * <code>Event</code> which contain information directly relating to the 
- * type of event they accompany. These derived interfaces are also 
- * implemented by the object passed to the event listener. 
- * <p>See also the <a href='http://www.w3.org/TR/2000/REC-DOM-Level-2-Events-20001113'>Document Object Model (DOM) Level 2 Events Specification</a>.
- * @since DOM Level 2
- */
-public interface Event {
-    // PhaseType
-    /**
-     * The current event phase is the capturing phase.
-     */
-    public static final short CAPTURING_PHASE           = 1;
-    /**
-     * The event is currently being evaluated at the target 
-     * <code>EventTarget</code>.
-     */
-    public static final short AT_TARGET                 = 2;
-    /**
-     * The current event phase is the bubbling phase.
-     */
-    public static final short BUBBLING_PHASE            = 3;
-
-    /**
-     * The name of the event (case-insensitive). The name must be an XML name.
-     */
-    public String getType();
-
-    /**
-     * Used to indicate the <code>EventTarget</code> to which the event was 
-     * originally dispatched. 
-     */
-    public EventTarget getTarget();
-
-    /**
-     * Used to indicate the <code>EventTarget</code> whose 
-     * <code>EventListeners</code> are currently being processed. This is 
-     * particularly useful during capturing and bubbling. 
-     */
-    public EventTarget getCurrentTarget();
-
-    /**
-     * Used to indicate which phase of event flow is currently being 
-     * evaluated. 
-     */
-    public short getEventPhase();
-
-    /**
-     * Used to indicate whether or not an event is a bubbling event. If the 
-     * event can bubble the value is true, else the value is false. 
-     */
-    public boolean getBubbles();
-
-    /**
-     * Used to indicate whether or not an event can have its default action 
-     * prevented. If the default action can be prevented the value is true, 
-     * else the value is false. 
-     */
-    public boolean getCancelable();
-
-    /**
-     *  Used to specify the time (in milliseconds relative to the epoch) at 
-     * which the event was created. Due to the fact that some systems may 
-     * not provide this information the value of <code>timeStamp</code> may 
-     * be not available for all events. When not available, a value of 0 
-     * will be returned. Examples of epoch time are the time of the system 
-     * start or 0:0:0 UTC 1st January 1970. 
-     */
-    public long getTimeStamp();
-
-    /**
-     * The <code>stopPropagation</code> method is used prevent further 
-     * propagation of an event during event flow. If this method is called 
-     * by any <code>EventListener</code> the event will cease propagating 
-     * through the tree. The event will complete dispatch to all listeners 
-     * on the current <code>EventTarget</code> before event flow stops. This 
-     * method may be used during any stage of event flow.
-     */
-    public void stopPropagation();
-
-    /**
-     * If an event is cancelable, the <code>preventDefault</code> method is 
-     * used to signify that the event is to be canceled, meaning any default 
-     * action normally taken by the implementation as a result of the event 
-     * will not occur. If, during any stage of event flow, the 
-     * <code>preventDefault</code> method is called the event is canceled. 
-     * Any default action associated with the event will not occur. Calling 
-     * this method for a non-cancelable event has no effect. Once 
-     * <code>preventDefault</code> has been called it will remain in effect 
-     * throughout the remainder of the event's propagation. This method may 
-     * be used during any stage of event flow. 
-     */
-    public void preventDefault();
-
-    /**
-     * The <code>initEvent</code> method is used to initialize the value of an 
-     * <code>Event</code> created through the <code>DocumentEvent</code> 
-     * interface. This method may only be called before the 
-     * <code>Event</code> has been dispatched via the 
-     * <code>dispatchEvent</code> method, though it may be called multiple 
-     * times during that phase if necessary. If called multiple times the 
-     * final invocation takes precedence. If called from a subclass of 
-     * <code>Event</code> interface only the values specified in the 
-     * <code>initEvent</code> method are modified, all other attributes are 
-     * left unchanged.
-     * @param eventTypeArg Specifies the event type. This type may be any 
-     *   event type currently defined in this specification or a new event 
-     *   type.. The string must be an XML name. Any new event type must not 
-     *   begin with any upper, lower, or mixed case version of the string 
-     *   "DOM". This prefix is reserved for future DOM event sets. It is 
-     *   also strongly recommended that third parties adding their own 
-     *   events use their own prefix to avoid confusion and lessen the 
-     *   probability of conflicts with other new events.
-     * @param canBubbleArg Specifies whether or not the event can bubble.
-     * @param cancelableArg Specifies whether or not the event's default 
-     *   action can be prevented.
-     */
-    public void initEvent(String eventTypeArg, 
-                          boolean canBubbleArg, 
-                          boolean cancelableArg);
-
-}
+/*
+ * Copyright (c) 2000 World Wide Web Consortium,
+ * (Massachusetts Institute of Technology, Institut National de
+ * Recherche en Informatique et en Automatique, Keio University). All
+ * Rights Reserved. This program is distributed under the W3C's Software
+ * Intellectual Property License. This program is distributed in the
+ * hope that it will be useful, but WITHOUT ANY WARRANTY; without even
+ * the implied warranty of MERCHANTABILITY or FITNESS FOR A PARTICULAR
+ * PURPOSE.
+ * See W3C License http://www.w3.org/Consortium/Legal/ for more details.
+ */
+
+package org.w3c.dom.events;
+
+/**
+ * The <code>Event</code> interface is used to provide contextual information 
+ * about an event to the handler processing the event. An object which 
+ * implements the <code>Event</code> interface is generally passed as the 
+ * first parameter to an event handler. More specific context information is 
+ * passed to event handlers by deriving additional interfaces from 
+ * <code>Event</code> which contain information directly relating to the 
+ * type of event they accompany. These derived interfaces are also 
+ * implemented by the object passed to the event listener. 
+ * <p>See also the <a href='http://www.w3.org/TR/2000/REC-DOM-Level-2-Events-20001113'>Document Object Model (DOM) Level 2 Events Specification</a>.
+ * @since DOM Level 2
+ */
+public interface Event {
+    // PhaseType
+    /**
+     * The current event phase is the capturing phase.
+     */
+    public static final short CAPTURING_PHASE           = 1;
+    /**
+     * The event is currently being evaluated at the target 
+     * <code>EventTarget</code>.
+     */
+    public static final short AT_TARGET                 = 2;
+    /**
+     * The current event phase is the bubbling phase.
+     */
+    public static final short BUBBLING_PHASE            = 3;
+
+    /**
+     * The name of the event (case-insensitive). The name must be an XML name.
+     */
+    public String getType();
+
+    /**
+     * Used to indicate the <code>EventTarget</code> to which the event was 
+     * originally dispatched. 
+     */
+    public EventTarget getTarget();
+
+    /**
+     * Used to indicate the <code>EventTarget</code> whose 
+     * <code>EventListeners</code> are currently being processed. This is 
+     * particularly useful during capturing and bubbling. 
+     */
+    public EventTarget getCurrentTarget();
+
+    /**
+     * Used to indicate which phase of event flow is currently being 
+     * evaluated. 
+     */
+    public short getEventPhase();
+
+    /**
+     * Used to indicate whether or not an event is a bubbling event. If the 
+     * event can bubble the value is true, else the value is false. 
+     */
+    public boolean getBubbles();
+
+    /**
+     * Used to indicate whether or not an event can have its default action 
+     * prevented. If the default action can be prevented the value is true, 
+     * else the value is false. 
+     */
+    public boolean getCancelable();
+
+    /**
+     *  Used to specify the time (in milliseconds relative to the epoch) at 
+     * which the event was created. Due to the fact that some systems may 
+     * not provide this information the value of <code>timeStamp</code> may 
+     * be not available for all events. When not available, a value of 0 
+     * will be returned. Examples of epoch time are the time of the system 
+     * start or 0:0:0 UTC 1st January 1970. 
+     */
+    public long getTimeStamp();
+
+    /**
+     * The <code>stopPropagation</code> method is used prevent further 
+     * propagation of an event during event flow. If this method is called 
+     * by any <code>EventListener</code> the event will cease propagating 
+     * through the tree. The event will complete dispatch to all listeners 
+     * on the current <code>EventTarget</code> before event flow stops. This 
+     * method may be used during any stage of event flow.
+     */
+    public void stopPropagation();
+
+    /**
+     * If an event is cancelable, the <code>preventDefault</code> method is 
+     * used to signify that the event is to be canceled, meaning any default 
+     * action normally taken by the implementation as a result of the event 
+     * will not occur. If, during any stage of event flow, the 
+     * <code>preventDefault</code> method is called the event is canceled. 
+     * Any default action associated with the event will not occur. Calling 
+     * this method for a non-cancelable event has no effect. Once 
+     * <code>preventDefault</code> has been called it will remain in effect 
+     * throughout the remainder of the event's propagation. This method may 
+     * be used during any stage of event flow. 
+     */
+    public void preventDefault();
+
+    /**
+     * The <code>initEvent</code> method is used to initialize the value of an 
+     * <code>Event</code> created through the <code>DocumentEvent</code> 
+     * interface. This method may only be called before the 
+     * <code>Event</code> has been dispatched via the 
+     * <code>dispatchEvent</code> method, though it may be called multiple 
+     * times during that phase if necessary. If called multiple times the 
+     * final invocation takes precedence. If called from a subclass of 
+     * <code>Event</code> interface only the values specified in the 
+     * <code>initEvent</code> method are modified, all other attributes are 
+     * left unchanged.
+     * @param eventTypeArg Specifies the event type. This type may be any 
+     *   event type currently defined in this specification or a new event 
+     *   type.. The string must be an XML name. Any new event type must not 
+     *   begin with any upper, lower, or mixed case version of the string 
+     *   "DOM". This prefix is reserved for future DOM event sets. It is 
+     *   also strongly recommended that third parties adding their own 
+     *   events use their own prefix to avoid confusion and lessen the 
+     *   probability of conflicts with other new events.
+     * @param canBubbleArg Specifies whether or not the event can bubble.
+     * @param cancelableArg Specifies whether or not the event's default 
+     *   action can be prevented.
+     */
+    public void initEvent(String eventTypeArg, 
+                          boolean canBubbleArg, 
+                          boolean cancelableArg);
+
+}
diff --git a/android-smsmms/src/main/java/org/w3c/dom/events/EventException.java b/android-smsmms/src/main/java/org/w3c/dom/events/EventException.java
index 7a6ff2620..91f261e7d 100755
--- a/android-smsmms/src/main/java/org/w3c/dom/events/EventException.java
+++ b/android-smsmms/src/main/java/org/w3c/dom/events/EventException.java
@@ -1,36 +1,36 @@
-/*
- * Copyright (c) 2000 World Wide Web Consortium,
- * (Massachusetts Institute of Technology, Institut National de
- * Recherche en Informatique et en Automatique, Keio University). All
- * Rights Reserved. This program is distributed under the W3C's Software
- * Intellectual Property License. This program is distributed in the
- * hope that it will be useful, but WITHOUT ANY WARRANTY; without even
- * the implied warranty of MERCHANTABILITY or FITNESS FOR A PARTICULAR
- * PURPOSE.
- * See W3C License http://www.w3.org/Consortium/Legal/ for more details.
- */
-
-package org.w3c.dom.events;
-
-/**
- *  Event operations may throw an <code>EventException</code> as specified in 
- * their method descriptions. 
- * <p>See also the <a href='http://www.w3.org/TR/2000/REC-DOM-Level-2-Events-20001113'>Document Object Model (DOM) Level 2 Events Specification</a>.
- * @since DOM Level 2
- */
-public class EventException extends RuntimeException {
-    public EventException(short code, String message) {
-       super(message);
-       this.code = code;
-    }
-    public short   code;
-    // EventExceptionCode
-    /**
-     *  If the <code>Event</code>'s type was not specified by initializing the 
-     * event before the method was called. Specification of the Event's type 
-     * as <code>null</code> or an empty string will also trigger this 
-     * exception. 
-     */
-    public static final short UNSPECIFIED_EVENT_TYPE_ERR = 0;
-
-}
+/*
+ * Copyright (c) 2000 World Wide Web Consortium,
+ * (Massachusetts Institute of Technology, Institut National de
+ * Recherche en Informatique et en Automatique, Keio University). All
+ * Rights Reserved. This program is distributed under the W3C's Software
+ * Intellectual Property License. This program is distributed in the
+ * hope that it will be useful, but WITHOUT ANY WARRANTY; without even
+ * the implied warranty of MERCHANTABILITY or FITNESS FOR A PARTICULAR
+ * PURPOSE.
+ * See W3C License http://www.w3.org/Consortium/Legal/ for more details.
+ */
+
+package org.w3c.dom.events;
+
+/**
+ *  Event operations may throw an <code>EventException</code> as specified in 
+ * their method descriptions. 
+ * <p>See also the <a href='http://www.w3.org/TR/2000/REC-DOM-Level-2-Events-20001113'>Document Object Model (DOM) Level 2 Events Specification</a>.
+ * @since DOM Level 2
+ */
+public class EventException extends RuntimeException {
+    public EventException(short code, String message) {
+       super(message);
+       this.code = code;
+    }
+    public short   code;
+    // EventExceptionCode
+    /**
+     *  If the <code>Event</code>'s type was not specified by initializing the 
+     * event before the method was called. Specification of the Event's type 
+     * as <code>null</code> or an empty string will also trigger this 
+     * exception. 
+     */
+    public static final short UNSPECIFIED_EVENT_TYPE_ERR = 0;
+
+}
diff --git a/android-smsmms/src/main/java/org/w3c/dom/events/EventListener.java b/android-smsmms/src/main/java/org/w3c/dom/events/EventListener.java
index 1df80202c..f2357db09 100755
--- a/android-smsmms/src/main/java/org/w3c/dom/events/EventListener.java
+++ b/android-smsmms/src/main/java/org/w3c/dom/events/EventListener.java
@@ -1,41 +1,41 @@
-/*
- * Copyright (c) 2000 World Wide Web Consortium,
- * (Massachusetts Institute of Technology, Institut National de
- * Recherche en Informatique et en Automatique, Keio University). All
- * Rights Reserved. This program is distributed under the W3C's Software
- * Intellectual Property License. This program is distributed in the
- * hope that it will be useful, but WITHOUT ANY WARRANTY; without even
- * the implied warranty of MERCHANTABILITY or FITNESS FOR A PARTICULAR
- * PURPOSE.
- * See W3C License http://www.w3.org/Consortium/Legal/ for more details.
- */
-
-package org.w3c.dom.events;
-
-/**
- *  The <code>EventListener</code> interface is the primary method for 
- * handling events. Users implement the <code>EventListener</code> interface 
- * and register their listener on an <code>EventTarget</code> using the 
- * <code>AddEventListener</code> method. The users should also remove their 
- * <code>EventListener</code> from its <code>EventTarget</code> after they 
- * have completed using the listener. 
- * <p> When a <code>Node</code> is copied using the <code>cloneNode</code> 
- * method the <code>EventListener</code>s attached to the source 
- * <code>Node</code> are not attached to the copied <code>Node</code>. If 
- * the user wishes the same <code>EventListener</code>s to be added to the 
- * newly created copy the user must add them manually. 
- * <p>See also the <a href='http://www.w3.org/TR/2000/REC-DOM-Level-2-Events-20001113'>Document Object Model (DOM) Level 2 Events Specification</a>.
- * @since DOM Level 2
- */
-public interface EventListener {
-    /**
-     *  This method is called whenever an event occurs of the type for which 
-     * the <code> EventListener</code> interface was registered. 
-     * @param evt  The <code>Event</code> contains contextual information 
-     *   about the event. It also contains the <code>stopPropagation</code> 
-     *   and <code>preventDefault</code> methods which are used in 
-     *   determining the event's flow and default action. 
-     */
-    public void handleEvent(Event evt);
-
-}
+/*
+ * Copyright (c) 2000 World Wide Web Consortium,
+ * (Massachusetts Institute of Technology, Institut National de
+ * Recherche en Informatique et en Automatique, Keio University). All
+ * Rights Reserved. This program is distributed under the W3C's Software
+ * Intellectual Property License. This program is distributed in the
+ * hope that it will be useful, but WITHOUT ANY WARRANTY; without even
+ * the implied warranty of MERCHANTABILITY or FITNESS FOR A PARTICULAR
+ * PURPOSE.
+ * See W3C License http://www.w3.org/Consortium/Legal/ for more details.
+ */
+
+package org.w3c.dom.events;
+
+/**
+ *  The <code>EventListener</code> interface is the primary method for 
+ * handling events. Users implement the <code>EventListener</code> interface 
+ * and register their listener on an <code>EventTarget</code> using the 
+ * <code>AddEventListener</code> method. The users should also remove their 
+ * <code>EventListener</code> from its <code>EventTarget</code> after they 
+ * have completed using the listener. 
+ * <p> When a <code>Node</code> is copied using the <code>cloneNode</code> 
+ * method the <code>EventListener</code>s attached to the source 
+ * <code>Node</code> are not attached to the copied <code>Node</code>. If 
+ * the user wishes the same <code>EventListener</code>s to be added to the 
+ * newly created copy the user must add them manually. 
+ * <p>See also the <a href='http://www.w3.org/TR/2000/REC-DOM-Level-2-Events-20001113'>Document Object Model (DOM) Level 2 Events Specification</a>.
+ * @since DOM Level 2
+ */
+public interface EventListener {
+    /**
+     *  This method is called whenever an event occurs of the type for which 
+     * the <code> EventListener</code> interface was registered. 
+     * @param evt  The <code>Event</code> contains contextual information 
+     *   about the event. It also contains the <code>stopPropagation</code> 
+     *   and <code>preventDefault</code> methods which are used in 
+     *   determining the event's flow and default action. 
+     */
+    public void handleEvent(Event evt);
+
+}
diff --git a/android-smsmms/src/main/java/org/w3c/dom/events/EventTarget.java b/android-smsmms/src/main/java/org/w3c/dom/events/EventTarget.java
index f07663660..3cbca527b 100755
--- a/android-smsmms/src/main/java/org/w3c/dom/events/EventTarget.java
+++ b/android-smsmms/src/main/java/org/w3c/dom/events/EventTarget.java
@@ -1,102 +1,102 @@
-/*
- * Copyright (c) 2000 World Wide Web Consortium,
- * (Massachusetts Institute of Technology, Institut National de
- * Recherche en Informatique et en Automatique, Keio University). All
- * Rights Reserved. This program is distributed under the W3C's Software
- * Intellectual Property License. This program is distributed in the
- * hope that it will be useful, but WITHOUT ANY WARRANTY; without even
- * the implied warranty of MERCHANTABILITY or FITNESS FOR A PARTICULAR
- * PURPOSE.
- * See W3C License http://www.w3.org/Consortium/Legal/ for more details.
- */
-
-package org.w3c.dom.events;
-
-/**
- *  The <code>EventTarget</code> interface is implemented by all 
- * <code>Nodes</code> in an implementation which supports the DOM Event 
- * Model. Therefore, this interface can be obtained by using 
- * binding-specific casting methods on an instance of the <code>Node</code> 
- * interface. The interface allows registration and removal of 
- * <code>EventListeners</code> on an <code>EventTarget</code> and dispatch 
- * of events to that <code>EventTarget</code>.
- * <p>See also the <a href='http://www.w3.org/TR/2000/REC-DOM-Level-2-Events-20001113'>Document Object Model (DOM) Level 2 Events Specification</a>.
- * @since DOM Level 2
- */
-public interface EventTarget {
-    /**
-     * This method allows the registration of event listeners on the event 
-     * target. If an <code>EventListener</code> is added to an 
-     * <code>EventTarget</code> while it is processing an event, it will not 
-     * be triggered by the current actions but may be triggered during a 
-     * later stage of event flow, such as the bubbling phase. 
-     * <br> If multiple identical <code>EventListener</code>s are registered 
-     * on the same <code>EventTarget</code> with the same parameters the 
-     * duplicate instances are discarded. They do not cause the 
-     * <code>EventListener</code> to be called twice and since they are 
-     * discarded they do not need to be removed with the 
-     * <code>removeEventListener</code> method. 
-     * @param type The event type for which the user is registering
-     * @param listener The <code>listener</code> parameter takes an interface 
-     *   implemented by the user which contains the methods to be called 
-     *   when the event occurs.
-     * @param useCapture If true, <code>useCapture</code> indicates that the 
-     *   user wishes to initiate capture. After initiating capture, all 
-     *   events of the specified type will be dispatched to the registered 
-     *   <code>EventListener</code> before being dispatched to any 
-     *   <code>EventTargets</code> beneath them in the tree. Events which 
-     *   are bubbling upward through the tree will not trigger an 
-     *   <code>EventListener</code> designated to use capture.
-     */
-    public void addEventListener(String type, 
-                                 EventListener listener, 
-                                 boolean useCapture);
-
-    /**
-     * This method allows the removal of event listeners from the event 
-     * target. If an <code>EventListener</code> is removed from an 
-     * <code>EventTarget</code> while it is processing an event, it will not 
-     * be triggered by the current actions. <code>EventListener</code>s can 
-     * never be invoked after being removed.
-     * <br>Calling <code>removeEventListener</code> with arguments which do 
-     * not identify any currently registered <code>EventListener</code> on 
-     * the <code>EventTarget</code> has no effect.
-     * @param type Specifies the event type of the <code>EventListener</code> 
-     *   being removed. 
-     * @param listener The <code>EventListener</code> parameter indicates the 
-     *   <code>EventListener </code> to be removed. 
-     * @param useCapture Specifies whether the <code>EventListener</code> 
-     *   being removed was registered as a capturing listener or not. If a 
-     *   listener was registered twice, one with capture and one without, 
-     *   each must be removed separately. Removal of a capturing listener 
-     *   does not affect a non-capturing version of the same listener, and 
-     *   vice versa. 
-     */
-    public void removeEventListener(String type, 
-                                    EventListener listener, 
-                                    boolean useCapture);
-
-    /**
-     * This method allows the dispatch of events into the implementations 
-     * event model. Events dispatched in this manner will have the same 
-     * capturing and bubbling behavior as events dispatched directly by the 
-     * implementation. The target of the event is the 
-     * <code> EventTarget</code> on which <code>dispatchEvent</code> is 
-     * called. 
-     * @param evt Specifies the event type, behavior, and contextual 
-     *   information to be used in processing the event.
-     * @return The return value of <code>dispatchEvent</code> indicates 
-     *   whether any of the listeners which handled the event called 
-     *   <code>preventDefault</code>. If <code>preventDefault</code> was 
-     *   called the value is false, else the value is true. 
-     * @exception EventException
-     *   UNSPECIFIED_EVENT_TYPE_ERR: Raised if the <code>Event</code>'s type 
-     *   was not specified by initializing the event before 
-     *   <code>dispatchEvent</code> was called. Specification of the 
-     *   <code>Event</code>'s type as <code>null</code> or an empty string 
-     *   will also trigger this exception.
-     */
-    public boolean dispatchEvent(Event evt)
-                                 throws EventException;
-
-}
+/*
+ * Copyright (c) 2000 World Wide Web Consortium,
+ * (Massachusetts Institute of Technology, Institut National de
+ * Recherche en Informatique et en Automatique, Keio University). All
+ * Rights Reserved. This program is distributed under the W3C's Software
+ * Intellectual Property License. This program is distributed in the
+ * hope that it will be useful, but WITHOUT ANY WARRANTY; without even
+ * the implied warranty of MERCHANTABILITY or FITNESS FOR A PARTICULAR
+ * PURPOSE.
+ * See W3C License http://www.w3.org/Consortium/Legal/ for more details.
+ */
+
+package org.w3c.dom.events;
+
+/**
+ *  The <code>EventTarget</code> interface is implemented by all 
+ * <code>Nodes</code> in an implementation which supports the DOM Event 
+ * Model. Therefore, this interface can be obtained by using 
+ * binding-specific casting methods on an instance of the <code>Node</code> 
+ * interface. The interface allows registration and removal of 
+ * <code>EventListeners</code> on an <code>EventTarget</code> and dispatch 
+ * of events to that <code>EventTarget</code>.
+ * <p>See also the <a href='http://www.w3.org/TR/2000/REC-DOM-Level-2-Events-20001113'>Document Object Model (DOM) Level 2 Events Specification</a>.
+ * @since DOM Level 2
+ */
+public interface EventTarget {
+    /**
+     * This method allows the registration of event listeners on the event 
+     * target. If an <code>EventListener</code> is added to an 
+     * <code>EventTarget</code> while it is processing an event, it will not 
+     * be triggered by the current actions but may be triggered during a 
+     * later stage of event flow, such as the bubbling phase. 
+     * <br> If multiple identical <code>EventListener</code>s are registered 
+     * on the same <code>EventTarget</code> with the same parameters the 
+     * duplicate instances are discarded. They do not cause the 
+     * <code>EventListener</code> to be called twice and since they are 
+     * discarded they do not need to be removed with the 
+     * <code>removeEventListener</code> method. 
+     * @param type The event type for which the user is registering
+     * @param listener The <code>listener</code> parameter takes an interface 
+     *   implemented by the user which contains the methods to be called 
+     *   when the event occurs.
+     * @param useCapture If true, <code>useCapture</code> indicates that the 
+     *   user wishes to initiate capture. After initiating capture, all 
+     *   events of the specified type will be dispatched to the registered 
+     *   <code>EventListener</code> before being dispatched to any 
+     *   <code>EventTargets</code> beneath them in the tree. Events which 
+     *   are bubbling upward through the tree will not trigger an 
+     *   <code>EventListener</code> designated to use capture.
+     */
+    public void addEventListener(String type, 
+                                 EventListener listener, 
+                                 boolean useCapture);
+
+    /**
+     * This method allows the removal of event listeners from the event 
+     * target. If an <code>EventListener</code> is removed from an 
+     * <code>EventTarget</code> while it is processing an event, it will not 
+     * be triggered by the current actions. <code>EventListener</code>s can 
+     * never be invoked after being removed.
+     * <br>Calling <code>removeEventListener</code> with arguments which do 
+     * not identify any currently registered <code>EventListener</code> on 
+     * the <code>EventTarget</code> has no effect.
+     * @param type Specifies the event type of the <code>EventListener</code> 
+     *   being removed. 
+     * @param listener The <code>EventListener</code> parameter indicates the 
+     *   <code>EventListener </code> to be removed. 
+     * @param useCapture Specifies whether the <code>EventListener</code> 
+     *   being removed was registered as a capturing listener or not. If a 
+     *   listener was registered twice, one with capture and one without, 
+     *   each must be removed separately. Removal of a capturing listener 
+     *   does not affect a non-capturing version of the same listener, and 
+     *   vice versa. 
+     */
+    public void removeEventListener(String type, 
+                                    EventListener listener, 
+                                    boolean useCapture);
+
+    /**
+     * This method allows the dispatch of events into the implementations 
+     * event model. Events dispatched in this manner will have the same 
+     * capturing and bubbling behavior as events dispatched directly by the 
+     * implementation. The target of the event is the 
+     * <code> EventTarget</code> on which <code>dispatchEvent</code> is 
+     * called. 
+     * @param evt Specifies the event type, behavior, and contextual 
+     *   information to be used in processing the event.
+     * @return The return value of <code>dispatchEvent</code> indicates 
+     *   whether any of the listeners which handled the event called 
+     *   <code>preventDefault</code>. If <code>preventDefault</code> was 
+     *   called the value is false, else the value is true. 
+     * @exception EventException
+     *   UNSPECIFIED_EVENT_TYPE_ERR: Raised if the <code>Event</code>'s type 
+     *   was not specified by initializing the event before 
+     *   <code>dispatchEvent</code> was called. Specification of the 
+     *   <code>Event</code>'s type as <code>null</code> or an empty string 
+     *   will also trigger this exception.
+     */
+    public boolean dispatchEvent(Event evt)
+                                 throws EventException;
+
+}
diff --git a/android-smsmms/src/main/java/org/w3c/dom/smil/ElementLayout.java b/android-smsmms/src/main/java/org/w3c/dom/smil/ElementLayout.java
index 7f3128fae..2cf48589b 100755
--- a/android-smsmms/src/main/java/org/w3c/dom/smil/ElementLayout.java
+++ b/android-smsmms/src/main/java/org/w3c/dom/smil/ElementLayout.java
@@ -1,55 +1,55 @@
-/*
- * Copyright (c) 2000 World Wide Web Consortium,
- * (Massachusetts Institute of Technology, Institut National de
- * Recherche en Informatique et en Automatique, Keio University). All
- * Rights Reserved. This program is distributed under the W3C's Software
- * Intellectual Property License. This program is distributed in the
- * hope that it will be useful, but WITHOUT ANY WARRANTY; without even
- * the implied warranty of MERCHANTABILITY or FITNESS FOR A PARTICULAR
- * PURPOSE. See W3C License http://www.w3.org/Consortium/Legal/ for more
- * details.
- */
-
-package org.w3c.dom.smil;
-
-import org.w3c.dom.DOMException;
-
-/**
- *  This interface is used by SMIL elements root-layout, top-layout and region.
- *  
- */
-public interface ElementLayout {
-    /**
-     * @exception DOMException
-     *    NO_MODIFICATION_ALLOWED_ERR: Raised if this attribute is readonly. 
-     */
-    public String getTitle();
-    public void setTitle(String title)
-                                      throws DOMException;
-
-    /**
-     * @exception DOMException
-     *    NO_MODIFICATION_ALLOWED_ERR: Raised if this attribute is readonly. 
-     */
-    public String getBackgroundColor();
-    public void setBackgroundColor(String backgroundColor)
-                                      throws DOMException;
-
-    /**
-     * @exception DOMException
-     *    NO_MODIFICATION_ALLOWED_ERR: Raised if this attribute is readonly. 
-     */
-    public int getHeight();
-    public void setHeight(int height)
-                                      throws DOMException;
-
-    /**
-     * @exception DOMException
-     *    NO_MODIFICATION_ALLOWED_ERR: Raised if this attribute is readonly. 
-     */
-    public int getWidth();
-    public void setWidth(int width)
-                                      throws DOMException;
-
-}
-
+/*
+ * Copyright (c) 2000 World Wide Web Consortium,
+ * (Massachusetts Institute of Technology, Institut National de
+ * Recherche en Informatique et en Automatique, Keio University). All
+ * Rights Reserved. This program is distributed under the W3C's Software
+ * Intellectual Property License. This program is distributed in the
+ * hope that it will be useful, but WITHOUT ANY WARRANTY; without even
+ * the implied warranty of MERCHANTABILITY or FITNESS FOR A PARTICULAR
+ * PURPOSE. See W3C License http://www.w3.org/Consortium/Legal/ for more
+ * details.
+ */
+
+package org.w3c.dom.smil;
+
+import org.w3c.dom.DOMException;
+
+/**
+ *  This interface is used by SMIL elements root-layout, top-layout and region.
+ *  
+ */
+public interface ElementLayout {
+    /**
+     * @exception DOMException
+     *    NO_MODIFICATION_ALLOWED_ERR: Raised if this attribute is readonly. 
+     */
+    public String getTitle();
+    public void setTitle(String title)
+                                      throws DOMException;
+
+    /**
+     * @exception DOMException
+     *    NO_MODIFICATION_ALLOWED_ERR: Raised if this attribute is readonly. 
+     */
+    public String getBackgroundColor();
+    public void setBackgroundColor(String backgroundColor)
+                                      throws DOMException;
+
+    /**
+     * @exception DOMException
+     *    NO_MODIFICATION_ALLOWED_ERR: Raised if this attribute is readonly. 
+     */
+    public int getHeight();
+    public void setHeight(int height)
+                                      throws DOMException;
+
+    /**
+     * @exception DOMException
+     *    NO_MODIFICATION_ALLOWED_ERR: Raised if this attribute is readonly. 
+     */
+    public int getWidth();
+    public void setWidth(int width)
+                                      throws DOMException;
+
+}
+
diff --git a/android-smsmms/src/main/java/org/w3c/dom/smil/ElementParallelTimeContainer.java b/android-smsmms/src/main/java/org/w3c/dom/smil/ElementParallelTimeContainer.java
index a796bc7be..8c40e9e26 100755
--- a/android-smsmms/src/main/java/org/w3c/dom/smil/ElementParallelTimeContainer.java
+++ b/android-smsmms/src/main/java/org/w3c/dom/smil/ElementParallelTimeContainer.java
@@ -1,40 +1,40 @@
-/*
- * Copyright (c) 2000 World Wide Web Consortium,
- * (Massachusetts Institute of Technology, Institut National de
- * Recherche en Informatique et en Automatique, Keio University). All
- * Rights Reserved. This program is distributed under the W3C's Software
- * Intellectual Property License. This program is distributed in the
- * hope that it will be useful, but WITHOUT ANY WARRANTY; without even
- * the implied warranty of MERCHANTABILITY or FITNESS FOR A PARTICULAR
- * PURPOSE. See W3C License http://www.w3.org/Consortium/Legal/ for more
- * details.
- */
-
-package org.w3c.dom.smil;
-
-import org.w3c.dom.DOMException;
-
-/**
- *  A <code>parallel</code> container defines a simple parallel time grouping 
- * in which multiple elements can play back at the same time.  It may have to 
- * specify a repeat iteration. (?) 
- */
-public interface ElementParallelTimeContainer extends ElementTimeContainer {
-    /**
-     *  Controls the end of the container.  Need to address thr id-ref value. 
-     * @exception DOMException
-     *    NO_MODIFICATION_ALLOWED_ERR: Raised if this attribute is readonly. 
-     */
-    public String getEndSync();
-    public void setEndSync(String endSync)
-                                        throws DOMException;
-
-    /**
-     *  This method returns the implicit duration in seconds. 
-     * @return  The implicit duration in seconds or -1 if the implicit is 
-     *   unknown (indefinite?). 
-     */
-    public float getImplicitDuration();
-
-}
-
+/*
+ * Copyright (c) 2000 World Wide Web Consortium,
+ * (Massachusetts Institute of Technology, Institut National de
+ * Recherche en Informatique et en Automatique, Keio University). All
+ * Rights Reserved. This program is distributed under the W3C's Software
+ * Intellectual Property License. This program is distributed in the
+ * hope that it will be useful, but WITHOUT ANY WARRANTY; without even
+ * the implied warranty of MERCHANTABILITY or FITNESS FOR A PARTICULAR
+ * PURPOSE. See W3C License http://www.w3.org/Consortium/Legal/ for more
+ * details.
+ */
+
+package org.w3c.dom.smil;
+
+import org.w3c.dom.DOMException;
+
+/**
+ *  A <code>parallel</code> container defines a simple parallel time grouping 
+ * in which multiple elements can play back at the same time.  It may have to 
+ * specify a repeat iteration. (?) 
+ */
+public interface ElementParallelTimeContainer extends ElementTimeContainer {
+    /**
+     *  Controls the end of the container.  Need to address thr id-ref value. 
+     * @exception DOMException
+     *    NO_MODIFICATION_ALLOWED_ERR: Raised if this attribute is readonly. 
+     */
+    public String getEndSync();
+    public void setEndSync(String endSync)
+                                        throws DOMException;
+
+    /**
+     *  This method returns the implicit duration in seconds. 
+     * @return  The implicit duration in seconds or -1 if the implicit is 
+     *   unknown (indefinite?). 
+     */
+    public float getImplicitDuration();
+
+}
+
diff --git a/android-smsmms/src/main/java/org/w3c/dom/smil/ElementSequentialTimeContainer.java b/android-smsmms/src/main/java/org/w3c/dom/smil/ElementSequentialTimeContainer.java
index bca584164..6f16b7b72 100755
--- a/android-smsmms/src/main/java/org/w3c/dom/smil/ElementSequentialTimeContainer.java
+++ b/android-smsmms/src/main/java/org/w3c/dom/smil/ElementSequentialTimeContainer.java
@@ -1,21 +1,21 @@
-/*
- * Copyright (c) 2000 World Wide Web Consortium,
- * (Massachusetts Institute of Technology, Institut National de
- * Recherche en Informatique et en Automatique, Keio University). All
- * Rights Reserved. This program is distributed under the W3C's Software
- * Intellectual Property License. This program is distributed in the
- * hope that it will be useful, but WITHOUT ANY WARRANTY; without even
- * the implied warranty of MERCHANTABILITY or FITNESS FOR A PARTICULAR
- * PURPOSE. See W3C License http://www.w3.org/Consortium/Legal/ for more
- * details.
- */
-
-package org.w3c.dom.smil;
-
-/**
- *  A <code>seq</code> container defines a sequence of elements in which 
- * elements play one after the other. 
- */
-public interface ElementSequentialTimeContainer extends ElementTimeContainer {
-}
-
+/*
+ * Copyright (c) 2000 World Wide Web Consortium,
+ * (Massachusetts Institute of Technology, Institut National de
+ * Recherche en Informatique et en Automatique, Keio University). All
+ * Rights Reserved. This program is distributed under the W3C's Software
+ * Intellectual Property License. This program is distributed in the
+ * hope that it will be useful, but WITHOUT ANY WARRANTY; without even
+ * the implied warranty of MERCHANTABILITY or FITNESS FOR A PARTICULAR
+ * PURPOSE. See W3C License http://www.w3.org/Consortium/Legal/ for more
+ * details.
+ */
+
+package org.w3c.dom.smil;
+
+/**
+ *  A <code>seq</code> container defines a sequence of elements in which 
+ * elements play one after the other. 
+ */
+public interface ElementSequentialTimeContainer extends ElementTimeContainer {
+}
+
diff --git a/android-smsmms/src/main/java/org/w3c/dom/smil/ElementTime.java b/android-smsmms/src/main/java/org/w3c/dom/smil/ElementTime.java
index 317cd2f2d..b6b73669d 100755
--- a/android-smsmms/src/main/java/org/w3c/dom/smil/ElementTime.java
+++ b/android-smsmms/src/main/java/org/w3c/dom/smil/ElementTime.java
@@ -1,161 +1,161 @@
-/*
- * Copyright (c) 2000 World Wide Web Consortium,
- * (Massachusetts Institute of Technology, Institut National de
- * Recherche en Informatique et en Automatique, Keio University). All
- * Rights Reserved. This program is distributed under the W3C's Software
- * Intellectual Property License. This program is distributed in the
- * hope that it will be useful, but WITHOUT ANY WARRANTY; without even
- * the implied warranty of MERCHANTABILITY or FITNESS FOR A PARTICULAR
- * PURPOSE. See W3C License http://www.w3.org/Consortium/Legal/ for more
- * details.
- *
- * Difference to the original copy of this file:
- *   1) ADD public static final short FILL_AUTO = 2;
- *   2) ADD public short getFillDefault();
- *   3) AND public void setFillDefault(short fillDefault)
- *                   throws DOMException;
- */
-
-package org.w3c.dom.smil;
-
-import org.w3c.dom.DOMException;
-
-/**
- *  This interface defines the set of timing attributes that are common to all
- * timed elements.
- */
-public interface ElementTime {
-    /**
-     *  The desired value (as a list of times) of the  begin instant of this
-     * node.
-     * @exception DOMException
-     *    NO_MODIFICATION_ALLOWED_ERR: Raised if this attribute is readonly.
-     */
-    public TimeList getBegin();
-    public void setBegin(TimeList begin)
-                     throws DOMException;
-
-    /**
-     *  The list of active  ends for this node.
-     * @exception DOMException
-     *    NO_MODIFICATION_ALLOWED_ERR: Raised if this attribute is readonly.
-     */
-    public TimeList getEnd();
-    public void setEnd(TimeList end)
-                     throws DOMException;
-
-    /**
-     *  The desired simple  duration value of this node in seconds. Negative
-     * value means "indefinite".
-     * @exception DOMException
-     *    NO_MODIFICATION_ALLOWED_ERR: Raised if this attribute is readonly.
-     */
-    public float getDur();
-    public void setDur(float dur)
-                     throws DOMException;
-
-    // restartTypes
-    public static final short RESTART_ALWAYS            = 0;
-    public static final short RESTART_NEVER             = 1;
-    public static final short RESTART_WHEN_NOT_ACTIVE   = 2;
-
-    /**
-     *  A code representing the value of the  restart attribute, as defined
-     * above. Default value is <code>RESTART_ALWAYS</code> .
-     * @exception DOMException
-     *    NO_MODIFICATION_ALLOWED_ERR: Raised if this attribute is readonly.
-     */
-    public short getRestart();
-    public void setRestart(short restart)
-                     throws DOMException;
-
-    // fillTypes
-    public static final short FILL_REMOVE               = 0;
-    public static final short FILL_FREEZE               = 1;
-    public static final short FILL_AUTO                 = 2;
-
-    /**
-     *  A code representing the value of the  fill attribute, as defined
-     * above. Default value is <code>FILL_REMOVE</code> .
-     * @exception DOMException
-     *    NO_MODIFICATION_ALLOWED_ERR: Raised if this attribute is readonly.
-     */
-    public short getFill();
-    public void setFill(short fill)
-                     throws DOMException;
-
-    /**
-     *  The  repeatCount attribute causes the element to play repeatedly
-     * (loop) for the specified number of times. A negative value repeat the
-     * element indefinitely. Default value is 0 (unspecified).
-     * @exception DOMException
-     *    NO_MODIFICATION_ALLOWED_ERR: Raised if this attribute is readonly.
-     */
-    public float getRepeatCount();
-    public void setRepeatCount(float repeatCount)
-                     throws DOMException;
-
-    /**
-     *  The  repeatDur causes the element to play repeatedly (loop) for the
-     * specified duration in milliseconds. Negative means "indefinite".
-     * @exception DOMException
-     *    NO_MODIFICATION_ALLOWED_ERR: Raised if this attribute is readonly.
-     */
-    public float getRepeatDur();
-    public void setRepeatDur(float repeatDur)
-                     throws DOMException;
-
-    /**
-     *  Causes this element to begin the local timeline (subject to sync
-     * constraints).
-     * @return  <code>true</code> if the method call was successful and the
-     *   element was begun. <code>false</code> if the method call failed.
-     *   Possible reasons for failure include:  The element doesn't support
-     *   the <code>beginElement</code> method. (the <code>beginEvent</code>
-     *   attribute is not set to <code>"undefinite"</code> )  The element is
-     *   already active and can't be restart when it is active. (the
-     *   <code>restart</code> attribute is set to <code>"whenNotActive"</code>
-     *    )  The element is active or has been active and can't be restart.
-     *   (the <code>restart</code> attribute is set to <code>"never"</code> ).
-     *
-     */
-    public boolean beginElement();
-
-    /**
-     *  Causes this element to end the local timeline (subject to sync
-     * constraints).
-     * @return  <code>true</code> if the method call was successful and the
-     *   element was endeed. <code>false</code> if method call failed.
-     *   Possible reasons for failure include:  The element doesn't support
-     *   the <code>endElement</code> method. (the <code>endEvent</code>
-     *   attribute is not set to <code>"undefinite"</code> )  The element is
-     *   not active.
-     */
-    public boolean endElement();
-
-    /**
-     *  Causes this element to pause the local timeline (subject to sync
-     * constraints).
-     */
-    public void pauseElement();
-
-    /**
-     *  Causes this element to resume a paused local timeline.
-     */
-    public void resumeElement();
-
-    /**
-     *  Seeks this element to the specified point on the local timeline
-     * (subject to sync constraints).  If this is a timeline, this must seek
-     * the entire timeline (i.e. propagate to all timeChildren).
-     * @param seekTo  The desired position on the local timeline in
-     *   milliseconds.
-     */
-    public void seekElement(float seekTo);
-
-    public short getFillDefault();
-    public void setFillDefault(short fillDefault)
-                     throws DOMException;
-
-}
-
+/*
+ * Copyright (c) 2000 World Wide Web Consortium,
+ * (Massachusetts Institute of Technology, Institut National de
+ * Recherche en Informatique et en Automatique, Keio University). All
+ * Rights Reserved. This program is distributed under the W3C's Software
+ * Intellectual Property License. This program is distributed in the
+ * hope that it will be useful, but WITHOUT ANY WARRANTY; without even
+ * the implied warranty of MERCHANTABILITY or FITNESS FOR A PARTICULAR
+ * PURPOSE. See W3C License http://www.w3.org/Consortium/Legal/ for more
+ * details.
+ *
+ * Difference to the original copy of this file:
+ *   1) ADD public static final short FILL_AUTO = 2;
+ *   2) ADD public short getFillDefault();
+ *   3) AND public void setFillDefault(short fillDefault)
+ *                   throws DOMException;
+ */
+
+package org.w3c.dom.smil;
+
+import org.w3c.dom.DOMException;
+
+/**
+ *  This interface defines the set of timing attributes that are common to all
+ * timed elements.
+ */
+public interface ElementTime {
+    /**
+     *  The desired value (as a list of times) of the  begin instant of this
+     * node.
+     * @exception DOMException
+     *    NO_MODIFICATION_ALLOWED_ERR: Raised if this attribute is readonly.
+     */
+    public TimeList getBegin();
+    public void setBegin(TimeList begin)
+                     throws DOMException;
+
+    /**
+     *  The list of active  ends for this node.
+     * @exception DOMException
+     *    NO_MODIFICATION_ALLOWED_ERR: Raised if this attribute is readonly.
+     */
+    public TimeList getEnd();
+    public void setEnd(TimeList end)
+                     throws DOMException;
+
+    /**
+     *  The desired simple  duration value of this node in seconds. Negative
+     * value means "indefinite".
+     * @exception DOMException
+     *    NO_MODIFICATION_ALLOWED_ERR: Raised if this attribute is readonly.
+     */
+    public float getDur();
+    public void setDur(float dur)
+                     throws DOMException;
+
+    // restartTypes
+    public static final short RESTART_ALWAYS            = 0;
+    public static final short RESTART_NEVER             = 1;
+    public static final short RESTART_WHEN_NOT_ACTIVE   = 2;
+
+    /**
+     *  A code representing the value of the  restart attribute, as defined
+     * above. Default value is <code>RESTART_ALWAYS</code> .
+     * @exception DOMException
+     *    NO_MODIFICATION_ALLOWED_ERR: Raised if this attribute is readonly.
+     */
+    public short getRestart();
+    public void setRestart(short restart)
+                     throws DOMException;
+
+    // fillTypes
+    public static final short FILL_REMOVE               = 0;
+    public static final short FILL_FREEZE               = 1;
+    public static final short FILL_AUTO                 = 2;
+
+    /**
+     *  A code representing the value of the  fill attribute, as defined
+     * above. Default value is <code>FILL_REMOVE</code> .
+     * @exception DOMException
+     *    NO_MODIFICATION_ALLOWED_ERR: Raised if this attribute is readonly.
+     */
+    public short getFill();
+    public void setFill(short fill)
+                     throws DOMException;
+
+    /**
+     *  The  repeatCount attribute causes the element to play repeatedly
+     * (loop) for the specified number of times. A negative value repeat the
+     * element indefinitely. Default value is 0 (unspecified).
+     * @exception DOMException
+     *    NO_MODIFICATION_ALLOWED_ERR: Raised if this attribute is readonly.
+     */
+    public float getRepeatCount();
+    public void setRepeatCount(float repeatCount)
+                     throws DOMException;
+
+    /**
+     *  The  repeatDur causes the element to play repeatedly (loop) for the
+     * specified duration in milliseconds. Negative means "indefinite".
+     * @exception DOMException
+     *    NO_MODIFICATION_ALLOWED_ERR: Raised if this attribute is readonly.
+     */
+    public float getRepeatDur();
+    public void setRepeatDur(float repeatDur)
+                     throws DOMException;
+
+    /**
+     *  Causes this element to begin the local timeline (subject to sync
+     * constraints).
+     * @return  <code>true</code> if the method call was successful and the
+     *   element was begun. <code>false</code> if the method call failed.
+     *   Possible reasons for failure include:  The element doesn't support
+     *   the <code>beginElement</code> method. (the <code>beginEvent</code>
+     *   attribute is not set to <code>"undefinite"</code> )  The element is
+     *   already active and can't be restart when it is active. (the
+     *   <code>restart</code> attribute is set to <code>"whenNotActive"</code>
+     *    )  The element is active or has been active and can't be restart.
+     *   (the <code>restart</code> attribute is set to <code>"never"</code> ).
+     *
+     */
+    public boolean beginElement();
+
+    /**
+     *  Causes this element to end the local timeline (subject to sync
+     * constraints).
+     * @return  <code>true</code> if the method call was successful and the
+     *   element was endeed. <code>false</code> if method call failed.
+     *   Possible reasons for failure include:  The element doesn't support
+     *   the <code>endElement</code> method. (the <code>endEvent</code>
+     *   attribute is not set to <code>"undefinite"</code> )  The element is
+     *   not active.
+     */
+    public boolean endElement();
+
+    /**
+     *  Causes this element to pause the local timeline (subject to sync
+     * constraints).
+     */
+    public void pauseElement();
+
+    /**
+     *  Causes this element to resume a paused local timeline.
+     */
+    public void resumeElement();
+
+    /**
+     *  Seeks this element to the specified point on the local timeline
+     * (subject to sync constraints).  If this is a timeline, this must seek
+     * the entire timeline (i.e. propagate to all timeChildren).
+     * @param seekTo  The desired position on the local timeline in
+     *   milliseconds.
+     */
+    public void seekElement(float seekTo);
+
+    public short getFillDefault();
+    public void setFillDefault(short fillDefault)
+                     throws DOMException;
+
+}
+
diff --git a/android-smsmms/src/main/java/org/w3c/dom/smil/ElementTimeContainer.java b/android-smsmms/src/main/java/org/w3c/dom/smil/ElementTimeContainer.java
index 69b39e820..df557e7d5 100755
--- a/android-smsmms/src/main/java/org/w3c/dom/smil/ElementTimeContainer.java
+++ b/android-smsmms/src/main/java/org/w3c/dom/smil/ElementTimeContainer.java
@@ -1,39 +1,39 @@
-/*
- * Copyright (c) 2000 World Wide Web Consortium,
- * (Massachusetts Institute of Technology, Institut National de
- * Recherche en Informatique et en Automatique, Keio University). All
- * Rights Reserved. This program is distributed under the W3C's Software
- * Intellectual Property License. This program is distributed in the
- * hope that it will be useful, but WITHOUT ANY WARRANTY; without even
- * the implied warranty of MERCHANTABILITY or FITNESS FOR A PARTICULAR
- * PURPOSE. See W3C License http://www.w3.org/Consortium/Legal/ for more
- * details.
- */
-
-package org.w3c.dom.smil;
-
-import org.w3c.dom.NodeList;
-
-/**
- *  This is a placeholder - subject to change. This represents generic 
- * timelines. 
- */
-public interface ElementTimeContainer extends ElementTime {
-    /**
-     *  A NodeList that contains all timed childrens of this node. If there are
-     *  no timed children, the <code>Nodelist</code> is empty.  An iterator 
-     * is more appropriate here than a node list but it requires Traversal 
-     * module support. 
-     */
-    public NodeList getTimeChildren();
-
-    /**
-     *  Returns a list of child elements active at the specified invocation. 
-     * @param instant  The desired position on the local timeline in 
-     *   milliseconds. 
-     * @return  List of timed child-elements active at instant. 
-     */
-    public NodeList getActiveChildrenAt(float instant);
-
-}
-
+/*
+ * Copyright (c) 2000 World Wide Web Consortium,
+ * (Massachusetts Institute of Technology, Institut National de
+ * Recherche en Informatique et en Automatique, Keio University). All
+ * Rights Reserved. This program is distributed under the W3C's Software
+ * Intellectual Property License. This program is distributed in the
+ * hope that it will be useful, but WITHOUT ANY WARRANTY; without even
+ * the implied warranty of MERCHANTABILITY or FITNESS FOR A PARTICULAR
+ * PURPOSE. See W3C License http://www.w3.org/Consortium/Legal/ for more
+ * details.
+ */
+
+package org.w3c.dom.smil;
+
+import org.w3c.dom.NodeList;
+
+/**
+ *  This is a placeholder - subject to change. This represents generic 
+ * timelines. 
+ */
+public interface ElementTimeContainer extends ElementTime {
+    /**
+     *  A NodeList that contains all timed childrens of this node. If there are
+     *  no timed children, the <code>Nodelist</code> is empty.  An iterator 
+     * is more appropriate here than a node list but it requires Traversal 
+     * module support. 
+     */
+    public NodeList getTimeChildren();
+
+    /**
+     *  Returns a list of child elements active at the specified invocation. 
+     * @param instant  The desired position on the local timeline in 
+     *   milliseconds. 
+     * @return  List of timed child-elements active at instant. 
+     */
+    public NodeList getActiveChildrenAt(float instant);
+
+}
+
diff --git a/android-smsmms/src/main/java/org/w3c/dom/smil/SMILDocument.java b/android-smsmms/src/main/java/org/w3c/dom/smil/SMILDocument.java
index e14681067..684d76d5e 100755
--- a/android-smsmms/src/main/java/org/w3c/dom/smil/SMILDocument.java
+++ b/android-smsmms/src/main/java/org/w3c/dom/smil/SMILDocument.java
@@ -1,51 +1,51 @@
-/*
- * Copyright (c) 2000 World Wide Web Consortium,
- * (Massachusetts Institute of Technology, Institut National de
- * Recherche en Informatique et en Automatique, Keio University). All
- * Rights Reserved. This program is distributed under the W3C's Software
- * Intellectual Property License. This program is distributed in the
- * hope that it will be useful, but WITHOUT ANY WARRANTY; without even
- * the implied warranty of MERCHANTABILITY or FITNESS FOR A PARTICULAR
- * PURPOSE. See W3C License http://www.w3.org/Consortium/Legal/ for more
- * details.
- *
- * Difference to the original copy of this file:
- *   1) ADD public SMILElement getHead();
- *   2) ADD public SMILElement getBody();
- *   3) ADD public SMILLayoutElement getLayout();
- */
-
-package org.w3c.dom.smil;
-
-import org.w3c.dom.Document;
-
-/**
- *  A SMIL document is the root of the SMIL Hierarchy and holds the entire
- * content. Beside providing access to the hierarchy, it also provides some
- * convenience methods for accessing certain sets of information from the
- * document.  Cover document timing, document locking?, linking modality and
- * any other document level issues. Are there issues with nested SMIL files?
- * Is it worth talking about different document scenarios, corresponding to
- * differing profiles? E.g. Standalone SMIL, HTML integration, etc.
- */
-public interface SMILDocument extends Document, ElementSequentialTimeContainer {
-
-    /**
-     * Returns the element that contains the layout node of this document,
-     * i.e. the <code>HEAD</code> element.
-     */
-    public SMILElement getHead();
-
-    /**
-     * Returns the element that contains the par's of the document, i.e. the
-     * <code>BODY</code> element.
-     */
-    public SMILElement getBody();
-
-    /**
-     * Returns the element that contains the layout information of the presentation,
-     * i.e. the <code>LAYOUT</code> element.
-     */
-    public SMILLayoutElement getLayout();
-}
-
+/*
+ * Copyright (c) 2000 World Wide Web Consortium,
+ * (Massachusetts Institute of Technology, Institut National de
+ * Recherche en Informatique et en Automatique, Keio University). All
+ * Rights Reserved. This program is distributed under the W3C's Software
+ * Intellectual Property License. This program is distributed in the
+ * hope that it will be useful, but WITHOUT ANY WARRANTY; without even
+ * the implied warranty of MERCHANTABILITY or FITNESS FOR A PARTICULAR
+ * PURPOSE. See W3C License http://www.w3.org/Consortium/Legal/ for more
+ * details.
+ *
+ * Difference to the original copy of this file:
+ *   1) ADD public SMILElement getHead();
+ *   2) ADD public SMILElement getBody();
+ *   3) ADD public SMILLayoutElement getLayout();
+ */
+
+package org.w3c.dom.smil;
+
+import org.w3c.dom.Document;
+
+/**
+ *  A SMIL document is the root of the SMIL Hierarchy and holds the entire
+ * content. Beside providing access to the hierarchy, it also provides some
+ * convenience methods for accessing certain sets of information from the
+ * document.  Cover document timing, document locking?, linking modality and
+ * any other document level issues. Are there issues with nested SMIL files?
+ * Is it worth talking about different document scenarios, corresponding to
+ * differing profiles? E.g. Standalone SMIL, HTML integration, etc.
+ */
+public interface SMILDocument extends Document, ElementSequentialTimeContainer {
+
+    /**
+     * Returns the element that contains the layout node of this document,
+     * i.e. the <code>HEAD</code> element.
+     */
+    public SMILElement getHead();
+
+    /**
+     * Returns the element that contains the par's of the document, i.e. the
+     * <code>BODY</code> element.
+     */
+    public SMILElement getBody();
+
+    /**
+     * Returns the element that contains the layout information of the presentation,
+     * i.e. the <code>LAYOUT</code> element.
+     */
+    public SMILLayoutElement getLayout();
+}
+
diff --git a/android-smsmms/src/main/java/org/w3c/dom/smil/SMILElement.java b/android-smsmms/src/main/java/org/w3c/dom/smil/SMILElement.java
index 748de23fc..1b01159fd 100755
--- a/android-smsmms/src/main/java/org/w3c/dom/smil/SMILElement.java
+++ b/android-smsmms/src/main/java/org/w3c/dom/smil/SMILElement.java
@@ -1,40 +1,40 @@
-/*
- * Copyright (c) 2000 World Wide Web Consortium,
- * (Massachusetts Institute of Technology, Institut National de
- * Recherche en Informatique et en Automatique, Keio University). All
- * Rights Reserved. This program is distributed under the W3C's Software
- * Intellectual Property License. This program is distributed in the
- * hope that it will be useful, but WITHOUT ANY WARRANTY; without even
- * the implied warranty of MERCHANTABILITY or FITNESS FOR A PARTICULAR
- * PURPOSE. See W3C License http://www.w3.org/Consortium/Legal/ for more
- * details.
- */
-
-package org.w3c.dom.smil;
-
-import org.w3c.dom.DOMException;
-import org.w3c.dom.Element;
-
-/**
- *  The <code>SMILElement</code> interface is the base for all SMIL element 
- * types. It follows the model of the <code>HTMLElement</code> in the HTML 
- * DOM, extending the base <code>Element</code> class to denote SMIL-specific 
- * elements. 
- * <p> Note that the <code>SMILElement</code> interface overlaps with the 
- * <code>HTMLElement</code> interface. In practice, an integrated document 
- * profile that include HTML and SMIL modules will effectively implement both 
- * interfaces (see also the DOM documentation discussion of  Inheritance vs 
- * Flattened Views of the API ).  // etc. This needs attention
- */
-public interface SMILElement extends Element {
-    /**
-     *  The unique id.
-     * @exception DOMException
-     *    NO_MODIFICATION_ALLOWED_ERR: Raised if this attribute is readonly. 
-     */
-    public String getId();
-    public void setId(String id)
-                                      throws DOMException;
-
-}
-
+/*
+ * Copyright (c) 2000 World Wide Web Consortium,
+ * (Massachusetts Institute of Technology, Institut National de
+ * Recherche en Informatique et en Automatique, Keio University). All
+ * Rights Reserved. This program is distributed under the W3C's Software
+ * Intellectual Property License. This program is distributed in the
+ * hope that it will be useful, but WITHOUT ANY WARRANTY; without even
+ * the implied warranty of MERCHANTABILITY or FITNESS FOR A PARTICULAR
+ * PURPOSE. See W3C License http://www.w3.org/Consortium/Legal/ for more
+ * details.
+ */
+
+package org.w3c.dom.smil;
+
+import org.w3c.dom.DOMException;
+import org.w3c.dom.Element;
+
+/**
+ *  The <code>SMILElement</code> interface is the base for all SMIL element 
+ * types. It follows the model of the <code>HTMLElement</code> in the HTML 
+ * DOM, extending the base <code>Element</code> class to denote SMIL-specific 
+ * elements. 
+ * <p> Note that the <code>SMILElement</code> interface overlaps with the 
+ * <code>HTMLElement</code> interface. In practice, an integrated document 
+ * profile that include HTML and SMIL modules will effectively implement both 
+ * interfaces (see also the DOM documentation discussion of  Inheritance vs 
+ * Flattened Views of the API ).  // etc. This needs attention
+ */
+public interface SMILElement extends Element {
+    /**
+     *  The unique id.
+     * @exception DOMException
+     *    NO_MODIFICATION_ALLOWED_ERR: Raised if this attribute is readonly. 
+     */
+    public String getId();
+    public void setId(String id)
+                                      throws DOMException;
+
+}
+
diff --git a/android-smsmms/src/main/java/org/w3c/dom/smil/SMILLayoutElement.java b/android-smsmms/src/main/java/org/w3c/dom/smil/SMILLayoutElement.java
index d812dac7b..a03e839ee 100755
--- a/android-smsmms/src/main/java/org/w3c/dom/smil/SMILLayoutElement.java
+++ b/android-smsmms/src/main/java/org/w3c/dom/smil/SMILLayoutElement.java
@@ -1,48 +1,48 @@
-/*
- * Copyright (c) 2000 World Wide Web Consortium,
- * (Massachusetts Institute of Technology, Institut National de
- * Recherche en Informatique et en Automatique, Keio University). All
- * Rights Reserved. This program is distributed under the W3C's Software
- * Intellectual Property License. This program is distributed in the
- * hope that it will be useful, but WITHOUT ANY WARRANTY; without even
- * the implied warranty of MERCHANTABILITY or FITNESS FOR A PARTICULAR
- * PURPOSE. See W3C License http://www.w3.org/Consortium/Legal/ for more
- * details.
- *
- * Difference to the original copy of this file:
- *   1) ADD public SMILRootLayoutElement getRootLayout();
- *   2) ADD public NodeList getRegions();
- */
-
-package org.w3c.dom.smil;
-
-import org.w3c.dom.NodeList;
-
-/**
- *  Declares layout type for the document. See the  LAYOUT element definition .
- *
- */
-public interface SMILLayoutElement extends SMILElement {
-    /**
-     *  The mime type of the layout langage used in this layout element.The
-     * default value of the type attribute is "text/smil-basic-layout".
-     */
-    public String getType();
-
-    /**
-     *  <code>true</code> if the player can understand the mime type,
-     * <code>false</code> otherwise.
-     */
-    public boolean getResolved();
-
-    /**
-     * Returns the root layout element of this document.
-     */
-    public SMILRootLayoutElement getRootLayout();
-
-    /**
-     * Return the region elements of this document.
-     */
-    public NodeList getRegions();
-}
-
+/*
+ * Copyright (c) 2000 World Wide Web Consortium,
+ * (Massachusetts Institute of Technology, Institut National de
+ * Recherche en Informatique et en Automatique, Keio University). All
+ * Rights Reserved. This program is distributed under the W3C's Software
+ * Intellectual Property License. This program is distributed in the
+ * hope that it will be useful, but WITHOUT ANY WARRANTY; without even
+ * the implied warranty of MERCHANTABILITY or FITNESS FOR A PARTICULAR
+ * PURPOSE. See W3C License http://www.w3.org/Consortium/Legal/ for more
+ * details.
+ *
+ * Difference to the original copy of this file:
+ *   1) ADD public SMILRootLayoutElement getRootLayout();
+ *   2) ADD public NodeList getRegions();
+ */
+
+package org.w3c.dom.smil;
+
+import org.w3c.dom.NodeList;
+
+/**
+ *  Declares layout type for the document. See the  LAYOUT element definition .
+ *
+ */
+public interface SMILLayoutElement extends SMILElement {
+    /**
+     *  The mime type of the layout langage used in this layout element.The
+     * default value of the type attribute is "text/smil-basic-layout".
+     */
+    public String getType();
+
+    /**
+     *  <code>true</code> if the player can understand the mime type,
+     * <code>false</code> otherwise.
+     */
+    public boolean getResolved();
+
+    /**
+     * Returns the root layout element of this document.
+     */
+    public SMILRootLayoutElement getRootLayout();
+
+    /**
+     * Return the region elements of this document.
+     */
+    public NodeList getRegions();
+}
+
diff --git a/android-smsmms/src/main/java/org/w3c/dom/smil/SMILMediaElement.java b/android-smsmms/src/main/java/org/w3c/dom/smil/SMILMediaElement.java
index d6a2d2de2..8da749f04 100755
--- a/android-smsmms/src/main/java/org/w3c/dom/smil/SMILMediaElement.java
+++ b/android-smsmms/src/main/java/org/w3c/dom/smil/SMILMediaElement.java
@@ -1,157 +1,157 @@
-/*
- * Copyright (c) 2000 World Wide Web Consortium,
- * (Massachusetts Institute of Technology, Institut National de
- * Recherche en Informatique et en Automatique, Keio University). All
- * Rights Reserved. This program is distributed under the W3C's Software
- * Intellectual Property License. This program is distributed in the
- * hope that it will be useful, but WITHOUT ANY WARRANTY; without even
- * the implied warranty of MERCHANTABILITY or FITNESS FOR A PARTICULAR
- * PURPOSE. See W3C License http://www.w3.org/Consortium/Legal/ for more
- * details.
- */
-
-package org.w3c.dom.smil;
-
-import org.w3c.dom.DOMException;
-
-/**
- *  Declares media content. 
- */
-public interface SMILMediaElement extends ElementTime, SMILElement {
-    /**
-     *  See the  abstract attribute from  . 
-     * @exception DOMException
-     *    NO_MODIFICATION_ALLOWED_ERR: Raised if this attribute is readonly. 
-     */
-    public String getAbstractAttr();
-    public void setAbstractAttr(String abstractAttr)
-                              throws DOMException;
-
-    /**
-     *  See the  alt attribute from  . 
-     * @exception DOMException
-     *    NO_MODIFICATION_ALLOWED_ERR: Raised if this attribute is readonly. 
-     */
-    public String getAlt();
-    public void setAlt(String alt)
-                              throws DOMException;
-
-    /**
-     *  See the  author attribute from  . 
-     * @exception DOMException
-     *    NO_MODIFICATION_ALLOWED_ERR: Raised if this attribute is readonly. 
-     */
-    public String getAuthor();
-    public void setAuthor(String author)
-                              throws DOMException;
-
-    /**
-     *  See the  clipBegin attribute from  . 
-     * @exception DOMException
-     *    NO_MODIFICATION_ALLOWED_ERR: Raised if this attribute is readonly. 
-     */
-    public String getClipBegin();
-    public void setClipBegin(String clipBegin)
-                              throws DOMException;
-
-    /**
-     *  See the  clipEnd attribute from  . 
-     * @exception DOMException
-     *    NO_MODIFICATION_ALLOWED_ERR: Raised if this attribute is readonly. 
-     */
-    public String getClipEnd();
-    public void setClipEnd(String clipEnd)
-                              throws DOMException;
-
-    /**
-     *  See the  copyright attribute from  . 
-     * @exception DOMException
-     *    NO_MODIFICATION_ALLOWED_ERR: Raised if this attribute is readonly. 
-     */
-    public String getCopyright();
-    public void setCopyright(String copyright)
-                              throws DOMException;
-
-    /**
-     *  See the  longdesc attribute from  . 
-     * @exception DOMException
-     *    NO_MODIFICATION_ALLOWED_ERR: Raised if this attribute is readonly. 
-     */
-    public String getLongdesc();
-    public void setLongdesc(String longdesc)
-                              throws DOMException;
-
-    /**
-     *  See the  port attribute from  . 
-     * @exception DOMException
-     *    NO_MODIFICATION_ALLOWED_ERR: Raised if this attribute is readonly. 
-     */
-    public String getPort();
-    public void setPort(String port)
-                              throws DOMException;
-
-    /**
-     *  See the  readIndex attribute from  . 
-     * @exception DOMException
-     *    NO_MODIFICATION_ALLOWED_ERR: Raised if this attribute is readonly. 
-     */
-    public String getReadIndex();
-    public void setReadIndex(String readIndex)
-                              throws DOMException;
-
-    /**
-     *  See the  rtpformat attribute from  . 
-     * @exception DOMException
-     *    NO_MODIFICATION_ALLOWED_ERR: Raised if this attribute is readonly. 
-     */
-    public String getRtpformat();
-    public void setRtpformat(String rtpformat)
-                              throws DOMException;
-
-    /**
-     *  See the  src attribute from  . 
-     * @exception DOMException
-     *    NO_MODIFICATION_ALLOWED_ERR: Raised if this attribute is readonly. 
-     */
-    public String getSrc();
-    public void setSrc(String src)
-                              throws DOMException;
-
-    /**
-     *  See the  stripRepeat attribute from  . 
-     * @exception DOMException
-     *    NO_MODIFICATION_ALLOWED_ERR: Raised if this attribute is readonly. 
-     */
-    public String getStripRepeat();
-    public void setStripRepeat(String stripRepeat)
-                              throws DOMException;
-
-    /**
-     *  See the  title attribute from  . 
-     * @exception DOMException
-     *    NO_MODIFICATION_ALLOWED_ERR: Raised if this attribute is readonly. 
-     */
-    public String getTitle();
-    public void setTitle(String title)
-                              throws DOMException;
-
-    /**
-     *  See the  transport attribute from  . 
-     * @exception DOMException
-     *    NO_MODIFICATION_ALLOWED_ERR: Raised if this attribute is readonly. 
-     */
-    public String getTransport();
-    public void setTransport(String transport)
-                              throws DOMException;
-
-    /**
-     *  See the  type attribute from  . 
-     * @exception DOMException
-     *    NO_MODIFICATION_ALLOWED_ERR: Raised if this attribute is readonly. 
-     */
-    public String getType();
-    public void setType(String type)
-                              throws DOMException;
-
-}
-
+/*
+ * Copyright (c) 2000 World Wide Web Consortium,
+ * (Massachusetts Institute of Technology, Institut National de
+ * Recherche en Informatique et en Automatique, Keio University). All
+ * Rights Reserved. This program is distributed under the W3C's Software
+ * Intellectual Property License. This program is distributed in the
+ * hope that it will be useful, but WITHOUT ANY WARRANTY; without even
+ * the implied warranty of MERCHANTABILITY or FITNESS FOR A PARTICULAR
+ * PURPOSE. See W3C License http://www.w3.org/Consortium/Legal/ for more
+ * details.
+ */
+
+package org.w3c.dom.smil;
+
+import org.w3c.dom.DOMException;
+
+/**
+ *  Declares media content. 
+ */
+public interface SMILMediaElement extends ElementTime, SMILElement {
+    /**
+     *  See the  abstract attribute from  . 
+     * @exception DOMException
+     *    NO_MODIFICATION_ALLOWED_ERR: Raised if this attribute is readonly. 
+     */
+    public String getAbstractAttr();
+    public void setAbstractAttr(String abstractAttr)
+                              throws DOMException;
+
+    /**
+     *  See the  alt attribute from  . 
+     * @exception DOMException
+     *    NO_MODIFICATION_ALLOWED_ERR: Raised if this attribute is readonly. 
+     */
+    public String getAlt();
+    public void setAlt(String alt)
+                              throws DOMException;
+
+    /**
+     *  See the  author attribute from  . 
+     * @exception DOMException
+     *    NO_MODIFICATION_ALLOWED_ERR: Raised if this attribute is readonly. 
+     */
+    public String getAuthor();
+    public void setAuthor(String author)
+                              throws DOMException;
+
+    /**
+     *  See the  clipBegin attribute from  . 
+     * @exception DOMException
+     *    NO_MODIFICATION_ALLOWED_ERR: Raised if this attribute is readonly. 
+     */
+    public String getClipBegin();
+    public void setClipBegin(String clipBegin)
+                              throws DOMException;
+
+    /**
+     *  See the  clipEnd attribute from  . 
+     * @exception DOMException
+     *    NO_MODIFICATION_ALLOWED_ERR: Raised if this attribute is readonly. 
+     */
+    public String getClipEnd();
+    public void setClipEnd(String clipEnd)
+                              throws DOMException;
+
+    /**
+     *  See the  copyright attribute from  . 
+     * @exception DOMException
+     *    NO_MODIFICATION_ALLOWED_ERR: Raised if this attribute is readonly. 
+     */
+    public String getCopyright();
+    public void setCopyright(String copyright)
+                              throws DOMException;
+
+    /**
+     *  See the  longdesc attribute from  . 
+     * @exception DOMException
+     *    NO_MODIFICATION_ALLOWED_ERR: Raised if this attribute is readonly. 
+     */
+    public String getLongdesc();
+    public void setLongdesc(String longdesc)
+                              throws DOMException;
+
+    /**
+     *  See the  port attribute from  . 
+     * @exception DOMException
+     *    NO_MODIFICATION_ALLOWED_ERR: Raised if this attribute is readonly. 
+     */
+    public String getPort();
+    public void setPort(String port)
+                              throws DOMException;
+
+    /**
+     *  See the  readIndex attribute from  . 
+     * @exception DOMException
+     *    NO_MODIFICATION_ALLOWED_ERR: Raised if this attribute is readonly. 
+     */
+    public String getReadIndex();
+    public void setReadIndex(String readIndex)
+                              throws DOMException;
+
+    /**
+     *  See the  rtpformat attribute from  . 
+     * @exception DOMException
+     *    NO_MODIFICATION_ALLOWED_ERR: Raised if this attribute is readonly. 
+     */
+    public String getRtpformat();
+    public void setRtpformat(String rtpformat)
+                              throws DOMException;
+
+    /**
+     *  See the  src attribute from  . 
+     * @exception DOMException
+     *    NO_MODIFICATION_ALLOWED_ERR: Raised if this attribute is readonly. 
+     */
+    public String getSrc();
+    public void setSrc(String src)
+                              throws DOMException;
+
+    /**
+     *  See the  stripRepeat attribute from  . 
+     * @exception DOMException
+     *    NO_MODIFICATION_ALLOWED_ERR: Raised if this attribute is readonly. 
+     */
+    public String getStripRepeat();
+    public void setStripRepeat(String stripRepeat)
+                              throws DOMException;
+
+    /**
+     *  See the  title attribute from  . 
+     * @exception DOMException
+     *    NO_MODIFICATION_ALLOWED_ERR: Raised if this attribute is readonly. 
+     */
+    public String getTitle();
+    public void setTitle(String title)
+                              throws DOMException;
+
+    /**
+     *  See the  transport attribute from  . 
+     * @exception DOMException
+     *    NO_MODIFICATION_ALLOWED_ERR: Raised if this attribute is readonly. 
+     */
+    public String getTransport();
+    public void setTransport(String transport)
+                              throws DOMException;
+
+    /**
+     *  See the  type attribute from  . 
+     * @exception DOMException
+     *    NO_MODIFICATION_ALLOWED_ERR: Raised if this attribute is readonly. 
+     */
+    public String getType();
+    public void setType(String type)
+                              throws DOMException;
+
+}
+
diff --git a/android-smsmms/src/main/java/org/w3c/dom/smil/SMILParElement.java b/android-smsmms/src/main/java/org/w3c/dom/smil/SMILParElement.java
index 0b3da84ba..c59d7a5e8 100755
--- a/android-smsmms/src/main/java/org/w3c/dom/smil/SMILParElement.java
+++ b/android-smsmms/src/main/java/org/w3c/dom/smil/SMILParElement.java
@@ -1,23 +1,23 @@
-/*
- * Copyright (C) 2007-2008 Esmertec AG.
- * Copyright (C) 2007-2008 The Android Open Source Project
- *
- * Licensed under the Apache License, Version 2.0 (the "License");
- * you may not use this file except in compliance with the License.
- * You may obtain a copy of the License at
- *
- *      http://www.apache.org/licenses/LICENSE-2.0
- *
- * Unless required by applicable law or agreed to in writing, software
- * distributed under the License is distributed on an "AS IS" BASIS,
- * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
- * See the License for the specific language governing permissions and
- * limitations under the License.
- */
-
-package org.w3c.dom.smil;
-
-public interface SMILParElement extends ElementParallelTimeContainer,
-        SMILElement {
-
-}
+/*
+ * Copyright (C) 2007-2008 Esmertec AG.
+ * Copyright (C) 2007-2008 The Android Open Source Project
+ *
+ * Licensed under the Apache License, Version 2.0 (the "License");
+ * you may not use this file except in compliance with the License.
+ * You may obtain a copy of the License at
+ *
+ *      http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing, software
+ * distributed under the License is distributed on an "AS IS" BASIS,
+ * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ * See the License for the specific language governing permissions and
+ * limitations under the License.
+ */
+
+package org.w3c.dom.smil;
+
+public interface SMILParElement extends ElementParallelTimeContainer,
+        SMILElement {
+
+}
diff --git a/android-smsmms/src/main/java/org/w3c/dom/smil/SMILRefElement.java b/android-smsmms/src/main/java/org/w3c/dom/smil/SMILRefElement.java
index adeb2b354..7bcf6b946 100755
--- a/android-smsmms/src/main/java/org/w3c/dom/smil/SMILRefElement.java
+++ b/android-smsmms/src/main/java/org/w3c/dom/smil/SMILRefElement.java
@@ -1,20 +1,20 @@
-/*
- * Copyright (c) 2000 World Wide Web Consortium,
- * (Massachusetts Institute of Technology, Institut National de
- * Recherche en Informatique et en Automatique, Keio University). All
- * Rights Reserved. This program is distributed under the W3C's Software
- * Intellectual Property License. This program is distributed in the
- * hope that it will be useful, but WITHOUT ANY WARRANTY; without even
- * the implied warranty of MERCHANTABILITY or FITNESS FOR A PARTICULAR
- * PURPOSE. See W3C License http://www.w3.org/Consortium/Legal/ for more
- * details.
- */
-
-package org.w3c.dom.smil;
-
-/** 
- * // audio, video, ... 
- */
-public interface SMILRefElement extends SMILMediaElement {
-}
-
+/*
+ * Copyright (c) 2000 World Wide Web Consortium,
+ * (Massachusetts Institute of Technology, Institut National de
+ * Recherche en Informatique et en Automatique, Keio University). All
+ * Rights Reserved. This program is distributed under the W3C's Software
+ * Intellectual Property License. This program is distributed in the
+ * hope that it will be useful, but WITHOUT ANY WARRANTY; without even
+ * the implied warranty of MERCHANTABILITY or FITNESS FOR A PARTICULAR
+ * PURPOSE. See W3C License http://www.w3.org/Consortium/Legal/ for more
+ * details.
+ */
+
+package org.w3c.dom.smil;
+
+/** 
+ * // audio, video, ... 
+ */
+public interface SMILRefElement extends SMILMediaElement {
+}
+
diff --git a/android-smsmms/src/main/java/org/w3c/dom/smil/SMILRegionElement.java b/android-smsmms/src/main/java/org/w3c/dom/smil/SMILRegionElement.java
index 9da699816..0f083c2f2 100755
--- a/android-smsmms/src/main/java/org/w3c/dom/smil/SMILRegionElement.java
+++ b/android-smsmms/src/main/java/org/w3c/dom/smil/SMILRegionElement.java
@@ -1,61 +1,61 @@
-/*
- * Copyright (c) 2000 World Wide Web Consortium,
- * (Massachusetts Institute of Technology, Institut National de
- * Recherche en Informatique et en Automatique, Keio University). All
- * Rights Reserved. This program is distributed under the W3C's Software
- * Intellectual Property License. This program is distributed in the
- * hope that it will be useful, but WITHOUT ANY WARRANTY; without even
- * the implied warranty of MERCHANTABILITY or FITNESS FOR A PARTICULAR
- * PURPOSE. See W3C License http://www.w3.org/Consortium/Legal/ for more
- * details.
- *
- * Difference to the original copy of this file:
- *   1) ADD public int getLeft();
- *   2) ADD public void setLeft(int top) throws DOMException;
- *   3) MODIFY public String getTop() to public int getTop();
- *   4) MODIFY public void setTop(String) to public void setTop(int);
- */
-
-package org.w3c.dom.smil;
-
-import org.w3c.dom.DOMException;
-
-/**
- *  Controls the position, size and scaling of media object elements. See the
- * region element definition .
- */
-public interface SMILRegionElement extends SMILElement, ElementLayout {
-    /**
-     * @exception DOMException
-     *    NO_MODIFICATION_ALLOWED_ERR: Raised if this attribute is readonly.
-     */
-    public String getFit();
-    public void setFit(String fit)
-                                      throws DOMException;
-
-    /**
-     * @exception DOMException
-     *    NO_MODIFICATION_ALLOWED_ERR: Raised if this attribute is readonly.
-     */
-    public int getLeft();
-    public void setLeft(int top)
-                                      throws DOMException;
-
-    /**
-     * @exception DOMException
-     *    NO_MODIFICATION_ALLOWED_ERR: Raised if this attribute is readonly.
-     */
-    public int getTop();
-    public void setTop(int top)
-                                      throws DOMException;
-
-    /**
-     * @exception DOMException
-     *    NO_MODIFICATION_ALLOWED_ERR: Raised if this attribute is readonly.
-     */
-    public int getZIndex();
-    public void setZIndex(int zIndex)
-                                      throws DOMException;
-
-}
-
+/*
+ * Copyright (c) 2000 World Wide Web Consortium,
+ * (Massachusetts Institute of Technology, Institut National de
+ * Recherche en Informatique et en Automatique, Keio University). All
+ * Rights Reserved. This program is distributed under the W3C's Software
+ * Intellectual Property License. This program is distributed in the
+ * hope that it will be useful, but WITHOUT ANY WARRANTY; without even
+ * the implied warranty of MERCHANTABILITY or FITNESS FOR A PARTICULAR
+ * PURPOSE. See W3C License http://www.w3.org/Consortium/Legal/ for more
+ * details.
+ *
+ * Difference to the original copy of this file:
+ *   1) ADD public int getLeft();
+ *   2) ADD public void setLeft(int top) throws DOMException;
+ *   3) MODIFY public String getTop() to public int getTop();
+ *   4) MODIFY public void setTop(String) to public void setTop(int);
+ */
+
+package org.w3c.dom.smil;
+
+import org.w3c.dom.DOMException;
+
+/**
+ *  Controls the position, size and scaling of media object elements. See the
+ * region element definition .
+ */
+public interface SMILRegionElement extends SMILElement, ElementLayout {
+    /**
+     * @exception DOMException
+     *    NO_MODIFICATION_ALLOWED_ERR: Raised if this attribute is readonly.
+     */
+    public String getFit();
+    public void setFit(String fit)
+                                      throws DOMException;
+
+    /**
+     * @exception DOMException
+     *    NO_MODIFICATION_ALLOWED_ERR: Raised if this attribute is readonly.
+     */
+    public int getLeft();
+    public void setLeft(int top)
+                                      throws DOMException;
+
+    /**
+     * @exception DOMException
+     *    NO_MODIFICATION_ALLOWED_ERR: Raised if this attribute is readonly.
+     */
+    public int getTop();
+    public void setTop(int top)
+                                      throws DOMException;
+
+    /**
+     * @exception DOMException
+     *    NO_MODIFICATION_ALLOWED_ERR: Raised if this attribute is readonly.
+     */
+    public int getZIndex();
+    public void setZIndex(int zIndex)
+                                      throws DOMException;
+
+}
+
diff --git a/android-smsmms/src/main/java/org/w3c/dom/smil/SMILRegionInterface.java b/android-smsmms/src/main/java/org/w3c/dom/smil/SMILRegionInterface.java
index b5e43c3b2..8cf244151 100755
--- a/android-smsmms/src/main/java/org/w3c/dom/smil/SMILRegionInterface.java
+++ b/android-smsmms/src/main/java/org/w3c/dom/smil/SMILRegionInterface.java
@@ -1,26 +1,26 @@
-/*
- * Copyright (c) 2000 World Wide Web Consortium,
- * (Massachusetts Institute of Technology, Institut National de
- * Recherche en Informatique et en Automatique, Keio University). All
- * Rights Reserved. This program is distributed under the W3C's Software
- * Intellectual Property License. This program is distributed in the
- * hope that it will be useful, but WITHOUT ANY WARRANTY; without even
- * the implied warranty of MERCHANTABILITY or FITNESS FOR A PARTICULAR
- * PURPOSE. See W3C License http://www.w3.org/Consortium/Legal/ for more
- * details.
- */
-
-package org.w3c.dom.smil;
-
-/**
- *  Declares rendering surface for an element. See the  region attribute 
- * definition . 
- */
-public interface SMILRegionInterface {
-    /**
-     */
-    public SMILRegionElement getRegion();
-    public void setRegion(SMILRegionElement region);
-
-}
-
+/*
+ * Copyright (c) 2000 World Wide Web Consortium,
+ * (Massachusetts Institute of Technology, Institut National de
+ * Recherche en Informatique et en Automatique, Keio University). All
+ * Rights Reserved. This program is distributed under the W3C's Software
+ * Intellectual Property License. This program is distributed in the
+ * hope that it will be useful, but WITHOUT ANY WARRANTY; without even
+ * the implied warranty of MERCHANTABILITY or FITNESS FOR A PARTICULAR
+ * PURPOSE. See W3C License http://www.w3.org/Consortium/Legal/ for more
+ * details.
+ */
+
+package org.w3c.dom.smil;
+
+/**
+ *  Declares rendering surface for an element. See the  region attribute 
+ * definition . 
+ */
+public interface SMILRegionInterface {
+    /**
+     */
+    public SMILRegionElement getRegion();
+    public void setRegion(SMILRegionElement region);
+
+}
+
diff --git a/android-smsmms/src/main/java/org/w3c/dom/smil/SMILRegionMediaElement.java b/android-smsmms/src/main/java/org/w3c/dom/smil/SMILRegionMediaElement.java
index 59493cded..76208c346 100755
--- a/android-smsmms/src/main/java/org/w3c/dom/smil/SMILRegionMediaElement.java
+++ b/android-smsmms/src/main/java/org/w3c/dom/smil/SMILRegionMediaElement.java
@@ -1,22 +1,22 @@
-/*
- * Copyright (C) 2007-2008 Esmertec AG.
- * Copyright (C) 2007-2008 The Android Open Source Project
- *
- * Licensed under the Apache License, Version 2.0 (the "License");
- * you may not use this file except in compliance with the License.
- * You may obtain a copy of the License at
- *
- *      http://www.apache.org/licenses/LICENSE-2.0
- *
- * Unless required by applicable law or agreed to in writing, software
- * distributed under the License is distributed on an "AS IS" BASIS,
- * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
- * See the License for the specific language governing permissions and
- * limitations under the License.
- */
-
-package org.w3c.dom.smil;
-
-public interface SMILRegionMediaElement extends SMILMediaElement,
-        SMILRegionInterface {
-}
+/*
+ * Copyright (C) 2007-2008 Esmertec AG.
+ * Copyright (C) 2007-2008 The Android Open Source Project
+ *
+ * Licensed under the Apache License, Version 2.0 (the "License");
+ * you may not use this file except in compliance with the License.
+ * You may obtain a copy of the License at
+ *
+ *      http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing, software
+ * distributed under the License is distributed on an "AS IS" BASIS,
+ * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ * See the License for the specific language governing permissions and
+ * limitations under the License.
+ */
+
+package org.w3c.dom.smil;
+
+public interface SMILRegionMediaElement extends SMILMediaElement,
+        SMILRegionInterface {
+}
diff --git a/android-smsmms/src/main/java/org/w3c/dom/smil/SMILRootLayoutElement.java b/android-smsmms/src/main/java/org/w3c/dom/smil/SMILRootLayoutElement.java
index 327ecd6b2..6c8a2bc4d 100755
--- a/android-smsmms/src/main/java/org/w3c/dom/smil/SMILRootLayoutElement.java
+++ b/android-smsmms/src/main/java/org/w3c/dom/smil/SMILRootLayoutElement.java
@@ -1,21 +1,21 @@
-/*
- * Copyright (c) 2000 World Wide Web Consortium,
- * (Massachusetts Institute of Technology, Institut National de
- * Recherche en Informatique et en Automatique, Keio University). All
- * Rights Reserved. This program is distributed under the W3C's Software
- * Intellectual Property License. This program is distributed in the
- * hope that it will be useful, but WITHOUT ANY WARRANTY; without even
- * the implied warranty of MERCHANTABILITY or FITNESS FOR A PARTICULAR
- * PURPOSE. See W3C License http://www.w3.org/Consortium/Legal/ for more
- * details.
- */
-
-package org.w3c.dom.smil;
-
-/**
- *  Declares layout properties for the root-layout element. See the  
- * root-layout element definition . 
- */
-public interface SMILRootLayoutElement extends SMILElement, ElementLayout {
-}
-
+/*
+ * Copyright (c) 2000 World Wide Web Consortium,
+ * (Massachusetts Institute of Technology, Institut National de
+ * Recherche en Informatique et en Automatique, Keio University). All
+ * Rights Reserved. This program is distributed under the W3C's Software
+ * Intellectual Property License. This program is distributed in the
+ * hope that it will be useful, but WITHOUT ANY WARRANTY; without even
+ * the implied warranty of MERCHANTABILITY or FITNESS FOR A PARTICULAR
+ * PURPOSE. See W3C License http://www.w3.org/Consortium/Legal/ for more
+ * details.
+ */
+
+package org.w3c.dom.smil;
+
+/**
+ *  Declares layout properties for the root-layout element. See the  
+ * root-layout element definition . 
+ */
+public interface SMILRootLayoutElement extends SMILElement, ElementLayout {
+}
+
diff --git a/android-smsmms/src/main/java/org/w3c/dom/smil/Time.java b/android-smsmms/src/main/java/org/w3c/dom/smil/Time.java
index 72fe08668..4852c60fe 100755
--- a/android-smsmms/src/main/java/org/w3c/dom/smil/Time.java
+++ b/android-smsmms/src/main/java/org/w3c/dom/smil/Time.java
@@ -1,119 +1,119 @@
-/*
- * Copyright (c) 2000 World Wide Web Consortium,
- * (Massachusetts Institute of Technology, Institut National de
- * Recherche en Informatique et en Automatique, Keio University). All
- * Rights Reserved. This program is distributed under the W3C's Software
- * Intellectual Property License. This program is distributed in the
- * hope that it will be useful, but WITHOUT ANY WARRANTY; without even
- * the implied warranty of MERCHANTABILITY or FITNESS FOR A PARTICULAR
- * PURPOSE. See W3C License http://www.w3.org/Consortium/Legal/ for more
- * details.
- */
-
-package org.w3c.dom.smil;
-
-import org.w3c.dom.DOMException;
-import org.w3c.dom.Element;
-
-/**
- *  The <code>Time</code> interface is a datatype that represents times within 
- * the timegraph. A <code>Time</code> has a type, key values to describe the 
- * time, and a boolean to indicate whether the values are currently 
- * unresolved.  Still need to address the wallclock values. 
- */
-public interface Time {
-    /**
-     *  A boolean indicating whether the current <code>Time</code> has been 
-     * fully resolved to the document schedule.  Note that for this to be 
-     * true, the current <code>Time</code> must be defined (not indefinite), 
-     * the syncbase and all <code>Time</code> 's that the syncbase depends on 
-     * must be defined (not indefinite), and the begin <code>Time</code> of 
-     * all ascendent time containers of this element and all <code>Time</code>
-     *  elements that this depends upon must be defined (not indefinite). 
-     * <br> If this <code>Time</code> is based upon an event, this 
-     * <code>Time</code> will only be resolved once the specified event has 
-     * happened, subject to the constraints of the time container. 
-     * <br> Note that this may change from true to false when the parent time 
-     * container ends its simple duration (including when it repeats or 
-     * restarts). 
-     */
-    public boolean getResolved();
-
-    /**
-     *  The clock value in seconds relative to the parent time container begin.
-     *  This indicates the resolved time relationship to the parent time 
-     * container.  This is only valid if resolved is true. 
-     */
-    public double getResolvedOffset();
-
-    // TimeTypes
-    public static final short SMIL_TIME_INDEFINITE      = 0;
-    public static final short SMIL_TIME_OFFSET          = 1;
-    public static final short SMIL_TIME_SYNC_BASED      = 2;
-    public static final short SMIL_TIME_EVENT_BASED     = 3;
-    public static final short SMIL_TIME_WALLCLOCK       = 4;
-    public static final short SMIL_TIME_MEDIA_MARKER    = 5;
-
-    /**
-     *  A code representing the type of the underlying object, as defined 
-     * above. 
-     */
-    public short getTimeType();
-
-    /**
-     *  The clock value in seconds relative to the syncbase or eventbase. 
-     * Default value is <code>0</code> . 
-     * @exception DOMException
-     *    NO_MODIFICATION_ALLOWED_ERR: Raised on attempts to modify this 
-     *   readonly attribute. 
-     */
-    public double getOffset();
-    public void setOffset(double offset)
-                                      throws DOMException;
-
-    /**
-     *  The base element for a sync-based or event-based time. 
-     * @exception DOMException
-     *    NO_MODIFICATION_ALLOWED_ERR: Raised on attempts to modify this 
-     *   readonly attribute. 
-     */
-    public Element getBaseElement();
-    public void setBaseElement(Element baseElement)
-                                      throws DOMException;
-
-    /**
-     *  If <code>true</code> , indicates that a sync-based time is relative to 
-     * the begin of the baseElement.  If <code>false</code> , indicates that a
-     *  sync-based time is relative to the active end of the baseElement. 
-     * @exception DOMException
-     *    NO_MODIFICATION_ALLOWED_ERR: Raised on attempts to modify this 
-     *   readonly attribute. 
-     */
-    public boolean getBaseBegin();
-    public void setBaseBegin(boolean baseBegin)
-                                      throws DOMException;
-
-    /**
-     *  The name of the event for an event-based time. Default value is 
-     * <code>null</code> . 
-     * @exception DOMException
-     *    NO_MODIFICATION_ALLOWED_ERR: Raised on attempts to modify this 
-     *   readonly attribute. 
-     */
-    public String getEvent();
-    public void setEvent(String event)
-                                      throws DOMException;
-
-    /**
-     *  The name of the marker from the media element, for media marker times. 
-     * Default value is <code>null</code> . 
-     * @exception DOMException
-     *    NO_MODIFICATION_ALLOWED_ERR: Raised on attempts to modify this 
-     *   readonly attribute. 
-     */
-    public String getMarker();
-    public void setMarker(String marker)
-                                      throws DOMException;
-
-}
-
+/*
+ * Copyright (c) 2000 World Wide Web Consortium,
+ * (Massachusetts Institute of Technology, Institut National de
+ * Recherche en Informatique et en Automatique, Keio University). All
+ * Rights Reserved. This program is distributed under the W3C's Software
+ * Intellectual Property License. This program is distributed in the
+ * hope that it will be useful, but WITHOUT ANY WARRANTY; without even
+ * the implied warranty of MERCHANTABILITY or FITNESS FOR A PARTICULAR
+ * PURPOSE. See W3C License http://www.w3.org/Consortium/Legal/ for more
+ * details.
+ */
+
+package org.w3c.dom.smil;
+
+import org.w3c.dom.DOMException;
+import org.w3c.dom.Element;
+
+/**
+ *  The <code>Time</code> interface is a datatype that represents times within 
+ * the timegraph. A <code>Time</code> has a type, key values to describe the 
+ * time, and a boolean to indicate whether the values are currently 
+ * unresolved.  Still need to address the wallclock values. 
+ */
+public interface Time {
+    /**
+     *  A boolean indicating whether the current <code>Time</code> has been 
+     * fully resolved to the document schedule.  Note that for this to be 
+     * true, the current <code>Time</code> must be defined (not indefinite), 
+     * the syncbase and all <code>Time</code> 's that the syncbase depends on 
+     * must be defined (not indefinite), and the begin <code>Time</code> of 
+     * all ascendent time containers of this element and all <code>Time</code>
+     *  elements that this depends upon must be defined (not indefinite). 
+     * <br> If this <code>Time</code> is based upon an event, this 
+     * <code>Time</code> will only be resolved once the specified event has 
+     * happened, subject to the constraints of the time container. 
+     * <br> Note that this may change from true to false when the parent time 
+     * container ends its simple duration (including when it repeats or 
+     * restarts). 
+     */
+    public boolean getResolved();
+
+    /**
+     *  The clock value in seconds relative to the parent time container begin.
+     *  This indicates the resolved time relationship to the parent time 
+     * container.  This is only valid if resolved is true. 
+     */
+    public double getResolvedOffset();
+
+    // TimeTypes
+    public static final short SMIL_TIME_INDEFINITE      = 0;
+    public static final short SMIL_TIME_OFFSET          = 1;
+    public static final short SMIL_TIME_SYNC_BASED      = 2;
+    public static final short SMIL_TIME_EVENT_BASED     = 3;
+    public static final short SMIL_TIME_WALLCLOCK       = 4;
+    public static final short SMIL_TIME_MEDIA_MARKER    = 5;
+
+    /**
+     *  A code representing the type of the underlying object, as defined 
+     * above. 
+     */
+    public short getTimeType();
+
+    /**
+     *  The clock value in seconds relative to the syncbase or eventbase. 
+     * Default value is <code>0</code> . 
+     * @exception DOMException
+     *    NO_MODIFICATION_ALLOWED_ERR: Raised on attempts to modify this 
+     *   readonly attribute. 
+     */
+    public double getOffset();
+    public void setOffset(double offset)
+                                      throws DOMException;
+
+    /**
+     *  The base element for a sync-based or event-based time. 
+     * @exception DOMException
+     *    NO_MODIFICATION_ALLOWED_ERR: Raised on attempts to modify this 
+     *   readonly attribute. 
+     */
+    public Element getBaseElement();
+    public void setBaseElement(Element baseElement)
+                                      throws DOMException;
+
+    /**
+     *  If <code>true</code> , indicates that a sync-based time is relative to 
+     * the begin of the baseElement.  If <code>false</code> , indicates that a
+     *  sync-based time is relative to the active end of the baseElement. 
+     * @exception DOMException
+     *    NO_MODIFICATION_ALLOWED_ERR: Raised on attempts to modify this 
+     *   readonly attribute. 
+     */
+    public boolean getBaseBegin();
+    public void setBaseBegin(boolean baseBegin)
+                                      throws DOMException;
+
+    /**
+     *  The name of the event for an event-based time. Default value is 
+     * <code>null</code> . 
+     * @exception DOMException
+     *    NO_MODIFICATION_ALLOWED_ERR: Raised on attempts to modify this 
+     *   readonly attribute. 
+     */
+    public String getEvent();
+    public void setEvent(String event)
+                                      throws DOMException;
+
+    /**
+     *  The name of the marker from the media element, for media marker times. 
+     * Default value is <code>null</code> . 
+     * @exception DOMException
+     *    NO_MODIFICATION_ALLOWED_ERR: Raised on attempts to modify this 
+     *   readonly attribute. 
+     */
+    public String getMarker();
+    public void setMarker(String marker)
+                                      throws DOMException;
+
+}
+
diff --git a/android-smsmms/src/main/java/org/w3c/dom/smil/TimeList.java b/android-smsmms/src/main/java/org/w3c/dom/smil/TimeList.java
index 7cec133fa..5bee83889 100755
--- a/android-smsmms/src/main/java/org/w3c/dom/smil/TimeList.java
+++ b/android-smsmms/src/main/java/org/w3c/dom/smil/TimeList.java
@@ -1,41 +1,41 @@
-/*
- * Copyright (c) 2000 World Wide Web Consortium,
- * (Massachusetts Institute of Technology, Institut National de
- * Recherche en Informatique et en Automatique, Keio University). All
- * Rights Reserved. This program is distributed under the W3C's Software
- * Intellectual Property License. This program is distributed in the
- * hope that it will be useful, but WITHOUT ANY WARRANTY; without even
- * the implied warranty of MERCHANTABILITY or FITNESS FOR A PARTICULAR
- * PURPOSE. See W3C License http://www.w3.org/Consortium/Legal/ for more
- * details.
- */
-
-package org.w3c.dom.smil;
-
-/**
- *  The <code>TimeList</code> interface provides the abstraction of an ordered 
- * collection of times, without defining or constraining how this collection 
- * is implemented.
- * <p> The items in the <code>TimeList</code> are accessible via an integral 
- * index, starting from 0. 
- */
-public interface TimeList {
-    /**
-     *  Returns the <code>index</code> th item in the collection. If 
-     * <code>index</code> is greater than or equal to the number of times in 
-     * the list, this returns <code>null</code> .
-     * @param index  Index into the collection.
-     * @return  The time at the <code>index</code> th position in the 
-     *   <code>TimeList</code> , or <code>null</code> if that is not a valid 
-     *   index.
-     */
-    public Time item(int index);
-
-    /**
-     *  The number of times in the list. The range of valid child time indices 
-     * is 0 to <code>length-1</code> inclusive. 
-     */
-    public int getLength();
-
-}
-
+/*
+ * Copyright (c) 2000 World Wide Web Consortium,
+ * (Massachusetts Institute of Technology, Institut National de
+ * Recherche en Informatique et en Automatique, Keio University). All
+ * Rights Reserved. This program is distributed under the W3C's Software
+ * Intellectual Property License. This program is distributed in the
+ * hope that it will be useful, but WITHOUT ANY WARRANTY; without even
+ * the implied warranty of MERCHANTABILITY or FITNESS FOR A PARTICULAR
+ * PURPOSE. See W3C License http://www.w3.org/Consortium/Legal/ for more
+ * details.
+ */
+
+package org.w3c.dom.smil;
+
+/**
+ *  The <code>TimeList</code> interface provides the abstraction of an ordered 
+ * collection of times, without defining or constraining how this collection 
+ * is implemented.
+ * <p> The items in the <code>TimeList</code> are accessible via an integral 
+ * index, starting from 0. 
+ */
+public interface TimeList {
+    /**
+     *  Returns the <code>index</code> th item in the collection. If 
+     * <code>index</code> is greater than or equal to the number of times in 
+     * the list, this returns <code>null</code> .
+     * @param index  Index into the collection.
+     * @return  The time at the <code>index</code> th position in the 
+     *   <code>TimeList</code> , or <code>null</code> if that is not a valid 
+     *   index.
+     */
+    public Time item(int index);
+
+    /**
+     *  The number of times in the list. The range of valid child time indices 
+     * is 0 to <code>length-1</code> inclusive. 
+     */
+    public int getLength();
+
+}
+
diff --git a/android-smsmms/src/main/res/drawable/ic_forward_black_24dp.xml b/android-smsmms/src/main/res/drawable/ic_forward_black_24dp.xml
index 06ceeb505..b15c44d38 100644
--- a/android-smsmms/src/main/res/drawable/ic_forward_black_24dp.xml
+++ b/android-smsmms/src/main/res/drawable/ic_forward_black_24dp.xml
@@ -1,27 +1,27 @@
-<!--
-  ~ Copyright (C) 2017 Moez Bhatti <moez.bhatti@gmail.com>
-  ~
-  ~ This file is part of QKSMS.
-  ~
-  ~ QKSMS is free software: you can redistribute it and/or modify
-  ~ it under the terms of the GNU General Public License as published by
-  ~ the Free Software Foundation, either version 3 of the License, or
-  ~ (at your option) any later version.
-  ~
-  ~ QKSMS is distributed in the hope that it will be useful,
-  ~ but WITHOUT ANY WARRANTY; without even the implied warranty of
-  ~ MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
-  ~ GNU General Public License for more details.
-  ~
-  ~ You should have received a copy of the GNU General Public License
-  ~ along with QKSMS.  If not, see <http://www.gnu.org/licenses/>.
-  -->
-<vector xmlns:android="http://schemas.android.com/apk/res/android"
-        android:width="24dp"
-        android:height="24dp"
-        android:viewportWidth="24.0"
-        android:viewportHeight="24.0">
-    <path
-        android:fillColor="#FF000000"
-        android:pathData="M12,8V4l8,8 -8,8v-4H4V8z"/>
-</vector>
+<!--
+  ~ Copyright (C) 2017 Moez Bhatti <moez.bhatti@gmail.com>
+  ~
+  ~ This file is part of QKSMS.
+  ~
+  ~ QKSMS is free software: you can redistribute it and/or modify
+  ~ it under the terms of the GNU General Public License as published by
+  ~ the Free Software Foundation, either version 3 of the License, or
+  ~ (at your option) any later version.
+  ~
+  ~ QKSMS is distributed in the hope that it will be useful,
+  ~ but WITHOUT ANY WARRANTY; without even the implied warranty of
+  ~ MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+  ~ GNU General Public License for more details.
+  ~
+  ~ You should have received a copy of the GNU General Public License
+  ~ along with QKSMS.  If not, see <http://www.gnu.org/licenses/>.
+  -->
+<vector xmlns:android="http://schemas.android.com/apk/res/android"
+        android:width="24dp"
+        android:height="24dp"
+        android:viewportWidth="24.0"
+        android:viewportHeight="24.0">
+    <path
+        android:fillColor="#FF000000"
+        android:pathData="M12,8V4l8,8 -8,8v-4H4V8z"/>
+</vector>
diff --git a/android-smsmms/src/main/res/drawable/ic_stop_black_24dp.xml b/android-smsmms/src/main/res/drawable/ic_stop_black_24dp.xml
index e2c4aa31a..37ba127e9 100644
--- a/android-smsmms/src/main/res/drawable/ic_stop_black_24dp.xml
+++ b/android-smsmms/src/main/res/drawable/ic_stop_black_24dp.xml
@@ -1,23 +1,23 @@
-<!--
-  ~ Copyright (C) 2017 Moez Bhatti <moez.bhatti@gmail.com>
-  ~
-  ~ This file is part of QKSMS.
-  ~
-  ~ QKSMS is free software: you can redistribute it and/or modify
-  ~ it under the terms of the GNU General Public License as published by
-  ~ the Free Software Foundation, either version 3 of the License, or
-  ~ (at your option) any later version.
-  ~
-  ~ QKSMS is distributed in the hope that it will be useful,
-  ~ but WITHOUT ANY WARRANTY; without even the implied warranty of
-  ~ MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
-  ~ GNU General Public License for more details.
-  ~
-  ~ You should have received a copy of the GNU General Public License
-  ~ along with QKSMS.  If not, see <http://www.gnu.org/licenses/>.
-  -->
-<vector android:height="24dp" android:tint="#FFFFFF"
-    android:viewportHeight="24.0" android:viewportWidth="24.0"
-    android:width="24dp" xmlns:android="http://schemas.android.com/apk/res/android">
-    <path android:fillColor="#FF000000" android:pathData="M6,6h12v12H6z"/>
-</vector>
+<!--
+  ~ Copyright (C) 2017 Moez Bhatti <moez.bhatti@gmail.com>
+  ~
+  ~ This file is part of QKSMS.
+  ~
+  ~ QKSMS is free software: you can redistribute it and/or modify
+  ~ it under the terms of the GNU General Public License as published by
+  ~ the Free Software Foundation, either version 3 of the License, or
+  ~ (at your option) any later version.
+  ~
+  ~ QKSMS is distributed in the hope that it will be useful,
+  ~ but WITHOUT ANY WARRANTY; without even the implied warranty of
+  ~ MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+  ~ GNU General Public License for more details.
+  ~
+  ~ You should have received a copy of the GNU General Public License
+  ~ along with QKSMS.  If not, see <http://www.gnu.org/licenses/>.
+  -->
+<vector android:height="24dp" android:tint="#FFFFFF"
+    android:viewportHeight="24.0" android:viewportWidth="24.0"
+    android:width="24dp" xmlns:android="http://schemas.android.com/apk/res/android">
+    <path android:fillColor="#FF000000" android:pathData="M6,6h12v12H6z"/>
+</vector>
diff --git a/android-smsmms/src/main/res/drawable/ic_translate_black_24dp.xml b/android-smsmms/src/main/res/drawable/ic_translate_black_24dp.xml
index f01877277..f502d3c0e 100644
--- a/android-smsmms/src/main/res/drawable/ic_translate_black_24dp.xml
+++ b/android-smsmms/src/main/res/drawable/ic_translate_black_24dp.xml
@@ -1,27 +1,27 @@
-<!--
-  ~ Copyright (C) 2017 Moez Bhatti <moez.bhatti@gmail.com>
-  ~
-  ~ This file is part of QKSMS.
-  ~
-  ~ QKSMS is free software: you can redistribute it and/or modify
-  ~ it under the terms of the GNU General Public License as published by
-  ~ the Free Software Foundation, either version 3 of the License, or
-  ~ (at your option) any later version.
-  ~
-  ~ QKSMS is distributed in the hope that it will be useful,
-  ~ but WITHOUT ANY WARRANTY; without even the implied warranty of
-  ~ MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
-  ~ GNU General Public License for more details.
-  ~
-  ~ You should have received a copy of the GNU General Public License
-  ~ along with QKSMS.  If not, see <http://www.gnu.org/licenses/>.
-  -->
-<vector xmlns:android="http://schemas.android.com/apk/res/android"
-        android:width="24dp"
-        android:height="24dp"
-        android:viewportWidth="24.0"
-        android:viewportHeight="24.0">
-    <path
-        android:fillColor="#FF000000"
-        android:pathData="M12.87,15.07l-2.54,-2.51 0.03,-0.03c1.74,-1.94 2.98,-4.17 3.71,-6.53L17,6L17,4h-7L10,2L8,2v2L1,4v1.99h11.17C11.5,7.92 10.44,9.75 9,11.35 8.07,10.32 7.3,9.19 6.69,8h-2c0.73,1.63 1.73,3.17 2.98,4.56l-5.09,5.02L4,19l5,-5 3.11,3.11 0.76,-2.04zM18.5,10h-2L12,22h2l1.12,-3h4.75L21,22h2l-4.5,-12zM15.88,17l1.62,-4.33L19.12,17h-3.24z"/>
-</vector>
+<!--
+  ~ Copyright (C) 2017 Moez Bhatti <moez.bhatti@gmail.com>
+  ~
+  ~ This file is part of QKSMS.
+  ~
+  ~ QKSMS is free software: you can redistribute it and/or modify
+  ~ it under the terms of the GNU General Public License as published by
+  ~ the Free Software Foundation, either version 3 of the License, or
+  ~ (at your option) any later version.
+  ~
+  ~ QKSMS is distributed in the hope that it will be useful,
+  ~ but WITHOUT ANY WARRANTY; without even the implied warranty of
+  ~ MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+  ~ GNU General Public License for more details.
+  ~
+  ~ You should have received a copy of the GNU General Public License
+  ~ along with QKSMS.  If not, see <http://www.gnu.org/licenses/>.
+  -->
+<vector xmlns:android="http://schemas.android.com/apk/res/android"
+        android:width="24dp"
+        android:height="24dp"
+        android:viewportWidth="24.0"
+        android:viewportHeight="24.0">
+    <path
+        android:fillColor="#FF000000"
+        android:pathData="M12.87,15.07l-2.54,-2.51 0.03,-0.03c1.74,-1.94 2.98,-4.17 3.71,-6.53L17,6L17,4h-7L10,2L8,2v2L1,4v1.99h11.17C11.5,7.92 10.44,9.75 9,11.35 8.07,10.32 7.3,9.19 6.69,8h-2c0.73,1.63 1.73,3.17 2.98,4.56l-5.09,5.02L4,19l5,-5 3.11,3.11 0.76,-2.04zM18.5,10h-2L12,22h2l1.12,-3h4.75L21,22h2l-4.5,-12zM15.88,17l1.62,-4.33L19.12,17h-3.24z"/>
+</vector>
diff --git a/android-smsmms/src/main/res/values/strings.xml b/android-smsmms/src/main/res/values/strings.xml
index c48bc4b8f..f633ee10c 100755
--- a/android-smsmms/src/main/res/values/strings.xml
+++ b/android-smsmms/src/main/res/values/strings.xml
@@ -1,31 +1,31 @@
-<?xml version="1.0" encoding="utf-8"?>
-
-<!-- Copyright (C) 2013 Jacob Klinker
-
-Licensed under the Apache License, Version 2.0 (the "License");
-you may not use this file except in compliance with the License.
-You may obtain a copy of the License at
-
-  http://www.apache.org/licenses/LICENSE-2.0
-
-Unless required by applicable law or agreed to in writing, software
-distributed under the License is distributed on an "AS IS" BASIS,
-WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
-See the License for the specific language governing permissions and
-limitations under the License.
--->
-
-<resources xmlns:xliff="urn:oasis:names:tc:xliff:document:1.2">
-
-    <string name="invalid_destination">Invalid destination address.</string>
-    <string name="service_not_activated">Service not activated on network.</string>
-    <string name="service_message_not_found">Message expired or not available.</string>
-    <string name="service_network_problem">Couldn\'t send due to network problem.</string>
-    <string name="message_queued">Currently can\'t send your message. It will be sent when the service becomes available.</string>
-    <string name="download_later">Can\'t download right now. Try again later.</string>
-    <string name="no_apn">No APN specified for the app, you need to set it up in settings!</string>
-    <string name="no_subject">(No subject)</string>
-    <string name="unknown_sender">Unknown sender</string>
-    <string name="dl_failure_notification">Couldn\'t download message <xliff:g id="subject">%1$s</xliff:g> from <xliff:g id="from">%2$s</xliff:g>.</string>
-
-</resources>
+<?xml version="1.0" encoding="utf-8"?>
+
+<!-- Copyright (C) 2013 Jacob Klinker
+
+Licensed under the Apache License, Version 2.0 (the "License");
+you may not use this file except in compliance with the License.
+You may obtain a copy of the License at
+
+  http://www.apache.org/licenses/LICENSE-2.0
+
+Unless required by applicable law or agreed to in writing, software
+distributed under the License is distributed on an "AS IS" BASIS,
+WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+See the License for the specific language governing permissions and
+limitations under the License.
+-->
+
+<resources xmlns:xliff="urn:oasis:names:tc:xliff:document:1.2">
+
+    <string name="invalid_destination">Invalid destination address.</string>
+    <string name="service_not_activated">Service not activated on network.</string>
+    <string name="service_message_not_found">Message expired or not available.</string>
+    <string name="service_network_problem">Couldn\'t send due to network problem.</string>
+    <string name="message_queued">Currently can\'t send your message. It will be sent when the service becomes available.</string>
+    <string name="download_later">Can\'t download right now. Try again later.</string>
+    <string name="no_apn">No APN specified for the app, you need to set it up in settings!</string>
+    <string name="no_subject">(No subject)</string>
+    <string name="unknown_sender">Unknown sender</string>
+    <string name="dl_failure_notification">Couldn\'t download message <xliff:g id="subject">%1$s</xliff:g> from <xliff:g id="from">%2$s</xliff:g>.</string>
+
+</resources>
diff --git a/android-smsmms/src/main/res/xml-mcc204-mnc04/mms_config.xml b/android-smsmms/src/main/res/xml-mcc204-mnc04/mms_config.xml
index 96e5b9df7..de6b16bd2 100755
--- a/android-smsmms/src/main/res/xml-mcc204-mnc04/mms_config.xml
+++ b/android-smsmms/src/main/res/xml-mcc204-mnc04/mms_config.xml
@@ -1,33 +1,33 @@
-<?xml version="1.0" encoding="utf-8"?>
-<!-- Copyright 2013 The Android Open Source Project
-
-     Licensed under the Apache License, Version 2.0 (the "License");
-     you may not use this file except in compliance with the License.
-     You may obtain a copy of the License at
-
-          http://www.apache.org/licenses/LICENSE-2.0
-
-     Unless required by applicable law or agreed to in writing, software
-     distributed under the License is distributed on an "AS IS" BASIS,
-     WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
-     See the License for the specific language governing permissions and
-     limitations under the License.
--->
-
-<!-- Version History
-        version 1 - initial version.
-        version 2 - added recipientLimit.
-        version 3 - added min/max recycler values.
-        version 4 - added sms to mms text threshold.
--->
-
-<mms_config version="4">
-    <!-- Maximum message size in bytes for a MMS message -->
-    <int name="maxMessageSize">1048576</int>
-
-    <!-- Maximum height for an attached image -->
-    <int name="maxImageHeight">1944</int>
-
-    <!-- Maximum width for an attached image -->
-    <int name="maxImageWidth">2592</int>
-</mms_config>
+<?xml version="1.0" encoding="utf-8"?>
+<!-- Copyright 2013 The Android Open Source Project
+
+     Licensed under the Apache License, Version 2.0 (the "License");
+     you may not use this file except in compliance with the License.
+     You may obtain a copy of the License at
+
+          http://www.apache.org/licenses/LICENSE-2.0
+
+     Unless required by applicable law or agreed to in writing, software
+     distributed under the License is distributed on an "AS IS" BASIS,
+     WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+     See the License for the specific language governing permissions and
+     limitations under the License.
+-->
+
+<!-- Version History
+        version 1 - initial version.
+        version 2 - added recipientLimit.
+        version 3 - added min/max recycler values.
+        version 4 - added sms to mms text threshold.
+-->
+
+<mms_config version="4">
+    <!-- Maximum message size in bytes for a MMS message -->
+    <int name="maxMessageSize">1048576</int>
+
+    <!-- Maximum height for an attached image -->
+    <int name="maxImageHeight">1944</int>
+
+    <!-- Maximum width for an attached image -->
+    <int name="maxImageWidth">2592</int>
+</mms_config>
diff --git a/android-smsmms/src/main/res/xml-mcc208-mnc01/mms_config.xml b/android-smsmms/src/main/res/xml-mcc208-mnc01/mms_config.xml
index 486c4682c..6c5de90eb 100755
--- a/android-smsmms/src/main/res/xml-mcc208-mnc01/mms_config.xml
+++ b/android-smsmms/src/main/res/xml-mcc208-mnc01/mms_config.xml
@@ -1,33 +1,33 @@
-<?xml version="1.0" encoding="utf-8"?>
-<!-- Copyright 2013 The Android Open Source Project
-
-     Licensed under the Apache License, Version 2.0 (the "License");
-     you may not use this file except in compliance with the License.
-     You may obtain a copy of the License at
-
-          http://www.apache.org/licenses/LICENSE-2.0
-
-     Unless required by applicable law or agreed to in writing, software
-     distributed under the License is distributed on an "AS IS" BASIS,
-     WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
-     See the License for the specific language governing permissions and
-     limitations under the License.
--->
-
-<!-- Version History
-        version 1 - initial version.
-        version 2 - added recipientLimit.
-        version 3 - added min/max recycler values.
-        version 4 - added sms to mms text threshold.
--->
-
-<mms_config version="4">
-    <!-- Maximum message size in bytes for a MMS message -->
-    <int name="maxMessageSize">614400</int>
-
-    <!-- Maximum height for an attached image -->
-    <int name="maxImageHeight">1944</int>
-
-    <!-- Maximum width for an attached image -->
-    <int name="maxImageWidth">2592</int>
-</mms_config>
+<?xml version="1.0" encoding="utf-8"?>
+<!-- Copyright 2013 The Android Open Source Project
+
+     Licensed under the Apache License, Version 2.0 (the "License");
+     you may not use this file except in compliance with the License.
+     You may obtain a copy of the License at
+
+          http://www.apache.org/licenses/LICENSE-2.0
+
+     Unless required by applicable law or agreed to in writing, software
+     distributed under the License is distributed on an "AS IS" BASIS,
+     WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+     See the License for the specific language governing permissions and
+     limitations under the License.
+-->
+
+<!-- Version History
+        version 1 - initial version.
+        version 2 - added recipientLimit.
+        version 3 - added min/max recycler values.
+        version 4 - added sms to mms text threshold.
+-->
+
+<mms_config version="4">
+    <!-- Maximum message size in bytes for a MMS message -->
+    <int name="maxMessageSize">614400</int>
+
+    <!-- Maximum height for an attached image -->
+    <int name="maxImageHeight">1944</int>
+
+    <!-- Maximum width for an attached image -->
+    <int name="maxImageWidth">2592</int>
+</mms_config>
diff --git a/android-smsmms/src/main/res/xml-mcc208-mnc10/mms_config.xml b/android-smsmms/src/main/res/xml-mcc208-mnc10/mms_config.xml
index 486c4682c..6c5de90eb 100755
--- a/android-smsmms/src/main/res/xml-mcc208-mnc10/mms_config.xml
+++ b/android-smsmms/src/main/res/xml-mcc208-mnc10/mms_config.xml
@@ -1,33 +1,33 @@
-<?xml version="1.0" encoding="utf-8"?>
-<!-- Copyright 2013 The Android Open Source Project
-
-     Licensed under the Apache License, Version 2.0 (the "License");
-     you may not use this file except in compliance with the License.
-     You may obtain a copy of the License at
-
-          http://www.apache.org/licenses/LICENSE-2.0
-
-     Unless required by applicable law or agreed to in writing, software
-     distributed under the License is distributed on an "AS IS" BASIS,
-     WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
-     See the License for the specific language governing permissions and
-     limitations under the License.
--->
-
-<!-- Version History
-        version 1 - initial version.
-        version 2 - added recipientLimit.
-        version 3 - added min/max recycler values.
-        version 4 - added sms to mms text threshold.
--->
-
-<mms_config version="4">
-    <!-- Maximum message size in bytes for a MMS message -->
-    <int name="maxMessageSize">614400</int>
-
-    <!-- Maximum height for an attached image -->
-    <int name="maxImageHeight">1944</int>
-
-    <!-- Maximum width for an attached image -->
-    <int name="maxImageWidth">2592</int>
-</mms_config>
+<?xml version="1.0" encoding="utf-8"?>
+<!-- Copyright 2013 The Android Open Source Project
+
+     Licensed under the Apache License, Version 2.0 (the "License");
+     you may not use this file except in compliance with the License.
+     You may obtain a copy of the License at
+
+          http://www.apache.org/licenses/LICENSE-2.0
+
+     Unless required by applicable law or agreed to in writing, software
+     distributed under the License is distributed on an "AS IS" BASIS,
+     WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+     See the License for the specific language governing permissions and
+     limitations under the License.
+-->
+
+<!-- Version History
+        version 1 - initial version.
+        version 2 - added recipientLimit.
+        version 3 - added min/max recycler values.
+        version 4 - added sms to mms text threshold.
+-->
+
+<mms_config version="4">
+    <!-- Maximum message size in bytes for a MMS message -->
+    <int name="maxMessageSize">614400</int>
+
+    <!-- Maximum height for an attached image -->
+    <int name="maxImageHeight">1944</int>
+
+    <!-- Maximum width for an attached image -->
+    <int name="maxImageWidth">2592</int>
+</mms_config>
diff --git a/android-smsmms/src/main/res/xml-mcc208-mnc15/mms_config.xml b/android-smsmms/src/main/res/xml-mcc208-mnc15/mms_config.xml
index 486c4682c..6c5de90eb 100755
--- a/android-smsmms/src/main/res/xml-mcc208-mnc15/mms_config.xml
+++ b/android-smsmms/src/main/res/xml-mcc208-mnc15/mms_config.xml
@@ -1,33 +1,33 @@
-<?xml version="1.0" encoding="utf-8"?>
-<!-- Copyright 2013 The Android Open Source Project
-
-     Licensed under the Apache License, Version 2.0 (the "License");
-     you may not use this file except in compliance with the License.
-     You may obtain a copy of the License at
-
-          http://www.apache.org/licenses/LICENSE-2.0
-
-     Unless required by applicable law or agreed to in writing, software
-     distributed under the License is distributed on an "AS IS" BASIS,
-     WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
-     See the License for the specific language governing permissions and
-     limitations under the License.
--->
-
-<!-- Version History
-        version 1 - initial version.
-        version 2 - added recipientLimit.
-        version 3 - added min/max recycler values.
-        version 4 - added sms to mms text threshold.
--->
-
-<mms_config version="4">
-    <!-- Maximum message size in bytes for a MMS message -->
-    <int name="maxMessageSize">614400</int>
-
-    <!-- Maximum height for an attached image -->
-    <int name="maxImageHeight">1944</int>
-
-    <!-- Maximum width for an attached image -->
-    <int name="maxImageWidth">2592</int>
-</mms_config>
+<?xml version="1.0" encoding="utf-8"?>
+<!-- Copyright 2013 The Android Open Source Project
+
+     Licensed under the Apache License, Version 2.0 (the "License");
+     you may not use this file except in compliance with the License.
+     You may obtain a copy of the License at
+
+          http://www.apache.org/licenses/LICENSE-2.0
+
+     Unless required by applicable law or agreed to in writing, software
+     distributed under the License is distributed on an "AS IS" BASIS,
+     WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+     See the License for the specific language governing permissions and
+     limitations under the License.
+-->
+
+<!-- Version History
+        version 1 - initial version.
+        version 2 - added recipientLimit.
+        version 3 - added min/max recycler values.
+        version 4 - added sms to mms text threshold.
+-->
+
+<mms_config version="4">
+    <!-- Maximum message size in bytes for a MMS message -->
+    <int name="maxMessageSize">614400</int>
+
+    <!-- Maximum height for an attached image -->
+    <int name="maxImageHeight">1944</int>
+
+    <!-- Maximum width for an attached image -->
+    <int name="maxImageWidth">2592</int>
+</mms_config>
diff --git a/android-smsmms/src/main/res/xml-mcc208-mnc20/mms_config.xml b/android-smsmms/src/main/res/xml-mcc208-mnc20/mms_config.xml
index 1fbf09ce3..538b03f79 100755
--- a/android-smsmms/src/main/res/xml-mcc208-mnc20/mms_config.xml
+++ b/android-smsmms/src/main/res/xml-mcc208-mnc20/mms_config.xml
@@ -1,37 +1,37 @@
-<?xml version="1.0" encoding="utf-8"?>
-<!-- Copyright 2013 The Android Open Source Project
-
-     Licensed under the Apache License, Version 2.0 (the "License");
-     you may not use this file except in compliance with the License.
-     You may obtain a copy of the License at
-
-          http://www.apache.org/licenses/LICENSE-2.0
-
-     Unless required by applicable law or agreed to in writing, software
-     distributed under the License is distributed on an "AS IS" BASIS,
-     WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
-     See the License for the specific language governing permissions and
-     limitations under the License.
--->
-
-<!-- Version History
-        version 1 - initial version.
-        version 2 - added recipientLimit.
-        version 3 - added min/max recycler values.
-        version 4 - added sms to mms text threshold.
-        version 5 - added supportHttpCharsetHeader.
--->
-
-<mms_config version="5">
-    <!-- Maximum message size in bytes for a MMS message -->
-    <int name="maxMessageSize">614400</int>
-
-    <!-- Maximum height for an attached image -->
-    <int name="maxImageHeight">1944</int>
-
-    <!-- Maximum width for an attached image -->
-    <int name="maxImageWidth">2592</int>
-
-    <!-- Flag indicating whether charset should be added to Content-Type header-->
-    <bool name="supportHttpCharsetHeader">false</bool>
-</mms_config>
+<?xml version="1.0" encoding="utf-8"?>
+<!-- Copyright 2013 The Android Open Source Project
+
+     Licensed under the Apache License, Version 2.0 (the "License");
+     you may not use this file except in compliance with the License.
+     You may obtain a copy of the License at
+
+          http://www.apache.org/licenses/LICENSE-2.0
+
+     Unless required by applicable law or agreed to in writing, software
+     distributed under the License is distributed on an "AS IS" BASIS,
+     WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+     See the License for the specific language governing permissions and
+     limitations under the License.
+-->
+
+<!-- Version History
+        version 1 - initial version.
+        version 2 - added recipientLimit.
+        version 3 - added min/max recycler values.
+        version 4 - added sms to mms text threshold.
+        version 5 - added supportHttpCharsetHeader.
+-->
+
+<mms_config version="5">
+    <!-- Maximum message size in bytes for a MMS message -->
+    <int name="maxMessageSize">614400</int>
+
+    <!-- Maximum height for an attached image -->
+    <int name="maxImageHeight">1944</int>
+
+    <!-- Maximum width for an attached image -->
+    <int name="maxImageWidth">2592</int>
+
+    <!-- Flag indicating whether charset should be added to Content-Type header-->
+    <bool name="supportHttpCharsetHeader">false</bool>
+</mms_config>
diff --git a/android-smsmms/src/main/res/xml-mcc208-mnc26/mms_config.xml b/android-smsmms/src/main/res/xml-mcc208-mnc26/mms_config.xml
index 486c4682c..6c5de90eb 100755
--- a/android-smsmms/src/main/res/xml-mcc208-mnc26/mms_config.xml
+++ b/android-smsmms/src/main/res/xml-mcc208-mnc26/mms_config.xml
@@ -1,33 +1,33 @@
-<?xml version="1.0" encoding="utf-8"?>
-<!-- Copyright 2013 The Android Open Source Project
-
-     Licensed under the Apache License, Version 2.0 (the "License");
-     you may not use this file except in compliance with the License.
-     You may obtain a copy of the License at
-
-          http://www.apache.org/licenses/LICENSE-2.0
-
-     Unless required by applicable law or agreed to in writing, software
-     distributed under the License is distributed on an "AS IS" BASIS,
-     WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
-     See the License for the specific language governing permissions and
-     limitations under the License.
--->
-
-<!-- Version History
-        version 1 - initial version.
-        version 2 - added recipientLimit.
-        version 3 - added min/max recycler values.
-        version 4 - added sms to mms text threshold.
--->
-
-<mms_config version="4">
-    <!-- Maximum message size in bytes for a MMS message -->
-    <int name="maxMessageSize">614400</int>
-
-    <!-- Maximum height for an attached image -->
-    <int name="maxImageHeight">1944</int>
-
-    <!-- Maximum width for an attached image -->
-    <int name="maxImageWidth">2592</int>
-</mms_config>
+<?xml version="1.0" encoding="utf-8"?>
+<!-- Copyright 2013 The Android Open Source Project
+
+     Licensed under the Apache License, Version 2.0 (the "License");
+     you may not use this file except in compliance with the License.
+     You may obtain a copy of the License at
+
+          http://www.apache.org/licenses/LICENSE-2.0
+
+     Unless required by applicable law or agreed to in writing, software
+     distributed under the License is distributed on an "AS IS" BASIS,
+     WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+     See the License for the specific language governing permissions and
+     limitations under the License.
+-->
+
+<!-- Version History
+        version 1 - initial version.
+        version 2 - added recipientLimit.
+        version 3 - added min/max recycler values.
+        version 4 - added sms to mms text threshold.
+-->
+
+<mms_config version="4">
+    <!-- Maximum message size in bytes for a MMS message -->
+    <int name="maxMessageSize">614400</int>
+
+    <!-- Maximum height for an attached image -->
+    <int name="maxImageHeight">1944</int>
+
+    <!-- Maximum width for an attached image -->
+    <int name="maxImageWidth">2592</int>
+</mms_config>
diff --git a/android-smsmms/src/main/res/xml-mcc214-mnc01/mms_config.xml b/android-smsmms/src/main/res/xml-mcc214-mnc01/mms_config.xml
index d6fad059c..1bd46c2cf 100755
--- a/android-smsmms/src/main/res/xml-mcc214-mnc01/mms_config.xml
+++ b/android-smsmms/src/main/res/xml-mcc214-mnc01/mms_config.xml
@@ -1,26 +1,26 @@
-<?xml version="1.0" encoding="utf-8"?>
-<!-- Copyright 2014 The Android Open Source Project
-
-     Licensed under the Apache License, Version 2.0 (the "License");
-     you may not use this file except in compliance with the License.
-     You may obtain a copy of the License at
-
-          http://www.apache.org/licenses/LICENSE-2.0
-
-     Unless required by applicable law or agreed to in writing, software
-     distributed under the License is distributed on an "AS IS" BASIS,
-     WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
-     See the License for the specific language governing permissions and
-     limitations under the License.
--->
-
-<!-- Version History
-        version 1 - initial version.
-        version 2 - enable force 7 bit encoding
-        version 3 - removing v2 changes and move to correct location
--->
-
-<mms_config version="2">
-    <!-- Disable SMS to MMS conversion for multiple recipient SMS -->
-    <bool name="enableGroupMms">false</bool>
-</mms_config>
+<?xml version="1.0" encoding="utf-8"?>
+<!-- Copyright 2014 The Android Open Source Project
+
+     Licensed under the Apache License, Version 2.0 (the "License");
+     you may not use this file except in compliance with the License.
+     You may obtain a copy of the License at
+
+          http://www.apache.org/licenses/LICENSE-2.0
+
+     Unless required by applicable law or agreed to in writing, software
+     distributed under the License is distributed on an "AS IS" BASIS,
+     WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+     See the License for the specific language governing permissions and
+     limitations under the License.
+-->
+
+<!-- Version History
+        version 1 - initial version.
+        version 2 - enable force 7 bit encoding
+        version 3 - removing v2 changes and move to correct location
+-->
+
+<mms_config version="2">
+    <!-- Disable SMS to MMS conversion for multiple recipient SMS -->
+    <bool name="enableGroupMms">false</bool>
+</mms_config>
diff --git a/android-smsmms/src/main/res/xml-mcc214-mnc03/mms_config.xml b/android-smsmms/src/main/res/xml-mcc214-mnc03/mms_config.xml
index 96e5b9df7..de6b16bd2 100755
--- a/android-smsmms/src/main/res/xml-mcc214-mnc03/mms_config.xml
+++ b/android-smsmms/src/main/res/xml-mcc214-mnc03/mms_config.xml
@@ -1,33 +1,33 @@
-<?xml version="1.0" encoding="utf-8"?>
-<!-- Copyright 2013 The Android Open Source Project
-
-     Licensed under the Apache License, Version 2.0 (the "License");
-     you may not use this file except in compliance with the License.
-     You may obtain a copy of the License at
-
-          http://www.apache.org/licenses/LICENSE-2.0
-
-     Unless required by applicable law or agreed to in writing, software
-     distributed under the License is distributed on an "AS IS" BASIS,
-     WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
-     See the License for the specific language governing permissions and
-     limitations under the License.
--->
-
-<!-- Version History
-        version 1 - initial version.
-        version 2 - added recipientLimit.
-        version 3 - added min/max recycler values.
-        version 4 - added sms to mms text threshold.
--->
-
-<mms_config version="4">
-    <!-- Maximum message size in bytes for a MMS message -->
-    <int name="maxMessageSize">1048576</int>
-
-    <!-- Maximum height for an attached image -->
-    <int name="maxImageHeight">1944</int>
-
-    <!-- Maximum width for an attached image -->
-    <int name="maxImageWidth">2592</int>
-</mms_config>
+<?xml version="1.0" encoding="utf-8"?>
+<!-- Copyright 2013 The Android Open Source Project
+
+     Licensed under the Apache License, Version 2.0 (the "License");
+     you may not use this file except in compliance with the License.
+     You may obtain a copy of the License at
+
+          http://www.apache.org/licenses/LICENSE-2.0
+
+     Unless required by applicable law or agreed to in writing, software
+     distributed under the License is distributed on an "AS IS" BASIS,
+     WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+     See the License for the specific language governing permissions and
+     limitations under the License.
+-->
+
+<!-- Version History
+        version 1 - initial version.
+        version 2 - added recipientLimit.
+        version 3 - added min/max recycler values.
+        version 4 - added sms to mms text threshold.
+-->
+
+<mms_config version="4">
+    <!-- Maximum message size in bytes for a MMS message -->
+    <int name="maxMessageSize">1048576</int>
+
+    <!-- Maximum height for an attached image -->
+    <int name="maxImageHeight">1944</int>
+
+    <!-- Maximum width for an attached image -->
+    <int name="maxImageWidth">2592</int>
+</mms_config>
diff --git a/android-smsmms/src/main/res/xml-mcc214-mnc07/mms_config.xml b/android-smsmms/src/main/res/xml-mcc214-mnc07/mms_config.xml
index a90a26d57..f17ae535a 100755
--- a/android-smsmms/src/main/res/xml-mcc214-mnc07/mms_config.xml
+++ b/android-smsmms/src/main/res/xml-mcc214-mnc07/mms_config.xml
@@ -1,33 +1,33 @@
-<?xml version="1.0" encoding="utf-8"?>
-<!-- Copyright 2013 The Android Open Source Project
-
-     Licensed under the Apache License, Version 2.0 (the "License");
-     you may not use this file except in compliance with the License.
-     You may obtain a copy of the License at
-
-          http://www.apache.org/licenses/LICENSE-2.0
-
-     Unless required by applicable law or agreed to in writing, software
-     distributed under the License is distributed on an "AS IS" BASIS,
-     WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
-     See the License for the specific language governing permissions and
-     limitations under the License.
--->
-
-<!-- Version History
-        version 1 - initial version.
-        version 2 - added recipientLimit.
-        version 3 - added min/max recycler values.
-        version 4 - added sms to mms text threshold.
--->
-
-<mms_config version="4">
-    <!-- Maximum message size in bytes for a MMS message -->
-    <int name="maxMessageSize">512000</int>
-
-    <!-- Maximum height for an attached image -->
-    <int name="maxImageHeight">1944</int>
-
-    <!-- Maximum width for an attached image -->
-    <int name="maxImageWidth">2592</int>
-</mms_config>
+<?xml version="1.0" encoding="utf-8"?>
+<!-- Copyright 2013 The Android Open Source Project
+
+     Licensed under the Apache License, Version 2.0 (the "License");
+     you may not use this file except in compliance with the License.
+     You may obtain a copy of the License at
+
+          http://www.apache.org/licenses/LICENSE-2.0
+
+     Unless required by applicable law or agreed to in writing, software
+     distributed under the License is distributed on an "AS IS" BASIS,
+     WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+     See the License for the specific language governing permissions and
+     limitations under the License.
+-->
+
+<!-- Version History
+        version 1 - initial version.
+        version 2 - added recipientLimit.
+        version 3 - added min/max recycler values.
+        version 4 - added sms to mms text threshold.
+-->
+
+<mms_config version="4">
+    <!-- Maximum message size in bytes for a MMS message -->
+    <int name="maxMessageSize">512000</int>
+
+    <!-- Maximum height for an attached image -->
+    <int name="maxImageHeight">1944</int>
+
+    <!-- Maximum width for an attached image -->
+    <int name="maxImageWidth">2592</int>
+</mms_config>
diff --git a/android-smsmms/src/main/res/xml-mcc218-mnc05/mms_config.xml b/android-smsmms/src/main/res/xml-mcc218-mnc05/mms_config.xml
index 96e5b9df7..de6b16bd2 100755
--- a/android-smsmms/src/main/res/xml-mcc218-mnc05/mms_config.xml
+++ b/android-smsmms/src/main/res/xml-mcc218-mnc05/mms_config.xml
@@ -1,33 +1,33 @@
-<?xml version="1.0" encoding="utf-8"?>
-<!-- Copyright 2013 The Android Open Source Project
-
-     Licensed under the Apache License, Version 2.0 (the "License");
-     you may not use this file except in compliance with the License.
-     You may obtain a copy of the License at
-
-          http://www.apache.org/licenses/LICENSE-2.0
-
-     Unless required by applicable law or agreed to in writing, software
-     distributed under the License is distributed on an "AS IS" BASIS,
-     WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
-     See the License for the specific language governing permissions and
-     limitations under the License.
--->
-
-<!-- Version History
-        version 1 - initial version.
-        version 2 - added recipientLimit.
-        version 3 - added min/max recycler values.
-        version 4 - added sms to mms text threshold.
--->
-
-<mms_config version="4">
-    <!-- Maximum message size in bytes for a MMS message -->
-    <int name="maxMessageSize">1048576</int>
-
-    <!-- Maximum height for an attached image -->
-    <int name="maxImageHeight">1944</int>
-
-    <!-- Maximum width for an attached image -->
-    <int name="maxImageWidth">2592</int>
-</mms_config>
+<?xml version="1.0" encoding="utf-8"?>
+<!-- Copyright 2013 The Android Open Source Project
+
+     Licensed under the Apache License, Version 2.0 (the "License");
+     you may not use this file except in compliance with the License.
+     You may obtain a copy of the License at
+
+          http://www.apache.org/licenses/LICENSE-2.0
+
+     Unless required by applicable law or agreed to in writing, software
+     distributed under the License is distributed on an "AS IS" BASIS,
+     WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+     See the License for the specific language governing permissions and
+     limitations under the License.
+-->
+
+<!-- Version History
+        version 1 - initial version.
+        version 2 - added recipientLimit.
+        version 3 - added min/max recycler values.
+        version 4 - added sms to mms text threshold.
+-->
+
+<mms_config version="4">
+    <!-- Maximum message size in bytes for a MMS message -->
+    <int name="maxMessageSize">1048576</int>
+
+    <!-- Maximum height for an attached image -->
+    <int name="maxImageHeight">1944</int>
+
+    <!-- Maximum width for an attached image -->
+    <int name="maxImageWidth">2592</int>
+</mms_config>
diff --git a/android-smsmms/src/main/res/xml-mcc222-mnc01/mms_config.xml b/android-smsmms/src/main/res/xml-mcc222-mnc01/mms_config.xml
index 96e5b9df7..de6b16bd2 100755
--- a/android-smsmms/src/main/res/xml-mcc222-mnc01/mms_config.xml
+++ b/android-smsmms/src/main/res/xml-mcc222-mnc01/mms_config.xml
@@ -1,33 +1,33 @@
-<?xml version="1.0" encoding="utf-8"?>
-<!-- Copyright 2013 The Android Open Source Project
-
-     Licensed under the Apache License, Version 2.0 (the "License");
-     you may not use this file except in compliance with the License.
-     You may obtain a copy of the License at
-
-          http://www.apache.org/licenses/LICENSE-2.0
-
-     Unless required by applicable law or agreed to in writing, software
-     distributed under the License is distributed on an "AS IS" BASIS,
-     WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
-     See the License for the specific language governing permissions and
-     limitations under the License.
--->
-
-<!-- Version History
-        version 1 - initial version.
-        version 2 - added recipientLimit.
-        version 3 - added min/max recycler values.
-        version 4 - added sms to mms text threshold.
--->
-
-<mms_config version="4">
-    <!-- Maximum message size in bytes for a MMS message -->
-    <int name="maxMessageSize">1048576</int>
-
-    <!-- Maximum height for an attached image -->
-    <int name="maxImageHeight">1944</int>
-
-    <!-- Maximum width for an attached image -->
-    <int name="maxImageWidth">2592</int>
-</mms_config>
+<?xml version="1.0" encoding="utf-8"?>
+<!-- Copyright 2013 The Android Open Source Project
+
+     Licensed under the Apache License, Version 2.0 (the "License");
+     you may not use this file except in compliance with the License.
+     You may obtain a copy of the License at
+
+          http://www.apache.org/licenses/LICENSE-2.0
+
+     Unless required by applicable law or agreed to in writing, software
+     distributed under the License is distributed on an "AS IS" BASIS,
+     WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+     See the License for the specific language governing permissions and
+     limitations under the License.
+-->
+
+<!-- Version History
+        version 1 - initial version.
+        version 2 - added recipientLimit.
+        version 3 - added min/max recycler values.
+        version 4 - added sms to mms text threshold.
+-->
+
+<mms_config version="4">
+    <!-- Maximum message size in bytes for a MMS message -->
+    <int name="maxMessageSize">1048576</int>
+
+    <!-- Maximum height for an attached image -->
+    <int name="maxImageHeight">1944</int>
+
+    <!-- Maximum width for an attached image -->
+    <int name="maxImageWidth">2592</int>
+</mms_config>
diff --git a/android-smsmms/src/main/res/xml-mcc222-mnc08/mms_config.xml b/android-smsmms/src/main/res/xml-mcc222-mnc08/mms_config.xml
index 96e5b9df7..de6b16bd2 100755
--- a/android-smsmms/src/main/res/xml-mcc222-mnc08/mms_config.xml
+++ b/android-smsmms/src/main/res/xml-mcc222-mnc08/mms_config.xml
@@ -1,33 +1,33 @@
-<?xml version="1.0" encoding="utf-8"?>
-<!-- Copyright 2013 The Android Open Source Project
-
-     Licensed under the Apache License, Version 2.0 (the "License");
-     you may not use this file except in compliance with the License.
-     You may obtain a copy of the License at
-
-          http://www.apache.org/licenses/LICENSE-2.0
-
-     Unless required by applicable law or agreed to in writing, software
-     distributed under the License is distributed on an "AS IS" BASIS,
-     WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
-     See the License for the specific language governing permissions and
-     limitations under the License.
--->
-
-<!-- Version History
-        version 1 - initial version.
-        version 2 - added recipientLimit.
-        version 3 - added min/max recycler values.
-        version 4 - added sms to mms text threshold.
--->
-
-<mms_config version="4">
-    <!-- Maximum message size in bytes for a MMS message -->
-    <int name="maxMessageSize">1048576</int>
-
-    <!-- Maximum height for an attached image -->
-    <int name="maxImageHeight">1944</int>
-
-    <!-- Maximum width for an attached image -->
-    <int name="maxImageWidth">2592</int>
-</mms_config>
+<?xml version="1.0" encoding="utf-8"?>
+<!-- Copyright 2013 The Android Open Source Project
+
+     Licensed under the Apache License, Version 2.0 (the "License");
+     you may not use this file except in compliance with the License.
+     You may obtain a copy of the License at
+
+          http://www.apache.org/licenses/LICENSE-2.0
+
+     Unless required by applicable law or agreed to in writing, software
+     distributed under the License is distributed on an "AS IS" BASIS,
+     WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+     See the License for the specific language governing permissions and
+     limitations under the License.
+-->
+
+<!-- Version History
+        version 1 - initial version.
+        version 2 - added recipientLimit.
+        version 3 - added min/max recycler values.
+        version 4 - added sms to mms text threshold.
+-->
+
+<mms_config version="4">
+    <!-- Maximum message size in bytes for a MMS message -->
+    <int name="maxMessageSize">1048576</int>
+
+    <!-- Maximum height for an attached image -->
+    <int name="maxImageHeight">1944</int>
+
+    <!-- Maximum width for an attached image -->
+    <int name="maxImageWidth">2592</int>
+</mms_config>
diff --git a/android-smsmms/src/main/res/xml-mcc234-mnc10/mms_config.xml b/android-smsmms/src/main/res/xml-mcc234-mnc10/mms_config.xml
index 9f89f968c..547f09f42 100755
--- a/android-smsmms/src/main/res/xml-mcc234-mnc10/mms_config.xml
+++ b/android-smsmms/src/main/res/xml-mcc234-mnc10/mms_config.xml
@@ -1,27 +1,27 @@
-<?xml version="1.0" encoding="utf-8"?>
-<!-- Copyright 2014 The Android Open Source Project
-
-     Licensed under the Apache License, Version 2.0 (the "License");
-     you may not use this file except in compliance with the License.
-     You may obtain a copy of the License at
-
-          http://www.apache.org/licenses/LICENSE-2.0
-
-     Unless required by applicable law or agreed to in writing, software
-     distributed under the License is distributed on an "AS IS" BASIS,
-     WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
-     See the License for the specific language governing permissions and
-     limitations under the License.
--->
-
-<!-- Version History
-        version 1 - initial version.
--->
-
-<mms_config version="1">
-    <!-- If enableMultipartSMS is true and smsToMmsTextThreshold > 1, then multi-part SMS messages
-         will be converted into a single mms message. For example, if the mms_config.xml file
-         specifies <int name="smsToMmsTextThreshold">7</int>, then on the 8th sms segment, the
-         message will be converted to an mms. -->
-    <int name="smsToMmsTextThreshold">10</int>
-</mms_config>
+<?xml version="1.0" encoding="utf-8"?>
+<!-- Copyright 2014 The Android Open Source Project
+
+     Licensed under the Apache License, Version 2.0 (the "License");
+     you may not use this file except in compliance with the License.
+     You may obtain a copy of the License at
+
+          http://www.apache.org/licenses/LICENSE-2.0
+
+     Unless required by applicable law or agreed to in writing, software
+     distributed under the License is distributed on an "AS IS" BASIS,
+     WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+     See the License for the specific language governing permissions and
+     limitations under the License.
+-->
+
+<!-- Version History
+        version 1 - initial version.
+-->
+
+<mms_config version="1">
+    <!-- If enableMultipartSMS is true and smsToMmsTextThreshold > 1, then multi-part SMS messages
+         will be converted into a single mms message. For example, if the mms_config.xml file
+         specifies <int name="smsToMmsTextThreshold">7</int>, then on the 8th sms segment, the
+         message will be converted to an mms. -->
+    <int name="smsToMmsTextThreshold">10</int>
+</mms_config>
diff --git a/android-smsmms/src/main/res/xml-mcc234-mnc11/mms_config.xml b/android-smsmms/src/main/res/xml-mcc234-mnc11/mms_config.xml
index 9f89f968c..547f09f42 100755
--- a/android-smsmms/src/main/res/xml-mcc234-mnc11/mms_config.xml
+++ b/android-smsmms/src/main/res/xml-mcc234-mnc11/mms_config.xml
@@ -1,27 +1,27 @@
-<?xml version="1.0" encoding="utf-8"?>
-<!-- Copyright 2014 The Android Open Source Project
-
-     Licensed under the Apache License, Version 2.0 (the "License");
-     you may not use this file except in compliance with the License.
-     You may obtain a copy of the License at
-
-          http://www.apache.org/licenses/LICENSE-2.0
-
-     Unless required by applicable law or agreed to in writing, software
-     distributed under the License is distributed on an "AS IS" BASIS,
-     WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
-     See the License for the specific language governing permissions and
-     limitations under the License.
--->
-
-<!-- Version History
-        version 1 - initial version.
--->
-
-<mms_config version="1">
-    <!-- If enableMultipartSMS is true and smsToMmsTextThreshold > 1, then multi-part SMS messages
-         will be converted into a single mms message. For example, if the mms_config.xml file
-         specifies <int name="smsToMmsTextThreshold">7</int>, then on the 8th sms segment, the
-         message will be converted to an mms. -->
-    <int name="smsToMmsTextThreshold">10</int>
-</mms_config>
+<?xml version="1.0" encoding="utf-8"?>
+<!-- Copyright 2014 The Android Open Source Project
+
+     Licensed under the Apache License, Version 2.0 (the "License");
+     you may not use this file except in compliance with the License.
+     You may obtain a copy of the License at
+
+          http://www.apache.org/licenses/LICENSE-2.0
+
+     Unless required by applicable law or agreed to in writing, software
+     distributed under the License is distributed on an "AS IS" BASIS,
+     WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+     See the License for the specific language governing permissions and
+     limitations under the License.
+-->
+
+<!-- Version History
+        version 1 - initial version.
+-->
+
+<mms_config version="1">
+    <!-- If enableMultipartSMS is true and smsToMmsTextThreshold > 1, then multi-part SMS messages
+         will be converted into a single mms message. For example, if the mms_config.xml file
+         specifies <int name="smsToMmsTextThreshold">7</int>, then on the 8th sms segment, the
+         message will be converted to an mms. -->
+    <int name="smsToMmsTextThreshold">10</int>
+</mms_config>
diff --git a/android-smsmms/src/main/res/xml-mcc234-mnc15/mms_config.xml b/android-smsmms/src/main/res/xml-mcc234-mnc15/mms_config.xml
index 9f89f968c..547f09f42 100755
--- a/android-smsmms/src/main/res/xml-mcc234-mnc15/mms_config.xml
+++ b/android-smsmms/src/main/res/xml-mcc234-mnc15/mms_config.xml
@@ -1,27 +1,27 @@
-<?xml version="1.0" encoding="utf-8"?>
-<!-- Copyright 2014 The Android Open Source Project
-
-     Licensed under the Apache License, Version 2.0 (the "License");
-     you may not use this file except in compliance with the License.
-     You may obtain a copy of the License at
-
-          http://www.apache.org/licenses/LICENSE-2.0
-
-     Unless required by applicable law or agreed to in writing, software
-     distributed under the License is distributed on an "AS IS" BASIS,
-     WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
-     See the License for the specific language governing permissions and
-     limitations under the License.
--->
-
-<!-- Version History
-        version 1 - initial version.
--->
-
-<mms_config version="1">
-    <!-- If enableMultipartSMS is true and smsToMmsTextThreshold > 1, then multi-part SMS messages
-         will be converted into a single mms message. For example, if the mms_config.xml file
-         specifies <int name="smsToMmsTextThreshold">7</int>, then on the 8th sms segment, the
-         message will be converted to an mms. -->
-    <int name="smsToMmsTextThreshold">10</int>
-</mms_config>
+<?xml version="1.0" encoding="utf-8"?>
+<!-- Copyright 2014 The Android Open Source Project
+
+     Licensed under the Apache License, Version 2.0 (the "License");
+     you may not use this file except in compliance with the License.
+     You may obtain a copy of the License at
+
+          http://www.apache.org/licenses/LICENSE-2.0
+
+     Unless required by applicable law or agreed to in writing, software
+     distributed under the License is distributed on an "AS IS" BASIS,
+     WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+     See the License for the specific language governing permissions and
+     limitations under the License.
+-->
+
+<!-- Version History
+        version 1 - initial version.
+-->
+
+<mms_config version="1">
+    <!-- If enableMultipartSMS is true and smsToMmsTextThreshold > 1, then multi-part SMS messages
+         will be converted into a single mms message. For example, if the mms_config.xml file
+         specifies <int name="smsToMmsTextThreshold">7</int>, then on the 8th sms segment, the
+         message will be converted to an mms. -->
+    <int name="smsToMmsTextThreshold">10</int>
+</mms_config>
diff --git a/android-smsmms/src/main/res/xml-mcc238-mnc02/mms_config.xml b/android-smsmms/src/main/res/xml-mcc238-mnc02/mms_config.xml
index 6a2780991..5df97aad0 100755
--- a/android-smsmms/src/main/res/xml-mcc238-mnc02/mms_config.xml
+++ b/android-smsmms/src/main/res/xml-mcc238-mnc02/mms_config.xml
@@ -1,33 +1,33 @@
-<?xml version="1.0" encoding="utf-8"?>
-<!-- Copyright 2013 The Android Open Source Project
-
-     Licensed under the Apache License, Version 2.0 (the "License");
-     you may not use this file except in compliance with the License.
-     You may obtain a copy of the License at
-
-          http://www.apache.org/licenses/LICENSE-2.0
-
-     Unless required by applicable law or agreed to in writing, software
-     distributed under the License is distributed on an "AS IS" BASIS,
-     WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
-     See the License for the specific language governing permissions and
-     limitations under the License.
--->
-
-<!-- Version History
-        version 1 - initial version.
-        version 2 - added recipientLimit.
-        version 3 - added min/max recycler values.
-        version 4 - added sms to mms text threshold.
--->
-
-<mms_config version="4">
-    <!-- Maximum message size in bytes for a MMS message -->
-    <int name="maxMessageSize">2097152</int>
-
-    <!-- Maximum height for an attached image -->
-    <int name="maxImageHeight">1944</int>
-
-    <!-- Maximum width for an attached image -->
-    <int name="maxImageWidth">2592</int>
-</mms_config>
+<?xml version="1.0" encoding="utf-8"?>
+<!-- Copyright 2013 The Android Open Source Project
+
+     Licensed under the Apache License, Version 2.0 (the "License");
+     you may not use this file except in compliance with the License.
+     You may obtain a copy of the License at
+
+          http://www.apache.org/licenses/LICENSE-2.0
+
+     Unless required by applicable law or agreed to in writing, software
+     distributed under the License is distributed on an "AS IS" BASIS,
+     WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+     See the License for the specific language governing permissions and
+     limitations under the License.
+-->
+
+<!-- Version History
+        version 1 - initial version.
+        version 2 - added recipientLimit.
+        version 3 - added min/max recycler values.
+        version 4 - added sms to mms text threshold.
+-->
+
+<mms_config version="4">
+    <!-- Maximum message size in bytes for a MMS message -->
+    <int name="maxMessageSize">2097152</int>
+
+    <!-- Maximum height for an attached image -->
+    <int name="maxImageHeight">1944</int>
+
+    <!-- Maximum width for an attached image -->
+    <int name="maxImageWidth">2592</int>
+</mms_config>
diff --git a/android-smsmms/src/main/res/xml-mcc240-mnc01/mms_config.xml b/android-smsmms/src/main/res/xml-mcc240-mnc01/mms_config.xml
index 486c4682c..6c5de90eb 100755
--- a/android-smsmms/src/main/res/xml-mcc240-mnc01/mms_config.xml
+++ b/android-smsmms/src/main/res/xml-mcc240-mnc01/mms_config.xml
@@ -1,33 +1,33 @@
-<?xml version="1.0" encoding="utf-8"?>
-<!-- Copyright 2013 The Android Open Source Project
-
-     Licensed under the Apache License, Version 2.0 (the "License");
-     you may not use this file except in compliance with the License.
-     You may obtain a copy of the License at
-
-          http://www.apache.org/licenses/LICENSE-2.0
-
-     Unless required by applicable law or agreed to in writing, software
-     distributed under the License is distributed on an "AS IS" BASIS,
-     WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
-     See the License for the specific language governing permissions and
-     limitations under the License.
--->
-
-<!-- Version History
-        version 1 - initial version.
-        version 2 - added recipientLimit.
-        version 3 - added min/max recycler values.
-        version 4 - added sms to mms text threshold.
--->
-
-<mms_config version="4">
-    <!-- Maximum message size in bytes for a MMS message -->
-    <int name="maxMessageSize">614400</int>
-
-    <!-- Maximum height for an attached image -->
-    <int name="maxImageHeight">1944</int>
-
-    <!-- Maximum width for an attached image -->
-    <int name="maxImageWidth">2592</int>
-</mms_config>
+<?xml version="1.0" encoding="utf-8"?>
+<!-- Copyright 2013 The Android Open Source Project
+
+     Licensed under the Apache License, Version 2.0 (the "License");
+     you may not use this file except in compliance with the License.
+     You may obtain a copy of the License at
+
+          http://www.apache.org/licenses/LICENSE-2.0
+
+     Unless required by applicable law or agreed to in writing, software
+     distributed under the License is distributed on an "AS IS" BASIS,
+     WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+     See the License for the specific language governing permissions and
+     limitations under the License.
+-->
+
+<!-- Version History
+        version 1 - initial version.
+        version 2 - added recipientLimit.
+        version 3 - added min/max recycler values.
+        version 4 - added sms to mms text threshold.
+-->
+
+<mms_config version="4">
+    <!-- Maximum message size in bytes for a MMS message -->
+    <int name="maxMessageSize">614400</int>
+
+    <!-- Maximum height for an attached image -->
+    <int name="maxImageHeight">1944</int>
+
+    <!-- Maximum width for an attached image -->
+    <int name="maxImageWidth">2592</int>
+</mms_config>
diff --git a/android-smsmms/src/main/res/xml-mcc240-mnc04/mms_config.xml b/android-smsmms/src/main/res/xml-mcc240-mnc04/mms_config.xml
index 486c4682c..6c5de90eb 100755
--- a/android-smsmms/src/main/res/xml-mcc240-mnc04/mms_config.xml
+++ b/android-smsmms/src/main/res/xml-mcc240-mnc04/mms_config.xml
@@ -1,33 +1,33 @@
-<?xml version="1.0" encoding="utf-8"?>
-<!-- Copyright 2013 The Android Open Source Project
-
-     Licensed under the Apache License, Version 2.0 (the "License");
-     you may not use this file except in compliance with the License.
-     You may obtain a copy of the License at
-
-          http://www.apache.org/licenses/LICENSE-2.0
-
-     Unless required by applicable law or agreed to in writing, software
-     distributed under the License is distributed on an "AS IS" BASIS,
-     WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
-     See the License for the specific language governing permissions and
-     limitations under the License.
--->
-
-<!-- Version History
-        version 1 - initial version.
-        version 2 - added recipientLimit.
-        version 3 - added min/max recycler values.
-        version 4 - added sms to mms text threshold.
--->
-
-<mms_config version="4">
-    <!-- Maximum message size in bytes for a MMS message -->
-    <int name="maxMessageSize">614400</int>
-
-    <!-- Maximum height for an attached image -->
-    <int name="maxImageHeight">1944</int>
-
-    <!-- Maximum width for an attached image -->
-    <int name="maxImageWidth">2592</int>
-</mms_config>
+<?xml version="1.0" encoding="utf-8"?>
+<!-- Copyright 2013 The Android Open Source Project
+
+     Licensed under the Apache License, Version 2.0 (the "License");
+     you may not use this file except in compliance with the License.
+     You may obtain a copy of the License at
+
+          http://www.apache.org/licenses/LICENSE-2.0
+
+     Unless required by applicable law or agreed to in writing, software
+     distributed under the License is distributed on an "AS IS" BASIS,
+     WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+     See the License for the specific language governing permissions and
+     limitations under the License.
+-->
+
+<!-- Version History
+        version 1 - initial version.
+        version 2 - added recipientLimit.
+        version 3 - added min/max recycler values.
+        version 4 - added sms to mms text threshold.
+-->
+
+<mms_config version="4">
+    <!-- Maximum message size in bytes for a MMS message -->
+    <int name="maxMessageSize">614400</int>
+
+    <!-- Maximum height for an attached image -->
+    <int name="maxImageHeight">1944</int>
+
+    <!-- Maximum width for an attached image -->
+    <int name="maxImageWidth">2592</int>
+</mms_config>
diff --git a/android-smsmms/src/main/res/xml-mcc240-mnc08/mms_config.xml b/android-smsmms/src/main/res/xml-mcc240-mnc08/mms_config.xml
index 486c4682c..6c5de90eb 100755
--- a/android-smsmms/src/main/res/xml-mcc240-mnc08/mms_config.xml
+++ b/android-smsmms/src/main/res/xml-mcc240-mnc08/mms_config.xml
@@ -1,33 +1,33 @@
-<?xml version="1.0" encoding="utf-8"?>
-<!-- Copyright 2013 The Android Open Source Project
-
-     Licensed under the Apache License, Version 2.0 (the "License");
-     you may not use this file except in compliance with the License.
-     You may obtain a copy of the License at
-
-          http://www.apache.org/licenses/LICENSE-2.0
-
-     Unless required by applicable law or agreed to in writing, software
-     distributed under the License is distributed on an "AS IS" BASIS,
-     WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
-     See the License for the specific language governing permissions and
-     limitations under the License.
--->
-
-<!-- Version History
-        version 1 - initial version.
-        version 2 - added recipientLimit.
-        version 3 - added min/max recycler values.
-        version 4 - added sms to mms text threshold.
--->
-
-<mms_config version="4">
-    <!-- Maximum message size in bytes for a MMS message -->
-    <int name="maxMessageSize">614400</int>
-
-    <!-- Maximum height for an attached image -->
-    <int name="maxImageHeight">1944</int>
-
-    <!-- Maximum width for an attached image -->
-    <int name="maxImageWidth">2592</int>
-</mms_config>
+<?xml version="1.0" encoding="utf-8"?>
+<!-- Copyright 2013 The Android Open Source Project
+
+     Licensed under the Apache License, Version 2.0 (the "License");
+     you may not use this file except in compliance with the License.
+     You may obtain a copy of the License at
+
+          http://www.apache.org/licenses/LICENSE-2.0
+
+     Unless required by applicable law or agreed to in writing, software
+     distributed under the License is distributed on an "AS IS" BASIS,
+     WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+     See the License for the specific language governing permissions and
+     limitations under the License.
+-->
+
+<!-- Version History
+        version 1 - initial version.
+        version 2 - added recipientLimit.
+        version 3 - added min/max recycler values.
+        version 4 - added sms to mms text threshold.
+-->
+
+<mms_config version="4">
+    <!-- Maximum message size in bytes for a MMS message -->
+    <int name="maxMessageSize">614400</int>
+
+    <!-- Maximum height for an attached image -->
+    <int name="maxImageHeight">1944</int>
+
+    <!-- Maximum width for an attached image -->
+    <int name="maxImageWidth">2592</int>
+</mms_config>
diff --git a/android-smsmms/src/main/res/xml-mcc240-mnc24/mms_config.xml b/android-smsmms/src/main/res/xml-mcc240-mnc24/mms_config.xml
index 486c4682c..6c5de90eb 100755
--- a/android-smsmms/src/main/res/xml-mcc240-mnc24/mms_config.xml
+++ b/android-smsmms/src/main/res/xml-mcc240-mnc24/mms_config.xml
@@ -1,33 +1,33 @@
-<?xml version="1.0" encoding="utf-8"?>
-<!-- Copyright 2013 The Android Open Source Project
-
-     Licensed under the Apache License, Version 2.0 (the "License");
-     you may not use this file except in compliance with the License.
-     You may obtain a copy of the License at
-
-          http://www.apache.org/licenses/LICENSE-2.0
-
-     Unless required by applicable law or agreed to in writing, software
-     distributed under the License is distributed on an "AS IS" BASIS,
-     WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
-     See the License for the specific language governing permissions and
-     limitations under the License.
--->
-
-<!-- Version History
-        version 1 - initial version.
-        version 2 - added recipientLimit.
-        version 3 - added min/max recycler values.
-        version 4 - added sms to mms text threshold.
--->
-
-<mms_config version="4">
-    <!-- Maximum message size in bytes for a MMS message -->
-    <int name="maxMessageSize">614400</int>
-
-    <!-- Maximum height for an attached image -->
-    <int name="maxImageHeight">1944</int>
-
-    <!-- Maximum width for an attached image -->
-    <int name="maxImageWidth">2592</int>
-</mms_config>
+<?xml version="1.0" encoding="utf-8"?>
+<!-- Copyright 2013 The Android Open Source Project
+
+     Licensed under the Apache License, Version 2.0 (the "License");
+     you may not use this file except in compliance with the License.
+     You may obtain a copy of the License at
+
+          http://www.apache.org/licenses/LICENSE-2.0
+
+     Unless required by applicable law or agreed to in writing, software
+     distributed under the License is distributed on an "AS IS" BASIS,
+     WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+     See the License for the specific language governing permissions and
+     limitations under the License.
+-->
+
+<!-- Version History
+        version 1 - initial version.
+        version 2 - added recipientLimit.
+        version 3 - added min/max recycler values.
+        version 4 - added sms to mms text threshold.
+-->
+
+<mms_config version="4">
+    <!-- Maximum message size in bytes for a MMS message -->
+    <int name="maxMessageSize">614400</int>
+
+    <!-- Maximum height for an attached image -->
+    <int name="maxImageHeight">1944</int>
+
+    <!-- Maximum width for an attached image -->
+    <int name="maxImageWidth">2592</int>
+</mms_config>
diff --git a/android-smsmms/src/main/res/xml-mcc242-mnc01/mms_config.xml b/android-smsmms/src/main/res/xml-mcc242-mnc01/mms_config.xml
index 6a2780991..5df97aad0 100755
--- a/android-smsmms/src/main/res/xml-mcc242-mnc01/mms_config.xml
+++ b/android-smsmms/src/main/res/xml-mcc242-mnc01/mms_config.xml
@@ -1,33 +1,33 @@
-<?xml version="1.0" encoding="utf-8"?>
-<!-- Copyright 2013 The Android Open Source Project
-
-     Licensed under the Apache License, Version 2.0 (the "License");
-     you may not use this file except in compliance with the License.
-     You may obtain a copy of the License at
-
-          http://www.apache.org/licenses/LICENSE-2.0
-
-     Unless required by applicable law or agreed to in writing, software
-     distributed under the License is distributed on an "AS IS" BASIS,
-     WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
-     See the License for the specific language governing permissions and
-     limitations under the License.
--->
-
-<!-- Version History
-        version 1 - initial version.
-        version 2 - added recipientLimit.
-        version 3 - added min/max recycler values.
-        version 4 - added sms to mms text threshold.
--->
-
-<mms_config version="4">
-    <!-- Maximum message size in bytes for a MMS message -->
-    <int name="maxMessageSize">2097152</int>
-
-    <!-- Maximum height for an attached image -->
-    <int name="maxImageHeight">1944</int>
-
-    <!-- Maximum width for an attached image -->
-    <int name="maxImageWidth">2592</int>
-</mms_config>
+<?xml version="1.0" encoding="utf-8"?>
+<!-- Copyright 2013 The Android Open Source Project
+
+     Licensed under the Apache License, Version 2.0 (the "License");
+     you may not use this file except in compliance with the License.
+     You may obtain a copy of the License at
+
+          http://www.apache.org/licenses/LICENSE-2.0
+
+     Unless required by applicable law or agreed to in writing, software
+     distributed under the License is distributed on an "AS IS" BASIS,
+     WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+     See the License for the specific language governing permissions and
+     limitations under the License.
+-->
+
+<!-- Version History
+        version 1 - initial version.
+        version 2 - added recipientLimit.
+        version 3 - added min/max recycler values.
+        version 4 - added sms to mms text threshold.
+-->
+
+<mms_config version="4">
+    <!-- Maximum message size in bytes for a MMS message -->
+    <int name="maxMessageSize">2097152</int>
+
+    <!-- Maximum height for an attached image -->
+    <int name="maxImageHeight">1944</int>
+
+    <!-- Maximum width for an attached image -->
+    <int name="maxImageWidth">2592</int>
+</mms_config>
diff --git a/android-smsmms/src/main/res/xml-mcc242-mnc02/mms_config.xml b/android-smsmms/src/main/res/xml-mcc242-mnc02/mms_config.xml
index 486c4682c..6c5de90eb 100755
--- a/android-smsmms/src/main/res/xml-mcc242-mnc02/mms_config.xml
+++ b/android-smsmms/src/main/res/xml-mcc242-mnc02/mms_config.xml
@@ -1,33 +1,33 @@
-<?xml version="1.0" encoding="utf-8"?>
-<!-- Copyright 2013 The Android Open Source Project
-
-     Licensed under the Apache License, Version 2.0 (the "License");
-     you may not use this file except in compliance with the License.
-     You may obtain a copy of the License at
-
-          http://www.apache.org/licenses/LICENSE-2.0
-
-     Unless required by applicable law or agreed to in writing, software
-     distributed under the License is distributed on an "AS IS" BASIS,
-     WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
-     See the License for the specific language governing permissions and
-     limitations under the License.
--->
-
-<!-- Version History
-        version 1 - initial version.
-        version 2 - added recipientLimit.
-        version 3 - added min/max recycler values.
-        version 4 - added sms to mms text threshold.
--->
-
-<mms_config version="4">
-    <!-- Maximum message size in bytes for a MMS message -->
-    <int name="maxMessageSize">614400</int>
-
-    <!-- Maximum height for an attached image -->
-    <int name="maxImageHeight">1944</int>
-
-    <!-- Maximum width for an attached image -->
-    <int name="maxImageWidth">2592</int>
-</mms_config>
+<?xml version="1.0" encoding="utf-8"?>
+<!-- Copyright 2013 The Android Open Source Project
+
+     Licensed under the Apache License, Version 2.0 (the "License");
+     you may not use this file except in compliance with the License.
+     You may obtain a copy of the License at
+
+          http://www.apache.org/licenses/LICENSE-2.0
+
+     Unless required by applicable law or agreed to in writing, software
+     distributed under the License is distributed on an "AS IS" BASIS,
+     WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+     See the License for the specific language governing permissions and
+     limitations under the License.
+-->
+
+<!-- Version History
+        version 1 - initial version.
+        version 2 - added recipientLimit.
+        version 3 - added min/max recycler values.
+        version 4 - added sms to mms text threshold.
+-->
+
+<mms_config version="4">
+    <!-- Maximum message size in bytes for a MMS message -->
+    <int name="maxMessageSize">614400</int>
+
+    <!-- Maximum height for an attached image -->
+    <int name="maxImageHeight">1944</int>
+
+    <!-- Maximum width for an attached image -->
+    <int name="maxImageWidth">2592</int>
+</mms_config>
diff --git a/android-smsmms/src/main/res/xml-mcc262-mnc07/mms_config.xml b/android-smsmms/src/main/res/xml-mcc262-mnc07/mms_config.xml
index 486c4682c..6c5de90eb 100755
--- a/android-smsmms/src/main/res/xml-mcc262-mnc07/mms_config.xml
+++ b/android-smsmms/src/main/res/xml-mcc262-mnc07/mms_config.xml
@@ -1,33 +1,33 @@
-<?xml version="1.0" encoding="utf-8"?>
-<!-- Copyright 2013 The Android Open Source Project
-
-     Licensed under the Apache License, Version 2.0 (the "License");
-     you may not use this file except in compliance with the License.
-     You may obtain a copy of the License at
-
-          http://www.apache.org/licenses/LICENSE-2.0
-
-     Unless required by applicable law or agreed to in writing, software
-     distributed under the License is distributed on an "AS IS" BASIS,
-     WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
-     See the License for the specific language governing permissions and
-     limitations under the License.
--->
-
-<!-- Version History
-        version 1 - initial version.
-        version 2 - added recipientLimit.
-        version 3 - added min/max recycler values.
-        version 4 - added sms to mms text threshold.
--->
-
-<mms_config version="4">
-    <!-- Maximum message size in bytes for a MMS message -->
-    <int name="maxMessageSize">614400</int>
-
-    <!-- Maximum height for an attached image -->
-    <int name="maxImageHeight">1944</int>
-
-    <!-- Maximum width for an attached image -->
-    <int name="maxImageWidth">2592</int>
-</mms_config>
+<?xml version="1.0" encoding="utf-8"?>
+<!-- Copyright 2013 The Android Open Source Project
+
+     Licensed under the Apache License, Version 2.0 (the "License");
+     you may not use this file except in compliance with the License.
+     You may obtain a copy of the License at
+
+          http://www.apache.org/licenses/LICENSE-2.0
+
+     Unless required by applicable law or agreed to in writing, software
+     distributed under the License is distributed on an "AS IS" BASIS,
+     WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+     See the License for the specific language governing permissions and
+     limitations under the License.
+-->
+
+<!-- Version History
+        version 1 - initial version.
+        version 2 - added recipientLimit.
+        version 3 - added min/max recycler values.
+        version 4 - added sms to mms text threshold.
+-->
+
+<mms_config version="4">
+    <!-- Maximum message size in bytes for a MMS message -->
+    <int name="maxMessageSize">614400</int>
+
+    <!-- Maximum height for an attached image -->
+    <int name="maxImageHeight">1944</int>
+
+    <!-- Maximum width for an attached image -->
+    <int name="maxImageWidth">2592</int>
+</mms_config>
diff --git a/android-smsmms/src/main/res/xml-mcc274-mnc02/mms_config.xml b/android-smsmms/src/main/res/xml-mcc274-mnc02/mms_config.xml
index 96e5b9df7..de6b16bd2 100755
--- a/android-smsmms/src/main/res/xml-mcc274-mnc02/mms_config.xml
+++ b/android-smsmms/src/main/res/xml-mcc274-mnc02/mms_config.xml
@@ -1,33 +1,33 @@
-<?xml version="1.0" encoding="utf-8"?>
-<!-- Copyright 2013 The Android Open Source Project
-
-     Licensed under the Apache License, Version 2.0 (the "License");
-     you may not use this file except in compliance with the License.
-     You may obtain a copy of the License at
-
-          http://www.apache.org/licenses/LICENSE-2.0
-
-     Unless required by applicable law or agreed to in writing, software
-     distributed under the License is distributed on an "AS IS" BASIS,
-     WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
-     See the License for the specific language governing permissions and
-     limitations under the License.
--->
-
-<!-- Version History
-        version 1 - initial version.
-        version 2 - added recipientLimit.
-        version 3 - added min/max recycler values.
-        version 4 - added sms to mms text threshold.
--->
-
-<mms_config version="4">
-    <!-- Maximum message size in bytes for a MMS message -->
-    <int name="maxMessageSize">1048576</int>
-
-    <!-- Maximum height for an attached image -->
-    <int name="maxImageHeight">1944</int>
-
-    <!-- Maximum width for an attached image -->
-    <int name="maxImageWidth">2592</int>
-</mms_config>
+<?xml version="1.0" encoding="utf-8"?>
+<!-- Copyright 2013 The Android Open Source Project
+
+     Licensed under the Apache License, Version 2.0 (the "License");
+     you may not use this file except in compliance with the License.
+     You may obtain a copy of the License at
+
+          http://www.apache.org/licenses/LICENSE-2.0
+
+     Unless required by applicable law or agreed to in writing, software
+     distributed under the License is distributed on an "AS IS" BASIS,
+     WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+     See the License for the specific language governing permissions and
+     limitations under the License.
+-->
+
+<!-- Version History
+        version 1 - initial version.
+        version 2 - added recipientLimit.
+        version 3 - added min/max recycler values.
+        version 4 - added sms to mms text threshold.
+-->
+
+<mms_config version="4">
+    <!-- Maximum message size in bytes for a MMS message -->
+    <int name="maxMessageSize">1048576</int>
+
+    <!-- Maximum height for an attached image -->
+    <int name="maxImageHeight">1944</int>
+
+    <!-- Maximum width for an attached image -->
+    <int name="maxImageWidth">2592</int>
+</mms_config>
diff --git a/android-smsmms/src/main/res/xml-mcc274-mnc03/mms_config.xml b/android-smsmms/src/main/res/xml-mcc274-mnc03/mms_config.xml
index 96e5b9df7..de6b16bd2 100755
--- a/android-smsmms/src/main/res/xml-mcc274-mnc03/mms_config.xml
+++ b/android-smsmms/src/main/res/xml-mcc274-mnc03/mms_config.xml
@@ -1,33 +1,33 @@
-<?xml version="1.0" encoding="utf-8"?>
-<!-- Copyright 2013 The Android Open Source Project
-
-     Licensed under the Apache License, Version 2.0 (the "License");
-     you may not use this file except in compliance with the License.
-     You may obtain a copy of the License at
-
-          http://www.apache.org/licenses/LICENSE-2.0
-
-     Unless required by applicable law or agreed to in writing, software
-     distributed under the License is distributed on an "AS IS" BASIS,
-     WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
-     See the License for the specific language governing permissions and
-     limitations under the License.
--->
-
-<!-- Version History
-        version 1 - initial version.
-        version 2 - added recipientLimit.
-        version 3 - added min/max recycler values.
-        version 4 - added sms to mms text threshold.
--->
-
-<mms_config version="4">
-    <!-- Maximum message size in bytes for a MMS message -->
-    <int name="maxMessageSize">1048576</int>
-
-    <!-- Maximum height for an attached image -->
-    <int name="maxImageHeight">1944</int>
-
-    <!-- Maximum width for an attached image -->
-    <int name="maxImageWidth">2592</int>
-</mms_config>
+<?xml version="1.0" encoding="utf-8"?>
+<!-- Copyright 2013 The Android Open Source Project
+
+     Licensed under the Apache License, Version 2.0 (the "License");
+     you may not use this file except in compliance with the License.
+     You may obtain a copy of the License at
+
+          http://www.apache.org/licenses/LICENSE-2.0
+
+     Unless required by applicable law or agreed to in writing, software
+     distributed under the License is distributed on an "AS IS" BASIS,
+     WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+     See the License for the specific language governing permissions and
+     limitations under the License.
+-->
+
+<!-- Version History
+        version 1 - initial version.
+        version 2 - added recipientLimit.
+        version 3 - added min/max recycler values.
+        version 4 - added sms to mms text threshold.
+-->
+
+<mms_config version="4">
+    <!-- Maximum message size in bytes for a MMS message -->
+    <int name="maxMessageSize">1048576</int>
+
+    <!-- Maximum height for an attached image -->
+    <int name="maxImageHeight">1944</int>
+
+    <!-- Maximum width for an attached image -->
+    <int name="maxImageWidth">2592</int>
+</mms_config>
diff --git a/android-smsmms/src/main/res/xml-mcc286-mnc01/mms_config.xml b/android-smsmms/src/main/res/xml-mcc286-mnc01/mms_config.xml
index a90a26d57..f17ae535a 100755
--- a/android-smsmms/src/main/res/xml-mcc286-mnc01/mms_config.xml
+++ b/android-smsmms/src/main/res/xml-mcc286-mnc01/mms_config.xml
@@ -1,33 +1,33 @@
-<?xml version="1.0" encoding="utf-8"?>
-<!-- Copyright 2013 The Android Open Source Project
-
-     Licensed under the Apache License, Version 2.0 (the "License");
-     you may not use this file except in compliance with the License.
-     You may obtain a copy of the License at
-
-          http://www.apache.org/licenses/LICENSE-2.0
-
-     Unless required by applicable law or agreed to in writing, software
-     distributed under the License is distributed on an "AS IS" BASIS,
-     WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
-     See the License for the specific language governing permissions and
-     limitations under the License.
--->
-
-<!-- Version History
-        version 1 - initial version.
-        version 2 - added recipientLimit.
-        version 3 - added min/max recycler values.
-        version 4 - added sms to mms text threshold.
--->
-
-<mms_config version="4">
-    <!-- Maximum message size in bytes for a MMS message -->
-    <int name="maxMessageSize">512000</int>
-
-    <!-- Maximum height for an attached image -->
-    <int name="maxImageHeight">1944</int>
-
-    <!-- Maximum width for an attached image -->
-    <int name="maxImageWidth">2592</int>
-</mms_config>
+<?xml version="1.0" encoding="utf-8"?>
+<!-- Copyright 2013 The Android Open Source Project
+
+     Licensed under the Apache License, Version 2.0 (the "License");
+     you may not use this file except in compliance with the License.
+     You may obtain a copy of the License at
+
+          http://www.apache.org/licenses/LICENSE-2.0
+
+     Unless required by applicable law or agreed to in writing, software
+     distributed under the License is distributed on an "AS IS" BASIS,
+     WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+     See the License for the specific language governing permissions and
+     limitations under the License.
+-->
+
+<!-- Version History
+        version 1 - initial version.
+        version 2 - added recipientLimit.
+        version 3 - added min/max recycler values.
+        version 4 - added sms to mms text threshold.
+-->
+
+<mms_config version="4">
+    <!-- Maximum message size in bytes for a MMS message -->
+    <int name="maxMessageSize">512000</int>
+
+    <!-- Maximum height for an attached image -->
+    <int name="maxImageHeight">1944</int>
+
+    <!-- Maximum width for an attached image -->
+    <int name="maxImageWidth">2592</int>
+</mms_config>
diff --git a/android-smsmms/src/main/res/xml-mcc286-mnc03/mms_config.xml b/android-smsmms/src/main/res/xml-mcc286-mnc03/mms_config.xml
index a90a26d57..f17ae535a 100755
--- a/android-smsmms/src/main/res/xml-mcc286-mnc03/mms_config.xml
+++ b/android-smsmms/src/main/res/xml-mcc286-mnc03/mms_config.xml
@@ -1,33 +1,33 @@
-<?xml version="1.0" encoding="utf-8"?>
-<!-- Copyright 2013 The Android Open Source Project
-
-     Licensed under the Apache License, Version 2.0 (the "License");
-     you may not use this file except in compliance with the License.
-     You may obtain a copy of the License at
-
-          http://www.apache.org/licenses/LICENSE-2.0
-
-     Unless required by applicable law or agreed to in writing, software
-     distributed under the License is distributed on an "AS IS" BASIS,
-     WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
-     See the License for the specific language governing permissions and
-     limitations under the License.
--->
-
-<!-- Version History
-        version 1 - initial version.
-        version 2 - added recipientLimit.
-        version 3 - added min/max recycler values.
-        version 4 - added sms to mms text threshold.
--->
-
-<mms_config version="4">
-    <!-- Maximum message size in bytes for a MMS message -->
-    <int name="maxMessageSize">512000</int>
-
-    <!-- Maximum height for an attached image -->
-    <int name="maxImageHeight">1944</int>
-
-    <!-- Maximum width for an attached image -->
-    <int name="maxImageWidth">2592</int>
-</mms_config>
+<?xml version="1.0" encoding="utf-8"?>
+<!-- Copyright 2013 The Android Open Source Project
+
+     Licensed under the Apache License, Version 2.0 (the "License");
+     you may not use this file except in compliance with the License.
+     You may obtain a copy of the License at
+
+          http://www.apache.org/licenses/LICENSE-2.0
+
+     Unless required by applicable law or agreed to in writing, software
+     distributed under the License is distributed on an "AS IS" BASIS,
+     WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+     See the License for the specific language governing permissions and
+     limitations under the License.
+-->
+
+<!-- Version History
+        version 1 - initial version.
+        version 2 - added recipientLimit.
+        version 3 - added min/max recycler values.
+        version 4 - added sms to mms text threshold.
+-->
+
+<mms_config version="4">
+    <!-- Maximum message size in bytes for a MMS message -->
+    <int name="maxMessageSize">512000</int>
+
+    <!-- Maximum height for an attached image -->
+    <int name="maxImageHeight">1944</int>
+
+    <!-- Maximum width for an attached image -->
+    <int name="maxImageWidth">2592</int>
+</mms_config>
diff --git a/android-smsmms/src/main/res/xml-mcc294-mnc01/mms_config.xml b/android-smsmms/src/main/res/xml-mcc294-mnc01/mms_config.xml
index 03ff16c0b..3d1391f4e 100755
--- a/android-smsmms/src/main/res/xml-mcc294-mnc01/mms_config.xml
+++ b/android-smsmms/src/main/res/xml-mcc294-mnc01/mms_config.xml
@@ -1,33 +1,33 @@
-<?xml version="1.0" encoding="utf-8"?>
-<!-- Copyright 2013 The Android Open Source Project
-
-     Licensed under the Apache License, Version 2.0 (the "License");
-     you may not use this file except in compliance with the License.
-     You may obtain a copy of the License at
-
-          http://www.apache.org/licenses/LICENSE-2.0
-
-     Unless required by applicable law or agreed to in writing, software
-     distributed under the License is distributed on an "AS IS" BASIS,
-     WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
-     See the License for the specific language governing permissions and
-     limitations under the License.
--->
-
-<!-- Version History
-        version 1 - initial version.
-        version 2 - added recipientLimit.
-        version 3 - added min/max recycler values.
-        version 4 - added sms to mms text threshold.
--->
-
-<mms_config version="4">
-    <!-- Maximum message size in bytes for a MMS message -->
-    <int name="maxMessageSize">102400</int>
-
-    <!-- Maximum height for an attached image -->
-    <int name="maxImageHeight">1944</int>
-
-    <!-- Maximum width for an attached image -->
-    <int name="maxImageWidth">2592</int>
-</mms_config>
+<?xml version="1.0" encoding="utf-8"?>
+<!-- Copyright 2013 The Android Open Source Project
+
+     Licensed under the Apache License, Version 2.0 (the "License");
+     you may not use this file except in compliance with the License.
+     You may obtain a copy of the License at
+
+          http://www.apache.org/licenses/LICENSE-2.0
+
+     Unless required by applicable law or agreed to in writing, software
+     distributed under the License is distributed on an "AS IS" BASIS,
+     WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+     See the License for the specific language governing permissions and
+     limitations under the License.
+-->
+
+<!-- Version History
+        version 1 - initial version.
+        version 2 - added recipientLimit.
+        version 3 - added min/max recycler values.
+        version 4 - added sms to mms text threshold.
+-->
+
+<mms_config version="4">
+    <!-- Maximum message size in bytes for a MMS message -->
+    <int name="maxMessageSize">102400</int>
+
+    <!-- Maximum height for an attached image -->
+    <int name="maxImageHeight">1944</int>
+
+    <!-- Maximum width for an attached image -->
+    <int name="maxImageWidth">2592</int>
+</mms_config>
diff --git a/android-smsmms/src/main/res/xml-mcc294-mnc02/mms_config.xml b/android-smsmms/src/main/res/xml-mcc294-mnc02/mms_config.xml
index 51af512db..c7cc96239 100755
--- a/android-smsmms/src/main/res/xml-mcc294-mnc02/mms_config.xml
+++ b/android-smsmms/src/main/res/xml-mcc294-mnc02/mms_config.xml
@@ -1,33 +1,33 @@
-<?xml version="1.0" encoding="utf-8"?>
-<!-- Copyright 2013 The Android Open Source Project
-
-     Licensed under the Apache License, Version 2.0 (the "License");
-     you may not use this file except in compliance with the License.
-     You may obtain a copy of the License at
-
-          http://www.apache.org/licenses/LICENSE-2.0
-
-     Unless required by applicable law or agreed to in writing, software
-     distributed under the License is distributed on an "AS IS" BASIS,
-     WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
-     See the License for the specific language governing permissions and
-     limitations under the License.
--->
-
-<!-- Version History
-        version 1 - initial version.
-        version 2 - added recipientLimit.
-        version 3 - added min/max recycler values.
-        version 4 - added sms to mms text threshold.
--->
-
-<mms_config version="4">
-    <!-- Maximum message size in bytes for a MMS message -->
-    <int name="maxMessageSize">131072</int>
-
-    <!-- Maximum height for an attached image -->
-    <int name="maxImageHeight">1944</int>
-
-    <!-- Maximum width for an attached image -->
-    <int name="maxImageWidth">2592</int>
-</mms_config>
+<?xml version="1.0" encoding="utf-8"?>
+<!-- Copyright 2013 The Android Open Source Project
+
+     Licensed under the Apache License, Version 2.0 (the "License");
+     you may not use this file except in compliance with the License.
+     You may obtain a copy of the License at
+
+          http://www.apache.org/licenses/LICENSE-2.0
+
+     Unless required by applicable law or agreed to in writing, software
+     distributed under the License is distributed on an "AS IS" BASIS,
+     WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+     See the License for the specific language governing permissions and
+     limitations under the License.
+-->
+
+<!-- Version History
+        version 1 - initial version.
+        version 2 - added recipientLimit.
+        version 3 - added min/max recycler values.
+        version 4 - added sms to mms text threshold.
+-->
+
+<mms_config version="4">
+    <!-- Maximum message size in bytes for a MMS message -->
+    <int name="maxMessageSize">131072</int>
+
+    <!-- Maximum height for an attached image -->
+    <int name="maxImageHeight">1944</int>
+
+    <!-- Maximum width for an attached image -->
+    <int name="maxImageWidth">2592</int>
+</mms_config>
diff --git a/android-smsmms/src/main/res/xml-mcc294-mnc03/mms_config.xml b/android-smsmms/src/main/res/xml-mcc294-mnc03/mms_config.xml
index 208a5a2a9..36eb33fbe 100755
--- a/android-smsmms/src/main/res/xml-mcc294-mnc03/mms_config.xml
+++ b/android-smsmms/src/main/res/xml-mcc294-mnc03/mms_config.xml
@@ -1,33 +1,33 @@
-<?xml version="1.0" encoding="utf-8"?>
-<!-- Copyright 2013 The Android Open Source Project
-
-     Licensed under the Apache License, Version 2.0 (the "License");
-     you may not use this file except in compliance with the License.
-     You may obtain a copy of the License at
-
-          http://www.apache.org/licenses/LICENSE-2.0
-
-     Unless required by applicable law or agreed to in writing, software
-     distributed under the License is distributed on an "AS IS" BASIS,
-     WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
-     See the License for the specific language governing permissions and
-     limitations under the License.
--->
-
-<!-- Version History
-        version 1 - initial version.
-        version 2 - added recipientLimit.
-        version 3 - added min/max recycler values.
-        version 4 - added sms to mms text threshold.
--->
-
-<mms_config version="4">
-    <!-- Maximum message size in bytes for a MMS message -->
-    <int name="maxMessageSize">256000</int>
-
-    <!-- Maximum height for an attached image -->
-    <int name="maxImageHeight">1944</int>
-
-    <!-- Maximum width for an attached image -->
-    <int name="maxImageWidth">2592</int>
-</mms_config>
+<?xml version="1.0" encoding="utf-8"?>
+<!-- Copyright 2013 The Android Open Source Project
+
+     Licensed under the Apache License, Version 2.0 (the "License");
+     you may not use this file except in compliance with the License.
+     You may obtain a copy of the License at
+
+          http://www.apache.org/licenses/LICENSE-2.0
+
+     Unless required by applicable law or agreed to in writing, software
+     distributed under the License is distributed on an "AS IS" BASIS,
+     WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+     See the License for the specific language governing permissions and
+     limitations under the License.
+-->
+
+<!-- Version History
+        version 1 - initial version.
+        version 2 - added recipientLimit.
+        version 3 - added min/max recycler values.
+        version 4 - added sms to mms text threshold.
+-->
+
+<mms_config version="4">
+    <!-- Maximum message size in bytes for a MMS message -->
+    <int name="maxMessageSize">256000</int>
+
+    <!-- Maximum height for an attached image -->
+    <int name="maxImageHeight">1944</int>
+
+    <!-- Maximum width for an attached image -->
+    <int name="maxImageWidth">2592</int>
+</mms_config>
diff --git a/android-smsmms/src/main/res/xml-mcc302-mnc220/mms_config.xml b/android-smsmms/src/main/res/xml-mcc302-mnc220/mms_config.xml
index 4267322fa..fc0c156c9 100755
--- a/android-smsmms/src/main/res/xml-mcc302-mnc220/mms_config.xml
+++ b/android-smsmms/src/main/res/xml-mcc302-mnc220/mms_config.xml
@@ -1,46 +1,46 @@
-<?xml version="1.0" encoding="utf-8"?>
-<!-- Copyright 2013 The Android Open Source Project
-
-     Licensed under the Apache License, Version 2.0 (the "License");
-     you may not use this file except in compliance with the License.
-     You may obtain a copy of the License at
-
-          http://www.apache.org/licenses/LICENSE-2.0
-
-     Unless required by applicable law or agreed to in writing, software
-     distributed under the License is distributed on an "AS IS" BASIS,
-     WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
-     See the License for the specific language governing permissions and
-     limitations under the License.
--->
-
-<!-- Version History
-        version 1 - initial version.
-        version 2 - added recipientLimit.
-        version 3 - added min/max recycler values.
-        version 4 - added sms to mms text threshold.
--->
-
-<mms_config version="4">
-    <!-- Maximum message size in bytes for a MMS message -->
-    <int name="maxMessageSize">1048576</int>
-
-    <!-- Maximum height for an attached image -->
-    <int name="maxImageHeight">1944</int>
-
-    <!-- Maximum width for an attached image -->
-    <int name="maxImageWidth">2592</int>
-
-    <!-- Maximum number of recipients allowed per message. Use a value of -1
-    to indicate no limit. -->
-    <int name="recipientLimit">10</int>
-
-    <!-- If enableMultipartSMS is true and smsToMmsTextThreshold > 1, then multi-part SMS messages
-    will be converted into a single mms message. For example, if the mms_config.xml file
-    specifies <int name="smsToMmsTextThreshold">7</int>, then on the 8th sms segment, the
-    message will be converted to an mms. -->
-    <int name="smsToMmsTextThreshold">5</int>
-
-    <!-- Maximum length in chars of mms subject field -->
-    <int name="maxSubjectLength">80</int>
-</mms_config>
+<?xml version="1.0" encoding="utf-8"?>
+<!-- Copyright 2013 The Android Open Source Project
+
+     Licensed under the Apache License, Version 2.0 (the "License");
+     you may not use this file except in compliance with the License.
+     You may obtain a copy of the License at
+
+          http://www.apache.org/licenses/LICENSE-2.0
+
+     Unless required by applicable law or agreed to in writing, software
+     distributed under the License is distributed on an "AS IS" BASIS,
+     WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+     See the License for the specific language governing permissions and
+     limitations under the License.
+-->
+
+<!-- Version History
+        version 1 - initial version.
+        version 2 - added recipientLimit.
+        version 3 - added min/max recycler values.
+        version 4 - added sms to mms text threshold.
+-->
+
+<mms_config version="4">
+    <!-- Maximum message size in bytes for a MMS message -->
+    <int name="maxMessageSize">1048576</int>
+
+    <!-- Maximum height for an attached image -->
+    <int name="maxImageHeight">1944</int>
+
+    <!-- Maximum width for an attached image -->
+    <int name="maxImageWidth">2592</int>
+
+    <!-- Maximum number of recipients allowed per message. Use a value of -1
+    to indicate no limit. -->
+    <int name="recipientLimit">10</int>
+
+    <!-- If enableMultipartSMS is true and smsToMmsTextThreshold > 1, then multi-part SMS messages
+    will be converted into a single mms message. For example, if the mms_config.xml file
+    specifies <int name="smsToMmsTextThreshold">7</int>, then on the 8th sms segment, the
+    message will be converted to an mms. -->
+    <int name="smsToMmsTextThreshold">5</int>
+
+    <!-- Maximum length in chars of mms subject field -->
+    <int name="maxSubjectLength">80</int>
+</mms_config>
diff --git a/android-smsmms/src/main/res/xml-mcc302-mnc221/mms_config.xml b/android-smsmms/src/main/res/xml-mcc302-mnc221/mms_config.xml
index 4267322fa..fc0c156c9 100755
--- a/android-smsmms/src/main/res/xml-mcc302-mnc221/mms_config.xml
+++ b/android-smsmms/src/main/res/xml-mcc302-mnc221/mms_config.xml
@@ -1,46 +1,46 @@
-<?xml version="1.0" encoding="utf-8"?>
-<!-- Copyright 2013 The Android Open Source Project
-
-     Licensed under the Apache License, Version 2.0 (the "License");
-     you may not use this file except in compliance with the License.
-     You may obtain a copy of the License at
-
-          http://www.apache.org/licenses/LICENSE-2.0
-
-     Unless required by applicable law or agreed to in writing, software
-     distributed under the License is distributed on an "AS IS" BASIS,
-     WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
-     See the License for the specific language governing permissions and
-     limitations under the License.
--->
-
-<!-- Version History
-        version 1 - initial version.
-        version 2 - added recipientLimit.
-        version 3 - added min/max recycler values.
-        version 4 - added sms to mms text threshold.
--->
-
-<mms_config version="4">
-    <!-- Maximum message size in bytes for a MMS message -->
-    <int name="maxMessageSize">1048576</int>
-
-    <!-- Maximum height for an attached image -->
-    <int name="maxImageHeight">1944</int>
-
-    <!-- Maximum width for an attached image -->
-    <int name="maxImageWidth">2592</int>
-
-    <!-- Maximum number of recipients allowed per message. Use a value of -1
-    to indicate no limit. -->
-    <int name="recipientLimit">10</int>
-
-    <!-- If enableMultipartSMS is true and smsToMmsTextThreshold > 1, then multi-part SMS messages
-    will be converted into a single mms message. For example, if the mms_config.xml file
-    specifies <int name="smsToMmsTextThreshold">7</int>, then on the 8th sms segment, the
-    message will be converted to an mms. -->
-    <int name="smsToMmsTextThreshold">5</int>
-
-    <!-- Maximum length in chars of mms subject field -->
-    <int name="maxSubjectLength">80</int>
-</mms_config>
+<?xml version="1.0" encoding="utf-8"?>
+<!-- Copyright 2013 The Android Open Source Project
+
+     Licensed under the Apache License, Version 2.0 (the "License");
+     you may not use this file except in compliance with the License.
+     You may obtain a copy of the License at
+
+          http://www.apache.org/licenses/LICENSE-2.0
+
+     Unless required by applicable law or agreed to in writing, software
+     distributed under the License is distributed on an "AS IS" BASIS,
+     WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+     See the License for the specific language governing permissions and
+     limitations under the License.
+-->
+
+<!-- Version History
+        version 1 - initial version.
+        version 2 - added recipientLimit.
+        version 3 - added min/max recycler values.
+        version 4 - added sms to mms text threshold.
+-->
+
+<mms_config version="4">
+    <!-- Maximum message size in bytes for a MMS message -->
+    <int name="maxMessageSize">1048576</int>
+
+    <!-- Maximum height for an attached image -->
+    <int name="maxImageHeight">1944</int>
+
+    <!-- Maximum width for an attached image -->
+    <int name="maxImageWidth">2592</int>
+
+    <!-- Maximum number of recipients allowed per message. Use a value of -1
+    to indicate no limit. -->
+    <int name="recipientLimit">10</int>
+
+    <!-- If enableMultipartSMS is true and smsToMmsTextThreshold > 1, then multi-part SMS messages
+    will be converted into a single mms message. For example, if the mms_config.xml file
+    specifies <int name="smsToMmsTextThreshold">7</int>, then on the 8th sms segment, the
+    message will be converted to an mms. -->
+    <int name="smsToMmsTextThreshold">5</int>
+
+    <!-- Maximum length in chars of mms subject field -->
+    <int name="maxSubjectLength">80</int>
+</mms_config>
diff --git a/android-smsmms/src/main/res/xml-mcc302-mnc270/mms_config.xml b/android-smsmms/src/main/res/xml-mcc302-mnc270/mms_config.xml
index 7f92daaa5..691948fe3 100755
--- a/android-smsmms/src/main/res/xml-mcc302-mnc270/mms_config.xml
+++ b/android-smsmms/src/main/res/xml-mcc302-mnc270/mms_config.xml
@@ -1,46 +1,46 @@
-<?xml version="1.0" encoding="utf-8"?>
-<!-- Copyright 2013 The Android Open Source Project
-
-     Licensed under the Apache License, Version 2.0 (the "License");
-     you may not use this file except in compliance with the License.
-     You may obtain a copy of the License at
-
-          http://www.apache.org/licenses/LICENSE-2.0
-
-     Unless required by applicable law or agreed to in writing, software
-     distributed under the License is distributed on an "AS IS" BASIS,
-     WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
-     See the License for the specific language governing permissions and
-     limitations under the License.
--->
-
-<!-- Version History
-        version 1 - initial version.
-        version 2 - added recipientLimit.
-        version 3 - added min/max recycler values.
-        version 4 - added sms to mms text threshold.
--->
-
-<mms_config version="4">
-    <!-- Maximum message size in bytes for a MMS message -->
-    <int name="maxMessageSize">1048576</int>
-
-    <!-- Maximum height for an attached image -->
-    <int name="maxImageHeight">1944</int>
-
-    <!-- Maximum width for an attached image -->
-    <int name="maxImageWidth">2592</int>
-
-    <!-- Maximum number of recipients allowed per message. Use a value of -1
-         to indicate no limit. -->
-    <int name="recipientLimit">20</int>
-
-    <!-- If enableMultipartSMS is true and smsToMmsTextThreshold > 1, then multi-part SMS messages
-         will be converted into a single mms message. For example, if the mms_config.xml file
-         specifies <int name="smsToMmsTextThreshold">7</int>, then on the 8th sms segment, the
-         message will be converted to an mms. -->
-    <int name="smsToMmsTextThreshold">6</int>
-
-    <!-- Maximum length in chars of mms subject field -->
-    <int name="maxSubjectLength">80</int>
-</mms_config>
+<?xml version="1.0" encoding="utf-8"?>
+<!-- Copyright 2013 The Android Open Source Project
+
+     Licensed under the Apache License, Version 2.0 (the "License");
+     you may not use this file except in compliance with the License.
+     You may obtain a copy of the License at
+
+          http://www.apache.org/licenses/LICENSE-2.0
+
+     Unless required by applicable law or agreed to in writing, software
+     distributed under the License is distributed on an "AS IS" BASIS,
+     WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+     See the License for the specific language governing permissions and
+     limitations under the License.
+-->
+
+<!-- Version History
+        version 1 - initial version.
+        version 2 - added recipientLimit.
+        version 3 - added min/max recycler values.
+        version 4 - added sms to mms text threshold.
+-->
+
+<mms_config version="4">
+    <!-- Maximum message size in bytes for a MMS message -->
+    <int name="maxMessageSize">1048576</int>
+
+    <!-- Maximum height for an attached image -->
+    <int name="maxImageHeight">1944</int>
+
+    <!-- Maximum width for an attached image -->
+    <int name="maxImageWidth">2592</int>
+
+    <!-- Maximum number of recipients allowed per message. Use a value of -1
+         to indicate no limit. -->
+    <int name="recipientLimit">20</int>
+
+    <!-- If enableMultipartSMS is true and smsToMmsTextThreshold > 1, then multi-part SMS messages
+         will be converted into a single mms message. For example, if the mms_config.xml file
+         specifies <int name="smsToMmsTextThreshold">7</int>, then on the 8th sms segment, the
+         message will be converted to an mms. -->
+    <int name="smsToMmsTextThreshold">6</int>
+
+    <!-- Maximum length in chars of mms subject field -->
+    <int name="maxSubjectLength">80</int>
+</mms_config>
diff --git a/android-smsmms/src/main/res/xml-mcc302-mnc290/mms_config.xml b/android-smsmms/src/main/res/xml-mcc302-mnc290/mms_config.xml
index 96e5b9df7..de6b16bd2 100755
--- a/android-smsmms/src/main/res/xml-mcc302-mnc290/mms_config.xml
+++ b/android-smsmms/src/main/res/xml-mcc302-mnc290/mms_config.xml
@@ -1,33 +1,33 @@
-<?xml version="1.0" encoding="utf-8"?>
-<!-- Copyright 2013 The Android Open Source Project
-
-     Licensed under the Apache License, Version 2.0 (the "License");
-     you may not use this file except in compliance with the License.
-     You may obtain a copy of the License at
-
-          http://www.apache.org/licenses/LICENSE-2.0
-
-     Unless required by applicable law or agreed to in writing, software
-     distributed under the License is distributed on an "AS IS" BASIS,
-     WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
-     See the License for the specific language governing permissions and
-     limitations under the License.
--->
-
-<!-- Version History
-        version 1 - initial version.
-        version 2 - added recipientLimit.
-        version 3 - added min/max recycler values.
-        version 4 - added sms to mms text threshold.
--->
-
-<mms_config version="4">
-    <!-- Maximum message size in bytes for a MMS message -->
-    <int name="maxMessageSize">1048576</int>
-
-    <!-- Maximum height for an attached image -->
-    <int name="maxImageHeight">1944</int>
-
-    <!-- Maximum width for an attached image -->
-    <int name="maxImageWidth">2592</int>
-</mms_config>
+<?xml version="1.0" encoding="utf-8"?>
+<!-- Copyright 2013 The Android Open Source Project
+
+     Licensed under the Apache License, Version 2.0 (the "License");
+     you may not use this file except in compliance with the License.
+     You may obtain a copy of the License at
+
+          http://www.apache.org/licenses/LICENSE-2.0
+
+     Unless required by applicable law or agreed to in writing, software
+     distributed under the License is distributed on an "AS IS" BASIS,
+     WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+     See the License for the specific language governing permissions and
+     limitations under the License.
+-->
+
+<!-- Version History
+        version 1 - initial version.
+        version 2 - added recipientLimit.
+        version 3 - added min/max recycler values.
+        version 4 - added sms to mms text threshold.
+-->
+
+<mms_config version="4">
+    <!-- Maximum message size in bytes for a MMS message -->
+    <int name="maxMessageSize">1048576</int>
+
+    <!-- Maximum height for an attached image -->
+    <int name="maxImageHeight">1944</int>
+
+    <!-- Maximum width for an attached image -->
+    <int name="maxImageWidth">2592</int>
+</mms_config>
diff --git a/android-smsmms/src/main/res/xml-mcc302-mnc320/mms_config.xml b/android-smsmms/src/main/res/xml-mcc302-mnc320/mms_config.xml
index 0dc79561b..af29ab9cc 100755
--- a/android-smsmms/src/main/res/xml-mcc302-mnc320/mms_config.xml
+++ b/android-smsmms/src/main/res/xml-mcc302-mnc320/mms_config.xml
@@ -1,39 +1,39 @@
-<?xml version="1.0" encoding="utf-8"?>
-<!-- Copyright 2014 The Android Open Source Project
-
-     Licensed under the Apache License, Version 2.0 (the "License");
-     you may not use this file except in compliance with the License.
-     You may obtain a copy of the License at
-
-          http://www.apache.org/licenses/LICENSE-2.0
-
-     Unless required by applicable law or agreed to in writing, software
-     distributed under the License is distributed on an "AS IS" BASIS,
-     WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
-     See the License for the specific language governing permissions and
-     limitations under the License.
--->
-
-<mms_config version="1">
-    <!-- Maximum message size in bytes for a MMS message -->
-    <int name="maxMessageSize">614400</int>
-
-    <!-- Maximum height for an attached image -->
-    <int name="maxImageHeight">1944</int>
-
-    <!-- Maximum width for an attached image -->
-    <int name="maxImageWidth">2592</int>
-
-    <!-- Maximum number of recipients allowed per message. Use a value of -1
-         to indicate no limit. -->
-    <int name="recipientLimit">20</int>
-
-    <!-- If enableMultipartSMS is true and smsToMmsTextThreshold > 1, then multi-part SMS messages
-         will be converted into a single mms message. For example, if the mms_config.xml file
-         specifies <int name="smsToMmsTextThreshold">7</int>, then on the 8th sms segment, the
-         message will be converted to an mms. -->
-    <int name="smsToMmsTextThreshold">6</int>
-
-    <!-- Maximum length in chars of mms subject field -->
-    <int name="maxSubjectLength">80</int>
-</mms_config>
+<?xml version="1.0" encoding="utf-8"?>
+<!-- Copyright 2014 The Android Open Source Project
+
+     Licensed under the Apache License, Version 2.0 (the "License");
+     you may not use this file except in compliance with the License.
+     You may obtain a copy of the License at
+
+          http://www.apache.org/licenses/LICENSE-2.0
+
+     Unless required by applicable law or agreed to in writing, software
+     distributed under the License is distributed on an "AS IS" BASIS,
+     WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+     See the License for the specific language governing permissions and
+     limitations under the License.
+-->
+
+<mms_config version="1">
+    <!-- Maximum message size in bytes for a MMS message -->
+    <int name="maxMessageSize">614400</int>
+
+    <!-- Maximum height for an attached image -->
+    <int name="maxImageHeight">1944</int>
+
+    <!-- Maximum width for an attached image -->
+    <int name="maxImageWidth">2592</int>
+
+    <!-- Maximum number of recipients allowed per message. Use a value of -1
+         to indicate no limit. -->
+    <int name="recipientLimit">20</int>
+
+    <!-- If enableMultipartSMS is true and smsToMmsTextThreshold > 1, then multi-part SMS messages
+         will be converted into a single mms message. For example, if the mms_config.xml file
+         specifies <int name="smsToMmsTextThreshold">7</int>, then on the 8th sms segment, the
+         message will be converted to an mms. -->
+    <int name="smsToMmsTextThreshold">6</int>
+
+    <!-- Maximum length in chars of mms subject field -->
+    <int name="maxSubjectLength">80</int>
+</mms_config>
diff --git a/android-smsmms/src/main/res/xml-mcc302-mnc370/mms_config.xml b/android-smsmms/src/main/res/xml-mcc302-mnc370/mms_config.xml
index 7f92daaa5..691948fe3 100755
--- a/android-smsmms/src/main/res/xml-mcc302-mnc370/mms_config.xml
+++ b/android-smsmms/src/main/res/xml-mcc302-mnc370/mms_config.xml
@@ -1,46 +1,46 @@
-<?xml version="1.0" encoding="utf-8"?>
-<!-- Copyright 2013 The Android Open Source Project
-
-     Licensed under the Apache License, Version 2.0 (the "License");
-     you may not use this file except in compliance with the License.
-     You may obtain a copy of the License at
-
-          http://www.apache.org/licenses/LICENSE-2.0
-
-     Unless required by applicable law or agreed to in writing, software
-     distributed under the License is distributed on an "AS IS" BASIS,
-     WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
-     See the License for the specific language governing permissions and
-     limitations under the License.
--->
-
-<!-- Version History
-        version 1 - initial version.
-        version 2 - added recipientLimit.
-        version 3 - added min/max recycler values.
-        version 4 - added sms to mms text threshold.
--->
-
-<mms_config version="4">
-    <!-- Maximum message size in bytes for a MMS message -->
-    <int name="maxMessageSize">1048576</int>
-
-    <!-- Maximum height for an attached image -->
-    <int name="maxImageHeight">1944</int>
-
-    <!-- Maximum width for an attached image -->
-    <int name="maxImageWidth">2592</int>
-
-    <!-- Maximum number of recipients allowed per message. Use a value of -1
-         to indicate no limit. -->
-    <int name="recipientLimit">20</int>
-
-    <!-- If enableMultipartSMS is true and smsToMmsTextThreshold > 1, then multi-part SMS messages
-         will be converted into a single mms message. For example, if the mms_config.xml file
-         specifies <int name="smsToMmsTextThreshold">7</int>, then on the 8th sms segment, the
-         message will be converted to an mms. -->
-    <int name="smsToMmsTextThreshold">6</int>
-
-    <!-- Maximum length in chars of mms subject field -->
-    <int name="maxSubjectLength">80</int>
-</mms_config>
+<?xml version="1.0" encoding="utf-8"?>
+<!-- Copyright 2013 The Android Open Source Project
+
+     Licensed under the Apache License, Version 2.0 (the "License");
+     you may not use this file except in compliance with the License.
+     You may obtain a copy of the License at
+
+          http://www.apache.org/licenses/LICENSE-2.0
+
+     Unless required by applicable law or agreed to in writing, software
+     distributed under the License is distributed on an "AS IS" BASIS,
+     WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+     See the License for the specific language governing permissions and
+     limitations under the License.
+-->
+
+<!-- Version History
+        version 1 - initial version.
+        version 2 - added recipientLimit.
+        version 3 - added min/max recycler values.
+        version 4 - added sms to mms text threshold.
+-->
+
+<mms_config version="4">
+    <!-- Maximum message size in bytes for a MMS message -->
+    <int name="maxMessageSize">1048576</int>
+
+    <!-- Maximum height for an attached image -->
+    <int name="maxImageHeight">1944</int>
+
+    <!-- Maximum width for an attached image -->
+    <int name="maxImageWidth">2592</int>
+
+    <!-- Maximum number of recipients allowed per message. Use a value of -1
+         to indicate no limit. -->
+    <int name="recipientLimit">20</int>
+
+    <!-- If enableMultipartSMS is true and smsToMmsTextThreshold > 1, then multi-part SMS messages
+         will be converted into a single mms message. For example, if the mms_config.xml file
+         specifies <int name="smsToMmsTextThreshold">7</int>, then on the 8th sms segment, the
+         message will be converted to an mms. -->
+    <int name="smsToMmsTextThreshold">6</int>
+
+    <!-- Maximum length in chars of mms subject field -->
+    <int name="maxSubjectLength">80</int>
+</mms_config>
diff --git a/android-smsmms/src/main/res/xml-mcc302-mnc490/mms_config.xml b/android-smsmms/src/main/res/xml-mcc302-mnc490/mms_config.xml
index 7f92daaa5..691948fe3 100755
--- a/android-smsmms/src/main/res/xml-mcc302-mnc490/mms_config.xml
+++ b/android-smsmms/src/main/res/xml-mcc302-mnc490/mms_config.xml
@@ -1,46 +1,46 @@
-<?xml version="1.0" encoding="utf-8"?>
-<!-- Copyright 2013 The Android Open Source Project
-
-     Licensed under the Apache License, Version 2.0 (the "License");
-     you may not use this file except in compliance with the License.
-     You may obtain a copy of the License at
-
-          http://www.apache.org/licenses/LICENSE-2.0
-
-     Unless required by applicable law or agreed to in writing, software
-     distributed under the License is distributed on an "AS IS" BASIS,
-     WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
-     See the License for the specific language governing permissions and
-     limitations under the License.
--->
-
-<!-- Version History
-        version 1 - initial version.
-        version 2 - added recipientLimit.
-        version 3 - added min/max recycler values.
-        version 4 - added sms to mms text threshold.
--->
-
-<mms_config version="4">
-    <!-- Maximum message size in bytes for a MMS message -->
-    <int name="maxMessageSize">1048576</int>
-
-    <!-- Maximum height for an attached image -->
-    <int name="maxImageHeight">1944</int>
-
-    <!-- Maximum width for an attached image -->
-    <int name="maxImageWidth">2592</int>
-
-    <!-- Maximum number of recipients allowed per message. Use a value of -1
-         to indicate no limit. -->
-    <int name="recipientLimit">20</int>
-
-    <!-- If enableMultipartSMS is true and smsToMmsTextThreshold > 1, then multi-part SMS messages
-         will be converted into a single mms message. For example, if the mms_config.xml file
-         specifies <int name="smsToMmsTextThreshold">7</int>, then on the 8th sms segment, the
-         message will be converted to an mms. -->
-    <int name="smsToMmsTextThreshold">6</int>
-
-    <!-- Maximum length in chars of mms subject field -->
-    <int name="maxSubjectLength">80</int>
-</mms_config>
+<?xml version="1.0" encoding="utf-8"?>
+<!-- Copyright 2013 The Android Open Source Project
+
+     Licensed under the Apache License, Version 2.0 (the "License");
+     you may not use this file except in compliance with the License.
+     You may obtain a copy of the License at
+
+          http://www.apache.org/licenses/LICENSE-2.0
+
+     Unless required by applicable law or agreed to in writing, software
+     distributed under the License is distributed on an "AS IS" BASIS,
+     WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+     See the License for the specific language governing permissions and
+     limitations under the License.
+-->
+
+<!-- Version History
+        version 1 - initial version.
+        version 2 - added recipientLimit.
+        version 3 - added min/max recycler values.
+        version 4 - added sms to mms text threshold.
+-->
+
+<mms_config version="4">
+    <!-- Maximum message size in bytes for a MMS message -->
+    <int name="maxMessageSize">1048576</int>
+
+    <!-- Maximum height for an attached image -->
+    <int name="maxImageHeight">1944</int>
+
+    <!-- Maximum width for an attached image -->
+    <int name="maxImageWidth">2592</int>
+
+    <!-- Maximum number of recipients allowed per message. Use a value of -1
+         to indicate no limit. -->
+    <int name="recipientLimit">20</int>
+
+    <!-- If enableMultipartSMS is true and smsToMmsTextThreshold > 1, then multi-part SMS messages
+         will be converted into a single mms message. For example, if the mms_config.xml file
+         specifies <int name="smsToMmsTextThreshold">7</int>, then on the 8th sms segment, the
+         message will be converted to an mms. -->
+    <int name="smsToMmsTextThreshold">6</int>
+
+    <!-- Maximum length in chars of mms subject field -->
+    <int name="maxSubjectLength">80</int>
+</mms_config>
diff --git a/android-smsmms/src/main/res/xml-mcc302-mnc500/mms_config.xml b/android-smsmms/src/main/res/xml-mcc302-mnc500/mms_config.xml
index 02167743c..3367568fd 100755
--- a/android-smsmms/src/main/res/xml-mcc302-mnc500/mms_config.xml
+++ b/android-smsmms/src/main/res/xml-mcc302-mnc500/mms_config.xml
@@ -1,46 +1,46 @@
-<?xml version="1.0" encoding="utf-8"?>
-<!-- Copyright 2013 The Android Open Source Project
-
-     Licensed under the Apache License, Version 2.0 (the "License");
-     you may not use this file except in compliance with the License.
-     You may obtain a copy of the License at
-
-          http://www.apache.org/licenses/LICENSE-2.0
-
-     Unless required by applicable law or agreed to in writing, software
-     distributed under the License is distributed on an "AS IS" BASIS,
-     WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
-     See the License for the specific language governing permissions and
-     limitations under the License.
--->
-
-<!-- Version History
-        version 1 - initial version.
-        version 2 - added recipientLimit.
-        version 3 - added min/max recycler values.
-        version 4 - added sms to mms text threshold.
--->
-
-<mms_config version="4">
-    <!-- Maximum message size in bytes for a MMS message -->
-    <int name="maxMessageSize">3072000</int>
-
-    <!-- Maximum height for an attached image -->
-    <int name="maxImageHeight">1944</int>
-
-    <!-- Maximum width for an attached image -->
-    <int name="maxImageWidth">2592</int>
-
-    <!-- Maximum number of recipients allowed per message. Use a value of -1
-         to indicate no limit. -->
-    <int name="recipientLimit">20</int>
-
-    <!-- If enableMultipartSMS is true and smsToMmsTextThreshold > 1, then multi-part SMS messages
-         will be converted into a single mms message. For example, if the mms_config.xml file
-         specifies <int name="smsToMmsTextThreshold">7</int>, then on the 8th sms segment, the
-         message will be converted to an mms. -->
-    <int name="smsToMmsTextThreshold">6</int>
-
-    <!-- Maximum length in chars of mms subject field -->
-    <int name="maxSubjectLength">80</int>
-</mms_config>
+<?xml version="1.0" encoding="utf-8"?>
+<!-- Copyright 2013 The Android Open Source Project
+
+     Licensed under the Apache License, Version 2.0 (the "License");
+     you may not use this file except in compliance with the License.
+     You may obtain a copy of the License at
+
+          http://www.apache.org/licenses/LICENSE-2.0
+
+     Unless required by applicable law or agreed to in writing, software
+     distributed under the License is distributed on an "AS IS" BASIS,
+     WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+     See the License for the specific language governing permissions and
+     limitations under the License.
+-->
+
+<!-- Version History
+        version 1 - initial version.
+        version 2 - added recipientLimit.
+        version 3 - added min/max recycler values.
+        version 4 - added sms to mms text threshold.
+-->
+
+<mms_config version="4">
+    <!-- Maximum message size in bytes for a MMS message -->
+    <int name="maxMessageSize">3072000</int>
+
+    <!-- Maximum height for an attached image -->
+    <int name="maxImageHeight">1944</int>
+
+    <!-- Maximum width for an attached image -->
+    <int name="maxImageWidth">2592</int>
+
+    <!-- Maximum number of recipients allowed per message. Use a value of -1
+         to indicate no limit. -->
+    <int name="recipientLimit">20</int>
+
+    <!-- If enableMultipartSMS is true and smsToMmsTextThreshold > 1, then multi-part SMS messages
+         will be converted into a single mms message. For example, if the mms_config.xml file
+         specifies <int name="smsToMmsTextThreshold">7</int>, then on the 8th sms segment, the
+         message will be converted to an mms. -->
+    <int name="smsToMmsTextThreshold">6</int>
+
+    <!-- Maximum length in chars of mms subject field -->
+    <int name="maxSubjectLength">80</int>
+</mms_config>
diff --git a/android-smsmms/src/main/res/xml-mcc302-mnc510/mms_config.xml b/android-smsmms/src/main/res/xml-mcc302-mnc510/mms_config.xml
index 02167743c..3367568fd 100755
--- a/android-smsmms/src/main/res/xml-mcc302-mnc510/mms_config.xml
+++ b/android-smsmms/src/main/res/xml-mcc302-mnc510/mms_config.xml
@@ -1,46 +1,46 @@
-<?xml version="1.0" encoding="utf-8"?>
-<!-- Copyright 2013 The Android Open Source Project
-
-     Licensed under the Apache License, Version 2.0 (the "License");
-     you may not use this file except in compliance with the License.
-     You may obtain a copy of the License at
-
-          http://www.apache.org/licenses/LICENSE-2.0
-
-     Unless required by applicable law or agreed to in writing, software
-     distributed under the License is distributed on an "AS IS" BASIS,
-     WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
-     See the License for the specific language governing permissions and
-     limitations under the License.
--->
-
-<!-- Version History
-        version 1 - initial version.
-        version 2 - added recipientLimit.
-        version 3 - added min/max recycler values.
-        version 4 - added sms to mms text threshold.
--->
-
-<mms_config version="4">
-    <!-- Maximum message size in bytes for a MMS message -->
-    <int name="maxMessageSize">3072000</int>
-
-    <!-- Maximum height for an attached image -->
-    <int name="maxImageHeight">1944</int>
-
-    <!-- Maximum width for an attached image -->
-    <int name="maxImageWidth">2592</int>
-
-    <!-- Maximum number of recipients allowed per message. Use a value of -1
-         to indicate no limit. -->
-    <int name="recipientLimit">20</int>
-
-    <!-- If enableMultipartSMS is true and smsToMmsTextThreshold > 1, then multi-part SMS messages
-         will be converted into a single mms message. For example, if the mms_config.xml file
-         specifies <int name="smsToMmsTextThreshold">7</int>, then on the 8th sms segment, the
-         message will be converted to an mms. -->
-    <int name="smsToMmsTextThreshold">6</int>
-
-    <!-- Maximum length in chars of mms subject field -->
-    <int name="maxSubjectLength">80</int>
-</mms_config>
+<?xml version="1.0" encoding="utf-8"?>
+<!-- Copyright 2013 The Android Open Source Project
+
+     Licensed under the Apache License, Version 2.0 (the "License");
+     you may not use this file except in compliance with the License.
+     You may obtain a copy of the License at
+
+          http://www.apache.org/licenses/LICENSE-2.0
+
+     Unless required by applicable law or agreed to in writing, software
+     distributed under the License is distributed on an "AS IS" BASIS,
+     WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+     See the License for the specific language governing permissions and
+     limitations under the License.
+-->
+
+<!-- Version History
+        version 1 - initial version.
+        version 2 - added recipientLimit.
+        version 3 - added min/max recycler values.
+        version 4 - added sms to mms text threshold.
+-->
+
+<mms_config version="4">
+    <!-- Maximum message size in bytes for a MMS message -->
+    <int name="maxMessageSize">3072000</int>
+
+    <!-- Maximum height for an attached image -->
+    <int name="maxImageHeight">1944</int>
+
+    <!-- Maximum width for an attached image -->
+    <int name="maxImageWidth">2592</int>
+
+    <!-- Maximum number of recipients allowed per message. Use a value of -1
+         to indicate no limit. -->
+    <int name="recipientLimit">20</int>
+
+    <!-- If enableMultipartSMS is true and smsToMmsTextThreshold > 1, then multi-part SMS messages
+         will be converted into a single mms message. For example, if the mms_config.xml file
+         specifies <int name="smsToMmsTextThreshold">7</int>, then on the 8th sms segment, the
+         message will be converted to an mms. -->
+    <int name="smsToMmsTextThreshold">6</int>
+
+    <!-- Maximum length in chars of mms subject field -->
+    <int name="maxSubjectLength">80</int>
+</mms_config>
diff --git a/android-smsmms/src/main/res/xml-mcc302-mnc520/mms_config.xml b/android-smsmms/src/main/res/xml-mcc302-mnc520/mms_config.xml
index 21b15bbf4..93d7e7cc6 100755
--- a/android-smsmms/src/main/res/xml-mcc302-mnc520/mms_config.xml
+++ b/android-smsmms/src/main/res/xml-mcc302-mnc520/mms_config.xml
@@ -1,39 +1,39 @@
-<?xml version="1.0" encoding="utf-8"?>
-<!-- Copyright 2014 The Android Open Source Project
-
-     Licensed under the Apache License, Version 2.0 (the "License");
-     you may not use this file except in compliance with the License.
-     You may obtain a copy of the License at
-
-          http://www.apache.org/licenses/LICENSE-2.0
-
-     Unless required by applicable law or agreed to in writing, software
-     distributed under the License is distributed on an "AS IS" BASIS,
-     WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
-     See the License for the specific language governing permissions and
-     limitations under the License.
--->
-
-<mms_config version="1">
-    <!-- Maximum message size in bytes for a MMS message -->
-    <int name="maxMessageSize">3072000</int>
-
-    <!-- Maximum height for an attached image -->
-    <int name="maxImageHeight">1944</int>
-
-    <!-- Maximum width for an attached image -->
-    <int name="maxImageWidth">2592</int>
-
-    <!-- Maximum number of recipients allowed per message. Use a value of -1
-         to indicate no limit. -->
-    <int name="recipientLimit">20</int>
-
-    <!-- If enableMultipartSMS is true and smsToMmsTextThreshold > 1, then multi-part SMS messages
-         will be converted into a single mms message. For example, if the mms_config.xml file
-         specifies <int name="smsToMmsTextThreshold">7</int>, then on the 8th sms segment, the
-         message will be converted to an mms. -->
-    <int name="smsToMmsTextThreshold">6</int>
-
-    <!-- Maximum length in chars of mms subject field -->
-    <int name="maxSubjectLength">80</int>
-</mms_config>
+<?xml version="1.0" encoding="utf-8"?>
+<!-- Copyright 2014 The Android Open Source Project
+
+     Licensed under the Apache License, Version 2.0 (the "License");
+     you may not use this file except in compliance with the License.
+     You may obtain a copy of the License at
+
+          http://www.apache.org/licenses/LICENSE-2.0
+
+     Unless required by applicable law or agreed to in writing, software
+     distributed under the License is distributed on an "AS IS" BASIS,
+     WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+     See the License for the specific language governing permissions and
+     limitations under the License.
+-->
+
+<mms_config version="1">
+    <!-- Maximum message size in bytes for a MMS message -->
+    <int name="maxMessageSize">3072000</int>
+
+    <!-- Maximum height for an attached image -->
+    <int name="maxImageHeight">1944</int>
+
+    <!-- Maximum width for an attached image -->
+    <int name="maxImageWidth">2592</int>
+
+    <!-- Maximum number of recipients allowed per message. Use a value of -1
+         to indicate no limit. -->
+    <int name="recipientLimit">20</int>
+
+    <!-- If enableMultipartSMS is true and smsToMmsTextThreshold > 1, then multi-part SMS messages
+         will be converted into a single mms message. For example, if the mms_config.xml file
+         specifies <int name="smsToMmsTextThreshold">7</int>, then on the 8th sms segment, the
+         message will be converted to an mms. -->
+    <int name="smsToMmsTextThreshold">6</int>
+
+    <!-- Maximum length in chars of mms subject field -->
+    <int name="maxSubjectLength">80</int>
+</mms_config>
diff --git a/android-smsmms/src/main/res/xml-mcc302-mnc610/mms_config.xml b/android-smsmms/src/main/res/xml-mcc302-mnc610/mms_config.xml
index cc94b7ffa..15e4697f7 100755
--- a/android-smsmms/src/main/res/xml-mcc302-mnc610/mms_config.xml
+++ b/android-smsmms/src/main/res/xml-mcc302-mnc610/mms_config.xml
@@ -1,52 +1,52 @@
-<?xml version="1.0" encoding="utf-8"?>
-<!-- Copyright 2013 The Android Open Source Project
-
-     Licensed under the Apache License, Version 2.0 (the "License");
-     you may not use this file except in compliance with the License.
-     You may obtain a copy of the License at
-
-          http://www.apache.org/licenses/LICENSE-2.0
-
-     Unless required by applicable law or agreed to in writing, software
-     distributed under the License is distributed on an "AS IS" BASIS,
-     WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
-     See the License for the specific language governing permissions and
-     limitations under the License.
--->
-
-<!-- Version History
-        version 1 - initial version.
-        version 2 - added recipientLimit.
-        version 3 - added min/max recycler values.
-        version 4 - added sms to mms text threshold.
--->
-
-<mms_config version="4">
-    <!-- Maximum message size in bytes for a MMS message -->
-    <int name="maxMessageSize">614400</int>
-
-    <!-- Maximum height for an attached image -->
-    <int name="maxImageHeight">1944</int>
-
-    <!-- Maximum width for an attached image -->
-    <int name="maxImageWidth">2592</int>
-
-    <!-- Maximum number of recipients allowed per message. Use a value of -1
-         to indicate no limit. -->
-    <int name="recipientLimit">20</int>
-
-    <!-- If enableMultipartSMS is true and smsToMmsTextThreshold > 1, then multi-part SMS messages
-         will be converted into a single mms message. For example, if the mms_config.xml file
-         specifies <int name="smsToMmsTextThreshold">7</int>, then on the 8th sms segment, the
-         message will be converted to an mms. -->
-    <int name="smsToMmsTextThreshold">8</int>
-
-    <!-- Maximum length in chars of mms subject field -->
-    <int name="maxSubjectLength">80</int>
-
-    <!-- Email Gateway Number -->
-    <string name="emailGatewayNumber">6245</string>
-
-    <!-- Disable SMS to MMS conversion for multiple recipient SMS -->
-    <bool name="enableGroupMms">false</bool>
-</mms_config>
+<?xml version="1.0" encoding="utf-8"?>
+<!-- Copyright 2013 The Android Open Source Project
+
+     Licensed under the Apache License, Version 2.0 (the "License");
+     you may not use this file except in compliance with the License.
+     You may obtain a copy of the License at
+
+          http://www.apache.org/licenses/LICENSE-2.0
+
+     Unless required by applicable law or agreed to in writing, software
+     distributed under the License is distributed on an "AS IS" BASIS,
+     WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+     See the License for the specific language governing permissions and
+     limitations under the License.
+-->
+
+<!-- Version History
+        version 1 - initial version.
+        version 2 - added recipientLimit.
+        version 3 - added min/max recycler values.
+        version 4 - added sms to mms text threshold.
+-->
+
+<mms_config version="4">
+    <!-- Maximum message size in bytes for a MMS message -->
+    <int name="maxMessageSize">614400</int>
+
+    <!-- Maximum height for an attached image -->
+    <int name="maxImageHeight">1944</int>
+
+    <!-- Maximum width for an attached image -->
+    <int name="maxImageWidth">2592</int>
+
+    <!-- Maximum number of recipients allowed per message. Use a value of -1
+         to indicate no limit. -->
+    <int name="recipientLimit">20</int>
+
+    <!-- If enableMultipartSMS is true and smsToMmsTextThreshold > 1, then multi-part SMS messages
+         will be converted into a single mms message. For example, if the mms_config.xml file
+         specifies <int name="smsToMmsTextThreshold">7</int>, then on the 8th sms segment, the
+         message will be converted to an mms. -->
+    <int name="smsToMmsTextThreshold">8</int>
+
+    <!-- Maximum length in chars of mms subject field -->
+    <int name="maxSubjectLength">80</int>
+
+    <!-- Email Gateway Number -->
+    <string name="emailGatewayNumber">6245</string>
+
+    <!-- Disable SMS to MMS conversion for multiple recipient SMS -->
+    <bool name="enableGroupMms">false</bool>
+</mms_config>
diff --git a/android-smsmms/src/main/res/xml-mcc302-mnc660/mms_config.xml b/android-smsmms/src/main/res/xml-mcc302-mnc660/mms_config.xml
index 7f92daaa5..691948fe3 100755
--- a/android-smsmms/src/main/res/xml-mcc302-mnc660/mms_config.xml
+++ b/android-smsmms/src/main/res/xml-mcc302-mnc660/mms_config.xml
@@ -1,46 +1,46 @@
-<?xml version="1.0" encoding="utf-8"?>
-<!-- Copyright 2013 The Android Open Source Project
-
-     Licensed under the Apache License, Version 2.0 (the "License");
-     you may not use this file except in compliance with the License.
-     You may obtain a copy of the License at
-
-          http://www.apache.org/licenses/LICENSE-2.0
-
-     Unless required by applicable law or agreed to in writing, software
-     distributed under the License is distributed on an "AS IS" BASIS,
-     WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
-     See the License for the specific language governing permissions and
-     limitations under the License.
--->
-
-<!-- Version History
-        version 1 - initial version.
-        version 2 - added recipientLimit.
-        version 3 - added min/max recycler values.
-        version 4 - added sms to mms text threshold.
--->
-
-<mms_config version="4">
-    <!-- Maximum message size in bytes for a MMS message -->
-    <int name="maxMessageSize">1048576</int>
-
-    <!-- Maximum height for an attached image -->
-    <int name="maxImageHeight">1944</int>
-
-    <!-- Maximum width for an attached image -->
-    <int name="maxImageWidth">2592</int>
-
-    <!-- Maximum number of recipients allowed per message. Use a value of -1
-         to indicate no limit. -->
-    <int name="recipientLimit">20</int>
-
-    <!-- If enableMultipartSMS is true and smsToMmsTextThreshold > 1, then multi-part SMS messages
-         will be converted into a single mms message. For example, if the mms_config.xml file
-         specifies <int name="smsToMmsTextThreshold">7</int>, then on the 8th sms segment, the
-         message will be converted to an mms. -->
-    <int name="smsToMmsTextThreshold">6</int>
-
-    <!-- Maximum length in chars of mms subject field -->
-    <int name="maxSubjectLength">80</int>
-</mms_config>
+<?xml version="1.0" encoding="utf-8"?>
+<!-- Copyright 2013 The Android Open Source Project
+
+     Licensed under the Apache License, Version 2.0 (the "License");
+     you may not use this file except in compliance with the License.
+     You may obtain a copy of the License at
+
+          http://www.apache.org/licenses/LICENSE-2.0
+
+     Unless required by applicable law or agreed to in writing, software
+     distributed under the License is distributed on an "AS IS" BASIS,
+     WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+     See the License for the specific language governing permissions and
+     limitations under the License.
+-->
+
+<!-- Version History
+        version 1 - initial version.
+        version 2 - added recipientLimit.
+        version 3 - added min/max recycler values.
+        version 4 - added sms to mms text threshold.
+-->
+
+<mms_config version="4">
+    <!-- Maximum message size in bytes for a MMS message -->
+    <int name="maxMessageSize">1048576</int>
+
+    <!-- Maximum height for an attached image -->
+    <int name="maxImageHeight">1944</int>
+
+    <!-- Maximum width for an attached image -->
+    <int name="maxImageWidth">2592</int>
+
+    <!-- Maximum number of recipients allowed per message. Use a value of -1
+         to indicate no limit. -->
+    <int name="recipientLimit">20</int>
+
+    <!-- If enableMultipartSMS is true and smsToMmsTextThreshold > 1, then multi-part SMS messages
+         will be converted into a single mms message. For example, if the mms_config.xml file
+         specifies <int name="smsToMmsTextThreshold">7</int>, then on the 8th sms segment, the
+         message will be converted to an mms. -->
+    <int name="smsToMmsTextThreshold">6</int>
+
+    <!-- Maximum length in chars of mms subject field -->
+    <int name="maxSubjectLength">80</int>
+</mms_config>
diff --git a/android-smsmms/src/main/res/xml-mcc302-mnc720/mms_config.xml b/android-smsmms/src/main/res/xml-mcc302-mnc720/mms_config.xml
index 7f92daaa5..691948fe3 100755
--- a/android-smsmms/src/main/res/xml-mcc302-mnc720/mms_config.xml
+++ b/android-smsmms/src/main/res/xml-mcc302-mnc720/mms_config.xml
@@ -1,46 +1,46 @@
-<?xml version="1.0" encoding="utf-8"?>
-<!-- Copyright 2013 The Android Open Source Project
-
-     Licensed under the Apache License, Version 2.0 (the "License");
-     you may not use this file except in compliance with the License.
-     You may obtain a copy of the License at
-
-          http://www.apache.org/licenses/LICENSE-2.0
-
-     Unless required by applicable law or agreed to in writing, software
-     distributed under the License is distributed on an "AS IS" BASIS,
-     WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
-     See the License for the specific language governing permissions and
-     limitations under the License.
--->
-
-<!-- Version History
-        version 1 - initial version.
-        version 2 - added recipientLimit.
-        version 3 - added min/max recycler values.
-        version 4 - added sms to mms text threshold.
--->
-
-<mms_config version="4">
-    <!-- Maximum message size in bytes for a MMS message -->
-    <int name="maxMessageSize">1048576</int>
-
-    <!-- Maximum height for an attached image -->
-    <int name="maxImageHeight">1944</int>
-
-    <!-- Maximum width for an attached image -->
-    <int name="maxImageWidth">2592</int>
-
-    <!-- Maximum number of recipients allowed per message. Use a value of -1
-         to indicate no limit. -->
-    <int name="recipientLimit">20</int>
-
-    <!-- If enableMultipartSMS is true and smsToMmsTextThreshold > 1, then multi-part SMS messages
-         will be converted into a single mms message. For example, if the mms_config.xml file
-         specifies <int name="smsToMmsTextThreshold">7</int>, then on the 8th sms segment, the
-         message will be converted to an mms. -->
-    <int name="smsToMmsTextThreshold">6</int>
-
-    <!-- Maximum length in chars of mms subject field -->
-    <int name="maxSubjectLength">80</int>
-</mms_config>
+<?xml version="1.0" encoding="utf-8"?>
+<!-- Copyright 2013 The Android Open Source Project
+
+     Licensed under the Apache License, Version 2.0 (the "License");
+     you may not use this file except in compliance with the License.
+     You may obtain a copy of the License at
+
+          http://www.apache.org/licenses/LICENSE-2.0
+
+     Unless required by applicable law or agreed to in writing, software
+     distributed under the License is distributed on an "AS IS" BASIS,
+     WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+     See the License for the specific language governing permissions and
+     limitations under the License.
+-->
+
+<!-- Version History
+        version 1 - initial version.
+        version 2 - added recipientLimit.
+        version 3 - added min/max recycler values.
+        version 4 - added sms to mms text threshold.
+-->
+
+<mms_config version="4">
+    <!-- Maximum message size in bytes for a MMS message -->
+    <int name="maxMessageSize">1048576</int>
+
+    <!-- Maximum height for an attached image -->
+    <int name="maxImageHeight">1944</int>
+
+    <!-- Maximum width for an attached image -->
+    <int name="maxImageWidth">2592</int>
+
+    <!-- Maximum number of recipients allowed per message. Use a value of -1
+         to indicate no limit. -->
+    <int name="recipientLimit">20</int>
+
+    <!-- If enableMultipartSMS is true and smsToMmsTextThreshold > 1, then multi-part SMS messages
+         will be converted into a single mms message. For example, if the mms_config.xml file
+         specifies <int name="smsToMmsTextThreshold">7</int>, then on the 8th sms segment, the
+         message will be converted to an mms. -->
+    <int name="smsToMmsTextThreshold">6</int>
+
+    <!-- Maximum length in chars of mms subject field -->
+    <int name="maxSubjectLength">80</int>
+</mms_config>
diff --git a/android-smsmms/src/main/res/xml-mcc302-mnc780/mms_config.xml b/android-smsmms/src/main/res/xml-mcc302-mnc780/mms_config.xml
index 486c4682c..6c5de90eb 100755
--- a/android-smsmms/src/main/res/xml-mcc302-mnc780/mms_config.xml
+++ b/android-smsmms/src/main/res/xml-mcc302-mnc780/mms_config.xml
@@ -1,33 +1,33 @@
-<?xml version="1.0" encoding="utf-8"?>
-<!-- Copyright 2013 The Android Open Source Project
-
-     Licensed under the Apache License, Version 2.0 (the "License");
-     you may not use this file except in compliance with the License.
-     You may obtain a copy of the License at
-
-          http://www.apache.org/licenses/LICENSE-2.0
-
-     Unless required by applicable law or agreed to in writing, software
-     distributed under the License is distributed on an "AS IS" BASIS,
-     WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
-     See the License for the specific language governing permissions and
-     limitations under the License.
--->
-
-<!-- Version History
-        version 1 - initial version.
-        version 2 - added recipientLimit.
-        version 3 - added min/max recycler values.
-        version 4 - added sms to mms text threshold.
--->
-
-<mms_config version="4">
-    <!-- Maximum message size in bytes for a MMS message -->
-    <int name="maxMessageSize">614400</int>
-
-    <!-- Maximum height for an attached image -->
-    <int name="maxImageHeight">1944</int>
-
-    <!-- Maximum width for an attached image -->
-    <int name="maxImageWidth">2592</int>
-</mms_config>
+<?xml version="1.0" encoding="utf-8"?>
+<!-- Copyright 2013 The Android Open Source Project
+
+     Licensed under the Apache License, Version 2.0 (the "License");
+     you may not use this file except in compliance with the License.
+     You may obtain a copy of the License at
+
+          http://www.apache.org/licenses/LICENSE-2.0
+
+     Unless required by applicable law or agreed to in writing, software
+     distributed under the License is distributed on an "AS IS" BASIS,
+     WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+     See the License for the specific language governing permissions and
+     limitations under the License.
+-->
+
+<!-- Version History
+        version 1 - initial version.
+        version 2 - added recipientLimit.
+        version 3 - added min/max recycler values.
+        version 4 - added sms to mms text threshold.
+-->
+
+<mms_config version="4">
+    <!-- Maximum message size in bytes for a MMS message -->
+    <int name="maxMessageSize">614400</int>
+
+    <!-- Maximum height for an attached image -->
+    <int name="maxImageHeight">1944</int>
+
+    <!-- Maximum width for an attached image -->
+    <int name="maxImageWidth">2592</int>
+</mms_config>
diff --git a/android-smsmms/src/main/res/xml-mcc310-mnc004/mms_config.xml b/android-smsmms/src/main/res/xml-mcc310-mnc004/mms_config.xml
index 346218bc6..2c2215422 100755
--- a/android-smsmms/src/main/res/xml-mcc310-mnc004/mms_config.xml
+++ b/android-smsmms/src/main/res/xml-mcc310-mnc004/mms_config.xml
@@ -1,83 +1,83 @@
-<?xml version="1.0" encoding="utf-8"?>
-<!-- Copyright 2014 The Android Open Source Project
-
-     Licensed under the Apache License, Version 2.0 (the "License");
-     you may not use this file except in compliance with the License.
-     You may obtain a copy of the License at
-
-          http://www.apache.org/licenses/LICENSE-2.0
-
-     Unless required by applicable law or agreed to in writing, software
-     distributed under the License is distributed on an "AS IS" BASIS,
-     WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
-     See the License for the specific language governing permissions and
-     limitations under the License.
--->
-
-<mms_config version="2">
-    <!-- In case of single segment M-Notification.ind, this indicates whether
-         TransactionID should be appended to URI or not. -->
-    <bool name="enabledTransID">true</bool>
-
-    <!-- Send M-Acknowledge.ind and M-NotifyResp.ind to the URL received by the
-         M-Notification.ind (WAP-PUSH). -->
-    <bool name="enabledNotifyWapMMSC">true</bool>
-
-    <!-- Maximum message size in bytes for a MMS message -->
-    <int name="maxMessageSize">1258291</int>
-
-    <!-- UAProf parameter tag name -->
-    <string name="uaProfTagName">Profile</string>
-
-    <!-- Maximum number of recipients allowed per message. Use a value of -1
-         to indicate no limit. -->
-    <int name="recipientLimit">20</int>
-
-    <!-- Additional http parameters used in MMS http request.
-         Parameters are seperated by '|'. Optional. -->
-    <string name="httpParams">x-up-calling-line-id: 1##LINE1NOCOUNTRYCODE##|X-VzW-MDN: 1##LINE1NOCOUNTRYCODE##</string>
-
-    <!-- Maximum height for an attached image -->
-    <int name="maxImageHeight">1944</int>
-
-    <!-- Maximum width for an attached image -->
-    <int name="maxImageWidth">2592</int>
-
-    <!-- Email Gateway Number -->
-    <!-- TODO: check if this is correct for Passion -->
-    <string name="emailGatewayNumber">6245</string>
-
-    <!-- enable alias -->
-    <bool name="aliasEnabled">true</bool>
-
-    <!-- alias rule: min chars -->
-    <int name="aliasMinChars">2</int>
-
-    <!-- alias rule: max chars -->
-    <int name="aliasMaxChars">48</int>
-
-    <!-- disable the option to attach an audio attachment to an Mms message. Currently Verizon
-         doesn't support OGG files and the only audio picker in the system allowed for picking
-         ringtones. All of our ringtones are OGG files so it doesn't make sense to allow a user
-         to select an audio file that eventually can't be handled. Therefore, the ability
-         to select a ringtone to send is disabled. -->
-    <bool name="allowAttachAudio">false</bool>
-
-    <!-- Hide the MMS read reports UI in settings -->
-    <bool name="enableMMSReadReports">false</bool>
-
-    <!-- Maximum length in chars of mms subject field -->
-    <int name="maxSubjectLength">80</int>
-
-    <!-- If true, The text message over 160 characters will be sent in multi part.
-         If false, The text message over 160 characters will be sent
-         via multi media message. -->
-    <bool name="enableMultipartSMS">true</bool>
-
-    <!-- If enableMultipartSMS is true and smsToMmsTextThreshold > 1, then multi-part SMS messages
-         will be converted into a single mms message. For example, if the mms_config.xml file
-         specifies <int name="smsToMmsTextThreshold">7</int>, then on the 8th sms segment, the
-         message will be converted to an mms. -->
-    <int name="smsToMmsTextThreshold">7</int>
-</mms_config>
-
+<?xml version="1.0" encoding="utf-8"?>
+<!-- Copyright 2014 The Android Open Source Project
+
+     Licensed under the Apache License, Version 2.0 (the "License");
+     you may not use this file except in compliance with the License.
+     You may obtain a copy of the License at
+
+          http://www.apache.org/licenses/LICENSE-2.0
+
+     Unless required by applicable law or agreed to in writing, software
+     distributed under the License is distributed on an "AS IS" BASIS,
+     WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+     See the License for the specific language governing permissions and
+     limitations under the License.
+-->
+
+<mms_config version="2">
+    <!-- In case of single segment M-Notification.ind, this indicates whether
+         TransactionID should be appended to URI or not. -->
+    <bool name="enabledTransID">true</bool>
+
+    <!-- Send M-Acknowledge.ind and M-NotifyResp.ind to the URL received by the
+         M-Notification.ind (WAP-PUSH). -->
+    <bool name="enabledNotifyWapMMSC">true</bool>
+
+    <!-- Maximum message size in bytes for a MMS message -->
+    <int name="maxMessageSize">1258291</int>
+
+    <!-- UAProf parameter tag name -->
+    <string name="uaProfTagName">Profile</string>
+
+    <!-- Maximum number of recipients allowed per message. Use a value of -1
+         to indicate no limit. -->
+    <int name="recipientLimit">20</int>
+
+    <!-- Additional http parameters used in MMS http request.
+         Parameters are seperated by '|'. Optional. -->
+    <string name="httpParams">x-up-calling-line-id: 1##LINE1NOCOUNTRYCODE##|X-VzW-MDN: 1##LINE1NOCOUNTRYCODE##</string>
+
+    <!-- Maximum height for an attached image -->
+    <int name="maxImageHeight">1944</int>
+
+    <!-- Maximum width for an attached image -->
+    <int name="maxImageWidth">2592</int>
+
+    <!-- Email Gateway Number -->
+    <!-- TODO: check if this is correct for Passion -->
+    <string name="emailGatewayNumber">6245</string>
+
+    <!-- enable alias -->
+    <bool name="aliasEnabled">true</bool>
+
+    <!-- alias rule: min chars -->
+    <int name="aliasMinChars">2</int>
+
+    <!-- alias rule: max chars -->
+    <int name="aliasMaxChars">48</int>
+
+    <!-- disable the option to attach an audio attachment to an Mms message. Currently Verizon
+         doesn't support OGG files and the only audio picker in the system allowed for picking
+         ringtones. All of our ringtones are OGG files so it doesn't make sense to allow a user
+         to select an audio file that eventually can't be handled. Therefore, the ability
+         to select a ringtone to send is disabled. -->
+    <bool name="allowAttachAudio">false</bool>
+
+    <!-- Hide the MMS read reports UI in settings -->
+    <bool name="enableMMSReadReports">false</bool>
+
+    <!-- Maximum length in chars of mms subject field -->
+    <int name="maxSubjectLength">80</int>
+
+    <!-- If true, The text message over 160 characters will be sent in multi part.
+         If false, The text message over 160 characters will be sent
+         via multi media message. -->
+    <bool name="enableMultipartSMS">true</bool>
+
+    <!-- If enableMultipartSMS is true and smsToMmsTextThreshold > 1, then multi-part SMS messages
+         will be converted into a single mms message. For example, if the mms_config.xml file
+         specifies <int name="smsToMmsTextThreshold">7</int>, then on the 8th sms segment, the
+         message will be converted to an mms. -->
+    <int name="smsToMmsTextThreshold">7</int>
+</mms_config>
+
diff --git a/android-smsmms/src/main/res/xml-mcc310-mnc005/mms_config.xml b/android-smsmms/src/main/res/xml-mcc310-mnc005/mms_config.xml
index 346218bc6..2c2215422 100755
--- a/android-smsmms/src/main/res/xml-mcc310-mnc005/mms_config.xml
+++ b/android-smsmms/src/main/res/xml-mcc310-mnc005/mms_config.xml
@@ -1,83 +1,83 @@
-<?xml version="1.0" encoding="utf-8"?>
-<!-- Copyright 2014 The Android Open Source Project
-
-     Licensed under the Apache License, Version 2.0 (the "License");
-     you may not use this file except in compliance with the License.
-     You may obtain a copy of the License at
-
-          http://www.apache.org/licenses/LICENSE-2.0
-
-     Unless required by applicable law or agreed to in writing, software
-     distributed under the License is distributed on an "AS IS" BASIS,
-     WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
-     See the License for the specific language governing permissions and
-     limitations under the License.
--->
-
-<mms_config version="2">
-    <!-- In case of single segment M-Notification.ind, this indicates whether
-         TransactionID should be appended to URI or not. -->
-    <bool name="enabledTransID">true</bool>
-
-    <!-- Send M-Acknowledge.ind and M-NotifyResp.ind to the URL received by the
-         M-Notification.ind (WAP-PUSH). -->
-    <bool name="enabledNotifyWapMMSC">true</bool>
-
-    <!-- Maximum message size in bytes for a MMS message -->
-    <int name="maxMessageSize">1258291</int>
-
-    <!-- UAProf parameter tag name -->
-    <string name="uaProfTagName">Profile</string>
-
-    <!-- Maximum number of recipients allowed per message. Use a value of -1
-         to indicate no limit. -->
-    <int name="recipientLimit">20</int>
-
-    <!-- Additional http parameters used in MMS http request.
-         Parameters are seperated by '|'. Optional. -->
-    <string name="httpParams">x-up-calling-line-id: 1##LINE1NOCOUNTRYCODE##|X-VzW-MDN: 1##LINE1NOCOUNTRYCODE##</string>
-
-    <!-- Maximum height for an attached image -->
-    <int name="maxImageHeight">1944</int>
-
-    <!-- Maximum width for an attached image -->
-    <int name="maxImageWidth">2592</int>
-
-    <!-- Email Gateway Number -->
-    <!-- TODO: check if this is correct for Passion -->
-    <string name="emailGatewayNumber">6245</string>
-
-    <!-- enable alias -->
-    <bool name="aliasEnabled">true</bool>
-
-    <!-- alias rule: min chars -->
-    <int name="aliasMinChars">2</int>
-
-    <!-- alias rule: max chars -->
-    <int name="aliasMaxChars">48</int>
-
-    <!-- disable the option to attach an audio attachment to an Mms message. Currently Verizon
-         doesn't support OGG files and the only audio picker in the system allowed for picking
-         ringtones. All of our ringtones are OGG files so it doesn't make sense to allow a user
-         to select an audio file that eventually can't be handled. Therefore, the ability
-         to select a ringtone to send is disabled. -->
-    <bool name="allowAttachAudio">false</bool>
-
-    <!-- Hide the MMS read reports UI in settings -->
-    <bool name="enableMMSReadReports">false</bool>
-
-    <!-- Maximum length in chars of mms subject field -->
-    <int name="maxSubjectLength">80</int>
-
-    <!-- If true, The text message over 160 characters will be sent in multi part.
-         If false, The text message over 160 characters will be sent
-         via multi media message. -->
-    <bool name="enableMultipartSMS">true</bool>
-
-    <!-- If enableMultipartSMS is true and smsToMmsTextThreshold > 1, then multi-part SMS messages
-         will be converted into a single mms message. For example, if the mms_config.xml file
-         specifies <int name="smsToMmsTextThreshold">7</int>, then on the 8th sms segment, the
-         message will be converted to an mms. -->
-    <int name="smsToMmsTextThreshold">7</int>
-</mms_config>
-
+<?xml version="1.0" encoding="utf-8"?>
+<!-- Copyright 2014 The Android Open Source Project
+
+     Licensed under the Apache License, Version 2.0 (the "License");
+     you may not use this file except in compliance with the License.
+     You may obtain a copy of the License at
+
+          http://www.apache.org/licenses/LICENSE-2.0
+
+     Unless required by applicable law or agreed to in writing, software
+     distributed under the License is distributed on an "AS IS" BASIS,
+     WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+     See the License for the specific language governing permissions and
+     limitations under the License.
+-->
+
+<mms_config version="2">
+    <!-- In case of single segment M-Notification.ind, this indicates whether
+         TransactionID should be appended to URI or not. -->
+    <bool name="enabledTransID">true</bool>
+
+    <!-- Send M-Acknowledge.ind and M-NotifyResp.ind to the URL received by the
+         M-Notification.ind (WAP-PUSH). -->
+    <bool name="enabledNotifyWapMMSC">true</bool>
+
+    <!-- Maximum message size in bytes for a MMS message -->
+    <int name="maxMessageSize">1258291</int>
+
+    <!-- UAProf parameter tag name -->
+    <string name="uaProfTagName">Profile</string>
+
+    <!-- Maximum number of recipients allowed per message. Use a value of -1
+         to indicate no limit. -->
+    <int name="recipientLimit">20</int>
+
+    <!-- Additional http parameters used in MMS http request.
+         Parameters are seperated by '|'. Optional. -->
+    <string name="httpParams">x-up-calling-line-id: 1##LINE1NOCOUNTRYCODE##|X-VzW-MDN: 1##LINE1NOCOUNTRYCODE##</string>
+
+    <!-- Maximum height for an attached image -->
+    <int name="maxImageHeight">1944</int>
+
+    <!-- Maximum width for an attached image -->
+    <int name="maxImageWidth">2592</int>
+
+    <!-- Email Gateway Number -->
+    <!-- TODO: check if this is correct for Passion -->
+    <string name="emailGatewayNumber">6245</string>
+
+    <!-- enable alias -->
+    <bool name="aliasEnabled">true</bool>
+
+    <!-- alias rule: min chars -->
+    <int name="aliasMinChars">2</int>
+
+    <!-- alias rule: max chars -->
+    <int name="aliasMaxChars">48</int>
+
+    <!-- disable the option to attach an audio attachment to an Mms message. Currently Verizon
+         doesn't support OGG files and the only audio picker in the system allowed for picking
+         ringtones. All of our ringtones are OGG files so it doesn't make sense to allow a user
+         to select an audio file that eventually can't be handled. Therefore, the ability
+         to select a ringtone to send is disabled. -->
+    <bool name="allowAttachAudio">false</bool>
+
+    <!-- Hide the MMS read reports UI in settings -->
+    <bool name="enableMMSReadReports">false</bool>
+
+    <!-- Maximum length in chars of mms subject field -->
+    <int name="maxSubjectLength">80</int>
+
+    <!-- If true, The text message over 160 characters will be sent in multi part.
+         If false, The text message over 160 characters will be sent
+         via multi media message. -->
+    <bool name="enableMultipartSMS">true</bool>
+
+    <!-- If enableMultipartSMS is true and smsToMmsTextThreshold > 1, then multi-part SMS messages
+         will be converted into a single mms message. For example, if the mms_config.xml file
+         specifies <int name="smsToMmsTextThreshold">7</int>, then on the 8th sms segment, the
+         message will be converted to an mms. -->
+    <int name="smsToMmsTextThreshold">7</int>
+</mms_config>
+
diff --git a/android-smsmms/src/main/res/xml-mcc310-mnc010/mms_config.xml b/android-smsmms/src/main/res/xml-mcc310-mnc010/mms_config.xml
index 571bc0717..5e406485b 100755
--- a/android-smsmms/src/main/res/xml-mcc310-mnc010/mms_config.xml
+++ b/android-smsmms/src/main/res/xml-mcc310-mnc010/mms_config.xml
@@ -1,55 +1,55 @@
-<?xml version="1.0" encoding="utf-8"?>
-<!-- Copyright 2013 The Android Open Source Project
-
-     Licensed under the Apache License, Version 2.0 (the "License");
-     you may not use this file except in compliance with the License.
-     You may obtain a copy of the License at
-
-          http://www.apache.org/licenses/LICENSE-2.0
-
-     Unless required by applicable law or agreed to in writing, software
-     distributed under the License is distributed on an "AS IS" BASIS,
-     WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
-     See the License for the specific language governing permissions and
-     limitations under the License.
--->
-
-<mms_config version="4">
-    <!-- Maximum message size in bytes for a MMS message -->
-    <int name="maxMessageSize">1048576</int>
-
-    <!-- Maximum height for an attached image -->
-    <int name="maxImageHeight">1944</int>
-
-    <!-- Maximum width for an attached image -->
-    <int name="maxImageWidth">2592</int>
-
-    <!-- If true, The text message over 160 characters will be sent in multi part.
-         If false, The text message over 160 characters will be sent
-         via multi media message or separate, independent SMS messages,
-         dependent on sendMultipartSMSAsSeparateMessages value. -->
-    <bool name="enableMultipartSMS">false</bool>
-
-    <!-- If this is true, The text message over 160 characters will be sent in separate,
-         independent messages after split into 160 character parts -->
-    <bool name="sendMultipartSmsAsSeparateMessages">true</bool>
-
-    <!-- If true, The mms support slide duration.
-         If false, The mms does not support slide duration and we have to
-         set duration value. -->
-    <bool name="enableSlideDuration">false</bool>
-
-    <!-- Maximum length for message text. Use a value of -1
-         to indicate default value -->
-    <int name="maxMessageTextSize">-1</int>
-
-    <bool name="enableMMSReadReports">false</bool>
-
-    <bool name="enableSMSDeliveryReports">false</bool>
-
-    <bool name="enableMMSDeliveryReports">false</bool>
-
-    <!-- If true, need to read content_disposition field of an MMS part -->
-    <bool name="supportMmsContentDisposition">false</bool>
-</mms_config>
-
+<?xml version="1.0" encoding="utf-8"?>
+<!-- Copyright 2013 The Android Open Source Project
+
+     Licensed under the Apache License, Version 2.0 (the "License");
+     you may not use this file except in compliance with the License.
+     You may obtain a copy of the License at
+
+          http://www.apache.org/licenses/LICENSE-2.0
+
+     Unless required by applicable law or agreed to in writing, software
+     distributed under the License is distributed on an "AS IS" BASIS,
+     WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+     See the License for the specific language governing permissions and
+     limitations under the License.
+-->
+
+<mms_config version="4">
+    <!-- Maximum message size in bytes for a MMS message -->
+    <int name="maxMessageSize">1048576</int>
+
+    <!-- Maximum height for an attached image -->
+    <int name="maxImageHeight">1944</int>
+
+    <!-- Maximum width for an attached image -->
+    <int name="maxImageWidth">2592</int>
+
+    <!-- If true, The text message over 160 characters will be sent in multi part.
+         If false, The text message over 160 characters will be sent
+         via multi media message or separate, independent SMS messages,
+         dependent on sendMultipartSMSAsSeparateMessages value. -->
+    <bool name="enableMultipartSMS">false</bool>
+
+    <!-- If this is true, The text message over 160 characters will be sent in separate,
+         independent messages after split into 160 character parts -->
+    <bool name="sendMultipartSmsAsSeparateMessages">true</bool>
+
+    <!-- If true, The mms support slide duration.
+         If false, The mms does not support slide duration and we have to
+         set duration value. -->
+    <bool name="enableSlideDuration">false</bool>
+
+    <!-- Maximum length for message text. Use a value of -1
+         to indicate default value -->
+    <int name="maxMessageTextSize">-1</int>
+
+    <bool name="enableMMSReadReports">false</bool>
+
+    <bool name="enableSMSDeliveryReports">false</bool>
+
+    <bool name="enableMMSDeliveryReports">false</bool>
+
+    <!-- If true, need to read content_disposition field of an MMS part -->
+    <bool name="supportMmsContentDisposition">false</bool>
+</mms_config>
+
diff --git a/android-smsmms/src/main/res/xml-mcc310-mnc026/mms_config.xml b/android-smsmms/src/main/res/xml-mcc310-mnc026/mms_config.xml
index 91481f976..e85ac2dee 100755
--- a/android-smsmms/src/main/res/xml-mcc310-mnc026/mms_config.xml
+++ b/android-smsmms/src/main/res/xml-mcc310-mnc026/mms_config.xml
@@ -1,28 +1,28 @@
-<?xml version="1.0" encoding="utf-8"?>
-<!-- Copyright 2013 The Android Open Source Project
-
-     Licensed under the Apache License, Version 2.0 (the "License");
-     you may not use this file except in compliance with the License.
-     You may obtain a copy of the License at
-
-          http://www.apache.org/licenses/LICENSE-2.0
-
-     Unless required by applicable law or agreed to in writing, software
-     distributed under the License is distributed on an "AS IS" BASIS,
-     WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
-     See the License for the specific language governing permissions and
-     limitations under the License.
--->
-
-<!-- T-Mobile U.S. mcc=310, mnc=026 -->
-
-<mms_config version="3">
-    <!-- Maximum message size in bytes for a MMS message -->
-    <int name="maxMessageSize">1048576</int>
-
-    <!-- Maximum height for an attached image -->
-    <int name="maxImageHeight">1944</int>
-
-    <!-- Maximum width for an attached image -->
-    <int name="maxImageWidth">2592</int>
-</mms_config>
+<?xml version="1.0" encoding="utf-8"?>
+<!-- Copyright 2013 The Android Open Source Project
+
+     Licensed under the Apache License, Version 2.0 (the "License");
+     you may not use this file except in compliance with the License.
+     You may obtain a copy of the License at
+
+          http://www.apache.org/licenses/LICENSE-2.0
+
+     Unless required by applicable law or agreed to in writing, software
+     distributed under the License is distributed on an "AS IS" BASIS,
+     WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+     See the License for the specific language governing permissions and
+     limitations under the License.
+-->
+
+<!-- T-Mobile U.S. mcc=310, mnc=026 -->
+
+<mms_config version="3">
+    <!-- Maximum message size in bytes for a MMS message -->
+    <int name="maxMessageSize">1048576</int>
+
+    <!-- Maximum height for an attached image -->
+    <int name="maxImageHeight">1944</int>
+
+    <!-- Maximum width for an attached image -->
+    <int name="maxImageWidth">2592</int>
+</mms_config>
diff --git a/android-smsmms/src/main/res/xml-mcc310-mnc040/mms_config.xml b/android-smsmms/src/main/res/xml-mcc310-mnc040/mms_config.xml
index 962285793..b6c20a12f 100755
--- a/android-smsmms/src/main/res/xml-mcc310-mnc040/mms_config.xml
+++ b/android-smsmms/src/main/res/xml-mcc310-mnc040/mms_config.xml
@@ -1,83 +1,83 @@
-<?xml version="1.0" encoding="utf-8"?>
-<!-- Copyright (C) 2009 The Android Open Source Project
-
-     Licensed under the Apache License, Version 2.0 (the "License");
-     you may not use this file except in compliance with the License.
-     You may obtain a copy of the License at
-
-          http://www.apache.org/licenses/LICENSE-2.0
-
-     Unless required by applicable law or agreed to in writing, software
-     distributed under the License is distributed on an "AS IS" BASIS,
-     WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
-     See the License for the specific language governing permissions and
-     limitations under the License.
--->
-
-<!-- Version History
-        version 1 - initial version.
-        version 2 - added recipientLimit.
-        version 3 - added min/max recycler values.
-        version 4 - added sms to mms text threshold.
--->
-
-<mms_config version="4">
-    <!-- Flag indicating whether MMS should be enabled -->
-    <bool name="enabledMMS">true</bool>
-
-    <!-- Maximum message size in bytes for a MMS message -->
-    <int name="maxMessageSize">1048576</int>
-
-    <!-- Maximum height for an attached image -->
-    <int name="maxImageHeight">2432</int>
-
-    <!-- Maximum width for an attached image -->
-    <int name="maxImageWidth">4320</int>
-
-    <!-- Maximum number of SMS message to save per thread before auto-delete kicks in.
-         This is the default value. -->
-    <int name="defaultSMSMessagesPerThread">500</int>
-
-    <!-- Maximum number of MMS message to save per thread before auto-delete kicks in.
-         This is the default value. -->
-    <int name="defaultMMSMessagesPerThread">50</int>
-
-    <!-- Minimum value for the number of messages kept per conversation. The user can never
-         set the limit below this value. -->
-    <int name="minMessageCountPerThread">10</int>
-
-    <!-- Maximum value for the number of messages kept per conversation. The user can never
-         set the limit above this value. -->
-    <int name="maxMessageCountPerThread">5000</int>
-
-    <!-- Maximum number of recipients allowed per message. Use a value of -1
-         to indicate no limit. -->
-    <int name="recipientLimit">20</int>
-
-    <!-- If true, The text message over 160 characters will be sent in multi part.
-         If false, The text message over 160 characters will be sent
-         via multi media message. -->
-    <bool name="enableMultipartSMS">true</bool>
-
-    <!-- If enableMultipartSMS is true and smsToMmsTextThreshold > 1, then multi-part SMS messages
-         will be converted into a single mms message. For example, if the mms_config.xml file
-         specifies <int name="smsToMmsTextThreshold">7</int>, then on the 8th sms segment, the
-         message will be converted to an mms. -->
-    <int name="smsToMmsTextThreshold">1</int>
-
-    <!-- If true, The mms support slide duration.
-         If false, The mms does not support slide duration and we have to
-         set duration value. -->
-    <bool name="enableSlideDuration">true</bool>
-
-    <!-- Maximum length for message text. Use a value of -1
-         to indicate default value -->
-    <int name="maxMessageTextSize">-1</int>
-
-    <!-- Maximum length in chars of mms subject field -->
-    <int name="maxSubjectLength">80</int>
-
-     <!-- Reference for additional http parameters used in MMS http request.
-          Parameters are seperated by '|'. Optional.  -->
-     <string name="httpParams">X-MDN: ##LINE1##</string>
-</mms_config>
+<?xml version="1.0" encoding="utf-8"?>
+<!-- Copyright (C) 2009 The Android Open Source Project
+
+     Licensed under the Apache License, Version 2.0 (the "License");
+     you may not use this file except in compliance with the License.
+     You may obtain a copy of the License at
+
+          http://www.apache.org/licenses/LICENSE-2.0
+
+     Unless required by applicable law or agreed to in writing, software
+     distributed under the License is distributed on an "AS IS" BASIS,
+     WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+     See the License for the specific language governing permissions and
+     limitations under the License.
+-->
+
+<!-- Version History
+        version 1 - initial version.
+        version 2 - added recipientLimit.
+        version 3 - added min/max recycler values.
+        version 4 - added sms to mms text threshold.
+-->
+
+<mms_config version="4">
+    <!-- Flag indicating whether MMS should be enabled -->
+    <bool name="enabledMMS">true</bool>
+
+    <!-- Maximum message size in bytes for a MMS message -->
+    <int name="maxMessageSize">1048576</int>
+
+    <!-- Maximum height for an attached image -->
+    <int name="maxImageHeight">2432</int>
+
+    <!-- Maximum width for an attached image -->
+    <int name="maxImageWidth">4320</int>
+
+    <!-- Maximum number of SMS message to save per thread before auto-delete kicks in.
+         This is the default value. -->
+    <int name="defaultSMSMessagesPerThread">500</int>
+
+    <!-- Maximum number of MMS message to save per thread before auto-delete kicks in.
+         This is the default value. -->
+    <int name="defaultMMSMessagesPerThread">50</int>
+
+    <!-- Minimum value for the number of messages kept per conversation. The user can never
+         set the limit below this value. -->
+    <int name="minMessageCountPerThread">10</int>
+
+    <!-- Maximum value for the number of messages kept per conversation. The user can never
+         set the limit above this value. -->
+    <int name="maxMessageCountPerThread">5000</int>
+
+    <!-- Maximum number of recipients allowed per message. Use a value of -1
+         to indicate no limit. -->
+    <int name="recipientLimit">20</int>
+
+    <!-- If true, The text message over 160 characters will be sent in multi part.
+         If false, The text message over 160 characters will be sent
+         via multi media message. -->
+    <bool name="enableMultipartSMS">true</bool>
+
+    <!-- If enableMultipartSMS is true and smsToMmsTextThreshold > 1, then multi-part SMS messages
+         will be converted into a single mms message. For example, if the mms_config.xml file
+         specifies <int name="smsToMmsTextThreshold">7</int>, then on the 8th sms segment, the
+         message will be converted to an mms. -->
+    <int name="smsToMmsTextThreshold">1</int>
+
+    <!-- If true, The mms support slide duration.
+         If false, The mms does not support slide duration and we have to
+         set duration value. -->
+    <bool name="enableSlideDuration">true</bool>
+
+    <!-- Maximum length for message text. Use a value of -1
+         to indicate default value -->
+    <int name="maxMessageTextSize">-1</int>
+
+    <!-- Maximum length in chars of mms subject field -->
+    <int name="maxSubjectLength">80</int>
+
+     <!-- Reference for additional http parameters used in MMS http request.
+          Parameters are seperated by '|'. Optional.  -->
+     <string name="httpParams">X-MDN: ##LINE1##</string>
+</mms_config>
diff --git a/android-smsmms/src/main/res/xml-mcc310-mnc070/mms_config.xml b/android-smsmms/src/main/res/xml-mcc310-mnc070/mms_config.xml
index e9404e871..ea8ed06ff 100755
--- a/android-smsmms/src/main/res/xml-mcc310-mnc070/mms_config.xml
+++ b/android-smsmms/src/main/res/xml-mcc310-mnc070/mms_config.xml
@@ -1,32 +1,32 @@
-<?xml version="1.0" encoding="utf-8"?>
-<!-- Copyright 2014 The Android Open Source Project
-
-     Licensed under the Apache License, Version 2.0 (the "License");
-     you may not use this file except in compliance with the License.
-     You may obtain a copy of the License at
-
-          http://www.apache.org/licenses/LICENSE-2.0
-
-     Unless required by applicable law or agreed to in writing, software
-     distributed under the License is distributed on an "AS IS" BASIS,
-     WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
-     See the License for the specific language governing permissions and
-     limitations under the License.
--->
-
-<!-- AT&T U.S. mcc=310, mnc=070 -->
-
-<mms_config version="1">
-    <!-- Maximum message size in bytes for a MMS message -->
-    <int name="maxMessageSize">1048576</int>
-
-    <!-- Maximum height for an attached image -->
-    <int name="maxImageHeight">1944</int>
-
-    <!-- Maximum width for an attached image -->
-    <int name="maxImageWidth">2592</int>
-
-    <!-- Maximum number of recipients allowed per message. Use a value of -1
-     to indicate no limit. -->
-    <int name="recipientLimit">10</int>
-</mms_config>
+<?xml version="1.0" encoding="utf-8"?>
+<!-- Copyright 2014 The Android Open Source Project
+
+     Licensed under the Apache License, Version 2.0 (the "License");
+     you may not use this file except in compliance with the License.
+     You may obtain a copy of the License at
+
+          http://www.apache.org/licenses/LICENSE-2.0
+
+     Unless required by applicable law or agreed to in writing, software
+     distributed under the License is distributed on an "AS IS" BASIS,
+     WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+     See the License for the specific language governing permissions and
+     limitations under the License.
+-->
+
+<!-- AT&T U.S. mcc=310, mnc=070 -->
+
+<mms_config version="1">
+    <!-- Maximum message size in bytes for a MMS message -->
+    <int name="maxMessageSize">1048576</int>
+
+    <!-- Maximum height for an attached image -->
+    <int name="maxImageHeight">1944</int>
+
+    <!-- Maximum width for an attached image -->
+    <int name="maxImageWidth">2592</int>
+
+    <!-- Maximum number of recipients allowed per message. Use a value of -1
+     to indicate no limit. -->
+    <int name="recipientLimit">10</int>
+</mms_config>
diff --git a/android-smsmms/src/main/res/xml-mcc310-mnc090/mms_config.xml b/android-smsmms/src/main/res/xml-mcc310-mnc090/mms_config.xml
index 0c8f8de9f..cc28e5bde 100755
--- a/android-smsmms/src/main/res/xml-mcc310-mnc090/mms_config.xml
+++ b/android-smsmms/src/main/res/xml-mcc310-mnc090/mms_config.xml
@@ -1,28 +1,28 @@
-<?xml version="1.0" encoding="utf-8"?>
-<!-- Copyright 2013 The Android Open Source Project
-
-     Licensed under the Apache License, Version 2.0 (the "License");
-     you may not use this file except in compliance with the License.
-     You may obtain a copy of the License at
-
-          http://www.apache.org/licenses/LICENSE-2.0
-
-     Unless required by applicable law or agreed to in writing, software
-     distributed under the License is distributed on an "AS IS" BASIS,
-     WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
-     See the License for the specific language governing permissions and
-     limitations under the License.
--->
-
-<!-- AT&T U.S. mcc=310, mnc=090 -->
-
-<mms_config version="3">
-    <!-- Maximum message size in bytes for a MMS message -->
-    <int name="maxMessageSize">614400</int>
-
-    <!-- Maximum height for an attached image -->
-    <int name="maxImageHeight">1944</int>
-
-    <!-- Maximum width for an attached image -->
-    <int name="maxImageWidth">2592</int>
-</mms_config>
+<?xml version="1.0" encoding="utf-8"?>
+<!-- Copyright 2013 The Android Open Source Project
+
+     Licensed under the Apache License, Version 2.0 (the "License");
+     you may not use this file except in compliance with the License.
+     You may obtain a copy of the License at
+
+          http://www.apache.org/licenses/LICENSE-2.0
+
+     Unless required by applicable law or agreed to in writing, software
+     distributed under the License is distributed on an "AS IS" BASIS,
+     WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+     See the License for the specific language governing permissions and
+     limitations under the License.
+-->
+
+<!-- AT&T U.S. mcc=310, mnc=090 -->
+
+<mms_config version="3">
+    <!-- Maximum message size in bytes for a MMS message -->
+    <int name="maxMessageSize">614400</int>
+
+    <!-- Maximum height for an attached image -->
+    <int name="maxImageHeight">1944</int>
+
+    <!-- Maximum width for an attached image -->
+    <int name="maxImageWidth">2592</int>
+</mms_config>
diff --git a/android-smsmms/src/main/res/xml-mcc310-mnc120/mms_config.xml b/android-smsmms/src/main/res/xml-mcc310-mnc120/mms_config.xml
index 8c1ae1193..ec09547de 100755
--- a/android-smsmms/src/main/res/xml-mcc310-mnc120/mms_config.xml
+++ b/android-smsmms/src/main/res/xml-mcc310-mnc120/mms_config.xml
@@ -1,75 +1,75 @@
-<?xml version="1.0" encoding="utf-8"?>
-<!-- Copyright 2013 The Android Open Source Project
-
-     Licensed under the Apache License, Version 2.0 (the "License");
-     you may not use this file except in compliance with the License.
-     You may obtain a copy of the License at
-
-          http://www.apache.org/licenses/LICENSE-2.0
-
-     Unless required by applicable law or agreed to in writing, software
-     distributed under the License is distributed on an "AS IS" BASIS,
-     WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
-     See the License for the specific language governing permissions and
-     limitations under the License.
--->
-
-<mms_config version="4">
-    <!-- Flag indicating whether MMS should be enabled -->
-    <bool name="enabledMMS">true</bool>
-
-    <!-- Maximum message size in bytes for a MMS message -->
-    <int name="maxMessageSize">1048576</int>
-
-    <!-- Maximum height for an attached image -->
-    <int name="maxImageHeight">1944</int>
-
-    <!-- Maximum width for an attached image -->
-    <int name="maxImageWidth">2592</int>
-
-    <!-- Maximum number of recipients allowed per message. Use a value of -1
-         to indicate no limit. -->
-    <int name="recipientLimit">40</int>
-
-    <!-- If true, The text message over 160 characters will be sent in multi part.
-         If false, The text message over 160 characters will be sent
-         via multi media message. -->
-    <bool name="enableMultipartSMS">true</bool>
-
-    <!-- If enableMultipartSMS is true and smsToMmsTextThreshold > 1, then multi-part SMS messages
-         will be converted into a single mms message. For example, if the mms_config.xml file
-         specifies <int name="smsToMmsTextThreshold">7</int>, then on the 8th sms segment, the
-         message will be converted to an mms. -->
-    <int name="smsToMmsTextThreshold">6</int>
-
-    <!-- If true, The mms support slide duration.
-         If false, The mms does not support slide duration and we have to
-         set duration value. -->
-    <bool name="enableSlideDuration">false</bool>
-
-    <!-- Maximum length for message text. Use a value of -1
-         to indicate default value -->
-    <int name="maxMessageTextSize">-1</int>
-
-    <!-- Maximum length in chars of mms subject field -->
-    <int name="maxSubjectLength">80</int>
-
-    <!-- Email Gateway Number -->
-    <string name="emailGatewayNumber">6245</string>
-
-    <bool name="enableMMSReadReports">false</bool>
-
-    <bool name="enableSMSDeliveryReports">false</bool>
-
-    <bool name="enableMMSDeliveryReports">false</bool>
-
-    <!-- Reference for additional http parameters used in MMS http request.
-         Parameters are seperated by '|'. Optional. -->
-    <string name="httpParams">X-MDN: ##LINE1##|Proxy-Authorization: Basic ##NAI##</string>
-
-    <!-- Suffix to the NAI header (encoded together with base64) -->
-    <string name="naiSuffix">:pcs</string>
-
-    <!-- If true, need to read content_disposition field of an MMS part -->
-    <bool name="supportMmsContentDisposition">false</bool>
-</mms_config>
+<?xml version="1.0" encoding="utf-8"?>
+<!-- Copyright 2013 The Android Open Source Project
+
+     Licensed under the Apache License, Version 2.0 (the "License");
+     you may not use this file except in compliance with the License.
+     You may obtain a copy of the License at
+
+          http://www.apache.org/licenses/LICENSE-2.0
+
+     Unless required by applicable law or agreed to in writing, software
+     distributed under the License is distributed on an "AS IS" BASIS,
+     WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+     See the License for the specific language governing permissions and
+     limitations under the License.
+-->
+
+<mms_config version="4">
+    <!-- Flag indicating whether MMS should be enabled -->
+    <bool name="enabledMMS">true</bool>
+
+    <!-- Maximum message size in bytes for a MMS message -->
+    <int name="maxMessageSize">1048576</int>
+
+    <!-- Maximum height for an attached image -->
+    <int name="maxImageHeight">1944</int>
+
+    <!-- Maximum width for an attached image -->
+    <int name="maxImageWidth">2592</int>
+
+    <!-- Maximum number of recipients allowed per message. Use a value of -1
+         to indicate no limit. -->
+    <int name="recipientLimit">40</int>
+
+    <!-- If true, The text message over 160 characters will be sent in multi part.
+         If false, The text message over 160 characters will be sent
+         via multi media message. -->
+    <bool name="enableMultipartSMS">true</bool>
+
+    <!-- If enableMultipartSMS is true and smsToMmsTextThreshold > 1, then multi-part SMS messages
+         will be converted into a single mms message. For example, if the mms_config.xml file
+         specifies <int name="smsToMmsTextThreshold">7</int>, then on the 8th sms segment, the
+         message will be converted to an mms. -->
+    <int name="smsToMmsTextThreshold">6</int>
+
+    <!-- If true, The mms support slide duration.
+         If false, The mms does not support slide duration and we have to
+         set duration value. -->
+    <bool name="enableSlideDuration">false</bool>
+
+    <!-- Maximum length for message text. Use a value of -1
+         to indicate default value -->
+    <int name="maxMessageTextSize">-1</int>
+
+    <!-- Maximum length in chars of mms subject field -->
+    <int name="maxSubjectLength">80</int>
+
+    <!-- Email Gateway Number -->
+    <string name="emailGatewayNumber">6245</string>
+
+    <bool name="enableMMSReadReports">false</bool>
+
+    <bool name="enableSMSDeliveryReports">false</bool>
+
+    <bool name="enableMMSDeliveryReports">false</bool>
+
+    <!-- Reference for additional http parameters used in MMS http request.
+         Parameters are seperated by '|'. Optional. -->
+    <string name="httpParams">X-MDN: ##LINE1##|Proxy-Authorization: Basic ##NAI##</string>
+
+    <!-- Suffix to the NAI header (encoded together with base64) -->
+    <string name="naiSuffix">:pcs</string>
+
+    <!-- If true, need to read content_disposition field of an MMS part -->
+    <bool name="supportMmsContentDisposition">false</bool>
+</mms_config>
diff --git a/android-smsmms/src/main/res/xml-mcc310-mnc130/mms_config.xml b/android-smsmms/src/main/res/xml-mcc310-mnc130/mms_config.xml
index 962285793..b6c20a12f 100755
--- a/android-smsmms/src/main/res/xml-mcc310-mnc130/mms_config.xml
+++ b/android-smsmms/src/main/res/xml-mcc310-mnc130/mms_config.xml
@@ -1,83 +1,83 @@
-<?xml version="1.0" encoding="utf-8"?>
-<!-- Copyright (C) 2009 The Android Open Source Project
-
-     Licensed under the Apache License, Version 2.0 (the "License");
-     you may not use this file except in compliance with the License.
-     You may obtain a copy of the License at
-
-          http://www.apache.org/licenses/LICENSE-2.0
-
-     Unless required by applicable law or agreed to in writing, software
-     distributed under the License is distributed on an "AS IS" BASIS,
-     WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
-     See the License for the specific language governing permissions and
-     limitations under the License.
--->
-
-<!-- Version History
-        version 1 - initial version.
-        version 2 - added recipientLimit.
-        version 3 - added min/max recycler values.
-        version 4 - added sms to mms text threshold.
--->
-
-<mms_config version="4">
-    <!-- Flag indicating whether MMS should be enabled -->
-    <bool name="enabledMMS">true</bool>
-
-    <!-- Maximum message size in bytes for a MMS message -->
-    <int name="maxMessageSize">1048576</int>
-
-    <!-- Maximum height for an attached image -->
-    <int name="maxImageHeight">2432</int>
-
-    <!-- Maximum width for an attached image -->
-    <int name="maxImageWidth">4320</int>
-
-    <!-- Maximum number of SMS message to save per thread before auto-delete kicks in.
-         This is the default value. -->
-    <int name="defaultSMSMessagesPerThread">500</int>
-
-    <!-- Maximum number of MMS message to save per thread before auto-delete kicks in.
-         This is the default value. -->
-    <int name="defaultMMSMessagesPerThread">50</int>
-
-    <!-- Minimum value for the number of messages kept per conversation. The user can never
-         set the limit below this value. -->
-    <int name="minMessageCountPerThread">10</int>
-
-    <!-- Maximum value for the number of messages kept per conversation. The user can never
-         set the limit above this value. -->
-    <int name="maxMessageCountPerThread">5000</int>
-
-    <!-- Maximum number of recipients allowed per message. Use a value of -1
-         to indicate no limit. -->
-    <int name="recipientLimit">20</int>
-
-    <!-- If true, The text message over 160 characters will be sent in multi part.
-         If false, The text message over 160 characters will be sent
-         via multi media message. -->
-    <bool name="enableMultipartSMS">true</bool>
-
-    <!-- If enableMultipartSMS is true and smsToMmsTextThreshold > 1, then multi-part SMS messages
-         will be converted into a single mms message. For example, if the mms_config.xml file
-         specifies <int name="smsToMmsTextThreshold">7</int>, then on the 8th sms segment, the
-         message will be converted to an mms. -->
-    <int name="smsToMmsTextThreshold">1</int>
-
-    <!-- If true, The mms support slide duration.
-         If false, The mms does not support slide duration and we have to
-         set duration value. -->
-    <bool name="enableSlideDuration">true</bool>
-
-    <!-- Maximum length for message text. Use a value of -1
-         to indicate default value -->
-    <int name="maxMessageTextSize">-1</int>
-
-    <!-- Maximum length in chars of mms subject field -->
-    <int name="maxSubjectLength">80</int>
-
-     <!-- Reference for additional http parameters used in MMS http request.
-          Parameters are seperated by '|'. Optional.  -->
-     <string name="httpParams">X-MDN: ##LINE1##</string>
-</mms_config>
+<?xml version="1.0" encoding="utf-8"?>
+<!-- Copyright (C) 2009 The Android Open Source Project
+
+     Licensed under the Apache License, Version 2.0 (the "License");
+     you may not use this file except in compliance with the License.
+     You may obtain a copy of the License at
+
+          http://www.apache.org/licenses/LICENSE-2.0
+
+     Unless required by applicable law or agreed to in writing, software
+     distributed under the License is distributed on an "AS IS" BASIS,
+     WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+     See the License for the specific language governing permissions and
+     limitations under the License.
+-->
+
+<!-- Version History
+        version 1 - initial version.
+        version 2 - added recipientLimit.
+        version 3 - added min/max recycler values.
+        version 4 - added sms to mms text threshold.
+-->
+
+<mms_config version="4">
+    <!-- Flag indicating whether MMS should be enabled -->
+    <bool name="enabledMMS">true</bool>
+
+    <!-- Maximum message size in bytes for a MMS message -->
+    <int name="maxMessageSize">1048576</int>
+
+    <!-- Maximum height for an attached image -->
+    <int name="maxImageHeight">2432</int>
+
+    <!-- Maximum width for an attached image -->
+    <int name="maxImageWidth">4320</int>
+
+    <!-- Maximum number of SMS message to save per thread before auto-delete kicks in.
+         This is the default value. -->
+    <int name="defaultSMSMessagesPerThread">500</int>
+
+    <!-- Maximum number of MMS message to save per thread before auto-delete kicks in.
+         This is the default value. -->
+    <int name="defaultMMSMessagesPerThread">50</int>
+
+    <!-- Minimum value for the number of messages kept per conversation. The user can never
+         set the limit below this value. -->
+    <int name="minMessageCountPerThread">10</int>
+
+    <!-- Maximum value for the number of messages kept per conversation. The user can never
+         set the limit above this value. -->
+    <int name="maxMessageCountPerThread">5000</int>
+
+    <!-- Maximum number of recipients allowed per message. Use a value of -1
+         to indicate no limit. -->
+    <int name="recipientLimit">20</int>
+
+    <!-- If true, The text message over 160 characters will be sent in multi part.
+         If false, The text message over 160 characters will be sent
+         via multi media message. -->
+    <bool name="enableMultipartSMS">true</bool>
+
+    <!-- If enableMultipartSMS is true and smsToMmsTextThreshold > 1, then multi-part SMS messages
+         will be converted into a single mms message. For example, if the mms_config.xml file
+         specifies <int name="smsToMmsTextThreshold">7</int>, then on the 8th sms segment, the
+         message will be converted to an mms. -->
+    <int name="smsToMmsTextThreshold">1</int>
+
+    <!-- If true, The mms support slide duration.
+         If false, The mms does not support slide duration and we have to
+         set duration value. -->
+    <bool name="enableSlideDuration">true</bool>
+
+    <!-- Maximum length for message text. Use a value of -1
+         to indicate default value -->
+    <int name="maxMessageTextSize">-1</int>
+
+    <!-- Maximum length in chars of mms subject field -->
+    <int name="maxSubjectLength">80</int>
+
+     <!-- Reference for additional http parameters used in MMS http request.
+          Parameters are seperated by '|'. Optional.  -->
+     <string name="httpParams">X-MDN: ##LINE1##</string>
+</mms_config>
diff --git a/android-smsmms/src/main/res/xml-mcc310-mnc150/mms_config.xml b/android-smsmms/src/main/res/xml-mcc310-mnc150/mms_config.xml
index 96e5b9df7..de6b16bd2 100755
--- a/android-smsmms/src/main/res/xml-mcc310-mnc150/mms_config.xml
+++ b/android-smsmms/src/main/res/xml-mcc310-mnc150/mms_config.xml
@@ -1,33 +1,33 @@
-<?xml version="1.0" encoding="utf-8"?>
-<!-- Copyright 2013 The Android Open Source Project
-
-     Licensed under the Apache License, Version 2.0 (the "License");
-     you may not use this file except in compliance with the License.
-     You may obtain a copy of the License at
-
-          http://www.apache.org/licenses/LICENSE-2.0
-
-     Unless required by applicable law or agreed to in writing, software
-     distributed under the License is distributed on an "AS IS" BASIS,
-     WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
-     See the License for the specific language governing permissions and
-     limitations under the License.
--->
-
-<!-- Version History
-        version 1 - initial version.
-        version 2 - added recipientLimit.
-        version 3 - added min/max recycler values.
-        version 4 - added sms to mms text threshold.
--->
-
-<mms_config version="4">
-    <!-- Maximum message size in bytes for a MMS message -->
-    <int name="maxMessageSize">1048576</int>
-
-    <!-- Maximum height for an attached image -->
-    <int name="maxImageHeight">1944</int>
-
-    <!-- Maximum width for an attached image -->
-    <int name="maxImageWidth">2592</int>
-</mms_config>
+<?xml version="1.0" encoding="utf-8"?>
+<!-- Copyright 2013 The Android Open Source Project
+
+     Licensed under the Apache License, Version 2.0 (the "License");
+     you may not use this file except in compliance with the License.
+     You may obtain a copy of the License at
+
+          http://www.apache.org/licenses/LICENSE-2.0
+
+     Unless required by applicable law or agreed to in writing, software
+     distributed under the License is distributed on an "AS IS" BASIS,
+     WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+     See the License for the specific language governing permissions and
+     limitations under the License.
+-->
+
+<!-- Version History
+        version 1 - initial version.
+        version 2 - added recipientLimit.
+        version 3 - added min/max recycler values.
+        version 4 - added sms to mms text threshold.
+-->
+
+<mms_config version="4">
+    <!-- Maximum message size in bytes for a MMS message -->
+    <int name="maxMessageSize">1048576</int>
+
+    <!-- Maximum height for an attached image -->
+    <int name="maxImageHeight">1944</int>
+
+    <!-- Maximum width for an attached image -->
+    <int name="maxImageWidth">2592</int>
+</mms_config>
diff --git a/android-smsmms/src/main/res/xml-mcc310-mnc170/mms_config.xml b/android-smsmms/src/main/res/xml-mcc310-mnc170/mms_config.xml
index 6705cbc4f..4a78df07c 100755
--- a/android-smsmms/src/main/res/xml-mcc310-mnc170/mms_config.xml
+++ b/android-smsmms/src/main/res/xml-mcc310-mnc170/mms_config.xml
@@ -1,32 +1,32 @@
-<?xml version="1.0" encoding="utf-8"?>
-<!-- Copyright 2013 The Android Open Source Project
-
-     Licensed under the Apache License, Version 2.0 (the "License");
-     you may not use this file except in compliance with the License.
-     You may obtain a copy of the License at
-
-          http://www.apache.org/licenses/LICENSE-2.0
-
-     Unless required by applicable law or agreed to in writing, software
-     distributed under the License is distributed on an "AS IS" BASIS,
-     WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
-     See the License for the specific language governing permissions and
-     limitations under the License.
--->
-
-<!-- T-Mobile U.S. mcc=310, mnc=170 -->
-
-<mms_config version="3">
-    <!-- Maximum message size in bytes for a MMS message -->
-    <int name="maxMessageSize">1048576</int>
-
-    <!-- Maximum height for an attached image -->
-    <int name="maxImageHeight">1944</int>
-
-    <!-- Maximum width for an attached image -->
-    <int name="maxImageWidth">2592</int>
-
-    <!-- Maximum number of recipients allowed per message. Use a value of -1
-     to indicate no limit. -->
-    <int name="recipientLimit">10</int>
-</mms_config>
+<?xml version="1.0" encoding="utf-8"?>
+<!-- Copyright 2013 The Android Open Source Project
+
+     Licensed under the Apache License, Version 2.0 (the "License");
+     you may not use this file except in compliance with the License.
+     You may obtain a copy of the License at
+
+          http://www.apache.org/licenses/LICENSE-2.0
+
+     Unless required by applicable law or agreed to in writing, software
+     distributed under the License is distributed on an "AS IS" BASIS,
+     WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+     See the License for the specific language governing permissions and
+     limitations under the License.
+-->
+
+<!-- T-Mobile U.S. mcc=310, mnc=170 -->
+
+<mms_config version="3">
+    <!-- Maximum message size in bytes for a MMS message -->
+    <int name="maxMessageSize">1048576</int>
+
+    <!-- Maximum height for an attached image -->
+    <int name="maxImageHeight">1944</int>
+
+    <!-- Maximum width for an attached image -->
+    <int name="maxImageWidth">2592</int>
+
+    <!-- Maximum number of recipients allowed per message. Use a value of -1
+     to indicate no limit. -->
+    <int name="recipientLimit">10</int>
+</mms_config>
diff --git a/android-smsmms/src/main/res/xml-mcc310-mnc260/mms_config.xml b/android-smsmms/src/main/res/xml-mcc310-mnc260/mms_config.xml
index 9bf9d702c..d010057a3 100755
--- a/android-smsmms/src/main/res/xml-mcc310-mnc260/mms_config.xml
+++ b/android-smsmms/src/main/res/xml-mcc310-mnc260/mms_config.xml
@@ -1,28 +1,28 @@
-<?xml version="1.0" encoding="utf-8"?>
-<!-- Copyright 2013 The Android Open Source Project
-
-     Licensed under the Apache License, Version 2.0 (the "License");
-     you may not use this file except in compliance with the License.
-     You may obtain a copy of the License at
-
-          http://www.apache.org/licenses/LICENSE-2.0
-
-     Unless required by applicable law or agreed to in writing, software
-     distributed under the License is distributed on an "AS IS" BASIS,
-     WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
-     See the License for the specific language governing permissions and
-     limitations under the License.
--->
-
-<!-- T-Mobile U.S. mcc=310, mnc=260 -->
-
-<mms_config version="3">
-    <!-- Maximum message size in bytes for a MMS message -->
-    <int name="maxMessageSize">1048576</int>
-
-    <!-- Maximum height for an attached image -->
-    <int name="maxImageHeight">1944</int>
-
-    <!-- Maximum width for an attached image -->
-    <int name="maxImageWidth">2592</int>
-</mms_config>
+<?xml version="1.0" encoding="utf-8"?>
+<!-- Copyright 2013 The Android Open Source Project
+
+     Licensed under the Apache License, Version 2.0 (the "License");
+     you may not use this file except in compliance with the License.
+     You may obtain a copy of the License at
+
+          http://www.apache.org/licenses/LICENSE-2.0
+
+     Unless required by applicable law or agreed to in writing, software
+     distributed under the License is distributed on an "AS IS" BASIS,
+     WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+     See the License for the specific language governing permissions and
+     limitations under the License.
+-->
+
+<!-- T-Mobile U.S. mcc=310, mnc=260 -->
+
+<mms_config version="3">
+    <!-- Maximum message size in bytes for a MMS message -->
+    <int name="maxMessageSize">1048576</int>
+
+    <!-- Maximum height for an attached image -->
+    <int name="maxImageHeight">1944</int>
+
+    <!-- Maximum width for an attached image -->
+    <int name="maxImageWidth">2592</int>
+</mms_config>
diff --git a/android-smsmms/src/main/res/xml-mcc310-mnc360/mms_config.xml b/android-smsmms/src/main/res/xml-mcc310-mnc360/mms_config.xml
index eb8da8066..5aa222dcd 100755
--- a/android-smsmms/src/main/res/xml-mcc310-mnc360/mms_config.xml
+++ b/android-smsmms/src/main/res/xml-mcc310-mnc360/mms_config.xml
@@ -1,83 +1,83 @@
-<?xml version="1.0" encoding="utf-8"?>
-<!-- Copyright (C) 2009 The Android Open Source Project
-
-     Licensed under the Apache License, Version 2.0 (the "License");
-     you may not use this file except in compliance with the License.
-     You may obtain a copy of the License at
-
-          http://www.apache.org/licenses/LICENSE-2.0
-
-     Unless required by applicable law or agreed to in writing, software
-     distributed under the License is distributed on an "AS IS" BASIS,
-     WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
-     See the License for the specific language governing permissions and
-     limitations under the License.
--->
-
-<!-- Version History
-        version 1 - initial version.
-        version 2 - added recipientLimit.
-        version 3 - added min/max recycler values.
-        version 4 - added sms to mms text threshold.
--->
-
-<mms_config version="4">
-    <!-- Flag indicating whether MMS should be enabled -->
-    <bool name="enabledMMS">true</bool>
-
-    <!-- Maximum message size in bytes for a MMS message -->
-    <int name="maxMessageSize">1228800</int>
-
-    <!-- Maximum height for an attached image -->
-    <int name="maxImageHeight">2432</int>
-
-    <!-- Maximum width for an attached image -->
-    <int name="maxImageWidth">4320</int>
-
-    <!-- Maximum number of SMS message to save per thread before auto-delete kicks in.
-         This is the default value. -->
-    <int name="defaultSMSMessagesPerThread">500</int>
-
-    <!-- Maximum number of MMS message to save per thread before auto-delete kicks in.
-         This is the default value. -->
-    <int name="defaultMMSMessagesPerThread">50</int>
-
-    <!-- Minimum value for the number of messages kept per conversation. The user can never
-         set the limit below this value. -->
-    <int name="minMessageCountPerThread">10</int>
-
-    <!-- Maximum value for the number of messages kept per conversation. The user can never
-         set the limit above this value. -->
-    <int name="maxMessageCountPerThread">5000</int>
-
-    <!-- Maximum number of recipients allowed per message. Use a value of -1
-         to indicate no limit. -->
-    <int name="recipientLimit">20</int>
-
-    <!-- If true, The text message over 160 characters will be sent in multi part.
-         If false, The text message over 160 characters will be sent
-         via multi media message. -->
-    <bool name="enableMultipartSMS">true</bool>
-
-    <!-- If enableMultipartSMS is true and smsToMmsTextThreshold > 1, then multi-part SMS messages
-         will be converted into a single mms message. For example, if the mms_config.xml file
-         specifies <int name="smsToMmsTextThreshold">7</int>, then on the 8th sms segment, the
-         message will be converted to an mms. -->
-    <int name="smsToMmsTextThreshold">1</int>
-
-    <!-- If true, The mms support slide duration.
-         If false, The mms does not support slide duration and we have to
-         set duration value. -->
-    <bool name="enableSlideDuration">true</bool>
-
-    <!-- Maximum length for message text. Use a value of -1
-         to indicate default value -->
-    <int name="maxMessageTextSize">-1</int>
-
-    <!-- Maximum length in chars of mms subject field -->
-    <int name="maxSubjectLength">80</int>
-
-     <!-- Reference for additional http parameters used in MMS http request.
-          Parameters are seperated by '|'. Optional.  -->
-     <string name="httpParams">X-MDN: ##LINE1##</string>
-</mms_config>
+<?xml version="1.0" encoding="utf-8"?>
+<!-- Copyright (C) 2009 The Android Open Source Project
+
+     Licensed under the Apache License, Version 2.0 (the "License");
+     you may not use this file except in compliance with the License.
+     You may obtain a copy of the License at
+
+          http://www.apache.org/licenses/LICENSE-2.0
+
+     Unless required by applicable law or agreed to in writing, software
+     distributed under the License is distributed on an "AS IS" BASIS,
+     WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+     See the License for the specific language governing permissions and
+     limitations under the License.
+-->
+
+<!-- Version History
+        version 1 - initial version.
+        version 2 - added recipientLimit.
+        version 3 - added min/max recycler values.
+        version 4 - added sms to mms text threshold.
+-->
+
+<mms_config version="4">
+    <!-- Flag indicating whether MMS should be enabled -->
+    <bool name="enabledMMS">true</bool>
+
+    <!-- Maximum message size in bytes for a MMS message -->
+    <int name="maxMessageSize">1228800</int>
+
+    <!-- Maximum height for an attached image -->
+    <int name="maxImageHeight">2432</int>
+
+    <!-- Maximum width for an attached image -->
+    <int name="maxImageWidth">4320</int>
+
+    <!-- Maximum number of SMS message to save per thread before auto-delete kicks in.
+         This is the default value. -->
+    <int name="defaultSMSMessagesPerThread">500</int>
+
+    <!-- Maximum number of MMS message to save per thread before auto-delete kicks in.
+         This is the default value. -->
+    <int name="defaultMMSMessagesPerThread">50</int>
+
+    <!-- Minimum value for the number of messages kept per conversation. The user can never
+         set the limit below this value. -->
+    <int name="minMessageCountPerThread">10</int>
+
+    <!-- Maximum value for the number of messages kept per conversation. The user can never
+         set the limit above this value. -->
+    <int name="maxMessageCountPerThread">5000</int>
+
+    <!-- Maximum number of recipients allowed per message. Use a value of -1
+         to indicate no limit. -->
+    <int name="recipientLimit">20</int>
+
+    <!-- If true, The text message over 160 characters will be sent in multi part.
+         If false, The text message over 160 characters will be sent
+         via multi media message. -->
+    <bool name="enableMultipartSMS">true</bool>
+
+    <!-- If enableMultipartSMS is true and smsToMmsTextThreshold > 1, then multi-part SMS messages
+         will be converted into a single mms message. For example, if the mms_config.xml file
+         specifies <int name="smsToMmsTextThreshold">7</int>, then on the 8th sms segment, the
+         message will be converted to an mms. -->
+    <int name="smsToMmsTextThreshold">1</int>
+
+    <!-- If true, The mms support slide duration.
+         If false, The mms does not support slide duration and we have to
+         set duration value. -->
+    <bool name="enableSlideDuration">true</bool>
+
+    <!-- Maximum length for message text. Use a value of -1
+         to indicate default value -->
+    <int name="maxMessageTextSize">-1</int>
+
+    <!-- Maximum length in chars of mms subject field -->
+    <int name="maxSubjectLength">80</int>
+
+     <!-- Reference for additional http parameters used in MMS http request.
+          Parameters are seperated by '|'. Optional.  -->
+     <string name="httpParams">X-MDN: ##LINE1##</string>
+</mms_config>
diff --git a/android-smsmms/src/main/res/xml-mcc310-mnc380/mms_config.xml b/android-smsmms/src/main/res/xml-mcc310-mnc380/mms_config.xml
index 0ea83d171..7c009176e 100755
--- a/android-smsmms/src/main/res/xml-mcc310-mnc380/mms_config.xml
+++ b/android-smsmms/src/main/res/xml-mcc310-mnc380/mms_config.xml
@@ -1,37 +1,37 @@
-<?xml version="1.0" encoding="utf-8"?>
-<!-- Copyright 2013 The Android Open Source Project
-
-     Licensed under the Apache License, Version 2.0 (the "License");
-     you may not use this file except in compliance with the License.
-     You may obtain a copy of the License at
-
-          http://www.apache.org/licenses/LICENSE-2.0
-
-     Unless required by applicable law or agreed to in writing, software
-     distributed under the License is distributed on an "AS IS" BASIS,
-     WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
-     See the License for the specific language governing permissions and
-     limitations under the License.
--->
-
-<!-- Version History
-        version 1 - initial version.
-        version 2 - added recipientLimit.
-        version 3 - added min/max recycler values.
--->
-<!-- AT&T U.S. mcc=310, mnc=380 -->
-
-<mms_config version="3">
-    <!-- Maximum message size in bytes for a MMS message -->
-    <int name="maxMessageSize">1048576</int>
-
-    <!-- Maximum height for an attached image -->
-    <int name="maxImageHeight">1944</int>
-
-    <!-- Maximum width for an attached image -->
-    <int name="maxImageWidth">2592</int>
-
-    <!-- Maximum number of recipients allowed per message. Use a value of -1
-     to indicate no limit. -->
-    <int name="recipientLimit">10</int>
-</mms_config>
+<?xml version="1.0" encoding="utf-8"?>
+<!-- Copyright 2013 The Android Open Source Project
+
+     Licensed under the Apache License, Version 2.0 (the "License");
+     you may not use this file except in compliance with the License.
+     You may obtain a copy of the License at
+
+          http://www.apache.org/licenses/LICENSE-2.0
+
+     Unless required by applicable law or agreed to in writing, software
+     distributed under the License is distributed on an "AS IS" BASIS,
+     WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+     See the License for the specific language governing permissions and
+     limitations under the License.
+-->
+
+<!-- Version History
+        version 1 - initial version.
+        version 2 - added recipientLimit.
+        version 3 - added min/max recycler values.
+-->
+<!-- AT&T U.S. mcc=310, mnc=380 -->
+
+<mms_config version="3">
+    <!-- Maximum message size in bytes for a MMS message -->
+    <int name="maxMessageSize">1048576</int>
+
+    <!-- Maximum height for an attached image -->
+    <int name="maxImageHeight">1944</int>
+
+    <!-- Maximum width for an attached image -->
+    <int name="maxImageWidth">2592</int>
+
+    <!-- Maximum number of recipients allowed per message. Use a value of -1
+     to indicate no limit. -->
+    <int name="recipientLimit">10</int>
+</mms_config>
diff --git a/android-smsmms/src/main/res/xml-mcc310-mnc410/mms_config.xml b/android-smsmms/src/main/res/xml-mcc310-mnc410/mms_config.xml
index 4e42f3a6a..9dc695f57 100755
--- a/android-smsmms/src/main/res/xml-mcc310-mnc410/mms_config.xml
+++ b/android-smsmms/src/main/res/xml-mcc310-mnc410/mms_config.xml
@@ -1,32 +1,32 @@
-<?xml version="1.0" encoding="utf-8"?>
-<!-- Copyright 2013 The Android Open Source Project
-
-     Licensed under the Apache License, Version 2.0 (the "License");
-     you may not use this file except in compliance with the License.
-     You may obtain a copy of the License at
-
-          http://www.apache.org/licenses/LICENSE-2.0
-
-     Unless required by applicable law or agreed to in writing, software
-     distributed under the License is distributed on an "AS IS" BASIS,
-     WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
-     See the License for the specific language governing permissions and
-     limitations under the License.
--->
-
-<!-- AT&T U.S. mcc=310, mnc=410 -->
-
-<mms_config version="3">
-    <!-- Maximum message size in bytes for a MMS message -->
-    <int name="maxMessageSize">1048576</int>
-
-    <!-- Maximum height for an attached image -->
-    <int name="maxImageHeight">1944</int>
-
-    <!-- Maximum width for an attached image -->
-    <int name="maxImageWidth">2592</int>
-
-    <!-- Maximum number of recipients allowed per message. Use a value of -1
-     to indicate no limit. -->
-    <int name="recipientLimit">10</int>
-</mms_config>
+<?xml version="1.0" encoding="utf-8"?>
+<!-- Copyright 2013 The Android Open Source Project
+
+     Licensed under the Apache License, Version 2.0 (the "License");
+     you may not use this file except in compliance with the License.
+     You may obtain a copy of the License at
+
+          http://www.apache.org/licenses/LICENSE-2.0
+
+     Unless required by applicable law or agreed to in writing, software
+     distributed under the License is distributed on an "AS IS" BASIS,
+     WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+     See the License for the specific language governing permissions and
+     limitations under the License.
+-->
+
+<!-- AT&T U.S. mcc=310, mnc=410 -->
+
+<mms_config version="3">
+    <!-- Maximum message size in bytes for a MMS message -->
+    <int name="maxMessageSize">1048576</int>
+
+    <!-- Maximum height for an attached image -->
+    <int name="maxImageHeight">1944</int>
+
+    <!-- Maximum width for an attached image -->
+    <int name="maxImageWidth">2592</int>
+
+    <!-- Maximum number of recipients allowed per message. Use a value of -1
+     to indicate no limit. -->
+    <int name="recipientLimit">10</int>
+</mms_config>
diff --git a/android-smsmms/src/main/res/xml-mcc310-mnc420/mms_config.xml b/android-smsmms/src/main/res/xml-mcc310-mnc420/mms_config.xml
index 96e5b9df7..de6b16bd2 100755
--- a/android-smsmms/src/main/res/xml-mcc310-mnc420/mms_config.xml
+++ b/android-smsmms/src/main/res/xml-mcc310-mnc420/mms_config.xml
@@ -1,33 +1,33 @@
-<?xml version="1.0" encoding="utf-8"?>
-<!-- Copyright 2013 The Android Open Source Project
-
-     Licensed under the Apache License, Version 2.0 (the "License");
-     you may not use this file except in compliance with the License.
-     You may obtain a copy of the License at
-
-          http://www.apache.org/licenses/LICENSE-2.0
-
-     Unless required by applicable law or agreed to in writing, software
-     distributed under the License is distributed on an "AS IS" BASIS,
-     WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
-     See the License for the specific language governing permissions and
-     limitations under the License.
--->
-
-<!-- Version History
-        version 1 - initial version.
-        version 2 - added recipientLimit.
-        version 3 - added min/max recycler values.
-        version 4 - added sms to mms text threshold.
--->
-
-<mms_config version="4">
-    <!-- Maximum message size in bytes for a MMS message -->
-    <int name="maxMessageSize">1048576</int>
-
-    <!-- Maximum height for an attached image -->
-    <int name="maxImageHeight">1944</int>
-
-    <!-- Maximum width for an attached image -->
-    <int name="maxImageWidth">2592</int>
-</mms_config>
+<?xml version="1.0" encoding="utf-8"?>
+<!-- Copyright 2013 The Android Open Source Project
+
+     Licensed under the Apache License, Version 2.0 (the "License");
+     you may not use this file except in compliance with the License.
+     You may obtain a copy of the License at
+
+          http://www.apache.org/licenses/LICENSE-2.0
+
+     Unless required by applicable law or agreed to in writing, software
+     distributed under the License is distributed on an "AS IS" BASIS,
+     WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+     See the License for the specific language governing permissions and
+     limitations under the License.
+-->
+
+<!-- Version History
+        version 1 - initial version.
+        version 2 - added recipientLimit.
+        version 3 - added min/max recycler values.
+        version 4 - added sms to mms text threshold.
+-->
+
+<mms_config version="4">
+    <!-- Maximum message size in bytes for a MMS message -->
+    <int name="maxMessageSize">1048576</int>
+
+    <!-- Maximum height for an attached image -->
+    <int name="maxImageHeight">1944</int>
+
+    <!-- Maximum width for an attached image -->
+    <int name="maxImageWidth">2592</int>
+</mms_config>
diff --git a/android-smsmms/src/main/res/xml-mcc310-mnc450/mms_config.xml b/android-smsmms/src/main/res/xml-mcc310-mnc450/mms_config.xml
index 96e5b9df7..de6b16bd2 100755
--- a/android-smsmms/src/main/res/xml-mcc310-mnc450/mms_config.xml
+++ b/android-smsmms/src/main/res/xml-mcc310-mnc450/mms_config.xml
@@ -1,33 +1,33 @@
-<?xml version="1.0" encoding="utf-8"?>
-<!-- Copyright 2013 The Android Open Source Project
-
-     Licensed under the Apache License, Version 2.0 (the "License");
-     you may not use this file except in compliance with the License.
-     You may obtain a copy of the License at
-
-          http://www.apache.org/licenses/LICENSE-2.0
-
-     Unless required by applicable law or agreed to in writing, software
-     distributed under the License is distributed on an "AS IS" BASIS,
-     WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
-     See the License for the specific language governing permissions and
-     limitations under the License.
--->
-
-<!-- Version History
-        version 1 - initial version.
-        version 2 - added recipientLimit.
-        version 3 - added min/max recycler values.
-        version 4 - added sms to mms text threshold.
--->
-
-<mms_config version="4">
-    <!-- Maximum message size in bytes for a MMS message -->
-    <int name="maxMessageSize">1048576</int>
-
-    <!-- Maximum height for an attached image -->
-    <int name="maxImageHeight">1944</int>
-
-    <!-- Maximum width for an attached image -->
-    <int name="maxImageWidth">2592</int>
-</mms_config>
+<?xml version="1.0" encoding="utf-8"?>
+<!-- Copyright 2013 The Android Open Source Project
+
+     Licensed under the Apache License, Version 2.0 (the "License");
+     you may not use this file except in compliance with the License.
+     You may obtain a copy of the License at
+
+          http://www.apache.org/licenses/LICENSE-2.0
+
+     Unless required by applicable law or agreed to in writing, software
+     distributed under the License is distributed on an "AS IS" BASIS,
+     WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+     See the License for the specific language governing permissions and
+     limitations under the License.
+-->
+
+<!-- Version History
+        version 1 - initial version.
+        version 2 - added recipientLimit.
+        version 3 - added min/max recycler values.
+        version 4 - added sms to mms text threshold.
+-->
+
+<mms_config version="4">
+    <!-- Maximum message size in bytes for a MMS message -->
+    <int name="maxMessageSize">1048576</int>
+
+    <!-- Maximum height for an attached image -->
+    <int name="maxImageHeight">1944</int>
+
+    <!-- Maximum width for an attached image -->
+    <int name="maxImageWidth">2592</int>
+</mms_config>
diff --git a/android-smsmms/src/main/res/xml-mcc310-mnc490/mms_config.xml b/android-smsmms/src/main/res/xml-mcc310-mnc490/mms_config.xml
index 06da531f2..55ddbaa7e 100755
--- a/android-smsmms/src/main/res/xml-mcc310-mnc490/mms_config.xml
+++ b/android-smsmms/src/main/res/xml-mcc310-mnc490/mms_config.xml
@@ -1,28 +1,28 @@
-<?xml version="1.0" encoding="utf-8"?>
-<!-- Copyright 2013 The Android Open Source Project
-
-     Licensed under the Apache License, Version 2.0 (the "License");
-     you may not use this file except in compliance with the License.
-     You may obtain a copy of the License at
-
-          http://www.apache.org/licenses/LICENSE-2.0
-
-     Unless required by applicable law or agreed to in writing, software
-     distributed under the License is distributed on an "AS IS" BASIS,
-     WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
-     See the License for the specific language governing permissions and
-     limitations under the License.
--->
-
-<!-- T-Mobile U.S. mcc=310, mnc=490 -->
-
-<mms_config version="3">
-    <!-- Maximum message size in bytes for a MMS message -->
-    <int name="maxMessageSize">1048576</int>
-
-    <!-- Maximum height for an attached image -->
-    <int name="maxImageHeight">1944</int>
-
-    <!-- Maximum width for an attached image -->
-    <int name="maxImageWidth">2592</int>
-</mms_config>
+<?xml version="1.0" encoding="utf-8"?>
+<!-- Copyright 2013 The Android Open Source Project
+
+     Licensed under the Apache License, Version 2.0 (the "License");
+     you may not use this file except in compliance with the License.
+     You may obtain a copy of the License at
+
+          http://www.apache.org/licenses/LICENSE-2.0
+
+     Unless required by applicable law or agreed to in writing, software
+     distributed under the License is distributed on an "AS IS" BASIS,
+     WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+     See the License for the specific language governing permissions and
+     limitations under the License.
+-->
+
+<!-- T-Mobile U.S. mcc=310, mnc=490 -->
+
+<mms_config version="3">
+    <!-- Maximum message size in bytes for a MMS message -->
+    <int name="maxMessageSize">1048576</int>
+
+    <!-- Maximum height for an attached image -->
+    <int name="maxImageHeight">1944</int>
+
+    <!-- Maximum width for an attached image -->
+    <int name="maxImageWidth">2592</int>
+</mms_config>
diff --git a/android-smsmms/src/main/res/xml-mcc310-mnc560/mms_config.xml b/android-smsmms/src/main/res/xml-mcc310-mnc560/mms_config.xml
index a12d6406f..1b1656a73 100755
--- a/android-smsmms/src/main/res/xml-mcc310-mnc560/mms_config.xml
+++ b/android-smsmms/src/main/res/xml-mcc310-mnc560/mms_config.xml
@@ -1,32 +1,32 @@
-<?xml version="1.0" encoding="utf-8"?>
-<!-- Copyright 2013 The Android Open Source Project
-
-     Licensed under the Apache License, Version 2.0 (the "License");
-     you may not use this file except in compliance with the License.
-     You may obtain a copy of the License at
-
-          http://www.apache.org/licenses/LICENSE-2.0
-
-     Unless required by applicable law or agreed to in writing, software
-     distributed under the License is distributed on an "AS IS" BASIS,
-     WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
-     See the License for the specific language governing permissions and
-     limitations under the License.
--->
-
-<!-- AT&T U.S. mcc=310, mnc=560 -->
-
-<mms_config version="3">
-    <!-- Maximum message size in bytes for a MMS message -->
-    <int name="maxMessageSize">1048576</int>
-
-    <!-- Maximum height for an attached image -->
-    <int name="maxImageHeight">1944</int>
-
-    <!-- Maximum width for an attached image -->
-    <int name="maxImageWidth">2592</int>
-
-    <!-- Maximum number of recipients allowed per message. Use a value of -1
-     to indicate no limit. -->
-    <int name="recipientLimit">10</int>
-</mms_config>
+<?xml version="1.0" encoding="utf-8"?>
+<!-- Copyright 2013 The Android Open Source Project
+
+     Licensed under the Apache License, Version 2.0 (the "License");
+     you may not use this file except in compliance with the License.
+     You may obtain a copy of the License at
+
+          http://www.apache.org/licenses/LICENSE-2.0
+
+     Unless required by applicable law or agreed to in writing, software
+     distributed under the License is distributed on an "AS IS" BASIS,
+     WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+     See the License for the specific language governing permissions and
+     limitations under the License.
+-->
+
+<!-- AT&T U.S. mcc=310, mnc=560 -->
+
+<mms_config version="3">
+    <!-- Maximum message size in bytes for a MMS message -->
+    <int name="maxMessageSize">1048576</int>
+
+    <!-- Maximum height for an attached image -->
+    <int name="maxImageHeight">1944</int>
+
+    <!-- Maximum width for an attached image -->
+    <int name="maxImageWidth">2592</int>
+
+    <!-- Maximum number of recipients allowed per message. Use a value of -1
+     to indicate no limit. -->
+    <int name="recipientLimit">10</int>
+</mms_config>
diff --git a/android-smsmms/src/main/res/xml-mcc310-mnc580/mms_config.xml b/android-smsmms/src/main/res/xml-mcc310-mnc580/mms_config.xml
index eb8da8066..5aa222dcd 100755
--- a/android-smsmms/src/main/res/xml-mcc310-mnc580/mms_config.xml
+++ b/android-smsmms/src/main/res/xml-mcc310-mnc580/mms_config.xml
@@ -1,83 +1,83 @@
-<?xml version="1.0" encoding="utf-8"?>
-<!-- Copyright (C) 2009 The Android Open Source Project
-
-     Licensed under the Apache License, Version 2.0 (the "License");
-     you may not use this file except in compliance with the License.
-     You may obtain a copy of the License at
-
-          http://www.apache.org/licenses/LICENSE-2.0
-
-     Unless required by applicable law or agreed to in writing, software
-     distributed under the License is distributed on an "AS IS" BASIS,
-     WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
-     See the License for the specific language governing permissions and
-     limitations under the License.
--->
-
-<!-- Version History
-        version 1 - initial version.
-        version 2 - added recipientLimit.
-        version 3 - added min/max recycler values.
-        version 4 - added sms to mms text threshold.
--->
-
-<mms_config version="4">
-    <!-- Flag indicating whether MMS should be enabled -->
-    <bool name="enabledMMS">true</bool>
-
-    <!-- Maximum message size in bytes for a MMS message -->
-    <int name="maxMessageSize">1228800</int>
-
-    <!-- Maximum height for an attached image -->
-    <int name="maxImageHeight">2432</int>
-
-    <!-- Maximum width for an attached image -->
-    <int name="maxImageWidth">4320</int>
-
-    <!-- Maximum number of SMS message to save per thread before auto-delete kicks in.
-         This is the default value. -->
-    <int name="defaultSMSMessagesPerThread">500</int>
-
-    <!-- Maximum number of MMS message to save per thread before auto-delete kicks in.
-         This is the default value. -->
-    <int name="defaultMMSMessagesPerThread">50</int>
-
-    <!-- Minimum value for the number of messages kept per conversation. The user can never
-         set the limit below this value. -->
-    <int name="minMessageCountPerThread">10</int>
-
-    <!-- Maximum value for the number of messages kept per conversation. The user can never
-         set the limit above this value. -->
-    <int name="maxMessageCountPerThread">5000</int>
-
-    <!-- Maximum number of recipients allowed per message. Use a value of -1
-         to indicate no limit. -->
-    <int name="recipientLimit">20</int>
-
-    <!-- If true, The text message over 160 characters will be sent in multi part.
-         If false, The text message over 160 characters will be sent
-         via multi media message. -->
-    <bool name="enableMultipartSMS">true</bool>
-
-    <!-- If enableMultipartSMS is true and smsToMmsTextThreshold > 1, then multi-part SMS messages
-         will be converted into a single mms message. For example, if the mms_config.xml file
-         specifies <int name="smsToMmsTextThreshold">7</int>, then on the 8th sms segment, the
-         message will be converted to an mms. -->
-    <int name="smsToMmsTextThreshold">1</int>
-
-    <!-- If true, The mms support slide duration.
-         If false, The mms does not support slide duration and we have to
-         set duration value. -->
-    <bool name="enableSlideDuration">true</bool>
-
-    <!-- Maximum length for message text. Use a value of -1
-         to indicate default value -->
-    <int name="maxMessageTextSize">-1</int>
-
-    <!-- Maximum length in chars of mms subject field -->
-    <int name="maxSubjectLength">80</int>
-
-     <!-- Reference for additional http parameters used in MMS http request.
-          Parameters are seperated by '|'. Optional.  -->
-     <string name="httpParams">X-MDN: ##LINE1##</string>
-</mms_config>
+<?xml version="1.0" encoding="utf-8"?>
+<!-- Copyright (C) 2009 The Android Open Source Project
+
+     Licensed under the Apache License, Version 2.0 (the "License");
+     you may not use this file except in compliance with the License.
+     You may obtain a copy of the License at
+
+          http://www.apache.org/licenses/LICENSE-2.0
+
+     Unless required by applicable law or agreed to in writing, software
+     distributed under the License is distributed on an "AS IS" BASIS,
+     WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+     See the License for the specific language governing permissions and
+     limitations under the License.
+-->
+
+<!-- Version History
+        version 1 - initial version.
+        version 2 - added recipientLimit.
+        version 3 - added min/max recycler values.
+        version 4 - added sms to mms text threshold.
+-->
+
+<mms_config version="4">
+    <!-- Flag indicating whether MMS should be enabled -->
+    <bool name="enabledMMS">true</bool>
+
+    <!-- Maximum message size in bytes for a MMS message -->
+    <int name="maxMessageSize">1228800</int>
+
+    <!-- Maximum height for an attached image -->
+    <int name="maxImageHeight">2432</int>
+
+    <!-- Maximum width for an attached image -->
+    <int name="maxImageWidth">4320</int>
+
+    <!-- Maximum number of SMS message to save per thread before auto-delete kicks in.
+         This is the default value. -->
+    <int name="defaultSMSMessagesPerThread">500</int>
+
+    <!-- Maximum number of MMS message to save per thread before auto-delete kicks in.
+         This is the default value. -->
+    <int name="defaultMMSMessagesPerThread">50</int>
+
+    <!-- Minimum value for the number of messages kept per conversation. The user can never
+         set the limit below this value. -->
+    <int name="minMessageCountPerThread">10</int>
+
+    <!-- Maximum value for the number of messages kept per conversation. The user can never
+         set the limit above this value. -->
+    <int name="maxMessageCountPerThread">5000</int>
+
+    <!-- Maximum number of recipients allowed per message. Use a value of -1
+         to indicate no limit. -->
+    <int name="recipientLimit">20</int>
+
+    <!-- If true, The text message over 160 characters will be sent in multi part.
+         If false, The text message over 160 characters will be sent
+         via multi media message. -->
+    <bool name="enableMultipartSMS">true</bool>
+
+    <!-- If enableMultipartSMS is true and smsToMmsTextThreshold > 1, then multi-part SMS messages
+         will be converted into a single mms message. For example, if the mms_config.xml file
+         specifies <int name="smsToMmsTextThreshold">7</int>, then on the 8th sms segment, the
+         message will be converted to an mms. -->
+    <int name="smsToMmsTextThreshold">1</int>
+
+    <!-- If true, The mms support slide duration.
+         If false, The mms does not support slide duration and we have to
+         set duration value. -->
+    <bool name="enableSlideDuration">true</bool>
+
+    <!-- Maximum length for message text. Use a value of -1
+         to indicate default value -->
+    <int name="maxMessageTextSize">-1</int>
+
+    <!-- Maximum length in chars of mms subject field -->
+    <int name="maxSubjectLength">80</int>
+
+     <!-- Reference for additional http parameters used in MMS http request.
+          Parameters are seperated by '|'. Optional.  -->
+     <string name="httpParams">X-MDN: ##LINE1##</string>
+</mms_config>
diff --git a/android-smsmms/src/main/res/xml-mcc310-mnc600/mms_config.xml b/android-smsmms/src/main/res/xml-mcc310-mnc600/mms_config.xml
index f76c945b5..4261d98db 100755
--- a/android-smsmms/src/main/res/xml-mcc310-mnc600/mms_config.xml
+++ b/android-smsmms/src/main/res/xml-mcc310-mnc600/mms_config.xml
@@ -1,90 +1,90 @@
-<?xml version="1.0" encoding="utf-8"?>
-<!-- Copyright (C) 2009 The Android Open Source Project
-
-     Licensed under the Apache License, Version 2.0 (the "License");
-     you may not use this file except in compliance with the License.
-     You may obtain a copy of the License at
-
-          http://www.apache.org/licenses/LICENSE-2.0
-
-     Unless required by applicable law or agreed to in writing, software
-     distributed under the License is distributed on an "AS IS" BASIS,
-     WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
-     See the License for the specific language governing permissions and
-     limitations under the License.
--->
-
-<!-- Version History
-        version 1 - initial version.
-        version 2 - added recipientLimit.
-        version 3 - added min/max recycler values.
-        version 4 - added sms to mms text threshold.
--->
-<!-- MCC:310 MNC:600 - New Cell Inc. dba Cellcom -->
-
-<mms_config version="4">
-    <!-- Flag indicating whether MMS should be enabled -->
-    <bool name="enabledMMS">true</bool>
-
-    <!-- Maximum message size in bytes for a MMS message -->
-    <int name="maxMessageSize">8388608</int>
-
-    <!-- Maximum height for an attached image -->
-    <int name="maxImageHeight">2432</int>
-
-    <!-- Maximum width for an attached image -->
-    <int name="maxImageWidth">4320</int>
-
-    <!-- Maximum number of SMS message to save per thread before auto-delete kicks in.
-         This is the default value. -->
-    <int name="defaultSMSMessagesPerThread">500</int>
-
-    <!-- Maximum number of MMS message to save per thread before auto-delete kicks in.
-         This is the default value. -->
-    <int name="defaultMMSMessagesPerThread">50</int>
-
-    <!-- Minimum value for the number of messages kept per conversation. The user can never
-         set the limit below this value. -->
-    <int name="minMessageCountPerThread">10</int>
-
-    <!-- Maximum value for the number of messages kept per conversation. The user can never
-         set the limit above this value. -->
-    <int name="maxMessageCountPerThread">5000</int>
-
-    <!-- Maximum number of recipients allowed per message. Use a value of -1
-         to indicate no limit. -->
-    <int name="recipientLimit">20</int>
-
-    <!-- If true, The text message over 160 characters will be sent in multi part.
-         If false, The text message over 160 characters will be sent
-         via multi media message. -->
-    <bool name="enableMultipartSMS">true</bool>
-
-    <!-- If enableMultipartSMS is true and smsToMmsTextThreshold > 1, then multi-part SMS messages
-         will be converted into a single mms message. For example, if the mms_config.xml file
-         specifies <int name="smsToMmsTextThreshold">7</int>, then on the 8th sms segment, the
-         message will be converted to an mms. -->
-    <int name="smsToMmsTextThreshold">1</int>
-
-    <!-- If true, The mms support slide duration.
-         If false, The mms does not support slide duration and we have to
-         set duration value. -->
-    <bool name="enableSlideDuration">true</bool>
-
-    <!-- Maximum length for message text. Use a value of -1
-         to indicate default value -->
-    <int name="maxMessageTextSize">-1</int>
-
-    <!-- Maximum length in chars of mms subject field -->
-    <int name="maxSubjectLength">80</int>
-
-    <!-- Hide the MMS read reports UI in settings -->
-    <bool name="enableMMSReadReports">false</bool>
-
-    <!-- Flag indicating whether MMS Delivery Reports UI option should be shown -->
-    <bool name="enableMMSDeliveryReports">false</bool>
-
-    <!-- Reference for additional http parameters used in MMS http request.
-         Parameters are seperated by '|'. Optional.  -->
-     <string name="httpParams">X-MDN: ##LINE1##</string>
-</mms_config>
+<?xml version="1.0" encoding="utf-8"?>
+<!-- Copyright (C) 2009 The Android Open Source Project
+
+     Licensed under the Apache License, Version 2.0 (the "License");
+     you may not use this file except in compliance with the License.
+     You may obtain a copy of the License at
+
+          http://www.apache.org/licenses/LICENSE-2.0
+
+     Unless required by applicable law or agreed to in writing, software
+     distributed under the License is distributed on an "AS IS" BASIS,
+     WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+     See the License for the specific language governing permissions and
+     limitations under the License.
+-->
+
+<!-- Version History
+        version 1 - initial version.
+        version 2 - added recipientLimit.
+        version 3 - added min/max recycler values.
+        version 4 - added sms to mms text threshold.
+-->
+<!-- MCC:310 MNC:600 - New Cell Inc. dba Cellcom -->
+
+<mms_config version="4">
+    <!-- Flag indicating whether MMS should be enabled -->
+    <bool name="enabledMMS">true</bool>
+
+    <!-- Maximum message size in bytes for a MMS message -->
+    <int name="maxMessageSize">8388608</int>
+
+    <!-- Maximum height for an attached image -->
+    <int name="maxImageHeight">2432</int>
+
+    <!-- Maximum width for an attached image -->
+    <int name="maxImageWidth">4320</int>
+
+    <!-- Maximum number of SMS message to save per thread before auto-delete kicks in.
+         This is the default value. -->
+    <int name="defaultSMSMessagesPerThread">500</int>
+
+    <!-- Maximum number of MMS message to save per thread before auto-delete kicks in.
+         This is the default value. -->
+    <int name="defaultMMSMessagesPerThread">50</int>
+
+    <!-- Minimum value for the number of messages kept per conversation. The user can never
+         set the limit below this value. -->
+    <int name="minMessageCountPerThread">10</int>
+
+    <!-- Maximum value for the number of messages kept per conversation. The user can never
+         set the limit above this value. -->
+    <int name="maxMessageCountPerThread">5000</int>
+
+    <!-- Maximum number of recipients allowed per message. Use a value of -1
+         to indicate no limit. -->
+    <int name="recipientLimit">20</int>
+
+    <!-- If true, The text message over 160 characters will be sent in multi part.
+         If false, The text message over 160 characters will be sent
+         via multi media message. -->
+    <bool name="enableMultipartSMS">true</bool>
+
+    <!-- If enableMultipartSMS is true and smsToMmsTextThreshold > 1, then multi-part SMS messages
+         will be converted into a single mms message. For example, if the mms_config.xml file
+         specifies <int name="smsToMmsTextThreshold">7</int>, then on the 8th sms segment, the
+         message will be converted to an mms. -->
+    <int name="smsToMmsTextThreshold">1</int>
+
+    <!-- If true, The mms support slide duration.
+         If false, The mms does not support slide duration and we have to
+         set duration value. -->
+    <bool name="enableSlideDuration">true</bool>
+
+    <!-- Maximum length for message text. Use a value of -1
+         to indicate default value -->
+    <int name="maxMessageTextSize">-1</int>
+
+    <!-- Maximum length in chars of mms subject field -->
+    <int name="maxSubjectLength">80</int>
+
+    <!-- Hide the MMS read reports UI in settings -->
+    <bool name="enableMMSReadReports">false</bool>
+
+    <!-- Flag indicating whether MMS Delivery Reports UI option should be shown -->
+    <bool name="enableMMSDeliveryReports">false</bool>
+
+    <!-- Reference for additional http parameters used in MMS http request.
+         Parameters are seperated by '|'. Optional.  -->
+     <string name="httpParams">X-MDN: ##LINE1##</string>
+</mms_config>
diff --git a/android-smsmms/src/main/res/xml-mcc310-mnc680/mms_config.xml b/android-smsmms/src/main/res/xml-mcc310-mnc680/mms_config.xml
index b42fa021c..141d424ff 100755
--- a/android-smsmms/src/main/res/xml-mcc310-mnc680/mms_config.xml
+++ b/android-smsmms/src/main/res/xml-mcc310-mnc680/mms_config.xml
@@ -1,32 +1,32 @@
-<?xml version="1.0" encoding="utf-8"?>
-<!-- Copyright 2013 The Android Open Source Project
-
-     Licensed under the Apache License, Version 2.0 (the "License");
-     you may not use this file except in compliance with the License.
-     You may obtain a copy of the License at
-
-          http://www.apache.org/licenses/LICENSE-2.0
-
-     Unless required by applicable law or agreed to in writing, software
-     distributed under the License is distributed on an "AS IS" BASIS,
-     WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
-     See the License for the specific language governing permissions and
-     limitations under the License.
--->
-
-<!-- AT&T U.S. mcc=310, mnc=680 -->
-
-<mms_config version="3">
-    <!-- Maximum message size in bytes for a MMS message -->
-    <int name="maxMessageSize">1048576</int>
-
-    <!-- Maximum height for an attached image -->
-    <int name="maxImageHeight">1944</int>
-
-    <!-- Maximum width for an attached image -->
-    <int name="maxImageWidth">2592</int>
-
-    <!-- Maximum number of recipients allowed per message. Use a value of -1
-     to indicate no limit. -->
-    <int name="recipientLimit">10</int>
-</mms_config>
+<?xml version="1.0" encoding="utf-8"?>
+<!-- Copyright 2013 The Android Open Source Project
+
+     Licensed under the Apache License, Version 2.0 (the "License");
+     you may not use this file except in compliance with the License.
+     You may obtain a copy of the License at
+
+          http://www.apache.org/licenses/LICENSE-2.0
+
+     Unless required by applicable law or agreed to in writing, software
+     distributed under the License is distributed on an "AS IS" BASIS,
+     WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+     See the License for the specific language governing permissions and
+     limitations under the License.
+-->
+
+<!-- AT&T U.S. mcc=310, mnc=680 -->
+
+<mms_config version="3">
+    <!-- Maximum message size in bytes for a MMS message -->
+    <int name="maxMessageSize">1048576</int>
+
+    <!-- Maximum height for an attached image -->
+    <int name="maxImageHeight">1944</int>
+
+    <!-- Maximum width for an attached image -->
+    <int name="maxImageWidth">2592</int>
+
+    <!-- Maximum number of recipients allowed per message. Use a value of -1
+     to indicate no limit. -->
+    <int name="recipientLimit">10</int>
+</mms_config>
diff --git a/android-smsmms/src/main/res/xml-mcc310-mnc750/mms_config.xml b/android-smsmms/src/main/res/xml-mcc310-mnc750/mms_config.xml
index eb8da8066..5aa222dcd 100755
--- a/android-smsmms/src/main/res/xml-mcc310-mnc750/mms_config.xml
+++ b/android-smsmms/src/main/res/xml-mcc310-mnc750/mms_config.xml
@@ -1,83 +1,83 @@
-<?xml version="1.0" encoding="utf-8"?>
-<!-- Copyright (C) 2009 The Android Open Source Project
-
-     Licensed under the Apache License, Version 2.0 (the "License");
-     you may not use this file except in compliance with the License.
-     You may obtain a copy of the License at
-
-          http://www.apache.org/licenses/LICENSE-2.0
-
-     Unless required by applicable law or agreed to in writing, software
-     distributed under the License is distributed on an "AS IS" BASIS,
-     WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
-     See the License for the specific language governing permissions and
-     limitations under the License.
--->
-
-<!-- Version History
-        version 1 - initial version.
-        version 2 - added recipientLimit.
-        version 3 - added min/max recycler values.
-        version 4 - added sms to mms text threshold.
--->
-
-<mms_config version="4">
-    <!-- Flag indicating whether MMS should be enabled -->
-    <bool name="enabledMMS">true</bool>
-
-    <!-- Maximum message size in bytes for a MMS message -->
-    <int name="maxMessageSize">1228800</int>
-
-    <!-- Maximum height for an attached image -->
-    <int name="maxImageHeight">2432</int>
-
-    <!-- Maximum width for an attached image -->
-    <int name="maxImageWidth">4320</int>
-
-    <!-- Maximum number of SMS message to save per thread before auto-delete kicks in.
-         This is the default value. -->
-    <int name="defaultSMSMessagesPerThread">500</int>
-
-    <!-- Maximum number of MMS message to save per thread before auto-delete kicks in.
-         This is the default value. -->
-    <int name="defaultMMSMessagesPerThread">50</int>
-
-    <!-- Minimum value for the number of messages kept per conversation. The user can never
-         set the limit below this value. -->
-    <int name="minMessageCountPerThread">10</int>
-
-    <!-- Maximum value for the number of messages kept per conversation. The user can never
-         set the limit above this value. -->
-    <int name="maxMessageCountPerThread">5000</int>
-
-    <!-- Maximum number of recipients allowed per message. Use a value of -1
-         to indicate no limit. -->
-    <int name="recipientLimit">20</int>
-
-    <!-- If true, The text message over 160 characters will be sent in multi part.
-         If false, The text message over 160 characters will be sent
-         via multi media message. -->
-    <bool name="enableMultipartSMS">true</bool>
-
-    <!-- If enableMultipartSMS is true and smsToMmsTextThreshold > 1, then multi-part SMS messages
-         will be converted into a single mms message. For example, if the mms_config.xml file
-         specifies <int name="smsToMmsTextThreshold">7</int>, then on the 8th sms segment, the
-         message will be converted to an mms. -->
-    <int name="smsToMmsTextThreshold">1</int>
-
-    <!-- If true, The mms support slide duration.
-         If false, The mms does not support slide duration and we have to
-         set duration value. -->
-    <bool name="enableSlideDuration">true</bool>
-
-    <!-- Maximum length for message text. Use a value of -1
-         to indicate default value -->
-    <int name="maxMessageTextSize">-1</int>
-
-    <!-- Maximum length in chars of mms subject field -->
-    <int name="maxSubjectLength">80</int>
-
-     <!-- Reference for additional http parameters used in MMS http request.
-          Parameters are seperated by '|'. Optional.  -->
-     <string name="httpParams">X-MDN: ##LINE1##</string>
-</mms_config>
+<?xml version="1.0" encoding="utf-8"?>
+<!-- Copyright (C) 2009 The Android Open Source Project
+
+     Licensed under the Apache License, Version 2.0 (the "License");
+     you may not use this file except in compliance with the License.
+     You may obtain a copy of the License at
+
+          http://www.apache.org/licenses/LICENSE-2.0
+
+     Unless required by applicable law or agreed to in writing, software
+     distributed under the License is distributed on an "AS IS" BASIS,
+     WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+     See the License for the specific language governing permissions and
+     limitations under the License.
+-->
+
+<!-- Version History
+        version 1 - initial version.
+        version 2 - added recipientLimit.
+        version 3 - added min/max recycler values.
+        version 4 - added sms to mms text threshold.
+-->
+
+<mms_config version="4">
+    <!-- Flag indicating whether MMS should be enabled -->
+    <bool name="enabledMMS">true</bool>
+
+    <!-- Maximum message size in bytes for a MMS message -->
+    <int name="maxMessageSize">1228800</int>
+
+    <!-- Maximum height for an attached image -->
+    <int name="maxImageHeight">2432</int>
+
+    <!-- Maximum width for an attached image -->
+    <int name="maxImageWidth">4320</int>
+
+    <!-- Maximum number of SMS message to save per thread before auto-delete kicks in.
+         This is the default value. -->
+    <int name="defaultSMSMessagesPerThread">500</int>
+
+    <!-- Maximum number of MMS message to save per thread before auto-delete kicks in.
+         This is the default value. -->
+    <int name="defaultMMSMessagesPerThread">50</int>
+
+    <!-- Minimum value for the number of messages kept per conversation. The user can never
+         set the limit below this value. -->
+    <int name="minMessageCountPerThread">10</int>
+
+    <!-- Maximum value for the number of messages kept per conversation. The user can never
+         set the limit above this value. -->
+    <int name="maxMessageCountPerThread">5000</int>
+
+    <!-- Maximum number of recipients allowed per message. Use a value of -1
+         to indicate no limit. -->
+    <int name="recipientLimit">20</int>
+
+    <!-- If true, The text message over 160 characters will be sent in multi part.
+         If false, The text message over 160 characters will be sent
+         via multi media message. -->
+    <bool name="enableMultipartSMS">true</bool>
+
+    <!-- If enableMultipartSMS is true and smsToMmsTextThreshold > 1, then multi-part SMS messages
+         will be converted into a single mms message. For example, if the mms_config.xml file
+         specifies <int name="smsToMmsTextThreshold">7</int>, then on the 8th sms segment, the
+         message will be converted to an mms. -->
+    <int name="smsToMmsTextThreshold">1</int>
+
+    <!-- If true, The mms support slide duration.
+         If false, The mms does not support slide duration and we have to
+         set duration value. -->
+    <bool name="enableSlideDuration">true</bool>
+
+    <!-- Maximum length for message text. Use a value of -1
+         to indicate default value -->
+    <int name="maxMessageTextSize">-1</int>
+
+    <!-- Maximum length in chars of mms subject field -->
+    <int name="maxSubjectLength">80</int>
+
+     <!-- Reference for additional http parameters used in MMS http request.
+          Parameters are seperated by '|'. Optional.  -->
+     <string name="httpParams">X-MDN: ##LINE1##</string>
+</mms_config>
diff --git a/android-smsmms/src/main/res/xml-mcc310-mnc770/mms_config.xml b/android-smsmms/src/main/res/xml-mcc310-mnc770/mms_config.xml
index 96e5b9df7..de6b16bd2 100755
--- a/android-smsmms/src/main/res/xml-mcc310-mnc770/mms_config.xml
+++ b/android-smsmms/src/main/res/xml-mcc310-mnc770/mms_config.xml
@@ -1,33 +1,33 @@
-<?xml version="1.0" encoding="utf-8"?>
-<!-- Copyright 2013 The Android Open Source Project
-
-     Licensed under the Apache License, Version 2.0 (the "License");
-     you may not use this file except in compliance with the License.
-     You may obtain a copy of the License at
-
-          http://www.apache.org/licenses/LICENSE-2.0
-
-     Unless required by applicable law or agreed to in writing, software
-     distributed under the License is distributed on an "AS IS" BASIS,
-     WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
-     See the License for the specific language governing permissions and
-     limitations under the License.
--->
-
-<!-- Version History
-        version 1 - initial version.
-        version 2 - added recipientLimit.
-        version 3 - added min/max recycler values.
-        version 4 - added sms to mms text threshold.
--->
-
-<mms_config version="4">
-    <!-- Maximum message size in bytes for a MMS message -->
-    <int name="maxMessageSize">1048576</int>
-
-    <!-- Maximum height for an attached image -->
-    <int name="maxImageHeight">1944</int>
-
-    <!-- Maximum width for an attached image -->
-    <int name="maxImageWidth">2592</int>
-</mms_config>
+<?xml version="1.0" encoding="utf-8"?>
+<!-- Copyright 2013 The Android Open Source Project
+
+     Licensed under the Apache License, Version 2.0 (the "License");
+     you may not use this file except in compliance with the License.
+     You may obtain a copy of the License at
+
+          http://www.apache.org/licenses/LICENSE-2.0
+
+     Unless required by applicable law or agreed to in writing, software
+     distributed under the License is distributed on an "AS IS" BASIS,
+     WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+     See the License for the specific language governing permissions and
+     limitations under the License.
+-->
+
+<!-- Version History
+        version 1 - initial version.
+        version 2 - added recipientLimit.
+        version 3 - added min/max recycler values.
+        version 4 - added sms to mms text threshold.
+-->
+
+<mms_config version="4">
+    <!-- Maximum message size in bytes for a MMS message -->
+    <int name="maxMessageSize">1048576</int>
+
+    <!-- Maximum height for an attached image -->
+    <int name="maxImageHeight">1944</int>
+
+    <!-- Maximum width for an attached image -->
+    <int name="maxImageWidth">2592</int>
+</mms_config>
diff --git a/android-smsmms/src/main/res/xml-mcc310-mnc920/mms_config.xml b/android-smsmms/src/main/res/xml-mcc310-mnc920/mms_config.xml
index 4319cb017..6386cbe8b 100755
--- a/android-smsmms/src/main/res/xml-mcc310-mnc920/mms_config.xml
+++ b/android-smsmms/src/main/res/xml-mcc310-mnc920/mms_config.xml
@@ -1,83 +1,83 @@
-<?xml version="1.0" encoding="utf-8"?>
-<!-- Copyright (C) 2009 The Android Open Source Project
-
-     Licensed under the Apache License, Version 2.0 (the "License");
-     you may not use this file except in compliance with the License.
-     You may obtain a copy of the License at
-
-          http://www.apache.org/licenses/LICENSE-2.0
-
-     Unless required by applicable law or agreed to in writing, software
-     distributed under the License is distributed on an "AS IS" BASIS,
-     WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
-     See the License for the specific language governing permissions and
-     limitations under the License.
--->
-
-<!-- Version History
-        version 1 - initial version.
-        version 2 - added recipientLimit.
-        version 3 - added min/max recycler values.
-        version 4 - added sms to mms text threshold.
--->
-
-<mms_config version="4">
-    <!-- Flag indicating whether MMS should be enabled -->
-    <bool name="enabledMMS">true</bool>
-
-    <!-- Maximum message size in bytes for a MMS message -->
-    <int name="maxMessageSize">1258291</int>
-
-    <!-- Maximum height for an attached image -->
-    <int name="maxImageHeight">2432</int>
-
-    <!-- Maximum width for an attached image -->
-    <int name="maxImageWidth">4320</int>
-
-    <!-- Maximum number of SMS message to save per thread before auto-delete kicks in.
-         This is the default value. -->
-    <int name="defaultSMSMessagesPerThread">500</int>
-
-    <!-- Maximum number of MMS message to save per thread before auto-delete kicks in.
-         This is the default value. -->
-    <int name="defaultMMSMessagesPerThread">50</int>
-
-    <!-- Minimum value for the number of messages kept per conversation. The user can never
-         set the limit below this value. -->
-    <int name="minMessageCountPerThread">10</int>
-
-    <!-- Maximum value for the number of messages kept per conversation. The user can never
-         set the limit above this value. -->
-    <int name="maxMessageCountPerThread">5000</int>
-
-    <!-- Maximum number of recipients allowed per message. Use a value of -1
-         to indicate no limit. -->
-    <int name="recipientLimit">20</int>
-
-    <!-- If true, The text message over 160 characters will be sent in multi part.
-         If false, The text message over 160 characters will be sent
-         via multi media message. -->
-    <bool name="enableMultipartSMS">true</bool>
-
-    <!-- If enableMultipartSMS is true and smsToMmsTextThreshold > 1, then multi-part SMS messages
-         will be converted into a single mms message. For example, if the mms_config.xml file
-         specifies <int name="smsToMmsTextThreshold">7</int>, then on the 8th sms segment, the
-         message will be converted to an mms. -->
-    <int name="smsToMmsTextThreshold">1</int>
-
-    <!-- If true, The mms support slide duration.
-         If false, The mms does not support slide duration and we have to
-         set duration value. -->
-    <bool name="enableSlideDuration">true</bool>
-
-    <!-- Maximum length for message text. Use a value of -1
-         to indicate default value -->
-    <int name="maxMessageTextSize">-1</int>
-
-    <!-- Maximum length in chars of mms subject field -->
-    <int name="maxSubjectLength">80</int>
-
-     <!-- Reference for additional http parameters used in MMS http request.
-          Parameters are seperated by '|'. Optional.  -->
-     <string name="httpParams">X-MDN: ##LINE1##</string>
-</mms_config>
+<?xml version="1.0" encoding="utf-8"?>
+<!-- Copyright (C) 2009 The Android Open Source Project
+
+     Licensed under the Apache License, Version 2.0 (the "License");
+     you may not use this file except in compliance with the License.
+     You may obtain a copy of the License at
+
+          http://www.apache.org/licenses/LICENSE-2.0
+
+     Unless required by applicable law or agreed to in writing, software
+     distributed under the License is distributed on an "AS IS" BASIS,
+     WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+     See the License for the specific language governing permissions and
+     limitations under the License.
+-->
+
+<!-- Version History
+        version 1 - initial version.
+        version 2 - added recipientLimit.
+        version 3 - added min/max recycler values.
+        version 4 - added sms to mms text threshold.
+-->
+
+<mms_config version="4">
+    <!-- Flag indicating whether MMS should be enabled -->
+    <bool name="enabledMMS">true</bool>
+
+    <!-- Maximum message size in bytes for a MMS message -->
+    <int name="maxMessageSize">1258291</int>
+
+    <!-- Maximum height for an attached image -->
+    <int name="maxImageHeight">2432</int>
+
+    <!-- Maximum width for an attached image -->
+    <int name="maxImageWidth">4320</int>
+
+    <!-- Maximum number of SMS message to save per thread before auto-delete kicks in.
+         This is the default value. -->
+    <int name="defaultSMSMessagesPerThread">500</int>
+
+    <!-- Maximum number of MMS message to save per thread before auto-delete kicks in.
+         This is the default value. -->
+    <int name="defaultMMSMessagesPerThread">50</int>
+
+    <!-- Minimum value for the number of messages kept per conversation. The user can never
+         set the limit below this value. -->
+    <int name="minMessageCountPerThread">10</int>
+
+    <!-- Maximum value for the number of messages kept per conversation. The user can never
+         set the limit above this value. -->
+    <int name="maxMessageCountPerThread">5000</int>
+
+    <!-- Maximum number of recipients allowed per message. Use a value of -1
+         to indicate no limit. -->
+    <int name="recipientLimit">20</int>
+
+    <!-- If true, The text message over 160 characters will be sent in multi part.
+         If false, The text message over 160 characters will be sent
+         via multi media message. -->
+    <bool name="enableMultipartSMS">true</bool>
+
+    <!-- If enableMultipartSMS is true and smsToMmsTextThreshold > 1, then multi-part SMS messages
+         will be converted into a single mms message. For example, if the mms_config.xml file
+         specifies <int name="smsToMmsTextThreshold">7</int>, then on the 8th sms segment, the
+         message will be converted to an mms. -->
+    <int name="smsToMmsTextThreshold">1</int>
+
+    <!-- If true, The mms support slide duration.
+         If false, The mms does not support slide duration and we have to
+         set duration value. -->
+    <bool name="enableSlideDuration">true</bool>
+
+    <!-- Maximum length for message text. Use a value of -1
+         to indicate default value -->
+    <int name="maxMessageTextSize">-1</int>
+
+    <!-- Maximum length in chars of mms subject field -->
+    <int name="maxSubjectLength">80</int>
+
+     <!-- Reference for additional http parameters used in MMS http request.
+          Parameters are seperated by '|'. Optional.  -->
+     <string name="httpParams">X-MDN: ##LINE1##</string>
+</mms_config>
diff --git a/android-smsmms/src/main/res/xml-mcc310-mnc980/mms_config.xml b/android-smsmms/src/main/res/xml-mcc310-mnc980/mms_config.xml
index 96e5b9df7..de6b16bd2 100755
--- a/android-smsmms/src/main/res/xml-mcc310-mnc980/mms_config.xml
+++ b/android-smsmms/src/main/res/xml-mcc310-mnc980/mms_config.xml
@@ -1,33 +1,33 @@
-<?xml version="1.0" encoding="utf-8"?>
-<!-- Copyright 2013 The Android Open Source Project
-
-     Licensed under the Apache License, Version 2.0 (the "License");
-     you may not use this file except in compliance with the License.
-     You may obtain a copy of the License at
-
-          http://www.apache.org/licenses/LICENSE-2.0
-
-     Unless required by applicable law or agreed to in writing, software
-     distributed under the License is distributed on an "AS IS" BASIS,
-     WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
-     See the License for the specific language governing permissions and
-     limitations under the License.
--->
-
-<!-- Version History
-        version 1 - initial version.
-        version 2 - added recipientLimit.
-        version 3 - added min/max recycler values.
-        version 4 - added sms to mms text threshold.
--->
-
-<mms_config version="4">
-    <!-- Maximum message size in bytes for a MMS message -->
-    <int name="maxMessageSize">1048576</int>
-
-    <!-- Maximum height for an attached image -->
-    <int name="maxImageHeight">1944</int>
-
-    <!-- Maximum width for an attached image -->
-    <int name="maxImageWidth">2592</int>
-</mms_config>
+<?xml version="1.0" encoding="utf-8"?>
+<!-- Copyright 2013 The Android Open Source Project
+
+     Licensed under the Apache License, Version 2.0 (the "License");
+     you may not use this file except in compliance with the License.
+     You may obtain a copy of the License at
+
+          http://www.apache.org/licenses/LICENSE-2.0
+
+     Unless required by applicable law or agreed to in writing, software
+     distributed under the License is distributed on an "AS IS" BASIS,
+     WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+     See the License for the specific language governing permissions and
+     limitations under the License.
+-->
+
+<!-- Version History
+        version 1 - initial version.
+        version 2 - added recipientLimit.
+        version 3 - added min/max recycler values.
+        version 4 - added sms to mms text threshold.
+-->
+
+<mms_config version="4">
+    <!-- Maximum message size in bytes for a MMS message -->
+    <int name="maxMessageSize">1048576</int>
+
+    <!-- Maximum height for an attached image -->
+    <int name="maxImageHeight">1944</int>
+
+    <!-- Maximum width for an attached image -->
+    <int name="maxImageWidth">2592</int>
+</mms_config>
diff --git a/android-smsmms/src/main/res/xml-mcc311-mnc012/mms_config.xml b/android-smsmms/src/main/res/xml-mcc311-mnc012/mms_config.xml
index 346218bc6..2c2215422 100755
--- a/android-smsmms/src/main/res/xml-mcc311-mnc012/mms_config.xml
+++ b/android-smsmms/src/main/res/xml-mcc311-mnc012/mms_config.xml
@@ -1,83 +1,83 @@
-<?xml version="1.0" encoding="utf-8"?>
-<!-- Copyright 2014 The Android Open Source Project
-
-     Licensed under the Apache License, Version 2.0 (the "License");
-     you may not use this file except in compliance with the License.
-     You may obtain a copy of the License at
-
-          http://www.apache.org/licenses/LICENSE-2.0
-
-     Unless required by applicable law or agreed to in writing, software
-     distributed under the License is distributed on an "AS IS" BASIS,
-     WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
-     See the License for the specific language governing permissions and
-     limitations under the License.
--->
-
-<mms_config version="2">
-    <!-- In case of single segment M-Notification.ind, this indicates whether
-         TransactionID should be appended to URI or not. -->
-    <bool name="enabledTransID">true</bool>
-
-    <!-- Send M-Acknowledge.ind and M-NotifyResp.ind to the URL received by the
-         M-Notification.ind (WAP-PUSH). -->
-    <bool name="enabledNotifyWapMMSC">true</bool>
-
-    <!-- Maximum message size in bytes for a MMS message -->
-    <int name="maxMessageSize">1258291</int>
-
-    <!-- UAProf parameter tag name -->
-    <string name="uaProfTagName">Profile</string>
-
-    <!-- Maximum number of recipients allowed per message. Use a value of -1
-         to indicate no limit. -->
-    <int name="recipientLimit">20</int>
-
-    <!-- Additional http parameters used in MMS http request.
-         Parameters are seperated by '|'. Optional. -->
-    <string name="httpParams">x-up-calling-line-id: 1##LINE1NOCOUNTRYCODE##|X-VzW-MDN: 1##LINE1NOCOUNTRYCODE##</string>
-
-    <!-- Maximum height for an attached image -->
-    <int name="maxImageHeight">1944</int>
-
-    <!-- Maximum width for an attached image -->
-    <int name="maxImageWidth">2592</int>
-
-    <!-- Email Gateway Number -->
-    <!-- TODO: check if this is correct for Passion -->
-    <string name="emailGatewayNumber">6245</string>
-
-    <!-- enable alias -->
-    <bool name="aliasEnabled">true</bool>
-
-    <!-- alias rule: min chars -->
-    <int name="aliasMinChars">2</int>
-
-    <!-- alias rule: max chars -->
-    <int name="aliasMaxChars">48</int>
-
-    <!-- disable the option to attach an audio attachment to an Mms message. Currently Verizon
-         doesn't support OGG files and the only audio picker in the system allowed for picking
-         ringtones. All of our ringtones are OGG files so it doesn't make sense to allow a user
-         to select an audio file that eventually can't be handled. Therefore, the ability
-         to select a ringtone to send is disabled. -->
-    <bool name="allowAttachAudio">false</bool>
-
-    <!-- Hide the MMS read reports UI in settings -->
-    <bool name="enableMMSReadReports">false</bool>
-
-    <!-- Maximum length in chars of mms subject field -->
-    <int name="maxSubjectLength">80</int>
-
-    <!-- If true, The text message over 160 characters will be sent in multi part.
-         If false, The text message over 160 characters will be sent
-         via multi media message. -->
-    <bool name="enableMultipartSMS">true</bool>
-
-    <!-- If enableMultipartSMS is true and smsToMmsTextThreshold > 1, then multi-part SMS messages
-         will be converted into a single mms message. For example, if the mms_config.xml file
-         specifies <int name="smsToMmsTextThreshold">7</int>, then on the 8th sms segment, the
-         message will be converted to an mms. -->
-    <int name="smsToMmsTextThreshold">7</int>
-</mms_config>
-
+<?xml version="1.0" encoding="utf-8"?>
+<!-- Copyright 2014 The Android Open Source Project
+
+     Licensed under the Apache License, Version 2.0 (the "License");
+     you may not use this file except in compliance with the License.
+     You may obtain a copy of the License at
+
+          http://www.apache.org/licenses/LICENSE-2.0
+
+     Unless required by applicable law or agreed to in writing, software
+     distributed under the License is distributed on an "AS IS" BASIS,
+     WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+     See the License for the specific language governing permissions and
+     limitations under the License.
+-->
+
+<mms_config version="2">
+    <!-- In case of single segment M-Notification.ind, this indicates whether
+         TransactionID should be appended to URI or not. -->
+    <bool name="enabledTransID">true</bool>
+
+    <!-- Send M-Acknowledge.ind and M-NotifyResp.ind to the URL received by the
+         M-Notification.ind (WAP-PUSH). -->
+    <bool name="enabledNotifyWapMMSC">true</bool>
+
+    <!-- Maximum message size in bytes for a MMS message -->
+    <int name="maxMessageSize">1258291</int>
+
+    <!-- UAProf parameter tag name -->
+    <string name="uaProfTagName">Profile</string>
+
+    <!-- Maximum number of recipients allowed per message. Use a value of -1
+         to indicate no limit. -->
+    <int name="recipientLimit">20</int>
+
+    <!-- Additional http parameters used in MMS http request.
+         Parameters are seperated by '|'. Optional. -->
+    <string name="httpParams">x-up-calling-line-id: 1##LINE1NOCOUNTRYCODE##|X-VzW-MDN: 1##LINE1NOCOUNTRYCODE##</string>
+
+    <!-- Maximum height for an attached image -->
+    <int name="maxImageHeight">1944</int>
+
+    <!-- Maximum width for an attached image -->
+    <int name="maxImageWidth">2592</int>
+
+    <!-- Email Gateway Number -->
+    <!-- TODO: check if this is correct for Passion -->
+    <string name="emailGatewayNumber">6245</string>
+
+    <!-- enable alias -->
+    <bool name="aliasEnabled">true</bool>
+
+    <!-- alias rule: min chars -->
+    <int name="aliasMinChars">2</int>
+
+    <!-- alias rule: max chars -->
+    <int name="aliasMaxChars">48</int>
+
+    <!-- disable the option to attach an audio attachment to an Mms message. Currently Verizon
+         doesn't support OGG files and the only audio picker in the system allowed for picking
+         ringtones. All of our ringtones are OGG files so it doesn't make sense to allow a user
+         to select an audio file that eventually can't be handled. Therefore, the ability
+         to select a ringtone to send is disabled. -->
+    <bool name="allowAttachAudio">false</bool>
+
+    <!-- Hide the MMS read reports UI in settings -->
+    <bool name="enableMMSReadReports">false</bool>
+
+    <!-- Maximum length in chars of mms subject field -->
+    <int name="maxSubjectLength">80</int>
+
+    <!-- If true, The text message over 160 characters will be sent in multi part.
+         If false, The text message over 160 characters will be sent
+         via multi media message. -->
+    <bool name="enableMultipartSMS">true</bool>
+
+    <!-- If enableMultipartSMS is true and smsToMmsTextThreshold > 1, then multi-part SMS messages
+         will be converted into a single mms message. For example, if the mms_config.xml file
+         specifies <int name="smsToMmsTextThreshold">7</int>, then on the 8th sms segment, the
+         message will be converted to an mms. -->
+    <int name="smsToMmsTextThreshold">7</int>
+</mms_config>
+
diff --git a/android-smsmms/src/main/res/xml-mcc311-mnc070/mms_config.xml b/android-smsmms/src/main/res/xml-mcc311-mnc070/mms_config.xml
index 962285793..b6c20a12f 100755
--- a/android-smsmms/src/main/res/xml-mcc311-mnc070/mms_config.xml
+++ b/android-smsmms/src/main/res/xml-mcc311-mnc070/mms_config.xml
@@ -1,83 +1,83 @@
-<?xml version="1.0" encoding="utf-8"?>
-<!-- Copyright (C) 2009 The Android Open Source Project
-
-     Licensed under the Apache License, Version 2.0 (the "License");
-     you may not use this file except in compliance with the License.
-     You may obtain a copy of the License at
-
-          http://www.apache.org/licenses/LICENSE-2.0
-
-     Unless required by applicable law or agreed to in writing, software
-     distributed under the License is distributed on an "AS IS" BASIS,
-     WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
-     See the License for the specific language governing permissions and
-     limitations under the License.
--->
-
-<!-- Version History
-        version 1 - initial version.
-        version 2 - added recipientLimit.
-        version 3 - added min/max recycler values.
-        version 4 - added sms to mms text threshold.
--->
-
-<mms_config version="4">
-    <!-- Flag indicating whether MMS should be enabled -->
-    <bool name="enabledMMS">true</bool>
-
-    <!-- Maximum message size in bytes for a MMS message -->
-    <int name="maxMessageSize">1048576</int>
-
-    <!-- Maximum height for an attached image -->
-    <int name="maxImageHeight">2432</int>
-
-    <!-- Maximum width for an attached image -->
-    <int name="maxImageWidth">4320</int>
-
-    <!-- Maximum number of SMS message to save per thread before auto-delete kicks in.
-         This is the default value. -->
-    <int name="defaultSMSMessagesPerThread">500</int>
-
-    <!-- Maximum number of MMS message to save per thread before auto-delete kicks in.
-         This is the default value. -->
-    <int name="defaultMMSMessagesPerThread">50</int>
-
-    <!-- Minimum value for the number of messages kept per conversation. The user can never
-         set the limit below this value. -->
-    <int name="minMessageCountPerThread">10</int>
-
-    <!-- Maximum value for the number of messages kept per conversation. The user can never
-         set the limit above this value. -->
-    <int name="maxMessageCountPerThread">5000</int>
-
-    <!-- Maximum number of recipients allowed per message. Use a value of -1
-         to indicate no limit. -->
-    <int name="recipientLimit">20</int>
-
-    <!-- If true, The text message over 160 characters will be sent in multi part.
-         If false, The text message over 160 characters will be sent
-         via multi media message. -->
-    <bool name="enableMultipartSMS">true</bool>
-
-    <!-- If enableMultipartSMS is true and smsToMmsTextThreshold > 1, then multi-part SMS messages
-         will be converted into a single mms message. For example, if the mms_config.xml file
-         specifies <int name="smsToMmsTextThreshold">7</int>, then on the 8th sms segment, the
-         message will be converted to an mms. -->
-    <int name="smsToMmsTextThreshold">1</int>
-
-    <!-- If true, The mms support slide duration.
-         If false, The mms does not support slide duration and we have to
-         set duration value. -->
-    <bool name="enableSlideDuration">true</bool>
-
-    <!-- Maximum length for message text. Use a value of -1
-         to indicate default value -->
-    <int name="maxMessageTextSize">-1</int>
-
-    <!-- Maximum length in chars of mms subject field -->
-    <int name="maxSubjectLength">80</int>
-
-     <!-- Reference for additional http parameters used in MMS http request.
-          Parameters are seperated by '|'. Optional.  -->
-     <string name="httpParams">X-MDN: ##LINE1##</string>
-</mms_config>
+<?xml version="1.0" encoding="utf-8"?>
+<!-- Copyright (C) 2009 The Android Open Source Project
+
+     Licensed under the Apache License, Version 2.0 (the "License");
+     you may not use this file except in compliance with the License.
+     You may obtain a copy of the License at
+
+          http://www.apache.org/licenses/LICENSE-2.0
+
+     Unless required by applicable law or agreed to in writing, software
+     distributed under the License is distributed on an "AS IS" BASIS,
+     WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+     See the License for the specific language governing permissions and
+     limitations under the License.
+-->
+
+<!-- Version History
+        version 1 - initial version.
+        version 2 - added recipientLimit.
+        version 3 - added min/max recycler values.
+        version 4 - added sms to mms text threshold.
+-->
+
+<mms_config version="4">
+    <!-- Flag indicating whether MMS should be enabled -->
+    <bool name="enabledMMS">true</bool>
+
+    <!-- Maximum message size in bytes for a MMS message -->
+    <int name="maxMessageSize">1048576</int>
+
+    <!-- Maximum height for an attached image -->
+    <int name="maxImageHeight">2432</int>
+
+    <!-- Maximum width for an attached image -->
+    <int name="maxImageWidth">4320</int>
+
+    <!-- Maximum number of SMS message to save per thread before auto-delete kicks in.
+         This is the default value. -->
+    <int name="defaultSMSMessagesPerThread">500</int>
+
+    <!-- Maximum number of MMS message to save per thread before auto-delete kicks in.
+         This is the default value. -->
+    <int name="defaultMMSMessagesPerThread">50</int>
+
+    <!-- Minimum value for the number of messages kept per conversation. The user can never
+         set the limit below this value. -->
+    <int name="minMessageCountPerThread">10</int>
+
+    <!-- Maximum value for the number of messages kept per conversation. The user can never
+         set the limit above this value. -->
+    <int name="maxMessageCountPerThread">5000</int>
+
+    <!-- Maximum number of recipients allowed per message. Use a value of -1
+         to indicate no limit. -->
+    <int name="recipientLimit">20</int>
+
+    <!-- If true, The text message over 160 characters will be sent in multi part.
+         If false, The text message over 160 characters will be sent
+         via multi media message. -->
+    <bool name="enableMultipartSMS">true</bool>
+
+    <!-- If enableMultipartSMS is true and smsToMmsTextThreshold > 1, then multi-part SMS messages
+         will be converted into a single mms message. For example, if the mms_config.xml file
+         specifies <int name="smsToMmsTextThreshold">7</int>, then on the 8th sms segment, the
+         message will be converted to an mms. -->
+    <int name="smsToMmsTextThreshold">1</int>
+
+    <!-- If true, The mms support slide duration.
+         If false, The mms does not support slide duration and we have to
+         set duration value. -->
+    <bool name="enableSlideDuration">true</bool>
+
+    <!-- Maximum length for message text. Use a value of -1
+         to indicate default value -->
+    <int name="maxMessageTextSize">-1</int>
+
+    <!-- Maximum length in chars of mms subject field -->
+    <int name="maxSubjectLength">80</int>
+
+     <!-- Reference for additional http parameters used in MMS http request.
+          Parameters are seperated by '|'. Optional.  -->
+     <string name="httpParams">X-MDN: ##LINE1##</string>
+</mms_config>
diff --git a/android-smsmms/src/main/res/xml-mcc311-mnc100/mms_config.xml b/android-smsmms/src/main/res/xml-mcc311-mnc100/mms_config.xml
index dd671f65a..68d1185c6 100755
--- a/android-smsmms/src/main/res/xml-mcc311-mnc100/mms_config.xml
+++ b/android-smsmms/src/main/res/xml-mcc311-mnc100/mms_config.xml
@@ -1,95 +1,95 @@
-<?xml version="1.0" encoding="utf-8"?>
-<!-- Copyright (C) 2009 The Android Open Source Project
-
-     Licensed under the Apache License, Version 2.0 (the "License");
-     you may not use this file except in compliance with the License.
-     You may obtain a copy of the License at
-
-          http://www.apache.org/licenses/LICENSE-2.0
-
-     Unless required by applicable law or agreed to in writing, software
-     distributed under the License is distributed on an "AS IS" BASIS,
-     WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
-     See the License for the specific language governing permissions and
-     limitations under the License.
--->
-
-<!-- Version History
-        version 1 - initial version.
-        version 2 - added recipientLimit.
-        version 3 - added min/max recycler values.
-        version 4 - added sms to mms text threshold.
--->
-<!--Nex-Tech Wireless configuration-->
-<mms_config version="4">
-    <!-- Flag indicating whether MMS should be enabled -->
-    <bool name="enabledMMS">true</bool>
-
-    <!-- Maximum message size in bytes for a MMS message -->
-    <int name="maxMessageSize">1048576</int>
-
-    <!-- Maximum height for an attached image -->
-    <int name="maxImageHeight">2432</int>
-
-    <!-- Maximum width for an attached image -->
-    <int name="maxImageWidth">4320</int>
-
-    <!-- Maximum number of SMS message to save per thread before auto-delete kicks in.
-         This is the default value. -->
-    <int name="defaultSMSMessagesPerThread">500</int>
-
-    <!-- Maximum number of MMS message to save per thread before auto-delete kicks in.
-         This is the default value. -->
-    <int name="defaultMMSMessagesPerThread">50</int>
-
-    <!-- Minimum value for the number of messages kept per conversation. The user can never
-         set the limit below this value. -->
-    <int name="minMessageCountPerThread">10</int>
-
-    <!-- Maximum value for the number of messages kept per conversation. The user can never
-         set the limit above this value. -->
-    <int name="maxMessageCountPerThread">5000</int>
-
-    <!-- Maximum number of recipients allowed per message. Use a value of -1
-         to indicate no limit. -->
-    <int name="recipientLimit">10</int>
-
-    <!-- If true, The text message over 160 characters will be sent in multi part.
-         If false, The text message over 160 characters will be sent
-         via multi media message. -->
-    <bool name="enableMultipartSMS">false</bool>
-
-    <!-- If enableMultipartSMS is true and smsToMmsTextThreshold > 1, then multi-part SMS messages
-         will be converted into a single mms message. For example, if the mms_config.xml file
-         specifies <int name="smsToMmsTextThreshold">7</int>, then on the 8th sms segment, the
-         message will be converted to an mms. -->
-    <int name="smsToMmsTextThreshold">-1</int>
-
-    <!-- If true, The mms support slide duration.
-         If false, The mms does not support slide duration and we have to
-         set duration value. -->
-    <bool name="enableSlideDuration">false</bool>
-
-    <!-- Maximum length for message text. Use a value of -1
-         to indicate default value -->
-    <int name="maxMessageTextSize">-1</int>
-
-    <!-- Maximum length in chars of mms subject field -->
-    <int name="maxSubjectLength">80</int>
-
-    <!-- Email Gateway Number -->
-    <string name="emailGatewayNumber">6245</string>
-
-    <!-- Hide the MMS read reports UI in settings -->
-    <bool name="enableMMSReadReports">false</bool>
-
-    <!-- Flag indicating whether SMS Delivery Reports UI option should be shown -->
-    <bool name="enableSMSDeliveryReports">false</bool>
-
-    <!-- Flag indicating whether MMS Delivery Reports UI option should be shown -->
-    <bool name="enableMMSDeliveryReports">false</bool>
-
-    <!-- Reference for additional http parameters used in MMS http request.
-            Parameters are seperated by '|'. Optional.  -->
-    <string name="httpParams">X-MDN: ##LINE1##</string>
-</mms_config>
+<?xml version="1.0" encoding="utf-8"?>
+<!-- Copyright (C) 2009 The Android Open Source Project
+
+     Licensed under the Apache License, Version 2.0 (the "License");
+     you may not use this file except in compliance with the License.
+     You may obtain a copy of the License at
+
+          http://www.apache.org/licenses/LICENSE-2.0
+
+     Unless required by applicable law or agreed to in writing, software
+     distributed under the License is distributed on an "AS IS" BASIS,
+     WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+     See the License for the specific language governing permissions and
+     limitations under the License.
+-->
+
+<!-- Version History
+        version 1 - initial version.
+        version 2 - added recipientLimit.
+        version 3 - added min/max recycler values.
+        version 4 - added sms to mms text threshold.
+-->
+<!--Nex-Tech Wireless configuration-->
+<mms_config version="4">
+    <!-- Flag indicating whether MMS should be enabled -->
+    <bool name="enabledMMS">true</bool>
+
+    <!-- Maximum message size in bytes for a MMS message -->
+    <int name="maxMessageSize">1048576</int>
+
+    <!-- Maximum height for an attached image -->
+    <int name="maxImageHeight">2432</int>
+
+    <!-- Maximum width for an attached image -->
+    <int name="maxImageWidth">4320</int>
+
+    <!-- Maximum number of SMS message to save per thread before auto-delete kicks in.
+         This is the default value. -->
+    <int name="defaultSMSMessagesPerThread">500</int>
+
+    <!-- Maximum number of MMS message to save per thread before auto-delete kicks in.
+         This is the default value. -->
+    <int name="defaultMMSMessagesPerThread">50</int>
+
+    <!-- Minimum value for the number of messages kept per conversation. The user can never
+         set the limit below this value. -->
+    <int name="minMessageCountPerThread">10</int>
+
+    <!-- Maximum value for the number of messages kept per conversation. The user can never
+         set the limit above this value. -->
+    <int name="maxMessageCountPerThread">5000</int>
+
+    <!-- Maximum number of recipients allowed per message. Use a value of -1
+         to indicate no limit. -->
+    <int name="recipientLimit">10</int>
+
+    <!-- If true, The text message over 160 characters will be sent in multi part.
+         If false, The text message over 160 characters will be sent
+         via multi media message. -->
+    <bool name="enableMultipartSMS">false</bool>
+
+    <!-- If enableMultipartSMS is true and smsToMmsTextThreshold > 1, then multi-part SMS messages
+         will be converted into a single mms message. For example, if the mms_config.xml file
+         specifies <int name="smsToMmsTextThreshold">7</int>, then on the 8th sms segment, the
+         message will be converted to an mms. -->
+    <int name="smsToMmsTextThreshold">-1</int>
+
+    <!-- If true, The mms support slide duration.
+         If false, The mms does not support slide duration and we have to
+         set duration value. -->
+    <bool name="enableSlideDuration">false</bool>
+
+    <!-- Maximum length for message text. Use a value of -1
+         to indicate default value -->
+    <int name="maxMessageTextSize">-1</int>
+
+    <!-- Maximum length in chars of mms subject field -->
+    <int name="maxSubjectLength">80</int>
+
+    <!-- Email Gateway Number -->
+    <string name="emailGatewayNumber">6245</string>
+
+    <!-- Hide the MMS read reports UI in settings -->
+    <bool name="enableMMSReadReports">false</bool>
+
+    <!-- Flag indicating whether SMS Delivery Reports UI option should be shown -->
+    <bool name="enableSMSDeliveryReports">false</bool>
+
+    <!-- Flag indicating whether MMS Delivery Reports UI option should be shown -->
+    <bool name="enableMMSDeliveryReports">false</bool>
+
+    <!-- Reference for additional http parameters used in MMS http request.
+            Parameters are seperated by '|'. Optional.  -->
+    <string name="httpParams">X-MDN: ##LINE1##</string>
+</mms_config>
diff --git a/android-smsmms/src/main/res/xml-mcc311-mnc180/mms_config.xml b/android-smsmms/src/main/res/xml-mcc311-mnc180/mms_config.xml
index 891618b78..75ede59a0 100755
--- a/android-smsmms/src/main/res/xml-mcc311-mnc180/mms_config.xml
+++ b/android-smsmms/src/main/res/xml-mcc311-mnc180/mms_config.xml
@@ -1,37 +1,37 @@
-<?xml version="1.0" encoding="utf-8"?>
-<!-- Copyright 2013 The Android Open Source Project
-
-     Licensed under the Apache License, Version 2.0 (the "License");
-     you may not use this file except in compliance with the License.
-     You may obtain a copy of the License at
-
-          http://www.apache.org/licenses/LICENSE-2.0
-
-     Unless required by applicable law or agreed to in writing, software
-     distributed under the License is distributed on an "AS IS" BASIS,
-     WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
-     See the License for the specific language governing permissions and
-     limitations under the License.
--->
-
-<!-- Version History
-        version 1 - initial version.
-        version 2 - added recipientLimit.
-        version 3 - added min/max recycler values.
-        version 4 - added sms to mms text threshold.
--->
-
-<mms_config version="4">
-    <!-- Maximum message size in bytes for a MMS message -->
-    <int name="maxMessageSize">1048576</int>
-
-    <!-- Maximum height for an attached image -->
-    <int name="maxImageHeight">1944</int>
-
-    <!-- Maximum width for an attached image -->
-    <int name="maxImageWidth">2592</int>
-
-    <!-- Maximum number of recipients allowed per message. Use a value of -1
-     to indicate no limit. -->
-    <int name="recipientLimit">10</int>
-</mms_config>
+<?xml version="1.0" encoding="utf-8"?>
+<!-- Copyright 2013 The Android Open Source Project
+
+     Licensed under the Apache License, Version 2.0 (the "License");
+     you may not use this file except in compliance with the License.
+     You may obtain a copy of the License at
+
+          http://www.apache.org/licenses/LICENSE-2.0
+
+     Unless required by applicable law or agreed to in writing, software
+     distributed under the License is distributed on an "AS IS" BASIS,
+     WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+     See the License for the specific language governing permissions and
+     limitations under the License.
+-->
+
+<!-- Version History
+        version 1 - initial version.
+        version 2 - added recipientLimit.
+        version 3 - added min/max recycler values.
+        version 4 - added sms to mms text threshold.
+-->
+
+<mms_config version="4">
+    <!-- Maximum message size in bytes for a MMS message -->
+    <int name="maxMessageSize">1048576</int>
+
+    <!-- Maximum height for an attached image -->
+    <int name="maxImageHeight">1944</int>
+
+    <!-- Maximum width for an attached image -->
+    <int name="maxImageWidth">2592</int>
+
+    <!-- Maximum number of recipients allowed per message. Use a value of -1
+     to indicate no limit. -->
+    <int name="recipientLimit">10</int>
+</mms_config>
diff --git a/android-smsmms/src/main/res/xml-mcc311-mnc220/mms_config.xml b/android-smsmms/src/main/res/xml-mcc311-mnc220/mms_config.xml
index 196d4f7f9..d9d80df27 100755
--- a/android-smsmms/src/main/res/xml-mcc311-mnc220/mms_config.xml
+++ b/android-smsmms/src/main/res/xml-mcc311-mnc220/mms_config.xml
@@ -1,65 +1,65 @@
-<?xml version="1.0" encoding="utf-8"?>
-<!-- Copyright 2014 The Android Open Source Project
-
-     Licensed under the Apache License, Version 2.0 (the "License");
-     you may not use this file except in compliance with the License.
-     You may obtain a copy of the License at
-
-          http://www.apache.org/licenses/LICENSE-2.0
-
-     Unless required by applicable law or agreed to in writing, software
-     distributed under the License is distributed on an "AS IS" BASIS,
-     WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
-     See the License for the specific language governing permissions and
-     limitations under the License.
--->
-
-<mms_config version="2">
-    <!-- In case of single segment M-Notification.ind, this indicates whether
-         TransactionID should be appended to URI or not. -->
-    <bool name="enabledTransID">true</bool>
-
-    <!-- Send M-Acknowledge.ind and M-NotifyResp.ind to the URL received by the
-         M-Notification.ind (WAP-PUSH). -->
-    <bool name="enabledNotifyWapMMSC">true</bool>
-
-    <!-- Maximum message size in bytes for a MMS message -->
-    <int name="maxMessageSize">1048576</int>
-
-    <!-- UAProf parameter tag name -->
-    <string name="uaProfTagName">x-wap-profile</string>
-
-    <!-- Maximum number of recipients allowed per message. Use a value of -1
-         to indicate no limit. -->
-    <int name="recipientLimit">20</int>
-
-    <!-- Additional http parameters used in MMS http request.
-         Parameters are seperated by '|'. Optional. -->
-    <string name="httpParams">x-vzw-mdn: 1##LINE1NOCOUNTRYCODE##</string>
-
-    <!-- Maximum height for an attached image -->
-    <int name="maxImageHeight">1944</int>
-
-    <!-- Maximum width for an attached image -->
-    <int name="maxImageWidth">2592</int>
-
-    <!-- If true, The text message over 160 characters will be sent in multi part.
-         If false, The text message over 160 characters will be sent
-         via multi media message or separate, independent SMS messages,
-         dependent on sendMultipartSMSAsSeparateMessages value. -->
-    <bool name="enableMultipartSMS">false</bool>
-
-    <!-- Email Gateway Number -->
-    <!-- TODO: check if this is correct for Passion -->
-    <string name="emailGatewayNumber">6245</string>
-
-    <bool name="allowAttachAudio">true</bool>
-
-    <!-- Hide the MMS read reports UI in settings -->
-    <bool name="enableMMSReadReports">false</bool>
-
-    <!-- Maximum length in chars of mms subject field -->
-    <int name="maxSubjectLength">80</int>
-
-</mms_config>
-
+<?xml version="1.0" encoding="utf-8"?>
+<!-- Copyright 2014 The Android Open Source Project
+
+     Licensed under the Apache License, Version 2.0 (the "License");
+     you may not use this file except in compliance with the License.
+     You may obtain a copy of the License at
+
+          http://www.apache.org/licenses/LICENSE-2.0
+
+     Unless required by applicable law or agreed to in writing, software
+     distributed under the License is distributed on an "AS IS" BASIS,
+     WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+     See the License for the specific language governing permissions and
+     limitations under the License.
+-->
+
+<mms_config version="2">
+    <!-- In case of single segment M-Notification.ind, this indicates whether
+         TransactionID should be appended to URI or not. -->
+    <bool name="enabledTransID">true</bool>
+
+    <!-- Send M-Acknowledge.ind and M-NotifyResp.ind to the URL received by the
+         M-Notification.ind (WAP-PUSH). -->
+    <bool name="enabledNotifyWapMMSC">true</bool>
+
+    <!-- Maximum message size in bytes for a MMS message -->
+    <int name="maxMessageSize">1048576</int>
+
+    <!-- UAProf parameter tag name -->
+    <string name="uaProfTagName">x-wap-profile</string>
+
+    <!-- Maximum number of recipients allowed per message. Use a value of -1
+         to indicate no limit. -->
+    <int name="recipientLimit">20</int>
+
+    <!-- Additional http parameters used in MMS http request.
+         Parameters are seperated by '|'. Optional. -->
+    <string name="httpParams">x-vzw-mdn: 1##LINE1NOCOUNTRYCODE##</string>
+
+    <!-- Maximum height for an attached image -->
+    <int name="maxImageHeight">1944</int>
+
+    <!-- Maximum width for an attached image -->
+    <int name="maxImageWidth">2592</int>
+
+    <!-- If true, The text message over 160 characters will be sent in multi part.
+         If false, The text message over 160 characters will be sent
+         via multi media message or separate, independent SMS messages,
+         dependent on sendMultipartSMSAsSeparateMessages value. -->
+    <bool name="enableMultipartSMS">false</bool>
+
+    <!-- Email Gateway Number -->
+    <!-- TODO: check if this is correct for Passion -->
+    <string name="emailGatewayNumber">6245</string>
+
+    <bool name="allowAttachAudio">true</bool>
+
+    <!-- Hide the MMS read reports UI in settings -->
+    <bool name="enableMMSReadReports">false</bool>
+
+    <!-- Maximum length in chars of mms subject field -->
+    <int name="maxSubjectLength">80</int>
+
+</mms_config>
+
diff --git a/android-smsmms/src/main/res/xml-mcc311-mnc221/mms_config.xml b/android-smsmms/src/main/res/xml-mcc311-mnc221/mms_config.xml
index 196d4f7f9..d9d80df27 100755
--- a/android-smsmms/src/main/res/xml-mcc311-mnc221/mms_config.xml
+++ b/android-smsmms/src/main/res/xml-mcc311-mnc221/mms_config.xml
@@ -1,65 +1,65 @@
-<?xml version="1.0" encoding="utf-8"?>
-<!-- Copyright 2014 The Android Open Source Project
-
-     Licensed under the Apache License, Version 2.0 (the "License");
-     you may not use this file except in compliance with the License.
-     You may obtain a copy of the License at
-
-          http://www.apache.org/licenses/LICENSE-2.0
-
-     Unless required by applicable law or agreed to in writing, software
-     distributed under the License is distributed on an "AS IS" BASIS,
-     WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
-     See the License for the specific language governing permissions and
-     limitations under the License.
--->
-
-<mms_config version="2">
-    <!-- In case of single segment M-Notification.ind, this indicates whether
-         TransactionID should be appended to URI or not. -->
-    <bool name="enabledTransID">true</bool>
-
-    <!-- Send M-Acknowledge.ind and M-NotifyResp.ind to the URL received by the
-         M-Notification.ind (WAP-PUSH). -->
-    <bool name="enabledNotifyWapMMSC">true</bool>
-
-    <!-- Maximum message size in bytes for a MMS message -->
-    <int name="maxMessageSize">1048576</int>
-
-    <!-- UAProf parameter tag name -->
-    <string name="uaProfTagName">x-wap-profile</string>
-
-    <!-- Maximum number of recipients allowed per message. Use a value of -1
-         to indicate no limit. -->
-    <int name="recipientLimit">20</int>
-
-    <!-- Additional http parameters used in MMS http request.
-         Parameters are seperated by '|'. Optional. -->
-    <string name="httpParams">x-vzw-mdn: 1##LINE1NOCOUNTRYCODE##</string>
-
-    <!-- Maximum height for an attached image -->
-    <int name="maxImageHeight">1944</int>
-
-    <!-- Maximum width for an attached image -->
-    <int name="maxImageWidth">2592</int>
-
-    <!-- If true, The text message over 160 characters will be sent in multi part.
-         If false, The text message over 160 characters will be sent
-         via multi media message or separate, independent SMS messages,
-         dependent on sendMultipartSMSAsSeparateMessages value. -->
-    <bool name="enableMultipartSMS">false</bool>
-
-    <!-- Email Gateway Number -->
-    <!-- TODO: check if this is correct for Passion -->
-    <string name="emailGatewayNumber">6245</string>
-
-    <bool name="allowAttachAudio">true</bool>
-
-    <!-- Hide the MMS read reports UI in settings -->
-    <bool name="enableMMSReadReports">false</bool>
-
-    <!-- Maximum length in chars of mms subject field -->
-    <int name="maxSubjectLength">80</int>
-
-</mms_config>
-
+<?xml version="1.0" encoding="utf-8"?>
+<!-- Copyright 2014 The Android Open Source Project
+
+     Licensed under the Apache License, Version 2.0 (the "License");
+     you may not use this file except in compliance with the License.
+     You may obtain a copy of the License at
+
+          http://www.apache.org/licenses/LICENSE-2.0
+
+     Unless required by applicable law or agreed to in writing, software
+     distributed under the License is distributed on an "AS IS" BASIS,
+     WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+     See the License for the specific language governing permissions and
+     limitations under the License.
+-->
+
+<mms_config version="2">
+    <!-- In case of single segment M-Notification.ind, this indicates whether
+         TransactionID should be appended to URI or not. -->
+    <bool name="enabledTransID">true</bool>
+
+    <!-- Send M-Acknowledge.ind and M-NotifyResp.ind to the URL received by the
+         M-Notification.ind (WAP-PUSH). -->
+    <bool name="enabledNotifyWapMMSC">true</bool>
+
+    <!-- Maximum message size in bytes for a MMS message -->
+    <int name="maxMessageSize">1048576</int>
+
+    <!-- UAProf parameter tag name -->
+    <string name="uaProfTagName">x-wap-profile</string>
+
+    <!-- Maximum number of recipients allowed per message. Use a value of -1
+         to indicate no limit. -->
+    <int name="recipientLimit">20</int>
+
+    <!-- Additional http parameters used in MMS http request.
+         Parameters are seperated by '|'. Optional. -->
+    <string name="httpParams">x-vzw-mdn: 1##LINE1NOCOUNTRYCODE##</string>
+
+    <!-- Maximum height for an attached image -->
+    <int name="maxImageHeight">1944</int>
+
+    <!-- Maximum width for an attached image -->
+    <int name="maxImageWidth">2592</int>
+
+    <!-- If true, The text message over 160 characters will be sent in multi part.
+         If false, The text message over 160 characters will be sent
+         via multi media message or separate, independent SMS messages,
+         dependent on sendMultipartSMSAsSeparateMessages value. -->
+    <bool name="enableMultipartSMS">false</bool>
+
+    <!-- Email Gateway Number -->
+    <!-- TODO: check if this is correct for Passion -->
+    <string name="emailGatewayNumber">6245</string>
+
+    <bool name="allowAttachAudio">true</bool>
+
+    <!-- Hide the MMS read reports UI in settings -->
+    <bool name="enableMMSReadReports">false</bool>
+
+    <!-- Maximum length in chars of mms subject field -->
+    <int name="maxSubjectLength">80</int>
+
+</mms_config>
+
diff --git a/android-smsmms/src/main/res/xml-mcc311-mnc222/mms_config.xml b/android-smsmms/src/main/res/xml-mcc311-mnc222/mms_config.xml
index 196d4f7f9..d9d80df27 100755
--- a/android-smsmms/src/main/res/xml-mcc311-mnc222/mms_config.xml
+++ b/android-smsmms/src/main/res/xml-mcc311-mnc222/mms_config.xml
@@ -1,65 +1,65 @@
-<?xml version="1.0" encoding="utf-8"?>
-<!-- Copyright 2014 The Android Open Source Project
-
-     Licensed under the Apache License, Version 2.0 (the "License");
-     you may not use this file except in compliance with the License.
-     You may obtain a copy of the License at
-
-          http://www.apache.org/licenses/LICENSE-2.0
-
-     Unless required by applicable law or agreed to in writing, software
-     distributed under the License is distributed on an "AS IS" BASIS,
-     WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
-     See the License for the specific language governing permissions and
-     limitations under the License.
--->
-
-<mms_config version="2">
-    <!-- In case of single segment M-Notification.ind, this indicates whether
-         TransactionID should be appended to URI or not. -->
-    <bool name="enabledTransID">true</bool>
-
-    <!-- Send M-Acknowledge.ind and M-NotifyResp.ind to the URL received by the
-         M-Notification.ind (WAP-PUSH). -->
-    <bool name="enabledNotifyWapMMSC">true</bool>
-
-    <!-- Maximum message size in bytes for a MMS message -->
-    <int name="maxMessageSize">1048576</int>
-
-    <!-- UAProf parameter tag name -->
-    <string name="uaProfTagName">x-wap-profile</string>
-
-    <!-- Maximum number of recipients allowed per message. Use a value of -1
-         to indicate no limit. -->
-    <int name="recipientLimit">20</int>
-
-    <!-- Additional http parameters used in MMS http request.
-         Parameters are seperated by '|'. Optional. -->
-    <string name="httpParams">x-vzw-mdn: 1##LINE1NOCOUNTRYCODE##</string>
-
-    <!-- Maximum height for an attached image -->
-    <int name="maxImageHeight">1944</int>
-
-    <!-- Maximum width for an attached image -->
-    <int name="maxImageWidth">2592</int>
-
-    <!-- If true, The text message over 160 characters will be sent in multi part.
-         If false, The text message over 160 characters will be sent
-         via multi media message or separate, independent SMS messages,
-         dependent on sendMultipartSMSAsSeparateMessages value. -->
-    <bool name="enableMultipartSMS">false</bool>
-
-    <!-- Email Gateway Number -->
-    <!-- TODO: check if this is correct for Passion -->
-    <string name="emailGatewayNumber">6245</string>
-
-    <bool name="allowAttachAudio">true</bool>
-
-    <!-- Hide the MMS read reports UI in settings -->
-    <bool name="enableMMSReadReports">false</bool>
-
-    <!-- Maximum length in chars of mms subject field -->
-    <int name="maxSubjectLength">80</int>
-
-</mms_config>
-
+<?xml version="1.0" encoding="utf-8"?>
+<!-- Copyright 2014 The Android Open Source Project
+
+     Licensed under the Apache License, Version 2.0 (the "License");
+     you may not use this file except in compliance with the License.
+     You may obtain a copy of the License at
+
+          http://www.apache.org/licenses/LICENSE-2.0
+
+     Unless required by applicable law or agreed to in writing, software
+     distributed under the License is distributed on an "AS IS" BASIS,
+     WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+     See the License for the specific language governing permissions and
+     limitations under the License.
+-->
+
+<mms_config version="2">
+    <!-- In case of single segment M-Notification.ind, this indicates whether
+         TransactionID should be appended to URI or not. -->
+    <bool name="enabledTransID">true</bool>
+
+    <!-- Send M-Acknowledge.ind and M-NotifyResp.ind to the URL received by the
+         M-Notification.ind (WAP-PUSH). -->
+    <bool name="enabledNotifyWapMMSC">true</bool>
+
+    <!-- Maximum message size in bytes for a MMS message -->
+    <int name="maxMessageSize">1048576</int>
+
+    <!-- UAProf parameter tag name -->
+    <string name="uaProfTagName">x-wap-profile</string>
+
+    <!-- Maximum number of recipients allowed per message. Use a value of -1
+         to indicate no limit. -->
+    <int name="recipientLimit">20</int>
+
+    <!-- Additional http parameters used in MMS http request.
+         Parameters are seperated by '|'. Optional. -->
+    <string name="httpParams">x-vzw-mdn: 1##LINE1NOCOUNTRYCODE##</string>
+
+    <!-- Maximum height for an attached image -->
+    <int name="maxImageHeight">1944</int>
+
+    <!-- Maximum width for an attached image -->
+    <int name="maxImageWidth">2592</int>
+
+    <!-- If true, The text message over 160 characters will be sent in multi part.
+         If false, The text message over 160 characters will be sent
+         via multi media message or separate, independent SMS messages,
+         dependent on sendMultipartSMSAsSeparateMessages value. -->
+    <bool name="enableMultipartSMS">false</bool>
+
+    <!-- Email Gateway Number -->
+    <!-- TODO: check if this is correct for Passion -->
+    <string name="emailGatewayNumber">6245</string>
+
+    <bool name="allowAttachAudio">true</bool>
+
+    <!-- Hide the MMS read reports UI in settings -->
+    <bool name="enableMMSReadReports">false</bool>
+
+    <!-- Maximum length in chars of mms subject field -->
+    <int name="maxSubjectLength">80</int>
+
+</mms_config>
+
diff --git a/android-smsmms/src/main/res/xml-mcc311-mnc223/mms_config.xml b/android-smsmms/src/main/res/xml-mcc311-mnc223/mms_config.xml
index 196d4f7f9..d9d80df27 100755
--- a/android-smsmms/src/main/res/xml-mcc311-mnc223/mms_config.xml
+++ b/android-smsmms/src/main/res/xml-mcc311-mnc223/mms_config.xml
@@ -1,65 +1,65 @@
-<?xml version="1.0" encoding="utf-8"?>
-<!-- Copyright 2014 The Android Open Source Project
-
-     Licensed under the Apache License, Version 2.0 (the "License");
-     you may not use this file except in compliance with the License.
-     You may obtain a copy of the License at
-
-          http://www.apache.org/licenses/LICENSE-2.0
-
-     Unless required by applicable law or agreed to in writing, software
-     distributed under the License is distributed on an "AS IS" BASIS,
-     WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
-     See the License for the specific language governing permissions and
-     limitations under the License.
--->
-
-<mms_config version="2">
-    <!-- In case of single segment M-Notification.ind, this indicates whether
-         TransactionID should be appended to URI or not. -->
-    <bool name="enabledTransID">true</bool>
-
-    <!-- Send M-Acknowledge.ind and M-NotifyResp.ind to the URL received by the
-         M-Notification.ind (WAP-PUSH). -->
-    <bool name="enabledNotifyWapMMSC">true</bool>
-
-    <!-- Maximum message size in bytes for a MMS message -->
-    <int name="maxMessageSize">1048576</int>
-
-    <!-- UAProf parameter tag name -->
-    <string name="uaProfTagName">x-wap-profile</string>
-
-    <!-- Maximum number of recipients allowed per message. Use a value of -1
-         to indicate no limit. -->
-    <int name="recipientLimit">20</int>
-
-    <!-- Additional http parameters used in MMS http request.
-         Parameters are seperated by '|'. Optional. -->
-    <string name="httpParams">x-vzw-mdn: 1##LINE1NOCOUNTRYCODE##</string>
-
-    <!-- Maximum height for an attached image -->
-    <int name="maxImageHeight">1944</int>
-
-    <!-- Maximum width for an attached image -->
-    <int name="maxImageWidth">2592</int>
-
-    <!-- If true, The text message over 160 characters will be sent in multi part.
-         If false, The text message over 160 characters will be sent
-         via multi media message or separate, independent SMS messages,
-         dependent on sendMultipartSMSAsSeparateMessages value. -->
-    <bool name="enableMultipartSMS">false</bool>
-
-    <!-- Email Gateway Number -->
-    <!-- TODO: check if this is correct for Passion -->
-    <string name="emailGatewayNumber">6245</string>
-
-    <bool name="allowAttachAudio">true</bool>
-
-    <!-- Hide the MMS read reports UI in settings -->
-    <bool name="enableMMSReadReports">false</bool>
-
-    <!-- Maximum length in chars of mms subject field -->
-    <int name="maxSubjectLength">80</int>
-
-</mms_config>
-
+<?xml version="1.0" encoding="utf-8"?>
+<!-- Copyright 2014 The Android Open Source Project
+
+     Licensed under the Apache License, Version 2.0 (the "License");
+     you may not use this file except in compliance with the License.
+     You may obtain a copy of the License at
+
+          http://www.apache.org/licenses/LICENSE-2.0
+
+     Unless required by applicable law or agreed to in writing, software
+     distributed under the License is distributed on an "AS IS" BASIS,
+     WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+     See the License for the specific language governing permissions and
+     limitations under the License.
+-->
+
+<mms_config version="2">
+    <!-- In case of single segment M-Notification.ind, this indicates whether
+         TransactionID should be appended to URI or not. -->
+    <bool name="enabledTransID">true</bool>
+
+    <!-- Send M-Acknowledge.ind and M-NotifyResp.ind to the URL received by the
+         M-Notification.ind (WAP-PUSH). -->
+    <bool name="enabledNotifyWapMMSC">true</bool>
+
+    <!-- Maximum message size in bytes for a MMS message -->
+    <int name="maxMessageSize">1048576</int>
+
+    <!-- UAProf parameter tag name -->
+    <string name="uaProfTagName">x-wap-profile</string>
+
+    <!-- Maximum number of recipients allowed per message. Use a value of -1
+         to indicate no limit. -->
+    <int name="recipientLimit">20</int>
+
+    <!-- Additional http parameters used in MMS http request.
+         Parameters are seperated by '|'. Optional. -->
+    <string name="httpParams">x-vzw-mdn: 1##LINE1NOCOUNTRYCODE##</string>
+
+    <!-- Maximum height for an attached image -->
+    <int name="maxImageHeight">1944</int>
+
+    <!-- Maximum width for an attached image -->
+    <int name="maxImageWidth">2592</int>
+
+    <!-- If true, The text message over 160 characters will be sent in multi part.
+         If false, The text message over 160 characters will be sent
+         via multi media message or separate, independent SMS messages,
+         dependent on sendMultipartSMSAsSeparateMessages value. -->
+    <bool name="enableMultipartSMS">false</bool>
+
+    <!-- Email Gateway Number -->
+    <!-- TODO: check if this is correct for Passion -->
+    <string name="emailGatewayNumber">6245</string>
+
+    <bool name="allowAttachAudio">true</bool>
+
+    <!-- Hide the MMS read reports UI in settings -->
+    <bool name="enableMMSReadReports">false</bool>
+
+    <!-- Maximum length in chars of mms subject field -->
+    <int name="maxSubjectLength">80</int>
+
+</mms_config>
+
diff --git a/android-smsmms/src/main/res/xml-mcc311-mnc224/mms_config.xml b/android-smsmms/src/main/res/xml-mcc311-mnc224/mms_config.xml
index 196d4f7f9..d9d80df27 100755
--- a/android-smsmms/src/main/res/xml-mcc311-mnc224/mms_config.xml
+++ b/android-smsmms/src/main/res/xml-mcc311-mnc224/mms_config.xml
@@ -1,65 +1,65 @@
-<?xml version="1.0" encoding="utf-8"?>
-<!-- Copyright 2014 The Android Open Source Project
-
-     Licensed under the Apache License, Version 2.0 (the "License");
-     you may not use this file except in compliance with the License.
-     You may obtain a copy of the License at
-
-          http://www.apache.org/licenses/LICENSE-2.0
-
-     Unless required by applicable law or agreed to in writing, software
-     distributed under the License is distributed on an "AS IS" BASIS,
-     WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
-     See the License for the specific language governing permissions and
-     limitations under the License.
--->
-
-<mms_config version="2">
-    <!-- In case of single segment M-Notification.ind, this indicates whether
-         TransactionID should be appended to URI or not. -->
-    <bool name="enabledTransID">true</bool>
-
-    <!-- Send M-Acknowledge.ind and M-NotifyResp.ind to the URL received by the
-         M-Notification.ind (WAP-PUSH). -->
-    <bool name="enabledNotifyWapMMSC">true</bool>
-
-    <!-- Maximum message size in bytes for a MMS message -->
-    <int name="maxMessageSize">1048576</int>
-
-    <!-- UAProf parameter tag name -->
-    <string name="uaProfTagName">x-wap-profile</string>
-
-    <!-- Maximum number of recipients allowed per message. Use a value of -1
-         to indicate no limit. -->
-    <int name="recipientLimit">20</int>
-
-    <!-- Additional http parameters used in MMS http request.
-         Parameters are seperated by '|'. Optional. -->
-    <string name="httpParams">x-vzw-mdn: 1##LINE1NOCOUNTRYCODE##</string>
-
-    <!-- Maximum height for an attached image -->
-    <int name="maxImageHeight">1944</int>
-
-    <!-- Maximum width for an attached image -->
-    <int name="maxImageWidth">2592</int>
-
-    <!-- If true, The text message over 160 characters will be sent in multi part.
-         If false, The text message over 160 characters will be sent
-         via multi media message or separate, independent SMS messages,
-         dependent on sendMultipartSMSAsSeparateMessages value. -->
-    <bool name="enableMultipartSMS">false</bool>
-
-    <!-- Email Gateway Number -->
-    <!-- TODO: check if this is correct for Passion -->
-    <string name="emailGatewayNumber">6245</string>
-
-    <bool name="allowAttachAudio">true</bool>
-
-    <!-- Hide the MMS read reports UI in settings -->
-    <bool name="enableMMSReadReports">false</bool>
-
-    <!-- Maximum length in chars of mms subject field -->
-    <int name="maxSubjectLength">80</int>
-
-</mms_config>
-
+<?xml version="1.0" encoding="utf-8"?>
+<!-- Copyright 2014 The Android Open Source Project
+
+     Licensed under the Apache License, Version 2.0 (the "License");
+     you may not use this file except in compliance with the License.
+     You may obtain a copy of the License at
+
+          http://www.apache.org/licenses/LICENSE-2.0
+
+     Unless required by applicable law or agreed to in writing, software
+     distributed under the License is distributed on an "AS IS" BASIS,
+     WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+     See the License for the specific language governing permissions and
+     limitations under the License.
+-->
+
+<mms_config version="2">
+    <!-- In case of single segment M-Notification.ind, this indicates whether
+         TransactionID should be appended to URI or not. -->
+    <bool name="enabledTransID">true</bool>
+
+    <!-- Send M-Acknowledge.ind and M-NotifyResp.ind to the URL received by the
+         M-Notification.ind (WAP-PUSH). -->
+    <bool name="enabledNotifyWapMMSC">true</bool>
+
+    <!-- Maximum message size in bytes for a MMS message -->
+    <int name="maxMessageSize">1048576</int>
+
+    <!-- UAProf parameter tag name -->
+    <string name="uaProfTagName">x-wap-profile</string>
+
+    <!-- Maximum number of recipients allowed per message. Use a value of -1
+         to indicate no limit. -->
+    <int name="recipientLimit">20</int>
+
+    <!-- Additional http parameters used in MMS http request.
+         Parameters are seperated by '|'. Optional. -->
+    <string name="httpParams">x-vzw-mdn: 1##LINE1NOCOUNTRYCODE##</string>
+
+    <!-- Maximum height for an attached image -->
+    <int name="maxImageHeight">1944</int>
+
+    <!-- Maximum width for an attached image -->
+    <int name="maxImageWidth">2592</int>
+
+    <!-- If true, The text message over 160 characters will be sent in multi part.
+         If false, The text message over 160 characters will be sent
+         via multi media message or separate, independent SMS messages,
+         dependent on sendMultipartSMSAsSeparateMessages value. -->
+    <bool name="enableMultipartSMS">false</bool>
+
+    <!-- Email Gateway Number -->
+    <!-- TODO: check if this is correct for Passion -->
+    <string name="emailGatewayNumber">6245</string>
+
+    <bool name="allowAttachAudio">true</bool>
+
+    <!-- Hide the MMS read reports UI in settings -->
+    <bool name="enableMMSReadReports">false</bool>
+
+    <!-- Maximum length in chars of mms subject field -->
+    <int name="maxSubjectLength">80</int>
+
+</mms_config>
+
diff --git a/android-smsmms/src/main/res/xml-mcc311-mnc225/mms_config.xml b/android-smsmms/src/main/res/xml-mcc311-mnc225/mms_config.xml
index 196d4f7f9..d9d80df27 100755
--- a/android-smsmms/src/main/res/xml-mcc311-mnc225/mms_config.xml
+++ b/android-smsmms/src/main/res/xml-mcc311-mnc225/mms_config.xml
@@ -1,65 +1,65 @@
-<?xml version="1.0" encoding="utf-8"?>
-<!-- Copyright 2014 The Android Open Source Project
-
-     Licensed under the Apache License, Version 2.0 (the "License");
-     you may not use this file except in compliance with the License.
-     You may obtain a copy of the License at
-
-          http://www.apache.org/licenses/LICENSE-2.0
-
-     Unless required by applicable law or agreed to in writing, software
-     distributed under the License is distributed on an "AS IS" BASIS,
-     WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
-     See the License for the specific language governing permissions and
-     limitations under the License.
--->
-
-<mms_config version="2">
-    <!-- In case of single segment M-Notification.ind, this indicates whether
-         TransactionID should be appended to URI or not. -->
-    <bool name="enabledTransID">true</bool>
-
-    <!-- Send M-Acknowledge.ind and M-NotifyResp.ind to the URL received by the
-         M-Notification.ind (WAP-PUSH). -->
-    <bool name="enabledNotifyWapMMSC">true</bool>
-
-    <!-- Maximum message size in bytes for a MMS message -->
-    <int name="maxMessageSize">1048576</int>
-
-    <!-- UAProf parameter tag name -->
-    <string name="uaProfTagName">x-wap-profile</string>
-
-    <!-- Maximum number of recipients allowed per message. Use a value of -1
-         to indicate no limit. -->
-    <int name="recipientLimit">20</int>
-
-    <!-- Additional http parameters used in MMS http request.
-         Parameters are seperated by '|'. Optional. -->
-    <string name="httpParams">x-vzw-mdn: 1##LINE1NOCOUNTRYCODE##</string>
-
-    <!-- Maximum height for an attached image -->
-    <int name="maxImageHeight">1944</int>
-
-    <!-- Maximum width for an attached image -->
-    <int name="maxImageWidth">2592</int>
-
-    <!-- If true, The text message over 160 characters will be sent in multi part.
-         If false, The text message over 160 characters will be sent
-         via multi media message or separate, independent SMS messages,
-         dependent on sendMultipartSMSAsSeparateMessages value. -->
-    <bool name="enableMultipartSMS">false</bool>
-
-    <!-- Email Gateway Number -->
-    <!-- TODO: check if this is correct for Passion -->
-    <string name="emailGatewayNumber">6245</string>
-
-    <bool name="allowAttachAudio">true</bool>
-
-    <!-- Hide the MMS read reports UI in settings -->
-    <bool name="enableMMSReadReports">false</bool>
-
-    <!-- Maximum length in chars of mms subject field -->
-    <int name="maxSubjectLength">80</int>
-
-</mms_config>
-
+<?xml version="1.0" encoding="utf-8"?>
+<!-- Copyright 2014 The Android Open Source Project
+
+     Licensed under the Apache License, Version 2.0 (the "License");
+     you may not use this file except in compliance with the License.
+     You may obtain a copy of the License at
+
+          http://www.apache.org/licenses/LICENSE-2.0
+
+     Unless required by applicable law or agreed to in writing, software
+     distributed under the License is distributed on an "AS IS" BASIS,
+     WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+     See the License for the specific language governing permissions and
+     limitations under the License.
+-->
+
+<mms_config version="2">
+    <!-- In case of single segment M-Notification.ind, this indicates whether
+         TransactionID should be appended to URI or not. -->
+    <bool name="enabledTransID">true</bool>
+
+    <!-- Send M-Acknowledge.ind and M-NotifyResp.ind to the URL received by the
+         M-Notification.ind (WAP-PUSH). -->
+    <bool name="enabledNotifyWapMMSC">true</bool>
+
+    <!-- Maximum message size in bytes for a MMS message -->
+    <int name="maxMessageSize">1048576</int>
+
+    <!-- UAProf parameter tag name -->
+    <string name="uaProfTagName">x-wap-profile</string>
+
+    <!-- Maximum number of recipients allowed per message. Use a value of -1
+         to indicate no limit. -->
+    <int name="recipientLimit">20</int>
+
+    <!-- Additional http parameters used in MMS http request.
+         Parameters are seperated by '|'. Optional. -->
+    <string name="httpParams">x-vzw-mdn: 1##LINE1NOCOUNTRYCODE##</string>
+
+    <!-- Maximum height for an attached image -->
+    <int name="maxImageHeight">1944</int>
+
+    <!-- Maximum width for an attached image -->
+    <int name="maxImageWidth">2592</int>
+
+    <!-- If true, The text message over 160 characters will be sent in multi part.
+         If false, The text message over 160 characters will be sent
+         via multi media message or separate, independent SMS messages,
+         dependent on sendMultipartSMSAsSeparateMessages value. -->
+    <bool name="enableMultipartSMS">false</bool>
+
+    <!-- Email Gateway Number -->
+    <!-- TODO: check if this is correct for Passion -->
+    <string name="emailGatewayNumber">6245</string>
+
+    <bool name="allowAttachAudio">true</bool>
+
+    <!-- Hide the MMS read reports UI in settings -->
+    <bool name="enableMMSReadReports">false</bool>
+
+    <!-- Maximum length in chars of mms subject field -->
+    <int name="maxSubjectLength">80</int>
+
+</mms_config>
+
diff --git a/android-smsmms/src/main/res/xml-mcc311-mnc226/mms_config.xml b/android-smsmms/src/main/res/xml-mcc311-mnc226/mms_config.xml
index 196d4f7f9..d9d80df27 100755
--- a/android-smsmms/src/main/res/xml-mcc311-mnc226/mms_config.xml
+++ b/android-smsmms/src/main/res/xml-mcc311-mnc226/mms_config.xml
@@ -1,65 +1,65 @@
-<?xml version="1.0" encoding="utf-8"?>
-<!-- Copyright 2014 The Android Open Source Project
-
-     Licensed under the Apache License, Version 2.0 (the "License");
-     you may not use this file except in compliance with the License.
-     You may obtain a copy of the License at
-
-          http://www.apache.org/licenses/LICENSE-2.0
-
-     Unless required by applicable law or agreed to in writing, software
-     distributed under the License is distributed on an "AS IS" BASIS,
-     WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
-     See the License for the specific language governing permissions and
-     limitations under the License.
--->
-
-<mms_config version="2">
-    <!-- In case of single segment M-Notification.ind, this indicates whether
-         TransactionID should be appended to URI or not. -->
-    <bool name="enabledTransID">true</bool>
-
-    <!-- Send M-Acknowledge.ind and M-NotifyResp.ind to the URL received by the
-         M-Notification.ind (WAP-PUSH). -->
-    <bool name="enabledNotifyWapMMSC">true</bool>
-
-    <!-- Maximum message size in bytes for a MMS message -->
-    <int name="maxMessageSize">1048576</int>
-
-    <!-- UAProf parameter tag name -->
-    <string name="uaProfTagName">x-wap-profile</string>
-
-    <!-- Maximum number of recipients allowed per message. Use a value of -1
-         to indicate no limit. -->
-    <int name="recipientLimit">20</int>
-
-    <!-- Additional http parameters used in MMS http request.
-         Parameters are seperated by '|'. Optional. -->
-    <string name="httpParams">x-vzw-mdn: 1##LINE1NOCOUNTRYCODE##</string>
-
-    <!-- Maximum height for an attached image -->
-    <int name="maxImageHeight">1944</int>
-
-    <!-- Maximum width for an attached image -->
-    <int name="maxImageWidth">2592</int>
-
-    <!-- If true, The text message over 160 characters will be sent in multi part.
-         If false, The text message over 160 characters will be sent
-         via multi media message or separate, independent SMS messages,
-         dependent on sendMultipartSMSAsSeparateMessages value. -->
-    <bool name="enableMultipartSMS">false</bool>
-
-    <!-- Email Gateway Number -->
-    <!-- TODO: check if this is correct for Passion -->
-    <string name="emailGatewayNumber">6245</string>
-
-    <bool name="allowAttachAudio">true</bool>
-
-    <!-- Hide the MMS read reports UI in settings -->
-    <bool name="enableMMSReadReports">false</bool>
-
-    <!-- Maximum length in chars of mms subject field -->
-    <int name="maxSubjectLength">80</int>
-
-</mms_config>
-
+<?xml version="1.0" encoding="utf-8"?>
+<!-- Copyright 2014 The Android Open Source Project
+
+     Licensed under the Apache License, Version 2.0 (the "License");
+     you may not use this file except in compliance with the License.
+     You may obtain a copy of the License at
+
+          http://www.apache.org/licenses/LICENSE-2.0
+
+     Unless required by applicable law or agreed to in writing, software
+     distributed under the License is distributed on an "AS IS" BASIS,
+     WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+     See the License for the specific language governing permissions and
+     limitations under the License.
+-->
+
+<mms_config version="2">
+    <!-- In case of single segment M-Notification.ind, this indicates whether
+         TransactionID should be appended to URI or not. -->
+    <bool name="enabledTransID">true</bool>
+
+    <!-- Send M-Acknowledge.ind and M-NotifyResp.ind to the URL received by the
+         M-Notification.ind (WAP-PUSH). -->
+    <bool name="enabledNotifyWapMMSC">true</bool>
+
+    <!-- Maximum message size in bytes for a MMS message -->
+    <int name="maxMessageSize">1048576</int>
+
+    <!-- UAProf parameter tag name -->
+    <string name="uaProfTagName">x-wap-profile</string>
+
+    <!-- Maximum number of recipients allowed per message. Use a value of -1
+         to indicate no limit. -->
+    <int name="recipientLimit">20</int>
+
+    <!-- Additional http parameters used in MMS http request.
+         Parameters are seperated by '|'. Optional. -->
+    <string name="httpParams">x-vzw-mdn: 1##LINE1NOCOUNTRYCODE##</string>
+
+    <!-- Maximum height for an attached image -->
+    <int name="maxImageHeight">1944</int>
+
+    <!-- Maximum width for an attached image -->
+    <int name="maxImageWidth">2592</int>
+
+    <!-- If true, The text message over 160 characters will be sent in multi part.
+         If false, The text message over 160 characters will be sent
+         via multi media message or separate, independent SMS messages,
+         dependent on sendMultipartSMSAsSeparateMessages value. -->
+    <bool name="enableMultipartSMS">false</bool>
+
+    <!-- Email Gateway Number -->
+    <!-- TODO: check if this is correct for Passion -->
+    <string name="emailGatewayNumber">6245</string>
+
+    <bool name="allowAttachAudio">true</bool>
+
+    <!-- Hide the MMS read reports UI in settings -->
+    <bool name="enableMMSReadReports">false</bool>
+
+    <!-- Maximum length in chars of mms subject field -->
+    <int name="maxSubjectLength">80</int>
+
+</mms_config>
+
diff --git a/android-smsmms/src/main/res/xml-mcc311-mnc227/mms_config.xml b/android-smsmms/src/main/res/xml-mcc311-mnc227/mms_config.xml
index 196d4f7f9..d9d80df27 100755
--- a/android-smsmms/src/main/res/xml-mcc311-mnc227/mms_config.xml
+++ b/android-smsmms/src/main/res/xml-mcc311-mnc227/mms_config.xml
@@ -1,65 +1,65 @@
-<?xml version="1.0" encoding="utf-8"?>
-<!-- Copyright 2014 The Android Open Source Project
-
-     Licensed under the Apache License, Version 2.0 (the "License");
-     you may not use this file except in compliance with the License.
-     You may obtain a copy of the License at
-
-          http://www.apache.org/licenses/LICENSE-2.0
-
-     Unless required by applicable law or agreed to in writing, software
-     distributed under the License is distributed on an "AS IS" BASIS,
-     WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
-     See the License for the specific language governing permissions and
-     limitations under the License.
--->
-
-<mms_config version="2">
-    <!-- In case of single segment M-Notification.ind, this indicates whether
-         TransactionID should be appended to URI or not. -->
-    <bool name="enabledTransID">true</bool>
-
-    <!-- Send M-Acknowledge.ind and M-NotifyResp.ind to the URL received by the
-         M-Notification.ind (WAP-PUSH). -->
-    <bool name="enabledNotifyWapMMSC">true</bool>
-
-    <!-- Maximum message size in bytes for a MMS message -->
-    <int name="maxMessageSize">1048576</int>
-
-    <!-- UAProf parameter tag name -->
-    <string name="uaProfTagName">x-wap-profile</string>
-
-    <!-- Maximum number of recipients allowed per message. Use a value of -1
-         to indicate no limit. -->
-    <int name="recipientLimit">20</int>
-
-    <!-- Additional http parameters used in MMS http request.
-         Parameters are seperated by '|'. Optional. -->
-    <string name="httpParams">x-vzw-mdn: 1##LINE1NOCOUNTRYCODE##</string>
-
-    <!-- Maximum height for an attached image -->
-    <int name="maxImageHeight">1944</int>
-
-    <!-- Maximum width for an attached image -->
-    <int name="maxImageWidth">2592</int>
-
-    <!-- If true, The text message over 160 characters will be sent in multi part.
-         If false, The text message over 160 characters will be sent
-         via multi media message or separate, independent SMS messages,
-         dependent on sendMultipartSMSAsSeparateMessages value. -->
-    <bool name="enableMultipartSMS">false</bool>
-
-    <!-- Email Gateway Number -->
-    <!-- TODO: check if this is correct for Passion -->
-    <string name="emailGatewayNumber">6245</string>
-
-    <bool name="allowAttachAudio">true</bool>
-
-    <!-- Hide the MMS read reports UI in settings -->
-    <bool name="enableMMSReadReports">false</bool>
-
-    <!-- Maximum length in chars of mms subject field -->
-    <int name="maxSubjectLength">80</int>
-
-</mms_config>
-
+<?xml version="1.0" encoding="utf-8"?>
+<!-- Copyright 2014 The Android Open Source Project
+
+     Licensed under the Apache License, Version 2.0 (the "License");
+     you may not use this file except in compliance with the License.
+     You may obtain a copy of the License at
+
+          http://www.apache.org/licenses/LICENSE-2.0
+
+     Unless required by applicable law or agreed to in writing, software
+     distributed under the License is distributed on an "AS IS" BASIS,
+     WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+     See the License for the specific language governing permissions and
+     limitations under the License.
+-->
+
+<mms_config version="2">
+    <!-- In case of single segment M-Notification.ind, this indicates whether
+         TransactionID should be appended to URI or not. -->
+    <bool name="enabledTransID">true</bool>
+
+    <!-- Send M-Acknowledge.ind and M-NotifyResp.ind to the URL received by the
+         M-Notification.ind (WAP-PUSH). -->
+    <bool name="enabledNotifyWapMMSC">true</bool>
+
+    <!-- Maximum message size in bytes for a MMS message -->
+    <int name="maxMessageSize">1048576</int>
+
+    <!-- UAProf parameter tag name -->
+    <string name="uaProfTagName">x-wap-profile</string>
+
+    <!-- Maximum number of recipients allowed per message. Use a value of -1
+         to indicate no limit. -->
+    <int name="recipientLimit">20</int>
+
+    <!-- Additional http parameters used in MMS http request.
+         Parameters are seperated by '|'. Optional. -->
+    <string name="httpParams">x-vzw-mdn: 1##LINE1NOCOUNTRYCODE##</string>
+
+    <!-- Maximum height for an attached image -->
+    <int name="maxImageHeight">1944</int>
+
+    <!-- Maximum width for an attached image -->
+    <int name="maxImageWidth">2592</int>
+
+    <!-- If true, The text message over 160 characters will be sent in multi part.
+         If false, The text message over 160 characters will be sent
+         via multi media message or separate, independent SMS messages,
+         dependent on sendMultipartSMSAsSeparateMessages value. -->
+    <bool name="enableMultipartSMS">false</bool>
+
+    <!-- Email Gateway Number -->
+    <!-- TODO: check if this is correct for Passion -->
+    <string name="emailGatewayNumber">6245</string>
+
+    <bool name="allowAttachAudio">true</bool>
+
+    <!-- Hide the MMS read reports UI in settings -->
+    <bool name="enableMMSReadReports">false</bool>
+
+    <!-- Maximum length in chars of mms subject field -->
+    <int name="maxSubjectLength">80</int>
+
+</mms_config>
+
diff --git a/android-smsmms/src/main/res/xml-mcc311-mnc228/mms_config.xml b/android-smsmms/src/main/res/xml-mcc311-mnc228/mms_config.xml
index 196d4f7f9..d9d80df27 100755
--- a/android-smsmms/src/main/res/xml-mcc311-mnc228/mms_config.xml
+++ b/android-smsmms/src/main/res/xml-mcc311-mnc228/mms_config.xml
@@ -1,65 +1,65 @@
-<?xml version="1.0" encoding="utf-8"?>
-<!-- Copyright 2014 The Android Open Source Project
-
-     Licensed under the Apache License, Version 2.0 (the "License");
-     you may not use this file except in compliance with the License.
-     You may obtain a copy of the License at
-
-          http://www.apache.org/licenses/LICENSE-2.0
-
-     Unless required by applicable law or agreed to in writing, software
-     distributed under the License is distributed on an "AS IS" BASIS,
-     WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
-     See the License for the specific language governing permissions and
-     limitations under the License.
--->
-
-<mms_config version="2">
-    <!-- In case of single segment M-Notification.ind, this indicates whether
-         TransactionID should be appended to URI or not. -->
-    <bool name="enabledTransID">true</bool>
-
-    <!-- Send M-Acknowledge.ind and M-NotifyResp.ind to the URL received by the
-         M-Notification.ind (WAP-PUSH). -->
-    <bool name="enabledNotifyWapMMSC">true</bool>
-
-    <!-- Maximum message size in bytes for a MMS message -->
-    <int name="maxMessageSize">1048576</int>
-
-    <!-- UAProf parameter tag name -->
-    <string name="uaProfTagName">x-wap-profile</string>
-
-    <!-- Maximum number of recipients allowed per message. Use a value of -1
-         to indicate no limit. -->
-    <int name="recipientLimit">20</int>
-
-    <!-- Additional http parameters used in MMS http request.
-         Parameters are seperated by '|'. Optional. -->
-    <string name="httpParams">x-vzw-mdn: 1##LINE1NOCOUNTRYCODE##</string>
-
-    <!-- Maximum height for an attached image -->
-    <int name="maxImageHeight">1944</int>
-
-    <!-- Maximum width for an attached image -->
-    <int name="maxImageWidth">2592</int>
-
-    <!-- If true, The text message over 160 characters will be sent in multi part.
-         If false, The text message over 160 characters will be sent
-         via multi media message or separate, independent SMS messages,
-         dependent on sendMultipartSMSAsSeparateMessages value. -->
-    <bool name="enableMultipartSMS">false</bool>
-
-    <!-- Email Gateway Number -->
-    <!-- TODO: check if this is correct for Passion -->
-    <string name="emailGatewayNumber">6245</string>
-
-    <bool name="allowAttachAudio">true</bool>
-
-    <!-- Hide the MMS read reports UI in settings -->
-    <bool name="enableMMSReadReports">false</bool>
-
-    <!-- Maximum length in chars of mms subject field -->
-    <int name="maxSubjectLength">80</int>
-
-</mms_config>
-
+<?xml version="1.0" encoding="utf-8"?>
+<!-- Copyright 2014 The Android Open Source Project
+
+     Licensed under the Apache License, Version 2.0 (the "License");
+     you may not use this file except in compliance with the License.
+     You may obtain a copy of the License at
+
+          http://www.apache.org/licenses/LICENSE-2.0
+
+     Unless required by applicable law or agreed to in writing, software
+     distributed under the License is distributed on an "AS IS" BASIS,
+     WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+     See the License for the specific language governing permissions and
+     limitations under the License.
+-->
+
+<mms_config version="2">
+    <!-- In case of single segment M-Notification.ind, this indicates whether
+         TransactionID should be appended to URI or not. -->
+    <bool name="enabledTransID">true</bool>
+
+    <!-- Send M-Acknowledge.ind and M-NotifyResp.ind to the URL received by the
+         M-Notification.ind (WAP-PUSH). -->
+    <bool name="enabledNotifyWapMMSC">true</bool>
+
+    <!-- Maximum message size in bytes for a MMS message -->
+    <int name="maxMessageSize">1048576</int>
+
+    <!-- UAProf parameter tag name -->
+    <string name="uaProfTagName">x-wap-profile</string>
+
+    <!-- Maximum number of recipients allowed per message. Use a value of -1
+         to indicate no limit. -->
+    <int name="recipientLimit">20</int>
+
+    <!-- Additional http parameters used in MMS http request.
+         Parameters are seperated by '|'. Optional. -->
+    <string name="httpParams">x-vzw-mdn: 1##LINE1NOCOUNTRYCODE##</string>
+
+    <!-- Maximum height for an attached image -->
+    <int name="maxImageHeight">1944</int>
+
+    <!-- Maximum width for an attached image -->
+    <int name="maxImageWidth">2592</int>
+
+    <!-- If true, The text message over 160 characters will be sent in multi part.
+         If false, The text message over 160 characters will be sent
+         via multi media message or separate, independent SMS messages,
+         dependent on sendMultipartSMSAsSeparateMessages value. -->
+    <bool name="enableMultipartSMS">false</bool>
+
+    <!-- Email Gateway Number -->
+    <!-- TODO: check if this is correct for Passion -->
+    <string name="emailGatewayNumber">6245</string>
+
+    <bool name="allowAttachAudio">true</bool>
+
+    <!-- Hide the MMS read reports UI in settings -->
+    <bool name="enableMMSReadReports">false</bool>
+
+    <!-- Maximum length in chars of mms subject field -->
+    <int name="maxSubjectLength">80</int>
+
+</mms_config>
+
diff --git a/android-smsmms/src/main/res/xml-mcc311-mnc229/mms_config.xml b/android-smsmms/src/main/res/xml-mcc311-mnc229/mms_config.xml
index 196d4f7f9..d9d80df27 100755
--- a/android-smsmms/src/main/res/xml-mcc311-mnc229/mms_config.xml
+++ b/android-smsmms/src/main/res/xml-mcc311-mnc229/mms_config.xml
@@ -1,65 +1,65 @@
-<?xml version="1.0" encoding="utf-8"?>
-<!-- Copyright 2014 The Android Open Source Project
-
-     Licensed under the Apache License, Version 2.0 (the "License");
-     you may not use this file except in compliance with the License.
-     You may obtain a copy of the License at
-
-          http://www.apache.org/licenses/LICENSE-2.0
-
-     Unless required by applicable law or agreed to in writing, software
-     distributed under the License is distributed on an "AS IS" BASIS,
-     WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
-     See the License for the specific language governing permissions and
-     limitations under the License.
--->
-
-<mms_config version="2">
-    <!-- In case of single segment M-Notification.ind, this indicates whether
-         TransactionID should be appended to URI or not. -->
-    <bool name="enabledTransID">true</bool>
-
-    <!-- Send M-Acknowledge.ind and M-NotifyResp.ind to the URL received by the
-         M-Notification.ind (WAP-PUSH). -->
-    <bool name="enabledNotifyWapMMSC">true</bool>
-
-    <!-- Maximum message size in bytes for a MMS message -->
-    <int name="maxMessageSize">1048576</int>
-
-    <!-- UAProf parameter tag name -->
-    <string name="uaProfTagName">x-wap-profile</string>
-
-    <!-- Maximum number of recipients allowed per message. Use a value of -1
-         to indicate no limit. -->
-    <int name="recipientLimit">20</int>
-
-    <!-- Additional http parameters used in MMS http request.
-         Parameters are seperated by '|'. Optional. -->
-    <string name="httpParams">x-vzw-mdn: 1##LINE1NOCOUNTRYCODE##</string>
-
-    <!-- Maximum height for an attached image -->
-    <int name="maxImageHeight">1944</int>
-
-    <!-- Maximum width for an attached image -->
-    <int name="maxImageWidth">2592</int>
-
-    <!-- If true, The text message over 160 characters will be sent in multi part.
-         If false, The text message over 160 characters will be sent
-         via multi media message or separate, independent SMS messages,
-         dependent on sendMultipartSMSAsSeparateMessages value. -->
-    <bool name="enableMultipartSMS">false</bool>
-
-    <!-- Email Gateway Number -->
-    <!-- TODO: check if this is correct for Passion -->
-    <string name="emailGatewayNumber">6245</string>
-
-    <bool name="allowAttachAudio">true</bool>
-
-    <!-- Hide the MMS read reports UI in settings -->
-    <bool name="enableMMSReadReports">false</bool>
-
-    <!-- Maximum length in chars of mms subject field -->
-    <int name="maxSubjectLength">80</int>
-
-</mms_config>
-
+<?xml version="1.0" encoding="utf-8"?>
+<!-- Copyright 2014 The Android Open Source Project
+
+     Licensed under the Apache License, Version 2.0 (the "License");
+     you may not use this file except in compliance with the License.
+     You may obtain a copy of the License at
+
+          http://www.apache.org/licenses/LICENSE-2.0
+
+     Unless required by applicable law or agreed to in writing, software
+     distributed under the License is distributed on an "AS IS" BASIS,
+     WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+     See the License for the specific language governing permissions and
+     limitations under the License.
+-->
+
+<mms_config version="2">
+    <!-- In case of single segment M-Notification.ind, this indicates whether
+         TransactionID should be appended to URI or not. -->
+    <bool name="enabledTransID">true</bool>
+
+    <!-- Send M-Acknowledge.ind and M-NotifyResp.ind to the URL received by the
+         M-Notification.ind (WAP-PUSH). -->
+    <bool name="enabledNotifyWapMMSC">true</bool>
+
+    <!-- Maximum message size in bytes for a MMS message -->
+    <int name="maxMessageSize">1048576</int>
+
+    <!-- UAProf parameter tag name -->
+    <string name="uaProfTagName">x-wap-profile</string>
+
+    <!-- Maximum number of recipients allowed per message. Use a value of -1
+         to indicate no limit. -->
+    <int name="recipientLimit">20</int>
+
+    <!-- Additional http parameters used in MMS http request.
+         Parameters are seperated by '|'. Optional. -->
+    <string name="httpParams">x-vzw-mdn: 1##LINE1NOCOUNTRYCODE##</string>
+
+    <!-- Maximum height for an attached image -->
+    <int name="maxImageHeight">1944</int>
+
+    <!-- Maximum width for an attached image -->
+    <int name="maxImageWidth">2592</int>
+
+    <!-- If true, The text message over 160 characters will be sent in multi part.
+         If false, The text message over 160 characters will be sent
+         via multi media message or separate, independent SMS messages,
+         dependent on sendMultipartSMSAsSeparateMessages value. -->
+    <bool name="enableMultipartSMS">false</bool>
+
+    <!-- Email Gateway Number -->
+    <!-- TODO: check if this is correct for Passion -->
+    <string name="emailGatewayNumber">6245</string>
+
+    <bool name="allowAttachAudio">true</bool>
+
+    <!-- Hide the MMS read reports UI in settings -->
+    <bool name="enableMMSReadReports">false</bool>
+
+    <!-- Maximum length in chars of mms subject field -->
+    <int name="maxSubjectLength">80</int>
+
+</mms_config>
+
diff --git a/android-smsmms/src/main/res/xml-mcc311-mnc230/mms_config.xml b/android-smsmms/src/main/res/xml-mcc311-mnc230/mms_config.xml
index b82f1d6ee..0a92e6d5c 100755
--- a/android-smsmms/src/main/res/xml-mcc311-mnc230/mms_config.xml
+++ b/android-smsmms/src/main/res/xml-mcc311-mnc230/mms_config.xml
@@ -1,95 +1,95 @@
-<?xml version="1.0" encoding="utf-8"?>
-<!-- Copyright (C) 2009 The Android Open Source Project
-
-     Licensed under the Apache License, Version 2.0 (the "License");
-     you may not use this file except in compliance with the License.
-     You may obtain a copy of the License at
-
-          http://www.apache.org/licenses/LICENSE-2.0
-
-     Unless required by applicable law or agreed to in writing, software
-     distributed under the License is distributed on an "AS IS" BASIS,
-     WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
-     See the License for the specific language governing permissions and
-     limitations under the License.
--->
-
-<!-- Version History
-        version 1 - initial version.
-        version 2 - added recipientLimit.
-        version 3 - added min/max recycler values.
-        version 4 - added sms to mms text threshold.
--->
-<!--C Spire configuration-->
-<mms_config version="4">
-    <!-- Flag indicating whether MMS should be enabled -->
-    <bool name="enabledMMS">true</bool>
-
-    <!-- Maximum message size in bytes for a MMS message -->
-    <int name="maxMessageSize">1048576</int>
-
-    <!-- Maximum height for an attached image -->
-    <int name="maxImageHeight">2432</int>
-
-    <!-- Maximum width for an attached image -->
-    <int name="maxImageWidth">4320</int>
-
-    <!-- Maximum number of SMS message to save per thread before auto-delete kicks in.
-         This is the default value. -->
-    <int name="defaultSMSMessagesPerThread">500</int>
-
-    <!-- Maximum number of MMS message to save per thread before auto-delete kicks in.
-         This is the default value. -->
-    <int name="defaultMMSMessagesPerThread">50</int>
-
-    <!-- Minimum value for the number of messages kept per conversation. The user can never
-         set the limit below this value. -->
-    <int name="minMessageCountPerThread">10</int>
-
-    <!-- Maximum value for the number of messages kept per conversation. The user can never
-         set the limit above this value. -->
-    <int name="maxMessageCountPerThread">5000</int>
-
-    <!-- Maximum number of recipients allowed per message. Use a value of -1
-         to indicate no limit. -->
-    <int name="recipientLimit">20</int>
-
-    <!-- If true, The text message over 160 characters will be sent in multi part.
-         If false, The text message over 160 characters will be sent
-         via multi media message. -->
-    <bool name="enableMultipartSMS">false</bool>
-
-    <!-- If enableMultipartSMS is true and smsToMmsTextThreshold > 1, then multi-part SMS messages
-         will be converted into a single mms message. For example, if the mms_config.xml file
-         specifies <int name="smsToMmsTextThreshold">7</int>, then on the 8th sms segment, the
-         message will be converted to an mms. -->
-    <int name="smsToMmsTextThreshold">-1</int>
-
-    <!-- If true, The mms support slide duration.
-         If false, The mms does not support slide duration and we have to
-         set duration value. -->
-    <bool name="enableSlideDuration">false</bool>
-
-    <!-- Maximum length for message text. Use a value of -1
-         to indicate default value -->
-    <int name="maxMessageTextSize">-1</int>
-
-    <!-- Maximum length in chars of mms subject field -->
-    <int name="maxSubjectLength">80</int>
-
-    <!-- Email Gateway Number -->
-    <string name="emailGatewayNumber">6245</string>
-
-    <!-- Hide the MMS read reports UI in settings -->
-    <bool name="enableMMSReadReports">false</bool>
-
-    <!-- Flag indicating whether SMS Delivery Reports UI option should be shown -->
-    <bool name="enableSMSDeliveryReports">false</bool>
-
-    <!-- Flag indicating whether MMS Delivery Reports UI option should be shown -->
-    <bool name="enableMMSDeliveryReports">false</bool>
-
-    <!-- Reference for additional http parameters used in MMS http request. -->
-    <string name="httpParams">X-CS3G-MDN: 1##LINE1NOCOUNTRYCODE##</string>
-
-</mms_config>
+<?xml version="1.0" encoding="utf-8"?>
+<!-- Copyright (C) 2009 The Android Open Source Project
+
+     Licensed under the Apache License, Version 2.0 (the "License");
+     you may not use this file except in compliance with the License.
+     You may obtain a copy of the License at
+
+          http://www.apache.org/licenses/LICENSE-2.0
+
+     Unless required by applicable law or agreed to in writing, software
+     distributed under the License is distributed on an "AS IS" BASIS,
+     WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+     See the License for the specific language governing permissions and
+     limitations under the License.
+-->
+
+<!-- Version History
+        version 1 - initial version.
+        version 2 - added recipientLimit.
+        version 3 - added min/max recycler values.
+        version 4 - added sms to mms text threshold.
+-->
+<!--C Spire configuration-->
+<mms_config version="4">
+    <!-- Flag indicating whether MMS should be enabled -->
+    <bool name="enabledMMS">true</bool>
+
+    <!-- Maximum message size in bytes for a MMS message -->
+    <int name="maxMessageSize">1048576</int>
+
+    <!-- Maximum height for an attached image -->
+    <int name="maxImageHeight">2432</int>
+
+    <!-- Maximum width for an attached image -->
+    <int name="maxImageWidth">4320</int>
+
+    <!-- Maximum number of SMS message to save per thread before auto-delete kicks in.
+         This is the default value. -->
+    <int name="defaultSMSMessagesPerThread">500</int>
+
+    <!-- Maximum number of MMS message to save per thread before auto-delete kicks in.
+         This is the default value. -->
+    <int name="defaultMMSMessagesPerThread">50</int>
+
+    <!-- Minimum value for the number of messages kept per conversation. The user can never
+         set the limit below this value. -->
+    <int name="minMessageCountPerThread">10</int>
+
+    <!-- Maximum value for the number of messages kept per conversation. The user can never
+         set the limit above this value. -->
+    <int name="maxMessageCountPerThread">5000</int>
+
+    <!-- Maximum number of recipients allowed per message. Use a value of -1
+         to indicate no limit. -->
+    <int name="recipientLimit">20</int>
+
+    <!-- If true, The text message over 160 characters will be sent in multi part.
+         If false, The text message over 160 characters will be sent
+         via multi media message. -->
+    <bool name="enableMultipartSMS">false</bool>
+
+    <!-- If enableMultipartSMS is true and smsToMmsTextThreshold > 1, then multi-part SMS messages
+         will be converted into a single mms message. For example, if the mms_config.xml file
+         specifies <int name="smsToMmsTextThreshold">7</int>, then on the 8th sms segment, the
+         message will be converted to an mms. -->
+    <int name="smsToMmsTextThreshold">-1</int>
+
+    <!-- If true, The mms support slide duration.
+         If false, The mms does not support slide duration and we have to
+         set duration value. -->
+    <bool name="enableSlideDuration">false</bool>
+
+    <!-- Maximum length for message text. Use a value of -1
+         to indicate default value -->
+    <int name="maxMessageTextSize">-1</int>
+
+    <!-- Maximum length in chars of mms subject field -->
+    <int name="maxSubjectLength">80</int>
+
+    <!-- Email Gateway Number -->
+    <string name="emailGatewayNumber">6245</string>
+
+    <!-- Hide the MMS read reports UI in settings -->
+    <bool name="enableMMSReadReports">false</bool>
+
+    <!-- Flag indicating whether SMS Delivery Reports UI option should be shown -->
+    <bool name="enableSMSDeliveryReports">false</bool>
+
+    <!-- Flag indicating whether MMS Delivery Reports UI option should be shown -->
+    <bool name="enableMMSDeliveryReports">false</bool>
+
+    <!-- Reference for additional http parameters used in MMS http request. -->
+    <string name="httpParams">X-CS3G-MDN: 1##LINE1NOCOUNTRYCODE##</string>
+
+</mms_config>
diff --git a/android-smsmms/src/main/res/xml-mcc311-mnc340/mms_config.xml b/android-smsmms/src/main/res/xml-mcc311-mnc340/mms_config.xml
index eb8da8066..5aa222dcd 100755
--- a/android-smsmms/src/main/res/xml-mcc311-mnc340/mms_config.xml
+++ b/android-smsmms/src/main/res/xml-mcc311-mnc340/mms_config.xml
@@ -1,83 +1,83 @@
-<?xml version="1.0" encoding="utf-8"?>
-<!-- Copyright (C) 2009 The Android Open Source Project
-
-     Licensed under the Apache License, Version 2.0 (the "License");
-     you may not use this file except in compliance with the License.
-     You may obtain a copy of the License at
-
-          http://www.apache.org/licenses/LICENSE-2.0
-
-     Unless required by applicable law or agreed to in writing, software
-     distributed under the License is distributed on an "AS IS" BASIS,
-     WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
-     See the License for the specific language governing permissions and
-     limitations under the License.
--->
-
-<!-- Version History
-        version 1 - initial version.
-        version 2 - added recipientLimit.
-        version 3 - added min/max recycler values.
-        version 4 - added sms to mms text threshold.
--->
-
-<mms_config version="4">
-    <!-- Flag indicating whether MMS should be enabled -->
-    <bool name="enabledMMS">true</bool>
-
-    <!-- Maximum message size in bytes for a MMS message -->
-    <int name="maxMessageSize">1228800</int>
-
-    <!-- Maximum height for an attached image -->
-    <int name="maxImageHeight">2432</int>
-
-    <!-- Maximum width for an attached image -->
-    <int name="maxImageWidth">4320</int>
-
-    <!-- Maximum number of SMS message to save per thread before auto-delete kicks in.
-         This is the default value. -->
-    <int name="defaultSMSMessagesPerThread">500</int>
-
-    <!-- Maximum number of MMS message to save per thread before auto-delete kicks in.
-         This is the default value. -->
-    <int name="defaultMMSMessagesPerThread">50</int>
-
-    <!-- Minimum value for the number of messages kept per conversation. The user can never
-         set the limit below this value. -->
-    <int name="minMessageCountPerThread">10</int>
-
-    <!-- Maximum value for the number of messages kept per conversation. The user can never
-         set the limit above this value. -->
-    <int name="maxMessageCountPerThread">5000</int>
-
-    <!-- Maximum number of recipients allowed per message. Use a value of -1
-         to indicate no limit. -->
-    <int name="recipientLimit">20</int>
-
-    <!-- If true, The text message over 160 characters will be sent in multi part.
-         If false, The text message over 160 characters will be sent
-         via multi media message. -->
-    <bool name="enableMultipartSMS">true</bool>
-
-    <!-- If enableMultipartSMS is true and smsToMmsTextThreshold > 1, then multi-part SMS messages
-         will be converted into a single mms message. For example, if the mms_config.xml file
-         specifies <int name="smsToMmsTextThreshold">7</int>, then on the 8th sms segment, the
-         message will be converted to an mms. -->
-    <int name="smsToMmsTextThreshold">1</int>
-
-    <!-- If true, The mms support slide duration.
-         If false, The mms does not support slide duration and we have to
-         set duration value. -->
-    <bool name="enableSlideDuration">true</bool>
-
-    <!-- Maximum length for message text. Use a value of -1
-         to indicate default value -->
-    <int name="maxMessageTextSize">-1</int>
-
-    <!-- Maximum length in chars of mms subject field -->
-    <int name="maxSubjectLength">80</int>
-
-     <!-- Reference for additional http parameters used in MMS http request.
-          Parameters are seperated by '|'. Optional.  -->
-     <string name="httpParams">X-MDN: ##LINE1##</string>
-</mms_config>
+<?xml version="1.0" encoding="utf-8"?>
+<!-- Copyright (C) 2009 The Android Open Source Project
+
+     Licensed under the Apache License, Version 2.0 (the "License");
+     you may not use this file except in compliance with the License.
+     You may obtain a copy of the License at
+
+          http://www.apache.org/licenses/LICENSE-2.0
+
+     Unless required by applicable law or agreed to in writing, software
+     distributed under the License is distributed on an "AS IS" BASIS,
+     WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+     See the License for the specific language governing permissions and
+     limitations under the License.
+-->
+
+<!-- Version History
+        version 1 - initial version.
+        version 2 - added recipientLimit.
+        version 3 - added min/max recycler values.
+        version 4 - added sms to mms text threshold.
+-->
+
+<mms_config version="4">
+    <!-- Flag indicating whether MMS should be enabled -->
+    <bool name="enabledMMS">true</bool>
+
+    <!-- Maximum message size in bytes for a MMS message -->
+    <int name="maxMessageSize">1228800</int>
+
+    <!-- Maximum height for an attached image -->
+    <int name="maxImageHeight">2432</int>
+
+    <!-- Maximum width for an attached image -->
+    <int name="maxImageWidth">4320</int>
+
+    <!-- Maximum number of SMS message to save per thread before auto-delete kicks in.
+         This is the default value. -->
+    <int name="defaultSMSMessagesPerThread">500</int>
+
+    <!-- Maximum number of MMS message to save per thread before auto-delete kicks in.
+         This is the default value. -->
+    <int name="defaultMMSMessagesPerThread">50</int>
+
+    <!-- Minimum value for the number of messages kept per conversation. The user can never
+         set the limit below this value. -->
+    <int name="minMessageCountPerThread">10</int>
+
+    <!-- Maximum value for the number of messages kept per conversation. The user can never
+         set the limit above this value. -->
+    <int name="maxMessageCountPerThread">5000</int>
+
+    <!-- Maximum number of recipients allowed per message. Use a value of -1
+         to indicate no limit. -->
+    <int name="recipientLimit">20</int>
+
+    <!-- If true, The text message over 160 characters will be sent in multi part.
+         If false, The text message over 160 characters will be sent
+         via multi media message. -->
+    <bool name="enableMultipartSMS">true</bool>
+
+    <!-- If enableMultipartSMS is true and smsToMmsTextThreshold > 1, then multi-part SMS messages
+         will be converted into a single mms message. For example, if the mms_config.xml file
+         specifies <int name="smsToMmsTextThreshold">7</int>, then on the 8th sms segment, the
+         message will be converted to an mms. -->
+    <int name="smsToMmsTextThreshold">1</int>
+
+    <!-- If true, The mms support slide duration.
+         If false, The mms does not support slide duration and we have to
+         set duration value. -->
+    <bool name="enableSlideDuration">true</bool>
+
+    <!-- Maximum length for message text. Use a value of -1
+         to indicate default value -->
+    <int name="maxMessageTextSize">-1</int>
+
+    <!-- Maximum length in chars of mms subject field -->
+    <int name="maxSubjectLength">80</int>
+
+     <!-- Reference for additional http parameters used in MMS http request.
+          Parameters are seperated by '|'. Optional.  -->
+     <string name="httpParams">X-MDN: ##LINE1##</string>
+</mms_config>
diff --git a/android-smsmms/src/main/res/xml-mcc311-mnc370/mms_config.xml b/android-smsmms/src/main/res/xml-mcc311-mnc370/mms_config.xml
index 96e5b9df7..de6b16bd2 100755
--- a/android-smsmms/src/main/res/xml-mcc311-mnc370/mms_config.xml
+++ b/android-smsmms/src/main/res/xml-mcc311-mnc370/mms_config.xml
@@ -1,33 +1,33 @@
-<?xml version="1.0" encoding="utf-8"?>
-<!-- Copyright 2013 The Android Open Source Project
-
-     Licensed under the Apache License, Version 2.0 (the "License");
-     you may not use this file except in compliance with the License.
-     You may obtain a copy of the License at
-
-          http://www.apache.org/licenses/LICENSE-2.0
-
-     Unless required by applicable law or agreed to in writing, software
-     distributed under the License is distributed on an "AS IS" BASIS,
-     WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
-     See the License for the specific language governing permissions and
-     limitations under the License.
--->
-
-<!-- Version History
-        version 1 - initial version.
-        version 2 - added recipientLimit.
-        version 3 - added min/max recycler values.
-        version 4 - added sms to mms text threshold.
--->
-
-<mms_config version="4">
-    <!-- Maximum message size in bytes for a MMS message -->
-    <int name="maxMessageSize">1048576</int>
-
-    <!-- Maximum height for an attached image -->
-    <int name="maxImageHeight">1944</int>
-
-    <!-- Maximum width for an attached image -->
-    <int name="maxImageWidth">2592</int>
-</mms_config>
+<?xml version="1.0" encoding="utf-8"?>
+<!-- Copyright 2013 The Android Open Source Project
+
+     Licensed under the Apache License, Version 2.0 (the "License");
+     you may not use this file except in compliance with the License.
+     You may obtain a copy of the License at
+
+          http://www.apache.org/licenses/LICENSE-2.0
+
+     Unless required by applicable law or agreed to in writing, software
+     distributed under the License is distributed on an "AS IS" BASIS,
+     WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+     See the License for the specific language governing permissions and
+     limitations under the License.
+-->
+
+<!-- Version History
+        version 1 - initial version.
+        version 2 - added recipientLimit.
+        version 3 - added min/max recycler values.
+        version 4 - added sms to mms text threshold.
+-->
+
+<mms_config version="4">
+    <!-- Maximum message size in bytes for a MMS message -->
+    <int name="maxMessageSize">1048576</int>
+
+    <!-- Maximum height for an attached image -->
+    <int name="maxImageHeight">1944</int>
+
+    <!-- Maximum width for an attached image -->
+    <int name="maxImageWidth">2592</int>
+</mms_config>
diff --git a/android-smsmms/src/main/res/xml-mcc311-mnc410/mms_config.xml b/android-smsmms/src/main/res/xml-mcc311-mnc410/mms_config.xml
index 962285793..b6c20a12f 100755
--- a/android-smsmms/src/main/res/xml-mcc311-mnc410/mms_config.xml
+++ b/android-smsmms/src/main/res/xml-mcc311-mnc410/mms_config.xml
@@ -1,83 +1,83 @@
-<?xml version="1.0" encoding="utf-8"?>
-<!-- Copyright (C) 2009 The Android Open Source Project
-
-     Licensed under the Apache License, Version 2.0 (the "License");
-     you may not use this file except in compliance with the License.
-     You may obtain a copy of the License at
-
-          http://www.apache.org/licenses/LICENSE-2.0
-
-     Unless required by applicable law or agreed to in writing, software
-     distributed under the License is distributed on an "AS IS" BASIS,
-     WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
-     See the License for the specific language governing permissions and
-     limitations under the License.
--->
-
-<!-- Version History
-        version 1 - initial version.
-        version 2 - added recipientLimit.
-        version 3 - added min/max recycler values.
-        version 4 - added sms to mms text threshold.
--->
-
-<mms_config version="4">
-    <!-- Flag indicating whether MMS should be enabled -->
-    <bool name="enabledMMS">true</bool>
-
-    <!-- Maximum message size in bytes for a MMS message -->
-    <int name="maxMessageSize">1048576</int>
-
-    <!-- Maximum height for an attached image -->
-    <int name="maxImageHeight">2432</int>
-
-    <!-- Maximum width for an attached image -->
-    <int name="maxImageWidth">4320</int>
-
-    <!-- Maximum number of SMS message to save per thread before auto-delete kicks in.
-         This is the default value. -->
-    <int name="defaultSMSMessagesPerThread">500</int>
-
-    <!-- Maximum number of MMS message to save per thread before auto-delete kicks in.
-         This is the default value. -->
-    <int name="defaultMMSMessagesPerThread">50</int>
-
-    <!-- Minimum value for the number of messages kept per conversation. The user can never
-         set the limit below this value. -->
-    <int name="minMessageCountPerThread">10</int>
-
-    <!-- Maximum value for the number of messages kept per conversation. The user can never
-         set the limit above this value. -->
-    <int name="maxMessageCountPerThread">5000</int>
-
-    <!-- Maximum number of recipients allowed per message. Use a value of -1
-         to indicate no limit. -->
-    <int name="recipientLimit">20</int>
-
-    <!-- If true, The text message over 160 characters will be sent in multi part.
-         If false, The text message over 160 characters will be sent
-         via multi media message. -->
-    <bool name="enableMultipartSMS">true</bool>
-
-    <!-- If enableMultipartSMS is true and smsToMmsTextThreshold > 1, then multi-part SMS messages
-         will be converted into a single mms message. For example, if the mms_config.xml file
-         specifies <int name="smsToMmsTextThreshold">7</int>, then on the 8th sms segment, the
-         message will be converted to an mms. -->
-    <int name="smsToMmsTextThreshold">1</int>
-
-    <!-- If true, The mms support slide duration.
-         If false, The mms does not support slide duration and we have to
-         set duration value. -->
-    <bool name="enableSlideDuration">true</bool>
-
-    <!-- Maximum length for message text. Use a value of -1
-         to indicate default value -->
-    <int name="maxMessageTextSize">-1</int>
-
-    <!-- Maximum length in chars of mms subject field -->
-    <int name="maxSubjectLength">80</int>
-
-     <!-- Reference for additional http parameters used in MMS http request.
-          Parameters are seperated by '|'. Optional.  -->
-     <string name="httpParams">X-MDN: ##LINE1##</string>
-</mms_config>
+<?xml version="1.0" encoding="utf-8"?>
+<!-- Copyright (C) 2009 The Android Open Source Project
+
+     Licensed under the Apache License, Version 2.0 (the "License");
+     you may not use this file except in compliance with the License.
+     You may obtain a copy of the License at
+
+          http://www.apache.org/licenses/LICENSE-2.0
+
+     Unless required by applicable law or agreed to in writing, software
+     distributed under the License is distributed on an "AS IS" BASIS,
+     WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+     See the License for the specific language governing permissions and
+     limitations under the License.
+-->
+
+<!-- Version History
+        version 1 - initial version.
+        version 2 - added recipientLimit.
+        version 3 - added min/max recycler values.
+        version 4 - added sms to mms text threshold.
+-->
+
+<mms_config version="4">
+    <!-- Flag indicating whether MMS should be enabled -->
+    <bool name="enabledMMS">true</bool>
+
+    <!-- Maximum message size in bytes for a MMS message -->
+    <int name="maxMessageSize">1048576</int>
+
+    <!-- Maximum height for an attached image -->
+    <int name="maxImageHeight">2432</int>
+
+    <!-- Maximum width for an attached image -->
+    <int name="maxImageWidth">4320</int>
+
+    <!-- Maximum number of SMS message to save per thread before auto-delete kicks in.
+         This is the default value. -->
+    <int name="defaultSMSMessagesPerThread">500</int>
+
+    <!-- Maximum number of MMS message to save per thread before auto-delete kicks in.
+         This is the default value. -->
+    <int name="defaultMMSMessagesPerThread">50</int>
+
+    <!-- Minimum value for the number of messages kept per conversation. The user can never
+         set the limit below this value. -->
+    <int name="minMessageCountPerThread">10</int>
+
+    <!-- Maximum value for the number of messages kept per conversation. The user can never
+         set the limit above this value. -->
+    <int name="maxMessageCountPerThread">5000</int>
+
+    <!-- Maximum number of recipients allowed per message. Use a value of -1
+         to indicate no limit. -->
+    <int name="recipientLimit">20</int>
+
+    <!-- If true, The text message over 160 characters will be sent in multi part.
+         If false, The text message over 160 characters will be sent
+         via multi media message. -->
+    <bool name="enableMultipartSMS">true</bool>
+
+    <!-- If enableMultipartSMS is true and smsToMmsTextThreshold > 1, then multi-part SMS messages
+         will be converted into a single mms message. For example, if the mms_config.xml file
+         specifies <int name="smsToMmsTextThreshold">7</int>, then on the 8th sms segment, the
+         message will be converted to an mms. -->
+    <int name="smsToMmsTextThreshold">1</int>
+
+    <!-- If true, The mms support slide duration.
+         If false, The mms does not support slide duration and we have to
+         set duration value. -->
+    <bool name="enableSlideDuration">true</bool>
+
+    <!-- Maximum length for message text. Use a value of -1
+         to indicate default value -->
+    <int name="maxMessageTextSize">-1</int>
+
+    <!-- Maximum length in chars of mms subject field -->
+    <int name="maxSubjectLength">80</int>
+
+     <!-- Reference for additional http parameters used in MMS http request.
+          Parameters are seperated by '|'. Optional.  -->
+     <string name="httpParams">X-MDN: ##LINE1##</string>
+</mms_config>
diff --git a/android-smsmms/src/main/res/xml-mcc311-mnc430/mms_config.xml b/android-smsmms/src/main/res/xml-mcc311-mnc430/mms_config.xml
index 962285793..b6c20a12f 100755
--- a/android-smsmms/src/main/res/xml-mcc311-mnc430/mms_config.xml
+++ b/android-smsmms/src/main/res/xml-mcc311-mnc430/mms_config.xml
@@ -1,83 +1,83 @@
-<?xml version="1.0" encoding="utf-8"?>
-<!-- Copyright (C) 2009 The Android Open Source Project
-
-     Licensed under the Apache License, Version 2.0 (the "License");
-     you may not use this file except in compliance with the License.
-     You may obtain a copy of the License at
-
-          http://www.apache.org/licenses/LICENSE-2.0
-
-     Unless required by applicable law or agreed to in writing, software
-     distributed under the License is distributed on an "AS IS" BASIS,
-     WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
-     See the License for the specific language governing permissions and
-     limitations under the License.
--->
-
-<!-- Version History
-        version 1 - initial version.
-        version 2 - added recipientLimit.
-        version 3 - added min/max recycler values.
-        version 4 - added sms to mms text threshold.
--->
-
-<mms_config version="4">
-    <!-- Flag indicating whether MMS should be enabled -->
-    <bool name="enabledMMS">true</bool>
-
-    <!-- Maximum message size in bytes for a MMS message -->
-    <int name="maxMessageSize">1048576</int>
-
-    <!-- Maximum height for an attached image -->
-    <int name="maxImageHeight">2432</int>
-
-    <!-- Maximum width for an attached image -->
-    <int name="maxImageWidth">4320</int>
-
-    <!-- Maximum number of SMS message to save per thread before auto-delete kicks in.
-         This is the default value. -->
-    <int name="defaultSMSMessagesPerThread">500</int>
-
-    <!-- Maximum number of MMS message to save per thread before auto-delete kicks in.
-         This is the default value. -->
-    <int name="defaultMMSMessagesPerThread">50</int>
-
-    <!-- Minimum value for the number of messages kept per conversation. The user can never
-         set the limit below this value. -->
-    <int name="minMessageCountPerThread">10</int>
-
-    <!-- Maximum value for the number of messages kept per conversation. The user can never
-         set the limit above this value. -->
-    <int name="maxMessageCountPerThread">5000</int>
-
-    <!-- Maximum number of recipients allowed per message. Use a value of -1
-         to indicate no limit. -->
-    <int name="recipientLimit">20</int>
-
-    <!-- If true, The text message over 160 characters will be sent in multi part.
-         If false, The text message over 160 characters will be sent
-         via multi media message. -->
-    <bool name="enableMultipartSMS">true</bool>
-
-    <!-- If enableMultipartSMS is true and smsToMmsTextThreshold > 1, then multi-part SMS messages
-         will be converted into a single mms message. For example, if the mms_config.xml file
-         specifies <int name="smsToMmsTextThreshold">7</int>, then on the 8th sms segment, the
-         message will be converted to an mms. -->
-    <int name="smsToMmsTextThreshold">1</int>
-
-    <!-- If true, The mms support slide duration.
-         If false, The mms does not support slide duration and we have to
-         set duration value. -->
-    <bool name="enableSlideDuration">true</bool>
-
-    <!-- Maximum length for message text. Use a value of -1
-         to indicate default value -->
-    <int name="maxMessageTextSize">-1</int>
-
-    <!-- Maximum length in chars of mms subject field -->
-    <int name="maxSubjectLength">80</int>
-
-     <!-- Reference for additional http parameters used in MMS http request.
-          Parameters are seperated by '|'. Optional.  -->
-     <string name="httpParams">X-MDN: ##LINE1##</string>
-</mms_config>
+<?xml version="1.0" encoding="utf-8"?>
+<!-- Copyright (C) 2009 The Android Open Source Project
+
+     Licensed under the Apache License, Version 2.0 (the "License");
+     you may not use this file except in compliance with the License.
+     You may obtain a copy of the License at
+
+          http://www.apache.org/licenses/LICENSE-2.0
+
+     Unless required by applicable law or agreed to in writing, software
+     distributed under the License is distributed on an "AS IS" BASIS,
+     WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+     See the License for the specific language governing permissions and
+     limitations under the License.
+-->
+
+<!-- Version History
+        version 1 - initial version.
+        version 2 - added recipientLimit.
+        version 3 - added min/max recycler values.
+        version 4 - added sms to mms text threshold.
+-->
+
+<mms_config version="4">
+    <!-- Flag indicating whether MMS should be enabled -->
+    <bool name="enabledMMS">true</bool>
+
+    <!-- Maximum message size in bytes for a MMS message -->
+    <int name="maxMessageSize">1048576</int>
+
+    <!-- Maximum height for an attached image -->
+    <int name="maxImageHeight">2432</int>
+
+    <!-- Maximum width for an attached image -->
+    <int name="maxImageWidth">4320</int>
+
+    <!-- Maximum number of SMS message to save per thread before auto-delete kicks in.
+         This is the default value. -->
+    <int name="defaultSMSMessagesPerThread">500</int>
+
+    <!-- Maximum number of MMS message to save per thread before auto-delete kicks in.
+         This is the default value. -->
+    <int name="defaultMMSMessagesPerThread">50</int>
+
+    <!-- Minimum value for the number of messages kept per conversation. The user can never
+         set the limit below this value. -->
+    <int name="minMessageCountPerThread">10</int>
+
+    <!-- Maximum value for the number of messages kept per conversation. The user can never
+         set the limit above this value. -->
+    <int name="maxMessageCountPerThread">5000</int>
+
+    <!-- Maximum number of recipients allowed per message. Use a value of -1
+         to indicate no limit. -->
+    <int name="recipientLimit">20</int>
+
+    <!-- If true, The text message over 160 characters will be sent in multi part.
+         If false, The text message over 160 characters will be sent
+         via multi media message. -->
+    <bool name="enableMultipartSMS">true</bool>
+
+    <!-- If enableMultipartSMS is true and smsToMmsTextThreshold > 1, then multi-part SMS messages
+         will be converted into a single mms message. For example, if the mms_config.xml file
+         specifies <int name="smsToMmsTextThreshold">7</int>, then on the 8th sms segment, the
+         message will be converted to an mms. -->
+    <int name="smsToMmsTextThreshold">1</int>
+
+    <!-- If true, The mms support slide duration.
+         If false, The mms does not support slide duration and we have to
+         set duration value. -->
+    <bool name="enableSlideDuration">true</bool>
+
+    <!-- Maximum length for message text. Use a value of -1
+         to indicate default value -->
+    <int name="maxMessageTextSize">-1</int>
+
+    <!-- Maximum length in chars of mms subject field -->
+    <int name="maxSubjectLength">80</int>
+
+     <!-- Reference for additional http parameters used in MMS http request.
+          Parameters are seperated by '|'. Optional.  -->
+     <string name="httpParams">X-MDN: ##LINE1##</string>
+</mms_config>
diff --git a/android-smsmms/src/main/res/xml-mcc311-mnc440/mms_config.xml b/android-smsmms/src/main/res/xml-mcc311-mnc440/mms_config.xml
index 0f26fab16..c6f7e7e6e 100755
--- a/android-smsmms/src/main/res/xml-mcc311-mnc440/mms_config.xml
+++ b/android-smsmms/src/main/res/xml-mcc311-mnc440/mms_config.xml
@@ -1,89 +1,89 @@
-<?xml version="1.0" encoding="utf-8"?>
-<!-- Copyright (C) 2009 The Android Open Source Project
-
-     Licensed under the Apache License, Version 2.0 (the "License");
-     you may not use this file except in compliance with the License.
-     You may obtain a copy of the License at
-
-          http://www.apache.org/licenses/LICENSE-2.0
-
-     Unless required by applicable law or agreed to in writing, software
-     distributed under the License is distributed on an "AS IS" BASIS,
-     WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
-     See the License for the specific language governing permissions and
-     limitations under the License.
--->
-
-<!-- Version History
-        version 1 - initial version.
-        version 2 - added recipientLimit.
-        version 3 - added min/max recycler values.
-        version 4 - added sms to mms text threshold.
--->
-
-<mms_config version="4">
-    <!-- Flag indicating whether MMS should be enabled -->
-    <bool name="enabledMMS">true</bool>
-
-    <!-- Maximum message size in bytes for a MMS message -->
-    <int name="maxMessageSize">1228800</int>
-
-    <!-- Maximum height for an attached image -->
-    <int name="maxImageHeight">2432</int>
-
-    <!-- Maximum width for an attached image -->
-    <int name="maxImageWidth">4320</int>
-
-    <!-- Maximum number of SMS message to save per thread before auto-delete kicks in.
-         This is the default value. -->
-    <int name="defaultSMSMessagesPerThread">500</int>
-
-    <!-- Maximum number of MMS message to save per thread before auto-delete kicks in.
-         This is the default value. -->
-    <int name="defaultMMSMessagesPerThread">50</int>
-
-    <!-- Minimum value for the number of messages kept per conversation. The user can never
-         set the limit below this value. -->
-    <int name="minMessageCountPerThread">10</int>
-
-    <!-- Maximum value for the number of messages kept per conversation. The user can never
-         set the limit above this value. -->
-    <int name="maxMessageCountPerThread">5000</int>
-
-    <!-- Maximum number of recipients allowed per message. Use a value of -1
-         to indicate no limit. -->
-    <int name="recipientLimit">20</int>
-
-    <!-- If true, The text message over 160 characters will be sent in multi part.
-         If false, The text message over 160 characters will be sent
-         via multi media message. -->
-    <bool name="enableMultipartSMS">true</bool>
-
-    <!-- If enableMultipartSMS is true and smsToMmsTextThreshold > 1, then multi-part SMS messages
-         will be converted into a single mms message. For example, if the mms_config.xml file
-         specifies <int name="smsToMmsTextThreshold">7</int>, then on the 8th sms segment, the
-         message will be converted to an mms. -->
-    <int name="smsToMmsTextThreshold">1</int>
-
-    <!-- If true, The mms support slide duration.
-         If false, The mms does not support slide duration and we have to
-         set duration value. -->
-    <bool name="enableSlideDuration">true</bool>
-
-    <!-- Maximum length for message text. Use a value of -1
-         to indicate default value -->
-    <int name="maxMessageTextSize">-1</int>
-
-    <!-- Maximum length in chars of mms subject field -->
-    <int name="maxSubjectLength">80</int>
-
-    <!-- Hide the MMS read reports UI in settings -->
-    <bool name="enableMMSReadReports">false</bool>
-
-    <!-- Flag indicating whether MMS Delivery Reports UI option should be shown -->
-    <bool name="enableMMSDeliveryReports">false</bool>
-
-    <!-- Reference for additional http parameters used in MMS http request.
-         Parameters are seperated by '|'. Optional.  -->
-     <string name="httpParams">X-MDN: ##LINE1##</string>
-</mms_config>
+<?xml version="1.0" encoding="utf-8"?>
+<!-- Copyright (C) 2009 The Android Open Source Project
+
+     Licensed under the Apache License, Version 2.0 (the "License");
+     you may not use this file except in compliance with the License.
+     You may obtain a copy of the License at
+
+          http://www.apache.org/licenses/LICENSE-2.0
+
+     Unless required by applicable law or agreed to in writing, software
+     distributed under the License is distributed on an "AS IS" BASIS,
+     WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+     See the License for the specific language governing permissions and
+     limitations under the License.
+-->
+
+<!-- Version History
+        version 1 - initial version.
+        version 2 - added recipientLimit.
+        version 3 - added min/max recycler values.
+        version 4 - added sms to mms text threshold.
+-->
+
+<mms_config version="4">
+    <!-- Flag indicating whether MMS should be enabled -->
+    <bool name="enabledMMS">true</bool>
+
+    <!-- Maximum message size in bytes for a MMS message -->
+    <int name="maxMessageSize">1228800</int>
+
+    <!-- Maximum height for an attached image -->
+    <int name="maxImageHeight">2432</int>
+
+    <!-- Maximum width for an attached image -->
+    <int name="maxImageWidth">4320</int>
+
+    <!-- Maximum number of SMS message to save per thread before auto-delete kicks in.
+         This is the default value. -->
+    <int name="defaultSMSMessagesPerThread">500</int>
+
+    <!-- Maximum number of MMS message to save per thread before auto-delete kicks in.
+         This is the default value. -->
+    <int name="defaultMMSMessagesPerThread">50</int>
+
+    <!-- Minimum value for the number of messages kept per conversation. The user can never
+         set the limit below this value. -->
+    <int name="minMessageCountPerThread">10</int>
+
+    <!-- Maximum value for the number of messages kept per conversation. The user can never
+         set the limit above this value. -->
+    <int name="maxMessageCountPerThread">5000</int>
+
+    <!-- Maximum number of recipients allowed per message. Use a value of -1
+         to indicate no limit. -->
+    <int name="recipientLimit">20</int>
+
+    <!-- If true, The text message over 160 characters will be sent in multi part.
+         If false, The text message over 160 characters will be sent
+         via multi media message. -->
+    <bool name="enableMultipartSMS">true</bool>
+
+    <!-- If enableMultipartSMS is true and smsToMmsTextThreshold > 1, then multi-part SMS messages
+         will be converted into a single mms message. For example, if the mms_config.xml file
+         specifies <int name="smsToMmsTextThreshold">7</int>, then on the 8th sms segment, the
+         message will be converted to an mms. -->
+    <int name="smsToMmsTextThreshold">1</int>
+
+    <!-- If true, The mms support slide duration.
+         If false, The mms does not support slide duration and we have to
+         set duration value. -->
+    <bool name="enableSlideDuration">true</bool>
+
+    <!-- Maximum length for message text. Use a value of -1
+         to indicate default value -->
+    <int name="maxMessageTextSize">-1</int>
+
+    <!-- Maximum length in chars of mms subject field -->
+    <int name="maxSubjectLength">80</int>
+
+    <!-- Hide the MMS read reports UI in settings -->
+    <bool name="enableMMSReadReports">false</bool>
+
+    <!-- Flag indicating whether MMS Delivery Reports UI option should be shown -->
+    <bool name="enableMMSDeliveryReports">false</bool>
+
+    <!-- Reference for additional http parameters used in MMS http request.
+         Parameters are seperated by '|'. Optional.  -->
+     <string name="httpParams">X-MDN: ##LINE1##</string>
+</mms_config>
diff --git a/android-smsmms/src/main/res/xml-mcc311-mnc480/mms_config.xml b/android-smsmms/src/main/res/xml-mcc311-mnc480/mms_config.xml
index 1929b6a22..a47451b46 100755
--- a/android-smsmms/src/main/res/xml-mcc311-mnc480/mms_config.xml
+++ b/android-smsmms/src/main/res/xml-mcc311-mnc480/mms_config.xml
@@ -1,70 +1,70 @@
-<?xml version="1.0" encoding="utf-8"?>
-
-<mms_config version="2">
-    <!-- In case of single segment M-Notification.ind, this indicates whether
-         TransactionID should be appended to URI or not. -->
-    <!-- TODO: check if this is correct for Passion -->
-    <bool name="enabledTransID">true</bool>
-
-    <!-- Send M-Acknowledge.ind and M-NotifyResp.ind to the URL received by the
-         M-Notification.ind (WAP-PUSH). -->
-    <bool name="enabledNotifyWapMMSC">true</bool>
-
-    <!-- Maximum message size in bytes for a MMS message -->
-    <int name="maxMessageSize">1258291</int>
-
-    <!-- UAProf parameter tag name -->
-    <string name="uaProfTagName">Profile</string>
-
-    <!-- Maximum number of recipients allowed per message. Use a value of -1
-         to indicate no limit. -->
-    <int name="recipientLimit">20</int>
-
-    <!-- Additional http parameters used in MMS http request.
-         Parameters are seperated by '|'. Optional. -->
-    <string name="httpParams">x-up-calling-line-id: 1##LINE1NOCOUNTRYCODE##|X-VzW-MDN: 1##LINE1NOCOUNTRYCODE##</string>
-
-    <!-- Maximum height for an attached image -->
-    <int name="maxImageHeight">1944</int>
-
-    <!-- Maximum width for an attached image -->
-    <int name="maxImageWidth">2592</int>
-
-    <!-- Email Gateway Number -->
-    <!-- TODO: check if this is correct for Passion -->
-    <string name="emailGatewayNumber">6245</string>
-
-    <!-- enable alias -->
-    <bool name="aliasEnabled">true</bool>
-
-    <!-- alias rule: min chars -->
-    <int name="aliasMinChars">2</int>
-
-    <!-- alias rule: max chars -->
-    <int name="aliasMaxChars">48</int>
-
-    <!-- disable the option to attach an audio attachment to an Mms message. Currently Verizon
-         doesn't support OGG files and the only audio picker in the system allowed for picking
-         ringtones. All of our ringtones are OGG files so it doesn't make sense to allow a user
-         to select an audio file that eventually can't be handled. Therefore, the ability
-         to select a ringtone to send is disabled. -->
-    <bool name="allowAttachAudio">false</bool>
-
-    <!-- Hide the MMS read reports UI in settings -->
-    <bool name="enableMMSReadReports">false</bool>
-
-    <!-- Maximum length in chars of mms subject field -->
-    <int name="maxSubjectLength">80</int>
-
-    <!-- If true, The text message over 160 characters will be sent in multi part.
-         If false, The text message over 160 characters will be sent
-         via multi media message. -->
-    <bool name="enableMultipartSMS">true</bool>
-
-    <!-- If enableMultipartSMS is true and smsToMmsTextThreshold > 1, then multi-part SMS messages
-         will be converted into a single mms message. For example, if the mms_config.xml file
-         specifies <int name="smsToMmsTextThreshold">7</int>, then on the 8th sms segment, the
-         message will be converted to an mms. -->
-    <int name="smsToMmsTextThreshold">7</int>
-</mms_config>
-
+<?xml version="1.0" encoding="utf-8"?>
+
+<mms_config version="2">
+    <!-- In case of single segment M-Notification.ind, this indicates whether
+         TransactionID should be appended to URI or not. -->
+    <!-- TODO: check if this is correct for Passion -->
+    <bool name="enabledTransID">true</bool>
+
+    <!-- Send M-Acknowledge.ind and M-NotifyResp.ind to the URL received by the
+         M-Notification.ind (WAP-PUSH). -->
+    <bool name="enabledNotifyWapMMSC">true</bool>
+
+    <!-- Maximum message size in bytes for a MMS message -->
+    <int name="maxMessageSize">1258291</int>
+
+    <!-- UAProf parameter tag name -->
+    <string name="uaProfTagName">Profile</string>
+
+    <!-- Maximum number of recipients allowed per message. Use a value of -1
+         to indicate no limit. -->
+    <int name="recipientLimit">20</int>
+
+    <!-- Additional http parameters used in MMS http request.
+         Parameters are seperated by '|'. Optional. -->
+    <string name="httpParams">x-up-calling-line-id: 1##LINE1NOCOUNTRYCODE##|X-VzW-MDN: 1##LINE1NOCOUNTRYCODE##</string>
+
+    <!-- Maximum height for an attached image -->
+    <int name="maxImageHeight">1944</int>
+
+    <!-- Maximum width for an attached image -->
+    <int name="maxImageWidth">2592</int>
+
+    <!-- Email Gateway Number -->
+    <!-- TODO: check if this is correct for Passion -->
+    <string name="emailGatewayNumber">6245</string>
+
+    <!-- enable alias -->
+    <bool name="aliasEnabled">true</bool>
+
+    <!-- alias rule: min chars -->
+    <int name="aliasMinChars">2</int>
+
+    <!-- alias rule: max chars -->
+    <int name="aliasMaxChars">48</int>
+
+    <!-- disable the option to attach an audio attachment to an Mms message. Currently Verizon
+         doesn't support OGG files and the only audio picker in the system allowed for picking
+         ringtones. All of our ringtones are OGG files so it doesn't make sense to allow a user
+         to select an audio file that eventually can't be handled. Therefore, the ability
+         to select a ringtone to send is disabled. -->
+    <bool name="allowAttachAudio">false</bool>
+
+    <!-- Hide the MMS read reports UI in settings -->
+    <bool name="enableMMSReadReports">false</bool>
+
+    <!-- Maximum length in chars of mms subject field -->
+    <int name="maxSubjectLength">80</int>
+
+    <!-- If true, The text message over 160 characters will be sent in multi part.
+         If false, The text message over 160 characters will be sent
+         via multi media message. -->
+    <bool name="enableMultipartSMS">true</bool>
+
+    <!-- If enableMultipartSMS is true and smsToMmsTextThreshold > 1, then multi-part SMS messages
+         will be converted into a single mms message. For example, if the mms_config.xml file
+         specifies <int name="smsToMmsTextThreshold">7</int>, then on the 8th sms segment, the
+         message will be converted to an mms. -->
+    <int name="smsToMmsTextThreshold">7</int>
+</mms_config>
+
diff --git a/android-smsmms/src/main/res/xml-mcc311-mnc490/mms_config.xml b/android-smsmms/src/main/res/xml-mcc311-mnc490/mms_config.xml
index 8c1ae1193..ec09547de 100755
--- a/android-smsmms/src/main/res/xml-mcc311-mnc490/mms_config.xml
+++ b/android-smsmms/src/main/res/xml-mcc311-mnc490/mms_config.xml
@@ -1,75 +1,75 @@
-<?xml version="1.0" encoding="utf-8"?>
-<!-- Copyright 2013 The Android Open Source Project
-
-     Licensed under the Apache License, Version 2.0 (the "License");
-     you may not use this file except in compliance with the License.
-     You may obtain a copy of the License at
-
-          http://www.apache.org/licenses/LICENSE-2.0
-
-     Unless required by applicable law or agreed to in writing, software
-     distributed under the License is distributed on an "AS IS" BASIS,
-     WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
-     See the License for the specific language governing permissions and
-     limitations under the License.
--->
-
-<mms_config version="4">
-    <!-- Flag indicating whether MMS should be enabled -->
-    <bool name="enabledMMS">true</bool>
-
-    <!-- Maximum message size in bytes for a MMS message -->
-    <int name="maxMessageSize">1048576</int>
-
-    <!-- Maximum height for an attached image -->
-    <int name="maxImageHeight">1944</int>
-
-    <!-- Maximum width for an attached image -->
-    <int name="maxImageWidth">2592</int>
-
-    <!-- Maximum number of recipients allowed per message. Use a value of -1
-         to indicate no limit. -->
-    <int name="recipientLimit">40</int>
-
-    <!-- If true, The text message over 160 characters will be sent in multi part.
-         If false, The text message over 160 characters will be sent
-         via multi media message. -->
-    <bool name="enableMultipartSMS">true</bool>
-
-    <!-- If enableMultipartSMS is true and smsToMmsTextThreshold > 1, then multi-part SMS messages
-         will be converted into a single mms message. For example, if the mms_config.xml file
-         specifies <int name="smsToMmsTextThreshold">7</int>, then on the 8th sms segment, the
-         message will be converted to an mms. -->
-    <int name="smsToMmsTextThreshold">6</int>
-
-    <!-- If true, The mms support slide duration.
-         If false, The mms does not support slide duration and we have to
-         set duration value. -->
-    <bool name="enableSlideDuration">false</bool>
-
-    <!-- Maximum length for message text. Use a value of -1
-         to indicate default value -->
-    <int name="maxMessageTextSize">-1</int>
-
-    <!-- Maximum length in chars of mms subject field -->
-    <int name="maxSubjectLength">80</int>
-
-    <!-- Email Gateway Number -->
-    <string name="emailGatewayNumber">6245</string>
-
-    <bool name="enableMMSReadReports">false</bool>
-
-    <bool name="enableSMSDeliveryReports">false</bool>
-
-    <bool name="enableMMSDeliveryReports">false</bool>
-
-    <!-- Reference for additional http parameters used in MMS http request.
-         Parameters are seperated by '|'. Optional. -->
-    <string name="httpParams">X-MDN: ##LINE1##|Proxy-Authorization: Basic ##NAI##</string>
-
-    <!-- Suffix to the NAI header (encoded together with base64) -->
-    <string name="naiSuffix">:pcs</string>
-
-    <!-- If true, need to read content_disposition field of an MMS part -->
-    <bool name="supportMmsContentDisposition">false</bool>
-</mms_config>
+<?xml version="1.0" encoding="utf-8"?>
+<!-- Copyright 2013 The Android Open Source Project
+
+     Licensed under the Apache License, Version 2.0 (the "License");
+     you may not use this file except in compliance with the License.
+     You may obtain a copy of the License at
+
+          http://www.apache.org/licenses/LICENSE-2.0
+
+     Unless required by applicable law or agreed to in writing, software
+     distributed under the License is distributed on an "AS IS" BASIS,
+     WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+     See the License for the specific language governing permissions and
+     limitations under the License.
+-->
+
+<mms_config version="4">
+    <!-- Flag indicating whether MMS should be enabled -->
+    <bool name="enabledMMS">true</bool>
+
+    <!-- Maximum message size in bytes for a MMS message -->
+    <int name="maxMessageSize">1048576</int>
+
+    <!-- Maximum height for an attached image -->
+    <int name="maxImageHeight">1944</int>
+
+    <!-- Maximum width for an attached image -->
+    <int name="maxImageWidth">2592</int>
+
+    <!-- Maximum number of recipients allowed per message. Use a value of -1
+         to indicate no limit. -->
+    <int name="recipientLimit">40</int>
+
+    <!-- If true, The text message over 160 characters will be sent in multi part.
+         If false, The text message over 160 characters will be sent
+         via multi media message. -->
+    <bool name="enableMultipartSMS">true</bool>
+
+    <!-- If enableMultipartSMS is true and smsToMmsTextThreshold > 1, then multi-part SMS messages
+         will be converted into a single mms message. For example, if the mms_config.xml file
+         specifies <int name="smsToMmsTextThreshold">7</int>, then on the 8th sms segment, the
+         message will be converted to an mms. -->
+    <int name="smsToMmsTextThreshold">6</int>
+
+    <!-- If true, The mms support slide duration.
+         If false, The mms does not support slide duration and we have to
+         set duration value. -->
+    <bool name="enableSlideDuration">false</bool>
+
+    <!-- Maximum length for message text. Use a value of -1
+         to indicate default value -->
+    <int name="maxMessageTextSize">-1</int>
+
+    <!-- Maximum length in chars of mms subject field -->
+    <int name="maxSubjectLength">80</int>
+
+    <!-- Email Gateway Number -->
+    <string name="emailGatewayNumber">6245</string>
+
+    <bool name="enableMMSReadReports">false</bool>
+
+    <bool name="enableSMSDeliveryReports">false</bool>
+
+    <bool name="enableMMSDeliveryReports">false</bool>
+
+    <!-- Reference for additional http parameters used in MMS http request.
+         Parameters are seperated by '|'. Optional. -->
+    <string name="httpParams">X-MDN: ##LINE1##|Proxy-Authorization: Basic ##NAI##</string>
+
+    <!-- Suffix to the NAI header (encoded together with base64) -->
+    <string name="naiSuffix">:pcs</string>
+
+    <!-- If true, need to read content_disposition field of an MMS part -->
+    <bool name="supportMmsContentDisposition">false</bool>
+</mms_config>
diff --git a/android-smsmms/src/main/res/xml-mcc311-mnc580/mms_config.xml b/android-smsmms/src/main/res/xml-mcc311-mnc580/mms_config.xml
index 196d4f7f9..d9d80df27 100755
--- a/android-smsmms/src/main/res/xml-mcc311-mnc580/mms_config.xml
+++ b/android-smsmms/src/main/res/xml-mcc311-mnc580/mms_config.xml
@@ -1,65 +1,65 @@
-<?xml version="1.0" encoding="utf-8"?>
-<!-- Copyright 2014 The Android Open Source Project
-
-     Licensed under the Apache License, Version 2.0 (the "License");
-     you may not use this file except in compliance with the License.
-     You may obtain a copy of the License at
-
-          http://www.apache.org/licenses/LICENSE-2.0
-
-     Unless required by applicable law or agreed to in writing, software
-     distributed under the License is distributed on an "AS IS" BASIS,
-     WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
-     See the License for the specific language governing permissions and
-     limitations under the License.
--->
-
-<mms_config version="2">
-    <!-- In case of single segment M-Notification.ind, this indicates whether
-         TransactionID should be appended to URI or not. -->
-    <bool name="enabledTransID">true</bool>
-
-    <!-- Send M-Acknowledge.ind and M-NotifyResp.ind to the URL received by the
-         M-Notification.ind (WAP-PUSH). -->
-    <bool name="enabledNotifyWapMMSC">true</bool>
-
-    <!-- Maximum message size in bytes for a MMS message -->
-    <int name="maxMessageSize">1048576</int>
-
-    <!-- UAProf parameter tag name -->
-    <string name="uaProfTagName">x-wap-profile</string>
-
-    <!-- Maximum number of recipients allowed per message. Use a value of -1
-         to indicate no limit. -->
-    <int name="recipientLimit">20</int>
-
-    <!-- Additional http parameters used in MMS http request.
-         Parameters are seperated by '|'. Optional. -->
-    <string name="httpParams">x-vzw-mdn: 1##LINE1NOCOUNTRYCODE##</string>
-
-    <!-- Maximum height for an attached image -->
-    <int name="maxImageHeight">1944</int>
-
-    <!-- Maximum width for an attached image -->
-    <int name="maxImageWidth">2592</int>
-
-    <!-- If true, The text message over 160 characters will be sent in multi part.
-         If false, The text message over 160 characters will be sent
-         via multi media message or separate, independent SMS messages,
-         dependent on sendMultipartSMSAsSeparateMessages value. -->
-    <bool name="enableMultipartSMS">false</bool>
-
-    <!-- Email Gateway Number -->
-    <!-- TODO: check if this is correct for Passion -->
-    <string name="emailGatewayNumber">6245</string>
-
-    <bool name="allowAttachAudio">true</bool>
-
-    <!-- Hide the MMS read reports UI in settings -->
-    <bool name="enableMMSReadReports">false</bool>
-
-    <!-- Maximum length in chars of mms subject field -->
-    <int name="maxSubjectLength">80</int>
-
-</mms_config>
-
+<?xml version="1.0" encoding="utf-8"?>
+<!-- Copyright 2014 The Android Open Source Project
+
+     Licensed under the Apache License, Version 2.0 (the "License");
+     you may not use this file except in compliance with the License.
+     You may obtain a copy of the License at
+
+          http://www.apache.org/licenses/LICENSE-2.0
+
+     Unless required by applicable law or agreed to in writing, software
+     distributed under the License is distributed on an "AS IS" BASIS,
+     WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+     See the License for the specific language governing permissions and
+     limitations under the License.
+-->
+
+<mms_config version="2">
+    <!-- In case of single segment M-Notification.ind, this indicates whether
+         TransactionID should be appended to URI or not. -->
+    <bool name="enabledTransID">true</bool>
+
+    <!-- Send M-Acknowledge.ind and M-NotifyResp.ind to the URL received by the
+         M-Notification.ind (WAP-PUSH). -->
+    <bool name="enabledNotifyWapMMSC">true</bool>
+
+    <!-- Maximum message size in bytes for a MMS message -->
+    <int name="maxMessageSize">1048576</int>
+
+    <!-- UAProf parameter tag name -->
+    <string name="uaProfTagName">x-wap-profile</string>
+
+    <!-- Maximum number of recipients allowed per message. Use a value of -1
+         to indicate no limit. -->
+    <int name="recipientLimit">20</int>
+
+    <!-- Additional http parameters used in MMS http request.
+         Parameters are seperated by '|'. Optional. -->
+    <string name="httpParams">x-vzw-mdn: 1##LINE1NOCOUNTRYCODE##</string>
+
+    <!-- Maximum height for an attached image -->
+    <int name="maxImageHeight">1944</int>
+
+    <!-- Maximum width for an attached image -->
+    <int name="maxImageWidth">2592</int>
+
+    <!-- If true, The text message over 160 characters will be sent in multi part.
+         If false, The text message over 160 characters will be sent
+         via multi media message or separate, independent SMS messages,
+         dependent on sendMultipartSMSAsSeparateMessages value. -->
+    <bool name="enableMultipartSMS">false</bool>
+
+    <!-- Email Gateway Number -->
+    <!-- TODO: check if this is correct for Passion -->
+    <string name="emailGatewayNumber">6245</string>
+
+    <bool name="allowAttachAudio">true</bool>
+
+    <!-- Hide the MMS read reports UI in settings -->
+    <bool name="enableMMSReadReports">false</bool>
+
+    <!-- Maximum length in chars of mms subject field -->
+    <int name="maxSubjectLength">80</int>
+
+</mms_config>
+
diff --git a/android-smsmms/src/main/res/xml-mcc311-mnc581/mms_config.xml b/android-smsmms/src/main/res/xml-mcc311-mnc581/mms_config.xml
index 196d4f7f9..d9d80df27 100755
--- a/android-smsmms/src/main/res/xml-mcc311-mnc581/mms_config.xml
+++ b/android-smsmms/src/main/res/xml-mcc311-mnc581/mms_config.xml
@@ -1,65 +1,65 @@
-<?xml version="1.0" encoding="utf-8"?>
-<!-- Copyright 2014 The Android Open Source Project
-
-     Licensed under the Apache License, Version 2.0 (the "License");
-     you may not use this file except in compliance with the License.
-     You may obtain a copy of the License at
-
-          http://www.apache.org/licenses/LICENSE-2.0
-
-     Unless required by applicable law or agreed to in writing, software
-     distributed under the License is distributed on an "AS IS" BASIS,
-     WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
-     See the License for the specific language governing permissions and
-     limitations under the License.
--->
-
-<mms_config version="2">
-    <!-- In case of single segment M-Notification.ind, this indicates whether
-         TransactionID should be appended to URI or not. -->
-    <bool name="enabledTransID">true</bool>
-
-    <!-- Send M-Acknowledge.ind and M-NotifyResp.ind to the URL received by the
-         M-Notification.ind (WAP-PUSH). -->
-    <bool name="enabledNotifyWapMMSC">true</bool>
-
-    <!-- Maximum message size in bytes for a MMS message -->
-    <int name="maxMessageSize">1048576</int>
-
-    <!-- UAProf parameter tag name -->
-    <string name="uaProfTagName">x-wap-profile</string>
-
-    <!-- Maximum number of recipients allowed per message. Use a value of -1
-         to indicate no limit. -->
-    <int name="recipientLimit">20</int>
-
-    <!-- Additional http parameters used in MMS http request.
-         Parameters are seperated by '|'. Optional. -->
-    <string name="httpParams">x-vzw-mdn: 1##LINE1NOCOUNTRYCODE##</string>
-
-    <!-- Maximum height for an attached image -->
-    <int name="maxImageHeight">1944</int>
-
-    <!-- Maximum width for an attached image -->
-    <int name="maxImageWidth">2592</int>
-
-    <!-- If true, The text message over 160 characters will be sent in multi part.
-         If false, The text message over 160 characters will be sent
-         via multi media message or separate, independent SMS messages,
-         dependent on sendMultipartSMSAsSeparateMessages value. -->
-    <bool name="enableMultipartSMS">false</bool>
-
-    <!-- Email Gateway Number -->
-    <!-- TODO: check if this is correct for Passion -->
-    <string name="emailGatewayNumber">6245</string>
-
-    <bool name="allowAttachAudio">true</bool>
-
-    <!-- Hide the MMS read reports UI in settings -->
-    <bool name="enableMMSReadReports">false</bool>
-
-    <!-- Maximum length in chars of mms subject field -->
-    <int name="maxSubjectLength">80</int>
-
-</mms_config>
-
+<?xml version="1.0" encoding="utf-8"?>
+<!-- Copyright 2014 The Android Open Source Project
+
+     Licensed under the Apache License, Version 2.0 (the "License");
+     you may not use this file except in compliance with the License.
+     You may obtain a copy of the License at
+
+          http://www.apache.org/licenses/LICENSE-2.0
+
+     Unless required by applicable law or agreed to in writing, software
+     distributed under the License is distributed on an "AS IS" BASIS,
+     WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+     See the License for the specific language governing permissions and
+     limitations under the License.
+-->
+
+<mms_config version="2">
+    <!-- In case of single segment M-Notification.ind, this indicates whether
+         TransactionID should be appended to URI or not. -->
+    <bool name="enabledTransID">true</bool>
+
+    <!-- Send M-Acknowledge.ind and M-NotifyResp.ind to the URL received by the
+         M-Notification.ind (WAP-PUSH). -->
+    <bool name="enabledNotifyWapMMSC">true</bool>
+
+    <!-- Maximum message size in bytes for a MMS message -->
+    <int name="maxMessageSize">1048576</int>
+
+    <!-- UAProf parameter tag name -->
+    <string name="uaProfTagName">x-wap-profile</string>
+
+    <!-- Maximum number of recipients allowed per message. Use a value of -1
+         to indicate no limit. -->
+    <int name="recipientLimit">20</int>
+
+    <!-- Additional http parameters used in MMS http request.
+         Parameters are seperated by '|'. Optional. -->
+    <string name="httpParams">x-vzw-mdn: 1##LINE1NOCOUNTRYCODE##</string>
+
+    <!-- Maximum height for an attached image -->
+    <int name="maxImageHeight">1944</int>
+
+    <!-- Maximum width for an attached image -->
+    <int name="maxImageWidth">2592</int>
+
+    <!-- If true, The text message over 160 characters will be sent in multi part.
+         If false, The text message over 160 characters will be sent
+         via multi media message or separate, independent SMS messages,
+         dependent on sendMultipartSMSAsSeparateMessages value. -->
+    <bool name="enableMultipartSMS">false</bool>
+
+    <!-- Email Gateway Number -->
+    <!-- TODO: check if this is correct for Passion -->
+    <string name="emailGatewayNumber">6245</string>
+
+    <bool name="allowAttachAudio">true</bool>
+
+    <!-- Hide the MMS read reports UI in settings -->
+    <bool name="enableMMSReadReports">false</bool>
+
+    <!-- Maximum length in chars of mms subject field -->
+    <int name="maxSubjectLength">80</int>
+
+</mms_config>
+
diff --git a/android-smsmms/src/main/res/xml-mcc311-mnc582/mms_config.xml b/android-smsmms/src/main/res/xml-mcc311-mnc582/mms_config.xml
index 196d4f7f9..d9d80df27 100755
--- a/android-smsmms/src/main/res/xml-mcc311-mnc582/mms_config.xml
+++ b/android-smsmms/src/main/res/xml-mcc311-mnc582/mms_config.xml
@@ -1,65 +1,65 @@
-<?xml version="1.0" encoding="utf-8"?>
-<!-- Copyright 2014 The Android Open Source Project
-
-     Licensed under the Apache License, Version 2.0 (the "License");
-     you may not use this file except in compliance with the License.
-     You may obtain a copy of the License at
-
-          http://www.apache.org/licenses/LICENSE-2.0
-
-     Unless required by applicable law or agreed to in writing, software
-     distributed under the License is distributed on an "AS IS" BASIS,
-     WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
-     See the License for the specific language governing permissions and
-     limitations under the License.
--->
-
-<mms_config version="2">
-    <!-- In case of single segment M-Notification.ind, this indicates whether
-         TransactionID should be appended to URI or not. -->
-    <bool name="enabledTransID">true</bool>
-
-    <!-- Send M-Acknowledge.ind and M-NotifyResp.ind to the URL received by the
-         M-Notification.ind (WAP-PUSH). -->
-    <bool name="enabledNotifyWapMMSC">true</bool>
-
-    <!-- Maximum message size in bytes for a MMS message -->
-    <int name="maxMessageSize">1048576</int>
-
-    <!-- UAProf parameter tag name -->
-    <string name="uaProfTagName">x-wap-profile</string>
-
-    <!-- Maximum number of recipients allowed per message. Use a value of -1
-         to indicate no limit. -->
-    <int name="recipientLimit">20</int>
-
-    <!-- Additional http parameters used in MMS http request.
-         Parameters are seperated by '|'. Optional. -->
-    <string name="httpParams">x-vzw-mdn: 1##LINE1NOCOUNTRYCODE##</string>
-
-    <!-- Maximum height for an attached image -->
-    <int name="maxImageHeight">1944</int>
-
-    <!-- Maximum width for an attached image -->
-    <int name="maxImageWidth">2592</int>
-
-    <!-- If true, The text message over 160 characters will be sent in multi part.
-         If false, The text message over 160 characters will be sent
-         via multi media message or separate, independent SMS messages,
-         dependent on sendMultipartSMSAsSeparateMessages value. -->
-    <bool name="enableMultipartSMS">false</bool>
-
-    <!-- Email Gateway Number -->
-    <!-- TODO: check if this is correct for Passion -->
-    <string name="emailGatewayNumber">6245</string>
-
-    <bool name="allowAttachAudio">true</bool>
-
-    <!-- Hide the MMS read reports UI in settings -->
-    <bool name="enableMMSReadReports">false</bool>
-
-    <!-- Maximum length in chars of mms subject field -->
-    <int name="maxSubjectLength">80</int>
-
-</mms_config>
-
+<?xml version="1.0" encoding="utf-8"?>
+<!-- Copyright 2014 The Android Open Source Project
+
+     Licensed under the Apache License, Version 2.0 (the "License");
+     you may not use this file except in compliance with the License.
+     You may obtain a copy of the License at
+
+          http://www.apache.org/licenses/LICENSE-2.0
+
+     Unless required by applicable law or agreed to in writing, software
+     distributed under the License is distributed on an "AS IS" BASIS,
+     WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+     See the License for the specific language governing permissions and
+     limitations under the License.
+-->
+
+<mms_config version="2">
+    <!-- In case of single segment M-Notification.ind, this indicates whether
+         TransactionID should be appended to URI or not. -->
+    <bool name="enabledTransID">true</bool>
+
+    <!-- Send M-Acknowledge.ind and M-NotifyResp.ind to the URL received by the
+         M-Notification.ind (WAP-PUSH). -->
+    <bool name="enabledNotifyWapMMSC">true</bool>
+
+    <!-- Maximum message size in bytes for a MMS message -->
+    <int name="maxMessageSize">1048576</int>
+
+    <!-- UAProf parameter tag name -->
+    <string name="uaProfTagName">x-wap-profile</string>
+
+    <!-- Maximum number of recipients allowed per message. Use a value of -1
+         to indicate no limit. -->
+    <int name="recipientLimit">20</int>
+
+    <!-- Additional http parameters used in MMS http request.
+         Parameters are seperated by '|'. Optional. -->
+    <string name="httpParams">x-vzw-mdn: 1##LINE1NOCOUNTRYCODE##</string>
+
+    <!-- Maximum height for an attached image -->
+    <int name="maxImageHeight">1944</int>
+
+    <!-- Maximum width for an attached image -->
+    <int name="maxImageWidth">2592</int>
+
+    <!-- If true, The text message over 160 characters will be sent in multi part.
+         If false, The text message over 160 characters will be sent
+         via multi media message or separate, independent SMS messages,
+         dependent on sendMultipartSMSAsSeparateMessages value. -->
+    <bool name="enableMultipartSMS">false</bool>
+
+    <!-- Email Gateway Number -->
+    <!-- TODO: check if this is correct for Passion -->
+    <string name="emailGatewayNumber">6245</string>
+
+    <bool name="allowAttachAudio">true</bool>
+
+    <!-- Hide the MMS read reports UI in settings -->
+    <bool name="enableMMSReadReports">false</bool>
+
+    <!-- Maximum length in chars of mms subject field -->
+    <int name="maxSubjectLength">80</int>
+
+</mms_config>
+
diff --git a/android-smsmms/src/main/res/xml-mcc311-mnc583/mms_config.xml b/android-smsmms/src/main/res/xml-mcc311-mnc583/mms_config.xml
index 196d4f7f9..d9d80df27 100755
--- a/android-smsmms/src/main/res/xml-mcc311-mnc583/mms_config.xml
+++ b/android-smsmms/src/main/res/xml-mcc311-mnc583/mms_config.xml
@@ -1,65 +1,65 @@
-<?xml version="1.0" encoding="utf-8"?>
-<!-- Copyright 2014 The Android Open Source Project
-
-     Licensed under the Apache License, Version 2.0 (the "License");
-     you may not use this file except in compliance with the License.
-     You may obtain a copy of the License at
-
-          http://www.apache.org/licenses/LICENSE-2.0
-
-     Unless required by applicable law or agreed to in writing, software
-     distributed under the License is distributed on an "AS IS" BASIS,
-     WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
-     See the License for the specific language governing permissions and
-     limitations under the License.
--->
-
-<mms_config version="2">
-    <!-- In case of single segment M-Notification.ind, this indicates whether
-         TransactionID should be appended to URI or not. -->
-    <bool name="enabledTransID">true</bool>
-
-    <!-- Send M-Acknowledge.ind and M-NotifyResp.ind to the URL received by the
-         M-Notification.ind (WAP-PUSH). -->
-    <bool name="enabledNotifyWapMMSC">true</bool>
-
-    <!-- Maximum message size in bytes for a MMS message -->
-    <int name="maxMessageSize">1048576</int>
-
-    <!-- UAProf parameter tag name -->
-    <string name="uaProfTagName">x-wap-profile</string>
-
-    <!-- Maximum number of recipients allowed per message. Use a value of -1
-         to indicate no limit. -->
-    <int name="recipientLimit">20</int>
-
-    <!-- Additional http parameters used in MMS http request.
-         Parameters are seperated by '|'. Optional. -->
-    <string name="httpParams">x-vzw-mdn: 1##LINE1NOCOUNTRYCODE##</string>
-
-    <!-- Maximum height for an attached image -->
-    <int name="maxImageHeight">1944</int>
-
-    <!-- Maximum width for an attached image -->
-    <int name="maxImageWidth">2592</int>
-
-    <!-- If true, The text message over 160 characters will be sent in multi part.
-         If false, The text message over 160 characters will be sent
-         via multi media message or separate, independent SMS messages,
-         dependent on sendMultipartSMSAsSeparateMessages value. -->
-    <bool name="enableMultipartSMS">false</bool>
-
-    <!-- Email Gateway Number -->
-    <!-- TODO: check if this is correct for Passion -->
-    <string name="emailGatewayNumber">6245</string>
-
-    <bool name="allowAttachAudio">true</bool>
-
-    <!-- Hide the MMS read reports UI in settings -->
-    <bool name="enableMMSReadReports">false</bool>
-
-    <!-- Maximum length in chars of mms subject field -->
-    <int name="maxSubjectLength">80</int>
-
-</mms_config>
-
+<?xml version="1.0" encoding="utf-8"?>
+<!-- Copyright 2014 The Android Open Source Project
+
+     Licensed under the Apache License, Version 2.0 (the "License");
+     you may not use this file except in compliance with the License.
+     You may obtain a copy of the License at
+
+          http://www.apache.org/licenses/LICENSE-2.0
+
+     Unless required by applicable law or agreed to in writing, software
+     distributed under the License is distributed on an "AS IS" BASIS,
+     WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+     See the License for the specific language governing permissions and
+     limitations under the License.
+-->
+
+<mms_config version="2">
+    <!-- In case of single segment M-Notification.ind, this indicates whether
+         TransactionID should be appended to URI or not. -->
+    <bool name="enabledTransID">true</bool>
+
+    <!-- Send M-Acknowledge.ind and M-NotifyResp.ind to the URL received by the
+         M-Notification.ind (WAP-PUSH). -->
+    <bool name="enabledNotifyWapMMSC">true</bool>
+
+    <!-- Maximum message size in bytes for a MMS message -->
+    <int name="maxMessageSize">1048576</int>
+
+    <!-- UAProf parameter tag name -->
+    <string name="uaProfTagName">x-wap-profile</string>
+
+    <!-- Maximum number of recipients allowed per message. Use a value of -1
+         to indicate no limit. -->
+    <int name="recipientLimit">20</int>
+
+    <!-- Additional http parameters used in MMS http request.
+         Parameters are seperated by '|'. Optional. -->
+    <string name="httpParams">x-vzw-mdn: 1##LINE1NOCOUNTRYCODE##</string>
+
+    <!-- Maximum height for an attached image -->
+    <int name="maxImageHeight">1944</int>
+
+    <!-- Maximum width for an attached image -->
+    <int name="maxImageWidth">2592</int>
+
+    <!-- If true, The text message over 160 characters will be sent in multi part.
+         If false, The text message over 160 characters will be sent
+         via multi media message or separate, independent SMS messages,
+         dependent on sendMultipartSMSAsSeparateMessages value. -->
+    <bool name="enableMultipartSMS">false</bool>
+
+    <!-- Email Gateway Number -->
+    <!-- TODO: check if this is correct for Passion -->
+    <string name="emailGatewayNumber">6245</string>
+
+    <bool name="allowAttachAudio">true</bool>
+
+    <!-- Hide the MMS read reports UI in settings -->
+    <bool name="enableMMSReadReports">false</bool>
+
+    <!-- Maximum length in chars of mms subject field -->
+    <int name="maxSubjectLength">80</int>
+
+</mms_config>
+
diff --git a/android-smsmms/src/main/res/xml-mcc311-mnc584/mms_config.xml b/android-smsmms/src/main/res/xml-mcc311-mnc584/mms_config.xml
index 196d4f7f9..d9d80df27 100755
--- a/android-smsmms/src/main/res/xml-mcc311-mnc584/mms_config.xml
+++ b/android-smsmms/src/main/res/xml-mcc311-mnc584/mms_config.xml
@@ -1,65 +1,65 @@
-<?xml version="1.0" encoding="utf-8"?>
-<!-- Copyright 2014 The Android Open Source Project
-
-     Licensed under the Apache License, Version 2.0 (the "License");
-     you may not use this file except in compliance with the License.
-     You may obtain a copy of the License at
-
-          http://www.apache.org/licenses/LICENSE-2.0
-
-     Unless required by applicable law or agreed to in writing, software
-     distributed under the License is distributed on an "AS IS" BASIS,
-     WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
-     See the License for the specific language governing permissions and
-     limitations under the License.
--->
-
-<mms_config version="2">
-    <!-- In case of single segment M-Notification.ind, this indicates whether
-         TransactionID should be appended to URI or not. -->
-    <bool name="enabledTransID">true</bool>
-
-    <!-- Send M-Acknowledge.ind and M-NotifyResp.ind to the URL received by the
-         M-Notification.ind (WAP-PUSH). -->
-    <bool name="enabledNotifyWapMMSC">true</bool>
-
-    <!-- Maximum message size in bytes for a MMS message -->
-    <int name="maxMessageSize">1048576</int>
-
-    <!-- UAProf parameter tag name -->
-    <string name="uaProfTagName">x-wap-profile</string>
-
-    <!-- Maximum number of recipients allowed per message. Use a value of -1
-         to indicate no limit. -->
-    <int name="recipientLimit">20</int>
-
-    <!-- Additional http parameters used in MMS http request.
-         Parameters are seperated by '|'. Optional. -->
-    <string name="httpParams">x-vzw-mdn: 1##LINE1NOCOUNTRYCODE##</string>
-
-    <!-- Maximum height for an attached image -->
-    <int name="maxImageHeight">1944</int>
-
-    <!-- Maximum width for an attached image -->
-    <int name="maxImageWidth">2592</int>
-
-    <!-- If true, The text message over 160 characters will be sent in multi part.
-         If false, The text message over 160 characters will be sent
-         via multi media message or separate, independent SMS messages,
-         dependent on sendMultipartSMSAsSeparateMessages value. -->
-    <bool name="enableMultipartSMS">false</bool>
-
-    <!-- Email Gateway Number -->
-    <!-- TODO: check if this is correct for Passion -->
-    <string name="emailGatewayNumber">6245</string>
-
-    <bool name="allowAttachAudio">true</bool>
-
-    <!-- Hide the MMS read reports UI in settings -->
-    <bool name="enableMMSReadReports">false</bool>
-
-    <!-- Maximum length in chars of mms subject field -->
-    <int name="maxSubjectLength">80</int>
-
-</mms_config>
-
+<?xml version="1.0" encoding="utf-8"?>
+<!-- Copyright 2014 The Android Open Source Project
+
+     Licensed under the Apache License, Version 2.0 (the "License");
+     you may not use this file except in compliance with the License.
+     You may obtain a copy of the License at
+
+          http://www.apache.org/licenses/LICENSE-2.0
+
+     Unless required by applicable law or agreed to in writing, software
+     distributed under the License is distributed on an "AS IS" BASIS,
+     WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+     See the License for the specific language governing permissions and
+     limitations under the License.
+-->
+
+<mms_config version="2">
+    <!-- In case of single segment M-Notification.ind, this indicates whether
+         TransactionID should be appended to URI or not. -->
+    <bool name="enabledTransID">true</bool>
+
+    <!-- Send M-Acknowledge.ind and M-NotifyResp.ind to the URL received by the
+         M-Notification.ind (WAP-PUSH). -->
+    <bool name="enabledNotifyWapMMSC">true</bool>
+
+    <!-- Maximum message size in bytes for a MMS message -->
+    <int name="maxMessageSize">1048576</int>
+
+    <!-- UAProf parameter tag name -->
+    <string name="uaProfTagName">x-wap-profile</string>
+
+    <!-- Maximum number of recipients allowed per message. Use a value of -1
+         to indicate no limit. -->
+    <int name="recipientLimit">20</int>
+
+    <!-- Additional http parameters used in MMS http request.
+         Parameters are seperated by '|'. Optional. -->
+    <string name="httpParams">x-vzw-mdn: 1##LINE1NOCOUNTRYCODE##</string>
+
+    <!-- Maximum height for an attached image -->
+    <int name="maxImageHeight">1944</int>
+
+    <!-- Maximum width for an attached image -->
+    <int name="maxImageWidth">2592</int>
+
+    <!-- If true, The text message over 160 characters will be sent in multi part.
+         If false, The text message over 160 characters will be sent
+         via multi media message or separate, independent SMS messages,
+         dependent on sendMultipartSMSAsSeparateMessages value. -->
+    <bool name="enableMultipartSMS">false</bool>
+
+    <!-- Email Gateway Number -->
+    <!-- TODO: check if this is correct for Passion -->
+    <string name="emailGatewayNumber">6245</string>
+
+    <bool name="allowAttachAudio">true</bool>
+
+    <!-- Hide the MMS read reports UI in settings -->
+    <bool name="enableMMSReadReports">false</bool>
+
+    <!-- Maximum length in chars of mms subject field -->
+    <int name="maxSubjectLength">80</int>
+
+</mms_config>
+
diff --git a/android-smsmms/src/main/res/xml-mcc311-mnc585/mms_config.xml b/android-smsmms/src/main/res/xml-mcc311-mnc585/mms_config.xml
index 196d4f7f9..d9d80df27 100755
--- a/android-smsmms/src/main/res/xml-mcc311-mnc585/mms_config.xml
+++ b/android-smsmms/src/main/res/xml-mcc311-mnc585/mms_config.xml
@@ -1,65 +1,65 @@
-<?xml version="1.0" encoding="utf-8"?>
-<!-- Copyright 2014 The Android Open Source Project
-
-     Licensed under the Apache License, Version 2.0 (the "License");
-     you may not use this file except in compliance with the License.
-     You may obtain a copy of the License at
-
-          http://www.apache.org/licenses/LICENSE-2.0
-
-     Unless required by applicable law or agreed to in writing, software
-     distributed under the License is distributed on an "AS IS" BASIS,
-     WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
-     See the License for the specific language governing permissions and
-     limitations under the License.
--->
-
-<mms_config version="2">
-    <!-- In case of single segment M-Notification.ind, this indicates whether
-         TransactionID should be appended to URI or not. -->
-    <bool name="enabledTransID">true</bool>
-
-    <!-- Send M-Acknowledge.ind and M-NotifyResp.ind to the URL received by the
-         M-Notification.ind (WAP-PUSH). -->
-    <bool name="enabledNotifyWapMMSC">true</bool>
-
-    <!-- Maximum message size in bytes for a MMS message -->
-    <int name="maxMessageSize">1048576</int>
-
-    <!-- UAProf parameter tag name -->
-    <string name="uaProfTagName">x-wap-profile</string>
-
-    <!-- Maximum number of recipients allowed per message. Use a value of -1
-         to indicate no limit. -->
-    <int name="recipientLimit">20</int>
-
-    <!-- Additional http parameters used in MMS http request.
-         Parameters are seperated by '|'. Optional. -->
-    <string name="httpParams">x-vzw-mdn: 1##LINE1NOCOUNTRYCODE##</string>
-
-    <!-- Maximum height for an attached image -->
-    <int name="maxImageHeight">1944</int>
-
-    <!-- Maximum width for an attached image -->
-    <int name="maxImageWidth">2592</int>
-
-    <!-- If true, The text message over 160 characters will be sent in multi part.
-         If false, The text message over 160 characters will be sent
-         via multi media message or separate, independent SMS messages,
-         dependent on sendMultipartSMSAsSeparateMessages value. -->
-    <bool name="enableMultipartSMS">false</bool>
-
-    <!-- Email Gateway Number -->
-    <!-- TODO: check if this is correct for Passion -->
-    <string name="emailGatewayNumber">6245</string>
-
-    <bool name="allowAttachAudio">true</bool>
-
-    <!-- Hide the MMS read reports UI in settings -->
-    <bool name="enableMMSReadReports">false</bool>
-
-    <!-- Maximum length in chars of mms subject field -->
-    <int name="maxSubjectLength">80</int>
-
-</mms_config>
-
+<?xml version="1.0" encoding="utf-8"?>
+<!-- Copyright 2014 The Android Open Source Project
+
+     Licensed under the Apache License, Version 2.0 (the "License");
+     you may not use this file except in compliance with the License.
+     You may obtain a copy of the License at
+
+          http://www.apache.org/licenses/LICENSE-2.0
+
+     Unless required by applicable law or agreed to in writing, software
+     distributed under the License is distributed on an "AS IS" BASIS,
+     WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+     See the License for the specific language governing permissions and
+     limitations under the License.
+-->
+
+<mms_config version="2">
+    <!-- In case of single segment M-Notification.ind, this indicates whether
+         TransactionID should be appended to URI or not. -->
+    <bool name="enabledTransID">true</bool>
+
+    <!-- Send M-Acknowledge.ind and M-NotifyResp.ind to the URL received by the
+         M-Notification.ind (WAP-PUSH). -->
+    <bool name="enabledNotifyWapMMSC">true</bool>
+
+    <!-- Maximum message size in bytes for a MMS message -->
+    <int name="maxMessageSize">1048576</int>
+
+    <!-- UAProf parameter tag name -->
+    <string name="uaProfTagName">x-wap-profile</string>
+
+    <!-- Maximum number of recipients allowed per message. Use a value of -1
+         to indicate no limit. -->
+    <int name="recipientLimit">20</int>
+
+    <!-- Additional http parameters used in MMS http request.
+         Parameters are seperated by '|'. Optional. -->
+    <string name="httpParams">x-vzw-mdn: 1##LINE1NOCOUNTRYCODE##</string>
+
+    <!-- Maximum height for an attached image -->
+    <int name="maxImageHeight">1944</int>
+
+    <!-- Maximum width for an attached image -->
+    <int name="maxImageWidth">2592</int>
+
+    <!-- If true, The text message over 160 characters will be sent in multi part.
+         If false, The text message over 160 characters will be sent
+         via multi media message or separate, independent SMS messages,
+         dependent on sendMultipartSMSAsSeparateMessages value. -->
+    <bool name="enableMultipartSMS">false</bool>
+
+    <!-- Email Gateway Number -->
+    <!-- TODO: check if this is correct for Passion -->
+    <string name="emailGatewayNumber">6245</string>
+
+    <bool name="allowAttachAudio">true</bool>
+
+    <!-- Hide the MMS read reports UI in settings -->
+    <bool name="enableMMSReadReports">false</bool>
+
+    <!-- Maximum length in chars of mms subject field -->
+    <int name="maxSubjectLength">80</int>
+
+</mms_config>
+
diff --git a/android-smsmms/src/main/res/xml-mcc311-mnc586/mms_config.xml b/android-smsmms/src/main/res/xml-mcc311-mnc586/mms_config.xml
index 196d4f7f9..d9d80df27 100755
--- a/android-smsmms/src/main/res/xml-mcc311-mnc586/mms_config.xml
+++ b/android-smsmms/src/main/res/xml-mcc311-mnc586/mms_config.xml
@@ -1,65 +1,65 @@
-<?xml version="1.0" encoding="utf-8"?>
-<!-- Copyright 2014 The Android Open Source Project
-
-     Licensed under the Apache License, Version 2.0 (the "License");
-     you may not use this file except in compliance with the License.
-     You may obtain a copy of the License at
-
-          http://www.apache.org/licenses/LICENSE-2.0
-
-     Unless required by applicable law or agreed to in writing, software
-     distributed under the License is distributed on an "AS IS" BASIS,
-     WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
-     See the License for the specific language governing permissions and
-     limitations under the License.
--->
-
-<mms_config version="2">
-    <!-- In case of single segment M-Notification.ind, this indicates whether
-         TransactionID should be appended to URI or not. -->
-    <bool name="enabledTransID">true</bool>
-
-    <!-- Send M-Acknowledge.ind and M-NotifyResp.ind to the URL received by the
-         M-Notification.ind (WAP-PUSH). -->
-    <bool name="enabledNotifyWapMMSC">true</bool>
-
-    <!-- Maximum message size in bytes for a MMS message -->
-    <int name="maxMessageSize">1048576</int>
-
-    <!-- UAProf parameter tag name -->
-    <string name="uaProfTagName">x-wap-profile</string>
-
-    <!-- Maximum number of recipients allowed per message. Use a value of -1
-         to indicate no limit. -->
-    <int name="recipientLimit">20</int>
-
-    <!-- Additional http parameters used in MMS http request.
-         Parameters are seperated by '|'. Optional. -->
-    <string name="httpParams">x-vzw-mdn: 1##LINE1NOCOUNTRYCODE##</string>
-
-    <!-- Maximum height for an attached image -->
-    <int name="maxImageHeight">1944</int>
-
-    <!-- Maximum width for an attached image -->
-    <int name="maxImageWidth">2592</int>
-
-    <!-- If true, The text message over 160 characters will be sent in multi part.
-         If false, The text message over 160 characters will be sent
-         via multi media message or separate, independent SMS messages,
-         dependent on sendMultipartSMSAsSeparateMessages value. -->
-    <bool name="enableMultipartSMS">false</bool>
-
-    <!-- Email Gateway Number -->
-    <!-- TODO: check if this is correct for Passion -->
-    <string name="emailGatewayNumber">6245</string>
-
-    <bool name="allowAttachAudio">true</bool>
-
-    <!-- Hide the MMS read reports UI in settings -->
-    <bool name="enableMMSReadReports">false</bool>
-
-    <!-- Maximum length in chars of mms subject field -->
-    <int name="maxSubjectLength">80</int>
-
-</mms_config>
-
+<?xml version="1.0" encoding="utf-8"?>
+<!-- Copyright 2014 The Android Open Source Project
+
+     Licensed under the Apache License, Version 2.0 (the "License");
+     you may not use this file except in compliance with the License.
+     You may obtain a copy of the License at
+
+          http://www.apache.org/licenses/LICENSE-2.0
+
+     Unless required by applicable law or agreed to in writing, software
+     distributed under the License is distributed on an "AS IS" BASIS,
+     WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+     See the License for the specific language governing permissions and
+     limitations under the License.
+-->
+
+<mms_config version="2">
+    <!-- In case of single segment M-Notification.ind, this indicates whether
+         TransactionID should be appended to URI or not. -->
+    <bool name="enabledTransID">true</bool>
+
+    <!-- Send M-Acknowledge.ind and M-NotifyResp.ind to the URL received by the
+         M-Notification.ind (WAP-PUSH). -->
+    <bool name="enabledNotifyWapMMSC">true</bool>
+
+    <!-- Maximum message size in bytes for a MMS message -->
+    <int name="maxMessageSize">1048576</int>
+
+    <!-- UAProf parameter tag name -->
+    <string name="uaProfTagName">x-wap-profile</string>
+
+    <!-- Maximum number of recipients allowed per message. Use a value of -1
+         to indicate no limit. -->
+    <int name="recipientLimit">20</int>
+
+    <!-- Additional http parameters used in MMS http request.
+         Parameters are seperated by '|'. Optional. -->
+    <string name="httpParams">x-vzw-mdn: 1##LINE1NOCOUNTRYCODE##</string>
+
+    <!-- Maximum height for an attached image -->
+    <int name="maxImageHeight">1944</int>
+
+    <!-- Maximum width for an attached image -->
+    <int name="maxImageWidth">2592</int>
+
+    <!-- If true, The text message over 160 characters will be sent in multi part.
+         If false, The text message over 160 characters will be sent
+         via multi media message or separate, independent SMS messages,
+         dependent on sendMultipartSMSAsSeparateMessages value. -->
+    <bool name="enableMultipartSMS">false</bool>
+
+    <!-- Email Gateway Number -->
+    <!-- TODO: check if this is correct for Passion -->
+    <string name="emailGatewayNumber">6245</string>
+
+    <bool name="allowAttachAudio">true</bool>
+
+    <!-- Hide the MMS read reports UI in settings -->
+    <bool name="enableMMSReadReports">false</bool>
+
+    <!-- Maximum length in chars of mms subject field -->
+    <int name="maxSubjectLength">80</int>
+
+</mms_config>
+
diff --git a/android-smsmms/src/main/res/xml-mcc311-mnc587/mms_config.xml b/android-smsmms/src/main/res/xml-mcc311-mnc587/mms_config.xml
index 196d4f7f9..d9d80df27 100755
--- a/android-smsmms/src/main/res/xml-mcc311-mnc587/mms_config.xml
+++ b/android-smsmms/src/main/res/xml-mcc311-mnc587/mms_config.xml
@@ -1,65 +1,65 @@
-<?xml version="1.0" encoding="utf-8"?>
-<!-- Copyright 2014 The Android Open Source Project
-
-     Licensed under the Apache License, Version 2.0 (the "License");
-     you may not use this file except in compliance with the License.
-     You may obtain a copy of the License at
-
-          http://www.apache.org/licenses/LICENSE-2.0
-
-     Unless required by applicable law or agreed to in writing, software
-     distributed under the License is distributed on an "AS IS" BASIS,
-     WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
-     See the License for the specific language governing permissions and
-     limitations under the License.
--->
-
-<mms_config version="2">
-    <!-- In case of single segment M-Notification.ind, this indicates whether
-         TransactionID should be appended to URI or not. -->
-    <bool name="enabledTransID">true</bool>
-
-    <!-- Send M-Acknowledge.ind and M-NotifyResp.ind to the URL received by the
-         M-Notification.ind (WAP-PUSH). -->
-    <bool name="enabledNotifyWapMMSC">true</bool>
-
-    <!-- Maximum message size in bytes for a MMS message -->
-    <int name="maxMessageSize">1048576</int>
-
-    <!-- UAProf parameter tag name -->
-    <string name="uaProfTagName">x-wap-profile</string>
-
-    <!-- Maximum number of recipients allowed per message. Use a value of -1
-         to indicate no limit. -->
-    <int name="recipientLimit">20</int>
-
-    <!-- Additional http parameters used in MMS http request.
-         Parameters are seperated by '|'. Optional. -->
-    <string name="httpParams">x-vzw-mdn: 1##LINE1NOCOUNTRYCODE##</string>
-
-    <!-- Maximum height for an attached image -->
-    <int name="maxImageHeight">1944</int>
-
-    <!-- Maximum width for an attached image -->
-    <int name="maxImageWidth">2592</int>
-
-    <!-- If true, The text message over 160 characters will be sent in multi part.
-         If false, The text message over 160 characters will be sent
-         via multi media message or separate, independent SMS messages,
-         dependent on sendMultipartSMSAsSeparateMessages value. -->
-    <bool name="enableMultipartSMS">false</bool>
-
-    <!-- Email Gateway Number -->
-    <!-- TODO: check if this is correct for Passion -->
-    <string name="emailGatewayNumber">6245</string>
-
-    <bool name="allowAttachAudio">true</bool>
-
-    <!-- Hide the MMS read reports UI in settings -->
-    <bool name="enableMMSReadReports">false</bool>
-
-    <!-- Maximum length in chars of mms subject field -->
-    <int name="maxSubjectLength">80</int>
-
-</mms_config>
-
+<?xml version="1.0" encoding="utf-8"?>
+<!-- Copyright 2014 The Android Open Source Project
+
+     Licensed under the Apache License, Version 2.0 (the "License");
+     you may not use this file except in compliance with the License.
+     You may obtain a copy of the License at
+
+          http://www.apache.org/licenses/LICENSE-2.0
+
+     Unless required by applicable law or agreed to in writing, software
+     distributed under the License is distributed on an "AS IS" BASIS,
+     WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+     See the License for the specific language governing permissions and
+     limitations under the License.
+-->
+
+<mms_config version="2">
+    <!-- In case of single segment M-Notification.ind, this indicates whether
+         TransactionID should be appended to URI or not. -->
+    <bool name="enabledTransID">true</bool>
+
+    <!-- Send M-Acknowledge.ind and M-NotifyResp.ind to the URL received by the
+         M-Notification.ind (WAP-PUSH). -->
+    <bool name="enabledNotifyWapMMSC">true</bool>
+
+    <!-- Maximum message size in bytes for a MMS message -->
+    <int name="maxMessageSize">1048576</int>
+
+    <!-- UAProf parameter tag name -->
+    <string name="uaProfTagName">x-wap-profile</string>
+
+    <!-- Maximum number of recipients allowed per message. Use a value of -1
+         to indicate no limit. -->
+    <int name="recipientLimit">20</int>
+
+    <!-- Additional http parameters used in MMS http request.
+         Parameters are seperated by '|'. Optional. -->
+    <string name="httpParams">x-vzw-mdn: 1##LINE1NOCOUNTRYCODE##</string>
+
+    <!-- Maximum height for an attached image -->
+    <int name="maxImageHeight">1944</int>
+
+    <!-- Maximum width for an attached image -->
+    <int name="maxImageWidth">2592</int>
+
+    <!-- If true, The text message over 160 characters will be sent in multi part.
+         If false, The text message over 160 characters will be sent
+         via multi media message or separate, independent SMS messages,
+         dependent on sendMultipartSMSAsSeparateMessages value. -->
+    <bool name="enableMultipartSMS">false</bool>
+
+    <!-- Email Gateway Number -->
+    <!-- TODO: check if this is correct for Passion -->
+    <string name="emailGatewayNumber">6245</string>
+
+    <bool name="allowAttachAudio">true</bool>
+
+    <!-- Hide the MMS read reports UI in settings -->
+    <bool name="enableMMSReadReports">false</bool>
+
+    <!-- Maximum length in chars of mms subject field -->
+    <int name="maxSubjectLength">80</int>
+
+</mms_config>
+
diff --git a/android-smsmms/src/main/res/xml-mcc311-mnc588/mms_config.xml b/android-smsmms/src/main/res/xml-mcc311-mnc588/mms_config.xml
index 196d4f7f9..d9d80df27 100755
--- a/android-smsmms/src/main/res/xml-mcc311-mnc588/mms_config.xml
+++ b/android-smsmms/src/main/res/xml-mcc311-mnc588/mms_config.xml
@@ -1,65 +1,65 @@
-<?xml version="1.0" encoding="utf-8"?>
-<!-- Copyright 2014 The Android Open Source Project
-
-     Licensed under the Apache License, Version 2.0 (the "License");
-     you may not use this file except in compliance with the License.
-     You may obtain a copy of the License at
-
-          http://www.apache.org/licenses/LICENSE-2.0
-
-     Unless required by applicable law or agreed to in writing, software
-     distributed under the License is distributed on an "AS IS" BASIS,
-     WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
-     See the License for the specific language governing permissions and
-     limitations under the License.
--->
-
-<mms_config version="2">
-    <!-- In case of single segment M-Notification.ind, this indicates whether
-         TransactionID should be appended to URI or not. -->
-    <bool name="enabledTransID">true</bool>
-
-    <!-- Send M-Acknowledge.ind and M-NotifyResp.ind to the URL received by the
-         M-Notification.ind (WAP-PUSH). -->
-    <bool name="enabledNotifyWapMMSC">true</bool>
-
-    <!-- Maximum message size in bytes for a MMS message -->
-    <int name="maxMessageSize">1048576</int>
-
-    <!-- UAProf parameter tag name -->
-    <string name="uaProfTagName">x-wap-profile</string>
-
-    <!-- Maximum number of recipients allowed per message. Use a value of -1
-         to indicate no limit. -->
-    <int name="recipientLimit">20</int>
-
-    <!-- Additional http parameters used in MMS http request.
-         Parameters are seperated by '|'. Optional. -->
-    <string name="httpParams">x-vzw-mdn: 1##LINE1NOCOUNTRYCODE##</string>
-
-    <!-- Maximum height for an attached image -->
-    <int name="maxImageHeight">1944</int>
-
-    <!-- Maximum width for an attached image -->
-    <int name="maxImageWidth">2592</int>
-
-    <!-- If true, The text message over 160 characters will be sent in multi part.
-         If false, The text message over 160 characters will be sent
-         via multi media message or separate, independent SMS messages,
-         dependent on sendMultipartSMSAsSeparateMessages value. -->
-    <bool name="enableMultipartSMS">false</bool>
-
-    <!-- Email Gateway Number -->
-    <!-- TODO: check if this is correct for Passion -->
-    <string name="emailGatewayNumber">6245</string>
-
-    <bool name="allowAttachAudio">true</bool>
-
-    <!-- Hide the MMS read reports UI in settings -->
-    <bool name="enableMMSReadReports">false</bool>
-
-    <!-- Maximum length in chars of mms subject field -->
-    <int name="maxSubjectLength">80</int>
-
-</mms_config>
-
+<?xml version="1.0" encoding="utf-8"?>
+<!-- Copyright 2014 The Android Open Source Project
+
+     Licensed under the Apache License, Version 2.0 (the "License");
+     you may not use this file except in compliance with the License.
+     You may obtain a copy of the License at
+
+          http://www.apache.org/licenses/LICENSE-2.0
+
+     Unless required by applicable law or agreed to in writing, software
+     distributed under the License is distributed on an "AS IS" BASIS,
+     WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+     See the License for the specific language governing permissions and
+     limitations under the License.
+-->
+
+<mms_config version="2">
+    <!-- In case of single segment M-Notification.ind, this indicates whether
+         TransactionID should be appended to URI or not. -->
+    <bool name="enabledTransID">true</bool>
+
+    <!-- Send M-Acknowledge.ind and M-NotifyResp.ind to the URL received by the
+         M-Notification.ind (WAP-PUSH). -->
+    <bool name="enabledNotifyWapMMSC">true</bool>
+
+    <!-- Maximum message size in bytes for a MMS message -->
+    <int name="maxMessageSize">1048576</int>
+
+    <!-- UAProf parameter tag name -->
+    <string name="uaProfTagName">x-wap-profile</string>
+
+    <!-- Maximum number of recipients allowed per message. Use a value of -1
+         to indicate no limit. -->
+    <int name="recipientLimit">20</int>
+
+    <!-- Additional http parameters used in MMS http request.
+         Parameters are seperated by '|'. Optional. -->
+    <string name="httpParams">x-vzw-mdn: 1##LINE1NOCOUNTRYCODE##</string>
+
+    <!-- Maximum height for an attached image -->
+    <int name="maxImageHeight">1944</int>
+
+    <!-- Maximum width for an attached image -->
+    <int name="maxImageWidth">2592</int>
+
+    <!-- If true, The text message over 160 characters will be sent in multi part.
+         If false, The text message over 160 characters will be sent
+         via multi media message or separate, independent SMS messages,
+         dependent on sendMultipartSMSAsSeparateMessages value. -->
+    <bool name="enableMultipartSMS">false</bool>
+
+    <!-- Email Gateway Number -->
+    <!-- TODO: check if this is correct for Passion -->
+    <string name="emailGatewayNumber">6245</string>
+
+    <bool name="allowAttachAudio">true</bool>
+
+    <!-- Hide the MMS read reports UI in settings -->
+    <bool name="enableMMSReadReports">false</bool>
+
+    <!-- Maximum length in chars of mms subject field -->
+    <int name="maxSubjectLength">80</int>
+
+</mms_config>
+
diff --git a/android-smsmms/src/main/res/xml-mcc311-mnc589/mms_config.xml b/android-smsmms/src/main/res/xml-mcc311-mnc589/mms_config.xml
index 196d4f7f9..d9d80df27 100755
--- a/android-smsmms/src/main/res/xml-mcc311-mnc589/mms_config.xml
+++ b/android-smsmms/src/main/res/xml-mcc311-mnc589/mms_config.xml
@@ -1,65 +1,65 @@
-<?xml version="1.0" encoding="utf-8"?>
-<!-- Copyright 2014 The Android Open Source Project
-
-     Licensed under the Apache License, Version 2.0 (the "License");
-     you may not use this file except in compliance with the License.
-     You may obtain a copy of the License at
-
-          http://www.apache.org/licenses/LICENSE-2.0
-
-     Unless required by applicable law or agreed to in writing, software
-     distributed under the License is distributed on an "AS IS" BASIS,
-     WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
-     See the License for the specific language governing permissions and
-     limitations under the License.
--->
-
-<mms_config version="2">
-    <!-- In case of single segment M-Notification.ind, this indicates whether
-         TransactionID should be appended to URI or not. -->
-    <bool name="enabledTransID">true</bool>
-
-    <!-- Send M-Acknowledge.ind and M-NotifyResp.ind to the URL received by the
-         M-Notification.ind (WAP-PUSH). -->
-    <bool name="enabledNotifyWapMMSC">true</bool>
-
-    <!-- Maximum message size in bytes for a MMS message -->
-    <int name="maxMessageSize">1048576</int>
-
-    <!-- UAProf parameter tag name -->
-    <string name="uaProfTagName">x-wap-profile</string>
-
-    <!-- Maximum number of recipients allowed per message. Use a value of -1
-         to indicate no limit. -->
-    <int name="recipientLimit">20</int>
-
-    <!-- Additional http parameters used in MMS http request.
-         Parameters are seperated by '|'. Optional. -->
-    <string name="httpParams">x-vzw-mdn: 1##LINE1NOCOUNTRYCODE##</string>
-
-    <!-- Maximum height for an attached image -->
-    <int name="maxImageHeight">1944</int>
-
-    <!-- Maximum width for an attached image -->
-    <int name="maxImageWidth">2592</int>
-
-    <!-- If true, The text message over 160 characters will be sent in multi part.
-         If false, The text message over 160 characters will be sent
-         via multi media message or separate, independent SMS messages,
-         dependent on sendMultipartSMSAsSeparateMessages value. -->
-    <bool name="enableMultipartSMS">false</bool>
-
-    <!-- Email Gateway Number -->
-    <!-- TODO: check if this is correct for Passion -->
-    <string name="emailGatewayNumber">6245</string>
-
-    <bool name="allowAttachAudio">true</bool>
-
-    <!-- Hide the MMS read reports UI in settings -->
-    <bool name="enableMMSReadReports">false</bool>
-
-    <!-- Maximum length in chars of mms subject field -->
-    <int name="maxSubjectLength">80</int>
-
-</mms_config>
-
+<?xml version="1.0" encoding="utf-8"?>
+<!-- Copyright 2014 The Android Open Source Project
+
+     Licensed under the Apache License, Version 2.0 (the "License");
+     you may not use this file except in compliance with the License.
+     You may obtain a copy of the License at
+
+          http://www.apache.org/licenses/LICENSE-2.0
+
+     Unless required by applicable law or agreed to in writing, software
+     distributed under the License is distributed on an "AS IS" BASIS,
+     WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+     See the License for the specific language governing permissions and
+     limitations under the License.
+-->
+
+<mms_config version="2">
+    <!-- In case of single segment M-Notification.ind, this indicates whether
+         TransactionID should be appended to URI or not. -->
+    <bool name="enabledTransID">true</bool>
+
+    <!-- Send M-Acknowledge.ind and M-NotifyResp.ind to the URL received by the
+         M-Notification.ind (WAP-PUSH). -->
+    <bool name="enabledNotifyWapMMSC">true</bool>
+
+    <!-- Maximum message size in bytes for a MMS message -->
+    <int name="maxMessageSize">1048576</int>
+
+    <!-- UAProf parameter tag name -->
+    <string name="uaProfTagName">x-wap-profile</string>
+
+    <!-- Maximum number of recipients allowed per message. Use a value of -1
+         to indicate no limit. -->
+    <int name="recipientLimit">20</int>
+
+    <!-- Additional http parameters used in MMS http request.
+         Parameters are seperated by '|'. Optional. -->
+    <string name="httpParams">x-vzw-mdn: 1##LINE1NOCOUNTRYCODE##</string>
+
+    <!-- Maximum height for an attached image -->
+    <int name="maxImageHeight">1944</int>
+
+    <!-- Maximum width for an attached image -->
+    <int name="maxImageWidth">2592</int>
+
+    <!-- If true, The text message over 160 characters will be sent in multi part.
+         If false, The text message over 160 characters will be sent
+         via multi media message or separate, independent SMS messages,
+         dependent on sendMultipartSMSAsSeparateMessages value. -->
+    <bool name="enableMultipartSMS">false</bool>
+
+    <!-- Email Gateway Number -->
+    <!-- TODO: check if this is correct for Passion -->
+    <string name="emailGatewayNumber">6245</string>
+
+    <bool name="allowAttachAudio">true</bool>
+
+    <!-- Hide the MMS read reports UI in settings -->
+    <bool name="enableMMSReadReports">false</bool>
+
+    <!-- Maximum length in chars of mms subject field -->
+    <int name="maxSubjectLength">80</int>
+
+</mms_config>
+
diff --git a/android-smsmms/src/main/res/xml-mcc311-mnc590/mms_config.xml b/android-smsmms/src/main/res/xml-mcc311-mnc590/mms_config.xml
index 962285793..b6c20a12f 100755
--- a/android-smsmms/src/main/res/xml-mcc311-mnc590/mms_config.xml
+++ b/android-smsmms/src/main/res/xml-mcc311-mnc590/mms_config.xml
@@ -1,83 +1,83 @@
-<?xml version="1.0" encoding="utf-8"?>
-<!-- Copyright (C) 2009 The Android Open Source Project
-
-     Licensed under the Apache License, Version 2.0 (the "License");
-     you may not use this file except in compliance with the License.
-     You may obtain a copy of the License at
-
-          http://www.apache.org/licenses/LICENSE-2.0
-
-     Unless required by applicable law or agreed to in writing, software
-     distributed under the License is distributed on an "AS IS" BASIS,
-     WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
-     See the License for the specific language governing permissions and
-     limitations under the License.
--->
-
-<!-- Version History
-        version 1 - initial version.
-        version 2 - added recipientLimit.
-        version 3 - added min/max recycler values.
-        version 4 - added sms to mms text threshold.
--->
-
-<mms_config version="4">
-    <!-- Flag indicating whether MMS should be enabled -->
-    <bool name="enabledMMS">true</bool>
-
-    <!-- Maximum message size in bytes for a MMS message -->
-    <int name="maxMessageSize">1048576</int>
-
-    <!-- Maximum height for an attached image -->
-    <int name="maxImageHeight">2432</int>
-
-    <!-- Maximum width for an attached image -->
-    <int name="maxImageWidth">4320</int>
-
-    <!-- Maximum number of SMS message to save per thread before auto-delete kicks in.
-         This is the default value. -->
-    <int name="defaultSMSMessagesPerThread">500</int>
-
-    <!-- Maximum number of MMS message to save per thread before auto-delete kicks in.
-         This is the default value. -->
-    <int name="defaultMMSMessagesPerThread">50</int>
-
-    <!-- Minimum value for the number of messages kept per conversation. The user can never
-         set the limit below this value. -->
-    <int name="minMessageCountPerThread">10</int>
-
-    <!-- Maximum value for the number of messages kept per conversation. The user can never
-         set the limit above this value. -->
-    <int name="maxMessageCountPerThread">5000</int>
-
-    <!-- Maximum number of recipients allowed per message. Use a value of -1
-         to indicate no limit. -->
-    <int name="recipientLimit">20</int>
-
-    <!-- If true, The text message over 160 characters will be sent in multi part.
-         If false, The text message over 160 characters will be sent
-         via multi media message. -->
-    <bool name="enableMultipartSMS">true</bool>
-
-    <!-- If enableMultipartSMS is true and smsToMmsTextThreshold > 1, then multi-part SMS messages
-         will be converted into a single mms message. For example, if the mms_config.xml file
-         specifies <int name="smsToMmsTextThreshold">7</int>, then on the 8th sms segment, the
-         message will be converted to an mms. -->
-    <int name="smsToMmsTextThreshold">1</int>
-
-    <!-- If true, The mms support slide duration.
-         If false, The mms does not support slide duration and we have to
-         set duration value. -->
-    <bool name="enableSlideDuration">true</bool>
-
-    <!-- Maximum length for message text. Use a value of -1
-         to indicate default value -->
-    <int name="maxMessageTextSize">-1</int>
-
-    <!-- Maximum length in chars of mms subject field -->
-    <int name="maxSubjectLength">80</int>
-
-     <!-- Reference for additional http parameters used in MMS http request.
-          Parameters are seperated by '|'. Optional.  -->
-     <string name="httpParams">X-MDN: ##LINE1##</string>
-</mms_config>
+<?xml version="1.0" encoding="utf-8"?>
+<!-- Copyright (C) 2009 The Android Open Source Project
+
+     Licensed under the Apache License, Version 2.0 (the "License");
+     you may not use this file except in compliance with the License.
+     You may obtain a copy of the License at
+
+          http://www.apache.org/licenses/LICENSE-2.0
+
+     Unless required by applicable law or agreed to in writing, software
+     distributed under the License is distributed on an "AS IS" BASIS,
+     WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+     See the License for the specific language governing permissions and
+     limitations under the License.
+-->
+
+<!-- Version History
+        version 1 - initial version.
+        version 2 - added recipientLimit.
+        version 3 - added min/max recycler values.
+        version 4 - added sms to mms text threshold.
+-->
+
+<mms_config version="4">
+    <!-- Flag indicating whether MMS should be enabled -->
+    <bool name="enabledMMS">true</bool>
+
+    <!-- Maximum message size in bytes for a MMS message -->
+    <int name="maxMessageSize">1048576</int>
+
+    <!-- Maximum height for an attached image -->
+    <int name="maxImageHeight">2432</int>
+
+    <!-- Maximum width for an attached image -->
+    <int name="maxImageWidth">4320</int>
+
+    <!-- Maximum number of SMS message to save per thread before auto-delete kicks in.
+         This is the default value. -->
+    <int name="defaultSMSMessagesPerThread">500</int>
+
+    <!-- Maximum number of MMS message to save per thread before auto-delete kicks in.
+         This is the default value. -->
+    <int name="defaultMMSMessagesPerThread">50</int>
+
+    <!-- Minimum value for the number of messages kept per conversation. The user can never
+         set the limit below this value. -->
+    <int name="minMessageCountPerThread">10</int>
+
+    <!-- Maximum value for the number of messages kept per conversation. The user can never
+         set the limit above this value. -->
+    <int name="maxMessageCountPerThread">5000</int>
+
+    <!-- Maximum number of recipients allowed per message. Use a value of -1
+         to indicate no limit. -->
+    <int name="recipientLimit">20</int>
+
+    <!-- If true, The text message over 160 characters will be sent in multi part.
+         If false, The text message over 160 characters will be sent
+         via multi media message. -->
+    <bool name="enableMultipartSMS">true</bool>
+
+    <!-- If enableMultipartSMS is true and smsToMmsTextThreshold > 1, then multi-part SMS messages
+         will be converted into a single mms message. For example, if the mms_config.xml file
+         specifies <int name="smsToMmsTextThreshold">7</int>, then on the 8th sms segment, the
+         message will be converted to an mms. -->
+    <int name="smsToMmsTextThreshold">1</int>
+
+    <!-- If true, The mms support slide duration.
+         If false, The mms does not support slide duration and we have to
+         set duration value. -->
+    <bool name="enableSlideDuration">true</bool>
+
+    <!-- Maximum length for message text. Use a value of -1
+         to indicate default value -->
+    <int name="maxMessageTextSize">-1</int>
+
+    <!-- Maximum length in chars of mms subject field -->
+    <int name="maxSubjectLength">80</int>
+
+     <!-- Reference for additional http parameters used in MMS http request.
+          Parameters are seperated by '|'. Optional.  -->
+     <string name="httpParams">X-MDN: ##LINE1##</string>
+</mms_config>
diff --git a/android-smsmms/src/main/res/xml-mcc311-mnc870/mms_config.xml b/android-smsmms/src/main/res/xml-mcc311-mnc870/mms_config.xml
index 8c1ae1193..ec09547de 100755
--- a/android-smsmms/src/main/res/xml-mcc311-mnc870/mms_config.xml
+++ b/android-smsmms/src/main/res/xml-mcc311-mnc870/mms_config.xml
@@ -1,75 +1,75 @@
-<?xml version="1.0" encoding="utf-8"?>
-<!-- Copyright 2013 The Android Open Source Project
-
-     Licensed under the Apache License, Version 2.0 (the "License");
-     you may not use this file except in compliance with the License.
-     You may obtain a copy of the License at
-
-          http://www.apache.org/licenses/LICENSE-2.0
-
-     Unless required by applicable law or agreed to in writing, software
-     distributed under the License is distributed on an "AS IS" BASIS,
-     WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
-     See the License for the specific language governing permissions and
-     limitations under the License.
--->
-
-<mms_config version="4">
-    <!-- Flag indicating whether MMS should be enabled -->
-    <bool name="enabledMMS">true</bool>
-
-    <!-- Maximum message size in bytes for a MMS message -->
-    <int name="maxMessageSize">1048576</int>
-
-    <!-- Maximum height for an attached image -->
-    <int name="maxImageHeight">1944</int>
-
-    <!-- Maximum width for an attached image -->
-    <int name="maxImageWidth">2592</int>
-
-    <!-- Maximum number of recipients allowed per message. Use a value of -1
-         to indicate no limit. -->
-    <int name="recipientLimit">40</int>
-
-    <!-- If true, The text message over 160 characters will be sent in multi part.
-         If false, The text message over 160 characters will be sent
-         via multi media message. -->
-    <bool name="enableMultipartSMS">true</bool>
-
-    <!-- If enableMultipartSMS is true and smsToMmsTextThreshold > 1, then multi-part SMS messages
-         will be converted into a single mms message. For example, if the mms_config.xml file
-         specifies <int name="smsToMmsTextThreshold">7</int>, then on the 8th sms segment, the
-         message will be converted to an mms. -->
-    <int name="smsToMmsTextThreshold">6</int>
-
-    <!-- If true, The mms support slide duration.
-         If false, The mms does not support slide duration and we have to
-         set duration value. -->
-    <bool name="enableSlideDuration">false</bool>
-
-    <!-- Maximum length for message text. Use a value of -1
-         to indicate default value -->
-    <int name="maxMessageTextSize">-1</int>
-
-    <!-- Maximum length in chars of mms subject field -->
-    <int name="maxSubjectLength">80</int>
-
-    <!-- Email Gateway Number -->
-    <string name="emailGatewayNumber">6245</string>
-
-    <bool name="enableMMSReadReports">false</bool>
-
-    <bool name="enableSMSDeliveryReports">false</bool>
-
-    <bool name="enableMMSDeliveryReports">false</bool>
-
-    <!-- Reference for additional http parameters used in MMS http request.
-         Parameters are seperated by '|'. Optional. -->
-    <string name="httpParams">X-MDN: ##LINE1##|Proxy-Authorization: Basic ##NAI##</string>
-
-    <!-- Suffix to the NAI header (encoded together with base64) -->
-    <string name="naiSuffix">:pcs</string>
-
-    <!-- If true, need to read content_disposition field of an MMS part -->
-    <bool name="supportMmsContentDisposition">false</bool>
-</mms_config>
+<?xml version="1.0" encoding="utf-8"?>
+<!-- Copyright 2013 The Android Open Source Project
+
+     Licensed under the Apache License, Version 2.0 (the "License");
+     you may not use this file except in compliance with the License.
+     You may obtain a copy of the License at
+
+          http://www.apache.org/licenses/LICENSE-2.0
+
+     Unless required by applicable law or agreed to in writing, software
+     distributed under the License is distributed on an "AS IS" BASIS,
+     WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+     See the License for the specific language governing permissions and
+     limitations under the License.
+-->
+
+<mms_config version="4">
+    <!-- Flag indicating whether MMS should be enabled -->
+    <bool name="enabledMMS">true</bool>
+
+    <!-- Maximum message size in bytes for a MMS message -->
+    <int name="maxMessageSize">1048576</int>
+
+    <!-- Maximum height for an attached image -->
+    <int name="maxImageHeight">1944</int>
+
+    <!-- Maximum width for an attached image -->
+    <int name="maxImageWidth">2592</int>
+
+    <!-- Maximum number of recipients allowed per message. Use a value of -1
+         to indicate no limit. -->
+    <int name="recipientLimit">40</int>
+
+    <!-- If true, The text message over 160 characters will be sent in multi part.
+         If false, The text message over 160 characters will be sent
+         via multi media message. -->
+    <bool name="enableMultipartSMS">true</bool>
+
+    <!-- If enableMultipartSMS is true and smsToMmsTextThreshold > 1, then multi-part SMS messages
+         will be converted into a single mms message. For example, if the mms_config.xml file
+         specifies <int name="smsToMmsTextThreshold">7</int>, then on the 8th sms segment, the
+         message will be converted to an mms. -->
+    <int name="smsToMmsTextThreshold">6</int>
+
+    <!-- If true, The mms support slide duration.
+         If false, The mms does not support slide duration and we have to
+         set duration value. -->
+    <bool name="enableSlideDuration">false</bool>
+
+    <!-- Maximum length for message text. Use a value of -1
+         to indicate default value -->
+    <int name="maxMessageTextSize">-1</int>
+
+    <!-- Maximum length in chars of mms subject field -->
+    <int name="maxSubjectLength">80</int>
+
+    <!-- Email Gateway Number -->
+    <string name="emailGatewayNumber">6245</string>
+
+    <bool name="enableMMSReadReports">false</bool>
+
+    <bool name="enableSMSDeliveryReports">false</bool>
+
+    <bool name="enableMMSDeliveryReports">false</bool>
+
+    <!-- Reference for additional http parameters used in MMS http request.
+         Parameters are seperated by '|'. Optional. -->
+    <string name="httpParams">X-MDN: ##LINE1##|Proxy-Authorization: Basic ##NAI##</string>
+
+    <!-- Suffix to the NAI header (encoded together with base64) -->
+    <string name="naiSuffix">:pcs</string>
+
+    <!-- If true, need to read content_disposition field of an MMS part -->
+    <bool name="supportMmsContentDisposition">false</bool>
+</mms_config>
diff --git a/android-smsmms/src/main/res/xml-mcc312-mnc160/mms_config.xml b/android-smsmms/src/main/res/xml-mcc312-mnc160/mms_config.xml
index 962285793..b6c20a12f 100755
--- a/android-smsmms/src/main/res/xml-mcc312-mnc160/mms_config.xml
+++ b/android-smsmms/src/main/res/xml-mcc312-mnc160/mms_config.xml
@@ -1,83 +1,83 @@
-<?xml version="1.0" encoding="utf-8"?>
-<!-- Copyright (C) 2009 The Android Open Source Project
-
-     Licensed under the Apache License, Version 2.0 (the "License");
-     you may not use this file except in compliance with the License.
-     You may obtain a copy of the License at
-
-          http://www.apache.org/licenses/LICENSE-2.0
-
-     Unless required by applicable law or agreed to in writing, software
-     distributed under the License is distributed on an "AS IS" BASIS,
-     WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
-     See the License for the specific language governing permissions and
-     limitations under the License.
--->
-
-<!-- Version History
-        version 1 - initial version.
-        version 2 - added recipientLimit.
-        version 3 - added min/max recycler values.
-        version 4 - added sms to mms text threshold.
--->
-
-<mms_config version="4">
-    <!-- Flag indicating whether MMS should be enabled -->
-    <bool name="enabledMMS">true</bool>
-
-    <!-- Maximum message size in bytes for a MMS message -->
-    <int name="maxMessageSize">1048576</int>
-
-    <!-- Maximum height for an attached image -->
-    <int name="maxImageHeight">2432</int>
-
-    <!-- Maximum width for an attached image -->
-    <int name="maxImageWidth">4320</int>
-
-    <!-- Maximum number of SMS message to save per thread before auto-delete kicks in.
-         This is the default value. -->
-    <int name="defaultSMSMessagesPerThread">500</int>
-
-    <!-- Maximum number of MMS message to save per thread before auto-delete kicks in.
-         This is the default value. -->
-    <int name="defaultMMSMessagesPerThread">50</int>
-
-    <!-- Minimum value for the number of messages kept per conversation. The user can never
-         set the limit below this value. -->
-    <int name="minMessageCountPerThread">10</int>
-
-    <!-- Maximum value for the number of messages kept per conversation. The user can never
-         set the limit above this value. -->
-    <int name="maxMessageCountPerThread">5000</int>
-
-    <!-- Maximum number of recipients allowed per message. Use a value of -1
-         to indicate no limit. -->
-    <int name="recipientLimit">20</int>
-
-    <!-- If true, The text message over 160 characters will be sent in multi part.
-         If false, The text message over 160 characters will be sent
-         via multi media message. -->
-    <bool name="enableMultipartSMS">true</bool>
-
-    <!-- If enableMultipartSMS is true and smsToMmsTextThreshold > 1, then multi-part SMS messages
-         will be converted into a single mms message. For example, if the mms_config.xml file
-         specifies <int name="smsToMmsTextThreshold">7</int>, then on the 8th sms segment, the
-         message will be converted to an mms. -->
-    <int name="smsToMmsTextThreshold">1</int>
-
-    <!-- If true, The mms support slide duration.
-         If false, The mms does not support slide duration and we have to
-         set duration value. -->
-    <bool name="enableSlideDuration">true</bool>
-
-    <!-- Maximum length for message text. Use a value of -1
-         to indicate default value -->
-    <int name="maxMessageTextSize">-1</int>
-
-    <!-- Maximum length in chars of mms subject field -->
-    <int name="maxSubjectLength">80</int>
-
-     <!-- Reference for additional http parameters used in MMS http request.
-          Parameters are seperated by '|'. Optional.  -->
-     <string name="httpParams">X-MDN: ##LINE1##</string>
-</mms_config>
+<?xml version="1.0" encoding="utf-8"?>
+<!-- Copyright (C) 2009 The Android Open Source Project
+
+     Licensed under the Apache License, Version 2.0 (the "License");
+     you may not use this file except in compliance with the License.
+     You may obtain a copy of the License at
+
+          http://www.apache.org/licenses/LICENSE-2.0
+
+     Unless required by applicable law or agreed to in writing, software
+     distributed under the License is distributed on an "AS IS" BASIS,
+     WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+     See the License for the specific language governing permissions and
+     limitations under the License.
+-->
+
+<!-- Version History
+        version 1 - initial version.
+        version 2 - added recipientLimit.
+        version 3 - added min/max recycler values.
+        version 4 - added sms to mms text threshold.
+-->
+
+<mms_config version="4">
+    <!-- Flag indicating whether MMS should be enabled -->
+    <bool name="enabledMMS">true</bool>
+
+    <!-- Maximum message size in bytes for a MMS message -->
+    <int name="maxMessageSize">1048576</int>
+
+    <!-- Maximum height for an attached image -->
+    <int name="maxImageHeight">2432</int>
+
+    <!-- Maximum width for an attached image -->
+    <int name="maxImageWidth">4320</int>
+
+    <!-- Maximum number of SMS message to save per thread before auto-delete kicks in.
+         This is the default value. -->
+    <int name="defaultSMSMessagesPerThread">500</int>
+
+    <!-- Maximum number of MMS message to save per thread before auto-delete kicks in.
+         This is the default value. -->
+    <int name="defaultMMSMessagesPerThread">50</int>
+
+    <!-- Minimum value for the number of messages kept per conversation. The user can never
+         set the limit below this value. -->
+    <int name="minMessageCountPerThread">10</int>
+
+    <!-- Maximum value for the number of messages kept per conversation. The user can never
+         set the limit above this value. -->
+    <int name="maxMessageCountPerThread">5000</int>
+
+    <!-- Maximum number of recipients allowed per message. Use a value of -1
+         to indicate no limit. -->
+    <int name="recipientLimit">20</int>
+
+    <!-- If true, The text message over 160 characters will be sent in multi part.
+         If false, The text message over 160 characters will be sent
+         via multi media message. -->
+    <bool name="enableMultipartSMS">true</bool>
+
+    <!-- If enableMultipartSMS is true and smsToMmsTextThreshold > 1, then multi-part SMS messages
+         will be converted into a single mms message. For example, if the mms_config.xml file
+         specifies <int name="smsToMmsTextThreshold">7</int>, then on the 8th sms segment, the
+         message will be converted to an mms. -->
+    <int name="smsToMmsTextThreshold">1</int>
+
+    <!-- If true, The mms support slide duration.
+         If false, The mms does not support slide duration and we have to
+         set duration value. -->
+    <bool name="enableSlideDuration">true</bool>
+
+    <!-- Maximum length for message text. Use a value of -1
+         to indicate default value -->
+    <int name="maxMessageTextSize">-1</int>
+
+    <!-- Maximum length in chars of mms subject field -->
+    <int name="maxSubjectLength">80</int>
+
+     <!-- Reference for additional http parameters used in MMS http request.
+          Parameters are seperated by '|'. Optional.  -->
+     <string name="httpParams">X-MDN: ##LINE1##</string>
+</mms_config>
diff --git a/android-smsmms/src/main/res/xml-mcc312-mnc530/mms_config.xml b/android-smsmms/src/main/res/xml-mcc312-mnc530/mms_config.xml
index 7b1b093c3..679d1f6b3 100755
--- a/android-smsmms/src/main/res/xml-mcc312-mnc530/mms_config.xml
+++ b/android-smsmms/src/main/res/xml-mcc312-mnc530/mms_config.xml
@@ -1,75 +1,75 @@
-<?xml version="1.0" encoding="utf-8"?>
-<!-- Copyright 2014 The Android Open Source Project
-
-     Licensed under the Apache License, Version 2.0 (the "License");
-     you may not use this file except in compliance with the License.
-     You may obtain a copy of the License at
-
-          http://www.apache.org/licenses/LICENSE-2.0
-
-     Unless required by applicable law or agreed to in writing, software
-     distributed under the License is distributed on an "AS IS" BASIS,
-     WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
-     See the License for the specific language governing permissions and
-     limitations under the License.
--->
-
-<mms_config version="1">
-    <!-- Flag indicating whether MMS should be enabled -->
-    <bool name="enabledMMS">true</bool>
-
-    <!-- Maximum message size in bytes for a MMS message -->
-    <int name="maxMessageSize">1048576</int>
-
-    <!-- Maximum height for an attached image -->
-    <int name="maxImageHeight">1944</int>
-
-    <!-- Maximum width for an attached image -->
-    <int name="maxImageWidth">2592</int>
-
-    <!-- Maximum number of recipients allowed per message. Use a value of -1
-         to indicate no limit. -->
-    <int name="recipientLimit">40</int>
-
-    <!-- If true, The text message over 160 characters will be sent in multi part.
-         If false, The text message over 160 characters will be sent
-         via multi media message. -->
-    <bool name="enableMultipartSMS">true</bool>
-
-    <!-- If enableMultipartSMS is true and smsToMmsTextThreshold > 1, then multi-part SMS messages
-         will be converted into a single mms message. For example, if the mms_config.xml file
-         specifies <int name="smsToMmsTextThreshold">7</int>, then on the 8th sms segment, the
-         message will be converted to an mms. -->
-    <int name="smsToMmsTextThreshold">6</int>
-
-    <!-- If true, The mms support slide duration.
-         If false, The mms does not support slide duration and we have to
-         set duration value. -->
-    <bool name="enableSlideDuration">false</bool>
-
-    <!-- Maximum length for message text. Use a value of -1
-         to indicate default value -->
-    <int name="maxMessageTextSize">-1</int>
-
-    <!-- Maximum length in chars of mms subject field -->
-    <int name="maxSubjectLength">80</int>
-
-    <!-- Email Gateway Number -->
-    <string name="emailGatewayNumber">6245</string>
-
-    <bool name="enableMMSReadReports">false</bool>
-
-    <bool name="enableSMSDeliveryReports">false</bool>
-
-    <bool name="enableMMSDeliveryReports">false</bool>
-
-    <!-- Reference for additional http parameters used in MMS http request.
-         Parameters are seperated by '|'. Optional. -->
-    <string name="httpParams">X-MDN: ##LINE1##|Proxy-Authorization: Basic ##NAI##</string>
-
-    <!-- Suffix to the NAI header (encoded together with base64) -->
-    <string name="naiSuffix">:pcs</string>
-
-    <!-- If true, need to read content_disposition field of an MMS part -->
-    <bool name="supportMmsContentDisposition">false</bool>
-</mms_config>
+<?xml version="1.0" encoding="utf-8"?>
+<!-- Copyright 2014 The Android Open Source Project
+
+     Licensed under the Apache License, Version 2.0 (the "License");
+     you may not use this file except in compliance with the License.
+     You may obtain a copy of the License at
+
+          http://www.apache.org/licenses/LICENSE-2.0
+
+     Unless required by applicable law or agreed to in writing, software
+     distributed under the License is distributed on an "AS IS" BASIS,
+     WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+     See the License for the specific language governing permissions and
+     limitations under the License.
+-->
+
+<mms_config version="1">
+    <!-- Flag indicating whether MMS should be enabled -->
+    <bool name="enabledMMS">true</bool>
+
+    <!-- Maximum message size in bytes for a MMS message -->
+    <int name="maxMessageSize">1048576</int>
+
+    <!-- Maximum height for an attached image -->
+    <int name="maxImageHeight">1944</int>
+
+    <!-- Maximum width for an attached image -->
+    <int name="maxImageWidth">2592</int>
+
+    <!-- Maximum number of recipients allowed per message. Use a value of -1
+         to indicate no limit. -->
+    <int name="recipientLimit">40</int>
+
+    <!-- If true, The text message over 160 characters will be sent in multi part.
+         If false, The text message over 160 characters will be sent
+         via multi media message. -->
+    <bool name="enableMultipartSMS">true</bool>
+
+    <!-- If enableMultipartSMS is true and smsToMmsTextThreshold > 1, then multi-part SMS messages
+         will be converted into a single mms message. For example, if the mms_config.xml file
+         specifies <int name="smsToMmsTextThreshold">7</int>, then on the 8th sms segment, the
+         message will be converted to an mms. -->
+    <int name="smsToMmsTextThreshold">6</int>
+
+    <!-- If true, The mms support slide duration.
+         If false, The mms does not support slide duration and we have to
+         set duration value. -->
+    <bool name="enableSlideDuration">false</bool>
+
+    <!-- Maximum length for message text. Use a value of -1
+         to indicate default value -->
+    <int name="maxMessageTextSize">-1</int>
+
+    <!-- Maximum length in chars of mms subject field -->
+    <int name="maxSubjectLength">80</int>
+
+    <!-- Email Gateway Number -->
+    <string name="emailGatewayNumber">6245</string>
+
+    <bool name="enableMMSReadReports">false</bool>
+
+    <bool name="enableSMSDeliveryReports">false</bool>
+
+    <bool name="enableMMSDeliveryReports">false</bool>
+
+    <!-- Reference for additional http parameters used in MMS http request.
+         Parameters are seperated by '|'. Optional. -->
+    <string name="httpParams">X-MDN: ##LINE1##|Proxy-Authorization: Basic ##NAI##</string>
+
+    <!-- Suffix to the NAI header (encoded together with base64) -->
+    <string name="naiSuffix">:pcs</string>
+
+    <!-- If true, need to read content_disposition field of an MMS part -->
+    <bool name="supportMmsContentDisposition">false</bool>
+</mms_config>
diff --git a/android-smsmms/src/main/res/xml-mcc334-mnc020/mms_config.xml b/android-smsmms/src/main/res/xml-mcc334-mnc020/mms_config.xml
index 96e5b9df7..de6b16bd2 100755
--- a/android-smsmms/src/main/res/xml-mcc334-mnc020/mms_config.xml
+++ b/android-smsmms/src/main/res/xml-mcc334-mnc020/mms_config.xml
@@ -1,33 +1,33 @@
-<?xml version="1.0" encoding="utf-8"?>
-<!-- Copyright 2013 The Android Open Source Project
-
-     Licensed under the Apache License, Version 2.0 (the "License");
-     you may not use this file except in compliance with the License.
-     You may obtain a copy of the License at
-
-          http://www.apache.org/licenses/LICENSE-2.0
-
-     Unless required by applicable law or agreed to in writing, software
-     distributed under the License is distributed on an "AS IS" BASIS,
-     WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
-     See the License for the specific language governing permissions and
-     limitations under the License.
--->
-
-<!-- Version History
-        version 1 - initial version.
-        version 2 - added recipientLimit.
-        version 3 - added min/max recycler values.
-        version 4 - added sms to mms text threshold.
--->
-
-<mms_config version="4">
-    <!-- Maximum message size in bytes for a MMS message -->
-    <int name="maxMessageSize">1048576</int>
-
-    <!-- Maximum height for an attached image -->
-    <int name="maxImageHeight">1944</int>
-
-    <!-- Maximum width for an attached image -->
-    <int name="maxImageWidth">2592</int>
-</mms_config>
+<?xml version="1.0" encoding="utf-8"?>
+<!-- Copyright 2013 The Android Open Source Project
+
+     Licensed under the Apache License, Version 2.0 (the "License");
+     you may not use this file except in compliance with the License.
+     You may obtain a copy of the License at
+
+          http://www.apache.org/licenses/LICENSE-2.0
+
+     Unless required by applicable law or agreed to in writing, software
+     distributed under the License is distributed on an "AS IS" BASIS,
+     WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+     See the License for the specific language governing permissions and
+     limitations under the License.
+-->
+
+<!-- Version History
+        version 1 - initial version.
+        version 2 - added recipientLimit.
+        version 3 - added min/max recycler values.
+        version 4 - added sms to mms text threshold.
+-->
+
+<mms_config version="4">
+    <!-- Maximum message size in bytes for a MMS message -->
+    <int name="maxMessageSize">1048576</int>
+
+    <!-- Maximum height for an attached image -->
+    <int name="maxImageHeight">1944</int>
+
+    <!-- Maximum width for an attached image -->
+    <int name="maxImageWidth">2592</int>
+</mms_config>
diff --git a/android-smsmms/src/main/res/xml-mcc418-mnc05/mms_config.xml b/android-smsmms/src/main/res/xml-mcc418-mnc05/mms_config.xml
index 03ff16c0b..3d1391f4e 100755
--- a/android-smsmms/src/main/res/xml-mcc418-mnc05/mms_config.xml
+++ b/android-smsmms/src/main/res/xml-mcc418-mnc05/mms_config.xml
@@ -1,33 +1,33 @@
-<?xml version="1.0" encoding="utf-8"?>
-<!-- Copyright 2013 The Android Open Source Project
-
-     Licensed under the Apache License, Version 2.0 (the "License");
-     you may not use this file except in compliance with the License.
-     You may obtain a copy of the License at
-
-          http://www.apache.org/licenses/LICENSE-2.0
-
-     Unless required by applicable law or agreed to in writing, software
-     distributed under the License is distributed on an "AS IS" BASIS,
-     WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
-     See the License for the specific language governing permissions and
-     limitations under the License.
--->
-
-<!-- Version History
-        version 1 - initial version.
-        version 2 - added recipientLimit.
-        version 3 - added min/max recycler values.
-        version 4 - added sms to mms text threshold.
--->
-
-<mms_config version="4">
-    <!-- Maximum message size in bytes for a MMS message -->
-    <int name="maxMessageSize">102400</int>
-
-    <!-- Maximum height for an attached image -->
-    <int name="maxImageHeight">1944</int>
-
-    <!-- Maximum width for an attached image -->
-    <int name="maxImageWidth">2592</int>
-</mms_config>
+<?xml version="1.0" encoding="utf-8"?>
+<!-- Copyright 2013 The Android Open Source Project
+
+     Licensed under the Apache License, Version 2.0 (the "License");
+     you may not use this file except in compliance with the License.
+     You may obtain a copy of the License at
+
+          http://www.apache.org/licenses/LICENSE-2.0
+
+     Unless required by applicable law or agreed to in writing, software
+     distributed under the License is distributed on an "AS IS" BASIS,
+     WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+     See the License for the specific language governing permissions and
+     limitations under the License.
+-->
+
+<!-- Version History
+        version 1 - initial version.
+        version 2 - added recipientLimit.
+        version 3 - added min/max recycler values.
+        version 4 - added sms to mms text threshold.
+-->
+
+<mms_config version="4">
+    <!-- Maximum message size in bytes for a MMS message -->
+    <int name="maxMessageSize">102400</int>
+
+    <!-- Maximum height for an attached image -->
+    <int name="maxImageHeight">1944</int>
+
+    <!-- Maximum width for an attached image -->
+    <int name="maxImageWidth">2592</int>
+</mms_config>
diff --git a/android-smsmms/src/main/res/xml-mcc418-mnc20/mms_config.xml b/android-smsmms/src/main/res/xml-mcc418-mnc20/mms_config.xml
index 9ef0dd8c8..eb1e5cee1 100755
--- a/android-smsmms/src/main/res/xml-mcc418-mnc20/mms_config.xml
+++ b/android-smsmms/src/main/res/xml-mcc418-mnc20/mms_config.xml
@@ -1,33 +1,33 @@
-<?xml version="1.0" encoding="utf-8"?>
-<!-- Copyright 2013 The Android Open Source Project
-
-     Licensed under the Apache License, Version 2.0 (the "License");
-     you may not use this file except in compliance with the License.
-     You may obtain a copy of the License at
-
-          http://www.apache.org/licenses/LICENSE-2.0
-
-     Unless required by applicable law or agreed to in writing, software
-     distributed under the License is distributed on an "AS IS" BASIS,
-     WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
-     See the License for the specific language governing permissions and
-     limitations under the License.
--->
-
-<!-- Version History
-        version 1 - initial version.
-        version 2 - added recipientLimit.
-        version 3 - added min/max recycler values.
-        version 4 - added sms to mms text threshold.
--->
-
-<mms_config version="4">
-    <!-- Maximum message size in bytes for a MMS message -->
-    <int name="maxMessageSize">153600</int>
-
-    <!-- Maximum height for an attached image -->
-    <int name="maxImageHeight">1944</int>
-
-    <!-- Maximum width for an attached image -->
-    <int name="maxImageWidth">2592</int>
-</mms_config>
+<?xml version="1.0" encoding="utf-8"?>
+<!-- Copyright 2013 The Android Open Source Project
+
+     Licensed under the Apache License, Version 2.0 (the "License");
+     you may not use this file except in compliance with the License.
+     You may obtain a copy of the License at
+
+          http://www.apache.org/licenses/LICENSE-2.0
+
+     Unless required by applicable law or agreed to in writing, software
+     distributed under the License is distributed on an "AS IS" BASIS,
+     WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+     See the License for the specific language governing permissions and
+     limitations under the License.
+-->
+
+<!-- Version History
+        version 1 - initial version.
+        version 2 - added recipientLimit.
+        version 3 - added min/max recycler values.
+        version 4 - added sms to mms text threshold.
+-->
+
+<mms_config version="4">
+    <!-- Maximum message size in bytes for a MMS message -->
+    <int name="maxMessageSize">153600</int>
+
+    <!-- Maximum height for an attached image -->
+    <int name="maxImageHeight">1944</int>
+
+    <!-- Maximum width for an attached image -->
+    <int name="maxImageWidth">2592</int>
+</mms_config>
diff --git a/android-smsmms/src/main/res/xml-mcc418-mnc30/mms_config.xml b/android-smsmms/src/main/res/xml-mcc418-mnc30/mms_config.xml
index 9ef0dd8c8..eb1e5cee1 100755
--- a/android-smsmms/src/main/res/xml-mcc418-mnc30/mms_config.xml
+++ b/android-smsmms/src/main/res/xml-mcc418-mnc30/mms_config.xml
@@ -1,33 +1,33 @@
-<?xml version="1.0" encoding="utf-8"?>
-<!-- Copyright 2013 The Android Open Source Project
-
-     Licensed under the Apache License, Version 2.0 (the "License");
-     you may not use this file except in compliance with the License.
-     You may obtain a copy of the License at
-
-          http://www.apache.org/licenses/LICENSE-2.0
-
-     Unless required by applicable law or agreed to in writing, software
-     distributed under the License is distributed on an "AS IS" BASIS,
-     WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
-     See the License for the specific language governing permissions and
-     limitations under the License.
--->
-
-<!-- Version History
-        version 1 - initial version.
-        version 2 - added recipientLimit.
-        version 3 - added min/max recycler values.
-        version 4 - added sms to mms text threshold.
--->
-
-<mms_config version="4">
-    <!-- Maximum message size in bytes for a MMS message -->
-    <int name="maxMessageSize">153600</int>
-
-    <!-- Maximum height for an attached image -->
-    <int name="maxImageHeight">1944</int>
-
-    <!-- Maximum width for an attached image -->
-    <int name="maxImageWidth">2592</int>
-</mms_config>
+<?xml version="1.0" encoding="utf-8"?>
+<!-- Copyright 2013 The Android Open Source Project
+
+     Licensed under the Apache License, Version 2.0 (the "License");
+     you may not use this file except in compliance with the License.
+     You may obtain a copy of the License at
+
+          http://www.apache.org/licenses/LICENSE-2.0
+
+     Unless required by applicable law or agreed to in writing, software
+     distributed under the License is distributed on an "AS IS" BASIS,
+     WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+     See the License for the specific language governing permissions and
+     limitations under the License.
+-->
+
+<!-- Version History
+        version 1 - initial version.
+        version 2 - added recipientLimit.
+        version 3 - added min/max recycler values.
+        version 4 - added sms to mms text threshold.
+-->
+
+<mms_config version="4">
+    <!-- Maximum message size in bytes for a MMS message -->
+    <int name="maxMessageSize">153600</int>
+
+    <!-- Maximum height for an attached image -->
+    <int name="maxImageHeight">1944</int>
+
+    <!-- Maximum width for an attached image -->
+    <int name="maxImageWidth">2592</int>
+</mms_config>
diff --git a/android-smsmms/src/main/res/xml-mcc420-mnc04/mms_config.xml b/android-smsmms/src/main/res/xml-mcc420-mnc04/mms_config.xml
index 614ba8e8a..8fa357ee5 100755
--- a/android-smsmms/src/main/res/xml-mcc420-mnc04/mms_config.xml
+++ b/android-smsmms/src/main/res/xml-mcc420-mnc04/mms_config.xml
@@ -1,33 +1,33 @@
-<?xml version="1.0" encoding="utf-8"?>
-<!-- Copyright 2013 The Android Open Source Project
-
-     Licensed under the Apache License, Version 2.0 (the "License");
-     you may not use this file except in compliance with the License.
-     You may obtain a copy of the License at
-
-          http://www.apache.org/licenses/LICENSE-2.0
-
-     Unless required by applicable law or agreed to in writing, software
-     distributed under the License is distributed on an "AS IS" BASIS,
-     WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
-     See the License for the specific language governing permissions and
-     limitations under the License.
--->
-
-<!-- Version History
-        version 1 - initial version.
-        version 2 - added recipientLimit.
-        version 3 - added min/max recycler values.
-        version 4 - added sms to mms text threshold.
--->
-
-<mms_config version="4">
-    <!-- Maximum message size in bytes for a MMS message -->
-    <int name="maxMessageSize">409600</int>
-
-    <!-- Maximum height for an attached image -->
-    <int name="maxImageHeight">1944</int>
-
-    <!-- Maximum width for an attached image -->
-    <int name="maxImageWidth">2592</int>
-</mms_config>
+<?xml version="1.0" encoding="utf-8"?>
+<!-- Copyright 2013 The Android Open Source Project
+
+     Licensed under the Apache License, Version 2.0 (the "License");
+     you may not use this file except in compliance with the License.
+     You may obtain a copy of the License at
+
+          http://www.apache.org/licenses/LICENSE-2.0
+
+     Unless required by applicable law or agreed to in writing, software
+     distributed under the License is distributed on an "AS IS" BASIS,
+     WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+     See the License for the specific language governing permissions and
+     limitations under the License.
+-->
+
+<!-- Version History
+        version 1 - initial version.
+        version 2 - added recipientLimit.
+        version 3 - added min/max recycler values.
+        version 4 - added sms to mms text threshold.
+-->
+
+<mms_config version="4">
+    <!-- Maximum message size in bytes for a MMS message -->
+    <int name="maxMessageSize">409600</int>
+
+    <!-- Maximum height for an attached image -->
+    <int name="maxImageHeight">1944</int>
+
+    <!-- Maximum width for an attached image -->
+    <int name="maxImageWidth">2592</int>
+</mms_config>
diff --git a/android-smsmms/src/main/res/xml-mcc440-mnc10/mms_config.xml b/android-smsmms/src/main/res/xml-mcc440-mnc10/mms_config.xml
index 486c4682c..6c5de90eb 100755
--- a/android-smsmms/src/main/res/xml-mcc440-mnc10/mms_config.xml
+++ b/android-smsmms/src/main/res/xml-mcc440-mnc10/mms_config.xml
@@ -1,33 +1,33 @@
-<?xml version="1.0" encoding="utf-8"?>
-<!-- Copyright 2013 The Android Open Source Project
-
-     Licensed under the Apache License, Version 2.0 (the "License");
-     you may not use this file except in compliance with the License.
-     You may obtain a copy of the License at
-
-          http://www.apache.org/licenses/LICENSE-2.0
-
-     Unless required by applicable law or agreed to in writing, software
-     distributed under the License is distributed on an "AS IS" BASIS,
-     WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
-     See the License for the specific language governing permissions and
-     limitations under the License.
--->
-
-<!-- Version History
-        version 1 - initial version.
-        version 2 - added recipientLimit.
-        version 3 - added min/max recycler values.
-        version 4 - added sms to mms text threshold.
--->
-
-<mms_config version="4">
-    <!-- Maximum message size in bytes for a MMS message -->
-    <int name="maxMessageSize">614400</int>
-
-    <!-- Maximum height for an attached image -->
-    <int name="maxImageHeight">1944</int>
-
-    <!-- Maximum width for an attached image -->
-    <int name="maxImageWidth">2592</int>
-</mms_config>
+<?xml version="1.0" encoding="utf-8"?>
+<!-- Copyright 2013 The Android Open Source Project
+
+     Licensed under the Apache License, Version 2.0 (the "License");
+     you may not use this file except in compliance with the License.
+     You may obtain a copy of the License at
+
+          http://www.apache.org/licenses/LICENSE-2.0
+
+     Unless required by applicable law or agreed to in writing, software
+     distributed under the License is distributed on an "AS IS" BASIS,
+     WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+     See the License for the specific language governing permissions and
+     limitations under the License.
+-->
+
+<!-- Version History
+        version 1 - initial version.
+        version 2 - added recipientLimit.
+        version 3 - added min/max recycler values.
+        version 4 - added sms to mms text threshold.
+-->
+
+<mms_config version="4">
+    <!-- Maximum message size in bytes for a MMS message -->
+    <int name="maxMessageSize">614400</int>
+
+    <!-- Maximum height for an attached image -->
+    <int name="maxImageHeight">1944</int>
+
+    <!-- Maximum width for an attached image -->
+    <int name="maxImageWidth">2592</int>
+</mms_config>
diff --git a/android-smsmms/src/main/res/xml-mcc440-mnc20/mms_config.xml b/android-smsmms/src/main/res/xml-mcc440-mnc20/mms_config.xml
index 7f383c4b2..ee69272ec 100755
--- a/android-smsmms/src/main/res/xml-mcc440-mnc20/mms_config.xml
+++ b/android-smsmms/src/main/res/xml-mcc440-mnc20/mms_config.xml
@@ -1,56 +1,56 @@
-<?xml version="1.0" encoding="utf-8"?>
-
-<!-- Version History
-        version 1 - initial version.
-        version 2 - added recipientLimit.
-        version 3 - added min/max recycler values.
-        version 4 - added sms to mms text threshold.
--->
-
-<!-- Softbank J.P. mcc=440, mnc=020 -->
-
-<mms_config version="4">
-    <!-- Flag indicating whether MMS should be enabled -->
-    <bool name="enabledMMS">true</bool>
-
-    <!-- Maximum message size in bytes for a MMS message -->
-    <int name="maxMessageSize">307200</int>
-
-    <!-- Maximum height for an attached image -->
-    <int name="maxImageHeight">1944</int>
-
-    <!-- Maximum width for an attached image -->
-    <int name="maxImageWidth">2592</int>
-
-    <!-- Maximum number of SMS message to save per thread before auto-delete kicks in.
-         This is the default value. -->
-    <int name="defaultSMSMessagesPerThread">10000</int>
-
-    <!-- Maximum number of MMS message to save per thread before auto-delete kicks in.
-         This is the default value. -->
-    <int name="defaultMMSMessagesPerThread">1000</int>
-
-    <!-- Minimum value for the number of messages kept per conversation. The user can never
-         set the limit below this value. -->
-    <int name="minMessageCountPerThread">10</int>
-
-    <!-- Maximum value for the number of messages kept per conversation. The user can never
-         set the limit above this value. -->
-    <int name="maxMessageCountPerThread">5000</int>
-
-    <!-- Maximum number of recipients allowed per message. Use a value of -1
-         to indicate no limit. -->
-    <int name="recipientLimit">-1</int>
-
-    <!-- If true, The mms support slide duration.
-         If false, The mms does not support slide duration and we have to
-         set duration value. -->
-    <bool name="enableSlideDuration">true</bool>
-
-    <!-- Maximum length for message text. Use a value of -1
-         to indicate default value -->
-    <int name="maxMessageTextSize">-1</int>
-
-    <!-- Set to true to add links to Cell Broadcast app from Settings and MMS app. -->
-    <bool name="config_cellBroadcastAppLinks">false</bool>
-</mms_config>
+<?xml version="1.0" encoding="utf-8"?>
+
+<!-- Version History
+        version 1 - initial version.
+        version 2 - added recipientLimit.
+        version 3 - added min/max recycler values.
+        version 4 - added sms to mms text threshold.
+-->
+
+<!-- Softbank J.P. mcc=440, mnc=020 -->
+
+<mms_config version="4">
+    <!-- Flag indicating whether MMS should be enabled -->
+    <bool name="enabledMMS">true</bool>
+
+    <!-- Maximum message size in bytes for a MMS message -->
+    <int name="maxMessageSize">307200</int>
+
+    <!-- Maximum height for an attached image -->
+    <int name="maxImageHeight">1944</int>
+
+    <!-- Maximum width for an attached image -->
+    <int name="maxImageWidth">2592</int>
+
+    <!-- Maximum number of SMS message to save per thread before auto-delete kicks in.
+         This is the default value. -->
+    <int name="defaultSMSMessagesPerThread">10000</int>
+
+    <!-- Maximum number of MMS message to save per thread before auto-delete kicks in.
+         This is the default value. -->
+    <int name="defaultMMSMessagesPerThread">1000</int>
+
+    <!-- Minimum value for the number of messages kept per conversation. The user can never
+         set the limit below this value. -->
+    <int name="minMessageCountPerThread">10</int>
+
+    <!-- Maximum value for the number of messages kept per conversation. The user can never
+         set the limit above this value. -->
+    <int name="maxMessageCountPerThread">5000</int>
+
+    <!-- Maximum number of recipients allowed per message. Use a value of -1
+         to indicate no limit. -->
+    <int name="recipientLimit">-1</int>
+
+    <!-- If true, The mms support slide duration.
+         If false, The mms does not support slide duration and we have to
+         set duration value. -->
+    <bool name="enableSlideDuration">true</bool>
+
+    <!-- Maximum length for message text. Use a value of -1
+         to indicate default value -->
+    <int name="maxMessageTextSize">-1</int>
+
+    <!-- Set to true to add links to Cell Broadcast app from Settings and MMS app. -->
+    <bool name="config_cellBroadcastAppLinks">false</bool>
+</mms_config>
diff --git a/android-smsmms/src/main/res/xml-mcc450-mnc00/mms_config.xml b/android-smsmms/src/main/res/xml-mcc450-mnc00/mms_config.xml
index 96e5b9df7..de6b16bd2 100755
--- a/android-smsmms/src/main/res/xml-mcc450-mnc00/mms_config.xml
+++ b/android-smsmms/src/main/res/xml-mcc450-mnc00/mms_config.xml
@@ -1,33 +1,33 @@
-<?xml version="1.0" encoding="utf-8"?>
-<!-- Copyright 2013 The Android Open Source Project
-
-     Licensed under the Apache License, Version 2.0 (the "License");
-     you may not use this file except in compliance with the License.
-     You may obtain a copy of the License at
-
-          http://www.apache.org/licenses/LICENSE-2.0
-
-     Unless required by applicable law or agreed to in writing, software
-     distributed under the License is distributed on an "AS IS" BASIS,
-     WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
-     See the License for the specific language governing permissions and
-     limitations under the License.
--->
-
-<!-- Version History
-        version 1 - initial version.
-        version 2 - added recipientLimit.
-        version 3 - added min/max recycler values.
-        version 4 - added sms to mms text threshold.
--->
-
-<mms_config version="4">
-    <!-- Maximum message size in bytes for a MMS message -->
-    <int name="maxMessageSize">1048576</int>
-
-    <!-- Maximum height for an attached image -->
-    <int name="maxImageHeight">1944</int>
-
-    <!-- Maximum width for an attached image -->
-    <int name="maxImageWidth">2592</int>
-</mms_config>
+<?xml version="1.0" encoding="utf-8"?>
+<!-- Copyright 2013 The Android Open Source Project
+
+     Licensed under the Apache License, Version 2.0 (the "License");
+     you may not use this file except in compliance with the License.
+     You may obtain a copy of the License at
+
+          http://www.apache.org/licenses/LICENSE-2.0
+
+     Unless required by applicable law or agreed to in writing, software
+     distributed under the License is distributed on an "AS IS" BASIS,
+     WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+     See the License for the specific language governing permissions and
+     limitations under the License.
+-->
+
+<!-- Version History
+        version 1 - initial version.
+        version 2 - added recipientLimit.
+        version 3 - added min/max recycler values.
+        version 4 - added sms to mms text threshold.
+-->
+
+<mms_config version="4">
+    <!-- Maximum message size in bytes for a MMS message -->
+    <int name="maxMessageSize">1048576</int>
+
+    <!-- Maximum height for an attached image -->
+    <int name="maxImageHeight">1944</int>
+
+    <!-- Maximum width for an attached image -->
+    <int name="maxImageWidth">2592</int>
+</mms_config>
diff --git a/android-smsmms/src/main/res/xml-mcc450-mnc02/mms_config.xml b/android-smsmms/src/main/res/xml-mcc450-mnc02/mms_config.xml
index 2a7231c48..d3afef0d6 100755
--- a/android-smsmms/src/main/res/xml-mcc450-mnc02/mms_config.xml
+++ b/android-smsmms/src/main/res/xml-mcc450-mnc02/mms_config.xml
@@ -1,39 +1,39 @@
-<?xml version="1.0" encoding="utf-8"?>
-<!-- Copyright 2013 The Android Open Source Project
-
-     Licensed under the Apache License, Version 2.0 (the "License");
-     you may not use this file except in compliance with the License.
-     You may obtain a copy of the License at
-
-          http://www.apache.org/licenses/LICENSE-2.0
-
-     Unless required by applicable law or agreed to in writing, software
-     distributed under the License is distributed on an "AS IS" BASIS,
-     WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
-     See the License for the specific language governing permissions and
-     limitations under the License.
--->
-
-<!-- Version History
-        version 1 - initial version.
-        version 2 - added recipientLimit.
-        version 3 - added min/max recycler values.
-        version 4 - added sms to mms text threshold.
--->
-
-<mms_config version="4">
-    <!-- Maximum message size in bytes for a MMS message -->
-    <int name="maxMessageSize">1048576</int>
-
-    <!-- Maximum height for an attached image -->
-    <int name="maxImageHeight">1944</int>
-
-    <!-- Maximum width for an attached image -->
-    <int name="maxImageWidth">2592</int>
-
-    <bool name="enableMMSReadReports">false</bool>
-
-    <bool name="enableSMSDeliveryReports">false</bool>
-
-    <bool name="enableMMSDeliveryReports">false</bool>
-</mms_config>
+<?xml version="1.0" encoding="utf-8"?>
+<!-- Copyright 2013 The Android Open Source Project
+
+     Licensed under the Apache License, Version 2.0 (the "License");
+     you may not use this file except in compliance with the License.
+     You may obtain a copy of the License at
+
+          http://www.apache.org/licenses/LICENSE-2.0
+
+     Unless required by applicable law or agreed to in writing, software
+     distributed under the License is distributed on an "AS IS" BASIS,
+     WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+     See the License for the specific language governing permissions and
+     limitations under the License.
+-->
+
+<!-- Version History
+        version 1 - initial version.
+        version 2 - added recipientLimit.
+        version 3 - added min/max recycler values.
+        version 4 - added sms to mms text threshold.
+-->
+
+<mms_config version="4">
+    <!-- Maximum message size in bytes for a MMS message -->
+    <int name="maxMessageSize">1048576</int>
+
+    <!-- Maximum height for an attached image -->
+    <int name="maxImageHeight">1944</int>
+
+    <!-- Maximum width for an attached image -->
+    <int name="maxImageWidth">2592</int>
+
+    <bool name="enableMMSReadReports">false</bool>
+
+    <bool name="enableSMSDeliveryReports">false</bool>
+
+    <bool name="enableMMSDeliveryReports">false</bool>
+</mms_config>
diff --git a/android-smsmms/src/main/res/xml-mcc450-mnc05/mms_config.xml b/android-smsmms/src/main/res/xml-mcc450-mnc05/mms_config.xml
index 2a7231c48..d3afef0d6 100755
--- a/android-smsmms/src/main/res/xml-mcc450-mnc05/mms_config.xml
+++ b/android-smsmms/src/main/res/xml-mcc450-mnc05/mms_config.xml
@@ -1,39 +1,39 @@
-<?xml version="1.0" encoding="utf-8"?>
-<!-- Copyright 2013 The Android Open Source Project
-
-     Licensed under the Apache License, Version 2.0 (the "License");
-     you may not use this file except in compliance with the License.
-     You may obtain a copy of the License at
-
-          http://www.apache.org/licenses/LICENSE-2.0
-
-     Unless required by applicable law or agreed to in writing, software
-     distributed under the License is distributed on an "AS IS" BASIS,
-     WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
-     See the License for the specific language governing permissions and
-     limitations under the License.
--->
-
-<!-- Version History
-        version 1 - initial version.
-        version 2 - added recipientLimit.
-        version 3 - added min/max recycler values.
-        version 4 - added sms to mms text threshold.
--->
-
-<mms_config version="4">
-    <!-- Maximum message size in bytes for a MMS message -->
-    <int name="maxMessageSize">1048576</int>
-
-    <!-- Maximum height for an attached image -->
-    <int name="maxImageHeight">1944</int>
-
-    <!-- Maximum width for an attached image -->
-    <int name="maxImageWidth">2592</int>
-
-    <bool name="enableMMSReadReports">false</bool>
-
-    <bool name="enableSMSDeliveryReports">false</bool>
-
-    <bool name="enableMMSDeliveryReports">false</bool>
-</mms_config>
+<?xml version="1.0" encoding="utf-8"?>
+<!-- Copyright 2013 The Android Open Source Project
+
+     Licensed under the Apache License, Version 2.0 (the "License");
+     you may not use this file except in compliance with the License.
+     You may obtain a copy of the License at
+
+          http://www.apache.org/licenses/LICENSE-2.0
+
+     Unless required by applicable law or agreed to in writing, software
+     distributed under the License is distributed on an "AS IS" BASIS,
+     WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+     See the License for the specific language governing permissions and
+     limitations under the License.
+-->
+
+<!-- Version History
+        version 1 - initial version.
+        version 2 - added recipientLimit.
+        version 3 - added min/max recycler values.
+        version 4 - added sms to mms text threshold.
+-->
+
+<mms_config version="4">
+    <!-- Maximum message size in bytes for a MMS message -->
+    <int name="maxMessageSize">1048576</int>
+
+    <!-- Maximum height for an attached image -->
+    <int name="maxImageHeight">1944</int>
+
+    <!-- Maximum width for an attached image -->
+    <int name="maxImageWidth">2592</int>
+
+    <bool name="enableMMSReadReports">false</bool>
+
+    <bool name="enableSMSDeliveryReports">false</bool>
+
+    <bool name="enableMMSDeliveryReports">false</bool>
+</mms_config>
diff --git a/android-smsmms/src/main/res/xml-mcc450-mnc06/mms_config.xml b/android-smsmms/src/main/res/xml-mcc450-mnc06/mms_config.xml
index 512398475..1ae5a476d 100755
--- a/android-smsmms/src/main/res/xml-mcc450-mnc06/mms_config.xml
+++ b/android-smsmms/src/main/res/xml-mcc450-mnc06/mms_config.xml
@@ -1,42 +1,42 @@
-<?xml version="1.0" encoding="utf-8"?>
-<!-- Copyright 2013 The Android Open Source Project
-
-     Licensed under the Apache License, Version 2.0 (the "License");
-     you may not use this file except in compliance with the License.
-     You may obtain a copy of the License at
-
-          http://www.apache.org/licenses/LICENSE-2.0
-
-     Unless required by applicable law or agreed to in writing, software
-     distributed under the License is distributed on an "AS IS" BASIS,
-     WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
-     See the License for the specific language governing permissions and
-     limitations under the License.
--->
-
-<!-- Version History
-        version 1 - initial version.
-        version 2 - added recipientLimit.
-        version 3 - added min/max recycler values.
-        version 4 - added sms to mms text threshold.
--->
-
-<mms_config version="4">
-    <!-- Maximum message size in bytes for a MMS message -->
-    <int name="maxMessageSize">1048576</int>
-
-    <!-- Maximum height for an attached image -->
-    <int name="maxImageHeight">1944</int>
-
-    <!-- Maximum width for an attached image -->
-    <int name="maxImageWidth">2592</int>
-
-    <!-- SMS text length threshold (in bytes) to turn into MMS -->
-    <int name="smsToMmsTextLengthThreshold">80</int>
-
-    <bool name="enableMMSReadReports">false</bool>
-
-    <bool name="enableSMSDeliveryReports">false</bool>
-
-    <bool name="enableMMSDeliveryReports">false</bool>
-</mms_config>
+<?xml version="1.0" encoding="utf-8"?>
+<!-- Copyright 2013 The Android Open Source Project
+
+     Licensed under the Apache License, Version 2.0 (the "License");
+     you may not use this file except in compliance with the License.
+     You may obtain a copy of the License at
+
+          http://www.apache.org/licenses/LICENSE-2.0
+
+     Unless required by applicable law or agreed to in writing, software
+     distributed under the License is distributed on an "AS IS" BASIS,
+     WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+     See the License for the specific language governing permissions and
+     limitations under the License.
+-->
+
+<!-- Version History
+        version 1 - initial version.
+        version 2 - added recipientLimit.
+        version 3 - added min/max recycler values.
+        version 4 - added sms to mms text threshold.
+-->
+
+<mms_config version="4">
+    <!-- Maximum message size in bytes for a MMS message -->
+    <int name="maxMessageSize">1048576</int>
+
+    <!-- Maximum height for an attached image -->
+    <int name="maxImageHeight">1944</int>
+
+    <!-- Maximum width for an attached image -->
+    <int name="maxImageWidth">2592</int>
+
+    <!-- SMS text length threshold (in bytes) to turn into MMS -->
+    <int name="smsToMmsTextLengthThreshold">80</int>
+
+    <bool name="enableMMSReadReports">false</bool>
+
+    <bool name="enableSMSDeliveryReports">false</bool>
+
+    <bool name="enableMMSDeliveryReports">false</bool>
+</mms_config>
diff --git a/android-smsmms/src/main/res/xml-mcc450-mnc08/mms_config.xml b/android-smsmms/src/main/res/xml-mcc450-mnc08/mms_config.xml
index 2a7231c48..d3afef0d6 100755
--- a/android-smsmms/src/main/res/xml-mcc450-mnc08/mms_config.xml
+++ b/android-smsmms/src/main/res/xml-mcc450-mnc08/mms_config.xml
@@ -1,39 +1,39 @@
-<?xml version="1.0" encoding="utf-8"?>
-<!-- Copyright 2013 The Android Open Source Project
-
-     Licensed under the Apache License, Version 2.0 (the "License");
-     you may not use this file except in compliance with the License.
-     You may obtain a copy of the License at
-
-          http://www.apache.org/licenses/LICENSE-2.0
-
-     Unless required by applicable law or agreed to in writing, software
-     distributed under the License is distributed on an "AS IS" BASIS,
-     WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
-     See the License for the specific language governing permissions and
-     limitations under the License.
--->
-
-<!-- Version History
-        version 1 - initial version.
-        version 2 - added recipientLimit.
-        version 3 - added min/max recycler values.
-        version 4 - added sms to mms text threshold.
--->
-
-<mms_config version="4">
-    <!-- Maximum message size in bytes for a MMS message -->
-    <int name="maxMessageSize">1048576</int>
-
-    <!-- Maximum height for an attached image -->
-    <int name="maxImageHeight">1944</int>
-
-    <!-- Maximum width for an attached image -->
-    <int name="maxImageWidth">2592</int>
-
-    <bool name="enableMMSReadReports">false</bool>
-
-    <bool name="enableSMSDeliveryReports">false</bool>
-
-    <bool name="enableMMSDeliveryReports">false</bool>
-</mms_config>
+<?xml version="1.0" encoding="utf-8"?>
+<!-- Copyright 2013 The Android Open Source Project
+
+     Licensed under the Apache License, Version 2.0 (the "License");
+     you may not use this file except in compliance with the License.
+     You may obtain a copy of the License at
+
+          http://www.apache.org/licenses/LICENSE-2.0
+
+     Unless required by applicable law or agreed to in writing, software
+     distributed under the License is distributed on an "AS IS" BASIS,
+     WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+     See the License for the specific language governing permissions and
+     limitations under the License.
+-->
+
+<!-- Version History
+        version 1 - initial version.
+        version 2 - added recipientLimit.
+        version 3 - added min/max recycler values.
+        version 4 - added sms to mms text threshold.
+-->
+
+<mms_config version="4">
+    <!-- Maximum message size in bytes for a MMS message -->
+    <int name="maxMessageSize">1048576</int>
+
+    <!-- Maximum height for an attached image -->
+    <int name="maxImageHeight">1944</int>
+
+    <!-- Maximum width for an attached image -->
+    <int name="maxImageWidth">2592</int>
+
+    <bool name="enableMMSReadReports">false</bool>
+
+    <bool name="enableSMSDeliveryReports">false</bool>
+
+    <bool name="enableMMSDeliveryReports">false</bool>
+</mms_config>
diff --git a/android-smsmms/src/main/res/xml-mcc505-mnc01/mms_config.xml b/android-smsmms/src/main/res/xml-mcc505-mnc01/mms_config.xml
index 6a2780991..5df97aad0 100755
--- a/android-smsmms/src/main/res/xml-mcc505-mnc01/mms_config.xml
+++ b/android-smsmms/src/main/res/xml-mcc505-mnc01/mms_config.xml
@@ -1,33 +1,33 @@
-<?xml version="1.0" encoding="utf-8"?>
-<!-- Copyright 2013 The Android Open Source Project
-
-     Licensed under the Apache License, Version 2.0 (the "License");
-     you may not use this file except in compliance with the License.
-     You may obtain a copy of the License at
-
-          http://www.apache.org/licenses/LICENSE-2.0
-
-     Unless required by applicable law or agreed to in writing, software
-     distributed under the License is distributed on an "AS IS" BASIS,
-     WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
-     See the License for the specific language governing permissions and
-     limitations under the License.
--->
-
-<!-- Version History
-        version 1 - initial version.
-        version 2 - added recipientLimit.
-        version 3 - added min/max recycler values.
-        version 4 - added sms to mms text threshold.
--->
-
-<mms_config version="4">
-    <!-- Maximum message size in bytes for a MMS message -->
-    <int name="maxMessageSize">2097152</int>
-
-    <!-- Maximum height for an attached image -->
-    <int name="maxImageHeight">1944</int>
-
-    <!-- Maximum width for an attached image -->
-    <int name="maxImageWidth">2592</int>
-</mms_config>
+<?xml version="1.0" encoding="utf-8"?>
+<!-- Copyright 2013 The Android Open Source Project
+
+     Licensed under the Apache License, Version 2.0 (the "License");
+     you may not use this file except in compliance with the License.
+     You may obtain a copy of the License at
+
+          http://www.apache.org/licenses/LICENSE-2.0
+
+     Unless required by applicable law or agreed to in writing, software
+     distributed under the License is distributed on an "AS IS" BASIS,
+     WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+     See the License for the specific language governing permissions and
+     limitations under the License.
+-->
+
+<!-- Version History
+        version 1 - initial version.
+        version 2 - added recipientLimit.
+        version 3 - added min/max recycler values.
+        version 4 - added sms to mms text threshold.
+-->
+
+<mms_config version="4">
+    <!-- Maximum message size in bytes for a MMS message -->
+    <int name="maxMessageSize">2097152</int>
+
+    <!-- Maximum height for an attached image -->
+    <int name="maxImageHeight">1944</int>
+
+    <!-- Maximum width for an attached image -->
+    <int name="maxImageWidth">2592</int>
+</mms_config>
diff --git a/android-smsmms/src/main/res/xml-mcc530-mnc05/mms_config.xml b/android-smsmms/src/main/res/xml-mcc530-mnc05/mms_config.xml
index fabcf3ce1..f88b24b66 100755
--- a/android-smsmms/src/main/res/xml-mcc530-mnc05/mms_config.xml
+++ b/android-smsmms/src/main/res/xml-mcc530-mnc05/mms_config.xml
@@ -1,36 +1,36 @@
-<?xml version="1.0" encoding="utf-8"?>
-<!-- Copyright 2013 The Android Open Source Project
-
-     Licensed under the Apache License, Version 2.0 (the "License");
-     you may not use this file except in compliance with the License.
-     You may obtain a copy of the License at
-
-          http://www.apache.org/licenses/LICENSE-2.0
-
-     Unless required by applicable law or agreed to in writing, software
-     distributed under the License is distributed on an "AS IS" BASIS,
-     WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
-     See the License for the specific language governing permissions and
-     limitations under the License.
--->
-
-<!-- Version History
-        version 1 - initial version.
-        version 2 - added recipientLimit.
-        version 3 - added min/max recycler values.
-        version 4 - added sms to mms text threshold.
--->
-
-<mms_config version="4">
-    <!-- Maximum message size in bytes for a MMS message -->
-    <int name="maxMessageSize">614400</int>
-
-    <!-- Maximum height for an attached image -->
-    <int name="maxImageHeight">1944</int>
-
-    <!-- Maximum width for an attached image -->
-    <int name="maxImageWidth">2592</int>
-
-    <!-- Content-Disposition header is not supported -->
-    <bool name="supportMmsContentDisposition">false</bool>
-</mms_config>
+<?xml version="1.0" encoding="utf-8"?>
+<!-- Copyright 2013 The Android Open Source Project
+
+     Licensed under the Apache License, Version 2.0 (the "License");
+     you may not use this file except in compliance with the License.
+     You may obtain a copy of the License at
+
+          http://www.apache.org/licenses/LICENSE-2.0
+
+     Unless required by applicable law or agreed to in writing, software
+     distributed under the License is distributed on an "AS IS" BASIS,
+     WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+     See the License for the specific language governing permissions and
+     limitations under the License.
+-->
+
+<!-- Version History
+        version 1 - initial version.
+        version 2 - added recipientLimit.
+        version 3 - added min/max recycler values.
+        version 4 - added sms to mms text threshold.
+-->
+
+<mms_config version="4">
+    <!-- Maximum message size in bytes for a MMS message -->
+    <int name="maxMessageSize">614400</int>
+
+    <!-- Maximum height for an attached image -->
+    <int name="maxImageHeight">1944</int>
+
+    <!-- Maximum width for an attached image -->
+    <int name="maxImageWidth">2592</int>
+
+    <!-- Content-Disposition header is not supported -->
+    <bool name="supportMmsContentDisposition">false</bool>
+</mms_config>
diff --git a/android-smsmms/src/main/res/xml-mcc604-mnc00/mms_config.xml b/android-smsmms/src/main/res/xml-mcc604-mnc00/mms_config.xml
index 03ff16c0b..3d1391f4e 100755
--- a/android-smsmms/src/main/res/xml-mcc604-mnc00/mms_config.xml
+++ b/android-smsmms/src/main/res/xml-mcc604-mnc00/mms_config.xml
@@ -1,33 +1,33 @@
-<?xml version="1.0" encoding="utf-8"?>
-<!-- Copyright 2013 The Android Open Source Project
-
-     Licensed under the Apache License, Version 2.0 (the "License");
-     you may not use this file except in compliance with the License.
-     You may obtain a copy of the License at
-
-          http://www.apache.org/licenses/LICENSE-2.0
-
-     Unless required by applicable law or agreed to in writing, software
-     distributed under the License is distributed on an "AS IS" BASIS,
-     WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
-     See the License for the specific language governing permissions and
-     limitations under the License.
--->
-
-<!-- Version History
-        version 1 - initial version.
-        version 2 - added recipientLimit.
-        version 3 - added min/max recycler values.
-        version 4 - added sms to mms text threshold.
--->
-
-<mms_config version="4">
-    <!-- Maximum message size in bytes for a MMS message -->
-    <int name="maxMessageSize">102400</int>
-
-    <!-- Maximum height for an attached image -->
-    <int name="maxImageHeight">1944</int>
-
-    <!-- Maximum width for an attached image -->
-    <int name="maxImageWidth">2592</int>
-</mms_config>
+<?xml version="1.0" encoding="utf-8"?>
+<!-- Copyright 2013 The Android Open Source Project
+
+     Licensed under the Apache License, Version 2.0 (the "License");
+     you may not use this file except in compliance with the License.
+     You may obtain a copy of the License at
+
+          http://www.apache.org/licenses/LICENSE-2.0
+
+     Unless required by applicable law or agreed to in writing, software
+     distributed under the License is distributed on an "AS IS" BASIS,
+     WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+     See the License for the specific language governing permissions and
+     limitations under the License.
+-->
+
+<!-- Version History
+        version 1 - initial version.
+        version 2 - added recipientLimit.
+        version 3 - added min/max recycler values.
+        version 4 - added sms to mms text threshold.
+-->
+
+<mms_config version="4">
+    <!-- Maximum message size in bytes for a MMS message -->
+    <int name="maxMessageSize">102400</int>
+
+    <!-- Maximum height for an attached image -->
+    <int name="maxImageHeight">1944</int>
+
+    <!-- Maximum width for an attached image -->
+    <int name="maxImageWidth">2592</int>
+</mms_config>
diff --git a/android-smsmms/src/main/res/xml-mcc604-mnc02/mms_config.xml b/android-smsmms/src/main/res/xml-mcc604-mnc02/mms_config.xml
index 03ff16c0b..3d1391f4e 100755
--- a/android-smsmms/src/main/res/xml-mcc604-mnc02/mms_config.xml
+++ b/android-smsmms/src/main/res/xml-mcc604-mnc02/mms_config.xml
@@ -1,33 +1,33 @@
-<?xml version="1.0" encoding="utf-8"?>
-<!-- Copyright 2013 The Android Open Source Project
-
-     Licensed under the Apache License, Version 2.0 (the "License");
-     you may not use this file except in compliance with the License.
-     You may obtain a copy of the License at
-
-          http://www.apache.org/licenses/LICENSE-2.0
-
-     Unless required by applicable law or agreed to in writing, software
-     distributed under the License is distributed on an "AS IS" BASIS,
-     WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
-     See the License for the specific language governing permissions and
-     limitations under the License.
--->
-
-<!-- Version History
-        version 1 - initial version.
-        version 2 - added recipientLimit.
-        version 3 - added min/max recycler values.
-        version 4 - added sms to mms text threshold.
--->
-
-<mms_config version="4">
-    <!-- Maximum message size in bytes for a MMS message -->
-    <int name="maxMessageSize">102400</int>
-
-    <!-- Maximum height for an attached image -->
-    <int name="maxImageHeight">1944</int>
-
-    <!-- Maximum width for an attached image -->
-    <int name="maxImageWidth">2592</int>
-</mms_config>
+<?xml version="1.0" encoding="utf-8"?>
+<!-- Copyright 2013 The Android Open Source Project
+
+     Licensed under the Apache License, Version 2.0 (the "License");
+     you may not use this file except in compliance with the License.
+     You may obtain a copy of the License at
+
+          http://www.apache.org/licenses/LICENSE-2.0
+
+     Unless required by applicable law or agreed to in writing, software
+     distributed under the License is distributed on an "AS IS" BASIS,
+     WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+     See the License for the specific language governing permissions and
+     limitations under the License.
+-->
+
+<!-- Version History
+        version 1 - initial version.
+        version 2 - added recipientLimit.
+        version 3 - added min/max recycler values.
+        version 4 - added sms to mms text threshold.
+-->
+
+<mms_config version="4">
+    <!-- Maximum message size in bytes for a MMS message -->
+    <int name="maxMessageSize">102400</int>
+
+    <!-- Maximum height for an attached image -->
+    <int name="maxImageHeight">1944</int>
+
+    <!-- Maximum width for an attached image -->
+    <int name="maxImageWidth">2592</int>
+</mms_config>
diff --git a/android-smsmms/src/main/res/xml-mcc647-mnc10/mms_config.xml b/android-smsmms/src/main/res/xml-mcc647-mnc10/mms_config.xml
index 486c4682c..6c5de90eb 100755
--- a/android-smsmms/src/main/res/xml-mcc647-mnc10/mms_config.xml
+++ b/android-smsmms/src/main/res/xml-mcc647-mnc10/mms_config.xml
@@ -1,33 +1,33 @@
-<?xml version="1.0" encoding="utf-8"?>
-<!-- Copyright 2013 The Android Open Source Project
-
-     Licensed under the Apache License, Version 2.0 (the "License");
-     you may not use this file except in compliance with the License.
-     You may obtain a copy of the License at
-
-          http://www.apache.org/licenses/LICENSE-2.0
-
-     Unless required by applicable law or agreed to in writing, software
-     distributed under the License is distributed on an "AS IS" BASIS,
-     WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
-     See the License for the specific language governing permissions and
-     limitations under the License.
--->
-
-<!-- Version History
-        version 1 - initial version.
-        version 2 - added recipientLimit.
-        version 3 - added min/max recycler values.
-        version 4 - added sms to mms text threshold.
--->
-
-<mms_config version="4">
-    <!-- Maximum message size in bytes for a MMS message -->
-    <int name="maxMessageSize">614400</int>
-
-    <!-- Maximum height for an attached image -->
-    <int name="maxImageHeight">1944</int>
-
-    <!-- Maximum width for an attached image -->
-    <int name="maxImageWidth">2592</int>
-</mms_config>
+<?xml version="1.0" encoding="utf-8"?>
+<!-- Copyright 2013 The Android Open Source Project
+
+     Licensed under the Apache License, Version 2.0 (the "License");
+     you may not use this file except in compliance with the License.
+     You may obtain a copy of the License at
+
+          http://www.apache.org/licenses/LICENSE-2.0
+
+     Unless required by applicable law or agreed to in writing, software
+     distributed under the License is distributed on an "AS IS" BASIS,
+     WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+     See the License for the specific language governing permissions and
+     limitations under the License.
+-->
+
+<!-- Version History
+        version 1 - initial version.
+        version 2 - added recipientLimit.
+        version 3 - added min/max recycler values.
+        version 4 - added sms to mms text threshold.
+-->
+
+<mms_config version="4">
+    <!-- Maximum message size in bytes for a MMS message -->
+    <int name="maxMessageSize">614400</int>
+
+    <!-- Maximum height for an attached image -->
+    <int name="maxImageHeight">1944</int>
+
+    <!-- Maximum width for an attached image -->
+    <int name="maxImageWidth">2592</int>
+</mms_config>
diff --git a/android-smsmms/src/main/res/xml/mms_config.xml b/android-smsmms/src/main/res/xml/mms_config.xml
index fe47c792d..ef8ec9ffc 100755
--- a/android-smsmms/src/main/res/xml/mms_config.xml
+++ b/android-smsmms/src/main/res/xml/mms_config.xml
@@ -1,87 +1,87 @@
-<?xml version="1.0" encoding="utf-8"?>
-<!-- Copyright (C) 2009 The Android Open Source Project
-
-     Licensed under the Apache License, Version 2.0 (the "License");
-     you may not use this file except in compliance with the License.
-     You may obtain a copy of the License at
-
-          http://www.apache.org/licenses/LICENSE-2.0
-
-     Unless required by applicable law or agreed to in writing, software
-     distributed under the License is distributed on an "AS IS" BASIS,
-     WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
-     See the License for the specific language governing permissions and
-     limitations under the License.
--->
-
-<!-- Version History
-        version 1 - initial version.
-        version 2 - added recipientLimit.
-        version 3 - added min/max recycler values.
-        version 4 - added sms to mms text threshold.
--->
-
-<mms_config version="4">
-    <!-- Flag indicating whether MMS should be enabled -->
-    <bool name="enabledMMS">true</bool>
-
-    <!-- Maximum message size in bytes for a MMS message -->
-    <int name="maxMessageSize">307200</int>
-
-    <!-- Maximum height for an attached image -->
-    <int name="maxImageHeight">480</int>
-
-    <!-- Maximum width for an attached image -->
-    <int name="maxImageWidth">640</int>
-
-    <!-- Maximum number of recipients allowed per message. Use a value of -1
-         to indicate no limit. -->
-    <int name="recipientLimit">-1</int>
-
-    <!-- If true, The text message over 160 characters will be sent in multi part.
-         If false, The text message over 160 characters will be sent
-         via multi media message. -->
-    <bool name="enableMultipartSMS">true</bool>
-
-    <!-- If enableMultipartSMS is true and smsToMmsTextThreshold > 1, then multi-part SMS messages
-         will be converted into a single mms message. For example, if the mms_config.xml file
-         specifies <int name="smsToMmsTextThreshold">7</int>, then on the 8th sms segment, the
-         message will be converted to an mms. -->
-    <int name="smsToMmsTextThreshold">-1</int>
-
-    <!-- Maximum length for message text. Use a value of -1
-         to indicate default value -->
-    <int name="maxMessageTextSize">-1</int>
-
-    <!--
-         User-Agent and UA Profile URL should be obtained via system API since Kitkat.
-         The following values provide a fallback in the rare case that system API
-         returns empty.
-    -->
-    <!-- User-Agent parameter used in MMS http request -->
-    <string name="userAgent">Android Messaging</string>
-
-    <!-- UAProf URL -->
-    <string name="uaProfUrl">http://www.gstatic.com/android/hangouts/hangouts_mms_ua_profile.xml</string>
-
-
-    <!-- UAProf parameter tag name -->
-    <!-- this is default to "x-wap-profile". Override if necessary. Optional -->
-    <!--
-    <string name="uaProfTagName">x-wap-profile</string>
-    -->
-
-    <!-- Reference for additional http parameters used in MMS http request.
-         Parameters are seperated by '|'. Optional.
-    -->
-    <!--
-    <string name="httpParams">
-        x-up-calling-line-id: ##LINE1##|x-carrier-magic: http://magic.google.com
-    </string>
-    -->
-
-    <!-- Suffix to the NAI header (encoded together with base64) -->
-    <!--
-    <string name="naiSuffix"></string>
-    -->
-</mms_config>
+<?xml version="1.0" encoding="utf-8"?>
+<!-- Copyright (C) 2009 The Android Open Source Project
+
+     Licensed under the Apache License, Version 2.0 (the "License");
+     you may not use this file except in compliance with the License.
+     You may obtain a copy of the License at
+
+          http://www.apache.org/licenses/LICENSE-2.0
+
+     Unless required by applicable law or agreed to in writing, software
+     distributed under the License is distributed on an "AS IS" BASIS,
+     WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+     See the License for the specific language governing permissions and
+     limitations under the License.
+-->
+
+<!-- Version History
+        version 1 - initial version.
+        version 2 - added recipientLimit.
+        version 3 - added min/max recycler values.
+        version 4 - added sms to mms text threshold.
+-->
+
+<mms_config version="4">
+    <!-- Flag indicating whether MMS should be enabled -->
+    <bool name="enabledMMS">true</bool>
+
+    <!-- Maximum message size in bytes for a MMS message -->
+    <int name="maxMessageSize">307200</int>
+
+    <!-- Maximum height for an attached image -->
+    <int name="maxImageHeight">480</int>
+
+    <!-- Maximum width for an attached image -->
+    <int name="maxImageWidth">640</int>
+
+    <!-- Maximum number of recipients allowed per message. Use a value of -1
+         to indicate no limit. -->
+    <int name="recipientLimit">-1</int>
+
+    <!-- If true, The text message over 160 characters will be sent in multi part.
+         If false, The text message over 160 characters will be sent
+         via multi media message. -->
+    <bool name="enableMultipartSMS">true</bool>
+
+    <!-- If enableMultipartSMS is true and smsToMmsTextThreshold > 1, then multi-part SMS messages
+         will be converted into a single mms message. For example, if the mms_config.xml file
+         specifies <int name="smsToMmsTextThreshold">7</int>, then on the 8th sms segment, the
+         message will be converted to an mms. -->
+    <int name="smsToMmsTextThreshold">-1</int>
+
+    <!-- Maximum length for message text. Use a value of -1
+         to indicate default value -->
+    <int name="maxMessageTextSize">-1</int>
+
+    <!--
+         User-Agent and UA Profile URL should be obtained via system API since Kitkat.
+         The following values provide a fallback in the rare case that system API
+         returns empty.
+    -->
+    <!-- User-Agent parameter used in MMS http request -->
+    <string name="userAgent">Android Messaging</string>
+
+    <!-- UAProf URL -->
+    <string name="uaProfUrl">http://www.gstatic.com/android/hangouts/hangouts_mms_ua_profile.xml</string>
+
+
+    <!-- UAProf parameter tag name -->
+    <!-- this is default to "x-wap-profile". Override if necessary. Optional -->
+    <!--
+    <string name="uaProfTagName">x-wap-profile</string>
+    -->
+
+    <!-- Reference for additional http parameters used in MMS http request.
+         Parameters are seperated by '|'. Optional.
+    -->
+    <!--
+    <string name="httpParams">
+        x-up-calling-line-id: ##LINE1##|x-carrier-magic: http://magic.google.com
+    </string>
+    -->
+
+    <!-- Suffix to the NAI header (encoded together with base64) -->
+    <!--
+    <string name="naiSuffix"></string>
+    -->
+</mms_config>
diff --git a/build.gradle b/build.gradle
index f7a1e2c8f..9dd2d9916 100644
--- a/build.gradle
+++ b/build.gradle
@@ -1,83 +1,83 @@
-// Top-level build file where you can add configuration options common to all sub-projects/modules.
-
-buildscript {
-    ext.androidx_appcompat_version = '1.1.0'
-    ext.androidx_constraintlayout_version = '1.1.3'
-    ext.androidx_core_version = '1.1.0'
-    ext.androidx_emoji_version = '1.0.0'
-    ext.androidx_exifinterface_version = '1.0.0'
-    ext.androidx_testrunner_version = '1.1.0-alpha3'
-    ext.androidx_viewpager_version = '1.0.0-beta05'
-    ext.autodispose_version = '1.3.0'
-    ext.billing_version = '3.0.2'
-    ext.conductor_version = '2.1.5'
-    ext.coroutines_version = '1.4.3'
-    ext.dagger_version = "2.16"
-    ext.espresso_version = '3.1.0-alpha3'
-    ext.exoplayer_version = "2.8.1"
-    ext.glide_version = "4.8.0"
-    ext.junit_version = '4.12'
-    ext.kotlin_version = '1.3.60'
-    ext.lifecycle_version = '2.1.0'
-    ext.material_version = '1.0.0'
-    ext.mockito_version = '2.18.3'
-    ext.moshi_version = '1.8.0'
-    ext.okhttp3_version = '4.1.0'
-    ext.realm_version = '5.8.0'
-    ext.realm_adapters_version = '3.1.0'
-    ext.rxandroid_version = '2.0.1'
-    ext.rxdogtag_version = '0.2.0'
-    ext.rxbinding_version = '2.0.0'
-    ext.rxjava_version = '2.1.4'
-    ext.rxkotlin_version = '2.1.0'
-    ext.rx_preferences_version = '2.0.0-RC3'
-    ext.timber_version = '4.5.1'
-
-    ext.abiCodes = ['armeabi-v7a': 1, 'arm64-v8a': 2]
-
-    repositories {
-        maven { url 'https://maven.google.com' }
-        jcenter()
-        google()
-    }
-
-    dependencies {
-        classpath 'com.android.tools.build:gradle:3.5.4'
-        classpath 'com.google.firebase:firebase-crashlytics-gradle:2.4.1'
-        classpath 'com.google.gms:google-services:4.2.0'
-        classpath "org.jetbrains.kotlin:kotlin-gradle-plugin:$kotlin_version"
-        classpath "io.realm:realm-gradle-plugin:$realm_version"
-    }
-}
-
-allprojects {
-    repositories {
-        google()
-        jcenter()
-        maven { url "https://jitpack.io" }
-        maven { url 'https://maven.google.com' }
-        maven {
-            name 'glide-snapshot'
-            url 'https://oss.sonatype.org/content/repositories/snapshots'
-        }
-        mavenCentral()
-    }
-}
-
-task clean(type: Delete) {
-    delete rootProject.buildDir
-}
-
-subprojects {
-    afterEvaluate {
-        if (project.hasProperty('kapt')) {
-            kapt {
-                // we expect this closure to run over a org.jetbrains.kotlin.gradle.plugin.KaptExtension
-                javacOptions {
-                    option("-source", "8")
-                    option("-target", "8")
-                }
-            }
-        }
-    }
-}
+// Top-level build file where you can add configuration options common to all sub-projects/modules.
+
+buildscript {
+    ext.androidx_appcompat_version = '1.1.0'
+    ext.androidx_constraintlayout_version = '1.1.3'
+    ext.androidx_core_version = '1.1.0'
+    ext.androidx_emoji_version = '1.0.0'
+    ext.androidx_exifinterface_version = '1.0.0'
+    ext.androidx_testrunner_version = '1.1.0-alpha3'
+    ext.androidx_viewpager_version = '1.0.0-beta05'
+    ext.autodispose_version = '1.3.0'
+    ext.billing_version = '3.0.2'
+    ext.conductor_version = '2.1.5'
+    ext.coroutines_version = '1.4.3'
+    ext.dagger_version = "2.16"
+    ext.espresso_version = '3.1.0-alpha3'
+    ext.exoplayer_version = "2.8.1"
+    ext.glide_version = "4.8.0"
+    ext.junit_version = '4.12'
+    ext.kotlin_version = '1.3.60'
+    ext.lifecycle_version = '2.1.0'
+    ext.material_version = '1.0.0'
+    ext.mockito_version = '2.18.3'
+    ext.moshi_version = '1.8.0'
+    ext.okhttp3_version = '4.1.0'
+    ext.realm_version = '5.8.0'
+    ext.realm_adapters_version = '3.1.0'
+    ext.rxandroid_version = '2.0.1'
+    ext.rxdogtag_version = '0.2.0'
+    ext.rxbinding_version = '2.0.0'
+    ext.rxjava_version = '2.1.4'
+    ext.rxkotlin_version = '2.1.0'
+    ext.rx_preferences_version = '2.0.0-RC3'
+    ext.timber_version = '4.5.1'
+
+    ext.abiCodes = ['armeabi-v7a': 1, 'arm64-v8a': 2]
+
+    repositories {
+        maven { url 'https://maven.google.com' }
+        jcenter()
+        google()
+    }
+
+    dependencies {
+        classpath 'com.android.tools.build:gradle:3.5.4'
+        classpath 'com.google.firebase:firebase-crashlytics-gradle:2.4.1'
+        classpath 'com.google.gms:google-services:4.2.0'
+        classpath "org.jetbrains.kotlin:kotlin-gradle-plugin:$kotlin_version"
+        classpath "io.realm:realm-gradle-plugin:$realm_version"
+    }
+}
+
+allprojects {
+    repositories {
+        google()
+        jcenter()
+        maven { url "https://jitpack.io" }
+        maven { url 'https://maven.google.com' }
+        maven {
+            name 'glide-snapshot'
+            url 'https://oss.sonatype.org/content/repositories/snapshots'
+        }
+        mavenCentral()
+    }
+}
+
+task clean(type: Delete) {
+    delete rootProject.buildDir
+}
+
+subprojects {
+    afterEvaluate {
+        if (project.hasProperty('kapt')) {
+            kapt {
+                // we expect this closure to run over a org.jetbrains.kotlin.gradle.plugin.KaptExtension
+                javacOptions {
+                    option("-source", "8")
+                    option("-target", "8")
+                }
+            }
+        }
+    }
+}
diff --git a/common/build.gradle b/common/build.gradle
index a893d1c18..ab6fe87a5 100644
--- a/common/build.gradle
+++ b/common/build.gradle
@@ -1,43 +1,43 @@
-/*
- * Copyright (C) 2017 Moez Bhatti <moez.bhatti@gmail.com>
- *
- * This file is part of QKSMS.
- *
- * QKSMS is free software: you can redistribute it and/or modify
- * it under the terms of the GNU General Public License as published by
- * the Free Software Foundation, either version 3 of the License, or
- * (at your option) any later version.
- *
- * QKSMS is distributed in the hope that it will be useful,
- * but WITHOUT ANY WARRANTY; without even the implied warranty of
- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
- * GNU General Public License for more details.
- *
- * You should have received a copy of the GNU General Public License
- * along with QKSMS.  If not, see <http://www.gnu.org/licenses/>.
- */
-apply plugin: 'com.android.library'
-apply plugin: 'kotlin-android'
-
-android {
-    compileSdkVersion 29
-
-    defaultConfig {
-        minSdkVersion 21
-        targetSdkVersion 29
-        testInstrumentationRunner "androidx.test.runner.AndroidJUnitRunner"
-
-    }
-}
-
-dependencies {
-    implementation "androidx.core:core-ktx:$androidx_core_version"
-    implementation "com.jakewharton.timber:timber:$timber_version"
-    implementation "org.jetbrains.kotlin:kotlin-stdlib:$kotlin_version"
-
-    implementation project(":android-smsmms")
-}
-
-repositories {
-    mavenCentral()
-}
+/*
+ * Copyright (C) 2017 Moez Bhatti <moez.bhatti@gmail.com>
+ *
+ * This file is part of QKSMS.
+ *
+ * QKSMS is free software: you can redistribute it and/or modify
+ * it under the terms of the GNU General Public License as published by
+ * the Free Software Foundation, either version 3 of the License, or
+ * (at your option) any later version.
+ *
+ * QKSMS is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+ * GNU General Public License for more details.
+ *
+ * You should have received a copy of the GNU General Public License
+ * along with QKSMS.  If not, see <http://www.gnu.org/licenses/>.
+ */
+apply plugin: 'com.android.library'
+apply plugin: 'kotlin-android'
+
+android {
+    compileSdkVersion 29
+
+    defaultConfig {
+        minSdkVersion 21
+        targetSdkVersion 29
+        testInstrumentationRunner "androidx.test.runner.AndroidJUnitRunner"
+
+    }
+}
+
+dependencies {
+    implementation "androidx.core:core-ktx:$androidx_core_version"
+    implementation "com.jakewharton.timber:timber:$timber_version"
+    implementation "org.jetbrains.kotlin:kotlin-stdlib:$kotlin_version"
+
+    implementation project(":android-smsmms")
+}
+
+repositories {
+    mavenCentral()
+}
diff --git a/common/src/main/AndroidManifest.xml b/common/src/main/AndroidManifest.xml
index 969a751c5..6311bb500 100644
--- a/common/src/main/AndroidManifest.xml
+++ b/common/src/main/AndroidManifest.xml
@@ -1,19 +1,19 @@
-<!--
-  ~ Copyright (C) 2017 Moez Bhatti <moez.bhatti@gmail.com>
-  ~
-  ~ This file is part of QKSMS.
-  ~
-  ~ QKSMS is free software: you can redistribute it and/or modify
-  ~ it under the terms of the GNU General Public License as published by
-  ~ the Free Software Foundation, either version 3 of the License, or
-  ~ (at your option) any later version.
-  ~
-  ~ QKSMS is distributed in the hope that it will be useful,
-  ~ but WITHOUT ANY WARRANTY; without even the implied warranty of
-  ~ MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
-  ~ GNU General Public License for more details.
-  ~
-  ~ You should have received a copy of the GNU General Public License
-  ~ along with QKSMS.  If not, see <http://www.gnu.org/licenses/>.
-  -->
-<manifest package="com.moez.QKSMS.common" />
+<!--
+  ~ Copyright (C) 2017 Moez Bhatti <moez.bhatti@gmail.com>
+  ~
+  ~ This file is part of QKSMS.
+  ~
+  ~ QKSMS is free software: you can redistribute it and/or modify
+  ~ it under the terms of the GNU General Public License as published by
+  ~ the Free Software Foundation, either version 3 of the License, or
+  ~ (at your option) any later version.
+  ~
+  ~ QKSMS is distributed in the hope that it will be useful,
+  ~ but WITHOUT ANY WARRANTY; without even the implied warranty of
+  ~ MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+  ~ GNU General Public License for more details.
+  ~
+  ~ You should have received a copy of the GNU General Public License
+  ~ along with QKSMS.  If not, see <http://www.gnu.org/licenses/>.
+  -->
+<manifest package="com.moez.QKSMS.common" />
diff --git a/common/src/main/java/com/bumptech/glide/gifencoder/AnimatedGifEncoder.java b/common/src/main/java/com/bumptech/glide/gifencoder/AnimatedGifEncoder.java
index c49c8c768..60da0783d 100644
--- a/common/src/main/java/com/bumptech/glide/gifencoder/AnimatedGifEncoder.java
+++ b/common/src/main/java/com/bumptech/glide/gifencoder/AnimatedGifEncoder.java
@@ -1,537 +1,537 @@
-package com.bumptech.glide.gifencoder;
-
-
-import android.graphics.Bitmap;
-import android.graphics.Canvas;
-import android.graphics.Color;
-import androidx.annotation.NonNull;
-import androidx.annotation.Nullable;
-import timber.log.Timber;
-
-import java.io.BufferedOutputStream;
-import java.io.FileOutputStream;
-import java.io.IOException;
-import java.io.OutputStream;
-
-public class AnimatedGifEncoder {
-
-    // The minimum % of an images pixels that must be transparent for us to set a transparent index
-    // automatically.
-    private static final double MIN_TRANSPARENT_PERCENTAGE = 4d;
-
-    private int width; // image size
-
-    private int height;
-
-    private int fixedWidth;   // set by setSize()
-
-    private int fixedHeight;
-
-    private Integer transparent = null; // transparent color if given
-
-    private int transIndex; // transparent index in color table
-
-    private int repeat = -1; // no repeat
-
-    private int delay = 0; // frame delay (hundredths)
-
-    private boolean started = false; // ready to output frames
-
-    private OutputStream out;
-
-    private Bitmap image; // current frame
-
-    private byte[] pixels; // BGR byte array from frame
-
-    private byte[] indexedPixels; // converted frame indexed to palette
-
-    private int colorDepth; // number of bit planes
-
-    private byte[] colorTab; // RGB palette
-
-    private boolean[] usedEntry = new boolean[256]; // active palette entries
-
-    private int palSize = 7; // color table size (bits-1)
-
-    private int dispose = -1; // disposal code (-1 = use default)
-
-    private boolean closeStream = false; // close stream when finished
-
-    private boolean firstFrame = true;
-
-    private boolean sizeSet = false; // if false, get size from first frame
-
-    private int sample = 10; // default sample interval for quantizer
-
-    private boolean hasTransparentPixels;
-
-    /**
-     * Sets the delay time between each frame, or changes it for subsequent frames
-     * (applies to last frame added).
-     *
-     * @param ms int delay time in milliseconds
-     */
-    public void setDelay(int ms) {
-        delay = Math.round(ms / 10.0f);
-    }
-
-    /**
-     * Sets the GIF frame disposal code for the last added frame and any
-     * subsequent frames. Default is 0 if no transparent color has been set,
-     * otherwise 2.
-     *
-     * @param code int disposal code.
-     */
-    public void setDispose(int code) {
-        if (code >= 0) {
-            dispose = code;
-        }
-    }
-
-    /**
-     * Sets the number of times the set of GIF frames should be played. Default is
-     * 1; 0 means play indefinitely. Must be invoked before the first image is
-     * added.
-     *
-     * @param iter int number of iterations.
-     */
-    public void setRepeat(int iter) {
-        if (iter >= 0) {
-            repeat = iter;
-        }
-    }
-
-    /**
-     * Sets the transparent color for the last added frame and any subsequent
-     * frames. Since all colors are subject to modification in the quantization
-     * process, the color in the final palette for each frame closest to the given
-     * color becomes the transparent color for that frame. May be set to null to
-     * indicate no transparent color.
-     *
-     * @param color Color to be treated as transparent on display.
-     */
-    public void setTransparent(int color) {
-        transparent = color;
-    }
-
-    /**
-     * Adds next GIF frame. The frame is not written immediately, but is actually
-     * deferred until the next frame is received so that timing data can be
-     * inserted. Invoking <code>finish()</code> flushes all frames. If
-     * <code>setSize</code> was invoked, the size is used for all subsequent frames.
-     * Otherwise, the actual size of the image is used for each frames.
-     *
-     * @param im BufferedImage containing frame to write.
-     * @return true if successful.
-     */
-    public boolean addFrame(@Nullable Bitmap im) {
-        return addFrame(im, 0, 0);
-    }
-
-    /**
-     * Adds next GIF frame to the specified position. The frame is not written immediately, but is
-     * actually deferred until the next frame is received so that timing data can be inserted.
-     * Invoking <code>finish()</code> flushes all frames. If <code>setSize</code> was invoked, the
-     * size is used for all subsequent frames. Otherwise, the actual size of the image is used for
-     * each frame.
-     * <p>
-     * See page 11 of http://giflib.sourceforge.net/gif89.txt for the position of the frame
-     *
-     * @param im BufferedImage containing frame to write.
-     * @param x  Column number, in pixels, of the left edge of the image, with respect to the left
-     *           edge of the Logical Screen.
-     * @param y  Row number, in pixels, of the top edge of the image with respect to the top edge of
-     *           the Logical Screen.
-     * @return true if successful.
-     */
-    public boolean addFrame(@Nullable Bitmap im, int x, int y) {
-        if ((im == null) || !started) {
-            return false;
-        }
-        boolean ok = true;
-        try {
-            if (sizeSet) {
-                setFrameSize(fixedWidth, fixedHeight);
-            } else {
-                setFrameSize(im.getWidth(), im.getHeight());
-            }
-            image = im;
-            getImagePixels(); // convert to correct format if necessary
-            analyzePixels(); // build color table & map pixels
-            if (firstFrame) {
-                writeLSD(); // logical screen descriptor
-                writePalette(); // global color table
-                if (repeat >= 0) {
-                    // use NS app extension to indicate reps
-                    writeNetscapeExt();
-                }
-            }
-            writeGraphicCtrlExt(); // write graphic control extension
-            writeImageDesc(x, y); // image descriptor
-            if (!firstFrame) {
-                writePalette(); // local color table
-            }
-            writePixels(); // encode and write pixel data
-            firstFrame = false;
-        } catch (IOException e) {
-            ok = false;
-        }
-
-        return ok;
-    }
-
-    /**
-     * Flushes any pending data and closes output file. If writing to an
-     * OutputStream, the stream is not closed.
-     */
-    public boolean finish() {
-        if (!started)
-            return false;
-        boolean ok = true;
-        started = false;
-        try {
-            out.write(0x3b); // GIF trailer
-            out.flush();
-            if (closeStream) {
-                out.close();
-            }
-        } catch (IOException e) {
-            ok = false;
-        }
-
-        // reset for subsequent use
-        transIndex = 0;
-        out = null;
-        image = null;
-        pixels = null;
-        indexedPixels = null;
-        colorTab = null;
-        closeStream = false;
-        firstFrame = true;
-
-        return ok;
-    }
-
-    /**
-     * Sets frame rate in frames per second. Equivalent to
-     * <code>setDelay(1000/fps)</code>.
-     *
-     * @param fps float frame rate (frames per second)
-     */
-    public void setFrameRate(float fps) {
-        if (fps != 0f) {
-            delay = Math.round(100f / fps);
-        }
-    }
-
-    /**
-     * Sets quality of color quantization (conversion of images to the maximum 256
-     * colors allowed by the GIF specification). Lower values (minimum = 1)
-     * produce better colors, but slow processing significantly. 10 is the
-     * default, and produces good color mapping at reasonable speeds. Values
-     * greater than 20 do not yield significant improvements in speed.
-     *
-     * @param quality int greater than 0.
-     */
-    public void setQuality(int quality) {
-        if (quality < 1)
-            quality = 1;
-        sample = quality;
-    }
-
-    /**
-     * Sets the fixed GIF frame size for all the frames.
-     * This should be called before start.
-     *
-     * @param w int frame width.
-     * @param h int frame width.
-     */
-    public void setSize(int w, int h) {
-        if (started) {
-            return;
-        }
-
-        fixedWidth = w;
-        fixedHeight = h;
-        if (fixedWidth < 1) {
-            fixedWidth = 320;
-        }
-        if (fixedHeight < 1) {
-            fixedHeight = 240;
-        }
-
-        sizeSet = true;
-    }
-
-    /**
-     * Sets current GIF frame size.
-     *
-     * @param w int frame width.
-     * @param h int frame width.
-     */
-    private void setFrameSize(int w, int h) {
-        width = w;
-        height = h;
-    }
-
-    /**
-     * Initiates GIF file creation on the given stream. The stream is not closed
-     * automatically.
-     *
-     * @param os OutputStream on which GIF images are written.
-     * @return false if initial write failed.
-     */
-    public boolean start(@Nullable OutputStream os) {
-        if (os == null)
-            return false;
-        boolean ok = true;
-        closeStream = false;
-        out = os;
-        try {
-            writeString("GIF89a"); // header
-        } catch (IOException e) {
-            ok = false;
-        }
-        return started = ok;
-    }
-
-    /**
-     * Initiates writing of a GIF file with the specified name.
-     *
-     * @param file String containing output file name.
-     * @return false if open or initial write failed.
-     */
-    public boolean start(@NonNull String file) {
-        boolean ok;
-        try {
-            out = new BufferedOutputStream(new FileOutputStream(file));
-            ok = start(out);
-            closeStream = true;
-        } catch (IOException e) {
-            ok = false;
-        }
-        return started = ok;
-    }
-
-    /**
-     * Analyzes image colors and creates color map.
-     */
-    private void analyzePixels() {
-        int len = pixels.length;
-        int nPix = len / 3;
-        indexedPixels = new byte[nPix];
-        NeuQuant nq = new NeuQuant(pixels, len, sample);
-        // initialize quantizer
-        colorTab = nq.process(); // create reduced palette
-        // convert map from BGR to RGB
-        for (int i = 0; i < colorTab.length; i += 3) {
-            byte temp = colorTab[i];
-            colorTab[i] = colorTab[i + 2];
-            colorTab[i + 2] = temp;
-            usedEntry[i / 3] = false;
-        }
-        // map image pixels to new palette
-        int k = 0;
-        for (int i = 0; i < nPix; i++) {
-            int index = nq.map(pixels[k++] & 0xff, pixels[k++] & 0xff, pixels[k++] & 0xff);
-            usedEntry[index] = true;
-            indexedPixels[i] = (byte) index;
-        }
-        pixels = null;
-        colorDepth = 8;
-        palSize = 7;
-        // get closest match to transparent color if specified
-        if (transparent != null) {
-            transIndex = findClosest(transparent);
-        } else if (hasTransparentPixels) {
-            transIndex = findClosest(Color.TRANSPARENT);
-        }
-    }
-
-    /**
-     * Returns index of palette color closest to c
-     */
-    private int findClosest(int color) {
-        if (colorTab == null)
-            return -1;
-        int r = Color.red(color);
-        int g = Color.green(color);
-        int b = Color.blue(color);
-        int minpos = 0;
-        int dmin = 256 * 256 * 256;
-        int len = colorTab.length;
-        for (int i = 0; i < len; ) {
-            int dr = r - (colorTab[i++] & 0xff);
-            int dg = g - (colorTab[i++] & 0xff);
-            int db = b - (colorTab[i] & 0xff);
-            int d = dr * dr + dg * dg + db * db;
-            int index = i / 3;
-            if (usedEntry[index] && (d < dmin)) {
-                dmin = d;
-                minpos = index;
-            }
-            i++;
-        }
-        return minpos;
-    }
-
-    /**
-     * Extracts image pixels into byte array "pixels"
-     */
-    private void getImagePixels() {
-        int w = image.getWidth();
-        int h = image.getHeight();
-
-        if ((w != width) || (h != height)) {
-            // create new image with right size/format
-            Bitmap temp = Bitmap.createBitmap(width, height, Bitmap.Config.ARGB_8888);
-            Canvas canvas = new Canvas(temp);
-            canvas.drawBitmap(temp, 0, 0, null);
-            image = temp;
-        }
-        int[] pixelsInt = new int[w * h];
-        image.getPixels(pixelsInt, 0, w, 0, 0, w, h);
-
-        // The algorithm requires 3 bytes per pixel as RGB.
-        pixels = new byte[pixelsInt.length * 3];
-
-        int pixelsIndex = 0;
-        hasTransparentPixels = false;
-        int totalTransparentPixels = 0;
-        for (final int pixel : pixelsInt) {
-            if (pixel == Color.TRANSPARENT) {
-                totalTransparentPixels++;
-            }
-            pixels[pixelsIndex++] = (byte) (pixel & 0xFF);
-            pixels[pixelsIndex++] = (byte) ((pixel >> 8) & 0xFF);
-            pixels[pixelsIndex++] = (byte) ((pixel >> 16) & 0xFF);
-        }
-
-        double transparentPercentage = 100 * totalTransparentPixels / (double) pixelsInt.length;
-        // Assume images with greater where more than n% of the pixels are transparent actually have
-        // transparency. See issue #214.
-        hasTransparentPixels = transparentPercentage > MIN_TRANSPARENT_PERCENTAGE;
-        Timber.d("got pixels for frame with " + transparentPercentage + "% transparent pixels");
-    }
-
-    /**
-     * Writes Graphic Control Extension
-     */
-    private void writeGraphicCtrlExt() throws IOException {
-        out.write(0x21); // extension introducer
-        out.write(0xf9); // GCE label
-        out.write(4); // data block size
-        int transp, disp;
-        if (transparent == null && !hasTransparentPixels) {
-            transp = 0;
-            disp = 0; // dispose = no action
-        } else {
-            transp = 1;
-            disp = 2; // force clear if using transparent color
-        }
-        if (dispose >= 0) {
-            disp = dispose & 7; // user override
-        }
-        disp <<= 2;
-
-        // packed fields
-        out.write(0 | // 1:3 reserved
-                disp | // 4:6 disposal
-                0 | // 7 user input - 0 = none
-                transp); // 8 transparency flag
-
-        writeShort(delay); // delay x 1/100 sec
-        out.write(transIndex); // transparent color index
-        out.write(0); // block terminator
-    }
-
-    /**
-     * Writes Image Descriptor
-     */
-    private void writeImageDesc(int x, int y) throws IOException {
-        out.write(0x2c); // image separator
-        writeShort(x); // image position
-        writeShort(y);
-        writeShort(width); // image size
-        writeShort(height);
-        // packed fields
-        if (firstFrame) {
-            // no LCT - GCT is used for first (or only) frame
-            out.write(0);
-        } else {
-            // specify normal LCT
-            out.write(0x80 | // 1 local color table 1=yes
-                    0 | // 2 interlace - 0=no
-                    0 | // 3 sorted - 0=no
-                    0 | // 4-5 reserved
-                    palSize); // 6-8 size of color table
-        }
-    }
-
-    /**
-     * Writes Logical Screen Descriptor
-     */
-    private void writeLSD() throws IOException {
-        // logical screen size
-        writeShort(width);
-        writeShort(height);
-        // packed fields
-        out.write((0x80 | // 1 : global color table flag = 1 (gct used)
-                0x70 | // 2-4 : color resolution = 7
-                0x00 | // 5 : gct sort flag = 0
-                palSize)); // 6-8 : gct size
-
-        out.write(0); // background color index
-        out.write(0); // pixel aspect ratio - assume 1:1
-    }
-
-    /**
-     * Writes Netscape application extension to define repeat count.
-     */
-    private void writeNetscapeExt() throws IOException {
-        out.write(0x21); // extension introducer
-        out.write(0xff); // app extension label
-        out.write(11); // block size
-        writeString("NETSCAPE" + "2.0"); // app id + auth code
-        out.write(3); // sub-block size
-        out.write(1); // loop sub-block id
-        writeShort(repeat); // loop count (extra iterations, 0=repeat forever)
-        out.write(0); // block terminator
-    }
-
-    /**
-     * Writes color table
-     */
-    private void writePalette() throws IOException {
-        out.write(colorTab, 0, colorTab.length);
-        int n = (3 * 256) - colorTab.length;
-        for (int i = 0; i < n; i++) {
-            out.write(0);
-        }
-    }
-
-    /**
-     * Encodes and writes pixel data
-     */
-    private void writePixels() throws IOException {
-        LZWEncoder encoder = new LZWEncoder(width, height, indexedPixels, colorDepth);
-        encoder.encode(out);
-    }
-
-    /**
-     * Write 16-bit value to output stream, LSB first
-     */
-    private void writeShort(int value) throws IOException {
-        out.write(value & 0xff);
-        out.write((value >> 8) & 0xff);
-    }
-
-    /**
-     * Writes string to output stream
-     */
-    private void writeString(String s) throws IOException {
-        for (int i = 0; i < s.length(); i++) {
-            out.write((byte) s.charAt(i));
-        }
-    }
+package com.bumptech.glide.gifencoder;
+
+
+import android.graphics.Bitmap;
+import android.graphics.Canvas;
+import android.graphics.Color;
+import androidx.annotation.NonNull;
+import androidx.annotation.Nullable;
+import timber.log.Timber;
+
+import java.io.BufferedOutputStream;
+import java.io.FileOutputStream;
+import java.io.IOException;
+import java.io.OutputStream;
+
+public class AnimatedGifEncoder {
+
+    // The minimum % of an images pixels that must be transparent for us to set a transparent index
+    // automatically.
+    private static final double MIN_TRANSPARENT_PERCENTAGE = 4d;
+
+    private int width; // image size
+
+    private int height;
+
+    private int fixedWidth;   // set by setSize()
+
+    private int fixedHeight;
+
+    private Integer transparent = null; // transparent color if given
+
+    private int transIndex; // transparent index in color table
+
+    private int repeat = -1; // no repeat
+
+    private int delay = 0; // frame delay (hundredths)
+
+    private boolean started = false; // ready to output frames
+
+    private OutputStream out;
+
+    private Bitmap image; // current frame
+
+    private byte[] pixels; // BGR byte array from frame
+
+    private byte[] indexedPixels; // converted frame indexed to palette
+
+    private int colorDepth; // number of bit planes
+
+    private byte[] colorTab; // RGB palette
+
+    private boolean[] usedEntry = new boolean[256]; // active palette entries
+
+    private int palSize = 7; // color table size (bits-1)
+
+    private int dispose = -1; // disposal code (-1 = use default)
+
+    private boolean closeStream = false; // close stream when finished
+
+    private boolean firstFrame = true;
+
+    private boolean sizeSet = false; // if false, get size from first frame
+
+    private int sample = 10; // default sample interval for quantizer
+
+    private boolean hasTransparentPixels;
+
+    /**
+     * Sets the delay time between each frame, or changes it for subsequent frames
+     * (applies to last frame added).
+     *
+     * @param ms int delay time in milliseconds
+     */
+    public void setDelay(int ms) {
+        delay = Math.round(ms / 10.0f);
+    }
+
+    /**
+     * Sets the GIF frame disposal code for the last added frame and any
+     * subsequent frames. Default is 0 if no transparent color has been set,
+     * otherwise 2.
+     *
+     * @param code int disposal code.
+     */
+    public void setDispose(int code) {
+        if (code >= 0) {
+            dispose = code;
+        }
+    }
+
+    /**
+     * Sets the number of times the set of GIF frames should be played. Default is
+     * 1; 0 means play indefinitely. Must be invoked before the first image is
+     * added.
+     *
+     * @param iter int number of iterations.
+     */
+    public void setRepeat(int iter) {
+        if (iter >= 0) {
+            repeat = iter;
+        }
+    }
+
+    /**
+     * Sets the transparent color for the last added frame and any subsequent
+     * frames. Since all colors are subject to modification in the quantization
+     * process, the color in the final palette for each frame closest to the given
+     * color becomes the transparent color for that frame. May be set to null to
+     * indicate no transparent color.
+     *
+     * @param color Color to be treated as transparent on display.
+     */
+    public void setTransparent(int color) {
+        transparent = color;
+    }
+
+    /**
+     * Adds next GIF frame. The frame is not written immediately, but is actually
+     * deferred until the next frame is received so that timing data can be
+     * inserted. Invoking <code>finish()</code> flushes all frames. If
+     * <code>setSize</code> was invoked, the size is used for all subsequent frames.
+     * Otherwise, the actual size of the image is used for each frames.
+     *
+     * @param im BufferedImage containing frame to write.
+     * @return true if successful.
+     */
+    public boolean addFrame(@Nullable Bitmap im) {
+        return addFrame(im, 0, 0);
+    }
+
+    /**
+     * Adds next GIF frame to the specified position. The frame is not written immediately, but is
+     * actually deferred until the next frame is received so that timing data can be inserted.
+     * Invoking <code>finish()</code> flushes all frames. If <code>setSize</code> was invoked, the
+     * size is used for all subsequent frames. Otherwise, the actual size of the image is used for
+     * each frame.
+     * <p>
+     * See page 11 of http://giflib.sourceforge.net/gif89.txt for the position of the frame
+     *
+     * @param im BufferedImage containing frame to write.
+     * @param x  Column number, in pixels, of the left edge of the image, with respect to the left
+     *           edge of the Logical Screen.
+     * @param y  Row number, in pixels, of the top edge of the image with respect to the top edge of
+     *           the Logical Screen.
+     * @return true if successful.
+     */
+    public boolean addFrame(@Nullable Bitmap im, int x, int y) {
+        if ((im == null) || !started) {
+            return false;
+        }
+        boolean ok = true;
+        try {
+            if (sizeSet) {
+                setFrameSize(fixedWidth, fixedHeight);
+            } else {
+                setFrameSize(im.getWidth(), im.getHeight());
+            }
+            image = im;
+            getImagePixels(); // convert to correct format if necessary
+            analyzePixels(); // build color table & map pixels
+            if (firstFrame) {
+                writeLSD(); // logical screen descriptor
+                writePalette(); // global color table
+                if (repeat >= 0) {
+                    // use NS app extension to indicate reps
+                    writeNetscapeExt();
+                }
+            }
+            writeGraphicCtrlExt(); // write graphic control extension
+            writeImageDesc(x, y); // image descriptor
+            if (!firstFrame) {
+                writePalette(); // local color table
+            }
+            writePixels(); // encode and write pixel data
+            firstFrame = false;
+        } catch (IOException e) {
+            ok = false;
+        }
+
+        return ok;
+    }
+
+    /**
+     * Flushes any pending data and closes output file. If writing to an
+     * OutputStream, the stream is not closed.
+     */
+    public boolean finish() {
+        if (!started)
+            return false;
+        boolean ok = true;
+        started = false;
+        try {
+            out.write(0x3b); // GIF trailer
+            out.flush();
+            if (closeStream) {
+                out.close();
+            }
+        } catch (IOException e) {
+            ok = false;
+        }
+
+        // reset for subsequent use
+        transIndex = 0;
+        out = null;
+        image = null;
+        pixels = null;
+        indexedPixels = null;
+        colorTab = null;
+        closeStream = false;
+        firstFrame = true;
+
+        return ok;
+    }
+
+    /**
+     * Sets frame rate in frames per second. Equivalent to
+     * <code>setDelay(1000/fps)</code>.
+     *
+     * @param fps float frame rate (frames per second)
+     */
+    public void setFrameRate(float fps) {
+        if (fps != 0f) {
+            delay = Math.round(100f / fps);
+        }
+    }
+
+    /**
+     * Sets quality of color quantization (conversion of images to the maximum 256
+     * colors allowed by the GIF specification). Lower values (minimum = 1)
+     * produce better colors, but slow processing significantly. 10 is the
+     * default, and produces good color mapping at reasonable speeds. Values
+     * greater than 20 do not yield significant improvements in speed.
+     *
+     * @param quality int greater than 0.
+     */
+    public void setQuality(int quality) {
+        if (quality < 1)
+            quality = 1;
+        sample = quality;
+    }
+
+    /**
+     * Sets the fixed GIF frame size for all the frames.
+     * This should be called before start.
+     *
+     * @param w int frame width.
+     * @param h int frame width.
+     */
+    public void setSize(int w, int h) {
+        if (started) {
+            return;
+        }
+
+        fixedWidth = w;
+        fixedHeight = h;
+        if (fixedWidth < 1) {
+            fixedWidth = 320;
+        }
+        if (fixedHeight < 1) {
+            fixedHeight = 240;
+        }
+
+        sizeSet = true;
+    }
+
+    /**
+     * Sets current GIF frame size.
+     *
+     * @param w int frame width.
+     * @param h int frame width.
+     */
+    private void setFrameSize(int w, int h) {
+        width = w;
+        height = h;
+    }
+
+    /**
+     * Initiates GIF file creation on the given stream. The stream is not closed
+     * automatically.
+     *
+     * @param os OutputStream on which GIF images are written.
+     * @return false if initial write failed.
+     */
+    public boolean start(@Nullable OutputStream os) {
+        if (os == null)
+            return false;
+        boolean ok = true;
+        closeStream = false;
+        out = os;
+        try {
+            writeString("GIF89a"); // header
+        } catch (IOException e) {
+            ok = false;
+        }
+        return started = ok;
+    }
+
+    /**
+     * Initiates writing of a GIF file with the specified name.
+     *
+     * @param file String containing output file name.
+     * @return false if open or initial write failed.
+     */
+    public boolean start(@NonNull String file) {
+        boolean ok;
+        try {
+            out = new BufferedOutputStream(new FileOutputStream(file));
+            ok = start(out);
+            closeStream = true;
+        } catch (IOException e) {
+            ok = false;
+        }
+        return started = ok;
+    }
+
+    /**
+     * Analyzes image colors and creates color map.
+     */
+    private void analyzePixels() {
+        int len = pixels.length;
+        int nPix = len / 3;
+        indexedPixels = new byte[nPix];
+        NeuQuant nq = new NeuQuant(pixels, len, sample);
+        // initialize quantizer
+        colorTab = nq.process(); // create reduced palette
+        // convert map from BGR to RGB
+        for (int i = 0; i < colorTab.length; i += 3) {
+            byte temp = colorTab[i];
+            colorTab[i] = colorTab[i + 2];
+            colorTab[i + 2] = temp;
+            usedEntry[i / 3] = false;
+        }
+        // map image pixels to new palette
+        int k = 0;
+        for (int i = 0; i < nPix; i++) {
+            int index = nq.map(pixels[k++] & 0xff, pixels[k++] & 0xff, pixels[k++] & 0xff);
+            usedEntry[index] = true;
+            indexedPixels[i] = (byte) index;
+        }
+        pixels = null;
+        colorDepth = 8;
+        palSize = 7;
+        // get closest match to transparent color if specified
+        if (transparent != null) {
+            transIndex = findClosest(transparent);
+        } else if (hasTransparentPixels) {
+            transIndex = findClosest(Color.TRANSPARENT);
+        }
+    }
+
+    /**
+     * Returns index of palette color closest to c
+     */
+    private int findClosest(int color) {
+        if (colorTab == null)
+            return -1;
+        int r = Color.red(color);
+        int g = Color.green(color);
+        int b = Color.blue(color);
+        int minpos = 0;
+        int dmin = 256 * 256 * 256;
+        int len = colorTab.length;
+        for (int i = 0; i < len; ) {
+            int dr = r - (colorTab[i++] & 0xff);
+            int dg = g - (colorTab[i++] & 0xff);
+            int db = b - (colorTab[i] & 0xff);
+            int d = dr * dr + dg * dg + db * db;
+            int index = i / 3;
+            if (usedEntry[index] && (d < dmin)) {
+                dmin = d;
+                minpos = index;
+            }
+            i++;
+        }
+        return minpos;
+    }
+
+    /**
+     * Extracts image pixels into byte array "pixels"
+     */
+    private void getImagePixels() {
+        int w = image.getWidth();
+        int h = image.getHeight();
+
+        if ((w != width) || (h != height)) {
+            // create new image with right size/format
+            Bitmap temp = Bitmap.createBitmap(width, height, Bitmap.Config.ARGB_8888);
+            Canvas canvas = new Canvas(temp);
+            canvas.drawBitmap(temp, 0, 0, null);
+            image = temp;
+        }
+        int[] pixelsInt = new int[w * h];
+        image.getPixels(pixelsInt, 0, w, 0, 0, w, h);
+
+        // The algorithm requires 3 bytes per pixel as RGB.
+        pixels = new byte[pixelsInt.length * 3];
+
+        int pixelsIndex = 0;
+        hasTransparentPixels = false;
+        int totalTransparentPixels = 0;
+        for (final int pixel : pixelsInt) {
+            if (pixel == Color.TRANSPARENT) {
+                totalTransparentPixels++;
+            }
+            pixels[pixelsIndex++] = (byte) (pixel & 0xFF);
+            pixels[pixelsIndex++] = (byte) ((pixel >> 8) & 0xFF);
+            pixels[pixelsIndex++] = (byte) ((pixel >> 16) & 0xFF);
+        }
+
+        double transparentPercentage = 100 * totalTransparentPixels / (double) pixelsInt.length;
+        // Assume images with greater where more than n% of the pixels are transparent actually have
+        // transparency. See issue #214.
+        hasTransparentPixels = transparentPercentage > MIN_TRANSPARENT_PERCENTAGE;
+        Timber.d("got pixels for frame with " + transparentPercentage + "% transparent pixels");
+    }
+
+    /**
+     * Writes Graphic Control Extension
+     */
+    private void writeGraphicCtrlExt() throws IOException {
+        out.write(0x21); // extension introducer
+        out.write(0xf9); // GCE label
+        out.write(4); // data block size
+        int transp, disp;
+        if (transparent == null && !hasTransparentPixels) {
+            transp = 0;
+            disp = 0; // dispose = no action
+        } else {
+            transp = 1;
+            disp = 2; // force clear if using transparent color
+        }
+        if (dispose >= 0) {
+            disp = dispose & 7; // user override
+        }
+        disp <<= 2;
+
+        // packed fields
+        out.write(0 | // 1:3 reserved
+                disp | // 4:6 disposal
+                0 | // 7 user input - 0 = none
+                transp); // 8 transparency flag
+
+        writeShort(delay); // delay x 1/100 sec
+        out.write(transIndex); // transparent color index
+        out.write(0); // block terminator
+    }
+
+    /**
+     * Writes Image Descriptor
+     */
+    private void writeImageDesc(int x, int y) throws IOException {
+        out.write(0x2c); // image separator
+        writeShort(x); // image position
+        writeShort(y);
+        writeShort(width); // image size
+        writeShort(height);
+        // packed fields
+        if (firstFrame) {
+            // no LCT - GCT is used for first (or only) frame
+            out.write(0);
+        } else {
+            // specify normal LCT
+            out.write(0x80 | // 1 local color table 1=yes
+                    0 | // 2 interlace - 0=no
+                    0 | // 3 sorted - 0=no
+                    0 | // 4-5 reserved
+                    palSize); // 6-8 size of color table
+        }
+    }
+
+    /**
+     * Writes Logical Screen Descriptor
+     */
+    private void writeLSD() throws IOException {
+        // logical screen size
+        writeShort(width);
+        writeShort(height);
+        // packed fields
+        out.write((0x80 | // 1 : global color table flag = 1 (gct used)
+                0x70 | // 2-4 : color resolution = 7
+                0x00 | // 5 : gct sort flag = 0
+                palSize)); // 6-8 : gct size
+
+        out.write(0); // background color index
+        out.write(0); // pixel aspect ratio - assume 1:1
+    }
+
+    /**
+     * Writes Netscape application extension to define repeat count.
+     */
+    private void writeNetscapeExt() throws IOException {
+        out.write(0x21); // extension introducer
+        out.write(0xff); // app extension label
+        out.write(11); // block size
+        writeString("NETSCAPE" + "2.0"); // app id + auth code
+        out.write(3); // sub-block size
+        out.write(1); // loop sub-block id
+        writeShort(repeat); // loop count (extra iterations, 0=repeat forever)
+        out.write(0); // block terminator
+    }
+
+    /**
+     * Writes color table
+     */
+    private void writePalette() throws IOException {
+        out.write(colorTab, 0, colorTab.length);
+        int n = (3 * 256) - colorTab.length;
+        for (int i = 0; i < n; i++) {
+            out.write(0);
+        }
+    }
+
+    /**
+     * Encodes and writes pixel data
+     */
+    private void writePixels() throws IOException {
+        LZWEncoder encoder = new LZWEncoder(width, height, indexedPixels, colorDepth);
+        encoder.encode(out);
+    }
+
+    /**
+     * Write 16-bit value to output stream, LSB first
+     */
+    private void writeShort(int value) throws IOException {
+        out.write(value & 0xff);
+        out.write((value >> 8) & 0xff);
+    }
+
+    /**
+     * Writes string to output stream
+     */
+    private void writeString(String s) throws IOException {
+        for (int i = 0; i < s.length(); i++) {
+            out.write((byte) s.charAt(i));
+        }
+    }
 }
\ No newline at end of file
diff --git a/common/src/main/java/com/bumptech/glide/gifencoder/LZWEncoder.java b/common/src/main/java/com/bumptech/glide/gifencoder/LZWEncoder.java
index addd103d9..52f3d8788 100644
--- a/common/src/main/java/com/bumptech/glide/gifencoder/LZWEncoder.java
+++ b/common/src/main/java/com/bumptech/glide/gifencoder/LZWEncoder.java
@@ -1,296 +1,296 @@
-package com.bumptech.glide.gifencoder;
-
-import java.io.IOException;
-import java.io.OutputStream;
-
-// ==============================================================================
-// Adapted from Jef Poskanzer's Java port by way of J. M. G. Elliott.
-// K Weiner 12/00
-class LZWEncoder {
-
-    private static final int EOF = -1;
-
-    private int imgW, imgH;
-
-    private byte[] pixAry;
-
-    private int initCodeSize;
-
-    private int remaining;
-
-    private int curPixel;
-
-    // GIFCOMPR.C - GIF Image compression routines
-    //
-    // Lempel-Ziv compression based on 'compress'. GIF modifications by
-    // David Rowley (mgardi@watdcsu.waterloo.edu)
-
-    // General DEFINEs
-
-    static final int BITS = 12;
-
-    static final int HSIZE = 5003; // 80% occupancy
-
-    // GIF Image compression - modified 'compress'
-    //
-    // Based on: compress.c - File compression ala IEEE Computer, June 1984.
-    //
-    // By Authors: Spencer W. Thomas (decvax!harpo!utah-cs!utah-gr!thomas)
-    // Jim McKie (decvax!mcvax!jim)
-    // Steve Davies (decvax!vax135!petsd!peora!srd)
-    // Ken Turkowski (decvax!decwrl!turtlevax!ken)
-    // James A. Woods (decvax!ihnp4!ames!jaw)
-    // Joe Orost (decvax!vax135!petsd!joe)
-
-    int n_bits; // number of bits/code
-
-    int maxbits = BITS; // user settable max # bits/code
-
-    int maxcode; // maximum code, given n_bits
-
-    int maxmaxcode = 1 << BITS; // should NEVER generate this code
-
-    int[] htab = new int[HSIZE];
-
-    int[] codetab = new int[HSIZE];
-
-    int hsize = HSIZE; // for dynamic table sizing
-
-    int free_ent = 0; // first unused entry
-
-    // block compression parameters -- after all codes are used up,
-    // and compression rate changes, start over.
-    boolean clear_flg = false;
-
-    // Algorithm: use open addressing double hashing (no chaining) on the
-    // prefix code / next character combination. We do a variant of Knuth's
-    // algorithm D (vol. 3, sec. 6.4) along with G. Knott's relatively-prime
-    // secondary probe. Here, the modular division first probe is gives way
-    // to a faster exclusive-or manipulation. Also do block compression with
-    // an adaptive reset, whereby the code table is cleared when the compression
-    // ratio decreases, but after the table fills. The variable-length output
-    // codes are re-sized at this point, and a special CLEAR code is generated
-    // for the decompressor. Late addition: construct the table according to
-    // file size for noticeable speed improvement on small files. Please direct
-    // questions about this implementation to ames!jaw.
-
-    int g_init_bits;
-
-    int ClearCode;
-
-    int EOFCode;
-
-    // output
-    //
-    // Output the given code.
-    // Inputs:
-    // code: A n_bits-bit integer. If == -1, then EOF. This assumes
-    // that n_bits =< wordsize - 1.
-    // Outputs:
-    // Outputs code to the file.
-    // Assumptions:
-    // Chars are 8 bits long.
-    // Algorithm:
-    // Maintain a BITS character long buffer (so that 8 codes will
-    // fit in it exactly). Use the VAX insv instruction to insert each
-    // code in turn. When the buffer fills up empty it and start over.
-
-    int cur_accum = 0;
-
-    int cur_bits = 0;
-
-    int masks[] = {0x0000, 0x0001, 0x0003, 0x0007, 0x000F, 0x001F, 0x003F, 0x007F, 0x00FF, 0x01FF,
-            0x03FF, 0x07FF, 0x0FFF, 0x1FFF, 0x3FFF, 0x7FFF, 0xFFFF};
-
-    // Number of characters so far in this 'packet'
-    int a_count;
-
-    // Define the storage for the packet accumulator
-    byte[] accum = new byte[256];
-
-    // ----------------------------------------------------------------------------
-    LZWEncoder(int width, int height, byte[] pixels, int color_depth) {
-        imgW = width;
-        imgH = height;
-        pixAry = pixels;
-        initCodeSize = Math.max(2, color_depth);
-    }
-
-    // Add a character to the end of the current packet, and if it is 254
-    // characters, flush the packet to disk.
-    void char_out(byte c, OutputStream outs) throws IOException {
-        accum[a_count++] = c;
-        if (a_count >= 254)
-            flush_char(outs);
-    }
-
-    // Clear out the hash table
-
-    // table clear for block compress
-    void cl_block(OutputStream outs) throws IOException {
-        cl_hash(hsize);
-        free_ent = ClearCode + 2;
-        clear_flg = true;
-
-        output(ClearCode, outs);
-    }
-
-    // reset code table
-    void cl_hash(int hsize) {
-        for (int i = 0; i < hsize; ++i)
-            htab[i] = -1;
-    }
-
-    void compress(int init_bits, OutputStream outs) throws IOException {
-        int fcode;
-        int i /* = 0 */;
-        int c;
-        int ent;
-        int disp;
-        int hsize_reg;
-        int hshift;
-
-        // Set up the globals: g_init_bits - initial number of bits
-        g_init_bits = init_bits;
-
-        // Set up the necessary values
-        clear_flg = false;
-        n_bits = g_init_bits;
-        maxcode = MAXCODE(n_bits);
-
-        ClearCode = 1 << (init_bits - 1);
-        EOFCode = ClearCode + 1;
-        free_ent = ClearCode + 2;
-
-        a_count = 0; // clear packet
-
-        ent = nextPixel();
-
-        hshift = 0;
-        for (fcode = hsize; fcode < 65536; fcode *= 2)
-            ++hshift;
-        hshift = 8 - hshift; // set hash code range bound
-
-        hsize_reg = hsize;
-        cl_hash(hsize_reg); // clear hash table
-
-        output(ClearCode, outs);
-
-        outer_loop:
-        while ((c = nextPixel()) != EOF) {
-            fcode = (c << maxbits) + ent;
-            i = (c << hshift) ^ ent; // xor hashing
-
-            if (htab[i] == fcode) {
-                ent = codetab[i];
-                continue;
-            } else if (htab[i] >= 0) // non-empty slot
-            {
-                disp = hsize_reg - i; // secondary hash (after G. Knott)
-                if (i == 0)
-                    disp = 1;
-                do {
-                    if ((i -= disp) < 0)
-                        i += hsize_reg;
-
-                    if (htab[i] == fcode) {
-                        ent = codetab[i];
-                        continue outer_loop;
-                    }
-                } while (htab[i] >= 0);
-            }
-            output(ent, outs);
-            ent = c;
-            if (free_ent < maxmaxcode) {
-                codetab[i] = free_ent++; // code -> hashtable
-                htab[i] = fcode;
-            } else
-                cl_block(outs);
-        }
-        // Put out the final code.
-        output(ent, outs);
-        output(EOFCode, outs);
-    }
-
-    // ----------------------------------------------------------------------------
-    void encode(OutputStream os) throws IOException {
-        os.write(initCodeSize); // write "initial code size" byte
-
-        remaining = imgW * imgH; // reset navigation variables
-        curPixel = 0;
-
-        compress(initCodeSize + 1, os); // compress and write the pixel data
-
-        os.write(0); // write block terminator
-    }
-
-    // Flush the packet to disk, and reset the accumulator
-    void flush_char(OutputStream outs) throws IOException {
-        if (a_count > 0) {
-            outs.write(a_count);
-            outs.write(accum, 0, a_count);
-            a_count = 0;
-        }
-    }
-
-    final int MAXCODE(int n_bits) {
-        return (1 << n_bits) - 1;
-    }
-
-    // ----------------------------------------------------------------------------
-    // Return the next pixel from the image
-    // ----------------------------------------------------------------------------
-    private int nextPixel() {
-        if (remaining == 0)
-            return EOF;
-
-        --remaining;
-
-        byte pix = pixAry[curPixel++];
-
-        return pix & 0xff;
-    }
-
-    void output(int code, OutputStream outs) throws IOException {
-        cur_accum &= masks[cur_bits];
-
-        if (cur_bits > 0)
-            cur_accum |= (code << cur_bits);
-        else
-            cur_accum = code;
-
-        cur_bits += n_bits;
-
-        while (cur_bits >= 8) {
-            char_out((byte) (cur_accum & 0xff), outs);
-            cur_accum >>= 8;
-            cur_bits -= 8;
-        }
-
-        // If the next entry is going to be too big for the code size,
-        // then increase it, if possible.
-        if (free_ent > maxcode || clear_flg) {
-            if (clear_flg) {
-                maxcode = MAXCODE(n_bits = g_init_bits);
-                clear_flg = false;
-            } else {
-                ++n_bits;
-                if (n_bits == maxbits)
-                    maxcode = maxmaxcode;
-                else
-                    maxcode = MAXCODE(n_bits);
-            }
-        }
-
-        if (code == EOFCode) {
-            // At EOF, write the rest of the buffer.
-            while (cur_bits > 0) {
-                char_out((byte) (cur_accum & 0xff), outs);
-                cur_accum >>= 8;
-                cur_bits -= 8;
-            }
-
-            flush_char(outs);
-        }
-    }
+package com.bumptech.glide.gifencoder;
+
+import java.io.IOException;
+import java.io.OutputStream;
+
+// ==============================================================================
+// Adapted from Jef Poskanzer's Java port by way of J. M. G. Elliott.
+// K Weiner 12/00
+class LZWEncoder {
+
+    private static final int EOF = -1;
+
+    private int imgW, imgH;
+
+    private byte[] pixAry;
+
+    private int initCodeSize;
+
+    private int remaining;
+
+    private int curPixel;
+
+    // GIFCOMPR.C - GIF Image compression routines
+    //
+    // Lempel-Ziv compression based on 'compress'. GIF modifications by
+    // David Rowley (mgardi@watdcsu.waterloo.edu)
+
+    // General DEFINEs
+
+    static final int BITS = 12;
+
+    static final int HSIZE = 5003; // 80% occupancy
+
+    // GIF Image compression - modified 'compress'
+    //
+    // Based on: compress.c - File compression ala IEEE Computer, June 1984.
+    //
+    // By Authors: Spencer W. Thomas (decvax!harpo!utah-cs!utah-gr!thomas)
+    // Jim McKie (decvax!mcvax!jim)
+    // Steve Davies (decvax!vax135!petsd!peora!srd)
+    // Ken Turkowski (decvax!decwrl!turtlevax!ken)
+    // James A. Woods (decvax!ihnp4!ames!jaw)
+    // Joe Orost (decvax!vax135!petsd!joe)
+
+    int n_bits; // number of bits/code
+
+    int maxbits = BITS; // user settable max # bits/code
+
+    int maxcode; // maximum code, given n_bits
+
+    int maxmaxcode = 1 << BITS; // should NEVER generate this code
+
+    int[] htab = new int[HSIZE];
+
+    int[] codetab = new int[HSIZE];
+
+    int hsize = HSIZE; // for dynamic table sizing
+
+    int free_ent = 0; // first unused entry
+
+    // block compression parameters -- after all codes are used up,
+    // and compression rate changes, start over.
+    boolean clear_flg = false;
+
+    // Algorithm: use open addressing double hashing (no chaining) on the
+    // prefix code / next character combination. We do a variant of Knuth's
+    // algorithm D (vol. 3, sec. 6.4) along with G. Knott's relatively-prime
+    // secondary probe. Here, the modular division first probe is gives way
+    // to a faster exclusive-or manipulation. Also do block compression with
+    // an adaptive reset, whereby the code table is cleared when the compression
+    // ratio decreases, but after the table fills. The variable-length output
+    // codes are re-sized at this point, and a special CLEAR code is generated
+    // for the decompressor. Late addition: construct the table according to
+    // file size for noticeable speed improvement on small files. Please direct
+    // questions about this implementation to ames!jaw.
+
+    int g_init_bits;
+
+    int ClearCode;
+
+    int EOFCode;
+
+    // output
+    //
+    // Output the given code.
+    // Inputs:
+    // code: A n_bits-bit integer. If == -1, then EOF. This assumes
+    // that n_bits =< wordsize - 1.
+    // Outputs:
+    // Outputs code to the file.
+    // Assumptions:
+    // Chars are 8 bits long.
+    // Algorithm:
+    // Maintain a BITS character long buffer (so that 8 codes will
+    // fit in it exactly). Use the VAX insv instruction to insert each
+    // code in turn. When the buffer fills up empty it and start over.
+
+    int cur_accum = 0;
+
+    int cur_bits = 0;
+
+    int masks[] = {0x0000, 0x0001, 0x0003, 0x0007, 0x000F, 0x001F, 0x003F, 0x007F, 0x00FF, 0x01FF,
+            0x03FF, 0x07FF, 0x0FFF, 0x1FFF, 0x3FFF, 0x7FFF, 0xFFFF};
+
+    // Number of characters so far in this 'packet'
+    int a_count;
+
+    // Define the storage for the packet accumulator
+    byte[] accum = new byte[256];
+
+    // ----------------------------------------------------------------------------
+    LZWEncoder(int width, int height, byte[] pixels, int color_depth) {
+        imgW = width;
+        imgH = height;
+        pixAry = pixels;
+        initCodeSize = Math.max(2, color_depth);
+    }
+
+    // Add a character to the end of the current packet, and if it is 254
+    // characters, flush the packet to disk.
+    void char_out(byte c, OutputStream outs) throws IOException {
+        accum[a_count++] = c;
+        if (a_count >= 254)
+            flush_char(outs);
+    }
+
+    // Clear out the hash table
+
+    // table clear for block compress
+    void cl_block(OutputStream outs) throws IOException {
+        cl_hash(hsize);
+        free_ent = ClearCode + 2;
+        clear_flg = true;
+
+        output(ClearCode, outs);
+    }
+
+    // reset code table
+    void cl_hash(int hsize) {
+        for (int i = 0; i < hsize; ++i)
+            htab[i] = -1;
+    }
+
+    void compress(int init_bits, OutputStream outs) throws IOException {
+        int fcode;
+        int i /* = 0 */;
+        int c;
+        int ent;
+        int disp;
+        int hsize_reg;
+        int hshift;
+
+        // Set up the globals: g_init_bits - initial number of bits
+        g_init_bits = init_bits;
+
+        // Set up the necessary values
+        clear_flg = false;
+        n_bits = g_init_bits;
+        maxcode = MAXCODE(n_bits);
+
+        ClearCode = 1 << (init_bits - 1);
+        EOFCode = ClearCode + 1;
+        free_ent = ClearCode + 2;
+
+        a_count = 0; // clear packet
+
+        ent = nextPixel();
+
+        hshift = 0;
+        for (fcode = hsize; fcode < 65536; fcode *= 2)
+            ++hshift;
+        hshift = 8 - hshift; // set hash code range bound
+
+        hsize_reg = hsize;
+        cl_hash(hsize_reg); // clear hash table
+
+        output(ClearCode, outs);
+
+        outer_loop:
+        while ((c = nextPixel()) != EOF) {
+            fcode = (c << maxbits) + ent;
+            i = (c << hshift) ^ ent; // xor hashing
+
+            if (htab[i] == fcode) {
+                ent = codetab[i];
+                continue;
+            } else if (htab[i] >= 0) // non-empty slot
+            {
+                disp = hsize_reg - i; // secondary hash (after G. Knott)
+                if (i == 0)
+                    disp = 1;
+                do {
+                    if ((i -= disp) < 0)
+                        i += hsize_reg;
+
+                    if (htab[i] == fcode) {
+                        ent = codetab[i];
+                        continue outer_loop;
+                    }
+                } while (htab[i] >= 0);
+            }
+            output(ent, outs);
+            ent = c;
+            if (free_ent < maxmaxcode) {
+                codetab[i] = free_ent++; // code -> hashtable
+                htab[i] = fcode;
+            } else
+                cl_block(outs);
+        }
+        // Put out the final code.
+        output(ent, outs);
+        output(EOFCode, outs);
+    }
+
+    // ----------------------------------------------------------------------------
+    void encode(OutputStream os) throws IOException {
+        os.write(initCodeSize); // write "initial code size" byte
+
+        remaining = imgW * imgH; // reset navigation variables
+        curPixel = 0;
+
+        compress(initCodeSize + 1, os); // compress and write the pixel data
+
+        os.write(0); // write block terminator
+    }
+
+    // Flush the packet to disk, and reset the accumulator
+    void flush_char(OutputStream outs) throws IOException {
+        if (a_count > 0) {
+            outs.write(a_count);
+            outs.write(accum, 0, a_count);
+            a_count = 0;
+        }
+    }
+
+    final int MAXCODE(int n_bits) {
+        return (1 << n_bits) - 1;
+    }
+
+    // ----------------------------------------------------------------------------
+    // Return the next pixel from the image
+    // ----------------------------------------------------------------------------
+    private int nextPixel() {
+        if (remaining == 0)
+            return EOF;
+
+        --remaining;
+
+        byte pix = pixAry[curPixel++];
+
+        return pix & 0xff;
+    }
+
+    void output(int code, OutputStream outs) throws IOException {
+        cur_accum &= masks[cur_bits];
+
+        if (cur_bits > 0)
+            cur_accum |= (code << cur_bits);
+        else
+            cur_accum = code;
+
+        cur_bits += n_bits;
+
+        while (cur_bits >= 8) {
+            char_out((byte) (cur_accum & 0xff), outs);
+            cur_accum >>= 8;
+            cur_bits -= 8;
+        }
+
+        // If the next entry is going to be too big for the code size,
+        // then increase it, if possible.
+        if (free_ent > maxcode || clear_flg) {
+            if (clear_flg) {
+                maxcode = MAXCODE(n_bits = g_init_bits);
+                clear_flg = false;
+            } else {
+                ++n_bits;
+                if (n_bits == maxbits)
+                    maxcode = maxmaxcode;
+                else
+                    maxcode = MAXCODE(n_bits);
+            }
+        }
+
+        if (code == EOFCode) {
+            // At EOF, write the rest of the buffer.
+            while (cur_bits > 0) {
+                char_out((byte) (cur_accum & 0xff), outs);
+                cur_accum >>= 8;
+                cur_bits -= 8;
+            }
+
+            flush_char(outs);
+        }
+    }
 }
\ No newline at end of file
diff --git a/common/src/main/java/com/bumptech/glide/gifencoder/NeuQuant.java b/common/src/main/java/com/bumptech/glide/gifencoder/NeuQuant.java
index 48412a917..a6f61195f 100644
--- a/common/src/main/java/com/bumptech/glide/gifencoder/NeuQuant.java
+++ b/common/src/main/java/com/bumptech/glide/gifencoder/NeuQuant.java
@@ -1,485 +1,485 @@
-package com.bumptech.glide.gifencoder;
-
-// Ported to Java 12/00 K Weiner
-class NeuQuant {
-
-    protected static final int netsize = 256; /* number of colours used */
-
-    /* four primes near 500 - assume no image has a length so large */
-    /* that it is divisible by all four primes */
-    protected static final int prime1 = 499;
-
-    protected static final int prime2 = 491;
-
-    protected static final int prime3 = 487;
-
-    protected static final int prime4 = 503;
-
-    protected static final int minpicturebytes = (3 * prime4);
-
-    /* minimum size for input image */
-
-    /*
-     * Program Skeleton ---------------- [select samplefac in range 1..30] [read
-     * image from input file] pic = (unsigned char*) malloc(3*width*height);
-     * initnet(pic,3*width*height,samplefac); learn(); unbiasnet(); [write output
-     * image header, using writecolourmap(f)] inxbuild(); write output image using
-     * inxsearch(b,g,r)
-     */
-
-    /*
-     * Network Definitions -------------------
-     */
-
-    protected static final int maxnetpos = (netsize - 1);
-
-    protected static final int netbiasshift = 4; /* bias for colour values */
-
-    protected static final int ncycles = 100; /* no. of learning cycles */
-
-    /* defs for freq and bias */
-    protected static final int intbiasshift = 16; /* bias for fractions */
-
-    protected static final int intbias = (((int) 1) << intbiasshift);
-
-    protected static final int gammashift = 10; /* gamma = 1024 */
-
-    protected static final int gamma = (((int) 1) << gammashift);
-
-    protected static final int betashift = 10;
-
-    protected static final int beta = (intbias >> betashift); /* beta = 1/1024 */
-
-    protected static final int betagamma = (intbias << (gammashift - betashift));
-
-    /* defs for decreasing radius factor */
-    protected static final int initrad = (netsize >> 3); /*
-     * for 256 cols, radius
-     * starts
-     */
-
-    protected static final int radiusbiasshift = 6; /* at 32.0 biased by 6 bits */
-
-    protected static final int radiusbias = (((int) 1) << radiusbiasshift);
-
-    protected static final int initradius = (initrad * radiusbias); /*
-     * and
-     * decreases
-     * by a
-     */
-
-    protected static final int radiusdec = 30; /* factor of 1/30 each cycle */
-
-    /* defs for decreasing alpha factor */
-    protected static final int alphabiasshift = 10; /* alpha starts at 1.0 */
-
-    protected static final int initalpha = (((int) 1) << alphabiasshift);
-
-    protected int alphadec; /* biased by 10 bits */
-
-    /* radbias and alpharadbias used for radpower calculation */
-    protected static final int radbiasshift = 8;
-
-    protected static final int radbias = (((int) 1) << radbiasshift);
-
-    protected static final int alpharadbshift = (alphabiasshift + radbiasshift);
-
-    protected static final int alpharadbias = (((int) 1) << alpharadbshift);
-
-    /*
-     * Types and Global Variables --------------------------
-     */
-
-    protected byte[] thepicture; /* the input image itself */
-
-    protected int lengthcount; /* lengthcount = H*W*3 */
-
-    protected int samplefac; /* sampling factor 1..30 */
-
-    // typedef int pixel[4]; /* BGRc */
-    protected int[][] network; /* the network itself - [netsize][4] */
-
-    protected int[] netindex = new int[256];
-
-    /* for network lookup - really 256 */
-
-    protected int[] bias = new int[netsize];
-
-    /* bias and freq arrays for learning */
-    protected int[] freq = new int[netsize];
-
-    protected int[] radpower = new int[initrad];
-
-    /* radpower for precomputation */
-
-    /*
-     * Initialise network in range (0,0,0) to (255,255,255) and set parameters
-     * -----------------------------------------------------------------------
-     */
-    public NeuQuant(byte[] thepic, int len, int sample) {
-
-        int i;
-        int[] p;
-
-        thepicture = thepic;
-        lengthcount = len;
-        samplefac = sample;
-
-        network = new int[netsize][];
-        for (i = 0; i < netsize; i++) {
-            network[i] = new int[4];
-            p = network[i];
-            p[0] = p[1] = p[2] = (i << (netbiasshift + 8)) / netsize;
-            freq[i] = intbias / netsize; /* 1/netsize */
-            bias[i] = 0;
-        }
-    }
-
-    public byte[] colorMap() {
-        byte[] map = new byte[3 * netsize];
-        int[] index = new int[netsize];
-        for (int i = 0; i < netsize; i++)
-            index[network[i][3]] = i;
-        int k = 0;
-        for (int i = 0; i < netsize; i++) {
-            int j = index[i];
-            map[k++] = (byte) (network[j][0]);
-            map[k++] = (byte) (network[j][1]);
-            map[k++] = (byte) (network[j][2]);
-        }
-        return map;
-    }
-
-    /*
-     * Insertion sort of network and building of netindex[0..255] (to do after
-     * unbias)
-     * -------------------------------------------------------------------------------
-     */
-    public void inxbuild() {
-
-        int i, j, smallpos, smallval;
-        int[] p;
-        int[] q;
-        int previouscol, startpos;
-
-        previouscol = 0;
-        startpos = 0;
-        for (i = 0; i < netsize; i++) {
-            p = network[i];
-            smallpos = i;
-            smallval = p[1]; /* index on g */
-            /* find smallest in i..netsize-1 */
-            for (j = i + 1; j < netsize; j++) {
-                q = network[j];
-                if (q[1] < smallval) { /* index on g */
-                    smallpos = j;
-                    smallval = q[1]; /* index on g */
-                }
-            }
-            q = network[smallpos];
-            /* swap p (i) and q (smallpos) entries */
-            if (i != smallpos) {
-                j = q[0];
-                q[0] = p[0];
-                p[0] = j;
-                j = q[1];
-                q[1] = p[1];
-                p[1] = j;
-                j = q[2];
-                q[2] = p[2];
-                p[2] = j;
-                j = q[3];
-                q[3] = p[3];
-                p[3] = j;
-            }
-            /* smallval entry is now in position i */
-            if (smallval != previouscol) {
-                netindex[previouscol] = (startpos + i) >> 1;
-                for (j = previouscol + 1; j < smallval; j++)
-                    netindex[j] = i;
-                previouscol = smallval;
-                startpos = i;
-            }
-        }
-        netindex[previouscol] = (startpos + maxnetpos) >> 1;
-        for (j = previouscol + 1; j < 256; j++)
-            netindex[j] = maxnetpos; /* really 256 */
-    }
-
-    /*
-     * Main Learning Loop ------------------
-     */
-    public void learn() {
-
-        int i, j, b, g, r;
-        int radius, rad, alpha, step, delta, samplepixels;
-        byte[] p;
-        int pix, lim;
-
-        if (lengthcount < minpicturebytes)
-            samplefac = 1;
-        alphadec = 30 + ((samplefac - 1) / 3);
-        p = thepicture;
-        pix = 0;
-        lim = lengthcount;
-        samplepixels = lengthcount / (3 * samplefac);
-        delta = samplepixels / ncycles;
-        alpha = initalpha;
-        radius = initradius;
-
-        rad = radius >> radiusbiasshift;
-        if (rad <= 1)
-            rad = 0;
-        for (i = 0; i < rad; i++)
-            radpower[i] = alpha * (((rad * rad - i * i) * radbias) / (rad * rad));
-
-        // fprintf(stderr,"beginning 1D learning: initial radius=%d\n", rad);
-
-        if (lengthcount < minpicturebytes)
-            step = 3;
-        else if ((lengthcount % prime1) != 0)
-            step = 3 * prime1;
-        else {
-            if ((lengthcount % prime2) != 0)
-                step = 3 * prime2;
-            else {
-                if ((lengthcount % prime3) != 0)
-                    step = 3 * prime3;
-                else
-                    step = 3 * prime4;
-            }
-        }
-
-        i = 0;
-        while (i < samplepixels) {
-            b = (p[pix + 0] & 0xff) << netbiasshift;
-            g = (p[pix + 1] & 0xff) << netbiasshift;
-            r = (p[pix + 2] & 0xff) << netbiasshift;
-            j = contest(b, g, r);
-
-            altersingle(alpha, j, b, g, r);
-            if (rad != 0)
-                alterneigh(rad, j, b, g, r); /* alter neighbours */
-
-            pix += step;
-            if (pix >= lim)
-                pix -= lengthcount;
-
-            i++;
-            if (delta == 0)
-                delta = 1;
-            if (i % delta == 0) {
-                alpha -= alpha / alphadec;
-                radius -= radius / radiusdec;
-                rad = radius >> radiusbiasshift;
-                if (rad <= 1)
-                    rad = 0;
-                for (j = 0; j < rad; j++)
-                    radpower[j] = alpha * (((rad * rad - j * j) * radbias) / (rad * rad));
-            }
-        }
-        // fprintf(stderr,"finished 1D learning: final alpha=%f
-        // !\n",((float)alpha)/initalpha);
-    }
-
-    /*
-     * Search for BGR values 0..255 (after net is unbiased) and return colour
-     * index
-     * ----------------------------------------------------------------------------
-     */
-    public int map(int b, int g, int r) {
-
-        int i, j, dist, a, bestd;
-        int[] p;
-        int best;
-
-        bestd = 1000; /* biggest possible dist is 256*3 */
-        best = -1;
-        i = netindex[g]; /* index on g */
-        j = i - 1; /* start at netindex[g] and work outwards */
-
-        while ((i < netsize) || (j >= 0)) {
-            if (i < netsize) {
-                p = network[i];
-                dist = p[1] - g; /* inx key */
-                if (dist >= bestd)
-                    i = netsize; /* stop iter */
-                else {
-                    i++;
-                    if (dist < 0)
-                        dist = -dist;
-                    a = p[0] - b;
-                    if (a < 0)
-                        a = -a;
-                    dist += a;
-                    if (dist < bestd) {
-                        a = p[2] - r;
-                        if (a < 0)
-                            a = -a;
-                        dist += a;
-                        if (dist < bestd) {
-                            bestd = dist;
-                            best = p[3];
-                        }
-                    }
-                }
-            }
-            if (j >= 0) {
-                p = network[j];
-                dist = g - p[1]; /* inx key - reverse dif */
-                if (dist >= bestd)
-                    j = -1; /* stop iter */
-                else {
-                    j--;
-                    if (dist < 0)
-                        dist = -dist;
-                    a = p[0] - b;
-                    if (a < 0)
-                        a = -a;
-                    dist += a;
-                    if (dist < bestd) {
-                        a = p[2] - r;
-                        if (a < 0)
-                            a = -a;
-                        dist += a;
-                        if (dist < bestd) {
-                            bestd = dist;
-                            best = p[3];
-                        }
-                    }
-                }
-            }
-        }
-        return (best);
-    }
-
-    public byte[] process() {
-        learn();
-        unbiasnet();
-        inxbuild();
-        return colorMap();
-    }
-
-    /*
-     * Unbias network to give byte values 0..255 and record position i to prepare
-     * for sort
-     * -----------------------------------------------------------------------------------
-     */
-    public void unbiasnet() {
-
-        int i, j;
-
-        for (i = 0; i < netsize; i++) {
-            network[i][0] >>= netbiasshift;
-            network[i][1] >>= netbiasshift;
-            network[i][2] >>= netbiasshift;
-            network[i][3] = i; /* record colour no */
-        }
-    }
-
-    /*
-     * Move adjacent neurons by precomputed alpha*(1-((i-j)^2/[r]^2)) in
-     * radpower[|i-j|]
-     * ---------------------------------------------------------------------------------
-     */
-    protected void alterneigh(int rad, int i, int b, int g, int r) {
-
-        int j, k, lo, hi, a, m;
-        int[] p;
-
-        lo = i - rad;
-        if (lo < -1)
-            lo = -1;
-        hi = i + rad;
-        if (hi > netsize)
-            hi = netsize;
-
-        j = i + 1;
-        k = i - 1;
-        m = 1;
-        while ((j < hi) || (k > lo)) {
-            a = radpower[m++];
-            if (j < hi) {
-                p = network[j++];
-                try {
-                    p[0] -= (a * (p[0] - b)) / alpharadbias;
-                    p[1] -= (a * (p[1] - g)) / alpharadbias;
-                    p[2] -= (a * (p[2] - r)) / alpharadbias;
-                } catch (Exception e) {
-                } // prevents 1.3 miscompilation
-            }
-            if (k > lo) {
-                p = network[k--];
-                try {
-                    p[0] -= (a * (p[0] - b)) / alpharadbias;
-                    p[1] -= (a * (p[1] - g)) / alpharadbias;
-                    p[2] -= (a * (p[2] - r)) / alpharadbias;
-                } catch (Exception e) {
-                }
-            }
-        }
-    }
-
-    /*
-     * Move neuron i towards biased (b,g,r) by factor alpha
-     * ----------------------------------------------------
-     */
-    protected void altersingle(int alpha, int i, int b, int g, int r) {
-
-        /* alter hit neuron */
-        int[] n = network[i];
-        n[0] -= (alpha * (n[0] - b)) / initalpha;
-        n[1] -= (alpha * (n[1] - g)) / initalpha;
-        n[2] -= (alpha * (n[2] - r)) / initalpha;
-    }
-
-    /*
-     * Search for biased BGR values ----------------------------
-     */
-    protected int contest(int b, int g, int r) {
-
-        /* finds closest neuron (min dist) and updates freq */
-        /* finds best neuron (min dist-bias) and returns position */
-        /* for frequently chosen neurons, freq[i] is high and bias[i] is negative */
-        /* bias[i] = gamma*((1/netsize)-freq[i]) */
-
-        int i, dist, a, biasdist, betafreq;
-        int bestpos, bestbiaspos, bestd, bestbiasd;
-        int[] n;
-
-        bestd = ~(((int) 1) << 31);
-        bestbiasd = bestd;
-        bestpos = -1;
-        bestbiaspos = bestpos;
-
-        for (i = 0; i < netsize; i++) {
-            n = network[i];
-            dist = n[0] - b;
-            if (dist < 0)
-                dist = -dist;
-            a = n[1] - g;
-            if (a < 0)
-                a = -a;
-            dist += a;
-            a = n[2] - r;
-            if (a < 0)
-                a = -a;
-            dist += a;
-            if (dist < bestd) {
-                bestd = dist;
-                bestpos = i;
-            }
-            biasdist = dist - ((bias[i]) >> (intbiasshift - netbiasshift));
-            if (biasdist < bestbiasd) {
-                bestbiasd = biasdist;
-                bestbiaspos = i;
-            }
-            betafreq = (freq[i] >> betashift);
-            freq[i] -= betafreq;
-            bias[i] += (betafreq << gammashift);
-        }
-        freq[bestpos] += beta;
-        bias[bestpos] -= betagamma;
-        return (bestbiaspos);
-    }
+package com.bumptech.glide.gifencoder;
+
+// Ported to Java 12/00 K Weiner
+class NeuQuant {
+
+    protected static final int netsize = 256; /* number of colours used */
+
+    /* four primes near 500 - assume no image has a length so large */
+    /* that it is divisible by all four primes */
+    protected static final int prime1 = 499;
+
+    protected static final int prime2 = 491;
+
+    protected static final int prime3 = 487;
+
+    protected static final int prime4 = 503;
+
+    protected static final int minpicturebytes = (3 * prime4);
+
+    /* minimum size for input image */
+
+    /*
+     * Program Skeleton ---------------- [select samplefac in range 1..30] [read
+     * image from input file] pic = (unsigned char*) malloc(3*width*height);
+     * initnet(pic,3*width*height,samplefac); learn(); unbiasnet(); [write output
+     * image header, using writecolourmap(f)] inxbuild(); write output image using
+     * inxsearch(b,g,r)
+     */
+
+    /*
+     * Network Definitions -------------------
+     */
+
+    protected static final int maxnetpos = (netsize - 1);
+
+    protected static final int netbiasshift = 4; /* bias for colour values */
+
+    protected static final int ncycles = 100; /* no. of learning cycles */
+
+    /* defs for freq and bias */
+    protected static final int intbiasshift = 16; /* bias for fractions */
+
+    protected static final int intbias = (((int) 1) << intbiasshift);
+
+    protected static final int gammashift = 10; /* gamma = 1024 */
+
+    protected static final int gamma = (((int) 1) << gammashift);
+
+    protected static final int betashift = 10;
+
+    protected static final int beta = (intbias >> betashift); /* beta = 1/1024 */
+
+    protected static final int betagamma = (intbias << (gammashift - betashift));
+
+    /* defs for decreasing radius factor */
+    protected static final int initrad = (netsize >> 3); /*
+     * for 256 cols, radius
+     * starts
+     */
+
+    protected static final int radiusbiasshift = 6; /* at 32.0 biased by 6 bits */
+
+    protected static final int radiusbias = (((int) 1) << radiusbiasshift);
+
+    protected static final int initradius = (initrad * radiusbias); /*
+     * and
+     * decreases
+     * by a
+     */
+
+    protected static final int radiusdec = 30; /* factor of 1/30 each cycle */
+
+    /* defs for decreasing alpha factor */
+    protected static final int alphabiasshift = 10; /* alpha starts at 1.0 */
+
+    protected static final int initalpha = (((int) 1) << alphabiasshift);
+
+    protected int alphadec; /* biased by 10 bits */
+
+    /* radbias and alpharadbias used for radpower calculation */
+    protected static final int radbiasshift = 8;
+
+    protected static final int radbias = (((int) 1) << radbiasshift);
+
+    protected static final int alpharadbshift = (alphabiasshift + radbiasshift);
+
+    protected static final int alpharadbias = (((int) 1) << alpharadbshift);
+
+    /*
+     * Types and Global Variables --------------------------
+     */
+
+    protected byte[] thepicture; /* the input image itself */
+
+    protected int lengthcount; /* lengthcount = H*W*3 */
+
+    protected int samplefac; /* sampling factor 1..30 */
+
+    // typedef int pixel[4]; /* BGRc */
+    protected int[][] network; /* the network itself - [netsize][4] */
+
+    protected int[] netindex = new int[256];
+
+    /* for network lookup - really 256 */
+
+    protected int[] bias = new int[netsize];
+
+    /* bias and freq arrays for learning */
+    protected int[] freq = new int[netsize];
+
+    protected int[] radpower = new int[initrad];
+
+    /* radpower for precomputation */
+
+    /*
+     * Initialise network in range (0,0,0) to (255,255,255) and set parameters
+     * -----------------------------------------------------------------------
+     */
+    public NeuQuant(byte[] thepic, int len, int sample) {
+
+        int i;
+        int[] p;
+
+        thepicture = thepic;
+        lengthcount = len;
+        samplefac = sample;
+
+        network = new int[netsize][];
+        for (i = 0; i < netsize; i++) {
+            network[i] = new int[4];
+            p = network[i];
+            p[0] = p[1] = p[2] = (i << (netbiasshift + 8)) / netsize;
+            freq[i] = intbias / netsize; /* 1/netsize */
+            bias[i] = 0;
+        }
+    }
+
+    public byte[] colorMap() {
+        byte[] map = new byte[3 * netsize];
+        int[] index = new int[netsize];
+        for (int i = 0; i < netsize; i++)
+            index[network[i][3]] = i;
+        int k = 0;
+        for (int i = 0; i < netsize; i++) {
+            int j = index[i];
+            map[k++] = (byte) (network[j][0]);
+            map[k++] = (byte) (network[j][1]);
+            map[k++] = (byte) (network[j][2]);
+        }
+        return map;
+    }
+
+    /*
+     * Insertion sort of network and building of netindex[0..255] (to do after
+     * unbias)
+     * -------------------------------------------------------------------------------
+     */
+    public void inxbuild() {
+
+        int i, j, smallpos, smallval;
+        int[] p;
+        int[] q;
+        int previouscol, startpos;
+
+        previouscol = 0;
+        startpos = 0;
+        for (i = 0; i < netsize; i++) {
+            p = network[i];
+            smallpos = i;
+            smallval = p[1]; /* index on g */
+            /* find smallest in i..netsize-1 */
+            for (j = i + 1; j < netsize; j++) {
+                q = network[j];
+                if (q[1] < smallval) { /* index on g */
+                    smallpos = j;
+                    smallval = q[1]; /* index on g */
+                }
+            }
+            q = network[smallpos];
+            /* swap p (i) and q (smallpos) entries */
+            if (i != smallpos) {
+                j = q[0];
+                q[0] = p[0];
+                p[0] = j;
+                j = q[1];
+                q[1] = p[1];
+                p[1] = j;
+                j = q[2];
+                q[2] = p[2];
+                p[2] = j;
+                j = q[3];
+                q[3] = p[3];
+                p[3] = j;
+            }
+            /* smallval entry is now in position i */
+            if (smallval != previouscol) {
+                netindex[previouscol] = (startpos + i) >> 1;
+                for (j = previouscol + 1; j < smallval; j++)
+                    netindex[j] = i;
+                previouscol = smallval;
+                startpos = i;
+            }
+        }
+        netindex[previouscol] = (startpos + maxnetpos) >> 1;
+        for (j = previouscol + 1; j < 256; j++)
+            netindex[j] = maxnetpos; /* really 256 */
+    }
+
+    /*
+     * Main Learning Loop ------------------
+     */
+    public void learn() {
+
+        int i, j, b, g, r;
+        int radius, rad, alpha, step, delta, samplepixels;
+        byte[] p;
+        int pix, lim;
+
+        if (lengthcount < minpicturebytes)
+            samplefac = 1;
+        alphadec = 30 + ((samplefac - 1) / 3);
+        p = thepicture;
+        pix = 0;
+        lim = lengthcount;
+        samplepixels = lengthcount / (3 * samplefac);
+        delta = samplepixels / ncycles;
+        alpha = initalpha;
+        radius = initradius;
+
+        rad = radius >> radiusbiasshift;
+        if (rad <= 1)
+            rad = 0;
+        for (i = 0; i < rad; i++)
+            radpower[i] = alpha * (((rad * rad - i * i) * radbias) / (rad * rad));
+
+        // fprintf(stderr,"beginning 1D learning: initial radius=%d\n", rad);
+
+        if (lengthcount < minpicturebytes)
+            step = 3;
+        else if ((lengthcount % prime1) != 0)
+            step = 3 * prime1;
+        else {
+            if ((lengthcount % prime2) != 0)
+                step = 3 * prime2;
+            else {
+                if ((lengthcount % prime3) != 0)
+                    step = 3 * prime3;
+                else
+                    step = 3 * prime4;
+            }
+        }
+
+        i = 0;
+        while (i < samplepixels) {
+            b = (p[pix + 0] & 0xff) << netbiasshift;
+            g = (p[pix + 1] & 0xff) << netbiasshift;
+            r = (p[pix + 2] & 0xff) << netbiasshift;
+            j = contest(b, g, r);
+
+            altersingle(alpha, j, b, g, r);
+            if (rad != 0)
+                alterneigh(rad, j, b, g, r); /* alter neighbours */
+
+            pix += step;
+            if (pix >= lim)
+                pix -= lengthcount;
+
+            i++;
+            if (delta == 0)
+                delta = 1;
+            if (i % delta == 0) {
+                alpha -= alpha / alphadec;
+                radius -= radius / radiusdec;
+                rad = radius >> radiusbiasshift;
+                if (rad <= 1)
+                    rad = 0;
+                for (j = 0; j < rad; j++)
+                    radpower[j] = alpha * (((rad * rad - j * j) * radbias) / (rad * rad));
+            }
+        }
+        // fprintf(stderr,"finished 1D learning: final alpha=%f
+        // !\n",((float)alpha)/initalpha);
+    }
+
+    /*
+     * Search for BGR values 0..255 (after net is unbiased) and return colour
+     * index
+     * ----------------------------------------------------------------------------
+     */
+    public int map(int b, int g, int r) {
+
+        int i, j, dist, a, bestd;
+        int[] p;
+        int best;
+
+        bestd = 1000; /* biggest possible dist is 256*3 */
+        best = -1;
+        i = netindex[g]; /* index on g */
+        j = i - 1; /* start at netindex[g] and work outwards */
+
+        while ((i < netsize) || (j >= 0)) {
+            if (i < netsize) {
+                p = network[i];
+                dist = p[1] - g; /* inx key */
+                if (dist >= bestd)
+                    i = netsize; /* stop iter */
+                else {
+                    i++;
+                    if (dist < 0)
+                        dist = -dist;
+                    a = p[0] - b;
+                    if (a < 0)
+                        a = -a;
+                    dist += a;
+                    if (dist < bestd) {
+                        a = p[2] - r;
+                        if (a < 0)
+                            a = -a;
+                        dist += a;
+                        if (dist < bestd) {
+                            bestd = dist;
+                            best = p[3];
+                        }
+                    }
+                }
+            }
+            if (j >= 0) {
+                p = network[j];
+                dist = g - p[1]; /* inx key - reverse dif */
+                if (dist >= bestd)
+                    j = -1; /* stop iter */
+                else {
+                    j--;
+                    if (dist < 0)
+                        dist = -dist;
+                    a = p[0] - b;
+                    if (a < 0)
+                        a = -a;
+                    dist += a;
+                    if (dist < bestd) {
+                        a = p[2] - r;
+                        if (a < 0)
+                            a = -a;
+                        dist += a;
+                        if (dist < bestd) {
+                            bestd = dist;
+                            best = p[3];
+                        }
+                    }
+                }
+            }
+        }
+        return (best);
+    }
+
+    public byte[] process() {
+        learn();
+        unbiasnet();
+        inxbuild();
+        return colorMap();
+    }
+
+    /*
+     * Unbias network to give byte values 0..255 and record position i to prepare
+     * for sort
+     * -----------------------------------------------------------------------------------
+     */
+    public void unbiasnet() {
+
+        int i, j;
+
+        for (i = 0; i < netsize; i++) {
+            network[i][0] >>= netbiasshift;
+            network[i][1] >>= netbiasshift;
+            network[i][2] >>= netbiasshift;
+            network[i][3] = i; /* record colour no */
+        }
+    }
+
+    /*
+     * Move adjacent neurons by precomputed alpha*(1-((i-j)^2/[r]^2)) in
+     * radpower[|i-j|]
+     * ---------------------------------------------------------------------------------
+     */
+    protected void alterneigh(int rad, int i, int b, int g, int r) {
+
+        int j, k, lo, hi, a, m;
+        int[] p;
+
+        lo = i - rad;
+        if (lo < -1)
+            lo = -1;
+        hi = i + rad;
+        if (hi > netsize)
+            hi = netsize;
+
+        j = i + 1;
+        k = i - 1;
+        m = 1;
+        while ((j < hi) || (k > lo)) {
+            a = radpower[m++];
+            if (j < hi) {
+                p = network[j++];
+                try {
+                    p[0] -= (a * (p[0] - b)) / alpharadbias;
+                    p[1] -= (a * (p[1] - g)) / alpharadbias;
+                    p[2] -= (a * (p[2] - r)) / alpharadbias;
+                } catch (Exception e) {
+                } // prevents 1.3 miscompilation
+            }
+            if (k > lo) {
+                p = network[k--];
+                try {
+                    p[0] -= (a * (p[0] - b)) / alpharadbias;
+                    p[1] -= (a * (p[1] - g)) / alpharadbias;
+                    p[2] -= (a * (p[2] - r)) / alpharadbias;
+                } catch (Exception e) {
+                }
+            }
+        }
+    }
+
+    /*
+     * Move neuron i towards biased (b,g,r) by factor alpha
+     * ----------------------------------------------------
+     */
+    protected void altersingle(int alpha, int i, int b, int g, int r) {
+
+        /* alter hit neuron */
+        int[] n = network[i];
+        n[0] -= (alpha * (n[0] - b)) / initalpha;
+        n[1] -= (alpha * (n[1] - g)) / initalpha;
+        n[2] -= (alpha * (n[2] - r)) / initalpha;
+    }
+
+    /*
+     * Search for biased BGR values ----------------------------
+     */
+    protected int contest(int b, int g, int r) {
+
+        /* finds closest neuron (min dist) and updates freq */
+        /* finds best neuron (min dist-bias) and returns position */
+        /* for frequently chosen neurons, freq[i] is high and bias[i] is negative */
+        /* bias[i] = gamma*((1/netsize)-freq[i]) */
+
+        int i, dist, a, biasdist, betafreq;
+        int bestpos, bestbiaspos, bestd, bestbiasd;
+        int[] n;
+
+        bestd = ~(((int) 1) << 31);
+        bestbiasd = bestd;
+        bestpos = -1;
+        bestbiaspos = bestpos;
+
+        for (i = 0; i < netsize; i++) {
+            n = network[i];
+            dist = n[0] - b;
+            if (dist < 0)
+                dist = -dist;
+            a = n[1] - g;
+            if (a < 0)
+                a = -a;
+            dist += a;
+            a = n[2] - r;
+            if (a < 0)
+                a = -a;
+            dist += a;
+            if (dist < bestd) {
+                bestd = dist;
+                bestpos = i;
+            }
+            biasdist = dist - ((bias[i]) >> (intbiasshift - netbiasshift));
+            if (biasdist < bestbiasd) {
+                bestbiasd = biasdist;
+                bestbiaspos = i;
+            }
+            betafreq = (freq[i] >> betashift);
+            freq[i] -= betafreq;
+            bias[i] += (betafreq << gammashift);
+        }
+        freq[bestpos] += beta;
+        bias[bestpos] -= betagamma;
+        return (bestbiaspos);
+    }
 }
\ No newline at end of file
diff --git a/common/src/main/java/com/moez/QKSMS/common/util/extensions/ContextExtensions.kt b/common/src/main/java/com/moez/QKSMS/common/util/extensions/ContextExtensions.kt
index f5534a9fc..83f643eb5 100644
--- a/common/src/main/java/com/moez/QKSMS/common/util/extensions/ContextExtensions.kt
+++ b/common/src/main/java/com/moez/QKSMS/common/util/extensions/ContextExtensions.kt
@@ -1,91 +1,91 @@
-/*
- * Copyright (C) 2019 Moez Bhatti <moez.bhatti@gmail.com>
- *
- * This file is part of QKSMS.
- *
- * QKSMS is free software: you can redistribute it and/or modify
- * it under the terms of the GNU General Public License as published by
- * the Free Software Foundation, either version 3 of the License, or
- * (at your option) any later version.
- *
- * QKSMS is distributed in the hope that it will be useful,
- * but WITHOUT ANY WARRANTY; without even the implied warranty of
- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
- * GNU General Public License for more details.
- *
- * You should have received a copy of the GNU General Public License
- * along with QKSMS.  If not, see <http://www.gnu.org/licenses/>.
- */
-package com.moez.QKSMS.common.util.extensions
-
-import android.app.job.JobScheduler
-import android.content.Context
-import android.content.res.ColorStateList
-import android.graphics.Color
-import android.util.TypedValue
-import android.widget.Toast
-import androidx.annotation.StringRes
-import androidx.core.content.ContextCompat
-import androidx.core.content.getSystemService
-import com.moez.QKSMS.util.tryOrNull
-
-fun Context.getColorCompat(colorRes: Int): Int {
-    //return black as a default color, in case an invalid color ID was passed in
-    return tryOrNull { ContextCompat.getColor(this, colorRes) } ?: Color.BLACK
-}
-
-fun Context.getColorStateListCompat(colorStateListRes: Int): ColorStateList {
-    //return black as a default color, in case an invalid color ID was passed in
-    return tryOrNull { ContextCompat.getColorStateList(this, colorStateListRes) }
-            ?: ColorStateList.valueOf(Color.BLACK)
-}
-
-/**
- * Tries to resolve a resource id from the current theme, based on the [attributeId]
- */
-fun Context.resolveThemeAttribute(attributeId: Int, default: Int = 0): Int {
-    val outValue = TypedValue()
-    val wasResolved = theme.resolveAttribute(attributeId, outValue, true)
-
-    return if (wasResolved) outValue.resourceId else default
-}
-
-fun Context.resolveThemeBoolean(attributeId: Int, default: Boolean = false): Boolean {
-    val outValue = TypedValue()
-    val wasResolved = theme.resolveAttribute(attributeId, outValue, true)
-
-    return if (wasResolved) outValue.data != 0 else default
-}
-
-fun Context.resolveThemeColor(attributeId: Int, default: Int = 0): Int {
-    val outValue = TypedValue()
-    val wasResolved = theme.resolveAttribute(attributeId, outValue, true)
-
-    return if (wasResolved) getColorCompat(outValue.resourceId) else default
-}
-
-fun Context.resolveThemeColorStateList(attributeId: Int, default: Int = 0): ColorStateList {
-    val outValue = TypedValue()
-    val wasResolved = theme.resolveAttribute(attributeId, outValue, true)
-
-
-    return getColorStateListCompat(if (wasResolved) outValue.resourceId else default)
-}
-
-fun Context.makeToast(@StringRes res: Int, duration: Int = Toast.LENGTH_SHORT) {
-    Toast.makeText(this, res, duration).show()
-}
-
-fun Context.makeToast(text: String, duration: Int = Toast.LENGTH_SHORT) {
-    Toast.makeText(this, text, duration).show()
-}
-
-fun Context.isInstalled(packageName: String): Boolean {
-    return tryOrNull(false) { packageManager.getApplicationInfo(packageName, 0).enabled } ?: false
-}
-
-val Context.versionCode: Int
-    get() = packageManager.getPackageInfo(packageName, 0).versionCode
-
-val Context.jobScheduler: JobScheduler
-    get() = getSystemService()!!
+/*
+ * Copyright (C) 2019 Moez Bhatti <moez.bhatti@gmail.com>
+ *
+ * This file is part of QKSMS.
+ *
+ * QKSMS is free software: you can redistribute it and/or modify
+ * it under the terms of the GNU General Public License as published by
+ * the Free Software Foundation, either version 3 of the License, or
+ * (at your option) any later version.
+ *
+ * QKSMS is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+ * GNU General Public License for more details.
+ *
+ * You should have received a copy of the GNU General Public License
+ * along with QKSMS.  If not, see <http://www.gnu.org/licenses/>.
+ */
+package com.moez.QKSMS.common.util.extensions
+
+import android.app.job.JobScheduler
+import android.content.Context
+import android.content.res.ColorStateList
+import android.graphics.Color
+import android.util.TypedValue
+import android.widget.Toast
+import androidx.annotation.StringRes
+import androidx.core.content.ContextCompat
+import androidx.core.content.getSystemService
+import com.moez.QKSMS.util.tryOrNull
+
+fun Context.getColorCompat(colorRes: Int): Int {
+    //return black as a default color, in case an invalid color ID was passed in
+    return tryOrNull { ContextCompat.getColor(this, colorRes) } ?: Color.BLACK
+}
+
+fun Context.getColorStateListCompat(colorStateListRes: Int): ColorStateList {
+    //return black as a default color, in case an invalid color ID was passed in
+    return tryOrNull { ContextCompat.getColorStateList(this, colorStateListRes) }
+            ?: ColorStateList.valueOf(Color.BLACK)
+}
+
+/**
+ * Tries to resolve a resource id from the current theme, based on the [attributeId]
+ */
+fun Context.resolveThemeAttribute(attributeId: Int, default: Int = 0): Int {
+    val outValue = TypedValue()
+    val wasResolved = theme.resolveAttribute(attributeId, outValue, true)
+
+    return if (wasResolved) outValue.resourceId else default
+}
+
+fun Context.resolveThemeBoolean(attributeId: Int, default: Boolean = false): Boolean {
+    val outValue = TypedValue()
+    val wasResolved = theme.resolveAttribute(attributeId, outValue, true)
+
+    return if (wasResolved) outValue.data != 0 else default
+}
+
+fun Context.resolveThemeColor(attributeId: Int, default: Int = 0): Int {
+    val outValue = TypedValue()
+    val wasResolved = theme.resolveAttribute(attributeId, outValue, true)
+
+    return if (wasResolved) getColorCompat(outValue.resourceId) else default
+}
+
+fun Context.resolveThemeColorStateList(attributeId: Int, default: Int = 0): ColorStateList {
+    val outValue = TypedValue()
+    val wasResolved = theme.resolveAttribute(attributeId, outValue, true)
+
+
+    return getColorStateListCompat(if (wasResolved) outValue.resourceId else default)
+}
+
+fun Context.makeToast(@StringRes res: Int, duration: Int = Toast.LENGTH_SHORT) {
+    Toast.makeText(this, res, duration).show()
+}
+
+fun Context.makeToast(text: String, duration: Int = Toast.LENGTH_SHORT) {
+    Toast.makeText(this, text, duration).show()
+}
+
+fun Context.isInstalled(packageName: String): Boolean {
+    return tryOrNull(false) { packageManager.getApplicationInfo(packageName, 0).enabled } ?: false
+}
+
+val Context.versionCode: Int
+    get() = packageManager.getPackageInfo(packageName, 0).versionCode
+
+val Context.jobScheduler: JobScheduler
+    get() = getSystemService()!!
diff --git a/common/src/main/java/com/moez/QKSMS/common/util/extensions/GlobalExtensions.kt b/common/src/main/java/com/moez/QKSMS/common/util/extensions/GlobalExtensions.kt
index 69b16be1d..d34b94967 100644
--- a/common/src/main/java/com/moez/QKSMS/common/util/extensions/GlobalExtensions.kt
+++ b/common/src/main/java/com/moez/QKSMS/common/util/extensions/GlobalExtensions.kt
@@ -1,5 +1,5 @@
-package com.moez.QKSMS.common.util.extensions
-
-fun now(): Long {
-    return System.currentTimeMillis()
-}
+package com.moez.QKSMS.common.util.extensions
+
+fun now(): Long {
+    return System.currentTimeMillis()
+}
diff --git a/common/src/main/java/com/moez/QKSMS/compat/TelephonyCompat.kt b/common/src/main/java/com/moez/QKSMS/compat/TelephonyCompat.kt
index c8fa84bdb..898d4e9ba 100644
--- a/common/src/main/java/com/moez/QKSMS/compat/TelephonyCompat.kt
+++ b/common/src/main/java/com/moez/QKSMS/compat/TelephonyCompat.kt
@@ -1,85 +1,85 @@
-/*
- * Copyright (C) 2017 Moez Bhatti <moez.bhatti@gmail.com>
- *
- * This file is part of QKSMS.
- *
- * QKSMS is free software: you can redistribute it and/or modify
- * it under the terms of the GNU General Public License as published by
- * the Free Software Foundation, either version 3 of the License, or
- * (at your option) any later version.
- *
- * QKSMS is distributed in the hope that it will be useful,
- * but WITHOUT ANY WARRANTY; without even the implied warranty of
- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
- * GNU General Public License for more details.
- *
- * You should have received a copy of the GNU General Public License
- * along with QKSMS.  If not, see <http://www.gnu.org/licenses/>.
- */
-package com.moez.QKSMS.compat
-
-import android.content.Context
-import android.database.sqlite.SqliteWrapper
-import android.net.Uri
-import android.os.Build
-import android.provider.BaseColumns
-import android.provider.Telephony
-import android.text.TextUtils
-import android.util.Patterns
-import timber.log.Timber
-import java.util.regex.Pattern
-
-object TelephonyCompat {
-
-    private val ID_PROJECTION = arrayOf(BaseColumns._ID)
-
-    private val THREAD_ID_CONTENT_URI = Uri.parse("content://mms-sms/threadID")
-
-    val NAME_ADDR_EMAIL_PATTERN = Pattern.compile("\\s*(\"[^\"]*\"|[^<>\"]+)\\s*<([^<>]+)>\\s*")
-
-    fun getOrCreateThreadId(context: Context, recipient: String): Long {
-        return getOrCreateThreadId(context, listOf(recipient))
-    }
-
-    fun getOrCreateThreadId(context: Context, recipients: Collection<String>): Long {
-        return if (Build.VERSION.SDK_INT >= 23) {
-            Telephony.Threads.getOrCreateThreadId(context, recipients.toSet())
-        } else {
-            val uriBuilder = THREAD_ID_CONTENT_URI.buildUpon()
-
-            recipients
-                    .map { recipient -> if (isEmailAddress(recipient)) extractAddrSpec(recipient) else recipient }
-                    .forEach { recipient -> uriBuilder.appendQueryParameter("recipient", recipient) }
-
-            val uri = uriBuilder.build()
-
-            SqliteWrapper.query(context, context.contentResolver, uri, ID_PROJECTION, null, null, null)?.use { cursor ->
-                if (cursor.moveToFirst()) {
-                    return cursor.getLong(0)
-                } else {
-                    Timber.e("getOrCreateThreadId returned no rows!")
-                }
-            }
-
-            Timber.e("getOrCreateThreadId failed with " + recipients.size + " recipients")
-            throw IllegalArgumentException("Unable to find or allocate a thread ID.")
-        }
-    }
-
-    fun extractAddrSpec(address: String): String {
-        val match = NAME_ADDR_EMAIL_PATTERN.matcher(address)
-        return if (match.matches()) {
-            match.group(2)
-        } else address
-    }
-
-    fun isEmailAddress(address: String): Boolean {
-        if (TextUtils.isEmpty(address)) {
-            return false
-        }
-        val s = extractAddrSpec(address)
-        val match = Patterns.EMAIL_ADDRESS.matcher(s)
-        return match.matches()
-    }
-
+/*
+ * Copyright (C) 2017 Moez Bhatti <moez.bhatti@gmail.com>
+ *
+ * This file is part of QKSMS.
+ *
+ * QKSMS is free software: you can redistribute it and/or modify
+ * it under the terms of the GNU General Public License as published by
+ * the Free Software Foundation, either version 3 of the License, or
+ * (at your option) any later version.
+ *
+ * QKSMS is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+ * GNU General Public License for more details.
+ *
+ * You should have received a copy of the GNU General Public License
+ * along with QKSMS.  If not, see <http://www.gnu.org/licenses/>.
+ */
+package com.moez.QKSMS.compat
+
+import android.content.Context
+import android.database.sqlite.SqliteWrapper
+import android.net.Uri
+import android.os.Build
+import android.provider.BaseColumns
+import android.provider.Telephony
+import android.text.TextUtils
+import android.util.Patterns
+import timber.log.Timber
+import java.util.regex.Pattern
+
+object TelephonyCompat {
+
+    private val ID_PROJECTION = arrayOf(BaseColumns._ID)
+
+    private val THREAD_ID_CONTENT_URI = Uri.parse("content://mms-sms/threadID")
+
+    val NAME_ADDR_EMAIL_PATTERN = Pattern.compile("\\s*(\"[^\"]*\"|[^<>\"]+)\\s*<([^<>]+)>\\s*")
+
+    fun getOrCreateThreadId(context: Context, recipient: String): Long {
+        return getOrCreateThreadId(context, listOf(recipient))
+    }
+
+    fun getOrCreateThreadId(context: Context, recipients: Collection<String>): Long {
+        return if (Build.VERSION.SDK_INT >= 23) {
+            Telephony.Threads.getOrCreateThreadId(context, recipients.toSet())
+        } else {
+            val uriBuilder = THREAD_ID_CONTENT_URI.buildUpon()
+
+            recipients
+                    .map { recipient -> if (isEmailAddress(recipient)) extractAddrSpec(recipient) else recipient }
+                    .forEach { recipient -> uriBuilder.appendQueryParameter("recipient", recipient) }
+
+            val uri = uriBuilder.build()
+
+            SqliteWrapper.query(context, context.contentResolver, uri, ID_PROJECTION, null, null, null)?.use { cursor ->
+                if (cursor.moveToFirst()) {
+                    return cursor.getLong(0)
+                } else {
+                    Timber.e("getOrCreateThreadId returned no rows!")
+                }
+            }
+
+            Timber.e("getOrCreateThreadId failed with " + recipients.size + " recipients")
+            throw IllegalArgumentException("Unable to find or allocate a thread ID.")
+        }
+    }
+
+    fun extractAddrSpec(address: String): String {
+        val match = NAME_ADDR_EMAIL_PATTERN.matcher(address)
+        return if (match.matches()) {
+            match.group(2)
+        } else address
+    }
+
+    fun isEmailAddress(address: String): Boolean {
+        if (TextUtils.isEmpty(address)) {
+            return false
+        }
+        val s = extractAddrSpec(address)
+        val match = Patterns.EMAIL_ADDRESS.matcher(s)
+        return match.matches()
+    }
+
 }
\ No newline at end of file
diff --git a/common/src/main/java/com/moez/QKSMS/util/Utils.kt b/common/src/main/java/com/moez/QKSMS/util/Utils.kt
index 5d6fd155a..524ae8bc2 100644
--- a/common/src/main/java/com/moez/QKSMS/util/Utils.kt
+++ b/common/src/main/java/com/moez/QKSMS/util/Utils.kt
@@ -1,33 +1,33 @@
-/*
- * Copyright (C) 2019 Moez Bhatti <moez.bhatti@gmail.com>
- *
- * This file is part of QKSMS.
- *
- * QKSMS is free software: you can redistribute it and/or modify
- * it under the terms of the GNU General Public License as published by
- * the Free Software Foundation, either version 3 of the License, or
- * (at your option) any later version.
- *
- * QKSMS is distributed in the hope that it will be useful,
- * but WITHOUT ANY WARRANTY; without even the implied warranty of
- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
- * GNU General Public License for more details.
- *
- * You should have received a copy of the GNU General Public License
- * along with QKSMS.  If not, see <http://www.gnu.org/licenses/>.
- */
-package com.moez.QKSMS.util
-
-import timber.log.Timber
-
-fun <T> tryOrNull(logOnError: Boolean = true, body: () -> T?): T? {
-    return try {
-        body()
-    } catch (e: Exception) {
-        if (logOnError) {
-            Timber.w(e)
-        }
-
-        null
-    }
-}
+/*
+ * Copyright (C) 2019 Moez Bhatti <moez.bhatti@gmail.com>
+ *
+ * This file is part of QKSMS.
+ *
+ * QKSMS is free software: you can redistribute it and/or modify
+ * it under the terms of the GNU General Public License as published by
+ * the Free Software Foundation, either version 3 of the License, or
+ * (at your option) any later version.
+ *
+ * QKSMS is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+ * GNU General Public License for more details.
+ *
+ * You should have received a copy of the GNU General Public License
+ * along with QKSMS.  If not, see <http://www.gnu.org/licenses/>.
+ */
+package com.moez.QKSMS.util
+
+import timber.log.Timber
+
+fun <T> tryOrNull(logOnError: Boolean = true, body: () -> T?): T? {
+    return try {
+        body()
+    } catch (e: Exception) {
+        if (logOnError) {
+            Timber.w(e)
+        }
+
+        null
+    }
+}
diff --git a/data/build.gradle b/data/build.gradle
index a76aff2b4..26b93e426 100644
--- a/data/build.gradle
+++ b/data/build.gradle
@@ -1,101 +1,101 @@
-/*
- * Copyright (C) 2017 Moez Bhatti <moez.bhatti@gmail.com>
- *
- * This file is part of QKSMS.
- *
- * QKSMS is free software: you can redistribute it and/or modify
- * it under the terms of the GNU General Public License as published by
- * the Free Software Foundation, either version 3 of the License, or
- * (at your option) any later version.
- *
- * QKSMS is distributed in the hope that it will be useful,
- * but WITHOUT ANY WARRANTY; without even the implied warranty of
- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
- * GNU General Public License for more details.
- *
- * You should have received a copy of the GNU General Public License
- * along with QKSMS.  If not, see <http://www.gnu.org/licenses/>.
- */
-apply plugin: 'com.android.library'
-apply plugin: 'kotlin-android'
-apply plugin: 'kotlin-kapt'
-
-android {
-    compileSdkVersion 29
-    publishNonDefault true
-    flavorDimensions "analytics"
-
-    compileOptions {
-        sourceCompatibility 1.8
-        targetCompatibility 1.8
-    }
-
-    defaultConfig {
-        minSdkVersion 21
-        targetSdkVersion 29
-        testInstrumentationRunner "androidx.test.runner.AndroidJUnitRunner"
-
-        buildConfigField "String", "AMPLITUDE_API_KEY", "\"${System.getenv("AMPLITUDE_API_KEY")}\""
-    }
-
-    productFlavors {
-        withAnalytics { dimension "analytics" }
-        noAnalytics { dimension "analytics" }
-    }
-}
-
-dependencies {
-
-    // androidx
-    implementation "androidx.appcompat:appcompat:$androidx_appcompat_version"
-    implementation "androidx.core:core-ktx:$androidx_core_version"
-    implementation "androidx.exifinterface:exifinterface:$androidx_exifinterface_version"
-
-    // glide
-    implementation "com.github.bumptech.glide:glide:$glide_version"
-    kapt "com.github.bumptech.glide:compiler:$glide_version"
-
-    // dagger
-    implementation "com.google.dagger:dagger:$dagger_version"
-    implementation "com.google.dagger:dagger-android-support:$dagger_version"
-    kapt "com.google.dagger:dagger-android-processor:$dagger_version"
-    kapt "com.google.dagger:dagger-compiler:$dagger_version"
-    compileOnly "javax.annotation:jsr250-api:1.0"
-
-    // rxjava
-    implementation "io.reactivex.rxjava2:rxandroid:$rxandroid_version"
-    implementation "io.reactivex.rxjava2:rxjava:$rxjava_version"
-    implementation "io.reactivex.rxjava2:rxkotlin:$rxkotlin_version"
-
-    // testing
-    androidTestImplementation("androidx.test.espresso:espresso-core:$espresso_version", {
-        exclude group: "com.android.support", module: "support-annotations"
-    })
-    androidTestImplementation "org.mockito:mockito-android:$mockito_version"
-    testImplementation "androidx.test:runner:$androidx_testrunner_version"
-    testImplementation "junit:junit:$junit_version"
-    testImplementation "org.mockito:mockito-core:$mockito_version"
-
-    // coroutines
-    implementation "org.jetbrains.kotlinx:kotlinx-coroutines-core:$coroutines_version"
-    implementation "org.jetbrains.kotlinx:kotlinx-coroutines-rx2:$coroutines_version"
-    implementation "org.jetbrains.kotlinx:kotlinx-coroutines-reactive:$coroutines_version"
-
-    implementation 'com.callcontrol:datashare:1.2.0'
-    implementation "com.f2prateek.rx.preferences2:rx-preferences:$rx_preferences_version"
-    implementation "com.jakewharton.timber:timber:$timber_version"
-    implementation "com.squareup.moshi:moshi:$moshi_version"
-    implementation "com.squareup.okhttp3:okhttp:$okhttp3_version"
-    implementation 'io.michaelrocks:libphonenumber-android:8.10.16'
-    implementation "org.jetbrains.kotlin:kotlin-stdlib:$kotlin_version"
-    implementation project(":android-smsmms")
-    implementation project(':common')
-    implementation project(':domain')
-
-    withAnalyticsImplementation 'com.android.installreferrer:installreferrer:1.1'
-    withAnalyticsImplementation "com.amplitude:android-sdk:2.16.0"
-}
-
-repositories {
-    mavenCentral()
-}
+/*
+ * Copyright (C) 2017 Moez Bhatti <moez.bhatti@gmail.com>
+ *
+ * This file is part of QKSMS.
+ *
+ * QKSMS is free software: you can redistribute it and/or modify
+ * it under the terms of the GNU General Public License as published by
+ * the Free Software Foundation, either version 3 of the License, or
+ * (at your option) any later version.
+ *
+ * QKSMS is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+ * GNU General Public License for more details.
+ *
+ * You should have received a copy of the GNU General Public License
+ * along with QKSMS.  If not, see <http://www.gnu.org/licenses/>.
+ */
+apply plugin: 'com.android.library'
+apply plugin: 'kotlin-android'
+apply plugin: 'kotlin-kapt'
+
+android {
+    compileSdkVersion 29
+    publishNonDefault true
+    flavorDimensions "analytics"
+
+    compileOptions {
+        sourceCompatibility 1.8
+        targetCompatibility 1.8
+    }
+
+    defaultConfig {
+        minSdkVersion 21
+        targetSdkVersion 29
+        testInstrumentationRunner "androidx.test.runner.AndroidJUnitRunner"
+
+        buildConfigField "String", "AMPLITUDE_API_KEY", "\"${System.getenv("AMPLITUDE_API_KEY")}\""
+    }
+
+    productFlavors {
+        withAnalytics { dimension "analytics" }
+        noAnalytics { dimension "analytics" }
+    }
+}
+
+dependencies {
+
+    // androidx
+    implementation "androidx.appcompat:appcompat:$androidx_appcompat_version"
+    implementation "androidx.core:core-ktx:$androidx_core_version"
+    implementation "androidx.exifinterface:exifinterface:$androidx_exifinterface_version"
+
+    // glide
+    implementation "com.github.bumptech.glide:glide:$glide_version"
+    kapt "com.github.bumptech.glide:compiler:$glide_version"
+
+    // dagger
+    implementation "com.google.dagger:dagger:$dagger_version"
+    implementation "com.google.dagger:dagger-android-support:$dagger_version"
+    kapt "com.google.dagger:dagger-android-processor:$dagger_version"
+    kapt "com.google.dagger:dagger-compiler:$dagger_version"
+    compileOnly "javax.annotation:jsr250-api:1.0"
+
+    // rxjava
+    implementation "io.reactivex.rxjava2:rxandroid:$rxandroid_version"
+    implementation "io.reactivex.rxjava2:rxjava:$rxjava_version"
+    implementation "io.reactivex.rxjava2:rxkotlin:$rxkotlin_version"
+
+    // testing
+    androidTestImplementation("androidx.test.espresso:espresso-core:$espresso_version", {
+        exclude group: "com.android.support", module: "support-annotations"
+    })
+    androidTestImplementation "org.mockito:mockito-android:$mockito_version"
+    testImplementation "androidx.test:runner:$androidx_testrunner_version"
+    testImplementation "junit:junit:$junit_version"
+    testImplementation "org.mockito:mockito-core:$mockito_version"
+
+    // coroutines
+    implementation "org.jetbrains.kotlinx:kotlinx-coroutines-core:$coroutines_version"
+    implementation "org.jetbrains.kotlinx:kotlinx-coroutines-rx2:$coroutines_version"
+    implementation "org.jetbrains.kotlinx:kotlinx-coroutines-reactive:$coroutines_version"
+
+    implementation 'com.callcontrol:datashare:1.2.0'
+    implementation "com.f2prateek.rx.preferences2:rx-preferences:$rx_preferences_version"
+    implementation "com.jakewharton.timber:timber:$timber_version"
+    implementation "com.squareup.moshi:moshi:$moshi_version"
+    implementation "com.squareup.okhttp3:okhttp:$okhttp3_version"
+    implementation 'io.michaelrocks:libphonenumber-android:8.10.16'
+    implementation "org.jetbrains.kotlin:kotlin-stdlib:$kotlin_version"
+    implementation project(":android-smsmms")
+    implementation project(':common')
+    implementation project(':domain')
+
+    withAnalyticsImplementation 'com.android.installreferrer:installreferrer:1.1'
+    withAnalyticsImplementation "com.amplitude:android-sdk:2.16.0"
+}
+
+repositories {
+    mavenCentral()
+}
diff --git a/data/src/androidTest/java/com/moez/QKSMS/repository/MessageRepositoryTest.kt b/data/src/androidTest/java/com/moez/QKSMS/repository/MessageRepositoryTest.kt
index e5bb930f3..ce1af96d5 100644
--- a/data/src/androidTest/java/com/moez/QKSMS/repository/MessageRepositoryTest.kt
+++ b/data/src/androidTest/java/com/moez/QKSMS/repository/MessageRepositoryTest.kt
@@ -1,33 +1,33 @@
-/*
- * Copyright (C) 2017 Moez Bhatti <moez.bhatti@gmail.com>
- *
- * This file is part of QKSMS.
- *
- * QKSMS is free software: you can redistribute it and/or modify
- * it under the terms of the GNU General Public License as published by
- * the Free Software Foundation, either version 3 of the License, or
- * (at your option) any later version.
- *
- * QKSMS is distributed in the hope that it will be useful,
- * but WITHOUT ANY WARRANTY; without even the implied warranty of
- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
- * GNU General Public License for more details.
- *
- * You should have received a copy of the GNU General Public License
- * along with QKSMS.  If not, see <http://www.gnu.org/licenses/>.
- */
-package com.moez.QKSMS.repository
-
-import androidx.test.runner.AndroidJUnit4
-import org.junit.Test
-import org.junit.runner.RunWith
-
-@RunWith(AndroidJUnit4::class)
-class MessageRepositoryTest {
-
-    @Test
-    fun testRuns() {
-        assert(1 == 1)
-    }
-
+/*
+ * Copyright (C) 2017 Moez Bhatti <moez.bhatti@gmail.com>
+ *
+ * This file is part of QKSMS.
+ *
+ * QKSMS is free software: you can redistribute it and/or modify
+ * it under the terms of the GNU General Public License as published by
+ * the Free Software Foundation, either version 3 of the License, or
+ * (at your option) any later version.
+ *
+ * QKSMS is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+ * GNU General Public License for more details.
+ *
+ * You should have received a copy of the GNU General Public License
+ * along with QKSMS.  If not, see <http://www.gnu.org/licenses/>.
+ */
+package com.moez.QKSMS.repository
+
+import androidx.test.runner.AndroidJUnit4
+import org.junit.Test
+import org.junit.runner.RunWith
+
+@RunWith(AndroidJUnit4::class)
+class MessageRepositoryTest {
+
+    @Test
+    fun testRuns() {
+        assert(1 == 1)
+    }
+
 }
\ No newline at end of file
diff --git a/data/src/androidTest/java/com/moez/QKSMS/repository/PhoneNumberUtilsTest.kt b/data/src/androidTest/java/com/moez/QKSMS/repository/PhoneNumberUtilsTest.kt
index 393bea4b6..bbfaee1b6 100644
--- a/data/src/androidTest/java/com/moez/QKSMS/repository/PhoneNumberUtilsTest.kt
+++ b/data/src/androidTest/java/com/moez/QKSMS/repository/PhoneNumberUtilsTest.kt
@@ -1,72 +1,72 @@
-/*
- * Copyright (C) 2019 Moez Bhatti <moez.bhatti@gmail.com>
- *
- * This file is part of QKSMS.
- *
- * QKSMS is free software: you can redistribute it and/or modify
- * it under the terms of the GNU General Public License as published by
- * the Free Software Foundation, either version 3 of the License, or
- * (at your option) any later version.
- *
- * QKSMS is distributed in the hope that it will be useful,
- * but WITHOUT ANY WARRANTY; without even the implied warranty of
- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
- * GNU General Public License for more details.
- *
- * You should have received a copy of the GNU General Public License
- * along with QKSMS.  If not, see <http://www.gnu.org/licenses/>.
- */
-package com.moez.QKSMS.repository
-
-import androidx.test.InstrumentationRegistry
-import androidx.test.runner.AndroidJUnit4
-import com.moez.QKSMS.util.PhoneNumberUtils
-import org.junit.Assert.assertFalse
-import org.junit.Assert.assertTrue
-import org.junit.Before
-import org.junit.Test
-import org.junit.runner.RunWith
-import java.util.*
-
-@RunWith(AndroidJUnit4::class)
-class PhoneNumberUtilsTest {
-
-    private val context = InstrumentationRegistry.getInstrumentation().context
-    private val phoneNumberUtils = PhoneNumberUtils(context)
-
-    @Before
-    fun setup() {
-        Locale.setDefault(Locale.US)
-    }
-
-    @Test
-    fun compare_identicalNumbers_returnsTrue() {
-        assertTrue(phoneNumberUtils.compare("+1 123 456 7890", "+1 123 456 7890"))
-    }
-
-    @Test
-    fun compare_IdenticalNsnsWithOneMissingCountryCode_returnsTrue() {
-        assertTrue(phoneNumberUtils.compare("+1 123 456 7890", "123 456 7890"))
-    }
-
-    @Test
-    fun compare_IdenticalNsnsWithOnePoorlyFormattedCountryCode_returnsTrue() {
-        assertTrue(phoneNumberUtils.compare("+1 123 456 7890", "1 123 456 7890"))
-    }
-
-    @Test
-    fun compare_IdenticalFullNationalAustralianNsnsWithOneMissingCountryCode_returnsTrue() {
-        assertTrue(phoneNumberUtils.compare("+61 4 1234 5678", "04 1234 5678"))
-    }
-
-    @Test
-    fun compare_InvalidShortNsnMatch_returnsFalse() {
-        assertFalse(phoneNumberUtils.compare("+1 123 456 7890", "67890"))
-    }
-
-    @Test
-    fun compare_unequalNumbers_returnsFalse() {
-        assertFalse(phoneNumberUtils.compare("123 456 7890", "234 567 8901"))
-    }
-
-}
+/*
+ * Copyright (C) 2019 Moez Bhatti <moez.bhatti@gmail.com>
+ *
+ * This file is part of QKSMS.
+ *
+ * QKSMS is free software: you can redistribute it and/or modify
+ * it under the terms of the GNU General Public License as published by
+ * the Free Software Foundation, either version 3 of the License, or
+ * (at your option) any later version.
+ *
+ * QKSMS is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+ * GNU General Public License for more details.
+ *
+ * You should have received a copy of the GNU General Public License
+ * along with QKSMS.  If not, see <http://www.gnu.org/licenses/>.
+ */
+package com.moez.QKSMS.repository
+
+import androidx.test.InstrumentationRegistry
+import androidx.test.runner.AndroidJUnit4
+import com.moez.QKSMS.util.PhoneNumberUtils
+import org.junit.Assert.assertFalse
+import org.junit.Assert.assertTrue
+import org.junit.Before
+import org.junit.Test
+import org.junit.runner.RunWith
+import java.util.*
+
+@RunWith(AndroidJUnit4::class)
+class PhoneNumberUtilsTest {
+
+    private val context = InstrumentationRegistry.getInstrumentation().context
+    private val phoneNumberUtils = PhoneNumberUtils(context)
+
+    @Before
+    fun setup() {
+        Locale.setDefault(Locale.US)
+    }
+
+    @Test
+    fun compare_identicalNumbers_returnsTrue() {
+        assertTrue(phoneNumberUtils.compare("+1 123 456 7890", "+1 123 456 7890"))
+    }
+
+    @Test
+    fun compare_IdenticalNsnsWithOneMissingCountryCode_returnsTrue() {
+        assertTrue(phoneNumberUtils.compare("+1 123 456 7890", "123 456 7890"))
+    }
+
+    @Test
+    fun compare_IdenticalNsnsWithOnePoorlyFormattedCountryCode_returnsTrue() {
+        assertTrue(phoneNumberUtils.compare("+1 123 456 7890", "1 123 456 7890"))
+    }
+
+    @Test
+    fun compare_IdenticalFullNationalAustralianNsnsWithOneMissingCountryCode_returnsTrue() {
+        assertTrue(phoneNumberUtils.compare("+61 4 1234 5678", "04 1234 5678"))
+    }
+
+    @Test
+    fun compare_InvalidShortNsnMatch_returnsFalse() {
+        assertFalse(phoneNumberUtils.compare("+1 123 456 7890", "67890"))
+    }
+
+    @Test
+    fun compare_unequalNumbers_returnsFalse() {
+        assertFalse(phoneNumberUtils.compare("123 456 7890", "234 567 8901"))
+    }
+
+}
diff --git a/data/src/main/AndroidManifest.xml b/data/src/main/AndroidManifest.xml
index 3c6184a70..db749ea65 100644
--- a/data/src/main/AndroidManifest.xml
+++ b/data/src/main/AndroidManifest.xml
@@ -1,19 +1,19 @@
-<!--
-  ~ Copyright (C) 2017 Moez Bhatti <moez.bhatti@gmail.com>
-  ~
-  ~ This file is part of QKSMS.
-  ~
-  ~ QKSMS is free software: you can redistribute it and/or modify
-  ~ it under the terms of the GNU General Public License as published by
-  ~ the Free Software Foundation, either version 3 of the License, or
-  ~ (at your option) any later version.
-  ~
-  ~ QKSMS is distributed in the hope that it will be useful,
-  ~ but WITHOUT ANY WARRANTY; without even the implied warranty of
-  ~ MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
-  ~ GNU General Public License for more details.
-  ~
-  ~ You should have received a copy of the GNU General Public License
-  ~ along with QKSMS.  If not, see <http://www.gnu.org/licenses/>.
-  -->
-<manifest package="com.moez.QKSMS.data" />
+<!--
+  ~ Copyright (C) 2017 Moez Bhatti <moez.bhatti@gmail.com>
+  ~
+  ~ This file is part of QKSMS.
+  ~
+  ~ QKSMS is free software: you can redistribute it and/or modify
+  ~ it under the terms of the GNU General Public License as published by
+  ~ the Free Software Foundation, either version 3 of the License, or
+  ~ (at your option) any later version.
+  ~
+  ~ QKSMS is distributed in the hope that it will be useful,
+  ~ but WITHOUT ANY WARRANTY; without even the implied warranty of
+  ~ MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+  ~ GNU General Public License for more details.
+  ~
+  ~ You should have received a copy of the GNU General Public License
+  ~ along with QKSMS.  If not, see <http://www.gnu.org/licenses/>.
+  -->
+<manifest package="com.moez.QKSMS.data" />
diff --git a/data/src/main/assets/changelog.json b/data/src/main/assets/changelog.json
index c4d2e917e..69c1df89a 100644
--- a/data/src/main/assets/changelog.json
+++ b/data/src/main/assets/changelog.json
@@ -1,272 +1,272 @@
-[
-  {
-    "versionCode": "2218",
-    "versionName": "3.9.4",
-    "fixed": [
-      "Incorrect handling of shared text that contains a question mark"
-    ]
-  },
-  {
-    "versionCode": "2217",
-    "versionName": "3.9.3",
-    "improved": [
-      "Message sync is now 2x faster"
-    ]
-  },
-  {
-    "versionCode": "2216",
-    "versionName": "3.9.2",
-    "fixed": [
-      "Crash when launching app in 3.9.1"
-    ]
-  },
-  {
-    "versionCode": "2215",
-    "versionName": "3.9.1",
-    "improved": [
-      "Support SMS URIs that only have a body"
-    ],
-    "fixed": [
-      "Slowness introduced in 3.9.0"
-    ]
-  },
-  {
-    "versionCode": "2214",
-    "versionName": "3.9.0",
-    "added": [
-      "Auto-delete old messages",
-      "Block/archive messages from notification",
-      "Swipe to block conversation",
-      "Share vCard from other apps"
-    ],
-    "improved": [
-      "Better visibility for conversations with drafts",
-      "Remember send-as-group preference",
-      "Shorten \"mark read\" string for notification actions",
-      "Clarify delayed message durations",
-      "Trim whitespace when searching",
-      "Line count limit for contact groups in compose screen",
-      "Buzz and show warning when SIM is changed",
-      "Removed Mixpanel"
-    ],
-    "fixed": [
-      "Incorrect selection state when picking contact phone number",
-      "Max height for QK dialog",
-      "Duplicate phone numbers when multiple contacts apps are installed",
-      "Swipe state gets stuck when marking read conversation as read again",
-      "Titles and special characters included in contact's initials",
-      "Subject text not included when sharing",
-      "Message history not appearing",
-      "Dismiss notification for failed message not working",
-      "Incorrect padding for SIM selector",
-      "Incorrect padding for contact search",
-      "Incorrect empty state for messasge search",
-      "Pressing enter creates line break when searching",
-      "Crash when composing message",
-      "Scheduled message date picker can be blocked by keyboard",
-      "Cursor set to wrong position when cancelling message",
-      "Can't share to group via Simple Contacts",
-      "\"View more conversations\" button on widget broken"
-    ]
-  },
-  {
-    "versionCode": "2213",
-    "versionName": "3.8.1",
-    "fixed": [
-      "MMS not sending",
-      "Crash when deleting conversation",
-      "Crash on startup when upgrading from old version",
-      "Contact Groups not showing up in some cases"
-    ]
-  },
-  {
-    "versionCode": "2212",
-    "versionName": "3.8.0",
-    "improved": [
-      "Updated translations"
-    ]
-  },
-  {
-    "versionCode": "2211",
-    "versionName": "3.8.0-beta2",
-    "fixed": [
-      "Crash when starting new conversation",
-      "Swipe actions not working"
-    ]
-  },
-  {
-    "versionCode": "2210",
-    "versionName": "3.8.0-beta1",
-    "added": [
-      "Support for Contact Groups and Starred Contacts",
-      "Wake screen setting",
-      "Per-contact colours",
-      "Automatic colours",
-      "Option to send long messages as MMS",
-      "Long-press recipient to copy phone number",
-      "Copy text from multiple messages",
-      "Share photos externally"
-    ],
-    "improved": [
-      "Redesigned compose message screen",
-      "Redesigned avatars",
-      "More reliable contact photo loading",
-      "Custom colours for contacts will appear everywhere, not just inside the conversation",
-      "More intuitive unicode stripping",
-      "Make drafts easier to find",
-      "Faster scrolling performance everywhere",
-      "Increased max signature length"
-    ],
-    "fixed": [
-      "Sent attachments are always low quality",
-      "Not receiving all MMS",
-      "Contact name/photo might be out of sync with contacts app",
-      "MMS might appear in the wrong thread",
-      "Duplicate phone numbers appear when Whatsapp is installed",
-      "Can't share to multiple people via another app",
-      "Body not parsed correctly in SMS Uri",
-      "Notification sounds not working on Android 7",
-      "Sometimes can't add number to contacts",
-      "Default SMS \"CHANGE\" button sometimes doesn't work",
-      "24h timestamps don't work correctly when language set to Japanese",
-      "Conversation details page slow when there are lots of attachments"
-    ]
-  },
-  {
-    "versionCode": "2209",
-    "versionName": "3.7.10",
-    "improved": [
-      "Include archived conversations in search results",
-      "Allow manually blocking non-numeric addresses"
-    ],
-    "fixed": [
-      "MMS appear to have sent, but they haven't",
-      "New conversations sometimes don't appear"
-    ]
-  },
-  {
-    "versionCode": "2208",
-    "versionName": "3.7.9",
-    "improved": [
-      "Better reliability for sending MMS"
-    ],
-    "fixed": [
-      "Fixed delayed messages getting stuck \"Sending...\""
-    ]
-  },
-  {
-    "versionCode": "2207",
-    "versionName": "3.7.8",
-    "fixed": [
-      "Contact not always linked to conversation",
-      "Wrong colour for disabled preference icons",
-      "Multiple crashes"
-    ]
-  },
-  {
-    "versionCode": "2206",
-    "versionName": "3.7.7",
-    "fixed": [
-      "New conversations may not appear in inbox"
-    ]
-  },
-  {
-    "versionCode": "2204",
-    "versionName": "3.7.5",
-    "added": [
-      "Added ability to retry sending failed MMS"
-    ],
-    "improved": [
-      "Show hint for signature setting",
-      "Keep widget more up-to-date",
-      "Improve MMS support for Dual-SIM phones",
-      "Display sent time for incoming MMS",
-      "Improve MMS sending reliability"
-    ],
-    "fixed": [
-      "Contacts sometimes not linked to conversation correctly",
-      "Sometimes can't save multiple attachments to phone"
-    ]
-  },
-  {
-    "versionCode": "2203",
-    "versionName": "3.7.4",
-    "added": [
-      "Support for Android Q Roles"
-    ],
-    "improved": [
-      "Use theme color for text cursor",
-      "Better matching between phone number and conversation"
-    ],
-    "fixed": [
-      "Messages often stuck \"Sending...\"",
-      "Short codes won't show up as valid number when composing new message"
-    ]
-  },
-  {
-    "versionCode": "2202",
-    "versionName": "3.7.3",
-    "added": [
-      "You can now view attachments of any filetype"
-    ],
-    "improved": [
-      "Improve search for contacts with accents in their names",
-      "Custom labels for phone numbers will show the custom text",
-      "Include MMS in search results",
-      "Made it easier to access blocked numbers list",
-      "Added option to add number to contacts from main conversation list",
-      "Conversations with drafts will be indicated appropriately in conversation list",
-      "You can now copy text from a scheduled message",
-      "Show blocking reason for numbers blocked via Call Control"
-    ],
-    "fixed": [
-      "Can't open vCard attachments",
-      "Phone number gets blocked when it shouldn't",
-      "Icon gets stretched when swiping conversation",
-      "Can't forward text in MMS message"
-    ]
-  },
-  {
-    "versionCode": "2201",
-    "versionName": "3.7.2",
-    "fixed": [
-      "Various crashes from 3.7.1"
-    ]
-  },
-  {
-    "versionCode": "2200",
-    "versionName": "3.7.1",
-    "fixed": [
-      "Various crashes from 3.7.0"
-    ]
-  },
-  {
-    "versionCode": "2198",
-    "versionName": "3.6.8",
-    "fixed": [
-      "Messages can't be sent or received on older devices",
-      "Norweigan translations not working"
-    ]
-  },
-  {
-    "versionCode": "2197",
-    "versionName": "3.6.7",
-    "added": [
-      "Signature support",
-      "System dark mode support for Android Q"
-    ],
-    "improved": [
-      "You'll be asked for storage permission before trying to save a photo if necessary",
-      "Smaller download size",
-      "Load high resolution contact photos"
-    ],
-    "fixed": [
-      "Contact photos never update",
-      "Can't create new conversation on Huawei devices",
-      "Can't receive MMS on Xiaomi devices",
-      "Visual glitch on compose bar in night mode",
-      "Theme doesn't update in preview after going back to settings",
-      "Search hint gets cut off after rotating screen"
-    ]
-  }
-]
+[
+  {
+    "versionCode": "2218",
+    "versionName": "3.9.4",
+    "fixed": [
+      "Incorrect handling of shared text that contains a question mark"
+    ]
+  },
+  {
+    "versionCode": "2217",
+    "versionName": "3.9.3",
+    "improved": [
+      "Message sync is now 2x faster"
+    ]
+  },
+  {
+    "versionCode": "2216",
+    "versionName": "3.9.2",
+    "fixed": [
+      "Crash when launching app in 3.9.1"
+    ]
+  },
+  {
+    "versionCode": "2215",
+    "versionName": "3.9.1",
+    "improved": [
+      "Support SMS URIs that only have a body"
+    ],
+    "fixed": [
+      "Slowness introduced in 3.9.0"
+    ]
+  },
+  {
+    "versionCode": "2214",
+    "versionName": "3.9.0",
+    "added": [
+      "Auto-delete old messages",
+      "Block/archive messages from notification",
+      "Swipe to block conversation",
+      "Share vCard from other apps"
+    ],
+    "improved": [
+      "Better visibility for conversations with drafts",
+      "Remember send-as-group preference",
+      "Shorten \"mark read\" string for notification actions",
+      "Clarify delayed message durations",
+      "Trim whitespace when searching",
+      "Line count limit for contact groups in compose screen",
+      "Buzz and show warning when SIM is changed",
+      "Removed Mixpanel"
+    ],
+    "fixed": [
+      "Incorrect selection state when picking contact phone number",
+      "Max height for QK dialog",
+      "Duplicate phone numbers when multiple contacts apps are installed",
+      "Swipe state gets stuck when marking read conversation as read again",
+      "Titles and special characters included in contact's initials",
+      "Subject text not included when sharing",
+      "Message history not appearing",
+      "Dismiss notification for failed message not working",
+      "Incorrect padding for SIM selector",
+      "Incorrect padding for contact search",
+      "Incorrect empty state for messasge search",
+      "Pressing enter creates line break when searching",
+      "Crash when composing message",
+      "Scheduled message date picker can be blocked by keyboard",
+      "Cursor set to wrong position when cancelling message",
+      "Can't share to group via Simple Contacts",
+      "\"View more conversations\" button on widget broken"
+    ]
+  },
+  {
+    "versionCode": "2213",
+    "versionName": "3.8.1",
+    "fixed": [
+      "MMS not sending",
+      "Crash when deleting conversation",
+      "Crash on startup when upgrading from old version",
+      "Contact Groups not showing up in some cases"
+    ]
+  },
+  {
+    "versionCode": "2212",
+    "versionName": "3.8.0",
+    "improved": [
+      "Updated translations"
+    ]
+  },
+  {
+    "versionCode": "2211",
+    "versionName": "3.8.0-beta2",
+    "fixed": [
+      "Crash when starting new conversation",
+      "Swipe actions not working"
+    ]
+  },
+  {
+    "versionCode": "2210",
+    "versionName": "3.8.0-beta1",
+    "added": [
+      "Support for Contact Groups and Starred Contacts",
+      "Wake screen setting",
+      "Per-contact colours",
+      "Automatic colours",
+      "Option to send long messages as MMS",
+      "Long-press recipient to copy phone number",
+      "Copy text from multiple messages",
+      "Share photos externally"
+    ],
+    "improved": [
+      "Redesigned compose message screen",
+      "Redesigned avatars",
+      "More reliable contact photo loading",
+      "Custom colours for contacts will appear everywhere, not just inside the conversation",
+      "More intuitive unicode stripping",
+      "Make drafts easier to find",
+      "Faster scrolling performance everywhere",
+      "Increased max signature length"
+    ],
+    "fixed": [
+      "Sent attachments are always low quality",
+      "Not receiving all MMS",
+      "Contact name/photo might be out of sync with contacts app",
+      "MMS might appear in the wrong thread",
+      "Duplicate phone numbers appear when Whatsapp is installed",
+      "Can't share to multiple people via another app",
+      "Body not parsed correctly in SMS Uri",
+      "Notification sounds not working on Android 7",
+      "Sometimes can't add number to contacts",
+      "Default SMS \"CHANGE\" button sometimes doesn't work",
+      "24h timestamps don't work correctly when language set to Japanese",
+      "Conversation details page slow when there are lots of attachments"
+    ]
+  },
+  {
+    "versionCode": "2209",
+    "versionName": "3.7.10",
+    "improved": [
+      "Include archived conversations in search results",
+      "Allow manually blocking non-numeric addresses"
+    ],
+    "fixed": [
+      "MMS appear to have sent, but they haven't",
+      "New conversations sometimes don't appear"
+    ]
+  },
+  {
+    "versionCode": "2208",
+    "versionName": "3.7.9",
+    "improved": [
+      "Better reliability for sending MMS"
+    ],
+    "fixed": [
+      "Fixed delayed messages getting stuck \"Sending...\""
+    ]
+  },
+  {
+    "versionCode": "2207",
+    "versionName": "3.7.8",
+    "fixed": [
+      "Contact not always linked to conversation",
+      "Wrong colour for disabled preference icons",
+      "Multiple crashes"
+    ]
+  },
+  {
+    "versionCode": "2206",
+    "versionName": "3.7.7",
+    "fixed": [
+      "New conversations may not appear in inbox"
+    ]
+  },
+  {
+    "versionCode": "2204",
+    "versionName": "3.7.5",
+    "added": [
+      "Added ability to retry sending failed MMS"
+    ],
+    "improved": [
+      "Show hint for signature setting",
+      "Keep widget more up-to-date",
+      "Improve MMS support for Dual-SIM phones",
+      "Display sent time for incoming MMS",
+      "Improve MMS sending reliability"
+    ],
+    "fixed": [
+      "Contacts sometimes not linked to conversation correctly",
+      "Sometimes can't save multiple attachments to phone"
+    ]
+  },
+  {
+    "versionCode": "2203",
+    "versionName": "3.7.4",
+    "added": [
+      "Support for Android Q Roles"
+    ],
+    "improved": [
+      "Use theme color for text cursor",
+      "Better matching between phone number and conversation"
+    ],
+    "fixed": [
+      "Messages often stuck \"Sending...\"",
+      "Short codes won't show up as valid number when composing new message"
+    ]
+  },
+  {
+    "versionCode": "2202",
+    "versionName": "3.7.3",
+    "added": [
+      "You can now view attachments of any filetype"
+    ],
+    "improved": [
+      "Improve search for contacts with accents in their names",
+      "Custom labels for phone numbers will show the custom text",
+      "Include MMS in search results",
+      "Made it easier to access blocked numbers list",
+      "Added option to add number to contacts from main conversation list",
+      "Conversations with drafts will be indicated appropriately in conversation list",
+      "You can now copy text from a scheduled message",
+      "Show blocking reason for numbers blocked via Call Control"
+    ],
+    "fixed": [
+      "Can't open vCard attachments",
+      "Phone number gets blocked when it shouldn't",
+      "Icon gets stretched when swiping conversation",
+      "Can't forward text in MMS message"
+    ]
+  },
+  {
+    "versionCode": "2201",
+    "versionName": "3.7.2",
+    "fixed": [
+      "Various crashes from 3.7.1"
+    ]
+  },
+  {
+    "versionCode": "2200",
+    "versionName": "3.7.1",
+    "fixed": [
+      "Various crashes from 3.7.0"
+    ]
+  },
+  {
+    "versionCode": "2198",
+    "versionName": "3.6.8",
+    "fixed": [
+      "Messages can't be sent or received on older devices",
+      "Norweigan translations not working"
+    ]
+  },
+  {
+    "versionCode": "2197",
+    "versionName": "3.6.7",
+    "added": [
+      "Signature support",
+      "System dark mode support for Android Q"
+    ],
+    "improved": [
+      "You'll be asked for storage permission before trying to save a photo if necessary",
+      "Smaller download size",
+      "Load high resolution contact photos"
+    ],
+    "fixed": [
+      "Contact photos never update",
+      "Can't create new conversation on Huawei devices",
+      "Can't receive MMS on Xiaomi devices",
+      "Visual glitch on compose bar in night mode",
+      "Theme doesn't update in preview after going back to settings",
+      "Search hint gets cut off after rotating screen"
+    ]
+  }
+]
diff --git a/data/src/main/java/com/moez/QKSMS/blocking/BlockingManager.kt b/data/src/main/java/com/moez/QKSMS/blocking/BlockingManager.kt
index 23d9e7586..62afcd0db 100644
--- a/data/src/main/java/com/moez/QKSMS/blocking/BlockingManager.kt
+++ b/data/src/main/java/com/moez/QKSMS/blocking/BlockingManager.kt
@@ -1,39 +1,39 @@
-package com.moez.QKSMS.blocking
-
-import com.moez.QKSMS.util.Preferences
-import io.reactivex.Completable
-import io.reactivex.Single
-import javax.inject.Inject
-import javax.inject.Singleton
-
-/**
- * Delegates requests to the active blocking client
- */
-@Singleton
-class BlockingManager @Inject constructor(
-    private val prefs: Preferences,
-    private val callControlBlockingClient: CallControlBlockingClient,
-    private val qksmsBlockingClient: QksmsBlockingClient,
-    private val shouldIAnswerBlockingClient: ShouldIAnswerBlockingClient
-) : BlockingClient {
-
-    private val client: BlockingClient
-        get() = when (prefs.blockingManager.get()) {
-            Preferences.BLOCKING_MANAGER_SIA -> shouldIAnswerBlockingClient
-            Preferences.BLOCKING_MANAGER_CC -> callControlBlockingClient
-            else -> qksmsBlockingClient
-        }
-
-    override fun isAvailable(): Boolean = client.isAvailable()
-
-    override fun getClientCapability(): BlockingClient.Capability = client.getClientCapability()
-
-    override fun getAction(address: String): Single<BlockingClient.Action> = client.getAction(address)
-
-    override fun block(addresses: List<String>): Completable = client.block(addresses)
-
-    override fun unblock(addresses: List<String>): Completable = client.unblock(addresses)
-
-    override fun openSettings() = client.openSettings()
-
-}
+package com.moez.QKSMS.blocking
+
+import com.moez.QKSMS.util.Preferences
+import io.reactivex.Completable
+import io.reactivex.Single
+import javax.inject.Inject
+import javax.inject.Singleton
+
+/**
+ * Delegates requests to the active blocking client
+ */
+@Singleton
+class BlockingManager @Inject constructor(
+    private val prefs: Preferences,
+    private val callControlBlockingClient: CallControlBlockingClient,
+    private val qksmsBlockingClient: QksmsBlockingClient,
+    private val shouldIAnswerBlockingClient: ShouldIAnswerBlockingClient
+) : BlockingClient {
+
+    private val client: BlockingClient
+        get() = when (prefs.blockingManager.get()) {
+            Preferences.BLOCKING_MANAGER_SIA -> shouldIAnswerBlockingClient
+            Preferences.BLOCKING_MANAGER_CC -> callControlBlockingClient
+            else -> qksmsBlockingClient
+        }
+
+    override fun isAvailable(): Boolean = client.isAvailable()
+
+    override fun getClientCapability(): BlockingClient.Capability = client.getClientCapability()
+
+    override fun getAction(address: String): Single<BlockingClient.Action> = client.getAction(address)
+
+    override fun block(addresses: List<String>): Completable = client.block(addresses)
+
+    override fun unblock(addresses: List<String>): Completable = client.unblock(addresses)
+
+    override fun openSettings() = client.openSettings()
+
+}
diff --git a/data/src/main/java/com/moez/QKSMS/blocking/CallControlBlockingClient.kt b/data/src/main/java/com/moez/QKSMS/blocking/CallControlBlockingClient.kt
index ada74816c..e02d5ba45 100644
--- a/data/src/main/java/com/moez/QKSMS/blocking/CallControlBlockingClient.kt
+++ b/data/src/main/java/com/moez/QKSMS/blocking/CallControlBlockingClient.kt
@@ -1,81 +1,81 @@
-/*
- * Copyright (C) 2017 Moez Bhatti <moez.bhatti@gmail.com>
- *
- * This file is part of QKSMS.
- *
- * QKSMS is free software: you can redistribute it and/or modify
- * it under the terms of the GNU General Public License as published by
- * the Free Software Foundation, either version 3 of the License, or
- * (at your option) any later version.
- *
- * QKSMS is distributed in the hope that it will be useful,
- * but WITHOUT ANY WARRANTY; without even the implied warranty of
- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
- * GNU General Public License for more details.
- *
- * You should have received a copy of the GNU General Public License
- * along with QKSMS.  If not, see <http://www.gnu.org/licenses/>.
- */
-package com.moez.QKSMS.blocking
-
-import android.content.Context
-import android.content.Intent
-import android.database.Cursor
-import android.net.Uri
-import androidx.core.database.getStringOrNull
-import com.callcontrol.datashare.CallControl
-import com.moez.QKSMS.common.util.extensions.isInstalled
-import com.moez.QKSMS.extensions.map
-import com.moez.QKSMS.util.tryOrNull
-import io.reactivex.Completable
-import io.reactivex.Single
-import javax.inject.Inject
-
-class CallControlBlockingClient @Inject constructor(
-    private val context: Context
-) : BlockingClient {
-
-    private val projection: Array<String> = arrayOf(
-            //CallControl.Lookup.DISPLAY_NAME, // This has a performance impact on the lookup, and we don't need it
-            CallControl.Lookup.BLOCK_REASON
-    )
-
-    class LookupResult(cursor: Cursor) {
-        val blockReason: String? = cursor.getStringOrNull(0)
-    }
-
-    override fun isAvailable(): Boolean = context.isInstalled("com.flexaspect.android.everycallcontrol")
-
-    override fun getClientCapability() = BlockingClient.Capability.BLOCK_WITH_PERMISSION
-
-    override fun getAction(address: String): Single<BlockingClient.Action> = Single.fromCallable {
-        val uri = Uri.withAppendedPath(CallControl.LOOKUP_TEXT_URI, address)
-        val blockReason = tryOrNull {
-            context.contentResolver.query(uri, projection, null, null, null) // Query URI
-                    ?.use { cursor -> cursor.map(::LookupResult) } // Map to Result object
-                    ?.find { result -> result.blockReason != null } // Check if any are blocked
-        }?.blockReason // If none are blocked or we errored at some point, return false
-
-        when (blockReason) {
-            null -> BlockingClient.Action.Unblock
-            else -> BlockingClient.Action.Block(blockReason)
-        }
-    }
-
-    override fun block(addresses: List<String>): Completable = Completable.fromCallable {
-        val reports = addresses.map { CallControl.Report(it) }
-        val reportsArrayList = arrayListOf<CallControl.Report>().apply { addAll(reports) }
-        CallControl.addRule(context, reportsArrayList, Intent.FLAG_ACTIVITY_NEW_TASK)
-    }
-
-    override fun unblock(addresses: List<String>): Completable = Completable.fromCallable {
-        val reports = addresses.map { CallControl.Report(it, null, false) }
-        val reportsArrayList = arrayListOf<CallControl.Report>().apply { addAll(reports) }
-        CallControl.addRule(context, reportsArrayList, Intent.FLAG_ACTIVITY_NEW_TASK)
-    }
-
-    override fun openSettings() {
-        CallControl.openBlockedList(context, Intent.FLAG_ACTIVITY_NEW_TASK)
-    }
-
-}
+/*
+ * Copyright (C) 2017 Moez Bhatti <moez.bhatti@gmail.com>
+ *
+ * This file is part of QKSMS.
+ *
+ * QKSMS is free software: you can redistribute it and/or modify
+ * it under the terms of the GNU General Public License as published by
+ * the Free Software Foundation, either version 3 of the License, or
+ * (at your option) any later version.
+ *
+ * QKSMS is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+ * GNU General Public License for more details.
+ *
+ * You should have received a copy of the GNU General Public License
+ * along with QKSMS.  If not, see <http://www.gnu.org/licenses/>.
+ */
+package com.moez.QKSMS.blocking
+
+import android.content.Context
+import android.content.Intent
+import android.database.Cursor
+import android.net.Uri
+import androidx.core.database.getStringOrNull
+import com.callcontrol.datashare.CallControl
+import com.moez.QKSMS.common.util.extensions.isInstalled
+import com.moez.QKSMS.extensions.map
+import com.moez.QKSMS.util.tryOrNull
+import io.reactivex.Completable
+import io.reactivex.Single
+import javax.inject.Inject
+
+class CallControlBlockingClient @Inject constructor(
+    private val context: Context
+) : BlockingClient {
+
+    private val projection: Array<String> = arrayOf(
+            //CallControl.Lookup.DISPLAY_NAME, // This has a performance impact on the lookup, and we don't need it
+            CallControl.Lookup.BLOCK_REASON
+    )
+
+    class LookupResult(cursor: Cursor) {
+        val blockReason: String? = cursor.getStringOrNull(0)
+    }
+
+    override fun isAvailable(): Boolean = context.isInstalled("com.flexaspect.android.everycallcontrol")
+
+    override fun getClientCapability() = BlockingClient.Capability.BLOCK_WITH_PERMISSION
+
+    override fun getAction(address: String): Single<BlockingClient.Action> = Single.fromCallable {
+        val uri = Uri.withAppendedPath(CallControl.LOOKUP_TEXT_URI, address)
+        val blockReason = tryOrNull {
+            context.contentResolver.query(uri, projection, null, null, null) // Query URI
+                    ?.use { cursor -> cursor.map(::LookupResult) } // Map to Result object
+                    ?.find { result -> result.blockReason != null } // Check if any are blocked
+        }?.blockReason // If none are blocked or we errored at some point, return false
+
+        when (blockReason) {
+            null -> BlockingClient.Action.Unblock
+            else -> BlockingClient.Action.Block(blockReason)
+        }
+    }
+
+    override fun block(addresses: List<String>): Completable = Completable.fromCallable {
+        val reports = addresses.map { CallControl.Report(it) }
+        val reportsArrayList = arrayListOf<CallControl.Report>().apply { addAll(reports) }
+        CallControl.addRule(context, reportsArrayList, Intent.FLAG_ACTIVITY_NEW_TASK)
+    }
+
+    override fun unblock(addresses: List<String>): Completable = Completable.fromCallable {
+        val reports = addresses.map { CallControl.Report(it, null, false) }
+        val reportsArrayList = arrayListOf<CallControl.Report>().apply { addAll(reports) }
+        CallControl.addRule(context, reportsArrayList, Intent.FLAG_ACTIVITY_NEW_TASK)
+    }
+
+    override fun openSettings() {
+        CallControl.openBlockedList(context, Intent.FLAG_ACTIVITY_NEW_TASK)
+    }
+
+}
diff --git a/data/src/main/java/com/moez/QKSMS/blocking/QksmsBlockingClient.kt b/data/src/main/java/com/moez/QKSMS/blocking/QksmsBlockingClient.kt
index 33be2b182..867b40427 100644
--- a/data/src/main/java/com/moez/QKSMS/blocking/QksmsBlockingClient.kt
+++ b/data/src/main/java/com/moez/QKSMS/blocking/QksmsBlockingClient.kt
@@ -1,51 +1,51 @@
-/*
- * Copyright (C) 2017 Moez Bhatti <moez.bhatti@gmail.com>
- *
- * This file is part of QKSMS.
- *
- * QKSMS is free software: you can redistribute it and/or modify
- * it under the terms of the GNU General Public License as published by
- * the Free Software Foundation, either version 3 of the License, or
- * (at your option) any later version.
- *
- * QKSMS is distributed in the hope that it will be useful,
- * but WITHOUT ANY WARRANTY; without even the implied warranty of
- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
- * GNU General Public License for more details.
- *
- * You should have received a copy of the GNU General Public License
- * along with QKSMS.  If not, see <http://www.gnu.org/licenses/>.
- */
-package com.moez.QKSMS.blocking
-
-import com.moez.QKSMS.repository.BlockingRepository
-import io.reactivex.Completable
-import io.reactivex.Single
-import javax.inject.Inject
-
-class QksmsBlockingClient @Inject constructor(
-    private val blockingRepo: BlockingRepository
-) : BlockingClient {
-
-    override fun isAvailable(): Boolean = true
-
-    override fun getClientCapability() = BlockingClient.Capability.BLOCK_WITHOUT_PERMISSION
-
-    override fun getAction(address: String): Single<BlockingClient.Action> = Single.fromCallable {
-        when (blockingRepo.isBlocked(address)) {
-            true -> BlockingClient.Action.Block()
-            false -> BlockingClient.Action.Unblock
-        }
-    }
-
-    override fun block(addresses: List<String>): Completable = Completable.fromCallable {
-        blockingRepo.blockNumber(*addresses.toTypedArray())
-    }
-
-    override fun unblock(addresses: List<String>): Completable = Completable.fromCallable {
-        blockingRepo.unblockNumbers(*addresses.toTypedArray())
-    }
-
-    override fun openSettings() = Unit // TODO: Do this here once we implement AndroidX navigation
-
-}
+/*
+ * Copyright (C) 2017 Moez Bhatti <moez.bhatti@gmail.com>
+ *
+ * This file is part of QKSMS.
+ *
+ * QKSMS is free software: you can redistribute it and/or modify
+ * it under the terms of the GNU General Public License as published by
+ * the Free Software Foundation, either version 3 of the License, or
+ * (at your option) any later version.
+ *
+ * QKSMS is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+ * GNU General Public License for more details.
+ *
+ * You should have received a copy of the GNU General Public License
+ * along with QKSMS.  If not, see <http://www.gnu.org/licenses/>.
+ */
+package com.moez.QKSMS.blocking
+
+import com.moez.QKSMS.repository.BlockingRepository
+import io.reactivex.Completable
+import io.reactivex.Single
+import javax.inject.Inject
+
+class QksmsBlockingClient @Inject constructor(
+    private val blockingRepo: BlockingRepository
+) : BlockingClient {
+
+    override fun isAvailable(): Boolean = true
+
+    override fun getClientCapability() = BlockingClient.Capability.BLOCK_WITHOUT_PERMISSION
+
+    override fun getAction(address: String): Single<BlockingClient.Action> = Single.fromCallable {
+        when (blockingRepo.isBlocked(address)) {
+            true -> BlockingClient.Action.Block()
+            false -> BlockingClient.Action.Unblock
+        }
+    }
+
+    override fun block(addresses: List<String>): Completable = Completable.fromCallable {
+        blockingRepo.blockNumber(*addresses.toTypedArray())
+    }
+
+    override fun unblock(addresses: List<String>): Completable = Completable.fromCallable {
+        blockingRepo.unblockNumbers(*addresses.toTypedArray())
+    }
+
+    override fun openSettings() = Unit // TODO: Do this here once we implement AndroidX navigation
+
+}
diff --git a/data/src/main/java/com/moez/QKSMS/blocking/ShouldIAnswerBlockingClient.kt b/data/src/main/java/com/moez/QKSMS/blocking/ShouldIAnswerBlockingClient.kt
index bfbc65a0c..be71eb5a7 100644
--- a/data/src/main/java/com/moez/QKSMS/blocking/ShouldIAnswerBlockingClient.kt
+++ b/data/src/main/java/com/moez/QKSMS/blocking/ShouldIAnswerBlockingClient.kt
@@ -1,155 +1,155 @@
-/*
- * Copyright (C) 2017 Moez Bhatti <moez.bhatti@gmail.com>
- *
- * This file is part of QKSMS.
- *
- * QKSMS is free software: you can redistribute it and/or modify
- * it under the terms of the GNU General Public License as published by
- * the Free Software Foundation, either version 3 of the License, or
- * (at your option) any later version.
- *
- * QKSMS is distributed in the hope that it will be useful,
- * but WITHOUT ANY WARRANTY; without even the implied warranty of
- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
- * GNU General Public License for more details.
- *
- * You should have received a copy of the GNU General Public License
- * along with QKSMS.  If not, see <http://www.gnu.org/licenses/>.
- */
-package com.moez.QKSMS.blocking
-
-import android.content.ComponentName
-import android.content.Context
-import android.content.Intent
-import android.content.ServiceConnection
-import android.os.Bundle
-import android.os.Handler
-import android.os.IBinder
-import android.os.Message
-import android.os.Messenger
-import androidx.core.os.bundleOf
-import com.moez.QKSMS.common.util.extensions.isInstalled
-import com.moez.QKSMS.util.tryOrNull
-import io.reactivex.Completable
-import io.reactivex.Single
-import io.reactivex.subjects.SingleSubject
-import javax.inject.Inject
-
-class ShouldIAnswerBlockingClient @Inject constructor(
-    private val context: Context
-) : BlockingClient {
-
-    companion object {
-        const val RATING_UNKNOWN = 0
-        const val RATING_POSITIVE = 1
-        const val RATING_NEGATIVE = 2
-        const val RATING_NEUTRAL = 3
-
-        const val GET_NUMBER_RATING = 1
-    }
-
-    override fun isAvailable(): Boolean = listOf("org.mistergroup.shouldianswer",
-            "org.mistergroup.shouldianswerpersonal",
-            "org.mistergroup.muzutozvednout")
-            .any(context::isInstalled)
-
-    override fun getClientCapability() = BlockingClient.Capability.CANT_BLOCK
-
-    override fun getAction(address: String): Single<BlockingClient.Action> {
-        return Binder(context, address).isBlocked()
-                .map { blocked ->
-                    when (blocked) {
-                        true -> BlockingClient.Action.Block()
-                        false -> BlockingClient.Action.DoNothing
-                    }
-                }
-    }
-
-    override fun block(addresses: List<String>): Completable = Completable.fromCallable { openSettings() }
-
-    override fun unblock(addresses: List<String>): Completable = Completable.fromCallable { openSettings() }
-
-    override fun openSettings() {
-        val pm = context.packageManager
-        val intent = pm.getLaunchIntentForPackage("org.mistergroup.shouldianswer")
-                ?: pm.getLaunchIntentForPackage("org.mistergroup.shouldianswerpersonal")
-                ?: pm.getLaunchIntentForPackage("org.mistergroup.muzutozvednout")
-
-        intent?.run(context::startActivity)
-    }
-
-    private class Binder(
-        private val context: Context,
-        private val address: String
-    ) : ServiceConnection {
-
-        private val subject: SingleSubject<Boolean> = SingleSubject.create()
-        private var serviceMessenger: Messenger? = null
-        private var isBound: Boolean = false
-
-        fun isBlocked(): Single<Boolean> {
-            // If either version of Should I Answer? is installed and SIA is enabled, build the
-            // intent to request a rating
-            val intent: Intent? = tryOrNull(false) {
-                context.packageManager.getApplicationInfo("org.mistergroup.shouldianswer", 0).enabled
-                Intent("org.mistergroup.shouldianswer.PublicService").setPackage("org.mistergroup.shouldianswer")
-            } ?: tryOrNull(false) {
-                context.packageManager.getApplicationInfo("org.mistergroup.shouldianswerpersonal", 0).enabled
-                Intent("org.mistergroup.shouldianswerpersonal.PublicService")
-                        .setPackage("org.mistergroup.shouldianswerpersonal")
-            } ?: tryOrNull(false) {
-                context.packageManager.getApplicationInfo("org.mistergroup.muzutozvednout", 0).enabled
-                Intent("org.mistergroup.muzutozvednout.PublicService").setPackage("org.mistergroup.muzutozvednout")
-            }
-
-            // If the intent isn't null, bind the service and wait for a result. Otherwise, don't block
-            if (intent != null) {
-                context.bindService(intent, this, Context.BIND_AUTO_CREATE)
-            } else {
-                subject.onSuccess(false)
-            }
-
-            return subject
-        }
-
-        override fun onServiceConnected(className: ComponentName, service: IBinder) {
-            serviceMessenger = Messenger(service)
-            isBound = true
-
-            val message = Message().apply {
-                what = GET_NUMBER_RATING
-                data = bundleOf("number" to address)
-                replyTo = Messenger(IncomingHandler { response ->
-                    subject.onSuccess(response.rating == RATING_NEGATIVE || response.wantBlock)
-
-                    // We're done, so unbind the service
-                    if (isBound && serviceMessenger != null) {
-                        context.unbindService(this@Binder)
-                    }
-                })
-            }
-
-            serviceMessenger?.send(message)
-        }
-
-        override fun onServiceDisconnected(className: ComponentName) {
-            serviceMessenger = null
-            isBound = false
-        }
-    }
-
-    private class IncomingHandler(private val callback: (response: Response) -> Unit) : Handler() {
-        class Response(bundle: Bundle) {
-            val rating: Int = bundle.getInt("rating")
-            val wantBlock = bundle.getInt("wantBlock") == 1
-        }
-
-        override fun handleMessage(msg: Message) {
-            when (msg.what) {
-                GET_NUMBER_RATING -> callback(Response(msg.data))
-                else -> super.handleMessage(msg)
-            }
-        }
-    }
-
-}
+/*
+ * Copyright (C) 2017 Moez Bhatti <moez.bhatti@gmail.com>
+ *
+ * This file is part of QKSMS.
+ *
+ * QKSMS is free software: you can redistribute it and/or modify
+ * it under the terms of the GNU General Public License as published by
+ * the Free Software Foundation, either version 3 of the License, or
+ * (at your option) any later version.
+ *
+ * QKSMS is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+ * GNU General Public License for more details.
+ *
+ * You should have received a copy of the GNU General Public License
+ * along with QKSMS.  If not, see <http://www.gnu.org/licenses/>.
+ */
+package com.moez.QKSMS.blocking
+
+import android.content.ComponentName
+import android.content.Context
+import android.content.Intent
+import android.content.ServiceConnection
+import android.os.Bundle
+import android.os.Handler
+import android.os.IBinder
+import android.os.Message
+import android.os.Messenger
+import androidx.core.os.bundleOf
+import com.moez.QKSMS.common.util.extensions.isInstalled
+import com.moez.QKSMS.util.tryOrNull
+import io.reactivex.Completable
+import io.reactivex.Single
+import io.reactivex.subjects.SingleSubject
+import javax.inject.Inject
+
+class ShouldIAnswerBlockingClient @Inject constructor(
+    private val context: Context
+) : BlockingClient {
+
+    companion object {
+        const val RATING_UNKNOWN = 0
+        const val RATING_POSITIVE = 1
+        const val RATING_NEGATIVE = 2
+        const val RATING_NEUTRAL = 3
+
+        const val GET_NUMBER_RATING = 1
+    }
+
+    override fun isAvailable(): Boolean = listOf("org.mistergroup.shouldianswer",
+            "org.mistergroup.shouldianswerpersonal",
+            "org.mistergroup.muzutozvednout")
+            .any(context::isInstalled)
+
+    override fun getClientCapability() = BlockingClient.Capability.CANT_BLOCK
+
+    override fun getAction(address: String): Single<BlockingClient.Action> {
+        return Binder(context, address).isBlocked()
+                .map { blocked ->
+                    when (blocked) {
+                        true -> BlockingClient.Action.Block()
+                        false -> BlockingClient.Action.DoNothing
+                    }
+                }
+    }
+
+    override fun block(addresses: List<String>): Completable = Completable.fromCallable { openSettings() }
+
+    override fun unblock(addresses: List<String>): Completable = Completable.fromCallable { openSettings() }
+
+    override fun openSettings() {
+        val pm = context.packageManager
+        val intent = pm.getLaunchIntentForPackage("org.mistergroup.shouldianswer")
+                ?: pm.getLaunchIntentForPackage("org.mistergroup.shouldianswerpersonal")
+                ?: pm.getLaunchIntentForPackage("org.mistergroup.muzutozvednout")
+
+        intent?.run(context::startActivity)
+    }
+
+    private class Binder(
+        private val context: Context,
+        private val address: String
+    ) : ServiceConnection {
+
+        private val subject: SingleSubject<Boolean> = SingleSubject.create()
+        private var serviceMessenger: Messenger? = null
+        private var isBound: Boolean = false
+
+        fun isBlocked(): Single<Boolean> {
+            // If either version of Should I Answer? is installed and SIA is enabled, build the
+            // intent to request a rating
+            val intent: Intent? = tryOrNull(false) {
+                context.packageManager.getApplicationInfo("org.mistergroup.shouldianswer", 0).enabled
+                Intent("org.mistergroup.shouldianswer.PublicService").setPackage("org.mistergroup.shouldianswer")
+            } ?: tryOrNull(false) {
+                context.packageManager.getApplicationInfo("org.mistergroup.shouldianswerpersonal", 0).enabled
+                Intent("org.mistergroup.shouldianswerpersonal.PublicService")
+                        .setPackage("org.mistergroup.shouldianswerpersonal")
+            } ?: tryOrNull(false) {
+                context.packageManager.getApplicationInfo("org.mistergroup.muzutozvednout", 0).enabled
+                Intent("org.mistergroup.muzutozvednout.PublicService").setPackage("org.mistergroup.muzutozvednout")
+            }
+
+            // If the intent isn't null, bind the service and wait for a result. Otherwise, don't block
+            if (intent != null) {
+                context.bindService(intent, this, Context.BIND_AUTO_CREATE)
+            } else {
+                subject.onSuccess(false)
+            }
+
+            return subject
+        }
+
+        override fun onServiceConnected(className: ComponentName, service: IBinder) {
+            serviceMessenger = Messenger(service)
+            isBound = true
+
+            val message = Message().apply {
+                what = GET_NUMBER_RATING
+                data = bundleOf("number" to address)
+                replyTo = Messenger(IncomingHandler { response ->
+                    subject.onSuccess(response.rating == RATING_NEGATIVE || response.wantBlock)
+
+                    // We're done, so unbind the service
+                    if (isBound && serviceMessenger != null) {
+                        context.unbindService(this@Binder)
+                    }
+                })
+            }
+
+            serviceMessenger?.send(message)
+        }
+
+        override fun onServiceDisconnected(className: ComponentName) {
+            serviceMessenger = null
+            isBound = false
+        }
+    }
+
+    private class IncomingHandler(private val callback: (response: Response) -> Unit) : Handler() {
+        class Response(bundle: Bundle) {
+            val rating: Int = bundle.getInt("rating")
+            val wantBlock = bundle.getInt("wantBlock") == 1
+        }
+
+        override fun handleMessage(msg: Message) {
+            when (msg.what) {
+                GET_NUMBER_RATING -> callback(Response(msg.data))
+                else -> super.handleMessage(msg)
+            }
+        }
+    }
+
+}
diff --git a/data/src/main/java/com/moez/QKSMS/compat/SubscriptionInfoCompat.kt b/data/src/main/java/com/moez/QKSMS/compat/SubscriptionInfoCompat.kt
index f6674e4c6..063020d12 100644
--- a/data/src/main/java/com/moez/QKSMS/compat/SubscriptionInfoCompat.kt
+++ b/data/src/main/java/com/moez/QKSMS/compat/SubscriptionInfoCompat.kt
@@ -1,34 +1,34 @@
-/*
- * Copyright (C) 2017 Moez Bhatti <moez.bhatti@gmail.com>
- *
- * This file is part of QKSMS.
- *
- * QKSMS is free software: you can redistribute it and/or modify
- * it under the terms of the GNU General Public License as published by
- * the Free Software Foundation, either version 3 of the License, or
- * (at your option) any later version.
- *
- * QKSMS is distributed in the hope that it will be useful,
- * but WITHOUT ANY WARRANTY; without even the implied warranty of
- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
- * GNU General Public License for more details.
- *
- * You should have received a copy of the GNU General Public License
- * along with QKSMS.  If not, see <http://www.gnu.org/licenses/>.
- */
-package com.moez.QKSMS.compat
-
-import android.annotation.TargetApi
-import android.os.Build
-import android.telephony.SubscriptionInfo
-
-@TargetApi(Build.VERSION_CODES.LOLLIPOP_MR1)
-data class SubscriptionInfoCompat(private val subscriptionInfo: SubscriptionInfo) {
-
-    val subscriptionId get() = subscriptionInfo.subscriptionId
-
-    val simSlotIndex get() = subscriptionInfo.simSlotIndex
-
-    val displayName get() = subscriptionInfo.displayName
-
+/*
+ * Copyright (C) 2017 Moez Bhatti <moez.bhatti@gmail.com>
+ *
+ * This file is part of QKSMS.
+ *
+ * QKSMS is free software: you can redistribute it and/or modify
+ * it under the terms of the GNU General Public License as published by
+ * the Free Software Foundation, either version 3 of the License, or
+ * (at your option) any later version.
+ *
+ * QKSMS is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+ * GNU General Public License for more details.
+ *
+ * You should have received a copy of the GNU General Public License
+ * along with QKSMS.  If not, see <http://www.gnu.org/licenses/>.
+ */
+package com.moez.QKSMS.compat
+
+import android.annotation.TargetApi
+import android.os.Build
+import android.telephony.SubscriptionInfo
+
+@TargetApi(Build.VERSION_CODES.LOLLIPOP_MR1)
+data class SubscriptionInfoCompat(private val subscriptionInfo: SubscriptionInfo) {
+
+    val subscriptionId get() = subscriptionInfo.subscriptionId
+
+    val simSlotIndex get() = subscriptionInfo.simSlotIndex
+
+    val displayName get() = subscriptionInfo.displayName
+
 }
\ No newline at end of file
diff --git a/data/src/main/java/com/moez/QKSMS/compat/SubscriptionManagerCompat.kt b/data/src/main/java/com/moez/QKSMS/compat/SubscriptionManagerCompat.kt
index fb6174ff4..c2c56ebd4 100644
--- a/data/src/main/java/com/moez/QKSMS/compat/SubscriptionManagerCompat.kt
+++ b/data/src/main/java/com/moez/QKSMS/compat/SubscriptionManagerCompat.kt
@@ -1,69 +1,69 @@
-/*
- * Copyright (C) 2017 Moez Bhatti <moez.bhatti@gmail.com>
- *
- * This file is part of QKSMS.
- *
- * QKSMS is free software: you can redistribute it and/or modify
- * it under the terms of the GNU General Public License as published by
- * the Free Software Foundation, either version 3 of the License, or
- * (at your option) any later version.
- *
- * QKSMS is distributed in the hope that it will be useful,
- * but WITHOUT ANY WARRANTY; without even the implied warranty of
- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
- * GNU General Public License for more details.
- *
- * You should have received a copy of the GNU General Public License
- * along with QKSMS.  If not, see <http://www.gnu.org/licenses/>.
- */
-package com.moez.QKSMS.compat
-
-import android.content.Context
-import android.os.Build
-import android.telephony.SubscriptionManager
-import com.moez.QKSMS.manager.PermissionManager
-import javax.inject.Inject
-
-class SubscriptionManagerCompat @Inject constructor(context: Context, private val permissions: PermissionManager) {
-
-    private val subscriptionManager: SubscriptionManager?
-        get() = field?.takeIf { permissions.hasPhone() }
-
-    val activeSubscriptionInfoList: List<SubscriptionInfoCompat>
-        get() {
-            return if (Build.VERSION.SDK_INT >= 22) {
-                subscriptionManager?.activeSubscriptionInfoList?.map { SubscriptionInfoCompat(it) } ?: listOf()
-            } else listOf()
-        }
-
-    init {
-        subscriptionManager = if (Build.VERSION.SDK_INT >= 22) SubscriptionManager.from(context) else null
-    }
-
-    fun addOnSubscriptionsChangedListener(listener: OnSubscriptionsChangedListener) {
-        if (Build.VERSION.SDK_INT >= 22) {
-            subscriptionManager?.addOnSubscriptionsChangedListener(listener.listener)
-        }
-    }
-
-    fun removeOnSubscriptionsChangedListener(listener: OnSubscriptionsChangedListener) {
-        if (Build.VERSION.SDK_INT >= 22) {
-            subscriptionManager?.removeOnSubscriptionsChangedListener(listener.listener)
-        }
-    }
-
-    abstract class OnSubscriptionsChangedListener {
-
-        val listener: SubscriptionManager.OnSubscriptionsChangedListener? = if (Build.VERSION.SDK_INT >= 22) {
-            object : SubscriptionManager.OnSubscriptionsChangedListener() {
-                override fun onSubscriptionsChanged() {
-                    this@OnSubscriptionsChangedListener.onSubscriptionsChanged()
-                }
-            }
-        } else null
-
-        abstract fun onSubscriptionsChanged()
-
-    }
-
+/*
+ * Copyright (C) 2017 Moez Bhatti <moez.bhatti@gmail.com>
+ *
+ * This file is part of QKSMS.
+ *
+ * QKSMS is free software: you can redistribute it and/or modify
+ * it under the terms of the GNU General Public License as published by
+ * the Free Software Foundation, either version 3 of the License, or
+ * (at your option) any later version.
+ *
+ * QKSMS is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+ * GNU General Public License for more details.
+ *
+ * You should have received a copy of the GNU General Public License
+ * along with QKSMS.  If not, see <http://www.gnu.org/licenses/>.
+ */
+package com.moez.QKSMS.compat
+
+import android.content.Context
+import android.os.Build
+import android.telephony.SubscriptionManager
+import com.moez.QKSMS.manager.PermissionManager
+import javax.inject.Inject
+
+class SubscriptionManagerCompat @Inject constructor(context: Context, private val permissions: PermissionManager) {
+
+    private val subscriptionManager: SubscriptionManager?
+        get() = field?.takeIf { permissions.hasPhone() }
+
+    val activeSubscriptionInfoList: List<SubscriptionInfoCompat>
+        get() {
+            return if (Build.VERSION.SDK_INT >= 22) {
+                subscriptionManager?.activeSubscriptionInfoList?.map { SubscriptionInfoCompat(it) } ?: listOf()
+            } else listOf()
+        }
+
+    init {
+        subscriptionManager = if (Build.VERSION.SDK_INT >= 22) SubscriptionManager.from(context) else null
+    }
+
+    fun addOnSubscriptionsChangedListener(listener: OnSubscriptionsChangedListener) {
+        if (Build.VERSION.SDK_INT >= 22) {
+            subscriptionManager?.addOnSubscriptionsChangedListener(listener.listener)
+        }
+    }
+
+    fun removeOnSubscriptionsChangedListener(listener: OnSubscriptionsChangedListener) {
+        if (Build.VERSION.SDK_INT >= 22) {
+            subscriptionManager?.removeOnSubscriptionsChangedListener(listener.listener)
+        }
+    }
+
+    abstract class OnSubscriptionsChangedListener {
+
+        val listener: SubscriptionManager.OnSubscriptionsChangedListener? = if (Build.VERSION.SDK_INT >= 22) {
+            object : SubscriptionManager.OnSubscriptionsChangedListener() {
+                override fun onSubscriptionsChanged() {
+                    this@OnSubscriptionsChangedListener.onSubscriptionsChanged()
+                }
+            }
+        } else null
+
+        abstract fun onSubscriptionsChanged()
+
+    }
+
 }
\ No newline at end of file
diff --git a/data/src/main/java/com/moez/QKSMS/extensions/CollectionExtensions.kt b/data/src/main/java/com/moez/QKSMS/extensions/CollectionExtensions.kt
index e22d70dd8..a6e07453f 100644
--- a/data/src/main/java/com/moez/QKSMS/extensions/CollectionExtensions.kt
+++ b/data/src/main/java/com/moez/QKSMS/extensions/CollectionExtensions.kt
@@ -1,13 +1,13 @@
-package com.moez.QKSMS.extensions
-
-inline fun <K, T> Iterable<T>.associateByNotNull(keySelector: (T) -> K?): Map<K, T> {
-    val map = hashMapOf<K, T>()
-    forEach { value ->
-        val key = keySelector(value)
-        if (key != null) {
-            map[key] = value
-        }
-    }
-
-    return map
-}
+package com.moez.QKSMS.extensions
+
+inline fun <K, T> Iterable<T>.associateByNotNull(keySelector: (T) -> K?): Map<K, T> {
+    val map = hashMapOf<K, T>()
+    forEach { value ->
+        val key = keySelector(value)
+        if (key != null) {
+            map[key] = value
+        }
+    }
+
+    return map
+}
diff --git a/data/src/main/java/com/moez/QKSMS/extensions/CursorExtensions.kt b/data/src/main/java/com/moez/QKSMS/extensions/CursorExtensions.kt
index a23e95b25..f5fb6afe3 100644
--- a/data/src/main/java/com/moez/QKSMS/extensions/CursorExtensions.kt
+++ b/data/src/main/java/com/moez/QKSMS/extensions/CursorExtensions.kt
@@ -1,68 +1,68 @@
-/*
- * Copyright (C) 2017 Moez Bhatti <moez.bhatti@gmail.com>
- *
- * This file is part of QKSMS.
- *
- * QKSMS is free software: you can redistribute it and/or modify
- * it under the terms of the GNU General Public License as published by
- * the Free Software Foundation, either version 3 of the License, or
- * (at your option) any later version.
- *
- * QKSMS is distributed in the hope that it will be useful,
- * but WITHOUT ANY WARRANTY; without even the implied warranty of
- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
- * GNU General Public License for more details.
- *
- * You should have received a copy of the GNU General Public License
- * along with QKSMS.  If not, see <http://www.gnu.org/licenses/>.
- */
-package com.moez.QKSMS.extensions
-
-import android.database.Cursor
-import io.reactivex.Flowable
-
-fun Cursor.forEach(closeOnComplete: Boolean = true, method: (Cursor) -> Unit = {}) {
-    moveToPosition(-1)
-    while (moveToNext()) {
-        method.invoke(this)
-    }
-
-    if (closeOnComplete) {
-        close()
-    }
-}
-
-fun <T> Cursor.map(map: (Cursor) -> T): List<T> {
-    return List(count) { position ->
-        moveToPosition(position)
-        map(this)
-    }
-}
-
-/**
- * We're using this simple implementation with .range() because of the
- * complexities of dealing with Backpressure with a Cursor. We can't simply
- * use a loop and call onNext() from a generator because we'll need to close
- * the cursor at the end, and if any items are still in the buffer, then
- * they will be made invalid
- */
-fun Cursor.asFlowable(): Flowable<Cursor> {
-    return Flowable.range(0, count)
-            .map {
-                moveToPosition(it)
-                this
-            }
-            .doOnComplete { close() }
-}
-
-/**
- * Dumps the contents of the cursor as a CSV string
- */
-fun Cursor.dump(): String {
-    val lines = mutableListOf<String>()
-
-    lines += columnNames.joinToString(",")
-    forEach { lines += (0 until columnCount).joinToString(",", transform = ::getString) }
-
-    return lines.joinToString("\n")
-}
+/*
+ * Copyright (C) 2017 Moez Bhatti <moez.bhatti@gmail.com>
+ *
+ * This file is part of QKSMS.
+ *
+ * QKSMS is free software: you can redistribute it and/or modify
+ * it under the terms of the GNU General Public License as published by
+ * the Free Software Foundation, either version 3 of the License, or
+ * (at your option) any later version.
+ *
+ * QKSMS is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+ * GNU General Public License for more details.
+ *
+ * You should have received a copy of the GNU General Public License
+ * along with QKSMS.  If not, see <http://www.gnu.org/licenses/>.
+ */
+package com.moez.QKSMS.extensions
+
+import android.database.Cursor
+import io.reactivex.Flowable
+
+fun Cursor.forEach(closeOnComplete: Boolean = true, method: (Cursor) -> Unit = {}) {
+    moveToPosition(-1)
+    while (moveToNext()) {
+        method.invoke(this)
+    }
+
+    if (closeOnComplete) {
+        close()
+    }
+}
+
+fun <T> Cursor.map(map: (Cursor) -> T): List<T> {
+    return List(count) { position ->
+        moveToPosition(position)
+        map(this)
+    }
+}
+
+/**
+ * We're using this simple implementation with .range() because of the
+ * complexities of dealing with Backpressure with a Cursor. We can't simply
+ * use a loop and call onNext() from a generator because we'll need to close
+ * the cursor at the end, and if any items are still in the buffer, then
+ * they will be made invalid
+ */
+fun Cursor.asFlowable(): Flowable<Cursor> {
+    return Flowable.range(0, count)
+            .map {
+                moveToPosition(it)
+                this
+            }
+            .doOnComplete { close() }
+}
+
+/**
+ * Dumps the contents of the cursor as a CSV string
+ */
+fun Cursor.dump(): String {
+    val lines = mutableListOf<String>()
+
+    lines += columnNames.joinToString(",")
+    forEach { lines += (0 until columnCount).joinToString(",", transform = ::getString) }
+
+    return lines.joinToString("\n")
+}
diff --git a/data/src/main/java/com/moez/QKSMS/extensions/MmsPartExtensions.kt b/data/src/main/java/com/moez/QKSMS/extensions/MmsPartExtensions.kt
index ea890c8c9..dd9ec1df3 100644
--- a/data/src/main/java/com/moez/QKSMS/extensions/MmsPartExtensions.kt
+++ b/data/src/main/java/com/moez/QKSMS/extensions/MmsPartExtensions.kt
@@ -1,32 +1,32 @@
-/*
- * Copyright (C) 2017 Moez Bhatti <moez.bhatti@gmail.com>
- *
- * This file is part of QKSMS.
- *
- * QKSMS is free software: you can redistribute it and/or modify
- * it under the terms of the GNU General Public License as published by
- * the Free Software Foundation, either version 3 of the License, or
- * (at your option) any later version.
- *
- * QKSMS is distributed in the hope that it will be useful,
- * but WITHOUT ANY WARRANTY; without even the implied warranty of
- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
- * GNU General Public License for more details.
- *
- * You should have received a copy of the GNU General Public License
- * along with QKSMS.  If not, see <http://www.gnu.org/licenses/>.
- */
-package com.moez.QKSMS.extensions
-
-import com.google.android.mms.ContentType
-import com.moez.QKSMS.model.MmsPart
-
-fun MmsPart.isSmil() = ContentType.APP_SMIL == type
-
-fun MmsPart.isImage() = ContentType.isImageType(type)
-
-fun MmsPart.isVideo() = ContentType.isVideoType(type)
-
-fun MmsPart.isText() = ContentType.TEXT_PLAIN == type
-
-fun MmsPart.isVCard() = ContentType.TEXT_VCARD == type
+/*
+ * Copyright (C) 2017 Moez Bhatti <moez.bhatti@gmail.com>
+ *
+ * This file is part of QKSMS.
+ *
+ * QKSMS is free software: you can redistribute it and/or modify
+ * it under the terms of the GNU General Public License as published by
+ * the Free Software Foundation, either version 3 of the License, or
+ * (at your option) any later version.
+ *
+ * QKSMS is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+ * GNU General Public License for more details.
+ *
+ * You should have received a copy of the GNU General Public License
+ * along with QKSMS.  If not, see <http://www.gnu.org/licenses/>.
+ */
+package com.moez.QKSMS.extensions
+
+import com.google.android.mms.ContentType
+import com.moez.QKSMS.model.MmsPart
+
+fun MmsPart.isSmil() = ContentType.APP_SMIL == type
+
+fun MmsPart.isImage() = ContentType.isImageType(type)
+
+fun MmsPart.isVideo() = ContentType.isVideoType(type)
+
+fun MmsPart.isText() = ContentType.TEXT_PLAIN == type
+
+fun MmsPart.isVCard() = ContentType.TEXT_VCARD == type
diff --git a/data/src/main/java/com/moez/QKSMS/extensions/RealmExtensions.kt b/data/src/main/java/com/moez/QKSMS/extensions/RealmExtensions.kt
index c6ee74d93..2d4bb3e1d 100644
--- a/data/src/main/java/com/moez/QKSMS/extensions/RealmExtensions.kt
+++ b/data/src/main/java/com/moez/QKSMS/extensions/RealmExtensions.kt
@@ -1,53 +1,53 @@
-/*
- * Copyright (C) 2017 Moez Bhatti <moez.bhatti@gmail.com>
- *
- * This file is part of QKSMS.
- *
- * QKSMS is free software: you can redistribute it and/or modify
- * it under the terms of the GNU General Public License as published by
- * the Free Software Foundation, either version 3 of the License, or
- * (at your option) any later version.
- *
- * QKSMS is distributed in the hope that it will be useful,
- * but WITHOUT ANY WARRANTY; without even the implied warranty of
- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
- * GNU General Public License for more details.
- *
- * You should have received a copy of the GNU General Public License
- * along with QKSMS.  If not, see <http://www.gnu.org/licenses/>.
- */
-package com.moez.QKSMS.extensions
-
-import io.reactivex.Observable
-import io.realm.Realm
-import io.realm.RealmModel
-import io.realm.RealmObject
-import io.realm.RealmQuery
-import io.realm.RealmResults
-
-fun RealmModel.insertOrUpdate() {
-    val realm = Realm.getDefaultInstance()
-    realm.executeTransaction { realm.insertOrUpdate(this) }
-    realm.close()
-}
-
-fun <T : RealmModel> Collection<T>.insertOrUpdate() {
-    val realm = Realm.getDefaultInstance()
-    realm.executeTransaction { realm.insertOrUpdate(this) }
-    realm.close()
-}
-
-fun <T : RealmObject> T.asObservable(): Observable<T> {
-    return asFlowable<T>().toObservable()
-}
-
-fun <T : RealmObject> RealmResults<T>.asObservable(): Observable<RealmResults<T>> {
-    return asFlowable().toObservable()
-}
-
-fun <T : RealmObject> RealmQuery<T>.anyOf(fieldName: String, values: LongArray): RealmQuery<T> {
-    return when (values.isEmpty()) {
-        true -> equalTo(fieldName, -1L)
-        false -> `in`(fieldName, values.toTypedArray())
-    }
+/*
+ * Copyright (C) 2017 Moez Bhatti <moez.bhatti@gmail.com>
+ *
+ * This file is part of QKSMS.
+ *
+ * QKSMS is free software: you can redistribute it and/or modify
+ * it under the terms of the GNU General Public License as published by
+ * the Free Software Foundation, either version 3 of the License, or
+ * (at your option) any later version.
+ *
+ * QKSMS is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+ * GNU General Public License for more details.
+ *
+ * You should have received a copy of the GNU General Public License
+ * along with QKSMS.  If not, see <http://www.gnu.org/licenses/>.
+ */
+package com.moez.QKSMS.extensions
+
+import io.reactivex.Observable
+import io.realm.Realm
+import io.realm.RealmModel
+import io.realm.RealmObject
+import io.realm.RealmQuery
+import io.realm.RealmResults
+
+fun RealmModel.insertOrUpdate() {
+    val realm = Realm.getDefaultInstance()
+    realm.executeTransaction { realm.insertOrUpdate(this) }
+    realm.close()
+}
+
+fun <T : RealmModel> Collection<T>.insertOrUpdate() {
+    val realm = Realm.getDefaultInstance()
+    realm.executeTransaction { realm.insertOrUpdate(this) }
+    realm.close()
+}
+
+fun <T : RealmObject> T.asObservable(): Observable<T> {
+    return asFlowable<T>().toObservable()
+}
+
+fun <T : RealmObject> RealmResults<T>.asObservable(): Observable<RealmResults<T>> {
+    return asFlowable().toObservable()
+}
+
+fun <T : RealmObject> RealmQuery<T>.anyOf(fieldName: String, values: LongArray): RealmQuery<T> {
+    return when (values.isEmpty()) {
+        true -> equalTo(fieldName, -1L)
+        false -> `in`(fieldName, values.toTypedArray())
+    }
 }
\ No newline at end of file
diff --git a/data/src/main/java/com/moez/QKSMS/extensions/StringExtensions.kt b/data/src/main/java/com/moez/QKSMS/extensions/StringExtensions.kt
index 1ef0a6eda..019090a38 100644
--- a/data/src/main/java/com/moez/QKSMS/extensions/StringExtensions.kt
+++ b/data/src/main/java/com/moez/QKSMS/extensions/StringExtensions.kt
@@ -1,26 +1,26 @@
-/*
- * Copyright (C) 2017 Moez Bhatti <moez.bhatti@gmail.com>
- *
- * This file is part of QKSMS.
- *
- * QKSMS is free software: you can redistribute it and/or modify
- * it under the terms of the GNU General Public License as published by
- * the Free Software Foundation, either version 3 of the License, or
- * (at your option) any later version.
- *
- * QKSMS is distributed in the hope that it will be useful,
- * but WITHOUT ANY WARRANTY; without even the implied warranty of
- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
- * GNU General Public License for more details.
- *
- * You should have received a copy of the GNU General Public License
- * along with QKSMS.  If not, see <http://www.gnu.org/licenses/>.
- */
-package com.moez.QKSMS.extensions
-
-import java.text.Normalizer
-
-/**
- * Strip the accents from a string
- */
-fun CharSequence.removeAccents(): String = Normalizer.normalize(this, Normalizer.Form.NFKD).replace(Regex("\\p{M}"), "")
+/*
+ * Copyright (C) 2017 Moez Bhatti <moez.bhatti@gmail.com>
+ *
+ * This file is part of QKSMS.
+ *
+ * QKSMS is free software: you can redistribute it and/or modify
+ * it under the terms of the GNU General Public License as published by
+ * the Free Software Foundation, either version 3 of the License, or
+ * (at your option) any later version.
+ *
+ * QKSMS is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+ * GNU General Public License for more details.
+ *
+ * You should have received a copy of the GNU General Public License
+ * along with QKSMS.  If not, see <http://www.gnu.org/licenses/>.
+ */
+package com.moez.QKSMS.extensions
+
+import java.text.Normalizer
+
+/**
+ * Strip the accents from a string
+ */
+fun CharSequence.removeAccents(): String = Normalizer.normalize(this, Normalizer.Form.NFKD).replace(Regex("\\p{M}"), "")
diff --git a/data/src/main/java/com/moez/QKSMS/filter/ContactFilter.kt b/data/src/main/java/com/moez/QKSMS/filter/ContactFilter.kt
index 6010c7b30..3960220d4 100644
--- a/data/src/main/java/com/moez/QKSMS/filter/ContactFilter.kt
+++ b/data/src/main/java/com/moez/QKSMS/filter/ContactFilter.kt
@@ -1,32 +1,32 @@
-/*
- * Copyright (C) 2017 Moez Bhatti <moez.bhatti@gmail.com>
- *
- * This file is part of QKSMS.
- *
- * QKSMS is free software: you can redistribute it and/or modify
- * it under the terms of the GNU General Public License as published by
- * the Free Software Foundation, either version 3 of the License, or
- * (at your option) any later version.
- *
- * QKSMS is distributed in the hope that it will be useful,
- * but WITHOUT ANY WARRANTY; without even the implied warranty of
- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
- * GNU General Public License for more details.
- *
- * You should have received a copy of the GNU General Public License
- * along with QKSMS.  If not, see <http://www.gnu.org/licenses/>.
- */
-package com.moez.QKSMS.filter
-
-import com.moez.QKSMS.extensions.removeAccents
-import com.moez.QKSMS.model.Contact
-import javax.inject.Inject
-
-class ContactFilter @Inject constructor(private val phoneNumberFilter: PhoneNumberFilter) : Filter<Contact>() {
-
-    override fun filter(item: Contact, query: CharSequence): Boolean {
-        return item.name.removeAccents().contains(query, true) || // Name
-                item.numbers.map { it.address }.any { address -> phoneNumberFilter.filter(address, query) } // Number
-    }
-
-}
+/*
+ * Copyright (C) 2017 Moez Bhatti <moez.bhatti@gmail.com>
+ *
+ * This file is part of QKSMS.
+ *
+ * QKSMS is free software: you can redistribute it and/or modify
+ * it under the terms of the GNU General Public License as published by
+ * the Free Software Foundation, either version 3 of the License, or
+ * (at your option) any later version.
+ *
+ * QKSMS is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+ * GNU General Public License for more details.
+ *
+ * You should have received a copy of the GNU General Public License
+ * along with QKSMS.  If not, see <http://www.gnu.org/licenses/>.
+ */
+package com.moez.QKSMS.filter
+
+import com.moez.QKSMS.extensions.removeAccents
+import com.moez.QKSMS.model.Contact
+import javax.inject.Inject
+
+class ContactFilter @Inject constructor(private val phoneNumberFilter: PhoneNumberFilter) : Filter<Contact>() {
+
+    override fun filter(item: Contact, query: CharSequence): Boolean {
+        return item.name.removeAccents().contains(query, true) || // Name
+                item.numbers.map { it.address }.any { address -> phoneNumberFilter.filter(address, query) } // Number
+    }
+
+}
diff --git a/data/src/main/java/com/moez/QKSMS/filter/ContactGroupFilter.kt b/data/src/main/java/com/moez/QKSMS/filter/ContactGroupFilter.kt
index 903e16fd8..613420c95 100644
--- a/data/src/main/java/com/moez/QKSMS/filter/ContactGroupFilter.kt
+++ b/data/src/main/java/com/moez/QKSMS/filter/ContactGroupFilter.kt
@@ -1,32 +1,32 @@
-/*
- * Copyright (C) 2019 Moez Bhatti <moez.bhatti@gmail.com>
- *
- * This file is part of QKSMS.
- *
- * QKSMS is free software: you can redistribute it and/or modify
- * it under the terms of the GNU General Public License as published by
- * the Free Software Foundation, either version 3 of the License, or
- * (at your option) any later version.
- *
- * QKSMS is distributed in the hope that it will be useful,
- * but WITHOUT ANY WARRANTY; without even the implied warranty of
- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
- * GNU General Public License for more details.
- *
- * You should have received a copy of the GNU General Public License
- * along with QKSMS.  If not, see <http://www.gnu.org/licenses/>.
- */
-package com.moez.QKSMS.filter
-
-import com.moez.QKSMS.extensions.removeAccents
-import com.moez.QKSMS.model.ContactGroup
-import javax.inject.Inject
-
-class ContactGroupFilter @Inject constructor(private val contactFilter: ContactFilter) : Filter<ContactGroup>() {
-
-    override fun filter(item: ContactGroup, query: CharSequence): Boolean {
-        return item.title.removeAccents().contains(query, true) || // Name
-                item.contacts.any { contact -> contactFilter.filter(contact, query) } // Contacts
-    }
-
-}
+/*
+ * Copyright (C) 2019 Moez Bhatti <moez.bhatti@gmail.com>
+ *
+ * This file is part of QKSMS.
+ *
+ * QKSMS is free software: you can redistribute it and/or modify
+ * it under the terms of the GNU General Public License as published by
+ * the Free Software Foundation, either version 3 of the License, or
+ * (at your option) any later version.
+ *
+ * QKSMS is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+ * GNU General Public License for more details.
+ *
+ * You should have received a copy of the GNU General Public License
+ * along with QKSMS.  If not, see <http://www.gnu.org/licenses/>.
+ */
+package com.moez.QKSMS.filter
+
+import com.moez.QKSMS.extensions.removeAccents
+import com.moez.QKSMS.model.ContactGroup
+import javax.inject.Inject
+
+class ContactGroupFilter @Inject constructor(private val contactFilter: ContactFilter) : Filter<ContactGroup>() {
+
+    override fun filter(item: ContactGroup, query: CharSequence): Boolean {
+        return item.title.removeAccents().contains(query, true) || // Name
+                item.contacts.any { contact -> contactFilter.filter(contact, query) } // Contacts
+    }
+
+}
diff --git a/data/src/main/java/com/moez/QKSMS/filter/ConversationFilter.kt b/data/src/main/java/com/moez/QKSMS/filter/ConversationFilter.kt
index 712ad3de0..c857bbc06 100644
--- a/data/src/main/java/com/moez/QKSMS/filter/ConversationFilter.kt
+++ b/data/src/main/java/com/moez/QKSMS/filter/ConversationFilter.kt
@@ -1,30 +1,30 @@
-/*
- * Copyright (C) 2017 Moez Bhatti <moez.bhatti@gmail.com>
- *
- * This file is part of QKSMS.
- *
- * QKSMS is free software: you can redistribute it and/or modify
- * it under the terms of the GNU General Public License as published by
- * the Free Software Foundation, either version 3 of the License, or
- * (at your option) any later version.
- *
- * QKSMS is distributed in the hope that it will be useful,
- * but WITHOUT ANY WARRANTY; without even the implied warranty of
- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
- * GNU General Public License for more details.
- *
- * You should have received a copy of the GNU General Public License
- * along with QKSMS.  If not, see <http://www.gnu.org/licenses/>.
- */
-package com.moez.QKSMS.filter
-
-import com.moez.QKSMS.model.Conversation
-import javax.inject.Inject
-
-class ConversationFilter @Inject constructor(private val recipientFilter: RecipientFilter) : Filter<Conversation>() {
-
-    override fun filter(item: Conversation, query: CharSequence): Boolean {
-        return item.recipients.any { recipient -> recipientFilter.filter(recipient, query) }
-    }
-
+/*
+ * Copyright (C) 2017 Moez Bhatti <moez.bhatti@gmail.com>
+ *
+ * This file is part of QKSMS.
+ *
+ * QKSMS is free software: you can redistribute it and/or modify
+ * it under the terms of the GNU General Public License as published by
+ * the Free Software Foundation, either version 3 of the License, or
+ * (at your option) any later version.
+ *
+ * QKSMS is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+ * GNU General Public License for more details.
+ *
+ * You should have received a copy of the GNU General Public License
+ * along with QKSMS.  If not, see <http://www.gnu.org/licenses/>.
+ */
+package com.moez.QKSMS.filter
+
+import com.moez.QKSMS.model.Conversation
+import javax.inject.Inject
+
+class ConversationFilter @Inject constructor(private val recipientFilter: RecipientFilter) : Filter<Conversation>() {
+
+    override fun filter(item: Conversation, query: CharSequence): Boolean {
+        return item.recipients.any { recipient -> recipientFilter.filter(recipient, query) }
+    }
+
 }
\ No newline at end of file
diff --git a/data/src/main/java/com/moez/QKSMS/filter/Filter.kt b/data/src/main/java/com/moez/QKSMS/filter/Filter.kt
index e839ad539..9e893697f 100644
--- a/data/src/main/java/com/moez/QKSMS/filter/Filter.kt
+++ b/data/src/main/java/com/moez/QKSMS/filter/Filter.kt
@@ -1,25 +1,25 @@
-/*
- * Copyright (C) 2017 Moez Bhatti <moez.bhatti@gmail.com>
- *
- * This file is part of QKSMS.
- *
- * QKSMS is free software: you can redistribute it and/or modify
- * it under the terms of the GNU General Public License as published by
- * the Free Software Foundation, either version 3 of the License, or
- * (at your option) any later version.
- *
- * QKSMS is distributed in the hope that it will be useful,
- * but WITHOUT ANY WARRANTY; without even the implied warranty of
- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
- * GNU General Public License for more details.
- *
- * You should have received a copy of the GNU General Public License
- * along with QKSMS.  If not, see <http://www.gnu.org/licenses/>.
- */
-package com.moez.QKSMS.filter
-
-abstract class Filter<in T> {
-
-    abstract fun filter(item: T, query: CharSequence): Boolean
-
+/*
+ * Copyright (C) 2017 Moez Bhatti <moez.bhatti@gmail.com>
+ *
+ * This file is part of QKSMS.
+ *
+ * QKSMS is free software: you can redistribute it and/or modify
+ * it under the terms of the GNU General Public License as published by
+ * the Free Software Foundation, either version 3 of the License, or
+ * (at your option) any later version.
+ *
+ * QKSMS is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+ * GNU General Public License for more details.
+ *
+ * You should have received a copy of the GNU General Public License
+ * along with QKSMS.  If not, see <http://www.gnu.org/licenses/>.
+ */
+package com.moez.QKSMS.filter
+
+abstract class Filter<in T> {
+
+    abstract fun filter(item: T, query: CharSequence): Boolean
+
 }
\ No newline at end of file
diff --git a/data/src/main/java/com/moez/QKSMS/filter/PhoneNumberFilter.kt b/data/src/main/java/com/moez/QKSMS/filter/PhoneNumberFilter.kt
index 470a84b6a..31a6e8a8f 100644
--- a/data/src/main/java/com/moez/QKSMS/filter/PhoneNumberFilter.kt
+++ b/data/src/main/java/com/moez/QKSMS/filter/PhoneNumberFilter.kt
@@ -1,34 +1,34 @@
-/*
- * Copyright (C) 2017 Moez Bhatti <moez.bhatti@gmail.com>
- *
- * This file is part of QKSMS.
- *
- * QKSMS is free software: you can redistribute it and/or modify
- * it under the terms of the GNU General Public License as published by
- * the Free Software Foundation, either version 3 of the License, or
- * (at your option) any later version.
- *
- * QKSMS is distributed in the hope that it will be useful,
- * but WITHOUT ANY WARRANTY; without even the implied warranty of
- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
- * GNU General Public License for more details.
- *
- * You should have received a copy of the GNU General Public License
- * along with QKSMS.  If not, see <http://www.gnu.org/licenses/>.
- */
-package com.moez.QKSMS.filter
-
-import com.moez.QKSMS.util.PhoneNumberUtils
-import javax.inject.Inject
-
-class PhoneNumberFilter @Inject constructor(
-    private val phoneNumberUtils: PhoneNumberUtils
-) : Filter<String>() {
-
-    override fun filter(item: String, query: CharSequence): Boolean {
-        val allCharactersDialable = query.all { phoneNumberUtils.isReallyDialable(it) }
-        return allCharactersDialable && (phoneNumberUtils.compare(item, query.toString()) ||
-                phoneNumberUtils.normalizeNumber(item).contains(phoneNumberUtils.normalizeNumber(query.toString())))
-    }
-
+/*
+ * Copyright (C) 2017 Moez Bhatti <moez.bhatti@gmail.com>
+ *
+ * This file is part of QKSMS.
+ *
+ * QKSMS is free software: you can redistribute it and/or modify
+ * it under the terms of the GNU General Public License as published by
+ * the Free Software Foundation, either version 3 of the License, or
+ * (at your option) any later version.
+ *
+ * QKSMS is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+ * GNU General Public License for more details.
+ *
+ * You should have received a copy of the GNU General Public License
+ * along with QKSMS.  If not, see <http://www.gnu.org/licenses/>.
+ */
+package com.moez.QKSMS.filter
+
+import com.moez.QKSMS.util.PhoneNumberUtils
+import javax.inject.Inject
+
+class PhoneNumberFilter @Inject constructor(
+    private val phoneNumberUtils: PhoneNumberUtils
+) : Filter<String>() {
+
+    override fun filter(item: String, query: CharSequence): Boolean {
+        val allCharactersDialable = query.all { phoneNumberUtils.isReallyDialable(it) }
+        return allCharactersDialable && (phoneNumberUtils.compare(item, query.toString()) ||
+                phoneNumberUtils.normalizeNumber(item).contains(phoneNumberUtils.normalizeNumber(query.toString())))
+    }
+
 }
\ No newline at end of file
diff --git a/data/src/main/java/com/moez/QKSMS/filter/RecipientFilter.kt b/data/src/main/java/com/moez/QKSMS/filter/RecipientFilter.kt
index 86ce9f87f..267582f6f 100644
--- a/data/src/main/java/com/moez/QKSMS/filter/RecipientFilter.kt
+++ b/data/src/main/java/com/moez/QKSMS/filter/RecipientFilter.kt
@@ -1,35 +1,35 @@
-/*
- * Copyright (C) 2017 Moez Bhatti <moez.bhatti@gmail.com>
- *
- * This file is part of QKSMS.
- *
- * QKSMS is free software: you can redistribute it and/or modify
- * it under the terms of the GNU General Public License as published by
- * the Free Software Foundation, either version 3 of the License, or
- * (at your option) any later version.
- *
- * QKSMS is distributed in the hope that it will be useful,
- * but WITHOUT ANY WARRANTY; without even the implied warranty of
- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
- * GNU General Public License for more details.
- *
- * You should have received a copy of the GNU General Public License
- * along with QKSMS.  If not, see <http://www.gnu.org/licenses/>.
- */
-package com.moez.QKSMS.filter
-
-import com.moez.QKSMS.model.Recipient
-import javax.inject.Inject
-
-class RecipientFilter @Inject constructor(
-    private val contactFilter: ContactFilter,
-    private val phoneNumberFilter: PhoneNumberFilter
-) : Filter<Recipient>() {
-
-    override fun filter(item: Recipient, query: CharSequence) = when {
-        item.contact?.let { contactFilter.filter(it, query) } == true -> true
-        phoneNumberFilter.filter(item.address, query) -> true
-        else -> false
-    }
-
+/*
+ * Copyright (C) 2017 Moez Bhatti <moez.bhatti@gmail.com>
+ *
+ * This file is part of QKSMS.
+ *
+ * QKSMS is free software: you can redistribute it and/or modify
+ * it under the terms of the GNU General Public License as published by
+ * the Free Software Foundation, either version 3 of the License, or
+ * (at your option) any later version.
+ *
+ * QKSMS is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+ * GNU General Public License for more details.
+ *
+ * You should have received a copy of the GNU General Public License
+ * along with QKSMS.  If not, see <http://www.gnu.org/licenses/>.
+ */
+package com.moez.QKSMS.filter
+
+import com.moez.QKSMS.model.Recipient
+import javax.inject.Inject
+
+class RecipientFilter @Inject constructor(
+    private val contactFilter: ContactFilter,
+    private val phoneNumberFilter: PhoneNumberFilter
+) : Filter<Recipient>() {
+
+    override fun filter(item: Recipient, query: CharSequence) = when {
+        item.contact?.let { contactFilter.filter(it, query) } == true -> true
+        phoneNumberFilter.filter(item.address, query) -> true
+        else -> false
+    }
+
 }
\ No newline at end of file
diff --git a/data/src/main/java/com/moez/QKSMS/listener/ContactAddedListenerImpl.kt b/data/src/main/java/com/moez/QKSMS/listener/ContactAddedListenerImpl.kt
index 1d1f74339..83125abba 100644
--- a/data/src/main/java/com/moez/QKSMS/listener/ContactAddedListenerImpl.kt
+++ b/data/src/main/java/com/moez/QKSMS/listener/ContactAddedListenerImpl.kt
@@ -1,64 +1,64 @@
-/*
- * Copyright (C) 2017 Moez Bhatti <moez.bhatti@gmail.com>
- *
- * This file is part of QKSMS.
- *
- * QKSMS is free software: you can redistribute it and/or modify
- * it under the terms of the GNU General Public License as published by
- * the Free Software Foundation, either version 3 of the License, or
- * (at your option) any later version.
- *
- * QKSMS is distributed in the hope that it will be useful,
- * but WITHOUT ANY WARRANTY; without even the implied warranty of
- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
- * GNU General Public License for more details.
- *
- * You should have received a copy of the GNU General Public License
- * along with QKSMS.  If not, see <http://www.gnu.org/licenses/>.
- */
-package com.moez.QKSMS.listener
-
-import android.content.Context
-import android.database.ContentObserver
-import android.net.Uri
-import android.os.Handler
-import android.provider.ContactsContract
-import io.reactivex.Observable
-import io.reactivex.subjects.BehaviorSubject
-import javax.inject.Inject
-
-/**
- * Listens for a contact being added, and then syncs it to Realm
- */
-class ContactAddedListenerImpl @Inject constructor(
-    private val context: Context
-) : ContactAddedListener {
-
-    companion object {
-        private val URI = ContactsContract.CommonDataKinds.Phone.CONTENT_URI
-    }
-
-    override fun listen(): Observable<*> {
-        return ContactContentObserver(context).observable
-    }
-
-    private class ContactContentObserver(context: Context) : ContentObserver(Handler()) {
-
-        private val subject = BehaviorSubject.createDefault<Unit>(Unit)
-
-        val observable: Observable<Unit> = subject
-                .doOnSubscribe { context.contentResolver.registerContentObserver(URI, true, this) }
-                .doOnDispose { context.contentResolver.unregisterContentObserver(this) }
-                .share()
-
-        override fun onChange(selfChange: Boolean) {
-            this.onChange(selfChange, null)
-        }
-
-        override fun onChange(selfChange: Boolean, uri: Uri?) {
-            subject.onNext(Unit)
-        }
-
-    }
-
-}
+/*
+ * Copyright (C) 2017 Moez Bhatti <moez.bhatti@gmail.com>
+ *
+ * This file is part of QKSMS.
+ *
+ * QKSMS is free software: you can redistribute it and/or modify
+ * it under the terms of the GNU General Public License as published by
+ * the Free Software Foundation, either version 3 of the License, or
+ * (at your option) any later version.
+ *
+ * QKSMS is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+ * GNU General Public License for more details.
+ *
+ * You should have received a copy of the GNU General Public License
+ * along with QKSMS.  If not, see <http://www.gnu.org/licenses/>.
+ */
+package com.moez.QKSMS.listener
+
+import android.content.Context
+import android.database.ContentObserver
+import android.net.Uri
+import android.os.Handler
+import android.provider.ContactsContract
+import io.reactivex.Observable
+import io.reactivex.subjects.BehaviorSubject
+import javax.inject.Inject
+
+/**
+ * Listens for a contact being added, and then syncs it to Realm
+ */
+class ContactAddedListenerImpl @Inject constructor(
+    private val context: Context
+) : ContactAddedListener {
+
+    companion object {
+        private val URI = ContactsContract.CommonDataKinds.Phone.CONTENT_URI
+    }
+
+    override fun listen(): Observable<*> {
+        return ContactContentObserver(context).observable
+    }
+
+    private class ContactContentObserver(context: Context) : ContentObserver(Handler()) {
+
+        private val subject = BehaviorSubject.createDefault<Unit>(Unit)
+
+        val observable: Observable<Unit> = subject
+                .doOnSubscribe { context.contentResolver.registerContentObserver(URI, true, this) }
+                .doOnDispose { context.contentResolver.unregisterContentObserver(this) }
+                .share()
+
+        override fun onChange(selfChange: Boolean) {
+            this.onChange(selfChange, null)
+        }
+
+        override fun onChange(selfChange: Boolean, uri: Uri?) {
+            subject.onNext(Unit)
+        }
+
+    }
+
+}
diff --git a/data/src/main/java/com/moez/QKSMS/manager/ActiveConversationManagerImpl.kt b/data/src/main/java/com/moez/QKSMS/manager/ActiveConversationManagerImpl.kt
index 4ef827650..bc3fc9670 100644
--- a/data/src/main/java/com/moez/QKSMS/manager/ActiveConversationManagerImpl.kt
+++ b/data/src/main/java/com/moez/QKSMS/manager/ActiveConversationManagerImpl.kt
@@ -1,37 +1,37 @@
-/*
- * Copyright (C) 2017 Moez Bhatti <moez.bhatti@gmail.com>
- *
- * This file is part of QKSMS.
- *
- * QKSMS is free software: you can redistribute it and/or modify
- * it under the terms of the GNU General Public License as published by
- * the Free Software Foundation, either version 3 of the License, or
- * (at your option) any later version.
- *
- * QKSMS is distributed in the hope that it will be useful,
- * but WITHOUT ANY WARRANTY; without even the implied warranty of
- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
- * GNU General Public License for more details.
- *
- * You should have received a copy of the GNU General Public License
- * along with QKSMS.  If not, see <http://www.gnu.org/licenses/>.
- */
-package com.moez.QKSMS.manager
-
-import javax.inject.Inject
-import javax.inject.Singleton
-
-@Singleton
-class ActiveConversationManagerImpl @Inject constructor() : ActiveConversationManager {
-
-    private var threadId: Long? = null
-
-    override fun setActiveConversation(threadId: Long?) {
-        this.threadId = threadId
-    }
-
-    override fun getActiveConversation(): Long? {
-        return threadId
-    }
-
-}
+/*
+ * Copyright (C) 2017 Moez Bhatti <moez.bhatti@gmail.com>
+ *
+ * This file is part of QKSMS.
+ *
+ * QKSMS is free software: you can redistribute it and/or modify
+ * it under the terms of the GNU General Public License as published by
+ * the Free Software Foundation, either version 3 of the License, or
+ * (at your option) any later version.
+ *
+ * QKSMS is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+ * GNU General Public License for more details.
+ *
+ * You should have received a copy of the GNU General Public License
+ * along with QKSMS.  If not, see <http://www.gnu.org/licenses/>.
+ */
+package com.moez.QKSMS.manager
+
+import javax.inject.Inject
+import javax.inject.Singleton
+
+@Singleton
+class ActiveConversationManagerImpl @Inject constructor() : ActiveConversationManager {
+
+    private var threadId: Long? = null
+
+    override fun setActiveConversation(threadId: Long?) {
+        this.threadId = threadId
+    }
+
+    override fun getActiveConversation(): Long? {
+        return threadId
+    }
+
+}
diff --git a/data/src/main/java/com/moez/QKSMS/manager/AlarmManagerImpl.kt b/data/src/main/java/com/moez/QKSMS/manager/AlarmManagerImpl.kt
index 526d5d0ac..9d8e8873e 100644
--- a/data/src/main/java/com/moez/QKSMS/manager/AlarmManagerImpl.kt
+++ b/data/src/main/java/com/moez/QKSMS/manager/AlarmManagerImpl.kt
@@ -1,44 +1,44 @@
-/*
- * Copyright (C) 2017 Moez Bhatti <moez.bhatti@gmail.com>
- *
- * This file is part of QKSMS.
- *
- * QKSMS is free software: you can redistribute it and/or modify
- * it under the terms of the GNU General Public License as published by
- * the Free Software Foundation, either version 3 of the License, or
- * (at your option) any later version.
- *
- * QKSMS is distributed in the hope that it will be useful,
- * but WITHOUT ANY WARRANTY; without even the implied warranty of
- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
- * GNU General Public License for more details.
- *
- * You should have received a copy of the GNU General Public License
- * along with QKSMS.  If not, see <http://www.gnu.org/licenses/>.
- */
-package com.moez.QKSMS.manager
-
-import android.app.PendingIntent
-import android.content.Context
-import android.content.Intent
-import android.os.Build
-import com.moez.QKSMS.receiver.SendScheduledMessageReceiver
-import javax.inject.Inject
-
-class AlarmManagerImpl @Inject constructor(private val context: Context) : AlarmManager {
-
-    override fun getScheduledMessageIntent(id: Long): PendingIntent {
-        val intent = Intent(context, SendScheduledMessageReceiver::class.java).putExtra("id", id)
-        return PendingIntent.getBroadcast(context, id.toInt(), intent, PendingIntent.FLAG_UPDATE_CURRENT)
-    }
-
-    override fun setAlarm(date: Long, intent: PendingIntent) {
-        val alarmManager = context.getSystemService(Context.ALARM_SERVICE) as android.app.AlarmManager
-        if (Build.VERSION.SDK_INT >= Build.VERSION_CODES.M) {
-            alarmManager.setExactAndAllowWhileIdle(android.app.AlarmManager.RTC_WAKEUP, date, intent)
-        } else {
-            alarmManager.setExact(android.app.AlarmManager.RTC_WAKEUP, date, intent)
-        }
-    }
-
+/*
+ * Copyright (C) 2017 Moez Bhatti <moez.bhatti@gmail.com>
+ *
+ * This file is part of QKSMS.
+ *
+ * QKSMS is free software: you can redistribute it and/or modify
+ * it under the terms of the GNU General Public License as published by
+ * the Free Software Foundation, either version 3 of the License, or
+ * (at your option) any later version.
+ *
+ * QKSMS is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+ * GNU General Public License for more details.
+ *
+ * You should have received a copy of the GNU General Public License
+ * along with QKSMS.  If not, see <http://www.gnu.org/licenses/>.
+ */
+package com.moez.QKSMS.manager
+
+import android.app.PendingIntent
+import android.content.Context
+import android.content.Intent
+import android.os.Build
+import com.moez.QKSMS.receiver.SendScheduledMessageReceiver
+import javax.inject.Inject
+
+class AlarmManagerImpl @Inject constructor(private val context: Context) : AlarmManager {
+
+    override fun getScheduledMessageIntent(id: Long): PendingIntent {
+        val intent = Intent(context, SendScheduledMessageReceiver::class.java).putExtra("id", id)
+        return PendingIntent.getBroadcast(context, id.toInt(), intent, PendingIntent.FLAG_UPDATE_CURRENT)
+    }
+
+    override fun setAlarm(date: Long, intent: PendingIntent) {
+        val alarmManager = context.getSystemService(Context.ALARM_SERVICE) as android.app.AlarmManager
+        if (Build.VERSION.SDK_INT >= Build.VERSION_CODES.M) {
+            alarmManager.setExactAndAllowWhileIdle(android.app.AlarmManager.RTC_WAKEUP, date, intent)
+        } else {
+            alarmManager.setExact(android.app.AlarmManager.RTC_WAKEUP, date, intent)
+        }
+    }
+
 }
\ No newline at end of file
diff --git a/data/src/main/java/com/moez/QKSMS/manager/ChangelogManagerImpl.kt b/data/src/main/java/com/moez/QKSMS/manager/ChangelogManagerImpl.kt
index 6d414de04..b81e3e73b 100644
--- a/data/src/main/java/com/moez/QKSMS/manager/ChangelogManagerImpl.kt
+++ b/data/src/main/java/com/moez/QKSMS/manager/ChangelogManagerImpl.kt
@@ -1,80 +1,80 @@
-/*
- * Copyright (C) 2017 Moez Bhatti <moez.bhatti@gmail.com>
- *
- * This file is part of QKSMS.
- *
- * QKSMS is free software: you can redistribute it and/or modify
- * it under the terms of the GNU General Public License as published by
- * the Free Software Foundation, either version 3 of the License, or
- * (at your option) any later version.
- *
- * QKSMS is distributed in the hope that it will be useful,
- * but WITHOUT ANY WARRANTY; without even the implied warranty of
- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
- * GNU General Public License for more details.
- *
- * You should have received a copy of the GNU General Public License
- * along with QKSMS.  If not, see <http://www.gnu.org/licenses/>.
- */
-package com.moez.QKSMS.manager
-
-import android.content.Context
-import com.moez.QKSMS.common.util.extensions.versionCode
-import com.moez.QKSMS.util.Preferences
-import com.squareup.moshi.Json
-import com.squareup.moshi.JsonClass
-import com.squareup.moshi.Moshi
-import com.squareup.moshi.Types
-import io.reactivex.Single
-import io.reactivex.android.schedulers.AndroidSchedulers
-import io.reactivex.schedulers.Schedulers
-import kotlinx.coroutines.Dispatchers
-import kotlinx.coroutines.withContext
-import okhttp3.Call
-import okhttp3.Callback
-import okhttp3.Response
-import java.io.IOException
-import javax.inject.Inject
-
-class ChangelogManagerImpl @Inject constructor(
-    private val context: Context,
-    private val moshi: Moshi,
-    private val prefs: Preferences
-) : ChangelogManager {
-
-    override fun didUpdate(): Boolean = prefs.changelogVersion.get() != context.versionCode
-
-    override suspend fun getChangelog(): ChangelogManager.CumulativeChangelog {
-        val listType = Types.newParameterizedType(List::class.java, Changeset::class.java)
-        val adapter = moshi.adapter<List<Changeset>>(listType)
-
-        return withContext(Dispatchers.IO) {
-            val changelogs = context.assets.open("changelog.json").bufferedReader().use { it.readText() }
-                    .let(adapter::fromJson)
-                    .orEmpty()
-                    .sortedBy { changelog -> changelog.versionCode }
-                    .filter { changelog ->
-                        changelog.versionCode in prefs.changelogVersion.get().inc()..context.versionCode
-                    }
-
-            ChangelogManager.CumulativeChangelog(
-                    added = changelogs.fold(listOf()) { acc, changelog -> acc + changelog.added.orEmpty()},
-                    improved = changelogs.fold(listOf()) { acc, changelog -> acc + changelog.improved.orEmpty()},
-                    fixed = changelogs.fold(listOf()) { acc, changelog -> acc + changelog.fixed.orEmpty()})
-        }
-    }
-
-    override fun markChangelogSeen() {
-        prefs.changelogVersion.set(context.versionCode)
-    }
-
-    @JsonClass(generateAdapter = true)
-    data class Changeset(
-        @Json(name = "added") val added: List<String>?,
-        @Json(name = "improved") val improved: List<String>?,
-        @Json(name = "fixed") val fixed: List<String>?,
-        @Json(name = "versionName") val versionName: String,
-        @Json(name = "versionCode") val versionCode: Int
-    )
-
-}
+/*
+ * Copyright (C) 2017 Moez Bhatti <moez.bhatti@gmail.com>
+ *
+ * This file is part of QKSMS.
+ *
+ * QKSMS is free software: you can redistribute it and/or modify
+ * it under the terms of the GNU General Public License as published by
+ * the Free Software Foundation, either version 3 of the License, or
+ * (at your option) any later version.
+ *
+ * QKSMS is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+ * GNU General Public License for more details.
+ *
+ * You should have received a copy of the GNU General Public License
+ * along with QKSMS.  If not, see <http://www.gnu.org/licenses/>.
+ */
+package com.moez.QKSMS.manager
+
+import android.content.Context
+import com.moez.QKSMS.common.util.extensions.versionCode
+import com.moez.QKSMS.util.Preferences
+import com.squareup.moshi.Json
+import com.squareup.moshi.JsonClass
+import com.squareup.moshi.Moshi
+import com.squareup.moshi.Types
+import io.reactivex.Single
+import io.reactivex.android.schedulers.AndroidSchedulers
+import io.reactivex.schedulers.Schedulers
+import kotlinx.coroutines.Dispatchers
+import kotlinx.coroutines.withContext
+import okhttp3.Call
+import okhttp3.Callback
+import okhttp3.Response
+import java.io.IOException
+import javax.inject.Inject
+
+class ChangelogManagerImpl @Inject constructor(
+    private val context: Context,
+    private val moshi: Moshi,
+    private val prefs: Preferences
+) : ChangelogManager {
+
+    override fun didUpdate(): Boolean = prefs.changelogVersion.get() != context.versionCode
+
+    override suspend fun getChangelog(): ChangelogManager.CumulativeChangelog {
+        val listType = Types.newParameterizedType(List::class.java, Changeset::class.java)
+        val adapter = moshi.adapter<List<Changeset>>(listType)
+
+        return withContext(Dispatchers.IO) {
+            val changelogs = context.assets.open("changelog.json").bufferedReader().use { it.readText() }
+                    .let(adapter::fromJson)
+                    .orEmpty()
+                    .sortedBy { changelog -> changelog.versionCode }
+                    .filter { changelog ->
+                        changelog.versionCode in prefs.changelogVersion.get().inc()..context.versionCode
+                    }
+
+            ChangelogManager.CumulativeChangelog(
+                    added = changelogs.fold(listOf()) { acc, changelog -> acc + changelog.added.orEmpty()},
+                    improved = changelogs.fold(listOf()) { acc, changelog -> acc + changelog.improved.orEmpty()},
+                    fixed = changelogs.fold(listOf()) { acc, changelog -> acc + changelog.fixed.orEmpty()})
+        }
+    }
+
+    override fun markChangelogSeen() {
+        prefs.changelogVersion.set(context.versionCode)
+    }
+
+    @JsonClass(generateAdapter = true)
+    data class Changeset(
+        @Json(name = "added") val added: List<String>?,
+        @Json(name = "improved") val improved: List<String>?,
+        @Json(name = "fixed") val fixed: List<String>?,
+        @Json(name = "versionName") val versionName: String,
+        @Json(name = "versionCode") val versionCode: Int
+    )
+
+}
diff --git a/data/src/main/java/com/moez/QKSMS/manager/KeyManagerImpl.kt b/data/src/main/java/com/moez/QKSMS/manager/KeyManagerImpl.kt
index 6b22866d6..2db6c79ad 100644
--- a/data/src/main/java/com/moez/QKSMS/manager/KeyManagerImpl.kt
+++ b/data/src/main/java/com/moez/QKSMS/manager/KeyManagerImpl.kt
@@ -1,55 +1,55 @@
-/*
- * Copyright (C) 2017 Moez Bhatti <moez.bhatti@gmail.com>
- *
- * This file is part of QKSMS.
- *
- * QKSMS is free software: you can redistribute it and/or modify
- * it under the terms of the GNU General Public License as published by
- * the Free Software Foundation, either version 3 of the License, or
- * (at your option) any later version.
- *
- * QKSMS is distributed in the hope that it will be useful,
- * but WITHOUT ANY WARRANTY; without even the implied warranty of
- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
- * GNU General Public License for more details.
- *
- * You should have received a copy of the GNU General Public License
- * along with QKSMS.  If not, see <http://www.gnu.org/licenses/>.
- */
-package com.moez.QKSMS.manager
-
-import com.moez.QKSMS.model.Message
-import io.realm.Realm
-import javax.inject.Inject
-import javax.inject.Singleton
-
-@Singleton
-class KeyManagerImpl @Inject constructor() : KeyManager {
-
-    private var initialized = false
-    private var maxValue: Long = 0
-
-    /**
-     * Should be called when a new sync is being started
-     */
-    override fun reset() {
-        initialized = true
-        maxValue = 0L
-    }
-
-    /**
-     * Returns a valid ID that can be used to store a new message
-     */
-    override fun newId(): Long {
-        if (!initialized) {
-            maxValue = Realm.getDefaultInstance().use { realm ->
-                realm.where(Message::class.java).max("id")?.toLong() ?: 0L
-            }
-            initialized = true
-        }
-
-        maxValue++
-        return maxValue
-    }
-
+/*
+ * Copyright (C) 2017 Moez Bhatti <moez.bhatti@gmail.com>
+ *
+ * This file is part of QKSMS.
+ *
+ * QKSMS is free software: you can redistribute it and/or modify
+ * it under the terms of the GNU General Public License as published by
+ * the Free Software Foundation, either version 3 of the License, or
+ * (at your option) any later version.
+ *
+ * QKSMS is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+ * GNU General Public License for more details.
+ *
+ * You should have received a copy of the GNU General Public License
+ * along with QKSMS.  If not, see <http://www.gnu.org/licenses/>.
+ */
+package com.moez.QKSMS.manager
+
+import com.moez.QKSMS.model.Message
+import io.realm.Realm
+import javax.inject.Inject
+import javax.inject.Singleton
+
+@Singleton
+class KeyManagerImpl @Inject constructor() : KeyManager {
+
+    private var initialized = false
+    private var maxValue: Long = 0
+
+    /**
+     * Should be called when a new sync is being started
+     */
+    override fun reset() {
+        initialized = true
+        maxValue = 0L
+    }
+
+    /**
+     * Returns a valid ID that can be used to store a new message
+     */
+    override fun newId(): Long {
+        if (!initialized) {
+            maxValue = Realm.getDefaultInstance().use { realm ->
+                realm.where(Message::class.java).max("id")?.toLong() ?: 0L
+            }
+            initialized = true
+        }
+
+        maxValue++
+        return maxValue
+    }
+
 }
\ No newline at end of file
diff --git a/data/src/main/java/com/moez/QKSMS/manager/PermissionManagerImpl.kt b/data/src/main/java/com/moez/QKSMS/manager/PermissionManagerImpl.kt
index 93620b69d..755079c43 100644
--- a/data/src/main/java/com/moez/QKSMS/manager/PermissionManagerImpl.kt
+++ b/data/src/main/java/com/moez/QKSMS/manager/PermissionManagerImpl.kt
@@ -1,68 +1,68 @@
-/*
- * Copyright (C) 2017 Moez Bhatti <moez.bhatti@gmail.com>
- *
- * This file is part of QKSMS.
- *
- * QKSMS is free software: you can redistribute it and/or modify
- * it under the terms of the GNU General Public License as published by
- * the Free Software Foundation, either version 3 of the License, or
- * (at your option) any later version.
- *
- * QKSMS is distributed in the hope that it will be useful,
- * but WITHOUT ANY WARRANTY; without even the implied warranty of
- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
- * GNU General Public License for more details.
- *
- * You should have received a copy of the GNU General Public License
- * along with QKSMS.  If not, see <http://www.gnu.org/licenses/>.
- */
-package com.moez.QKSMS.manager
-
-import android.Manifest
-import android.app.role.RoleManager
-import android.content.Context
-import android.content.pm.PackageManager
-import android.os.Build
-import android.provider.Telephony
-import androidx.core.content.ContextCompat
-import javax.inject.Inject
-
-class PermissionManagerImpl @Inject constructor(private val context: Context) : PermissionManager {
-
-    override fun isDefaultSms(): Boolean {
-        return if (Build.VERSION.SDK_INT >= Build.VERSION_CODES.Q) {
-            context.getSystemService(RoleManager::class.java)?.isRoleHeld(RoleManager.ROLE_SMS) == true
-        } else {
-            Telephony.Sms.getDefaultSmsPackage(context) == context.packageName
-        }
-    }
-
-    override fun hasReadSms(): Boolean {
-        return hasPermission(Manifest.permission.READ_SMS)
-    }
-
-    override fun hasSendSms(): Boolean {
-        return hasPermission(Manifest.permission.SEND_SMS)
-    }
-
-    override fun hasContacts(): Boolean {
-        return hasPermission(Manifest.permission.READ_CONTACTS)
-    }
-
-    override fun hasPhone(): Boolean {
-        return hasPermission(Manifest.permission.READ_PHONE_STATE)
-    }
-
-    override fun hasCalling(): Boolean {
-        return hasPermission(Manifest.permission.CALL_PHONE)
-    }
-
-    override fun hasStorage(): Boolean {
-        return hasPermission(Manifest.permission.WRITE_EXTERNAL_STORAGE)
-    }
-
-    private fun hasPermission(permission: String): Boolean {
-        return ContextCompat.checkSelfPermission(context, permission) == PackageManager.PERMISSION_GRANTED
-    }
-
-}
+/*
+ * Copyright (C) 2017 Moez Bhatti <moez.bhatti@gmail.com>
+ *
+ * This file is part of QKSMS.
+ *
+ * QKSMS is free software: you can redistribute it and/or modify
+ * it under the terms of the GNU General Public License as published by
+ * the Free Software Foundation, either version 3 of the License, or
+ * (at your option) any later version.
+ *
+ * QKSMS is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+ * GNU General Public License for more details.
+ *
+ * You should have received a copy of the GNU General Public License
+ * along with QKSMS.  If not, see <http://www.gnu.org/licenses/>.
+ */
+package com.moez.QKSMS.manager
+
+import android.Manifest
+import android.app.role.RoleManager
+import android.content.Context
+import android.content.pm.PackageManager
+import android.os.Build
+import android.provider.Telephony
+import androidx.core.content.ContextCompat
+import javax.inject.Inject
+
+class PermissionManagerImpl @Inject constructor(private val context: Context) : PermissionManager {
+
+    override fun isDefaultSms(): Boolean {
+        return if (Build.VERSION.SDK_INT >= Build.VERSION_CODES.Q) {
+            context.getSystemService(RoleManager::class.java)?.isRoleHeld(RoleManager.ROLE_SMS) == true
+        } else {
+            Telephony.Sms.getDefaultSmsPackage(context) == context.packageName
+        }
+    }
+
+    override fun hasReadSms(): Boolean {
+        return hasPermission(Manifest.permission.READ_SMS)
+    }
+
+    override fun hasSendSms(): Boolean {
+        return hasPermission(Manifest.permission.SEND_SMS)
+    }
+
+    override fun hasContacts(): Boolean {
+        return hasPermission(Manifest.permission.READ_CONTACTS)
+    }
+
+    override fun hasPhone(): Boolean {
+        return hasPermission(Manifest.permission.READ_PHONE_STATE)
+    }
+
+    override fun hasCalling(): Boolean {
+        return hasPermission(Manifest.permission.CALL_PHONE)
+    }
+
+    override fun hasStorage(): Boolean {
+        return hasPermission(Manifest.permission.WRITE_EXTERNAL_STORAGE)
+    }
+
+    private fun hasPermission(permission: String): Boolean {
+        return ContextCompat.checkSelfPermission(context, permission) == PackageManager.PERMISSION_GRANTED
+    }
+
+}
diff --git a/data/src/main/java/com/moez/QKSMS/manager/WidgetManagerImpl.kt b/data/src/main/java/com/moez/QKSMS/manager/WidgetManagerImpl.kt
index a8f3b26b3..96d9c9b5b 100644
--- a/data/src/main/java/com/moez/QKSMS/manager/WidgetManagerImpl.kt
+++ b/data/src/main/java/com/moez/QKSMS/manager/WidgetManagerImpl.kt
@@ -1,43 +1,43 @@
-/*
- * Copyright (C) 2017 Moez Bhatti <moez.bhatti@gmail.com>
- *
- * This file is part of QKSMS.
- *
- * QKSMS is free software: you can redistribute it and/or modify
- * it under the terms of the GNU General Public License as published by
- * the Free Software Foundation, either version 3 of the License, or
- * (at your option) any later version.
- *
- * QKSMS is distributed in the hope that it will be useful,
- * but WITHOUT ANY WARRANTY; without even the implied warranty of
- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
- * GNU General Public License for more details.
- *
- * You should have received a copy of the GNU General Public License
- * along with QKSMS.  If not, see <http://www.gnu.org/licenses/>.
- */
-package com.moez.QKSMS.manager
-
-import android.appwidget.AppWidgetManager
-import android.content.ComponentName
-import android.content.Context
-import android.content.Intent
-import com.klinker.android.send_message.BroadcastUtils
-import javax.inject.Inject
-
-class WidgetManagerImpl @Inject constructor(private val context: Context) : WidgetManager {
-
-    override fun updateUnreadCount() {
-        BroadcastUtils.sendExplicitBroadcast(context, Intent(), WidgetManager.ACTION_NOTIFY_DATASET_CHANGED)
-    }
-
-    override fun updateTheme() {
-        val ids = AppWidgetManager.getInstance(context)
-                .getAppWidgetIds(ComponentName("com.moez.QKSMS", "com.moez.QKSMS.feature.widget.WidgetProvider"))
-
-        val intent = Intent().putExtra(AppWidgetManager.EXTRA_APPWIDGET_IDS, ids)
-
-        BroadcastUtils.sendExplicitBroadcast(context, intent, AppWidgetManager.ACTION_APPWIDGET_UPDATE)
-    }
-
+/*
+ * Copyright (C) 2017 Moez Bhatti <moez.bhatti@gmail.com>
+ *
+ * This file is part of QKSMS.
+ *
+ * QKSMS is free software: you can redistribute it and/or modify
+ * it under the terms of the GNU General Public License as published by
+ * the Free Software Foundation, either version 3 of the License, or
+ * (at your option) any later version.
+ *
+ * QKSMS is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+ * GNU General Public License for more details.
+ *
+ * You should have received a copy of the GNU General Public License
+ * along with QKSMS.  If not, see <http://www.gnu.org/licenses/>.
+ */
+package com.moez.QKSMS.manager
+
+import android.appwidget.AppWidgetManager
+import android.content.ComponentName
+import android.content.Context
+import android.content.Intent
+import com.klinker.android.send_message.BroadcastUtils
+import javax.inject.Inject
+
+class WidgetManagerImpl @Inject constructor(private val context: Context) : WidgetManager {
+
+    override fun updateUnreadCount() {
+        BroadcastUtils.sendExplicitBroadcast(context, Intent(), WidgetManager.ACTION_NOTIFY_DATASET_CHANGED)
+    }
+
+    override fun updateTheme() {
+        val ids = AppWidgetManager.getInstance(context)
+                .getAppWidgetIds(ComponentName("com.moez.QKSMS", "com.moez.QKSMS.feature.widget.WidgetProvider"))
+
+        val intent = Intent().putExtra(AppWidgetManager.EXTRA_APPWIDGET_IDS, ids)
+
+        BroadcastUtils.sendExplicitBroadcast(context, intent, AppWidgetManager.ACTION_APPWIDGET_UPDATE)
+    }
+
 }
\ No newline at end of file
diff --git a/data/src/main/java/com/moez/QKSMS/mapper/CursorToContactGroupImpl.kt b/data/src/main/java/com/moez/QKSMS/mapper/CursorToContactGroupImpl.kt
index ad9d6532c..7b16417b9 100644
--- a/data/src/main/java/com/moez/QKSMS/mapper/CursorToContactGroupImpl.kt
+++ b/data/src/main/java/com/moez/QKSMS/mapper/CursorToContactGroupImpl.kt
@@ -1,53 +1,53 @@
-/*
- * Copyright (C) 2019 Moez Bhatti <moez.bhatti@gmail.com>
- *
- * This file is part of QKSMS.
- *
- * QKSMS is free software: you can redistribute it and/or modify
- * it under the terms of the GNU General Public License as published by
- * the Free Software Foundation, either version 3 of the License, or
- * (at your option) any later version.
- *
- * QKSMS is distributed in the hope that it will be useful,
- * but WITHOUT ANY WARRANTY; without even the implied warranty of
- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
- * GNU General Public License for more details.
- *
- * You should have received a copy of the GNU General Public License
- * along with QKSMS.  If not, see <http://www.gnu.org/licenses/>.
- */
-package com.moez.QKSMS.mapper
-
-import android.content.Context
-import android.database.Cursor
-import android.provider.ContactsContract
-import com.moez.QKSMS.model.ContactGroup
-import javax.inject.Inject
-
-class CursorToContactGroupImpl @Inject constructor(
-    private val context: Context
-) : CursorToContactGroup {
-
-    companion object {
-        private val URI = ContactsContract.Groups.CONTENT_URI
-        private val PROJECTION = arrayOf(
-                ContactsContract.Groups._ID,
-                ContactsContract.Groups.TITLE)
-        private const val SELECTION = "${ContactsContract.Groups.AUTO_ADD}=0 " +
-                "AND ${ContactsContract.Groups.DELETED}=0 " +
-                "AND ${ContactsContract.Groups.FAVORITES}=0 " +
-                "AND ${ContactsContract.Groups.TITLE} IS NOT NULL"
-
-        private const val ID = 0
-        private const val TITLE = 1
-    }
-
-    override fun map(from: Cursor): ContactGroup {
-        return ContactGroup(from.getLong(ID), from.getString(TITLE))
-    }
-
-    override fun getContactGroupsCursor(): Cursor? {
-        return context.contentResolver.query(URI, PROJECTION, SELECTION, null, null)
-    }
-
-}
+/*
+ * Copyright (C) 2019 Moez Bhatti <moez.bhatti@gmail.com>
+ *
+ * This file is part of QKSMS.
+ *
+ * QKSMS is free software: you can redistribute it and/or modify
+ * it under the terms of the GNU General Public License as published by
+ * the Free Software Foundation, either version 3 of the License, or
+ * (at your option) any later version.
+ *
+ * QKSMS is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+ * GNU General Public License for more details.
+ *
+ * You should have received a copy of the GNU General Public License
+ * along with QKSMS.  If not, see <http://www.gnu.org/licenses/>.
+ */
+package com.moez.QKSMS.mapper
+
+import android.content.Context
+import android.database.Cursor
+import android.provider.ContactsContract
+import com.moez.QKSMS.model.ContactGroup
+import javax.inject.Inject
+
+class CursorToContactGroupImpl @Inject constructor(
+    private val context: Context
+) : CursorToContactGroup {
+
+    companion object {
+        private val URI = ContactsContract.Groups.CONTENT_URI
+        private val PROJECTION = arrayOf(
+                ContactsContract.Groups._ID,
+                ContactsContract.Groups.TITLE)
+        private const val SELECTION = "${ContactsContract.Groups.AUTO_ADD}=0 " +
+                "AND ${ContactsContract.Groups.DELETED}=0 " +
+                "AND ${ContactsContract.Groups.FAVORITES}=0 " +
+                "AND ${ContactsContract.Groups.TITLE} IS NOT NULL"
+
+        private const val ID = 0
+        private const val TITLE = 1
+    }
+
+    override fun map(from: Cursor): ContactGroup {
+        return ContactGroup(from.getLong(ID), from.getString(TITLE))
+    }
+
+    override fun getContactGroupsCursor(): Cursor? {
+        return context.contentResolver.query(URI, PROJECTION, SELECTION, null, null)
+    }
+
+}
diff --git a/data/src/main/java/com/moez/QKSMS/mapper/CursorToContactGroupMemberImpl.kt b/data/src/main/java/com/moez/QKSMS/mapper/CursorToContactGroupMemberImpl.kt
index 7eb72aab7..e1e186610 100644
--- a/data/src/main/java/com/moez/QKSMS/mapper/CursorToContactGroupMemberImpl.kt
+++ b/data/src/main/java/com/moez/QKSMS/mapper/CursorToContactGroupMemberImpl.kt
@@ -1,52 +1,52 @@
-/*
- * Copyright (C) 2019 Moez Bhatti <moez.bhatti@gmail.com>
- *
- * This file is part of QKSMS.
- *
- * QKSMS is free software: you can redistribute it and/or modify
- * it under the terms of the GNU General Public License as published by
- * the Free Software Foundation, either version 3 of the License, or
- * (at your option) any later version.
- *
- * QKSMS is distributed in the hope that it will be useful,
- * but WITHOUT ANY WARRANTY; without even the implied warranty of
- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
- * GNU General Public License for more details.
- *
- * You should have received a copy of the GNU General Public License
- * along with QKSMS.  If not, see <http://www.gnu.org/licenses/>.
- */
-package com.moez.QKSMS.mapper
-
-import android.content.Context
-import android.database.Cursor
-import android.provider.ContactsContract
-import javax.inject.Inject
-
-class CursorToContactGroupMemberImpl @Inject constructor(
-    private val context: Context
-) : CursorToContactGroupMember {
-
-    companion object {
-        private val URI = ContactsContract.Data.CONTENT_URI
-        private val PROJECTION = arrayOf(
-                ContactsContract.Data.LOOKUP_KEY,
-                ContactsContract.Data.DATA1)
-
-        private const val SELECTION = "${ContactsContract.Data.MIMETYPE}=?"
-        private val SELECTION_ARGS = arrayOf(
-                ContactsContract.CommonDataKinds.GroupMembership.CONTENT_ITEM_TYPE)
-
-        private const val LOOKUP_KEY = 0
-        private const val GROUP_ID = 1
-    }
-
-    override fun map(from: Cursor): CursorToContactGroupMember.GroupMember {
-        return CursorToContactGroupMember.GroupMember(from.getString(LOOKUP_KEY), from.getLong(GROUP_ID))
-    }
-
-    override fun getGroupMembersCursor(): Cursor? {
-        return context.contentResolver.query(URI, PROJECTION, SELECTION, SELECTION_ARGS, null)
-    }
-
-}
+/*
+ * Copyright (C) 2019 Moez Bhatti <moez.bhatti@gmail.com>
+ *
+ * This file is part of QKSMS.
+ *
+ * QKSMS is free software: you can redistribute it and/or modify
+ * it under the terms of the GNU General Public License as published by
+ * the Free Software Foundation, either version 3 of the License, or
+ * (at your option) any later version.
+ *
+ * QKSMS is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+ * GNU General Public License for more details.
+ *
+ * You should have received a copy of the GNU General Public License
+ * along with QKSMS.  If not, see <http://www.gnu.org/licenses/>.
+ */
+package com.moez.QKSMS.mapper
+
+import android.content.Context
+import android.database.Cursor
+import android.provider.ContactsContract
+import javax.inject.Inject
+
+class CursorToContactGroupMemberImpl @Inject constructor(
+    private val context: Context
+) : CursorToContactGroupMember {
+
+    companion object {
+        private val URI = ContactsContract.Data.CONTENT_URI
+        private val PROJECTION = arrayOf(
+                ContactsContract.Data.LOOKUP_KEY,
+                ContactsContract.Data.DATA1)
+
+        private const val SELECTION = "${ContactsContract.Data.MIMETYPE}=?"
+        private val SELECTION_ARGS = arrayOf(
+                ContactsContract.CommonDataKinds.GroupMembership.CONTENT_ITEM_TYPE)
+
+        private const val LOOKUP_KEY = 0
+        private const val GROUP_ID = 1
+    }
+
+    override fun map(from: Cursor): CursorToContactGroupMember.GroupMember {
+        return CursorToContactGroupMember.GroupMember(from.getString(LOOKUP_KEY), from.getLong(GROUP_ID))
+    }
+
+    override fun getGroupMembersCursor(): Cursor? {
+        return context.contentResolver.query(URI, PROJECTION, SELECTION, SELECTION_ARGS, null)
+    }
+
+}
diff --git a/data/src/main/java/com/moez/QKSMS/mapper/CursorToContactImpl.kt b/data/src/main/java/com/moez/QKSMS/mapper/CursorToContactImpl.kt
index 5b618d032..4e5af0407 100644
--- a/data/src/main/java/com/moez/QKSMS/mapper/CursorToContactImpl.kt
+++ b/data/src/main/java/com/moez/QKSMS/mapper/CursorToContactImpl.kt
@@ -1,83 +1,83 @@
-/*
- * Copyright (C) 2017 Moez Bhatti <moez.bhatti@gmail.com>
- *
- * This file is part of QKSMS.
- *
- * QKSMS is free software: you can redistribute it and/or modify
- * it under the terms of the GNU General Public License as published by
- * the Free Software Foundation, either version 3 of the License, or
- * (at your option) any later version.
- *
- * QKSMS is distributed in the hope that it will be useful,
- * but WITHOUT ANY WARRANTY; without even the implied warranty of
- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
- * GNU General Public License for more details.
- *
- * You should have received a copy of the GNU General Public License
- * along with QKSMS.  If not, see <http://www.gnu.org/licenses/>.
- */
-package com.moez.QKSMS.mapper
-
-import android.content.Context
-import android.database.Cursor
-import android.provider.ContactsContract.CommonDataKinds.Phone
-import com.moez.QKSMS.manager.PermissionManager
-import com.moez.QKSMS.model.Contact
-import com.moez.QKSMS.model.PhoneNumber
-import javax.inject.Inject
-
-class CursorToContactImpl @Inject constructor(
-    private val context: Context,
-    private val permissionManager: PermissionManager
-) : CursorToContact {
-
-    companion object {
-        val URI = Phone.CONTENT_URI
-        val PROJECTION = arrayOf(
-                Phone._ID,
-                Phone.LOOKUP_KEY,
-                Phone.ACCOUNT_TYPE_AND_DATA_SET,
-                Phone.NUMBER,
-                Phone.TYPE,
-                Phone.LABEL,
-                Phone.DISPLAY_NAME,
-                Phone.PHOTO_URI,
-                Phone.STARRED,
-                Phone.CONTACT_LAST_UPDATED_TIMESTAMP
-        )
-
-        const val COLUMN_ID = 0
-        const val COLUMN_LOOKUP_KEY = 1
-        const val COLUMN_ACCOUNT_TYPE = 2
-        const val COLUMN_NUMBER = 3
-        const val COLUMN_TYPE = 4
-        const val COLUMN_LABEL = 5
-        const val COLUMN_DISPLAY_NAME = 6
-        const val COLUMN_PHOTO_URI = 7
-        const val COLUMN_STARRED = 8
-        const val CONTACT_LAST_UPDATED = 9
-    }
-
-    override fun map(from: Cursor) = Contact().apply {
-        lookupKey = from.getString(COLUMN_LOOKUP_KEY)
-        name = from.getString(COLUMN_DISPLAY_NAME) ?: ""
-        photoUri = from.getString(COLUMN_PHOTO_URI)
-        numbers.add(PhoneNumber(
-                id = from.getLong(COLUMN_ID),
-                accountType = from.getString(COLUMN_ACCOUNT_TYPE),
-                address = from.getString(COLUMN_NUMBER) ?: "",
-                type = Phone.getTypeLabel(context.resources, from.getInt(COLUMN_TYPE),
-                        from.getString(COLUMN_LABEL)).toString()
-        ))
-        starred = from.getInt(COLUMN_STARRED) != 0
-        lastUpdate = from.getLong(CONTACT_LAST_UPDATED)
-    }
-
-    override fun getContactsCursor(): Cursor? {
-        return when (permissionManager.hasContacts()) {
-            true -> context.contentResolver.query(URI, PROJECTION, null, null, null)
-            false -> null
-        }
-    }
-
-}
+/*
+ * Copyright (C) 2017 Moez Bhatti <moez.bhatti@gmail.com>
+ *
+ * This file is part of QKSMS.
+ *
+ * QKSMS is free software: you can redistribute it and/or modify
+ * it under the terms of the GNU General Public License as published by
+ * the Free Software Foundation, either version 3 of the License, or
+ * (at your option) any later version.
+ *
+ * QKSMS is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+ * GNU General Public License for more details.
+ *
+ * You should have received a copy of the GNU General Public License
+ * along with QKSMS.  If not, see <http://www.gnu.org/licenses/>.
+ */
+package com.moez.QKSMS.mapper
+
+import android.content.Context
+import android.database.Cursor
+import android.provider.ContactsContract.CommonDataKinds.Phone
+import com.moez.QKSMS.manager.PermissionManager
+import com.moez.QKSMS.model.Contact
+import com.moez.QKSMS.model.PhoneNumber
+import javax.inject.Inject
+
+class CursorToContactImpl @Inject constructor(
+    private val context: Context,
+    private val permissionManager: PermissionManager
+) : CursorToContact {
+
+    companion object {
+        val URI = Phone.CONTENT_URI
+        val PROJECTION = arrayOf(
+                Phone._ID,
+                Phone.LOOKUP_KEY,
+                Phone.ACCOUNT_TYPE_AND_DATA_SET,
+                Phone.NUMBER,
+                Phone.TYPE,
+                Phone.LABEL,
+                Phone.DISPLAY_NAME,
+                Phone.PHOTO_URI,
+                Phone.STARRED,
+                Phone.CONTACT_LAST_UPDATED_TIMESTAMP
+        )
+
+        const val COLUMN_ID = 0
+        const val COLUMN_LOOKUP_KEY = 1
+        const val COLUMN_ACCOUNT_TYPE = 2
+        const val COLUMN_NUMBER = 3
+        const val COLUMN_TYPE = 4
+        const val COLUMN_LABEL = 5
+        const val COLUMN_DISPLAY_NAME = 6
+        const val COLUMN_PHOTO_URI = 7
+        const val COLUMN_STARRED = 8
+        const val CONTACT_LAST_UPDATED = 9
+    }
+
+    override fun map(from: Cursor) = Contact().apply {
+        lookupKey = from.getString(COLUMN_LOOKUP_KEY)
+        name = from.getString(COLUMN_DISPLAY_NAME) ?: ""
+        photoUri = from.getString(COLUMN_PHOTO_URI)
+        numbers.add(PhoneNumber(
+                id = from.getLong(COLUMN_ID),
+                accountType = from.getString(COLUMN_ACCOUNT_TYPE),
+                address = from.getString(COLUMN_NUMBER) ?: "",
+                type = Phone.getTypeLabel(context.resources, from.getInt(COLUMN_TYPE),
+                        from.getString(COLUMN_LABEL)).toString()
+        ))
+        starred = from.getInt(COLUMN_STARRED) != 0
+        lastUpdate = from.getLong(CONTACT_LAST_UPDATED)
+    }
+
+    override fun getContactsCursor(): Cursor? {
+        return when (permissionManager.hasContacts()) {
+            true -> context.contentResolver.query(URI, PROJECTION, null, null, null)
+            false -> null
+        }
+    }
+
+}
diff --git a/data/src/main/java/com/moez/QKSMS/mapper/CursorToConversationImpl.kt b/data/src/main/java/com/moez/QKSMS/mapper/CursorToConversationImpl.kt
index 48416ab86..2c1a5ab33 100644
--- a/data/src/main/java/com/moez/QKSMS/mapper/CursorToConversationImpl.kt
+++ b/data/src/main/java/com/moez/QKSMS/mapper/CursorToConversationImpl.kt
@@ -1,64 +1,64 @@
-/*
- * Copyright (C) 2017 Moez Bhatti <moez.bhatti@gmail.com>
- *
- * This file is part of QKSMS.
- *
- * QKSMS is free software: you can redistribute it and/or modify
- * it under the terms of the GNU General Public License as published by
- * the Free Software Foundation, either version 3 of the License, or
- * (at your option) any later version.
- *
- * QKSMS is distributed in the hope that it will be useful,
- * but WITHOUT ANY WARRANTY; without even the implied warranty of
- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
- * GNU General Public License for more details.
- *
- * You should have received a copy of the GNU General Public License
- * along with QKSMS.  If not, see <http://www.gnu.org/licenses/>.
- */
-package com.moez.QKSMS.mapper
-
-import android.content.Context
-import android.database.Cursor
-import android.net.Uri
-import android.provider.Telephony.Threads
-import com.moez.QKSMS.manager.PermissionManager
-import com.moez.QKSMS.model.Conversation
-import com.moez.QKSMS.model.Recipient
-import javax.inject.Inject
-
-class CursorToConversationImpl @Inject constructor(
-    private val context: Context,
-    private val permissionManager: PermissionManager
-) : CursorToConversation {
-
-    companion object {
-        val URI: Uri = Uri.parse("content://mms-sms/conversations?simple=true")
-        val PROJECTION = arrayOf(
-                Threads._ID,
-                Threads.RECIPIENT_IDS
-        )
-
-        const val ID = 0
-        const val RECIPIENT_IDS = 1
-    }
-
-    override fun map(from: Cursor): Conversation {
-        return Conversation().apply {
-            id = from.getLong(ID)
-            recipients.addAll(from.getString(RECIPIENT_IDS)
-                    .split(" ")
-                    .filter { it.isNotBlank() }
-                    .map { recipientId -> recipientId.toLong() }
-                    .map { recipientId -> Recipient().apply { id = recipientId } })
-        }
-    }
-
-    override fun getConversationsCursor(): Cursor? {
-        return when (permissionManager.hasReadSms()) {
-            true -> context.contentResolver.query(URI, PROJECTION, null, null, "date desc")
-            false -> null
-        }
-    }
-
+/*
+ * Copyright (C) 2017 Moez Bhatti <moez.bhatti@gmail.com>
+ *
+ * This file is part of QKSMS.
+ *
+ * QKSMS is free software: you can redistribute it and/or modify
+ * it under the terms of the GNU General Public License as published by
+ * the Free Software Foundation, either version 3 of the License, or
+ * (at your option) any later version.
+ *
+ * QKSMS is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+ * GNU General Public License for more details.
+ *
+ * You should have received a copy of the GNU General Public License
+ * along with QKSMS.  If not, see <http://www.gnu.org/licenses/>.
+ */
+package com.moez.QKSMS.mapper
+
+import android.content.Context
+import android.database.Cursor
+import android.net.Uri
+import android.provider.Telephony.Threads
+import com.moez.QKSMS.manager.PermissionManager
+import com.moez.QKSMS.model.Conversation
+import com.moez.QKSMS.model.Recipient
+import javax.inject.Inject
+
+class CursorToConversationImpl @Inject constructor(
+    private val context: Context,
+    private val permissionManager: PermissionManager
+) : CursorToConversation {
+
+    companion object {
+        val URI: Uri = Uri.parse("content://mms-sms/conversations?simple=true")
+        val PROJECTION = arrayOf(
+                Threads._ID,
+                Threads.RECIPIENT_IDS
+        )
+
+        const val ID = 0
+        const val RECIPIENT_IDS = 1
+    }
+
+    override fun map(from: Cursor): Conversation {
+        return Conversation().apply {
+            id = from.getLong(ID)
+            recipients.addAll(from.getString(RECIPIENT_IDS)
+                    .split(" ")
+                    .filter { it.isNotBlank() }
+                    .map { recipientId -> recipientId.toLong() }
+                    .map { recipientId -> Recipient().apply { id = recipientId } })
+        }
+    }
+
+    override fun getConversationsCursor(): Cursor? {
+        return when (permissionManager.hasReadSms()) {
+            true -> context.contentResolver.query(URI, PROJECTION, null, null, "date desc")
+            false -> null
+        }
+    }
+
 }
\ No newline at end of file
diff --git a/data/src/main/java/com/moez/QKSMS/mapper/CursorToMessageImpl.kt b/data/src/main/java/com/moez/QKSMS/mapper/CursorToMessageImpl.kt
index 03cbe2503..d33e6befd 100644
--- a/data/src/main/java/com/moez/QKSMS/mapper/CursorToMessageImpl.kt
+++ b/data/src/main/java/com/moez/QKSMS/mapper/CursorToMessageImpl.kt
@@ -1,178 +1,178 @@
-/*
- * Copyright (C) 2017 Moez Bhatti <moez.bhatti@gmail.com>
- *
- * This file is part of QKSMS.
- *
- * QKSMS is free software: you can redistribute it and/or modify
- * it under the terms of the GNU General Public License as published by
- * the Free Software Foundation, either version 3 of the License, or
- * (at your option) any later version.
- *
- * QKSMS is distributed in the hope that it will be useful,
- * but WITHOUT ANY WARRANTY; without even the implied warranty of
- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
- * GNU General Public License for more details.
- *
- * You should have received a copy of the GNU General Public License
- * along with QKSMS.  If not, see <http://www.gnu.org/licenses/>.
- */
-package com.moez.QKSMS.mapper
-
-import android.content.Context
-import android.database.Cursor
-import android.net.Uri
-import android.provider.Telephony.*
-import com.google.android.mms.pdu_alt.EncodedStringValue
-import com.google.android.mms.pdu_alt.PduHeaders
-import com.google.android.mms.pdu_alt.PduPersister
-import com.moez.QKSMS.extensions.map
-import com.moez.QKSMS.manager.KeyManager
-import com.moez.QKSMS.manager.PermissionManager
-import com.moez.QKSMS.model.Message
-import com.moez.QKSMS.util.Preferences
-import com.moez.QKSMS.util.SqliteWrapper
-import com.moez.QKSMS.util.tryOrNull
-import javax.inject.Inject
-
-class CursorToMessageImpl @Inject constructor(
-    private val context: Context,
-    private val cursorToPart: CursorToPart,
-    private val keys: KeyManager,
-    private val permissionManager: PermissionManager,
-    private val preferences: Preferences
-) : CursorToMessage {
-
-    private val uri = Uri.parse("content://mms-sms/complete-conversations")
-    private val projection = arrayOf(
-            MmsSms.TYPE_DISCRIMINATOR_COLUMN,
-            MmsSms._ID,
-            Mms.DATE,
-            Mms.DATE_SENT,
-            Mms.READ,
-            Mms.THREAD_ID,
-            Mms.LOCKED,
-
-            Sms.ADDRESS,
-            Sms.BODY,
-            Sms.SEEN,
-            Sms.TYPE,
-            Sms.STATUS,
-            Sms.ERROR_CODE,
-
-            Mms.SUBJECT,
-            Mms.SUBJECT_CHARSET,
-            Mms.SEEN,
-            Mms.MESSAGE_TYPE,
-            Mms.MESSAGE_BOX,
-            Mms.DELIVERY_REPORT,
-            Mms.READ_REPORT,
-            MmsSms.PendingMessages.ERROR_TYPE,
-            Mms.STATUS
-    )
-
-    override fun map(from: Pair<Cursor, CursorToMessage.MessageColumns>): Message {
-        val cursor = from.first
-        val columnsMap = from.second
-
-        return Message().apply {
-            type = when {
-                cursor.getColumnIndex(MmsSms.TYPE_DISCRIMINATOR_COLUMN) != -1 -> cursor.getString(columnsMap.msgType)
-                cursor.getColumnIndex(Mms.SUBJECT) != -1 -> "mms"
-                cursor.getColumnIndex(Sms.ADDRESS) != -1 -> "sms"
-                else -> "unknown"
-            }
-
-            id = keys.newId()
-            threadId = cursor.getLong(columnsMap.threadId)
-            contentId = cursor.getLong(columnsMap.msgId)
-            date = cursor.getLong(columnsMap.date)
-            dateSent = cursor.getLong(columnsMap.dateSent)
-            read = cursor.getInt(columnsMap.read) != 0
-            locked = cursor.getInt(columnsMap.locked) != 0
-            subId = if (columnsMap.subId != -1) cursor.getInt(columnsMap.subId) else -1
-
-            when (type) {
-                "sms" -> {
-                    address = cursor.getString(columnsMap.smsAddress) ?: ""
-                    boxId = cursor.getInt(columnsMap.smsType)
-                    seen = cursor.getInt(columnsMap.smsSeen) != 0
-
-                    body = columnsMap.smsBody
-                            .takeIf { column -> column != -1 } // The column may not be set
-                            ?.let { column -> cursor.getString(column) } ?: "" // cursor.getString() may return null
-
-                    errorCode = cursor.getInt(columnsMap.smsErrorCode)
-                    deliveryStatus = cursor.getInt(columnsMap.smsStatus)
-                }
-
-                "mms" -> {
-                    address = getMmsAddress(contentId)
-                    boxId = cursor.getInt(columnsMap.mmsMessageBox)
-                    date *= 1000L
-                    dateSent *= 1000L
-                    seen = cursor.getInt(columnsMap.mmsSeen) != 0
-                    mmsDeliveryStatusString = cursor.getString(columnsMap.mmsDeliveryReport) ?: ""
-                    errorType = if (columnsMap.mmsErrorType != -1) cursor.getInt(columnsMap.mmsErrorType) else 0
-                    messageSize = 0
-                    readReportString = cursor.getString(columnsMap.mmsReadReport) ?: ""
-                    messageType = cursor.getInt(columnsMap.mmsMessageType)
-                    mmsStatus = cursor.getInt(columnsMap.mmsStatus)
-                    val subjectCharset = cursor.getInt(columnsMap.mmsSubjectCharset)
-                    subject = cursor.getString(columnsMap.mmsSubject)
-                            ?.takeIf { it.isNotBlank() }
-                            ?.let(PduPersister::getBytes)
-                            ?.let { EncodedStringValue(subjectCharset, it).string } ?: ""
-                    textContentType = ""
-                    attachmentType = Message.AttachmentType.NOT_LOADED
-                }
-            }
-        }
-    }
-
-    override fun getMessagesCursor(): Cursor? {
-
-        // Even if the device is running API 22, we can't assume we have access to the subId
-        // column. In this case, we need to check if we do, before trying to sync messages
-        if (!preferences.canUseSubId.isSet) {
-            val canUseSubId = tryOrNull {
-                SqliteWrapper.query(context, uri, arrayOf(Mms.SUBSCRIPTION_ID), logError = false)?.use { true }
-            }
-
-            preferences.canUseSubId.set(canUseSubId ?: false)
-        }
-
-        val projection = when (preferences.canUseSubId.get()) {
-            true -> this.projection + Mms.SUBSCRIPTION_ID
-            false -> this.projection
-        }
-
-        return when (permissionManager.hasReadSms()) {
-            true -> SqliteWrapper.query(context, uri, projection, sortOrder = "normalized_date desc")
-            false -> null
-        }
-    }
-
-    override fun getMessageCursor(id: Long): Cursor? {
-        TODO("not implemented") //To change body of created functions use File | Settings | File Templates.
-    }
-
-    private fun getMmsAddress(messageId: Long): String {
-        val uri = Mms.CONTENT_URI.buildUpon()
-                .appendPath(messageId.toString())
-                .appendPath("addr").build()
-
-        //TODO: Use Charset to ensure address is decoded correctly
-        val projection = arrayOf(Mms.Addr.ADDRESS, Mms.Addr.CHARSET)
-        val selection = "${Mms.Addr.TYPE} = ${PduHeaders.FROM}"
-
-        val cursor = context.contentResolver.query(uri, projection, selection, null, null)
-        cursor?.use {
-            if (cursor.moveToFirst()) {
-                return cursor.getString(0) ?: ""
-            }
-        }
-
-        return ""
-    }
-
-}
+/*
+ * Copyright (C) 2017 Moez Bhatti <moez.bhatti@gmail.com>
+ *
+ * This file is part of QKSMS.
+ *
+ * QKSMS is free software: you can redistribute it and/or modify
+ * it under the terms of the GNU General Public License as published by
+ * the Free Software Foundation, either version 3 of the License, or
+ * (at your option) any later version.
+ *
+ * QKSMS is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+ * GNU General Public License for more details.
+ *
+ * You should have received a copy of the GNU General Public License
+ * along with QKSMS.  If not, see <http://www.gnu.org/licenses/>.
+ */
+package com.moez.QKSMS.mapper
+
+import android.content.Context
+import android.database.Cursor
+import android.net.Uri
+import android.provider.Telephony.*
+import com.google.android.mms.pdu_alt.EncodedStringValue
+import com.google.android.mms.pdu_alt.PduHeaders
+import com.google.android.mms.pdu_alt.PduPersister
+import com.moez.QKSMS.extensions.map
+import com.moez.QKSMS.manager.KeyManager
+import com.moez.QKSMS.manager.PermissionManager
+import com.moez.QKSMS.model.Message
+import com.moez.QKSMS.util.Preferences
+import com.moez.QKSMS.util.SqliteWrapper
+import com.moez.QKSMS.util.tryOrNull
+import javax.inject.Inject
+
+class CursorToMessageImpl @Inject constructor(
+    private val context: Context,
+    private val cursorToPart: CursorToPart,
+    private val keys: KeyManager,
+    private val permissionManager: PermissionManager,
+    private val preferences: Preferences
+) : CursorToMessage {
+
+    private val uri = Uri.parse("content://mms-sms/complete-conversations")
+    private val projection = arrayOf(
+            MmsSms.TYPE_DISCRIMINATOR_COLUMN,
+            MmsSms._ID,
+            Mms.DATE,
+            Mms.DATE_SENT,
+            Mms.READ,
+            Mms.THREAD_ID,
+            Mms.LOCKED,
+
+            Sms.ADDRESS,
+            Sms.BODY,
+            Sms.SEEN,
+            Sms.TYPE,
+            Sms.STATUS,
+            Sms.ERROR_CODE,
+
+            Mms.SUBJECT,
+            Mms.SUBJECT_CHARSET,
+            Mms.SEEN,
+            Mms.MESSAGE_TYPE,
+            Mms.MESSAGE_BOX,
+            Mms.DELIVERY_REPORT,
+            Mms.READ_REPORT,
+            MmsSms.PendingMessages.ERROR_TYPE,
+            Mms.STATUS
+    )
+
+    override fun map(from: Pair<Cursor, CursorToMessage.MessageColumns>): Message {
+        val cursor = from.first
+        val columnsMap = from.second
+
+        return Message().apply {
+            type = when {
+                cursor.getColumnIndex(MmsSms.TYPE_DISCRIMINATOR_COLUMN) != -1 -> cursor.getString(columnsMap.msgType)
+                cursor.getColumnIndex(Mms.SUBJECT) != -1 -> "mms"
+                cursor.getColumnIndex(Sms.ADDRESS) != -1 -> "sms"
+                else -> "unknown"
+            }
+
+            id = keys.newId()
+            threadId = cursor.getLong(columnsMap.threadId)
+            contentId = cursor.getLong(columnsMap.msgId)
+            date = cursor.getLong(columnsMap.date)
+            dateSent = cursor.getLong(columnsMap.dateSent)
+            read = cursor.getInt(columnsMap.read) != 0
+            locked = cursor.getInt(columnsMap.locked) != 0
+            subId = if (columnsMap.subId != -1) cursor.getInt(columnsMap.subId) else -1
+
+            when (type) {
+                "sms" -> {
+                    address = cursor.getString(columnsMap.smsAddress) ?: ""
+                    boxId = cursor.getInt(columnsMap.smsType)
+                    seen = cursor.getInt(columnsMap.smsSeen) != 0
+
+                    body = columnsMap.smsBody
+                            .takeIf { column -> column != -1 } // The column may not be set
+                            ?.let { column -> cursor.getString(column) } ?: "" // cursor.getString() may return null
+
+                    errorCode = cursor.getInt(columnsMap.smsErrorCode)
+                    deliveryStatus = cursor.getInt(columnsMap.smsStatus)
+                }
+
+                "mms" -> {
+                    address = getMmsAddress(contentId)
+                    boxId = cursor.getInt(columnsMap.mmsMessageBox)
+                    date *= 1000L
+                    dateSent *= 1000L
+                    seen = cursor.getInt(columnsMap.mmsSeen) != 0
+                    mmsDeliveryStatusString = cursor.getString(columnsMap.mmsDeliveryReport) ?: ""
+                    errorType = if (columnsMap.mmsErrorType != -1) cursor.getInt(columnsMap.mmsErrorType) else 0
+                    messageSize = 0
+                    readReportString = cursor.getString(columnsMap.mmsReadReport) ?: ""
+                    messageType = cursor.getInt(columnsMap.mmsMessageType)
+                    mmsStatus = cursor.getInt(columnsMap.mmsStatus)
+                    val subjectCharset = cursor.getInt(columnsMap.mmsSubjectCharset)
+                    subject = cursor.getString(columnsMap.mmsSubject)
+                            ?.takeIf { it.isNotBlank() }
+                            ?.let(PduPersister::getBytes)
+                            ?.let { EncodedStringValue(subjectCharset, it).string } ?: ""
+                    textContentType = ""
+                    attachmentType = Message.AttachmentType.NOT_LOADED
+                }
+            }
+        }
+    }
+
+    override fun getMessagesCursor(): Cursor? {
+
+        // Even if the device is running API 22, we can't assume we have access to the subId
+        // column. In this case, we need to check if we do, before trying to sync messages
+        if (!preferences.canUseSubId.isSet) {
+            val canUseSubId = tryOrNull {
+                SqliteWrapper.query(context, uri, arrayOf(Mms.SUBSCRIPTION_ID), logError = false)?.use { true }
+            }
+
+            preferences.canUseSubId.set(canUseSubId ?: false)
+        }
+
+        val projection = when (preferences.canUseSubId.get()) {
+            true -> this.projection + Mms.SUBSCRIPTION_ID
+            false -> this.projection
+        }
+
+        return when (permissionManager.hasReadSms()) {
+            true -> SqliteWrapper.query(context, uri, projection, sortOrder = "normalized_date desc")
+            false -> null
+        }
+    }
+
+    override fun getMessageCursor(id: Long): Cursor? {
+        TODO("not implemented") //To change body of created functions use File | Settings | File Templates.
+    }
+
+    private fun getMmsAddress(messageId: Long): String {
+        val uri = Mms.CONTENT_URI.buildUpon()
+                .appendPath(messageId.toString())
+                .appendPath("addr").build()
+
+        //TODO: Use Charset to ensure address is decoded correctly
+        val projection = arrayOf(Mms.Addr.ADDRESS, Mms.Addr.CHARSET)
+        val selection = "${Mms.Addr.TYPE} = ${PduHeaders.FROM}"
+
+        val cursor = context.contentResolver.query(uri, projection, selection, null, null)
+        cursor?.use {
+            if (cursor.moveToFirst()) {
+                return cursor.getString(0) ?: ""
+            }
+        }
+
+        return ""
+    }
+
+}
diff --git a/data/src/main/java/com/moez/QKSMS/mapper/CursorToPartImpl.kt b/data/src/main/java/com/moez/QKSMS/mapper/CursorToPartImpl.kt
index 23a2c6a95..b5fae6996 100644
--- a/data/src/main/java/com/moez/QKSMS/mapper/CursorToPartImpl.kt
+++ b/data/src/main/java/com/moez/QKSMS/mapper/CursorToPartImpl.kt
@@ -1,55 +1,55 @@
-/*
- * Copyright (C) 2017 Moez Bhatti <moez.bhatti@gmail.com>
- *
- * This file is part of QKSMS.
- *
- * QKSMS is free software: you can redistribute it and/or modify
- * it under the terms of the GNU General Public License as published by
- * the Free Software Foundation, either version 3 of the License, or
- * (at your option) any later version.
- *
- * QKSMS is distributed in the hope that it will be useful,
- * but WITHOUT ANY WARRANTY; without even the implied warranty of
- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
- * GNU General Public License for more details.
- *
- * You should have received a copy of the GNU General Public License
- * along with QKSMS.  If not, see <http://www.gnu.org/licenses/>.
- */
-package com.moez.QKSMS.mapper
-
-import android.content.Context
-import android.database.Cursor
-import android.net.Uri
-import android.provider.Telephony
-import androidx.core.database.getIntOrNull
-import androidx.core.database.getStringOrNull
-import com.moez.QKSMS.model.MmsPart
-import javax.inject.Inject
-
-class CursorToPartImpl @Inject constructor(private val context: Context) : CursorToPart {
-
-    companion object {
-        val CONTENT_URI: Uri = Uri.parse("content://mms/part")
-    }
-
-    override fun map(from: Cursor) = MmsPart().apply {
-        id = from.getLong(from.getColumnIndexOrThrow(Telephony.Mms.Part._ID))
-        messageId = from.getLong(from.getColumnIndexOrThrow(Telephony.Mms.Part.MSG_ID))
-        type = from.getStringOrNull(from.getColumnIndexOrThrow(Telephony.Mms.Part.CONTENT_TYPE)) ?: "*/*"
-        seq = from.getIntOrNull(from.getColumnIndexOrThrow(Telephony.Mms.Part.SEQ)) ?: -1
-        name = from.getStringOrNull(from.getColumnIndexOrThrow(Telephony.Mms.Part.NAME))
-                ?: from.getStringOrNull(from.getColumnIndexOrThrow(Telephony.Mms.Part.CONTENT_LOCATION))
-                        ?.split("/")?.last()
-        text = from.getStringOrNull(from.getColumnIndexOrThrow(Telephony.Mms.Part.TEXT))
-    }
-
-    override fun getPartsCursor(messageId: Long?): Cursor? {
-        return when (messageId) {
-            null -> context.contentResolver.query(CONTENT_URI, null, null, null, null)
-            else -> context.contentResolver.query(CONTENT_URI, null,
-                    "${Telephony.Mms.Part.MSG_ID} = ?", arrayOf(messageId.toString()), null)
-        }
-    }
-
-}
+/*
+ * Copyright (C) 2017 Moez Bhatti <moez.bhatti@gmail.com>
+ *
+ * This file is part of QKSMS.
+ *
+ * QKSMS is free software: you can redistribute it and/or modify
+ * it under the terms of the GNU General Public License as published by
+ * the Free Software Foundation, either version 3 of the License, or
+ * (at your option) any later version.
+ *
+ * QKSMS is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+ * GNU General Public License for more details.
+ *
+ * You should have received a copy of the GNU General Public License
+ * along with QKSMS.  If not, see <http://www.gnu.org/licenses/>.
+ */
+package com.moez.QKSMS.mapper
+
+import android.content.Context
+import android.database.Cursor
+import android.net.Uri
+import android.provider.Telephony
+import androidx.core.database.getIntOrNull
+import androidx.core.database.getStringOrNull
+import com.moez.QKSMS.model.MmsPart
+import javax.inject.Inject
+
+class CursorToPartImpl @Inject constructor(private val context: Context) : CursorToPart {
+
+    companion object {
+        val CONTENT_URI: Uri = Uri.parse("content://mms/part")
+    }
+
+    override fun map(from: Cursor) = MmsPart().apply {
+        id = from.getLong(from.getColumnIndexOrThrow(Telephony.Mms.Part._ID))
+        messageId = from.getLong(from.getColumnIndexOrThrow(Telephony.Mms.Part.MSG_ID))
+        type = from.getStringOrNull(from.getColumnIndexOrThrow(Telephony.Mms.Part.CONTENT_TYPE)) ?: "*/*"
+        seq = from.getIntOrNull(from.getColumnIndexOrThrow(Telephony.Mms.Part.SEQ)) ?: -1
+        name = from.getStringOrNull(from.getColumnIndexOrThrow(Telephony.Mms.Part.NAME))
+                ?: from.getStringOrNull(from.getColumnIndexOrThrow(Telephony.Mms.Part.CONTENT_LOCATION))
+                        ?.split("/")?.last()
+        text = from.getStringOrNull(from.getColumnIndexOrThrow(Telephony.Mms.Part.TEXT))
+    }
+
+    override fun getPartsCursor(messageId: Long?): Cursor? {
+        return when (messageId) {
+            null -> context.contentResolver.query(CONTENT_URI, null, null, null, null)
+            else -> context.contentResolver.query(CONTENT_URI, null,
+                    "${Telephony.Mms.Part.MSG_ID} = ?", arrayOf(messageId.toString()), null)
+        }
+    }
+
+}
diff --git a/data/src/main/java/com/moez/QKSMS/mapper/CursorToRecipientImpl.kt b/data/src/main/java/com/moez/QKSMS/mapper/CursorToRecipientImpl.kt
index 08bf3974c..be4ce7a1d 100644
--- a/data/src/main/java/com/moez/QKSMS/mapper/CursorToRecipientImpl.kt
+++ b/data/src/main/java/com/moez/QKSMS/mapper/CursorToRecipientImpl.kt
@@ -1,56 +1,56 @@
-/*
- * Copyright (C) 2017 Moez Bhatti <moez.bhatti@gmail.com>
- *
- * This file is part of QKSMS.
- *
- * QKSMS is free software: you can redistribute it and/or modify
- * it under the terms of the GNU General Public License as published by
- * the Free Software Foundation, either version 3 of the License, or
- * (at your option) any later version.
- *
- * QKSMS is distributed in the hope that it will be useful,
- * but WITHOUT ANY WARRANTY; without even the implied warranty of
- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
- * GNU General Public License for more details.
- *
- * You should have received a copy of the GNU General Public License
- * along with QKSMS.  If not, see <http://www.gnu.org/licenses/>.
- */
-package com.moez.QKSMS.mapper
-
-import android.content.Context
-import android.database.Cursor
-import android.net.Uri
-import com.moez.QKSMS.manager.PermissionManager
-import com.moez.QKSMS.model.Recipient
-import javax.inject.Inject
-
-class CursorToRecipientImpl @Inject constructor(
-    private val context: Context,
-    private val permissionManager: PermissionManager
-) : CursorToRecipient {
-
-    companion object {
-        val URI = Uri.parse("content://mms-sms/canonical-addresses")
-
-        const val COLUMN_ID = 0
-        const val COLUMN_ADDRESS = 1
-    }
-
-    override fun map(from: Cursor) = Recipient(
-            id = from.getLong(COLUMN_ID),
-            address = from.getString(COLUMN_ADDRESS),
-            lastUpdate = System.currentTimeMillis())
-
-    override fun getRecipientCursor(): Cursor? {
-        return when (permissionManager.hasReadSms()) {
-            true -> context.contentResolver.query(URI, null, null, null, null)
-            false -> null
-        }
-    }
-
-    override fun getRecipientCursor(id: Long): Cursor? {
-        return context.contentResolver.query(URI, null, "_id = ?", arrayOf(id.toString()), null)
-    }
-
+/*
+ * Copyright (C) 2017 Moez Bhatti <moez.bhatti@gmail.com>
+ *
+ * This file is part of QKSMS.
+ *
+ * QKSMS is free software: you can redistribute it and/or modify
+ * it under the terms of the GNU General Public License as published by
+ * the Free Software Foundation, either version 3 of the License, or
+ * (at your option) any later version.
+ *
+ * QKSMS is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+ * GNU General Public License for more details.
+ *
+ * You should have received a copy of the GNU General Public License
+ * along with QKSMS.  If not, see <http://www.gnu.org/licenses/>.
+ */
+package com.moez.QKSMS.mapper
+
+import android.content.Context
+import android.database.Cursor
+import android.net.Uri
+import com.moez.QKSMS.manager.PermissionManager
+import com.moez.QKSMS.model.Recipient
+import javax.inject.Inject
+
+class CursorToRecipientImpl @Inject constructor(
+    private val context: Context,
+    private val permissionManager: PermissionManager
+) : CursorToRecipient {
+
+    companion object {
+        val URI = Uri.parse("content://mms-sms/canonical-addresses")
+
+        const val COLUMN_ID = 0
+        const val COLUMN_ADDRESS = 1
+    }
+
+    override fun map(from: Cursor) = Recipient(
+            id = from.getLong(COLUMN_ID),
+            address = from.getString(COLUMN_ADDRESS),
+            lastUpdate = System.currentTimeMillis())
+
+    override fun getRecipientCursor(): Cursor? {
+        return when (permissionManager.hasReadSms()) {
+            true -> context.contentResolver.query(URI, null, null, null, null)
+            false -> null
+        }
+    }
+
+    override fun getRecipientCursor(id: Long): Cursor? {
+        return context.contentResolver.query(URI, null, "_id = ?", arrayOf(id.toString()), null)
+    }
+
 }
\ No newline at end of file
diff --git a/data/src/main/java/com/moez/QKSMS/mapper/RatingManagerImpl.kt b/data/src/main/java/com/moez/QKSMS/mapper/RatingManagerImpl.kt
index 09c8d60fc..52096cabc 100644
--- a/data/src/main/java/com/moez/QKSMS/mapper/RatingManagerImpl.kt
+++ b/data/src/main/java/com/moez/QKSMS/mapper/RatingManagerImpl.kt
@@ -1,62 +1,62 @@
-/*
- * Copyright (C) 2017 Moez Bhatti <moez.bhatti@gmail.com>
- *
- * This file is part of QKSMS.
- *
- * QKSMS is free software: you can redistribute it and/or modify
- * it under the terms of the GNU General Public License as published by
- * the Free Software Foundation, either version 3 of the License, or
- * (at your option) any later version.
- *
- * QKSMS is distributed in the hope that it will be useful,
- * but WITHOUT ANY WARRANTY; without even the implied warranty of
- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
- * GNU General Public License for more details.
- *
- * You should have received a copy of the GNU General Public License
- * along with QKSMS.  If not, see <http://www.gnu.org/licenses/>.
- */
-package com.moez.QKSMS.mapper
-
-import com.f2prateek.rx.preferences2.RxSharedPreferences
-import com.moez.QKSMS.manager.AnalyticsManager
-import com.moez.QKSMS.manager.RatingManager
-import io.reactivex.rxkotlin.Observables
-import javax.inject.Inject
-
-class RatingManagerImpl @Inject constructor(
-    rxPrefs: RxSharedPreferences,
-    private val analyticsManager: AnalyticsManager
-) : RatingManager {
-
-    companion object {
-        private const val RATING_THRESHOLD = 10
-    }
-
-    private val sessions = rxPrefs.getInteger("sessions", 0)
-    private val rated = rxPrefs.getBoolean("rated", false)
-    private val dismissed = rxPrefs.getBoolean("dismissed", false)
-
-    override val shouldShowRating = Observables.combineLatest(
-            sessions.asObservable(),
-            rated.asObservable(),
-            dismissed.asObservable()
-    ) { sessions, rated, dismissed ->
-        sessions > RATING_THRESHOLD && !rated && !dismissed
-    }
-
-    override fun addSession() {
-        sessions.set(sessions.get() + 1)
-    }
-
-    override fun rate() {
-        analyticsManager.track("Clicked Rate")
-        rated.set(true)
-    }
-
-    override fun dismiss() {
-        analyticsManager.track("Clicked Rate (Dismiss)")
-        dismissed.set(true)
-    }
-
-}
+/*
+ * Copyright (C) 2017 Moez Bhatti <moez.bhatti@gmail.com>
+ *
+ * This file is part of QKSMS.
+ *
+ * QKSMS is free software: you can redistribute it and/or modify
+ * it under the terms of the GNU General Public License as published by
+ * the Free Software Foundation, either version 3 of the License, or
+ * (at your option) any later version.
+ *
+ * QKSMS is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+ * GNU General Public License for more details.
+ *
+ * You should have received a copy of the GNU General Public License
+ * along with QKSMS.  If not, see <http://www.gnu.org/licenses/>.
+ */
+package com.moez.QKSMS.mapper
+
+import com.f2prateek.rx.preferences2.RxSharedPreferences
+import com.moez.QKSMS.manager.AnalyticsManager
+import com.moez.QKSMS.manager.RatingManager
+import io.reactivex.rxkotlin.Observables
+import javax.inject.Inject
+
+class RatingManagerImpl @Inject constructor(
+    rxPrefs: RxSharedPreferences,
+    private val analyticsManager: AnalyticsManager
+) : RatingManager {
+
+    companion object {
+        private const val RATING_THRESHOLD = 10
+    }
+
+    private val sessions = rxPrefs.getInteger("sessions", 0)
+    private val rated = rxPrefs.getBoolean("rated", false)
+    private val dismissed = rxPrefs.getBoolean("dismissed", false)
+
+    override val shouldShowRating = Observables.combineLatest(
+            sessions.asObservable(),
+            rated.asObservable(),
+            dismissed.asObservable()
+    ) { sessions, rated, dismissed ->
+        sessions > RATING_THRESHOLD && !rated && !dismissed
+    }
+
+    override fun addSession() {
+        sessions.set(sessions.get() + 1)
+    }
+
+    override fun rate() {
+        analyticsManager.track("Clicked Rate")
+        rated.set(true)
+    }
+
+    override fun dismiss() {
+        analyticsManager.track("Clicked Rate (Dismiss)")
+        dismissed.set(true)
+    }
+
+}
diff --git a/data/src/main/java/com/moez/QKSMS/migration/QkMigration.kt b/data/src/main/java/com/moez/QKSMS/migration/QkMigration.kt
index beafeca1f..4d4936964 100644
--- a/data/src/main/java/com/moez/QKSMS/migration/QkMigration.kt
+++ b/data/src/main/java/com/moez/QKSMS/migration/QkMigration.kt
@@ -1,68 +1,68 @@
-/*
- * Copyright (C) 2019 Moez Bhatti <moez.bhatti@gmail.com>
- *
- * This file is part of QKSMS.
- *
- * QKSMS is free software: you can redistribute it and/or modify
- * it under the terms of the GNU General Public License as published by
- * the Free Software Foundation, either version 3 of the License, or
- * (at your option) any later version.
- *
- * QKSMS is distributed in the hope that it will be useful,
- * but WITHOUT ANY WARRANTY; without even the implied warranty of
- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
- * GNU General Public License for more details.
- *
- * You should have received a copy of the GNU General Public License
- * along with QKSMS.  If not, see <http://www.gnu.org/licenses/>.
- */
-package com.moez.QKSMS.migration
-
-import android.content.Context
-import com.moez.QKSMS.blocking.QksmsBlockingClient
-import com.moez.QKSMS.common.util.extensions.versionCode
-import com.moez.QKSMS.repository.ConversationRepository
-import com.moez.QKSMS.util.Preferences
-import kotlinx.coroutines.GlobalScope
-import kotlinx.coroutines.launch
-import javax.inject.Inject
-
-class QkMigration @Inject constructor(
-    private val context: Context,
-    private val conversationRepo: ConversationRepository,
-    private val prefs: Preferences,
-    private val qksmsBlockingClient: QksmsBlockingClient
-) {
-
-    fun performMigration() {
-        GlobalScope.launch {
-            val oldVersion = prefs.version.get()
-
-            if (oldVersion < 2199) {
-                upgradeTo370()
-            }
-
-            prefs.version.set(context.versionCode)
-        }
-    }
-
-    private fun upgradeTo370() {
-        // Migrate changelog version
-        prefs.changelogVersion.set(prefs.version.get())
-
-        // Migrate from old SIA preference to blocking manager preference
-        if (prefs.sia.get()) {
-            prefs.blockingManager.set(Preferences.BLOCKING_MANAGER_SIA)
-            prefs.sia.delete()
-        }
-
-        // Migrate blocked conversations into QK blocking client
-        val addresses = conversationRepo.getBlockedConversations()
-                .flatMap { conversation -> conversation.recipients }
-                .map { recipient -> recipient.address }
-                .distinct()
-
-        qksmsBlockingClient.block(addresses).blockingAwait()
-    }
-
-}
+/*
+ * Copyright (C) 2019 Moez Bhatti <moez.bhatti@gmail.com>
+ *
+ * This file is part of QKSMS.
+ *
+ * QKSMS is free software: you can redistribute it and/or modify
+ * it under the terms of the GNU General Public License as published by
+ * the Free Software Foundation, either version 3 of the License, or
+ * (at your option) any later version.
+ *
+ * QKSMS is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+ * GNU General Public License for more details.
+ *
+ * You should have received a copy of the GNU General Public License
+ * along with QKSMS.  If not, see <http://www.gnu.org/licenses/>.
+ */
+package com.moez.QKSMS.migration
+
+import android.content.Context
+import com.moez.QKSMS.blocking.QksmsBlockingClient
+import com.moez.QKSMS.common.util.extensions.versionCode
+import com.moez.QKSMS.repository.ConversationRepository
+import com.moez.QKSMS.util.Preferences
+import kotlinx.coroutines.GlobalScope
+import kotlinx.coroutines.launch
+import javax.inject.Inject
+
+class QkMigration @Inject constructor(
+    private val context: Context,
+    private val conversationRepo: ConversationRepository,
+    private val prefs: Preferences,
+    private val qksmsBlockingClient: QksmsBlockingClient
+) {
+
+    fun performMigration() {
+        GlobalScope.launch {
+            val oldVersion = prefs.version.get()
+
+            if (oldVersion < 2199) {
+                upgradeTo370()
+            }
+
+            prefs.version.set(context.versionCode)
+        }
+    }
+
+    private fun upgradeTo370() {
+        // Migrate changelog version
+        prefs.changelogVersion.set(prefs.version.get())
+
+        // Migrate from old SIA preference to blocking manager preference
+        if (prefs.sia.get()) {
+            prefs.blockingManager.set(Preferences.BLOCKING_MANAGER_SIA)
+            prefs.sia.delete()
+        }
+
+        // Migrate blocked conversations into QK blocking client
+        val addresses = conversationRepo.getBlockedConversations()
+                .flatMap { conversation -> conversation.recipients }
+                .map { recipient -> recipient.address }
+                .distinct()
+
+        qksmsBlockingClient.block(addresses).blockingAwait()
+    }
+
+}
diff --git a/data/src/main/java/com/moez/QKSMS/migration/QkRealmMigration.kt b/data/src/main/java/com/moez/QKSMS/migration/QkRealmMigration.kt
index a006f83b4..b501b96bf 100644
--- a/data/src/main/java/com/moez/QKSMS/migration/QkRealmMigration.kt
+++ b/data/src/main/java/com/moez/QKSMS/migration/QkRealmMigration.kt
@@ -1,240 +1,240 @@
-/*
- * Copyright (C) 2017 Moez Bhatti <moez.bhatti@gmail.com>
- *
- * This file is part of QKSMS.
- *
- * QKSMS is free software: you can redistribute it and/or modify
- * it under the terms of the GNU General Public License as published by
- * the Free Software Foundation, either version 3 of the License, or
- * (at your option) any later version.
- *
- * QKSMS is distributed in the hope that it will be useful,
- * but WITHOUT ANY WARRANTY; without even the implied warranty of
- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
- * GNU General Public License for more details.
- *
- * You should have received a copy of the GNU General Public License
- * along with QKSMS.  If not, see <http://www.gnu.org/licenses/>.
- */
-package com.moez.QKSMS.migration
-
-import android.annotation.SuppressLint
-import com.moez.QKSMS.extensions.map
-import com.moez.QKSMS.mapper.CursorToContactImpl
-import com.moez.QKSMS.util.Preferences
-import io.realm.DynamicRealm
-import io.realm.DynamicRealmObject
-import io.realm.FieldAttribute
-import io.realm.RealmList
-import io.realm.RealmMigration
-import io.realm.Sort
-import javax.inject.Inject
-
-class QkRealmMigration @Inject constructor(
-    private val cursorToContact: CursorToContactImpl,
-    private val prefs: Preferences
-) : RealmMigration {
-
-    companion object {
-        const val SchemaVersion: Long = 11
-    }
-
-    @SuppressLint("ApplySharedPref")
-    override fun migrate(realm: DynamicRealm, oldVersion: Long, newVersion: Long) {
-        var version = oldVersion
-
-        if (version == 0L) {
-            realm.schema.get("MmsPart")
-                    ?.removeField("image")
-
-            version++
-        }
-
-        if (version == 1L) {
-            realm.schema.get("Message")
-                    ?.addField("subId", Int::class.java)
-
-            version++
-        }
-
-        if (version == 2L) {
-            realm.schema.get("Conversation")
-                    ?.addField("name", String::class.java, FieldAttribute.REQUIRED)
-
-            version++
-        }
-
-        if (version == 3L) {
-            realm.schema.create("ScheduledMessage")
-                    .addField("id", Long::class.java, FieldAttribute.PRIMARY_KEY, FieldAttribute.REQUIRED)
-                    .addField("date", Long::class.java, FieldAttribute.REQUIRED)
-                    .addField("subId", Long::class.java, FieldAttribute.REQUIRED)
-                    .addRealmListField("recipients", String::class.java)
-                    .addField("sendAsGroup", Boolean::class.java, FieldAttribute.REQUIRED)
-                    .addField("body", String::class.java, FieldAttribute.REQUIRED)
-                    .addRealmListField("attachments", String::class.java)
-
-            version++
-        }
-
-        if (version == 4L) {
-            realm.schema.get("Conversation")
-                    ?.addField("pinned", Boolean::class.java, FieldAttribute.REQUIRED, FieldAttribute.INDEXED)
-
-            version++
-        }
-
-        if (version == 5L) {
-            realm.schema.create("BlockedNumber")
-                    .addField("id", Long::class.java, FieldAttribute.PRIMARY_KEY, FieldAttribute.REQUIRED)
-                    .addField("address", String::class.java, FieldAttribute.REQUIRED)
-
-            version++
-        }
-
-        if (version == 6L) {
-            realm.schema.get("Conversation")
-                    ?.addField("blockingClient", Integer::class.java)
-                    ?.addField("blockReason", String::class.java)
-
-            realm.schema.get("MmsPart")
-                    ?.addField("seq", Integer::class.java, FieldAttribute.REQUIRED)
-                    ?.addField("name", String::class.java)
-
-            version++
-        }
-
-        if (version == 7L) {
-            realm.schema.get("Conversation")
-                    ?.addRealmObjectField("lastMessage", realm.schema.get("Message"))
-                    ?.removeField("count")
-                    ?.removeField("date")
-                    ?.removeField("snippet")
-                    ?.removeField("read")
-                    ?.removeField("me")
-
-            val conversations = realm.where("Conversation")
-                    .findAll()
-
-            val messages = realm.where("Message")
-                    .sort("date", Sort.DESCENDING)
-                    .distinct("threadId")
-                    .findAll()
-                    .associateBy { message -> message.getLong("threadId") }
-
-            conversations.forEach { conversation ->
-                conversation.setObject("lastMessage", messages[conversation.getLong("id")])
-            }
-
-            version++
-        }
-
-        if (version == 8L) {
-            // Delete this data since we'll need to repopulate it with its new primaryKey
-            realm.delete("PhoneNumber")
-
-            realm.schema.create("ContactGroup")
-                    .addField("id", Long::class.java, FieldAttribute.PRIMARY_KEY, FieldAttribute.REQUIRED)
-                    .addField("title", String::class.java, FieldAttribute.REQUIRED)
-                    .addRealmListField("contacts", realm.schema.get("Contact"))
-
-            realm.schema.get("PhoneNumber")
-                    ?.addField("id", Long::class.java, FieldAttribute.PRIMARY_KEY, FieldAttribute.REQUIRED)
-                    ?.addField("accountType", String::class.java)
-                    ?.addField("isDefault", Boolean::class.java, FieldAttribute.REQUIRED)
-
-            val phoneNumbers = cursorToContact.getContactsCursor()
-                    ?.map(cursorToContact::map)
-                    ?.distinctBy { contact -> contact.numbers.firstOrNull()?.id } // Each row has only one number
-                    ?.groupBy { contact -> contact.lookupKey }
-                    ?: mapOf()
-
-            realm.schema.get("Contact")
-                    ?.addField("starred", Boolean::class.java, FieldAttribute.REQUIRED)
-                    ?.addField("photoUri", String::class.java)
-                    ?.transform { realmContact ->
-                        val numbers = RealmList<DynamicRealmObject>()
-                        phoneNumbers[realmContact.get("lookupKey")]
-                                ?.flatMap { contact -> contact.numbers }
-                                ?.map { number ->
-                                    realm.createObject("PhoneNumber", number.id).apply {
-                                        setString("accountType", number.accountType)
-                                        setString("address", number.address)
-                                        setString("type", number.type)
-                                    }
-                                }
-                                ?.let(numbers::addAll)
-
-                        val photoUri = phoneNumbers[realmContact.get("lookupKey")]
-                                ?.firstOrNull { number -> number.photoUri != null }
-                                ?.photoUri
-
-                        realmContact.setList("numbers", numbers)
-                        realmContact.setString("photoUri", photoUri)
-                    }
-
-            // Migrate conversation themes
-            val recipients = mutableMapOf<Long, Int>() // Map of recipientId:theme
-            realm.where("Conversation").findAll().forEach { conversation ->
-                val pref = prefs.theme(conversation.getLong("id"))
-                if (pref.isSet) {
-                    conversation.getList("recipients").forEach { recipient ->
-                        recipients[recipient.getLong("id")] = pref.get()
-                    }
-
-                    pref.delete()
-                }
-            }
-
-            recipients.forEach { (recipientId, theme) ->
-                prefs.theme(recipientId).set(theme)
-            }
-
-            version++
-        }
-
-        if (version == 9L) {
-            val migrateNotificationAction = { pref: Int ->
-                when (pref) {
-                    1 -> Preferences.NOTIFICATION_ACTION_READ
-                    2 -> Preferences.NOTIFICATION_ACTION_REPLY
-                    3 -> Preferences.NOTIFICATION_ACTION_CALL
-                    4 -> Preferences.NOTIFICATION_ACTION_DELETE
-                    else -> pref
-                }
-            }
-
-            val migrateSwipeAction = { pref: Int ->
-                when (pref) {
-                    2 -> Preferences.SWIPE_ACTION_DELETE
-                    3 -> Preferences.SWIPE_ACTION_CALL
-                    4 -> Preferences.SWIPE_ACTION_READ
-                    5 -> Preferences.SWIPE_ACTION_UNREAD
-                    else -> pref
-                }
-            }
-
-            if (prefs.notifAction1.isSet) prefs.notifAction1.set(migrateNotificationAction(prefs.notifAction1.get()))
-            if (prefs.notifAction2.isSet) prefs.notifAction2.set(migrateNotificationAction(prefs.notifAction2.get()))
-            if (prefs.notifAction3.isSet) prefs.notifAction3.set(migrateNotificationAction(prefs.notifAction3.get()))
-            if (prefs.swipeLeft.isSet) prefs.swipeLeft.set(migrateSwipeAction(prefs.swipeLeft.get()))
-            if (prefs.swipeRight.isSet) prefs.swipeRight.set(migrateSwipeAction(prefs.swipeRight.get()))
-
-            version++
-        }
-
-        if (version == 10L) {
-            realm.schema.get("MmsPart")
-                    ?.addField("messageId", Long::class.java, FieldAttribute.INDEXED, FieldAttribute.REQUIRED)
-                    ?.transform { part ->
-                        val messageId = part.linkingObjects("Message", "parts").firstOrNull()?.getLong("contentId") ?: 0
-                        part.setLong("messageId", messageId)
-                    }
-
-            version++
-        }
-
-        check(version >= newVersion) { "Migration missing from v$oldVersion to v$newVersion" }
-    }
-
-}
+/*
+ * Copyright (C) 2017 Moez Bhatti <moez.bhatti@gmail.com>
+ *
+ * This file is part of QKSMS.
+ *
+ * QKSMS is free software: you can redistribute it and/or modify
+ * it under the terms of the GNU General Public License as published by
+ * the Free Software Foundation, either version 3 of the License, or
+ * (at your option) any later version.
+ *
+ * QKSMS is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+ * GNU General Public License for more details.
+ *
+ * You should have received a copy of the GNU General Public License
+ * along with QKSMS.  If not, see <http://www.gnu.org/licenses/>.
+ */
+package com.moez.QKSMS.migration
+
+import android.annotation.SuppressLint
+import com.moez.QKSMS.extensions.map
+import com.moez.QKSMS.mapper.CursorToContactImpl
+import com.moez.QKSMS.util.Preferences
+import io.realm.DynamicRealm
+import io.realm.DynamicRealmObject
+import io.realm.FieldAttribute
+import io.realm.RealmList
+import io.realm.RealmMigration
+import io.realm.Sort
+import javax.inject.Inject
+
+class QkRealmMigration @Inject constructor(
+    private val cursorToContact: CursorToContactImpl,
+    private val prefs: Preferences
+) : RealmMigration {
+
+    companion object {
+        const val SchemaVersion: Long = 11
+    }
+
+    @SuppressLint("ApplySharedPref")
+    override fun migrate(realm: DynamicRealm, oldVersion: Long, newVersion: Long) {
+        var version = oldVersion
+
+        if (version == 0L) {
+            realm.schema.get("MmsPart")
+                    ?.removeField("image")
+
+            version++
+        }
+
+        if (version == 1L) {
+            realm.schema.get("Message")
+                    ?.addField("subId", Int::class.java)
+
+            version++
+        }
+
+        if (version == 2L) {
+            realm.schema.get("Conversation")
+                    ?.addField("name", String::class.java, FieldAttribute.REQUIRED)
+
+            version++
+        }
+
+        if (version == 3L) {
+            realm.schema.create("ScheduledMessage")
+                    .addField("id", Long::class.java, FieldAttribute.PRIMARY_KEY, FieldAttribute.REQUIRED)
+                    .addField("date", Long::class.java, FieldAttribute.REQUIRED)
+                    .addField("subId", Long::class.java, FieldAttribute.REQUIRED)
+                    .addRealmListField("recipients", String::class.java)
+                    .addField("sendAsGroup", Boolean::class.java, FieldAttribute.REQUIRED)
+                    .addField("body", String::class.java, FieldAttribute.REQUIRED)
+                    .addRealmListField("attachments", String::class.java)
+
+            version++
+        }
+
+        if (version == 4L) {
+            realm.schema.get("Conversation")
+                    ?.addField("pinned", Boolean::class.java, FieldAttribute.REQUIRED, FieldAttribute.INDEXED)
+
+            version++
+        }
+
+        if (version == 5L) {
+            realm.schema.create("BlockedNumber")
+                    .addField("id", Long::class.java, FieldAttribute.PRIMARY_KEY, FieldAttribute.REQUIRED)
+                    .addField("address", String::class.java, FieldAttribute.REQUIRED)
+
+            version++
+        }
+
+        if (version == 6L) {
+            realm.schema.get("Conversation")
+                    ?.addField("blockingClient", Integer::class.java)
+                    ?.addField("blockReason", String::class.java)
+
+            realm.schema.get("MmsPart")
+                    ?.addField("seq", Integer::class.java, FieldAttribute.REQUIRED)
+                    ?.addField("name", String::class.java)
+
+            version++
+        }
+
+        if (version == 7L) {
+            realm.schema.get("Conversation")
+                    ?.addRealmObjectField("lastMessage", realm.schema.get("Message"))
+                    ?.removeField("count")
+                    ?.removeField("date")
+                    ?.removeField("snippet")
+                    ?.removeField("read")
+                    ?.removeField("me")
+
+            val conversations = realm.where("Conversation")
+                    .findAll()
+
+            val messages = realm.where("Message")
+                    .sort("date", Sort.DESCENDING)
+                    .distinct("threadId")
+                    .findAll()
+                    .associateBy { message -> message.getLong("threadId") }
+
+            conversations.forEach { conversation ->
+                conversation.setObject("lastMessage", messages[conversation.getLong("id")])
+            }
+
+            version++
+        }
+
+        if (version == 8L) {
+            // Delete this data since we'll need to repopulate it with its new primaryKey
+            realm.delete("PhoneNumber")
+
+            realm.schema.create("ContactGroup")
+                    .addField("id", Long::class.java, FieldAttribute.PRIMARY_KEY, FieldAttribute.REQUIRED)
+                    .addField("title", String::class.java, FieldAttribute.REQUIRED)
+                    .addRealmListField("contacts", realm.schema.get("Contact"))
+
+            realm.schema.get("PhoneNumber")
+                    ?.addField("id", Long::class.java, FieldAttribute.PRIMARY_KEY, FieldAttribute.REQUIRED)
+                    ?.addField("accountType", String::class.java)
+                    ?.addField("isDefault", Boolean::class.java, FieldAttribute.REQUIRED)
+
+            val phoneNumbers = cursorToContact.getContactsCursor()
+                    ?.map(cursorToContact::map)
+                    ?.distinctBy { contact -> contact.numbers.firstOrNull()?.id } // Each row has only one number
+                    ?.groupBy { contact -> contact.lookupKey }
+                    ?: mapOf()
+
+            realm.schema.get("Contact")
+                    ?.addField("starred", Boolean::class.java, FieldAttribute.REQUIRED)
+                    ?.addField("photoUri", String::class.java)
+                    ?.transform { realmContact ->
+                        val numbers = RealmList<DynamicRealmObject>()
+                        phoneNumbers[realmContact.get("lookupKey")]
+                                ?.flatMap { contact -> contact.numbers }
+                                ?.map { number ->
+                                    realm.createObject("PhoneNumber", number.id).apply {
+                                        setString("accountType", number.accountType)
+                                        setString("address", number.address)
+                                        setString("type", number.type)
+                                    }
+                                }
+                                ?.let(numbers::addAll)
+
+                        val photoUri = phoneNumbers[realmContact.get("lookupKey")]
+                                ?.firstOrNull { number -> number.photoUri != null }
+                                ?.photoUri
+
+                        realmContact.setList("numbers", numbers)
+                        realmContact.setString("photoUri", photoUri)
+                    }
+
+            // Migrate conversation themes
+            val recipients = mutableMapOf<Long, Int>() // Map of recipientId:theme
+            realm.where("Conversation").findAll().forEach { conversation ->
+                val pref = prefs.theme(conversation.getLong("id"))
+                if (pref.isSet) {
+                    conversation.getList("recipients").forEach { recipient ->
+                        recipients[recipient.getLong("id")] = pref.get()
+                    }
+
+                    pref.delete()
+                }
+            }
+
+            recipients.forEach { (recipientId, theme) ->
+                prefs.theme(recipientId).set(theme)
+            }
+
+            version++
+        }
+
+        if (version == 9L) {
+            val migrateNotificationAction = { pref: Int ->
+                when (pref) {
+                    1 -> Preferences.NOTIFICATION_ACTION_READ
+                    2 -> Preferences.NOTIFICATION_ACTION_REPLY
+                    3 -> Preferences.NOTIFICATION_ACTION_CALL
+                    4 -> Preferences.NOTIFICATION_ACTION_DELETE
+                    else -> pref
+                }
+            }
+
+            val migrateSwipeAction = { pref: Int ->
+                when (pref) {
+                    2 -> Preferences.SWIPE_ACTION_DELETE
+                    3 -> Preferences.SWIPE_ACTION_CALL
+                    4 -> Preferences.SWIPE_ACTION_READ
+                    5 -> Preferences.SWIPE_ACTION_UNREAD
+                    else -> pref
+                }
+            }
+
+            if (prefs.notifAction1.isSet) prefs.notifAction1.set(migrateNotificationAction(prefs.notifAction1.get()))
+            if (prefs.notifAction2.isSet) prefs.notifAction2.set(migrateNotificationAction(prefs.notifAction2.get()))
+            if (prefs.notifAction3.isSet) prefs.notifAction3.set(migrateNotificationAction(prefs.notifAction3.get()))
+            if (prefs.swipeLeft.isSet) prefs.swipeLeft.set(migrateSwipeAction(prefs.swipeLeft.get()))
+            if (prefs.swipeRight.isSet) prefs.swipeRight.set(migrateSwipeAction(prefs.swipeRight.get()))
+
+            version++
+        }
+
+        if (version == 10L) {
+            realm.schema.get("MmsPart")
+                    ?.addField("messageId", Long::class.java, FieldAttribute.INDEXED, FieldAttribute.REQUIRED)
+                    ?.transform { part ->
+                        val messageId = part.linkingObjects("Message", "parts").firstOrNull()?.getLong("contentId") ?: 0
+                        part.setLong("messageId", messageId)
+                    }
+
+            version++
+        }
+
+        check(version >= newVersion) { "Migration missing from v$oldVersion to v$newVersion" }
+    }
+
+}
diff --git a/data/src/main/java/com/moez/QKSMS/receiver/BlockThreadReceiver.kt b/data/src/main/java/com/moez/QKSMS/receiver/BlockThreadReceiver.kt
index 68143ed8d..2100540d2 100644
--- a/data/src/main/java/com/moez/QKSMS/receiver/BlockThreadReceiver.kt
+++ b/data/src/main/java/com/moez/QKSMS/receiver/BlockThreadReceiver.kt
@@ -1,52 +1,52 @@
-/*
- * Copyright (C) 2017 Moez Bhatti <moez.bhatti@gmail.com>
- *
- * This file is part of QKSMS.
- *
- * QKSMS is free software: you can redistribute it and/or modify
- * it under the terms of the GNU General Public License as published by
- * the Free Software Foundation, either version 3 of the License, or
- * (at your option) any later version.
- *
- * QKSMS is distributed in the hope that it will be useful,
- * but WITHOUT ANY WARRANTY; without even the implied warranty of
- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
- * GNU General Public License for more details.
- *
- * You should have received a copy of the GNU General Public License
- * along with QKSMS.  If not, see <http://www.gnu.org/licenses/>.
- */
-package com.moez.QKSMS.receiver
-
-import android.content.BroadcastReceiver
-import android.content.Context
-import android.content.Intent
-import com.moez.QKSMS.blocking.BlockingClient
-import com.moez.QKSMS.interactor.MarkBlocked
-import com.moez.QKSMS.repository.ConversationRepository
-import com.moez.QKSMS.util.Preferences
-import dagger.android.AndroidInjection
-import javax.inject.Inject
-
-class BlockThreadReceiver : BroadcastReceiver() {
-
-    @Inject lateinit var blockingClient: BlockingClient
-    @Inject lateinit var conversationRepo: ConversationRepository
-    @Inject lateinit var markBlocked: MarkBlocked
-    @Inject lateinit var prefs: Preferences
-
-    override fun onReceive(context: Context, intent: Intent) {
-        AndroidInjection.inject(this, context)
-
-        val pendingResult = goAsync()
-        val threadId = intent.getLongExtra("threadId", 0)
-        val conversation = conversationRepo.getConversation(threadId)!!
-        val blockingManager = prefs.blockingManager.get()
-
-        blockingClient
-                .block(conversation.recipients.map { it.address })
-                .andThen(markBlocked.buildObservable(MarkBlocked.Params(listOf(threadId), blockingManager, null)))
-                .subscribe { pendingResult.finish() }
-    }
-
-}
+/*
+ * Copyright (C) 2017 Moez Bhatti <moez.bhatti@gmail.com>
+ *
+ * This file is part of QKSMS.
+ *
+ * QKSMS is free software: you can redistribute it and/or modify
+ * it under the terms of the GNU General Public License as published by
+ * the Free Software Foundation, either version 3 of the License, or
+ * (at your option) any later version.
+ *
+ * QKSMS is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+ * GNU General Public License for more details.
+ *
+ * You should have received a copy of the GNU General Public License
+ * along with QKSMS.  If not, see <http://www.gnu.org/licenses/>.
+ */
+package com.moez.QKSMS.receiver
+
+import android.content.BroadcastReceiver
+import android.content.Context
+import android.content.Intent
+import com.moez.QKSMS.blocking.BlockingClient
+import com.moez.QKSMS.interactor.MarkBlocked
+import com.moez.QKSMS.repository.ConversationRepository
+import com.moez.QKSMS.util.Preferences
+import dagger.android.AndroidInjection
+import javax.inject.Inject
+
+class BlockThreadReceiver : BroadcastReceiver() {
+
+    @Inject lateinit var blockingClient: BlockingClient
+    @Inject lateinit var conversationRepo: ConversationRepository
+    @Inject lateinit var markBlocked: MarkBlocked
+    @Inject lateinit var prefs: Preferences
+
+    override fun onReceive(context: Context, intent: Intent) {
+        AndroidInjection.inject(this, context)
+
+        val pendingResult = goAsync()
+        val threadId = intent.getLongExtra("threadId", 0)
+        val conversation = conversationRepo.getConversation(threadId)!!
+        val blockingManager = prefs.blockingManager.get()
+
+        blockingClient
+                .block(conversation.recipients.map { it.address })
+                .andThen(markBlocked.buildObservable(MarkBlocked.Params(listOf(threadId), blockingManager, null)))
+                .subscribe { pendingResult.finish() }
+    }
+
+}
diff --git a/data/src/main/java/com/moez/QKSMS/receiver/BootReceiver.kt b/data/src/main/java/com/moez/QKSMS/receiver/BootReceiver.kt
index e7f739f8f..cad131f9d 100644
--- a/data/src/main/java/com/moez/QKSMS/receiver/BootReceiver.kt
+++ b/data/src/main/java/com/moez/QKSMS/receiver/BootReceiver.kt
@@ -1,39 +1,39 @@
-/*
- * Copyright (C) 2017 Moez Bhatti <moez.bhatti@gmail.com>
- *
- * This file is part of QKSMS.
- *
- * QKSMS is free software: you can redistribute it and/or modify
- * it under the terms of the GNU General Public License as published by
- * the Free Software Foundation, either version 3 of the License, or
- * (at your option) any later version.
- *
- * QKSMS is distributed in the hope that it will be useful,
- * but WITHOUT ANY WARRANTY; without even the implied warranty of
- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
- * GNU General Public License for more details.
- *
- * You should have received a copy of the GNU General Public License
- * along with QKSMS.  If not, see <http://www.gnu.org/licenses/>.
- */
-package com.moez.QKSMS.receiver
-
-import android.content.BroadcastReceiver
-import android.content.Context
-import android.content.Intent
-import com.moez.QKSMS.interactor.UpdateScheduledMessageAlarms
-import dagger.android.AndroidInjection
-import javax.inject.Inject
-
-class BootReceiver : BroadcastReceiver() {
-
-    @Inject lateinit var updateScheduledMessageAlarms: UpdateScheduledMessageAlarms
-
-    override fun onReceive(context: Context, intent: Intent?) {
-        AndroidInjection.inject(this, context)
-
-        val result = goAsync()
-        updateScheduledMessageAlarms.execute(Unit) { result.finish() }
-    }
-
+/*
+ * Copyright (C) 2017 Moez Bhatti <moez.bhatti@gmail.com>
+ *
+ * This file is part of QKSMS.
+ *
+ * QKSMS is free software: you can redistribute it and/or modify
+ * it under the terms of the GNU General Public License as published by
+ * the Free Software Foundation, either version 3 of the License, or
+ * (at your option) any later version.
+ *
+ * QKSMS is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+ * GNU General Public License for more details.
+ *
+ * You should have received a copy of the GNU General Public License
+ * along with QKSMS.  If not, see <http://www.gnu.org/licenses/>.
+ */
+package com.moez.QKSMS.receiver
+
+import android.content.BroadcastReceiver
+import android.content.Context
+import android.content.Intent
+import com.moez.QKSMS.interactor.UpdateScheduledMessageAlarms
+import dagger.android.AndroidInjection
+import javax.inject.Inject
+
+class BootReceiver : BroadcastReceiver() {
+
+    @Inject lateinit var updateScheduledMessageAlarms: UpdateScheduledMessageAlarms
+
+    override fun onReceive(context: Context, intent: Intent?) {
+        AndroidInjection.inject(this, context)
+
+        val result = goAsync()
+        updateScheduledMessageAlarms.execute(Unit) { result.finish() }
+    }
+
 }
\ No newline at end of file
diff --git a/data/src/main/java/com/moez/QKSMS/receiver/DefaultSmsChangedReceiver.kt b/data/src/main/java/com/moez/QKSMS/receiver/DefaultSmsChangedReceiver.kt
index 8f3b2d9c1..ed1243cc5 100644
--- a/data/src/main/java/com/moez/QKSMS/receiver/DefaultSmsChangedReceiver.kt
+++ b/data/src/main/java/com/moez/QKSMS/receiver/DefaultSmsChangedReceiver.kt
@@ -1,47 +1,47 @@
-/*
- * Copyright (C) 2017 Moez Bhatti <moez.bhatti@gmail.com>
- *
- * This file is part of QKSMS.
- *
- * QKSMS is free software: you can redistribute it and/or modify
- * it under the terms of the GNU General Public License as published by
- * the Free Software Foundation, either version 3 of the License, or
- * (at your option) any later version.
- *
- * QKSMS is distributed in the hope that it will be useful,
- * but WITHOUT ANY WARRANTY; without even the implied warranty of
- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
- * GNU General Public License for more details.
- *
- * You should have received a copy of the GNU General Public License
- * along with QKSMS.  If not, see <http://www.gnu.org/licenses/>.
- */
-package com.moez.QKSMS.receiver
-
-import android.content.BroadcastReceiver
-import android.content.Context
-import android.content.Intent
-import android.os.Build
-import android.provider.Telephony
-import androidx.annotation.RequiresApi
-import com.moez.QKSMS.interactor.SyncMessages
-import com.moez.QKSMS.util.Preferences
-import dagger.android.AndroidInjection
-import javax.inject.Inject
-
-class DefaultSmsChangedReceiver : BroadcastReceiver() {
-
-    @Inject lateinit var prefs: Preferences
-    @Inject lateinit var syncMessages: SyncMessages
-
-    @RequiresApi(Build.VERSION_CODES.N)
-    override fun onReceive(context: Context, intent: Intent) {
-        AndroidInjection.inject(this, context)
-
-        if (intent.getBooleanExtra(Telephony.Sms.Intents.EXTRA_IS_DEFAULT_SMS_APP, false)) {
-            val pendingResult = goAsync()
-            syncMessages.execute(Unit) { pendingResult.finish() }
-        }
-    }
-
+/*
+ * Copyright (C) 2017 Moez Bhatti <moez.bhatti@gmail.com>
+ *
+ * This file is part of QKSMS.
+ *
+ * QKSMS is free software: you can redistribute it and/or modify
+ * it under the terms of the GNU General Public License as published by
+ * the Free Software Foundation, either version 3 of the License, or
+ * (at your option) any later version.
+ *
+ * QKSMS is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+ * GNU General Public License for more details.
+ *
+ * You should have received a copy of the GNU General Public License
+ * along with QKSMS.  If not, see <http://www.gnu.org/licenses/>.
+ */
+package com.moez.QKSMS.receiver
+
+import android.content.BroadcastReceiver
+import android.content.Context
+import android.content.Intent
+import android.os.Build
+import android.provider.Telephony
+import androidx.annotation.RequiresApi
+import com.moez.QKSMS.interactor.SyncMessages
+import com.moez.QKSMS.util.Preferences
+import dagger.android.AndroidInjection
+import javax.inject.Inject
+
+class DefaultSmsChangedReceiver : BroadcastReceiver() {
+
+    @Inject lateinit var prefs: Preferences
+    @Inject lateinit var syncMessages: SyncMessages
+
+    @RequiresApi(Build.VERSION_CODES.N)
+    override fun onReceive(context: Context, intent: Intent) {
+        AndroidInjection.inject(this, context)
+
+        if (intent.getBooleanExtra(Telephony.Sms.Intents.EXTRA_IS_DEFAULT_SMS_APP, false)) {
+            val pendingResult = goAsync()
+            syncMessages.execute(Unit) { pendingResult.finish() }
+        }
+    }
+
 }
\ No newline at end of file
diff --git a/data/src/main/java/com/moez/QKSMS/receiver/DeleteMessagesReceiver.kt b/data/src/main/java/com/moez/QKSMS/receiver/DeleteMessagesReceiver.kt
index 7d5e15252..d0130bfb5 100644
--- a/data/src/main/java/com/moez/QKSMS/receiver/DeleteMessagesReceiver.kt
+++ b/data/src/main/java/com/moez/QKSMS/receiver/DeleteMessagesReceiver.kt
@@ -1,41 +1,41 @@
-/*
- * Copyright (C) 2017 Moez Bhatti <moez.bhatti@gmail.com>
- *
- * This file is part of QKSMS.
- *
- * QKSMS is free software: you can redistribute it and/or modify
- * it under the terms of the GNU General Public License as published by
- * the Free Software Foundation, either version 3 of the License, or
- * (at your option) any later version.
- *
- * QKSMS is distributed in the hope that it will be useful,
- * but WITHOUT ANY WARRANTY; without even the implied warranty of
- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
- * GNU General Public License for more details.
- *
- * You should have received a copy of the GNU General Public License
- * along with QKSMS.  If not, see <http://www.gnu.org/licenses/>.
- */
-package com.moez.QKSMS.receiver
-
-import android.content.BroadcastReceiver
-import android.content.Context
-import android.content.Intent
-import com.moez.QKSMS.interactor.DeleteMessages
-import dagger.android.AndroidInjection
-import javax.inject.Inject
-
-class DeleteMessagesReceiver : BroadcastReceiver() {
-
-    @Inject lateinit var deleteMessages: DeleteMessages
-
-    override fun onReceive(context: Context, intent: Intent) {
-        AndroidInjection.inject(this, context)
-
-        val pendingResult = goAsync()
-        val threadId = intent.getLongExtra("threadId", 0)
-        val messageIds = intent.getLongArrayExtra("messageIds")
-        deleteMessages.execute(DeleteMessages.Params(messageIds.toList(), threadId)) { pendingResult.finish() }
-    }
-
+/*
+ * Copyright (C) 2017 Moez Bhatti <moez.bhatti@gmail.com>
+ *
+ * This file is part of QKSMS.
+ *
+ * QKSMS is free software: you can redistribute it and/or modify
+ * it under the terms of the GNU General Public License as published by
+ * the Free Software Foundation, either version 3 of the License, or
+ * (at your option) any later version.
+ *
+ * QKSMS is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+ * GNU General Public License for more details.
+ *
+ * You should have received a copy of the GNU General Public License
+ * along with QKSMS.  If not, see <http://www.gnu.org/licenses/>.
+ */
+package com.moez.QKSMS.receiver
+
+import android.content.BroadcastReceiver
+import android.content.Context
+import android.content.Intent
+import com.moez.QKSMS.interactor.DeleteMessages
+import dagger.android.AndroidInjection
+import javax.inject.Inject
+
+class DeleteMessagesReceiver : BroadcastReceiver() {
+
+    @Inject lateinit var deleteMessages: DeleteMessages
+
+    override fun onReceive(context: Context, intent: Intent) {
+        AndroidInjection.inject(this, context)
+
+        val pendingResult = goAsync()
+        val threadId = intent.getLongExtra("threadId", 0)
+        val messageIds = intent.getLongArrayExtra("messageIds")
+        deleteMessages.execute(DeleteMessages.Params(messageIds.toList(), threadId)) { pendingResult.finish() }
+    }
+
 }
\ No newline at end of file
diff --git a/data/src/main/java/com/moez/QKSMS/receiver/MarkArchivedReceiver.kt b/data/src/main/java/com/moez/QKSMS/receiver/MarkArchivedReceiver.kt
index 55fdf2324..23e1f8069 100644
--- a/data/src/main/java/com/moez/QKSMS/receiver/MarkArchivedReceiver.kt
+++ b/data/src/main/java/com/moez/QKSMS/receiver/MarkArchivedReceiver.kt
@@ -1,40 +1,40 @@
-/*
- * Copyright (C) 2017 Moez Bhatti <moez.bhatti@gmail.com>
- *
- * This file is part of QKSMS.
- *
- * QKSMS is free software: you can redistribute it and/or modify
- * it under the terms of the GNU General Public License as published by
- * the Free Software Foundation, either version 3 of the License, or
- * (at your option) any later version.
- *
- * QKSMS is distributed in the hope that it will be useful,
- * but WITHOUT ANY WARRANTY; without even the implied warranty of
- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
- * GNU General Public License for more details.
- *
- * You should have received a copy of the GNU General Public License
- * along with QKSMS.  If not, see <http://www.gnu.org/licenses/>.
- */
-package com.moez.QKSMS.receiver
-
-import android.content.BroadcastReceiver
-import android.content.Context
-import android.content.Intent
-import com.moez.QKSMS.interactor.MarkArchived
-import dagger.android.AndroidInjection
-import javax.inject.Inject
-
-class MarkArchivedReceiver : BroadcastReceiver() {
-
-    @Inject lateinit var markArchived: MarkArchived
-
-    override fun onReceive(context: Context, intent: Intent) {
-        AndroidInjection.inject(this, context)
-
-        val pendingResult = goAsync()
-        val threadId = intent.getLongExtra("threadId", 0)
-        markArchived.execute(listOf(threadId)) { pendingResult.finish() }
-    }
-
+/*
+ * Copyright (C) 2017 Moez Bhatti <moez.bhatti@gmail.com>
+ *
+ * This file is part of QKSMS.
+ *
+ * QKSMS is free software: you can redistribute it and/or modify
+ * it under the terms of the GNU General Public License as published by
+ * the Free Software Foundation, either version 3 of the License, or
+ * (at your option) any later version.
+ *
+ * QKSMS is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+ * GNU General Public License for more details.
+ *
+ * You should have received a copy of the GNU General Public License
+ * along with QKSMS.  If not, see <http://www.gnu.org/licenses/>.
+ */
+package com.moez.QKSMS.receiver
+
+import android.content.BroadcastReceiver
+import android.content.Context
+import android.content.Intent
+import com.moez.QKSMS.interactor.MarkArchived
+import dagger.android.AndroidInjection
+import javax.inject.Inject
+
+class MarkArchivedReceiver : BroadcastReceiver() {
+
+    @Inject lateinit var markArchived: MarkArchived
+
+    override fun onReceive(context: Context, intent: Intent) {
+        AndroidInjection.inject(this, context)
+
+        val pendingResult = goAsync()
+        val threadId = intent.getLongExtra("threadId", 0)
+        markArchived.execute(listOf(threadId)) { pendingResult.finish() }
+    }
+
 }
\ No newline at end of file
diff --git a/data/src/main/java/com/moez/QKSMS/receiver/MarkReadReceiver.kt b/data/src/main/java/com/moez/QKSMS/receiver/MarkReadReceiver.kt
index d6ae0afa3..fe2ebff39 100644
--- a/data/src/main/java/com/moez/QKSMS/receiver/MarkReadReceiver.kt
+++ b/data/src/main/java/com/moez/QKSMS/receiver/MarkReadReceiver.kt
@@ -1,40 +1,40 @@
-/*
- * Copyright (C) 2017 Moez Bhatti <moez.bhatti@gmail.com>
- *
- * This file is part of QKSMS.
- *
- * QKSMS is free software: you can redistribute it and/or modify
- * it under the terms of the GNU General Public License as published by
- * the Free Software Foundation, either version 3 of the License, or
- * (at your option) any later version.
- *
- * QKSMS is distributed in the hope that it will be useful,
- * but WITHOUT ANY WARRANTY; without even the implied warranty of
- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
- * GNU General Public License for more details.
- *
- * You should have received a copy of the GNU General Public License
- * along with QKSMS.  If not, see <http://www.gnu.org/licenses/>.
- */
-package com.moez.QKSMS.receiver
-
-import android.content.BroadcastReceiver
-import android.content.Context
-import android.content.Intent
-import com.moez.QKSMS.interactor.MarkRead
-import dagger.android.AndroidInjection
-import javax.inject.Inject
-
-class MarkReadReceiver : BroadcastReceiver() {
-
-    @Inject lateinit var markRead: MarkRead
-
-    override fun onReceive(context: Context, intent: Intent) {
-        AndroidInjection.inject(this, context)
-
-        val pendingResult = goAsync()
-        val threadId = intent.getLongExtra("threadId", 0)
-        markRead.execute(listOf(threadId)) { pendingResult.finish() }
-    }
-
+/*
+ * Copyright (C) 2017 Moez Bhatti <moez.bhatti@gmail.com>
+ *
+ * This file is part of QKSMS.
+ *
+ * QKSMS is free software: you can redistribute it and/or modify
+ * it under the terms of the GNU General Public License as published by
+ * the Free Software Foundation, either version 3 of the License, or
+ * (at your option) any later version.
+ *
+ * QKSMS is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+ * GNU General Public License for more details.
+ *
+ * You should have received a copy of the GNU General Public License
+ * along with QKSMS.  If not, see <http://www.gnu.org/licenses/>.
+ */
+package com.moez.QKSMS.receiver
+
+import android.content.BroadcastReceiver
+import android.content.Context
+import android.content.Intent
+import com.moez.QKSMS.interactor.MarkRead
+import dagger.android.AndroidInjection
+import javax.inject.Inject
+
+class MarkReadReceiver : BroadcastReceiver() {
+
+    @Inject lateinit var markRead: MarkRead
+
+    override fun onReceive(context: Context, intent: Intent) {
+        AndroidInjection.inject(this, context)
+
+        val pendingResult = goAsync()
+        val threadId = intent.getLongExtra("threadId", 0)
+        markRead.execute(listOf(threadId)) { pendingResult.finish() }
+    }
+
 }
\ No newline at end of file
diff --git a/data/src/main/java/com/moez/QKSMS/receiver/MarkSeenReceiver.kt b/data/src/main/java/com/moez/QKSMS/receiver/MarkSeenReceiver.kt
index 1ba94ba39..d9cfa29e6 100644
--- a/data/src/main/java/com/moez/QKSMS/receiver/MarkSeenReceiver.kt
+++ b/data/src/main/java/com/moez/QKSMS/receiver/MarkSeenReceiver.kt
@@ -1,40 +1,40 @@
-/*
- * Copyright (C) 2017 Moez Bhatti <moez.bhatti@gmail.com>
- *
- * This file is part of QKSMS.
- *
- * QKSMS is free software: you can redistribute it and/or modify
- * it under the terms of the GNU General Public License as published by
- * the Free Software Foundation, either version 3 of the License, or
- * (at your option) any later version.
- *
- * QKSMS is distributed in the hope that it will be useful,
- * but WITHOUT ANY WARRANTY; without even the implied warranty of
- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
- * GNU General Public License for more details.
- *
- * You should have received a copy of the GNU General Public License
- * along with QKSMS.  If not, see <http://www.gnu.org/licenses/>.
- */
-package com.moez.QKSMS.receiver
-
-import android.content.BroadcastReceiver
-import android.content.Context
-import android.content.Intent
-import com.moez.QKSMS.interactor.MarkSeen
-import dagger.android.AndroidInjection
-import javax.inject.Inject
-
-class MarkSeenReceiver : BroadcastReceiver() {
-
-    @Inject lateinit var markSeen: MarkSeen
-
-    override fun onReceive(context: Context, intent: Intent) {
-        AndroidInjection.inject(this, context)
-
-        val pendingResult = goAsync()
-        val threadId = intent.getLongExtra("threadId", 0)
-        markSeen.execute(threadId) { pendingResult.finish() }
-    }
-
+/*
+ * Copyright (C) 2017 Moez Bhatti <moez.bhatti@gmail.com>
+ *
+ * This file is part of QKSMS.
+ *
+ * QKSMS is free software: you can redistribute it and/or modify
+ * it under the terms of the GNU General Public License as published by
+ * the Free Software Foundation, either version 3 of the License, or
+ * (at your option) any later version.
+ *
+ * QKSMS is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+ * GNU General Public License for more details.
+ *
+ * You should have received a copy of the GNU General Public License
+ * along with QKSMS.  If not, see <http://www.gnu.org/licenses/>.
+ */
+package com.moez.QKSMS.receiver
+
+import android.content.BroadcastReceiver
+import android.content.Context
+import android.content.Intent
+import com.moez.QKSMS.interactor.MarkSeen
+import dagger.android.AndroidInjection
+import javax.inject.Inject
+
+class MarkSeenReceiver : BroadcastReceiver() {
+
+    @Inject lateinit var markSeen: MarkSeen
+
+    override fun onReceive(context: Context, intent: Intent) {
+        AndroidInjection.inject(this, context)
+
+        val pendingResult = goAsync()
+        val threadId = intent.getLongExtra("threadId", 0)
+        markSeen.execute(threadId) { pendingResult.finish() }
+    }
+
 }
\ No newline at end of file
diff --git a/data/src/main/java/com/moez/QKSMS/receiver/MmsReceivedReceiver.kt b/data/src/main/java/com/moez/QKSMS/receiver/MmsReceivedReceiver.kt
index 9e340b084..f585d61dd 100644
--- a/data/src/main/java/com/moez/QKSMS/receiver/MmsReceivedReceiver.kt
+++ b/data/src/main/java/com/moez/QKSMS/receiver/MmsReceivedReceiver.kt
@@ -1,45 +1,45 @@
-/*
- * Copyright (C) 2017 Moez Bhatti <moez.bhatti@gmail.com>
- *
- * This file is part of QKSMS.
- *
- * QKSMS is free software: you can redistribute it and/or modify
- * it under the terms of the GNU General Public License as published by
- * the Free Software Foundation, either version 3 of the License, or
- * (at your option) any later version.
- *
- * QKSMS is distributed in the hope that it will be useful,
- * but WITHOUT ANY WARRANTY; without even the implied warranty of
- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
- * GNU General Public License for more details.
- *
- * You should have received a copy of the GNU General Public License
- * along with QKSMS.  If not, see <http://www.gnu.org/licenses/>.
- */
-package com.moez.QKSMS.receiver
-
-import android.content.Context
-import android.content.Intent
-import android.net.Uri
-import com.klinker.android.send_message.MmsReceivedReceiver
-import com.moez.QKSMS.interactor.ReceiveMms
-import dagger.android.AndroidInjection
-import javax.inject.Inject
-
-class MmsReceivedReceiver : MmsReceivedReceiver() {
-
-    @Inject lateinit var receiveMms: ReceiveMms
-
-    override fun onReceive(context: Context?, intent: Intent?) {
-        AndroidInjection.inject(this, context)
-        super.onReceive(context, intent)
-    }
-
-    override fun onMessageReceived(messageUri: Uri?) {
-        messageUri?.let { uri ->
-            val pendingResult = goAsync()
-            receiveMms.execute(uri) { pendingResult.finish() }
-        }
-    }
-
-}
+/*
+ * Copyright (C) 2017 Moez Bhatti <moez.bhatti@gmail.com>
+ *
+ * This file is part of QKSMS.
+ *
+ * QKSMS is free software: you can redistribute it and/or modify
+ * it under the terms of the GNU General Public License as published by
+ * the Free Software Foundation, either version 3 of the License, or
+ * (at your option) any later version.
+ *
+ * QKSMS is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+ * GNU General Public License for more details.
+ *
+ * You should have received a copy of the GNU General Public License
+ * along with QKSMS.  If not, see <http://www.gnu.org/licenses/>.
+ */
+package com.moez.QKSMS.receiver
+
+import android.content.Context
+import android.content.Intent
+import android.net.Uri
+import com.klinker.android.send_message.MmsReceivedReceiver
+import com.moez.QKSMS.interactor.ReceiveMms
+import dagger.android.AndroidInjection
+import javax.inject.Inject
+
+class MmsReceivedReceiver : MmsReceivedReceiver() {
+
+    @Inject lateinit var receiveMms: ReceiveMms
+
+    override fun onReceive(context: Context?, intent: Intent?) {
+        AndroidInjection.inject(this, context)
+        super.onReceive(context, intent)
+    }
+
+    override fun onMessageReceived(messageUri: Uri?) {
+        messageUri?.let { uri ->
+            val pendingResult = goAsync()
+            receiveMms.execute(uri) { pendingResult.finish() }
+        }
+    }
+
+}
diff --git a/data/src/main/java/com/moez/QKSMS/receiver/MmsReceiver.kt b/data/src/main/java/com/moez/QKSMS/receiver/MmsReceiver.kt
index 63e57a7eb..331f1bfad 100644
--- a/data/src/main/java/com/moez/QKSMS/receiver/MmsReceiver.kt
+++ b/data/src/main/java/com/moez/QKSMS/receiver/MmsReceiver.kt
@@ -1,23 +1,23 @@
-/*
- * Copyright (C) 2017 Moez Bhatti <moez.bhatti@gmail.com>
- *
- * This file is part of QKSMS.
- *
- * QKSMS is free software: you can redistribute it and/or modify
- * it under the terms of the GNU General Public License as published by
- * the Free Software Foundation, either version 3 of the License, or
- * (at your option) any later version.
- *
- * QKSMS is distributed in the hope that it will be useful,
- * but WITHOUT ANY WARRANTY; without even the implied warranty of
- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
- * GNU General Public License for more details.
- *
- * You should have received a copy of the GNU General Public License
- * along with QKSMS.  If not, see <http://www.gnu.org/licenses/>.
- */
-package com.moez.QKSMS.receiver
-
-import com.android.mms.transaction.PushReceiver
-
+/*
+ * Copyright (C) 2017 Moez Bhatti <moez.bhatti@gmail.com>
+ *
+ * This file is part of QKSMS.
+ *
+ * QKSMS is free software: you can redistribute it and/or modify
+ * it under the terms of the GNU General Public License as published by
+ * the Free Software Foundation, either version 3 of the License, or
+ * (at your option) any later version.
+ *
+ * QKSMS is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+ * GNU General Public License for more details.
+ *
+ * You should have received a copy of the GNU General Public License
+ * along with QKSMS.  If not, see <http://www.gnu.org/licenses/>.
+ */
+package com.moez.QKSMS.receiver
+
+import com.android.mms.transaction.PushReceiver
+
 class MmsReceiver : PushReceiver()
\ No newline at end of file
diff --git a/data/src/main/java/com/moez/QKSMS/receiver/MmsSentReceiver.kt b/data/src/main/java/com/moez/QKSMS/receiver/MmsSentReceiver.kt
index 1aaba0e36..52da8d3a3 100644
--- a/data/src/main/java/com/moez/QKSMS/receiver/MmsSentReceiver.kt
+++ b/data/src/main/java/com/moez/QKSMS/receiver/MmsSentReceiver.kt
@@ -1,93 +1,93 @@
-/*
- * Copyright (C) 2017 Moez Bhatti <moez.bhatti@gmail.com>
- *
- * This file is part of QKSMS.
- *
- * QKSMS is free software: you can redistribute it and/or modify
- * it under the terms of the GNU General Public License as published by
- * the Free Software Foundation, either version 3 of the License, or
- * (at your option) any later version.
- *
- * QKSMS is distributed in the hope that it will be useful,
- * but WITHOUT ANY WARRANTY; without even the implied warranty of
- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
- * GNU General Public License for more details.
- *
- * You should have received a copy of the GNU General Public License
- * along with QKSMS.  If not, see <http://www.gnu.org/licenses/>.
- */
-package com.moez.QKSMS.receiver
-
-import android.app.Activity
-import android.content.BroadcastReceiver
-import android.content.ContentUris
-import android.content.ContentValues
-import android.content.Context
-import android.content.Intent
-import android.net.Uri
-import android.provider.Telephony
-import com.google.android.mms.MmsException
-import com.google.android.mms.util_alt.SqliteWrapper
-import com.klinker.android.send_message.Transaction
-import com.moez.QKSMS.interactor.SyncMessage
-import dagger.android.AndroidInjection
-import timber.log.Timber
-import java.io.File
-import javax.inject.Inject
-
-class MmsSentReceiver : BroadcastReceiver() {
-
-    @Inject lateinit var syncMessage: SyncMessage
-
-    override fun onReceive(context: Context, intent: Intent) {
-        AndroidInjection.inject(this, context)
-
-        Timber.v("MMS sending result: $resultCode")
-        val uri = Uri.parse(intent.getStringExtra(Transaction.EXTRA_CONTENT_URI))
-        Timber.v(uri.toString())
-
-        when (resultCode) {
-            Activity.RESULT_OK -> {
-                Timber.v("MMS has finished sending, marking it as so in the database")
-                val values = ContentValues(1)
-                values.put(Telephony.Mms.MESSAGE_BOX, Telephony.Mms.MESSAGE_BOX_SENT)
-                SqliteWrapper.update(context, context.contentResolver, uri, values, null, null)
-            }
-
-            else -> {
-                Timber.v("MMS has failed to send, marking it as so in the database")
-                try {
-                    val messageId = ContentUris.parseId(uri)
-
-                    val values = ContentValues(1)
-                    values.put(Telephony.Mms.MESSAGE_BOX, Telephony.Mms.MESSAGE_BOX_FAILED)
-                    SqliteWrapper.update(context, context.contentResolver, Telephony.Mms.CONTENT_URI, values,
-                            "${Telephony.Mms._ID} = ?", arrayOf(messageId.toString()))
-
-                    // TODO this query isn't able to find any results
-                    // Need to figure out why the message isn't appearing in the PendingMessages Uri,
-                    // so that we can properly assign the error type
-                    val errorTypeValues = ContentValues(1)
-                    errorTypeValues.put(Telephony.MmsSms.PendingMessages.ERROR_TYPE,
-                            Telephony.MmsSms.ERR_TYPE_GENERIC_PERMANENT)
-                    SqliteWrapper.update(context, context.contentResolver, Telephony.MmsSms.PendingMessages.CONTENT_URI,
-                            errorTypeValues, "${Telephony.MmsSms.PendingMessages.MSG_ID} = ?",
-                            arrayOf(messageId.toString()))
-
-                } catch (e: MmsException) {
-                    e.printStackTrace()
-                }
-            }
-        }
-
-        val filePath = intent.getStringExtra(Transaction.EXTRA_FILE_PATH)
-        Timber.v(filePath)
-        File(filePath).delete()
-
-        Uri.parse(intent.getStringExtra("content_uri"))?.let { uri ->
-            val pendingResult = goAsync()
-            syncMessage.execute(uri) { pendingResult.finish() }
-        }
-    }
-
+/*
+ * Copyright (C) 2017 Moez Bhatti <moez.bhatti@gmail.com>
+ *
+ * This file is part of QKSMS.
+ *
+ * QKSMS is free software: you can redistribute it and/or modify
+ * it under the terms of the GNU General Public License as published by
+ * the Free Software Foundation, either version 3 of the License, or
+ * (at your option) any later version.
+ *
+ * QKSMS is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+ * GNU General Public License for more details.
+ *
+ * You should have received a copy of the GNU General Public License
+ * along with QKSMS.  If not, see <http://www.gnu.org/licenses/>.
+ */
+package com.moez.QKSMS.receiver
+
+import android.app.Activity
+import android.content.BroadcastReceiver
+import android.content.ContentUris
+import android.content.ContentValues
+import android.content.Context
+import android.content.Intent
+import android.net.Uri
+import android.provider.Telephony
+import com.google.android.mms.MmsException
+import com.google.android.mms.util_alt.SqliteWrapper
+import com.klinker.android.send_message.Transaction
+import com.moez.QKSMS.interactor.SyncMessage
+import dagger.android.AndroidInjection
+import timber.log.Timber
+import java.io.File
+import javax.inject.Inject
+
+class MmsSentReceiver : BroadcastReceiver() {
+
+    @Inject lateinit var syncMessage: SyncMessage
+
+    override fun onReceive(context: Context, intent: Intent) {
+        AndroidInjection.inject(this, context)
+
+        Timber.v("MMS sending result: $resultCode")
+        val uri = Uri.parse(intent.getStringExtra(Transaction.EXTRA_CONTENT_URI))
+        Timber.v(uri.toString())
+
+        when (resultCode) {
+            Activity.RESULT_OK -> {
+                Timber.v("MMS has finished sending, marking it as so in the database")
+                val values = ContentValues(1)
+                values.put(Telephony.Mms.MESSAGE_BOX, Telephony.Mms.MESSAGE_BOX_SENT)
+                SqliteWrapper.update(context, context.contentResolver, uri, values, null, null)
+            }
+
+            else -> {
+                Timber.v("MMS has failed to send, marking it as so in the database")
+                try {
+                    val messageId = ContentUris.parseId(uri)
+
+                    val values = ContentValues(1)
+                    values.put(Telephony.Mms.MESSAGE_BOX, Telephony.Mms.MESSAGE_BOX_FAILED)
+                    SqliteWrapper.update(context, context.contentResolver, Telephony.Mms.CONTENT_URI, values,
+                            "${Telephony.Mms._ID} = ?", arrayOf(messageId.toString()))
+
+                    // TODO this query isn't able to find any results
+                    // Need to figure out why the message isn't appearing in the PendingMessages Uri,
+                    // so that we can properly assign the error type
+                    val errorTypeValues = ContentValues(1)
+                    errorTypeValues.put(Telephony.MmsSms.PendingMessages.ERROR_TYPE,
+                            Telephony.MmsSms.ERR_TYPE_GENERIC_PERMANENT)
+                    SqliteWrapper.update(context, context.contentResolver, Telephony.MmsSms.PendingMessages.CONTENT_URI,
+                            errorTypeValues, "${Telephony.MmsSms.PendingMessages.MSG_ID} = ?",
+                            arrayOf(messageId.toString()))
+
+                } catch (e: MmsException) {
+                    e.printStackTrace()
+                }
+            }
+        }
+
+        val filePath = intent.getStringExtra(Transaction.EXTRA_FILE_PATH)
+        Timber.v(filePath)
+        File(filePath).delete()
+
+        Uri.parse(intent.getStringExtra("content_uri"))?.let { uri ->
+            val pendingResult = goAsync()
+            syncMessage.execute(uri) { pendingResult.finish() }
+        }
+    }
+
 }
\ No newline at end of file
diff --git a/data/src/main/java/com/moez/QKSMS/receiver/MmsUpdatedReceiver.kt b/data/src/main/java/com/moez/QKSMS/receiver/MmsUpdatedReceiver.kt
index 2891a1b0a..e2a3686b8 100644
--- a/data/src/main/java/com/moez/QKSMS/receiver/MmsUpdatedReceiver.kt
+++ b/data/src/main/java/com/moez/QKSMS/receiver/MmsUpdatedReceiver.kt
@@ -1,46 +1,46 @@
-/*
- * Copyright (C) 2017 Moez Bhatti <moez.bhatti@gmail.com>
- *
- * This file is part of QKSMS.
- *
- * QKSMS is free software: you can redistribute it and/or modify
- * it under the terms of the GNU General Public License as published by
- * the Free Software Foundation, either version 3 of the License, or
- * (at your option) any later version.
- *
- * QKSMS is distributed in the hope that it will be useful,
- * but WITHOUT ANY WARRANTY; without even the implied warranty of
- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
- * GNU General Public License for more details.
- *
- * You should have received a copy of the GNU General Public License
- * along with QKSMS.  If not, see <http://www.gnu.org/licenses/>.
- */
-package com.moez.QKSMS.receiver
-
-import android.content.BroadcastReceiver
-import android.content.Context
-import android.content.Intent
-import android.net.Uri
-import com.moez.QKSMS.interactor.SyncMessage
-import dagger.android.AndroidInjection
-import javax.inject.Inject
-
-class MmsUpdatedReceiver : BroadcastReceiver() {
-
-    companion object {
-        const val URI = "uri"
-    }
-
-    @Inject lateinit var syncMessage: SyncMessage
-
-    override fun onReceive(context: Context, intent: Intent) {
-        AndroidInjection.inject(this, context)
-
-        intent.getStringExtra(URI)?.let { uriString ->
-            val pendingResult = goAsync()
-            syncMessage.execute(Uri.parse(uriString)) { pendingResult.finish() }
-        }
-    }
-
+/*
+ * Copyright (C) 2017 Moez Bhatti <moez.bhatti@gmail.com>
+ *
+ * This file is part of QKSMS.
+ *
+ * QKSMS is free software: you can redistribute it and/or modify
+ * it under the terms of the GNU General Public License as published by
+ * the Free Software Foundation, either version 3 of the License, or
+ * (at your option) any later version.
+ *
+ * QKSMS is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+ * GNU General Public License for more details.
+ *
+ * You should have received a copy of the GNU General Public License
+ * along with QKSMS.  If not, see <http://www.gnu.org/licenses/>.
+ */
+package com.moez.QKSMS.receiver
+
+import android.content.BroadcastReceiver
+import android.content.Context
+import android.content.Intent
+import android.net.Uri
+import com.moez.QKSMS.interactor.SyncMessage
+import dagger.android.AndroidInjection
+import javax.inject.Inject
+
+class MmsUpdatedReceiver : BroadcastReceiver() {
+
+    companion object {
+        const val URI = "uri"
+    }
+
+    @Inject lateinit var syncMessage: SyncMessage
+
+    override fun onReceive(context: Context, intent: Intent) {
+        AndroidInjection.inject(this, context)
+
+        intent.getStringExtra(URI)?.let { uriString ->
+            val pendingResult = goAsync()
+            syncMessage.execute(Uri.parse(uriString)) { pendingResult.finish() }
+        }
+    }
+
 }
\ No newline at end of file
diff --git a/data/src/main/java/com/moez/QKSMS/receiver/NightModeReceiver.kt b/data/src/main/java/com/moez/QKSMS/receiver/NightModeReceiver.kt
index aec5836d5..46e5a7d1e 100644
--- a/data/src/main/java/com/moez/QKSMS/receiver/NightModeReceiver.kt
+++ b/data/src/main/java/com/moez/QKSMS/receiver/NightModeReceiver.kt
@@ -1,37 +1,37 @@
-/*
- * Copyright (C) 2017 Moez Bhatti <moez.bhatti@gmail.com>
- *
- * This file is part of QKSMS.
- *
- * QKSMS is free software: you can redistribute it and/or modify
- * it under the terms of the GNU General Public License as published by
- * the Free Software Foundation, either version 3 of the License, or
- * (at your option) any later version.
- *
- * QKSMS is distributed in the hope that it will be useful,
- * but WITHOUT ANY WARRANTY; without even the implied warranty of
- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
- * GNU General Public License for more details.
- *
- * You should have received a copy of the GNU General Public License
- * along with QKSMS.  If not, see <http://www.gnu.org/licenses/>.
- */
-package com.moez.QKSMS.receiver
-
-import android.content.BroadcastReceiver
-import android.content.Context
-import android.content.Intent
-import com.moez.QKSMS.util.NightModeManager
-import dagger.android.AndroidInjection
-import javax.inject.Inject
-
-class NightModeReceiver : BroadcastReceiver() {
-
-    @Inject lateinit var nightModeManager: NightModeManager
-
-    override fun onReceive(context: Context, intent: Intent) {
-        AndroidInjection.inject(this, context)
-
-        nightModeManager.updateCurrentTheme()
-    }
+/*
+ * Copyright (C) 2017 Moez Bhatti <moez.bhatti@gmail.com>
+ *
+ * This file is part of QKSMS.
+ *
+ * QKSMS is free software: you can redistribute it and/or modify
+ * it under the terms of the GNU General Public License as published by
+ * the Free Software Foundation, either version 3 of the License, or
+ * (at your option) any later version.
+ *
+ * QKSMS is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+ * GNU General Public License for more details.
+ *
+ * You should have received a copy of the GNU General Public License
+ * along with QKSMS.  If not, see <http://www.gnu.org/licenses/>.
+ */
+package com.moez.QKSMS.receiver
+
+import android.content.BroadcastReceiver
+import android.content.Context
+import android.content.Intent
+import com.moez.QKSMS.util.NightModeManager
+import dagger.android.AndroidInjection
+import javax.inject.Inject
+
+class NightModeReceiver : BroadcastReceiver() {
+
+    @Inject lateinit var nightModeManager: NightModeManager
+
+    override fun onReceive(context: Context, intent: Intent) {
+        AndroidInjection.inject(this, context)
+
+        nightModeManager.updateCurrentTheme()
+    }
 }
\ No newline at end of file
diff --git a/data/src/main/java/com/moez/QKSMS/receiver/RemoteMessagingReceiver.kt b/data/src/main/java/com/moez/QKSMS/receiver/RemoteMessagingReceiver.kt
index f013b8472..7c1e53484 100644
--- a/data/src/main/java/com/moez/QKSMS/receiver/RemoteMessagingReceiver.kt
+++ b/data/src/main/java/com/moez/QKSMS/receiver/RemoteMessagingReceiver.kt
@@ -1,60 +1,60 @@
-/*
- * Copyright (C) 2017 Moez Bhatti <moez.bhatti@gmail.com>
- *
- * This file is part of QKSMS.
- *
- * QKSMS is free software: you can redistribute it and/or modify
- * it under the terms of the GNU General Public License as published by
- * the Free Software Foundation, either version 3 of the License, or
- * (at your option) any later version.
- *
- * QKSMS is distributed in the hope that it will be useful,
- * but WITHOUT ANY WARRANTY; without even the implied warranty of
- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
- * GNU General Public License for more details.
- *
- * You should have received a copy of the GNU General Public License
- * along with QKSMS.  If not, see <http://www.gnu.org/licenses/>.
- */
-package com.moez.QKSMS.receiver
-
-import android.content.BroadcastReceiver
-import android.content.Context
-import android.content.Intent
-import androidx.core.app.RemoteInput
-import com.moez.QKSMS.compat.SubscriptionManagerCompat
-import com.moez.QKSMS.interactor.MarkRead
-import com.moez.QKSMS.interactor.SendMessage
-import com.moez.QKSMS.repository.ConversationRepository
-import com.moez.QKSMS.repository.MessageRepository
-import dagger.android.AndroidInjection
-import javax.inject.Inject
-
-class RemoteMessagingReceiver : BroadcastReceiver() {
-
-    @Inject lateinit var conversationRepo: ConversationRepository
-    @Inject lateinit var markRead: MarkRead
-    @Inject lateinit var messageRepo: MessageRepository
-    @Inject lateinit var sendMessage: SendMessage
-    @Inject lateinit var subscriptionManager: SubscriptionManagerCompat
-
-    override fun onReceive(context: Context, intent: Intent) {
-        AndroidInjection.inject(this, context)
-
-        val remoteInput = RemoteInput.getResultsFromIntent(intent) ?: return
-        val bundle = intent.extras ?: return
-
-        val threadId = bundle.getLong("threadId")
-        val body = remoteInput.getCharSequence("body").toString()
-        markRead.execute(listOf(threadId))
-
-        val lastMessage = messageRepo.getMessages(threadId).lastOrNull()
-        val subId = subscriptionManager.activeSubscriptionInfoList
-                .firstOrNull { it.subscriptionId == lastMessage?.subId }
-                ?.subscriptionId ?: -1
-        val addresses = conversationRepo.getConversation(threadId)?.recipients?.map { it.address } ?: return
-
-        val pendingRepository = goAsync()
-        sendMessage.execute(SendMessage.Params(subId, threadId, addresses, body)) { pendingRepository.finish() }
-    }
-}
+/*
+ * Copyright (C) 2017 Moez Bhatti <moez.bhatti@gmail.com>
+ *
+ * This file is part of QKSMS.
+ *
+ * QKSMS is free software: you can redistribute it and/or modify
+ * it under the terms of the GNU General Public License as published by
+ * the Free Software Foundation, either version 3 of the License, or
+ * (at your option) any later version.
+ *
+ * QKSMS is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+ * GNU General Public License for more details.
+ *
+ * You should have received a copy of the GNU General Public License
+ * along with QKSMS.  If not, see <http://www.gnu.org/licenses/>.
+ */
+package com.moez.QKSMS.receiver
+
+import android.content.BroadcastReceiver
+import android.content.Context
+import android.content.Intent
+import androidx.core.app.RemoteInput
+import com.moez.QKSMS.compat.SubscriptionManagerCompat
+import com.moez.QKSMS.interactor.MarkRead
+import com.moez.QKSMS.interactor.SendMessage
+import com.moez.QKSMS.repository.ConversationRepository
+import com.moez.QKSMS.repository.MessageRepository
+import dagger.android.AndroidInjection
+import javax.inject.Inject
+
+class RemoteMessagingReceiver : BroadcastReceiver() {
+
+    @Inject lateinit var conversationRepo: ConversationRepository
+    @Inject lateinit var markRead: MarkRead
+    @Inject lateinit var messageRepo: MessageRepository
+    @Inject lateinit var sendMessage: SendMessage
+    @Inject lateinit var subscriptionManager: SubscriptionManagerCompat
+
+    override fun onReceive(context: Context, intent: Intent) {
+        AndroidInjection.inject(this, context)
+
+        val remoteInput = RemoteInput.getResultsFromIntent(intent) ?: return
+        val bundle = intent.extras ?: return
+
+        val threadId = bundle.getLong("threadId")
+        val body = remoteInput.getCharSequence("body").toString()
+        markRead.execute(listOf(threadId))
+
+        val lastMessage = messageRepo.getMessages(threadId).lastOrNull()
+        val subId = subscriptionManager.activeSubscriptionInfoList
+                .firstOrNull { it.subscriptionId == lastMessage?.subId }
+                ?.subscriptionId ?: -1
+        val addresses = conversationRepo.getConversation(threadId)?.recipients?.map { it.address } ?: return
+
+        val pendingRepository = goAsync()
+        sendMessage.execute(SendMessage.Params(subId, threadId, addresses, body)) { pendingRepository.finish() }
+    }
+}
diff --git a/data/src/main/java/com/moez/QKSMS/receiver/SendScheduledMessageReceiver.kt b/data/src/main/java/com/moez/QKSMS/receiver/SendScheduledMessageReceiver.kt
index dcd2f3938..d02ca6363 100644
--- a/data/src/main/java/com/moez/QKSMS/receiver/SendScheduledMessageReceiver.kt
+++ b/data/src/main/java/com/moez/QKSMS/receiver/SendScheduledMessageReceiver.kt
@@ -1,43 +1,43 @@
-/*
- * Copyright (C) 2017 Moez Bhatti <moez.bhatti@gmail.com>
- *
- * This file is part of QKSMS.
- *
- * QKSMS is free software: you can redistribute it and/or modify
- * it under the terms of the GNU General Public License as published by
- * the Free Software Foundation, either version 3 of the License, or
- * (at your option) any later version.
- *
- * QKSMS is distributed in the hope that it will be useful,
- * but WITHOUT ANY WARRANTY; without even the implied warranty of
- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
- * GNU General Public License for more details.
- *
- * You should have received a copy of the GNU General Public License
- * along with QKSMS.  If not, see <http://www.gnu.org/licenses/>.
- */
-package com.moez.QKSMS.receiver
-
-import android.content.BroadcastReceiver
-import android.content.Context
-import android.content.Intent
-import com.moez.QKSMS.interactor.SendScheduledMessage
-import com.moez.QKSMS.repository.MessageRepository
-import dagger.android.AndroidInjection
-import javax.inject.Inject
-
-class SendScheduledMessageReceiver : BroadcastReceiver() {
-
-    @Inject lateinit var messageRepo: MessageRepository
-    @Inject lateinit var sendScheduledMessage: SendScheduledMessage
-
-    override fun onReceive(context: Context, intent: Intent) {
-        AndroidInjection.inject(this, context)
-
-        intent.getLongExtra("id", -1L).takeIf { it >= 0 }?.let { id ->
-            val result = goAsync()
-            sendScheduledMessage.execute(id) { result.finish() }
-        }
-    }
-
+/*
+ * Copyright (C) 2017 Moez Bhatti <moez.bhatti@gmail.com>
+ *
+ * This file is part of QKSMS.
+ *
+ * QKSMS is free software: you can redistribute it and/or modify
+ * it under the terms of the GNU General Public License as published by
+ * the Free Software Foundation, either version 3 of the License, or
+ * (at your option) any later version.
+ *
+ * QKSMS is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+ * GNU General Public License for more details.
+ *
+ * You should have received a copy of the GNU General Public License
+ * along with QKSMS.  If not, see <http://www.gnu.org/licenses/>.
+ */
+package com.moez.QKSMS.receiver
+
+import android.content.BroadcastReceiver
+import android.content.Context
+import android.content.Intent
+import com.moez.QKSMS.interactor.SendScheduledMessage
+import com.moez.QKSMS.repository.MessageRepository
+import dagger.android.AndroidInjection
+import javax.inject.Inject
+
+class SendScheduledMessageReceiver : BroadcastReceiver() {
+
+    @Inject lateinit var messageRepo: MessageRepository
+    @Inject lateinit var sendScheduledMessage: SendScheduledMessage
+
+    override fun onReceive(context: Context, intent: Intent) {
+        AndroidInjection.inject(this, context)
+
+        intent.getLongExtra("id", -1L).takeIf { it >= 0 }?.let { id ->
+            val result = goAsync()
+            sendScheduledMessage.execute(id) { result.finish() }
+        }
+    }
+
 }
\ No newline at end of file
diff --git a/data/src/main/java/com/moez/QKSMS/receiver/SendSmsReceiver.kt b/data/src/main/java/com/moez/QKSMS/receiver/SendSmsReceiver.kt
index f913f2e39..406d5ea2c 100644
--- a/data/src/main/java/com/moez/QKSMS/receiver/SendSmsReceiver.kt
+++ b/data/src/main/java/com/moez/QKSMS/receiver/SendSmsReceiver.kt
@@ -1,43 +1,43 @@
-/*
- * Copyright (C) 2017 Moez Bhatti <moez.bhatti@gmail.com>
- *
- * This file is part of QKSMS.
- *
- * QKSMS is free software: you can redistribute it and/or modify
- * it under the terms of the GNU General Public License as published by
- * the Free Software Foundation, either version 3 of the License, or
- * (at your option) any later version.
- *
- * QKSMS is distributed in the hope that it will be useful,
- * but WITHOUT ANY WARRANTY; without even the implied warranty of
- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
- * GNU General Public License for more details.
- *
- * You should have received a copy of the GNU General Public License
- * along with QKSMS.  If not, see <http://www.gnu.org/licenses/>.
- */
-package com.moez.QKSMS.receiver
-
-import android.content.BroadcastReceiver
-import android.content.Context
-import android.content.Intent
-import com.moez.QKSMS.interactor.RetrySending
-import com.moez.QKSMS.repository.MessageRepository
-import dagger.android.AndroidInjection
-import javax.inject.Inject
-
-class SendSmsReceiver : BroadcastReceiver() {
-
-    @Inject lateinit var messageRepo: MessageRepository
-    @Inject lateinit var retrySending: RetrySending
-
-    override fun onReceive(context: Context, intent: Intent) {
-        AndroidInjection.inject(this, context)
-
-        val messageId = intent.getLongExtra("id", -1L).takeIf { it >= 0 } ?: return
-
-        val result = goAsync()
-        retrySending.execute(messageId) { result.finish() }
-    }
-
-}
+/*
+ * Copyright (C) 2017 Moez Bhatti <moez.bhatti@gmail.com>
+ *
+ * This file is part of QKSMS.
+ *
+ * QKSMS is free software: you can redistribute it and/or modify
+ * it under the terms of the GNU General Public License as published by
+ * the Free Software Foundation, either version 3 of the License, or
+ * (at your option) any later version.
+ *
+ * QKSMS is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+ * GNU General Public License for more details.
+ *
+ * You should have received a copy of the GNU General Public License
+ * along with QKSMS.  If not, see <http://www.gnu.org/licenses/>.
+ */
+package com.moez.QKSMS.receiver
+
+import android.content.BroadcastReceiver
+import android.content.Context
+import android.content.Intent
+import com.moez.QKSMS.interactor.RetrySending
+import com.moez.QKSMS.repository.MessageRepository
+import dagger.android.AndroidInjection
+import javax.inject.Inject
+
+class SendSmsReceiver : BroadcastReceiver() {
+
+    @Inject lateinit var messageRepo: MessageRepository
+    @Inject lateinit var retrySending: RetrySending
+
+    override fun onReceive(context: Context, intent: Intent) {
+        AndroidInjection.inject(this, context)
+
+        val messageId = intent.getLongExtra("id", -1L).takeIf { it >= 0 } ?: return
+
+        val result = goAsync()
+        retrySending.execute(messageId) { result.finish() }
+    }
+
+}
diff --git a/data/src/main/java/com/moez/QKSMS/receiver/SmsDeliveredReceiver.kt b/data/src/main/java/com/moez/QKSMS/receiver/SmsDeliveredReceiver.kt
index 83382c319..dfc334872 100644
--- a/data/src/main/java/com/moez/QKSMS/receiver/SmsDeliveredReceiver.kt
+++ b/data/src/main/java/com/moez/QKSMS/receiver/SmsDeliveredReceiver.kt
@@ -1,55 +1,55 @@
-/*
- * Copyright (C) 2017 Moez Bhatti <moez.bhatti@gmail.com>
- *
- * This file is part of QKSMS.
- *
- * QKSMS is free software: you can redistribute it and/or modify
- * it under the terms of the GNU General Public License as published by
- * the Free Software Foundation, either version 3 of the License, or
- * (at your option) any later version.
- *
- * QKSMS is distributed in the hope that it will be useful,
- * but WITHOUT ANY WARRANTY; without even the implied warranty of
- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
- * GNU General Public License for more details.
- *
- * You should have received a copy of the GNU General Public License
- * along with QKSMS.  If not, see <http://www.gnu.org/licenses/>.
- */
-package com.moez.QKSMS.receiver
-
-import android.app.Activity
-import android.content.BroadcastReceiver
-import android.content.Context
-import android.content.Intent
-import com.moez.QKSMS.interactor.MarkDelivered
-import com.moez.QKSMS.interactor.MarkDeliveryFailed
-import dagger.android.AndroidInjection
-import javax.inject.Inject
-
-class SmsDeliveredReceiver : BroadcastReceiver() {
-
-    @Inject lateinit var markDelivered: MarkDelivered
-    @Inject lateinit var markDeliveryFailed: MarkDeliveryFailed
-
-    override fun onReceive(context: Context, intent: Intent) {
-        AndroidInjection.inject(this, context)
-
-        val id = intent.getLongExtra("id", 0L)
-
-        when (resultCode) {
-            // TODO notify about delivery
-            Activity.RESULT_OK -> {
-                val pendingResult = goAsync()
-                markDelivered.execute(id) { pendingResult.finish() }
-            }
-
-            // TODO notify about delivery failure
-            Activity.RESULT_CANCELED -> {
-                val pendingResult = goAsync()
-                markDeliveryFailed.execute(MarkDeliveryFailed.Params(id, resultCode)) { pendingResult.finish() }
-            }
-        }
-    }
-
-}
+/*
+ * Copyright (C) 2017 Moez Bhatti <moez.bhatti@gmail.com>
+ *
+ * This file is part of QKSMS.
+ *
+ * QKSMS is free software: you can redistribute it and/or modify
+ * it under the terms of the GNU General Public License as published by
+ * the Free Software Foundation, either version 3 of the License, or
+ * (at your option) any later version.
+ *
+ * QKSMS is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+ * GNU General Public License for more details.
+ *
+ * You should have received a copy of the GNU General Public License
+ * along with QKSMS.  If not, see <http://www.gnu.org/licenses/>.
+ */
+package com.moez.QKSMS.receiver
+
+import android.app.Activity
+import android.content.BroadcastReceiver
+import android.content.Context
+import android.content.Intent
+import com.moez.QKSMS.interactor.MarkDelivered
+import com.moez.QKSMS.interactor.MarkDeliveryFailed
+import dagger.android.AndroidInjection
+import javax.inject.Inject
+
+class SmsDeliveredReceiver : BroadcastReceiver() {
+
+    @Inject lateinit var markDelivered: MarkDelivered
+    @Inject lateinit var markDeliveryFailed: MarkDeliveryFailed
+
+    override fun onReceive(context: Context, intent: Intent) {
+        AndroidInjection.inject(this, context)
+
+        val id = intent.getLongExtra("id", 0L)
+
+        when (resultCode) {
+            // TODO notify about delivery
+            Activity.RESULT_OK -> {
+                val pendingResult = goAsync()
+                markDelivered.execute(id) { pendingResult.finish() }
+            }
+
+            // TODO notify about delivery failure
+            Activity.RESULT_CANCELED -> {
+                val pendingResult = goAsync()
+                markDeliveryFailed.execute(MarkDeliveryFailed.Params(id, resultCode)) { pendingResult.finish() }
+            }
+        }
+    }
+
+}
diff --git a/data/src/main/java/com/moez/QKSMS/receiver/SmsProviderChangedReceiver.kt b/data/src/main/java/com/moez/QKSMS/receiver/SmsProviderChangedReceiver.kt
index dcdc53fb3..8d9debb78 100644
--- a/data/src/main/java/com/moez/QKSMS/receiver/SmsProviderChangedReceiver.kt
+++ b/data/src/main/java/com/moez/QKSMS/receiver/SmsProviderChangedReceiver.kt
@@ -1,55 +1,55 @@
-/*
- * Copyright (C) 2017 Moez Bhatti <moez.bhatti@gmail.com>
- *
- * This file is part of QKSMS.
- *
- * QKSMS is free software: you can redistribute it and/or modify
- * it under the terms of the GNU General Public License as published by
- * the Free Software Foundation, either version 3 of the License, or
- * (at your option) any later version.
- *
- * QKSMS is distributed in the hope that it will be useful,
- * but WITHOUT ANY WARRANTY; without even the implied warranty of
- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
- * GNU General Public License for more details.
- *
- * You should have received a copy of the GNU General Public License
- * along with QKSMS.  If not, see <http://www.gnu.org/licenses/>.
- */
-package com.moez.QKSMS.receiver
-
-import android.content.BroadcastReceiver
-import android.content.Context
-import android.content.Intent
-import com.moez.QKSMS.interactor.SyncMessage
-import dagger.android.AndroidInjection
-import javax.inject.Inject
-
-/**
- * When the SMS contentprovider is changed by a process other than us, we need to sync the Uri that
- * was changed.
- *
- * This can happen if a message is sent through something like Pushbullet or Google Assistant.
- *
- * This only works on API 24+, so to fully solve this problem we'll need a smarter way of running
- * partial syncs on older devices.
- *
- * https://developer.android.com/reference/android/provider/Telephony.Sms.Intents.html#ACTION_EXTERNAL_PROVIDER_CHANGE
- */
-class SmsProviderChangedReceiver : BroadcastReceiver() {
-
-    @Inject lateinit var syncMessage: SyncMessage
-
-    override fun onReceive(context: Context, intent: Intent) {
-        AndroidInjection.inject(this, context)
-
-        // Obtain the uri for the changed data
-        // If the value is null, don't continue
-        val uri = intent.data ?: return
-
-        // Sync the message to our realm
-        val pendingResult = goAsync()
-        syncMessage.execute(uri) { pendingResult.finish() }
-    }
-
+/*
+ * Copyright (C) 2017 Moez Bhatti <moez.bhatti@gmail.com>
+ *
+ * This file is part of QKSMS.
+ *
+ * QKSMS is free software: you can redistribute it and/or modify
+ * it under the terms of the GNU General Public License as published by
+ * the Free Software Foundation, either version 3 of the License, or
+ * (at your option) any later version.
+ *
+ * QKSMS is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+ * GNU General Public License for more details.
+ *
+ * You should have received a copy of the GNU General Public License
+ * along with QKSMS.  If not, see <http://www.gnu.org/licenses/>.
+ */
+package com.moez.QKSMS.receiver
+
+import android.content.BroadcastReceiver
+import android.content.Context
+import android.content.Intent
+import com.moez.QKSMS.interactor.SyncMessage
+import dagger.android.AndroidInjection
+import javax.inject.Inject
+
+/**
+ * When the SMS contentprovider is changed by a process other than us, we need to sync the Uri that
+ * was changed.
+ *
+ * This can happen if a message is sent through something like Pushbullet or Google Assistant.
+ *
+ * This only works on API 24+, so to fully solve this problem we'll need a smarter way of running
+ * partial syncs on older devices.
+ *
+ * https://developer.android.com/reference/android/provider/Telephony.Sms.Intents.html#ACTION_EXTERNAL_PROVIDER_CHANGE
+ */
+class SmsProviderChangedReceiver : BroadcastReceiver() {
+
+    @Inject lateinit var syncMessage: SyncMessage
+
+    override fun onReceive(context: Context, intent: Intent) {
+        AndroidInjection.inject(this, context)
+
+        // Obtain the uri for the changed data
+        // If the value is null, don't continue
+        val uri = intent.data ?: return
+
+        // Sync the message to our realm
+        val pendingResult = goAsync()
+        syncMessage.execute(uri) { pendingResult.finish() }
+    }
+
 }
\ No newline at end of file
diff --git a/data/src/main/java/com/moez/QKSMS/receiver/SmsReceiver.kt b/data/src/main/java/com/moez/QKSMS/receiver/SmsReceiver.kt
index 3e6c410f9..b9902cfcb 100644
--- a/data/src/main/java/com/moez/QKSMS/receiver/SmsReceiver.kt
+++ b/data/src/main/java/com/moez/QKSMS/receiver/SmsReceiver.kt
@@ -1,46 +1,46 @@
-/*
- * Copyright (C) 2017 Moez Bhatti <moez.bhatti@gmail.com>
- *
- * This file is part of QKSMS.
- *
- * QKSMS is free software: you can redistribute it and/or modify
- * it under the terms of the GNU General Public License as published by
- * the Free Software Foundation, either version 3 of the License, or
- * (at your option) any later version.
- *
- * QKSMS is distributed in the hope that it will be useful,
- * but WITHOUT ANY WARRANTY; without even the implied warranty of
- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
- * GNU General Public License for more details.
- *
- * You should have received a copy of the GNU General Public License
- * along with QKSMS.  If not, see <http://www.gnu.org/licenses/>.
- */
-package com.moez.QKSMS.receiver
-
-import android.content.BroadcastReceiver
-import android.content.Context
-import android.content.Intent
-import android.provider.Telephony.Sms
-import com.moez.QKSMS.interactor.ReceiveSms
-import dagger.android.AndroidInjection
-import timber.log.Timber
-import javax.inject.Inject
-
-class SmsReceiver : BroadcastReceiver() {
-
-    @Inject lateinit var receiveMessage: ReceiveSms
-
-    override fun onReceive(context: Context, intent: Intent) {
-        AndroidInjection.inject(this, context)
-        Timber.v("onReceive")
-
-        Sms.Intents.getMessagesFromIntent(intent)?.let { messages ->
-            val subId = intent.extras?.getInt("subscription", -1) ?: -1
-
-            val pendingResult = goAsync()
-            receiveMessage.execute(ReceiveSms.Params(subId, messages)) { pendingResult.finish() }
-        }
-    }
-
+/*
+ * Copyright (C) 2017 Moez Bhatti <moez.bhatti@gmail.com>
+ *
+ * This file is part of QKSMS.
+ *
+ * QKSMS is free software: you can redistribute it and/or modify
+ * it under the terms of the GNU General Public License as published by
+ * the Free Software Foundation, either version 3 of the License, or
+ * (at your option) any later version.
+ *
+ * QKSMS is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+ * GNU General Public License for more details.
+ *
+ * You should have received a copy of the GNU General Public License
+ * along with QKSMS.  If not, see <http://www.gnu.org/licenses/>.
+ */
+package com.moez.QKSMS.receiver
+
+import android.content.BroadcastReceiver
+import android.content.Context
+import android.content.Intent
+import android.provider.Telephony.Sms
+import com.moez.QKSMS.interactor.ReceiveSms
+import dagger.android.AndroidInjection
+import timber.log.Timber
+import javax.inject.Inject
+
+class SmsReceiver : BroadcastReceiver() {
+
+    @Inject lateinit var receiveMessage: ReceiveSms
+
+    override fun onReceive(context: Context, intent: Intent) {
+        AndroidInjection.inject(this, context)
+        Timber.v("onReceive")
+
+        Sms.Intents.getMessagesFromIntent(intent)?.let { messages ->
+            val subId = intent.extras?.getInt("subscription", -1) ?: -1
+
+            val pendingResult = goAsync()
+            receiveMessage.execute(ReceiveSms.Params(subId, messages)) { pendingResult.finish() }
+        }
+    }
+
 }
\ No newline at end of file
diff --git a/data/src/main/java/com/moez/QKSMS/receiver/SmsSentReceiver.kt b/data/src/main/java/com/moez/QKSMS/receiver/SmsSentReceiver.kt
index 077e9f338..c9cb494f8 100644
--- a/data/src/main/java/com/moez/QKSMS/receiver/SmsSentReceiver.kt
+++ b/data/src/main/java/com/moez/QKSMS/receiver/SmsSentReceiver.kt
@@ -1,53 +1,53 @@
-/*
- * Copyright (C) 2017 Moez Bhatti <moez.bhatti@gmail.com>
- *
- * This file is part of QKSMS.
- *
- * QKSMS is free software: you can redistribute it and/or modify
- * it under the terms of the GNU General Public License as published by
- * the Free Software Foundation, either version 3 of the License, or
- * (at your option) any later version.
- *
- * QKSMS is distributed in the hope that it will be useful,
- * but WITHOUT ANY WARRANTY; without even the implied warranty of
- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
- * GNU General Public License for more details.
- *
- * You should have received a copy of the GNU General Public License
- * along with QKSMS.  If not, see <http://www.gnu.org/licenses/>.
- */
-package com.moez.QKSMS.receiver
-
-import android.app.Activity
-import android.content.BroadcastReceiver
-import android.content.Context
-import android.content.Intent
-import com.moez.QKSMS.interactor.MarkFailed
-import com.moez.QKSMS.interactor.MarkSent
-import dagger.android.AndroidInjection
-import javax.inject.Inject
-
-class SmsSentReceiver : BroadcastReceiver() {
-
-    @Inject lateinit var markSent: MarkSent
-    @Inject lateinit var markFailed: MarkFailed
-
-    override fun onReceive(context: Context, intent: Intent) {
-        AndroidInjection.inject(this, context)
-
-        val id = intent.getLongExtra("id", 0L)
-
-        when (resultCode) {
-            Activity.RESULT_OK -> {
-                val pendingResult = goAsync()
-                markSent.execute(id) { pendingResult.finish() }
-            }
-
-            else -> {
-                val pendingResult = goAsync()
-                markFailed.execute(MarkFailed.Params(id, resultCode)) { pendingResult.finish() }
-            }
-        }
-    }
-
-}
+/*
+ * Copyright (C) 2017 Moez Bhatti <moez.bhatti@gmail.com>
+ *
+ * This file is part of QKSMS.
+ *
+ * QKSMS is free software: you can redistribute it and/or modify
+ * it under the terms of the GNU General Public License as published by
+ * the Free Software Foundation, either version 3 of the License, or
+ * (at your option) any later version.
+ *
+ * QKSMS is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+ * GNU General Public License for more details.
+ *
+ * You should have received a copy of the GNU General Public License
+ * along with QKSMS.  If not, see <http://www.gnu.org/licenses/>.
+ */
+package com.moez.QKSMS.receiver
+
+import android.app.Activity
+import android.content.BroadcastReceiver
+import android.content.Context
+import android.content.Intent
+import com.moez.QKSMS.interactor.MarkFailed
+import com.moez.QKSMS.interactor.MarkSent
+import dagger.android.AndroidInjection
+import javax.inject.Inject
+
+class SmsSentReceiver : BroadcastReceiver() {
+
+    @Inject lateinit var markSent: MarkSent
+    @Inject lateinit var markFailed: MarkFailed
+
+    override fun onReceive(context: Context, intent: Intent) {
+        AndroidInjection.inject(this, context)
+
+        val id = intent.getLongExtra("id", 0L)
+
+        when (resultCode) {
+            Activity.RESULT_OK -> {
+                val pendingResult = goAsync()
+                markSent.execute(id) { pendingResult.finish() }
+            }
+
+            else -> {
+                val pendingResult = goAsync()
+                markFailed.execute(MarkFailed.Params(id, resultCode)) { pendingResult.finish() }
+            }
+        }
+    }
+
+}
diff --git a/data/src/main/java/com/moez/QKSMS/repository/BackupRepositoryImpl.kt b/data/src/main/java/com/moez/QKSMS/repository/BackupRepositoryImpl.kt
index 9fff3db35..2cd6ef2cd 100644
--- a/data/src/main/java/com/moez/QKSMS/repository/BackupRepositoryImpl.kt
+++ b/data/src/main/java/com/moez/QKSMS/repository/BackupRepositoryImpl.kt
@@ -1,247 +1,247 @@
-/*
- * Copyright (C) 2017 Moez Bhatti <moez.bhatti@gmail.com>
- *
- * This file is part of QKSMS.
- *
- * QKSMS is free software: you can redistribute it and/or modify
- * it under the terms of the GNU General Public License as published by
- * the Free Software Foundation, either version 3 of the License, or
- * (at your option) any later version.
- *
- * QKSMS is distributed in the hope that it will be useful,
- * but WITHOUT ANY WARRANTY; without even the implied warranty of
- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
- * GNU General Public License for more details.
- *
- * You should have received a copy of the GNU General Public License
- * along with QKSMS.  If not, see <http://www.gnu.org/licenses/>.
- */
-package com.moez.QKSMS.repository
-
-import android.content.Context
-import android.os.Environment
-import android.provider.Telephony
-import androidx.core.content.contentValuesOf
-import com.moez.QKSMS.model.BackupFile
-import com.moez.QKSMS.model.Message
-import com.moez.QKSMS.util.Preferences
-import com.moez.QKSMS.util.QkFileObserver
-import com.moez.QKSMS.util.tryOrNull
-import com.squareup.moshi.Moshi
-import io.reactivex.Observable
-import io.reactivex.schedulers.Schedulers
-import io.reactivex.subjects.BehaviorSubject
-import io.reactivex.subjects.Subject
-import io.realm.Realm
-import okio.buffer
-import okio.source
-import timber.log.Timber
-import java.io.File
-import java.io.FileOutputStream
-import java.text.SimpleDateFormat
-import java.util.*
-import javax.inject.Inject
-import javax.inject.Singleton
-import kotlin.concurrent.schedule
-
-@Singleton
-class BackupRepositoryImpl @Inject constructor(
-    private val context: Context,
-    private val moshi: Moshi,
-    private val prefs: Preferences,
-    private val syncRepo: SyncRepository
-) : BackupRepository {
-
-    companion object {
-        private val BACKUP_DIRECTORY = Environment.getExternalStorageDirectory().toString() + "/QKSMS/Backups"
-    }
-
-    data class Backup(
-        val messageCount: Int = 0,
-        val messages: List<BackupMessage> = listOf()
-    )
-
-    /**
-     * Simpler version of [Backup] which allows us to read certain fields from the backup without
-     * needing to parse the entire file
-     */
-    data class BackupMetadata(
-        val messageCount: Int = 0
-    )
-
-    data class BackupMessage(
-        val type: Int,
-        val address: String,
-        val date: Long,
-        val dateSent: Long,
-        val read: Boolean,
-        val status: Int,
-        val body: String,
-        val protocol: Int,
-        val serviceCenter: String?,
-        val locked: Boolean,
-        val subId: Int
-    )
-
-    // Subjects to emit our progress events to
-    private val backupProgress: Subject<BackupRepository.Progress> =
-            BehaviorSubject.createDefault(BackupRepository.Progress.Idle())
-    private val restoreProgress: Subject<BackupRepository.Progress> =
-            BehaviorSubject.createDefault(BackupRepository.Progress.Idle())
-
-    @Volatile private var stopFlag: Boolean = false
-
-    override fun performBackup() {
-        // If a backup or restore is already running, don't do anything
-        if (isBackupOrRestoreRunning()) return
-
-        var messageCount = 0
-
-        // Map all the messages into our object we'll use for the Json mapping
-        val backupMessages = Realm.getDefaultInstance().use { realm ->
-            // Get the messages from realm
-            val messages = realm.where(Message::class.java).sort("date").findAll().createSnapshot()
-            messageCount = messages.size
-
-            // Map the messages to the new format
-            messages.mapIndexed { index, message ->
-                // Update the progress
-                backupProgress.onNext(BackupRepository.Progress.Running(messageCount, index))
-                messageToBackupMessage(message)
-            }
-        }
-
-        // Update the status, and set the progress to be indeterminate since we can no longer calculate progress
-        backupProgress.onNext(BackupRepository.Progress.Saving())
-
-        // Convert the data to json
-        val adapter = moshi.adapter(Backup::class.java).indent("\t")
-        val json = adapter.toJson(Backup(messageCount, backupMessages)).toByteArray()
-
-        try {
-            // Create the directory and file
-            val dir = File(BACKUP_DIRECTORY).apply { mkdirs() }
-            val timestamp = SimpleDateFormat("yyyyMMddHHmmss", Locale.getDefault()).format(System.currentTimeMillis())
-            val file = File(dir, "backup-$timestamp.json")
-
-            // Write the log to the file
-            FileOutputStream(file, true).use { fileOutputStream -> fileOutputStream.write(json) }
-        } catch (e: Exception) {
-            Timber.w(e)
-        }
-
-        // Mark the task finished, and set it as Idle a second later
-        backupProgress.onNext(BackupRepository.Progress.Finished())
-        Timer().schedule(1000) { backupProgress.onNext(BackupRepository.Progress.Idle()) }
-    }
-
-    private fun messageToBackupMessage(message: Message): BackupMessage = BackupMessage(
-            type = message.boxId,
-            address = message.address,
-            date = message.date,
-            dateSent = message.dateSent,
-            read = message.read,
-            status = message.deliveryStatus,
-            body = message.body,
-            protocol = 0,
-            serviceCenter = null,
-            locked = message.locked,
-            subId = message.subId
-    )
-
-    override fun getBackupProgress(): Observable<BackupRepository.Progress> = backupProgress
-
-    override fun getBackups(): Observable<List<BackupFile>> = QkFileObserver(BACKUP_DIRECTORY).observable
-            .map { File(BACKUP_DIRECTORY).listFiles() ?: arrayOf() }
-            .subscribeOn(Schedulers.io())
-            .observeOn(Schedulers.computation())
-            .map { files ->
-                files.mapNotNull { file ->
-                    val adapter = moshi.adapter(BackupMetadata::class.java)
-                    val backup = tryOrNull(false) {
-                        file.source().buffer().use(adapter::fromJson)
-                    } ?: return@mapNotNull null
-
-                    val path = file.path
-                    val date = file.lastModified()
-                    val messages = backup.messageCount
-                    val size = file.length()
-                    BackupFile(path, date, messages, size)
-                }
-            }
-            .map { files -> files.sortedByDescending { file -> file.date } }
-
-    override fun performRestore(filePath: String) {
-        // If a backupFile or restore is already running, don't do anything
-        if (isBackupOrRestoreRunning()) return
-
-        restoreProgress.onNext(BackupRepository.Progress.Parsing())
-
-        val file = File(filePath)
-        val backup = file.source().buffer().use { source ->
-            moshi.adapter(Backup::class.java).fromJson(source)
-        }
-
-        val messageCount = backup?.messages?.size ?: 0
-        var errorCount = 0
-
-        backup?.messages?.forEachIndexed { index, message ->
-            if (stopFlag) {
-                stopFlag = false
-                restoreProgress.onNext(BackupRepository.Progress.Idle())
-                return
-            }
-
-            // Update the progress
-            restoreProgress.onNext(BackupRepository.Progress.Running(messageCount, index))
-
-            try {
-                val values = contentValuesOf(
-                        Telephony.Sms.TYPE to message.type,
-                        Telephony.Sms.ADDRESS to message.address,
-                        Telephony.Sms.DATE to message.date,
-                        Telephony.Sms.DATE_SENT to message.dateSent,
-                        Telephony.Sms.READ to message.read,
-                        Telephony.Sms.SEEN to 1,
-                        Telephony.Sms.STATUS to message.status,
-                        Telephony.Sms.BODY to message.body,
-                        Telephony.Sms.PROTOCOL to message.protocol,
-                        Telephony.Sms.SERVICE_CENTER to message.serviceCenter,
-                        Telephony.Sms.LOCKED to message.locked
-                )
-
-                if (prefs.canUseSubId.get()) {
-                    values.put(Telephony.Sms.SUBSCRIPTION_ID, message.subId)
-                }
-
-                context.contentResolver.insert(Telephony.Sms.CONTENT_URI, values)
-            } catch (e: Exception) {
-                Timber.w(e)
-                errorCount++
-            }
-        }
-
-        if (errorCount > 0) {
-            Timber.w(Exception("Failed to backup $errorCount/$messageCount messages"))
-        }
-
-        // Sync the messages
-        restoreProgress.onNext(BackupRepository.Progress.Syncing())
-        syncRepo.syncMessages()
-
-        // Mark the task finished, and set it as Idle a second later
-        restoreProgress.onNext(BackupRepository.Progress.Finished())
-        Timer().schedule(1000) { restoreProgress.onNext(BackupRepository.Progress.Idle()) }
-    }
-
-    override fun stopRestore() {
-        stopFlag = true
-    }
-
-    override fun getRestoreProgress(): Observable<BackupRepository.Progress> = restoreProgress
-
-    private fun isBackupOrRestoreRunning(): Boolean {
-        return backupProgress.blockingFirst().running || restoreProgress.blockingFirst().running
-    }
-
+/*
+ * Copyright (C) 2017 Moez Bhatti <moez.bhatti@gmail.com>
+ *
+ * This file is part of QKSMS.
+ *
+ * QKSMS is free software: you can redistribute it and/or modify
+ * it under the terms of the GNU General Public License as published by
+ * the Free Software Foundation, either version 3 of the License, or
+ * (at your option) any later version.
+ *
+ * QKSMS is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+ * GNU General Public License for more details.
+ *
+ * You should have received a copy of the GNU General Public License
+ * along with QKSMS.  If not, see <http://www.gnu.org/licenses/>.
+ */
+package com.moez.QKSMS.repository
+
+import android.content.Context
+import android.os.Environment
+import android.provider.Telephony
+import androidx.core.content.contentValuesOf
+import com.moez.QKSMS.model.BackupFile
+import com.moez.QKSMS.model.Message
+import com.moez.QKSMS.util.Preferences
+import com.moez.QKSMS.util.QkFileObserver
+import com.moez.QKSMS.util.tryOrNull
+import com.squareup.moshi.Moshi
+import io.reactivex.Observable
+import io.reactivex.schedulers.Schedulers
+import io.reactivex.subjects.BehaviorSubject
+import io.reactivex.subjects.Subject
+import io.realm.Realm
+import okio.buffer
+import okio.source
+import timber.log.Timber
+import java.io.File
+import java.io.FileOutputStream
+import java.text.SimpleDateFormat
+import java.util.*
+import javax.inject.Inject
+import javax.inject.Singleton
+import kotlin.concurrent.schedule
+
+@Singleton
+class BackupRepositoryImpl @Inject constructor(
+    private val context: Context,
+    private val moshi: Moshi,
+    private val prefs: Preferences,
+    private val syncRepo: SyncRepository
+) : BackupRepository {
+
+    companion object {
+        private val BACKUP_DIRECTORY = Environment.getExternalStorageDirectory().toString() + "/QKSMS/Backups"
+    }
+
+    data class Backup(
+        val messageCount: Int = 0,
+        val messages: List<BackupMessage> = listOf()
+    )
+
+    /**
+     * Simpler version of [Backup] which allows us to read certain fields from the backup without
+     * needing to parse the entire file
+     */
+    data class BackupMetadata(
+        val messageCount: Int = 0
+    )
+
+    data class BackupMessage(
+        val type: Int,
+        val address: String,
+        val date: Long,
+        val dateSent: Long,
+        val read: Boolean,
+        val status: Int,
+        val body: String,
+        val protocol: Int,
+        val serviceCenter: String?,
+        val locked: Boolean,
+        val subId: Int
+    )
+
+    // Subjects to emit our progress events to
+    private val backupProgress: Subject<BackupRepository.Progress> =
+            BehaviorSubject.createDefault(BackupRepository.Progress.Idle())
+    private val restoreProgress: Subject<BackupRepository.Progress> =
+            BehaviorSubject.createDefault(BackupRepository.Progress.Idle())
+
+    @Volatile private var stopFlag: Boolean = false
+
+    override fun performBackup() {
+        // If a backup or restore is already running, don't do anything
+        if (isBackupOrRestoreRunning()) return
+
+        var messageCount = 0
+
+        // Map all the messages into our object we'll use for the Json mapping
+        val backupMessages = Realm.getDefaultInstance().use { realm ->
+            // Get the messages from realm
+            val messages = realm.where(Message::class.java).sort("date").findAll().createSnapshot()
+            messageCount = messages.size
+
+            // Map the messages to the new format
+            messages.mapIndexed { index, message ->
+                // Update the progress
+                backupProgress.onNext(BackupRepository.Progress.Running(messageCount, index))
+                messageToBackupMessage(message)
+            }
+        }
+
+        // Update the status, and set the progress to be indeterminate since we can no longer calculate progress
+        backupProgress.onNext(BackupRepository.Progress.Saving())
+
+        // Convert the data to json
+        val adapter = moshi.adapter(Backup::class.java).indent("\t")
+        val json = adapter.toJson(Backup(messageCount, backupMessages)).toByteArray()
+
+        try {
+            // Create the directory and file
+            val dir = File(BACKUP_DIRECTORY).apply { mkdirs() }
+            val timestamp = SimpleDateFormat("yyyyMMddHHmmss", Locale.getDefault()).format(System.currentTimeMillis())
+            val file = File(dir, "backup-$timestamp.json")
+
+            // Write the log to the file
+            FileOutputStream(file, true).use { fileOutputStream -> fileOutputStream.write(json) }
+        } catch (e: Exception) {
+            Timber.w(e)
+        }
+
+        // Mark the task finished, and set it as Idle a second later
+        backupProgress.onNext(BackupRepository.Progress.Finished())
+        Timer().schedule(1000) { backupProgress.onNext(BackupRepository.Progress.Idle()) }
+    }
+
+    private fun messageToBackupMessage(message: Message): BackupMessage = BackupMessage(
+            type = message.boxId,
+            address = message.address,
+            date = message.date,
+            dateSent = message.dateSent,
+            read = message.read,
+            status = message.deliveryStatus,
+            body = message.body,
+            protocol = 0,
+            serviceCenter = null,
+            locked = message.locked,
+            subId = message.subId
+    )
+
+    override fun getBackupProgress(): Observable<BackupRepository.Progress> = backupProgress
+
+    override fun getBackups(): Observable<List<BackupFile>> = QkFileObserver(BACKUP_DIRECTORY).observable
+            .map { File(BACKUP_DIRECTORY).listFiles() ?: arrayOf() }
+            .subscribeOn(Schedulers.io())
+            .observeOn(Schedulers.computation())
+            .map { files ->
+                files.mapNotNull { file ->
+                    val adapter = moshi.adapter(BackupMetadata::class.java)
+                    val backup = tryOrNull(false) {
+                        file.source().buffer().use(adapter::fromJson)
+                    } ?: return@mapNotNull null
+
+                    val path = file.path
+                    val date = file.lastModified()
+                    val messages = backup.messageCount
+                    val size = file.length()
+                    BackupFile(path, date, messages, size)
+                }
+            }
+            .map { files -> files.sortedByDescending { file -> file.date } }
+
+    override fun performRestore(filePath: String) {
+        // If a backupFile or restore is already running, don't do anything
+        if (isBackupOrRestoreRunning()) return
+
+        restoreProgress.onNext(BackupRepository.Progress.Parsing())
+
+        val file = File(filePath)
+        val backup = file.source().buffer().use { source ->
+            moshi.adapter(Backup::class.java).fromJson(source)
+        }
+
+        val messageCount = backup?.messages?.size ?: 0
+        var errorCount = 0
+
+        backup?.messages?.forEachIndexed { index, message ->
+            if (stopFlag) {
+                stopFlag = false
+                restoreProgress.onNext(BackupRepository.Progress.Idle())
+                return
+            }
+
+            // Update the progress
+            restoreProgress.onNext(BackupRepository.Progress.Running(messageCount, index))
+
+            try {
+                val values = contentValuesOf(
+                        Telephony.Sms.TYPE to message.type,
+                        Telephony.Sms.ADDRESS to message.address,
+                        Telephony.Sms.DATE to message.date,
+                        Telephony.Sms.DATE_SENT to message.dateSent,
+                        Telephony.Sms.READ to message.read,
+                        Telephony.Sms.SEEN to 1,
+                        Telephony.Sms.STATUS to message.status,
+                        Telephony.Sms.BODY to message.body,
+                        Telephony.Sms.PROTOCOL to message.protocol,
+                        Telephony.Sms.SERVICE_CENTER to message.serviceCenter,
+                        Telephony.Sms.LOCKED to message.locked
+                )
+
+                if (prefs.canUseSubId.get()) {
+                    values.put(Telephony.Sms.SUBSCRIPTION_ID, message.subId)
+                }
+
+                context.contentResolver.insert(Telephony.Sms.CONTENT_URI, values)
+            } catch (e: Exception) {
+                Timber.w(e)
+                errorCount++
+            }
+        }
+
+        if (errorCount > 0) {
+            Timber.w(Exception("Failed to backup $errorCount/$messageCount messages"))
+        }
+
+        // Sync the messages
+        restoreProgress.onNext(BackupRepository.Progress.Syncing())
+        syncRepo.syncMessages()
+
+        // Mark the task finished, and set it as Idle a second later
+        restoreProgress.onNext(BackupRepository.Progress.Finished())
+        Timer().schedule(1000) { restoreProgress.onNext(BackupRepository.Progress.Idle()) }
+    }
+
+    override fun stopRestore() {
+        stopFlag = true
+    }
+
+    override fun getRestoreProgress(): Observable<BackupRepository.Progress> = restoreProgress
+
+    private fun isBackupOrRestoreRunning(): Boolean {
+        return backupProgress.blockingFirst().running || restoreProgress.blockingFirst().running
+    }
+
 }
\ No newline at end of file
diff --git a/data/src/main/java/com/moez/QKSMS/repository/BlockingRepositoryImpl.kt b/data/src/main/java/com/moez/QKSMS/repository/BlockingRepositoryImpl.kt
index 4dcbcb1ee..ebdb53c0d 100644
--- a/data/src/main/java/com/moez/QKSMS/repository/BlockingRepositoryImpl.kt
+++ b/data/src/main/java/com/moez/QKSMS/repository/BlockingRepositoryImpl.kt
@@ -1,103 +1,103 @@
-/*
- * Copyright (C) 2017 Moez Bhatti <moez.bhatti@gmail.com>
- *
- * This file is part of QKSMS.
- *
- * QKSMS is free software: you can redistribute it and/or modify
- * it under the terms of the GNU General Public License as published by
- * the Free Software Foundation, either version 3 of the License, or
- * (at your option) any later version.
- *
- * QKSMS is distributed in the hope that it will be useful,
- * but WITHOUT ANY WARRANTY; without even the implied warranty of
- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
- * GNU General Public License for more details.
- *
- * You should have received a copy of the GNU General Public License
- * along with QKSMS.  If not, see <http://www.gnu.org/licenses/>.
- */
-package com.moez.QKSMS.repository
-
-import com.moez.QKSMS.extensions.anyOf
-import com.moez.QKSMS.model.BlockedNumber
-import com.moez.QKSMS.util.PhoneNumberUtils
-import io.realm.Realm
-import io.realm.RealmResults
-import javax.inject.Inject
-
-class BlockingRepositoryImpl @Inject constructor(
-    private val phoneNumberUtils: PhoneNumberUtils
-) : BlockingRepository {
-
-    override fun blockNumber(vararg addresses: String) {
-        Realm.getDefaultInstance().use { realm ->
-            realm.refresh()
-
-            val blockedNumbers = realm.where(BlockedNumber::class.java).findAll()
-            val newAddresses = addresses.filter { address ->
-                blockedNumbers.none { number -> phoneNumberUtils.compare(number.address, address) }
-            }
-
-            val maxId = realm.where(BlockedNumber::class.java)
-                    .max("id")?.toLong() ?: -1
-
-            realm.executeTransaction {
-                realm.insert(newAddresses.mapIndexed { index, address ->
-                    BlockedNumber(maxId + 1 + index, address)
-                })
-            }
-        }
-    }
-
-    override fun getBlockedNumbers(): RealmResults<BlockedNumber> {
-        return Realm.getDefaultInstance()
-                .where(BlockedNumber::class.java)
-                .findAllAsync()
-    }
-
-    override fun getBlockedNumber(id: Long): BlockedNumber? {
-        return Realm.getDefaultInstance()
-                .where(BlockedNumber::class.java)
-                .equalTo("id", id)
-                .findFirst()
-    }
-
-    override fun isBlocked(address: String): Boolean {
-        return Realm.getDefaultInstance().use { realm ->
-            realm.where(BlockedNumber::class.java)
-                    .findAll()
-                    .any { number -> phoneNumberUtils.compare(number.address, address) }
-        }
-    }
-
-    override fun unblockNumber(id: Long) {
-        Realm.getDefaultInstance().use { realm ->
-            realm.executeTransaction {
-                realm.where(BlockedNumber::class.java)
-                        .equalTo("id", id)
-                        .findAll()
-                        .deleteAllFromRealm()
-            }
-        }
-    }
-
-    override fun unblockNumbers(vararg addresses: String) {
-        Realm.getDefaultInstance().use { realm ->
-            val ids = realm.where(BlockedNumber::class.java)
-                    .findAll()
-                    .filter { number ->
-                        addresses.any { address -> phoneNumberUtils.compare(number.address, address) }
-                    }
-                    .map { number -> number.id }
-                    .toLongArray()
-
-            realm.executeTransaction {
-                realm.where(BlockedNumber::class.java)
-                        .anyOf("id", ids)
-                        .findAll()
-                        .deleteAllFromRealm()
-            }
-        }
-    }
-
-}
+/*
+ * Copyright (C) 2017 Moez Bhatti <moez.bhatti@gmail.com>
+ *
+ * This file is part of QKSMS.
+ *
+ * QKSMS is free software: you can redistribute it and/or modify
+ * it under the terms of the GNU General Public License as published by
+ * the Free Software Foundation, either version 3 of the License, or
+ * (at your option) any later version.
+ *
+ * QKSMS is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+ * GNU General Public License for more details.
+ *
+ * You should have received a copy of the GNU General Public License
+ * along with QKSMS.  If not, see <http://www.gnu.org/licenses/>.
+ */
+package com.moez.QKSMS.repository
+
+import com.moez.QKSMS.extensions.anyOf
+import com.moez.QKSMS.model.BlockedNumber
+import com.moez.QKSMS.util.PhoneNumberUtils
+import io.realm.Realm
+import io.realm.RealmResults
+import javax.inject.Inject
+
+class BlockingRepositoryImpl @Inject constructor(
+    private val phoneNumberUtils: PhoneNumberUtils
+) : BlockingRepository {
+
+    override fun blockNumber(vararg addresses: String) {
+        Realm.getDefaultInstance().use { realm ->
+            realm.refresh()
+
+            val blockedNumbers = realm.where(BlockedNumber::class.java).findAll()
+            val newAddresses = addresses.filter { address ->
+                blockedNumbers.none { number -> phoneNumberUtils.compare(number.address, address) }
+            }
+
+            val maxId = realm.where(BlockedNumber::class.java)
+                    .max("id")?.toLong() ?: -1
+
+            realm.executeTransaction {
+                realm.insert(newAddresses.mapIndexed { index, address ->
+                    BlockedNumber(maxId + 1 + index, address)
+                })
+            }
+        }
+    }
+
+    override fun getBlockedNumbers(): RealmResults<BlockedNumber> {
+        return Realm.getDefaultInstance()
+                .where(BlockedNumber::class.java)
+                .findAllAsync()
+    }
+
+    override fun getBlockedNumber(id: Long): BlockedNumber? {
+        return Realm.getDefaultInstance()
+                .where(BlockedNumber::class.java)
+                .equalTo("id", id)
+                .findFirst()
+    }
+
+    override fun isBlocked(address: String): Boolean {
+        return Realm.getDefaultInstance().use { realm ->
+            realm.where(BlockedNumber::class.java)
+                    .findAll()
+                    .any { number -> phoneNumberUtils.compare(number.address, address) }
+        }
+    }
+
+    override fun unblockNumber(id: Long) {
+        Realm.getDefaultInstance().use { realm ->
+            realm.executeTransaction {
+                realm.where(BlockedNumber::class.java)
+                        .equalTo("id", id)
+                        .findAll()
+                        .deleteAllFromRealm()
+            }
+        }
+    }
+
+    override fun unblockNumbers(vararg addresses: String) {
+        Realm.getDefaultInstance().use { realm ->
+            val ids = realm.where(BlockedNumber::class.java)
+                    .findAll()
+                    .filter { number ->
+                        addresses.any { address -> phoneNumberUtils.compare(number.address, address) }
+                    }
+                    .map { number -> number.id }
+                    .toLongArray()
+
+            realm.executeTransaction {
+                realm.where(BlockedNumber::class.java)
+                        .anyOf("id", ids)
+                        .findAll()
+                        .deleteAllFromRealm()
+            }
+        }
+    }
+
+}
diff --git a/data/src/main/java/com/moez/QKSMS/repository/ContactRepositoryImpl.kt b/data/src/main/java/com/moez/QKSMS/repository/ContactRepositoryImpl.kt
index ee3d25fa2..586a414fc 100644
--- a/data/src/main/java/com/moez/QKSMS/repository/ContactRepositoryImpl.kt
+++ b/data/src/main/java/com/moez/QKSMS/repository/ContactRepositoryImpl.kt
@@ -1,165 +1,165 @@
-/*
- * Copyright (C) 2017 Moez Bhatti <moez.bhatti@gmail.com>
- *
- * This file is part of QKSMS.
- *
- * QKSMS is free software: you can redistribute it and/or modify
- * it under the terms of the GNU General Public License as published by
- * the Free Software Foundation, either version 3 of the License, or
- * (at your option) any later version.
- *
- * QKSMS is distributed in the hope that it will be useful,
- * but WITHOUT ANY WARRANTY; without even the implied warranty of
- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
- * GNU General Public License for more details.
- *
- * You should have received a copy of the GNU General Public License
- * along with QKSMS.  If not, see <http://www.gnu.org/licenses/>.
- */
-package com.moez.QKSMS.repository
-
-import android.content.Context
-import android.net.Uri
-import android.provider.BaseColumns
-import android.provider.ContactsContract
-import android.provider.ContactsContract.CommonDataKinds.Email
-import android.provider.ContactsContract.CommonDataKinds.Phone
-import com.moez.QKSMS.extensions.asFlowable
-import com.moez.QKSMS.extensions.asObservable
-import com.moez.QKSMS.extensions.mapNotNull
-import com.moez.QKSMS.model.Contact
-import com.moez.QKSMS.model.ContactGroup
-import com.moez.QKSMS.util.Preferences
-import io.reactivex.Flowable
-import io.reactivex.Observable
-import io.reactivex.Single
-import io.reactivex.android.schedulers.AndroidSchedulers
-import io.reactivex.schedulers.Schedulers
-import io.realm.Realm
-import io.realm.RealmResults
-import javax.inject.Inject
-import javax.inject.Singleton
-
-@Singleton
-class ContactRepositoryImpl @Inject constructor(
-    private val context: Context,
-    private val prefs: Preferences
-) : ContactRepository {
-
-    override fun findContactUri(address: String): Single<Uri> {
-        return Flowable.just(address)
-                .map {
-                    when {
-                        address.contains('@') -> {
-                            Uri.withAppendedPath(Email.CONTENT_FILTER_URI, Uri.encode(address))
-                        }
-
-                        else -> {
-                            Uri.withAppendedPath(ContactsContract.PhoneLookup.CONTENT_FILTER_URI, Uri.encode(address))
-                        }
-                    }
-                }
-                .mapNotNull { uri -> context.contentResolver.query(uri, arrayOf(BaseColumns._ID), null, null, null) }
-                .flatMap { cursor -> cursor.asFlowable() }
-                .firstOrError()
-                .map { cursor -> cursor.getString(cursor.getColumnIndexOrThrow(BaseColumns._ID)) }
-                .map { id -> Uri.withAppendedPath(ContactsContract.Contacts.CONTENT_URI, id) }
-    }
-
-    override fun getContacts(): RealmResults<Contact> {
-        val realm = Realm.getDefaultInstance()
-        return realm.where(Contact::class.java)
-                .sort("name")
-                .findAll()
-    }
-
-    override fun getUnmanagedContact(lookupKey: String): Contact? {
-        return Realm.getDefaultInstance().use { realm ->
-            realm.where(Contact::class.java)
-                    .equalTo("lookupKey", lookupKey)
-                    .findFirst()
-                    ?.let(realm::copyFromRealm)
-        }
-    }
-
-    override fun getUnmanagedContacts(starred: Boolean): Observable<List<Contact>> {
-        val realm = Realm.getDefaultInstance()
-
-        val mobileOnly = prefs.mobileOnly.get()
-        val mobileLabel by lazy { Phone.getTypeLabel(context.resources, Phone.TYPE_MOBILE, "Mobile").toString() }
-
-        var query = realm.where(Contact::class.java)
-
-        if (mobileOnly) {
-            query = query.contains("numbers.type", mobileLabel)
-        }
-
-        if (starred) {
-            query = query.equalTo("starred", true)
-        }
-
-        return query
-                .findAllAsync()
-                .asObservable()
-                .filter { it.isLoaded }
-                .filter { it.isValid }
-                .map { realm.copyFromRealm(it) }
-                .subscribeOn(AndroidSchedulers.mainThread())
-                .observeOn(Schedulers.io())
-                .map { contacts ->
-                    if (mobileOnly) {
-                        contacts.map { contact ->
-                            val filteredNumbers = contact.numbers.filter { number -> number.type == mobileLabel }
-                            contact.numbers.clear()
-                            contact.numbers.addAll(filteredNumbers)
-                            contact
-                        }
-                    } else {
-                        contacts
-                    }
-                }
-                .map { contacts ->
-                    contacts.sortedWith(Comparator { c1, c2 ->
-                        val initial = c1.name.firstOrNull()
-                        val other = c2.name.firstOrNull()
-                        if (initial?.isLetter() == true && other?.isLetter() != true) {
-                            -1
-                        } else if (initial?.isLetter() != true && other?.isLetter() == true) {
-                            1
-                        } else {
-                            c1.name.compareTo(c2.name, ignoreCase = true)
-                        }
-                    })
-                }
-    }
-
-    override fun getUnmanagedContactGroups(): Observable<List<ContactGroup>> {
-        val realm = Realm.getDefaultInstance()
-        return realm.where(ContactGroup::class.java)
-                .isNotEmpty("contacts")
-                .findAllAsync()
-                .asObservable()
-                .filter { it.isLoaded }
-                .filter { it.isValid }
-                .map { realm.copyFromRealm(it) }
-                .subscribeOn(AndroidSchedulers.mainThread())
-                .observeOn(Schedulers.io())
-    }
-
-    override fun setDefaultPhoneNumber(lookupKey: String, phoneNumberId: Long) {
-        Realm.getDefaultInstance().use { realm ->
-            realm.refresh()
-            val contact = realm.where(Contact::class.java)
-                    .equalTo("lookupKey", lookupKey)
-                    .findFirst()
-                    ?: return
-
-            realm.executeTransaction {
-                contact.numbers.forEach { number ->
-                    number.isDefault = number.id == phoneNumberId
-                }
-            }
-        }
-    }
-
-}
+/*
+ * Copyright (C) 2017 Moez Bhatti <moez.bhatti@gmail.com>
+ *
+ * This file is part of QKSMS.
+ *
+ * QKSMS is free software: you can redistribute it and/or modify
+ * it under the terms of the GNU General Public License as published by
+ * the Free Software Foundation, either version 3 of the License, or
+ * (at your option) any later version.
+ *
+ * QKSMS is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+ * GNU General Public License for more details.
+ *
+ * You should have received a copy of the GNU General Public License
+ * along with QKSMS.  If not, see <http://www.gnu.org/licenses/>.
+ */
+package com.moez.QKSMS.repository
+
+import android.content.Context
+import android.net.Uri
+import android.provider.BaseColumns
+import android.provider.ContactsContract
+import android.provider.ContactsContract.CommonDataKinds.Email
+import android.provider.ContactsContract.CommonDataKinds.Phone
+import com.moez.QKSMS.extensions.asFlowable
+import com.moez.QKSMS.extensions.asObservable
+import com.moez.QKSMS.extensions.mapNotNull
+import com.moez.QKSMS.model.Contact
+import com.moez.QKSMS.model.ContactGroup
+import com.moez.QKSMS.util.Preferences
+import io.reactivex.Flowable
+import io.reactivex.Observable
+import io.reactivex.Single
+import io.reactivex.android.schedulers.AndroidSchedulers
+import io.reactivex.schedulers.Schedulers
+import io.realm.Realm
+import io.realm.RealmResults
+import javax.inject.Inject
+import javax.inject.Singleton
+
+@Singleton
+class ContactRepositoryImpl @Inject constructor(
+    private val context: Context,
+    private val prefs: Preferences
+) : ContactRepository {
+
+    override fun findContactUri(address: String): Single<Uri> {
+        return Flowable.just(address)
+                .map {
+                    when {
+                        address.contains('@') -> {
+                            Uri.withAppendedPath(Email.CONTENT_FILTER_URI, Uri.encode(address))
+                        }
+
+                        else -> {
+                            Uri.withAppendedPath(ContactsContract.PhoneLookup.CONTENT_FILTER_URI, Uri.encode(address))
+                        }
+                    }
+                }
+                .mapNotNull { uri -> context.contentResolver.query(uri, arrayOf(BaseColumns._ID), null, null, null) }
+                .flatMap { cursor -> cursor.asFlowable() }
+                .firstOrError()
+                .map { cursor -> cursor.getString(cursor.getColumnIndexOrThrow(BaseColumns._ID)) }
+                .map { id -> Uri.withAppendedPath(ContactsContract.Contacts.CONTENT_URI, id) }
+    }
+
+    override fun getContacts(): RealmResults<Contact> {
+        val realm = Realm.getDefaultInstance()
+        return realm.where(Contact::class.java)
+                .sort("name")
+                .findAll()
+    }
+
+    override fun getUnmanagedContact(lookupKey: String): Contact? {
+        return Realm.getDefaultInstance().use { realm ->
+            realm.where(Contact::class.java)
+                    .equalTo("lookupKey", lookupKey)
+                    .findFirst()
+                    ?.let(realm::copyFromRealm)
+        }
+    }
+
+    override fun getUnmanagedContacts(starred: Boolean): Observable<List<Contact>> {
+        val realm = Realm.getDefaultInstance()
+
+        val mobileOnly = prefs.mobileOnly.get()
+        val mobileLabel by lazy { Phone.getTypeLabel(context.resources, Phone.TYPE_MOBILE, "Mobile").toString() }
+
+        var query = realm.where(Contact::class.java)
+
+        if (mobileOnly) {
+            query = query.contains("numbers.type", mobileLabel)
+        }
+
+        if (starred) {
+            query = query.equalTo("starred", true)
+        }
+
+        return query
+                .findAllAsync()
+                .asObservable()
+                .filter { it.isLoaded }
+                .filter { it.isValid }
+                .map { realm.copyFromRealm(it) }
+                .subscribeOn(AndroidSchedulers.mainThread())
+                .observeOn(Schedulers.io())
+                .map { contacts ->
+                    if (mobileOnly) {
+                        contacts.map { contact ->
+                            val filteredNumbers = contact.numbers.filter { number -> number.type == mobileLabel }
+                            contact.numbers.clear()
+                            contact.numbers.addAll(filteredNumbers)
+                            contact
+                        }
+                    } else {
+                        contacts
+                    }
+                }
+                .map { contacts ->
+                    contacts.sortedWith(Comparator { c1, c2 ->
+                        val initial = c1.name.firstOrNull()
+                        val other = c2.name.firstOrNull()
+                        if (initial?.isLetter() == true && other?.isLetter() != true) {
+                            -1
+                        } else if (initial?.isLetter() != true && other?.isLetter() == true) {
+                            1
+                        } else {
+                            c1.name.compareTo(c2.name, ignoreCase = true)
+                        }
+                    })
+                }
+    }
+
+    override fun getUnmanagedContactGroups(): Observable<List<ContactGroup>> {
+        val realm = Realm.getDefaultInstance()
+        return realm.where(ContactGroup::class.java)
+                .isNotEmpty("contacts")
+                .findAllAsync()
+                .asObservable()
+                .filter { it.isLoaded }
+                .filter { it.isValid }
+                .map { realm.copyFromRealm(it) }
+                .subscribeOn(AndroidSchedulers.mainThread())
+                .observeOn(Schedulers.io())
+    }
+
+    override fun setDefaultPhoneNumber(lookupKey: String, phoneNumberId: Long) {
+        Realm.getDefaultInstance().use { realm ->
+            realm.refresh()
+            val contact = realm.where(Contact::class.java)
+                    .equalTo("lookupKey", lookupKey)
+                    .findFirst()
+                    ?: return
+
+            realm.executeTransaction {
+                contact.numbers.forEach { number ->
+                    number.isDefault = number.id == phoneNumberId
+                }
+            }
+        }
+    }
+
+}
diff --git a/data/src/main/java/com/moez/QKSMS/repository/ConversationRepositoryImpl.kt b/data/src/main/java/com/moez/QKSMS/repository/ConversationRepositoryImpl.kt
index 7706c904a..4065ae7ad 100644
--- a/data/src/main/java/com/moez/QKSMS/repository/ConversationRepositoryImpl.kt
+++ b/data/src/main/java/com/moez/QKSMS/repository/ConversationRepositoryImpl.kt
@@ -1,466 +1,466 @@
-/*
- * Copyright (C) 2017 Moez Bhatti <moez.bhatti@gmail.com>
- *
- * This file is part of QKSMS.
- *
- * QKSMS is free software: you can redistribute it and/or modify
- * it under the terms of the GNU General Public License as published by
- * the Free Software Foundation, either version 3 of the License, or
- * (at your option) any later version.
- *
- * QKSMS is distributed in the hope that it will be useful,
- * but WITHOUT ANY WARRANTY; without even the implied warranty of
- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
- * GNU General Public License for more details.
- *
- * You should have received a copy of the GNU General Public License
- * along with QKSMS.  If not, see <http://www.gnu.org/licenses/>.
- */
-package com.moez.QKSMS.repository
-
-import android.content.ContentUris
-import android.content.Context
-import android.provider.Telephony
-import com.moez.QKSMS.compat.TelephonyCompat
-import com.moez.QKSMS.extensions.anyOf
-import com.moez.QKSMS.extensions.asObservable
-import com.moez.QKSMS.extensions.map
-import com.moez.QKSMS.extensions.removeAccents
-import com.moez.QKSMS.filter.ConversationFilter
-import com.moez.QKSMS.mapper.CursorToConversation
-import com.moez.QKSMS.mapper.CursorToRecipient
-import com.moez.QKSMS.model.Contact
-import com.moez.QKSMS.model.Conversation
-import com.moez.QKSMS.model.Message
-import com.moez.QKSMS.model.Recipient
-import com.moez.QKSMS.model.SearchResult
-import com.moez.QKSMS.util.PhoneNumberUtils
-import com.moez.QKSMS.util.tryOrNull
-import io.reactivex.Observable
-import io.reactivex.android.schedulers.AndroidSchedulers
-import io.reactivex.schedulers.Schedulers
-import io.realm.Case
-import io.realm.Realm
-import io.realm.RealmResults
-import io.realm.Sort
-import java.util.concurrent.TimeUnit
-import javax.inject.Inject
-
-class ConversationRepositoryImpl @Inject constructor(
-    private val context: Context,
-    private val conversationFilter: ConversationFilter,
-    private val cursorToConversation: CursorToConversation,
-    private val cursorToRecipient: CursorToRecipient,
-    private val phoneNumberUtils: PhoneNumberUtils
-) : ConversationRepository {
-
-    override fun getConversations(archived: Boolean): RealmResults<Conversation> {
-        return Realm.getDefaultInstance()
-                .where(Conversation::class.java)
-                .notEqualTo("id", 0L)
-                .equalTo("archived", archived)
-                .equalTo("blocked", false)
-                .isNotEmpty("recipients")
-                .beginGroup()
-                .isNotNull("lastMessage")
-                .or()
-                .isNotEmpty("draft")
-                .endGroup()
-                .sort(
-                        arrayOf("pinned", "draft", "lastMessage.date"),
-                        arrayOf(Sort.DESCENDING, Sort.DESCENDING, Sort.DESCENDING)
-                )
-                .findAllAsync()
-    }
-
-    override fun getConversationsSnapshot(): List<Conversation> {
-        return Realm.getDefaultInstance().use { realm ->
-            realm.refresh()
-            realm.copyFromRealm(realm.where(Conversation::class.java)
-                    .notEqualTo("id", 0L)
-                    .equalTo("archived", false)
-                    .equalTo("blocked", false)
-                    .isNotEmpty("recipients")
-                    .beginGroup()
-                    .isNotNull("lastMessage")
-                    .or()
-                    .isNotEmpty("draft")
-                    .endGroup()
-                    .sort(
-                            arrayOf("pinned", "draft", "lastMessage.date"),
-                            arrayOf(Sort.DESCENDING, Sort.DESCENDING, Sort.DESCENDING)
-                    )
-                    .findAll())
-        }
-    }
-
-    override fun getTopConversations(): List<Conversation> {
-        return Realm.getDefaultInstance().use { realm ->
-            realm.copyFromRealm(realm.where(Conversation::class.java)
-                    .notEqualTo("id", 0L)
-                    .isNotNull("lastMessage")
-                    .beginGroup()
-                    .equalTo("pinned", true)
-                    .or()
-                    .greaterThan("lastMessage.date", System.currentTimeMillis() - TimeUnit.DAYS.toMillis(7))
-                    .endGroup()
-                    .equalTo("archived", false)
-                    .equalTo("blocked", false)
-                    .isNotEmpty("recipients")
-                    .findAll())
-                    .sortedWith(compareByDescending<Conversation> { conversation -> conversation.pinned }
-                            .thenByDescending { conversation ->
-                                realm.where(Message::class.java)
-                                        .equalTo("threadId", conversation.id)
-                                        .greaterThan("date", System.currentTimeMillis() - TimeUnit.DAYS.toMillis(7))
-                                        .count()
-                            })
-        }
-    }
-
-    override fun setConversationName(id: Long, name: String) {
-        Realm.getDefaultInstance().use { realm ->
-            realm.executeTransaction {
-                realm.where(Conversation::class.java)
-                        .equalTo("id", id)
-                        .findFirst()
-                        ?.name = name
-            }
-        }
-    }
-
-    override fun searchConversations(query: CharSequence): List<SearchResult> {
-        val realm = Realm.getDefaultInstance()
-
-        val normalizedQuery = query.removeAccents()
-        val conversations = realm.copyFromRealm(realm
-                .where(Conversation::class.java)
-                .notEqualTo("id", 0L)
-                .isNotNull("lastMessage")
-                .equalTo("blocked", false)
-                .isNotEmpty("recipients")
-                .sort("pinned", Sort.DESCENDING, "lastMessage.date", Sort.DESCENDING)
-                .findAll())
-
-        val messagesByConversation = realm.copyFromRealm(realm
-                .where(Message::class.java)
-                .beginGroup()
-                .contains("body", normalizedQuery, Case.INSENSITIVE)
-                .or()
-                .contains("parts.text", normalizedQuery, Case.INSENSITIVE)
-                .endGroup()
-                .findAll())
-                .asSequence()
-                .groupBy { message -> message.threadId }
-                .filter { (threadId, _) -> conversations.firstOrNull { it.id == threadId } != null }
-                .map { (threadId, messages) -> Pair(conversations.first { it.id == threadId }, messages.size) }
-                .map { (conversation, messages) -> SearchResult(normalizedQuery, conversation, messages) }
-                .sortedByDescending { result -> result.messages }
-                .toList()
-
-        realm.close()
-
-        return conversations
-                .filter { conversation -> conversationFilter.filter(conversation, normalizedQuery) }
-                .map { conversation -> SearchResult(normalizedQuery, conversation, 0) } + messagesByConversation
-    }
-
-    override fun getBlockedConversations(): RealmResults<Conversation> {
-        return Realm.getDefaultInstance()
-                .where(Conversation::class.java)
-                .equalTo("blocked", true)
-                .findAll()
-    }
-
-    override fun getBlockedConversationsAsync(): RealmResults<Conversation> {
-        return Realm.getDefaultInstance()
-                .where(Conversation::class.java)
-                .equalTo("blocked", true)
-                .findAllAsync()
-    }
-
-    override fun getConversationAsync(threadId: Long): Conversation {
-        return Realm.getDefaultInstance()
-                .where(Conversation::class.java)
-                .equalTo("id", threadId)
-                .findFirstAsync()
-    }
-
-    override fun getConversation(threadId: Long): Conversation? {
-        return Realm.getDefaultInstance()
-                .apply { refresh() }
-                .where(Conversation::class.java)
-                .equalTo("id", threadId)
-                .findFirst()
-    }
-
-    override fun getConversations(vararg threadIds: Long): RealmResults<Conversation> {
-        return Realm.getDefaultInstance()
-                .where(Conversation::class.java)
-                .anyOf("id", threadIds)
-                .findAll()
-    }
-
-    override fun getUnmanagedConversations(): Observable<List<Conversation>> {
-        val realm = Realm.getDefaultInstance()
-        return realm.where(Conversation::class.java)
-                .sort("lastMessage.date", Sort.DESCENDING)
-                .notEqualTo("id", 0L)
-                .isNotNull("lastMessage")
-                .equalTo("archived", false)
-                .equalTo("blocked", false)
-                .isNotEmpty("recipients")
-                .limit(5)
-                .findAllAsync()
-                .asObservable()
-                .filter { it.isLoaded }
-                .filter { it.isValid }
-                .map { realm.copyFromRealm(it) }
-                .subscribeOn(AndroidSchedulers.mainThread())
-                .observeOn(Schedulers.io())
-    }
-
-    override fun getRecipients(): RealmResults<Recipient> {
-        val realm = Realm.getDefaultInstance()
-        return realm.where(Recipient::class.java)
-                .findAll()
-    }
-
-    override fun getUnmanagedRecipients(): Observable<List<Recipient>> {
-        val realm = Realm.getDefaultInstance()
-        return realm.where(Recipient::class.java)
-                .isNotNull("contact")
-                .findAllAsync()
-                .asObservable()
-                .filter { it.isLoaded && it.isValid }
-                .map { realm.copyFromRealm(it) }
-                .subscribeOn(AndroidSchedulers.mainThread())
-    }
-
-    override fun getRecipient(recipientId: Long): Recipient? {
-        return Realm.getDefaultInstance()
-                .where(Recipient::class.java)
-                .equalTo("id", recipientId)
-                .findFirst()
-    }
-
-    override fun getThreadId(recipient: String): Long? {
-        return getThreadId(listOf(recipient))
-    }
-
-    override fun getThreadId(recipients: Collection<String>): Long? {
-        return Realm.getDefaultInstance().use { realm ->
-            realm.refresh()
-            realm.where(Conversation::class.java)
-                    .findAll()
-                    .asSequence()
-                    .filter { conversation -> conversation.recipients.size == recipients.size }
-                    .find { conversation ->
-                        conversation.recipients.map { it.address }.all { address ->
-                            recipients.any { recipient -> phoneNumberUtils.compare(recipient, address) }
-                        }
-                    }?.id
-        }
-    }
-
-    override fun getOrCreateConversation(threadId: Long): Conversation? {
-        return getConversation(threadId) ?: getConversationFromCp(threadId)
-    }
-
-    override fun getOrCreateConversation(address: String): Conversation? {
-        return getOrCreateConversation(listOf(address))
-    }
-
-    override fun getOrCreateConversation(addresses: List<String>): Conversation? {
-        if (addresses.isEmpty()) {
-            return null
-        }
-
-        return (getThreadId(addresses) ?: tryOrNull { TelephonyCompat.getOrCreateThreadId(context, addresses.toSet()) })
-                ?.takeIf { threadId -> threadId != 0L }
-                ?.let { threadId ->
-                    getConversation(threadId)
-                            ?.let(Realm.getDefaultInstance()::copyFromRealm)
-                            ?: getConversationFromCp(threadId)
-                }
-    }
-
-    override fun saveDraft(threadId: Long, draft: String) {
-        Realm.getDefaultInstance().use { realm ->
-            realm.refresh()
-
-            val conversation = realm.where(Conversation::class.java)
-                    .equalTo("id", threadId)
-                    .findFirst()
-
-            realm.executeTransaction {
-                conversation?.takeIf { it.isValid }?.draft = draft
-            }
-        }
-    }
-
-    override fun updateConversations(vararg threadIds: Long) {
-        Realm.getDefaultInstance().use { realm ->
-            realm.refresh()
-
-            threadIds.forEach { threadId ->
-                val conversation = realm
-                        .where(Conversation::class.java)
-                        .equalTo("id", threadId)
-                        .findFirst() ?: return
-
-                val message = realm
-                        .where(Message::class.java)
-                        .equalTo("threadId", threadId)
-                        .sort("date", Sort.DESCENDING)
-                        .findFirst()
-
-                realm.executeTransaction {
-                    conversation.lastMessage = message
-                }
-            }
-        }
-    }
-
-    override fun markArchived(vararg threadIds: Long) {
-        Realm.getDefaultInstance().use { realm ->
-            val conversations = realm.where(Conversation::class.java)
-                    .anyOf("id", threadIds)
-                    .findAll()
-
-            realm.executeTransaction {
-                conversations.forEach { it.archived = true }
-            }
-        }
-    }
-
-    override fun markUnarchived(vararg threadIds: Long) {
-        Realm.getDefaultInstance().use { realm ->
-            val conversations = realm.where(Conversation::class.java)
-                    .anyOf("id", threadIds)
-                    .findAll()
-
-            realm.executeTransaction {
-                conversations.forEach { it.archived = false }
-            }
-        }
-    }
-
-    override fun markPinned(vararg threadIds: Long) {
-        Realm.getDefaultInstance().use { realm ->
-            val conversations = realm.where(Conversation::class.java)
-                    .anyOf("id", threadIds)
-                    .findAll()
-
-            realm.executeTransaction {
-                conversations.forEach { it.pinned = true }
-            }
-        }
-    }
-
-    override fun markUnpinned(vararg threadIds: Long) {
-        Realm.getDefaultInstance().use { realm ->
-            val conversations = realm.where(Conversation::class.java)
-                    .anyOf("id", threadIds)
-                    .findAll()
-
-            realm.executeTransaction {
-                conversations.forEach { it.pinned = false }
-            }
-        }
-    }
-
-    override fun markBlocked(threadIds: List<Long>, blockingClient: Int, blockReason: String?) {
-        Realm.getDefaultInstance().use { realm ->
-            val conversations = realm.where(Conversation::class.java)
-                    .anyOf("id", threadIds.toLongArray())
-                    .equalTo("blocked", false)
-                    .findAll()
-
-            realm.executeTransaction {
-                conversations.forEach { conversation ->
-                    conversation.blocked = true
-                    conversation.blockingClient = blockingClient
-                    conversation.blockReason = blockReason
-                }
-            }
-        }
-    }
-
-    override fun markUnblocked(vararg threadIds: Long) {
-        Realm.getDefaultInstance().use { realm ->
-            val conversations = realm.where(Conversation::class.java)
-                    .anyOf("id", threadIds)
-                    .findAll()
-
-            realm.executeTransaction {
-                conversations.forEach { conversation ->
-                    conversation.blocked = false
-                    conversation.blockingClient = null
-                    conversation.blockReason = null
-                }
-            }
-        }
-    }
-
-    override fun deleteConversations(vararg threadIds: Long) {
-        Realm.getDefaultInstance().use { realm ->
-            val conversation = realm.where(Conversation::class.java).anyOf("id", threadIds).findAll()
-            val messages = realm.where(Message::class.java).anyOf("threadId", threadIds).findAll()
-
-            realm.executeTransaction {
-                conversation.deleteAllFromRealm()
-                messages.deleteAllFromRealm()
-            }
-        }
-
-        threadIds.forEach { threadId ->
-            val uri = ContentUris.withAppendedId(Telephony.Threads.CONTENT_URI, threadId)
-            context.contentResolver.delete(uri, null, null)
-        }
-    }
-
-    /**
-     * Returns a [Conversation] from the system SMS ContentProvider, based on the [threadId]
-     *
-     * It should be noted that even if we have a valid [threadId], that does not guarantee that
-     * we can return a [Conversation]. On some devices, the ContentProvider won't return the
-     * conversation unless it contains at least 1 message
-     */
-    private fun getConversationFromCp(threadId: Long): Conversation? {
-        return cursorToConversation.getConversationsCursor()
-                ?.map(cursorToConversation::map)
-                ?.firstOrNull { it.id == threadId }
-                ?.let { conversation ->
-                    val realm = Realm.getDefaultInstance()
-                    val contacts = realm.copyFromRealm(realm.where(Contact::class.java).findAll())
-                    val lastMessage = realm.where(Message::class.java).equalTo("threadId", threadId)
-                            .sort("date", Sort.DESCENDING).findFirst()?.let(realm::copyFromRealm)
-
-                    val recipients = conversation.recipients
-                            .map { recipient -> recipient.id }
-                            .map { id -> cursorToRecipient.getRecipientCursor(id) }
-                            .mapNotNull { recipientCursor ->
-                                // Map the recipient cursor to a list of recipients
-                                recipientCursor?.use { recipientCursor.map { cursorToRecipient.map(recipientCursor) } }
-                            }
-                            .flatten()
-                            .map { recipient ->
-                                recipient.apply {
-                                    contact = contacts.firstOrNull {
-                                        it.numbers.any { phoneNumberUtils.compare(recipient.address, it.address) }
-                                    }
-                                }
-                            }
-
-                    conversation.recipients.clear()
-                    conversation.recipients.addAll(recipients)
-                    conversation.lastMessage = lastMessage
-                    realm.executeTransaction { it.insertOrUpdate(conversation) }
-                    realm.close()
-
-                    conversation
-                }
-    }
-
+/*
+ * Copyright (C) 2017 Moez Bhatti <moez.bhatti@gmail.com>
+ *
+ * This file is part of QKSMS.
+ *
+ * QKSMS is free software: you can redistribute it and/or modify
+ * it under the terms of the GNU General Public License as published by
+ * the Free Software Foundation, either version 3 of the License, or
+ * (at your option) any later version.
+ *
+ * QKSMS is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+ * GNU General Public License for more details.
+ *
+ * You should have received a copy of the GNU General Public License
+ * along with QKSMS.  If not, see <http://www.gnu.org/licenses/>.
+ */
+package com.moez.QKSMS.repository
+
+import android.content.ContentUris
+import android.content.Context
+import android.provider.Telephony
+import com.moez.QKSMS.compat.TelephonyCompat
+import com.moez.QKSMS.extensions.anyOf
+import com.moez.QKSMS.extensions.asObservable
+import com.moez.QKSMS.extensions.map
+import com.moez.QKSMS.extensions.removeAccents
+import com.moez.QKSMS.filter.ConversationFilter
+import com.moez.QKSMS.mapper.CursorToConversation
+import com.moez.QKSMS.mapper.CursorToRecipient
+import com.moez.QKSMS.model.Contact
+import com.moez.QKSMS.model.Conversation
+import com.moez.QKSMS.model.Message
+import com.moez.QKSMS.model.Recipient
+import com.moez.QKSMS.model.SearchResult
+import com.moez.QKSMS.util.PhoneNumberUtils
+import com.moez.QKSMS.util.tryOrNull
+import io.reactivex.Observable
+import io.reactivex.android.schedulers.AndroidSchedulers
+import io.reactivex.schedulers.Schedulers
+import io.realm.Case
+import io.realm.Realm
+import io.realm.RealmResults
+import io.realm.Sort
+import java.util.concurrent.TimeUnit
+import javax.inject.Inject
+
+class ConversationRepositoryImpl @Inject constructor(
+    private val context: Context,
+    private val conversationFilter: ConversationFilter,
+    private val cursorToConversation: CursorToConversation,
+    private val cursorToRecipient: CursorToRecipient,
+    private val phoneNumberUtils: PhoneNumberUtils
+) : ConversationRepository {
+
+    override fun getConversations(archived: Boolean): RealmResults<Conversation> {
+        return Realm.getDefaultInstance()
+                .where(Conversation::class.java)
+                .notEqualTo("id", 0L)
+                .equalTo("archived", archived)
+                .equalTo("blocked", false)
+                .isNotEmpty("recipients")
+                .beginGroup()
+                .isNotNull("lastMessage")
+                .or()
+                .isNotEmpty("draft")
+                .endGroup()
+                .sort(
+                        arrayOf("pinned", "draft", "lastMessage.date"),
+                        arrayOf(Sort.DESCENDING, Sort.DESCENDING, Sort.DESCENDING)
+                )
+                .findAllAsync()
+    }
+
+    override fun getConversationsSnapshot(): List<Conversation> {
+        return Realm.getDefaultInstance().use { realm ->
+            realm.refresh()
+            realm.copyFromRealm(realm.where(Conversation::class.java)
+                    .notEqualTo("id", 0L)
+                    .equalTo("archived", false)
+                    .equalTo("blocked", false)
+                    .isNotEmpty("recipients")
+                    .beginGroup()
+                    .isNotNull("lastMessage")
+                    .or()
+                    .isNotEmpty("draft")
+                    .endGroup()
+                    .sort(
+                            arrayOf("pinned", "draft", "lastMessage.date"),
+                            arrayOf(Sort.DESCENDING, Sort.DESCENDING, Sort.DESCENDING)
+                    )
+                    .findAll())
+        }
+    }
+
+    override fun getTopConversations(): List<Conversation> {
+        return Realm.getDefaultInstance().use { realm ->
+            realm.copyFromRealm(realm.where(Conversation::class.java)
+                    .notEqualTo("id", 0L)
+                    .isNotNull("lastMessage")
+                    .beginGroup()
+                    .equalTo("pinned", true)
+                    .or()
+                    .greaterThan("lastMessage.date", System.currentTimeMillis() - TimeUnit.DAYS.toMillis(7))
+                    .endGroup()
+                    .equalTo("archived", false)
+                    .equalTo("blocked", false)
+                    .isNotEmpty("recipients")
+                    .findAll())
+                    .sortedWith(compareByDescending<Conversation> { conversation -> conversation.pinned }
+                            .thenByDescending { conversation ->
+                                realm.where(Message::class.java)
+                                        .equalTo("threadId", conversation.id)
+                                        .greaterThan("date", System.currentTimeMillis() - TimeUnit.DAYS.toMillis(7))
+                                        .count()
+                            })
+        }
+    }
+
+    override fun setConversationName(id: Long, name: String) {
+        Realm.getDefaultInstance().use { realm ->
+            realm.executeTransaction {
+                realm.where(Conversation::class.java)
+                        .equalTo("id", id)
+                        .findFirst()
+                        ?.name = name
+            }
+        }
+    }
+
+    override fun searchConversations(query: CharSequence): List<SearchResult> {
+        val realm = Realm.getDefaultInstance()
+
+        val normalizedQuery = query.removeAccents()
+        val conversations = realm.copyFromRealm(realm
+                .where(Conversation::class.java)
+                .notEqualTo("id", 0L)
+                .isNotNull("lastMessage")
+                .equalTo("blocked", false)
+                .isNotEmpty("recipients")
+                .sort("pinned", Sort.DESCENDING, "lastMessage.date", Sort.DESCENDING)
+                .findAll())
+
+        val messagesByConversation = realm.copyFromRealm(realm
+                .where(Message::class.java)
+                .beginGroup()
+                .contains("body", normalizedQuery, Case.INSENSITIVE)
+                .or()
+                .contains("parts.text", normalizedQuery, Case.INSENSITIVE)
+                .endGroup()
+                .findAll())
+                .asSequence()
+                .groupBy { message -> message.threadId }
+                .filter { (threadId, _) -> conversations.firstOrNull { it.id == threadId } != null }
+                .map { (threadId, messages) -> Pair(conversations.first { it.id == threadId }, messages.size) }
+                .map { (conversation, messages) -> SearchResult(normalizedQuery, conversation, messages) }
+                .sortedByDescending { result -> result.messages }
+                .toList()
+
+        realm.close()
+
+        return conversations
+                .filter { conversation -> conversationFilter.filter(conversation, normalizedQuery) }
+                .map { conversation -> SearchResult(normalizedQuery, conversation, 0) } + messagesByConversation
+    }
+
+    override fun getBlockedConversations(): RealmResults<Conversation> {
+        return Realm.getDefaultInstance()
+                .where(Conversation::class.java)
+                .equalTo("blocked", true)
+                .findAll()
+    }
+
+    override fun getBlockedConversationsAsync(): RealmResults<Conversation> {
+        return Realm.getDefaultInstance()
+                .where(Conversation::class.java)
+                .equalTo("blocked", true)
+                .findAllAsync()
+    }
+
+    override fun getConversationAsync(threadId: Long): Conversation {
+        return Realm.getDefaultInstance()
+                .where(Conversation::class.java)
+                .equalTo("id", threadId)
+                .findFirstAsync()
+    }
+
+    override fun getConversation(threadId: Long): Conversation? {
+        return Realm.getDefaultInstance()
+                .apply { refresh() }
+                .where(Conversation::class.java)
+                .equalTo("id", threadId)
+                .findFirst()
+    }
+
+    override fun getConversations(vararg threadIds: Long): RealmResults<Conversation> {
+        return Realm.getDefaultInstance()
+                .where(Conversation::class.java)
+                .anyOf("id", threadIds)
+                .findAll()
+    }
+
+    override fun getUnmanagedConversations(): Observable<List<Conversation>> {
+        val realm = Realm.getDefaultInstance()
+        return realm.where(Conversation::class.java)
+                .sort("lastMessage.date", Sort.DESCENDING)
+                .notEqualTo("id", 0L)
+                .isNotNull("lastMessage")
+                .equalTo("archived", false)
+                .equalTo("blocked", false)
+                .isNotEmpty("recipients")
+                .limit(5)
+                .findAllAsync()
+                .asObservable()
+                .filter { it.isLoaded }
+                .filter { it.isValid }
+                .map { realm.copyFromRealm(it) }
+                .subscribeOn(AndroidSchedulers.mainThread())
+                .observeOn(Schedulers.io())
+    }
+
+    override fun getRecipients(): RealmResults<Recipient> {
+        val realm = Realm.getDefaultInstance()
+        return realm.where(Recipient::class.java)
+                .findAll()
+    }
+
+    override fun getUnmanagedRecipients(): Observable<List<Recipient>> {
+        val realm = Realm.getDefaultInstance()
+        return realm.where(Recipient::class.java)
+                .isNotNull("contact")
+                .findAllAsync()
+                .asObservable()
+                .filter { it.isLoaded && it.isValid }
+                .map { realm.copyFromRealm(it) }
+                .subscribeOn(AndroidSchedulers.mainThread())
+    }
+
+    override fun getRecipient(recipientId: Long): Recipient? {
+        return Realm.getDefaultInstance()
+                .where(Recipient::class.java)
+                .equalTo("id", recipientId)
+                .findFirst()
+    }
+
+    override fun getThreadId(recipient: String): Long? {
+        return getThreadId(listOf(recipient))
+    }
+
+    override fun getThreadId(recipients: Collection<String>): Long? {
+        return Realm.getDefaultInstance().use { realm ->
+            realm.refresh()
+            realm.where(Conversation::class.java)
+                    .findAll()
+                    .asSequence()
+                    .filter { conversation -> conversation.recipients.size == recipients.size }
+                    .find { conversation ->
+                        conversation.recipients.map { it.address }.all { address ->
+                            recipients.any { recipient -> phoneNumberUtils.compare(recipient, address) }
+                        }
+                    }?.id
+        }
+    }
+
+    override fun getOrCreateConversation(threadId: Long): Conversation? {
+        return getConversation(threadId) ?: getConversationFromCp(threadId)
+    }
+
+    override fun getOrCreateConversation(address: String): Conversation? {
+        return getOrCreateConversation(listOf(address))
+    }
+
+    override fun getOrCreateConversation(addresses: List<String>): Conversation? {
+        if (addresses.isEmpty()) {
+            return null
+        }
+
+        return (getThreadId(addresses) ?: tryOrNull { TelephonyCompat.getOrCreateThreadId(context, addresses.toSet()) })
+                ?.takeIf { threadId -> threadId != 0L }
+                ?.let { threadId ->
+                    getConversation(threadId)
+                            ?.let(Realm.getDefaultInstance()::copyFromRealm)
+                            ?: getConversationFromCp(threadId)
+                }
+    }
+
+    override fun saveDraft(threadId: Long, draft: String) {
+        Realm.getDefaultInstance().use { realm ->
+            realm.refresh()
+
+            val conversation = realm.where(Conversation::class.java)
+                    .equalTo("id", threadId)
+                    .findFirst()
+
+            realm.executeTransaction {
+                conversation?.takeIf { it.isValid }?.draft = draft
+            }
+        }
+    }
+
+    override fun updateConversations(vararg threadIds: Long) {
+        Realm.getDefaultInstance().use { realm ->
+            realm.refresh()
+
+            threadIds.forEach { threadId ->
+                val conversation = realm
+                        .where(Conversation::class.java)
+                        .equalTo("id", threadId)
+                        .findFirst() ?: return
+
+                val message = realm
+                        .where(Message::class.java)
+                        .equalTo("threadId", threadId)
+                        .sort("date", Sort.DESCENDING)
+                        .findFirst()
+
+                realm.executeTransaction {
+                    conversation.lastMessage = message
+                }
+            }
+        }
+    }
+
+    override fun markArchived(vararg threadIds: Long) {
+        Realm.getDefaultInstance().use { realm ->
+            val conversations = realm.where(Conversation::class.java)
+                    .anyOf("id", threadIds)
+                    .findAll()
+
+            realm.executeTransaction {
+                conversations.forEach { it.archived = true }
+            }
+        }
+    }
+
+    override fun markUnarchived(vararg threadIds: Long) {
+        Realm.getDefaultInstance().use { realm ->
+            val conversations = realm.where(Conversation::class.java)
+                    .anyOf("id", threadIds)
+                    .findAll()
+
+            realm.executeTransaction {
+                conversations.forEach { it.archived = false }
+            }
+        }
+    }
+
+    override fun markPinned(vararg threadIds: Long) {
+        Realm.getDefaultInstance().use { realm ->
+            val conversations = realm.where(Conversation::class.java)
+                    .anyOf("id", threadIds)
+                    .findAll()
+
+            realm.executeTransaction {
+                conversations.forEach { it.pinned = true }
+            }
+        }
+    }
+
+    override fun markUnpinned(vararg threadIds: Long) {
+        Realm.getDefaultInstance().use { realm ->
+            val conversations = realm.where(Conversation::class.java)
+                    .anyOf("id", threadIds)
+                    .findAll()
+
+            realm.executeTransaction {
+                conversations.forEach { it.pinned = false }
+            }
+        }
+    }
+
+    override fun markBlocked(threadIds: List<Long>, blockingClient: Int, blockReason: String?) {
+        Realm.getDefaultInstance().use { realm ->
+            val conversations = realm.where(Conversation::class.java)
+                    .anyOf("id", threadIds.toLongArray())
+                    .equalTo("blocked", false)
+                    .findAll()
+
+            realm.executeTransaction {
+                conversations.forEach { conversation ->
+                    conversation.blocked = true
+                    conversation.blockingClient = blockingClient
+                    conversation.blockReason = blockReason
+                }
+            }
+        }
+    }
+
+    override fun markUnblocked(vararg threadIds: Long) {
+        Realm.getDefaultInstance().use { realm ->
+            val conversations = realm.where(Conversation::class.java)
+                    .anyOf("id", threadIds)
+                    .findAll()
+
+            realm.executeTransaction {
+                conversations.forEach { conversation ->
+                    conversation.blocked = false
+                    conversation.blockingClient = null
+                    conversation.blockReason = null
+                }
+            }
+        }
+    }
+
+    override fun deleteConversations(vararg threadIds: Long) {
+        Realm.getDefaultInstance().use { realm ->
+            val conversation = realm.where(Conversation::class.java).anyOf("id", threadIds).findAll()
+            val messages = realm.where(Message::class.java).anyOf("threadId", threadIds).findAll()
+
+            realm.executeTransaction {
+                conversation.deleteAllFromRealm()
+                messages.deleteAllFromRealm()
+            }
+        }
+
+        threadIds.forEach { threadId ->
+            val uri = ContentUris.withAppendedId(Telephony.Threads.CONTENT_URI, threadId)
+            context.contentResolver.delete(uri, null, null)
+        }
+    }
+
+    /**
+     * Returns a [Conversation] from the system SMS ContentProvider, based on the [threadId]
+     *
+     * It should be noted that even if we have a valid [threadId], that does not guarantee that
+     * we can return a [Conversation]. On some devices, the ContentProvider won't return the
+     * conversation unless it contains at least 1 message
+     */
+    private fun getConversationFromCp(threadId: Long): Conversation? {
+        return cursorToConversation.getConversationsCursor()
+                ?.map(cursorToConversation::map)
+                ?.firstOrNull { it.id == threadId }
+                ?.let { conversation ->
+                    val realm = Realm.getDefaultInstance()
+                    val contacts = realm.copyFromRealm(realm.where(Contact::class.java).findAll())
+                    val lastMessage = realm.where(Message::class.java).equalTo("threadId", threadId)
+                            .sort("date", Sort.DESCENDING).findFirst()?.let(realm::copyFromRealm)
+
+                    val recipients = conversation.recipients
+                            .map { recipient -> recipient.id }
+                            .map { id -> cursorToRecipient.getRecipientCursor(id) }
+                            .mapNotNull { recipientCursor ->
+                                // Map the recipient cursor to a list of recipients
+                                recipientCursor?.use { recipientCursor.map { cursorToRecipient.map(recipientCursor) } }
+                            }
+                            .flatten()
+                            .map { recipient ->
+                                recipient.apply {
+                                    contact = contacts.firstOrNull {
+                                        it.numbers.any { phoneNumberUtils.compare(recipient.address, it.address) }
+                                    }
+                                }
+                            }
+
+                    conversation.recipients.clear()
+                    conversation.recipients.addAll(recipients)
+                    conversation.lastMessage = lastMessage
+                    realm.executeTransaction { it.insertOrUpdate(conversation) }
+                    realm.close()
+
+                    conversation
+                }
+    }
+
 }
\ No newline at end of file
diff --git a/data/src/main/java/com/moez/QKSMS/repository/MessageRepositoryImpl.kt b/data/src/main/java/com/moez/QKSMS/repository/MessageRepositoryImpl.kt
index a5438d346..f08f40f7c 100644
--- a/data/src/main/java/com/moez/QKSMS/repository/MessageRepositoryImpl.kt
+++ b/data/src/main/java/com/moez/QKSMS/repository/MessageRepositoryImpl.kt
@@ -1,753 +1,753 @@
-/*
- * Copyright (C) 2017 Moez Bhatti <moez.bhatti@gmail.com>
- *
- * This file is part of QKSMS.
- *
- * QKSMS is free software: you can redistribute it and/or modify
- * it under the terms of the GNU General Public License as published by
- * the Free Software Foundation, either version 3 of the License, or
- * (at your option) any later version.
- *
- * QKSMS is distributed in the hope that it will be useful,
- * but WITHOUT ANY WARRANTY; without even the implied warranty of
- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
- * GNU General Public License for more details.
- *
- * You should have received a copy of the GNU General Public License
- * along with QKSMS.  If not, see <http://www.gnu.org/licenses/>.
- */
-package com.moez.QKSMS.repository
-
-import android.app.AlarmManager
-import android.app.PendingIntent
-import android.content.ContentUris
-import android.content.ContentValues
-import android.content.Context
-import android.content.Intent
-import android.graphics.BitmapFactory
-import android.media.MediaScannerConnection
-import android.os.Build
-import android.os.Environment
-import android.provider.Telephony
-import android.provider.Telephony.Mms
-import android.provider.Telephony.Sms
-import android.telephony.SmsManager
-import android.webkit.MimeTypeMap
-import androidx.core.content.contentValuesOf
-import com.google.android.mms.ContentType
-import com.google.android.mms.MMSPart
-import com.google.android.mms.pdu_alt.MultimediaMessagePdu
-import com.google.android.mms.pdu_alt.PduPersister
-import com.klinker.android.send_message.SmsManagerFactory
-import com.klinker.android.send_message.StripAccents
-import com.klinker.android.send_message.Transaction
-import com.moez.QKSMS.common.util.extensions.now
-import com.moez.QKSMS.compat.TelephonyCompat
-import com.moez.QKSMS.extensions.anyOf
-import com.moez.QKSMS.manager.ActiveConversationManager
-import com.moez.QKSMS.manager.KeyManager
-import com.moez.QKSMS.model.Attachment
-import com.moez.QKSMS.model.Conversation
-import com.moez.QKSMS.model.Message
-import com.moez.QKSMS.model.MmsPart
-import com.moez.QKSMS.receiver.SendSmsReceiver
-import com.moez.QKSMS.receiver.SmsDeliveredReceiver
-import com.moez.QKSMS.receiver.SmsSentReceiver
-import com.moez.QKSMS.util.ImageUtils
-import com.moez.QKSMS.util.PhoneNumberUtils
-import com.moez.QKSMS.util.Preferences
-import com.moez.QKSMS.util.tryOrNull
-import io.realm.Case
-import io.realm.Realm
-import io.realm.RealmResults
-import io.realm.Sort
-import timber.log.Timber
-import java.io.File
-import java.io.FileNotFoundException
-import java.io.FileOutputStream
-import java.io.IOException
-import java.util.*
-import java.util.concurrent.TimeUnit
-import javax.inject.Inject
-import javax.inject.Singleton
-import kotlin.collections.ArrayList
-import kotlin.math.sqrt
-
-@Singleton
-class MessageRepositoryImpl @Inject constructor(
-    private val activeConversationManager: ActiveConversationManager,
-    private val context: Context,
-    private val messageIds: KeyManager,
-    private val phoneNumberUtils: PhoneNumberUtils,
-    private val prefs: Preferences,
-    private val syncRepository: SyncRepository
-) : MessageRepository {
-
-    override fun getMessages(threadId: Long, query: String): RealmResults<Message> {
-        return Realm.getDefaultInstance()
-                .where(Message::class.java)
-                .equalTo("threadId", threadId)
-                .let {
-                    when (query.isEmpty()) {
-                        true -> it
-                        false -> it
-                                .beginGroup()
-                                .contains("body", query, Case.INSENSITIVE)
-                                .or()
-                                .contains("parts.text", query, Case.INSENSITIVE)
-                                .endGroup()
-                    }
-                }
-                .sort("date")
-                .findAllAsync()
-    }
-
-    override fun getMessage(id: Long): Message? {
-        return Realm.getDefaultInstance()
-                .also { realm -> realm.refresh() }
-                .where(Message::class.java)
-                .equalTo("id", id)
-                .findFirst()
-    }
-
-    override fun getMessageForPart(id: Long): Message? {
-        return Realm.getDefaultInstance()
-                .where(Message::class.java)
-                .equalTo("parts.id", id)
-                .findFirst()
-    }
-
-    override fun getLastIncomingMessage(threadId: Long): RealmResults<Message> {
-        return Realm.getDefaultInstance()
-                .where(Message::class.java)
-                .equalTo("threadId", threadId)
-                .beginGroup()
-                .beginGroup()
-                .equalTo("type", "sms")
-                .`in`("boxId", arrayOf(Sms.MESSAGE_TYPE_INBOX, Sms.MESSAGE_TYPE_ALL))
-                .endGroup()
-                .or()
-                .beginGroup()
-                .equalTo("type", "mms")
-                .`in`("boxId", arrayOf(Mms.MESSAGE_BOX_INBOX, Mms.MESSAGE_BOX_ALL))
-                .endGroup()
-                .endGroup()
-                .sort("date", Sort.DESCENDING)
-                .findAll()
-    }
-
-    override fun getUnreadCount(): Long {
-        return Realm.getDefaultInstance().use { realm ->
-            realm.refresh()
-            realm.where(Conversation::class.java)
-                    .equalTo("archived", false)
-                    .equalTo("blocked", false)
-                    .equalTo("lastMessage.read", false)
-                    .count()
-        }
-    }
-
-    override fun getPart(id: Long): MmsPart? {
-        return Realm.getDefaultInstance()
-                .where(MmsPart::class.java)
-                .equalTo("id", id)
-                .findFirst()
-    }
-
-    override fun getPartsForConversation(threadId: Long): RealmResults<MmsPart> {
-        return Realm.getDefaultInstance()
-                .where(MmsPart::class.java)
-                .equalTo("messages.threadId", threadId)
-                .beginGroup()
-                .contains("type", "image/")
-                .or()
-                .contains("type", "video/")
-                .endGroup()
-                .sort("id", Sort.DESCENDING)
-                .findAllAsync()
-    }
-
-    override fun savePart(id: Long): File? {
-        val part = getPart(id) ?: return null
-
-        val extension = MimeTypeMap.getSingleton().getExtensionFromMimeType(part.type) ?: return null
-        val date = part.messages?.first()?.date
-        val dir = File(Environment.getExternalStorageDirectory(), "QKSMS/Media").apply { mkdirs() }
-        val fileName = part.name?.takeIf { name -> name.endsWith(extension) }
-                ?: "${part.type.split("/").last()}_$date.$extension"
-        var file: File
-        var index = 0
-        do {
-            file = File(dir, if (index == 0) fileName else fileName.replace(".$extension", " ($index).$extension"))
-            index++
-        } while (file.exists())
-
-        try {
-            FileOutputStream(file).use { outputStream ->
-                context.contentResolver.openInputStream(part.getUri())?.use { inputStream ->
-                    inputStream.copyTo(outputStream, 1024)
-                }
-            }
-        } catch (e: FileNotFoundException) {
-            e.printStackTrace()
-        } catch (e: IOException) {
-            e.printStackTrace()
-        }
-
-        MediaScannerConnection.scanFile(context, arrayOf(file.path), null, null)
-
-        return file.takeIf { it.exists() }
-    }
-
-    /**
-     * Retrieves the list of messages which should be shown in the notification
-     * for a given conversation
-     */
-    override fun getUnreadUnseenMessages(threadId: Long): RealmResults<Message> {
-        return Realm.getDefaultInstance()
-                .also { it.refresh() }
-                .where(Message::class.java)
-                .equalTo("seen", false)
-                .equalTo("read", false)
-                .equalTo("threadId", threadId)
-                .sort("date")
-                .findAll()
-    }
-
-    override fun getUnreadMessages(threadId: Long): RealmResults<Message> {
-        return Realm.getDefaultInstance()
-                .where(Message::class.java)
-                .equalTo("read", false)
-                .equalTo("threadId", threadId)
-                .sort("date")
-                .findAll()
-    }
-
-    override fun markAllSeen() {
-        val realm = Realm.getDefaultInstance()
-        val messages = realm.where(Message::class.java).equalTo("seen", false).findAll()
-        realm.executeTransaction { messages.forEach { message -> message.seen = true } }
-        realm.close()
-    }
-
-    override fun markSeen(threadId: Long) {
-        val realm = Realm.getDefaultInstance()
-        val messages = realm.where(Message::class.java)
-                .equalTo("threadId", threadId)
-                .equalTo("seen", false)
-                .findAll()
-
-        realm.executeTransaction {
-            messages.forEach { message ->
-                message.seen = true
-            }
-        }
-        realm.close()
-    }
-
-    override fun markRead(vararg threadIds: Long) {
-        Realm.getDefaultInstance()?.use { realm ->
-            val messages = realm.where(Message::class.java)
-                    .anyOf("threadId", threadIds)
-                    .beginGroup()
-                    .equalTo("read", false)
-                    .or()
-                    .equalTo("seen", false)
-                    .endGroup()
-                    .findAll()
-
-            realm.executeTransaction {
-                messages.forEach { message ->
-                    message.seen = true
-                    message.read = true
-                }
-            }
-        }
-
-        val values = ContentValues()
-        values.put(Sms.SEEN, true)
-        values.put(Sms.READ, true)
-
-        threadIds.forEach { threadId ->
-            try {
-                val uri = ContentUris.withAppendedId(Telephony.MmsSms.CONTENT_CONVERSATIONS_URI, threadId)
-                context.contentResolver.update(uri, values, "${Sms.READ} = 0", null)
-            } catch (exception: Exception) {
-                Timber.w(exception)
-            }
-        }
-    }
-
-    override fun markUnread(vararg threadIds: Long) {
-        Realm.getDefaultInstance()?.use { realm ->
-            val conversations = realm.where(Conversation::class.java)
-                    .anyOf("id", threadIds)
-                    .equalTo("lastMessage.read", true)
-                    .findAll()
-
-            realm.executeTransaction {
-                conversations.forEach { conversation ->
-                    conversation.lastMessage?.read = false
-                }
-            }
-        }
-    }
-
-    override fun sendMessage(
-        subId: Int,
-        threadId: Long,
-        addresses: List<String>,
-        body: String,
-        attachments: List<Attachment>,
-        delay: Int
-    ) {
-        val signedBody = when {
-            prefs.signature.get().isEmpty() -> body
-            body.isNotEmpty() -> body + '\n' + prefs.signature.get()
-            else -> prefs.signature.get()
-        }
-
-        val smsManager = subId.takeIf { it != -1 }
-                ?.let(SmsManagerFactory::createSmsManager)
-                ?: SmsManager.getDefault()
-
-        // We only care about stripping SMS
-        val strippedBody = when (prefs.unicode.get()) {
-            true -> StripAccents.stripAccents(signedBody)
-            false -> signedBody
-        }
-
-        val parts = smsManager.divideMessage(strippedBody).orEmpty()
-        val forceMms = prefs.longAsMms.get() && parts.size > 1
-
-        if (addresses.size == 1 && attachments.isEmpty() && !forceMms) { // SMS
-            if (delay > 0) { // With delay
-                val sendTime = System.currentTimeMillis() + delay
-                val message = insertSentSms(subId, threadId, addresses.first(), strippedBody, sendTime)
-
-                val intent = getIntentForDelayedSms(message.id)
-
-                val alarmManager = context.getSystemService(Context.ALARM_SERVICE) as AlarmManager
-                if (Build.VERSION.SDK_INT >= Build.VERSION_CODES.M) {
-                    alarmManager.setExactAndAllowWhileIdle(AlarmManager.RTC_WAKEUP, sendTime, intent)
-                } else {
-                    alarmManager.setExact(AlarmManager.RTC_WAKEUP, sendTime, intent)
-                }
-            } else { // No delay
-                val message = insertSentSms(subId, threadId, addresses.first(), strippedBody, now())
-                sendSms(message)
-            }
-        } else { // MMS
-            val parts = arrayListOf<MMSPart>()
-
-            val maxWidth = smsManager.carrierConfigValues.getInt(SmsManager.MMS_CONFIG_MAX_IMAGE_WIDTH)
-                    .takeIf { prefs.mmsSize.get() == -1 } ?: Int.MAX_VALUE
-
-            val maxHeight = smsManager.carrierConfigValues.getInt(SmsManager.MMS_CONFIG_MAX_IMAGE_HEIGHT)
-                    .takeIf { prefs.mmsSize.get() == -1 } ?: Int.MAX_VALUE
-
-            var remainingBytes = when (prefs.mmsSize.get()) {
-                -1 -> smsManager.carrierConfigValues.getInt(SmsManager.MMS_CONFIG_MAX_MESSAGE_SIZE)
-                0 -> Int.MAX_VALUE
-                else -> prefs.mmsSize.get() * 1024
-            } * 0.9 // Ugly, but buys us a bit of wiggle room
-
-            signedBody.takeIf { it.isNotEmpty() }?.toByteArray()?.let { bytes ->
-                remainingBytes -= bytes.size
-                parts += MMSPart("text", ContentType.TEXT_PLAIN, bytes)
-            }
-
-            // Attach contacts
-            parts += attachments
-                    .mapNotNull { attachment -> attachment as? Attachment.Contact }
-                    .map { attachment -> attachment.vCard.toByteArray() }
-                    .map { vCard ->
-                        remainingBytes -= vCard.size
-                        MMSPart("contact", ContentType.TEXT_VCARD, vCard)
-                    }
-
-            val imageBytesByAttachment = attachments
-                    .mapNotNull { attachment -> attachment as? Attachment.Image }
-                    .associateWith { attachment ->
-                        val uri = attachment.getUri() ?: return@associateWith byteArrayOf()
-                        when (attachment.isGif(context)) {
-                            true -> ImageUtils.getScaledGif(context, uri, maxWidth, maxHeight)
-                            false -> ImageUtils.getScaledImage(context, uri, maxWidth, maxHeight)
-                        }
-                    }
-                    .toMutableMap()
-
-            val imageByteCount = imageBytesByAttachment.values.sumBy { byteArray -> byteArray.size }
-            if (imageByteCount > remainingBytes) {
-                imageBytesByAttachment.forEach { (attachment, originalBytes) ->
-                    val uri = attachment.getUri() ?: return@forEach
-                    val maxBytes = originalBytes.size / imageByteCount.toFloat() * remainingBytes
-
-                    // Get the image dimensions
-                    val options = BitmapFactory.Options().apply { inJustDecodeBounds = true }
-                    BitmapFactory.decodeStream(context.contentResolver.openInputStream(uri), null, options)
-                    val width = options.outWidth
-                    val height = options.outHeight
-                    val aspectRatio = width.toFloat() / height.toFloat()
-
-                    var attempts = 0
-                    var scaledBytes = originalBytes
-
-                    while (scaledBytes.size > maxBytes) {
-                        // Estimate how much we need to scale the image down by. If it's still too big, we'll need to
-                        // try smaller and smaller values
-                        val scale = maxBytes / originalBytes.size * (0.9 - attempts * 0.2)
-                        if (scale <= 0) {
-                            Timber.w("Failed to compress ${originalBytes.size / 1024}Kb to ${maxBytes.toInt() / 1024}Kb")
-                            return@forEach
-                        }
-
-                        val newArea = scale * width * height
-                        val newWidth = sqrt(newArea * aspectRatio).toInt()
-                        val newHeight = (newWidth / aspectRatio).toInt()
-
-                        attempts++
-                        scaledBytes = when (attachment.isGif(context)) {
-                            true -> ImageUtils.getScaledGif(context, uri, newWidth, newHeight, 80)
-                            false -> ImageUtils.getScaledImage(context, uri, newWidth, newHeight, 80)
-                        }
-
-                        Timber.d("Compression attempt $attempts: ${scaledBytes.size / 1024}/${maxBytes.toInt() / 1024}Kb ($width*$height -> $newWidth*$newHeight)")
-                    }
-
-                    Timber.v("Compressed ${originalBytes.size / 1024}Kb to ${scaledBytes.size / 1024}Kb with a target size of ${maxBytes.toInt() / 1024}Kb in $attempts attempts")
-                    imageBytesByAttachment[attachment] = scaledBytes
-                }
-            }
-
-            imageBytesByAttachment.forEach { (attachment, bytes) ->
-                parts += when (attachment.isGif(context)) {
-                    true -> MMSPart("image", ContentType.IMAGE_GIF, bytes)
-                    false -> MMSPart("image", ContentType.IMAGE_JPEG, bytes)
-                }
-            }
-
-            // We need to strip the separators from outgoing MMS, or else they'll appear to have sent and not go through
-            val transaction = Transaction(context)
-            val recipients = addresses.map(phoneNumberUtils::normalizeNumber)
-            transaction.sendNewMessage(subId, threadId, recipients, parts, null, null)
-        }
-    }
-
-    override fun sendSms(message: Message) {
-        val smsManager = message.subId.takeIf { it != -1 }
-                ?.let(SmsManagerFactory::createSmsManager)
-                ?: SmsManager.getDefault()
-
-        val parts = smsManager
-                .divideMessage(if (prefs.unicode.get()) StripAccents.stripAccents(message.body) else message.body)
-                ?: arrayListOf()
-
-        val sentIntents = parts.map {
-            val intent = Intent(context, SmsSentReceiver::class.java).putExtra("id", message.id)
-            PendingIntent.getBroadcast(context, message.id.toInt(), intent, PendingIntent.FLAG_UPDATE_CURRENT)
-        }
-
-        val deliveredIntents = parts.map {
-            val intent = Intent(context, SmsDeliveredReceiver::class.java).putExtra("id", message.id)
-            val pendingIntent = PendingIntent
-                    .getBroadcast(context, message.id.toInt(), intent, PendingIntent.FLAG_UPDATE_CURRENT)
-            if (prefs.delivery.get()) pendingIntent else null
-        }
-
-        try {
-            smsManager.sendMultipartTextMessage(
-                    message.address,
-                    null,
-                    parts,
-                    ArrayList(sentIntents),
-                    ArrayList(deliveredIntents)
-            )
-        } catch (e: IllegalArgumentException) {
-            Timber.w(e, "Message body lengths: ${parts.map { it?.length }}")
-            markFailed(message.id, Telephony.MmsSms.ERR_TYPE_GENERIC)
-        }
-    }
-
-    override fun resendMms(message: Message) {
-        val subId = message.subId
-        val threadId = message.threadId
-        val pdu = tryOrNull {
-            PduPersister.getPduPersister(context).load(message.getUri()) as MultimediaMessagePdu
-        } ?: return
-
-        val addresses = pdu.to.map { it.string }.filter { it.isNotBlank() }
-        val parts = message.parts.mapNotNull { part ->
-            val bytes = tryOrNull(false) {
-                context.contentResolver.openInputStream(part.getUri())?.use { inputStream -> inputStream.readBytes() }
-            } ?: return@mapNotNull null
-
-            MMSPart(part.name.orEmpty(), part.type, bytes)
-        }
-
-        Transaction(context).sendNewMessage(subId, threadId, addresses, parts, message.subject, message.getUri())
-    }
-
-    override fun cancelDelayedSms(id: Long) {
-        val alarmManager = context.getSystemService(Context.ALARM_SERVICE) as AlarmManager
-        alarmManager.cancel(getIntentForDelayedSms(id))
-    }
-
-    private fun getIntentForDelayedSms(id: Long): PendingIntent {
-        val intent = Intent(context, SendSmsReceiver::class.java).putExtra("id", id)
-        return PendingIntent.getBroadcast(context, id.toInt(), intent, PendingIntent.FLAG_UPDATE_CURRENT)
-    }
-
-    override fun insertSentSms(subId: Int, threadId: Long, address: String, body: String, date: Long): Message {
-
-        // Insert the message to Realm
-        val message = Message().apply {
-            this.threadId = threadId
-            this.address = address
-            this.body = body
-            this.date = date
-            this.subId = subId
-
-            id = messageIds.newId()
-            boxId = Sms.MESSAGE_TYPE_OUTBOX
-            type = "sms"
-            read = true
-            seen = true
-        }
-        val realm = Realm.getDefaultInstance()
-        var managedMessage: Message? = null
-        realm.executeTransaction { managedMessage = realm.copyToRealmOrUpdate(message) }
-
-        // Insert the message to the native content provider
-        val values = contentValuesOf(
-                Sms.ADDRESS to address,
-                Sms.BODY to body,
-                Sms.DATE to System.currentTimeMillis(),
-                Sms.READ to true,
-                Sms.SEEN to true,
-                Sms.TYPE to Sms.MESSAGE_TYPE_OUTBOX,
-                Sms.THREAD_ID to threadId
-        )
-
-        if (prefs.canUseSubId.get()) {
-            values.put(Sms.SUBSCRIPTION_ID, message.subId)
-        }
-
-        val uri = context.contentResolver.insert(Sms.CONTENT_URI, values)
-
-        // Update the contentId after the message has been inserted to the content provider
-        // The message might have been deleted by now, so only proceed if it's valid
-        //
-        // We do this after inserting the message because it might be slow, and we want the message
-        // to be inserted into Realm immediately. We don't need to do this after receiving one
-        uri?.lastPathSegment?.toLong()?.let { id ->
-            realm.executeTransaction { managedMessage?.takeIf { it.isValid }?.contentId = id }
-        }
-        realm.close()
-
-        // On some devices, we can't obtain a threadId until after the first message is sent in a
-        // conversation. In this case, we need to update the message's threadId after it gets added
-        // to the native ContentProvider
-        if (threadId == 0L) {
-            uri?.let(syncRepository::syncMessage)
-        }
-
-        return message
-    }
-
-    override fun insertReceivedSms(subId: Int, address: String, body: String, sentTime: Long): Message {
-
-        // Insert the message to Realm
-        val message = Message().apply {
-            this.address = address
-            this.body = body
-            this.dateSent = sentTime
-            this.date = System.currentTimeMillis()
-            this.subId = subId
-
-            id = messageIds.newId()
-            threadId = TelephonyCompat.getOrCreateThreadId(context, address)
-            boxId = Sms.MESSAGE_TYPE_INBOX
-            type = "sms"
-            read = activeConversationManager.getActiveConversation() == threadId
-        }
-        val realm = Realm.getDefaultInstance()
-        var managedMessage: Message? = null
-        realm.executeTransaction { managedMessage = realm.copyToRealmOrUpdate(message) }
-
-        // Insert the message to the native content provider
-        val values = contentValuesOf(
-                Sms.ADDRESS to address,
-                Sms.BODY to body,
-                Sms.DATE_SENT to sentTime
-        )
-
-        if (prefs.canUseSubId.get()) {
-            values.put(Sms.SUBSCRIPTION_ID, message.subId)
-        }
-
-        context.contentResolver.insert(Sms.Inbox.CONTENT_URI, values)?.lastPathSegment?.toLong()?.let { id ->
-            // Update the contentId after the message has been inserted to the content provider
-            realm.executeTransaction { managedMessage?.contentId = id }
-        }
-
-        realm.close()
-
-        return message
-    }
-
-    /**
-     * Marks the message as sending, in case we need to retry sending it
-     */
-    override fun markSending(id: Long) {
-        Realm.getDefaultInstance().use { realm ->
-            realm.refresh()
-
-            val message = realm.where(Message::class.java).equalTo("id", id).findFirst()
-            message?.let {
-                // Update the message in realm
-                realm.executeTransaction {
-                    message.boxId = when (message.isSms()) {
-                        true -> Sms.MESSAGE_TYPE_OUTBOX
-                        false -> Mms.MESSAGE_BOX_OUTBOX
-                    }
-                }
-
-                // Update the message in the native ContentProvider
-                val values = when (message.isSms()) {
-                    true -> contentValuesOf(Sms.TYPE to Sms.MESSAGE_TYPE_OUTBOX)
-                    false -> contentValuesOf(Mms.MESSAGE_BOX to Mms.MESSAGE_BOX_OUTBOX)
-                }
-                context.contentResolver.update(message.getUri(), values, null, null)
-            }
-        }
-    }
-
-    override fun markSent(id: Long) {
-        Realm.getDefaultInstance().use { realm ->
-            realm.refresh()
-
-            val message = realm.where(Message::class.java).equalTo("id", id).findFirst()
-            message?.let {
-                // Update the message in realm
-                realm.executeTransaction {
-                    message.boxId = Sms.MESSAGE_TYPE_SENT
-                }
-
-                // Update the message in the native ContentProvider
-                val values = ContentValues()
-                values.put(Sms.TYPE, Sms.MESSAGE_TYPE_SENT)
-                context.contentResolver.update(message.getUri(), values, null, null)
-            }
-        }
-    }
-
-    override fun markFailed(id: Long, resultCode: Int) {
-        Realm.getDefaultInstance().use { realm ->
-            realm.refresh()
-
-            val message = realm.where(Message::class.java).equalTo("id", id).findFirst()
-            message?.let {
-                // Update the message in realm
-                realm.executeTransaction {
-                    message.boxId = Sms.MESSAGE_TYPE_FAILED
-                    message.errorCode = resultCode
-                }
-
-                // Update the message in the native ContentProvider
-                val values = ContentValues()
-                values.put(Sms.TYPE, Sms.MESSAGE_TYPE_FAILED)
-                values.put(Sms.ERROR_CODE, resultCode)
-                context.contentResolver.update(message.getUri(), values, null, null)
-            }
-        }
-    }
-
-    override fun markDelivered(id: Long) {
-        Realm.getDefaultInstance().use { realm ->
-            realm.refresh()
-
-            val message = realm.where(Message::class.java).equalTo("id", id).findFirst()
-            message?.let {
-                // Update the message in realm
-                realm.executeTransaction {
-                    message.deliveryStatus = Sms.STATUS_COMPLETE
-                    message.dateSent = System.currentTimeMillis()
-                    message.read = true
-                }
-
-                // Update the message in the native ContentProvider
-                val values = ContentValues()
-                values.put(Sms.STATUS, Sms.STATUS_COMPLETE)
-                values.put(Sms.DATE_SENT, System.currentTimeMillis())
-                values.put(Sms.READ, true)
-                context.contentResolver.update(message.getUri(), values, null, null)
-            }
-        }
-    }
-
-    override fun markDeliveryFailed(id: Long, resultCode: Int) {
-        Realm.getDefaultInstance().use { realm ->
-            realm.refresh()
-
-            val message = realm.where(Message::class.java).equalTo("id", id).findFirst()
-            message?.let {
-                // Update the message in realm
-                realm.executeTransaction {
-                    message.deliveryStatus = Sms.STATUS_FAILED
-                    message.dateSent = System.currentTimeMillis()
-                    message.read = true
-                    message.errorCode = resultCode
-                }
-
-                // Update the message in the native ContentProvider
-                val values = ContentValues()
-                values.put(Sms.STATUS, Sms.STATUS_FAILED)
-                values.put(Sms.DATE_SENT, System.currentTimeMillis())
-                values.put(Sms.READ, true)
-                values.put(Sms.ERROR_CODE, resultCode)
-                context.contentResolver.update(message.getUri(), values, null, null)
-            }
-        }
-    }
-
-    override fun deleteMessages(vararg messageIds: Long) {
-        Realm.getDefaultInstance().use { realm ->
-            realm.refresh()
-
-            val messages = realm.where(Message::class.java)
-                    .anyOf("id", messageIds)
-                    .findAll()
-
-            val uris = messages.map { it.getUri() }
-
-            realm.executeTransaction { messages.deleteAllFromRealm() }
-
-            uris.forEach { uri -> context.contentResolver.delete(uri, null, null) }
-        }
-    }
-
-    override fun getOldMessageCounts(maxAgeDays: Int): Map<Long, Int> {
-        return Realm.getDefaultInstance().use { realm ->
-            realm.where(Message::class.java)
-                    .lessThan("date", now() - TimeUnit.DAYS.toMillis(maxAgeDays.toLong()))
-                    .findAll()
-                    .groupingBy { message -> message.threadId }
-                    .eachCount()
-        }
-    }
-
-    override fun deleteOldMessages(maxAgeDays: Int) {
-        return Realm.getDefaultInstance().use { realm ->
-            val messages = realm.where(Message::class.java)
-                    .lessThan("date", now() - TimeUnit.DAYS.toMillis(maxAgeDays.toLong()))
-                    .findAll()
-
-            val uris = messages.map { it.getUri() }
-
-            realm.executeTransaction { messages.deleteAllFromRealm() }
-
-            uris.forEach { uri -> context.contentResolver.delete(uri, null, null) }
-        }
-    }
-}
+/*
+ * Copyright (C) 2017 Moez Bhatti <moez.bhatti@gmail.com>
+ *
+ * This file is part of QKSMS.
+ *
+ * QKSMS is free software: you can redistribute it and/or modify
+ * it under the terms of the GNU General Public License as published by
+ * the Free Software Foundation, either version 3 of the License, or
+ * (at your option) any later version.
+ *
+ * QKSMS is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+ * GNU General Public License for more details.
+ *
+ * You should have received a copy of the GNU General Public License
+ * along with QKSMS.  If not, see <http://www.gnu.org/licenses/>.
+ */
+package com.moez.QKSMS.repository
+
+import android.app.AlarmManager
+import android.app.PendingIntent
+import android.content.ContentUris
+import android.content.ContentValues
+import android.content.Context
+import android.content.Intent
+import android.graphics.BitmapFactory
+import android.media.MediaScannerConnection
+import android.os.Build
+import android.os.Environment
+import android.provider.Telephony
+import android.provider.Telephony.Mms
+import android.provider.Telephony.Sms
+import android.telephony.SmsManager
+import android.webkit.MimeTypeMap
+import androidx.core.content.contentValuesOf
+import com.google.android.mms.ContentType
+import com.google.android.mms.MMSPart
+import com.google.android.mms.pdu_alt.MultimediaMessagePdu
+import com.google.android.mms.pdu_alt.PduPersister
+import com.klinker.android.send_message.SmsManagerFactory
+import com.klinker.android.send_message.StripAccents
+import com.klinker.android.send_message.Transaction
+import com.moez.QKSMS.common.util.extensions.now
+import com.moez.QKSMS.compat.TelephonyCompat
+import com.moez.QKSMS.extensions.anyOf
+import com.moez.QKSMS.manager.ActiveConversationManager
+import com.moez.QKSMS.manager.KeyManager
+import com.moez.QKSMS.model.Attachment
+import com.moez.QKSMS.model.Conversation
+import com.moez.QKSMS.model.Message
+import com.moez.QKSMS.model.MmsPart
+import com.moez.QKSMS.receiver.SendSmsReceiver
+import com.moez.QKSMS.receiver.SmsDeliveredReceiver
+import com.moez.QKSMS.receiver.SmsSentReceiver
+import com.moez.QKSMS.util.ImageUtils
+import com.moez.QKSMS.util.PhoneNumberUtils
+import com.moez.QKSMS.util.Preferences
+import com.moez.QKSMS.util.tryOrNull
+import io.realm.Case
+import io.realm.Realm
+import io.realm.RealmResults
+import io.realm.Sort
+import timber.log.Timber
+import java.io.File
+import java.io.FileNotFoundException
+import java.io.FileOutputStream
+import java.io.IOException
+import java.util.*
+import java.util.concurrent.TimeUnit
+import javax.inject.Inject
+import javax.inject.Singleton
+import kotlin.collections.ArrayList
+import kotlin.math.sqrt
+
+@Singleton
+class MessageRepositoryImpl @Inject constructor(
+    private val activeConversationManager: ActiveConversationManager,
+    private val context: Context,
+    private val messageIds: KeyManager,
+    private val phoneNumberUtils: PhoneNumberUtils,
+    private val prefs: Preferences,
+    private val syncRepository: SyncRepository
+) : MessageRepository {
+
+    override fun getMessages(threadId: Long, query: String): RealmResults<Message> {
+        return Realm.getDefaultInstance()
+                .where(Message::class.java)
+                .equalTo("threadId", threadId)
+                .let {
+                    when (query.isEmpty()) {
+                        true -> it
+                        false -> it
+                                .beginGroup()
+                                .contains("body", query, Case.INSENSITIVE)
+                                .or()
+                                .contains("parts.text", query, Case.INSENSITIVE)
+                                .endGroup()
+                    }
+                }
+                .sort("date")
+                .findAllAsync()
+    }
+
+    override fun getMessage(id: Long): Message? {
+        return Realm.getDefaultInstance()
+                .also { realm -> realm.refresh() }
+                .where(Message::class.java)
+                .equalTo("id", id)
+                .findFirst()
+    }
+
+    override fun getMessageForPart(id: Long): Message? {
+        return Realm.getDefaultInstance()
+                .where(Message::class.java)
+                .equalTo("parts.id", id)
+                .findFirst()
+    }
+
+    override fun getLastIncomingMessage(threadId: Long): RealmResults<Message> {
+        return Realm.getDefaultInstance()
+                .where(Message::class.java)
+                .equalTo("threadId", threadId)
+                .beginGroup()
+                .beginGroup()
+                .equalTo("type", "sms")
+                .`in`("boxId", arrayOf(Sms.MESSAGE_TYPE_INBOX, Sms.MESSAGE_TYPE_ALL))
+                .endGroup()
+                .or()
+                .beginGroup()
+                .equalTo("type", "mms")
+                .`in`("boxId", arrayOf(Mms.MESSAGE_BOX_INBOX, Mms.MESSAGE_BOX_ALL))
+                .endGroup()
+                .endGroup()
+                .sort("date", Sort.DESCENDING)
+                .findAll()
+    }
+
+    override fun getUnreadCount(): Long {
+        return Realm.getDefaultInstance().use { realm ->
+            realm.refresh()
+            realm.where(Conversation::class.java)
+                    .equalTo("archived", false)
+                    .equalTo("blocked", false)
+                    .equalTo("lastMessage.read", false)
+                    .count()
+        }
+    }
+
+    override fun getPart(id: Long): MmsPart? {
+        return Realm.getDefaultInstance()
+                .where(MmsPart::class.java)
+                .equalTo("id", id)
+                .findFirst()
+    }
+
+    override fun getPartsForConversation(threadId: Long): RealmResults<MmsPart> {
+        return Realm.getDefaultInstance()
+                .where(MmsPart::class.java)
+                .equalTo("messages.threadId", threadId)
+                .beginGroup()
+                .contains("type", "image/")
+                .or()
+                .contains("type", "video/")
+                .endGroup()
+                .sort("id", Sort.DESCENDING)
+                .findAllAsync()
+    }
+
+    override fun savePart(id: Long): File? {
+        val part = getPart(id) ?: return null
+
+        val extension = MimeTypeMap.getSingleton().getExtensionFromMimeType(part.type) ?: return null
+        val date = part.messages?.first()?.date
+        val dir = File(Environment.getExternalStorageDirectory(), "QKSMS/Media").apply { mkdirs() }
+        val fileName = part.name?.takeIf { name -> name.endsWith(extension) }
+                ?: "${part.type.split("/").last()}_$date.$extension"
+        var file: File
+        var index = 0
+        do {
+            file = File(dir, if (index == 0) fileName else fileName.replace(".$extension", " ($index).$extension"))
+            index++
+        } while (file.exists())
+
+        try {
+            FileOutputStream(file).use { outputStream ->
+                context.contentResolver.openInputStream(part.getUri())?.use { inputStream ->
+                    inputStream.copyTo(outputStream, 1024)
+                }
+            }
+        } catch (e: FileNotFoundException) {
+            e.printStackTrace()
+        } catch (e: IOException) {
+            e.printStackTrace()
+        }
+
+        MediaScannerConnection.scanFile(context, arrayOf(file.path), null, null)
+
+        return file.takeIf { it.exists() }
+    }
+
+    /**
+     * Retrieves the list of messages which should be shown in the notification
+     * for a given conversation
+     */
+    override fun getUnreadUnseenMessages(threadId: Long): RealmResults<Message> {
+        return Realm.getDefaultInstance()
+                .also { it.refresh() }
+                .where(Message::class.java)
+                .equalTo("seen", false)
+                .equalTo("read", false)
+                .equalTo("threadId", threadId)
+                .sort("date")
+                .findAll()
+    }
+
+    override fun getUnreadMessages(threadId: Long): RealmResults<Message> {
+        return Realm.getDefaultInstance()
+                .where(Message::class.java)
+                .equalTo("read", false)
+                .equalTo("threadId", threadId)
+                .sort("date")
+                .findAll()
+    }
+
+    override fun markAllSeen() {
+        val realm = Realm.getDefaultInstance()
+        val messages = realm.where(Message::class.java).equalTo("seen", false).findAll()
+        realm.executeTransaction { messages.forEach { message -> message.seen = true } }
+        realm.close()
+    }
+
+    override fun markSeen(threadId: Long) {
+        val realm = Realm.getDefaultInstance()
+        val messages = realm.where(Message::class.java)
+                .equalTo("threadId", threadId)
+                .equalTo("seen", false)
+                .findAll()
+
+        realm.executeTransaction {
+            messages.forEach { message ->
+                message.seen = true
+            }
+        }
+        realm.close()
+    }
+
+    override fun markRead(vararg threadIds: Long) {
+        Realm.getDefaultInstance()?.use { realm ->
+            val messages = realm.where(Message::class.java)
+                    .anyOf("threadId", threadIds)
+                    .beginGroup()
+                    .equalTo("read", false)
+                    .or()
+                    .equalTo("seen", false)
+                    .endGroup()
+                    .findAll()
+
+            realm.executeTransaction {
+                messages.forEach { message ->
+                    message.seen = true
+                    message.read = true
+                }
+            }
+        }
+
+        val values = ContentValues()
+        values.put(Sms.SEEN, true)
+        values.put(Sms.READ, true)
+
+        threadIds.forEach { threadId ->
+            try {
+                val uri = ContentUris.withAppendedId(Telephony.MmsSms.CONTENT_CONVERSATIONS_URI, threadId)
+                context.contentResolver.update(uri, values, "${Sms.READ} = 0", null)
+            } catch (exception: Exception) {
+                Timber.w(exception)
+            }
+        }
+    }
+
+    override fun markUnread(vararg threadIds: Long) {
+        Realm.getDefaultInstance()?.use { realm ->
+            val conversations = realm.where(Conversation::class.java)
+                    .anyOf("id", threadIds)
+                    .equalTo("lastMessage.read", true)
+                    .findAll()
+
+            realm.executeTransaction {
+                conversations.forEach { conversation ->
+                    conversation.lastMessage?.read = false
+                }
+            }
+        }
+    }
+
+    override fun sendMessage(
+        subId: Int,
+        threadId: Long,
+        addresses: List<String>,
+        body: String,
+        attachments: List<Attachment>,
+        delay: Int
+    ) {
+        val signedBody = when {
+            prefs.signature.get().isEmpty() -> body
+            body.isNotEmpty() -> body + '\n' + prefs.signature.get()
+            else -> prefs.signature.get()
+        }
+
+        val smsManager = subId.takeIf { it != -1 }
+                ?.let(SmsManagerFactory::createSmsManager)
+                ?: SmsManager.getDefault()
+
+        // We only care about stripping SMS
+        val strippedBody = when (prefs.unicode.get()) {
+            true -> StripAccents.stripAccents(signedBody)
+            false -> signedBody
+        }
+
+        val parts = smsManager.divideMessage(strippedBody).orEmpty()
+        val forceMms = prefs.longAsMms.get() && parts.size > 1
+
+        if (addresses.size == 1 && attachments.isEmpty() && !forceMms) { // SMS
+            if (delay > 0) { // With delay
+                val sendTime = System.currentTimeMillis() + delay
+                val message = insertSentSms(subId, threadId, addresses.first(), strippedBody, sendTime)
+
+                val intent = getIntentForDelayedSms(message.id)
+
+                val alarmManager = context.getSystemService(Context.ALARM_SERVICE) as AlarmManager
+                if (Build.VERSION.SDK_INT >= Build.VERSION_CODES.M) {
+                    alarmManager.setExactAndAllowWhileIdle(AlarmManager.RTC_WAKEUP, sendTime, intent)
+                } else {
+                    alarmManager.setExact(AlarmManager.RTC_WAKEUP, sendTime, intent)
+                }
+            } else { // No delay
+                val message = insertSentSms(subId, threadId, addresses.first(), strippedBody, now())
+                sendSms(message)
+            }
+        } else { // MMS
+            val parts = arrayListOf<MMSPart>()
+
+            val maxWidth = smsManager.carrierConfigValues.getInt(SmsManager.MMS_CONFIG_MAX_IMAGE_WIDTH)
+                    .takeIf { prefs.mmsSize.get() == -1 } ?: Int.MAX_VALUE
+
+            val maxHeight = smsManager.carrierConfigValues.getInt(SmsManager.MMS_CONFIG_MAX_IMAGE_HEIGHT)
+                    .takeIf { prefs.mmsSize.get() == -1 } ?: Int.MAX_VALUE
+
+            var remainingBytes = when (prefs.mmsSize.get()) {
+                -1 -> smsManager.carrierConfigValues.getInt(SmsManager.MMS_CONFIG_MAX_MESSAGE_SIZE)
+                0 -> Int.MAX_VALUE
+                else -> prefs.mmsSize.get() * 1024
+            } * 0.9 // Ugly, but buys us a bit of wiggle room
+
+            signedBody.takeIf { it.isNotEmpty() }?.toByteArray()?.let { bytes ->
+                remainingBytes -= bytes.size
+                parts += MMSPart("text", ContentType.TEXT_PLAIN, bytes)
+            }
+
+            // Attach contacts
+            parts += attachments
+                    .mapNotNull { attachment -> attachment as? Attachment.Contact }
+                    .map { attachment -> attachment.vCard.toByteArray() }
+                    .map { vCard ->
+                        remainingBytes -= vCard.size
+                        MMSPart("contact", ContentType.TEXT_VCARD, vCard)
+                    }
+
+            val imageBytesByAttachment = attachments
+                    .mapNotNull { attachment -> attachment as? Attachment.Image }
+                    .associateWith { attachment ->
+                        val uri = attachment.getUri() ?: return@associateWith byteArrayOf()
+                        when (attachment.isGif(context)) {
+                            true -> ImageUtils.getScaledGif(context, uri, maxWidth, maxHeight)
+                            false -> ImageUtils.getScaledImage(context, uri, maxWidth, maxHeight)
+                        }
+                    }
+                    .toMutableMap()
+
+            val imageByteCount = imageBytesByAttachment.values.sumBy { byteArray -> byteArray.size }
+            if (imageByteCount > remainingBytes) {
+                imageBytesByAttachment.forEach { (attachment, originalBytes) ->
+                    val uri = attachment.getUri() ?: return@forEach
+                    val maxBytes = originalBytes.size / imageByteCount.toFloat() * remainingBytes
+
+                    // Get the image dimensions
+                    val options = BitmapFactory.Options().apply { inJustDecodeBounds = true }
+                    BitmapFactory.decodeStream(context.contentResolver.openInputStream(uri), null, options)
+                    val width = options.outWidth
+                    val height = options.outHeight
+                    val aspectRatio = width.toFloat() / height.toFloat()
+
+                    var attempts = 0
+                    var scaledBytes = originalBytes
+
+                    while (scaledBytes.size > maxBytes) {
+                        // Estimate how much we need to scale the image down by. If it's still too big, we'll need to
+                        // try smaller and smaller values
+                        val scale = maxBytes / originalBytes.size * (0.9 - attempts * 0.2)
+                        if (scale <= 0) {
+                            Timber.w("Failed to compress ${originalBytes.size / 1024}Kb to ${maxBytes.toInt() / 1024}Kb")
+                            return@forEach
+                        }
+
+                        val newArea = scale * width * height
+                        val newWidth = sqrt(newArea * aspectRatio).toInt()
+                        val newHeight = (newWidth / aspectRatio).toInt()
+
+                        attempts++
+                        scaledBytes = when (attachment.isGif(context)) {
+                            true -> ImageUtils.getScaledGif(context, uri, newWidth, newHeight, 80)
+                            false -> ImageUtils.getScaledImage(context, uri, newWidth, newHeight, 80)
+                        }
+
+                        Timber.d("Compression attempt $attempts: ${scaledBytes.size / 1024}/${maxBytes.toInt() / 1024}Kb ($width*$height -> $newWidth*$newHeight)")
+                    }
+
+                    Timber.v("Compressed ${originalBytes.size / 1024}Kb to ${scaledBytes.size / 1024}Kb with a target size of ${maxBytes.toInt() / 1024}Kb in $attempts attempts")
+                    imageBytesByAttachment[attachment] = scaledBytes
+                }
+            }
+
+            imageBytesByAttachment.forEach { (attachment, bytes) ->
+                parts += when (attachment.isGif(context)) {
+                    true -> MMSPart("image", ContentType.IMAGE_GIF, bytes)
+                    false -> MMSPart("image", ContentType.IMAGE_JPEG, bytes)
+                }
+            }
+
+            // We need to strip the separators from outgoing MMS, or else they'll appear to have sent and not go through
+            val transaction = Transaction(context)
+            val recipients = addresses.map(phoneNumberUtils::normalizeNumber)
+            transaction.sendNewMessage(subId, threadId, recipients, parts, null, null)
+        }
+    }
+
+    override fun sendSms(message: Message) {
+        val smsManager = message.subId.takeIf { it != -1 }
+                ?.let(SmsManagerFactory::createSmsManager)
+                ?: SmsManager.getDefault()
+
+        val parts = smsManager
+                .divideMessage(if (prefs.unicode.get()) StripAccents.stripAccents(message.body) else message.body)
+                ?: arrayListOf()
+
+        val sentIntents = parts.map {
+            val intent = Intent(context, SmsSentReceiver::class.java).putExtra("id", message.id)
+            PendingIntent.getBroadcast(context, message.id.toInt(), intent, PendingIntent.FLAG_UPDATE_CURRENT)
+        }
+
+        val deliveredIntents = parts.map {
+            val intent = Intent(context, SmsDeliveredReceiver::class.java).putExtra("id", message.id)
+            val pendingIntent = PendingIntent
+                    .getBroadcast(context, message.id.toInt(), intent, PendingIntent.FLAG_UPDATE_CURRENT)
+            if (prefs.delivery.get()) pendingIntent else null
+        }
+
+        try {
+            smsManager.sendMultipartTextMessage(
+                    message.address,
+                    null,
+                    parts,
+                    ArrayList(sentIntents),
+                    ArrayList(deliveredIntents)
+            )
+        } catch (e: IllegalArgumentException) {
+            Timber.w(e, "Message body lengths: ${parts.map { it?.length }}")
+            markFailed(message.id, Telephony.MmsSms.ERR_TYPE_GENERIC)
+        }
+    }
+
+    override fun resendMms(message: Message) {
+        val subId = message.subId
+        val threadId = message.threadId
+        val pdu = tryOrNull {
+            PduPersister.getPduPersister(context).load(message.getUri()) as MultimediaMessagePdu
+        } ?: return
+
+        val addresses = pdu.to.map { it.string }.filter { it.isNotBlank() }
+        val parts = message.parts.mapNotNull { part ->
+            val bytes = tryOrNull(false) {
+                context.contentResolver.openInputStream(part.getUri())?.use { inputStream -> inputStream.readBytes() }
+            } ?: return@mapNotNull null
+
+            MMSPart(part.name.orEmpty(), part.type, bytes)
+        }
+
+        Transaction(context).sendNewMessage(subId, threadId, addresses, parts, message.subject, message.getUri())
+    }
+
+    override fun cancelDelayedSms(id: Long) {
+        val alarmManager = context.getSystemService(Context.ALARM_SERVICE) as AlarmManager
+        alarmManager.cancel(getIntentForDelayedSms(id))
+    }
+
+    private fun getIntentForDelayedSms(id: Long): PendingIntent {
+        val intent = Intent(context, SendSmsReceiver::class.java).putExtra("id", id)
+        return PendingIntent.getBroadcast(context, id.toInt(), intent, PendingIntent.FLAG_UPDATE_CURRENT)
+    }
+
+    override fun insertSentSms(subId: Int, threadId: Long, address: String, body: String, date: Long): Message {
+
+        // Insert the message to Realm
+        val message = Message().apply {
+            this.threadId = threadId
+            this.address = address
+            this.body = body
+            this.date = date
+            this.subId = subId
+
+            id = messageIds.newId()
+            boxId = Sms.MESSAGE_TYPE_OUTBOX
+            type = "sms"
+            read = true
+            seen = true
+        }
+        val realm = Realm.getDefaultInstance()
+        var managedMessage: Message? = null
+        realm.executeTransaction { managedMessage = realm.copyToRealmOrUpdate(message) }
+
+        // Insert the message to the native content provider
+        val values = contentValuesOf(
+                Sms.ADDRESS to address,
+                Sms.BODY to body,
+                Sms.DATE to System.currentTimeMillis(),
+                Sms.READ to true,
+                Sms.SEEN to true,
+                Sms.TYPE to Sms.MESSAGE_TYPE_OUTBOX,
+                Sms.THREAD_ID to threadId
+        )
+
+        if (prefs.canUseSubId.get()) {
+            values.put(Sms.SUBSCRIPTION_ID, message.subId)
+        }
+
+        val uri = context.contentResolver.insert(Sms.CONTENT_URI, values)
+
+        // Update the contentId after the message has been inserted to the content provider
+        // The message might have been deleted by now, so only proceed if it's valid
+        //
+        // We do this after inserting the message because it might be slow, and we want the message
+        // to be inserted into Realm immediately. We don't need to do this after receiving one
+        uri?.lastPathSegment?.toLong()?.let { id ->
+            realm.executeTransaction { managedMessage?.takeIf { it.isValid }?.contentId = id }
+        }
+        realm.close()
+
+        // On some devices, we can't obtain a threadId until after the first message is sent in a
+        // conversation. In this case, we need to update the message's threadId after it gets added
+        // to the native ContentProvider
+        if (threadId == 0L) {
+            uri?.let(syncRepository::syncMessage)
+        }
+
+        return message
+    }
+
+    override fun insertReceivedSms(subId: Int, address: String, body: String, sentTime: Long): Message {
+
+        // Insert the message to Realm
+        val message = Message().apply {
+            this.address = address
+            this.body = body
+            this.dateSent = sentTime
+            this.date = System.currentTimeMillis()
+            this.subId = subId
+
+            id = messageIds.newId()
+            threadId = TelephonyCompat.getOrCreateThreadId(context, address)
+            boxId = Sms.MESSAGE_TYPE_INBOX
+            type = "sms"
+            read = activeConversationManager.getActiveConversation() == threadId
+        }
+        val realm = Realm.getDefaultInstance()
+        var managedMessage: Message? = null
+        realm.executeTransaction { managedMessage = realm.copyToRealmOrUpdate(message) }
+
+        // Insert the message to the native content provider
+        val values = contentValuesOf(
+                Sms.ADDRESS to address,
+                Sms.BODY to body,
+                Sms.DATE_SENT to sentTime
+        )
+
+        if (prefs.canUseSubId.get()) {
+            values.put(Sms.SUBSCRIPTION_ID, message.subId)
+        }
+
+        context.contentResolver.insert(Sms.Inbox.CONTENT_URI, values)?.lastPathSegment?.toLong()?.let { id ->
+            // Update the contentId after the message has been inserted to the content provider
+            realm.executeTransaction { managedMessage?.contentId = id }
+        }
+
+        realm.close()
+
+        return message
+    }
+
+    /**
+     * Marks the message as sending, in case we need to retry sending it
+     */
+    override fun markSending(id: Long) {
+        Realm.getDefaultInstance().use { realm ->
+            realm.refresh()
+
+            val message = realm.where(Message::class.java).equalTo("id", id).findFirst()
+            message?.let {
+                // Update the message in realm
+                realm.executeTransaction {
+                    message.boxId = when (message.isSms()) {
+                        true -> Sms.MESSAGE_TYPE_OUTBOX
+                        false -> Mms.MESSAGE_BOX_OUTBOX
+                    }
+                }
+
+                // Update the message in the native ContentProvider
+                val values = when (message.isSms()) {
+                    true -> contentValuesOf(Sms.TYPE to Sms.MESSAGE_TYPE_OUTBOX)
+                    false -> contentValuesOf(Mms.MESSAGE_BOX to Mms.MESSAGE_BOX_OUTBOX)
+                }
+                context.contentResolver.update(message.getUri(), values, null, null)
+            }
+        }
+    }
+
+    override fun markSent(id: Long) {
+        Realm.getDefaultInstance().use { realm ->
+            realm.refresh()
+
+            val message = realm.where(Message::class.java).equalTo("id", id).findFirst()
+            message?.let {
+                // Update the message in realm
+                realm.executeTransaction {
+                    message.boxId = Sms.MESSAGE_TYPE_SENT
+                }
+
+                // Update the message in the native ContentProvider
+                val values = ContentValues()
+                values.put(Sms.TYPE, Sms.MESSAGE_TYPE_SENT)
+                context.contentResolver.update(message.getUri(), values, null, null)
+            }
+        }
+    }
+
+    override fun markFailed(id: Long, resultCode: Int) {
+        Realm.getDefaultInstance().use { realm ->
+            realm.refresh()
+
+            val message = realm.where(Message::class.java).equalTo("id", id).findFirst()
+            message?.let {
+                // Update the message in realm
+                realm.executeTransaction {
+                    message.boxId = Sms.MESSAGE_TYPE_FAILED
+                    message.errorCode = resultCode
+                }
+
+                // Update the message in the native ContentProvider
+                val values = ContentValues()
+                values.put(Sms.TYPE, Sms.MESSAGE_TYPE_FAILED)
+                values.put(Sms.ERROR_CODE, resultCode)
+                context.contentResolver.update(message.getUri(), values, null, null)
+            }
+        }
+    }
+
+    override fun markDelivered(id: Long) {
+        Realm.getDefaultInstance().use { realm ->
+            realm.refresh()
+
+            val message = realm.where(Message::class.java).equalTo("id", id).findFirst()
+            message?.let {
+                // Update the message in realm
+                realm.executeTransaction {
+                    message.deliveryStatus = Sms.STATUS_COMPLETE
+                    message.dateSent = System.currentTimeMillis()
+                    message.read = true
+                }
+
+                // Update the message in the native ContentProvider
+                val values = ContentValues()
+                values.put(Sms.STATUS, Sms.STATUS_COMPLETE)
+                values.put(Sms.DATE_SENT, System.currentTimeMillis())
+                values.put(Sms.READ, true)
+                context.contentResolver.update(message.getUri(), values, null, null)
+            }
+        }
+    }
+
+    override fun markDeliveryFailed(id: Long, resultCode: Int) {
+        Realm.getDefaultInstance().use { realm ->
+            realm.refresh()
+
+            val message = realm.where(Message::class.java).equalTo("id", id).findFirst()
+            message?.let {
+                // Update the message in realm
+                realm.executeTransaction {
+                    message.deliveryStatus = Sms.STATUS_FAILED
+                    message.dateSent = System.currentTimeMillis()
+                    message.read = true
+                    message.errorCode = resultCode
+                }
+
+                // Update the message in the native ContentProvider
+                val values = ContentValues()
+                values.put(Sms.STATUS, Sms.STATUS_FAILED)
+                values.put(Sms.DATE_SENT, System.currentTimeMillis())
+                values.put(Sms.READ, true)
+                values.put(Sms.ERROR_CODE, resultCode)
+                context.contentResolver.update(message.getUri(), values, null, null)
+            }
+        }
+    }
+
+    override fun deleteMessages(vararg messageIds: Long) {
+        Realm.getDefaultInstance().use { realm ->
+            realm.refresh()
+
+            val messages = realm.where(Message::class.java)
+                    .anyOf("id", messageIds)
+                    .findAll()
+
+            val uris = messages.map { it.getUri() }
+
+            realm.executeTransaction { messages.deleteAllFromRealm() }
+
+            uris.forEach { uri -> context.contentResolver.delete(uri, null, null) }
+        }
+    }
+
+    override fun getOldMessageCounts(maxAgeDays: Int): Map<Long, Int> {
+        return Realm.getDefaultInstance().use { realm ->
+            realm.where(Message::class.java)
+                    .lessThan("date", now() - TimeUnit.DAYS.toMillis(maxAgeDays.toLong()))
+                    .findAll()
+                    .groupingBy { message -> message.threadId }
+                    .eachCount()
+        }
+    }
+
+    override fun deleteOldMessages(maxAgeDays: Int) {
+        return Realm.getDefaultInstance().use { realm ->
+            val messages = realm.where(Message::class.java)
+                    .lessThan("date", now() - TimeUnit.DAYS.toMillis(maxAgeDays.toLong()))
+                    .findAll()
+
+            val uris = messages.map { it.getUri() }
+
+            realm.executeTransaction { messages.deleteAllFromRealm() }
+
+            uris.forEach { uri -> context.contentResolver.delete(uri, null, null) }
+        }
+    }
+}
diff --git a/data/src/main/java/com/moez/QKSMS/repository/ScheduledMessageRepositoryImpl.kt b/data/src/main/java/com/moez/QKSMS/repository/ScheduledMessageRepositoryImpl.kt
index 4c382bed9..6599b8897 100644
--- a/data/src/main/java/com/moez/QKSMS/repository/ScheduledMessageRepositoryImpl.kt
+++ b/data/src/main/java/com/moez/QKSMS/repository/ScheduledMessageRepositoryImpl.kt
@@ -1,76 +1,76 @@
-/*
- * Copyright (C) 2017 Moez Bhatti <moez.bhatti@gmail.com>
- *
- * This file is part of QKSMS.
- *
- * QKSMS is free software: you can redistribute it and/or modify
- * it under the terms of the GNU General Public License as published by
- * the Free Software Foundation, either version 3 of the License, or
- * (at your option) any later version.
- *
- * QKSMS is distributed in the hope that it will be useful,
- * but WITHOUT ANY WARRANTY; without even the implied warranty of
- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
- * GNU General Public License for more details.
- *
- * You should have received a copy of the GNU General Public License
- * along with QKSMS.  If not, see <http://www.gnu.org/licenses/>.
- */
-package com.moez.QKSMS.repository
-
-import com.moez.QKSMS.model.ScheduledMessage
-import io.realm.Realm
-import io.realm.RealmList
-import io.realm.RealmResults
-import javax.inject.Inject
-
-class ScheduledMessageRepositoryImpl @Inject constructor() : ScheduledMessageRepository {
-
-    override fun saveScheduledMessage(
-        date: Long,
-        subId: Int,
-        recipients: List<String>,
-        sendAsGroup: Boolean,
-        body: String,
-        attachments: List<String>
-    ) {
-        Realm.getDefaultInstance().use { realm ->
-            val id = (realm.where(ScheduledMessage::class.java).max("id")?.toLong() ?: -1) + 1
-            val recipientsRealmList = RealmList(*recipients.toTypedArray())
-            val attachmentsRealmList = RealmList(*attachments.toTypedArray())
-
-            val message = ScheduledMessage(id, date, subId, recipientsRealmList, sendAsGroup, body,
-                    attachmentsRealmList)
-
-            realm.executeTransaction { realm.insertOrUpdate(message) }
-        }
-    }
-
-    override fun getScheduledMessages(): RealmResults<ScheduledMessage> {
-        return Realm.getDefaultInstance()
-                .where(ScheduledMessage::class.java)
-                .sort("date")
-                .findAll()
-    }
-
-    override fun getScheduledMessage(id: Long): ScheduledMessage? {
-        return Realm.getDefaultInstance()
-                .apply { refresh() }
-                .where(ScheduledMessage::class.java)
-                .equalTo("id", id)
-                .findFirst()
-    }
-
-    override fun deleteScheduledMessage(id: Long) {
-        Realm.getDefaultInstance()
-                .apply { refresh() }
-                .use { realm ->
-                    val message = realm.where(ScheduledMessage::class.java)
-                            .equalTo("id", id)
-                            .findFirst()
-
-                    realm.executeTransaction { message?.deleteFromRealm() }
-                }
-    }
-
+/*
+ * Copyright (C) 2017 Moez Bhatti <moez.bhatti@gmail.com>
+ *
+ * This file is part of QKSMS.
+ *
+ * QKSMS is free software: you can redistribute it and/or modify
+ * it under the terms of the GNU General Public License as published by
+ * the Free Software Foundation, either version 3 of the License, or
+ * (at your option) any later version.
+ *
+ * QKSMS is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+ * GNU General Public License for more details.
+ *
+ * You should have received a copy of the GNU General Public License
+ * along with QKSMS.  If not, see <http://www.gnu.org/licenses/>.
+ */
+package com.moez.QKSMS.repository
+
+import com.moez.QKSMS.model.ScheduledMessage
+import io.realm.Realm
+import io.realm.RealmList
+import io.realm.RealmResults
+import javax.inject.Inject
+
+class ScheduledMessageRepositoryImpl @Inject constructor() : ScheduledMessageRepository {
+
+    override fun saveScheduledMessage(
+        date: Long,
+        subId: Int,
+        recipients: List<String>,
+        sendAsGroup: Boolean,
+        body: String,
+        attachments: List<String>
+    ) {
+        Realm.getDefaultInstance().use { realm ->
+            val id = (realm.where(ScheduledMessage::class.java).max("id")?.toLong() ?: -1) + 1
+            val recipientsRealmList = RealmList(*recipients.toTypedArray())
+            val attachmentsRealmList = RealmList(*attachments.toTypedArray())
+
+            val message = ScheduledMessage(id, date, subId, recipientsRealmList, sendAsGroup, body,
+                    attachmentsRealmList)
+
+            realm.executeTransaction { realm.insertOrUpdate(message) }
+        }
+    }
+
+    override fun getScheduledMessages(): RealmResults<ScheduledMessage> {
+        return Realm.getDefaultInstance()
+                .where(ScheduledMessage::class.java)
+                .sort("date")
+                .findAll()
+    }
+
+    override fun getScheduledMessage(id: Long): ScheduledMessage? {
+        return Realm.getDefaultInstance()
+                .apply { refresh() }
+                .where(ScheduledMessage::class.java)
+                .equalTo("id", id)
+                .findFirst()
+    }
+
+    override fun deleteScheduledMessage(id: Long) {
+        Realm.getDefaultInstance()
+                .apply { refresh() }
+                .use { realm ->
+                    val message = realm.where(ScheduledMessage::class.java)
+                            .equalTo("id", id)
+                            .findFirst()
+
+                    realm.executeTransaction { message?.deleteFromRealm() }
+                }
+    }
+
 }
\ No newline at end of file
diff --git a/data/src/main/java/com/moez/QKSMS/repository/SyncRepositoryImpl.kt b/data/src/main/java/com/moez/QKSMS/repository/SyncRepositoryImpl.kt
index 1990adf10..bd2104ebc 100644
--- a/data/src/main/java/com/moez/QKSMS/repository/SyncRepositoryImpl.kt
+++ b/data/src/main/java/com/moez/QKSMS/repository/SyncRepositoryImpl.kt
@@ -1,348 +1,348 @@
-/*
- * Copyright (C) 2017 Moez Bhatti <moez.bhatti@gmail.com>
- *
- * This file is part of QKSMS.
- *
- * QKSMS is free software: you can redistribute it and/or modify
- * it under the terms of the GNU General Public License as published by
- * the Free Software Foundation, either version 3 of the License, or
- * (at your option) any later version.
- *
- * QKSMS is distributed in the hope that it will be useful,
- * but WITHOUT ANY WARRANTY; without even the implied warranty of
- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
- * GNU General Public License for more details.
- *
- * You should have received a copy of the GNU General Public License
- * along with QKSMS.  If not, see <http://www.gnu.org/licenses/>.
- */
-package com.moez.QKSMS.repository
-
-import android.content.ContentResolver
-import android.content.ContentUris
-import android.net.Uri
-import android.provider.Telephony
-import com.f2prateek.rx.preferences2.RxSharedPreferences
-import com.moez.QKSMS.extensions.forEach
-import com.moez.QKSMS.extensions.insertOrUpdate
-import com.moez.QKSMS.extensions.map
-import com.moez.QKSMS.manager.KeyManager
-import com.moez.QKSMS.mapper.CursorToContact
-import com.moez.QKSMS.mapper.CursorToContactGroup
-import com.moez.QKSMS.mapper.CursorToContactGroupMember
-import com.moez.QKSMS.mapper.CursorToConversation
-import com.moez.QKSMS.mapper.CursorToMessage
-import com.moez.QKSMS.mapper.CursorToPart
-import com.moez.QKSMS.mapper.CursorToRecipient
-import com.moez.QKSMS.model.Contact
-import com.moez.QKSMS.model.ContactGroup
-import com.moez.QKSMS.model.Conversation
-import com.moez.QKSMS.model.Message
-import com.moez.QKSMS.model.MmsPart
-import com.moez.QKSMS.model.PhoneNumber
-import com.moez.QKSMS.model.Recipient
-import com.moez.QKSMS.model.SyncLog
-import com.moez.QKSMS.util.PhoneNumberUtils
-import com.moez.QKSMS.util.tryOrNull
-import io.reactivex.subjects.BehaviorSubject
-import io.reactivex.subjects.Subject
-import io.realm.Realm
-import io.realm.RealmList
-import io.realm.Sort
-import javax.inject.Inject
-import javax.inject.Singleton
-
-@Singleton
-class SyncRepositoryImpl @Inject constructor(
-    private val contentResolver: ContentResolver,
-    private val conversationRepo: ConversationRepository,
-    private val cursorToConversation: CursorToConversation,
-    private val cursorToMessage: CursorToMessage,
-    private val cursorToPart: CursorToPart,
-    private val cursorToRecipient: CursorToRecipient,
-    private val cursorToContact: CursorToContact,
-    private val cursorToContactGroup: CursorToContactGroup,
-    private val cursorToContactGroupMember: CursorToContactGroupMember,
-    private val keys: KeyManager,
-    private val phoneNumberUtils: PhoneNumberUtils,
-    private val rxPrefs: RxSharedPreferences
-) : SyncRepository {
-
-    override val syncProgress: Subject<SyncRepository.SyncProgress> =
-            BehaviorSubject.createDefault(SyncRepository.SyncProgress.Idle)
-
-    override fun syncMessages() {
-
-        // If the sync is already running, don't try to do another one
-        if (syncProgress.blockingFirst() is SyncRepository.SyncProgress.Running) return
-        syncProgress.onNext(SyncRepository.SyncProgress.Running(0, 0, true))
-
-        val realm = Realm.getDefaultInstance()
-        realm.beginTransaction()
-
-        val persistedData = realm.copyFromRealm(realm.where(Conversation::class.java)
-                .beginGroup()
-                .equalTo("archived", true)
-                .or()
-                .equalTo("blocked", true)
-                .or()
-                .equalTo("pinned", true)
-                .or()
-                .isNotEmpty("name")
-                .or()
-                .isNotNull("blockingClient")
-                .or()
-                .isNotEmpty("blockReason")
-                .endGroup()
-                .findAll())
-                .associateBy { conversation -> conversation.id }
-                .toMutableMap()
-
-        realm.delete(Contact::class.java)
-        realm.delete(ContactGroup::class.java)
-        realm.delete(Conversation::class.java)
-        realm.delete(Message::class.java)
-        realm.delete(MmsPart::class.java)
-        realm.delete(Recipient::class.java)
-
-        keys.reset()
-
-        val partsCursor = cursorToPart.getPartsCursor()
-        val messageCursor = cursorToMessage.getMessagesCursor()
-        val conversationCursor = cursorToConversation.getConversationsCursor()
-        val recipientCursor = cursorToRecipient.getRecipientCursor()
-
-        val max = (partsCursor?.count ?: 0) +
-                (messageCursor?.count ?: 0) +
-                (conversationCursor?.count ?: 0) +
-                (recipientCursor?.count ?: 0)
-
-        var progress = 0
-
-        // Sync message parts
-        partsCursor?.use {
-            partsCursor.forEach {
-                tryOrNull {
-                    progress++
-                    val part = cursorToPart.map(partsCursor)
-                    realm.insertOrUpdate(part)
-                }
-            }
-        }
-
-        // Sync messages
-        messageCursor?.use {
-            val messageColumns = CursorToMessage.MessageColumns(messageCursor)
-            messageCursor.forEach { cursor ->
-                tryOrNull {
-                    progress++
-                    syncProgress.onNext(SyncRepository.SyncProgress.Running(max, progress, false))
-                    val message = cursorToMessage.map(Pair(cursor, messageColumns)).apply {
-                        if (isMms()) {
-                            parts = RealmList<MmsPart>().apply {
-                                addAll(realm.where(MmsPart::class.java)
-                                        .equalTo("messageId", contentId)
-                                        .findAll())
-                            }
-                        }
-                    }
-                    realm.insertOrUpdate(message)
-                }
-            }
-        }
-
-        // Migrate blocked conversations from 2.7.3
-        val oldBlockedSenders = rxPrefs.getStringSet("pref_key_blocked_senders")
-        oldBlockedSenders.get()
-                .map { threadIdString -> threadIdString.toLong() }
-                .filter { threadId -> !persistedData.contains(threadId) }
-                .forEach { threadId -> persistedData[threadId] = Conversation(id = threadId, blocked = true) }
-
-        // Sync conversations
-        conversationCursor?.use {
-            conversationCursor.forEach { cursor ->
-                tryOrNull {
-                    progress++
-                    syncProgress.onNext(SyncRepository.SyncProgress.Running(max, progress, false))
-                    val conversation = cursorToConversation.map(cursor).apply {
-                        persistedData[id]?.let { persistedConversation ->
-                            archived = persistedConversation.archived
-                            blocked = persistedConversation.blocked
-                            pinned = persistedConversation.pinned
-                            name = persistedConversation.name
-                            blockingClient = persistedConversation.blockingClient
-                            blockReason = persistedConversation.blockReason
-                        }
-                        lastMessage = realm.where(Message::class.java)
-                                .sort("date", Sort.DESCENDING)
-                                .equalTo("threadId", id)
-                                .findFirst()
-                    }
-                    realm.insertOrUpdate(conversation)
-                }
-            }
-        }
-
-        // Sync recipients
-        recipientCursor?.use {
-            val contacts = realm.copyToRealmOrUpdate(getContacts())
-            recipientCursor.forEach { cursor ->
-                tryOrNull {
-                    progress++
-                    syncProgress.onNext(SyncRepository.SyncProgress.Running(max, progress, false))
-                    val recipient = cursorToRecipient.map(cursor).apply {
-                        contact = contacts.firstOrNull { contact ->
-                            contact.numbers.any { phoneNumberUtils.compare(address, it.address) }
-                        }
-                    }
-                    realm.insertOrUpdate(recipient)
-                }
-            }
-        }
-
-        syncProgress.onNext(SyncRepository.SyncProgress.Running(0, 0, true))
-
-
-        realm.insert(SyncLog())
-        realm.commitTransaction()
-        realm.close()
-
-        // Only delete this after the sync has successfully completed
-        oldBlockedSenders.delete()
-
-        syncProgress.onNext(SyncRepository.SyncProgress.Idle)
-    }
-
-    override fun syncMessage(uri: Uri): Message? {
-
-        // If we don't have a valid type, return null
-        val type = when {
-            uri.toString().contains("mms") -> "mms"
-            uri.toString().contains("sms") -> "sms"
-            else -> return null
-        }
-
-        // If we don't have a valid id, return null
-        val id = tryOrNull(false) { ContentUris.parseId(uri) } ?: return null
-
-        // Check if the message already exists, so we can reuse the id
-        val existingId = Realm.getDefaultInstance().use { realm ->
-            realm.refresh()
-            realm.where(Message::class.java)
-                    .equalTo("type", type)
-                    .equalTo("contentId", id)
-                    .findFirst()
-                    ?.id
-        }
-
-        // The uri might be something like content://mms/inbox/id
-        // The box might change though, so we should just use the mms/id uri
-        val stableUri = when (type) {
-            "mms" -> ContentUris.withAppendedId(Telephony.Mms.CONTENT_URI, id)
-            else -> ContentUris.withAppendedId(Telephony.Sms.CONTENT_URI, id)
-        }
-
-        return contentResolver.query(stableUri, null, null, null, null)?.use { cursor ->
-
-            // If there are no rows, return null. Otherwise, we've moved to the first row
-            if (!cursor.moveToFirst()) return null
-
-            val columnsMap = CursorToMessage.MessageColumns(cursor)
-            cursorToMessage.map(Pair(cursor, columnsMap)).apply {
-                existingId?.let { this.id = it }
-
-                if (isMms()) {
-                    parts = RealmList<MmsPart>().apply {
-                        addAll(cursorToPart.getPartsCursor(contentId)?.map { cursorToPart.map(it) }.orEmpty())
-                    }
-                }
-
-                conversationRepo.getOrCreateConversation(threadId)
-                insertOrUpdate()
-            }
-        }
-    }
-
-    override fun syncContacts() {
-        // Load all the contacts
-        var contacts = getContacts()
-
-        Realm.getDefaultInstance()?.use { realm ->
-            val recipients = realm.where(Recipient::class.java).findAll()
-
-            realm.executeTransaction {
-                realm.delete(Contact::class.java)
-                realm.delete(ContactGroup::class.java)
-
-                contacts = realm.copyToRealmOrUpdate(contacts)
-                realm.insertOrUpdate(getContactGroups(contacts))
-
-                // Update all the recipients with the new contacts
-                recipients.forEach { recipient ->
-                    recipient.contact = contacts.find { contact ->
-                        contact.numbers.any { phoneNumberUtils.compare(recipient.address, it.address) }
-                    }
-                }
-
-                realm.insertOrUpdate(recipients)
-            }
-
-        }
-    }
-
-    private fun getContacts(): List<Contact> {
-        val defaultNumberIds = Realm.getDefaultInstance().use { realm ->
-            realm.where(PhoneNumber::class.java)
-                    .equalTo("isDefault", true)
-                    .findAll()
-                    .map { number -> number.id }
-        }
-
-        return cursorToContact.getContactsCursor()
-                ?.map { cursor -> cursorToContact.map(cursor) }
-                ?.groupBy { contact -> contact.lookupKey }
-                ?.map { contacts ->
-                    // Sometimes, contacts providers on the phone will create duplicate phone number entries. This
-                    // commonly happens with Whatsapp. Let's try to detect these duplicate entries and filter them out
-                    val uniqueNumbers = mutableListOf<PhoneNumber>()
-                    contacts.value
-                            .flatMap { it.numbers }
-                            .forEach { number ->
-                                number.isDefault = defaultNumberIds.any { id -> id == number.id }
-                                val duplicate = uniqueNumbers.find { other ->
-                                    phoneNumberUtils.compare(number.address, other.address)
-                                }
-
-                                if (duplicate == null) {
-                                    uniqueNumbers += number
-                                } else if (!duplicate.isDefault && number.isDefault) {
-                                    duplicate.isDefault = true
-                                }
-                            }
-
-                    contacts.value.first().apply {
-                        numbers.clear()
-                        numbers.addAll(uniqueNumbers)
-                    }
-                } ?: listOf()
-    }
-
-    private fun getContactGroups(contacts: List<Contact>): List<ContactGroup> {
-        val groupMembers = cursorToContactGroupMember.getGroupMembersCursor()
-                ?.map(cursorToContactGroupMember::map)
-                .orEmpty()
-
-        val groups = cursorToContactGroup.getContactGroupsCursor()
-                ?.map(cursorToContactGroup::map)
-                .orEmpty()
-
-        groups.forEach { group ->
-            group.contacts.addAll(groupMembers
-                    .filter { member -> member.groupId == group.id }
-                    .mapNotNull { member -> contacts.find { contact -> contact.lookupKey == member.lookupKey } })
-        }
-
-        return groups
-    }
-
-}
+/*
+ * Copyright (C) 2017 Moez Bhatti <moez.bhatti@gmail.com>
+ *
+ * This file is part of QKSMS.
+ *
+ * QKSMS is free software: you can redistribute it and/or modify
+ * it under the terms of the GNU General Public License as published by
+ * the Free Software Foundation, either version 3 of the License, or
+ * (at your option) any later version.
+ *
+ * QKSMS is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+ * GNU General Public License for more details.
+ *
+ * You should have received a copy of the GNU General Public License
+ * along with QKSMS.  If not, see <http://www.gnu.org/licenses/>.
+ */
+package com.moez.QKSMS.repository
+
+import android.content.ContentResolver
+import android.content.ContentUris
+import android.net.Uri
+import android.provider.Telephony
+import com.f2prateek.rx.preferences2.RxSharedPreferences
+import com.moez.QKSMS.extensions.forEach
+import com.moez.QKSMS.extensions.insertOrUpdate
+import com.moez.QKSMS.extensions.map
+import com.moez.QKSMS.manager.KeyManager
+import com.moez.QKSMS.mapper.CursorToContact
+import com.moez.QKSMS.mapper.CursorToContactGroup
+import com.moez.QKSMS.mapper.CursorToContactGroupMember
+import com.moez.QKSMS.mapper.CursorToConversation
+import com.moez.QKSMS.mapper.CursorToMessage
+import com.moez.QKSMS.mapper.CursorToPart
+import com.moez.QKSMS.mapper.CursorToRecipient
+import com.moez.QKSMS.model.Contact
+import com.moez.QKSMS.model.ContactGroup
+import com.moez.QKSMS.model.Conversation
+import com.moez.QKSMS.model.Message
+import com.moez.QKSMS.model.MmsPart
+import com.moez.QKSMS.model.PhoneNumber
+import com.moez.QKSMS.model.Recipient
+import com.moez.QKSMS.model.SyncLog
+import com.moez.QKSMS.util.PhoneNumberUtils
+import com.moez.QKSMS.util.tryOrNull
+import io.reactivex.subjects.BehaviorSubject
+import io.reactivex.subjects.Subject
+import io.realm.Realm
+import io.realm.RealmList
+import io.realm.Sort
+import javax.inject.Inject
+import javax.inject.Singleton
+
+@Singleton
+class SyncRepositoryImpl @Inject constructor(
+    private val contentResolver: ContentResolver,
+    private val conversationRepo: ConversationRepository,
+    private val cursorToConversation: CursorToConversation,
+    private val cursorToMessage: CursorToMessage,
+    private val cursorToPart: CursorToPart,
+    private val cursorToRecipient: CursorToRecipient,
+    private val cursorToContact: CursorToContact,
+    private val cursorToContactGroup: CursorToContactGroup,
+    private val cursorToContactGroupMember: CursorToContactGroupMember,
+    private val keys: KeyManager,
+    private val phoneNumberUtils: PhoneNumberUtils,
+    private val rxPrefs: RxSharedPreferences
+) : SyncRepository {
+
+    override val syncProgress: Subject<SyncRepository.SyncProgress> =
+            BehaviorSubject.createDefault(SyncRepository.SyncProgress.Idle)
+
+    override fun syncMessages() {
+
+        // If the sync is already running, don't try to do another one
+        if (syncProgress.blockingFirst() is SyncRepository.SyncProgress.Running) return
+        syncProgress.onNext(SyncRepository.SyncProgress.Running(0, 0, true))
+
+        val realm = Realm.getDefaultInstance()
+        realm.beginTransaction()
+
+        val persistedData = realm.copyFromRealm(realm.where(Conversation::class.java)
+                .beginGroup()
+                .equalTo("archived", true)
+                .or()
+                .equalTo("blocked", true)
+                .or()
+                .equalTo("pinned", true)
+                .or()
+                .isNotEmpty("name")
+                .or()
+                .isNotNull("blockingClient")
+                .or()
+                .isNotEmpty("blockReason")
+                .endGroup()
+                .findAll())
+                .associateBy { conversation -> conversation.id }
+                .toMutableMap()
+
+        realm.delete(Contact::class.java)
+        realm.delete(ContactGroup::class.java)
+        realm.delete(Conversation::class.java)
+        realm.delete(Message::class.java)
+        realm.delete(MmsPart::class.java)
+        realm.delete(Recipient::class.java)
+
+        keys.reset()
+
+        val partsCursor = cursorToPart.getPartsCursor()
+        val messageCursor = cursorToMessage.getMessagesCursor()
+        val conversationCursor = cursorToConversation.getConversationsCursor()
+        val recipientCursor = cursorToRecipient.getRecipientCursor()
+
+        val max = (partsCursor?.count ?: 0) +
+                (messageCursor?.count ?: 0) +
+                (conversationCursor?.count ?: 0) +
+                (recipientCursor?.count ?: 0)
+
+        var progress = 0
+
+        // Sync message parts
+        partsCursor?.use {
+            partsCursor.forEach {
+                tryOrNull {
+                    progress++
+                    val part = cursorToPart.map(partsCursor)
+                    realm.insertOrUpdate(part)
+                }
+            }
+        }
+
+        // Sync messages
+        messageCursor?.use {
+            val messageColumns = CursorToMessage.MessageColumns(messageCursor)
+            messageCursor.forEach { cursor ->
+                tryOrNull {
+                    progress++
+                    syncProgress.onNext(SyncRepository.SyncProgress.Running(max, progress, false))
+                    val message = cursorToMessage.map(Pair(cursor, messageColumns)).apply {
+                        if (isMms()) {
+                            parts = RealmList<MmsPart>().apply {
+                                addAll(realm.where(MmsPart::class.java)
+                                        .equalTo("messageId", contentId)
+                                        .findAll())
+                            }
+                        }
+                    }
+                    realm.insertOrUpdate(message)
+                }
+            }
+        }
+
+        // Migrate blocked conversations from 2.7.3
+        val oldBlockedSenders = rxPrefs.getStringSet("pref_key_blocked_senders")
+        oldBlockedSenders.get()
+                .map { threadIdString -> threadIdString.toLong() }
+                .filter { threadId -> !persistedData.contains(threadId) }
+                .forEach { threadId -> persistedData[threadId] = Conversation(id = threadId, blocked = true) }
+
+        // Sync conversations
+        conversationCursor?.use {
+            conversationCursor.forEach { cursor ->
+                tryOrNull {
+                    progress++
+                    syncProgress.onNext(SyncRepository.SyncProgress.Running(max, progress, false))
+                    val conversation = cursorToConversation.map(cursor).apply {
+                        persistedData[id]?.let { persistedConversation ->
+                            archived = persistedConversation.archived
+                            blocked = persistedConversation.blocked
+                            pinned = persistedConversation.pinned
+                            name = persistedConversation.name
+                            blockingClient = persistedConversation.blockingClient
+                            blockReason = persistedConversation.blockReason
+                        }
+                        lastMessage = realm.where(Message::class.java)
+                                .sort("date", Sort.DESCENDING)
+                                .equalTo("threadId", id)
+                                .findFirst()
+                    }
+                    realm.insertOrUpdate(conversation)
+                }
+            }
+        }
+
+        // Sync recipients
+        recipientCursor?.use {
+            val contacts = realm.copyToRealmOrUpdate(getContacts())
+            recipientCursor.forEach { cursor ->
+                tryOrNull {
+                    progress++
+                    syncProgress.onNext(SyncRepository.SyncProgress.Running(max, progress, false))
+                    val recipient = cursorToRecipient.map(cursor).apply {
+                        contact = contacts.firstOrNull { contact ->
+                            contact.numbers.any { phoneNumberUtils.compare(address, it.address) }
+                        }
+                    }
+                    realm.insertOrUpdate(recipient)
+                }
+            }
+        }
+
+        syncProgress.onNext(SyncRepository.SyncProgress.Running(0, 0, true))
+
+
+        realm.insert(SyncLog())
+        realm.commitTransaction()
+        realm.close()
+
+        // Only delete this after the sync has successfully completed
+        oldBlockedSenders.delete()
+
+        syncProgress.onNext(SyncRepository.SyncProgress.Idle)
+    }
+
+    override fun syncMessage(uri: Uri): Message? {
+
+        // If we don't have a valid type, return null
+        val type = when {
+            uri.toString().contains("mms") -> "mms"
+            uri.toString().contains("sms") -> "sms"
+            else -> return null
+        }
+
+        // If we don't have a valid id, return null
+        val id = tryOrNull(false) { ContentUris.parseId(uri) } ?: return null
+
+        // Check if the message already exists, so we can reuse the id
+        val existingId = Realm.getDefaultInstance().use { realm ->
+            realm.refresh()
+            realm.where(Message::class.java)
+                    .equalTo("type", type)
+                    .equalTo("contentId", id)
+                    .findFirst()
+                    ?.id
+        }
+
+        // The uri might be something like content://mms/inbox/id
+        // The box might change though, so we should just use the mms/id uri
+        val stableUri = when (type) {
+            "mms" -> ContentUris.withAppendedId(Telephony.Mms.CONTENT_URI, id)
+            else -> ContentUris.withAppendedId(Telephony.Sms.CONTENT_URI, id)
+        }
+
+        return contentResolver.query(stableUri, null, null, null, null)?.use { cursor ->
+
+            // If there are no rows, return null. Otherwise, we've moved to the first row
+            if (!cursor.moveToFirst()) return null
+
+            val columnsMap = CursorToMessage.MessageColumns(cursor)
+            cursorToMessage.map(Pair(cursor, columnsMap)).apply {
+                existingId?.let { this.id = it }
+
+                if (isMms()) {
+                    parts = RealmList<MmsPart>().apply {
+                        addAll(cursorToPart.getPartsCursor(contentId)?.map { cursorToPart.map(it) }.orEmpty())
+                    }
+                }
+
+                conversationRepo.getOrCreateConversation(threadId)
+                insertOrUpdate()
+            }
+        }
+    }
+
+    override fun syncContacts() {
+        // Load all the contacts
+        var contacts = getContacts()
+
+        Realm.getDefaultInstance()?.use { realm ->
+            val recipients = realm.where(Recipient::class.java).findAll()
+
+            realm.executeTransaction {
+                realm.delete(Contact::class.java)
+                realm.delete(ContactGroup::class.java)
+
+                contacts = realm.copyToRealmOrUpdate(contacts)
+                realm.insertOrUpdate(getContactGroups(contacts))
+
+                // Update all the recipients with the new contacts
+                recipients.forEach { recipient ->
+                    recipient.contact = contacts.find { contact ->
+                        contact.numbers.any { phoneNumberUtils.compare(recipient.address, it.address) }
+                    }
+                }
+
+                realm.insertOrUpdate(recipients)
+            }
+
+        }
+    }
+
+    private fun getContacts(): List<Contact> {
+        val defaultNumberIds = Realm.getDefaultInstance().use { realm ->
+            realm.where(PhoneNumber::class.java)
+                    .equalTo("isDefault", true)
+                    .findAll()
+                    .map { number -> number.id }
+        }
+
+        return cursorToContact.getContactsCursor()
+                ?.map { cursor -> cursorToContact.map(cursor) }
+                ?.groupBy { contact -> contact.lookupKey }
+                ?.map { contacts ->
+                    // Sometimes, contacts providers on the phone will create duplicate phone number entries. This
+                    // commonly happens with Whatsapp. Let's try to detect these duplicate entries and filter them out
+                    val uniqueNumbers = mutableListOf<PhoneNumber>()
+                    contacts.value
+                            .flatMap { it.numbers }
+                            .forEach { number ->
+                                number.isDefault = defaultNumberIds.any { id -> id == number.id }
+                                val duplicate = uniqueNumbers.find { other ->
+                                    phoneNumberUtils.compare(number.address, other.address)
+                                }
+
+                                if (duplicate == null) {
+                                    uniqueNumbers += number
+                                } else if (!duplicate.isDefault && number.isDefault) {
+                                    duplicate.isDefault = true
+                                }
+                            }
+
+                    contacts.value.first().apply {
+                        numbers.clear()
+                        numbers.addAll(uniqueNumbers)
+                    }
+                } ?: listOf()
+    }
+
+    private fun getContactGroups(contacts: List<Contact>): List<ContactGroup> {
+        val groupMembers = cursorToContactGroupMember.getGroupMembersCursor()
+                ?.map(cursorToContactGroupMember::map)
+                .orEmpty()
+
+        val groups = cursorToContactGroup.getContactGroupsCursor()
+                ?.map(cursorToContactGroup::map)
+                .orEmpty()
+
+        groups.forEach { group ->
+            group.contacts.addAll(groupMembers
+                    .filter { member -> member.groupId == group.id }
+                    .mapNotNull { member -> contacts.find { contact -> contact.lookupKey == member.lookupKey } })
+        }
+
+        return groups
+    }
+
+}
diff --git a/data/src/main/java/com/moez/QKSMS/service/AutoDeleteService.kt b/data/src/main/java/com/moez/QKSMS/service/AutoDeleteService.kt
index b29edca71..da29f4970 100644
--- a/data/src/main/java/com/moez/QKSMS/service/AutoDeleteService.kt
+++ b/data/src/main/java/com/moez/QKSMS/service/AutoDeleteService.kt
@@ -1,62 +1,62 @@
-package com.moez.QKSMS.service
-
-import android.annotation.SuppressLint
-import android.app.job.JobInfo
-import android.app.job.JobParameters
-import android.app.job.JobService
-import android.content.ComponentName
-import android.content.Context
-import androidx.core.content.getSystemService
-import com.moez.QKSMS.common.util.extensions.jobScheduler
-import com.moez.QKSMS.interactor.DeleteOldMessages
-import dagger.android.AndroidInjection
-import io.reactivex.disposables.CompositeDisposable
-import io.reactivex.rxkotlin.plusAssign
-import kotlinx.coroutines.Job
-import timber.log.Timber
-import java.util.concurrent.TimeUnit
-import javax.inject.Inject
-
-class AutoDeleteService : JobService() {
-
-    companion object {
-        private const val JobId = 8120235
-
-        @SuppressLint("MissingPermission") // Added in [presentation]'s AndroidManifest.xml
-        fun scheduleJob(context: Context) {
-            Timber.i("Scheduling job")
-            val serviceComponent = ComponentName(context, AutoDeleteService::class.java)
-            val periodicJob = JobInfo.Builder(JobId, serviceComponent)
-                    .setPeriodic(TimeUnit.DAYS.toMillis(1))
-                    .setPersisted(true)
-                    .build()
-
-            context.jobScheduler.schedule(periodicJob)
-        }
-
-        fun cancelJob(context: Context) {
-            Timber.i("Canceling job")
-            context.jobScheduler.cancel(JobId)
-        }
-    }
-
-    @Inject lateinit var deleteOldMessages: DeleteOldMessages
-
-    private val disposables = CompositeDisposable()
-
-    override fun onStartJob(params: JobParameters?): Boolean {
-        Timber.i("onStartJob")
-        AndroidInjection.inject(this)
-        disposables += deleteOldMessages
-        deleteOldMessages.execute(Unit) {
-            jobFinished(params, false)
-        }
-        return true
-    }
-
-    override fun onStopJob(params: JobParameters?): Boolean {
-        Timber.i("onStopJob")
-        disposables.dispose()
-        return true
-    }
-}
+package com.moez.QKSMS.service
+
+import android.annotation.SuppressLint
+import android.app.job.JobInfo
+import android.app.job.JobParameters
+import android.app.job.JobService
+import android.content.ComponentName
+import android.content.Context
+import androidx.core.content.getSystemService
+import com.moez.QKSMS.common.util.extensions.jobScheduler
+import com.moez.QKSMS.interactor.DeleteOldMessages
+import dagger.android.AndroidInjection
+import io.reactivex.disposables.CompositeDisposable
+import io.reactivex.rxkotlin.plusAssign
+import kotlinx.coroutines.Job
+import timber.log.Timber
+import java.util.concurrent.TimeUnit
+import javax.inject.Inject
+
+class AutoDeleteService : JobService() {
+
+    companion object {
+        private const val JobId = 8120235
+
+        @SuppressLint("MissingPermission") // Added in [presentation]'s AndroidManifest.xml
+        fun scheduleJob(context: Context) {
+            Timber.i("Scheduling job")
+            val serviceComponent = ComponentName(context, AutoDeleteService::class.java)
+            val periodicJob = JobInfo.Builder(JobId, serviceComponent)
+                    .setPeriodic(TimeUnit.DAYS.toMillis(1))
+                    .setPersisted(true)
+                    .build()
+
+            context.jobScheduler.schedule(periodicJob)
+        }
+
+        fun cancelJob(context: Context) {
+            Timber.i("Canceling job")
+            context.jobScheduler.cancel(JobId)
+        }
+    }
+
+    @Inject lateinit var deleteOldMessages: DeleteOldMessages
+
+    private val disposables = CompositeDisposable()
+
+    override fun onStartJob(params: JobParameters?): Boolean {
+        Timber.i("onStartJob")
+        AndroidInjection.inject(this)
+        disposables += deleteOldMessages
+        deleteOldMessages.execute(Unit) {
+            jobFinished(params, false)
+        }
+        return true
+    }
+
+    override fun onStopJob(params: JobParameters?): Boolean {
+        Timber.i("onStopJob")
+        disposables.dispose()
+        return true
+    }
+}
diff --git a/data/src/main/java/com/moez/QKSMS/service/HeadlessSmsSendService.kt b/data/src/main/java/com/moez/QKSMS/service/HeadlessSmsSendService.kt
index ce3909342..381d78864 100644
--- a/data/src/main/java/com/moez/QKSMS/service/HeadlessSmsSendService.kt
+++ b/data/src/main/java/com/moez/QKSMS/service/HeadlessSmsSendService.kt
@@ -1,53 +1,53 @@
-/*
- * Copyright (C) 2017 Moez Bhatti <moez.bhatti@gmail.com>
- *
- * This file is part of QKSMS.
- *
- * QKSMS is free software: you can redistribute it and/or modify
- * it under the terms of the GNU General Public License as published by
- * the Free Software Foundation, either version 3 of the License, or
- * (at your option) any later version.
- *
- * QKSMS is distributed in the hope that it will be useful,
- * but WITHOUT ANY WARRANTY; without even the implied warranty of
- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
- * GNU General Public License for more details.
- *
- * You should have received a copy of the GNU General Public License
- * along with QKSMS.  If not, see <http://www.gnu.org/licenses/>.
- */
-package com.moez.QKSMS.service
-
-import android.app.IntentService
-import android.content.Intent
-import android.net.Uri
-import android.telephony.TelephonyManager
-import com.moez.QKSMS.interactor.SendMessage
-import com.moez.QKSMS.repository.ConversationRepository
-import dagger.android.AndroidInjection
-import javax.inject.Inject
-
-class HeadlessSmsSendService : IntentService("HeadlessSmsSendService") {
-
-    @Inject lateinit var conversationRepo: ConversationRepository
-    @Inject lateinit var sendMessage: SendMessage
-
-    override fun onHandleIntent(intent: Intent?) {
-        if (intent?.action != TelephonyManager.ACTION_RESPOND_VIA_MESSAGE) return
-
-        AndroidInjection.inject(this)
-        intent.extras?.getString(Intent.EXTRA_TEXT)?.takeIf { it.isNotBlank() }?.let { body ->
-            val intentUri = intent.data
-            val recipients = intentUri?.let(::getRecipients)?.split(";") ?: return@let
-            val threadId = conversationRepo.getOrCreateConversation(recipients)?.id ?: 0L
-            sendMessage.execute(SendMessage.Params(-1, threadId, recipients, body))
-        }
-    }
-
-    private fun getRecipients(uri: Uri): String {
-        val base = uri.schemeSpecificPart
-        val position = base.indexOf('?')
-        return if (position == -1) base else base.substring(0, position)
-    }
-
+/*
+ * Copyright (C) 2017 Moez Bhatti <moez.bhatti@gmail.com>
+ *
+ * This file is part of QKSMS.
+ *
+ * QKSMS is free software: you can redistribute it and/or modify
+ * it under the terms of the GNU General Public License as published by
+ * the Free Software Foundation, either version 3 of the License, or
+ * (at your option) any later version.
+ *
+ * QKSMS is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+ * GNU General Public License for more details.
+ *
+ * You should have received a copy of the GNU General Public License
+ * along with QKSMS.  If not, see <http://www.gnu.org/licenses/>.
+ */
+package com.moez.QKSMS.service
+
+import android.app.IntentService
+import android.content.Intent
+import android.net.Uri
+import android.telephony.TelephonyManager
+import com.moez.QKSMS.interactor.SendMessage
+import com.moez.QKSMS.repository.ConversationRepository
+import dagger.android.AndroidInjection
+import javax.inject.Inject
+
+class HeadlessSmsSendService : IntentService("HeadlessSmsSendService") {
+
+    @Inject lateinit var conversationRepo: ConversationRepository
+    @Inject lateinit var sendMessage: SendMessage
+
+    override fun onHandleIntent(intent: Intent?) {
+        if (intent?.action != TelephonyManager.ACTION_RESPOND_VIA_MESSAGE) return
+
+        AndroidInjection.inject(this)
+        intent.extras?.getString(Intent.EXTRA_TEXT)?.takeIf { it.isNotBlank() }?.let { body ->
+            val intentUri = intent.data
+            val recipients = intentUri?.let(::getRecipients)?.split(";") ?: return@let
+            val threadId = conversationRepo.getOrCreateConversation(recipients)?.id ?: 0L
+            sendMessage.execute(SendMessage.Params(-1, threadId, recipients, body))
+        }
+    }
+
+    private fun getRecipients(uri: Uri): String {
+        val base = uri.schemeSpecificPart
+        val position = base.indexOf('?')
+        return if (position == -1) base else base.substring(0, position)
+    }
+
 }
\ No newline at end of file
diff --git a/data/src/main/java/com/moez/QKSMS/util/ActiveSubscriptionObservable.kt b/data/src/main/java/com/moez/QKSMS/util/ActiveSubscriptionObservable.kt
index c52f8f5bc..cda572dbb 100644
--- a/data/src/main/java/com/moez/QKSMS/util/ActiveSubscriptionObservable.kt
+++ b/data/src/main/java/com/moez/QKSMS/util/ActiveSubscriptionObservable.kt
@@ -1,61 +1,61 @@
-/*
- * Copyright (C) 2017 Moez Bhatti <moez.bhatti@gmail.com>
- *
- * This file is part of QKSMS.
- *
- * QKSMS is free software: you can redistribute it and/or modify
- * it under the terms of the GNU General Public License as published by
- * the Free Software Foundation, either version 3 of the License, or
- * (at your option) any later version.
- *
- * QKSMS is distributed in the hope that it will be useful,
- * but WITHOUT ANY WARRANTY; without even the implied warranty of
- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
- * GNU General Public License for more details.
- *
- * You should have received a copy of the GNU General Public License
- * along with QKSMS.  If not, see <http://www.gnu.org/licenses/>.
- */
-package com.moez.QKSMS.util
-
-import com.moez.QKSMS.compat.SubscriptionInfoCompat
-import com.moez.QKSMS.compat.SubscriptionManagerCompat
-import io.reactivex.Observable
-import io.reactivex.Observer
-import io.reactivex.disposables.Disposable
-
-class ActiveSubscriptionObservable(
-    private val subscriptionManager: SubscriptionManagerCompat
-) : Observable<List<SubscriptionInfoCompat>>() {
-
-    override fun subscribeActual(observer: Observer<in List<SubscriptionInfoCompat>>) {
-        observer.onNext(subscriptionManager.activeSubscriptionInfoList)
-
-        val listener = Listener(subscriptionManager, observer)
-        observer.onSubscribe(listener)
-        subscriptionManager.addOnSubscriptionsChangedListener(listener)
-    }
-
-    internal class Listener(
-        private val subscriptionManager: SubscriptionManagerCompat,
-        private val observer: Observer<in List<SubscriptionInfoCompat>>
-    ) : Disposable, SubscriptionManagerCompat.OnSubscriptionsChangedListener() {
-
-        private var disposed: Boolean = false
-
-        override fun onSubscriptionsChanged() {
-            if (!isDisposed) {
-                observer.onNext(subscriptionManager.activeSubscriptionInfoList)
-            }
-        }
-
-        override fun isDisposed(): Boolean = disposed
-
-        override fun dispose() {
-            disposed = true
-            subscriptionManager.removeOnSubscriptionsChangedListener(this)
-        }
-
-    }
-
+/*
+ * Copyright (C) 2017 Moez Bhatti <moez.bhatti@gmail.com>
+ *
+ * This file is part of QKSMS.
+ *
+ * QKSMS is free software: you can redistribute it and/or modify
+ * it under the terms of the GNU General Public License as published by
+ * the Free Software Foundation, either version 3 of the License, or
+ * (at your option) any later version.
+ *
+ * QKSMS is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+ * GNU General Public License for more details.
+ *
+ * You should have received a copy of the GNU General Public License
+ * along with QKSMS.  If not, see <http://www.gnu.org/licenses/>.
+ */
+package com.moez.QKSMS.util
+
+import com.moez.QKSMS.compat.SubscriptionInfoCompat
+import com.moez.QKSMS.compat.SubscriptionManagerCompat
+import io.reactivex.Observable
+import io.reactivex.Observer
+import io.reactivex.disposables.Disposable
+
+class ActiveSubscriptionObservable(
+    private val subscriptionManager: SubscriptionManagerCompat
+) : Observable<List<SubscriptionInfoCompat>>() {
+
+    override fun subscribeActual(observer: Observer<in List<SubscriptionInfoCompat>>) {
+        observer.onNext(subscriptionManager.activeSubscriptionInfoList)
+
+        val listener = Listener(subscriptionManager, observer)
+        observer.onSubscribe(listener)
+        subscriptionManager.addOnSubscriptionsChangedListener(listener)
+    }
+
+    internal class Listener(
+        private val subscriptionManager: SubscriptionManagerCompat,
+        private val observer: Observer<in List<SubscriptionInfoCompat>>
+    ) : Disposable, SubscriptionManagerCompat.OnSubscriptionsChangedListener() {
+
+        private var disposed: Boolean = false
+
+        override fun onSubscriptionsChanged() {
+            if (!isDisposed) {
+                observer.onNext(subscriptionManager.activeSubscriptionInfoList)
+            }
+        }
+
+        override fun isDisposed(): Boolean = disposed
+
+        override fun dispose() {
+            disposed = true
+            subscriptionManager.removeOnSubscriptionsChangedListener(this)
+        }
+
+    }
+
 }
\ No newline at end of file
diff --git a/data/src/main/java/com/moez/QKSMS/util/GifEncoder.kt b/data/src/main/java/com/moez/QKSMS/util/GifEncoder.kt
index 177c28d5d..bdb04c1f4 100644
--- a/data/src/main/java/com/moez/QKSMS/util/GifEncoder.kt
+++ b/data/src/main/java/com/moez/QKSMS/util/GifEncoder.kt
@@ -1,114 +1,114 @@
-/*
- * Copyright (C) 2017 Moez Bhatti <moez.bhatti@gmail.com>
- *
- * This file is part of QKSMS.
- *
- * QKSMS is free software: you can redistribute it and/or modify
- * it under the terms of the GNU General Public License as published by
- * the Free Software Foundation, either version 3 of the License, or
- * (at your option) any later version.
- *
- * QKSMS is distributed in the hope that it will be useful,
- * but WITHOUT ANY WARRANTY; without even the implied warranty of
- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
- * GNU General Public License for more details.
- *
- * You should have received a copy of the GNU General Public License
- * along with QKSMS.  If not, see <http://www.gnu.org/licenses/>.
- */
-package com.moez.QKSMS.util
-
-import android.content.Context
-import android.graphics.Bitmap
-import androidx.annotation.VisibleForTesting
-import com.bumptech.glide.gifdecoder.GifDecoder
-import com.bumptech.glide.gifdecoder.GifHeaderParser
-import com.bumptech.glide.gifdecoder.StandardGifDecoder
-import com.bumptech.glide.gifencoder.AnimatedGifEncoder
-import com.bumptech.glide.load.Transformation
-import com.bumptech.glide.load.engine.Resource
-import com.bumptech.glide.load.engine.bitmap_recycle.BitmapPool
-import com.bumptech.glide.load.resource.bitmap.BitmapResource
-import com.bumptech.glide.load.resource.gif.GifBitmapProvider
-import com.bumptech.glide.load.resource.gif.GifDrawable
-import java.io.OutputStream
-import java.nio.ByteBuffer
-
-/**
- * Allows converting an animated [GifDrawable] to an [OutputStream]
- * Based on Glide's ReEncodingGifResourceEncoder
- */
-class GifEncoder internal constructor(
-    private val context: Context,
-    private val bitmapPool: BitmapPool,
-    private val factory: Factory = Factory()
-) {
-
-    private val provider = GifBitmapProvider(bitmapPool)
-
-    fun encodeTransformedToStream(drawable: GifDrawable, os: OutputStream): Boolean {
-        val transformation = drawable.frameTransformation
-        val decoder = decodeHeaders(drawable.buffer)
-        val encoder = factory.buildEncoder()
-        if (!encoder.start(os)) {
-            return false
-        }
-
-        for (i in 0 until decoder.frameCount) {
-            val currentFrame = decoder.nextFrame
-            val transformedResource = getTransformedFrame(currentFrame, transformation, drawable)
-            try {
-                if (!encoder.addFrame(transformedResource.get())) {
-                    return false
-                }
-                val currentFrameIndex = decoder.currentFrameIndex
-                val delay = decoder.getDelay(currentFrameIndex)
-                encoder.setDelay(delay)
-
-                decoder.advance()
-            } finally {
-                transformedResource.recycle()
-            }
-        }
-
-        return encoder.finish()
-    }
-
-    private fun decodeHeaders(data: ByteBuffer): GifDecoder {
-        val parser = factory.buildParser()
-        parser.setData(data)
-        val header = parser.parseHeader()
-
-        val decoder = factory.buildDecoder(provider)
-        decoder.setData(header, data)
-        decoder.advance()
-
-        return decoder
-    }
-
-    private fun getTransformedFrame(
-        currentFrame: Bitmap?,
-        transformation: Transformation<Bitmap>,
-        drawable: GifDrawable
-    ): Resource<Bitmap> {
-        // TODO: what if current frame is null?
-        val bitmapResource = factory.buildFrameResource(currentFrame!!, bitmapPool)
-        val transformedResource = transformation.transform(
-                context, bitmapResource, drawable.intrinsicWidth, drawable.intrinsicHeight)
-        if (bitmapResource != transformedResource) {
-            bitmapResource.recycle()
-        }
-        return transformedResource
-    }
-
-    @VisibleForTesting
-    internal class Factory {
-        fun buildDecoder(bitmapProvider: GifDecoder.BitmapProvider) = StandardGifDecoder(bitmapProvider)
-
-        fun buildParser() = GifHeaderParser()
-
-        fun buildEncoder() = AnimatedGifEncoder()
-
-        fun buildFrameResource(bitmap: Bitmap, bitmapPool: BitmapPool) = BitmapResource(bitmap, bitmapPool)
-    }
+/*
+ * Copyright (C) 2017 Moez Bhatti <moez.bhatti@gmail.com>
+ *
+ * This file is part of QKSMS.
+ *
+ * QKSMS is free software: you can redistribute it and/or modify
+ * it under the terms of the GNU General Public License as published by
+ * the Free Software Foundation, either version 3 of the License, or
+ * (at your option) any later version.
+ *
+ * QKSMS is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+ * GNU General Public License for more details.
+ *
+ * You should have received a copy of the GNU General Public License
+ * along with QKSMS.  If not, see <http://www.gnu.org/licenses/>.
+ */
+package com.moez.QKSMS.util
+
+import android.content.Context
+import android.graphics.Bitmap
+import androidx.annotation.VisibleForTesting
+import com.bumptech.glide.gifdecoder.GifDecoder
+import com.bumptech.glide.gifdecoder.GifHeaderParser
+import com.bumptech.glide.gifdecoder.StandardGifDecoder
+import com.bumptech.glide.gifencoder.AnimatedGifEncoder
+import com.bumptech.glide.load.Transformation
+import com.bumptech.glide.load.engine.Resource
+import com.bumptech.glide.load.engine.bitmap_recycle.BitmapPool
+import com.bumptech.glide.load.resource.bitmap.BitmapResource
+import com.bumptech.glide.load.resource.gif.GifBitmapProvider
+import com.bumptech.glide.load.resource.gif.GifDrawable
+import java.io.OutputStream
+import java.nio.ByteBuffer
+
+/**
+ * Allows converting an animated [GifDrawable] to an [OutputStream]
+ * Based on Glide's ReEncodingGifResourceEncoder
+ */
+class GifEncoder internal constructor(
+    private val context: Context,
+    private val bitmapPool: BitmapPool,
+    private val factory: Factory = Factory()
+) {
+
+    private val provider = GifBitmapProvider(bitmapPool)
+
+    fun encodeTransformedToStream(drawable: GifDrawable, os: OutputStream): Boolean {
+        val transformation = drawable.frameTransformation
+        val decoder = decodeHeaders(drawable.buffer)
+        val encoder = factory.buildEncoder()
+        if (!encoder.start(os)) {
+            return false
+        }
+
+        for (i in 0 until decoder.frameCount) {
+            val currentFrame = decoder.nextFrame
+            val transformedResource = getTransformedFrame(currentFrame, transformation, drawable)
+            try {
+                if (!encoder.addFrame(transformedResource.get())) {
+                    return false
+                }
+                val currentFrameIndex = decoder.currentFrameIndex
+                val delay = decoder.getDelay(currentFrameIndex)
+                encoder.setDelay(delay)
+
+                decoder.advance()
+            } finally {
+                transformedResource.recycle()
+            }
+        }
+
+        return encoder.finish()
+    }
+
+    private fun decodeHeaders(data: ByteBuffer): GifDecoder {
+        val parser = factory.buildParser()
+        parser.setData(data)
+        val header = parser.parseHeader()
+
+        val decoder = factory.buildDecoder(provider)
+        decoder.setData(header, data)
+        decoder.advance()
+
+        return decoder
+    }
+
+    private fun getTransformedFrame(
+        currentFrame: Bitmap?,
+        transformation: Transformation<Bitmap>,
+        drawable: GifDrawable
+    ): Resource<Bitmap> {
+        // TODO: what if current frame is null?
+        val bitmapResource = factory.buildFrameResource(currentFrame!!, bitmapPool)
+        val transformedResource = transformation.transform(
+                context, bitmapResource, drawable.intrinsicWidth, drawable.intrinsicHeight)
+        if (bitmapResource != transformedResource) {
+            bitmapResource.recycle()
+        }
+        return transformedResource
+    }
+
+    @VisibleForTesting
+    internal class Factory {
+        fun buildDecoder(bitmapProvider: GifDecoder.BitmapProvider) = StandardGifDecoder(bitmapProvider)
+
+        fun buildParser() = GifHeaderParser()
+
+        fun buildEncoder() = AnimatedGifEncoder()
+
+        fun buildFrameResource(bitmap: Bitmap, bitmapPool: BitmapPool) = BitmapResource(bitmap, bitmapPool)
+    }
 }
\ No newline at end of file
diff --git a/data/src/main/java/com/moez/QKSMS/util/GlideAppModule.kt b/data/src/main/java/com/moez/QKSMS/util/GlideAppModule.kt
index 294a2c647..dd3de92e1 100644
--- a/data/src/main/java/com/moez/QKSMS/util/GlideAppModule.kt
+++ b/data/src/main/java/com/moez/QKSMS/util/GlideAppModule.kt
@@ -1,40 +1,40 @@
-/*
- * Copyright (C) 2017 Moez Bhatti <moez.bhatti@gmail.com>
- *
- * This file is part of QKSMS.
- *
- * QKSMS is free software: you can redistribute it and/or modify
- * it under the terms of the GNU General Public License as published by
- * the Free Software Foundation, either version 3 of the License, or
- * (at your option) any later version.
- *
- * QKSMS is distributed in the hope that it will be useful,
- * but WITHOUT ANY WARRANTY; without even the implied warranty of
- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
- * GNU General Public License for more details.
- *
- * You should have received a copy of the GNU General Public License
- * along with QKSMS.  If not, see <http://www.gnu.org/licenses/>.
- */
-package com.moez.QKSMS.util
-
-import android.content.Context
-import android.util.Log
-import com.bumptech.glide.Glide
-import com.bumptech.glide.GlideBuilder
-import com.bumptech.glide.Registry
-import com.bumptech.glide.annotation.GlideModule
-import com.bumptech.glide.module.AppGlideModule
-
-@GlideModule
-class GlideAppModule : AppGlideModule() {
-
-    override fun applyOptions(context: Context, builder: GlideBuilder) {
-        builder.setLogLevel(Log.ERROR)
-    }
-
-    override fun registerComponents(context: Context, glide: Glide, registry: Registry) {
-        // registry.prepend(GifDrawable::class.java, ReEncodingGifResourceEncoder(context, glide.bitmapPool))
-    }
-
-}
+/*
+ * Copyright (C) 2017 Moez Bhatti <moez.bhatti@gmail.com>
+ *
+ * This file is part of QKSMS.
+ *
+ * QKSMS is free software: you can redistribute it and/or modify
+ * it under the terms of the GNU General Public License as published by
+ * the Free Software Foundation, either version 3 of the License, or
+ * (at your option) any later version.
+ *
+ * QKSMS is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+ * GNU General Public License for more details.
+ *
+ * You should have received a copy of the GNU General Public License
+ * along with QKSMS.  If not, see <http://www.gnu.org/licenses/>.
+ */
+package com.moez.QKSMS.util
+
+import android.content.Context
+import android.util.Log
+import com.bumptech.glide.Glide
+import com.bumptech.glide.GlideBuilder
+import com.bumptech.glide.Registry
+import com.bumptech.glide.annotation.GlideModule
+import com.bumptech.glide.module.AppGlideModule
+
+@GlideModule
+class GlideAppModule : AppGlideModule() {
+
+    override fun applyOptions(context: Context, builder: GlideBuilder) {
+        builder.setLogLevel(Log.ERROR)
+    }
+
+    override fun registerComponents(context: Context, glide: Glide, registry: Registry) {
+        // registry.prepend(GifDrawable::class.java, ReEncodingGifResourceEncoder(context, glide.bitmapPool))
+    }
+
+}
diff --git a/data/src/main/java/com/moez/QKSMS/util/ImageUtils.kt b/data/src/main/java/com/moez/QKSMS/util/ImageUtils.kt
index ff74b7fd5..3dbc9bcd1 100644
--- a/data/src/main/java/com/moez/QKSMS/util/ImageUtils.kt
+++ b/data/src/main/java/com/moez/QKSMS/util/ImageUtils.kt
@@ -1,53 +1,53 @@
-/*
- * Copyright (C) 2017 Moez Bhatti <moez.bhatti@gmail.com>
- *
- * This file is part of QKSMS.
- *
- * QKSMS is free software: you can redistribute it and/or modify
- * it under the terms of the GNU General Public License as published by
- * the Free Software Foundation, either version 3 of the License, or
- * (at your option) any later version.
- *
- * QKSMS is distributed in the hope that it will be useful,
- * but WITHOUT ANY WARRANTY; without even the implied warranty of
- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
- * GNU General Public License for more details.
- *
- * You should have received a copy of the GNU General Public License
- * along with QKSMS.  If not, see <http://www.gnu.org/licenses/>.
- */
-package com.moez.QKSMS.util
-
-import android.content.Context
-import android.net.Uri
-import java.io.ByteArrayOutputStream
-
-object ImageUtils {
-
-    fun getScaledGif(context: Context, uri: Uri, maxWidth: Int, maxHeight: Int, quality: Int = 90): ByteArray {
-        val gif = GlideApp
-                .with(context)
-                .asGif()
-                .load(uri)
-                .centerInside()
-                .encodeQuality(quality)
-                .submit(maxWidth, maxHeight)
-                .get()
-
-        val outputStream = ByteArrayOutputStream()
-        GifEncoder(context, GlideApp.get(context).bitmapPool).encodeTransformedToStream(gif, outputStream)
-        return outputStream.toByteArray()
-    }
-
-    fun getScaledImage(context: Context, uri: Uri, maxWidth: Int, maxHeight: Int, quality: Int = 90): ByteArray {
-        return GlideApp
-                .with(context)
-                .`as`(ByteArray::class.java)
-                .load(uri)
-                .centerInside()
-                .encodeQuality(quality)
-                .submit(maxWidth, maxHeight)
-                .get()
-    }
-
+/*
+ * Copyright (C) 2017 Moez Bhatti <moez.bhatti@gmail.com>
+ *
+ * This file is part of QKSMS.
+ *
+ * QKSMS is free software: you can redistribute it and/or modify
+ * it under the terms of the GNU General Public License as published by
+ * the Free Software Foundation, either version 3 of the License, or
+ * (at your option) any later version.
+ *
+ * QKSMS is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+ * GNU General Public License for more details.
+ *
+ * You should have received a copy of the GNU General Public License
+ * along with QKSMS.  If not, see <http://www.gnu.org/licenses/>.
+ */
+package com.moez.QKSMS.util
+
+import android.content.Context
+import android.net.Uri
+import java.io.ByteArrayOutputStream
+
+object ImageUtils {
+
+    fun getScaledGif(context: Context, uri: Uri, maxWidth: Int, maxHeight: Int, quality: Int = 90): ByteArray {
+        val gif = GlideApp
+                .with(context)
+                .asGif()
+                .load(uri)
+                .centerInside()
+                .encodeQuality(quality)
+                .submit(maxWidth, maxHeight)
+                .get()
+
+        val outputStream = ByteArrayOutputStream()
+        GifEncoder(context, GlideApp.get(context).bitmapPool).encodeTransformedToStream(gif, outputStream)
+        return outputStream.toByteArray()
+    }
+
+    fun getScaledImage(context: Context, uri: Uri, maxWidth: Int, maxHeight: Int, quality: Int = 90): ByteArray {
+        return GlideApp
+                .with(context)
+                .`as`(ByteArray::class.java)
+                .load(uri)
+                .centerInside()
+                .encodeQuality(quality)
+                .submit(maxWidth, maxHeight)
+                .get()
+    }
+
 }
\ No newline at end of file
diff --git a/data/src/main/java/com/moez/QKSMS/util/NightModeManager.kt b/data/src/main/java/com/moez/QKSMS/util/NightModeManager.kt
index 243bfb53c..b5cf666dd 100644
--- a/data/src/main/java/com/moez/QKSMS/util/NightModeManager.kt
+++ b/data/src/main/java/com/moez/QKSMS/util/NightModeManager.kt
@@ -1,168 +1,168 @@
-/*
- * Copyright (C) 2017 Moez Bhatti <moez.bhatti@gmail.com>
- *
- * This file is part of QKSMS.
- *
- * QKSMS is free software: you can redistribute it and/or modify
- * it under the terms of the GNU General Public License as published by
- * the Free Software Foundation, either version 3 of the License, or
- * (at your option) any later version.
- *
- * QKSMS is distributed in the hope that it will be useful,
- * but WITHOUT ANY WARRANTY; without even the implied warranty of
- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
- * GNU General Public License for more details.
- *
- * You should have received a copy of the GNU General Public License
- * along with QKSMS.  If not, see <http://www.gnu.org/licenses/>.
- */
-package com.moez.QKSMS.util
-
-import android.app.AlarmManager
-import android.app.PendingIntent
-import android.content.Context
-import android.content.Intent
-import androidx.appcompat.app.AppCompatDelegate
-import com.moez.QKSMS.manager.WidgetManager
-import com.moez.QKSMS.receiver.NightModeReceiver
-import java.text.SimpleDateFormat
-import java.util.*
-import java.util.concurrent.TimeUnit
-import javax.inject.Inject
-import javax.inject.Singleton
-
-@Singleton
-class NightModeManager @Inject constructor(
-    private val context: Context,
-    private val prefs: Preferences,
-    private val widgetManager: WidgetManager
-) {
-
-    fun updateCurrentTheme() {
-        when (prefs.nightMode.get()) {
-            Preferences.NIGHT_MODE_SYSTEM -> {
-                AppCompatDelegate.setDefaultNightMode(AppCompatDelegate.MODE_NIGHT_FOLLOW_SYSTEM)
-            }
-
-            Preferences.NIGHT_MODE_OFF -> {
-                AppCompatDelegate.setDefaultNightMode(AppCompatDelegate.MODE_NIGHT_NO)
-            }
-
-            Preferences.NIGHT_MODE_ON -> {
-                AppCompatDelegate.setDefaultNightMode(AppCompatDelegate.MODE_NIGHT_YES)
-            }
-
-            Preferences.NIGHT_MODE_AUTO -> {
-                val nightStartTime = getPreviousInstanceOfTime(prefs.nightStart.get())
-                val nightEndTime = getPreviousInstanceOfTime(prefs.nightEnd.get())
-
-                // If the last nightStart was more recent than the last nightEnd, then it's night time
-                val night = nightStartTime > nightEndTime
-                prefs.night.set(night)
-                AppCompatDelegate.setDefaultNightMode(when (night) {
-                    true -> AppCompatDelegate.MODE_NIGHT_YES
-                    false -> AppCompatDelegate.MODE_NIGHT_NO
-                })
-                widgetManager.updateTheme()
-            }
-        }
-    }
-
-    fun updateNightMode(mode: Int) {
-        prefs.nightMode.set(mode)
-
-        // If it's not on auto mode, set the appropriate night mode
-        if (mode != Preferences.NIGHT_MODE_AUTO) {
-            prefs.night.set(mode == Preferences.NIGHT_MODE_ON)
-            AppCompatDelegate.setDefaultNightMode(when (mode) {
-                Preferences.NIGHT_MODE_OFF -> AppCompatDelegate.MODE_NIGHT_NO
-                Preferences.NIGHT_MODE_ON -> AppCompatDelegate.MODE_NIGHT_YES
-                Preferences.NIGHT_MODE_SYSTEM -> AppCompatDelegate.MODE_NIGHT_FOLLOW_SYSTEM
-                else -> AppCompatDelegate.MODE_NIGHT_NO
-            })
-            widgetManager.updateTheme()
-        }
-
-        updateAlarms()
-    }
-
-    fun setNightStart(hour: Int, minute: Int) {
-        prefs.nightStart.set("$hour:$minute")
-        updateAlarms()
-    }
-
-    fun setNightEnd(hour: Int, minute: Int) {
-        prefs.nightEnd.set("$hour:$minute")
-        updateAlarms()
-    }
-
-    private fun updateAlarms() {
-        val dayCalendar = createCalendar(prefs.nightEnd.get())
-        val day = Intent(context, NightModeReceiver::class.java)
-        val dayIntent = PendingIntent.getBroadcast(context, 0, day, 0)
-
-        val nightCalendar = createCalendar(prefs.nightStart.get())
-        val night = Intent(context, NightModeReceiver::class.java)
-        val nightIntent = PendingIntent.getBroadcast(context, 1, night, 0)
-
-        context.sendBroadcast(day)
-        context.sendBroadcast(night)
-
-        val alarmManager = context.getSystemService(Context.ALARM_SERVICE) as AlarmManager
-        if (prefs.nightMode.get() == Preferences.NIGHT_MODE_AUTO) {
-            alarmManager.setInexactRepeating(
-                    AlarmManager.RTC_WAKEUP,
-                    dayCalendar.timeInMillis,
-                    AlarmManager.INTERVAL_DAY,
-                    dayIntent
-            )
-            alarmManager.setInexactRepeating(
-                    AlarmManager.RTC_WAKEUP,
-                    nightCalendar.timeInMillis,
-                    AlarmManager.INTERVAL_DAY,
-                    nightIntent
-            )
-        } else {
-            alarmManager.cancel(dayIntent)
-            alarmManager.cancel(nightIntent)
-        }
-    }
-
-    private fun createCalendar(time: String): Calendar {
-        val calendar = parseTime(time)
-
-        return Calendar.getInstance().apply {
-            set(Calendar.HOUR_OF_DAY, calendar.get(Calendar.HOUR_OF_DAY))
-            set(Calendar.MINUTE, calendar.get(Calendar.MINUTE))
-        }
-    }
-
-    /**
-     * Parses the hour and minute out of the [time], which should be formatted h:mm
-     */
-    fun parseTime(time: String): Calendar {
-        return tryOrNull {
-            val parsedTime = SimpleDateFormat("H:mm", Locale.US).parse(time)
-            Calendar.getInstance().apply { this.time = parsedTime }
-        } ?: tryOrNull {
-            // Parse the legacy timestamp format (<=3.1.3)
-            val parsedTime = SimpleDateFormat("h:mm a", Locale.US).parse(time)
-            Calendar.getInstance().apply { this.time = parsedTime }
-        } ?: Calendar.getInstance().apply { set(Calendar.HOUR_OF_DAY, 18) }
-    }
-
-    /**
-     * Returns a Calendar set to the most recent occurrence of this time
-     */
-    private fun getPreviousInstanceOfTime(time: String): Calendar {
-        val currentTime = System.currentTimeMillis() + TimeUnit.MINUTES.toMillis(10)
-        val calendar = createCalendar(time)
-
-        while (calendar.timeInMillis > currentTime) {
-            calendar.add(Calendar.DAY_OF_YEAR, -1)
-        }
-
-        return calendar
-    }
-
+/*
+ * Copyright (C) 2017 Moez Bhatti <moez.bhatti@gmail.com>
+ *
+ * This file is part of QKSMS.
+ *
+ * QKSMS is free software: you can redistribute it and/or modify
+ * it under the terms of the GNU General Public License as published by
+ * the Free Software Foundation, either version 3 of the License, or
+ * (at your option) any later version.
+ *
+ * QKSMS is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+ * GNU General Public License for more details.
+ *
+ * You should have received a copy of the GNU General Public License
+ * along with QKSMS.  If not, see <http://www.gnu.org/licenses/>.
+ */
+package com.moez.QKSMS.util
+
+import android.app.AlarmManager
+import android.app.PendingIntent
+import android.content.Context
+import android.content.Intent
+import androidx.appcompat.app.AppCompatDelegate
+import com.moez.QKSMS.manager.WidgetManager
+import com.moez.QKSMS.receiver.NightModeReceiver
+import java.text.SimpleDateFormat
+import java.util.*
+import java.util.concurrent.TimeUnit
+import javax.inject.Inject
+import javax.inject.Singleton
+
+@Singleton
+class NightModeManager @Inject constructor(
+    private val context: Context,
+    private val prefs: Preferences,
+    private val widgetManager: WidgetManager
+) {
+
+    fun updateCurrentTheme() {
+        when (prefs.nightMode.get()) {
+            Preferences.NIGHT_MODE_SYSTEM -> {
+                AppCompatDelegate.setDefaultNightMode(AppCompatDelegate.MODE_NIGHT_FOLLOW_SYSTEM)
+            }
+
+            Preferences.NIGHT_MODE_OFF -> {
+                AppCompatDelegate.setDefaultNightMode(AppCompatDelegate.MODE_NIGHT_NO)
+            }
+
+            Preferences.NIGHT_MODE_ON -> {
+                AppCompatDelegate.setDefaultNightMode(AppCompatDelegate.MODE_NIGHT_YES)
+            }
+
+            Preferences.NIGHT_MODE_AUTO -> {
+                val nightStartTime = getPreviousInstanceOfTime(prefs.nightStart.get())
+                val nightEndTime = getPreviousInstanceOfTime(prefs.nightEnd.get())
+
+                // If the last nightStart was more recent than the last nightEnd, then it's night time
+                val night = nightStartTime > nightEndTime
+                prefs.night.set(night)
+                AppCompatDelegate.setDefaultNightMode(when (night) {
+                    true -> AppCompatDelegate.MODE_NIGHT_YES
+                    false -> AppCompatDelegate.MODE_NIGHT_NO
+                })
+                widgetManager.updateTheme()
+            }
+        }
+    }
+
+    fun updateNightMode(mode: Int) {
+        prefs.nightMode.set(mode)
+
+        // If it's not on auto mode, set the appropriate night mode
+        if (mode != Preferences.NIGHT_MODE_AUTO) {
+            prefs.night.set(mode == Preferences.NIGHT_MODE_ON)
+            AppCompatDelegate.setDefaultNightMode(when (mode) {
+                Preferences.NIGHT_MODE_OFF -> AppCompatDelegate.MODE_NIGHT_NO
+                Preferences.NIGHT_MODE_ON -> AppCompatDelegate.MODE_NIGHT_YES
+                Preferences.NIGHT_MODE_SYSTEM -> AppCompatDelegate.MODE_NIGHT_FOLLOW_SYSTEM
+                else -> AppCompatDelegate.MODE_NIGHT_NO
+            })
+            widgetManager.updateTheme()
+        }
+
+        updateAlarms()
+    }
+
+    fun setNightStart(hour: Int, minute: Int) {
+        prefs.nightStart.set("$hour:$minute")
+        updateAlarms()
+    }
+
+    fun setNightEnd(hour: Int, minute: Int) {
+        prefs.nightEnd.set("$hour:$minute")
+        updateAlarms()
+    }
+
+    private fun updateAlarms() {
+        val dayCalendar = createCalendar(prefs.nightEnd.get())
+        val day = Intent(context, NightModeReceiver::class.java)
+        val dayIntent = PendingIntent.getBroadcast(context, 0, day, 0)
+
+        val nightCalendar = createCalendar(prefs.nightStart.get())
+        val night = Intent(context, NightModeReceiver::class.java)
+        val nightIntent = PendingIntent.getBroadcast(context, 1, night, 0)
+
+        context.sendBroadcast(day)
+        context.sendBroadcast(night)
+
+        val alarmManager = context.getSystemService(Context.ALARM_SERVICE) as AlarmManager
+        if (prefs.nightMode.get() == Preferences.NIGHT_MODE_AUTO) {
+            alarmManager.setInexactRepeating(
+                    AlarmManager.RTC_WAKEUP,
+                    dayCalendar.timeInMillis,
+                    AlarmManager.INTERVAL_DAY,
+                    dayIntent
+            )
+            alarmManager.setInexactRepeating(
+                    AlarmManager.RTC_WAKEUP,
+                    nightCalendar.timeInMillis,
+                    AlarmManager.INTERVAL_DAY,
+                    nightIntent
+            )
+        } else {
+            alarmManager.cancel(dayIntent)
+            alarmManager.cancel(nightIntent)
+        }
+    }
+
+    private fun createCalendar(time: String): Calendar {
+        val calendar = parseTime(time)
+
+        return Calendar.getInstance().apply {
+            set(Calendar.HOUR_OF_DAY, calendar.get(Calendar.HOUR_OF_DAY))
+            set(Calendar.MINUTE, calendar.get(Calendar.MINUTE))
+        }
+    }
+
+    /**
+     * Parses the hour and minute out of the [time], which should be formatted h:mm
+     */
+    fun parseTime(time: String): Calendar {
+        return tryOrNull {
+            val parsedTime = SimpleDateFormat("H:mm", Locale.US).parse(time)
+            Calendar.getInstance().apply { this.time = parsedTime }
+        } ?: tryOrNull {
+            // Parse the legacy timestamp format (<=3.1.3)
+            val parsedTime = SimpleDateFormat("h:mm a", Locale.US).parse(time)
+            Calendar.getInstance().apply { this.time = parsedTime }
+        } ?: Calendar.getInstance().apply { set(Calendar.HOUR_OF_DAY, 18) }
+    }
+
+    /**
+     * Returns a Calendar set to the most recent occurrence of this time
+     */
+    private fun getPreviousInstanceOfTime(time: String): Calendar {
+        val currentTime = System.currentTimeMillis() + TimeUnit.MINUTES.toMillis(10)
+        val calendar = createCalendar(time)
+
+        while (calendar.timeInMillis > currentTime) {
+            calendar.add(Calendar.DAY_OF_YEAR, -1)
+        }
+
+        return calendar
+    }
+
 }
\ No newline at end of file
diff --git a/data/src/main/java/com/moez/QKSMS/util/PhoneNumberUtils.kt b/data/src/main/java/com/moez/QKSMS/util/PhoneNumberUtils.kt
index 9885fc7aa..bf76f9e81 100644
--- a/data/src/main/java/com/moez/QKSMS/util/PhoneNumberUtils.kt
+++ b/data/src/main/java/com/moez/QKSMS/util/PhoneNumberUtils.kt
@@ -1,77 +1,77 @@
-/*
- * Copyright (C) 2019 Moez Bhatti <moez.bhatti@gmail.com>
- *
- * This file is part of QKSMS.
- *
- * QKSMS is free software: you can redistribute it and/or modify
- * it under the terms of the GNU General Public License as published by
- * the Free Software Foundation, either version 3 of the License, or
- * (at your option) any later version.
- *
- * QKSMS is distributed in the hope that it will be useful,
- * but WITHOUT ANY WARRANTY; without even the implied warranty of
- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
- * GNU General Public License for more details.
- *
- * You should have received a copy of the GNU General Public License
- * along with QKSMS.  If not, see <http://www.gnu.org/licenses/>.
- */
-package com.moez.QKSMS.util
-
-import android.content.Context
-import android.telephony.PhoneNumberUtils
-import io.michaelrocks.libphonenumber.android.PhoneNumberUtil
-import io.michaelrocks.libphonenumber.android.Phonenumber
-import java.util.*
-import javax.inject.Inject
-import javax.inject.Singleton
-
-@Singleton
-class PhoneNumberUtils @Inject constructor(context: Context) {
-
-    private val countryCode = Locale.getDefault().country
-    private val phoneNumberUtil = PhoneNumberUtil.createInstance(context)
-
-    /**
-     * Android's implementation is too loose and causes false positives
-     * libphonenumber is stricter but too slow
-     *
-     * This method will run successfully stricter checks without compromising much speed
-     */
-    fun compare(first: String, second: String): Boolean {
-        if (first.equals(second, true)) {
-            return true
-        }
-
-        if (PhoneNumberUtils.compare(first, second)) {
-            val matchType = phoneNumberUtil.isNumberMatch(first, second)
-            if (matchType >= PhoneNumberUtil.MatchType.SHORT_NSN_MATCH) {
-                return true
-            }
-        }
-
-        return false
-    }
-
-    fun isPossibleNumber(number: CharSequence): Boolean {
-        return parse(number) != null
-    }
-
-    fun isReallyDialable(digit: Char): Boolean {
-        return PhoneNumberUtils.isReallyDialable(digit)
-    }
-
-    fun formatNumber(number: CharSequence): String {
-        // PhoneNumberUtil doesn't maintain country code input
-        return PhoneNumberUtils.formatNumber(number.toString(), countryCode) ?: number.toString()
-    }
-
-    fun normalizeNumber(number: String): String {
-        return PhoneNumberUtils.stripSeparators(number)
-    }
-
-    private fun parse(number: CharSequence): Phonenumber.PhoneNumber? {
-        return tryOrNull(false) { phoneNumberUtil.parse(number, countryCode) }
-    }
-
-}
+/*
+ * Copyright (C) 2019 Moez Bhatti <moez.bhatti@gmail.com>
+ *
+ * This file is part of QKSMS.
+ *
+ * QKSMS is free software: you can redistribute it and/or modify
+ * it under the terms of the GNU General Public License as published by
+ * the Free Software Foundation, either version 3 of the License, or
+ * (at your option) any later version.
+ *
+ * QKSMS is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+ * GNU General Public License for more details.
+ *
+ * You should have received a copy of the GNU General Public License
+ * along with QKSMS.  If not, see <http://www.gnu.org/licenses/>.
+ */
+package com.moez.QKSMS.util
+
+import android.content.Context
+import android.telephony.PhoneNumberUtils
+import io.michaelrocks.libphonenumber.android.PhoneNumberUtil
+import io.michaelrocks.libphonenumber.android.Phonenumber
+import java.util.*
+import javax.inject.Inject
+import javax.inject.Singleton
+
+@Singleton
+class PhoneNumberUtils @Inject constructor(context: Context) {
+
+    private val countryCode = Locale.getDefault().country
+    private val phoneNumberUtil = PhoneNumberUtil.createInstance(context)
+
+    /**
+     * Android's implementation is too loose and causes false positives
+     * libphonenumber is stricter but too slow
+     *
+     * This method will run successfully stricter checks without compromising much speed
+     */
+    fun compare(first: String, second: String): Boolean {
+        if (first.equals(second, true)) {
+            return true
+        }
+
+        if (PhoneNumberUtils.compare(first, second)) {
+            val matchType = phoneNumberUtil.isNumberMatch(first, second)
+            if (matchType >= PhoneNumberUtil.MatchType.SHORT_NSN_MATCH) {
+                return true
+            }
+        }
+
+        return false
+    }
+
+    fun isPossibleNumber(number: CharSequence): Boolean {
+        return parse(number) != null
+    }
+
+    fun isReallyDialable(digit: Char): Boolean {
+        return PhoneNumberUtils.isReallyDialable(digit)
+    }
+
+    fun formatNumber(number: CharSequence): String {
+        // PhoneNumberUtil doesn't maintain country code input
+        return PhoneNumberUtils.formatNumber(number.toString(), countryCode) ?: number.toString()
+    }
+
+    fun normalizeNumber(number: String): String {
+        return PhoneNumberUtils.stripSeparators(number)
+    }
+
+    private fun parse(number: CharSequence): Phonenumber.PhoneNumber? {
+        return tryOrNull(false) { phoneNumberUtil.parse(number, countryCode) }
+    }
+
+}
diff --git a/data/src/main/java/com/moez/QKSMS/util/QkFileObserver.kt b/data/src/main/java/com/moez/QKSMS/util/QkFileObserver.kt
index f1f728092..0c4baaf3b 100644
--- a/data/src/main/java/com/moez/QKSMS/util/QkFileObserver.kt
+++ b/data/src/main/java/com/moez/QKSMS/util/QkFileObserver.kt
@@ -1,44 +1,44 @@
-/*
- * Copyright (C) 2017 Moez Bhatti <moez.bhatti@gmail.com>
- *
- * This file is part of QKSMS.
- *
- * QKSMS is free software: you can redistribute it and/or modify
- * it under the terms of the GNU General Public License as published by
- * the Free Software Foundation, either version 3 of the License, or
- * (at your option) any later version.
- *
- * QKSMS is distributed in the hope that it will be useful,
- * but WITHOUT ANY WARRANTY; without even the implied warranty of
- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
- * GNU General Public License for more details.
- *
- * You should have received a copy of the GNU General Public License
- * along with QKSMS.  If not, see <http://www.gnu.org/licenses/>.
- */
-package com.moez.QKSMS.util
-
-import android.os.FileObserver
-import io.reactivex.Observable
-import io.reactivex.subjects.BehaviorSubject
-import java.io.File
-
-class QkFileObserver(path: String) : FileObserver(path, CREATE or DELETE or MODIFY) {
-
-    private val subject = BehaviorSubject.createDefault<String>(path).toSerialized()
-
-    val observable: Observable<String> = subject
-            .doOnSubscribe { startWatching() }
-            .doOnDispose { stopWatching() }
-            .share()
-
-    init {
-        // Make sure that the directory exists
-        tryOrNull { File(path).mkdirs() }
-    }
-
-    override fun onEvent(event: Int, path: String?) {
-        path?.let(subject::onNext)
-    }
-
+/*
+ * Copyright (C) 2017 Moez Bhatti <moez.bhatti@gmail.com>
+ *
+ * This file is part of QKSMS.
+ *
+ * QKSMS is free software: you can redistribute it and/or modify
+ * it under the terms of the GNU General Public License as published by
+ * the Free Software Foundation, either version 3 of the License, or
+ * (at your option) any later version.
+ *
+ * QKSMS is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+ * GNU General Public License for more details.
+ *
+ * You should have received a copy of the GNU General Public License
+ * along with QKSMS.  If not, see <http://www.gnu.org/licenses/>.
+ */
+package com.moez.QKSMS.util
+
+import android.os.FileObserver
+import io.reactivex.Observable
+import io.reactivex.subjects.BehaviorSubject
+import java.io.File
+
+class QkFileObserver(path: String) : FileObserver(path, CREATE or DELETE or MODIFY) {
+
+    private val subject = BehaviorSubject.createDefault<String>(path).toSerialized()
+
+    val observable: Observable<String> = subject
+            .doOnSubscribe { startWatching() }
+            .doOnDispose { stopWatching() }
+            .share()
+
+    init {
+        // Make sure that the directory exists
+        tryOrNull { File(path).mkdirs() }
+    }
+
+    override fun onEvent(event: Int, path: String?) {
+        path?.let(subject::onNext)
+    }
+
 }
\ No newline at end of file
diff --git a/data/src/main/java/com/moez/QKSMS/util/SqliteWrapper.kt b/data/src/main/java/com/moez/QKSMS/util/SqliteWrapper.kt
index 73244de84..ae4378686 100644
--- a/data/src/main/java/com/moez/QKSMS/util/SqliteWrapper.kt
+++ b/data/src/main/java/com/moez/QKSMS/util/SqliteWrapper.kt
@@ -1,52 +1,52 @@
-/*
- * Copyright (C) 2017 Moez Bhatti <moez.bhatti@gmail.com>
- *
- * This file is part of QKSMS.
- *
- * QKSMS is free software: you can redistribute it and/or modify
- * it under the terms of the GNU General Public License as published by
- * the Free Software Foundation, either version 3 of the License, or
- * (at your option) any later version.
- *
- * QKSMS is distributed in the hope that it will be useful,
- * but WITHOUT ANY WARRANTY; without even the implied warranty of
- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
- * GNU General Public License for more details.
- *
- * You should have received a copy of the GNU General Public License
- * along with QKSMS.  If not, see <http://www.gnu.org/licenses/>.
- */
-package com.moez.QKSMS.util
-
-import android.content.Context
-import android.database.Cursor
-import android.database.sqlite.SQLiteException
-import android.net.Uri
-import timber.log.Timber
-
-/**
- * Utility class to make ContentResolver queries with Kotlin more concise
- */
-object SqliteWrapper {
-
-    fun query(
-        context: Context,
-        uri: Uri,
-        projection: Array<String>? = null,
-        selection: String? = null,
-        selectionArgs: Array<String>? = null,
-        sortOrder: String? = null,
-        logError: Boolean = true
-    ): Cursor? {
-        return try {
-            context.contentResolver.query(uri, projection, selection, selectionArgs, sortOrder)
-        } catch (e: SQLiteException) {
-            if (logError) {
-                Timber.e(e)
-            }
-            null
-        }
-
-    }
-
+/*
+ * Copyright (C) 2017 Moez Bhatti <moez.bhatti@gmail.com>
+ *
+ * This file is part of QKSMS.
+ *
+ * QKSMS is free software: you can redistribute it and/or modify
+ * it under the terms of the GNU General Public License as published by
+ * the Free Software Foundation, either version 3 of the License, or
+ * (at your option) any later version.
+ *
+ * QKSMS is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+ * GNU General Public License for more details.
+ *
+ * You should have received a copy of the GNU General Public License
+ * along with QKSMS.  If not, see <http://www.gnu.org/licenses/>.
+ */
+package com.moez.QKSMS.util
+
+import android.content.Context
+import android.database.Cursor
+import android.database.sqlite.SQLiteException
+import android.net.Uri
+import timber.log.Timber
+
+/**
+ * Utility class to make ContentResolver queries with Kotlin more concise
+ */
+object SqliteWrapper {
+
+    fun query(
+        context: Context,
+        uri: Uri,
+        projection: Array<String>? = null,
+        selection: String? = null,
+        selectionArgs: Array<String>? = null,
+        sortOrder: String? = null,
+        logError: Boolean = true
+    ): Cursor? {
+        return try {
+            context.contentResolver.query(uri, projection, selection, selectionArgs, sortOrder)
+        } catch (e: SQLiteException) {
+            if (logError) {
+                Timber.e(e)
+            }
+            null
+        }
+
+    }
+
 }
\ No newline at end of file
diff --git a/data/src/noAnalytics/java/com/moez/QKSMS/manager/AnalyticsManagerImpl.kt b/data/src/noAnalytics/java/com/moez/QKSMS/manager/AnalyticsManagerImpl.kt
index 772c3ea31..db55e4123 100644
--- a/data/src/noAnalytics/java/com/moez/QKSMS/manager/AnalyticsManagerImpl.kt
+++ b/data/src/noAnalytics/java/com/moez/QKSMS/manager/AnalyticsManagerImpl.kt
@@ -1,42 +1,42 @@
-/*
- * Copyright (C) 2017 Moez Bhatti <moez.bhatti@gmail.com>
- *
- * This file is part of QKSMS.
- *
- * QKSMS is free software: you can redistribute it and/or modify
- * it under the terms of the GNU General Public License as published by
- * the Free Software Foundation, either version 3 of the License, or
- * (at your option) any later version.
- *
- * QKSMS is distributed in the hope that it will be useful,
- * but WITHOUT ANY WARRANTY; without even the implied warranty of
- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
- * GNU General Public License for more details.
- *
- * You should have received a copy of the GNU General Public License
- * along with QKSMS.  If not, see <http://www.gnu.org/licenses/>.
- */
-package com.moez.QKSMS.manager
-
-import org.json.JSONObject
-import timber.log.Timber
-import javax.inject.Inject
-import javax.inject.Singleton
-
-@Singleton
-class AnalyticsManagerImpl @Inject constructor() : AnalyticsManager {
-
-    override fun track(event: String, vararg properties: Pair<String, Any>) {
-
-        // Log the event, but don't do anything else
-        JSONObject(properties
-                .associateBy { pair -> pair.first }
-                .mapValues { pair -> pair.value.second })
-                .also { Timber.v("$event: $it") }
-    }
-
-    override fun setUserProperty(key: String, value: Any) {
-        Timber.v("$key: $value")
-    }
-
-}
+/*
+ * Copyright (C) 2017 Moez Bhatti <moez.bhatti@gmail.com>
+ *
+ * This file is part of QKSMS.
+ *
+ * QKSMS is free software: you can redistribute it and/or modify
+ * it under the terms of the GNU General Public License as published by
+ * the Free Software Foundation, either version 3 of the License, or
+ * (at your option) any later version.
+ *
+ * QKSMS is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+ * GNU General Public License for more details.
+ *
+ * You should have received a copy of the GNU General Public License
+ * along with QKSMS.  If not, see <http://www.gnu.org/licenses/>.
+ */
+package com.moez.QKSMS.manager
+
+import org.json.JSONObject
+import timber.log.Timber
+import javax.inject.Inject
+import javax.inject.Singleton
+
+@Singleton
+class AnalyticsManagerImpl @Inject constructor() : AnalyticsManager {
+
+    override fun track(event: String, vararg properties: Pair<String, Any>) {
+
+        // Log the event, but don't do anything else
+        JSONObject(properties
+                .associateBy { pair -> pair.first }
+                .mapValues { pair -> pair.value.second })
+                .also { Timber.v("$event: $it") }
+    }
+
+    override fun setUserProperty(key: String, value: Any) {
+        Timber.v("$key: $value")
+    }
+
+}
diff --git a/data/src/noAnalytics/java/com/moez/QKSMS/manager/ReferralManagerImpl.kt b/data/src/noAnalytics/java/com/moez/QKSMS/manager/ReferralManagerImpl.kt
index 0f51410f5..b9ecc9803 100644
--- a/data/src/noAnalytics/java/com/moez/QKSMS/manager/ReferralManagerImpl.kt
+++ b/data/src/noAnalytics/java/com/moez/QKSMS/manager/ReferralManagerImpl.kt
@@ -1,33 +1,33 @@
-/*
- * Copyright (C) 2020 Moez Bhatti <moez.bhatti@gmail.com>
- *
- * This file is part of QKSMS.
- *
- * QKSMS is free software: you can redistribute it and/or modify
- * it under the terms of the GNU General Public License as published by
- * the Free Software Foundation, either version 3 of the License, or
- * (at your option) any later version.
- *
- * QKSMS is distributed in the hope that it will be useful,
- * but WITHOUT ANY WARRANTY; without even the implied warranty of
- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
- * GNU General Public License for more details.
- *
- * You should have received a copy of the GNU General Public License
- * along with QKSMS.  If not, see <http://www.gnu.org/licenses/>.
- */
-
-package com.moez.QKSMS.manager
-
-import android.content.Context
-import com.moez.QKSMS.util.Preferences
-import kotlinx.coroutines.suspendCancellableCoroutine
-import javax.inject.Inject
-import kotlin.coroutines.resume
-
-class ReferralManagerImpl @Inject constructor() : ReferralManager {
-
-    override suspend fun trackReferrer() {
-    }
-
-}
+/*
+ * Copyright (C) 2020 Moez Bhatti <moez.bhatti@gmail.com>
+ *
+ * This file is part of QKSMS.
+ *
+ * QKSMS is free software: you can redistribute it and/or modify
+ * it under the terms of the GNU General Public License as published by
+ * the Free Software Foundation, either version 3 of the License, or
+ * (at your option) any later version.
+ *
+ * QKSMS is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+ * GNU General Public License for more details.
+ *
+ * You should have received a copy of the GNU General Public License
+ * along with QKSMS.  If not, see <http://www.gnu.org/licenses/>.
+ */
+
+package com.moez.QKSMS.manager
+
+import android.content.Context
+import com.moez.QKSMS.util.Preferences
+import kotlinx.coroutines.suspendCancellableCoroutine
+import javax.inject.Inject
+import kotlin.coroutines.resume
+
+class ReferralManagerImpl @Inject constructor() : ReferralManager {
+
+    override suspend fun trackReferrer() {
+    }
+
+}
diff --git a/data/src/withAnalytics/java/com/moez/QKSMS/manager/AnalyticsManagerImpl.kt b/data/src/withAnalytics/java/com/moez/QKSMS/manager/AnalyticsManagerImpl.kt
index 2cc27c1c2..fad38acbd 100644
--- a/data/src/withAnalytics/java/com/moez/QKSMS/manager/AnalyticsManagerImpl.kt
+++ b/data/src/withAnalytics/java/com/moez/QKSMS/manager/AnalyticsManagerImpl.kt
@@ -1,74 +1,74 @@
-/*
- * Copyright (C) 2017 Moez Bhatti <moez.bhatti@gmail.com>
- *
- * This file is part of QKSMS.
- *
- * QKSMS is free software: you can redistribute it and/or modify
- * it under the terms of the GNU General Public License as published by
- * the Free Software Foundation, either version 3 of the License, or
- * (at your option) any later version.
- *
- * QKSMS is distributed in the hope that it will be useful,
- * but WITHOUT ANY WARRANTY; without even the implied warranty of
- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
- * GNU General Public License for more details.
- *
- * You should have received a copy of the GNU General Public License
- * along with QKSMS.  If not, see <http://www.gnu.org/licenses/>.
- */
-package com.moez.QKSMS.manager
-
-import android.content.Context
-import com.amplitude.api.Amplitude
-import com.amplitude.api.AmplitudeClient
-import com.amplitude.api.Identify
-import com.moez.QKSMS.data.BuildConfig
-import org.json.JSONArray
-import org.json.JSONObject
-import timber.log.Timber
-import javax.inject.Inject
-import javax.inject.Singleton
-
-@Singleton
-class AnalyticsManagerImpl @Inject constructor(context: Context) : AnalyticsManager {
-
-    private val amplitude: AmplitudeClient = Amplitude.getInstance().initialize(context, BuildConfig.AMPLITUDE_API_KEY)
-
-    init {
-        amplitude.trackSessionEvents(true)
-    }
-
-    override fun track(event: String, vararg properties: Pair<String, Any>) {
-        val propertiesJson = JSONObject(properties
-                .associateBy { pair -> pair.first }
-                .mapValues { pair -> pair.value.second })
-                .also { Timber.v("$event: $it") }
-
-        amplitude.logEvent(event, propertiesJson)
-    }
-
-    override fun setUserProperty(key: String, value: Any) {
-        Timber.v("$key: $value")
-
-        // Set the value in Amplitude
-        val identify = Identify()
-        when (value) {
-            is Boolean -> identify.set(key, value)
-            is BooleanArray -> identify.set(key, value)
-            is Double -> identify.set(key, value)
-            is DoubleArray -> identify.set(key, value)
-            is Float -> identify.set(key, value)
-            is FloatArray -> identify.set(key, value)
-            is Int -> identify.set(key, value)
-            is IntArray -> identify.set(key, value)
-            is Long -> identify.set(key, value)
-            is LongArray -> identify.set(key, value)
-            is String -> identify.set(key, value)
-            is JSONArray -> identify.set(key, value)
-            is JSONObject -> identify.set(key, value)
-            else -> Timber.e("Value of type ${value::class.java} not supported")
-        }
-        amplitude.identify(identify)
-    }
-
-}
+/*
+ * Copyright (C) 2017 Moez Bhatti <moez.bhatti@gmail.com>
+ *
+ * This file is part of QKSMS.
+ *
+ * QKSMS is free software: you can redistribute it and/or modify
+ * it under the terms of the GNU General Public License as published by
+ * the Free Software Foundation, either version 3 of the License, or
+ * (at your option) any later version.
+ *
+ * QKSMS is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+ * GNU General Public License for more details.
+ *
+ * You should have received a copy of the GNU General Public License
+ * along with QKSMS.  If not, see <http://www.gnu.org/licenses/>.
+ */
+package com.moez.QKSMS.manager
+
+import android.content.Context
+import com.amplitude.api.Amplitude
+import com.amplitude.api.AmplitudeClient
+import com.amplitude.api.Identify
+import com.moez.QKSMS.data.BuildConfig
+import org.json.JSONArray
+import org.json.JSONObject
+import timber.log.Timber
+import javax.inject.Inject
+import javax.inject.Singleton
+
+@Singleton
+class AnalyticsManagerImpl @Inject constructor(context: Context) : AnalyticsManager {
+
+    private val amplitude: AmplitudeClient = Amplitude.getInstance().initialize(context, BuildConfig.AMPLITUDE_API_KEY)
+
+    init {
+        amplitude.trackSessionEvents(true)
+    }
+
+    override fun track(event: String, vararg properties: Pair<String, Any>) {
+        val propertiesJson = JSONObject(properties
+                .associateBy { pair -> pair.first }
+                .mapValues { pair -> pair.value.second })
+                .also { Timber.v("$event: $it") }
+
+        amplitude.logEvent(event, propertiesJson)
+    }
+
+    override fun setUserProperty(key: String, value: Any) {
+        Timber.v("$key: $value")
+
+        // Set the value in Amplitude
+        val identify = Identify()
+        when (value) {
+            is Boolean -> identify.set(key, value)
+            is BooleanArray -> identify.set(key, value)
+            is Double -> identify.set(key, value)
+            is DoubleArray -> identify.set(key, value)
+            is Float -> identify.set(key, value)
+            is FloatArray -> identify.set(key, value)
+            is Int -> identify.set(key, value)
+            is IntArray -> identify.set(key, value)
+            is Long -> identify.set(key, value)
+            is LongArray -> identify.set(key, value)
+            is String -> identify.set(key, value)
+            is JSONArray -> identify.set(key, value)
+            is JSONObject -> identify.set(key, value)
+            else -> Timber.e("Value of type ${value::class.java} not supported")
+        }
+        amplitude.identify(identify)
+    }
+
+}
diff --git a/data/src/withAnalytics/java/com/moez/QKSMS/manager/ReferralManagerImpl.kt b/data/src/withAnalytics/java/com/moez/QKSMS/manager/ReferralManagerImpl.kt
index 32a48cc0a..b94929fb2 100644
--- a/data/src/withAnalytics/java/com/moez/QKSMS/manager/ReferralManagerImpl.kt
+++ b/data/src/withAnalytics/java/com/moez/QKSMS/manager/ReferralManagerImpl.kt
@@ -1,76 +1,76 @@
-/*
- * Copyright (C) 2020 Moez Bhatti <moez.bhatti@gmail.com>
- *
- * This file is part of QKSMS.
- *
- * QKSMS is free software: you can redistribute it and/or modify
- * it under the terms of the GNU General Public License as published by
- * the Free Software Foundation, either version 3 of the License, or
- * (at your option) any later version.
- *
- * QKSMS is distributed in the hope that it will be useful,
- * but WITHOUT ANY WARRANTY; without even the implied warranty of
- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
- * GNU General Public License for more details.
- *
- * You should have received a copy of the GNU General Public License
- * along with QKSMS.  If not, see <http://www.gnu.org/licenses/>.
- */
-
-package com.moez.QKSMS.manager
-
-import android.content.Context
-import com.android.installreferrer.api.InstallReferrerClient
-import com.android.installreferrer.api.InstallReferrerStateListener
-import com.moez.QKSMS.util.Preferences
-import kotlinx.coroutines.suspendCancellableCoroutine
-import javax.inject.Inject
-import kotlin.coroutines.resume
-
-class ReferralManagerImpl @Inject constructor(
-    private val analytics: AnalyticsManager,
-    private val context: Context,
-    private val prefs: Preferences
-) : ReferralManager {
-
-    override suspend fun trackReferrer() {
-        if (prefs.didSetReferrer.get()) {
-            return
-        }
-
-        context.packageManager.getInstallerPackageName(context.packageName)?.let { installer ->
-            analytics.setUserProperty("Installer", installer)
-        }
-
-        val referrerClient = InstallReferrerClient.newBuilder(context).build()
-        val responseCode = suspendCancellableCoroutine<Int> { cont ->
-            referrerClient.startConnection(object : InstallReferrerStateListener {
-                override fun onInstallReferrerSetupFinished(responseCode: Int) {
-                    cont.resume(responseCode)
-                }
-
-                override fun onInstallReferrerServiceDisconnected() {
-                    cont.resume(InstallReferrerClient.InstallReferrerResponse.SERVICE_DISCONNECTED)
-                }
-            })
-
-            cont.invokeOnCancellation {
-                referrerClient.endConnection()
-            }
-        }
-
-        when (responseCode) {
-            InstallReferrerClient.InstallReferrerResponse.OK -> {
-                analytics.setUserProperty("Referrer", referrerClient.installReferrer.installReferrer)
-                prefs.didSetReferrer.set(true)
-            }
-
-            InstallReferrerClient.InstallReferrerResponse.FEATURE_NOT_SUPPORTED -> {
-                prefs.didSetReferrer.set(true)
-            }
-        }
-
-        referrerClient.endConnection()
-    }
-
-}
+/*
+ * Copyright (C) 2020 Moez Bhatti <moez.bhatti@gmail.com>
+ *
+ * This file is part of QKSMS.
+ *
+ * QKSMS is free software: you can redistribute it and/or modify
+ * it under the terms of the GNU General Public License as published by
+ * the Free Software Foundation, either version 3 of the License, or
+ * (at your option) any later version.
+ *
+ * QKSMS is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+ * GNU General Public License for more details.
+ *
+ * You should have received a copy of the GNU General Public License
+ * along with QKSMS.  If not, see <http://www.gnu.org/licenses/>.
+ */
+
+package com.moez.QKSMS.manager
+
+import android.content.Context
+import com.android.installreferrer.api.InstallReferrerClient
+import com.android.installreferrer.api.InstallReferrerStateListener
+import com.moez.QKSMS.util.Preferences
+import kotlinx.coroutines.suspendCancellableCoroutine
+import javax.inject.Inject
+import kotlin.coroutines.resume
+
+class ReferralManagerImpl @Inject constructor(
+    private val analytics: AnalyticsManager,
+    private val context: Context,
+    private val prefs: Preferences
+) : ReferralManager {
+
+    override suspend fun trackReferrer() {
+        if (prefs.didSetReferrer.get()) {
+            return
+        }
+
+        context.packageManager.getInstallerPackageName(context.packageName)?.let { installer ->
+            analytics.setUserProperty("Installer", installer)
+        }
+
+        val referrerClient = InstallReferrerClient.newBuilder(context).build()
+        val responseCode = suspendCancellableCoroutine<Int> { cont ->
+            referrerClient.startConnection(object : InstallReferrerStateListener {
+                override fun onInstallReferrerSetupFinished(responseCode: Int) {
+                    cont.resume(responseCode)
+                }
+
+                override fun onInstallReferrerServiceDisconnected() {
+                    cont.resume(InstallReferrerClient.InstallReferrerResponse.SERVICE_DISCONNECTED)
+                }
+            })
+
+            cont.invokeOnCancellation {
+                referrerClient.endConnection()
+            }
+        }
+
+        when (responseCode) {
+            InstallReferrerClient.InstallReferrerResponse.OK -> {
+                analytics.setUserProperty("Referrer", referrerClient.installReferrer.installReferrer)
+                prefs.didSetReferrer.set(true)
+            }
+
+            InstallReferrerClient.InstallReferrerResponse.FEATURE_NOT_SUPPORTED -> {
+                prefs.didSetReferrer.set(true)
+            }
+        }
+
+        referrerClient.endConnection()
+    }
+
+}
diff --git a/domain/build.gradle b/domain/build.gradle
index 85a69fd8d..aa270dc4b 100644
--- a/domain/build.gradle
+++ b/domain/build.gradle
@@ -1,69 +1,69 @@
-/*
- * Copyright (C) 2017 Moez Bhatti <moez.bhatti@gmail.com>
- *
- * This file is part of QKSMS.
- *
- * QKSMS is free software: you can redistribute it and/or modify
- * it under the terms of the GNU General Public License as published by
- * the Free Software Foundation, either version 3 of the License, or
- * (at your option) any later version.
- *
- * QKSMS is distributed in the hope that it will be useful,
- * but WITHOUT ANY WARRANTY; without even the implied warranty of
- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
- * GNU General Public License for more details.
- *
- * You should have received a copy of the GNU General Public License
- * along with QKSMS.  If not, see <http://www.gnu.org/licenses/>.
- */
-apply plugin: 'com.android.library'
-apply plugin: 'realm-android' // Realm needs to be before Kotlin or the build will fail
-apply plugin: 'kotlin-android'
-apply plugin: 'kotlin-android-extensions'
-apply plugin: 'kotlin-kapt'
-
-android {
-    compileSdkVersion 29
-
-    compileOptions {
-        sourceCompatibility 1.8
-        targetCompatibility 1.8
-    }
-
-    defaultConfig {
-        minSdkVersion 21
-        targetSdkVersion 29
-    }
-}
-
-dependencies {
-
-    // dagger
-    implementation "com.google.dagger:dagger:$dagger_version"
-    kapt "com.google.dagger:dagger-compiler:$dagger_version"
-    compileOnly "javax.annotation:jsr250-api:1.0"
-
-    // realm
-    kapt "io.realm:realm-annotations:$realm_version"
-    kapt "io.realm:realm-annotations-processor:$realm_version"
-
-    // rxjava
-    implementation "io.reactivex.rxjava2:rxandroid:$rxandroid_version"
-    implementation "io.reactivex.rxjava2:rxjava:$rxjava_version"
-    implementation "io.reactivex.rxjava2:rxkotlin:$rxkotlin_version"
-
-    // coroutines
-    implementation "org.jetbrains.kotlinx:kotlinx-coroutines-core:$coroutines_version"
-    implementation "org.jetbrains.kotlinx:kotlinx-coroutines-rx2:$coroutines_version"
-    implementation "org.jetbrains.kotlinx:kotlinx-coroutines-reactive:$coroutines_version"
-
-    implementation "androidx.core:core-ktx:$androidx_core_version"
-    implementation "com.f2prateek.rx.preferences2:rx-preferences:$rx_preferences_version"
-    implementation "com.jakewharton.timber:timber:$timber_version"
-    implementation "org.jetbrains.kotlin:kotlin-stdlib:$kotlin_version"
-    implementation project(":common")
-}
-
-repositories {
-    mavenCentral()
-}
+/*
+ * Copyright (C) 2017 Moez Bhatti <moez.bhatti@gmail.com>
+ *
+ * This file is part of QKSMS.
+ *
+ * QKSMS is free software: you can redistribute it and/or modify
+ * it under the terms of the GNU General Public License as published by
+ * the Free Software Foundation, either version 3 of the License, or
+ * (at your option) any later version.
+ *
+ * QKSMS is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+ * GNU General Public License for more details.
+ *
+ * You should have received a copy of the GNU General Public License
+ * along with QKSMS.  If not, see <http://www.gnu.org/licenses/>.
+ */
+apply plugin: 'com.android.library'
+apply plugin: 'realm-android' // Realm needs to be before Kotlin or the build will fail
+apply plugin: 'kotlin-android'
+apply plugin: 'kotlin-android-extensions'
+apply plugin: 'kotlin-kapt'
+
+android {
+    compileSdkVersion 29
+
+    compileOptions {
+        sourceCompatibility 1.8
+        targetCompatibility 1.8
+    }
+
+    defaultConfig {
+        minSdkVersion 21
+        targetSdkVersion 29
+    }
+}
+
+dependencies {
+
+    // dagger
+    implementation "com.google.dagger:dagger:$dagger_version"
+    kapt "com.google.dagger:dagger-compiler:$dagger_version"
+    compileOnly "javax.annotation:jsr250-api:1.0"
+
+    // realm
+    kapt "io.realm:realm-annotations:$realm_version"
+    kapt "io.realm:realm-annotations-processor:$realm_version"
+
+    // rxjava
+    implementation "io.reactivex.rxjava2:rxandroid:$rxandroid_version"
+    implementation "io.reactivex.rxjava2:rxjava:$rxjava_version"
+    implementation "io.reactivex.rxjava2:rxkotlin:$rxkotlin_version"
+
+    // coroutines
+    implementation "org.jetbrains.kotlinx:kotlinx-coroutines-core:$coroutines_version"
+    implementation "org.jetbrains.kotlinx:kotlinx-coroutines-rx2:$coroutines_version"
+    implementation "org.jetbrains.kotlinx:kotlinx-coroutines-reactive:$coroutines_version"
+
+    implementation "androidx.core:core-ktx:$androidx_core_version"
+    implementation "com.f2prateek.rx.preferences2:rx-preferences:$rx_preferences_version"
+    implementation "com.jakewharton.timber:timber:$timber_version"
+    implementation "org.jetbrains.kotlin:kotlin-stdlib:$kotlin_version"
+    implementation project(":common")
+}
+
+repositories {
+    mavenCentral()
+}
diff --git a/domain/src/main/AndroidManifest.xml b/domain/src/main/AndroidManifest.xml
index 00485b51a..ff8a22a1a 100644
--- a/domain/src/main/AndroidManifest.xml
+++ b/domain/src/main/AndroidManifest.xml
@@ -1,19 +1,19 @@
-<!--
-  ~ Copyright (C) 2017 Moez Bhatti <moez.bhatti@gmail.com>
-  ~
-  ~ This file is part of QKSMS.
-  ~
-  ~ QKSMS is free software: you can redistribute it and/or modify
-  ~ it under the terms of the GNU General Public License as published by
-  ~ the Free Software Foundation, either version 3 of the License, or
-  ~ (at your option) any later version.
-  ~
-  ~ QKSMS is distributed in the hope that it will be useful,
-  ~ but WITHOUT ANY WARRANTY; without even the implied warranty of
-  ~ MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
-  ~ GNU General Public License for more details.
-  ~
-  ~ You should have received a copy of the GNU General Public License
-  ~ along with QKSMS.  If not, see <http://www.gnu.org/licenses/>.
-  -->
-<manifest package="com.moez.QKSMS.domain" />
+<!--
+  ~ Copyright (C) 2017 Moez Bhatti <moez.bhatti@gmail.com>
+  ~
+  ~ This file is part of QKSMS.
+  ~
+  ~ QKSMS is free software: you can redistribute it and/or modify
+  ~ it under the terms of the GNU General Public License as published by
+  ~ the Free Software Foundation, either version 3 of the License, or
+  ~ (at your option) any later version.
+  ~
+  ~ QKSMS is distributed in the hope that it will be useful,
+  ~ but WITHOUT ANY WARRANTY; without even the implied warranty of
+  ~ MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+  ~ GNU General Public License for more details.
+  ~
+  ~ You should have received a copy of the GNU General Public License
+  ~ along with QKSMS.  If not, see <http://www.gnu.org/licenses/>.
+  -->
+<manifest package="com.moez.QKSMS.domain" />
diff --git a/domain/src/main/java/com/moez/QKSMS/blocking/BlockingClient.kt b/domain/src/main/java/com/moez/QKSMS/blocking/BlockingClient.kt
index 97534f8f8..94429ccde 100644
--- a/domain/src/main/java/com/moez/QKSMS/blocking/BlockingClient.kt
+++ b/domain/src/main/java/com/moez/QKSMS/blocking/BlockingClient.kt
@@ -1,72 +1,72 @@
-/*
- * Copyright (C) 2017 Moez Bhatti <moez.bhatti@gmail.com>
- *
- * This file is part of QKSMS.
- *
- * QKSMS is free software: you can redistribute it and/or modify
- * it under the terms of the GNU General Public License as published by
- * the Free Software Foundation, either version 3 of the License, or
- * (at your option) any later version.
- *
- * QKSMS is distributed in the hope that it will be useful,
- * but WITHOUT ANY WARRANTY; without even the implied warranty of
- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
- * GNU General Public License for more details.
- *
- * You should have received a copy of the GNU General Public License
- * along with QKSMS.  If not, see <http://www.gnu.org/licenses/>.
- */
-package com.moez.QKSMS.blocking
-
-import io.reactivex.Completable
-import io.reactivex.Single
-
-interface BlockingClient {
-
-    enum class Capability {
-        BLOCK_WITHOUT_PERMISSION,
-        BLOCK_WITH_PERMISSION ,
-        CANT_BLOCK
-    }
-
-    sealed class Action {
-        class Block(val reason: String? = null) : Action()
-        object Unblock : Action()
-
-        // We only need these for Should I Answer, because they don't allow us to block numbers in their app directly.
-        // This means there's a good chance that if a number is blocked in QK, it won't be blocked there, so we
-        // shouldn't unblock the conversation in that case
-        object DoNothing : Action()
-    }
-
-    /**
-     * Returns true if the target blocking client is available for use, ie. it is installed
-     */
-    fun isAvailable(): Boolean
-
-    /**
-     * Returns the level of access that the given blocking client provides to QKSMS
-     */
-    fun getClientCapability(): Capability
-
-    /**
-     * Returns the recommendation action to perform given a message from the [address]
-     */
-    fun getAction(address: String): Single<Action>
-
-    /**
-     * Blocks the numbers or opens the manager
-     */
-    fun block(addresses: List<String>): Completable
-
-    /**
-     * Unblocks the numbers or opens the manager
-     */
-    fun unblock(addresses: List<String>): Completable
-
-    /**
-     * Opens the settings page for the blocking manager
-     */
-    fun openSettings()
-
-}
+/*
+ * Copyright (C) 2017 Moez Bhatti <moez.bhatti@gmail.com>
+ *
+ * This file is part of QKSMS.
+ *
+ * QKSMS is free software: you can redistribute it and/or modify
+ * it under the terms of the GNU General Public License as published by
+ * the Free Software Foundation, either version 3 of the License, or
+ * (at your option) any later version.
+ *
+ * QKSMS is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+ * GNU General Public License for more details.
+ *
+ * You should have received a copy of the GNU General Public License
+ * along with QKSMS.  If not, see <http://www.gnu.org/licenses/>.
+ */
+package com.moez.QKSMS.blocking
+
+import io.reactivex.Completable
+import io.reactivex.Single
+
+interface BlockingClient {
+
+    enum class Capability {
+        BLOCK_WITHOUT_PERMISSION,
+        BLOCK_WITH_PERMISSION ,
+        CANT_BLOCK
+    }
+
+    sealed class Action {
+        class Block(val reason: String? = null) : Action()
+        object Unblock : Action()
+
+        // We only need these for Should I Answer, because they don't allow us to block numbers in their app directly.
+        // This means there's a good chance that if a number is blocked in QK, it won't be blocked there, so we
+        // shouldn't unblock the conversation in that case
+        object DoNothing : Action()
+    }
+
+    /**
+     * Returns true if the target blocking client is available for use, ie. it is installed
+     */
+    fun isAvailable(): Boolean
+
+    /**
+     * Returns the level of access that the given blocking client provides to QKSMS
+     */
+    fun getClientCapability(): Capability
+
+    /**
+     * Returns the recommendation action to perform given a message from the [address]
+     */
+    fun getAction(address: String): Single<Action>
+
+    /**
+     * Blocks the numbers or opens the manager
+     */
+    fun block(addresses: List<String>): Completable
+
+    /**
+     * Unblocks the numbers or opens the manager
+     */
+    fun unblock(addresses: List<String>): Completable
+
+    /**
+     * Opens the settings page for the blocking manager
+     */
+    fun openSettings()
+
+}
diff --git a/domain/src/main/java/com/moez/QKSMS/experiment/Experiment.kt b/domain/src/main/java/com/moez/QKSMS/experiment/Experiment.kt
index da5785fd7..f7ae06d9a 100644
--- a/domain/src/main/java/com/moez/QKSMS/experiment/Experiment.kt
+++ b/domain/src/main/java/com/moez/QKSMS/experiment/Experiment.kt
@@ -1,58 +1,58 @@
-/*
- * Copyright (C) 2017 Moez Bhatti <moez.bhatti@gmail.com>
- *
- * This file is part of QKSMS.
- *
- * QKSMS is free software: you can redistribute it and/or modify
- * it under the terms of the GNU General Public License as published by
- * the Free Software Foundation, either version 3 of the License, or
- * (at your option) any later version.
- *
- * QKSMS is distributed in the hope that it will be useful,
- * but WITHOUT ANY WARRANTY; without even the implied warranty of
- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
- * GNU General Public License for more details.
- *
- * You should have received a copy of the GNU General Public License
- * along with QKSMS.  If not, see <http://www.gnu.org/licenses/>.
- */
-package com.moez.QKSMS.experiment
-
-import android.content.Context
-import android.preference.PreferenceManager
-import com.moez.QKSMS.manager.AnalyticsManager
-import java.util.*
-
-abstract class Experiment<T>(val context: Context, val analytics: AnalyticsManager) {
-
-    private val prefs by lazy { PreferenceManager.getDefaultSharedPreferences(context) }
-    private val prefKey: String
-        get() = "experiment_$key"
-
-    protected abstract val key: String
-    protected abstract val variants: List<Variant<T>>
-    protected abstract val default: T
-
-    /**
-     * Returns true if the current device qualifies for the experiment
-     */
-    protected open val qualifies: Boolean by lazy { Locale.getDefault().language.startsWith("en") }
-
-    val variant: T by lazy {
-        when {
-            !qualifies -> null // Device doesn't quality for experiment
-
-            prefs.contains(prefKey) -> { // Variant already set
-                variants.firstOrNull { it.key == prefs.getString(prefKey, null) }?.value
-            }
-
-            else -> { // Variant hasn't been set yet
-                variants[Random().nextInt(variants.size)].also { variant ->
-                    analytics.setUserProperty("Experiment: $key", variant.key)
-                    prefs.edit().putString(prefKey, variant.key).apply()
-                }.value
-            }
-        } ?: default
-    }
-
+/*
+ * Copyright (C) 2017 Moez Bhatti <moez.bhatti@gmail.com>
+ *
+ * This file is part of QKSMS.
+ *
+ * QKSMS is free software: you can redistribute it and/or modify
+ * it under the terms of the GNU General Public License as published by
+ * the Free Software Foundation, either version 3 of the License, or
+ * (at your option) any later version.
+ *
+ * QKSMS is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+ * GNU General Public License for more details.
+ *
+ * You should have received a copy of the GNU General Public License
+ * along with QKSMS.  If not, see <http://www.gnu.org/licenses/>.
+ */
+package com.moez.QKSMS.experiment
+
+import android.content.Context
+import android.preference.PreferenceManager
+import com.moez.QKSMS.manager.AnalyticsManager
+import java.util.*
+
+abstract class Experiment<T>(val context: Context, val analytics: AnalyticsManager) {
+
+    private val prefs by lazy { PreferenceManager.getDefaultSharedPreferences(context) }
+    private val prefKey: String
+        get() = "experiment_$key"
+
+    protected abstract val key: String
+    protected abstract val variants: List<Variant<T>>
+    protected abstract val default: T
+
+    /**
+     * Returns true if the current device qualifies for the experiment
+     */
+    protected open val qualifies: Boolean by lazy { Locale.getDefault().language.startsWith("en") }
+
+    val variant: T by lazy {
+        when {
+            !qualifies -> null // Device doesn't quality for experiment
+
+            prefs.contains(prefKey) -> { // Variant already set
+                variants.firstOrNull { it.key == prefs.getString(prefKey, null) }?.value
+            }
+
+            else -> { // Variant hasn't been set yet
+                variants[Random().nextInt(variants.size)].also { variant ->
+                    analytics.setUserProperty("Experiment: $key", variant.key)
+                    prefs.edit().putString(prefKey, variant.key).apply()
+                }.value
+            }
+        } ?: default
+    }
+
 }
\ No newline at end of file
diff --git a/domain/src/main/java/com/moez/QKSMS/experiment/Variant.kt b/domain/src/main/java/com/moez/QKSMS/experiment/Variant.kt
index 0d7d5df69..caae872a0 100644
--- a/domain/src/main/java/com/moez/QKSMS/experiment/Variant.kt
+++ b/domain/src/main/java/com/moez/QKSMS/experiment/Variant.kt
@@ -1,21 +1,21 @@
-/*
- * Copyright (C) 2017 Moez Bhatti <moez.bhatti@gmail.com>
- *
- * This file is part of QKSMS.
- *
- * QKSMS is free software: you can redistribute it and/or modify
- * it under the terms of the GNU General Public License as published by
- * the Free Software Foundation, either version 3 of the License, or
- * (at your option) any later version.
- *
- * QKSMS is distributed in the hope that it will be useful,
- * but WITHOUT ANY WARRANTY; without even the implied warranty of
- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
- * GNU General Public License for more details.
- *
- * You should have received a copy of the GNU General Public License
- * along with QKSMS.  If not, see <http://www.gnu.org/licenses/>.
- */
-package com.moez.QKSMS.experiment
-
+/*
+ * Copyright (C) 2017 Moez Bhatti <moez.bhatti@gmail.com>
+ *
+ * This file is part of QKSMS.
+ *
+ * QKSMS is free software: you can redistribute it and/or modify
+ * it under the terms of the GNU General Public License as published by
+ * the Free Software Foundation, either version 3 of the License, or
+ * (at your option) any later version.
+ *
+ * QKSMS is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+ * GNU General Public License for more details.
+ *
+ * You should have received a copy of the GNU General Public License
+ * along with QKSMS.  If not, see <http://www.gnu.org/licenses/>.
+ */
+package com.moez.QKSMS.experiment
+
 data class Variant<T>(val key: String, val value: T)
\ No newline at end of file
diff --git a/domain/src/main/java/com/moez/QKSMS/extensions/RxExtensions.kt b/domain/src/main/java/com/moez/QKSMS/extensions/RxExtensions.kt
index a5e1a49d4..461ff145d 100644
--- a/domain/src/main/java/com/moez/QKSMS/extensions/RxExtensions.kt
+++ b/domain/src/main/java/com/moez/QKSMS/extensions/RxExtensions.kt
@@ -1,37 +1,37 @@
-/*
- * Copyright (C) 2017 Moez Bhatti <moez.bhatti@gmail.com>
- *
- * This file is part of QKSMS.
- *
- * QKSMS is free software: you can redistribute it and/or modify
- * it under the terms of the GNU General Public License as published by
- * the Free Software Foundation, either version 3 of the License, or
- * (at your option) any later version.
- *
- * QKSMS is distributed in the hope that it will be useful,
- * but WITHOUT ANY WARRANTY; without even the implied warranty of
- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
- * GNU General Public License for more details.
- *
- * You should have received a copy of the GNU General Public License
- * along with QKSMS.  If not, see <http://www.gnu.org/licenses/>.
- */
-
-package com.moez.QKSMS.extensions
-
-import io.reactivex.Flowable
-import io.reactivex.Observable
-
-data class Optional<out T>(val value: T?) {
-    fun notNull() = value != null
-}
-
-fun <T, R> Flowable<T>.mapNotNull(mapper: (T) -> R?): Flowable<R> = map { input -> Optional(mapper(input)) }
-        .filter { optional -> optional.notNull() }
-        .map { optional -> optional.value }
-
-fun <T, R> Observable<T>.mapNotNull(mapper: (T) -> R?): Observable<R> = map { input -> Optional(mapper(input)) }
-        .filter { optional -> optional.notNull() }
-        .map { optional -> optional.value }
-
+/*
+ * Copyright (C) 2017 Moez Bhatti <moez.bhatti@gmail.com>
+ *
+ * This file is part of QKSMS.
+ *
+ * QKSMS is free software: you can redistribute it and/or modify
+ * it under the terms of the GNU General Public License as published by
+ * the Free Software Foundation, either version 3 of the License, or
+ * (at your option) any later version.
+ *
+ * QKSMS is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+ * GNU General Public License for more details.
+ *
+ * You should have received a copy of the GNU General Public License
+ * along with QKSMS.  If not, see <http://www.gnu.org/licenses/>.
+ */
+
+package com.moez.QKSMS.extensions
+
+import io.reactivex.Flowable
+import io.reactivex.Observable
+
+data class Optional<out T>(val value: T?) {
+    fun notNull() = value != null
+}
+
+fun <T, R> Flowable<T>.mapNotNull(mapper: (T) -> R?): Flowable<R> = map { input -> Optional(mapper(input)) }
+        .filter { optional -> optional.notNull() }
+        .map { optional -> optional.value }
+
+fun <T, R> Observable<T>.mapNotNull(mapper: (T) -> R?): Observable<R> = map { input -> Optional(mapper(input)) }
+        .filter { optional -> optional.notNull() }
+        .map { optional -> optional.value }
+
 fun <T> Observable<T>.toFlowable(): Flowable<T> = this.toFlowable(io.reactivex.BackpressureStrategy.BUFFER)
\ No newline at end of file
diff --git a/domain/src/main/java/com/moez/QKSMS/interactor/AddScheduledMessage.kt b/domain/src/main/java/com/moez/QKSMS/interactor/AddScheduledMessage.kt
index 3b31402ae..6f44e56fe 100644
--- a/domain/src/main/java/com/moez/QKSMS/interactor/AddScheduledMessage.kt
+++ b/domain/src/main/java/com/moez/QKSMS/interactor/AddScheduledMessage.kt
@@ -1,48 +1,48 @@
-/*
- * Copyright (C) 2017 Moez Bhatti <moez.bhatti@gmail.com>
- *
- * This file is part of QKSMS.
- *
- * QKSMS is free software: you can redistribute it and/or modify
- * it under the terms of the GNU General Public License as published by
- * the Free Software Foundation, either version 3 of the License, or
- * (at your option) any later version.
- *
- * QKSMS is distributed in the hope that it will be useful,
- * but WITHOUT ANY WARRANTY; without even the implied warranty of
- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
- * GNU General Public License for more details.
- *
- * You should have received a copy of the GNU General Public License
- * along with QKSMS.  If not, see <http://www.gnu.org/licenses/>.
- */
-package com.moez.QKSMS.interactor
-
-import com.moez.QKSMS.repository.ScheduledMessageRepository
-import io.reactivex.Flowable
-import javax.inject.Inject
-
-class AddScheduledMessage @Inject constructor(
-    private val scheduledMessageRepo: ScheduledMessageRepository,
-    private val updateScheduledMessageAlarms: UpdateScheduledMessageAlarms
-) : Interactor<AddScheduledMessage.Params>() {
-
-    data class Params(
-        val date: Long,
-        val subId: Int,
-        val recipients: List<String>,
-        val sendAsGroup: Boolean,
-        val body: String,
-        val attachments: List<String>
-    )
-
-    override fun buildObservable(params: Params): Flowable<*> {
-        return Flowable.just(params)
-                .map {
-                    scheduledMessageRepo.saveScheduledMessage(it.date, it.subId, it.recipients, it.sendAsGroup, it.body,
-                            it.attachments)
-                }
-                .flatMap { updateScheduledMessageAlarms.buildObservable(Unit) }
-    }
-
+/*
+ * Copyright (C) 2017 Moez Bhatti <moez.bhatti@gmail.com>
+ *
+ * This file is part of QKSMS.
+ *
+ * QKSMS is free software: you can redistribute it and/or modify
+ * it under the terms of the GNU General Public License as published by
+ * the Free Software Foundation, either version 3 of the License, or
+ * (at your option) any later version.
+ *
+ * QKSMS is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+ * GNU General Public License for more details.
+ *
+ * You should have received a copy of the GNU General Public License
+ * along with QKSMS.  If not, see <http://www.gnu.org/licenses/>.
+ */
+package com.moez.QKSMS.interactor
+
+import com.moez.QKSMS.repository.ScheduledMessageRepository
+import io.reactivex.Flowable
+import javax.inject.Inject
+
+class AddScheduledMessage @Inject constructor(
+    private val scheduledMessageRepo: ScheduledMessageRepository,
+    private val updateScheduledMessageAlarms: UpdateScheduledMessageAlarms
+) : Interactor<AddScheduledMessage.Params>() {
+
+    data class Params(
+        val date: Long,
+        val subId: Int,
+        val recipients: List<String>,
+        val sendAsGroup: Boolean,
+        val body: String,
+        val attachments: List<String>
+    )
+
+    override fun buildObservable(params: Params): Flowable<*> {
+        return Flowable.just(params)
+                .map {
+                    scheduledMessageRepo.saveScheduledMessage(it.date, it.subId, it.recipients, it.sendAsGroup, it.body,
+                            it.attachments)
+                }
+                .flatMap { updateScheduledMessageAlarms.buildObservable(Unit) }
+    }
+
 }
\ No newline at end of file
diff --git a/domain/src/main/java/com/moez/QKSMS/interactor/CancelDelayedMessage.kt b/domain/src/main/java/com/moez/QKSMS/interactor/CancelDelayedMessage.kt
index 429c2a754..077860cbd 100644
--- a/domain/src/main/java/com/moez/QKSMS/interactor/CancelDelayedMessage.kt
+++ b/domain/src/main/java/com/moez/QKSMS/interactor/CancelDelayedMessage.kt
@@ -1,40 +1,40 @@
-/*
- * Copyright (C) 2017 Moez Bhatti <moez.bhatti@gmail.com>
- *
- * This file is part of QKSMS.
- *
- * QKSMS is free software: you can redistribute it and/or modify
- * it under the terms of the GNU General Public License as published by
- * the Free Software Foundation, either version 3 of the License, or
- * (at your option) any later version.
- *
- * QKSMS is distributed in the hope that it will be useful,
- * but WITHOUT ANY WARRANTY; without even the implied warranty of
- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
- * GNU General Public License for more details.
- *
- * You should have received a copy of the GNU General Public License
- * along with QKSMS.  If not, see <http://www.gnu.org/licenses/>.
- */
-package com.moez.QKSMS.interactor
-
-import com.moez.QKSMS.repository.ConversationRepository
-import com.moez.QKSMS.repository.MessageRepository
-import io.reactivex.Flowable
-import javax.inject.Inject
-
-class CancelDelayedMessage @Inject constructor(
-    private val conversationRepo: ConversationRepository,
-    private val messageRepo: MessageRepository
-) : Interactor<CancelDelayedMessage.Params>() {
-
-    data class Params(val messageId: Long, val threadId: Long)
-
-    override fun buildObservable(params: Params): Flowable<*> {
-        return Flowable.just(Unit)
-                .doOnNext { messageRepo.cancelDelayedSms(params.messageId) }
-                .doOnNext { messageRepo.deleteMessages(params.messageId) }
-                .doOnNext { conversationRepo.updateConversations(params.threadId) } // Update the conversation
-    }
-
-}
+/*
+ * Copyright (C) 2017 Moez Bhatti <moez.bhatti@gmail.com>
+ *
+ * This file is part of QKSMS.
+ *
+ * QKSMS is free software: you can redistribute it and/or modify
+ * it under the terms of the GNU General Public License as published by
+ * the Free Software Foundation, either version 3 of the License, or
+ * (at your option) any later version.
+ *
+ * QKSMS is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+ * GNU General Public License for more details.
+ *
+ * You should have received a copy of the GNU General Public License
+ * along with QKSMS.  If not, see <http://www.gnu.org/licenses/>.
+ */
+package com.moez.QKSMS.interactor
+
+import com.moez.QKSMS.repository.ConversationRepository
+import com.moez.QKSMS.repository.MessageRepository
+import io.reactivex.Flowable
+import javax.inject.Inject
+
+class CancelDelayedMessage @Inject constructor(
+    private val conversationRepo: ConversationRepository,
+    private val messageRepo: MessageRepository
+) : Interactor<CancelDelayedMessage.Params>() {
+
+    data class Params(val messageId: Long, val threadId: Long)
+
+    override fun buildObservable(params: Params): Flowable<*> {
+        return Flowable.just(Unit)
+                .doOnNext { messageRepo.cancelDelayedSms(params.messageId) }
+                .doOnNext { messageRepo.deleteMessages(params.messageId) }
+                .doOnNext { conversationRepo.updateConversations(params.threadId) } // Update the conversation
+    }
+
+}
diff --git a/domain/src/main/java/com/moez/QKSMS/interactor/DeleteConversations.kt b/domain/src/main/java/com/moez/QKSMS/interactor/DeleteConversations.kt
index 9c7da3723..07c3beaaa 100644
--- a/domain/src/main/java/com/moez/QKSMS/interactor/DeleteConversations.kt
+++ b/domain/src/main/java/com/moez/QKSMS/interactor/DeleteConversations.kt
@@ -1,39 +1,39 @@
-/*
- * Copyright (C) 2017 Moez Bhatti <moez.bhatti@gmail.com>
- *
- * This file is part of QKSMS.
- *
- * QKSMS is free software: you can redistribute it and/or modify
- * it under the terms of the GNU General Public License as published by
- * the Free Software Foundation, either version 3 of the License, or
- * (at your option) any later version.
- *
- * QKSMS is distributed in the hope that it will be useful,
- * but WITHOUT ANY WARRANTY; without even the implied warranty of
- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
- * GNU General Public License for more details.
- *
- * You should have received a copy of the GNU General Public License
- * along with QKSMS.  If not, see <http://www.gnu.org/licenses/>.
- */
-package com.moez.QKSMS.interactor
-
-import com.moez.QKSMS.manager.NotificationManager
-import com.moez.QKSMS.repository.ConversationRepository
-import io.reactivex.Flowable
-import javax.inject.Inject
-
-class DeleteConversations @Inject constructor(
-    private val conversationRepo: ConversationRepository,
-    private val notificationManager: NotificationManager,
-    private val updateBadge: UpdateBadge
-) : Interactor<List<Long>>() {
-
-    override fun buildObservable(params: List<Long>): Flowable<*> {
-        return Flowable.just(params.toLongArray())
-                .doOnNext { threadIds -> conversationRepo.deleteConversations(*threadIds) }
-                .doOnNext { threadIds -> threadIds.forEach(notificationManager::update) }
-                .flatMap { updateBadge.buildObservable(Unit) } // Update the badge
-    }
-
+/*
+ * Copyright (C) 2017 Moez Bhatti <moez.bhatti@gmail.com>
+ *
+ * This file is part of QKSMS.
+ *
+ * QKSMS is free software: you can redistribute it and/or modify
+ * it under the terms of the GNU General Public License as published by
+ * the Free Software Foundation, either version 3 of the License, or
+ * (at your option) any later version.
+ *
+ * QKSMS is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+ * GNU General Public License for more details.
+ *
+ * You should have received a copy of the GNU General Public License
+ * along with QKSMS.  If not, see <http://www.gnu.org/licenses/>.
+ */
+package com.moez.QKSMS.interactor
+
+import com.moez.QKSMS.manager.NotificationManager
+import com.moez.QKSMS.repository.ConversationRepository
+import io.reactivex.Flowable
+import javax.inject.Inject
+
+class DeleteConversations @Inject constructor(
+    private val conversationRepo: ConversationRepository,
+    private val notificationManager: NotificationManager,
+    private val updateBadge: UpdateBadge
+) : Interactor<List<Long>>() {
+
+    override fun buildObservable(params: List<Long>): Flowable<*> {
+        return Flowable.just(params.toLongArray())
+                .doOnNext { threadIds -> conversationRepo.deleteConversations(*threadIds) }
+                .doOnNext { threadIds -> threadIds.forEach(notificationManager::update) }
+                .flatMap { updateBadge.buildObservable(Unit) } // Update the badge
+    }
+
 }
\ No newline at end of file
diff --git a/domain/src/main/java/com/moez/QKSMS/interactor/DeleteMessages.kt b/domain/src/main/java/com/moez/QKSMS/interactor/DeleteMessages.kt
index 3f573cdf1..2c7fd75e5 100644
--- a/domain/src/main/java/com/moez/QKSMS/interactor/DeleteMessages.kt
+++ b/domain/src/main/java/com/moez/QKSMS/interactor/DeleteMessages.kt
@@ -1,44 +1,44 @@
-/*
- * Copyright (C) 2017 Moez Bhatti <moez.bhatti@gmail.com>
- *
- * This file is part of QKSMS.
- *
- * QKSMS is free software: you can redistribute it and/or modify
- * it under the terms of the GNU General Public License as published by
- * the Free Software Foundation, either version 3 of the License, or
- * (at your option) any later version.
- *
- * QKSMS is distributed in the hope that it will be useful,
- * but WITHOUT ANY WARRANTY; without even the implied warranty of
- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
- * GNU General Public License for more details.
- *
- * You should have received a copy of the GNU General Public License
- * along with QKSMS.  If not, see <http://www.gnu.org/licenses/>.
- */
-package com.moez.QKSMS.interactor
-
-import com.moez.QKSMS.manager.NotificationManager
-import com.moez.QKSMS.repository.ConversationRepository
-import com.moez.QKSMS.repository.MessageRepository
-import io.reactivex.Flowable
-import javax.inject.Inject
-
-class DeleteMessages @Inject constructor(
-    private val conversationRepo: ConversationRepository,
-    private val messageRepo: MessageRepository,
-    private val notificationManager: NotificationManager,
-    private val updateBadge: UpdateBadge
-) : Interactor<DeleteMessages.Params>() {
-
-    data class Params(val messageIds: List<Long>, val threadId: Long)
-
-    override fun buildObservable(params: Params): Flowable<*> {
-        return Flowable.just(params.messageIds.toLongArray())
-                .doOnNext { messageIds -> messageRepo.deleteMessages(*messageIds) } // Delete the messages
-                .doOnNext { conversationRepo.updateConversations(params.threadId) } // Update the conversation
-                .doOnNext { notificationManager.update(params.threadId) }
-                .flatMap { updateBadge.buildObservable(Unit) } // Update the badge
-    }
-
+/*
+ * Copyright (C) 2017 Moez Bhatti <moez.bhatti@gmail.com>
+ *
+ * This file is part of QKSMS.
+ *
+ * QKSMS is free software: you can redistribute it and/or modify
+ * it under the terms of the GNU General Public License as published by
+ * the Free Software Foundation, either version 3 of the License, or
+ * (at your option) any later version.
+ *
+ * QKSMS is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+ * GNU General Public License for more details.
+ *
+ * You should have received a copy of the GNU General Public License
+ * along with QKSMS.  If not, see <http://www.gnu.org/licenses/>.
+ */
+package com.moez.QKSMS.interactor
+
+import com.moez.QKSMS.manager.NotificationManager
+import com.moez.QKSMS.repository.ConversationRepository
+import com.moez.QKSMS.repository.MessageRepository
+import io.reactivex.Flowable
+import javax.inject.Inject
+
+class DeleteMessages @Inject constructor(
+    private val conversationRepo: ConversationRepository,
+    private val messageRepo: MessageRepository,
+    private val notificationManager: NotificationManager,
+    private val updateBadge: UpdateBadge
+) : Interactor<DeleteMessages.Params>() {
+
+    data class Params(val messageIds: List<Long>, val threadId: Long)
+
+    override fun buildObservable(params: Params): Flowable<*> {
+        return Flowable.just(params.messageIds.toLongArray())
+                .doOnNext { messageIds -> messageRepo.deleteMessages(*messageIds) } // Delete the messages
+                .doOnNext { conversationRepo.updateConversations(params.threadId) } // Update the conversation
+                .doOnNext { notificationManager.update(params.threadId) }
+                .flatMap { updateBadge.buildObservable(Unit) } // Update the badge
+    }
+
 }
\ No newline at end of file
diff --git a/domain/src/main/java/com/moez/QKSMS/interactor/DeleteOldMessages.kt b/domain/src/main/java/com/moez/QKSMS/interactor/DeleteOldMessages.kt
index 7479933db..fd3af13a0 100644
--- a/domain/src/main/java/com/moez/QKSMS/interactor/DeleteOldMessages.kt
+++ b/domain/src/main/java/com/moez/QKSMS/interactor/DeleteOldMessages.kt
@@ -1,44 +1,44 @@
-/*
- * Copyright (C) 2017 Moez Bhatti <moez.bhatti@gmail.com>
- *
- * This file is part of QKSMS.
- *
- * QKSMS is free software: you can redistribute it and/or modify
- * it under the terms of the GNU General Public License as published by
- * the Free Software Foundation, either version 3 of the License, or
- * (at your option) any later version.
- *
- * QKSMS is distributed in the hope that it will be useful,
- * but WITHOUT ANY WARRANTY; without even the implied warranty of
- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
- * GNU General Public License for more details.
- *
- * You should have received a copy of the GNU General Public License
- * along with QKSMS.  If not, see <http://www.gnu.org/licenses/>.
- */
-package com.moez.QKSMS.interactor
-
-import com.moez.QKSMS.repository.ConversationRepository
-import com.moez.QKSMS.repository.MessageRepository
-import com.moez.QKSMS.util.Preferences
-import io.reactivex.Flowable
-import timber.log.Timber
-import javax.inject.Inject
-
-class DeleteOldMessages @Inject constructor(
-    private val conversationRepo: ConversationRepository,
-    private val messageRepo: MessageRepository,
-    private val prefs: Preferences
-) : Interactor<Unit>() {
-
-    override fun buildObservable(params: Unit): Flowable<*> = Flowable.fromCallable {
-        val maxAge = prefs.autoDelete.get().takeIf { it > 0 } ?: return@fromCallable
-        val counts = messageRepo.getOldMessageCounts(maxAge)
-        val threadIds = counts.keys.toLongArray()
-
-        Timber.d("Deleting ${counts.values.sum()} old messages from ${threadIds.size} conversations")
-        messageRepo.deleteOldMessages(maxAge)
-        conversationRepo.updateConversations(*threadIds)
-    }
-
-}
+/*
+ * Copyright (C) 2017 Moez Bhatti <moez.bhatti@gmail.com>
+ *
+ * This file is part of QKSMS.
+ *
+ * QKSMS is free software: you can redistribute it and/or modify
+ * it under the terms of the GNU General Public License as published by
+ * the Free Software Foundation, either version 3 of the License, or
+ * (at your option) any later version.
+ *
+ * QKSMS is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+ * GNU General Public License for more details.
+ *
+ * You should have received a copy of the GNU General Public License
+ * along with QKSMS.  If not, see <http://www.gnu.org/licenses/>.
+ */
+package com.moez.QKSMS.interactor
+
+import com.moez.QKSMS.repository.ConversationRepository
+import com.moez.QKSMS.repository.MessageRepository
+import com.moez.QKSMS.util.Preferences
+import io.reactivex.Flowable
+import timber.log.Timber
+import javax.inject.Inject
+
+class DeleteOldMessages @Inject constructor(
+    private val conversationRepo: ConversationRepository,
+    private val messageRepo: MessageRepository,
+    private val prefs: Preferences
+) : Interactor<Unit>() {
+
+    override fun buildObservable(params: Unit): Flowable<*> = Flowable.fromCallable {
+        val maxAge = prefs.autoDelete.get().takeIf { it > 0 } ?: return@fromCallable
+        val counts = messageRepo.getOldMessageCounts(maxAge)
+        val threadIds = counts.keys.toLongArray()
+
+        Timber.d("Deleting ${counts.values.sum()} old messages from ${threadIds.size} conversations")
+        messageRepo.deleteOldMessages(maxAge)
+        conversationRepo.updateConversations(*threadIds)
+    }
+
+}
diff --git a/domain/src/main/java/com/moez/QKSMS/interactor/Interactor.kt b/domain/src/main/java/com/moez/QKSMS/interactor/Interactor.kt
index 309ddfe9a..8e1e890bb 100644
--- a/domain/src/main/java/com/moez/QKSMS/interactor/Interactor.kt
+++ b/domain/src/main/java/com/moez/QKSMS/interactor/Interactor.kt
@@ -1,51 +1,51 @@
-/*
- * Copyright (C) 2017 Moez Bhatti <moez.bhatti@gmail.com>
- *
- * This file is part of QKSMS.
- *
- * QKSMS is free software: you can redistribute it and/or modify
- * it under the terms of the GNU General Public License as published by
- * the Free Software Foundation, either version 3 of the License, or
- * (at your option) any later version.
- *
- * QKSMS is distributed in the hope that it will be useful,
- * but WITHOUT ANY WARRANTY; without even the implied warranty of
- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
- * GNU General Public License for more details.
- *
- * You should have received a copy of the GNU General Public License
- * along with QKSMS.  If not, see <http://www.gnu.org/licenses/>.
- */
-package com.moez.QKSMS.interactor
-
-import io.reactivex.Flowable
-import io.reactivex.android.schedulers.AndroidSchedulers
-import io.reactivex.disposables.CompositeDisposable
-import io.reactivex.disposables.Disposable
-import io.reactivex.rxkotlin.plusAssign
-import io.reactivex.schedulers.Schedulers
-import timber.log.Timber
-
-abstract class Interactor<in Params> : Disposable {
-
-    private val disposables: CompositeDisposable = CompositeDisposable()
-
-    abstract fun buildObservable(params: Params): Flowable<*>
-
-    fun execute(params: Params, onComplete: () -> Unit = {}) {
-        disposables += buildObservable(params)
-                .subscribeOn(Schedulers.io())
-                .observeOn(AndroidSchedulers.mainThread())
-                .doOnComplete(onComplete)
-                .subscribe({}, Timber::w)
-    }
-
-    override fun dispose() {
-        return disposables.dispose()
-    }
-
-    override fun isDisposed(): Boolean {
-        return disposables.isDisposed
-    }
-
-}
+/*
+ * Copyright (C) 2017 Moez Bhatti <moez.bhatti@gmail.com>
+ *
+ * This file is part of QKSMS.
+ *
+ * QKSMS is free software: you can redistribute it and/or modify
+ * it under the terms of the GNU General Public License as published by
+ * the Free Software Foundation, either version 3 of the License, or
+ * (at your option) any later version.
+ *
+ * QKSMS is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+ * GNU General Public License for more details.
+ *
+ * You should have received a copy of the GNU General Public License
+ * along with QKSMS.  If not, see <http://www.gnu.org/licenses/>.
+ */
+package com.moez.QKSMS.interactor
+
+import io.reactivex.Flowable
+import io.reactivex.android.schedulers.AndroidSchedulers
+import io.reactivex.disposables.CompositeDisposable
+import io.reactivex.disposables.Disposable
+import io.reactivex.rxkotlin.plusAssign
+import io.reactivex.schedulers.Schedulers
+import timber.log.Timber
+
+abstract class Interactor<in Params> : Disposable {
+
+    private val disposables: CompositeDisposable = CompositeDisposable()
+
+    abstract fun buildObservable(params: Params): Flowable<*>
+
+    fun execute(params: Params, onComplete: () -> Unit = {}) {
+        disposables += buildObservable(params)
+                .subscribeOn(Schedulers.io())
+                .observeOn(AndroidSchedulers.mainThread())
+                .doOnComplete(onComplete)
+                .subscribe({}, Timber::w)
+    }
+
+    override fun dispose() {
+        return disposables.dispose()
+    }
+
+    override fun isDisposed(): Boolean {
+        return disposables.isDisposed
+    }
+
+}
diff --git a/domain/src/main/java/com/moez/QKSMS/interactor/MarkAllSeen.kt b/domain/src/main/java/com/moez/QKSMS/interactor/MarkAllSeen.kt
index c1c2a2013..41d14a545 100644
--- a/domain/src/main/java/com/moez/QKSMS/interactor/MarkAllSeen.kt
+++ b/domain/src/main/java/com/moez/QKSMS/interactor/MarkAllSeen.kt
@@ -1,32 +1,32 @@
-/*
- * Copyright (C) 2017 Moez Bhatti <moez.bhatti@gmail.com>
- *
- * This file is part of QKSMS.
- *
- * QKSMS is free software: you can redistribute it and/or modify
- * it under the terms of the GNU General Public License as published by
- * the Free Software Foundation, either version 3 of the License, or
- * (at your option) any later version.
- *
- * QKSMS is distributed in the hope that it will be useful,
- * but WITHOUT ANY WARRANTY; without even the implied warranty of
- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
- * GNU General Public License for more details.
- *
- * You should have received a copy of the GNU General Public License
- * along with QKSMS.  If not, see <http://www.gnu.org/licenses/>.
- */
-package com.moez.QKSMS.interactor
-
-import com.moez.QKSMS.repository.MessageRepository
-import io.reactivex.Flowable
-import javax.inject.Inject
-
-class MarkAllSeen @Inject constructor(private val messageRepo: MessageRepository) : Interactor<Unit>() {
-
-    override fun buildObservable(params: Unit): Flowable<Unit> {
-        return Flowable.just(Unit)
-                .doOnNext { messageRepo.markAllSeen() }
-    }
-
+/*
+ * Copyright (C) 2017 Moez Bhatti <moez.bhatti@gmail.com>
+ *
+ * This file is part of QKSMS.
+ *
+ * QKSMS is free software: you can redistribute it and/or modify
+ * it under the terms of the GNU General Public License as published by
+ * the Free Software Foundation, either version 3 of the License, or
+ * (at your option) any later version.
+ *
+ * QKSMS is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+ * GNU General Public License for more details.
+ *
+ * You should have received a copy of the GNU General Public License
+ * along with QKSMS.  If not, see <http://www.gnu.org/licenses/>.
+ */
+package com.moez.QKSMS.interactor
+
+import com.moez.QKSMS.repository.MessageRepository
+import io.reactivex.Flowable
+import javax.inject.Inject
+
+class MarkAllSeen @Inject constructor(private val messageRepo: MessageRepository) : Interactor<Unit>() {
+
+    override fun buildObservable(params: Unit): Flowable<Unit> {
+        return Flowable.just(Unit)
+                .doOnNext { messageRepo.markAllSeen() }
+    }
+
 }
\ No newline at end of file
diff --git a/domain/src/main/java/com/moez/QKSMS/interactor/MarkArchived.kt b/domain/src/main/java/com/moez/QKSMS/interactor/MarkArchived.kt
index 2b9b8890c..7868cb5e1 100644
--- a/domain/src/main/java/com/moez/QKSMS/interactor/MarkArchived.kt
+++ b/domain/src/main/java/com/moez/QKSMS/interactor/MarkArchived.kt
@@ -1,36 +1,36 @@
-/*
- * Copyright (C) 2017 Moez Bhatti <moez.bhatti@gmail.com>
- *
- * This file is part of QKSMS.
- *
- * QKSMS is free software: you can redistribute it and/or modify
- * it under the terms of the GNU General Public License as published by
- * the Free Software Foundation, either version 3 of the License, or
- * (at your option) any later version.
- *
- * QKSMS is distributed in the hope that it will be useful,
- * but WITHOUT ANY WARRANTY; without even the implied warranty of
- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
- * GNU General Public License for more details.
- *
- * You should have received a copy of the GNU General Public License
- * along with QKSMS.  If not, see <http://www.gnu.org/licenses/>.
- */
-package com.moez.QKSMS.interactor
-
-import com.moez.QKSMS.repository.ConversationRepository
-import io.reactivex.Flowable
-import javax.inject.Inject
-
-class MarkArchived @Inject constructor(
-    private val conversationRepo: ConversationRepository,
-    private val markRead: MarkRead
-) : Interactor<List<Long>>() {
-
-    override fun buildObservable(params: List<Long>): Flowable<*> {
-        return Flowable.just(params.toLongArray())
-                .doOnNext { threadIds -> conversationRepo.markArchived(*threadIds) }
-                .flatMap { markRead.buildObservable(params) }
-    }
-
+/*
+ * Copyright (C) 2017 Moez Bhatti <moez.bhatti@gmail.com>
+ *
+ * This file is part of QKSMS.
+ *
+ * QKSMS is free software: you can redistribute it and/or modify
+ * it under the terms of the GNU General Public License as published by
+ * the Free Software Foundation, either version 3 of the License, or
+ * (at your option) any later version.
+ *
+ * QKSMS is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+ * GNU General Public License for more details.
+ *
+ * You should have received a copy of the GNU General Public License
+ * along with QKSMS.  If not, see <http://www.gnu.org/licenses/>.
+ */
+package com.moez.QKSMS.interactor
+
+import com.moez.QKSMS.repository.ConversationRepository
+import io.reactivex.Flowable
+import javax.inject.Inject
+
+class MarkArchived @Inject constructor(
+    private val conversationRepo: ConversationRepository,
+    private val markRead: MarkRead
+) : Interactor<List<Long>>() {
+
+    override fun buildObservable(params: List<Long>): Flowable<*> {
+        return Flowable.just(params.toLongArray())
+                .doOnNext { threadIds -> conversationRepo.markArchived(*threadIds) }
+                .flatMap { markRead.buildObservable(params) }
+    }
+
 }
\ No newline at end of file
diff --git a/domain/src/main/java/com/moez/QKSMS/interactor/MarkBlocked.kt b/domain/src/main/java/com/moez/QKSMS/interactor/MarkBlocked.kt
index da6d5e764..99243d631 100644
--- a/domain/src/main/java/com/moez/QKSMS/interactor/MarkBlocked.kt
+++ b/domain/src/main/java/com/moez/QKSMS/interactor/MarkBlocked.kt
@@ -1,40 +1,40 @@
-/*
- * Copyright (C) 2017 Moez Bhatti <moez.bhatti@gmail.com>
- *
- * This file is part of QKSMS.
- *
- * QKSMS is free software: you can redistribute it and/or modify
- * it under the terms of the GNU General Public License as published by
- * the Free Software Foundation, either version 3 of the License, or
- * (at your option) any later version.
- *
- * QKSMS is distributed in the hope that it will be useful,
- * but WITHOUT ANY WARRANTY; without even the implied warranty of
- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
- * GNU General Public License for more details.
- *
- * You should have received a copy of the GNU General Public License
- * along with QKSMS.  If not, see <http://www.gnu.org/licenses/>.
- */
-package com.moez.QKSMS.interactor
-
-import com.moez.QKSMS.repository.ConversationRepository
-import io.reactivex.Flowable
-import javax.inject.Inject
-
-class MarkBlocked @Inject constructor(
-    private val conversationRepo: ConversationRepository,
-    private val markRead: MarkRead
-) : Interactor<MarkBlocked.Params>() {
-
-    data class Params(val threadIds: List<Long>, val blockingClient: Int, val blockReason: String?)
-
-    override fun buildObservable(params: Params): Flowable<*> {
-        return Flowable.just(params)
-                .doOnNext { (threadIds, blockingClient, blockReason) ->
-                    conversationRepo.markBlocked(threadIds, blockingClient, blockReason)
-                }
-                .flatMap { (threadIds) -> markRead.buildObservable(threadIds) }
-    }
-
-}
+/*
+ * Copyright (C) 2017 Moez Bhatti <moez.bhatti@gmail.com>
+ *
+ * This file is part of QKSMS.
+ *
+ * QKSMS is free software: you can redistribute it and/or modify
+ * it under the terms of the GNU General Public License as published by
+ * the Free Software Foundation, either version 3 of the License, or
+ * (at your option) any later version.
+ *
+ * QKSMS is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+ * GNU General Public License for more details.
+ *
+ * You should have received a copy of the GNU General Public License
+ * along with QKSMS.  If not, see <http://www.gnu.org/licenses/>.
+ */
+package com.moez.QKSMS.interactor
+
+import com.moez.QKSMS.repository.ConversationRepository
+import io.reactivex.Flowable
+import javax.inject.Inject
+
+class MarkBlocked @Inject constructor(
+    private val conversationRepo: ConversationRepository,
+    private val markRead: MarkRead
+) : Interactor<MarkBlocked.Params>() {
+
+    data class Params(val threadIds: List<Long>, val blockingClient: Int, val blockReason: String?)
+
+    override fun buildObservable(params: Params): Flowable<*> {
+        return Flowable.just(params)
+                .doOnNext { (threadIds, blockingClient, blockReason) ->
+                    conversationRepo.markBlocked(threadIds, blockingClient, blockReason)
+                }
+                .flatMap { (threadIds) -> markRead.buildObservable(threadIds) }
+    }
+
+}
diff --git a/domain/src/main/java/com/moez/QKSMS/interactor/MarkDelivered.kt b/domain/src/main/java/com/moez/QKSMS/interactor/MarkDelivered.kt
index c36cb82a3..155503aab 100644
--- a/domain/src/main/java/com/moez/QKSMS/interactor/MarkDelivered.kt
+++ b/domain/src/main/java/com/moez/QKSMS/interactor/MarkDelivered.kt
@@ -1,32 +1,32 @@
-/*
- * Copyright (C) 2017 Moez Bhatti <moez.bhatti@gmail.com>
- *
- * This file is part of QKSMS.
- *
- * QKSMS is free software: you can redistribute it and/or modify
- * it under the terms of the GNU General Public License as published by
- * the Free Software Foundation, either version 3 of the License, or
- * (at your option) any later version.
- *
- * QKSMS is distributed in the hope that it will be useful,
- * but WITHOUT ANY WARRANTY; without even the implied warranty of
- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
- * GNU General Public License for more details.
- *
- * You should have received a copy of the GNU General Public License
- * along with QKSMS.  If not, see <http://www.gnu.org/licenses/>.
- */
-package com.moez.QKSMS.interactor
-
-import com.moez.QKSMS.repository.MessageRepository
-import io.reactivex.Flowable
-import javax.inject.Inject
-
-class MarkDelivered @Inject constructor(private val messageRepo: MessageRepository) : Interactor<Long>() {
-
-    override fun buildObservable(params: Long): Flowable<Unit> {
-        return Flowable.just(Unit)
-                .doOnNext { messageRepo.markDelivered(params) }
-    }
-
+/*
+ * Copyright (C) 2017 Moez Bhatti <moez.bhatti@gmail.com>
+ *
+ * This file is part of QKSMS.
+ *
+ * QKSMS is free software: you can redistribute it and/or modify
+ * it under the terms of the GNU General Public License as published by
+ * the Free Software Foundation, either version 3 of the License, or
+ * (at your option) any later version.
+ *
+ * QKSMS is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+ * GNU General Public License for more details.
+ *
+ * You should have received a copy of the GNU General Public License
+ * along with QKSMS.  If not, see <http://www.gnu.org/licenses/>.
+ */
+package com.moez.QKSMS.interactor
+
+import com.moez.QKSMS.repository.MessageRepository
+import io.reactivex.Flowable
+import javax.inject.Inject
+
+class MarkDelivered @Inject constructor(private val messageRepo: MessageRepository) : Interactor<Long>() {
+
+    override fun buildObservable(params: Long): Flowable<Unit> {
+        return Flowable.just(Unit)
+                .doOnNext { messageRepo.markDelivered(params) }
+    }
+
 }
\ No newline at end of file
diff --git a/domain/src/main/java/com/moez/QKSMS/interactor/MarkDeliveryFailed.kt b/domain/src/main/java/com/moez/QKSMS/interactor/MarkDeliveryFailed.kt
index 8c5e465b8..682f9632f 100644
--- a/domain/src/main/java/com/moez/QKSMS/interactor/MarkDeliveryFailed.kt
+++ b/domain/src/main/java/com/moez/QKSMS/interactor/MarkDeliveryFailed.kt
@@ -1,36 +1,36 @@
-/*
- * Copyright (C) 2017 Moez Bhatti <moez.bhatti@gmail.com>
- *
- * This file is part of QKSMS.
- *
- * QKSMS is free software: you can redistribute it and/or modify
- * it under the terms of the GNU General Public License as published by
- * the Free Software Foundation, either version 3 of the License, or
- * (at your option) any later version.
- *
- * QKSMS is distributed in the hope that it will be useful,
- * but WITHOUT ANY WARRANTY; without even the implied warranty of
- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
- * GNU General Public License for more details.
- *
- * You should have received a copy of the GNU General Public License
- * along with QKSMS.  If not, see <http://www.gnu.org/licenses/>.
- */
-package com.moez.QKSMS.interactor
-
-import com.moez.QKSMS.repository.MessageRepository
-import io.reactivex.Flowable
-import javax.inject.Inject
-
-class MarkDeliveryFailed @Inject constructor(
-    private val messageRepo: MessageRepository
-) : Interactor<MarkDeliveryFailed.Params>() {
-
-    data class Params(val id: Long, val resultCode: Int)
-
-    override fun buildObservable(params: Params): Flowable<Unit> {
-        return Flowable.just(Unit)
-                .doOnNext { messageRepo.markDeliveryFailed(params.id, params.resultCode) }
-    }
-
+/*
+ * Copyright (C) 2017 Moez Bhatti <moez.bhatti@gmail.com>
+ *
+ * This file is part of QKSMS.
+ *
+ * QKSMS is free software: you can redistribute it and/or modify
+ * it under the terms of the GNU General Public License as published by
+ * the Free Software Foundation, either version 3 of the License, or
+ * (at your option) any later version.
+ *
+ * QKSMS is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+ * GNU General Public License for more details.
+ *
+ * You should have received a copy of the GNU General Public License
+ * along with QKSMS.  If not, see <http://www.gnu.org/licenses/>.
+ */
+package com.moez.QKSMS.interactor
+
+import com.moez.QKSMS.repository.MessageRepository
+import io.reactivex.Flowable
+import javax.inject.Inject
+
+class MarkDeliveryFailed @Inject constructor(
+    private val messageRepo: MessageRepository
+) : Interactor<MarkDeliveryFailed.Params>() {
+
+    data class Params(val id: Long, val resultCode: Int)
+
+    override fun buildObservable(params: Params): Flowable<Unit> {
+        return Flowable.just(Unit)
+                .doOnNext { messageRepo.markDeliveryFailed(params.id, params.resultCode) }
+    }
+
 }
\ No newline at end of file
diff --git a/domain/src/main/java/com/moez/QKSMS/interactor/MarkFailed.kt b/domain/src/main/java/com/moez/QKSMS/interactor/MarkFailed.kt
index 6aa7ed5de..552743ec3 100644
--- a/domain/src/main/java/com/moez/QKSMS/interactor/MarkFailed.kt
+++ b/domain/src/main/java/com/moez/QKSMS/interactor/MarkFailed.kt
@@ -1,39 +1,39 @@
-/*
- * Copyright (C) 2017 Moez Bhatti <moez.bhatti@gmail.com>
- *
- * This file is part of QKSMS.
- *
- * QKSMS is free software: you can redistribute it and/or modify
- * it under the terms of the GNU General Public License as published by
- * the Free Software Foundation, either version 3 of the License, or
- * (at your option) any later version.
- *
- * QKSMS is distributed in the hope that it will be useful,
- * but WITHOUT ANY WARRANTY; without even the implied warranty of
- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
- * GNU General Public License for more details.
- *
- * You should have received a copy of the GNU General Public License
- * along with QKSMS.  If not, see <http://www.gnu.org/licenses/>.
- */
-package com.moez.QKSMS.interactor
-
-import com.moez.QKSMS.manager.NotificationManager
-import com.moez.QKSMS.repository.MessageRepository
-import io.reactivex.Flowable
-import javax.inject.Inject
-
-class MarkFailed @Inject constructor(
-    private val messageRepo: MessageRepository,
-    private val notificationManager: NotificationManager
-) : Interactor<MarkFailed.Params>() {
-
-    data class Params(val id: Long, val resultCode: Int)
-
-    override fun buildObservable(params: Params): Flowable<Unit> {
-        return Flowable.just(Unit)
-                .doOnNext { messageRepo.markFailed(params.id, params.resultCode) }
-                .doOnNext { notificationManager.notifyFailed(params.id) }
-    }
-
+/*
+ * Copyright (C) 2017 Moez Bhatti <moez.bhatti@gmail.com>
+ *
+ * This file is part of QKSMS.
+ *
+ * QKSMS is free software: you can redistribute it and/or modify
+ * it under the terms of the GNU General Public License as published by
+ * the Free Software Foundation, either version 3 of the License, or
+ * (at your option) any later version.
+ *
+ * QKSMS is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+ * GNU General Public License for more details.
+ *
+ * You should have received a copy of the GNU General Public License
+ * along with QKSMS.  If not, see <http://www.gnu.org/licenses/>.
+ */
+package com.moez.QKSMS.interactor
+
+import com.moez.QKSMS.manager.NotificationManager
+import com.moez.QKSMS.repository.MessageRepository
+import io.reactivex.Flowable
+import javax.inject.Inject
+
+class MarkFailed @Inject constructor(
+    private val messageRepo: MessageRepository,
+    private val notificationManager: NotificationManager
+) : Interactor<MarkFailed.Params>() {
+
+    data class Params(val id: Long, val resultCode: Int)
+
+    override fun buildObservable(params: Params): Flowable<Unit> {
+        return Flowable.just(Unit)
+                .doOnNext { messageRepo.markFailed(params.id, params.resultCode) }
+                .doOnNext { notificationManager.notifyFailed(params.id) }
+    }
+
 }
\ No newline at end of file
diff --git a/domain/src/main/java/com/moez/QKSMS/interactor/MarkPinned.kt b/domain/src/main/java/com/moez/QKSMS/interactor/MarkPinned.kt
index 781d65a61..5660d9b9f 100644
--- a/domain/src/main/java/com/moez/QKSMS/interactor/MarkPinned.kt
+++ b/domain/src/main/java/com/moez/QKSMS/interactor/MarkPinned.kt
@@ -1,39 +1,39 @@
-/*
- * Copyright (C) 2017 Moez Bhatti <moez.bhatti@gmail.com>
- *
- * This file is part of QKSMS.
- *
- * QKSMS is free software: you can redistribute it and/or modify
- * it under the terms of the GNU General Public License as published by
- * the Free Software Foundation, either version 3 of the License, or
- * (at your option) any later version.
- *
- * QKSMS is distributed in the hope that it will be useful,
- * but WITHOUT ANY WARRANTY; without even the implied warranty of
- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
- * GNU General Public License for more details.
- *
- * You should have received a copy of the GNU General Public License
- * along with QKSMS.  If not, see <http://www.gnu.org/licenses/>.
- */
-package com.moez.QKSMS.interactor
-
-import com.moez.QKSMS.manager.ShortcutManager
-import com.moez.QKSMS.repository.ConversationRepository
-import io.reactivex.Flowable
-import javax.inject.Inject
-
-class MarkPinned @Inject constructor(
-    private val conversationRepo: ConversationRepository,
-    private val updateBadge: UpdateBadge,
-    private val shortcutManager: ShortcutManager
-) : Interactor<List<Long>>() {
-
-    override fun buildObservable(params: List<Long>): Flowable<*> {
-        return Flowable.just(params.toLongArray())
-                .doOnNext { threadIds -> conversationRepo.markPinned(*threadIds) }
-                .doOnNext { shortcutManager.updateShortcuts() } // Update shortcuts
-                .flatMap { updateBadge.buildObservable(Unit) } // Update the badge and widget
-    }
-
-}
+/*
+ * Copyright (C) 2017 Moez Bhatti <moez.bhatti@gmail.com>
+ *
+ * This file is part of QKSMS.
+ *
+ * QKSMS is free software: you can redistribute it and/or modify
+ * it under the terms of the GNU General Public License as published by
+ * the Free Software Foundation, either version 3 of the License, or
+ * (at your option) any later version.
+ *
+ * QKSMS is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+ * GNU General Public License for more details.
+ *
+ * You should have received a copy of the GNU General Public License
+ * along with QKSMS.  If not, see <http://www.gnu.org/licenses/>.
+ */
+package com.moez.QKSMS.interactor
+
+import com.moez.QKSMS.manager.ShortcutManager
+import com.moez.QKSMS.repository.ConversationRepository
+import io.reactivex.Flowable
+import javax.inject.Inject
+
+class MarkPinned @Inject constructor(
+    private val conversationRepo: ConversationRepository,
+    private val updateBadge: UpdateBadge,
+    private val shortcutManager: ShortcutManager
+) : Interactor<List<Long>>() {
+
+    override fun buildObservable(params: List<Long>): Flowable<*> {
+        return Flowable.just(params.toLongArray())
+                .doOnNext { threadIds -> conversationRepo.markPinned(*threadIds) }
+                .doOnNext { shortcutManager.updateShortcuts() } // Update shortcuts
+                .flatMap { updateBadge.buildObservable(Unit) } // Update the badge and widget
+    }
+
+}
diff --git a/domain/src/main/java/com/moez/QKSMS/interactor/MarkRead.kt b/domain/src/main/java/com/moez/QKSMS/interactor/MarkRead.kt
index ff612971b..dc48e5e2d 100644
--- a/domain/src/main/java/com/moez/QKSMS/interactor/MarkRead.kt
+++ b/domain/src/main/java/com/moez/QKSMS/interactor/MarkRead.kt
@@ -1,39 +1,39 @@
-/*
- * Copyright (C) 2017 Moez Bhatti <moez.bhatti@gmail.com>
- *
- * This file is part of QKSMS.
- *
- * QKSMS is free software: you can redistribute it and/or modify
- * it under the terms of the GNU General Public License as published by
- * the Free Software Foundation, either version 3 of the License, or
- * (at your option) any later version.
- *
- * QKSMS is distributed in the hope that it will be useful,
- * but WITHOUT ANY WARRANTY; without even the implied warranty of
- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
- * GNU General Public License for more details.
- *
- * You should have received a copy of the GNU General Public License
- * along with QKSMS.  If not, see <http://www.gnu.org/licenses/>.
- */
-package com.moez.QKSMS.interactor
-
-import com.moez.QKSMS.manager.NotificationManager
-import com.moez.QKSMS.repository.MessageRepository
-import io.reactivex.Flowable
-import javax.inject.Inject
-
-class MarkRead @Inject constructor(
-    private val messageRepo: MessageRepository,
-    private val notificationManager: NotificationManager,
-    private val updateBadge: UpdateBadge
-) : Interactor<List<Long>>() {
-
-    override fun buildObservable(params: List<Long>): Flowable<*> {
-        return Flowable.just(params.toLongArray())
-                .doOnNext { threadIds -> messageRepo.markRead(*threadIds) }
-                .doOnNext { threadIds -> threadIds.forEach(notificationManager::update) }
-                .flatMap { updateBadge.buildObservable(Unit) } // Update the badge
-    }
-
+/*
+ * Copyright (C) 2017 Moez Bhatti <moez.bhatti@gmail.com>
+ *
+ * This file is part of QKSMS.
+ *
+ * QKSMS is free software: you can redistribute it and/or modify
+ * it under the terms of the GNU General Public License as published by
+ * the Free Software Foundation, either version 3 of the License, or
+ * (at your option) any later version.
+ *
+ * QKSMS is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+ * GNU General Public License for more details.
+ *
+ * You should have received a copy of the GNU General Public License
+ * along with QKSMS.  If not, see <http://www.gnu.org/licenses/>.
+ */
+package com.moez.QKSMS.interactor
+
+import com.moez.QKSMS.manager.NotificationManager
+import com.moez.QKSMS.repository.MessageRepository
+import io.reactivex.Flowable
+import javax.inject.Inject
+
+class MarkRead @Inject constructor(
+    private val messageRepo: MessageRepository,
+    private val notificationManager: NotificationManager,
+    private val updateBadge: UpdateBadge
+) : Interactor<List<Long>>() {
+
+    override fun buildObservable(params: List<Long>): Flowable<*> {
+        return Flowable.just(params.toLongArray())
+                .doOnNext { threadIds -> messageRepo.markRead(*threadIds) }
+                .doOnNext { threadIds -> threadIds.forEach(notificationManager::update) }
+                .flatMap { updateBadge.buildObservable(Unit) } // Update the badge
+    }
+
 }
\ No newline at end of file
diff --git a/domain/src/main/java/com/moez/QKSMS/interactor/MarkSeen.kt b/domain/src/main/java/com/moez/QKSMS/interactor/MarkSeen.kt
index 6f58e8cc2..8005f20ab 100644
--- a/domain/src/main/java/com/moez/QKSMS/interactor/MarkSeen.kt
+++ b/domain/src/main/java/com/moez/QKSMS/interactor/MarkSeen.kt
@@ -1,32 +1,32 @@
-/*
- * Copyright (C) 2017 Moez Bhatti <moez.bhatti@gmail.com>
- *
- * This file is part of QKSMS.
- *
- * QKSMS is free software: you can redistribute it and/or modify
- * it under the terms of the GNU General Public License as published by
- * the Free Software Foundation, either version 3 of the License, or
- * (at your option) any later version.
- *
- * QKSMS is distributed in the hope that it will be useful,
- * but WITHOUT ANY WARRANTY; without even the implied warranty of
- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
- * GNU General Public License for more details.
- *
- * You should have received a copy of the GNU General Public License
- * along with QKSMS.  If not, see <http://www.gnu.org/licenses/>.
- */
-package com.moez.QKSMS.interactor
-
-import com.moez.QKSMS.repository.MessageRepository
-import io.reactivex.Flowable
-import javax.inject.Inject
-
-class MarkSeen @Inject constructor(private val messageRepo: MessageRepository) : Interactor<Long>() {
-
-    override fun buildObservable(params: Long): Flowable<Unit> {
-        return Flowable.just(Unit)
-                .doOnNext { messageRepo.markSeen(params) }
-    }
-
+/*
+ * Copyright (C) 2017 Moez Bhatti <moez.bhatti@gmail.com>
+ *
+ * This file is part of QKSMS.
+ *
+ * QKSMS is free software: you can redistribute it and/or modify
+ * it under the terms of the GNU General Public License as published by
+ * the Free Software Foundation, either version 3 of the License, or
+ * (at your option) any later version.
+ *
+ * QKSMS is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+ * GNU General Public License for more details.
+ *
+ * You should have received a copy of the GNU General Public License
+ * along with QKSMS.  If not, see <http://www.gnu.org/licenses/>.
+ */
+package com.moez.QKSMS.interactor
+
+import com.moez.QKSMS.repository.MessageRepository
+import io.reactivex.Flowable
+import javax.inject.Inject
+
+class MarkSeen @Inject constructor(private val messageRepo: MessageRepository) : Interactor<Long>() {
+
+    override fun buildObservable(params: Long): Flowable<Unit> {
+        return Flowable.just(Unit)
+                .doOnNext { messageRepo.markSeen(params) }
+    }
+
 }
\ No newline at end of file
diff --git a/domain/src/main/java/com/moez/QKSMS/interactor/MarkSent.kt b/domain/src/main/java/com/moez/QKSMS/interactor/MarkSent.kt
index 135b597ac..187f60a40 100644
--- a/domain/src/main/java/com/moez/QKSMS/interactor/MarkSent.kt
+++ b/domain/src/main/java/com/moez/QKSMS/interactor/MarkSent.kt
@@ -1,32 +1,32 @@
-/*
- * Copyright (C) 2017 Moez Bhatti <moez.bhatti@gmail.com>
- *
- * This file is part of QKSMS.
- *
- * QKSMS is free software: you can redistribute it and/or modify
- * it under the terms of the GNU General Public License as published by
- * the Free Software Foundation, either version 3 of the License, or
- * (at your option) any later version.
- *
- * QKSMS is distributed in the hope that it will be useful,
- * but WITHOUT ANY WARRANTY; without even the implied warranty of
- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
- * GNU General Public License for more details.
- *
- * You should have received a copy of the GNU General Public License
- * along with QKSMS.  If not, see <http://www.gnu.org/licenses/>.
- */
-package com.moez.QKSMS.interactor
-
-import com.moez.QKSMS.repository.MessageRepository
-import io.reactivex.Flowable
-import javax.inject.Inject
-
-class MarkSent @Inject constructor(private val messageRepo: MessageRepository) : Interactor<Long>() {
-
-    override fun buildObservable(params: Long): Flowable<Unit> {
-        return Flowable.just(Unit)
-                .doOnNext { messageRepo.markSent(params) }
-    }
-
+/*
+ * Copyright (C) 2017 Moez Bhatti <moez.bhatti@gmail.com>
+ *
+ * This file is part of QKSMS.
+ *
+ * QKSMS is free software: you can redistribute it and/or modify
+ * it under the terms of the GNU General Public License as published by
+ * the Free Software Foundation, either version 3 of the License, or
+ * (at your option) any later version.
+ *
+ * QKSMS is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+ * GNU General Public License for more details.
+ *
+ * You should have received a copy of the GNU General Public License
+ * along with QKSMS.  If not, see <http://www.gnu.org/licenses/>.
+ */
+package com.moez.QKSMS.interactor
+
+import com.moez.QKSMS.repository.MessageRepository
+import io.reactivex.Flowable
+import javax.inject.Inject
+
+class MarkSent @Inject constructor(private val messageRepo: MessageRepository) : Interactor<Long>() {
+
+    override fun buildObservable(params: Long): Flowable<Unit> {
+        return Flowable.just(Unit)
+                .doOnNext { messageRepo.markSent(params) }
+    }
+
 }
\ No newline at end of file
diff --git a/domain/src/main/java/com/moez/QKSMS/interactor/MarkUnarchived.kt b/domain/src/main/java/com/moez/QKSMS/interactor/MarkUnarchived.kt
index 19aecf4f6..17b66f798 100644
--- a/domain/src/main/java/com/moez/QKSMS/interactor/MarkUnarchived.kt
+++ b/domain/src/main/java/com/moez/QKSMS/interactor/MarkUnarchived.kt
@@ -1,32 +1,32 @@
-/*
- * Copyright (C) 2017 Moez Bhatti <moez.bhatti@gmail.com>
- *
- * This file is part of QKSMS.
- *
- * QKSMS is free software: you can redistribute it and/or modify
- * it under the terms of the GNU General Public License as published by
- * the Free Software Foundation, either version 3 of the License, or
- * (at your option) any later version.
- *
- * QKSMS is distributed in the hope that it will be useful,
- * but WITHOUT ANY WARRANTY; without even the implied warranty of
- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
- * GNU General Public License for more details.
- *
- * You should have received a copy of the GNU General Public License
- * along with QKSMS.  If not, see <http://www.gnu.org/licenses/>.
- */
-package com.moez.QKSMS.interactor
-
-import com.moez.QKSMS.repository.ConversationRepository
-import io.reactivex.Flowable
-import javax.inject.Inject
-
-class MarkUnarchived @Inject constructor(private val conversationRepo: ConversationRepository) : Interactor<List<Long>>() {
-
-    override fun buildObservable(params: List<Long>): Flowable<*> {
-        return Flowable.just(params.toLongArray())
-                .doOnNext { threadIds -> conversationRepo.markUnarchived(*threadIds) }
-    }
-
+/*
+ * Copyright (C) 2017 Moez Bhatti <moez.bhatti@gmail.com>
+ *
+ * This file is part of QKSMS.
+ *
+ * QKSMS is free software: you can redistribute it and/or modify
+ * it under the terms of the GNU General Public License as published by
+ * the Free Software Foundation, either version 3 of the License, or
+ * (at your option) any later version.
+ *
+ * QKSMS is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+ * GNU General Public License for more details.
+ *
+ * You should have received a copy of the GNU General Public License
+ * along with QKSMS.  If not, see <http://www.gnu.org/licenses/>.
+ */
+package com.moez.QKSMS.interactor
+
+import com.moez.QKSMS.repository.ConversationRepository
+import io.reactivex.Flowable
+import javax.inject.Inject
+
+class MarkUnarchived @Inject constructor(private val conversationRepo: ConversationRepository) : Interactor<List<Long>>() {
+
+    override fun buildObservable(params: List<Long>): Flowable<*> {
+        return Flowable.just(params.toLongArray())
+                .doOnNext { threadIds -> conversationRepo.markUnarchived(*threadIds) }
+    }
+
 }
\ No newline at end of file
diff --git a/domain/src/main/java/com/moez/QKSMS/interactor/MarkUnblocked.kt b/domain/src/main/java/com/moez/QKSMS/interactor/MarkUnblocked.kt
index e92e60900..972b49367 100644
--- a/domain/src/main/java/com/moez/QKSMS/interactor/MarkUnblocked.kt
+++ b/domain/src/main/java/com/moez/QKSMS/interactor/MarkUnblocked.kt
@@ -1,32 +1,32 @@
-/*
- * Copyright (C) 2017 Moez Bhatti <moez.bhatti@gmail.com>
- *
- * This file is part of QKSMS.
- *
- * QKSMS is free software: you can redistribute it and/or modify
- * it under the terms of the GNU General Public License as published by
- * the Free Software Foundation, either version 3 of the License, or
- * (at your option) any later version.
- *
- * QKSMS is distributed in the hope that it will be useful,
- * but WITHOUT ANY WARRANTY; without even the implied warranty of
- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
- * GNU General Public License for more details.
- *
- * You should have received a copy of the GNU General Public License
- * along with QKSMS.  If not, see <http://www.gnu.org/licenses/>.
- */
-package com.moez.QKSMS.interactor
-
-import com.moez.QKSMS.repository.ConversationRepository
-import io.reactivex.Flowable
-import javax.inject.Inject
-
-class MarkUnblocked @Inject constructor(private val conversationRepo: ConversationRepository) : Interactor<List<Long>>() {
-
-    override fun buildObservable(params: List<Long>): Flowable<*> {
-        return Flowable.just(params.toLongArray())
-                .doOnNext { threadIds -> conversationRepo.markUnblocked(*threadIds) }
-    }
-
+/*
+ * Copyright (C) 2017 Moez Bhatti <moez.bhatti@gmail.com>
+ *
+ * This file is part of QKSMS.
+ *
+ * QKSMS is free software: you can redistribute it and/or modify
+ * it under the terms of the GNU General Public License as published by
+ * the Free Software Foundation, either version 3 of the License, or
+ * (at your option) any later version.
+ *
+ * QKSMS is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+ * GNU General Public License for more details.
+ *
+ * You should have received a copy of the GNU General Public License
+ * along with QKSMS.  If not, see <http://www.gnu.org/licenses/>.
+ */
+package com.moez.QKSMS.interactor
+
+import com.moez.QKSMS.repository.ConversationRepository
+import io.reactivex.Flowable
+import javax.inject.Inject
+
+class MarkUnblocked @Inject constructor(private val conversationRepo: ConversationRepository) : Interactor<List<Long>>() {
+
+    override fun buildObservable(params: List<Long>): Flowable<*> {
+        return Flowable.just(params.toLongArray())
+                .doOnNext { threadIds -> conversationRepo.markUnblocked(*threadIds) }
+    }
+
 }
\ No newline at end of file
diff --git a/domain/src/main/java/com/moez/QKSMS/interactor/MarkUnpinned.kt b/domain/src/main/java/com/moez/QKSMS/interactor/MarkUnpinned.kt
index 2cbb5e7bd..f503bb486 100644
--- a/domain/src/main/java/com/moez/QKSMS/interactor/MarkUnpinned.kt
+++ b/domain/src/main/java/com/moez/QKSMS/interactor/MarkUnpinned.kt
@@ -1,39 +1,39 @@
-/*
- * Copyright (C) 2017 Moez Bhatti <moez.bhatti@gmail.com>
- *
- * This file is part of QKSMS.
- *
- * QKSMS is free software: you can redistribute it and/or modify
- * it under the terms of the GNU General Public License as published by
- * the Free Software Foundation, either version 3 of the License, or
- * (at your option) any later version.
- *
- * QKSMS is distributed in the hope that it will be useful,
- * but WITHOUT ANY WARRANTY; without even the implied warranty of
- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
- * GNU General Public License for more details.
- *
- * You should have received a copy of the GNU General Public License
- * along with QKSMS.  If not, see <http://www.gnu.org/licenses/>.
- */
-package com.moez.QKSMS.interactor
-
-import com.moez.QKSMS.manager.ShortcutManager
-import com.moez.QKSMS.repository.ConversationRepository
-import io.reactivex.Flowable
-import javax.inject.Inject
-
-class MarkUnpinned @Inject constructor(
-    private val conversationRepo: ConversationRepository,
-    private val updateBadge: UpdateBadge,
-    private val shortcutManager: ShortcutManager
-) : Interactor<List<Long>>() {
-
-    override fun buildObservable(params: List<Long>): Flowable<*> {
-        return Flowable.just(params.toLongArray())
-                .doOnNext { threadIds -> conversationRepo.markUnpinned(*threadIds) }
-                .doOnNext { shortcutManager.updateShortcuts() } // Update shortcuts
-                .flatMap { updateBadge.buildObservable(Unit) } // Update the badge and widget
-    }
-
-}
+/*
+ * Copyright (C) 2017 Moez Bhatti <moez.bhatti@gmail.com>
+ *
+ * This file is part of QKSMS.
+ *
+ * QKSMS is free software: you can redistribute it and/or modify
+ * it under the terms of the GNU General Public License as published by
+ * the Free Software Foundation, either version 3 of the License, or
+ * (at your option) any later version.
+ *
+ * QKSMS is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+ * GNU General Public License for more details.
+ *
+ * You should have received a copy of the GNU General Public License
+ * along with QKSMS.  If not, see <http://www.gnu.org/licenses/>.
+ */
+package com.moez.QKSMS.interactor
+
+import com.moez.QKSMS.manager.ShortcutManager
+import com.moez.QKSMS.repository.ConversationRepository
+import io.reactivex.Flowable
+import javax.inject.Inject
+
+class MarkUnpinned @Inject constructor(
+    private val conversationRepo: ConversationRepository,
+    private val updateBadge: UpdateBadge,
+    private val shortcutManager: ShortcutManager
+) : Interactor<List<Long>>() {
+
+    override fun buildObservable(params: List<Long>): Flowable<*> {
+        return Flowable.just(params.toLongArray())
+                .doOnNext { threadIds -> conversationRepo.markUnpinned(*threadIds) }
+                .doOnNext { shortcutManager.updateShortcuts() } // Update shortcuts
+                .flatMap { updateBadge.buildObservable(Unit) } // Update the badge and widget
+    }
+
+}
diff --git a/domain/src/main/java/com/moez/QKSMS/interactor/MarkUnread.kt b/domain/src/main/java/com/moez/QKSMS/interactor/MarkUnread.kt
index b9e3964d6..f11c376d8 100644
--- a/domain/src/main/java/com/moez/QKSMS/interactor/MarkUnread.kt
+++ b/domain/src/main/java/com/moez/QKSMS/interactor/MarkUnread.kt
@@ -1,36 +1,36 @@
-/*
- * Copyright (C) 2017 Moez Bhatti <moez.bhatti@gmail.com>
- *
- * This file is part of QKSMS.
- *
- * QKSMS is free software: you can redistribute it and/or modify
- * it under the terms of the GNU General Public License as published by
- * the Free Software Foundation, either version 3 of the License, or
- * (at your option) any later version.
- *
- * QKSMS is distributed in the hope that it will be useful,
- * but WITHOUT ANY WARRANTY; without even the implied warranty of
- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
- * GNU General Public License for more details.
- *
- * You should have received a copy of the GNU General Public License
- * along with QKSMS.  If not, see <http://www.gnu.org/licenses/>.
- */
-package com.moez.QKSMS.interactor
-
-import com.moez.QKSMS.repository.MessageRepository
-import io.reactivex.Flowable
-import javax.inject.Inject
-
-class MarkUnread @Inject constructor(
-    private val messageRepo: MessageRepository,
-    private val updateBadge: UpdateBadge
-) : Interactor<List<Long>>() {
-
-    override fun buildObservable(params: List<Long>): Flowable<*> {
-        return Flowable.just(params.toLongArray())
-                .doOnNext { threadId -> messageRepo.markUnread(*threadId) }
-                .flatMap { updateBadge.buildObservable(Unit) } // Update the badge
-    }
-
+/*
+ * Copyright (C) 2017 Moez Bhatti <moez.bhatti@gmail.com>
+ *
+ * This file is part of QKSMS.
+ *
+ * QKSMS is free software: you can redistribute it and/or modify
+ * it under the terms of the GNU General Public License as published by
+ * the Free Software Foundation, either version 3 of the License, or
+ * (at your option) any later version.
+ *
+ * QKSMS is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+ * GNU General Public License for more details.
+ *
+ * You should have received a copy of the GNU General Public License
+ * along with QKSMS.  If not, see <http://www.gnu.org/licenses/>.
+ */
+package com.moez.QKSMS.interactor
+
+import com.moez.QKSMS.repository.MessageRepository
+import io.reactivex.Flowable
+import javax.inject.Inject
+
+class MarkUnread @Inject constructor(
+    private val messageRepo: MessageRepository,
+    private val updateBadge: UpdateBadge
+) : Interactor<List<Long>>() {
+
+    override fun buildObservable(params: List<Long>): Flowable<*> {
+        return Flowable.just(params.toLongArray())
+                .doOnNext { threadId -> messageRepo.markUnread(*threadId) }
+                .flatMap { updateBadge.buildObservable(Unit) } // Update the badge
+    }
+
 }
\ No newline at end of file
diff --git a/domain/src/main/java/com/moez/QKSMS/interactor/PerformBackup.kt b/domain/src/main/java/com/moez/QKSMS/interactor/PerformBackup.kt
index e0b60695f..5d2d3dea8 100644
--- a/domain/src/main/java/com/moez/QKSMS/interactor/PerformBackup.kt
+++ b/domain/src/main/java/com/moez/QKSMS/interactor/PerformBackup.kt
@@ -1,34 +1,34 @@
-/*
- * Copyright (C) 2017 Moez Bhatti <moez.bhatti@gmail.com>
- *
- * This file is part of QKSMS.
- *
- * QKSMS is free software: you can redistribute it and/or modify
- * it under the terms of the GNU General Public License as published by
- * the Free Software Foundation, either version 3 of the License, or
- * (at your option) any later version.
- *
- * QKSMS is distributed in the hope that it will be useful,
- * but WITHOUT ANY WARRANTY; without even the implied warranty of
- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
- * GNU General Public License for more details.
- *
- * You should have received a copy of the GNU General Public License
- * along with QKSMS.  If not, see <http://www.gnu.org/licenses/>.
- */
-package com.moez.QKSMS.interactor
-
-import com.moez.QKSMS.repository.BackupRepository
-import io.reactivex.Flowable
-import javax.inject.Inject
-
-class PerformBackup @Inject constructor(
-    private val backupRepo: BackupRepository
-) : Interactor<Unit>() {
-
-    override fun buildObservable(params: Unit): Flowable<*> {
-        return Flowable.just(params)
-                .doOnNext { backupRepo.performBackup() }
-    }
-
+/*
+ * Copyright (C) 2017 Moez Bhatti <moez.bhatti@gmail.com>
+ *
+ * This file is part of QKSMS.
+ *
+ * QKSMS is free software: you can redistribute it and/or modify
+ * it under the terms of the GNU General Public License as published by
+ * the Free Software Foundation, either version 3 of the License, or
+ * (at your option) any later version.
+ *
+ * QKSMS is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+ * GNU General Public License for more details.
+ *
+ * You should have received a copy of the GNU General Public License
+ * along with QKSMS.  If not, see <http://www.gnu.org/licenses/>.
+ */
+package com.moez.QKSMS.interactor
+
+import com.moez.QKSMS.repository.BackupRepository
+import io.reactivex.Flowable
+import javax.inject.Inject
+
+class PerformBackup @Inject constructor(
+    private val backupRepo: BackupRepository
+) : Interactor<Unit>() {
+
+    override fun buildObservable(params: Unit): Flowable<*> {
+        return Flowable.just(params)
+                .doOnNext { backupRepo.performBackup() }
+    }
+
 }
\ No newline at end of file
diff --git a/domain/src/main/java/com/moez/QKSMS/interactor/PerformRestore.kt b/domain/src/main/java/com/moez/QKSMS/interactor/PerformRestore.kt
index 03ef3ca19..c4e93e775 100644
--- a/domain/src/main/java/com/moez/QKSMS/interactor/PerformRestore.kt
+++ b/domain/src/main/java/com/moez/QKSMS/interactor/PerformRestore.kt
@@ -1,34 +1,34 @@
-/*
- * Copyright (C) 2017 Moez Bhatti <moez.bhatti@gmail.com>
- *
- * This file is part of QKSMS.
- *
- * QKSMS is free software: you can redistribute it and/or modify
- * it under the terms of the GNU General Public License as published by
- * the Free Software Foundation, either version 3 of the License, or
- * (at your option) any later version.
- *
- * QKSMS is distributed in the hope that it will be useful,
- * but WITHOUT ANY WARRANTY; without even the implied warranty of
- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
- * GNU General Public License for more details.
- *
- * You should have received a copy of the GNU General Public License
- * along with QKSMS.  If not, see <http://www.gnu.org/licenses/>.
- */
-package com.moez.QKSMS.interactor
-
-import com.moez.QKSMS.repository.BackupRepository
-import io.reactivex.Flowable
-import javax.inject.Inject
-
-class PerformRestore @Inject constructor(
-    private val backupRepo: BackupRepository
-) : Interactor<String>() {
-
-    override fun buildObservable(params: String): Flowable<*> {
-        return Flowable.just(params)
-                .doOnNext(backupRepo::performRestore)
-    }
-
+/*
+ * Copyright (C) 2017 Moez Bhatti <moez.bhatti@gmail.com>
+ *
+ * This file is part of QKSMS.
+ *
+ * QKSMS is free software: you can redistribute it and/or modify
+ * it under the terms of the GNU General Public License as published by
+ * the Free Software Foundation, either version 3 of the License, or
+ * (at your option) any later version.
+ *
+ * QKSMS is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+ * GNU General Public License for more details.
+ *
+ * You should have received a copy of the GNU General Public License
+ * along with QKSMS.  If not, see <http://www.gnu.org/licenses/>.
+ */
+package com.moez.QKSMS.interactor
+
+import com.moez.QKSMS.repository.BackupRepository
+import io.reactivex.Flowable
+import javax.inject.Inject
+
+class PerformRestore @Inject constructor(
+    private val backupRepo: BackupRepository
+) : Interactor<String>() {
+
+    override fun buildObservable(params: String): Flowable<*> {
+        return Flowable.just(params)
+                .doOnNext(backupRepo::performRestore)
+    }
+
 }
\ No newline at end of file
diff --git a/domain/src/main/java/com/moez/QKSMS/interactor/ReceiveMms.kt b/domain/src/main/java/com/moez/QKSMS/interactor/ReceiveMms.kt
index 0d1ff0838..64690c3d5 100644
--- a/domain/src/main/java/com/moez/QKSMS/interactor/ReceiveMms.kt
+++ b/domain/src/main/java/com/moez/QKSMS/interactor/ReceiveMms.kt
@@ -1,96 +1,96 @@
-/*
- * Copyright (C) 2017 Moez Bhatti <moez.bhatti@gmail.com>
- *
- * This file is part of QKSMS.
- *
- * QKSMS is free software: you can redistribute it and/or modify
- * it under the terms of the GNU General Public License as published by
- * the Free Software Foundation, either version 3 of the License, or
- * (at your option) any later version.
- *
- * QKSMS is distributed in the hope that it will be useful,
- * but WITHOUT ANY WARRANTY; without even the implied warranty of
- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
- * GNU General Public License for more details.
- *
- * You should have received a copy of the GNU General Public License
- * along with QKSMS.  If not, see <http://www.gnu.org/licenses/>.
- */
-package com.moez.QKSMS.interactor
-
-import android.net.Uri
-import com.moez.QKSMS.blocking.BlockingClient
-import com.moez.QKSMS.extensions.mapNotNull
-import com.moez.QKSMS.manager.ActiveConversationManager
-import com.moez.QKSMS.manager.NotificationManager
-import com.moez.QKSMS.repository.ConversationRepository
-import com.moez.QKSMS.repository.MessageRepository
-import com.moez.QKSMS.repository.SyncRepository
-import com.moez.QKSMS.util.Preferences
-import io.reactivex.Flowable
-import timber.log.Timber
-import javax.inject.Inject
-
-class ReceiveMms @Inject constructor(
-    private val activeConversationManager: ActiveConversationManager,
-    private val conversationRepo: ConversationRepository,
-    private val blockingClient: BlockingClient,
-    private val prefs: Preferences,
-    private val syncManager: SyncRepository,
-    private val messageRepo: MessageRepository,
-    private val notificationManager: NotificationManager,
-    private val updateBadge: UpdateBadge
-) : Interactor<Uri>() {
-
-    override fun buildObservable(params: Uri): Flowable<*> {
-        return Flowable.just(params)
-                .mapNotNull(syncManager::syncMessage) // Sync the message
-                .doOnNext { message ->
-                    // TODO: Ideally this is done when we're saving the MMS to ContentResolver
-                    // This change can be made once we move the MMS storing code to the Data module
-                    if (activeConversationManager.getActiveConversation() == message.threadId) {
-                        messageRepo.markRead(message.threadId)
-                    }
-                }
-                .mapNotNull { message ->
-                    // Because we use the smsmms library for receiving and storing MMS, we'll need
-                    // to check if it should be blocked after we've pulled it into realm. If it
-                    // turns out that it should be dropped, then delete it
-                    // TODO Don't store blocked messages in the first place
-                    val action = blockingClient.getAction(message.address).blockingGet()
-                    val shouldDrop = prefs.drop.get()
-                    Timber.v("block=$action, drop=$shouldDrop")
-
-                    if (action is BlockingClient.Action.Block && shouldDrop) {
-                        messageRepo.deleteMessages(message.id)
-                        return@mapNotNull null
-                    }
-
-                    when (action) {
-                        is BlockingClient.Action.Block -> {
-                            messageRepo.markRead(message.threadId)
-                            conversationRepo.markBlocked(listOf(message.threadId), prefs.blockingManager.get(), action.reason)
-                        }
-                        is BlockingClient.Action.Unblock -> conversationRepo.markUnblocked(message.threadId)
-                        else -> Unit
-                    }
-
-                    message
-                }
-                .doOnNext { message ->
-                    conversationRepo.updateConversations(message.threadId) // Update the conversation
-                }
-                .mapNotNull { message ->
-                    conversationRepo.getOrCreateConversation(message.threadId) // Map message to conversation
-                }
-                .filter { conversation -> !conversation.blocked } // Don't notify for blocked conversations
-                .doOnNext { conversation ->
-                    // Unarchive conversation if necessary
-                    if (conversation.archived) conversationRepo.markUnarchived(conversation.id)
-                }
-                .map { conversation -> conversation.id } // Map to the id because [delay] will put us on the wrong thread
-                .doOnNext(notificationManager::update) // Update the notification
-                .flatMap { updateBadge.buildObservable(Unit) } // Update the badge
-    }
-
+/*
+ * Copyright (C) 2017 Moez Bhatti <moez.bhatti@gmail.com>
+ *
+ * This file is part of QKSMS.
+ *
+ * QKSMS is free software: you can redistribute it and/or modify
+ * it under the terms of the GNU General Public License as published by
+ * the Free Software Foundation, either version 3 of the License, or
+ * (at your option) any later version.
+ *
+ * QKSMS is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+ * GNU General Public License for more details.
+ *
+ * You should have received a copy of the GNU General Public License
+ * along with QKSMS.  If not, see <http://www.gnu.org/licenses/>.
+ */
+package com.moez.QKSMS.interactor
+
+import android.net.Uri
+import com.moez.QKSMS.blocking.BlockingClient
+import com.moez.QKSMS.extensions.mapNotNull
+import com.moez.QKSMS.manager.ActiveConversationManager
+import com.moez.QKSMS.manager.NotificationManager
+import com.moez.QKSMS.repository.ConversationRepository
+import com.moez.QKSMS.repository.MessageRepository
+import com.moez.QKSMS.repository.SyncRepository
+import com.moez.QKSMS.util.Preferences
+import io.reactivex.Flowable
+import timber.log.Timber
+import javax.inject.Inject
+
+class ReceiveMms @Inject constructor(
+    private val activeConversationManager: ActiveConversationManager,
+    private val conversationRepo: ConversationRepository,
+    private val blockingClient: BlockingClient,
+    private val prefs: Preferences,
+    private val syncManager: SyncRepository,
+    private val messageRepo: MessageRepository,
+    private val notificationManager: NotificationManager,
+    private val updateBadge: UpdateBadge
+) : Interactor<Uri>() {
+
+    override fun buildObservable(params: Uri): Flowable<*> {
+        return Flowable.just(params)
+                .mapNotNull(syncManager::syncMessage) // Sync the message
+                .doOnNext { message ->
+                    // TODO: Ideally this is done when we're saving the MMS to ContentResolver
+                    // This change can be made once we move the MMS storing code to the Data module
+                    if (activeConversationManager.getActiveConversation() == message.threadId) {
+                        messageRepo.markRead(message.threadId)
+                    }
+                }
+                .mapNotNull { message ->
+                    // Because we use the smsmms library for receiving and storing MMS, we'll need
+                    // to check if it should be blocked after we've pulled it into realm. If it
+                    // turns out that it should be dropped, then delete it
+                    // TODO Don't store blocked messages in the first place
+                    val action = blockingClient.getAction(message.address).blockingGet()
+                    val shouldDrop = prefs.drop.get()
+                    Timber.v("block=$action, drop=$shouldDrop")
+
+                    if (action is BlockingClient.Action.Block && shouldDrop) {
+                        messageRepo.deleteMessages(message.id)
+                        return@mapNotNull null
+                    }
+
+                    when (action) {
+                        is BlockingClient.Action.Block -> {
+                            messageRepo.markRead(message.threadId)
+                            conversationRepo.markBlocked(listOf(message.threadId), prefs.blockingManager.get(), action.reason)
+                        }
+                        is BlockingClient.Action.Unblock -> conversationRepo.markUnblocked(message.threadId)
+                        else -> Unit
+                    }
+
+                    message
+                }
+                .doOnNext { message ->
+                    conversationRepo.updateConversations(message.threadId) // Update the conversation
+                }
+                .mapNotNull { message ->
+                    conversationRepo.getOrCreateConversation(message.threadId) // Map message to conversation
+                }
+                .filter { conversation -> !conversation.blocked } // Don't notify for blocked conversations
+                .doOnNext { conversation ->
+                    // Unarchive conversation if necessary
+                    if (conversation.archived) conversationRepo.markUnarchived(conversation.id)
+                }
+                .map { conversation -> conversation.id } // Map to the id because [delay] will put us on the wrong thread
+                .doOnNext(notificationManager::update) // Update the notification
+                .flatMap { updateBadge.buildObservable(Unit) } // Update the badge
+    }
+
 }
\ No newline at end of file
diff --git a/domain/src/main/java/com/moez/QKSMS/interactor/ReceiveSms.kt b/domain/src/main/java/com/moez/QKSMS/interactor/ReceiveSms.kt
index f2b4c6d34..65ea4228a 100644
--- a/domain/src/main/java/com/moez/QKSMS/interactor/ReceiveSms.kt
+++ b/domain/src/main/java/com/moez/QKSMS/interactor/ReceiveSms.kt
@@ -1,97 +1,97 @@
-/*
- * Copyright (C) 2017 Moez Bhatti <moez.bhatti@gmail.com>
- *
- * This file is part of QKSMS.
- *
- * QKSMS is free software: you can redistribute it and/or modify
- * it under the terms of the GNU General Public License as published by
- * the Free Software Foundation, either version 3 of the License, or
- * (at your option) any later version.
- *
- * QKSMS is distributed in the hope that it will be useful,
- * but WITHOUT ANY WARRANTY; without even the implied warranty of
- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
- * GNU General Public License for more details.
- *
- * You should have received a copy of the GNU General Public License
- * along with QKSMS.  If not, see <http://www.gnu.org/licenses/>.
- */
-package com.moez.QKSMS.interactor
-
-import android.telephony.SmsMessage
-import com.moez.QKSMS.blocking.BlockingClient
-import com.moez.QKSMS.extensions.mapNotNull
-import com.moez.QKSMS.manager.NotificationManager
-import com.moez.QKSMS.manager.ShortcutManager
-import com.moez.QKSMS.repository.ConversationRepository
-import com.moez.QKSMS.repository.MessageRepository
-import com.moez.QKSMS.util.Preferences
-import io.reactivex.Flowable
-import timber.log.Timber
-import javax.inject.Inject
-
-class ReceiveSms @Inject constructor(
-    private val conversationRepo: ConversationRepository,
-    private val blockingClient: BlockingClient,
-    private val prefs: Preferences,
-    private val messageRepo: MessageRepository,
-    private val notificationManager: NotificationManager,
-    private val updateBadge: UpdateBadge,
-    private val shortcutManager: ShortcutManager
-) : Interactor<ReceiveSms.Params>() {
-
-    class Params(val subId: Int, val messages: Array<SmsMessage>)
-
-    override fun buildObservable(params: Params): Flowable<*> {
-        return Flowable.just(params)
-                .filter { it.messages.isNotEmpty() }
-                .mapNotNull {
-                    // Don't continue if the sender is blocked
-                    val messages = it.messages
-                    val address = messages[0].displayOriginatingAddress
-                    val action = blockingClient.getAction(address).blockingGet()
-                    val shouldDrop = prefs.drop.get()
-                    Timber.v("block=$action, drop=$shouldDrop")
-
-                    // If we should drop the message, don't even save it
-                    if (action is BlockingClient.Action.Block && shouldDrop) {
-                        return@mapNotNull null
-                    }
-
-                    val time = messages[0].timestampMillis
-                    val body: String = messages
-                            .mapNotNull { message -> message.displayMessageBody }
-                            .reduce { body, new -> body + new }
-
-                    // Add the message to the db
-                    val message = messageRepo.insertReceivedSms(it.subId, address, body, time)
-
-                    when (action) {
-                        is BlockingClient.Action.Block -> {
-                            messageRepo.markRead(message.threadId)
-                            conversationRepo.markBlocked(listOf(message.threadId), prefs.blockingManager.get(), action.reason)
-                        }
-                        is BlockingClient.Action.Unblock -> conversationRepo.markUnblocked(message.threadId)
-                        else -> Unit
-                    }
-
-                    message
-                }
-                .doOnNext { message ->
-                    conversationRepo.updateConversations(message.threadId) // Update the conversation
-                }
-                .mapNotNull { message ->
-                    conversationRepo.getOrCreateConversation(message.threadId) // Map message to conversation
-                }
-                .filter { conversation -> !conversation.blocked } // Don't notify for blocked conversations
-                .doOnNext { conversation ->
-                    // Unarchive conversation if necessary
-                    if (conversation.archived) conversationRepo.markUnarchived(conversation.id)
-                }
-                .map { conversation -> conversation.id } // Map to the id because [delay] will put us on the wrong thread
-                .doOnNext { threadId -> notificationManager.update(threadId) } // Update the notification
-                .doOnNext { shortcutManager.updateShortcuts() } // Update shortcuts
-                .flatMap { updateBadge.buildObservable(Unit) } // Update the badge and widget
-    }
-
-}
+/*
+ * Copyright (C) 2017 Moez Bhatti <moez.bhatti@gmail.com>
+ *
+ * This file is part of QKSMS.
+ *
+ * QKSMS is free software: you can redistribute it and/or modify
+ * it under the terms of the GNU General Public License as published by
+ * the Free Software Foundation, either version 3 of the License, or
+ * (at your option) any later version.
+ *
+ * QKSMS is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+ * GNU General Public License for more details.
+ *
+ * You should have received a copy of the GNU General Public License
+ * along with QKSMS.  If not, see <http://www.gnu.org/licenses/>.
+ */
+package com.moez.QKSMS.interactor
+
+import android.telephony.SmsMessage
+import com.moez.QKSMS.blocking.BlockingClient
+import com.moez.QKSMS.extensions.mapNotNull
+import com.moez.QKSMS.manager.NotificationManager
+import com.moez.QKSMS.manager.ShortcutManager
+import com.moez.QKSMS.repository.ConversationRepository
+import com.moez.QKSMS.repository.MessageRepository
+import com.moez.QKSMS.util.Preferences
+import io.reactivex.Flowable
+import timber.log.Timber
+import javax.inject.Inject
+
+class ReceiveSms @Inject constructor(
+    private val conversationRepo: ConversationRepository,
+    private val blockingClient: BlockingClient,
+    private val prefs: Preferences,
+    private val messageRepo: MessageRepository,
+    private val notificationManager: NotificationManager,
+    private val updateBadge: UpdateBadge,
+    private val shortcutManager: ShortcutManager
+) : Interactor<ReceiveSms.Params>() {
+
+    class Params(val subId: Int, val messages: Array<SmsMessage>)
+
+    override fun buildObservable(params: Params): Flowable<*> {
+        return Flowable.just(params)
+                .filter { it.messages.isNotEmpty() }
+                .mapNotNull {
+                    // Don't continue if the sender is blocked
+                    val messages = it.messages
+                    val address = messages[0].displayOriginatingAddress
+                    val action = blockingClient.getAction(address).blockingGet()
+                    val shouldDrop = prefs.drop.get()
+                    Timber.v("block=$action, drop=$shouldDrop")
+
+                    // If we should drop the message, don't even save it
+                    if (action is BlockingClient.Action.Block && shouldDrop) {
+                        return@mapNotNull null
+                    }
+
+                    val time = messages[0].timestampMillis
+                    val body: String = messages
+                            .mapNotNull { message -> message.displayMessageBody }
+                            .reduce { body, new -> body + new }
+
+                    // Add the message to the db
+                    val message = messageRepo.insertReceivedSms(it.subId, address, body, time)
+
+                    when (action) {
+                        is BlockingClient.Action.Block -> {
+                            messageRepo.markRead(message.threadId)
+                            conversationRepo.markBlocked(listOf(message.threadId), prefs.blockingManager.get(), action.reason)
+                        }
+                        is BlockingClient.Action.Unblock -> conversationRepo.markUnblocked(message.threadId)
+                        else -> Unit
+                    }
+
+                    message
+                }
+                .doOnNext { message ->
+                    conversationRepo.updateConversations(message.threadId) // Update the conversation
+                }
+                .mapNotNull { message ->
+                    conversationRepo.getOrCreateConversation(message.threadId) // Map message to conversation
+                }
+                .filter { conversation -> !conversation.blocked } // Don't notify for blocked conversations
+                .doOnNext { conversation ->
+                    // Unarchive conversation if necessary
+                    if (conversation.archived) conversationRepo.markUnarchived(conversation.id)
+                }
+                .map { conversation -> conversation.id } // Map to the id because [delay] will put us on the wrong thread
+                .doOnNext { threadId -> notificationManager.update(threadId) } // Update the notification
+                .doOnNext { shortcutManager.updateShortcuts() } // Update shortcuts
+                .flatMap { updateBadge.buildObservable(Unit) } // Update the badge and widget
+    }
+
+}
diff --git a/domain/src/main/java/com/moez/QKSMS/interactor/RetrySending.kt b/domain/src/main/java/com/moez/QKSMS/interactor/RetrySending.kt
index 71818f3de..2275657e2 100644
--- a/domain/src/main/java/com/moez/QKSMS/interactor/RetrySending.kt
+++ b/domain/src/main/java/com/moez/QKSMS/interactor/RetrySending.kt
@@ -1,41 +1,41 @@
-/*
- * Copyright (C) 2017 Moez Bhatti <moez.bhatti@gmail.com>
- *
- * This file is part of QKSMS.
- *
- * QKSMS is free software: you can redistribute it and/or modify
- * it under the terms of the GNU General Public License as published by
- * the Free Software Foundation, either version 3 of the License, or
- * (at your option) any later version.
- *
- * QKSMS is distributed in the hope that it will be useful,
- * but WITHOUT ANY WARRANTY; without even the implied warranty of
- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
- * GNU General Public License for more details.
- *
- * You should have received a copy of the GNU General Public License
- * along with QKSMS.  If not, see <http://www.gnu.org/licenses/>.
- */
-package com.moez.QKSMS.interactor
-
-import com.moez.QKSMS.extensions.mapNotNull
-import com.moez.QKSMS.model.Message
-import com.moez.QKSMS.repository.MessageRepository
-import io.reactivex.Flowable
-import javax.inject.Inject
-
-class RetrySending @Inject constructor(private val messageRepo: MessageRepository) : Interactor<Long>() {
-
-    override fun buildObservable(params: Long): Flowable<Message> {
-        return Flowable.just(params)
-                .doOnNext(messageRepo::markSending)
-                .mapNotNull(messageRepo::getMessage)
-                .doOnNext { message ->
-                    when (message.isSms()) {
-                        true -> messageRepo.sendSms(message)
-                        false -> messageRepo.resendMms(message)
-                    }
-                }
-    }
-
-}
+/*
+ * Copyright (C) 2017 Moez Bhatti <moez.bhatti@gmail.com>
+ *
+ * This file is part of QKSMS.
+ *
+ * QKSMS is free software: you can redistribute it and/or modify
+ * it under the terms of the GNU General Public License as published by
+ * the Free Software Foundation, either version 3 of the License, or
+ * (at your option) any later version.
+ *
+ * QKSMS is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+ * GNU General Public License for more details.
+ *
+ * You should have received a copy of the GNU General Public License
+ * along with QKSMS.  If not, see <http://www.gnu.org/licenses/>.
+ */
+package com.moez.QKSMS.interactor
+
+import com.moez.QKSMS.extensions.mapNotNull
+import com.moez.QKSMS.model.Message
+import com.moez.QKSMS.repository.MessageRepository
+import io.reactivex.Flowable
+import javax.inject.Inject
+
+class RetrySending @Inject constructor(private val messageRepo: MessageRepository) : Interactor<Long>() {
+
+    override fun buildObservable(params: Long): Flowable<Message> {
+        return Flowable.just(params)
+                .doOnNext(messageRepo::markSending)
+                .mapNotNull(messageRepo::getMessage)
+                .doOnNext { message ->
+                    when (message.isSms()) {
+                        true -> messageRepo.sendSms(message)
+                        false -> messageRepo.resendMms(message)
+                    }
+                }
+    }
+
+}
diff --git a/domain/src/main/java/com/moez/QKSMS/interactor/SaveImage.kt b/domain/src/main/java/com/moez/QKSMS/interactor/SaveImage.kt
index 3c5e5838c..4cad562e2 100644
--- a/domain/src/main/java/com/moez/QKSMS/interactor/SaveImage.kt
+++ b/domain/src/main/java/com/moez/QKSMS/interactor/SaveImage.kt
@@ -1,34 +1,34 @@
-/*
- * Copyright (C) 2017 Moez Bhatti <moez.bhatti@gmail.com>
- *
- * This file is part of QKSMS.
- *
- * QKSMS is free software: you can redistribute it and/or modify
- * it under the terms of the GNU General Public License as published by
- * the Free Software Foundation, either version 3 of the License, or
- * (at your option) any later version.
- *
- * QKSMS is distributed in the hope that it will be useful,
- * but WITHOUT ANY WARRANTY; without even the implied warranty of
- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
- * GNU General Public License for more details.
- *
- * You should have received a copy of the GNU General Public License
- * along with QKSMS.  If not, see <http://www.gnu.org/licenses/>.
- */
-package com.moez.QKSMS.interactor
-
-import com.moez.QKSMS.repository.MessageRepository
-import io.reactivex.Flowable
-import javax.inject.Inject
-
-class SaveImage @Inject constructor(
-    private val messageRepo: MessageRepository
-) : Interactor<Long>() {
-
-    override fun buildObservable(params: Long): Flowable<*> {
-        return Flowable.just(params)
-                .doOnNext { partId -> messageRepo.savePart(partId) }
-    }
-
+/*
+ * Copyright (C) 2017 Moez Bhatti <moez.bhatti@gmail.com>
+ *
+ * This file is part of QKSMS.
+ *
+ * QKSMS is free software: you can redistribute it and/or modify
+ * it under the terms of the GNU General Public License as published by
+ * the Free Software Foundation, either version 3 of the License, or
+ * (at your option) any later version.
+ *
+ * QKSMS is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+ * GNU General Public License for more details.
+ *
+ * You should have received a copy of the GNU General Public License
+ * along with QKSMS.  If not, see <http://www.gnu.org/licenses/>.
+ */
+package com.moez.QKSMS.interactor
+
+import com.moez.QKSMS.repository.MessageRepository
+import io.reactivex.Flowable
+import javax.inject.Inject
+
+class SaveImage @Inject constructor(
+    private val messageRepo: MessageRepository
+) : Interactor<Long>() {
+
+    override fun buildObservable(params: Long): Flowable<*> {
+        return Flowable.just(params)
+                .doOnNext { partId -> messageRepo.savePart(partId) }
+    }
+
 }
\ No newline at end of file
diff --git a/domain/src/main/java/com/moez/QKSMS/interactor/SendMessage.kt b/domain/src/main/java/com/moez/QKSMS/interactor/SendMessage.kt
index 6018670dc..ce1b482d3 100644
--- a/domain/src/main/java/com/moez/QKSMS/interactor/SendMessage.kt
+++ b/domain/src/main/java/com/moez/QKSMS/interactor/SendMessage.kt
@@ -1,69 +1,69 @@
-/*
- * Copyright (C) 2017 Moez Bhatti <moez.bhatti@gmail.com>
- *
- * This file is part of QKSMS.
- *
- * QKSMS is free software: you can redistribute it and/or modify
- * it under the terms of the GNU General Public License as published by
- * the Free Software Foundation, either version 3 of the License, or
- * (at your option) any later version.
- *
- * QKSMS is distributed in the hope that it will be useful,
- * but WITHOUT ANY WARRANTY; without even the implied warranty of
- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
- * GNU General Public License for more details.
- *
- * You should have received a copy of the GNU General Public License
- * along with QKSMS.  If not, see <http://www.gnu.org/licenses/>.
- */
-package com.moez.QKSMS.interactor
-
-import android.content.Context
-import com.moez.QKSMS.compat.TelephonyCompat
-import com.moez.QKSMS.extensions.mapNotNull
-import com.moez.QKSMS.model.Attachment
-import com.moez.QKSMS.repository.ConversationRepository
-import com.moez.QKSMS.repository.MessageRepository
-import io.reactivex.Flowable
-import javax.inject.Inject
-
-class SendMessage @Inject constructor(
-    private val context: Context,
-    private val conversationRepo: ConversationRepository,
-    private val messageRepo: MessageRepository,
-    private val updateBadge: UpdateBadge
-) : Interactor<SendMessage.Params>() {
-
-    data class Params(
-        val subId: Int,
-        val threadId: Long,
-        val addresses: List<String>,
-        val body: String,
-        val attachments: List<Attachment> = listOf(),
-        val delay: Int = 0
-    )
-
-    override fun buildObservable(params: Params): Flowable<*> = Flowable.just(Unit)
-            .filter { params.addresses.isNotEmpty() }
-            .doOnNext {
-                // If a threadId isn't provided, try to obtain one
-                val threadId = when (params.threadId) {
-                    0L -> TelephonyCompat.getOrCreateThreadId(context, params.addresses.toSet())
-                    else -> params.threadId
-                }
-                messageRepo.sendMessage(params.subId, threadId, params.addresses, params.body, params.attachments,
-                        params.delay)
-            }
-            .mapNotNull {
-                // If the threadId wasn't provided, then it's probably because it doesn't exist in Realm.
-                // Sync it now and get the id
-                when (params.threadId) {
-                    0L -> conversationRepo.getOrCreateConversation(params.addresses)?.id
-                    else -> params.threadId
-                }
-            }
-            .doOnNext { threadId -> conversationRepo.updateConversations(threadId) }
-            .doOnNext { threadId -> conversationRepo.markUnarchived(threadId) }
-            .flatMap { updateBadge.buildObservable(Unit) } // Update the widget
-
+/*
+ * Copyright (C) 2017 Moez Bhatti <moez.bhatti@gmail.com>
+ *
+ * This file is part of QKSMS.
+ *
+ * QKSMS is free software: you can redistribute it and/or modify
+ * it under the terms of the GNU General Public License as published by
+ * the Free Software Foundation, either version 3 of the License, or
+ * (at your option) any later version.
+ *
+ * QKSMS is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+ * GNU General Public License for more details.
+ *
+ * You should have received a copy of the GNU General Public License
+ * along with QKSMS.  If not, see <http://www.gnu.org/licenses/>.
+ */
+package com.moez.QKSMS.interactor
+
+import android.content.Context
+import com.moez.QKSMS.compat.TelephonyCompat
+import com.moez.QKSMS.extensions.mapNotNull
+import com.moez.QKSMS.model.Attachment
+import com.moez.QKSMS.repository.ConversationRepository
+import com.moez.QKSMS.repository.MessageRepository
+import io.reactivex.Flowable
+import javax.inject.Inject
+
+class SendMessage @Inject constructor(
+    private val context: Context,
+    private val conversationRepo: ConversationRepository,
+    private val messageRepo: MessageRepository,
+    private val updateBadge: UpdateBadge
+) : Interactor<SendMessage.Params>() {
+
+    data class Params(
+        val subId: Int,
+        val threadId: Long,
+        val addresses: List<String>,
+        val body: String,
+        val attachments: List<Attachment> = listOf(),
+        val delay: Int = 0
+    )
+
+    override fun buildObservable(params: Params): Flowable<*> = Flowable.just(Unit)
+            .filter { params.addresses.isNotEmpty() }
+            .doOnNext {
+                // If a threadId isn't provided, try to obtain one
+                val threadId = when (params.threadId) {
+                    0L -> TelephonyCompat.getOrCreateThreadId(context, params.addresses.toSet())
+                    else -> params.threadId
+                }
+                messageRepo.sendMessage(params.subId, threadId, params.addresses, params.body, params.attachments,
+                        params.delay)
+            }
+            .mapNotNull {
+                // If the threadId wasn't provided, then it's probably because it doesn't exist in Realm.
+                // Sync it now and get the id
+                when (params.threadId) {
+                    0L -> conversationRepo.getOrCreateConversation(params.addresses)?.id
+                    else -> params.threadId
+                }
+            }
+            .doOnNext { threadId -> conversationRepo.updateConversations(threadId) }
+            .doOnNext { threadId -> conversationRepo.markUnarchived(threadId) }
+            .flatMap { updateBadge.buildObservable(Unit) } // Update the widget
+
 }
\ No newline at end of file
diff --git a/domain/src/main/java/com/moez/QKSMS/interactor/SendScheduledMessage.kt b/domain/src/main/java/com/moez/QKSMS/interactor/SendScheduledMessage.kt
index 00a3ef091..43bb143d7 100644
--- a/domain/src/main/java/com/moez/QKSMS/interactor/SendScheduledMessage.kt
+++ b/domain/src/main/java/com/moez/QKSMS/interactor/SendScheduledMessage.kt
@@ -1,57 +1,57 @@
-/*
- * Copyright (C) 2017 Moez Bhatti <moez.bhatti@gmail.com>
- *
- * This file is part of QKSMS.
- *
- * QKSMS is free software: you can redistribute it and/or modify
- * it under the terms of the GNU General Public License as published by
- * the Free Software Foundation, either version 3 of the License, or
- * (at your option) any later version.
- *
- * QKSMS is distributed in the hope that it will be useful,
- * but WITHOUT ANY WARRANTY; without even the implied warranty of
- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
- * GNU General Public License for more details.
- *
- * You should have received a copy of the GNU General Public License
- * along with QKSMS.  If not, see <http://www.gnu.org/licenses/>.
- */
-package com.moez.QKSMS.interactor
-
-import android.content.Context
-import android.net.Uri
-import com.moez.QKSMS.compat.TelephonyCompat
-import com.moez.QKSMS.extensions.mapNotNull
-import com.moez.QKSMS.model.Attachment
-import com.moez.QKSMS.repository.ScheduledMessageRepository
-import io.reactivex.Flowable
-import io.reactivex.rxkotlin.toFlowable
-import io.realm.RealmList
-import javax.inject.Inject
-
-class SendScheduledMessage @Inject constructor(
-    private val context: Context,
-    private val scheduledMessageRepo: ScheduledMessageRepository,
-    private val sendMessage: SendMessage
-) : Interactor<Long>() {
-
-    override fun buildObservable(params: Long): Flowable<*> {
-        return Flowable.just(params)
-                .mapNotNull(scheduledMessageRepo::getScheduledMessage)
-                .flatMap { message ->
-                    if (message.sendAsGroup) {
-                        listOf(message)
-                    } else {
-                        message.recipients.map { recipient -> message.copy(recipients = RealmList(recipient)) }
-                    }.toFlowable()
-                }
-                .map { message ->
-                    val threadId = TelephonyCompat.getOrCreateThreadId(context, message.recipients)
-                    val attachments = message.attachments.mapNotNull(Uri::parse).map { Attachment.Image(it) }
-                    SendMessage.Params(message.subId, threadId, message.recipients, message.body, attachments)
-                }
-                .flatMap(sendMessage::buildObservable)
-                .doOnNext { scheduledMessageRepo.deleteScheduledMessage(params) }
-    }
-
+/*
+ * Copyright (C) 2017 Moez Bhatti <moez.bhatti@gmail.com>
+ *
+ * This file is part of QKSMS.
+ *
+ * QKSMS is free software: you can redistribute it and/or modify
+ * it under the terms of the GNU General Public License as published by
+ * the Free Software Foundation, either version 3 of the License, or
+ * (at your option) any later version.
+ *
+ * QKSMS is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+ * GNU General Public License for more details.
+ *
+ * You should have received a copy of the GNU General Public License
+ * along with QKSMS.  If not, see <http://www.gnu.org/licenses/>.
+ */
+package com.moez.QKSMS.interactor
+
+import android.content.Context
+import android.net.Uri
+import com.moez.QKSMS.compat.TelephonyCompat
+import com.moez.QKSMS.extensions.mapNotNull
+import com.moez.QKSMS.model.Attachment
+import com.moez.QKSMS.repository.ScheduledMessageRepository
+import io.reactivex.Flowable
+import io.reactivex.rxkotlin.toFlowable
+import io.realm.RealmList
+import javax.inject.Inject
+
+class SendScheduledMessage @Inject constructor(
+    private val context: Context,
+    private val scheduledMessageRepo: ScheduledMessageRepository,
+    private val sendMessage: SendMessage
+) : Interactor<Long>() {
+
+    override fun buildObservable(params: Long): Flowable<*> {
+        return Flowable.just(params)
+                .mapNotNull(scheduledMessageRepo::getScheduledMessage)
+                .flatMap { message ->
+                    if (message.sendAsGroup) {
+                        listOf(message)
+                    } else {
+                        message.recipients.map { recipient -> message.copy(recipients = RealmList(recipient)) }
+                    }.toFlowable()
+                }
+                .map { message ->
+                    val threadId = TelephonyCompat.getOrCreateThreadId(context, message.recipients)
+                    val attachments = message.attachments.mapNotNull(Uri::parse).map { Attachment.Image(it) }
+                    SendMessage.Params(message.subId, threadId, message.recipients, message.body, attachments)
+                }
+                .flatMap(sendMessage::buildObservable)
+                .doOnNext { scheduledMessageRepo.deleteScheduledMessage(params) }
+    }
+
 }
\ No newline at end of file
diff --git a/domain/src/main/java/com/moez/QKSMS/interactor/SetDefaultPhoneNumber.kt b/domain/src/main/java/com/moez/QKSMS/interactor/SetDefaultPhoneNumber.kt
index 639c15426..5a59f0441 100644
--- a/domain/src/main/java/com/moez/QKSMS/interactor/SetDefaultPhoneNumber.kt
+++ b/domain/src/main/java/com/moez/QKSMS/interactor/SetDefaultPhoneNumber.kt
@@ -1,38 +1,38 @@
-/*
- * Copyright (C) 2019 Moez Bhatti <moez.bhatti@gmail.com>
- *
- * This file is part of QKSMS.
- *
- * QKSMS is free software: you can redistribute it and/or modify
- * it under the terms of the GNU General Public License as published by
- * the Free Software Foundation, either version 3 of the License, or
- * (at your option) any later version.
- *
- * QKSMS is distributed in the hope that it will be useful,
- * but WITHOUT ANY WARRANTY; without even the implied warranty of
- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
- * GNU General Public License for more details.
- *
- * You should have received a copy of the GNU General Public License
- * along with QKSMS.  If not, see <http://www.gnu.org/licenses/>.
- */
-package com.moez.QKSMS.interactor
-
-import com.moez.QKSMS.repository.ContactRepository
-import io.reactivex.Flowable
-import javax.inject.Inject
-
-class SetDefaultPhoneNumber @Inject constructor(
-    private val contactRepo: ContactRepository
-) : Interactor<SetDefaultPhoneNumber.Params>() {
-
-    data class Params(val lookupKey: String, val phoneNumberId: Long)
-
-    override fun buildObservable(params: Params): Flowable<*> {
-        return Flowable.just(params)
-                .doOnNext { (lookupKey, phoneNumberId) ->
-                    contactRepo.setDefaultPhoneNumber(lookupKey, phoneNumberId)
-                }
-    }
-
-}
+/*
+ * Copyright (C) 2019 Moez Bhatti <moez.bhatti@gmail.com>
+ *
+ * This file is part of QKSMS.
+ *
+ * QKSMS is free software: you can redistribute it and/or modify
+ * it under the terms of the GNU General Public License as published by
+ * the Free Software Foundation, either version 3 of the License, or
+ * (at your option) any later version.
+ *
+ * QKSMS is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+ * GNU General Public License for more details.
+ *
+ * You should have received a copy of the GNU General Public License
+ * along with QKSMS.  If not, see <http://www.gnu.org/licenses/>.
+ */
+package com.moez.QKSMS.interactor
+
+import com.moez.QKSMS.repository.ContactRepository
+import io.reactivex.Flowable
+import javax.inject.Inject
+
+class SetDefaultPhoneNumber @Inject constructor(
+    private val contactRepo: ContactRepository
+) : Interactor<SetDefaultPhoneNumber.Params>() {
+
+    data class Params(val lookupKey: String, val phoneNumberId: Long)
+
+    override fun buildObservable(params: Params): Flowable<*> {
+        return Flowable.just(params)
+                .doOnNext { (lookupKey, phoneNumberId) ->
+                    contactRepo.setDefaultPhoneNumber(lookupKey, phoneNumberId)
+                }
+    }
+
+}
diff --git a/domain/src/main/java/com/moez/QKSMS/interactor/SyncContacts.kt b/domain/src/main/java/com/moez/QKSMS/interactor/SyncContacts.kt
index 45fd8874e..a6f896ba4 100644
--- a/domain/src/main/java/com/moez/QKSMS/interactor/SyncContacts.kt
+++ b/domain/src/main/java/com/moez/QKSMS/interactor/SyncContacts.kt
@@ -1,35 +1,35 @@
-/*
- * Copyright (C) 2017 Moez Bhatti <moez.bhatti@gmail.com>
- *
- * This file is part of QKSMS.
- *
- * QKSMS is free software: you can redistribute it and/or modify
- * it under the terms of the GNU General Public License as published by
- * the Free Software Foundation, either version 3 of the License, or
- * (at your option) any later version.
- *
- * QKSMS is distributed in the hope that it will be useful,
- * but WITHOUT ANY WARRANTY; without even the implied warranty of
- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
- * GNU General Public License for more details.
- *
- * You should have received a copy of the GNU General Public License
- * along with QKSMS.  If not, see <http://www.gnu.org/licenses/>.
- */
-package com.moez.QKSMS.interactor
-
-import com.moez.QKSMS.repository.SyncRepository
-import io.reactivex.Flowable
-import timber.log.Timber
-import javax.inject.Inject
-
-class SyncContacts @Inject constructor(private val syncManager: SyncRepository) : Interactor<Unit>() {
-
-    override fun buildObservable(params: Unit): Flowable<Long> {
-        return Flowable.just(System.currentTimeMillis())
-                .doOnNext { syncManager.syncContacts() }
-                .map { startTime -> System.currentTimeMillis() - startTime }
-                .doOnNext { duration -> Timber.v("Completed sync in ${duration}ms") }
-    }
-
+/*
+ * Copyright (C) 2017 Moez Bhatti <moez.bhatti@gmail.com>
+ *
+ * This file is part of QKSMS.
+ *
+ * QKSMS is free software: you can redistribute it and/or modify
+ * it under the terms of the GNU General Public License as published by
+ * the Free Software Foundation, either version 3 of the License, or
+ * (at your option) any later version.
+ *
+ * QKSMS is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+ * GNU General Public License for more details.
+ *
+ * You should have received a copy of the GNU General Public License
+ * along with QKSMS.  If not, see <http://www.gnu.org/licenses/>.
+ */
+package com.moez.QKSMS.interactor
+
+import com.moez.QKSMS.repository.SyncRepository
+import io.reactivex.Flowable
+import timber.log.Timber
+import javax.inject.Inject
+
+class SyncContacts @Inject constructor(private val syncManager: SyncRepository) : Interactor<Unit>() {
+
+    override fun buildObservable(params: Unit): Flowable<Long> {
+        return Flowable.just(System.currentTimeMillis())
+                .doOnNext { syncManager.syncContacts() }
+                .map { startTime -> System.currentTimeMillis() - startTime }
+                .doOnNext { duration -> Timber.v("Completed sync in ${duration}ms") }
+    }
+
 }
\ No newline at end of file
diff --git a/domain/src/main/java/com/moez/QKSMS/interactor/SyncMessage.kt b/domain/src/main/java/com/moez/QKSMS/interactor/SyncMessage.kt
index 9aa9e0eb9..9e616288c 100644
--- a/domain/src/main/java/com/moez/QKSMS/interactor/SyncMessage.kt
+++ b/domain/src/main/java/com/moez/QKSMS/interactor/SyncMessage.kt
@@ -1,41 +1,41 @@
-/*
- * Copyright (C) 2017 Moez Bhatti <moez.bhatti@gmail.com>
- *
- * This file is part of QKSMS.
- *
- * QKSMS is free software: you can redistribute it and/or modify
- * it under the terms of the GNU General Public License as published by
- * the Free Software Foundation, either version 3 of the License, or
- * (at your option) any later version.
- *
- * QKSMS is distributed in the hope that it will be useful,
- * but WITHOUT ANY WARRANTY; without even the implied warranty of
- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
- * GNU General Public License for more details.
- *
- * You should have received a copy of the GNU General Public License
- * along with QKSMS.  If not, see <http://www.gnu.org/licenses/>.
- */
-package com.moez.QKSMS.interactor
-
-import android.net.Uri
-import com.moez.QKSMS.extensions.mapNotNull
-import com.moez.QKSMS.repository.ConversationRepository
-import com.moez.QKSMS.repository.SyncRepository
-import io.reactivex.Flowable
-import javax.inject.Inject
-
-class SyncMessage @Inject constructor(
-    private val conversationRepo: ConversationRepository,
-    private val syncManager: SyncRepository,
-    private val updateBadge: UpdateBadge
-) : Interactor<Uri>() {
-
-    override fun buildObservable(params: Uri): Flowable<*> {
-        return Flowable.just(params)
-                .mapNotNull { uri -> syncManager.syncMessage(uri) }
-                .doOnNext { message -> conversationRepo.updateConversations(message.threadId) }
-                .flatMap { updateBadge.buildObservable(Unit) } // Update the badge
-    }
-
+/*
+ * Copyright (C) 2017 Moez Bhatti <moez.bhatti@gmail.com>
+ *
+ * This file is part of QKSMS.
+ *
+ * QKSMS is free software: you can redistribute it and/or modify
+ * it under the terms of the GNU General Public License as published by
+ * the Free Software Foundation, either version 3 of the License, or
+ * (at your option) any later version.
+ *
+ * QKSMS is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+ * GNU General Public License for more details.
+ *
+ * You should have received a copy of the GNU General Public License
+ * along with QKSMS.  If not, see <http://www.gnu.org/licenses/>.
+ */
+package com.moez.QKSMS.interactor
+
+import android.net.Uri
+import com.moez.QKSMS.extensions.mapNotNull
+import com.moez.QKSMS.repository.ConversationRepository
+import com.moez.QKSMS.repository.SyncRepository
+import io.reactivex.Flowable
+import javax.inject.Inject
+
+class SyncMessage @Inject constructor(
+    private val conversationRepo: ConversationRepository,
+    private val syncManager: SyncRepository,
+    private val updateBadge: UpdateBadge
+) : Interactor<Uri>() {
+
+    override fun buildObservable(params: Uri): Flowable<*> {
+        return Flowable.just(params)
+                .mapNotNull { uri -> syncManager.syncMessage(uri) }
+                .doOnNext { message -> conversationRepo.updateConversations(message.threadId) }
+                .flatMap { updateBadge.buildObservable(Unit) } // Update the badge
+    }
+
 }
\ No newline at end of file
diff --git a/domain/src/main/java/com/moez/QKSMS/interactor/SyncMessages.kt b/domain/src/main/java/com/moez/QKSMS/interactor/SyncMessages.kt
index 66acd4e26..99e2b3ef5 100644
--- a/domain/src/main/java/com/moez/QKSMS/interactor/SyncMessages.kt
+++ b/domain/src/main/java/com/moez/QKSMS/interactor/SyncMessages.kt
@@ -1,41 +1,41 @@
-/*
- * Copyright (C) 2017 Moez Bhatti <moez.bhatti@gmail.com>
- *
- * This file is part of QKSMS.
- *
- * QKSMS is free software: you can redistribute it and/or modify
- * it under the terms of the GNU General Public License as published by
- * the Free Software Foundation, either version 3 of the License, or
- * (at your option) any later version.
- *
- * QKSMS is distributed in the hope that it will be useful,
- * but WITHOUT ANY WARRANTY; without even the implied warranty of
- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
- * GNU General Public License for more details.
- *
- * You should have received a copy of the GNU General Public License
- * along with QKSMS.  If not, see <http://www.gnu.org/licenses/>.
- */
-package com.moez.QKSMS.interactor
-
-import com.moez.QKSMS.repository.SyncRepository
-import io.reactivex.Flowable
-import timber.log.Timber
-import java.util.concurrent.TimeUnit
-import javax.inject.Inject
-
-class SyncMessages @Inject constructor(
-    private val syncManager: SyncRepository,
-    private val updateBadge: UpdateBadge
-) : Interactor<Unit>() {
-
-    override fun buildObservable(params: Unit): Flowable<*> {
-        return Flowable.just(System.currentTimeMillis())
-                .doOnNext { syncManager.syncMessages() }
-                .map { startTime -> System.currentTimeMillis() - startTime }
-                .map { elapsed -> TimeUnit.MILLISECONDS.toSeconds(elapsed) }
-                .doOnNext { seconds -> Timber.v("Completed sync in $seconds seconds") }
-                .flatMap { updateBadge.buildObservable(Unit) } // Update the badge
-    }
-
+/*
+ * Copyright (C) 2017 Moez Bhatti <moez.bhatti@gmail.com>
+ *
+ * This file is part of QKSMS.
+ *
+ * QKSMS is free software: you can redistribute it and/or modify
+ * it under the terms of the GNU General Public License as published by
+ * the Free Software Foundation, either version 3 of the License, or
+ * (at your option) any later version.
+ *
+ * QKSMS is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+ * GNU General Public License for more details.
+ *
+ * You should have received a copy of the GNU General Public License
+ * along with QKSMS.  If not, see <http://www.gnu.org/licenses/>.
+ */
+package com.moez.QKSMS.interactor
+
+import com.moez.QKSMS.repository.SyncRepository
+import io.reactivex.Flowable
+import timber.log.Timber
+import java.util.concurrent.TimeUnit
+import javax.inject.Inject
+
+class SyncMessages @Inject constructor(
+    private val syncManager: SyncRepository,
+    private val updateBadge: UpdateBadge
+) : Interactor<Unit>() {
+
+    override fun buildObservable(params: Unit): Flowable<*> {
+        return Flowable.just(System.currentTimeMillis())
+                .doOnNext { syncManager.syncMessages() }
+                .map { startTime -> System.currentTimeMillis() - startTime }
+                .map { elapsed -> TimeUnit.MILLISECONDS.toSeconds(elapsed) }
+                .doOnNext { seconds -> Timber.v("Completed sync in $seconds seconds") }
+                .flatMap { updateBadge.buildObservable(Unit) } // Update the badge
+    }
+
 }
\ No newline at end of file
diff --git a/domain/src/main/java/com/moez/QKSMS/interactor/UpdateBadge.kt b/domain/src/main/java/com/moez/QKSMS/interactor/UpdateBadge.kt
index 7359e6592..500093e13 100644
--- a/domain/src/main/java/com/moez/QKSMS/interactor/UpdateBadge.kt
+++ b/domain/src/main/java/com/moez/QKSMS/interactor/UpdateBadge.kt
@@ -1,37 +1,37 @@
-/*
- * Copyright (C) 2017 Moez Bhatti <moez.bhatti@gmail.com>
- *
- * This file is part of QKSMS.
- *
- * QKSMS is free software: you can redistribute it and/or modify
- * it under the terms of the GNU General Public License as published by
- * the Free Software Foundation, either version 3 of the License, or
- * (at your option) any later version.
- *
- * QKSMS is distributed in the hope that it will be useful,
- * but WITHOUT ANY WARRANTY; without even the implied warranty of
- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
- * GNU General Public License for more details.
- *
- * You should have received a copy of the GNU General Public License
- * along with QKSMS.  If not, see <http://www.gnu.org/licenses/>.
- */
-package com.moez.QKSMS.interactor
-
-import com.moez.QKSMS.manager.ShortcutManager
-import com.moez.QKSMS.manager.WidgetManager
-import io.reactivex.Flowable
-import javax.inject.Inject
-
-class UpdateBadge @Inject constructor(
-    private val shortcutManager: ShortcutManager,
-    private val widgetManager: WidgetManager
-) : Interactor<Unit>() {
-
-    override fun buildObservable(params: Unit): Flowable<*> {
-        return Flowable.just(params)
-                .doOnNext { shortcutManager.updateBadge() }
-                .doOnNext { widgetManager.updateUnreadCount() }
-    }
-
+/*
+ * Copyright (C) 2017 Moez Bhatti <moez.bhatti@gmail.com>
+ *
+ * This file is part of QKSMS.
+ *
+ * QKSMS is free software: you can redistribute it and/or modify
+ * it under the terms of the GNU General Public License as published by
+ * the Free Software Foundation, either version 3 of the License, or
+ * (at your option) any later version.
+ *
+ * QKSMS is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+ * GNU General Public License for more details.
+ *
+ * You should have received a copy of the GNU General Public License
+ * along with QKSMS.  If not, see <http://www.gnu.org/licenses/>.
+ */
+package com.moez.QKSMS.interactor
+
+import com.moez.QKSMS.manager.ShortcutManager
+import com.moez.QKSMS.manager.WidgetManager
+import io.reactivex.Flowable
+import javax.inject.Inject
+
+class UpdateBadge @Inject constructor(
+    private val shortcutManager: ShortcutManager,
+    private val widgetManager: WidgetManager
+) : Interactor<Unit>() {
+
+    override fun buildObservable(params: Unit): Flowable<*> {
+        return Flowable.just(params)
+                .doOnNext { shortcutManager.updateBadge() }
+                .doOnNext { widgetManager.updateUnreadCount() }
+    }
+
 }
\ No newline at end of file
diff --git a/domain/src/main/java/com/moez/QKSMS/interactor/UpdateScheduledMessageAlarms.kt b/domain/src/main/java/com/moez/QKSMS/interactor/UpdateScheduledMessageAlarms.kt
index 5b8ab1cad..113d00094 100644
--- a/domain/src/main/java/com/moez/QKSMS/interactor/UpdateScheduledMessageAlarms.kt
+++ b/domain/src/main/java/com/moez/QKSMS/interactor/UpdateScheduledMessageAlarms.kt
@@ -1,44 +1,44 @@
-/*
- * Copyright (C) 2017 Moez Bhatti <moez.bhatti@gmail.com>
- *
- * This file is part of QKSMS.
- *
- * QKSMS is free software: you can redistribute it and/or modify
- * it under the terms of the GNU General Public License as published by
- * the Free Software Foundation, either version 3 of the License, or
- * (at your option) any later version.
- *
- * QKSMS is distributed in the hope that it will be useful,
- * but WITHOUT ANY WARRANTY; without even the implied warranty of
- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
- * GNU General Public License for more details.
- *
- * You should have received a copy of the GNU General Public License
- * along with QKSMS.  If not, see <http://www.gnu.org/licenses/>.
- */
-package com.moez.QKSMS.interactor
-
-import com.moez.QKSMS.manager.AlarmManager
-import com.moez.QKSMS.repository.ScheduledMessageRepository
-import io.reactivex.Flowable
-import javax.inject.Inject
-
-class UpdateScheduledMessageAlarms @Inject constructor(
-    private val alarmManager: AlarmManager,
-    private val scheduledMessageRepo: ScheduledMessageRepository,
-    private val sendScheduledMessage: SendScheduledMessage
-) : Interactor<Unit>() {
-
-    override fun buildObservable(params: Unit): Flowable<*> {
-        return Flowable.just(params)
-                .map { scheduledMessageRepo.getScheduledMessages() } // Get all the scheduled messages
-                .map { it.map { message -> Pair(message.id, message.date) } } // Map the data we need out of Realm
-                .flatMap { messages -> Flowable.fromIterable(messages) } // Turn the list into a stream
-                .doOnNext { (id, date) ->
-                    alarmManager.setAlarm(date, alarmManager.getScheduledMessageIntent(id)) // Create alarm
-                }
-                .filter { (_, date) -> date < System.currentTimeMillis() } // Filter messages that should have already been sent
-                .flatMap { (id, _) -> sendScheduledMessage.buildObservable(id) } // Send them
-    }
-
+/*
+ * Copyright (C) 2017 Moez Bhatti <moez.bhatti@gmail.com>
+ *
+ * This file is part of QKSMS.
+ *
+ * QKSMS is free software: you can redistribute it and/or modify
+ * it under the terms of the GNU General Public License as published by
+ * the Free Software Foundation, either version 3 of the License, or
+ * (at your option) any later version.
+ *
+ * QKSMS is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+ * GNU General Public License for more details.
+ *
+ * You should have received a copy of the GNU General Public License
+ * along with QKSMS.  If not, see <http://www.gnu.org/licenses/>.
+ */
+package com.moez.QKSMS.interactor
+
+import com.moez.QKSMS.manager.AlarmManager
+import com.moez.QKSMS.repository.ScheduledMessageRepository
+import io.reactivex.Flowable
+import javax.inject.Inject
+
+class UpdateScheduledMessageAlarms @Inject constructor(
+    private val alarmManager: AlarmManager,
+    private val scheduledMessageRepo: ScheduledMessageRepository,
+    private val sendScheduledMessage: SendScheduledMessage
+) : Interactor<Unit>() {
+
+    override fun buildObservable(params: Unit): Flowable<*> {
+        return Flowable.just(params)
+                .map { scheduledMessageRepo.getScheduledMessages() } // Get all the scheduled messages
+                .map { it.map { message -> Pair(message.id, message.date) } } // Map the data we need out of Realm
+                .flatMap { messages -> Flowable.fromIterable(messages) } // Turn the list into a stream
+                .doOnNext { (id, date) ->
+                    alarmManager.setAlarm(date, alarmManager.getScheduledMessageIntent(id)) // Create alarm
+                }
+                .filter { (_, date) -> date < System.currentTimeMillis() } // Filter messages that should have already been sent
+                .flatMap { (id, _) -> sendScheduledMessage.buildObservable(id) } // Send them
+    }
+
 }
\ No newline at end of file
diff --git a/domain/src/main/java/com/moez/QKSMS/listener/ContactAddedListener.kt b/domain/src/main/java/com/moez/QKSMS/listener/ContactAddedListener.kt
index 800d83460..06af0874d 100644
--- a/domain/src/main/java/com/moez/QKSMS/listener/ContactAddedListener.kt
+++ b/domain/src/main/java/com/moez/QKSMS/listener/ContactAddedListener.kt
@@ -1,27 +1,27 @@
-/*
- * Copyright (C) 2017 Moez Bhatti <moez.bhatti@gmail.com>
- *
- * This file is part of QKSMS.
- *
- * QKSMS is free software: you can redistribute it and/or modify
- * it under the terms of the GNU General Public License as published by
- * the Free Software Foundation, either version 3 of the License, or
- * (at your option) any later version.
- *
- * QKSMS is distributed in the hope that it will be useful,
- * but WITHOUT ANY WARRANTY; without even the implied warranty of
- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
- * GNU General Public License for more details.
- *
- * You should have received a copy of the GNU General Public License
- * along with QKSMS.  If not, see <http://www.gnu.org/licenses/>.
- */
-package com.moez.QKSMS.listener
-
-import io.reactivex.Observable
-
-interface ContactAddedListener {
-
-    fun listen(): Observable<*>
-
-}
+/*
+ * Copyright (C) 2017 Moez Bhatti <moez.bhatti@gmail.com>
+ *
+ * This file is part of QKSMS.
+ *
+ * QKSMS is free software: you can redistribute it and/or modify
+ * it under the terms of the GNU General Public License as published by
+ * the Free Software Foundation, either version 3 of the License, or
+ * (at your option) any later version.
+ *
+ * QKSMS is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+ * GNU General Public License for more details.
+ *
+ * You should have received a copy of the GNU General Public License
+ * along with QKSMS.  If not, see <http://www.gnu.org/licenses/>.
+ */
+package com.moez.QKSMS.listener
+
+import io.reactivex.Observable
+
+interface ContactAddedListener {
+
+    fun listen(): Observable<*>
+
+}
diff --git a/domain/src/main/java/com/moez/QKSMS/manager/ActiveConversationManager.kt b/domain/src/main/java/com/moez/QKSMS/manager/ActiveConversationManager.kt
index 4ed432d4c..5a714475a 100644
--- a/domain/src/main/java/com/moez/QKSMS/manager/ActiveConversationManager.kt
+++ b/domain/src/main/java/com/moez/QKSMS/manager/ActiveConversationManager.kt
@@ -1,32 +1,32 @@
-/*
- * Copyright (C) 2017 Moez Bhatti <moez.bhatti@gmail.com>
- *
- * This file is part of QKSMS.
- *
- * QKSMS is free software: you can redistribute it and/or modify
- * it under the terms of the GNU General Public License as published by
- * the Free Software Foundation, either version 3 of the License, or
- * (at your option) any later version.
- *
- * QKSMS is distributed in the hope that it will be useful,
- * but WITHOUT ANY WARRANTY; without even the implied warranty of
- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
- * GNU General Public License for more details.
- *
- * You should have received a copy of the GNU General Public License
- * along with QKSMS.  If not, see <http://www.gnu.org/licenses/>.
- */
-package com.moez.QKSMS.manager
-
-/**
- * Keeps track of the conversation that the user is currently viewing. This is useful when we
- * receive a message, because it allows us to immediately mark the message read and not display
- * a notification
- */
-interface ActiveConversationManager {
-
-    fun setActiveConversation(threadId: Long?)
-
-    fun getActiveConversation(): Long?
-
-}
+/*
+ * Copyright (C) 2017 Moez Bhatti <moez.bhatti@gmail.com>
+ *
+ * This file is part of QKSMS.
+ *
+ * QKSMS is free software: you can redistribute it and/or modify
+ * it under the terms of the GNU General Public License as published by
+ * the Free Software Foundation, either version 3 of the License, or
+ * (at your option) any later version.
+ *
+ * QKSMS is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+ * GNU General Public License for more details.
+ *
+ * You should have received a copy of the GNU General Public License
+ * along with QKSMS.  If not, see <http://www.gnu.org/licenses/>.
+ */
+package com.moez.QKSMS.manager
+
+/**
+ * Keeps track of the conversation that the user is currently viewing. This is useful when we
+ * receive a message, because it allows us to immediately mark the message read and not display
+ * a notification
+ */
+interface ActiveConversationManager {
+
+    fun setActiveConversation(threadId: Long?)
+
+    fun getActiveConversation(): Long?
+
+}
diff --git a/domain/src/main/java/com/moez/QKSMS/manager/AlarmManager.kt b/domain/src/main/java/com/moez/QKSMS/manager/AlarmManager.kt
index 840655639..3d114965a 100644
--- a/domain/src/main/java/com/moez/QKSMS/manager/AlarmManager.kt
+++ b/domain/src/main/java/com/moez/QKSMS/manager/AlarmManager.kt
@@ -1,29 +1,29 @@
-/*
- * Copyright (C) 2017 Moez Bhatti <moez.bhatti@gmail.com>
- *
- * This file is part of QKSMS.
- *
- * QKSMS is free software: you can redistribute it and/or modify
- * it under the terms of the GNU General Public License as published by
- * the Free Software Foundation, either version 3 of the License, or
- * (at your option) any later version.
- *
- * QKSMS is distributed in the hope that it will be useful,
- * but WITHOUT ANY WARRANTY; without even the implied warranty of
- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
- * GNU General Public License for more details.
- *
- * You should have received a copy of the GNU General Public License
- * along with QKSMS.  If not, see <http://www.gnu.org/licenses/>.
- */
-package com.moez.QKSMS.manager
-
-import android.app.PendingIntent
-
-interface AlarmManager {
-
-    fun getScheduledMessageIntent(id: Long): PendingIntent
-
-    fun setAlarm(date: Long, intent: PendingIntent)
-
+/*
+ * Copyright (C) 2017 Moez Bhatti <moez.bhatti@gmail.com>
+ *
+ * This file is part of QKSMS.
+ *
+ * QKSMS is free software: you can redistribute it and/or modify
+ * it under the terms of the GNU General Public License as published by
+ * the Free Software Foundation, either version 3 of the License, or
+ * (at your option) any later version.
+ *
+ * QKSMS is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+ * GNU General Public License for more details.
+ *
+ * You should have received a copy of the GNU General Public License
+ * along with QKSMS.  If not, see <http://www.gnu.org/licenses/>.
+ */
+package com.moez.QKSMS.manager
+
+import android.app.PendingIntent
+
+interface AlarmManager {
+
+    fun getScheduledMessageIntent(id: Long): PendingIntent
+
+    fun setAlarm(date: Long, intent: PendingIntent)
+
 }
\ No newline at end of file
diff --git a/domain/src/main/java/com/moez/QKSMS/manager/AnalyticsManager.kt b/domain/src/main/java/com/moez/QKSMS/manager/AnalyticsManager.kt
index 1f0b90088..5564caf7c 100644
--- a/domain/src/main/java/com/moez/QKSMS/manager/AnalyticsManager.kt
+++ b/domain/src/main/java/com/moez/QKSMS/manager/AnalyticsManager.kt
@@ -1,27 +1,27 @@
-/*
- * Copyright (C) 2017 Moez Bhatti <moez.bhatti@gmail.com>
- *
- * This file is part of QKSMS.
- *
- * QKSMS is free software: you can redistribute it and/or modify
- * it under the terms of the GNU General Public License as published by
- * the Free Software Foundation, either version 3 of the License, or
- * (at your option) any later version.
- *
- * QKSMS is distributed in the hope that it will be useful,
- * but WITHOUT ANY WARRANTY; without even the implied warranty of
- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
- * GNU General Public License for more details.
- *
- * You should have received a copy of the GNU General Public License
- * along with QKSMS.  If not, see <http://www.gnu.org/licenses/>.
- */
-package com.moez.QKSMS.manager
-
-interface AnalyticsManager {
-
-    fun track(event: String, vararg properties: Pair<String, Any>)
-
-    fun setUserProperty(key: String, value: Any)
-
+/*
+ * Copyright (C) 2017 Moez Bhatti <moez.bhatti@gmail.com>
+ *
+ * This file is part of QKSMS.
+ *
+ * QKSMS is free software: you can redistribute it and/or modify
+ * it under the terms of the GNU General Public License as published by
+ * the Free Software Foundation, either version 3 of the License, or
+ * (at your option) any later version.
+ *
+ * QKSMS is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+ * GNU General Public License for more details.
+ *
+ * You should have received a copy of the GNU General Public License
+ * along with QKSMS.  If not, see <http://www.gnu.org/licenses/>.
+ */
+package com.moez.QKSMS.manager
+
+interface AnalyticsManager {
+
+    fun track(event: String, vararg properties: Pair<String, Any>)
+
+    fun setUserProperty(key: String, value: Any)
+
 }
\ No newline at end of file
diff --git a/domain/src/main/java/com/moez/QKSMS/manager/BillingManager.kt b/domain/src/main/java/com/moez/QKSMS/manager/BillingManager.kt
index e92e763ac..cf5251eee 100644
--- a/domain/src/main/java/com/moez/QKSMS/manager/BillingManager.kt
+++ b/domain/src/main/java/com/moez/QKSMS/manager/BillingManager.kt
@@ -1,47 +1,47 @@
-/*
- * Copyright (C) 2020 Moez Bhatti <moez.bhatti@gmail.com>
- *
- * This file is part of QKSMS.
- *
- * QKSMS is free software: you can redistribute it and/or modify
- * it under the terms of the GNU General Public License as published by
- * the Free Software Foundation, either version 3 of the License, or
- * (at your option) any later version.
- *
- * QKSMS is distributed in the hope that it will be useful,
- * but WITHOUT ANY WARRANTY; without even the implied warranty of
- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
- * GNU General Public License for more details.
- *
- * You should have received a copy of the GNU General Public License
- * along with QKSMS.  If not, see <http://www.gnu.org/licenses/>.
- */
-
-package com.moez.QKSMS.manager
-
-import android.app.Activity
-import io.reactivex.Observable
-
-interface BillingManager {
-
-    companion object {
-        const val SKU_PLUS = "remove_ads"
-        const val SKU_PLUS_DONATE = "qksms_plus_donate"
-    }
-
-    data class Product(
-        val sku: String,
-        val price: String,
-        val priceCurrencyCode: String
-    )
-
-    val products: Observable<List<Product>>
-    val upgradeStatus: Observable<Boolean>
-
-    suspend fun checkForPurchases()
-
-    suspend fun queryProducts()
-
-    suspend fun initiatePurchaseFlow(activity: Activity, sku: String)
-
-}
+/*
+ * Copyright (C) 2020 Moez Bhatti <moez.bhatti@gmail.com>
+ *
+ * This file is part of QKSMS.
+ *
+ * QKSMS is free software: you can redistribute it and/or modify
+ * it under the terms of the GNU General Public License as published by
+ * the Free Software Foundation, either version 3 of the License, or
+ * (at your option) any later version.
+ *
+ * QKSMS is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+ * GNU General Public License for more details.
+ *
+ * You should have received a copy of the GNU General Public License
+ * along with QKSMS.  If not, see <http://www.gnu.org/licenses/>.
+ */
+
+package com.moez.QKSMS.manager
+
+import android.app.Activity
+import io.reactivex.Observable
+
+interface BillingManager {
+
+    companion object {
+        const val SKU_PLUS = "remove_ads"
+        const val SKU_PLUS_DONATE = "qksms_plus_donate"
+    }
+
+    data class Product(
+        val sku: String,
+        val price: String,
+        val priceCurrencyCode: String
+    )
+
+    val products: Observable<List<Product>>
+    val upgradeStatus: Observable<Boolean>
+
+    suspend fun checkForPurchases()
+
+    suspend fun queryProducts()
+
+    suspend fun initiatePurchaseFlow(activity: Activity, sku: String)
+
+}
diff --git a/domain/src/main/java/com/moez/QKSMS/manager/ChangelogManager.kt b/domain/src/main/java/com/moez/QKSMS/manager/ChangelogManager.kt
index 4ba22f8b8..357cec0ae 100644
--- a/domain/src/main/java/com/moez/QKSMS/manager/ChangelogManager.kt
+++ b/domain/src/main/java/com/moez/QKSMS/manager/ChangelogManager.kt
@@ -1,38 +1,38 @@
-/*
- * Copyright (C) 2017 Moez Bhatti <moez.bhatti@gmail.com>
- *
- * This file is part of QKSMS.
- *
- * QKSMS is free software: you can redistribute it and/or modify
- * it under the terms of the GNU General Public License as published by
- * the Free Software Foundation, either version 3 of the License, or
- * (at your option) any later version.
- *
- * QKSMS is distributed in the hope that it will be useful,
- * but WITHOUT ANY WARRANTY; without even the implied warranty of
- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
- * GNU General Public License for more details.
- *
- * You should have received a copy of the GNU General Public License
- * along with QKSMS.  If not, see <http://www.gnu.org/licenses/>.
- */
-package com.moez.QKSMS.manager
-
-interface ChangelogManager {
-
-    data class CumulativeChangelog(
-        val added: List<String>,
-        val improved: List<String>,
-        val fixed: List<String>
-    )
-
-    /**
-     * Returns true if the app has benn updated since the last time this method was called
-     */
-    fun didUpdate(): Boolean
-
-    suspend fun getChangelog(): CumulativeChangelog
-
-    fun markChangelogSeen()
-
-}
+/*
+ * Copyright (C) 2017 Moez Bhatti <moez.bhatti@gmail.com>
+ *
+ * This file is part of QKSMS.
+ *
+ * QKSMS is free software: you can redistribute it and/or modify
+ * it under the terms of the GNU General Public License as published by
+ * the Free Software Foundation, either version 3 of the License, or
+ * (at your option) any later version.
+ *
+ * QKSMS is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+ * GNU General Public License for more details.
+ *
+ * You should have received a copy of the GNU General Public License
+ * along with QKSMS.  If not, see <http://www.gnu.org/licenses/>.
+ */
+package com.moez.QKSMS.manager
+
+interface ChangelogManager {
+
+    data class CumulativeChangelog(
+        val added: List<String>,
+        val improved: List<String>,
+        val fixed: List<String>
+    )
+
+    /**
+     * Returns true if the app has benn updated since the last time this method was called
+     */
+    fun didUpdate(): Boolean
+
+    suspend fun getChangelog(): CumulativeChangelog
+
+    fun markChangelogSeen()
+
+}
diff --git a/domain/src/main/java/com/moez/QKSMS/manager/KeyManager.kt b/domain/src/main/java/com/moez/QKSMS/manager/KeyManager.kt
index c3d27b9b7..558e8cbfe 100644
--- a/domain/src/main/java/com/moez/QKSMS/manager/KeyManager.kt
+++ b/domain/src/main/java/com/moez/QKSMS/manager/KeyManager.kt
@@ -1,36 +1,36 @@
-/*
- * Copyright (C) 2017 Moez Bhatti <moez.bhatti@gmail.com>
- *
- * This file is part of QKSMS.
- *
- * QKSMS is free software: you can redistribute it and/or modify
- * it under the terms of the GNU General Public License as published by
- * the Free Software Foundation, either version 3 of the License, or
- * (at your option) any later version.
- *
- * QKSMS is distributed in the hope that it will be useful,
- * but WITHOUT ANY WARRANTY; without even the implied warranty of
- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
- * GNU General Public License for more details.
- *
- * You should have received a copy of the GNU General Public License
- * along with QKSMS.  If not, see <http://www.gnu.org/licenses/>.
- */
-package com.moez.QKSMS.manager
-
-/**
- * Helper class for generating incrementing ids for messages
- */
-interface KeyManager {
-
-    /**
-     * Should be called when a new sync is being started
-     */
-    fun reset()
-
-    /**
-     * Returns a valid ID that can be used to store a new message
-     */
-    fun newId(): Long
-
+/*
+ * Copyright (C) 2017 Moez Bhatti <moez.bhatti@gmail.com>
+ *
+ * This file is part of QKSMS.
+ *
+ * QKSMS is free software: you can redistribute it and/or modify
+ * it under the terms of the GNU General Public License as published by
+ * the Free Software Foundation, either version 3 of the License, or
+ * (at your option) any later version.
+ *
+ * QKSMS is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+ * GNU General Public License for more details.
+ *
+ * You should have received a copy of the GNU General Public License
+ * along with QKSMS.  If not, see <http://www.gnu.org/licenses/>.
+ */
+package com.moez.QKSMS.manager
+
+/**
+ * Helper class for generating incrementing ids for messages
+ */
+interface KeyManager {
+
+    /**
+     * Should be called when a new sync is being started
+     */
+    fun reset()
+
+    /**
+     * Returns a valid ID that can be used to store a new message
+     */
+    fun newId(): Long
+
 }
\ No newline at end of file
diff --git a/domain/src/main/java/com/moez/QKSMS/manager/NotificationManager.kt b/domain/src/main/java/com/moez/QKSMS/manager/NotificationManager.kt
index 2af74aa71..9f8e805e4 100644
--- a/domain/src/main/java/com/moez/QKSMS/manager/NotificationManager.kt
+++ b/domain/src/main/java/com/moez/QKSMS/manager/NotificationManager.kt
@@ -1,35 +1,35 @@
-/*
- * Copyright (C) 2017 Moez Bhatti <moez.bhatti@gmail.com>
- *
- * This file is part of QKSMS.
- *
- * QKSMS is free software: you can redistribute it and/or modify
- * it under the terms of the GNU General Public License as published by
- * the Free Software Foundation, either version 3 of the License, or
- * (at your option) any later version.
- *
- * QKSMS is distributed in the hope that it will be useful,
- * but WITHOUT ANY WARRANTY; without even the implied warranty of
- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
- * GNU General Public License for more details.
- *
- * You should have received a copy of the GNU General Public License
- * along with QKSMS.  If not, see <http://www.gnu.org/licenses/>.
- */
-package com.moez.QKSMS.manager
-
-import androidx.core.app.NotificationCompat
-
-interface NotificationManager {
-
-    fun update(threadId: Long)
-
-    fun notifyFailed(threadId: Long)
-
-    fun createNotificationChannel(threadId: Long = 0L)
-
-    fun buildNotificationChannelId(threadId: Long): String
-
-    fun getNotificationForBackup(): NotificationCompat.Builder
-
-}
+/*
+ * Copyright (C) 2017 Moez Bhatti <moez.bhatti@gmail.com>
+ *
+ * This file is part of QKSMS.
+ *
+ * QKSMS is free software: you can redistribute it and/or modify
+ * it under the terms of the GNU General Public License as published by
+ * the Free Software Foundation, either version 3 of the License, or
+ * (at your option) any later version.
+ *
+ * QKSMS is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+ * GNU General Public License for more details.
+ *
+ * You should have received a copy of the GNU General Public License
+ * along with QKSMS.  If not, see <http://www.gnu.org/licenses/>.
+ */
+package com.moez.QKSMS.manager
+
+import androidx.core.app.NotificationCompat
+
+interface NotificationManager {
+
+    fun update(threadId: Long)
+
+    fun notifyFailed(threadId: Long)
+
+    fun createNotificationChannel(threadId: Long = 0L)
+
+    fun buildNotificationChannelId(threadId: Long): String
+
+    fun getNotificationForBackup(): NotificationCompat.Builder
+
+}
diff --git a/domain/src/main/java/com/moez/QKSMS/manager/PermissionManager.kt b/domain/src/main/java/com/moez/QKSMS/manager/PermissionManager.kt
index 0fd6123a9..c481947c6 100644
--- a/domain/src/main/java/com/moez/QKSMS/manager/PermissionManager.kt
+++ b/domain/src/main/java/com/moez/QKSMS/manager/PermissionManager.kt
@@ -1,37 +1,37 @@
-/*
- * Copyright (C) 2017 Moez Bhatti <moez.bhatti@gmail.com>
- *
- * This file is part of QKSMS.
- *
- * QKSMS is free software: you can redistribute it and/or modify
- * it under the terms of the GNU General Public License as published by
- * the Free Software Foundation, either version 3 of the License, or
- * (at your option) any later version.
- *
- * QKSMS is distributed in the hope that it will be useful,
- * but WITHOUT ANY WARRANTY; without even the implied warranty of
- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
- * GNU General Public License for more details.
- *
- * You should have received a copy of the GNU General Public License
- * along with QKSMS.  If not, see <http://www.gnu.org/licenses/>.
- */
-package com.moez.QKSMS.manager
-
-interface PermissionManager {
-
-    fun isDefaultSms(): Boolean
-
-    fun hasReadSms(): Boolean
-
-    fun hasSendSms(): Boolean
-
-    fun hasContacts(): Boolean
-
-    fun hasPhone(): Boolean
-
-    fun hasCalling(): Boolean
-
-    fun hasStorage(): Boolean
-
+/*
+ * Copyright (C) 2017 Moez Bhatti <moez.bhatti@gmail.com>
+ *
+ * This file is part of QKSMS.
+ *
+ * QKSMS is free software: you can redistribute it and/or modify
+ * it under the terms of the GNU General Public License as published by
+ * the Free Software Foundation, either version 3 of the License, or
+ * (at your option) any later version.
+ *
+ * QKSMS is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+ * GNU General Public License for more details.
+ *
+ * You should have received a copy of the GNU General Public License
+ * along with QKSMS.  If not, see <http://www.gnu.org/licenses/>.
+ */
+package com.moez.QKSMS.manager
+
+interface PermissionManager {
+
+    fun isDefaultSms(): Boolean
+
+    fun hasReadSms(): Boolean
+
+    fun hasSendSms(): Boolean
+
+    fun hasContacts(): Boolean
+
+    fun hasPhone(): Boolean
+
+    fun hasCalling(): Boolean
+
+    fun hasStorage(): Boolean
+
 }
\ No newline at end of file
diff --git a/domain/src/main/java/com/moez/QKSMS/manager/RatingManager.kt b/domain/src/main/java/com/moez/QKSMS/manager/RatingManager.kt
index 9ea89e4ad..9782f8c21 100644
--- a/domain/src/main/java/com/moez/QKSMS/manager/RatingManager.kt
+++ b/domain/src/main/java/com/moez/QKSMS/manager/RatingManager.kt
@@ -1,36 +1,36 @@
-/*
- * Copyright (C) 2017 Moez Bhatti <moez.bhatti@gmail.com>
- *
- * This file is part of QKSMS.
- *
- * QKSMS is free software: you can redistribute it and/or modify
- * it under the terms of the GNU General Public License as published by
- * the Free Software Foundation, either version 3 of the License, or
- * (at your option) any later version.
- *
- * QKSMS is distributed in the hope that it will be useful,
- * but WITHOUT ANY WARRANTY; without even the implied warranty of
- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
- * GNU General Public License for more details.
- *
- * You should have received a copy of the GNU General Public License
- * along with QKSMS.  If not, see <http://www.gnu.org/licenses/>.
- */
-package com.moez.QKSMS.manager
-
-import io.reactivex.Observable
-
-interface RatingManager {
-
-    val shouldShowRating: Observable<Boolean>
-
-    /**
-     * Whether or not we should show the rating UI should depend on the number of sessions
-     */
-    fun addSession()
-
-    fun rate()
-
-    fun dismiss()
-
+/*
+ * Copyright (C) 2017 Moez Bhatti <moez.bhatti@gmail.com>
+ *
+ * This file is part of QKSMS.
+ *
+ * QKSMS is free software: you can redistribute it and/or modify
+ * it under the terms of the GNU General Public License as published by
+ * the Free Software Foundation, either version 3 of the License, or
+ * (at your option) any later version.
+ *
+ * QKSMS is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+ * GNU General Public License for more details.
+ *
+ * You should have received a copy of the GNU General Public License
+ * along with QKSMS.  If not, see <http://www.gnu.org/licenses/>.
+ */
+package com.moez.QKSMS.manager
+
+import io.reactivex.Observable
+
+interface RatingManager {
+
+    val shouldShowRating: Observable<Boolean>
+
+    /**
+     * Whether or not we should show the rating UI should depend on the number of sessions
+     */
+    fun addSession()
+
+    fun rate()
+
+    fun dismiss()
+
 }
\ No newline at end of file
diff --git a/domain/src/main/java/com/moez/QKSMS/manager/ReferralManager.kt b/domain/src/main/java/com/moez/QKSMS/manager/ReferralManager.kt
index 30bcfff40..33f38cf7c 100644
--- a/domain/src/main/java/com/moez/QKSMS/manager/ReferralManager.kt
+++ b/domain/src/main/java/com/moez/QKSMS/manager/ReferralManager.kt
@@ -1,7 +1,7 @@
-package com.moez.QKSMS.manager
-
-interface ReferralManager {
-
-    suspend fun trackReferrer()
-
-}
+package com.moez.QKSMS.manager
+
+interface ReferralManager {
+
+    suspend fun trackReferrer()
+
+}
diff --git a/domain/src/main/java/com/moez/QKSMS/manager/ShortcutManager.kt b/domain/src/main/java/com/moez/QKSMS/manager/ShortcutManager.kt
index 7f57f3788..f55ed6d91 100644
--- a/domain/src/main/java/com/moez/QKSMS/manager/ShortcutManager.kt
+++ b/domain/src/main/java/com/moez/QKSMS/manager/ShortcutManager.kt
@@ -1,27 +1,27 @@
-/*
- * Copyright (C) 2017 Moez Bhatti <moez.bhatti@gmail.com>
- *
- * This file is part of QKSMS.
- *
- * QKSMS is free software: you can redistribute it and/or modify
- * it under the terms of the GNU General Public License as published by
- * the Free Software Foundation, either version 3 of the License, or
- * (at your option) any later version.
- *
- * QKSMS is distributed in the hope that it will be useful,
- * but WITHOUT ANY WARRANTY; without even the implied warranty of
- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
- * GNU General Public License for more details.
- *
- * You should have received a copy of the GNU General Public License
- * along with QKSMS.  If not, see <http://www.gnu.org/licenses/>.
- */
-package com.moez.QKSMS.manager
-
-interface ShortcutManager {
-
-    fun updateBadge()
-
-    fun updateShortcuts()
-
+/*
+ * Copyright (C) 2017 Moez Bhatti <moez.bhatti@gmail.com>
+ *
+ * This file is part of QKSMS.
+ *
+ * QKSMS is free software: you can redistribute it and/or modify
+ * it under the terms of the GNU General Public License as published by
+ * the Free Software Foundation, either version 3 of the License, or
+ * (at your option) any later version.
+ *
+ * QKSMS is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+ * GNU General Public License for more details.
+ *
+ * You should have received a copy of the GNU General Public License
+ * along with QKSMS.  If not, see <http://www.gnu.org/licenses/>.
+ */
+package com.moez.QKSMS.manager
+
+interface ShortcutManager {
+
+    fun updateBadge()
+
+    fun updateShortcuts()
+
 }
\ No newline at end of file
diff --git a/domain/src/main/java/com/moez/QKSMS/manager/WidgetManager.kt b/domain/src/main/java/com/moez/QKSMS/manager/WidgetManager.kt
index eabaab0aa..b31624d0d 100644
--- a/domain/src/main/java/com/moez/QKSMS/manager/WidgetManager.kt
+++ b/domain/src/main/java/com/moez/QKSMS/manager/WidgetManager.kt
@@ -1,31 +1,31 @@
-/*
- * Copyright (C) 2017 Moez Bhatti <moez.bhatti@gmail.com>
- *
- * This file is part of QKSMS.
- *
- * QKSMS is free software: you can redistribute it and/or modify
- * it under the terms of the GNU General Public License as published by
- * the Free Software Foundation, either version 3 of the License, or
- * (at your option) any later version.
- *
- * QKSMS is distributed in the hope that it will be useful,
- * but WITHOUT ANY WARRANTY; without even the implied warranty of
- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
- * GNU General Public License for more details.
- *
- * You should have received a copy of the GNU General Public License
- * along with QKSMS.  If not, see <http://www.gnu.org/licenses/>.
- */
-package com.moez.QKSMS.manager
-
-interface WidgetManager {
-
-    companion object {
-        const val ACTION_NOTIFY_DATASET_CHANGED = "com.moez.QKSMS.intent.action.ACTION_NOTIFY_DATASET_CHANGED"
-    }
-
-    fun updateUnreadCount()
-
-    fun updateTheme()
-
+/*
+ * Copyright (C) 2017 Moez Bhatti <moez.bhatti@gmail.com>
+ *
+ * This file is part of QKSMS.
+ *
+ * QKSMS is free software: you can redistribute it and/or modify
+ * it under the terms of the GNU General Public License as published by
+ * the Free Software Foundation, either version 3 of the License, or
+ * (at your option) any later version.
+ *
+ * QKSMS is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+ * GNU General Public License for more details.
+ *
+ * You should have received a copy of the GNU General Public License
+ * along with QKSMS.  If not, see <http://www.gnu.org/licenses/>.
+ */
+package com.moez.QKSMS.manager
+
+interface WidgetManager {
+
+    companion object {
+        const val ACTION_NOTIFY_DATASET_CHANGED = "com.moez.QKSMS.intent.action.ACTION_NOTIFY_DATASET_CHANGED"
+    }
+
+    fun updateUnreadCount()
+
+    fun updateTheme()
+
 }
\ No newline at end of file
diff --git a/domain/src/main/java/com/moez/QKSMS/mapper/CursorToContact.kt b/domain/src/main/java/com/moez/QKSMS/mapper/CursorToContact.kt
index c56d4660e..50bcbc0d1 100644
--- a/domain/src/main/java/com/moez/QKSMS/mapper/CursorToContact.kt
+++ b/domain/src/main/java/com/moez/QKSMS/mapper/CursorToContact.kt
@@ -1,28 +1,28 @@
-/*
- * Copyright (C) 2017 Moez Bhatti <moez.bhatti@gmail.com>
- *
- * This file is part of QKSMS.
- *
- * QKSMS is free software: you can redistribute it and/or modify
- * it under the terms of the GNU General Public License as published by
- * the Free Software Foundation, either version 3 of the License, or
- * (at your option) any later version.
- *
- * QKSMS is distributed in the hope that it will be useful,
- * but WITHOUT ANY WARRANTY; without even the implied warranty of
- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
- * GNU General Public License for more details.
- *
- * You should have received a copy of the GNU General Public License
- * along with QKSMS.  If not, see <http://www.gnu.org/licenses/>.
- */
-package com.moez.QKSMS.mapper
-
-import android.database.Cursor
-import com.moez.QKSMS.model.Contact
-
-interface CursorToContact : Mapper<Cursor, Contact> {
-
-    fun getContactsCursor(): Cursor?
-
+/*
+ * Copyright (C) 2017 Moez Bhatti <moez.bhatti@gmail.com>
+ *
+ * This file is part of QKSMS.
+ *
+ * QKSMS is free software: you can redistribute it and/or modify
+ * it under the terms of the GNU General Public License as published by
+ * the Free Software Foundation, either version 3 of the License, or
+ * (at your option) any later version.
+ *
+ * QKSMS is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+ * GNU General Public License for more details.
+ *
+ * You should have received a copy of the GNU General Public License
+ * along with QKSMS.  If not, see <http://www.gnu.org/licenses/>.
+ */
+package com.moez.QKSMS.mapper
+
+import android.database.Cursor
+import com.moez.QKSMS.model.Contact
+
+interface CursorToContact : Mapper<Cursor, Contact> {
+
+    fun getContactsCursor(): Cursor?
+
 }
\ No newline at end of file
diff --git a/domain/src/main/java/com/moez/QKSMS/mapper/CursorToContactGroup.kt b/domain/src/main/java/com/moez/QKSMS/mapper/CursorToContactGroup.kt
index 2de28c6f4..139af21c2 100644
--- a/domain/src/main/java/com/moez/QKSMS/mapper/CursorToContactGroup.kt
+++ b/domain/src/main/java/com/moez/QKSMS/mapper/CursorToContactGroup.kt
@@ -1,28 +1,28 @@
-/*
- * Copyright (C) 2019 Moez Bhatti <moez.bhatti@gmail.com>
- *
- * This file is part of QKSMS.
- *
- * QKSMS is free software: you can redistribute it and/or modify
- * it under the terms of the GNU General Public License as published by
- * the Free Software Foundation, either version 3 of the License, or
- * (at your option) any later version.
- *
- * QKSMS is distributed in the hope that it will be useful,
- * but WITHOUT ANY WARRANTY; without even the implied warranty of
- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
- * GNU General Public License for more details.
- *
- * You should have received a copy of the GNU General Public License
- * along with QKSMS.  If not, see <http://www.gnu.org/licenses/>.
- */
-package com.moez.QKSMS.mapper
-
-import android.database.Cursor
-import com.moez.QKSMS.model.ContactGroup
-
-interface CursorToContactGroup : Mapper<Cursor, ContactGroup> {
-
-    fun getContactGroupsCursor(): Cursor?
-
-}
+/*
+ * Copyright (C) 2019 Moez Bhatti <moez.bhatti@gmail.com>
+ *
+ * This file is part of QKSMS.
+ *
+ * QKSMS is free software: you can redistribute it and/or modify
+ * it under the terms of the GNU General Public License as published by
+ * the Free Software Foundation, either version 3 of the License, or
+ * (at your option) any later version.
+ *
+ * QKSMS is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+ * GNU General Public License for more details.
+ *
+ * You should have received a copy of the GNU General Public License
+ * along with QKSMS.  If not, see <http://www.gnu.org/licenses/>.
+ */
+package com.moez.QKSMS.mapper
+
+import android.database.Cursor
+import com.moez.QKSMS.model.ContactGroup
+
+interface CursorToContactGroup : Mapper<Cursor, ContactGroup> {
+
+    fun getContactGroupsCursor(): Cursor?
+
+}
diff --git a/domain/src/main/java/com/moez/QKSMS/mapper/CursorToContactGroupMember.kt b/domain/src/main/java/com/moez/QKSMS/mapper/CursorToContactGroupMember.kt
index 22861fdd4..4b73000e4 100644
--- a/domain/src/main/java/com/moez/QKSMS/mapper/CursorToContactGroupMember.kt
+++ b/domain/src/main/java/com/moez/QKSMS/mapper/CursorToContactGroupMember.kt
@@ -1,29 +1,29 @@
-/*
- * Copyright (C) 2019 Moez Bhatti <moez.bhatti@gmail.com>
- *
- * This file is part of QKSMS.
- *
- * QKSMS is free software: you can redistribute it and/or modify
- * it under the terms of the GNU General Public License as published by
- * the Free Software Foundation, either version 3 of the License, or
- * (at your option) any later version.
- *
- * QKSMS is distributed in the hope that it will be useful,
- * but WITHOUT ANY WARRANTY; without even the implied warranty of
- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
- * GNU General Public License for more details.
- *
- * You should have received a copy of the GNU General Public License
- * along with QKSMS.  If not, see <http://www.gnu.org/licenses/>.
- */
-package com.moez.QKSMS.mapper
-
-import android.database.Cursor
-
-interface CursorToContactGroupMember : Mapper<Cursor, CursorToContactGroupMember.GroupMember> {
-
-    data class GroupMember(val lookupKey: String, val groupId: Long)
-
-    fun getGroupMembersCursor(): Cursor?
-
-}
+/*
+ * Copyright (C) 2019 Moez Bhatti <moez.bhatti@gmail.com>
+ *
+ * This file is part of QKSMS.
+ *
+ * QKSMS is free software: you can redistribute it and/or modify
+ * it under the terms of the GNU General Public License as published by
+ * the Free Software Foundation, either version 3 of the License, or
+ * (at your option) any later version.
+ *
+ * QKSMS is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+ * GNU General Public License for more details.
+ *
+ * You should have received a copy of the GNU General Public License
+ * along with QKSMS.  If not, see <http://www.gnu.org/licenses/>.
+ */
+package com.moez.QKSMS.mapper
+
+import android.database.Cursor
+
+interface CursorToContactGroupMember : Mapper<Cursor, CursorToContactGroupMember.GroupMember> {
+
+    data class GroupMember(val lookupKey: String, val groupId: Long)
+
+    fun getGroupMembersCursor(): Cursor?
+
+}
diff --git a/domain/src/main/java/com/moez/QKSMS/mapper/CursorToConversation.kt b/domain/src/main/java/com/moez/QKSMS/mapper/CursorToConversation.kt
index 56f15e3eb..92aa993c9 100644
--- a/domain/src/main/java/com/moez/QKSMS/mapper/CursorToConversation.kt
+++ b/domain/src/main/java/com/moez/QKSMS/mapper/CursorToConversation.kt
@@ -1,28 +1,28 @@
-/*
- * Copyright (C) 2017 Moez Bhatti <moez.bhatti@gmail.com>
- *
- * This file is part of QKSMS.
- *
- * QKSMS is free software: you can redistribute it and/or modify
- * it under the terms of the GNU General Public License as published by
- * the Free Software Foundation, either version 3 of the License, or
- * (at your option) any later version.
- *
- * QKSMS is distributed in the hope that it will be useful,
- * but WITHOUT ANY WARRANTY; without even the implied warranty of
- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
- * GNU General Public License for more details.
- *
- * You should have received a copy of the GNU General Public License
- * along with QKSMS.  If not, see <http://www.gnu.org/licenses/>.
- */
-package com.moez.QKSMS.mapper
-
-import android.database.Cursor
-import com.moez.QKSMS.model.Conversation
-
-interface CursorToConversation : Mapper<Cursor, Conversation> {
-
-    fun getConversationsCursor(): Cursor?
-
+/*
+ * Copyright (C) 2017 Moez Bhatti <moez.bhatti@gmail.com>
+ *
+ * This file is part of QKSMS.
+ *
+ * QKSMS is free software: you can redistribute it and/or modify
+ * it under the terms of the GNU General Public License as published by
+ * the Free Software Foundation, either version 3 of the License, or
+ * (at your option) any later version.
+ *
+ * QKSMS is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+ * GNU General Public License for more details.
+ *
+ * You should have received a copy of the GNU General Public License
+ * along with QKSMS.  If not, see <http://www.gnu.org/licenses/>.
+ */
+package com.moez.QKSMS.mapper
+
+import android.database.Cursor
+import com.moez.QKSMS.model.Conversation
+
+interface CursorToConversation : Mapper<Cursor, Conversation> {
+
+    fun getConversationsCursor(): Cursor?
+
 }
\ No newline at end of file
diff --git a/domain/src/main/java/com/moez/QKSMS/mapper/CursorToMessage.kt b/domain/src/main/java/com/moez/QKSMS/mapper/CursorToMessage.kt
index 478913274..089946fc4 100644
--- a/domain/src/main/java/com/moez/QKSMS/mapper/CursorToMessage.kt
+++ b/domain/src/main/java/com/moez/QKSMS/mapper/CursorToMessage.kt
@@ -1,68 +1,68 @@
-/*
- * Copyright (C) 2017 Moez Bhatti <moez.bhatti@gmail.com>
- *
- * This file is part of QKSMS.
- *
- * QKSMS is free software: you can redistribute it and/or modify
- * it under the terms of the GNU General Public License as published by
- * the Free Software Foundation, either version 3 of the License, or
- * (at your option) any later version.
- *
- * QKSMS is distributed in the hope that it will be useful,
- * but WITHOUT ANY WARRANTY; without even the implied warranty of
- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
- * GNU General Public License for more details.
- *
- * You should have received a copy of the GNU General Public License
- * along with QKSMS.  If not, see <http://www.gnu.org/licenses/>.
- */
-package com.moez.QKSMS.mapper
-
-import android.database.Cursor
-import android.provider.Telephony.*
-import com.moez.QKSMS.model.Message
-import timber.log.Timber
-import java.util.*
-
-interface CursorToMessage : Mapper<Pair<Cursor, CursorToMessage.MessageColumns>, Message> {
-
-    fun getMessagesCursor(): Cursor?
-
-    fun getMessageCursor(id: Long): Cursor?
-
-    class MessageColumns(private val cursor: Cursor) {
-
-        val msgType by lazy { getColumnIndex(MmsSms.TYPE_DISCRIMINATOR_COLUMN) }
-        val msgId by lazy { getColumnIndex(MmsSms._ID) }
-        val date by lazy { getColumnIndex(Mms.DATE) }
-        val dateSent by lazy { getColumnIndex(Mms.DATE_SENT) }
-        val read by lazy { getColumnIndex(Mms.READ) }
-        val threadId by lazy { getColumnIndex(Mms.THREAD_ID) }
-        val locked by lazy { getColumnIndex(Mms.LOCKED) }
-        val subId by lazy { getColumnIndex(Mms.SUBSCRIPTION_ID) }
-
-        val smsAddress by lazy { getColumnIndex(Sms.ADDRESS) }
-        val smsBody by lazy { getColumnIndex(Sms.BODY) }
-        val smsSeen by lazy { getColumnIndex(Sms.SEEN) }
-        val smsType by lazy { getColumnIndex(Sms.TYPE) }
-        val smsStatus by lazy { getColumnIndex(Sms.STATUS) }
-        val smsErrorCode by lazy { getColumnIndex(Sms.ERROR_CODE) }
-
-        val mmsSubject by lazy { getColumnIndex(Mms.SUBJECT) }
-        val mmsSubjectCharset by lazy { getColumnIndex(Mms.SUBJECT_CHARSET) }
-        val mmsSeen by lazy { getColumnIndex(Mms.SEEN) }
-        val mmsMessageType by lazy { getColumnIndex(Mms.MESSAGE_TYPE) }
-        val mmsMessageBox by lazy { getColumnIndex(Mms.MESSAGE_BOX) }
-        val mmsDeliveryReport by lazy { getColumnIndex(Mms.DELIVERY_REPORT) }
-        val mmsReadReport by lazy { getColumnIndex(Mms.READ_REPORT) }
-        val mmsErrorType by lazy { getColumnIndex(MmsSms.PendingMessages.ERROR_TYPE) }
-        val mmsStatus by lazy { getColumnIndex(Mms.STATUS) }
-
-        private fun getColumnIndex(columnsName: String) = try {
-            cursor.getColumnIndexOrThrow(columnsName)
-        } catch (e: Exception) {
-            Timber.e("Couldn't find column \'$columnsName\' in ${Arrays.toString(cursor.columnNames)}")
-            -1
-        }
-    }
-}
+/*
+ * Copyright (C) 2017 Moez Bhatti <moez.bhatti@gmail.com>
+ *
+ * This file is part of QKSMS.
+ *
+ * QKSMS is free software: you can redistribute it and/or modify
+ * it under the terms of the GNU General Public License as published by
+ * the Free Software Foundation, either version 3 of the License, or
+ * (at your option) any later version.
+ *
+ * QKSMS is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+ * GNU General Public License for more details.
+ *
+ * You should have received a copy of the GNU General Public License
+ * along with QKSMS.  If not, see <http://www.gnu.org/licenses/>.
+ */
+package com.moez.QKSMS.mapper
+
+import android.database.Cursor
+import android.provider.Telephony.*
+import com.moez.QKSMS.model.Message
+import timber.log.Timber
+import java.util.*
+
+interface CursorToMessage : Mapper<Pair<Cursor, CursorToMessage.MessageColumns>, Message> {
+
+    fun getMessagesCursor(): Cursor?
+
+    fun getMessageCursor(id: Long): Cursor?
+
+    class MessageColumns(private val cursor: Cursor) {
+
+        val msgType by lazy { getColumnIndex(MmsSms.TYPE_DISCRIMINATOR_COLUMN) }
+        val msgId by lazy { getColumnIndex(MmsSms._ID) }
+        val date by lazy { getColumnIndex(Mms.DATE) }
+        val dateSent by lazy { getColumnIndex(Mms.DATE_SENT) }
+        val read by lazy { getColumnIndex(Mms.READ) }
+        val threadId by lazy { getColumnIndex(Mms.THREAD_ID) }
+        val locked by lazy { getColumnIndex(Mms.LOCKED) }
+        val subId by lazy { getColumnIndex(Mms.SUBSCRIPTION_ID) }
+
+        val smsAddress by lazy { getColumnIndex(Sms.ADDRESS) }
+        val smsBody by lazy { getColumnIndex(Sms.BODY) }
+        val smsSeen by lazy { getColumnIndex(Sms.SEEN) }
+        val smsType by lazy { getColumnIndex(Sms.TYPE) }
+        val smsStatus by lazy { getColumnIndex(Sms.STATUS) }
+        val smsErrorCode by lazy { getColumnIndex(Sms.ERROR_CODE) }
+
+        val mmsSubject by lazy { getColumnIndex(Mms.SUBJECT) }
+        val mmsSubjectCharset by lazy { getColumnIndex(Mms.SUBJECT_CHARSET) }
+        val mmsSeen by lazy { getColumnIndex(Mms.SEEN) }
+        val mmsMessageType by lazy { getColumnIndex(Mms.MESSAGE_TYPE) }
+        val mmsMessageBox by lazy { getColumnIndex(Mms.MESSAGE_BOX) }
+        val mmsDeliveryReport by lazy { getColumnIndex(Mms.DELIVERY_REPORT) }
+        val mmsReadReport by lazy { getColumnIndex(Mms.READ_REPORT) }
+        val mmsErrorType by lazy { getColumnIndex(MmsSms.PendingMessages.ERROR_TYPE) }
+        val mmsStatus by lazy { getColumnIndex(Mms.STATUS) }
+
+        private fun getColumnIndex(columnsName: String) = try {
+            cursor.getColumnIndexOrThrow(columnsName)
+        } catch (e: Exception) {
+            Timber.e("Couldn't find column \'$columnsName\' in ${Arrays.toString(cursor.columnNames)}")
+            -1
+        }
+    }
+}
diff --git a/domain/src/main/java/com/moez/QKSMS/mapper/CursorToPart.kt b/domain/src/main/java/com/moez/QKSMS/mapper/CursorToPart.kt
index e4ae1acc6..292ef0114 100644
--- a/domain/src/main/java/com/moez/QKSMS/mapper/CursorToPart.kt
+++ b/domain/src/main/java/com/moez/QKSMS/mapper/CursorToPart.kt
@@ -1,28 +1,28 @@
-/*
- * Copyright (C) 2017 Moez Bhatti <moez.bhatti@gmail.com>
- *
- * This file is part of QKSMS.
- *
- * QKSMS is free software: you can redistribute it and/or modify
- * it under the terms of the GNU General Public License as published by
- * the Free Software Foundation, either version 3 of the License, or
- * (at your option) any later version.
- *
- * QKSMS is distributed in the hope that it will be useful,
- * but WITHOUT ANY WARRANTY; without even the implied warranty of
- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
- * GNU General Public License for more details.
- *
- * You should have received a copy of the GNU General Public License
- * along with QKSMS.  If not, see <http://www.gnu.org/licenses/>.
- */
-package com.moez.QKSMS.mapper
-
-import android.database.Cursor
-import com.moez.QKSMS.model.MmsPart
-
-interface CursorToPart : Mapper<Cursor, MmsPart> {
-
-    fun getPartsCursor(messageId: Long? = null): Cursor?
-
-}
+/*
+ * Copyright (C) 2017 Moez Bhatti <moez.bhatti@gmail.com>
+ *
+ * This file is part of QKSMS.
+ *
+ * QKSMS is free software: you can redistribute it and/or modify
+ * it under the terms of the GNU General Public License as published by
+ * the Free Software Foundation, either version 3 of the License, or
+ * (at your option) any later version.
+ *
+ * QKSMS is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+ * GNU General Public License for more details.
+ *
+ * You should have received a copy of the GNU General Public License
+ * along with QKSMS.  If not, see <http://www.gnu.org/licenses/>.
+ */
+package com.moez.QKSMS.mapper
+
+import android.database.Cursor
+import com.moez.QKSMS.model.MmsPart
+
+interface CursorToPart : Mapper<Cursor, MmsPart> {
+
+    fun getPartsCursor(messageId: Long? = null): Cursor?
+
+}
diff --git a/domain/src/main/java/com/moez/QKSMS/mapper/CursorToRecipient.kt b/domain/src/main/java/com/moez/QKSMS/mapper/CursorToRecipient.kt
index 2f3b267eb..483f14d3e 100644
--- a/domain/src/main/java/com/moez/QKSMS/mapper/CursorToRecipient.kt
+++ b/domain/src/main/java/com/moez/QKSMS/mapper/CursorToRecipient.kt
@@ -1,30 +1,30 @@
-/*
- * Copyright (C) 2017 Moez Bhatti <moez.bhatti@gmail.com>
- *
- * This file is part of QKSMS.
- *
- * QKSMS is free software: you can redistribute it and/or modify
- * it under the terms of the GNU General Public License as published by
- * the Free Software Foundation, either version 3 of the License, or
- * (at your option) any later version.
- *
- * QKSMS is distributed in the hope that it will be useful,
- * but WITHOUT ANY WARRANTY; without even the implied warranty of
- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
- * GNU General Public License for more details.
- *
- * You should have received a copy of the GNU General Public License
- * along with QKSMS.  If not, see <http://www.gnu.org/licenses/>.
- */
-package com.moez.QKSMS.mapper
-
-import android.database.Cursor
-import com.moez.QKSMS.model.Recipient
-
-interface CursorToRecipient : Mapper<Cursor, Recipient> {
-
-    fun getRecipientCursor(): Cursor?
-
-    fun getRecipientCursor(id: Long): Cursor?
-
+/*
+ * Copyright (C) 2017 Moez Bhatti <moez.bhatti@gmail.com>
+ *
+ * This file is part of QKSMS.
+ *
+ * QKSMS is free software: you can redistribute it and/or modify
+ * it under the terms of the GNU General Public License as published by
+ * the Free Software Foundation, either version 3 of the License, or
+ * (at your option) any later version.
+ *
+ * QKSMS is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+ * GNU General Public License for more details.
+ *
+ * You should have received a copy of the GNU General Public License
+ * along with QKSMS.  If not, see <http://www.gnu.org/licenses/>.
+ */
+package com.moez.QKSMS.mapper
+
+import android.database.Cursor
+import com.moez.QKSMS.model.Recipient
+
+interface CursorToRecipient : Mapper<Cursor, Recipient> {
+
+    fun getRecipientCursor(): Cursor?
+
+    fun getRecipientCursor(id: Long): Cursor?
+
 }
\ No newline at end of file
diff --git a/domain/src/main/java/com/moez/QKSMS/mapper/Mapper.kt b/domain/src/main/java/com/moez/QKSMS/mapper/Mapper.kt
index 29430f634..21d85ee21 100644
--- a/domain/src/main/java/com/moez/QKSMS/mapper/Mapper.kt
+++ b/domain/src/main/java/com/moez/QKSMS/mapper/Mapper.kt
@@ -1,25 +1,25 @@
-/*
- * Copyright (C) 2017 Moez Bhatti <moez.bhatti@gmail.com>
- *
- * This file is part of QKSMS.
- *
- * QKSMS is free software: you can redistribute it and/or modify
- * it under the terms of the GNU General Public License as published by
- * the Free Software Foundation, either version 3 of the License, or
- * (at your option) any later version.
- *
- * QKSMS is distributed in the hope that it will be useful,
- * but WITHOUT ANY WARRANTY; without even the implied warranty of
- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
- * GNU General Public License for more details.
- *
- * You should have received a copy of the GNU General Public License
- * along with QKSMS.  If not, see <http://www.gnu.org/licenses/>.
- */
-package com.moez.QKSMS.mapper
-
-interface Mapper<in From, out To> {
-
-    fun map(from: From): To
-
-}
+/*
+ * Copyright (C) 2017 Moez Bhatti <moez.bhatti@gmail.com>
+ *
+ * This file is part of QKSMS.
+ *
+ * QKSMS is free software: you can redistribute it and/or modify
+ * it under the terms of the GNU General Public License as published by
+ * the Free Software Foundation, either version 3 of the License, or
+ * (at your option) any later version.
+ *
+ * QKSMS is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+ * GNU General Public License for more details.
+ *
+ * You should have received a copy of the GNU General Public License
+ * along with QKSMS.  If not, see <http://www.gnu.org/licenses/>.
+ */
+package com.moez.QKSMS.mapper
+
+interface Mapper<in From, out To> {
+
+    fun map(from: From): To
+
+}
diff --git a/domain/src/main/java/com/moez/QKSMS/model/Attachment.kt b/domain/src/main/java/com/moez/QKSMS/model/Attachment.kt
index 07298feea..d425449cf 100644
--- a/domain/src/main/java/com/moez/QKSMS/model/Attachment.kt
+++ b/domain/src/main/java/com/moez/QKSMS/model/Attachment.kt
@@ -1,54 +1,54 @@
-/*
- * Copyright (C) 2017 Moez Bhatti <moez.bhatti@gmail.com>
- *
- * This file is part of QKSMS.
- *
- * QKSMS is free software: you can redistribute it and/or modify
- * it under the terms of the GNU General Public License as published by
- * the Free Software Foundation, either version 3 of the License, or
- * (at your option) any later version.
- *
- * QKSMS is distributed in the hope that it will be useful,
- * but WITHOUT ANY WARRANTY; without even the implied warranty of
- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
- * GNU General Public License for more details.
- *
- * You should have received a copy of the GNU General Public License
- * along with QKSMS.  If not, see <http://www.gnu.org/licenses/>.
- */
-package com.moez.QKSMS.model
-
-import android.content.Context
-import android.net.Uri
-import android.os.Build
-import androidx.core.view.inputmethod.InputContentInfoCompat
-
-sealed class Attachment {
-
-    data class Image(
-        private val uri: Uri? = null,
-        private val inputContent: InputContentInfoCompat? = null
-    ) : Attachment() {
-
-        fun getUri(): Uri? {
-            return if (Build.VERSION.SDK_INT >= Build.VERSION_CODES.N_MR1) {
-                inputContent?.contentUri ?: uri
-            } else {
-                uri
-            }
-        }
-
-        fun isGif(context: Context): Boolean {
-            return if (Build.VERSION.SDK_INT >= Build.VERSION_CODES.N_MR1 && inputContent != null) {
-                inputContent.description.hasMimeType("image/gif")
-            } else {
-                uri?.let(context.contentResolver::getType) == "image/gif"
-            }
-        }
-    }
-
-    data class Contact(val vCard: String) : Attachment()
-
-}
-
-class Attachments(attachments: List<Attachment>) : List<Attachment> by attachments
+/*
+ * Copyright (C) 2017 Moez Bhatti <moez.bhatti@gmail.com>
+ *
+ * This file is part of QKSMS.
+ *
+ * QKSMS is free software: you can redistribute it and/or modify
+ * it under the terms of the GNU General Public License as published by
+ * the Free Software Foundation, either version 3 of the License, or
+ * (at your option) any later version.
+ *
+ * QKSMS is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+ * GNU General Public License for more details.
+ *
+ * You should have received a copy of the GNU General Public License
+ * along with QKSMS.  If not, see <http://www.gnu.org/licenses/>.
+ */
+package com.moez.QKSMS.model
+
+import android.content.Context
+import android.net.Uri
+import android.os.Build
+import androidx.core.view.inputmethod.InputContentInfoCompat
+
+sealed class Attachment {
+
+    data class Image(
+        private val uri: Uri? = null,
+        private val inputContent: InputContentInfoCompat? = null
+    ) : Attachment() {
+
+        fun getUri(): Uri? {
+            return if (Build.VERSION.SDK_INT >= Build.VERSION_CODES.N_MR1) {
+                inputContent?.contentUri ?: uri
+            } else {
+                uri
+            }
+        }
+
+        fun isGif(context: Context): Boolean {
+            return if (Build.VERSION.SDK_INT >= Build.VERSION_CODES.N_MR1 && inputContent != null) {
+                inputContent.description.hasMimeType("image/gif")
+            } else {
+                uri?.let(context.contentResolver::getType) == "image/gif"
+            }
+        }
+    }
+
+    data class Contact(val vCard: String) : Attachment()
+
+}
+
+class Attachments(attachments: List<Attachment>) : List<Attachment> by attachments
diff --git a/domain/src/main/java/com/moez/QKSMS/model/BackupFile.kt b/domain/src/main/java/com/moez/QKSMS/model/BackupFile.kt
index eca659216..ce0d8bef9 100644
--- a/domain/src/main/java/com/moez/QKSMS/model/BackupFile.kt
+++ b/domain/src/main/java/com/moez/QKSMS/model/BackupFile.kt
@@ -1,26 +1,26 @@
-/*
- * Copyright (C) 2017 Moez Bhatti <moez.bhatti@gmail.com>
- *
- * This file is part of QKSMS.
- *
- * QKSMS is free software: you can redistribute it and/or modify
- * it under the terms of the GNU General Public License as published by
- * the Free Software Foundation, either version 3 of the License, or
- * (at your option) any later version.
- *
- * QKSMS is distributed in the hope that it will be useful,
- * but WITHOUT ANY WARRANTY; without even the implied warranty of
- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
- * GNU General Public License for more details.
- *
- * You should have received a copy of the GNU General Public License
- * along with QKSMS.  If not, see <http://www.gnu.org/licenses/>.
- */
-package com.moez.QKSMS.model
-
-data class BackupFile(
-    val path: String,
-    val date: Long,
-    val messages: Int,
-    val size: Long
+/*
+ * Copyright (C) 2017 Moez Bhatti <moez.bhatti@gmail.com>
+ *
+ * This file is part of QKSMS.
+ *
+ * QKSMS is free software: you can redistribute it and/or modify
+ * it under the terms of the GNU General Public License as published by
+ * the Free Software Foundation, either version 3 of the License, or
+ * (at your option) any later version.
+ *
+ * QKSMS is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+ * GNU General Public License for more details.
+ *
+ * You should have received a copy of the GNU General Public License
+ * along with QKSMS.  If not, see <http://www.gnu.org/licenses/>.
+ */
+package com.moez.QKSMS.model
+
+data class BackupFile(
+    val path: String,
+    val date: Long,
+    val messages: Int,
+    val size: Long
 )
\ No newline at end of file
diff --git a/domain/src/main/java/com/moez/QKSMS/model/BlockedNumber.kt b/domain/src/main/java/com/moez/QKSMS/model/BlockedNumber.kt
index f2bf54a1c..6b09c504e 100644
--- a/domain/src/main/java/com/moez/QKSMS/model/BlockedNumber.kt
+++ b/domain/src/main/java/com/moez/QKSMS/model/BlockedNumber.kt
@@ -1,10 +1,10 @@
-package com.moez.QKSMS.model
-
-import io.realm.RealmObject
-import io.realm.annotations.PrimaryKey
-
-open class BlockedNumber(
-        @PrimaryKey var id: Long = 0,
-
-        var address: String = ""
-) : RealmObject()
+package com.moez.QKSMS.model
+
+import io.realm.RealmObject
+import io.realm.annotations.PrimaryKey
+
+open class BlockedNumber(
+        @PrimaryKey var id: Long = 0,
+
+        var address: String = ""
+) : RealmObject()
diff --git a/domain/src/main/java/com/moez/QKSMS/model/Contact.kt b/domain/src/main/java/com/moez/QKSMS/model/Contact.kt
index 8c08e42af..5782e44a5 100644
--- a/domain/src/main/java/com/moez/QKSMS/model/Contact.kt
+++ b/domain/src/main/java/com/moez/QKSMS/model/Contact.kt
@@ -1,36 +1,36 @@
-/*
- * Copyright (C) 2017 Moez Bhatti <moez.bhatti@gmail.com>
- *
- * This file is part of QKSMS.
- *
- * QKSMS is free software: you can redistribute it and/or modify
- * it under the terms of the GNU General Public License as published by
- * the Free Software Foundation, either version 3 of the License, or
- * (at your option) any later version.
- *
- * QKSMS is distributed in the hope that it will be useful,
- * but WITHOUT ANY WARRANTY; without even the implied warranty of
- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
- * GNU General Public License for more details.
- *
- * You should have received a copy of the GNU General Public License
- * along with QKSMS.  If not, see <http://www.gnu.org/licenses/>.
- */
-package com.moez.QKSMS.model
-
-import io.realm.RealmList
-import io.realm.RealmObject
-import io.realm.annotations.PrimaryKey
-
-open class Contact(
-    @PrimaryKey var lookupKey: String = "",
-    var numbers: RealmList<PhoneNumber> = RealmList(),
-    var name: String = "",
-    var photoUri: String? = null,
-    var starred: Boolean = false,
-    var lastUpdate: Long = 0
-) : RealmObject() {
-
-    fun getDefaultNumber(): PhoneNumber? = numbers.find { number -> number.isDefault }
-
-}
+/*
+ * Copyright (C) 2017 Moez Bhatti <moez.bhatti@gmail.com>
+ *
+ * This file is part of QKSMS.
+ *
+ * QKSMS is free software: you can redistribute it and/or modify
+ * it under the terms of the GNU General Public License as published by
+ * the Free Software Foundation, either version 3 of the License, or
+ * (at your option) any later version.
+ *
+ * QKSMS is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+ * GNU General Public License for more details.
+ *
+ * You should have received a copy of the GNU General Public License
+ * along with QKSMS.  If not, see <http://www.gnu.org/licenses/>.
+ */
+package com.moez.QKSMS.model
+
+import io.realm.RealmList
+import io.realm.RealmObject
+import io.realm.annotations.PrimaryKey
+
+open class Contact(
+    @PrimaryKey var lookupKey: String = "",
+    var numbers: RealmList<PhoneNumber> = RealmList(),
+    var name: String = "",
+    var photoUri: String? = null,
+    var starred: Boolean = false,
+    var lastUpdate: Long = 0
+) : RealmObject() {
+
+    fun getDefaultNumber(): PhoneNumber? = numbers.find { number -> number.isDefault }
+
+}
diff --git a/domain/src/main/java/com/moez/QKSMS/model/ContactGroup.kt b/domain/src/main/java/com/moez/QKSMS/model/ContactGroup.kt
index fd0e4363f..526d8ff0f 100644
--- a/domain/src/main/java/com/moez/QKSMS/model/ContactGroup.kt
+++ b/domain/src/main/java/com/moez/QKSMS/model/ContactGroup.kt
@@ -1,29 +1,29 @@
-/*
- * Copyright (C) 2019 Moez Bhatti <moez.bhatti@gmail.com>
- *
- * This file is part of QKSMS.
- *
- * QKSMS is free software: you can redistribute it and/or modify
- * it under the terms of the GNU General Public License as published by
- * the Free Software Foundation, either version 3 of the License, or
- * (at your option) any later version.
- *
- * QKSMS is distributed in the hope that it will be useful,
- * but WITHOUT ANY WARRANTY; without even the implied warranty of
- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
- * GNU General Public License for more details.
- *
- * You should have received a copy of the GNU General Public License
- * along with QKSMS.  If not, see <http://www.gnu.org/licenses/>.
- */
-package com.moez.QKSMS.model
-
-import io.realm.RealmList
-import io.realm.RealmObject
-import io.realm.annotations.PrimaryKey
-
-open class ContactGroup(
-    @PrimaryKey var id: Long = 0,
-    var title: String = "",
-    var contacts: RealmList<Contact> = RealmList()
-) : RealmObject()
+/*
+ * Copyright (C) 2019 Moez Bhatti <moez.bhatti@gmail.com>
+ *
+ * This file is part of QKSMS.
+ *
+ * QKSMS is free software: you can redistribute it and/or modify
+ * it under the terms of the GNU General Public License as published by
+ * the Free Software Foundation, either version 3 of the License, or
+ * (at your option) any later version.
+ *
+ * QKSMS is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+ * GNU General Public License for more details.
+ *
+ * You should have received a copy of the GNU General Public License
+ * along with QKSMS.  If not, see <http://www.gnu.org/licenses/>.
+ */
+package com.moez.QKSMS.model
+
+import io.realm.RealmList
+import io.realm.RealmObject
+import io.realm.annotations.PrimaryKey
+
+open class ContactGroup(
+    @PrimaryKey var id: Long = 0,
+    var title: String = "",
+    var contacts: RealmList<Contact> = RealmList()
+) : RealmObject()
diff --git a/domain/src/main/java/com/moez/QKSMS/model/Conversation.kt b/domain/src/main/java/com/moez/QKSMS/model/Conversation.kt
index d4339b414..514fd06e3 100644
--- a/domain/src/main/java/com/moez/QKSMS/model/Conversation.kt
+++ b/domain/src/main/java/com/moez/QKSMS/model/Conversation.kt
@@ -1,50 +1,50 @@
-/*
- * Copyright (C) 2017 Moez Bhatti <moez.bhatti@gmail.com>
- *
- * This file is part of QKSMS.
- *
- * QKSMS is free software: you can redistribute it and/or modify
- * it under the terms of the GNU General Public License as published by
- * the Free Software Foundation, either version 3 of the License, or
- * (at your option) any later version.
- *
- * QKSMS is distributed in the hope that it will be useful,
- * but WITHOUT ANY WARRANTY; without even the implied warranty of
- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
- * GNU General Public License for more details.
- *
- * You should have received a copy of the GNU General Public License
- * along with QKSMS.  If not, see <http://www.gnu.org/licenses/>.
- */
-package com.moez.QKSMS.model
-
-import io.realm.RealmList
-import io.realm.RealmObject
-import io.realm.annotations.Index
-import io.realm.annotations.PrimaryKey
-
-open class Conversation(
-    @PrimaryKey var id: Long = 0,
-    @Index var archived: Boolean = false,
-    @Index var blocked: Boolean = false,
-    @Index var pinned: Boolean = false,
-    var recipients: RealmList<Recipient> = RealmList(),
-    var lastMessage: Message? = null,
-    var draft: String = "",
-
-    var blockingClient: Int? = null,
-    var blockReason: String? = null,
-
-    var name: String = "" // For group chats, the user is allowed to set a custom title for the conversation
-) : RealmObject() {
-
-    val date: Long get() = lastMessage?.date ?: 0
-    val snippet: String? get() = lastMessage?.getSummary()
-    val unread: Boolean get() = lastMessage?.read == false
-    val me: Boolean get() = lastMessage?.isMe() == true
-
-    fun getTitle(): String {
-        return name.takeIf { it.isNotBlank() } ?: recipients.joinToString { recipient -> recipient.getDisplayName() }
-    }
-
-}
+/*
+ * Copyright (C) 2017 Moez Bhatti <moez.bhatti@gmail.com>
+ *
+ * This file is part of QKSMS.
+ *
+ * QKSMS is free software: you can redistribute it and/or modify
+ * it under the terms of the GNU General Public License as published by
+ * the Free Software Foundation, either version 3 of the License, or
+ * (at your option) any later version.
+ *
+ * QKSMS is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+ * GNU General Public License for more details.
+ *
+ * You should have received a copy of the GNU General Public License
+ * along with QKSMS.  If not, see <http://www.gnu.org/licenses/>.
+ */
+package com.moez.QKSMS.model
+
+import io.realm.RealmList
+import io.realm.RealmObject
+import io.realm.annotations.Index
+import io.realm.annotations.PrimaryKey
+
+open class Conversation(
+    @PrimaryKey var id: Long = 0,
+    @Index var archived: Boolean = false,
+    @Index var blocked: Boolean = false,
+    @Index var pinned: Boolean = false,
+    var recipients: RealmList<Recipient> = RealmList(),
+    var lastMessage: Message? = null,
+    var draft: String = "",
+
+    var blockingClient: Int? = null,
+    var blockReason: String? = null,
+
+    var name: String = "" // For group chats, the user is allowed to set a custom title for the conversation
+) : RealmObject() {
+
+    val date: Long get() = lastMessage?.date ?: 0
+    val snippet: String? get() = lastMessage?.getSummary()
+    val unread: Boolean get() = lastMessage?.read == false
+    val me: Boolean get() = lastMessage?.isMe() == true
+
+    fun getTitle(): String {
+        return name.takeIf { it.isNotBlank() } ?: recipients.joinToString { recipient -> recipient.getDisplayName() }
+    }
+
+}
diff --git a/domain/src/main/java/com/moez/QKSMS/model/Message.kt b/domain/src/main/java/com/moez/QKSMS/model/Message.kt
index 82d040598..c576c4a9d 100644
--- a/domain/src/main/java/com/moez/QKSMS/model/Message.kt
+++ b/domain/src/main/java/com/moez/QKSMS/model/Message.kt
@@ -1,164 +1,164 @@
-/*
- * Copyright (C) 2017 Moez Bhatti <moez.bhatti@gmail.com>
- *
- * This file is part of QKSMS.
- *
- * QKSMS is free software: you can redistribute it and/or modify
- * it under the terms of the GNU General Public License as published by
- * the Free Software Foundation, either version 3 of the License, or
- * (at your option) any later version.
- *
- * QKSMS is distributed in the hope that it will be useful,
- * but WITHOUT ANY WARRANTY; without even the implied warranty of
- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
- * GNU General Public License for more details.
- *
- * You should have received a copy of the GNU General Public License
- * along with QKSMS.  If not, see <http://www.gnu.org/licenses/>.
- */
-package com.moez.QKSMS.model
-
-import android.content.ContentUris
-import android.net.Uri
-import android.provider.Telephony.*
-import io.realm.RealmList
-import io.realm.RealmObject
-import io.realm.annotations.Index
-import io.realm.annotations.PrimaryKey
-
-open class Message : RealmObject() {
-
-    enum class AttachmentType { TEXT, IMAGE, VIDEO, AUDIO, SLIDESHOW, NOT_LOADED }
-
-    @PrimaryKey var id: Long = 0
-
-    @Index var threadId: Long = 0
-
-    // The MMS-SMS content provider returns messages where duplicate ids can exist. This is because
-    // SMS and MMS are stored in separate tables. We can't use these ids as our realm message id
-    // since it's our primary key for the single message object, so we'll store the original id in
-    // case we need to access the original message item in the content provider
-    var contentId: Long = 0
-    var address: String = ""
-    var boxId: Int = 0
-    var type: String = ""
-    var date: Long = 0
-    var dateSent: Long = 0
-    var seen: Boolean = false
-    var read: Boolean = false
-    var locked: Boolean = false
-    var subId: Int = -1
-
-    // SMS only
-    var body: String = ""
-    var errorCode: Int = 0
-    var deliveryStatus: Int = Sms.STATUS_NONE
-
-    // MMS only
-    var attachmentTypeString: String = AttachmentType.NOT_LOADED.toString()
-    var attachmentType: AttachmentType
-        get() = AttachmentType.valueOf(attachmentTypeString)
-        set(value) {
-            attachmentTypeString = value.toString()
-        }
-
-    var mmsDeliveryStatusString: String = ""
-    var readReportString: String = ""
-    var errorType: Int = 0
-    var messageSize: Int = 0
-    var messageType: Int = 0
-    var mmsStatus: Int = 0
-    var subject: String = ""
-    var textContentType: String = ""
-    var parts: RealmList<MmsPart> = RealmList()
-
-    fun getUri(): Uri {
-        val baseUri = if (isMms()) Mms.CONTENT_URI else Sms.CONTENT_URI
-        return ContentUris.withAppendedId(baseUri, contentId)
-    }
-
-    fun isMms(): Boolean = type == "mms"
-
-    fun isSms(): Boolean = type == "sms"
-
-    fun isMe(): Boolean {
-        val isIncomingMms = isMms() && (boxId == Mms.MESSAGE_BOX_INBOX || boxId == Mms.MESSAGE_BOX_ALL)
-        val isIncomingSms = isSms() && (boxId == Sms.MESSAGE_TYPE_INBOX || boxId == Sms.MESSAGE_TYPE_ALL)
-
-        return !(isIncomingMms || isIncomingSms)
-    }
-
-    fun isOutgoingMessage(): Boolean {
-        val isOutgoingMms = isMms() && boxId == Mms.MESSAGE_BOX_OUTBOX
-        val isOutgoingSms = isSms() && (boxId == Sms.MESSAGE_TYPE_FAILED
-                || boxId == Sms.MESSAGE_TYPE_OUTBOX
-                || boxId == Sms.MESSAGE_TYPE_QUEUED)
-
-        return isOutgoingMms || isOutgoingSms
-    }
-
-    /**
-     * Returns the text that should be copied to the clipboard
-     */
-    fun getText(): String {
-        return when {
-            isSms() -> body
-
-            else -> parts
-                    .filter { it.type == "text/plain" }
-                    .mapNotNull { it.text }
-                    .joinToString("\n") { text -> text }
-        }
-    }
-
-    /**
-     * Returns the text that should be displayed when a preview of the message
-     * needs to be displayed, such as in the conversation view or in a notification
-     */
-    fun getSummary(): String = when {
-        isSms() -> body
-
-        else -> {
-            val sb = StringBuilder()
-
-            // Add subject
-            getCleansedSubject().takeIf { it.isNotEmpty() }?.run(sb::appendln)
-
-            // Add parts
-            parts.mapNotNull { it.getSummary() }.forEach { summary -> sb.appendln(summary) }
-
-            sb.toString().trim()
-        }
-    }
-
-    /**
-     * Cleanses the subject in case it's useless, so that the UI doesn't have to show it
-     */
-    fun getCleansedSubject(): String {
-        val uselessSubjects = listOf("no subject", "NoSubject", "<not present>")
-
-        return if (uselessSubjects.contains(subject)) "" else subject
-    }
-
-    fun isSending(): Boolean {
-        return !isFailedMessage() && isOutgoingMessage()
-    }
-
-    fun isDelivered(): Boolean {
-        val isDeliveredMms = false // TODO
-        val isDeliveredSms = deliveryStatus == Sms.STATUS_COMPLETE
-        return isDeliveredMms || isDeliveredSms
-    }
-
-    fun isFailedMessage(): Boolean {
-        val isFailedMms = isMms() && (errorType >= MmsSms.ERR_TYPE_GENERIC_PERMANENT || boxId == Mms.MESSAGE_BOX_FAILED)
-        val isFailedSms = isSms() && boxId == Sms.MESSAGE_TYPE_FAILED
-        return isFailedMms || isFailedSms
-    }
-
-    fun compareSender(other: Message): Boolean = when {
-        isMe() && other.isMe() -> subId == other.subId
-        !isMe() && !other.isMe() -> subId == other.subId && address == other.address
-        else -> false
-    }
+/*
+ * Copyright (C) 2017 Moez Bhatti <moez.bhatti@gmail.com>
+ *
+ * This file is part of QKSMS.
+ *
+ * QKSMS is free software: you can redistribute it and/or modify
+ * it under the terms of the GNU General Public License as published by
+ * the Free Software Foundation, either version 3 of the License, or
+ * (at your option) any later version.
+ *
+ * QKSMS is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+ * GNU General Public License for more details.
+ *
+ * You should have received a copy of the GNU General Public License
+ * along with QKSMS.  If not, see <http://www.gnu.org/licenses/>.
+ */
+package com.moez.QKSMS.model
+
+import android.content.ContentUris
+import android.net.Uri
+import android.provider.Telephony.*
+import io.realm.RealmList
+import io.realm.RealmObject
+import io.realm.annotations.Index
+import io.realm.annotations.PrimaryKey
+
+open class Message : RealmObject() {
+
+    enum class AttachmentType { TEXT, IMAGE, VIDEO, AUDIO, SLIDESHOW, NOT_LOADED }
+
+    @PrimaryKey var id: Long = 0
+
+    @Index var threadId: Long = 0
+
+    // The MMS-SMS content provider returns messages where duplicate ids can exist. This is because
+    // SMS and MMS are stored in separate tables. We can't use these ids as our realm message id
+    // since it's our primary key for the single message object, so we'll store the original id in
+    // case we need to access the original message item in the content provider
+    var contentId: Long = 0
+    var address: String = ""
+    var boxId: Int = 0
+    var type: String = ""
+    var date: Long = 0
+    var dateSent: Long = 0
+    var seen: Boolean = false
+    var read: Boolean = false
+    var locked: Boolean = false
+    var subId: Int = -1
+
+    // SMS only
+    var body: String = ""
+    var errorCode: Int = 0
+    var deliveryStatus: Int = Sms.STATUS_NONE
+
+    // MMS only
+    var attachmentTypeString: String = AttachmentType.NOT_LOADED.toString()
+    var attachmentType: AttachmentType
+        get() = AttachmentType.valueOf(attachmentTypeString)
+        set(value) {
+            attachmentTypeString = value.toString()
+        }
+
+    var mmsDeliveryStatusString: String = ""
+    var readReportString: String = ""
+    var errorType: Int = 0
+    var messageSize: Int = 0
+    var messageType: Int = 0
+    var mmsStatus: Int = 0
+    var subject: String = ""
+    var textContentType: String = ""
+    var parts: RealmList<MmsPart> = RealmList()
+
+    fun getUri(): Uri {
+        val baseUri = if (isMms()) Mms.CONTENT_URI else Sms.CONTENT_URI
+        return ContentUris.withAppendedId(baseUri, contentId)
+    }
+
+    fun isMms(): Boolean = type == "mms"
+
+    fun isSms(): Boolean = type == "sms"
+
+    fun isMe(): Boolean {
+        val isIncomingMms = isMms() && (boxId == Mms.MESSAGE_BOX_INBOX || boxId == Mms.MESSAGE_BOX_ALL)
+        val isIncomingSms = isSms() && (boxId == Sms.MESSAGE_TYPE_INBOX || boxId == Sms.MESSAGE_TYPE_ALL)
+
+        return !(isIncomingMms || isIncomingSms)
+    }
+
+    fun isOutgoingMessage(): Boolean {
+        val isOutgoingMms = isMms() && boxId == Mms.MESSAGE_BOX_OUTBOX
+        val isOutgoingSms = isSms() && (boxId == Sms.MESSAGE_TYPE_FAILED
+                || boxId == Sms.MESSAGE_TYPE_OUTBOX
+                || boxId == Sms.MESSAGE_TYPE_QUEUED)
+
+        return isOutgoingMms || isOutgoingSms
+    }
+
+    /**
+     * Returns the text that should be copied to the clipboard
+     */
+    fun getText(): String {
+        return when {
+            isSms() -> body
+
+            else -> parts
+                    .filter { it.type == "text/plain" }
+                    .mapNotNull { it.text }
+                    .joinToString("\n") { text -> text }
+        }
+    }
+
+    /**
+     * Returns the text that should be displayed when a preview of the message
+     * needs to be displayed, such as in the conversation view or in a notification
+     */
+    fun getSummary(): String = when {
+        isSms() -> body
+
+        else -> {
+            val sb = StringBuilder()
+
+            // Add subject
+            getCleansedSubject().takeIf { it.isNotEmpty() }?.run(sb::appendln)
+
+            // Add parts
+            parts.mapNotNull { it.getSummary() }.forEach { summary -> sb.appendln(summary) }
+
+            sb.toString().trim()
+        }
+    }
+
+    /**
+     * Cleanses the subject in case it's useless, so that the UI doesn't have to show it
+     */
+    fun getCleansedSubject(): String {
+        val uselessSubjects = listOf("no subject", "NoSubject", "<not present>")
+
+        return if (uselessSubjects.contains(subject)) "" else subject
+    }
+
+    fun isSending(): Boolean {
+        return !isFailedMessage() && isOutgoingMessage()
+    }
+
+    fun isDelivered(): Boolean {
+        val isDeliveredMms = false // TODO
+        val isDeliveredSms = deliveryStatus == Sms.STATUS_COMPLETE
+        return isDeliveredMms || isDeliveredSms
+    }
+
+    fun isFailedMessage(): Boolean {
+        val isFailedMms = isMms() && (errorType >= MmsSms.ERR_TYPE_GENERIC_PERMANENT || boxId == Mms.MESSAGE_BOX_FAILED)
+        val isFailedSms = isSms() && boxId == Sms.MESSAGE_TYPE_FAILED
+        return isFailedMms || isFailedSms
+    }
+
+    fun compareSender(other: Message): Boolean = when {
+        isMe() && other.isMe() -> subId == other.subId
+        !isMe() && !other.isMe() -> subId == other.subId && address == other.address
+        else -> false
+    }
 }
\ No newline at end of file
diff --git a/domain/src/main/java/com/moez/QKSMS/model/MmsPart.kt b/domain/src/main/java/com/moez/QKSMS/model/MmsPart.kt
index aa3fa9082..25dc860be 100644
--- a/domain/src/main/java/com/moez/QKSMS/model/MmsPart.kt
+++ b/domain/src/main/java/com/moez/QKSMS/model/MmsPart.kt
@@ -1,50 +1,50 @@
-/*
- * Copyright (C) 2017 Moez Bhatti <moez.bhatti@gmail.com>
- *
- * This file is part of QKSMS.
- *
- * QKSMS is free software: you can redistribute it and/or modify
- * it under the terms of the GNU General Public License as published by
- * the Free Software Foundation, either version 3 of the License, or
- * (at your option) any later version.
- *
- * QKSMS is distributed in the hope that it will be useful,
- * but WITHOUT ANY WARRANTY; without even the implied warranty of
- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
- * GNU General Public License for more details.
- *
- * You should have received a copy of the GNU General Public License
- * along with QKSMS.  If not, see <http://www.gnu.org/licenses/>.
- */
-package com.moez.QKSMS.model
-
-import androidx.core.net.toUri
-import io.realm.RealmObject
-import io.realm.RealmResults
-import io.realm.annotations.Index
-import io.realm.annotations.LinkingObjects
-import io.realm.annotations.PrimaryKey
-
-open class MmsPart : RealmObject() {
-
-    @PrimaryKey var id: Long = 0
-    @Index var messageId: Long = 0
-    var type: String = ""
-    var seq: Int = -1
-    var name: String? = null
-    var text: String? = null
-
-    @LinkingObjects("parts")
-    val messages: RealmResults<Message>? = null
-
-    fun getUri() = "content://mms/part/$id".toUri()
-
-    fun getSummary(): String? = when {
-        type == "text/plain" -> text
-        type == "text/x-vCard" -> "Contact card"
-        type.startsWith("image") -> "Photo"
-        type.startsWith("video") -> "Video"
-        else -> null
-    }
-
+/*
+ * Copyright (C) 2017 Moez Bhatti <moez.bhatti@gmail.com>
+ *
+ * This file is part of QKSMS.
+ *
+ * QKSMS is free software: you can redistribute it and/or modify
+ * it under the terms of the GNU General Public License as published by
+ * the Free Software Foundation, either version 3 of the License, or
+ * (at your option) any later version.
+ *
+ * QKSMS is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+ * GNU General Public License for more details.
+ *
+ * You should have received a copy of the GNU General Public License
+ * along with QKSMS.  If not, see <http://www.gnu.org/licenses/>.
+ */
+package com.moez.QKSMS.model
+
+import androidx.core.net.toUri
+import io.realm.RealmObject
+import io.realm.RealmResults
+import io.realm.annotations.Index
+import io.realm.annotations.LinkingObjects
+import io.realm.annotations.PrimaryKey
+
+open class MmsPart : RealmObject() {
+
+    @PrimaryKey var id: Long = 0
+    @Index var messageId: Long = 0
+    var type: String = ""
+    var seq: Int = -1
+    var name: String? = null
+    var text: String? = null
+
+    @LinkingObjects("parts")
+    val messages: RealmResults<Message>? = null
+
+    fun getUri() = "content://mms/part/$id".toUri()
+
+    fun getSummary(): String? = when {
+        type == "text/plain" -> text
+        type == "text/x-vCard" -> "Contact card"
+        type.startsWith("image") -> "Photo"
+        type.startsWith("video") -> "Video"
+        else -> null
+    }
+
 }
\ No newline at end of file
diff --git a/domain/src/main/java/com/moez/QKSMS/model/PhoneNumber.kt b/domain/src/main/java/com/moez/QKSMS/model/PhoneNumber.kt
index 4c4063546..48be4d79b 100644
--- a/domain/src/main/java/com/moez/QKSMS/model/PhoneNumber.kt
+++ b/domain/src/main/java/com/moez/QKSMS/model/PhoneNumber.kt
@@ -1,30 +1,30 @@
-/*
- * Copyright (C) 2017 Moez Bhatti <moez.bhatti@gmail.com>
- *
- * This file is part of QKSMS.
- *
- * QKSMS is free software: you can redistribute it and/or modify
- * it under the terms of the GNU General Public License as published by
- * the Free Software Foundation, either version 3 of the License, or
- * (at your option) any later version.
- *
- * QKSMS is distributed in the hope that it will be useful,
- * but WITHOUT ANY WARRANTY; without even the implied warranty of
- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
- * GNU General Public License for more details.
- *
- * You should have received a copy of the GNU General Public License
- * along with QKSMS.  If not, see <http://www.gnu.org/licenses/>.
- */
-package com.moez.QKSMS.model
-
-import io.realm.RealmObject
-import io.realm.annotations.PrimaryKey
-
-open class PhoneNumber(
-    @PrimaryKey var id: Long = 0,
-    var accountType: String? = "",
-    var address: String = "",
-    var type: String = "",
-    var isDefault: Boolean = false
-) : RealmObject()
+/*
+ * Copyright (C) 2017 Moez Bhatti <moez.bhatti@gmail.com>
+ *
+ * This file is part of QKSMS.
+ *
+ * QKSMS is free software: you can redistribute it and/or modify
+ * it under the terms of the GNU General Public License as published by
+ * the Free Software Foundation, either version 3 of the License, or
+ * (at your option) any later version.
+ *
+ * QKSMS is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+ * GNU General Public License for more details.
+ *
+ * You should have received a copy of the GNU General Public License
+ * along with QKSMS.  If not, see <http://www.gnu.org/licenses/>.
+ */
+package com.moez.QKSMS.model
+
+import io.realm.RealmObject
+import io.realm.annotations.PrimaryKey
+
+open class PhoneNumber(
+    @PrimaryKey var id: Long = 0,
+    var accountType: String? = "",
+    var address: String = "",
+    var type: String = "",
+    var isDefault: Boolean = false
+) : RealmObject()
diff --git a/domain/src/main/java/com/moez/QKSMS/model/Recipient.kt b/domain/src/main/java/com/moez/QKSMS/model/Recipient.kt
index 2beebaaed..cedda44f0 100644
--- a/domain/src/main/java/com/moez/QKSMS/model/Recipient.kt
+++ b/domain/src/main/java/com/moez/QKSMS/model/Recipient.kt
@@ -1,40 +1,40 @@
-/*
- * Copyright (C) 2017 Moez Bhatti <moez.bhatti@gmail.com>
- *
- * This file is part of QKSMS.
- *
- * QKSMS is free software: you can redistribute it and/or modify
- * it under the terms of the GNU General Public License as published by
- * the Free Software Foundation, either version 3 of the License, or
- * (at your option) any later version.
- *
- * QKSMS is distributed in the hope that it will be useful,
- * but WITHOUT ANY WARRANTY; without even the implied warranty of
- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
- * GNU General Public License for more details.
- *
- * You should have received a copy of the GNU General Public License
- * along with QKSMS.  If not, see <http://www.gnu.org/licenses/>.
- */
-package com.moez.QKSMS.model
-
-import android.telephony.PhoneNumberUtils
-import io.realm.RealmObject
-import io.realm.annotations.PrimaryKey
-import java.util.*
-
-open class Recipient(
-    @PrimaryKey var id: Long = 0,
-    var address: String = "",
-    var contact: Contact? = null,
-    var lastUpdate: Long = 0
-) : RealmObject() {
-
-    /**
-     * Return a string that can be displayed to represent the name of this contact
-     */
-    fun getDisplayName(): String = contact?.name?.takeIf { it.isNotBlank() }
-            ?: PhoneNumberUtils.formatNumber(address, Locale.getDefault().country) // TODO: Use our own PhoneNumberUtils
-            ?: address
-
-}
+/*
+ * Copyright (C) 2017 Moez Bhatti <moez.bhatti@gmail.com>
+ *
+ * This file is part of QKSMS.
+ *
+ * QKSMS is free software: you can redistribute it and/or modify
+ * it under the terms of the GNU General Public License as published by
+ * the Free Software Foundation, either version 3 of the License, or
+ * (at your option) any later version.
+ *
+ * QKSMS is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+ * GNU General Public License for more details.
+ *
+ * You should have received a copy of the GNU General Public License
+ * along with QKSMS.  If not, see <http://www.gnu.org/licenses/>.
+ */
+package com.moez.QKSMS.model
+
+import android.telephony.PhoneNumberUtils
+import io.realm.RealmObject
+import io.realm.annotations.PrimaryKey
+import java.util.*
+
+open class Recipient(
+    @PrimaryKey var id: Long = 0,
+    var address: String = "",
+    var contact: Contact? = null,
+    var lastUpdate: Long = 0
+) : RealmObject() {
+
+    /**
+     * Return a string that can be displayed to represent the name of this contact
+     */
+    fun getDisplayName(): String = contact?.name?.takeIf { it.isNotBlank() }
+            ?: PhoneNumberUtils.formatNumber(address, Locale.getDefault().country) // TODO: Use our own PhoneNumberUtils
+            ?: address
+
+}
diff --git a/domain/src/main/java/com/moez/QKSMS/model/ScheduledMessage.kt b/domain/src/main/java/com/moez/QKSMS/model/ScheduledMessage.kt
index de07f1952..356c3c6f7 100644
--- a/domain/src/main/java/com/moez/QKSMS/model/ScheduledMessage.kt
+++ b/domain/src/main/java/com/moez/QKSMS/model/ScheduledMessage.kt
@@ -1,48 +1,48 @@
-/*
- * Copyright (C) 2017 Moez Bhatti <moez.bhatti@gmail.com>
- *
- * This file is part of QKSMS.
- *
- * QKSMS is free software: you can redistribute it and/or modify
- * it under the terms of the GNU General Public License as published by
- * the Free Software Foundation, either version 3 of the License, or
- * (at your option) any later version.
- *
- * QKSMS is distributed in the hope that it will be useful,
- * but WITHOUT ANY WARRANTY; without even the implied warranty of
- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
- * GNU General Public License for more details.
- *
- * You should have received a copy of the GNU General Public License
- * along with QKSMS.  If not, see <http://www.gnu.org/licenses/>.
- */
-package com.moez.QKSMS.model
-
-import io.realm.RealmList
-import io.realm.RealmObject
-import io.realm.annotations.PrimaryKey
-
-open class ScheduledMessage(
-    @PrimaryKey var id: Long = 0,
-    var date: Long = 0,
-    var subId: Int = -1,
-    var recipients: RealmList<String> = RealmList(),
-    var sendAsGroup: Boolean = true,
-    var body: String = "",
-    var attachments: RealmList<String> = RealmList()
-) : RealmObject() {
-
-    fun copy(
-        id: Long = this.id,
-        date: Long = this.date,
-        subId: Int = this.subId,
-        recipients: RealmList<String> = this.recipients,
-        sendAsGroup: Boolean = this.sendAsGroup,
-        body: String = this.body,
-        attachments: RealmList<String> = this.attachments
-    ): ScheduledMessage {
-
-        return ScheduledMessage(id, date, subId, recipients, sendAsGroup, body, attachments)
-    }
-
+/*
+ * Copyright (C) 2017 Moez Bhatti <moez.bhatti@gmail.com>
+ *
+ * This file is part of QKSMS.
+ *
+ * QKSMS is free software: you can redistribute it and/or modify
+ * it under the terms of the GNU General Public License as published by
+ * the Free Software Foundation, either version 3 of the License, or
+ * (at your option) any later version.
+ *
+ * QKSMS is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+ * GNU General Public License for more details.
+ *
+ * You should have received a copy of the GNU General Public License
+ * along with QKSMS.  If not, see <http://www.gnu.org/licenses/>.
+ */
+package com.moez.QKSMS.model
+
+import io.realm.RealmList
+import io.realm.RealmObject
+import io.realm.annotations.PrimaryKey
+
+open class ScheduledMessage(
+    @PrimaryKey var id: Long = 0,
+    var date: Long = 0,
+    var subId: Int = -1,
+    var recipients: RealmList<String> = RealmList(),
+    var sendAsGroup: Boolean = true,
+    var body: String = "",
+    var attachments: RealmList<String> = RealmList()
+) : RealmObject() {
+
+    fun copy(
+        id: Long = this.id,
+        date: Long = this.date,
+        subId: Int = this.subId,
+        recipients: RealmList<String> = this.recipients,
+        sendAsGroup: Boolean = this.sendAsGroup,
+        body: String = this.body,
+        attachments: RealmList<String> = this.attachments
+    ): ScheduledMessage {
+
+        return ScheduledMessage(id, date, subId, recipients, sendAsGroup, body, attachments)
+    }
+
 }
\ No newline at end of file
diff --git a/domain/src/main/java/com/moez/QKSMS/model/SearchResult.kt b/domain/src/main/java/com/moez/QKSMS/model/SearchResult.kt
index cef7504de..e3e245c3a 100644
--- a/domain/src/main/java/com/moez/QKSMS/model/SearchResult.kt
+++ b/domain/src/main/java/com/moez/QKSMS/model/SearchResult.kt
@@ -1,21 +1,21 @@
-/*
- * Copyright (C) 2017 Moez Bhatti <moez.bhatti@gmail.com>
- *
- * This file is part of QKSMS.
- *
- * QKSMS is free software: you can redistribute it and/or modify
- * it under the terms of the GNU General Public License as published by
- * the Free Software Foundation, either version 3 of the License, or
- * (at your option) any later version.
- *
- * QKSMS is distributed in the hope that it will be useful,
- * but WITHOUT ANY WARRANTY; without even the implied warranty of
- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
- * GNU General Public License for more details.
- *
- * You should have received a copy of the GNU General Public License
- * along with QKSMS.  If not, see <http://www.gnu.org/licenses/>.
- */
-package com.moez.QKSMS.model
-
+/*
+ * Copyright (C) 2017 Moez Bhatti <moez.bhatti@gmail.com>
+ *
+ * This file is part of QKSMS.
+ *
+ * QKSMS is free software: you can redistribute it and/or modify
+ * it under the terms of the GNU General Public License as published by
+ * the Free Software Foundation, either version 3 of the License, or
+ * (at your option) any later version.
+ *
+ * QKSMS is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+ * GNU General Public License for more details.
+ *
+ * You should have received a copy of the GNU General Public License
+ * along with QKSMS.  If not, see <http://www.gnu.org/licenses/>.
+ */
+package com.moez.QKSMS.model
+
 data class SearchResult(val query: String, val conversation: Conversation, val messages: Int)
\ No newline at end of file
diff --git a/domain/src/main/java/com/moez/QKSMS/model/SyncLog.kt b/domain/src/main/java/com/moez/QKSMS/model/SyncLog.kt
index e6a63f5e4..e79e8388c 100644
--- a/domain/src/main/java/com/moez/QKSMS/model/SyncLog.kt
+++ b/domain/src/main/java/com/moez/QKSMS/model/SyncLog.kt
@@ -1,27 +1,27 @@
-/*
- * Copyright (C) 2017 Moez Bhatti <moez.bhatti@gmail.com>
- *
- * This file is part of QKSMS.
- *
- * QKSMS is free software: you can redistribute it and/or modify
- * it under the terms of the GNU General Public License as published by
- * the Free Software Foundation, either version 3 of the License, or
- * (at your option) any later version.
- *
- * QKSMS is distributed in the hope that it will be useful,
- * but WITHOUT ANY WARRANTY; without even the implied warranty of
- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
- * GNU General Public License for more details.
- *
- * You should have received a copy of the GNU General Public License
- * along with QKSMS.  If not, see <http://www.gnu.org/licenses/>.
- */
-package com.moez.QKSMS.model
-
-import io.realm.RealmObject
-
-open class SyncLog : RealmObject() {
-
-    var date: Long = System.currentTimeMillis()
-
+/*
+ * Copyright (C) 2017 Moez Bhatti <moez.bhatti@gmail.com>
+ *
+ * This file is part of QKSMS.
+ *
+ * QKSMS is free software: you can redistribute it and/or modify
+ * it under the terms of the GNU General Public License as published by
+ * the Free Software Foundation, either version 3 of the License, or
+ * (at your option) any later version.
+ *
+ * QKSMS is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+ * GNU General Public License for more details.
+ *
+ * You should have received a copy of the GNU General Public License
+ * along with QKSMS.  If not, see <http://www.gnu.org/licenses/>.
+ */
+package com.moez.QKSMS.model
+
+import io.realm.RealmObject
+
+open class SyncLog : RealmObject() {
+
+    var date: Long = System.currentTimeMillis()
+
 }
\ No newline at end of file
diff --git a/domain/src/main/java/com/moez/QKSMS/repository/BackupRepository.kt b/domain/src/main/java/com/moez/QKSMS/repository/BackupRepository.kt
index 7c73a7312..5ea6c952e 100644
--- a/domain/src/main/java/com/moez/QKSMS/repository/BackupRepository.kt
+++ b/domain/src/main/java/com/moez/QKSMS/repository/BackupRepository.kt
@@ -1,50 +1,50 @@
-/*
- * Copyright (C) 2017 Moez Bhatti <moez.bhatti@gmail.com>
- *
- * This file is part of QKSMS.
- *
- * QKSMS is free software: you can redistribute it and/or modify
- * it under the terms of the GNU General Public License as published by
- * the Free Software Foundation, either version 3 of the License, or
- * (at your option) any later version.
- *
- * QKSMS is distributed in the hope that it will be useful,
- * but WITHOUT ANY WARRANTY; without even the implied warranty of
- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
- * GNU General Public License for more details.
- *
- * You should have received a copy of the GNU General Public License
- * along with QKSMS.  If not, see <http://www.gnu.org/licenses/>.
- */
-package com.moez.QKSMS.repository
-
-import com.moez.QKSMS.model.BackupFile
-import io.reactivex.Observable
-
-interface BackupRepository {
-
-    sealed class Progress(val running: Boolean = false, val indeterminate: Boolean = true) {
-        class Idle : Progress()
-        class Parsing : Progress(true)
-        class Running(val max: Int, val count: Int) : Progress(true, false)
-        class Saving : Progress(true)
-        class Syncing : Progress(true)
-        class Finished : Progress(true, false)
-    }
-
-    fun performBackup()
-
-    fun getBackupProgress(): Observable<Progress>
-
-    /**
-     * Returns a list of all local backups
-     */
-    fun getBackups(): Observable<List<BackupFile>>
-
-    fun performRestore(filePath: String)
-
-    fun stopRestore()
-
-    fun getRestoreProgress(): Observable<Progress>
-
+/*
+ * Copyright (C) 2017 Moez Bhatti <moez.bhatti@gmail.com>
+ *
+ * This file is part of QKSMS.
+ *
+ * QKSMS is free software: you can redistribute it and/or modify
+ * it under the terms of the GNU General Public License as published by
+ * the Free Software Foundation, either version 3 of the License, or
+ * (at your option) any later version.
+ *
+ * QKSMS is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+ * GNU General Public License for more details.
+ *
+ * You should have received a copy of the GNU General Public License
+ * along with QKSMS.  If not, see <http://www.gnu.org/licenses/>.
+ */
+package com.moez.QKSMS.repository
+
+import com.moez.QKSMS.model.BackupFile
+import io.reactivex.Observable
+
+interface BackupRepository {
+
+    sealed class Progress(val running: Boolean = false, val indeterminate: Boolean = true) {
+        class Idle : Progress()
+        class Parsing : Progress(true)
+        class Running(val max: Int, val count: Int) : Progress(true, false)
+        class Saving : Progress(true)
+        class Syncing : Progress(true)
+        class Finished : Progress(true, false)
+    }
+
+    fun performBackup()
+
+    fun getBackupProgress(): Observable<Progress>
+
+    /**
+     * Returns a list of all local backups
+     */
+    fun getBackups(): Observable<List<BackupFile>>
+
+    fun performRestore(filePath: String)
+
+    fun stopRestore()
+
+    fun getRestoreProgress(): Observable<Progress>
+
 }
\ No newline at end of file
diff --git a/domain/src/main/java/com/moez/QKSMS/repository/BlockingRepository.kt b/domain/src/main/java/com/moez/QKSMS/repository/BlockingRepository.kt
index 9af81b95d..1c0842ec1 100644
--- a/domain/src/main/java/com/moez/QKSMS/repository/BlockingRepository.kt
+++ b/domain/src/main/java/com/moez/QKSMS/repository/BlockingRepository.kt
@@ -1,38 +1,38 @@
-/*
- * Copyright (C) 2017 Moez Bhatti <moez.bhatti@gmail.com>
- *
- * This file is part of QKSMS.
- *
- * QKSMS is free software: you can redistribute it and/or modify
- * it under the terms of the GNU General Public License as published by
- * the Free Software Foundation, either version 3 of the License, or
- * (at your option) any later version.
- *
- * QKSMS is distributed in the hope that it will be useful,
- * but WITHOUT ANY WARRANTY; without even the implied warranty of
- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
- * GNU General Public License for more details.
- *
- * You should have received a copy of the GNU General Public License
- * along with QKSMS.  If not, see <http://www.gnu.org/licenses/>.
- */
-package com.moez.QKSMS.repository
-
-import com.moez.QKSMS.model.BlockedNumber
-import io.realm.RealmResults
-
-interface BlockingRepository {
-
-    fun blockNumber(vararg addresses: String)
-
-    fun getBlockedNumbers(): RealmResults<BlockedNumber>
-
-    fun getBlockedNumber(id: Long): BlockedNumber?
-
-    fun isBlocked(address: String): Boolean
-
-    fun unblockNumber(id: Long)
-
-    fun unblockNumbers(vararg addresses: String)
-
-}
+/*
+ * Copyright (C) 2017 Moez Bhatti <moez.bhatti@gmail.com>
+ *
+ * This file is part of QKSMS.
+ *
+ * QKSMS is free software: you can redistribute it and/or modify
+ * it under the terms of the GNU General Public License as published by
+ * the Free Software Foundation, either version 3 of the License, or
+ * (at your option) any later version.
+ *
+ * QKSMS is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+ * GNU General Public License for more details.
+ *
+ * You should have received a copy of the GNU General Public License
+ * along with QKSMS.  If not, see <http://www.gnu.org/licenses/>.
+ */
+package com.moez.QKSMS.repository
+
+import com.moez.QKSMS.model.BlockedNumber
+import io.realm.RealmResults
+
+interface BlockingRepository {
+
+    fun blockNumber(vararg addresses: String)
+
+    fun getBlockedNumbers(): RealmResults<BlockedNumber>
+
+    fun getBlockedNumber(id: Long): BlockedNumber?
+
+    fun isBlocked(address: String): Boolean
+
+    fun unblockNumber(id: Long)
+
+    fun unblockNumbers(vararg addresses: String)
+
+}
diff --git a/domain/src/main/java/com/moez/QKSMS/repository/ContactRepository.kt b/domain/src/main/java/com/moez/QKSMS/repository/ContactRepository.kt
index b6f8011b1..6d027f20c 100644
--- a/domain/src/main/java/com/moez/QKSMS/repository/ContactRepository.kt
+++ b/domain/src/main/java/com/moez/QKSMS/repository/ContactRepository.kt
@@ -1,42 +1,42 @@
-/*
- * Copyright (C) 2017 Moez Bhatti <moez.bhatti@gmail.com>
- *
- * This file is part of QKSMS.
- *
- * QKSMS is free software: you can redistribute it and/or modify
- * it under the terms of the GNU General Public License as published by
- * the Free Software Foundation, either version 3 of the License, or
- * (at your option) any later version.
- *
- * QKSMS is distributed in the hope that it will be useful,
- * but WITHOUT ANY WARRANTY; without even the implied warranty of
- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
- * GNU General Public License for more details.
- *
- * You should have received a copy of the GNU General Public License
- * along with QKSMS.  If not, see <http://www.gnu.org/licenses/>.
- */
-package com.moez.QKSMS.repository
-
-import android.net.Uri
-import com.moez.QKSMS.model.Contact
-import com.moez.QKSMS.model.ContactGroup
-import io.reactivex.Observable
-import io.reactivex.Single
-import io.realm.RealmResults
-
-interface ContactRepository {
-
-    fun findContactUri(address: String): Single<Uri>
-
-    fun getContacts(): RealmResults<Contact>
-
-    fun getUnmanagedContact(lookupKey: String): Contact?
-
-    fun getUnmanagedContacts(starred: Boolean = false): Observable<List<Contact>>
-
-    fun getUnmanagedContactGroups(): Observable<List<ContactGroup>>
-
-    fun setDefaultPhoneNumber(lookupKey: String, phoneNumberId: Long)
-
-}
+/*
+ * Copyright (C) 2017 Moez Bhatti <moez.bhatti@gmail.com>
+ *
+ * This file is part of QKSMS.
+ *
+ * QKSMS is free software: you can redistribute it and/or modify
+ * it under the terms of the GNU General Public License as published by
+ * the Free Software Foundation, either version 3 of the License, or
+ * (at your option) any later version.
+ *
+ * QKSMS is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+ * GNU General Public License for more details.
+ *
+ * You should have received a copy of the GNU General Public License
+ * along with QKSMS.  If not, see <http://www.gnu.org/licenses/>.
+ */
+package com.moez.QKSMS.repository
+
+import android.net.Uri
+import com.moez.QKSMS.model.Contact
+import com.moez.QKSMS.model.ContactGroup
+import io.reactivex.Observable
+import io.reactivex.Single
+import io.realm.RealmResults
+
+interface ContactRepository {
+
+    fun findContactUri(address: String): Single<Uri>
+
+    fun getContacts(): RealmResults<Contact>
+
+    fun getUnmanagedContact(lookupKey: String): Contact?
+
+    fun getUnmanagedContacts(starred: Boolean = false): Observable<List<Contact>>
+
+    fun getUnmanagedContactGroups(): Observable<List<ContactGroup>>
+
+    fun setDefaultPhoneNumber(lookupKey: String, phoneNumberId: Long)
+
+}
diff --git a/domain/src/main/java/com/moez/QKSMS/repository/ConversationRepository.kt b/domain/src/main/java/com/moez/QKSMS/repository/ConversationRepository.kt
index e94d1c9fa..863784804 100644
--- a/domain/src/main/java/com/moez/QKSMS/repository/ConversationRepository.kt
+++ b/domain/src/main/java/com/moez/QKSMS/repository/ConversationRepository.kt
@@ -1,94 +1,94 @@
-/*
- * Copyright (C) 2017 Moez Bhatti <moez.bhatti@gmail.com>
- *
- * This file is part of QKSMS.
- *
- * QKSMS is free software: you can redistribute it and/or modify
- * it under the terms of the GNU General Public License as published by
- * the Free Software Foundation, either version 3 of the License, or
- * (at your option) any later version.
- *
- * QKSMS is distributed in the hope that it will be useful,
- * but WITHOUT ANY WARRANTY; without even the implied warranty of
- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
- * GNU General Public License for more details.
- *
- * You should have received a copy of the GNU General Public License
- * along with QKSMS.  If not, see <http://www.gnu.org/licenses/>.
- */
-package com.moez.QKSMS.repository
-
-import com.moez.QKSMS.model.Conversation
-import com.moez.QKSMS.model.Recipient
-import com.moez.QKSMS.model.SearchResult
-import io.reactivex.Observable
-import io.realm.RealmResults
-
-interface ConversationRepository {
-
-    fun getConversations(archived: Boolean = false): RealmResults<Conversation>
-
-    fun getConversationsSnapshot(): List<Conversation>
-
-    /**
-     * Returns the top conversations that were active in the last week
-     */
-    fun getTopConversations(): List<Conversation>
-
-    fun setConversationName(id: Long, name: String)
-
-    fun searchConversations(query: CharSequence): List<SearchResult>
-
-    fun getBlockedConversations(): RealmResults<Conversation>
-
-    fun getBlockedConversationsAsync(): RealmResults<Conversation>
-
-    fun getConversationAsync(threadId: Long): Conversation
-
-    fun getConversation(threadId: Long): Conversation?
-
-    /**
-     * Returns all conversations with an id in [threadIds]
-     */
-    fun getConversations(vararg threadIds: Long): RealmResults<Conversation>
-
-    fun getUnmanagedConversations(): Observable<List<Conversation>>
-
-    fun getRecipients(): RealmResults<Recipient>
-
-    fun getUnmanagedRecipients(): Observable<List<Recipient>>
-
-    fun getRecipient(recipientId: Long): Recipient?
-
-    fun getThreadId(recipient: String): Long?
-
-    fun getThreadId(recipients: Collection<String>): Long?
-
-    fun getOrCreateConversation(threadId: Long): Conversation?
-
-    fun getOrCreateConversation(address: String): Conversation?
-
-    fun getOrCreateConversation(addresses: List<String>): Conversation?
-
-    fun saveDraft(threadId: Long, draft: String)
-
-    /**
-     * Updates message-related fields in the conversation, like the date and snippet
-     */
-    fun updateConversations(vararg threadIds: Long)
-
-    fun markArchived(vararg threadIds: Long)
-
-    fun markUnarchived(vararg threadIds: Long)
-
-    fun markPinned(vararg threadIds: Long)
-
-    fun markUnpinned(vararg threadIds: Long)
-
-    fun markBlocked(threadIds: List<Long>, blockingClient: Int, blockReason: String?)
-
-    fun markUnblocked(vararg threadIds: Long)
-
-    fun deleteConversations(vararg threadIds: Long)
-
-}
+/*
+ * Copyright (C) 2017 Moez Bhatti <moez.bhatti@gmail.com>
+ *
+ * This file is part of QKSMS.
+ *
+ * QKSMS is free software: you can redistribute it and/or modify
+ * it under the terms of the GNU General Public License as published by
+ * the Free Software Foundation, either version 3 of the License, or
+ * (at your option) any later version.
+ *
+ * QKSMS is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+ * GNU General Public License for more details.
+ *
+ * You should have received a copy of the GNU General Public License
+ * along with QKSMS.  If not, see <http://www.gnu.org/licenses/>.
+ */
+package com.moez.QKSMS.repository
+
+import com.moez.QKSMS.model.Conversation
+import com.moez.QKSMS.model.Recipient
+import com.moez.QKSMS.model.SearchResult
+import io.reactivex.Observable
+import io.realm.RealmResults
+
+interface ConversationRepository {
+
+    fun getConversations(archived: Boolean = false): RealmResults<Conversation>
+
+    fun getConversationsSnapshot(): List<Conversation>
+
+    /**
+     * Returns the top conversations that were active in the last week
+     */
+    fun getTopConversations(): List<Conversation>
+
+    fun setConversationName(id: Long, name: String)
+
+    fun searchConversations(query: CharSequence): List<SearchResult>
+
+    fun getBlockedConversations(): RealmResults<Conversation>
+
+    fun getBlockedConversationsAsync(): RealmResults<Conversation>
+
+    fun getConversationAsync(threadId: Long): Conversation
+
+    fun getConversation(threadId: Long): Conversation?
+
+    /**
+     * Returns all conversations with an id in [threadIds]
+     */
+    fun getConversations(vararg threadIds: Long): RealmResults<Conversation>
+
+    fun getUnmanagedConversations(): Observable<List<Conversation>>
+
+    fun getRecipients(): RealmResults<Recipient>
+
+    fun getUnmanagedRecipients(): Observable<List<Recipient>>
+
+    fun getRecipient(recipientId: Long): Recipient?
+
+    fun getThreadId(recipient: String): Long?
+
+    fun getThreadId(recipients: Collection<String>): Long?
+
+    fun getOrCreateConversation(threadId: Long): Conversation?
+
+    fun getOrCreateConversation(address: String): Conversation?
+
+    fun getOrCreateConversation(addresses: List<String>): Conversation?
+
+    fun saveDraft(threadId: Long, draft: String)
+
+    /**
+     * Updates message-related fields in the conversation, like the date and snippet
+     */
+    fun updateConversations(vararg threadIds: Long)
+
+    fun markArchived(vararg threadIds: Long)
+
+    fun markUnarchived(vararg threadIds: Long)
+
+    fun markPinned(vararg threadIds: Long)
+
+    fun markUnpinned(vararg threadIds: Long)
+
+    fun markBlocked(threadIds: List<Long>, blockingClient: Int, blockReason: String?)
+
+    fun markUnblocked(vararg threadIds: Long)
+
+    fun deleteConversations(vararg threadIds: Long)
+
+}
diff --git a/domain/src/main/java/com/moez/QKSMS/repository/MessageRepository.kt b/domain/src/main/java/com/moez/QKSMS/repository/MessageRepository.kt
index a3ef7c19f..89693132f 100644
--- a/domain/src/main/java/com/moez/QKSMS/repository/MessageRepository.kt
+++ b/domain/src/main/java/com/moez/QKSMS/repository/MessageRepository.kt
@@ -1,115 +1,115 @@
-/*
- * Copyright (C) 2017 Moez Bhatti <moez.bhatti@gmail.com>
- *
- * This file is part of QKSMS.
- *
- * QKSMS is free software: you can redistribute it and/or modify
- * it under the terms of the GNU General Public License as published by
- * the Free Software Foundation, either version 3 of the License, or
- * (at your option) any later version.
- *
- * QKSMS is distributed in the hope that it will be useful,
- * but WITHOUT ANY WARRANTY; without even the implied warranty of
- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
- * GNU General Public License for more details.
- *
- * You should have received a copy of the GNU General Public License
- * along with QKSMS.  If not, see <http://www.gnu.org/licenses/>.
- */
-package com.moez.QKSMS.repository
-
-import com.moez.QKSMS.model.Attachment
-import com.moez.QKSMS.model.Message
-import com.moez.QKSMS.model.MmsPart
-import io.realm.RealmResults
-import java.io.File
-
-interface MessageRepository {
-
-    fun getMessages(threadId: Long, query: String = ""): RealmResults<Message>
-
-    fun getMessage(id: Long): Message?
-
-    fun getMessageForPart(id: Long): Message?
-
-    fun getLastIncomingMessage(threadId: Long): RealmResults<Message>
-
-    fun getUnreadCount(): Long
-
-    fun getPart(id: Long): MmsPart?
-
-    fun getPartsForConversation(threadId: Long): RealmResults<MmsPart>
-
-    fun savePart(id: Long): File?
-
-    /**
-     * Retrieves the list of messages which should be shown in the notification
-     * for a given conversation
-     */
-    fun getUnreadUnseenMessages(threadId: Long): RealmResults<Message>
-
-    /**
-     * Retrieves the list of messages which should be shown in the quickreply popup
-     * for a given conversation
-     */
-    fun getUnreadMessages(threadId: Long): RealmResults<Message>
-
-    fun markAllSeen()
-
-    fun markSeen(threadId: Long)
-
-    fun markRead(vararg threadIds: Long)
-
-    fun markUnread(vararg threadIds: Long)
-
-    fun sendMessage(
-        subId: Int,
-        threadId: Long,
-        addresses: List<String>,
-        body: String,
-        attachments: List<Attachment>,
-        delay: Int = 0
-    )
-
-    /**
-     * Attempts to send the SMS message. This can be called if the message has already been persisted
-     */
-    fun sendSms(message: Message)
-
-    fun resendMms(message: Message)
-
-    /**
-     * Attempts to cancel sending the message with the given id
-     */
-    fun cancelDelayedSms(id: Long)
-
-    fun insertSentSms(subId: Int, threadId: Long, address: String, body: String, date: Long): Message
-
-    fun insertReceivedSms(subId: Int, address: String, body: String, sentTime: Long): Message
-
-    /**
-     * Marks the message as sending, in case we need to retry sending it
-     */
-    fun markSending(id: Long)
-
-    fun markSent(id: Long)
-
-    fun markFailed(id: Long, resultCode: Int)
-
-    fun markDelivered(id: Long)
-
-    fun markDeliveryFailed(id: Long, resultCode: Int)
-
-    fun deleteMessages(vararg messageIds: Long)
-
-    /**
-     * Returns the number of messages older than [maxAgeDays] per conversation
-     */
-    fun getOldMessageCounts(maxAgeDays: Int): Map<Long, Int>
-
-    /**
-     * Deletes all messages older than [maxAgeDays]
-     */
-    fun deleteOldMessages(maxAgeDays: Int)
-
-}
+/*
+ * Copyright (C) 2017 Moez Bhatti <moez.bhatti@gmail.com>
+ *
+ * This file is part of QKSMS.
+ *
+ * QKSMS is free software: you can redistribute it and/or modify
+ * it under the terms of the GNU General Public License as published by
+ * the Free Software Foundation, either version 3 of the License, or
+ * (at your option) any later version.
+ *
+ * QKSMS is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+ * GNU General Public License for more details.
+ *
+ * You should have received a copy of the GNU General Public License
+ * along with QKSMS.  If not, see <http://www.gnu.org/licenses/>.
+ */
+package com.moez.QKSMS.repository
+
+import com.moez.QKSMS.model.Attachment
+import com.moez.QKSMS.model.Message
+import com.moez.QKSMS.model.MmsPart
+import io.realm.RealmResults
+import java.io.File
+
+interface MessageRepository {
+
+    fun getMessages(threadId: Long, query: String = ""): RealmResults<Message>
+
+    fun getMessage(id: Long): Message?
+
+    fun getMessageForPart(id: Long): Message?
+
+    fun getLastIncomingMessage(threadId: Long): RealmResults<Message>
+
+    fun getUnreadCount(): Long
+
+    fun getPart(id: Long): MmsPart?
+
+    fun getPartsForConversation(threadId: Long): RealmResults<MmsPart>
+
+    fun savePart(id: Long): File?
+
+    /**
+     * Retrieves the list of messages which should be shown in the notification
+     * for a given conversation
+     */
+    fun getUnreadUnseenMessages(threadId: Long): RealmResults<Message>
+
+    /**
+     * Retrieves the list of messages which should be shown in the quickreply popup
+     * for a given conversation
+     */
+    fun getUnreadMessages(threadId: Long): RealmResults<Message>
+
+    fun markAllSeen()
+
+    fun markSeen(threadId: Long)
+
+    fun markRead(vararg threadIds: Long)
+
+    fun markUnread(vararg threadIds: Long)
+
+    fun sendMessage(
+        subId: Int,
+        threadId: Long,
+        addresses: List<String>,
+        body: String,
+        attachments: List<Attachment>,
+        delay: Int = 0
+    )
+
+    /**
+     * Attempts to send the SMS message. This can be called if the message has already been persisted
+     */
+    fun sendSms(message: Message)
+
+    fun resendMms(message: Message)
+
+    /**
+     * Attempts to cancel sending the message with the given id
+     */
+    fun cancelDelayedSms(id: Long)
+
+    fun insertSentSms(subId: Int, threadId: Long, address: String, body: String, date: Long): Message
+
+    fun insertReceivedSms(subId: Int, address: String, body: String, sentTime: Long): Message
+
+    /**
+     * Marks the message as sending, in case we need to retry sending it
+     */
+    fun markSending(id: Long)
+
+    fun markSent(id: Long)
+
+    fun markFailed(id: Long, resultCode: Int)
+
+    fun markDelivered(id: Long)
+
+    fun markDeliveryFailed(id: Long, resultCode: Int)
+
+    fun deleteMessages(vararg messageIds: Long)
+
+    /**
+     * Returns the number of messages older than [maxAgeDays] per conversation
+     */
+    fun getOldMessageCounts(maxAgeDays: Int): Map<Long, Int>
+
+    /**
+     * Deletes all messages older than [maxAgeDays]
+     */
+    fun deleteOldMessages(maxAgeDays: Int)
+
+}
diff --git a/domain/src/main/java/com/moez/QKSMS/repository/ScheduledMessageRepository.kt b/domain/src/main/java/com/moez/QKSMS/repository/ScheduledMessageRepository.kt
index 06f8e04fc..62e58c56c 100644
--- a/domain/src/main/java/com/moez/QKSMS/repository/ScheduledMessageRepository.kt
+++ b/domain/src/main/java/com/moez/QKSMS/repository/ScheduledMessageRepository.kt
@@ -1,53 +1,53 @@
-/*
- * Copyright (C) 2017 Moez Bhatti <moez.bhatti@gmail.com>
- *
- * This file is part of QKSMS.
- *
- * QKSMS is free software: you can redistribute it and/or modify
- * it under the terms of the GNU General Public License as published by
- * the Free Software Foundation, either version 3 of the License, or
- * (at your option) any later version.
- *
- * QKSMS is distributed in the hope that it will be useful,
- * but WITHOUT ANY WARRANTY; without even the implied warranty of
- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
- * GNU General Public License for more details.
- *
- * You should have received a copy of the GNU General Public License
- * along with QKSMS.  If not, see <http://www.gnu.org/licenses/>.
- */
-package com.moez.QKSMS.repository
-
-import com.moez.QKSMS.model.ScheduledMessage
-import io.realm.RealmResults
-
-interface ScheduledMessageRepository {
-
-    /**
-     * Saves a scheduled message
-     */
-    fun saveScheduledMessage(
-        date: Long,
-        subId: Int,
-        recipients: List<String>,
-        sendAsGroup: Boolean,
-        body: String,
-        attachments: List<String>
-    )
-
-    /**
-     * Returns all of the scheduled messages, sorted chronologically
-     */
-    fun getScheduledMessages(): RealmResults<ScheduledMessage>
-
-    /**
-     * Returns the scheduled message with the given [id]
-     */
-    fun getScheduledMessage(id: Long): ScheduledMessage?
-
-    /**
-     * Deletes the scheduled message with the given [id]
-     */
-    fun deleteScheduledMessage(id: Long)
-
+/*
+ * Copyright (C) 2017 Moez Bhatti <moez.bhatti@gmail.com>
+ *
+ * This file is part of QKSMS.
+ *
+ * QKSMS is free software: you can redistribute it and/or modify
+ * it under the terms of the GNU General Public License as published by
+ * the Free Software Foundation, either version 3 of the License, or
+ * (at your option) any later version.
+ *
+ * QKSMS is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+ * GNU General Public License for more details.
+ *
+ * You should have received a copy of the GNU General Public License
+ * along with QKSMS.  If not, see <http://www.gnu.org/licenses/>.
+ */
+package com.moez.QKSMS.repository
+
+import com.moez.QKSMS.model.ScheduledMessage
+import io.realm.RealmResults
+
+interface ScheduledMessageRepository {
+
+    /**
+     * Saves a scheduled message
+     */
+    fun saveScheduledMessage(
+        date: Long,
+        subId: Int,
+        recipients: List<String>,
+        sendAsGroup: Boolean,
+        body: String,
+        attachments: List<String>
+    )
+
+    /**
+     * Returns all of the scheduled messages, sorted chronologically
+     */
+    fun getScheduledMessages(): RealmResults<ScheduledMessage>
+
+    /**
+     * Returns the scheduled message with the given [id]
+     */
+    fun getScheduledMessage(id: Long): ScheduledMessage?
+
+    /**
+     * Deletes the scheduled message with the given [id]
+     */
+    fun deleteScheduledMessage(id: Long)
+
 }
\ No newline at end of file
diff --git a/domain/src/main/java/com/moez/QKSMS/repository/SyncRepository.kt b/domain/src/main/java/com/moez/QKSMS/repository/SyncRepository.kt
index f8f8b7def..d848d54f8 100644
--- a/domain/src/main/java/com/moez/QKSMS/repository/SyncRepository.kt
+++ b/domain/src/main/java/com/moez/QKSMS/repository/SyncRepository.kt
@@ -1,40 +1,40 @@
-/*
- * Copyright (C) 2017 Moez Bhatti <moez.bhatti@gmail.com>
- *
- * This file is part of QKSMS.
- *
- * QKSMS is free software: you can redistribute it and/or modify
- * it under the terms of the GNU General Public License as published by
- * the Free Software Foundation, either version 3 of the License, or
- * (at your option) any later version.
- *
- * QKSMS is distributed in the hope that it will be useful,
- * but WITHOUT ANY WARRANTY; without even the implied warranty of
- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
- * GNU General Public License for more details.
- *
- * You should have received a copy of the GNU General Public License
- * along with QKSMS.  If not, see <http://www.gnu.org/licenses/>.
- */
-package com.moez.QKSMS.repository
-
-import android.net.Uri
-import com.moez.QKSMS.model.Message
-import io.reactivex.Observable
-
-interface SyncRepository {
-
-    sealed class SyncProgress {
-        object Idle : SyncProgress()
-        data class Running(val max: Int, val progress: Int, val indeterminate: Boolean) : SyncProgress()
-    }
-
-    val syncProgress: Observable<SyncProgress>
-
-    fun syncMessages()
-
-    fun syncMessage(uri: Uri): Message?
-
-    fun syncContacts()
-
-}
+/*
+ * Copyright (C) 2017 Moez Bhatti <moez.bhatti@gmail.com>
+ *
+ * This file is part of QKSMS.
+ *
+ * QKSMS is free software: you can redistribute it and/or modify
+ * it under the terms of the GNU General Public License as published by
+ * the Free Software Foundation, either version 3 of the License, or
+ * (at your option) any later version.
+ *
+ * QKSMS is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+ * GNU General Public License for more details.
+ *
+ * You should have received a copy of the GNU General Public License
+ * along with QKSMS.  If not, see <http://www.gnu.org/licenses/>.
+ */
+package com.moez.QKSMS.repository
+
+import android.net.Uri
+import com.moez.QKSMS.model.Message
+import io.reactivex.Observable
+
+interface SyncRepository {
+
+    sealed class SyncProgress {
+        object Idle : SyncProgress()
+        data class Running(val max: Int, val progress: Int, val indeterminate: Boolean) : SyncProgress()
+    }
+
+    val syncProgress: Observable<SyncProgress>
+
+    fun syncMessages()
+
+    fun syncMessage(uri: Uri): Message?
+
+    fun syncContacts()
+
+}
diff --git a/domain/src/main/java/com/moez/QKSMS/util/Preferences.kt b/domain/src/main/java/com/moez/QKSMS/util/Preferences.kt
index 919fab278..e61989e99 100644
--- a/domain/src/main/java/com/moez/QKSMS/util/Preferences.kt
+++ b/domain/src/main/java/com/moez/QKSMS/util/Preferences.kt
@@ -1,205 +1,205 @@
-/*
- * Copyright (C) 2017 Moez Bhatti <moez.bhatti@gmail.com>
- *
- * This file is part of QKSMS.
- *
- * QKSMS is free software: you can redistribute it and/or modify
- * it under the terms of the GNU General Public License as published by
- * the Free Software Foundation, either version 3 of the License, or
- * (at your option) any later version.
- *
- * QKSMS is distributed in the hope that it will be useful,
- * but WITHOUT ANY WARRANTY; without even the implied warranty of
- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
- * GNU General Public License for more details.
- *
- * You should have received a copy of the GNU General Public License
- * along with QKSMS.  If not, see <http://www.gnu.org/licenses/>.
- */
-package com.moez.QKSMS.util
-
-import android.content.Context
-import android.content.SharedPreferences
-import android.os.Build
-import android.provider.Settings
-import com.f2prateek.rx.preferences2.Preference
-import com.f2prateek.rx.preferences2.RxSharedPreferences
-import com.moez.QKSMS.common.util.extensions.versionCode
-import io.reactivex.Observable
-import javax.inject.Inject
-import javax.inject.Singleton
-
-@Singleton
-class Preferences @Inject constructor(
-    context: Context,
-    private val rxPrefs: RxSharedPreferences,
-    private val sharedPrefs: SharedPreferences
-) {
-
-    companion object {
-        const val NIGHT_MODE_SYSTEM = 0
-        const val NIGHT_MODE_OFF = 1
-        const val NIGHT_MODE_ON = 2
-        const val NIGHT_MODE_AUTO = 3
-
-        const val TEXT_SIZE_SMALL = 0
-        const val TEXT_SIZE_NORMAL = 1
-        const val TEXT_SIZE_LARGE = 2
-        const val TEXT_SIZE_LARGER = 3
-
-        const val NOTIFICATION_PREVIEWS_ALL = 0
-        const val NOTIFICATION_PREVIEWS_NAME = 1
-        const val NOTIFICATION_PREVIEWS_NONE = 2
-
-        const val NOTIFICATION_ACTION_NONE = 0
-        const val NOTIFICATION_ACTION_ARCHIVE = 1
-        const val NOTIFICATION_ACTION_DELETE = 2
-        const val NOTIFICATION_ACTION_BLOCK = 3
-        const val NOTIFICATION_ACTION_CALL = 4
-        const val NOTIFICATION_ACTION_READ = 5
-        const val NOTIFICATION_ACTION_REPLY = 6
-
-        const val SEND_DELAY_NONE = 0
-        const val SEND_DELAY_SHORT = 1
-        const val SEND_DELAY_MEDIUM = 2
-        const val SEND_DELAY_LONG = 3
-
-        const val SWIPE_ACTION_NONE = 0
-        const val SWIPE_ACTION_ARCHIVE = 1
-        const val SWIPE_ACTION_DELETE = 2
-        const val SWIPE_ACTION_BLOCK = 3
-        const val SWIPE_ACTION_CALL = 4
-        const val SWIPE_ACTION_READ = 5
-        const val SWIPE_ACTION_UNREAD = 6
-
-        const val BLOCKING_MANAGER_QKSMS = 0
-        const val BLOCKING_MANAGER_CC = 1
-        const val BLOCKING_MANAGER_SIA = 2
-    }
-
-    // Internal
-    val didSetReferrer = rxPrefs.getBoolean("didSetReferrer", false)
-    val night = rxPrefs.getBoolean("night", false)
-    val canUseSubId = rxPrefs.getBoolean("canUseSubId", true)
-    val version = rxPrefs.getInteger("version", context.versionCode)
-    val changelogVersion = rxPrefs.getInteger("changelogVersion", context.versionCode)
-    @Deprecated("This should only be accessed when migrating to @blockingManager")
-    val sia = rxPrefs.getBoolean("sia", false)
-
-    // User configurable
-    val sendAsGroup = rxPrefs.getBoolean("sendAsGroup", true)
-    val nightMode = rxPrefs.getInteger("nightMode", when (Build.VERSION.SDK_INT >= 29) {
-        true -> NIGHT_MODE_SYSTEM
-        false -> NIGHT_MODE_OFF
-    })
-    val nightStart = rxPrefs.getString("nightStart", "18:00")
-    val nightEnd = rxPrefs.getString("nightEnd", "6:00")
-    val black = rxPrefs.getBoolean("black", false)
-    val autoColor = rxPrefs.getBoolean("autoColor", true)
-    val systemFont = rxPrefs.getBoolean("systemFont", false)
-    val textSize = rxPrefs.getInteger("textSize", TEXT_SIZE_NORMAL)
-    val blockingManager = rxPrefs.getInteger("blockingManager", BLOCKING_MANAGER_QKSMS)
-    val drop = rxPrefs.getBoolean("drop", false)
-    val notifAction1 = rxPrefs.getInteger("notifAction1", NOTIFICATION_ACTION_READ)
-    val notifAction2 = rxPrefs.getInteger("notifAction2", NOTIFICATION_ACTION_REPLY)
-    val notifAction3 = rxPrefs.getInteger("notifAction3", NOTIFICATION_ACTION_NONE)
-    val qkreply = rxPrefs.getBoolean("qkreply", Build.VERSION.SDK_INT < Build.VERSION_CODES.N)
-    val qkreplyTapDismiss = rxPrefs.getBoolean("qkreplyTapDismiss", true)
-    val sendDelay = rxPrefs.getInteger("sendDelay", SEND_DELAY_NONE)
-    val swipeRight = rxPrefs.getInteger("swipeRight", SWIPE_ACTION_ARCHIVE)
-    val swipeLeft = rxPrefs.getInteger("swipeLeft", SWIPE_ACTION_ARCHIVE)
-    val autoEmoji = rxPrefs.getBoolean("autoEmoji", true)
-    val delivery = rxPrefs.getBoolean("delivery", false)
-    val signature = rxPrefs.getString("signature", "")
-    val unicode = rxPrefs.getBoolean("unicode", false)
-    val mobileOnly = rxPrefs.getBoolean("mobileOnly", false)
-    val autoDelete = rxPrefs.getInteger("autoDelete", 0)
-    val longAsMms = rxPrefs.getBoolean("longAsMms", false)
-    val mmsSize = rxPrefs.getInteger("mmsSize", 300)
-    val logging = rxPrefs.getBoolean("logging", false)
-
-    init {
-        // Migrate from old night mode preference to new one, now that we support android Q night mode
-        val nightModeSummary = rxPrefs.getInteger("nightModeSummary")
-        if (nightModeSummary.isSet) {
-            nightMode.set(when (nightModeSummary.get()) {
-                0 -> NIGHT_MODE_OFF
-                1 -> NIGHT_MODE_ON
-                2 -> NIGHT_MODE_AUTO
-                else -> NIGHT_MODE_OFF
-            })
-            nightModeSummary.delete()
-        }
-    }
-
-    /**
-     * Returns a stream of preference keys for changing preferences
-     */
-    val keyChanges: Observable<String> = Observable.create<String> { emitter ->
-        // Making this a lambda would cause it to be GCd
-        val listener = SharedPreferences.OnSharedPreferenceChangeListener { _, key ->
-            emitter.onNext(key)
-        }
-
-        emitter.setCancellable {
-            sharedPrefs.unregisterOnSharedPreferenceChangeListener(listener)
-        }
-
-        sharedPrefs.registerOnSharedPreferenceChangeListener(listener)
-    }.share()
-
-    fun theme(
-        recipientId: Long = 0,
-        default: Int = rxPrefs.getInteger("theme", 0xFF0097A7.toInt()).get()
-    ): Preference<Int> {
-        return when (recipientId) {
-            0L -> rxPrefs.getInteger("theme", 0xFF0097A7.toInt())
-            else -> rxPrefs.getInteger("theme_$recipientId", default)
-        }
-    }
-
-    fun notifications(threadId: Long = 0): Preference<Boolean> {
-        val default = rxPrefs.getBoolean("notifications", true)
-
-        return when (threadId) {
-            0L -> default
-            else -> rxPrefs.getBoolean("notifications_$threadId", default.get())
-        }
-    }
-
-    fun notificationPreviews(threadId: Long = 0): Preference<Int> {
-        val default = rxPrefs.getInteger("notification_previews", 0)
-
-        return when (threadId) {
-            0L -> default
-            else -> rxPrefs.getInteger("notification_previews_$threadId", default.get())
-        }
-    }
-
-    fun wakeScreen(threadId: Long = 0): Preference<Boolean> {
-        val default = rxPrefs.getBoolean("wake", false)
-
-        return when (threadId) {
-            0L -> default
-            else -> rxPrefs.getBoolean("wake_$threadId", default.get())
-        }
-    }
-
-    fun vibration(threadId: Long = 0): Preference<Boolean> {
-        val default = rxPrefs.getBoolean("vibration", true)
-
-        return when (threadId) {
-            0L -> default
-            else -> rxPrefs.getBoolean("vibration$threadId", default.get())
-        }
-    }
-
-    fun ringtone(threadId: Long = 0): Preference<String> {
-        val default = rxPrefs.getString("ringtone", Settings.System.DEFAULT_NOTIFICATION_URI.toString())
-
-        return when (threadId) {
-            0L -> default
-            else -> rxPrefs.getString("ringtone_$threadId", default.get())
-        }
-    }
-}
+/*
+ * Copyright (C) 2017 Moez Bhatti <moez.bhatti@gmail.com>
+ *
+ * This file is part of QKSMS.
+ *
+ * QKSMS is free software: you can redistribute it and/or modify
+ * it under the terms of the GNU General Public License as published by
+ * the Free Software Foundation, either version 3 of the License, or
+ * (at your option) any later version.
+ *
+ * QKSMS is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+ * GNU General Public License for more details.
+ *
+ * You should have received a copy of the GNU General Public License
+ * along with QKSMS.  If not, see <http://www.gnu.org/licenses/>.
+ */
+package com.moez.QKSMS.util
+
+import android.content.Context
+import android.content.SharedPreferences
+import android.os.Build
+import android.provider.Settings
+import com.f2prateek.rx.preferences2.Preference
+import com.f2prateek.rx.preferences2.RxSharedPreferences
+import com.moez.QKSMS.common.util.extensions.versionCode
+import io.reactivex.Observable
+import javax.inject.Inject
+import javax.inject.Singleton
+
+@Singleton
+class Preferences @Inject constructor(
+    context: Context,
+    private val rxPrefs: RxSharedPreferences,
+    private val sharedPrefs: SharedPreferences
+) {
+
+    companion object {
+        const val NIGHT_MODE_SYSTEM = 0
+        const val NIGHT_MODE_OFF = 1
+        const val NIGHT_MODE_ON = 2
+        const val NIGHT_MODE_AUTO = 3
+
+        const val TEXT_SIZE_SMALL = 0
+        const val TEXT_SIZE_NORMAL = 1
+        const val TEXT_SIZE_LARGE = 2
+        const val TEXT_SIZE_LARGER = 3
+
+        const val NOTIFICATION_PREVIEWS_ALL = 0
+        const val NOTIFICATION_PREVIEWS_NAME = 1
+        const val NOTIFICATION_PREVIEWS_NONE = 2
+
+        const val NOTIFICATION_ACTION_NONE = 0
+        const val NOTIFICATION_ACTION_ARCHIVE = 1
+        const val NOTIFICATION_ACTION_DELETE = 2
+        const val NOTIFICATION_ACTION_BLOCK = 3
+        const val NOTIFICATION_ACTION_CALL = 4
+        const val NOTIFICATION_ACTION_READ = 5
+        const val NOTIFICATION_ACTION_REPLY = 6
+
+        const val SEND_DELAY_NONE = 0
+        const val SEND_DELAY_SHORT = 1
+        const val SEND_DELAY_MEDIUM = 2
+        const val SEND_DELAY_LONG = 3
+
+        const val SWIPE_ACTION_NONE = 0
+        const val SWIPE_ACTION_ARCHIVE = 1
+        const val SWIPE_ACTION_DELETE = 2
+        const val SWIPE_ACTION_BLOCK = 3
+        const val SWIPE_ACTION_CALL = 4
+        const val SWIPE_ACTION_READ = 5
+        const val SWIPE_ACTION_UNREAD = 6
+
+        const val BLOCKING_MANAGER_QKSMS = 0
+        const val BLOCKING_MANAGER_CC = 1
+        const val BLOCKING_MANAGER_SIA = 2
+    }
+
+    // Internal
+    val didSetReferrer = rxPrefs.getBoolean("didSetReferrer", false)
+    val night = rxPrefs.getBoolean("night", false)
+    val canUseSubId = rxPrefs.getBoolean("canUseSubId", true)
+    val version = rxPrefs.getInteger("version", context.versionCode)
+    val changelogVersion = rxPrefs.getInteger("changelogVersion", context.versionCode)
+    @Deprecated("This should only be accessed when migrating to @blockingManager")
+    val sia = rxPrefs.getBoolean("sia", false)
+
+    // User configurable
+    val sendAsGroup = rxPrefs.getBoolean("sendAsGroup", true)
+    val nightMode = rxPrefs.getInteger("nightMode", when (Build.VERSION.SDK_INT >= 29) {
+        true -> NIGHT_MODE_SYSTEM
+        false -> NIGHT_MODE_OFF
+    })
+    val nightStart = rxPrefs.getString("nightStart", "18:00")
+    val nightEnd = rxPrefs.getString("nightEnd", "6:00")
+    val black = rxPrefs.getBoolean("black", false)
+    val autoColor = rxPrefs.getBoolean("autoColor", true)
+    val systemFont = rxPrefs.getBoolean("systemFont", false)
+    val textSize = rxPrefs.getInteger("textSize", TEXT_SIZE_NORMAL)
+    val blockingManager = rxPrefs.getInteger("blockingManager", BLOCKING_MANAGER_QKSMS)
+    val drop = rxPrefs.getBoolean("drop", false)
+    val notifAction1 = rxPrefs.getInteger("notifAction1", NOTIFICATION_ACTION_READ)
+    val notifAction2 = rxPrefs.getInteger("notifAction2", NOTIFICATION_ACTION_REPLY)
+    val notifAction3 = rxPrefs.getInteger("notifAction3", NOTIFICATION_ACTION_NONE)
+    val qkreply = rxPrefs.getBoolean("qkreply", Build.VERSION.SDK_INT < Build.VERSION_CODES.N)
+    val qkreplyTapDismiss = rxPrefs.getBoolean("qkreplyTapDismiss", true)
+    val sendDelay = rxPrefs.getInteger("sendDelay", SEND_DELAY_NONE)
+    val swipeRight = rxPrefs.getInteger("swipeRight", SWIPE_ACTION_ARCHIVE)
+    val swipeLeft = rxPrefs.getInteger("swipeLeft", SWIPE_ACTION_ARCHIVE)
+    val autoEmoji = rxPrefs.getBoolean("autoEmoji", true)
+    val delivery = rxPrefs.getBoolean("delivery", false)
+    val signature = rxPrefs.getString("signature", "")
+    val unicode = rxPrefs.getBoolean("unicode", false)
+    val mobileOnly = rxPrefs.getBoolean("mobileOnly", false)
+    val autoDelete = rxPrefs.getInteger("autoDelete", 0)
+    val longAsMms = rxPrefs.getBoolean("longAsMms", false)
+    val mmsSize = rxPrefs.getInteger("mmsSize", 300)
+    val logging = rxPrefs.getBoolean("logging", false)
+
+    init {
+        // Migrate from old night mode preference to new one, now that we support android Q night mode
+        val nightModeSummary = rxPrefs.getInteger("nightModeSummary")
+        if (nightModeSummary.isSet) {
+            nightMode.set(when (nightModeSummary.get()) {
+                0 -> NIGHT_MODE_OFF
+                1 -> NIGHT_MODE_ON
+                2 -> NIGHT_MODE_AUTO
+                else -> NIGHT_MODE_OFF
+            })
+            nightModeSummary.delete()
+        }
+    }
+
+    /**
+     * Returns a stream of preference keys for changing preferences
+     */
+    val keyChanges: Observable<String> = Observable.create<String> { emitter ->
+        // Making this a lambda would cause it to be GCd
+        val listener = SharedPreferences.OnSharedPreferenceChangeListener { _, key ->
+            emitter.onNext(key)
+        }
+
+        emitter.setCancellable {
+            sharedPrefs.unregisterOnSharedPreferenceChangeListener(listener)
+        }
+
+        sharedPrefs.registerOnSharedPreferenceChangeListener(listener)
+    }.share()
+
+    fun theme(
+        recipientId: Long = 0,
+        default: Int = rxPrefs.getInteger("theme", 0xFF0097A7.toInt()).get()
+    ): Preference<Int> {
+        return when (recipientId) {
+            0L -> rxPrefs.getInteger("theme", 0xFF0097A7.toInt())
+            else -> rxPrefs.getInteger("theme_$recipientId", default)
+        }
+    }
+
+    fun notifications(threadId: Long = 0): Preference<Boolean> {
+        val default = rxPrefs.getBoolean("notifications", true)
+
+        return when (threadId) {
+            0L -> default
+            else -> rxPrefs.getBoolean("notifications_$threadId", default.get())
+        }
+    }
+
+    fun notificationPreviews(threadId: Long = 0): Preference<Int> {
+        val default = rxPrefs.getInteger("notification_previews", 0)
+
+        return when (threadId) {
+            0L -> default
+            else -> rxPrefs.getInteger("notification_previews_$threadId", default.get())
+        }
+    }
+
+    fun wakeScreen(threadId: Long = 0): Preference<Boolean> {
+        val default = rxPrefs.getBoolean("wake", false)
+
+        return when (threadId) {
+            0L -> default
+            else -> rxPrefs.getBoolean("wake_$threadId", default.get())
+        }
+    }
+
+    fun vibration(threadId: Long = 0): Preference<Boolean> {
+        val default = rxPrefs.getBoolean("vibration", true)
+
+        return when (threadId) {
+            0L -> default
+            else -> rxPrefs.getBoolean("vibration$threadId", default.get())
+        }
+    }
+
+    fun ringtone(threadId: Long = 0): Preference<String> {
+        val default = rxPrefs.getString("ringtone", Settings.System.DEFAULT_NOTIFICATION_URI.toString())
+
+        return when (threadId) {
+            0L -> default
+            else -> rxPrefs.getString("ringtone_$threadId", default.get())
+        }
+    }
+}
diff --git a/gradle.properties b/gradle.properties
index bb91abfe1..7af86d4d5 100644
--- a/gradle.properties
+++ b/gradle.properties
@@ -1,22 +1,22 @@
-# Project-wide Gradle settings.
-
-# IDE (e.g. Android Studio) users:
-# Gradle settings configured through the IDE *will override*
-# any settings specified in this file.
-
-# For more details on how to configure your build environment visit
-# http://www.gradle.org/docs/current/userguide/build_environment.html
-
-# Specifies the JVM arguments used for the daemon process.
-# The setting is particularly useful for tweaking memory settings.
-org.gradle.jvmargs=-Xmx1536m
-
-# https://blog.gradle.org/introducing-gradle-build-cache
-org.gradle.caching=true
-android.useAndroidX=true
-android.enableJetifier=true
-
-# When configured, Gradle will run in incubating parallel mode.
-# This option should only be used with decoupled projects. More details, visit
-# http://www.gradle.org/docs/current/userguide/multi_project_builds.html#sec:decoupled_projects
-# org.gradle.parallel=true
+# Project-wide Gradle settings.
+
+# IDE (e.g. Android Studio) users:
+# Gradle settings configured through the IDE *will override*
+# any settings specified in this file.
+
+# For more details on how to configure your build environment visit
+# http://www.gradle.org/docs/current/userguide/build_environment.html
+
+# Specifies the JVM arguments used for the daemon process.
+# The setting is particularly useful for tweaking memory settings.
+org.gradle.jvmargs=-Xmx1536m
+
+# https://blog.gradle.org/introducing-gradle-build-cache
+org.gradle.caching=true
+android.useAndroidX=true
+android.enableJetifier=true
+
+# When configured, Gradle will run in incubating parallel mode.
+# This option should only be used with decoupled projects. More details, visit
+# http://www.gradle.org/docs/current/userguide/multi_project_builds.html#sec:decoupled_projects
+# org.gradle.parallel=true
diff --git a/gradle/wrapper/gradle-wrapper.properties b/gradle/wrapper/gradle-wrapper.properties
index 4b9cec46b..5f0c04ce7 100644
--- a/gradle/wrapper/gradle-wrapper.properties
+++ b/gradle/wrapper/gradle-wrapper.properties
@@ -1,6 +1,6 @@
-#Tue Dec 03 23:30:52 EST 2019
-distributionBase=GRADLE_USER_HOME
-distributionPath=wrapper/dists
-zipStoreBase=GRADLE_USER_HOME
-zipStorePath=wrapper/dists
-distributionUrl=https\://services.gradle.org/distributions/gradle-5.4.1-all.zip
+#Tue Dec 03 23:30:52 EST 2019
+distributionBase=GRADLE_USER_HOME
+distributionPath=wrapper/dists
+zipStoreBase=GRADLE_USER_HOME
+zipStorePath=wrapper/dists
+distributionUrl=https\://services.gradle.org/distributions/gradle-5.4.1-all.zip
diff --git a/gradlew b/gradlew
index 9d82f7891..e8349733f 100755
--- a/gradlew
+++ b/gradlew
@@ -1,160 +1,160 @@
-#!/usr/bin/env bash
-
-##############################################################################
-##
-##  Gradle start up script for UN*X
-##
-##############################################################################
-
-# Add default JVM options here. You can also use JAVA_OPTS and GRADLE_OPTS to pass JVM options to this script.
-DEFAULT_JVM_OPTS=""
-
-APP_NAME="Gradle"
-APP_BASE_NAME=`basename "$0"`
-
-# Use the maximum available, or set MAX_FD != -1 to use that value.
-MAX_FD="maximum"
-
-warn ( ) {
-    echo "$*"
-}
-
-die ( ) {
-    echo
-    echo "$*"
-    echo
-    exit 1
-}
-
-# OS specific support (must be 'true' or 'false').
-cygwin=false
-msys=false
-darwin=false
-case "`uname`" in
-  CYGWIN* )
-    cygwin=true
-    ;;
-  Darwin* )
-    darwin=true
-    ;;
-  MINGW* )
-    msys=true
-    ;;
-esac
-
-# Attempt to set APP_HOME
-# Resolve links: $0 may be a link
-PRG="$0"
-# Need this for relative symlinks.
-while [ -h "$PRG" ] ; do
-    ls=`ls -ld "$PRG"`
-    link=`expr "$ls" : '.*-> \(.*\)$'`
-    if expr "$link" : '/.*' > /dev/null; then
-        PRG="$link"
-    else
-        PRG=`dirname "$PRG"`"/$link"
-    fi
-done
-SAVED="`pwd`"
-cd "`dirname \"$PRG\"`/" >/dev/null
-APP_HOME="`pwd -P`"
-cd "$SAVED" >/dev/null
-
-CLASSPATH=$APP_HOME/gradle/wrapper/gradle-wrapper.jar
-
-# Determine the Java command to use to start the JVM.
-if [ -n "$JAVA_HOME" ] ; then
-    if [ -x "$JAVA_HOME/jre/sh/java" ] ; then
-        # IBM's JDK on AIX uses strange locations for the executables
-        JAVACMD="$JAVA_HOME/jre/sh/java"
-    else
-        JAVACMD="$JAVA_HOME/bin/java"
-    fi
-    if [ ! -x "$JAVACMD" ] ; then
-        die "ERROR: JAVA_HOME is set to an invalid directory: $JAVA_HOME
-
-Please set the JAVA_HOME variable in your environment to match the
-location of your Java installation."
-    fi
-else
-    JAVACMD="java"
-    which java >/dev/null 2>&1 || die "ERROR: JAVA_HOME is not set and no 'java' command could be found in your PATH.
-
-Please set the JAVA_HOME variable in your environment to match the
-location of your Java installation."
-fi
-
-# Increase the maximum file descriptors if we can.
-if [ "$cygwin" = "false" -a "$darwin" = "false" ] ; then
-    MAX_FD_LIMIT=`ulimit -H -n`
-    if [ $? -eq 0 ] ; then
-        if [ "$MAX_FD" = "maximum" -o "$MAX_FD" = "max" ] ; then
-            MAX_FD="$MAX_FD_LIMIT"
-        fi
-        ulimit -n $MAX_FD
-        if [ $? -ne 0 ] ; then
-            warn "Could not set maximum file descriptor limit: $MAX_FD"
-        fi
-    else
-        warn "Could not query maximum file descriptor limit: $MAX_FD_LIMIT"
-    fi
-fi
-
-# For Darwin, add options to specify how the application appears in the dock
-if $darwin; then
-    GRADLE_OPTS="$GRADLE_OPTS \"-Xdock:name=$APP_NAME\" \"-Xdock:icon=$APP_HOME/media/gradle.icns\""
-fi
-
-# For Cygwin, switch paths to Windows format before running java
-if $cygwin ; then
-    APP_HOME=`cygpath --path --mixed "$APP_HOME"`
-    CLASSPATH=`cygpath --path --mixed "$CLASSPATH"`
-    JAVACMD=`cygpath --unix "$JAVACMD"`
-
-    # We build the pattern for arguments to be converted via cygpath
-    ROOTDIRSRAW=`find -L / -maxdepth 1 -mindepth 1 -type d 2>/dev/null`
-    SEP=""
-    for dir in $ROOTDIRSRAW ; do
-        ROOTDIRS="$ROOTDIRS$SEP$dir"
-        SEP="|"
-    done
-    OURCYGPATTERN="(^($ROOTDIRS))"
-    # Add a user-defined pattern to the cygpath arguments
-    if [ "$GRADLE_CYGPATTERN" != "" ] ; then
-        OURCYGPATTERN="$OURCYGPATTERN|($GRADLE_CYGPATTERN)"
-    fi
-    # Now convert the arguments - kludge to limit ourselves to /bin/sh
-    i=0
-    for arg in "$@" ; do
-        CHECK=`echo "$arg"|egrep -c "$OURCYGPATTERN" -`
-        CHECK2=`echo "$arg"|egrep -c "^-"`                                 ### Determine if an option
-
-        if [ $CHECK -ne 0 ] && [ $CHECK2 -eq 0 ] ; then                    ### Added a condition
-            eval `echo args$i`=`cygpath --path --ignore --mixed "$arg"`
-        else
-            eval `echo args$i`="\"$arg\""
-        fi
-        i=$((i+1))
-    done
-    case $i in
-        (0) set -- ;;
-        (1) set -- "$args0" ;;
-        (2) set -- "$args0" "$args1" ;;
-        (3) set -- "$args0" "$args1" "$args2" ;;
-        (4) set -- "$args0" "$args1" "$args2" "$args3" ;;
-        (5) set -- "$args0" "$args1" "$args2" "$args3" "$args4" ;;
-        (6) set -- "$args0" "$args1" "$args2" "$args3" "$args4" "$args5" ;;
-        (7) set -- "$args0" "$args1" "$args2" "$args3" "$args4" "$args5" "$args6" ;;
-        (8) set -- "$args0" "$args1" "$args2" "$args3" "$args4" "$args5" "$args6" "$args7" ;;
-        (9) set -- "$args0" "$args1" "$args2" "$args3" "$args4" "$args5" "$args6" "$args7" "$args8" ;;
-    esac
-fi
-
-# Split up the JVM_OPTS And GRADLE_OPTS values into an array, following the shell quoting and substitution rules
-function splitJvmOpts() {
-    JVM_OPTS=("$@")
-}
-eval splitJvmOpts $DEFAULT_JVM_OPTS $JAVA_OPTS $GRADLE_OPTS
-JVM_OPTS[${#JVM_OPTS[*]}]="-Dorg.gradle.appname=$APP_BASE_NAME"
-
-exec "$JAVACMD" "${JVM_OPTS[@]}" -classpath "$CLASSPATH" org.gradle.wrapper.GradleWrapperMain "$@"
+#!/usr/bin/env bash
+
+##############################################################################
+##
+##  Gradle start up script for UN*X
+##
+##############################################################################
+
+# Add default JVM options here. You can also use JAVA_OPTS and GRADLE_OPTS to pass JVM options to this script.
+DEFAULT_JVM_OPTS=""
+
+APP_NAME="Gradle"
+APP_BASE_NAME=`basename "$0"`
+
+# Use the maximum available, or set MAX_FD != -1 to use that value.
+MAX_FD="maximum"
+
+warn ( ) {
+    echo "$*"
+}
+
+die ( ) {
+    echo
+    echo "$*"
+    echo
+    exit 1
+}
+
+# OS specific support (must be 'true' or 'false').
+cygwin=false
+msys=false
+darwin=false
+case "`uname`" in
+  CYGWIN* )
+    cygwin=true
+    ;;
+  Darwin* )
+    darwin=true
+    ;;
+  MINGW* )
+    msys=true
+    ;;
+esac
+
+# Attempt to set APP_HOME
+# Resolve links: $0 may be a link
+PRG="$0"
+# Need this for relative symlinks.
+while [ -h "$PRG" ] ; do
+    ls=`ls -ld "$PRG"`
+    link=`expr "$ls" : '.*-> \(.*\)$'`
+    if expr "$link" : '/.*' > /dev/null; then
+        PRG="$link"
+    else
+        PRG=`dirname "$PRG"`"/$link"
+    fi
+done
+SAVED="`pwd`"
+cd "`dirname \"$PRG\"`/" >/dev/null
+APP_HOME="`pwd -P`"
+cd "$SAVED" >/dev/null
+
+CLASSPATH=$APP_HOME/gradle/wrapper/gradle-wrapper.jar
+
+# Determine the Java command to use to start the JVM.
+if [ -n "$JAVA_HOME" ] ; then
+    if [ -x "$JAVA_HOME/jre/sh/java" ] ; then
+        # IBM's JDK on AIX uses strange locations for the executables
+        JAVACMD="$JAVA_HOME/jre/sh/java"
+    else
+        JAVACMD="$JAVA_HOME/bin/java"
+    fi
+    if [ ! -x "$JAVACMD" ] ; then
+        die "ERROR: JAVA_HOME is set to an invalid directory: $JAVA_HOME
+
+Please set the JAVA_HOME variable in your environment to match the
+location of your Java installation."
+    fi
+else
+    JAVACMD="java"
+    which java >/dev/null 2>&1 || die "ERROR: JAVA_HOME is not set and no 'java' command could be found in your PATH.
+
+Please set the JAVA_HOME variable in your environment to match the
+location of your Java installation."
+fi
+
+# Increase the maximum file descriptors if we can.
+if [ "$cygwin" = "false" -a "$darwin" = "false" ] ; then
+    MAX_FD_LIMIT=`ulimit -H -n`
+    if [ $? -eq 0 ] ; then
+        if [ "$MAX_FD" = "maximum" -o "$MAX_FD" = "max" ] ; then
+            MAX_FD="$MAX_FD_LIMIT"
+        fi
+        ulimit -n $MAX_FD
+        if [ $? -ne 0 ] ; then
+            warn "Could not set maximum file descriptor limit: $MAX_FD"
+        fi
+    else
+        warn "Could not query maximum file descriptor limit: $MAX_FD_LIMIT"
+    fi
+fi
+
+# For Darwin, add options to specify how the application appears in the dock
+if $darwin; then
+    GRADLE_OPTS="$GRADLE_OPTS \"-Xdock:name=$APP_NAME\" \"-Xdock:icon=$APP_HOME/media/gradle.icns\""
+fi
+
+# For Cygwin, switch paths to Windows format before running java
+if $cygwin ; then
+    APP_HOME=`cygpath --path --mixed "$APP_HOME"`
+    CLASSPATH=`cygpath --path --mixed "$CLASSPATH"`
+    JAVACMD=`cygpath --unix "$JAVACMD"`
+
+    # We build the pattern for arguments to be converted via cygpath
+    ROOTDIRSRAW=`find -L / -maxdepth 1 -mindepth 1 -type d 2>/dev/null`
+    SEP=""
+    for dir in $ROOTDIRSRAW ; do
+        ROOTDIRS="$ROOTDIRS$SEP$dir"
+        SEP="|"
+    done
+    OURCYGPATTERN="(^($ROOTDIRS))"
+    # Add a user-defined pattern to the cygpath arguments
+    if [ "$GRADLE_CYGPATTERN" != "" ] ; then
+        OURCYGPATTERN="$OURCYGPATTERN|($GRADLE_CYGPATTERN)"
+    fi
+    # Now convert the arguments - kludge to limit ourselves to /bin/sh
+    i=0
+    for arg in "$@" ; do
+        CHECK=`echo "$arg"|egrep -c "$OURCYGPATTERN" -`
+        CHECK2=`echo "$arg"|egrep -c "^-"`                                 ### Determine if an option
+
+        if [ $CHECK -ne 0 ] && [ $CHECK2 -eq 0 ] ; then                    ### Added a condition
+            eval `echo args$i`=`cygpath --path --ignore --mixed "$arg"`
+        else
+            eval `echo args$i`="\"$arg\""
+        fi
+        i=$((i+1))
+    done
+    case $i in
+        (0) set -- ;;
+        (1) set -- "$args0" ;;
+        (2) set -- "$args0" "$args1" ;;
+        (3) set -- "$args0" "$args1" "$args2" ;;
+        (4) set -- "$args0" "$args1" "$args2" "$args3" ;;
+        (5) set -- "$args0" "$args1" "$args2" "$args3" "$args4" ;;
+        (6) set -- "$args0" "$args1" "$args2" "$args3" "$args4" "$args5" ;;
+        (7) set -- "$args0" "$args1" "$args2" "$args3" "$args4" "$args5" "$args6" ;;
+        (8) set -- "$args0" "$args1" "$args2" "$args3" "$args4" "$args5" "$args6" "$args7" ;;
+        (9) set -- "$args0" "$args1" "$args2" "$args3" "$args4" "$args5" "$args6" "$args7" "$args8" ;;
+    esac
+fi
+
+# Split up the JVM_OPTS And GRADLE_OPTS values into an array, following the shell quoting and substitution rules
+function splitJvmOpts() {
+    JVM_OPTS=("$@")
+}
+eval splitJvmOpts $DEFAULT_JVM_OPTS $JAVA_OPTS $GRADLE_OPTS
+JVM_OPTS[${#JVM_OPTS[*]}]="-Dorg.gradle.appname=$APP_BASE_NAME"
+
+exec "$JAVACMD" "${JVM_OPTS[@]}" -classpath "$CLASSPATH" org.gradle.wrapper.GradleWrapperMain "$@"
diff --git a/presentation/build.gradle b/presentation/build.gradle
index 7dee8d3c8..19c7a6437 100644
--- a/presentation/build.gradle
+++ b/presentation/build.gradle
@@ -1,201 +1,201 @@
-/*
- * Copyright (C) 2017 Moez Bhatti <moez.bhatti@gmail.com>
- *
- * This file is part of QKSMS.
- *
- * QKSMS is free software: you can redistribute it and/or modify
- * it under the terms of the GNU General Public License as published by
- * the Free Software Foundation, either version 3 of the License, or
- * (at your option) any later version.
- *
- * QKSMS is distributed in the hope that it will be useful,
- * but WITHOUT ANY WARRANTY; without even the implied warranty of
- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
- * GNU General Public License for more details.
- *
- * You should have received a copy of the GNU General Public License
- * along with QKSMS.  If not, see <http://www.gnu.org/licenses/>.
- */
-apply plugin: 'com.android.application'
-apply plugin: 'realm-android' // Realm needs to be before Kotlin or the build will fail
-apply plugin: 'kotlin-android'
-apply plugin: 'kotlin-android-extensions'
-apply plugin: 'kotlin-kapt'
-
-android {
-    compileSdkVersion 29
-    buildToolsVersion "29.0.3"
-    flavorDimensions "analytics"
-
-    defaultConfig {
-        applicationId "com.moez.QKSMS"
-        minSdkVersion 21
-        targetSdkVersion 29
-        versionCode 2218
-        versionName "3.9.4"
-        setProperty("archivesBaseName", "QKSMS-v${versionName}")
-        testInstrumentationRunner "androidx.test.runner.AndroidJUnitRunner"
-
-        setProperty("archivesBaseName", "QKSMS-v${versionName}")
-    }
-
-    signingConfigs {
-        release
-    }
-
-    buildTypes {
-        release {
-            minifyEnabled true
-            shrinkResources true
-            proguardFiles getDefaultProguardFile('proguard-android.txt'), 'proguard-rules.pro'
-            signingConfig signingConfigs.release
-        }
-    }
-
-    compileOptions {
-        sourceCompatibility 1.8
-        targetCompatibility 1.8
-    }
-
-    kotlinOptions {
-        jvmTarget = "1.8"
-    }
-
-    lintOptions {
-        abortOnError false
-    }
-
-    productFlavors {
-        withAnalytics { dimension "analytics" }
-        noAnalytics { dimension "analytics" }
-    }
-
-    if (System.getenv("CI") == "true") {
-        signingConfigs.release.storeFile = file("../keystore")
-        signingConfigs.release.storePassword = System.getenv("keystore_password")
-        signingConfigs.release.keyAlias = System.getenv("key_alias")
-        signingConfigs.release.keyPassword = System.getenv("key_password")
-    }
-}
-
-androidExtensions {
-    experimental = true
-}
-
-configurations {
-    noAnalyticsDebug
-    noAnalyticsRelease
-    withAnalyticsDebug
-    withAnalyticsRelease
-}
-
-dependencies {
-    // lifecycle
-    implementation "androidx.lifecycle:lifecycle-extensions:$lifecycle_version"
-    implementation "androidx.lifecycle:lifecycle-common-java8:$lifecycle_version"
-
-    // androidx
-    implementation "androidx.appcompat:appcompat:$androidx_appcompat_version"
-    implementation "androidx.constraintlayout:constraintlayout:$androidx_constraintlayout_version"
-    implementation "androidx.core:core-ktx:$androidx_core_version"
-    implementation "androidx.emoji:emoji-appcompat:$androidx_emoji_version"
-    implementation "androidx.viewpager2:viewpager2:$androidx_viewpager_version"
-    implementation "com.google.android.material:material:$material_version"
-
-    // conductor
-    implementation "com.bluelinelabs:conductor:$conductor_version"
-    implementation "com.bluelinelabs:conductor-archlifecycle:$conductor_version"
-
-    // glide
-    implementation "com.github.bumptech.glide:glide:$glide_version"
-    kapt "com.github.bumptech.glide:compiler:$glide_version"
-
-    // exoplayer
-    implementation "com.google.android.exoplayer:exoplayer-core:$exoplayer_version"
-    implementation("com.google.android.exoplayer:exoplayer-ui:$exoplayer_version", {
-        exclude group: "com.android.support", module: "support-media-compat"
-    })
-
-    // rxbinding
-    implementation "com.jakewharton.rxbinding2:rxbinding-kotlin:$rxbinding_version"
-    implementation "com.jakewharton.rxbinding2:rxbinding-support-v4-kotlin:$rxbinding_version"
-
-    // autodispose
-    implementation "com.uber.autodispose:autodispose-android-archcomponents:$autodispose_version"
-    implementation "com.uber.autodispose:autodispose-android-archcomponents-test:$autodispose_version"
-    implementation "com.uber.autodispose:autodispose-android:$autodispose_version"
-    implementation "com.uber.autodispose:autodispose:$autodispose_version"
-    implementation "com.uber.autodispose:autodispose-lifecycle:$autodispose_version"
-
-    // dagger
-    implementation "com.google.dagger:dagger:$dagger_version"
-    implementation "com.google.dagger:dagger-android-support:$dagger_version"
-    kapt "com.google.dagger:dagger-compiler:$dagger_version"
-    kapt "com.google.dagger:dagger-android-processor:$dagger_version"
-    compileOnly "javax.annotation:jsr250-api:1.0"
-
-    // ezvcard
-    implementation('com.googlecode.ez-vcard:ez-vcard:0.10.4', {
-        exclude group: "org.jsoup", module: "jsoup"
-        exclude group: "org.freemarker", module: "freemarker"
-        exclude group: "com.fasterxml.jackson.core", module: "jackson-core"
-    })
-
-    // realm
-    implementation("io.realm:android-adapters:$realm_adapters_version") { transitive = false }
-    kapt "io.realm:realm-annotations:$realm_version"
-    kapt "io.realm:realm-annotations-processor:$realm_version"
-
-    // rxjava
-    implementation "io.reactivex.rxjava2:rxandroid:$rxandroid_version"
-    implementation "io.reactivex.rxjava2:rxjava:$rxjava_version"
-    implementation "io.reactivex.rxjava2:rxkotlin:$rxkotlin_version"
-    implementation "com.uber.rxdogtag:rxdogtag:$rxdogtag_version"
-    implementation "com.uber.rxdogtag:rxdogtag-autodispose:$rxdogtag_version"
-
-
-    // testing
-    androidTestImplementation("androidx.test.espresso:espresso-core:$espresso_version", {
-        exclude group: "com.android.support", module: "support-annotations"
-    })
-    androidTestImplementation "org.mockito:mockito-android:$mockito_version"
-    testImplementation "androidx.test:runner:$androidx_testrunner_version"
-    testImplementation "junit:junit:$junit_version"
-    testImplementation "org.mockito:mockito-core:$mockito_version"
-
-    // moshi
-    implementation "com.squareup.moshi:moshi:$moshi_version"
-    debugImplementation "com.squareup.moshi:moshi-kotlin:$moshi_version"
-    kaptRelease "com.squareup.moshi:moshi-kotlin-codegen:$moshi_version"
-
-    // coroutines
-    implementation "org.jetbrains.kotlinx:kotlinx-coroutines-core:$coroutines_version"
-    implementation "org.jetbrains.kotlinx:kotlinx-coroutines-android:$coroutines_version"
-    implementation "org.jetbrains.kotlinx:kotlinx-coroutines-rx2:$coroutines_version"
-    implementation "org.jetbrains.kotlinx:kotlinx-coroutines-reactive:$coroutines_version"
-
-    implementation "com.github.chrisbanes:PhotoView:2.0.0"
-    implementation "com.f2prateek.rx.preferences2:rx-preferences:$rx_preferences_version"
-    implementation "com.google.android:flexbox:0.3.1"
-    implementation "com.jakewharton.timber:timber:$timber_version"
-    implementation "com.squareup.moshi:moshi-kotlin:$moshi_version"
-    implementation "me.leolin:ShortcutBadger:1.1.22"
-    implementation "org.jetbrains.kotlin:kotlin-stdlib-jdk7:$kotlin_version"
-    implementation project(":android-smsmms")
-    implementation project(":common")
-    implementation project(':data')
-    implementation project(':domain')
-
-    withAnalyticsImplementation 'com.google.firebase:firebase-crashlytics:17.3.0'
-    withAnalyticsImplementation "com.android.billingclient:billing:$billing_version"
-    withAnalyticsImplementation "com.android.billingclient:billing-ktx:$billing_version"
-    noAnalyticsDebug project(path: ':data', configuration: 'noAnalyticsDebug')
-    noAnalyticsRelease project(path: ':data', configuration: 'noAnalyticsRelease')
-    withAnalyticsDebug project(path: ':data', configuration: 'withAnalyticsDebug')
-    withAnalyticsRelease project(path: ':data', configuration: 'withAnalyticsRelease')
-}
-
-if (getGradle().getStartParameter().getTaskRequests().toString().contains("WithAnalytics")) {
-    apply plugin: 'com.google.gms.google-services'
-    apply plugin: 'com.google.firebase.crashlytics'
-}
+/*
+ * Copyright (C) 2017 Moez Bhatti <moez.bhatti@gmail.com>
+ *
+ * This file is part of QKSMS.
+ *
+ * QKSMS is free software: you can redistribute it and/or modify
+ * it under the terms of the GNU General Public License as published by
+ * the Free Software Foundation, either version 3 of the License, or
+ * (at your option) any later version.
+ *
+ * QKSMS is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+ * GNU General Public License for more details.
+ *
+ * You should have received a copy of the GNU General Public License
+ * along with QKSMS.  If not, see <http://www.gnu.org/licenses/>.
+ */
+apply plugin: 'com.android.application'
+apply plugin: 'realm-android' // Realm needs to be before Kotlin or the build will fail
+apply plugin: 'kotlin-android'
+apply plugin: 'kotlin-android-extensions'
+apply plugin: 'kotlin-kapt'
+
+android {
+    compileSdkVersion 29
+    buildToolsVersion "29.0.3"
+    flavorDimensions "analytics"
+
+    defaultConfig {
+        applicationId "com.moez.QKSMS"
+        minSdkVersion 21
+        targetSdkVersion 29
+        versionCode 2218
+        versionName "3.9.4"
+        setProperty("archivesBaseName", "QKSMS-v${versionName}")
+        testInstrumentationRunner "androidx.test.runner.AndroidJUnitRunner"
+
+        setProperty("archivesBaseName", "QKSMS-v${versionName}")
+    }
+
+    signingConfigs {
+        release
+    }
+
+    buildTypes {
+        release {
+            minifyEnabled true
+            shrinkResources true
+            proguardFiles getDefaultProguardFile('proguard-android.txt'), 'proguard-rules.pro'
+            signingConfig signingConfigs.release
+        }
+    }
+
+    compileOptions {
+        sourceCompatibility 1.8
+        targetCompatibility 1.8
+    }
+
+    kotlinOptions {
+        jvmTarget = "1.8"
+    }
+
+    lintOptions {
+        abortOnError false
+    }
+
+    productFlavors {
+        withAnalytics { dimension "analytics" }
+        noAnalytics { dimension "analytics" }
+    }
+
+    if (System.getenv("CI") == "true") {
+        signingConfigs.release.storeFile = file("../keystore")
+        signingConfigs.release.storePassword = System.getenv("keystore_password")
+        signingConfigs.release.keyAlias = System.getenv("key_alias")
+        signingConfigs.release.keyPassword = System.getenv("key_password")
+    }
+}
+
+androidExtensions {
+    experimental = true
+}
+
+configurations {
+    noAnalyticsDebug
+    noAnalyticsRelease
+    withAnalyticsDebug
+    withAnalyticsRelease
+}
+
+dependencies {
+    // lifecycle
+    implementation "androidx.lifecycle:lifecycle-extensions:$lifecycle_version"
+    implementation "androidx.lifecycle:lifecycle-common-java8:$lifecycle_version"
+
+    // androidx
+    implementation "androidx.appcompat:appcompat:$androidx_appcompat_version"
+    implementation "androidx.constraintlayout:constraintlayout:$androidx_constraintlayout_version"
+    implementation "androidx.core:core-ktx:$androidx_core_version"
+    implementation "androidx.emoji:emoji-appcompat:$androidx_emoji_version"
+    implementation "androidx.viewpager2:viewpager2:$androidx_viewpager_version"
+    implementation "com.google.android.material:material:$material_version"
+
+    // conductor
+    implementation "com.bluelinelabs:conductor:$conductor_version"
+    implementation "com.bluelinelabs:conductor-archlifecycle:$conductor_version"
+
+    // glide
+    implementation "com.github.bumptech.glide:glide:$glide_version"
+    kapt "com.github.bumptech.glide:compiler:$glide_version"
+
+    // exoplayer
+    implementation "com.google.android.exoplayer:exoplayer-core:$exoplayer_version"
+    implementation("com.google.android.exoplayer:exoplayer-ui:$exoplayer_version", {
+        exclude group: "com.android.support", module: "support-media-compat"
+    })
+
+    // rxbinding
+    implementation "com.jakewharton.rxbinding2:rxbinding-kotlin:$rxbinding_version"
+    implementation "com.jakewharton.rxbinding2:rxbinding-support-v4-kotlin:$rxbinding_version"
+
+    // autodispose
+    implementation "com.uber.autodispose:autodispose-android-archcomponents:$autodispose_version"
+    implementation "com.uber.autodispose:autodispose-android-archcomponents-test:$autodispose_version"
+    implementation "com.uber.autodispose:autodispose-android:$autodispose_version"
+    implementation "com.uber.autodispose:autodispose:$autodispose_version"
+    implementation "com.uber.autodispose:autodispose-lifecycle:$autodispose_version"
+
+    // dagger
+    implementation "com.google.dagger:dagger:$dagger_version"
+    implementation "com.google.dagger:dagger-android-support:$dagger_version"
+    kapt "com.google.dagger:dagger-compiler:$dagger_version"
+    kapt "com.google.dagger:dagger-android-processor:$dagger_version"
+    compileOnly "javax.annotation:jsr250-api:1.0"
+
+    // ezvcard
+    implementation('com.googlecode.ez-vcard:ez-vcard:0.10.4', {
+        exclude group: "org.jsoup", module: "jsoup"
+        exclude group: "org.freemarker", module: "freemarker"
+        exclude group: "com.fasterxml.jackson.core", module: "jackson-core"
+    })
+
+    // realm
+    implementation("io.realm:android-adapters:$realm_adapters_version") { transitive = false }
+    kapt "io.realm:realm-annotations:$realm_version"
+    kapt "io.realm:realm-annotations-processor:$realm_version"
+
+    // rxjava
+    implementation "io.reactivex.rxjava2:rxandroid:$rxandroid_version"
+    implementation "io.reactivex.rxjava2:rxjava:$rxjava_version"
+    implementation "io.reactivex.rxjava2:rxkotlin:$rxkotlin_version"
+    implementation "com.uber.rxdogtag:rxdogtag:$rxdogtag_version"
+    implementation "com.uber.rxdogtag:rxdogtag-autodispose:$rxdogtag_version"
+
+
+    // testing
+    androidTestImplementation("androidx.test.espresso:espresso-core:$espresso_version", {
+        exclude group: "com.android.support", module: "support-annotations"
+    })
+    androidTestImplementation "org.mockito:mockito-android:$mockito_version"
+    testImplementation "androidx.test:runner:$androidx_testrunner_version"
+    testImplementation "junit:junit:$junit_version"
+    testImplementation "org.mockito:mockito-core:$mockito_version"
+
+    // moshi
+    implementation "com.squareup.moshi:moshi:$moshi_version"
+    debugImplementation "com.squareup.moshi:moshi-kotlin:$moshi_version"
+    kaptRelease "com.squareup.moshi:moshi-kotlin-codegen:$moshi_version"
+
+    // coroutines
+    implementation "org.jetbrains.kotlinx:kotlinx-coroutines-core:$coroutines_version"
+    implementation "org.jetbrains.kotlinx:kotlinx-coroutines-android:$coroutines_version"
+    implementation "org.jetbrains.kotlinx:kotlinx-coroutines-rx2:$coroutines_version"
+    implementation "org.jetbrains.kotlinx:kotlinx-coroutines-reactive:$coroutines_version"
+
+    implementation "com.github.chrisbanes:PhotoView:2.0.0"
+    implementation "com.f2prateek.rx.preferences2:rx-preferences:$rx_preferences_version"
+    implementation "com.google.android:flexbox:0.3.1"
+    implementation "com.jakewharton.timber:timber:$timber_version"
+    implementation "com.squareup.moshi:moshi-kotlin:$moshi_version"
+    implementation "me.leolin:ShortcutBadger:1.1.22"
+    implementation "org.jetbrains.kotlin:kotlin-stdlib-jdk7:$kotlin_version"
+    implementation project(":android-smsmms")
+    implementation project(":common")
+    implementation project(':data')
+    implementation project(':domain')
+
+    withAnalyticsImplementation 'com.google.firebase:firebase-crashlytics:17.3.0'
+    withAnalyticsImplementation "com.android.billingclient:billing:$billing_version"
+    withAnalyticsImplementation "com.android.billingclient:billing-ktx:$billing_version"
+    noAnalyticsDebug project(path: ':data', configuration: 'noAnalyticsDebug')
+    noAnalyticsRelease project(path: ':data', configuration: 'noAnalyticsRelease')
+    withAnalyticsDebug project(path: ':data', configuration: 'withAnalyticsDebug')
+    withAnalyticsRelease project(path: ':data', configuration: 'withAnalyticsRelease')
+}
+
+if (getGradle().getStartParameter().getTaskRequests().toString().contains("WithAnalytics")) {
+    apply plugin: 'com.google.gms.google-services'
+    apply plugin: 'com.google.firebase.crashlytics'
+}
diff --git a/presentation/proguard-rules.pro b/presentation/proguard-rules.pro
index 5d87be3fe..91e1593e5 100644
--- a/presentation/proguard-rules.pro
+++ b/presentation/proguard-rules.pro
@@ -1,92 +1,92 @@
--dontobfuscate
-
-# android-smsmms
-# -keep class android.net.** { *; }
--dontwarn android.net.ConnectivityManager
--dontwarn android.net.LinkProperties
-
-# autodispose
--dontwarn com.uber.autodispose.**
-
-# ez-vcard
--dontwarn ezvcard.**
--dontwarn org.apache.log.**
--dontwarn org.apache.log4j.**
--dontwarn org.python.core.**
-
-# okio
--dontwarn okio.**
-
-# okhttp3
-# JSR 305 annotations are for embedding nullability information.
--dontwarn javax.annotation.**
-
-# A resource is loaded with a relative path so the package of this class must be preserved.
--keepnames class okhttp3.internal.publicsuffix.PublicSuffixDatabase
-
-# Animal Sniffer compileOnly dependency to ensure APIs are compatible with older versions of Java.
--dontwarn org.codehaus.mojo.animal_sniffer.*
-
-# OkHttp platform used only on JVM and when Conscrypt dependency is available.
--dontwarn okhttp3.internal.platform.ConscryptPlatform
-
-# moshi
-# JSR 305 annotations are for embedding nullability information.
--dontwarn javax.annotation.**
-
--keepclasseswithmembers class * {
-    @com.squareup.moshi.* <methods>;
-}
-
--keep @com.squareup.moshi.JsonQualifier interface *
-
-# Enum field names are used by the integrated EnumJsonAdapter.
-# Annotate enums with @JsonClass(generateAdapter = false) to use them with Moshi.
--keepclassmembers @com.squareup.moshi.JsonClass class * extends java.lang.Enum {
-    <fields>;
-}
-
-# The name of @JsonClass types is used to look up the generated adapter.
--keepnames @com.squareup.moshi.JsonClass class *
-
-# Retain generated target class's synthetic defaults constructor and keep DefaultConstructorMarker's
-# name. We will look this up reflectively to invoke the type's constructor.
-#
-# We can't _just_ keep the defaults constructor because Proguard/R8's spec doesn't allow wildcard
-# matching preceding parameters.
--keepnames class kotlin.jvm.internal.DefaultConstructorMarker
--keepclassmembers @com.squareup.moshi.JsonClass class * {
-    <init>(...);
-}
-
-# Retain generated JsonAdapters if annotated type is retained.
--if @com.squareup.moshi.JsonClass class *
--keep class <1>JsonAdapter {
-    <init>(...);
-    <fields>;
-}
--if @com.squareup.moshi.JsonClass class **$*
--keep class <1>_<2>JsonAdapter {
-    <init>(...);
-    <fields>;
-}
--if @com.squareup.moshi.JsonClass class **$*$*
--keep class <1>_<2>_<3>JsonAdapter {
-    <init>(...);
-    <fields>;
-}
--if @com.squareup.moshi.JsonClass class **$*$*$*
--keep class <1>_<2>_<3>_<4>JsonAdapter {
-    <init>(...);
-    <fields>;
-}
--if @com.squareup.moshi.JsonClass class **$*$*$*$*
--keep class <1>_<2>_<3>_<4>_<5>JsonAdapter {
-    <init>(...);
-    <fields>;
-}
--if @com.squareup.moshi.JsonClass class **$*$*$*$*$*
--keep class <1>_<2>_<3>_<4>_<5>_<6>JsonAdapter {
-    <init>(...);
-    <fields>;
-}
+-dontobfuscate
+
+# android-smsmms
+# -keep class android.net.** { *; }
+-dontwarn android.net.ConnectivityManager
+-dontwarn android.net.LinkProperties
+
+# autodispose
+-dontwarn com.uber.autodispose.**
+
+# ez-vcard
+-dontwarn ezvcard.**
+-dontwarn org.apache.log.**
+-dontwarn org.apache.log4j.**
+-dontwarn org.python.core.**
+
+# okio
+-dontwarn okio.**
+
+# okhttp3
+# JSR 305 annotations are for embedding nullability information.
+-dontwarn javax.annotation.**
+
+# A resource is loaded with a relative path so the package of this class must be preserved.
+-keepnames class okhttp3.internal.publicsuffix.PublicSuffixDatabase
+
+# Animal Sniffer compileOnly dependency to ensure APIs are compatible with older versions of Java.
+-dontwarn org.codehaus.mojo.animal_sniffer.*
+
+# OkHttp platform used only on JVM and when Conscrypt dependency is available.
+-dontwarn okhttp3.internal.platform.ConscryptPlatform
+
+# moshi
+# JSR 305 annotations are for embedding nullability information.
+-dontwarn javax.annotation.**
+
+-keepclasseswithmembers class * {
+    @com.squareup.moshi.* <methods>;
+}
+
+-keep @com.squareup.moshi.JsonQualifier interface *
+
+# Enum field names are used by the integrated EnumJsonAdapter.
+# Annotate enums with @JsonClass(generateAdapter = false) to use them with Moshi.
+-keepclassmembers @com.squareup.moshi.JsonClass class * extends java.lang.Enum {
+    <fields>;
+}
+
+# The name of @JsonClass types is used to look up the generated adapter.
+-keepnames @com.squareup.moshi.JsonClass class *
+
+# Retain generated target class's synthetic defaults constructor and keep DefaultConstructorMarker's
+# name. We will look this up reflectively to invoke the type's constructor.
+#
+# We can't _just_ keep the defaults constructor because Proguard/R8's spec doesn't allow wildcard
+# matching preceding parameters.
+-keepnames class kotlin.jvm.internal.DefaultConstructorMarker
+-keepclassmembers @com.squareup.moshi.JsonClass class * {
+    <init>(...);
+}
+
+# Retain generated JsonAdapters if annotated type is retained.
+-if @com.squareup.moshi.JsonClass class *
+-keep class <1>JsonAdapter {
+    <init>(...);
+    <fields>;
+}
+-if @com.squareup.moshi.JsonClass class **$*
+-keep class <1>_<2>JsonAdapter {
+    <init>(...);
+    <fields>;
+}
+-if @com.squareup.moshi.JsonClass class **$*$*
+-keep class <1>_<2>_<3>JsonAdapter {
+    <init>(...);
+    <fields>;
+}
+-if @com.squareup.moshi.JsonClass class **$*$*$*
+-keep class <1>_<2>_<3>_<4>JsonAdapter {
+    <init>(...);
+    <fields>;
+}
+-if @com.squareup.moshi.JsonClass class **$*$*$*$*
+-keep class <1>_<2>_<3>_<4>_<5>JsonAdapter {
+    <init>(...);
+    <fields>;
+}
+-if @com.squareup.moshi.JsonClass class **$*$*$*$*$*
+-keep class <1>_<2>_<3>_<4>_<5>_<6>JsonAdapter {
+    <init>(...);
+    <fields>;
+}
diff --git a/presentation/src/androidTest/java/com/moez/QKSMS/feature/main/MainViewModelTest.kt b/presentation/src/androidTest/java/com/moez/QKSMS/feature/main/MainViewModelTest.kt
index 6023c5d25..df194246d 100644
--- a/presentation/src/androidTest/java/com/moez/QKSMS/feature/main/MainViewModelTest.kt
+++ b/presentation/src/androidTest/java/com/moez/QKSMS/feature/main/MainViewModelTest.kt
@@ -1,33 +1,33 @@
-/*
- * Copyright (C) 2017 Moez Bhatti <moez.bhatti@gmail.com>
- *
- * This file is part of QKSMS.
- *
- * QKSMS is free software: you can redistribute it and/or modify
- * it under the terms of the GNU General Public License as published by
- * the Free Software Foundation, either version 3 of the License, or
- * (at your option) any later version.
- *
- * QKSMS is distributed in the hope that it will be useful,
- * but WITHOUT ANY WARRANTY; without even the implied warranty of
- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
- * GNU General Public License for more details.
- *
- * You should have received a copy of the GNU General Public License
- * along with QKSMS.  If not, see <http://www.gnu.org/licenses/>.
- */
-package com.moez.QKSMS.feature.main
-
-import androidx.test.runner.AndroidJUnit4
-import org.junit.Test
-import org.junit.runner.RunWith
-
-@RunWith(AndroidJUnit4::class)
-class MainViewModelTest {
-
-    @Test
-    fun insertedSentMessageEqualsSyncResult() {
-        assert(1 == 1)
-    }
-
+/*
+ * Copyright (C) 2017 Moez Bhatti <moez.bhatti@gmail.com>
+ *
+ * This file is part of QKSMS.
+ *
+ * QKSMS is free software: you can redistribute it and/or modify
+ * it under the terms of the GNU General Public License as published by
+ * the Free Software Foundation, either version 3 of the License, or
+ * (at your option) any later version.
+ *
+ * QKSMS is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+ * GNU General Public License for more details.
+ *
+ * You should have received a copy of the GNU General Public License
+ * along with QKSMS.  If not, see <http://www.gnu.org/licenses/>.
+ */
+package com.moez.QKSMS.feature.main
+
+import androidx.test.runner.AndroidJUnit4
+import org.junit.Test
+import org.junit.runner.RunWith
+
+@RunWith(AndroidJUnit4::class)
+class MainViewModelTest {
+
+    @Test
+    fun insertedSentMessageEqualsSyncResult() {
+        assert(1 == 1)
+    }
+
 }
\ No newline at end of file
diff --git a/presentation/src/main/AndroidManifest.xml b/presentation/src/main/AndroidManifest.xml
index 796dc6a33..db6dad122 100644
--- a/presentation/src/main/AndroidManifest.xml
+++ b/presentation/src/main/AndroidManifest.xml
@@ -1,232 +1,232 @@
-<?xml version="1.0" encoding="utf-8"?>
-<!--
-  ~ Copyright (C) 2017 Moez Bhatti <moez.bhatti@gmail.com>
-  ~
-  ~ This file is part of QKSMS.
-  ~
-  ~ QKSMS is free software: you can redistribute it and/or modify
-  ~ it under the terms of the GNU General Public License as published by
-  ~ the Free Software Foundation, either version 3 of the License, or
-  ~ (at your option) any later version.
-  ~
-  ~ QKSMS is distributed in the hope that it will be useful,
-  ~ but WITHOUT ANY WARRANTY; without even the implied warranty of
-  ~ MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
-  ~ GNU General Public License for more details.
-  ~
-  ~ You should have received a copy of the GNU General Public License
-  ~ along with QKSMS.  If not, see <http://www.gnu.org/licenses/>.
-  -->
-<manifest xmlns:android="http://schemas.android.com/apk/res/android"
-    package="com.moez.QKSMS">
-
-    <uses-permission android:name="android.permission.ACCESS_NETWORK_STATE" />
-    <uses-permission android:name="android.permission.CALL_PHONE" />
-    <!-- Used for starting foreground service for backup/restore on Android P+ -->
-    <uses-permission android:name="android.permission.FOREGROUND_SERVICE" />
-    <uses-permission android:name="android.permission.INTERNET" />
-    <uses-permission android:name="android.permission.READ_CONTACTS" />
-    <uses-permission android:name="android.permission.READ_SMS" />
-    <uses-permission android:name="android.permission.READ_PHONE_STATE" />
-    <uses-permission android:name="android.permission.RECEIVE_BOOT_COMPLETED" />
-    <uses-permission android:name="android.permission.RECEIVE_MMS" />
-    <uses-permission android:name="android.permission.RECEIVE_SMS" />
-    <uses-permission android:name="android.permission.SEND_SMS" />
-    <uses-permission android:name="android.permission.VIBRATE" />
-    <uses-permission android:name="android.permission.WAKE_LOCK" />
-    <uses-permission android:name="android.permission.WRITE_EXTERNAL_STORAGE" />
-    <uses-permission android:name="android.permission.WRITE_SMS" />
-
-    <application
-        android:name=".common.QKApplication"
-        android:allowBackup="true"
-        android:icon="@mipmap/ic_launcher"
-        android:label="@string/app_name"
-        android:requestLegacyExternalStorage="true"
-        android:supportsRtl="true"
-        android:theme="@style/AppLaunchTheme">
-
-        <activity
-            android:name=".feature.main.MainActivity"
-            android:launchMode="singleTask">
-            <intent-filter>
-                <action android:name="android.intent.action.MAIN" />
-                <category android:name="android.intent.category.LAUNCHER" />
-            </intent-filter>
-            <meta-data
-                android:name="android.app.shortcuts"
-                android:resource="@xml/shortcuts" />
-        </activity>
-        <activity
-            android:name=".feature.compose.ComposeActivity"
-            android:parentActivityName=".feature.main.MainActivity">
-            <intent-filter>
-                <action android:name="android.intent.action.VIEW" />
-                <action android:name="android.intent.action.MAIN" />
-                <action android:name="android.intent.action.SEND" />
-                <action android:name="android.intent.action.SENDTO" />
-
-                <category android:name="android.intent.category.DEFAULT" />
-                <category android:name="android.intent.category.BROWSABLE" />
-
-                <data android:scheme="sms" />
-                <data android:scheme="smsto" />
-                <data android:scheme="mms" />
-                <data android:scheme="mmsto" />
-                <data android:scheme="sms_body" />
-            </intent-filter>
-            <intent-filter>
-                <action android:name="android.intent.action.SEND" />
-                <category android:name="android.intent.category.DEFAULT" />
-                <data android:mimeType="text/plain" />
-            </intent-filter>
-            <intent-filter>
-                <action android:name="android.intent.action.SEND" />
-                <category android:name="android.intent.category.DEFAULT" />
-                <data android:mimeType="image/*" />
-            </intent-filter>
-            <intent-filter>
-                <action android:name="android.intent.action.SEND_MULTIPLE" />
-                <category android:name="android.intent.category.DEFAULT" />
-                <data android:mimeType="image/*" />
-            </intent-filter>
-            <intent-filter>
-                <action android:name="android.intent.action.SEND" />
-                <category android:name="android.intent.category.DEFAULT" />
-                <data android:mimeType="text/x-vcard" />
-            </intent-filter>
-
-            <meta-data
-                android:name="android.service.chooser.chooser_target_service"
-                android:value=".common.util.QkChooserTargetService" />
-        </activity>
-        <activity android:name=".feature.settings.SettingsActivity" />
-        <activity android:name=".feature.plus.PlusActivity" />
-        <activity
-            android:name=".feature.gallery.GalleryActivity"
-            android:theme="@style/AppTheme.Black" />
-        <activity android:name=".feature.conversationinfo.ConversationInfoActivity" />
-        <activity android:name=".feature.notificationprefs.NotificationPrefsActivity" />
-        <activity android:name=".feature.blocking.BlockingActivity" />
-        <activity
-            android:name=".feature.qkreply.QkReplyActivity"
-            android:excludeFromRecents="true"
-            android:taskAffinity=""
-            android:theme="@style/AppThemeDialog"
-            android:windowSoftInputMode="adjustResize" />
-        <activity android:name=".feature.scheduled.ScheduledActivity" />
-        <activity android:name=".feature.backup.BackupActivity" />
-        <activity android:name=".feature.contacts.ContactsActivity" />
-
-        <receiver android:name=".receiver.BootReceiver">
-            <intent-filter>
-                <action android:name="android.intent.action.BOOT_COMPLETED" />
-            </intent-filter>
-        </receiver>
-        <receiver android:name=".receiver.DefaultSmsChangedReceiver">
-            <intent-filter>
-                <action android:name="android.provider.action.DEFAULT_SMS_PACKAGE_CHANGED" />
-            </intent-filter>
-        </receiver>
-        <receiver android:name=".receiver.DeleteMessagesReceiver" />
-        <receiver
-            android:name=".receiver.SmsReceiver"
-            android:permission="android.permission.BROADCAST_SMS">
-            <intent-filter>
-                <action android:name="android.provider.Telephony.SMS_DELIVER" />
-            </intent-filter>
-        </receiver>
-        <receiver
-            android:name=".receiver.MmsReceiver"
-            android:permission="android.permission.BROADCAST_WAP_PUSH">
-            <intent-filter>
-                <action android:name="android.provider.Telephony.WAP_PUSH_DELIVER" />
-                <data android:mimeType="application/vnd.wap.mms-message" />
-            </intent-filter>
-        </receiver>
-        <receiver android:name=".receiver.SmsSentReceiver" />
-        <receiver android:name=".receiver.SmsDeliveredReceiver" />
-        <receiver
-            android:name=".receiver.MmsSentReceiver"
-            android:taskAffinity="com.moez.QKSMS.MMS_SENT" />
-        <receiver
-            android:name=".receiver.MmsUpdatedReceiver"
-            android:taskAffinity="com.moez.QKSMS.MMS_UPDATED" />
-        <receiver
-            android:name=".receiver.MmsReceivedReceiver"
-            android:taskAffinity="com.klinker.android.messaging.MMS_RECEIVED" />
-        <receiver android:name=".receiver.MarkArchivedReceiver" />
-        <receiver android:name=".receiver.BlockThreadReceiver" />
-        <receiver android:name=".receiver.MarkSeenReceiver" />
-        <receiver android:name=".receiver.MarkReadReceiver" />
-        <receiver android:name=".receiver.RemoteMessagingReceiver" />
-        <receiver android:name=".receiver.NightModeReceiver" />
-        <receiver android:name=".receiver.SmsProviderChangedReceiver">
-            <intent-filter>
-                <action android:name="android.provider.action.EXTERNAL_PROVIDER_CHANGE" />
-            </intent-filter>
-        </receiver>
-        <receiver android:name=".receiver.SendScheduledMessageReceiver" />
-        <receiver android:name=".feature.widget.WidgetProvider">
-            <intent-filter>
-                <action android:name="android.appwidget.action.APPWIDGET_UPDATE" />
-                <action android:name="com.moez.QKSMS.intent.action.ACTION_NOTIFY_DATASET_CHANGED" />
-            </intent-filter>
-
-            <meta-data
-                android:name="android.appwidget.provider"
-                android:resource="@xml/widget_info" />
-        </receiver>
-        <receiver android:name=".receiver.SendSmsReceiver" />
-
-        <service android:name="com.android.mms.transaction.TransactionService" />
-        <service android:name=".feature.backup.RestoreBackupService" />
-        <service
-            android:name=".feature.widget.WidgetService"
-            android:permission="android.permission.BIND_REMOTEVIEWS" />
-        <service
-            android:name=".service.AutoDeleteService"
-            android:permission="android.permission.BIND_JOB_SERVICE" />
-        <service
-            android:name=".service.HeadlessSmsSendService"
-            android:exported="true"
-            android:permission="android.permission.SEND_RESPOND_VIA_MESSAGE">
-            <intent-filter>
-                <action android:name="android.intent.action.RESPOND_VIA_MESSAGE" />
-                <category android:name="android.intent.category.DEFAULT" />
-
-                <data android:scheme="sms" />
-                <data android:scheme="smsto" />
-                <data android:scheme="mms" />
-                <data android:scheme="mmsto" />
-            </intent-filter>
-        </service>
-        <service
-            android:name=".common.util.QkChooserTargetService"
-            android:label="@string/app_name"
-            android:permission="android.permission.BIND_CHOOSER_TARGET_SERVICE">
-            <intent-filter>
-                <action android:name="android.service.chooser.ChooserTargetService" />
-            </intent-filter>
-        </service>
-
-        <meta-data
-            android:name="com.callcontrol.datashare.messaging"
-            android:value="true" />
-        <meta-data
-            android:name="preloaded_fonts"
-            android:resource="@array/preloaded_fonts" />
-
-        <provider
-            android:name="androidx.core.content.FileProvider"
-            android:authorities="${applicationId}.fileprovider"
-            android:exported="false"
-            android:grantUriPermissions="true">
-            <meta-data
-                android:name="android.support.FILE_PROVIDER_PATHS"
-                android:resource="@xml/provider_paths" />
-        </provider>
-
-    </application>
-
+<?xml version="1.0" encoding="utf-8"?>
+<!--
+  ~ Copyright (C) 2017 Moez Bhatti <moez.bhatti@gmail.com>
+  ~
+  ~ This file is part of QKSMS.
+  ~
+  ~ QKSMS is free software: you can redistribute it and/or modify
+  ~ it under the terms of the GNU General Public License as published by
+  ~ the Free Software Foundation, either version 3 of the License, or
+  ~ (at your option) any later version.
+  ~
+  ~ QKSMS is distributed in the hope that it will be useful,
+  ~ but WITHOUT ANY WARRANTY; without even the implied warranty of
+  ~ MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+  ~ GNU General Public License for more details.
+  ~
+  ~ You should have received a copy of the GNU General Public License
+  ~ along with QKSMS.  If not, see <http://www.gnu.org/licenses/>.
+  -->
+<manifest xmlns:android="http://schemas.android.com/apk/res/android"
+    package="com.moez.QKSMS">
+
+    <uses-permission android:name="android.permission.ACCESS_NETWORK_STATE" />
+    <uses-permission android:name="android.permission.CALL_PHONE" />
+    <!-- Used for starting foreground service for backup/restore on Android P+ -->
+    <uses-permission android:name="android.permission.FOREGROUND_SERVICE" />
+    <uses-permission android:name="android.permission.INTERNET" />
+    <uses-permission android:name="android.permission.READ_CONTACTS" />
+    <uses-permission android:name="android.permission.READ_SMS" />
+    <uses-permission android:name="android.permission.READ_PHONE_STATE" />
+    <uses-permission android:name="android.permission.RECEIVE_BOOT_COMPLETED" />
+    <uses-permission android:name="android.permission.RECEIVE_MMS" />
+    <uses-permission android:name="android.permission.RECEIVE_SMS" />
+    <uses-permission android:name="android.permission.SEND_SMS" />
+    <uses-permission android:name="android.permission.VIBRATE" />
+    <uses-permission android:name="android.permission.WAKE_LOCK" />
+    <uses-permission android:name="android.permission.WRITE_EXTERNAL_STORAGE" />
+    <uses-permission android:name="android.permission.WRITE_SMS" />
+
+    <application
+        android:name=".common.QKApplication"
+        android:allowBackup="true"
+        android:icon="@mipmap/ic_launcher"
+        android:label="@string/app_name"
+        android:requestLegacyExternalStorage="true"
+        android:supportsRtl="true"
+        android:theme="@style/AppLaunchTheme">
+
+        <activity
+            android:name=".feature.main.MainActivity"
+            android:launchMode="singleTask">
+            <intent-filter>
+                <action android:name="android.intent.action.MAIN" />
+                <category android:name="android.intent.category.LAUNCHER" />
+            </intent-filter>
+            <meta-data
+                android:name="android.app.shortcuts"
+                android:resource="@xml/shortcuts" />
+        </activity>
+        <activity
+            android:name=".feature.compose.ComposeActivity"
+            android:parentActivityName=".feature.main.MainActivity">
+            <intent-filter>
+                <action android:name="android.intent.action.VIEW" />
+                <action android:name="android.intent.action.MAIN" />
+                <action android:name="android.intent.action.SEND" />
+                <action android:name="android.intent.action.SENDTO" />
+
+                <category android:name="android.intent.category.DEFAULT" />
+                <category android:name="android.intent.category.BROWSABLE" />
+
+                <data android:scheme="sms" />
+                <data android:scheme="smsto" />
+                <data android:scheme="mms" />
+                <data android:scheme="mmsto" />
+                <data android:scheme="sms_body" />
+            </intent-filter>
+            <intent-filter>
+                <action android:name="android.intent.action.SEND" />
+                <category android:name="android.intent.category.DEFAULT" />
+                <data android:mimeType="text/plain" />
+            </intent-filter>
+            <intent-filter>
+                <action android:name="android.intent.action.SEND" />
+                <category android:name="android.intent.category.DEFAULT" />
+                <data android:mimeType="image/*" />
+            </intent-filter>
+            <intent-filter>
+                <action android:name="android.intent.action.SEND_MULTIPLE" />
+                <category android:name="android.intent.category.DEFAULT" />
+                <data android:mimeType="image/*" />
+            </intent-filter>
+            <intent-filter>
+                <action android:name="android.intent.action.SEND" />
+                <category android:name="android.intent.category.DEFAULT" />
+                <data android:mimeType="text/x-vcard" />
+            </intent-filter>
+
+            <meta-data
+                android:name="android.service.chooser.chooser_target_service"
+                android:value=".common.util.QkChooserTargetService" />
+        </activity>
+        <activity android:name=".feature.settings.SettingsActivity" />
+        <activity android:name=".feature.plus.PlusActivity" />
+        <activity
+            android:name=".feature.gallery.GalleryActivity"
+            android:theme="@style/AppTheme.Black" />
+        <activity android:name=".feature.conversationinfo.ConversationInfoActivity" />
+        <activity android:name=".feature.notificationprefs.NotificationPrefsActivity" />
+        <activity android:name=".feature.blocking.BlockingActivity" />
+        <activity
+            android:name=".feature.qkreply.QkReplyActivity"
+            android:excludeFromRecents="true"
+            android:taskAffinity=""
+            android:theme="@style/AppThemeDialog"
+            android:windowSoftInputMode="adjustResize" />
+        <activity android:name=".feature.scheduled.ScheduledActivity" />
+        <activity android:name=".feature.backup.BackupActivity" />
+        <activity android:name=".feature.contacts.ContactsActivity" />
+
+        <receiver android:name=".receiver.BootReceiver">
+            <intent-filter>
+                <action android:name="android.intent.action.BOOT_COMPLETED" />
+            </intent-filter>
+        </receiver>
+        <receiver android:name=".receiver.DefaultSmsChangedReceiver">
+            <intent-filter>
+                <action android:name="android.provider.action.DEFAULT_SMS_PACKAGE_CHANGED" />
+            </intent-filter>
+        </receiver>
+        <receiver android:name=".receiver.DeleteMessagesReceiver" />
+        <receiver
+            android:name=".receiver.SmsReceiver"
+            android:permission="android.permission.BROADCAST_SMS">
+            <intent-filter>
+                <action android:name="android.provider.Telephony.SMS_DELIVER" />
+            </intent-filter>
+        </receiver>
+        <receiver
+            android:name=".receiver.MmsReceiver"
+            android:permission="android.permission.BROADCAST_WAP_PUSH">
+            <intent-filter>
+                <action android:name="android.provider.Telephony.WAP_PUSH_DELIVER" />
+                <data android:mimeType="application/vnd.wap.mms-message" />
+            </intent-filter>
+        </receiver>
+        <receiver android:name=".receiver.SmsSentReceiver" />
+        <receiver android:name=".receiver.SmsDeliveredReceiver" />
+        <receiver
+            android:name=".receiver.MmsSentReceiver"
+            android:taskAffinity="com.moez.QKSMS.MMS_SENT" />
+        <receiver
+            android:name=".receiver.MmsUpdatedReceiver"
+            android:taskAffinity="com.moez.QKSMS.MMS_UPDATED" />
+        <receiver
+            android:name=".receiver.MmsReceivedReceiver"
+            android:taskAffinity="com.klinker.android.messaging.MMS_RECEIVED" />
+        <receiver android:name=".receiver.MarkArchivedReceiver" />
+        <receiver android:name=".receiver.BlockThreadReceiver" />
+        <receiver android:name=".receiver.MarkSeenReceiver" />
+        <receiver android:name=".receiver.MarkReadReceiver" />
+        <receiver android:name=".receiver.RemoteMessagingReceiver" />
+        <receiver android:name=".receiver.NightModeReceiver" />
+        <receiver android:name=".receiver.SmsProviderChangedReceiver">
+            <intent-filter>
+                <action android:name="android.provider.action.EXTERNAL_PROVIDER_CHANGE" />
+            </intent-filter>
+        </receiver>
+        <receiver android:name=".receiver.SendScheduledMessageReceiver" />
+        <receiver android:name=".feature.widget.WidgetProvider">
+            <intent-filter>
+                <action android:name="android.appwidget.action.APPWIDGET_UPDATE" />
+                <action android:name="com.moez.QKSMS.intent.action.ACTION_NOTIFY_DATASET_CHANGED" />
+            </intent-filter>
+
+            <meta-data
+                android:name="android.appwidget.provider"
+                android:resource="@xml/widget_info" />
+        </receiver>
+        <receiver android:name=".receiver.SendSmsReceiver" />
+
+        <service android:name="com.android.mms.transaction.TransactionService" />
+        <service android:name=".feature.backup.RestoreBackupService" />
+        <service
+            android:name=".feature.widget.WidgetService"
+            android:permission="android.permission.BIND_REMOTEVIEWS" />
+        <service
+            android:name=".service.AutoDeleteService"
+            android:permission="android.permission.BIND_JOB_SERVICE" />
+        <service
+            android:name=".service.HeadlessSmsSendService"
+            android:exported="true"
+            android:permission="android.permission.SEND_RESPOND_VIA_MESSAGE">
+            <intent-filter>
+                <action android:name="android.intent.action.RESPOND_VIA_MESSAGE" />
+                <category android:name="android.intent.category.DEFAULT" />
+
+                <data android:scheme="sms" />
+                <data android:scheme="smsto" />
+                <data android:scheme="mms" />
+                <data android:scheme="mmsto" />
+            </intent-filter>
+        </service>
+        <service
+            android:name=".common.util.QkChooserTargetService"
+            android:label="@string/app_name"
+            android:permission="android.permission.BIND_CHOOSER_TARGET_SERVICE">
+            <intent-filter>
+                <action android:name="android.service.chooser.ChooserTargetService" />
+            </intent-filter>
+        </service>
+
+        <meta-data
+            android:name="com.callcontrol.datashare.messaging"
+            android:value="true" />
+        <meta-data
+            android:name="preloaded_fonts"
+            android:resource="@array/preloaded_fonts" />
+
+        <provider
+            android:name="androidx.core.content.FileProvider"
+            android:authorities="${applicationId}.fileprovider"
+            android:exported="false"
+            android:grantUriPermissions="true">
+            <meta-data
+                android:name="android.support.FILE_PROVIDER_PATHS"
+                android:resource="@xml/provider_paths" />
+        </provider>
+
+    </application>
+
 </manifest>
\ No newline at end of file
diff --git a/presentation/src/main/java/com/moez/QKSMS/common/GlideCompletionListener.kt b/presentation/src/main/java/com/moez/QKSMS/common/GlideCompletionListener.kt
index f106b539e..ac03ae126 100644
--- a/presentation/src/main/java/com/moez/QKSMS/common/GlideCompletionListener.kt
+++ b/presentation/src/main/java/com/moez/QKSMS/common/GlideCompletionListener.kt
@@ -1,38 +1,38 @@
-/*
- * Copyright (C) 2017 Moez Bhatti <moez.bhatti@gmail.com>
- *
- * This file is part of QKSMS.
- *
- * QKSMS is free software: you can redistribute it and/or modify
- * it under the terms of the GNU General Public License as published by
- * the Free Software Foundation, either version 3 of the License, or
- * (at your option) any later version.
- *
- * QKSMS is distributed in the hope that it will be useful,
- * but WITHOUT ANY WARRANTY; without even the implied warranty of
- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
- * GNU General Public License for more details.
- *
- * You should have received a copy of the GNU General Public License
- * along with QKSMS.  If not, see <http://www.gnu.org/licenses/>.
- */
-package com.moez.QKSMS.common
-
-import com.bumptech.glide.load.DataSource
-import com.bumptech.glide.load.engine.GlideException
-import com.bumptech.glide.request.RequestListener
-import com.bumptech.glide.request.target.Target
-
-class GlideCompletionListener<T>(private val listener: () -> Unit) : RequestListener<T> {
-
-    override fun onLoadFailed(e: GlideException?, model: Any?, target: Target<T>?, isFirstResource: Boolean): Boolean {
-        listener()
-        return false
-    }
-
-    override fun onResourceReady(resource: T, model: Any?, target: Target<T>?, dataSource: DataSource?, isFirstResource: Boolean): Boolean {
-        listener()
-        return false
-    }
-
+/*
+ * Copyright (C) 2017 Moez Bhatti <moez.bhatti@gmail.com>
+ *
+ * This file is part of QKSMS.
+ *
+ * QKSMS is free software: you can redistribute it and/or modify
+ * it under the terms of the GNU General Public License as published by
+ * the Free Software Foundation, either version 3 of the License, or
+ * (at your option) any later version.
+ *
+ * QKSMS is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+ * GNU General Public License for more details.
+ *
+ * You should have received a copy of the GNU General Public License
+ * along with QKSMS.  If not, see <http://www.gnu.org/licenses/>.
+ */
+package com.moez.QKSMS.common
+
+import com.bumptech.glide.load.DataSource
+import com.bumptech.glide.load.engine.GlideException
+import com.bumptech.glide.request.RequestListener
+import com.bumptech.glide.request.target.Target
+
+class GlideCompletionListener<T>(private val listener: () -> Unit) : RequestListener<T> {
+
+    override fun onLoadFailed(e: GlideException?, model: Any?, target: Target<T>?, isFirstResource: Boolean): Boolean {
+        listener()
+        return false
+    }
+
+    override fun onResourceReady(resource: T, model: Any?, target: Target<T>?, dataSource: DataSource?, isFirstResource: Boolean): Boolean {
+        listener()
+        return false
+    }
+
 }
\ No newline at end of file
diff --git a/presentation/src/main/java/com/moez/QKSMS/common/MenuItemAdapter.kt b/presentation/src/main/java/com/moez/QKSMS/common/MenuItemAdapter.kt
index 656305482..a8a1bce1e 100644
--- a/presentation/src/main/java/com/moez/QKSMS/common/MenuItemAdapter.kt
+++ b/presentation/src/main/java/com/moez/QKSMS/common/MenuItemAdapter.kt
@@ -1,98 +1,98 @@
-/*
- * Copyright (C) 2017 Moez Bhatti <moez.bhatti@gmail.com>
- *
- * This file is part of QKSMS.
- *
- * QKSMS is free software: you can redistribute it and/or modify
- * it under the terms of the GNU General Public License as published by
- * the Free Software Foundation, either version 3 of the License, or
- * (at your option) any later version.
- *
- * QKSMS is distributed in the hope that it will be useful,
- * but WITHOUT ANY WARRANTY; without even the implied warranty of
- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
- * GNU General Public License for more details.
- *
- * You should have received a copy of the GNU General Public License
- * along with QKSMS.  If not, see <http://www.gnu.org/licenses/>.
- */
-package com.moez.QKSMS.common
-
-import android.content.Context
-import android.content.res.ColorStateList
-import android.view.LayoutInflater
-import android.view.ViewGroup
-import androidx.annotation.ArrayRes
-import androidx.recyclerview.widget.RecyclerView
-import com.moez.QKSMS.R
-import com.moez.QKSMS.common.base.QkAdapter
-import com.moez.QKSMS.common.base.QkViewHolder
-import com.moez.QKSMS.common.util.Colors
-import com.moez.QKSMS.common.util.extensions.resolveThemeColor
-import com.moez.QKSMS.common.util.extensions.setVisible
-import io.reactivex.disposables.CompositeDisposable
-import io.reactivex.subjects.PublishSubject
-import io.reactivex.subjects.Subject
-import kotlinx.android.synthetic.main.menu_list_item.*
-import kotlinx.android.synthetic.main.menu_list_item.view.*
-import javax.inject.Inject
-
-data class MenuItem(val title: String, val actionId: Int)
-
-class MenuItemAdapter @Inject constructor(private val context: Context, private val colors: Colors) : QkAdapter<MenuItem>() {
-
-    val menuItemClicks: Subject<Int> = PublishSubject.create()
-
-    private val disposables = CompositeDisposable()
-
-    var selectedItem: Int? = null
-        set(value) {
-            val old = data.map { it.actionId }.indexOfFirst { it == field }
-            val new = data.map { it.actionId }.indexOfFirst { it == value }
-
-            field = value
-
-            old.let { notifyItemChanged(it) }
-            new.let { notifyItemChanged(it) }
-        }
-
-    fun setData(@ArrayRes titles: Int, @ArrayRes values: Int = -1) {
-        val valueInts = if (values != -1) context.resources.getIntArray(values) else null
-
-        data = context.resources.getStringArray(titles)
-                .mapIndexed { index, title -> MenuItem(title, valueInts?.getOrNull(index) ?: index) }
-    }
-
-    override fun onCreateViewHolder(parent: ViewGroup, viewType: Int): QkViewHolder {
-        val layoutInflater = LayoutInflater.from(parent.context)
-        val view = layoutInflater.inflate(R.layout.menu_list_item, parent, false)
-
-        val states = arrayOf(
-                intArrayOf(android.R.attr.state_activated),
-                intArrayOf(-android.R.attr.state_activated))
-
-        val text = parent.context.resolveThemeColor(android.R.attr.textColorTertiary)
-        view.check.imageTintList = ColorStateList(states, intArrayOf(colors.theme().theme, text))
-
-        return QkViewHolder(view).apply {
-            view.setOnClickListener {
-                val menuItem = getItem(adapterPosition)
-                menuItemClicks.onNext(menuItem.actionId)
-            }
-        }
-    }
-
-    override fun onBindViewHolder(holder: QkViewHolder, position: Int) {
-        val menuItem = getItem(position)
-
-        holder.title.text = menuItem.title
-        holder.check.isActivated = (menuItem.actionId == selectedItem)
-        holder.check.setVisible(selectedItem != null)
-    }
-
-    override fun onDetachedFromRecyclerView(recyclerView: RecyclerView) {
-        super.onDetachedFromRecyclerView(recyclerView)
-        disposables.clear()
-    }
-
+/*
+ * Copyright (C) 2017 Moez Bhatti <moez.bhatti@gmail.com>
+ *
+ * This file is part of QKSMS.
+ *
+ * QKSMS is free software: you can redistribute it and/or modify
+ * it under the terms of the GNU General Public License as published by
+ * the Free Software Foundation, either version 3 of the License, or
+ * (at your option) any later version.
+ *
+ * QKSMS is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+ * GNU General Public License for more details.
+ *
+ * You should have received a copy of the GNU General Public License
+ * along with QKSMS.  If not, see <http://www.gnu.org/licenses/>.
+ */
+package com.moez.QKSMS.common
+
+import android.content.Context
+import android.content.res.ColorStateList
+import android.view.LayoutInflater
+import android.view.ViewGroup
+import androidx.annotation.ArrayRes
+import androidx.recyclerview.widget.RecyclerView
+import com.moez.QKSMS.R
+import com.moez.QKSMS.common.base.QkAdapter
+import com.moez.QKSMS.common.base.QkViewHolder
+import com.moez.QKSMS.common.util.Colors
+import com.moez.QKSMS.common.util.extensions.resolveThemeColor
+import com.moez.QKSMS.common.util.extensions.setVisible
+import io.reactivex.disposables.CompositeDisposable
+import io.reactivex.subjects.PublishSubject
+import io.reactivex.subjects.Subject
+import kotlinx.android.synthetic.main.menu_list_item.*
+import kotlinx.android.synthetic.main.menu_list_item.view.*
+import javax.inject.Inject
+
+data class MenuItem(val title: String, val actionId: Int)
+
+class MenuItemAdapter @Inject constructor(private val context: Context, private val colors: Colors) : QkAdapter<MenuItem>() {
+
+    val menuItemClicks: Subject<Int> = PublishSubject.create()
+
+    private val disposables = CompositeDisposable()
+
+    var selectedItem: Int? = null
+        set(value) {
+            val old = data.map { it.actionId }.indexOfFirst { it == field }
+            val new = data.map { it.actionId }.indexOfFirst { it == value }
+
+            field = value
+
+            old.let { notifyItemChanged(it) }
+            new.let { notifyItemChanged(it) }
+        }
+
+    fun setData(@ArrayRes titles: Int, @ArrayRes values: Int = -1) {
+        val valueInts = if (values != -1) context.resources.getIntArray(values) else null
+
+        data = context.resources.getStringArray(titles)
+                .mapIndexed { index, title -> MenuItem(title, valueInts?.getOrNull(index) ?: index) }
+    }
+
+    override fun onCreateViewHolder(parent: ViewGroup, viewType: Int): QkViewHolder {
+        val layoutInflater = LayoutInflater.from(parent.context)
+        val view = layoutInflater.inflate(R.layout.menu_list_item, parent, false)
+
+        val states = arrayOf(
+                intArrayOf(android.R.attr.state_activated),
+                intArrayOf(-android.R.attr.state_activated))
+
+        val text = parent.context.resolveThemeColor(android.R.attr.textColorTertiary)
+        view.check.imageTintList = ColorStateList(states, intArrayOf(colors.theme().theme, text))
+
+        return QkViewHolder(view).apply {
+            view.setOnClickListener {
+                val menuItem = getItem(adapterPosition)
+                menuItemClicks.onNext(menuItem.actionId)
+            }
+        }
+    }
+
+    override fun onBindViewHolder(holder: QkViewHolder, position: Int) {
+        val menuItem = getItem(position)
+
+        holder.title.text = menuItem.title
+        holder.check.isActivated = (menuItem.actionId == selectedItem)
+        holder.check.setVisible(selectedItem != null)
+    }
+
+    override fun onDetachedFromRecyclerView(recyclerView: RecyclerView) {
+        super.onDetachedFromRecyclerView(recyclerView)
+        disposables.clear()
+    }
+
 }
\ No newline at end of file
diff --git a/presentation/src/main/java/com/moez/QKSMS/common/Navigator.kt b/presentation/src/main/java/com/moez/QKSMS/common/Navigator.kt
index 0a7cba9cb..911b74954 100644
--- a/presentation/src/main/java/com/moez/QKSMS/common/Navigator.kt
+++ b/presentation/src/main/java/com/moez/QKSMS/common/Navigator.kt
@@ -1,295 +1,295 @@
-/*
- * Copyright (C) 2017 Moez Bhatti <moez.bhatti@gmail.com>
- *
- * This file is part of QKSMS.
- *
- * QKSMS is free software: you can redistribute it and/or modify
- * it under the terms of the GNU General Public License as published by
- * the Free Software Foundation, either version 3 of the License, or
- * (at your option) any later version.
- *
- * QKSMS is distributed in the hope that it will be useful,
- * but WITHOUT ANY WARRANTY; without even the implied warranty of
- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
- * GNU General Public License for more details.
- *
- * You should have received a copy of the GNU General Public License
- * along with QKSMS.  If not, see <http://www.gnu.org/licenses/>.
- */
-package com.moez.QKSMS.common
-
-import android.app.Activity
-import android.app.role.RoleManager
-import android.content.ActivityNotFoundException
-import android.content.Context
-import android.content.Intent
-import android.net.Uri
-import android.os.Build
-import android.provider.ContactsContract
-import android.provider.Settings
-import android.provider.Telephony
-import android.webkit.MimeTypeMap
-import androidx.core.content.FileProvider
-import com.moez.QKSMS.BuildConfig
-import com.moez.QKSMS.feature.backup.BackupActivity
-import com.moez.QKSMS.feature.blocking.BlockingActivity
-import com.moez.QKSMS.feature.compose.ComposeActivity
-import com.moez.QKSMS.feature.conversationinfo.ConversationInfoActivity
-import com.moez.QKSMS.feature.gallery.GalleryActivity
-import com.moez.QKSMS.feature.notificationprefs.NotificationPrefsActivity
-import com.moez.QKSMS.feature.plus.PlusActivity
-import com.moez.QKSMS.feature.scheduled.ScheduledActivity
-import com.moez.QKSMS.feature.settings.SettingsActivity
-import com.moez.QKSMS.manager.AnalyticsManager
-import com.moez.QKSMS.manager.BillingManager
-import com.moez.QKSMS.manager.NotificationManager
-import com.moez.QKSMS.manager.PermissionManager
-import java.io.File
-import javax.inject.Inject
-import javax.inject.Singleton
-
-@Singleton
-class Navigator @Inject constructor(
-    private val context: Context,
-    private val analyticsManager: AnalyticsManager,
-    private val billingManager: BillingManager,
-    private val notificationManager: NotificationManager,
-    private val permissions: PermissionManager
-) {
-
-    private fun startActivity(intent: Intent) {
-        intent.addFlags(Intent.FLAG_ACTIVITY_NEW_TASK)
-        context.startActivity(intent)
-    }
-
-    private fun startActivityExternal(intent: Intent) {
-        if (intent.resolveActivity(context.packageManager) != null) {
-            startActivity(intent)
-        } else {
-            startActivity(Intent.createChooser(intent, null))
-        }
-    }
-
-    /**
-     * @param source String to indicate where this QKSMS+ screen was launched from. This should be
-     * one of [main_menu, compose_schedule, settings_night, settings_theme]
-     */
-    fun showQksmsPlusActivity(source: String) {
-        analyticsManager.track("Viewed QKSMS+", Pair("source", source))
-        val intent = Intent(context, PlusActivity::class.java)
-        startActivity(intent)
-    }
-
-    /**
-     * This won't work unless we use startActivityForResult
-     */
-    fun showDefaultSmsDialog(context: Activity) {
-        if (Build.VERSION.SDK_INT >= Build.VERSION_CODES.Q) {
-            val roleManager = context.getSystemService(RoleManager::class.java) as RoleManager
-            val intent = roleManager.createRequestRoleIntent(RoleManager.ROLE_SMS)
-            context.startActivityForResult(intent, 42389)
-        } else {
-            val intent = Intent(Telephony.Sms.Intents.ACTION_CHANGE_DEFAULT)
-            intent.putExtra(Telephony.Sms.Intents.EXTRA_PACKAGE_NAME, context.packageName)
-            context.startActivity(intent)
-        }
-    }
-
-    fun showCompose(body: String? = null, images: List<Uri>? = null) {
-        val intent = Intent(context, ComposeActivity::class.java)
-        intent.putExtra(Intent.EXTRA_TEXT, body)
-
-        images?.takeIf { it.isNotEmpty() }?.let {
-            intent.putParcelableArrayListExtra(Intent.EXTRA_STREAM, ArrayList(images))
-        }
-
-        startActivity(intent)
-    }
-
-    fun showConversation(threadId: Long, query: String? = null) {
-        val intent = Intent(context, ComposeActivity::class.java)
-                .putExtra("threadId", threadId)
-                .putExtra("query", query)
-        startActivity(intent)
-    }
-
-    fun showConversationInfo(threadId: Long) {
-        val intent = Intent(context, ConversationInfoActivity::class.java)
-        intent.putExtra("threadId", threadId)
-        startActivity(intent)
-    }
-
-    fun showMedia(partId: Long) {
-        val intent = Intent(context, GalleryActivity::class.java)
-        intent.putExtra("partId", partId)
-        startActivity(intent)
-    }
-
-    fun showBackup() {
-        analyticsManager.track("Viewed Backup")
-        startActivity(Intent(context, BackupActivity::class.java))
-    }
-
-    fun showScheduled() {
-        analyticsManager.track("Viewed Scheduled")
-        val intent = Intent(context, ScheduledActivity::class.java)
-        startActivity(intent)
-    }
-
-    fun showSettings() {
-        val intent = Intent(context, SettingsActivity::class.java)
-        startActivity(intent)
-    }
-
-    fun showDeveloper() {
-        val intent = Intent(Intent.ACTION_VIEW, Uri.parse("https://github.com/moezbhatti"))
-        startActivityExternal(intent)
-    }
-
-    fun showSourceCode() {
-        val intent = Intent(Intent.ACTION_VIEW, Uri.parse("https://github.com/moezbhatti/qksms"))
-        startActivityExternal(intent)
-    }
-
-    fun showChangelog() {
-        val intent = Intent(Intent.ACTION_VIEW, Uri.parse("https://github.com/moezbhatti/qksms/releases"))
-        startActivityExternal(intent)
-    }
-
-    fun showLicense() {
-        val intent = Intent(Intent.ACTION_VIEW, Uri.parse("https://github.com/moezbhatti/qksms/blob/master/LICENSE"))
-        startActivityExternal(intent)
-    }
-
-    fun showBlockedConversations() {
-        val intent = Intent(context, BlockingActivity::class.java)
-        startActivity(intent)
-    }
-
-    fun makePhoneCall(address: String) {
-        val action = if (permissions.hasCalling()) Intent.ACTION_CALL else Intent.ACTION_DIAL
-        val intent = Intent(action, Uri.parse("tel:$address"))
-        startActivityExternal(intent)
-    }
-
-    fun showDonation() {
-        val intent = Intent(Intent.ACTION_VIEW, Uri.parse("https://bit.ly/QKSMSDonation"))
-        startActivityExternal(intent)
-    }
-
-    fun showRating() {
-        val intent = Intent(Intent.ACTION_VIEW, Uri.parse("market://details?id=com.moez.QKSMS"))
-                .addFlags(Intent.FLAG_ACTIVITY_NO_HISTORY
-                        or Intent.FLAG_ACTIVITY_NEW_DOCUMENT
-                        or Intent.FLAG_ACTIVITY_MULTIPLE_TASK)
-
-        try {
-            startActivityExternal(intent)
-        } catch (e: ActivityNotFoundException) {
-            val url = "http://play.google.com/store/apps/details?id=com.moez.QKSMS"
-            startActivityExternal(Intent(Intent.ACTION_VIEW, Uri.parse(url)))
-        }
-    }
-
-    /**
-     * Launch the Play Store and display the Call Control listing
-     */
-    fun installCallControl() {
-        val url = "https://play.google.com/store/apps/details?id=com.flexaspect.android.everycallcontrol"
-        val intent = Intent(Intent.ACTION_VIEW, Uri.parse(url))
-        startActivityExternal(intent)
-    }
-
-    /**
-     * Launch the Play Store and display the Should I Answer? listing
-     */
-    fun installSia() {
-        val url = "https://play.google.com/store/apps/details?id=org.mistergroup.shouldianswer"
-        val intent = Intent(Intent.ACTION_VIEW, Uri.parse(url))
-        startActivityExternal(intent)
-    }
-
-    fun showSupport() {
-        val intent = Intent(Intent.ACTION_SENDTO)
-        intent.data = Uri.parse("mailto:")
-        intent.putExtra(Intent.EXTRA_EMAIL, arrayOf("moez@qklabs.com"))
-        intent.putExtra(Intent.EXTRA_SUBJECT, "QKSMS Support")
-        intent.putExtra(Intent.EXTRA_TEXT, StringBuilder("\n\n")
-                .append("\n\n--- Please write your message above this line ---\n\n")
-                .append("Package: ${context.packageName}\n")
-                .append("Version: ${BuildConfig.VERSION_NAME}\n")
-                .append("Device: ${Build.BRAND} ${Build.MODEL}\n")
-                .append("SDK: ${Build.VERSION.SDK_INT}\n")
-                .append("Upgraded"
-                        .takeIf { BuildConfig.FLAVOR != "noAnalytics" }
-                        .takeIf { billingManager.upgradeStatus.blockingFirst() } ?: "")
-                .toString())
-        startActivityExternal(intent)
-    }
-
-    fun showInvite() {
-        analyticsManager.track("Clicked Invite")
-        Intent(Intent.ACTION_SEND)
-                .setType("text/plain")
-                .putExtra(Intent.EXTRA_TEXT, "http://qklabs.com/download")
-                .let { Intent.createChooser(it, null) }
-                .let(::startActivityExternal)
-    }
-
-    fun addContact(address: String) {
-        val intent = Intent(Intent.ACTION_INSERT)
-                .setType(ContactsContract.Contacts.CONTENT_TYPE)
-                .putExtra(ContactsContract.Intents.Insert.PHONE, address)
-
-        startActivityExternal(intent)
-    }
-
-    fun showContact(lookupKey: String) {
-        val intent = Intent(Intent.ACTION_VIEW)
-                .setData(Uri.withAppendedPath(ContactsContract.Contacts.CONTENT_LOOKUP_URI, lookupKey))
-
-        startActivityExternal(intent)
-    }
-
-    fun viewFile(file: File) {
-        val data = FileProvider.getUriForFile(context, "${context.packageName}.fileprovider", file)
-        val type = MimeTypeMap.getSingleton().getMimeTypeFromExtension(file.name.split(".").last())
-        val intent = Intent(Intent.ACTION_VIEW)
-                .setDataAndType(data, type)
-                .addFlags(Intent.FLAG_GRANT_READ_URI_PERMISSION)
-
-        startActivityExternal(intent)
-    }
-
-    fun shareFile(file: File) {
-        val data = FileProvider.getUriForFile(context, "${context.packageName}.fileprovider", file)
-        val type = MimeTypeMap.getSingleton().getMimeTypeFromExtension(file.name.split(".").last())
-        val intent = Intent(Intent.ACTION_SEND)
-                .setType(type)
-                .putExtra(Intent.EXTRA_STREAM, data)
-                .addFlags(Intent.FLAG_GRANT_READ_URI_PERMISSION)
-
-        startActivityExternal(intent)
-    }
-
-    fun showNotificationSettings(threadId: Long = 0) {
-        val intent = Intent(context, NotificationPrefsActivity::class.java)
-        intent.putExtra("threadId", threadId)
-        startActivity(intent)
-    }
-
-    fun showNotificationChannel(threadId: Long = 0) {
-        if (Build.VERSION.SDK_INT >= Build.VERSION_CODES.O) {
-            if (threadId != 0L) {
-                notificationManager.createNotificationChannel(threadId)
-            }
-
-            val channelId = notificationManager.buildNotificationChannelId(threadId)
-            val intent = Intent(Settings.ACTION_CHANNEL_NOTIFICATION_SETTINGS)
-                    .putExtra(Settings.EXTRA_CHANNEL_ID, channelId)
-                    .putExtra(Settings.EXTRA_APP_PACKAGE, context.packageName)
-            startActivity(intent)
-        }
-    }
-
-}
+/*
+ * Copyright (C) 2017 Moez Bhatti <moez.bhatti@gmail.com>
+ *
+ * This file is part of QKSMS.
+ *
+ * QKSMS is free software: you can redistribute it and/or modify
+ * it under the terms of the GNU General Public License as published by
+ * the Free Software Foundation, either version 3 of the License, or
+ * (at your option) any later version.
+ *
+ * QKSMS is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+ * GNU General Public License for more details.
+ *
+ * You should have received a copy of the GNU General Public License
+ * along with QKSMS.  If not, see <http://www.gnu.org/licenses/>.
+ */
+package com.moez.QKSMS.common
+
+import android.app.Activity
+import android.app.role.RoleManager
+import android.content.ActivityNotFoundException
+import android.content.Context
+import android.content.Intent
+import android.net.Uri
+import android.os.Build
+import android.provider.ContactsContract
+import android.provider.Settings
+import android.provider.Telephony
+import android.webkit.MimeTypeMap
+import androidx.core.content.FileProvider
+import com.moez.QKSMS.BuildConfig
+import com.moez.QKSMS.feature.backup.BackupActivity
+import com.moez.QKSMS.feature.blocking.BlockingActivity
+import com.moez.QKSMS.feature.compose.ComposeActivity
+import com.moez.QKSMS.feature.conversationinfo.ConversationInfoActivity
+import com.moez.QKSMS.feature.gallery.GalleryActivity
+import com.moez.QKSMS.feature.notificationprefs.NotificationPrefsActivity
+import com.moez.QKSMS.feature.plus.PlusActivity
+import com.moez.QKSMS.feature.scheduled.ScheduledActivity
+import com.moez.QKSMS.feature.settings.SettingsActivity
+import com.moez.QKSMS.manager.AnalyticsManager
+import com.moez.QKSMS.manager.BillingManager
+import com.moez.QKSMS.manager.NotificationManager
+import com.moez.QKSMS.manager.PermissionManager
+import java.io.File
+import javax.inject.Inject
+import javax.inject.Singleton
+
+@Singleton
+class Navigator @Inject constructor(
+    private val context: Context,
+    private val analyticsManager: AnalyticsManager,
+    private val billingManager: BillingManager,
+    private val notificationManager: NotificationManager,
+    private val permissions: PermissionManager
+) {
+
+    private fun startActivity(intent: Intent) {
+        intent.addFlags(Intent.FLAG_ACTIVITY_NEW_TASK)
+        context.startActivity(intent)
+    }
+
+    private fun startActivityExternal(intent: Intent) {
+        if (intent.resolveActivity(context.packageManager) != null) {
+            startActivity(intent)
+        } else {
+            startActivity(Intent.createChooser(intent, null))
+        }
+    }
+
+    /**
+     * @param source String to indicate where this QKSMS+ screen was launched from. This should be
+     * one of [main_menu, compose_schedule, settings_night, settings_theme]
+     */
+    fun showQksmsPlusActivity(source: String) {
+        analyticsManager.track("Viewed QKSMS+", Pair("source", source))
+        val intent = Intent(context, PlusActivity::class.java)
+        startActivity(intent)
+    }
+
+    /**
+     * This won't work unless we use startActivityForResult
+     */
+    fun showDefaultSmsDialog(context: Activity) {
+        if (Build.VERSION.SDK_INT >= Build.VERSION_CODES.Q) {
+            val roleManager = context.getSystemService(RoleManager::class.java) as RoleManager
+            val intent = roleManager.createRequestRoleIntent(RoleManager.ROLE_SMS)
+            context.startActivityForResult(intent, 42389)
+        } else {
+            val intent = Intent(Telephony.Sms.Intents.ACTION_CHANGE_DEFAULT)
+            intent.putExtra(Telephony.Sms.Intents.EXTRA_PACKAGE_NAME, context.packageName)
+            context.startActivity(intent)
+        }
+    }
+
+    fun showCompose(body: String? = null, images: List<Uri>? = null) {
+        val intent = Intent(context, ComposeActivity::class.java)
+        intent.putExtra(Intent.EXTRA_TEXT, body)
+
+        images?.takeIf { it.isNotEmpty() }?.let {
+            intent.putParcelableArrayListExtra(Intent.EXTRA_STREAM, ArrayList(images))
+        }
+
+        startActivity(intent)
+    }
+
+    fun showConversation(threadId: Long, query: String? = null) {
+        val intent = Intent(context, ComposeActivity::class.java)
+                .putExtra("threadId", threadId)
+                .putExtra("query", query)
+        startActivity(intent)
+    }
+
+    fun showConversationInfo(threadId: Long) {
+        val intent = Intent(context, ConversationInfoActivity::class.java)
+        intent.putExtra("threadId", threadId)
+        startActivity(intent)
+    }
+
+    fun showMedia(partId: Long) {
+        val intent = Intent(context, GalleryActivity::class.java)
+        intent.putExtra("partId", partId)
+        startActivity(intent)
+    }
+
+    fun showBackup() {
+        analyticsManager.track("Viewed Backup")
+        startActivity(Intent(context, BackupActivity::class.java))
+    }
+
+    fun showScheduled() {
+        analyticsManager.track("Viewed Scheduled")
+        val intent = Intent(context, ScheduledActivity::class.java)
+        startActivity(intent)
+    }
+
+    fun showSettings() {
+        val intent = Intent(context, SettingsActivity::class.java)
+        startActivity(intent)
+    }
+
+    fun showDeveloper() {
+        val intent = Intent(Intent.ACTION_VIEW, Uri.parse("https://github.com/moezbhatti"))
+        startActivityExternal(intent)
+    }
+
+    fun showSourceCode() {
+        val intent = Intent(Intent.ACTION_VIEW, Uri.parse("https://github.com/moezbhatti/qksms"))
+        startActivityExternal(intent)
+    }
+
+    fun showChangelog() {
+        val intent = Intent(Intent.ACTION_VIEW, Uri.parse("https://github.com/moezbhatti/qksms/releases"))
+        startActivityExternal(intent)
+    }
+
+    fun showLicense() {
+        val intent = Intent(Intent.ACTION_VIEW, Uri.parse("https://github.com/moezbhatti/qksms/blob/master/LICENSE"))
+        startActivityExternal(intent)
+    }
+
+    fun showBlockedConversations() {
+        val intent = Intent(context, BlockingActivity::class.java)
+        startActivity(intent)
+    }
+
+    fun makePhoneCall(address: String) {
+        val action = if (permissions.hasCalling()) Intent.ACTION_CALL else Intent.ACTION_DIAL
+        val intent = Intent(action, Uri.parse("tel:$address"))
+        startActivityExternal(intent)
+    }
+
+    fun showDonation() {
+        val intent = Intent(Intent.ACTION_VIEW, Uri.parse("https://bit.ly/QKSMSDonation"))
+        startActivityExternal(intent)
+    }
+
+    fun showRating() {
+        val intent = Intent(Intent.ACTION_VIEW, Uri.parse("market://details?id=com.moez.QKSMS"))
+                .addFlags(Intent.FLAG_ACTIVITY_NO_HISTORY
+                        or Intent.FLAG_ACTIVITY_NEW_DOCUMENT
+                        or Intent.FLAG_ACTIVITY_MULTIPLE_TASK)
+
+        try {
+            startActivityExternal(intent)
+        } catch (e: ActivityNotFoundException) {
+            val url = "http://play.google.com/store/apps/details?id=com.moez.QKSMS"
+            startActivityExternal(Intent(Intent.ACTION_VIEW, Uri.parse(url)))
+        }
+    }
+
+    /**
+     * Launch the Play Store and display the Call Control listing
+     */
+    fun installCallControl() {
+        val url = "https://play.google.com/store/apps/details?id=com.flexaspect.android.everycallcontrol"
+        val intent = Intent(Intent.ACTION_VIEW, Uri.parse(url))
+        startActivityExternal(intent)
+    }
+
+    /**
+     * Launch the Play Store and display the Should I Answer? listing
+     */
+    fun installSia() {
+        val url = "https://play.google.com/store/apps/details?id=org.mistergroup.shouldianswer"
+        val intent = Intent(Intent.ACTION_VIEW, Uri.parse(url))
+        startActivityExternal(intent)
+    }
+
+    fun showSupport() {
+        val intent = Intent(Intent.ACTION_SENDTO)
+        intent.data = Uri.parse("mailto:")
+        intent.putExtra(Intent.EXTRA_EMAIL, arrayOf("moez@qklabs.com"))
+        intent.putExtra(Intent.EXTRA_SUBJECT, "QKSMS Support")
+        intent.putExtra(Intent.EXTRA_TEXT, StringBuilder("\n\n")
+                .append("\n\n--- Please write your message above this line ---\n\n")
+                .append("Package: ${context.packageName}\n")
+                .append("Version: ${BuildConfig.VERSION_NAME}\n")
+                .append("Device: ${Build.BRAND} ${Build.MODEL}\n")
+                .append("SDK: ${Build.VERSION.SDK_INT}\n")
+                .append("Upgraded"
+                        .takeIf { BuildConfig.FLAVOR != "noAnalytics" }
+                        .takeIf { billingManager.upgradeStatus.blockingFirst() } ?: "")
+                .toString())
+        startActivityExternal(intent)
+    }
+
+    fun showInvite() {
+        analyticsManager.track("Clicked Invite")
+        Intent(Intent.ACTION_SEND)
+                .setType("text/plain")
+                .putExtra(Intent.EXTRA_TEXT, "http://qklabs.com/download")
+                .let { Intent.createChooser(it, null) }
+                .let(::startActivityExternal)
+    }
+
+    fun addContact(address: String) {
+        val intent = Intent(Intent.ACTION_INSERT)
+                .setType(ContactsContract.Contacts.CONTENT_TYPE)
+                .putExtra(ContactsContract.Intents.Insert.PHONE, address)
+
+        startActivityExternal(intent)
+    }
+
+    fun showContact(lookupKey: String) {
+        val intent = Intent(Intent.ACTION_VIEW)
+                .setData(Uri.withAppendedPath(ContactsContract.Contacts.CONTENT_LOOKUP_URI, lookupKey))
+
+        startActivityExternal(intent)
+    }
+
+    fun viewFile(file: File) {
+        val data = FileProvider.getUriForFile(context, "${context.packageName}.fileprovider", file)
+        val type = MimeTypeMap.getSingleton().getMimeTypeFromExtension(file.name.split(".").last())
+        val intent = Intent(Intent.ACTION_VIEW)
+                .setDataAndType(data, type)
+                .addFlags(Intent.FLAG_GRANT_READ_URI_PERMISSION)
+
+        startActivityExternal(intent)
+    }
+
+    fun shareFile(file: File) {
+        val data = FileProvider.getUriForFile(context, "${context.packageName}.fileprovider", file)
+        val type = MimeTypeMap.getSingleton().getMimeTypeFromExtension(file.name.split(".").last())
+        val intent = Intent(Intent.ACTION_SEND)
+                .setType(type)
+                .putExtra(Intent.EXTRA_STREAM, data)
+                .addFlags(Intent.FLAG_GRANT_READ_URI_PERMISSION)
+
+        startActivityExternal(intent)
+    }
+
+    fun showNotificationSettings(threadId: Long = 0) {
+        val intent = Intent(context, NotificationPrefsActivity::class.java)
+        intent.putExtra("threadId", threadId)
+        startActivity(intent)
+    }
+
+    fun showNotificationChannel(threadId: Long = 0) {
+        if (Build.VERSION.SDK_INT >= Build.VERSION_CODES.O) {
+            if (threadId != 0L) {
+                notificationManager.createNotificationChannel(threadId)
+            }
+
+            val channelId = notificationManager.buildNotificationChannelId(threadId)
+            val intent = Intent(Settings.ACTION_CHANNEL_NOTIFICATION_SETTINGS)
+                    .putExtra(Settings.EXTRA_CHANNEL_ID, channelId)
+                    .putExtra(Settings.EXTRA_APP_PACKAGE, context.packageName)
+            startActivity(intent)
+        }
+    }
+
+}
diff --git a/presentation/src/main/java/com/moez/QKSMS/common/QKApplication.kt b/presentation/src/main/java/com/moez/QKSMS/common/QKApplication.kt
index 12ececf6d..1737201b2 100644
--- a/presentation/src/main/java/com/moez/QKSMS/common/QKApplication.kt
+++ b/presentation/src/main/java/com/moez/QKSMS/common/QKApplication.kt
@@ -1,123 +1,123 @@
-/*
- * Copyright (C) 2017 Moez Bhatti <moez.bhatti@gmail.com>
- *
- * This file is part of QKSMS.
- *
- * QKSMS is free software: you can redistribute it and/or modify
- * it under the terms of the GNU General Public License as published by
- * the Free Software Foundation, either version 3 of the License, or
- * (at your option) any later version.
- *
- * QKSMS is distributed in the hope that it will be useful,
- * but WITHOUT ANY WARRANTY; without even the implied warranty of
- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
- * GNU General Public License for more details.
- *
- * You should have received a copy of the GNU General Public License
- * along with QKSMS.  If not, see <http://www.gnu.org/licenses/>.
- */
-package com.moez.QKSMS.common
-
-import android.app.Activity
-import android.app.Application
-import android.app.Service
-import android.content.BroadcastReceiver
-import androidx.core.provider.FontRequest
-import androidx.emoji.text.EmojiCompat
-import androidx.emoji.text.FontRequestEmojiCompatConfig
-import com.moez.QKSMS.R
-import com.moez.QKSMS.common.util.CrashlyticsTree
-import com.moez.QKSMS.common.util.FileLoggingTree
-import com.moez.QKSMS.injection.AppComponentManager
-import com.moez.QKSMS.injection.appComponent
-import com.moez.QKSMS.manager.AnalyticsManager
-import com.moez.QKSMS.manager.BillingManager
-import com.moez.QKSMS.manager.ReferralManager
-import com.moez.QKSMS.migration.QkMigration
-import com.moez.QKSMS.migration.QkRealmMigration
-import com.moez.QKSMS.util.NightModeManager
-import com.uber.rxdogtag.RxDogTag
-import com.uber.rxdogtag.autodispose.AutoDisposeConfigurer
-import dagger.android.AndroidInjector
-import dagger.android.DispatchingAndroidInjector
-import dagger.android.HasActivityInjector
-import dagger.android.HasBroadcastReceiverInjector
-import dagger.android.HasServiceInjector
-import io.realm.Realm
-import io.realm.RealmConfiguration
-import kotlinx.coroutines.Dispatchers
-import kotlinx.coroutines.GlobalScope
-import kotlinx.coroutines.launch
-import timber.log.Timber
-import javax.inject.Inject
-
-class QKApplication : Application(), HasActivityInjector, HasBroadcastReceiverInjector, HasServiceInjector {
-
-    /**
-     * Inject these so that they are forced to initialize
-     */
-    @Suppress("unused")
-    @Inject lateinit var analyticsManager: AnalyticsManager
-    @Suppress("unused")
-    @Inject lateinit var qkMigration: QkMigration
-
-    @Inject lateinit var billingManager: BillingManager
-    @Inject lateinit var dispatchingActivityInjector: DispatchingAndroidInjector<Activity>
-    @Inject lateinit var dispatchingBroadcastReceiverInjector: DispatchingAndroidInjector<BroadcastReceiver>
-    @Inject lateinit var dispatchingServiceInjector: DispatchingAndroidInjector<Service>
-    @Inject lateinit var fileLoggingTree: FileLoggingTree
-    @Inject lateinit var nightModeManager: NightModeManager
-    @Inject lateinit var realmMigration: QkRealmMigration
-    @Inject lateinit var referralManager: ReferralManager
-
-    override fun onCreate() {
-        super.onCreate()
-
-        AppComponentManager.init(this)
-        appComponent.inject(this)
-
-        Realm.init(this)
-        Realm.setDefaultConfiguration(RealmConfiguration.Builder()
-                .compactOnLaunch()
-                .migration(realmMigration)
-                .schemaVersion(QkRealmMigration.SchemaVersion)
-                .build())
-
-        qkMigration.performMigration()
-
-        GlobalScope.launch(Dispatchers.IO) {
-            referralManager.trackReferrer()
-            billingManager.checkForPurchases()
-            billingManager.queryProducts()
-        }
-
-        nightModeManager.updateCurrentTheme()
-
-        val fontRequest = FontRequest(
-                "com.google.android.gms.fonts",
-                "com.google.android.gms",
-                "Noto Color Emoji Compat",
-                R.array.com_google_android_gms_fonts_certs)
-
-        EmojiCompat.init(FontRequestEmojiCompatConfig(this, fontRequest))
-
-        Timber.plant(Timber.DebugTree(), CrashlyticsTree(), fileLoggingTree)
-
-        RxDogTag.builder()
-                .configureWith(AutoDisposeConfigurer::configure)
-                .install()
-    }
-
-    override fun activityInjector(): AndroidInjector<Activity> {
-        return dispatchingActivityInjector
-    }
-
-    override fun broadcastReceiverInjector(): AndroidInjector<BroadcastReceiver> {
-        return dispatchingBroadcastReceiverInjector
-    }
-
-    override fun serviceInjector(): AndroidInjector<Service> {
-        return dispatchingServiceInjector
-    }
-
+/*
+ * Copyright (C) 2017 Moez Bhatti <moez.bhatti@gmail.com>
+ *
+ * This file is part of QKSMS.
+ *
+ * QKSMS is free software: you can redistribute it and/or modify
+ * it under the terms of the GNU General Public License as published by
+ * the Free Software Foundation, either version 3 of the License, or
+ * (at your option) any later version.
+ *
+ * QKSMS is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+ * GNU General Public License for more details.
+ *
+ * You should have received a copy of the GNU General Public License
+ * along with QKSMS.  If not, see <http://www.gnu.org/licenses/>.
+ */
+package com.moez.QKSMS.common
+
+import android.app.Activity
+import android.app.Application
+import android.app.Service
+import android.content.BroadcastReceiver
+import androidx.core.provider.FontRequest
+import androidx.emoji.text.EmojiCompat
+import androidx.emoji.text.FontRequestEmojiCompatConfig
+import com.moez.QKSMS.R
+import com.moez.QKSMS.common.util.CrashlyticsTree
+import com.moez.QKSMS.common.util.FileLoggingTree
+import com.moez.QKSMS.injection.AppComponentManager
+import com.moez.QKSMS.injection.appComponent
+import com.moez.QKSMS.manager.AnalyticsManager
+import com.moez.QKSMS.manager.BillingManager
+import com.moez.QKSMS.manager.ReferralManager
+import com.moez.QKSMS.migration.QkMigration
+import com.moez.QKSMS.migration.QkRealmMigration
+import com.moez.QKSMS.util.NightModeManager
+import com.uber.rxdogtag.RxDogTag
+import com.uber.rxdogtag.autodispose.AutoDisposeConfigurer
+import dagger.android.AndroidInjector
+import dagger.android.DispatchingAndroidInjector
+import dagger.android.HasActivityInjector
+import dagger.android.HasBroadcastReceiverInjector
+import dagger.android.HasServiceInjector
+import io.realm.Realm
+import io.realm.RealmConfiguration
+import kotlinx.coroutines.Dispatchers
+import kotlinx.coroutines.GlobalScope
+import kotlinx.coroutines.launch
+import timber.log.Timber
+import javax.inject.Inject
+
+class QKApplication : Application(), HasActivityInjector, HasBroadcastReceiverInjector, HasServiceInjector {
+
+    /**
+     * Inject these so that they are forced to initialize
+     */
+    @Suppress("unused")
+    @Inject lateinit var analyticsManager: AnalyticsManager
+    @Suppress("unused")
+    @Inject lateinit var qkMigration: QkMigration
+
+    @Inject lateinit var billingManager: BillingManager
+    @Inject lateinit var dispatchingActivityInjector: DispatchingAndroidInjector<Activity>
+    @Inject lateinit var dispatchingBroadcastReceiverInjector: DispatchingAndroidInjector<BroadcastReceiver>
+    @Inject lateinit var dispatchingServiceInjector: DispatchingAndroidInjector<Service>
+    @Inject lateinit var fileLoggingTree: FileLoggingTree
+    @Inject lateinit var nightModeManager: NightModeManager
+    @Inject lateinit var realmMigration: QkRealmMigration
+    @Inject lateinit var referralManager: ReferralManager
+
+    override fun onCreate() {
+        super.onCreate()
+
+        AppComponentManager.init(this)
+        appComponent.inject(this)
+
+        Realm.init(this)
+        Realm.setDefaultConfiguration(RealmConfiguration.Builder()
+                .compactOnLaunch()
+                .migration(realmMigration)
+                .schemaVersion(QkRealmMigration.SchemaVersion)
+                .build())
+
+        qkMigration.performMigration()
+
+        GlobalScope.launch(Dispatchers.IO) {
+            referralManager.trackReferrer()
+            billingManager.checkForPurchases()
+            billingManager.queryProducts()
+        }
+
+        nightModeManager.updateCurrentTheme()
+
+        val fontRequest = FontRequest(
+                "com.google.android.gms.fonts",
+                "com.google.android.gms",
+                "Noto Color Emoji Compat",
+                R.array.com_google_android_gms_fonts_certs)
+
+        EmojiCompat.init(FontRequestEmojiCompatConfig(this, fontRequest))
+
+        Timber.plant(Timber.DebugTree(), CrashlyticsTree(), fileLoggingTree)
+
+        RxDogTag.builder()
+                .configureWith(AutoDisposeConfigurer::configure)
+                .install()
+    }
+
+    override fun activityInjector(): AndroidInjector<Activity> {
+        return dispatchingActivityInjector
+    }
+
+    override fun broadcastReceiverInjector(): AndroidInjector<BroadcastReceiver> {
+        return dispatchingBroadcastReceiverInjector
+    }
+
+    override fun serviceInjector(): AndroidInjector<Service> {
+        return dispatchingServiceInjector
+    }
+
 }
\ No newline at end of file
diff --git a/presentation/src/main/java/com/moez/QKSMS/common/QkChangeHandler.kt b/presentation/src/main/java/com/moez/QKSMS/common/QkChangeHandler.kt
index d18805e1b..4524d888a 100644
--- a/presentation/src/main/java/com/moez/QKSMS/common/QkChangeHandler.kt
+++ b/presentation/src/main/java/com/moez/QKSMS/common/QkChangeHandler.kt
@@ -1,79 +1,79 @@
-/*
- * Copyright (C) 2017 Moez Bhatti <moez.bhatti@gmail.com>
- *
- * This file is part of QKSMS.
- *
- * QKSMS is free software: you can redistribute it and/or modify
- * it under the terms of the GNU General Public License as published by
- * the Free Software Foundation, either version 3 of the License, or
- * (at your option) any later version.
- *
- * QKSMS is distributed in the hope that it will be useful,
- * but WITHOUT ANY WARRANTY; without even the implied warranty of
- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
- * GNU General Public License for more details.
- *
- * You should have received a copy of the GNU General Public License
- * along with QKSMS.  If not, see <http://www.gnu.org/licenses/>.
- */
-package com.moez.QKSMS.common
-
-import android.animation.Animator
-import android.animation.AnimatorSet
-import android.animation.ObjectAnimator
-import android.view.View
-import android.view.ViewGroup
-import android.view.animation.DecelerateInterpolator
-import androidx.annotation.NonNull
-import androidx.annotation.Nullable
-import com.bluelinelabs.conductor.ControllerChangeHandler
-import com.bluelinelabs.conductor.changehandler.AnimatorChangeHandler
-import com.moez.QKSMS.common.util.extensions.dpToPx
-
-class QkChangeHandler : AnimatorChangeHandler(250, true) {
-
-    @NonNull
-    override fun getAnimator(
-        @NonNull container: ViewGroup,
-        @Nullable from: View?,
-        @Nullable to: View?,
-        isPush: Boolean,
-        toAddedToContainer: Boolean
-    ): Animator {
-        val animatorSet = AnimatorSet()
-        animatorSet.interpolator = DecelerateInterpolator()
-
-        if (isPush) {
-            if (from != null) {
-                animatorSet.play(ObjectAnimator.ofFloat(from, View.TRANSLATION_X, -from.width.toFloat() / 4))
-            }
-            if (to != null) {
-                to.translationZ = 8.dpToPx(to.context).toFloat()
-                animatorSet.play(ObjectAnimator.ofFloat(to, View.TRANSLATION_X, to.width.toFloat(), 0f))
-            }
-        } else {
-            if (from != null) {
-                from.translationZ = 8.dpToPx(from.context).toFloat()
-                animatorSet.play(ObjectAnimator.ofFloat(from, View.TRANSLATION_X, from.width.toFloat()))
-            }
-            if (to != null) {
-                // Allow this to have a nice transition when coming off an aborted push animation
-                val fromLeft = from?.translationX ?: 0f
-                animatorSet.play(ObjectAnimator.ofFloat(to, View.TRANSLATION_X, fromLeft - to.width / 4, 0f))
-            }
-        }
-
-        return animatorSet
-    }
-
-    override fun resetFromView(@NonNull from: View) {
-        from.translationX = 0f
-        from.translationZ = 0f
-    }
-
-    @NonNull
-    override fun copy(): ControllerChangeHandler {
-        return QkChangeHandler()
-    }
-
-}
+/*
+ * Copyright (C) 2017 Moez Bhatti <moez.bhatti@gmail.com>
+ *
+ * This file is part of QKSMS.
+ *
+ * QKSMS is free software: you can redistribute it and/or modify
+ * it under the terms of the GNU General Public License as published by
+ * the Free Software Foundation, either version 3 of the License, or
+ * (at your option) any later version.
+ *
+ * QKSMS is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+ * GNU General Public License for more details.
+ *
+ * You should have received a copy of the GNU General Public License
+ * along with QKSMS.  If not, see <http://www.gnu.org/licenses/>.
+ */
+package com.moez.QKSMS.common
+
+import android.animation.Animator
+import android.animation.AnimatorSet
+import android.animation.ObjectAnimator
+import android.view.View
+import android.view.ViewGroup
+import android.view.animation.DecelerateInterpolator
+import androidx.annotation.NonNull
+import androidx.annotation.Nullable
+import com.bluelinelabs.conductor.ControllerChangeHandler
+import com.bluelinelabs.conductor.changehandler.AnimatorChangeHandler
+import com.moez.QKSMS.common.util.extensions.dpToPx
+
+class QkChangeHandler : AnimatorChangeHandler(250, true) {
+
+    @NonNull
+    override fun getAnimator(
+        @NonNull container: ViewGroup,
+        @Nullable from: View?,
+        @Nullable to: View?,
+        isPush: Boolean,
+        toAddedToContainer: Boolean
+    ): Animator {
+        val animatorSet = AnimatorSet()
+        animatorSet.interpolator = DecelerateInterpolator()
+
+        if (isPush) {
+            if (from != null) {
+                animatorSet.play(ObjectAnimator.ofFloat(from, View.TRANSLATION_X, -from.width.toFloat() / 4))
+            }
+            if (to != null) {
+                to.translationZ = 8.dpToPx(to.context).toFloat()
+                animatorSet.play(ObjectAnimator.ofFloat(to, View.TRANSLATION_X, to.width.toFloat(), 0f))
+            }
+        } else {
+            if (from != null) {
+                from.translationZ = 8.dpToPx(from.context).toFloat()
+                animatorSet.play(ObjectAnimator.ofFloat(from, View.TRANSLATION_X, from.width.toFloat()))
+            }
+            if (to != null) {
+                // Allow this to have a nice transition when coming off an aborted push animation
+                val fromLeft = from?.translationX ?: 0f
+                animatorSet.play(ObjectAnimator.ofFloat(to, View.TRANSLATION_X, fromLeft - to.width / 4, 0f))
+            }
+        }
+
+        return animatorSet
+    }
+
+    override fun resetFromView(@NonNull from: View) {
+        from.translationX = 0f
+        from.translationZ = 0f
+    }
+
+    @NonNull
+    override fun copy(): ControllerChangeHandler {
+        return QkChangeHandler()
+    }
+
+}
diff --git a/presentation/src/main/java/com/moez/QKSMS/common/QkDialog.kt b/presentation/src/main/java/com/moez/QKSMS/common/QkDialog.kt
index bba43ab29..1294e9ed1 100644
--- a/presentation/src/main/java/com/moez/QKSMS/common/QkDialog.kt
+++ b/presentation/src/main/java/com/moez/QKSMS/common/QkDialog.kt
@@ -1,68 +1,68 @@
-/*
- * Copyright (C) 2017 Moez Bhatti <moez.bhatti@gmail.com>
- *
- * This file is part of QKSMS.
- *
- * QKSMS is free software: you can redistribute it and/or modify
- * it under the terms of the GNU General Public License as published by
- * the Free Software Foundation, either version 3 of the License, or
- * (at your option) any later version.
- *
- * QKSMS is distributed in the hope that it will be useful,
- * but WITHOUT ANY WARRANTY; without even the implied warranty of
- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
- * GNU General Public License for more details.
- *
- * You should have received a copy of the GNU General Public License
- * along with QKSMS.  If not, see <http://www.gnu.org/licenses/>.
- */
-package com.moez.QKSMS.common
-
-import android.app.Activity
-import android.content.Context
-import androidx.annotation.StringRes
-import androidx.appcompat.app.AlertDialog
-import androidx.recyclerview.widget.LinearLayoutManager
-import androidx.recyclerview.widget.RecyclerView
-import com.moez.QKSMS.common.util.extensions.dpToPx
-import com.moez.QKSMS.common.util.extensions.setPadding
-import com.moez.QKSMS.injection.appComponent
-import javax.inject.Inject
-
-/**
- * Wrapper around AlertDialog which makes it easier to display lists that use our UI
- */
-class QkDialog @Inject constructor(private val context: Context, val adapter: MenuItemAdapter) {
-
-    var title: String? = null
-
-    init {
-        appComponent.inject(this)
-    }
-
-    fun show(activity: Activity) {
-        val recyclerView = RecyclerView(activity)
-        recyclerView.layoutManager = LinearLayoutManager(context)
-        recyclerView.adapter = adapter
-        recyclerView.setPadding(top = 8.dpToPx(context), bottom = 8.dpToPx(context))
-
-        val dialog = AlertDialog.Builder(activity)
-                .setTitle(title)
-                .setView(recyclerView)
-                .create()
-
-        val clicks = adapter.menuItemClicks
-                .subscribe { dialog.dismiss() }
-
-        dialog.setOnDismissListener {
-            clicks.dispose()
-        }
-
-        dialog.show()
-    }
-
-    fun setTitle(@StringRes title: Int) {
-        this.title = context.getString(title)
-    }
-
+/*
+ * Copyright (C) 2017 Moez Bhatti <moez.bhatti@gmail.com>
+ *
+ * This file is part of QKSMS.
+ *
+ * QKSMS is free software: you can redistribute it and/or modify
+ * it under the terms of the GNU General Public License as published by
+ * the Free Software Foundation, either version 3 of the License, or
+ * (at your option) any later version.
+ *
+ * QKSMS is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+ * GNU General Public License for more details.
+ *
+ * You should have received a copy of the GNU General Public License
+ * along with QKSMS.  If not, see <http://www.gnu.org/licenses/>.
+ */
+package com.moez.QKSMS.common
+
+import android.app.Activity
+import android.content.Context
+import androidx.annotation.StringRes
+import androidx.appcompat.app.AlertDialog
+import androidx.recyclerview.widget.LinearLayoutManager
+import androidx.recyclerview.widget.RecyclerView
+import com.moez.QKSMS.common.util.extensions.dpToPx
+import com.moez.QKSMS.common.util.extensions.setPadding
+import com.moez.QKSMS.injection.appComponent
+import javax.inject.Inject
+
+/**
+ * Wrapper around AlertDialog which makes it easier to display lists that use our UI
+ */
+class QkDialog @Inject constructor(private val context: Context, val adapter: MenuItemAdapter) {
+
+    var title: String? = null
+
+    init {
+        appComponent.inject(this)
+    }
+
+    fun show(activity: Activity) {
+        val recyclerView = RecyclerView(activity)
+        recyclerView.layoutManager = LinearLayoutManager(context)
+        recyclerView.adapter = adapter
+        recyclerView.setPadding(top = 8.dpToPx(context), bottom = 8.dpToPx(context))
+
+        val dialog = AlertDialog.Builder(activity)
+                .setTitle(title)
+                .setView(recyclerView)
+                .create()
+
+        val clicks = adapter.menuItemClicks
+                .subscribe { dialog.dismiss() }
+
+        dialog.setOnDismissListener {
+            clicks.dispose()
+        }
+
+        dialog.show()
+    }
+
+    fun setTitle(@StringRes title: Int) {
+        this.title = context.getString(title)
+    }
+
 }
\ No newline at end of file
diff --git a/presentation/src/main/java/com/moez/QKSMS/common/ViewModelFactory.kt b/presentation/src/main/java/com/moez/QKSMS/common/ViewModelFactory.kt
index d6341eb32..8b02468bb 100644
--- a/presentation/src/main/java/com/moez/QKSMS/common/ViewModelFactory.kt
+++ b/presentation/src/main/java/com/moez/QKSMS/common/ViewModelFactory.kt
@@ -1,30 +1,30 @@
-/*
- * Copyright (C) 2017 Moez Bhatti <moez.bhatti@gmail.com>
- *
- * This file is part of QKSMS.
- *
- * QKSMS is free software: you can redistribute it and/or modify
- * it under the terms of the GNU General Public License as published by
- * the Free Software Foundation, either version 3 of the License, or
- * (at your option) any later version.
- *
- * QKSMS is distributed in the hope that it will be useful,
- * but WITHOUT ANY WARRANTY; without even the implied warranty of
- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
- * GNU General Public License for more details.
- *
- * You should have received a copy of the GNU General Public License
- * along with QKSMS.  If not, see <http://www.gnu.org/licenses/>.
- */
-package com.moez.QKSMS.common
-
-import androidx.lifecycle.ViewModel
-import androidx.lifecycle.ViewModelProvider
-import javax.inject.Inject
-import javax.inject.Provider
-
-class ViewModelFactory @Inject constructor(private val viewModels: MutableMap<Class<out ViewModel>, Provider<ViewModel>>) : ViewModelProvider.Factory {
-
-    override fun <T : ViewModel> create(modelClass: Class<T>): T = viewModels[modelClass]?.get() as T
-
+/*
+ * Copyright (C) 2017 Moez Bhatti <moez.bhatti@gmail.com>
+ *
+ * This file is part of QKSMS.
+ *
+ * QKSMS is free software: you can redistribute it and/or modify
+ * it under the terms of the GNU General Public License as published by
+ * the Free Software Foundation, either version 3 of the License, or
+ * (at your option) any later version.
+ *
+ * QKSMS is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+ * GNU General Public License for more details.
+ *
+ * You should have received a copy of the GNU General Public License
+ * along with QKSMS.  If not, see <http://www.gnu.org/licenses/>.
+ */
+package com.moez.QKSMS.common
+
+import androidx.lifecycle.ViewModel
+import androidx.lifecycle.ViewModelProvider
+import javax.inject.Inject
+import javax.inject.Provider
+
+class ViewModelFactory @Inject constructor(private val viewModels: MutableMap<Class<out ViewModel>, Provider<ViewModel>>) : ViewModelProvider.Factory {
+
+    override fun <T : ViewModel> create(modelClass: Class<T>): T = viewModels[modelClass]?.get() as T
+
 }
\ No newline at end of file
diff --git a/presentation/src/main/java/com/moez/QKSMS/common/androidxcompat/DrawerLayoutDrawerOpenedObservable.java b/presentation/src/main/java/com/moez/QKSMS/common/androidxcompat/DrawerLayoutDrawerOpenedObservable.java
index 370fed645..36e431f52 100644
--- a/presentation/src/main/java/com/moez/QKSMS/common/androidxcompat/DrawerLayoutDrawerOpenedObservable.java
+++ b/presentation/src/main/java/com/moez/QKSMS/common/androidxcompat/DrawerLayoutDrawerOpenedObservable.java
@@ -1,92 +1,92 @@
-/*
- * Copyright (C) 2017 Moez Bhatti <moez.bhatti@gmail.com>
- *
- * This file is part of QKSMS.
- *
- * QKSMS is free software: you can redistribute it and/or modify
- * it under the terms of the GNU General Public License as published by
- * the Free Software Foundation, either version 3 of the License, or
- * (at your option) any later version.
- *
- * QKSMS is distributed in the hope that it will be useful,
- * but WITHOUT ANY WARRANTY; without even the implied warranty of
- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
- * GNU General Public License for more details.
- *
- * You should have received a copy of the GNU General Public License
- * along with QKSMS.  If not, see <http://www.gnu.org/licenses/>.
- */
-package com.moez.QKSMS.common.androidxcompat;
-
-import android.view.View;
-import androidx.drawerlayout.widget.DrawerLayout;
-import com.jakewharton.rxbinding2.InitialValueObservable;
-import io.reactivex.Observer;
-import io.reactivex.android.MainThreadDisposable;
-
-import static com.jakewharton.rxbinding2.internal.Preconditions.checkMainThread;
-
-final class DrawerLayoutDrawerOpenedObservable extends InitialValueObservable<Boolean> {
-  private final DrawerLayout view;
-  private final int gravity;
-
-  DrawerLayoutDrawerOpenedObservable(DrawerLayout view, int gravity) {
-    this.view = view;
-    this.gravity = gravity;
-  }
-
-  @Override protected void subscribeListener(Observer<? super Boolean> observer) {
-    if (!checkMainThread(observer)) {
-      return;
-    }
-    Listener listener = new Listener(view, gravity, observer);
-    observer.onSubscribe(listener);
-    view.addDrawerListener(listener);
-  }
-
-  @Override protected Boolean getInitialValue() {
-    return view.isDrawerOpen(gravity);
-  }
-
-  static final class Listener extends MainThreadDisposable implements DrawerLayout.DrawerListener {
-    private final DrawerLayout view;
-    private final int gravity;
-    private final Observer<? super Boolean> observer;
-
-    Listener(DrawerLayout view, int gravity, Observer<? super Boolean> observer) {
-      this.view = view;
-      this.gravity = gravity;
-      this.observer = observer;
-    }
-
-    @Override public void onDrawerSlide(View drawerView, float slideOffset) {
-
-    }
-
-    @Override public void onDrawerOpened(View drawerView) {
-      if (!isDisposed()) {
-        int drawerGravity = ((DrawerLayout.LayoutParams) drawerView.getLayoutParams()).gravity;
-        if (drawerGravity == gravity) {
-          observer.onNext(true);
-        }
-      }
-    }
-
-    @Override public void onDrawerClosed(View drawerView) {
-      if (!isDisposed()) {
-        int drawerGravity = ((DrawerLayout.LayoutParams) drawerView.getLayoutParams()).gravity;
-        if (drawerGravity == gravity) {
-          observer.onNext(false);
-        }
-      }
-    }
-
-    @Override public void onDrawerStateChanged(int newState) {
-
-    }
-
-    @Override protected void onDispose() {
-      view.removeDrawerListener(this);
-    }
-  }
+/*
+ * Copyright (C) 2017 Moez Bhatti <moez.bhatti@gmail.com>
+ *
+ * This file is part of QKSMS.
+ *
+ * QKSMS is free software: you can redistribute it and/or modify
+ * it under the terms of the GNU General Public License as published by
+ * the Free Software Foundation, either version 3 of the License, or
+ * (at your option) any later version.
+ *
+ * QKSMS is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+ * GNU General Public License for more details.
+ *
+ * You should have received a copy of the GNU General Public License
+ * along with QKSMS.  If not, see <http://www.gnu.org/licenses/>.
+ */
+package com.moez.QKSMS.common.androidxcompat;
+
+import android.view.View;
+import androidx.drawerlayout.widget.DrawerLayout;
+import com.jakewharton.rxbinding2.InitialValueObservable;
+import io.reactivex.Observer;
+import io.reactivex.android.MainThreadDisposable;
+
+import static com.jakewharton.rxbinding2.internal.Preconditions.checkMainThread;
+
+final class DrawerLayoutDrawerOpenedObservable extends InitialValueObservable<Boolean> {
+  private final DrawerLayout view;
+  private final int gravity;
+
+  DrawerLayoutDrawerOpenedObservable(DrawerLayout view, int gravity) {
+    this.view = view;
+    this.gravity = gravity;
+  }
+
+  @Override protected void subscribeListener(Observer<? super Boolean> observer) {
+    if (!checkMainThread(observer)) {
+      return;
+    }
+    Listener listener = new Listener(view, gravity, observer);
+    observer.onSubscribe(listener);
+    view.addDrawerListener(listener);
+  }
+
+  @Override protected Boolean getInitialValue() {
+    return view.isDrawerOpen(gravity);
+  }
+
+  static final class Listener extends MainThreadDisposable implements DrawerLayout.DrawerListener {
+    private final DrawerLayout view;
+    private final int gravity;
+    private final Observer<? super Boolean> observer;
+
+    Listener(DrawerLayout view, int gravity, Observer<? super Boolean> observer) {
+      this.view = view;
+      this.gravity = gravity;
+      this.observer = observer;
+    }
+
+    @Override public void onDrawerSlide(View drawerView, float slideOffset) {
+
+    }
+
+    @Override public void onDrawerOpened(View drawerView) {
+      if (!isDisposed()) {
+        int drawerGravity = ((DrawerLayout.LayoutParams) drawerView.getLayoutParams()).gravity;
+        if (drawerGravity == gravity) {
+          observer.onNext(true);
+        }
+      }
+    }
+
+    @Override public void onDrawerClosed(View drawerView) {
+      if (!isDisposed()) {
+        int drawerGravity = ((DrawerLayout.LayoutParams) drawerView.getLayoutParams()).gravity;
+        if (drawerGravity == gravity) {
+          observer.onNext(false);
+        }
+      }
+    }
+
+    @Override public void onDrawerStateChanged(int newState) {
+
+    }
+
+    @Override protected void onDispose() {
+      view.removeDrawerListener(this);
+    }
+  }
 }
\ No newline at end of file
diff --git a/presentation/src/main/java/com/moez/QKSMS/common/androidxcompat/RxDrawerLayout.java b/presentation/src/main/java/com/moez/QKSMS/common/androidxcompat/RxDrawerLayout.java
index 06a9a7e8f..e85a60865 100644
--- a/presentation/src/main/java/com/moez/QKSMS/common/androidxcompat/RxDrawerLayout.java
+++ b/presentation/src/main/java/com/moez/QKSMS/common/androidxcompat/RxDrawerLayout.java
@@ -1,69 +1,69 @@
-/*
- * Copyright (C) 2017 Moez Bhatti <moez.bhatti@gmail.com>
- *
- * This file is part of QKSMS.
- *
- * QKSMS is free software: you can redistribute it and/or modify
- * it under the terms of the GNU General Public License as published by
- * the Free Software Foundation, either version 3 of the License, or
- * (at your option) any later version.
- *
- * QKSMS is distributed in the hope that it will be useful,
- * but WITHOUT ANY WARRANTY; without even the implied warranty of
- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
- * GNU General Public License for more details.
- *
- * You should have received a copy of the GNU General Public License
- * along with QKSMS.  If not, see <http://www.gnu.org/licenses/>.
- */
-package com.moez.QKSMS.common.androidxcompat;
-
-import androidx.annotation.CheckResult;
-import androidx.annotation.NonNull;
-import androidx.drawerlayout.widget.DrawerLayout;
-import com.jakewharton.rxbinding2.InitialValueObservable;
-import io.reactivex.functions.Consumer;
-
-import static com.jakewharton.rxbinding2.internal.Preconditions.checkNotNull;
-
-public final class RxDrawerLayout {
-  /**
-   * Create an observable of the open state of the drawer of {@code view}.
-   * <p>
-   * <em>Warning:</em> The created observable keeps a strong reference to {@code view}. Unsubscribe
-   * to free this reference.
-   * <p>
-   * <em>Note:</em> A value will be emitted immediately on subscribe.
-   */
-  @CheckResult
-  @NonNull
-  public static InitialValueObservable<Boolean> drawerOpen(
-          @NonNull DrawerLayout view, int gravity) {
-    checkNotNull(view, "view == null");
-    return new DrawerLayoutDrawerOpenedObservable(view, gravity);
-  }
-
-  /**
-   * An action which sets whether the drawer with {@code gravity} of {@code view} is open.
-   * <p>
-   * <em>Warning:</em> The created observable keeps a strong reference to {@code view}. Unsubscribe
-   * to free this reference.
-   */
-  @CheckResult @NonNull public static Consumer<? super Boolean> open(
-      @NonNull final DrawerLayout view, final int gravity) {
-    checkNotNull(view, "view == null");
-    return new Consumer<Boolean>() {
-      @Override public void accept(Boolean aBoolean) {
-        if (aBoolean) {
-          view.openDrawer(gravity);
-        } else {
-          view.closeDrawer(gravity);
-        }
-      }
-    };
-  }
-
-  private RxDrawerLayout() {
-    throw new AssertionError("No instances.");
-  }
+/*
+ * Copyright (C) 2017 Moez Bhatti <moez.bhatti@gmail.com>
+ *
+ * This file is part of QKSMS.
+ *
+ * QKSMS is free software: you can redistribute it and/or modify
+ * it under the terms of the GNU General Public License as published by
+ * the Free Software Foundation, either version 3 of the License, or
+ * (at your option) any later version.
+ *
+ * QKSMS is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+ * GNU General Public License for more details.
+ *
+ * You should have received a copy of the GNU General Public License
+ * along with QKSMS.  If not, see <http://www.gnu.org/licenses/>.
+ */
+package com.moez.QKSMS.common.androidxcompat;
+
+import androidx.annotation.CheckResult;
+import androidx.annotation.NonNull;
+import androidx.drawerlayout.widget.DrawerLayout;
+import com.jakewharton.rxbinding2.InitialValueObservable;
+import io.reactivex.functions.Consumer;
+
+import static com.jakewharton.rxbinding2.internal.Preconditions.checkNotNull;
+
+public final class RxDrawerLayout {
+  /**
+   * Create an observable of the open state of the drawer of {@code view}.
+   * <p>
+   * <em>Warning:</em> The created observable keeps a strong reference to {@code view}. Unsubscribe
+   * to free this reference.
+   * <p>
+   * <em>Note:</em> A value will be emitted immediately on subscribe.
+   */
+  @CheckResult
+  @NonNull
+  public static InitialValueObservable<Boolean> drawerOpen(
+          @NonNull DrawerLayout view, int gravity) {
+    checkNotNull(view, "view == null");
+    return new DrawerLayoutDrawerOpenedObservable(view, gravity);
+  }
+
+  /**
+   * An action which sets whether the drawer with {@code gravity} of {@code view} is open.
+   * <p>
+   * <em>Warning:</em> The created observable keeps a strong reference to {@code view}. Unsubscribe
+   * to free this reference.
+   */
+  @CheckResult @NonNull public static Consumer<? super Boolean> open(
+      @NonNull final DrawerLayout view, final int gravity) {
+    checkNotNull(view, "view == null");
+    return new Consumer<Boolean>() {
+      @Override public void accept(Boolean aBoolean) {
+        if (aBoolean) {
+          view.openDrawer(gravity);
+        } else {
+          view.closeDrawer(gravity);
+        }
+      }
+    };
+  }
+
+  private RxDrawerLayout() {
+    throw new AssertionError("No instances.");
+  }
 }
\ No newline at end of file
diff --git a/presentation/src/main/java/com/moez/QKSMS/common/androidxcompat/drawerOpen.kt b/presentation/src/main/java/com/moez/QKSMS/common/androidxcompat/drawerOpen.kt
index 958954406..5fd3d9ef8 100644
--- a/presentation/src/main/java/com/moez/QKSMS/common/androidxcompat/drawerOpen.kt
+++ b/presentation/src/main/java/com/moez/QKSMS/common/androidxcompat/drawerOpen.kt
@@ -1,46 +1,46 @@
-/*
- * Copyright (C) 2017 Moez Bhatti <moez.bhatti@gmail.com>
- *
- * This file is part of QKSMS.
- *
- * QKSMS is free software: you can redistribute it and/or modify
- * it under the terms of the GNU General Public License as published by
- * the Free Software Foundation, either version 3 of the License, or
- * (at your option) any later version.
- *
- * QKSMS is distributed in the hope that it will be useful,
- * but WITHOUT ANY WARRANTY; without even the implied warranty of
- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
- * GNU General Public License for more details.
- *
- * You should have received a copy of the GNU General Public License
- * along with QKSMS.  If not, see <http://www.gnu.org/licenses/>.
- */
-@file:Suppress("NOTHING_TO_INLINE")
-
-package com.moez.QKSMS.common.androidxcompat
-
-import androidx.annotation.CheckResult
-import androidx.drawerlayout.widget.DrawerLayout
-import com.jakewharton.rxbinding2.InitialValueObservable
-import io.reactivex.functions.Consumer
-
-/**
- * Create an observable of the open state of the drawer of `view`.
- *
- * *Warning:* The created observable keeps a strong reference to `view`. Unsubscribe
- * to free this reference.
- *
- * *Note:* A value will be emitted immediately on subscribe.
- */
-@CheckResult
-inline fun DrawerLayout.drawerOpen(gravity: Int): InitialValueObservable<Boolean> = RxDrawerLayout.drawerOpen(this, gravity)
-
-/**
- * An action which sets whether the drawer with `gravity` of `view` is open.
- *
- * *Warning:* The created observable keeps a strong reference to `view`. Unsubscribe
- * to free this reference.
- */
-@CheckResult
+/*
+ * Copyright (C) 2017 Moez Bhatti <moez.bhatti@gmail.com>
+ *
+ * This file is part of QKSMS.
+ *
+ * QKSMS is free software: you can redistribute it and/or modify
+ * it under the terms of the GNU General Public License as published by
+ * the Free Software Foundation, either version 3 of the License, or
+ * (at your option) any later version.
+ *
+ * QKSMS is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+ * GNU General Public License for more details.
+ *
+ * You should have received a copy of the GNU General Public License
+ * along with QKSMS.  If not, see <http://www.gnu.org/licenses/>.
+ */
+@file:Suppress("NOTHING_TO_INLINE")
+
+package com.moez.QKSMS.common.androidxcompat
+
+import androidx.annotation.CheckResult
+import androidx.drawerlayout.widget.DrawerLayout
+import com.jakewharton.rxbinding2.InitialValueObservable
+import io.reactivex.functions.Consumer
+
+/**
+ * Create an observable of the open state of the drawer of `view`.
+ *
+ * *Warning:* The created observable keeps a strong reference to `view`. Unsubscribe
+ * to free this reference.
+ *
+ * *Note:* A value will be emitted immediately on subscribe.
+ */
+@CheckResult
+inline fun DrawerLayout.drawerOpen(gravity: Int): InitialValueObservable<Boolean> = RxDrawerLayout.drawerOpen(this, gravity)
+
+/**
+ * An action which sets whether the drawer with `gravity` of `view` is open.
+ *
+ * *Warning:* The created observable keeps a strong reference to `view`. Unsubscribe
+ * to free this reference.
+ */
+@CheckResult
 inline fun DrawerLayout.open(gravity: Int): Consumer<in Boolean> = RxDrawerLayout.open(this, gravity)
\ No newline at end of file
diff --git a/presentation/src/main/java/com/moez/QKSMS/common/base/FlowableAdapter.kt b/presentation/src/main/java/com/moez/QKSMS/common/base/FlowableAdapter.kt
index 1a71d5163..61eabedde 100644
--- a/presentation/src/main/java/com/moez/QKSMS/common/base/FlowableAdapter.kt
+++ b/presentation/src/main/java/com/moez/QKSMS/common/base/FlowableAdapter.kt
@@ -1,81 +1,81 @@
-/*
- * Copyright (C) 2017 Moez Bhatti <moez.bhatti@gmail.com>
- *
- * This file is part of QKSMS.
- *
- * QKSMS is free software: you can redistribute it and/or modify
- * it under the terms of the GNU General Public License as published by
- * the Free Software Foundation, either version 3 of the License, or
- * (at your option) any later version.
- *
- * QKSMS is distributed in the hope that it will be useful,
- * but WITHOUT ANY WARRANTY; without even the implied warranty of
- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
- * GNU General Public License for more details.
- *
- * You should have received a copy of the GNU General Public License
- * along with QKSMS.  If not, see <http://www.gnu.org/licenses/>.
- */
-package com.moez.QKSMS.common.base
-
-import androidx.annotation.CallSuper
-import androidx.recyclerview.widget.RecyclerView
-import io.reactivex.Flowable
-import io.reactivex.disposables.Disposable
-
-/**
- * Base RecyclerView.Adapter that provides some convenience when creating a new Adapter, such as
- * data list handing and item animations
- */
-abstract class FlowableAdapter<T> : QkAdapter<T>() {
-
-    var flowable: Flowable<List<T>>? = null
-        set(value) {
-            if (field === value) return
-
-            field = value
-
-            // Stop listening for updates on the old flowable
-            dispose()
-
-            // If we're attached to any RecyclerViews, then subscribe to updates
-            if (recyclerViews.isNotEmpty()) {
-                subscribe()
-            }
-        }
-
-    private val recyclerViews = ArrayList<RecyclerView>()
-    private var disposable: Disposable? = null
-
-    @CallSuper
-    override fun onAttachedToRecyclerView(recyclerView: RecyclerView) {
-
-        // If this is the first RecyclerView to be attached, then start listening to updates
-        if (recyclerViews.isEmpty() || disposable == null) {
-            subscribe()
-        }
-
-        recyclerViews.add(recyclerView)
-    }
-
-    @CallSuper
-    override fun onDetachedFromRecyclerView(recyclerView: RecyclerView) {
-        recyclerViews.remove(recyclerView)
-
-        // If no more RecyclerViews are attached, stop listening to updates
-        if (recyclerViews.isEmpty()) {
-            dispose()
-        }
-    }
-
-    private fun subscribe() {
-        disposable = flowable?.subscribe {
-            data = it
-        }
-    }
-
-    private fun dispose() {
-        disposable?.dispose()
-    }
-
+/*
+ * Copyright (C) 2017 Moez Bhatti <moez.bhatti@gmail.com>
+ *
+ * This file is part of QKSMS.
+ *
+ * QKSMS is free software: you can redistribute it and/or modify
+ * it under the terms of the GNU General Public License as published by
+ * the Free Software Foundation, either version 3 of the License, or
+ * (at your option) any later version.
+ *
+ * QKSMS is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+ * GNU General Public License for more details.
+ *
+ * You should have received a copy of the GNU General Public License
+ * along with QKSMS.  If not, see <http://www.gnu.org/licenses/>.
+ */
+package com.moez.QKSMS.common.base
+
+import androidx.annotation.CallSuper
+import androidx.recyclerview.widget.RecyclerView
+import io.reactivex.Flowable
+import io.reactivex.disposables.Disposable
+
+/**
+ * Base RecyclerView.Adapter that provides some convenience when creating a new Adapter, such as
+ * data list handing and item animations
+ */
+abstract class FlowableAdapter<T> : QkAdapter<T>() {
+
+    var flowable: Flowable<List<T>>? = null
+        set(value) {
+            if (field === value) return
+
+            field = value
+
+            // Stop listening for updates on the old flowable
+            dispose()
+
+            // If we're attached to any RecyclerViews, then subscribe to updates
+            if (recyclerViews.isNotEmpty()) {
+                subscribe()
+            }
+        }
+
+    private val recyclerViews = ArrayList<RecyclerView>()
+    private var disposable: Disposable? = null
+
+    @CallSuper
+    override fun onAttachedToRecyclerView(recyclerView: RecyclerView) {
+
+        // If this is the first RecyclerView to be attached, then start listening to updates
+        if (recyclerViews.isEmpty() || disposable == null) {
+            subscribe()
+        }
+
+        recyclerViews.add(recyclerView)
+    }
+
+    @CallSuper
+    override fun onDetachedFromRecyclerView(recyclerView: RecyclerView) {
+        recyclerViews.remove(recyclerView)
+
+        // If no more RecyclerViews are attached, stop listening to updates
+        if (recyclerViews.isEmpty()) {
+            dispose()
+        }
+    }
+
+    private fun subscribe() {
+        disposable = flowable?.subscribe {
+            data = it
+        }
+    }
+
+    private fun dispose() {
+        disposable?.dispose()
+    }
+
 }
\ No newline at end of file
diff --git a/presentation/src/main/java/com/moez/QKSMS/common/base/QkActivity.kt b/presentation/src/main/java/com/moez/QKSMS/common/base/QkActivity.kt
index 379224fd7..19e2f883b 100644
--- a/presentation/src/main/java/com/moez/QKSMS/common/base/QkActivity.kt
+++ b/presentation/src/main/java/com/moez/QKSMS/common/base/QkActivity.kt
@@ -1,77 +1,77 @@
-/*
- * Copyright (C) 2017 Moez Bhatti <moez.bhatti@gmail.com>
- *
- * This file is part of QKSMS.
- *
- * QKSMS is free software: you can redistribute it and/or modify
- * it under the terms of the GNU General Public License as published by
- * the Free Software Foundation, either version 3 of the License, or
- * (at your option) any later version.
- *
- * QKSMS is distributed in the hope that it will be useful,
- * but WITHOUT ANY WARRANTY; without even the implied warranty of
- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
- * GNU General Public License for more details.
- *
- * You should have received a copy of the GNU General Public License
- * along with QKSMS.  If not, see <http://www.gnu.org/licenses/>.
- */
-package com.moez.QKSMS.common.base
-
-import android.annotation.SuppressLint
-import android.os.Bundle
-import android.view.Menu
-import android.view.MenuItem
-import androidx.appcompat.app.AppCompatActivity
-import io.reactivex.subjects.BehaviorSubject
-import io.reactivex.subjects.Subject
-import kotlinx.android.synthetic.main.toolbar.*
-
-abstract class QkActivity : AppCompatActivity() {
-
-    protected val menu: Subject<Menu> = BehaviorSubject.create()
-
-    @SuppressLint("InlinedApi")
-    override fun onCreate(savedInstanceState: Bundle?) {
-        super.onCreate(savedInstanceState)
-        onNewIntent(intent)
-    }
-
-    override fun onOptionsItemSelected(item: MenuItem): Boolean {
-        return when (item.itemId) {
-            android.R.id.home -> {
-                onBackPressed()
-                true
-            }
-            else -> super.onOptionsItemSelected(item)
-        }
-    }
-
-    override fun setContentView(layoutResID: Int) {
-        super.setContentView(layoutResID)
-        setSupportActionBar(toolbar)
-        title = title // The title may have been set before layout inflation
-    }
-
-    override fun setTitle(titleId: Int) {
-        title = getString(titleId)
-    }
-
-    override fun setTitle(title: CharSequence?) {
-        super.setTitle(title)
-        toolbarTitle?.text = title
-    }
-
-    override fun onCreateOptionsMenu(menu: Menu?): Boolean {
-        val result = super.onCreateOptionsMenu(menu)
-        if (menu != null) {
-            this.menu.onNext(menu)
-        }
-        return result
-    }
-
-    protected open fun showBackButton(show: Boolean) {
-        supportActionBar?.setDisplayHomeAsUpEnabled(show)
-    }
-
+/*
+ * Copyright (C) 2017 Moez Bhatti <moez.bhatti@gmail.com>
+ *
+ * This file is part of QKSMS.
+ *
+ * QKSMS is free software: you can redistribute it and/or modify
+ * it under the terms of the GNU General Public License as published by
+ * the Free Software Foundation, either version 3 of the License, or
+ * (at your option) any later version.
+ *
+ * QKSMS is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+ * GNU General Public License for more details.
+ *
+ * You should have received a copy of the GNU General Public License
+ * along with QKSMS.  If not, see <http://www.gnu.org/licenses/>.
+ */
+package com.moez.QKSMS.common.base
+
+import android.annotation.SuppressLint
+import android.os.Bundle
+import android.view.Menu
+import android.view.MenuItem
+import androidx.appcompat.app.AppCompatActivity
+import io.reactivex.subjects.BehaviorSubject
+import io.reactivex.subjects.Subject
+import kotlinx.android.synthetic.main.toolbar.*
+
+abstract class QkActivity : AppCompatActivity() {
+
+    protected val menu: Subject<Menu> = BehaviorSubject.create()
+
+    @SuppressLint("InlinedApi")
+    override fun onCreate(savedInstanceState: Bundle?) {
+        super.onCreate(savedInstanceState)
+        onNewIntent(intent)
+    }
+
+    override fun onOptionsItemSelected(item: MenuItem): Boolean {
+        return when (item.itemId) {
+            android.R.id.home -> {
+                onBackPressed()
+                true
+            }
+            else -> super.onOptionsItemSelected(item)
+        }
+    }
+
+    override fun setContentView(layoutResID: Int) {
+        super.setContentView(layoutResID)
+        setSupportActionBar(toolbar)
+        title = title // The title may have been set before layout inflation
+    }
+
+    override fun setTitle(titleId: Int) {
+        title = getString(titleId)
+    }
+
+    override fun setTitle(title: CharSequence?) {
+        super.setTitle(title)
+        toolbarTitle?.text = title
+    }
+
+    override fun onCreateOptionsMenu(menu: Menu?): Boolean {
+        val result = super.onCreateOptionsMenu(menu)
+        if (menu != null) {
+            this.menu.onNext(menu)
+        }
+        return result
+    }
+
+    protected open fun showBackButton(show: Boolean) {
+        supportActionBar?.setDisplayHomeAsUpEnabled(show)
+    }
+
 }
\ No newline at end of file
diff --git a/presentation/src/main/java/com/moez/QKSMS/common/base/QkAdapter.kt b/presentation/src/main/java/com/moez/QKSMS/common/base/QkAdapter.kt
index 0101f4351..40ff64452 100644
--- a/presentation/src/main/java/com/moez/QKSMS/common/base/QkAdapter.kt
+++ b/presentation/src/main/java/com/moez/QKSMS/common/base/QkAdapter.kt
@@ -1,125 +1,125 @@
-/*
- * Copyright (C) 2017 Moez Bhatti <moez.bhatti@gmail.com>
- *
- * This file is part of QKSMS.
- *
- * QKSMS is free software: you can redistribute it and/or modify
- * it under the terms of the GNU General Public License as published by
- * the Free Software Foundation, either version 3 of the License, or
- * (at your option) any later version.
- *
- * QKSMS is distributed in the hope that it will be useful,
- * but WITHOUT ANY WARRANTY; without even the implied warranty of
- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
- * GNU General Public License for more details.
- *
- * You should have received a copy of the GNU General Public License
- * along with QKSMS.  If not, see <http://www.gnu.org/licenses/>.
- */
-package com.moez.QKSMS.common.base
-
-import android.view.View
-import androidx.core.view.isVisible
-import androidx.recyclerview.widget.DiffUtil
-import androidx.recyclerview.widget.RecyclerView
-import com.moez.QKSMS.common.util.extensions.setVisible
-import io.reactivex.subjects.BehaviorSubject
-import io.reactivex.subjects.Subject
-
-/**
- * Base RecyclerView.Adapter that provides some convenience when creating a new Adapter, such as
- * data list handing and item animations
- */
-abstract class QkAdapter<T> : RecyclerView.Adapter<QkViewHolder>() {
-
-    var data: List<T> = ArrayList()
-        set(value) {
-            if (field === value) return
-
-            val diff = DiffUtil.calculateDiff(getDiffUtilCallback(field, value))
-            field = value
-            diff.dispatchUpdatesTo(this)
-            onDatasetChanged()
-
-            emptyView?.setVisible(value.isEmpty())
-        }
-
-    /**
-     * This view can be set, and the adapter will automatically control the visibility of this view
-     * based on the data
-     */
-    var emptyView: View? = null
-        set(value) {
-            field = value
-            field?.isVisible = data.isEmpty()
-        }
-
-    val selectionChanges: Subject<List<Long>> = BehaviorSubject.create()
-
-    private val selection = mutableListOf<Long>()
-
-    /**
-     * Toggles the selected state for a particular view
-     *
-     * If we are currently in selection mode (we have an active selection), then the state will
-     * toggle. If we are not in selection mode, then we will only toggle if [force]
-     */
-    protected fun toggleSelection(id: Long, force: Boolean = true): Boolean {
-        if (!force && selection.isEmpty()) return false
-
-        when (selection.contains(id)) {
-            true -> selection.remove(id)
-            false -> selection.add(id)
-        }
-
-        selectionChanges.onNext(selection)
-        return true
-    }
-
-    protected fun isSelected(id: Long): Boolean {
-        return selection.contains(id)
-    }
-
-    fun clearSelection() {
-        selection.clear()
-        selectionChanges.onNext(selection)
-        notifyDataSetChanged()
-    }
-
-    fun getItem(position: Int): T {
-        return data[position]
-    }
-
-    override fun getItemCount(): Int {
-        return data.size
-    }
-
-    open fun onDatasetChanged() {}
-
-    /**
-     * Allows the adapter implementation to provide a custom DiffUtil.Callback
-     * If not, then the abstract implementation will be used
-     */
-    private fun getDiffUtilCallback(oldData: List<T>, newData: List<T>): DiffUtil.Callback {
-        return object : DiffUtil.Callback() {
-            override fun areItemsTheSame(oldItemPosition: Int, newItemPosition: Int) =
-                    areItemsTheSame(oldData[oldItemPosition], newData[newItemPosition])
-
-            override fun areContentsTheSame(oldItemPosition: Int, newItemPosition: Int) =
-                    areContentsTheSame(oldData[oldItemPosition], newData[newItemPosition])
-
-            override fun getOldListSize() = oldData.size
-
-            override fun getNewListSize() = newData.size
-        }
-    }
-
-    protected open fun areItemsTheSame(old: T, new: T): Boolean {
-        return old == new
-    }
-
-    protected open fun areContentsTheSame(old: T, new: T): Boolean {
-        return old == new
-    }
-
+/*
+ * Copyright (C) 2017 Moez Bhatti <moez.bhatti@gmail.com>
+ *
+ * This file is part of QKSMS.
+ *
+ * QKSMS is free software: you can redistribute it and/or modify
+ * it under the terms of the GNU General Public License as published by
+ * the Free Software Foundation, either version 3 of the License, or
+ * (at your option) any later version.
+ *
+ * QKSMS is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+ * GNU General Public License for more details.
+ *
+ * You should have received a copy of the GNU General Public License
+ * along with QKSMS.  If not, see <http://www.gnu.org/licenses/>.
+ */
+package com.moez.QKSMS.common.base
+
+import android.view.View
+import androidx.core.view.isVisible
+import androidx.recyclerview.widget.DiffUtil
+import androidx.recyclerview.widget.RecyclerView
+import com.moez.QKSMS.common.util.extensions.setVisible
+import io.reactivex.subjects.BehaviorSubject
+import io.reactivex.subjects.Subject
+
+/**
+ * Base RecyclerView.Adapter that provides some convenience when creating a new Adapter, such as
+ * data list handing and item animations
+ */
+abstract class QkAdapter<T> : RecyclerView.Adapter<QkViewHolder>() {
+
+    var data: List<T> = ArrayList()
+        set(value) {
+            if (field === value) return
+
+            val diff = DiffUtil.calculateDiff(getDiffUtilCallback(field, value))
+            field = value
+            diff.dispatchUpdatesTo(this)
+            onDatasetChanged()
+
+            emptyView?.setVisible(value.isEmpty())
+        }
+
+    /**
+     * This view can be set, and the adapter will automatically control the visibility of this view
+     * based on the data
+     */
+    var emptyView: View? = null
+        set(value) {
+            field = value
+            field?.isVisible = data.isEmpty()
+        }
+
+    val selectionChanges: Subject<List<Long>> = BehaviorSubject.create()
+
+    private val selection = mutableListOf<Long>()
+
+    /**
+     * Toggles the selected state for a particular view
+     *
+     * If we are currently in selection mode (we have an active selection), then the state will
+     * toggle. If we are not in selection mode, then we will only toggle if [force]
+     */
+    protected fun toggleSelection(id: Long, force: Boolean = true): Boolean {
+        if (!force && selection.isEmpty()) return false
+
+        when (selection.contains(id)) {
+            true -> selection.remove(id)
+            false -> selection.add(id)
+        }
+
+        selectionChanges.onNext(selection)
+        return true
+    }
+
+    protected fun isSelected(id: Long): Boolean {
+        return selection.contains(id)
+    }
+
+    fun clearSelection() {
+        selection.clear()
+        selectionChanges.onNext(selection)
+        notifyDataSetChanged()
+    }
+
+    fun getItem(position: Int): T {
+        return data[position]
+    }
+
+    override fun getItemCount(): Int {
+        return data.size
+    }
+
+    open fun onDatasetChanged() {}
+
+    /**
+     * Allows the adapter implementation to provide a custom DiffUtil.Callback
+     * If not, then the abstract implementation will be used
+     */
+    private fun getDiffUtilCallback(oldData: List<T>, newData: List<T>): DiffUtil.Callback {
+        return object : DiffUtil.Callback() {
+            override fun areItemsTheSame(oldItemPosition: Int, newItemPosition: Int) =
+                    areItemsTheSame(oldData[oldItemPosition], newData[newItemPosition])
+
+            override fun areContentsTheSame(oldItemPosition: Int, newItemPosition: Int) =
+                    areContentsTheSame(oldData[oldItemPosition], newData[newItemPosition])
+
+            override fun getOldListSize() = oldData.size
+
+            override fun getNewListSize() = newData.size
+        }
+    }
+
+    protected open fun areItemsTheSame(old: T, new: T): Boolean {
+        return old == new
+    }
+
+    protected open fun areContentsTheSame(old: T, new: T): Boolean {
+        return old == new
+    }
+
 }
\ No newline at end of file
diff --git a/presentation/src/main/java/com/moez/QKSMS/common/base/QkController.kt b/presentation/src/main/java/com/moez/QKSMS/common/base/QkController.kt
index deefa8e21..94928cbed 100644
--- a/presentation/src/main/java/com/moez/QKSMS/common/base/QkController.kt
+++ b/presentation/src/main/java/com/moez/QKSMS/common/base/QkController.kt
@@ -1,80 +1,80 @@
-/*
- * Copyright (C) 2017 Moez Bhatti <moez.bhatti@gmail.com>
- *
- * This file is part of QKSMS.
- *
- * QKSMS is free software: you can redistribute it and/or modify
- * it under the terms of the GNU General Public License as published by
- * the Free Software Foundation, either version 3 of the License, or
- * (at your option) any later version.
- *
- * QKSMS is distributed in the hope that it will be useful,
- * but WITHOUT ANY WARRANTY; without even the implied warranty of
- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
- * GNU General Public License for more details.
- *
- * You should have received a copy of the GNU General Public License
- * along with QKSMS.  If not, see <http://www.gnu.org/licenses/>.
- */
-package com.moez.QKSMS.common.base
-
-import android.view.LayoutInflater
-import android.view.View
-import android.view.ViewGroup
-import androidx.annotation.LayoutRes
-import androidx.annotation.StringRes
-import androidx.appcompat.app.AppCompatActivity
-import com.bluelinelabs.conductor.archlifecycle.LifecycleController
-import kotlinx.android.extensions.LayoutContainer
-import kotlinx.android.synthetic.*
-import kotlinx.android.synthetic.main.toolbar.view.*
-
-abstract class QkController<ViewContract : QkViewContract<State>, State, Presenter : QkPresenter<ViewContract, State>> : LifecycleController(), LayoutContainer {
-
-    abstract var presenter: Presenter
-
-    private val appCompatActivity: AppCompatActivity?
-        get() = activity as? AppCompatActivity
-
-    protected val themedActivity: QkThemedActivity?
-        get() = activity as? QkThemedActivity
-
-    override var containerView: View? = null
-
-    @LayoutRes
-    var layoutRes: Int = 0
-
-    override fun onCreateView(inflater: LayoutInflater, container: ViewGroup): View {
-        return inflater.inflate(layoutRes, container, false).also {
-            containerView = it
-            onViewCreated()
-        }
-    }
-
-    open fun onViewCreated() {
-    }
-
-    fun setTitle(@StringRes titleId: Int) {
-        setTitle(activity?.getString(titleId))
-    }
-
-    fun setTitle(title: CharSequence?) {
-        activity?.title = title
-        view?.toolbarTitle?.text = title
-    }
-
-    fun showBackButton(show: Boolean) {
-        appCompatActivity?.supportActionBar?.setDisplayHomeAsUpEnabled(show)
-    }
-
-    override fun onDestroyView(view: View) {
-        containerView = null
-        clearFindViewByIdCache()
-    }
-
-    override fun onDestroy() {
-        super.onDestroy()
-        presenter.onCleared()
-    }
-
-}
+/*
+ * Copyright (C) 2017 Moez Bhatti <moez.bhatti@gmail.com>
+ *
+ * This file is part of QKSMS.
+ *
+ * QKSMS is free software: you can redistribute it and/or modify
+ * it under the terms of the GNU General Public License as published by
+ * the Free Software Foundation, either version 3 of the License, or
+ * (at your option) any later version.
+ *
+ * QKSMS is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+ * GNU General Public License for more details.
+ *
+ * You should have received a copy of the GNU General Public License
+ * along with QKSMS.  If not, see <http://www.gnu.org/licenses/>.
+ */
+package com.moez.QKSMS.common.base
+
+import android.view.LayoutInflater
+import android.view.View
+import android.view.ViewGroup
+import androidx.annotation.LayoutRes
+import androidx.annotation.StringRes
+import androidx.appcompat.app.AppCompatActivity
+import com.bluelinelabs.conductor.archlifecycle.LifecycleController
+import kotlinx.android.extensions.LayoutContainer
+import kotlinx.android.synthetic.*
+import kotlinx.android.synthetic.main.toolbar.view.*
+
+abstract class QkController<ViewContract : QkViewContract<State>, State, Presenter : QkPresenter<ViewContract, State>> : LifecycleController(), LayoutContainer {
+
+    abstract var presenter: Presenter
+
+    private val appCompatActivity: AppCompatActivity?
+        get() = activity as? AppCompatActivity
+
+    protected val themedActivity: QkThemedActivity?
+        get() = activity as? QkThemedActivity
+
+    override var containerView: View? = null
+
+    @LayoutRes
+    var layoutRes: Int = 0
+
+    override fun onCreateView(inflater: LayoutInflater, container: ViewGroup): View {
+        return inflater.inflate(layoutRes, container, false).also {
+            containerView = it
+            onViewCreated()
+        }
+    }
+
+    open fun onViewCreated() {
+    }
+
+    fun setTitle(@StringRes titleId: Int) {
+        setTitle(activity?.getString(titleId))
+    }
+
+    fun setTitle(title: CharSequence?) {
+        activity?.title = title
+        view?.toolbarTitle?.text = title
+    }
+
+    fun showBackButton(show: Boolean) {
+        appCompatActivity?.supportActionBar?.setDisplayHomeAsUpEnabled(show)
+    }
+
+    override fun onDestroyView(view: View) {
+        containerView = null
+        clearFindViewByIdCache()
+    }
+
+    override fun onDestroy() {
+        super.onDestroy()
+        presenter.onCleared()
+    }
+
+}
diff --git a/presentation/src/main/java/com/moez/QKSMS/common/base/QkPresenter.kt b/presentation/src/main/java/com/moez/QKSMS/common/base/QkPresenter.kt
index 6955a0dd5..27ea4a5c4 100644
--- a/presentation/src/main/java/com/moez/QKSMS/common/base/QkPresenter.kt
+++ b/presentation/src/main/java/com/moez/QKSMS/common/base/QkPresenter.kt
@@ -1,59 +1,59 @@
-/*
- * Copyright (C) 2017 Moez Bhatti <moez.bhatti@gmail.com>
- *
- * This file is part of QKSMS.
- *
- * QKSMS is free software: you can redistribute it and/or modify
- * it under the terms of the GNU General Public License as published by
- * the Free Software Foundation, either version 3 of the License, or
- * (at your option) any later version.
- *
- * QKSMS is distributed in the hope that it will be useful,
- * but WITHOUT ANY WARRANTY; without even the implied warranty of
- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
- * GNU General Public License for more details.
- *
- * You should have received a copy of the GNU General Public License
- * along with QKSMS.  If not, see <http://www.gnu.org/licenses/>.
- */
-package com.moez.QKSMS.common.base
-
-import androidx.annotation.CallSuper
-import com.uber.autodispose.android.lifecycle.scope
-import com.uber.autodispose.autoDisposable
-import io.reactivex.android.schedulers.AndroidSchedulers
-import io.reactivex.disposables.CompositeDisposable
-import io.reactivex.rxkotlin.plusAssign
-import io.reactivex.subjects.BehaviorSubject
-import io.reactivex.subjects.PublishSubject
-import io.reactivex.subjects.Subject
-
-abstract class QkPresenter<View : QkViewContract<State>, State>(initialState: State) {
-
-    protected val disposables = CompositeDisposable()
-    protected val state: Subject<State> = BehaviorSubject.createDefault(initialState)
-
-    private val stateReducer: Subject<State.() -> State> = PublishSubject.create()
-
-    init {
-        // If we accidentally push a realm object into the state on the wrong thread, switching
-        // to mainThread right here should immediately alert us of the issue
-        disposables += stateReducer
-                .observeOn(AndroidSchedulers.mainThread())
-                .scan(initialState) { state, reducer -> reducer(state) }
-                .subscribe(state::onNext)
-    }
-
-    @CallSuper
-    open fun bindIntents(view: View) {
-        state
-                .observeOn(AndroidSchedulers.mainThread())
-                .autoDisposable(view.scope())
-                .subscribe(view::render)
-    }
-
-    protected fun newState(reducer: State.() -> State) = stateReducer.onNext(reducer)
-
-    open fun onCleared() = disposables.dispose()
-
-}
+/*
+ * Copyright (C) 2017 Moez Bhatti <moez.bhatti@gmail.com>
+ *
+ * This file is part of QKSMS.
+ *
+ * QKSMS is free software: you can redistribute it and/or modify
+ * it under the terms of the GNU General Public License as published by
+ * the Free Software Foundation, either version 3 of the License, or
+ * (at your option) any later version.
+ *
+ * QKSMS is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+ * GNU General Public License for more details.
+ *
+ * You should have received a copy of the GNU General Public License
+ * along with QKSMS.  If not, see <http://www.gnu.org/licenses/>.
+ */
+package com.moez.QKSMS.common.base
+
+import androidx.annotation.CallSuper
+import com.uber.autodispose.android.lifecycle.scope
+import com.uber.autodispose.autoDisposable
+import io.reactivex.android.schedulers.AndroidSchedulers
+import io.reactivex.disposables.CompositeDisposable
+import io.reactivex.rxkotlin.plusAssign
+import io.reactivex.subjects.BehaviorSubject
+import io.reactivex.subjects.PublishSubject
+import io.reactivex.subjects.Subject
+
+abstract class QkPresenter<View : QkViewContract<State>, State>(initialState: State) {
+
+    protected val disposables = CompositeDisposable()
+    protected val state: Subject<State> = BehaviorSubject.createDefault(initialState)
+
+    private val stateReducer: Subject<State.() -> State> = PublishSubject.create()
+
+    init {
+        // If we accidentally push a realm object into the state on the wrong thread, switching
+        // to mainThread right here should immediately alert us of the issue
+        disposables += stateReducer
+                .observeOn(AndroidSchedulers.mainThread())
+                .scan(initialState) { state, reducer -> reducer(state) }
+                .subscribe(state::onNext)
+    }
+
+    @CallSuper
+    open fun bindIntents(view: View) {
+        state
+                .observeOn(AndroidSchedulers.mainThread())
+                .autoDisposable(view.scope())
+                .subscribe(view::render)
+    }
+
+    protected fun newState(reducer: State.() -> State) = stateReducer.onNext(reducer)
+
+    open fun onCleared() = disposables.dispose()
+
+}
diff --git a/presentation/src/main/java/com/moez/QKSMS/common/base/QkRealmAdapter.kt b/presentation/src/main/java/com/moez/QKSMS/common/base/QkRealmAdapter.kt
index 7b1d8997e..fb1f95827 100644
--- a/presentation/src/main/java/com/moez/QKSMS/common/base/QkRealmAdapter.kt
+++ b/presentation/src/main/java/com/moez/QKSMS/common/base/QkRealmAdapter.kt
@@ -1,127 +1,127 @@
-/*
- * Copyright (C) 2017 Moez Bhatti <moez.bhatti@gmail.com>
- *
- * This file is part of QKSMS.
- *
- * QKSMS is free software: you can redistribute it and/or modify
- * it under the terms of the GNU General Public License as published by
- * the Free Software Foundation, either version 3 of the License, or
- * (at your option) any later version.
- *
- * QKSMS is distributed in the hope that it will be useful,
- * but WITHOUT ANY WARRANTY; without even the implied warranty of
- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
- * GNU General Public License for more details.
- *
- * You should have received a copy of the GNU General Public License
- * along with QKSMS.  If not, see <http://www.gnu.org/licenses/>.
- */
-package com.moez.QKSMS.common.base
-
-import android.view.View
-import androidx.recyclerview.widget.RecyclerView
-import com.moez.QKSMS.common.util.extensions.setVisible
-import io.reactivex.subjects.BehaviorSubject
-import io.reactivex.subjects.Subject
-import io.realm.OrderedRealmCollection
-import io.realm.RealmList
-import io.realm.RealmModel
-import io.realm.RealmRecyclerViewAdapter
-import io.realm.RealmResults
-import timber.log.Timber
-
-abstract class QkRealmAdapter<T : RealmModel> : RealmRecyclerViewAdapter<T, QkViewHolder>(null, true) {
-
-    /**
-     * This view can be set, and the adapter will automatically control the visibility of this view
-     * based on the data
-     */
-    var emptyView: View? = null
-        set(value) {
-            if (field === value) return
-
-            field = value
-            value?.setVisible(data?.isLoaded == true && data?.isEmpty() == true)
-        }
-
-    private val emptyListener: (OrderedRealmCollection<T>) -> Unit = { data ->
-        emptyView?.setVisible(data.isLoaded && data.isEmpty())
-    }
-
-    val selectionChanges: Subject<List<Long>> = BehaviorSubject.create()
-
-    private var selection = listOf<Long>()
-
-    /**
-     * Toggles the selected state for a particular view
-     *
-     * If we are currently in selection mode (we have an active selection), then the state will
-     * toggle. If we are not in selection mode, then we will only toggle if [force]
-     */
-    protected fun toggleSelection(id: Long, force: Boolean = true): Boolean {
-        if (!force && selection.isEmpty()) return false
-
-        selection = when (selection.contains(id)) {
-            true -> selection - id
-            false -> selection + id
-        }
-
-        selectionChanges.onNext(selection)
-        return true
-    }
-
-    protected fun isSelected(id: Long): Boolean {
-        return selection.contains(id)
-    }
-
-    fun clearSelection() {
-        selection = listOf()
-        selectionChanges.onNext(selection)
-        notifyDataSetChanged()
-    }
-
-    override fun getItem(index: Int): T? {
-        if (index < 0) {
-            Timber.w("Only indexes >= 0 are allowed. Input was: $index")
-            return null
-        }
-
-        return super.getItem(index)
-    }
-
-    override fun updateData(data: OrderedRealmCollection<T>?) {
-        if (getData() === data) return
-
-        removeListener(getData())
-        addListener(data)
-
-        data?.run(emptyListener)
-
-        super.updateData(data)
-    }
-
-    override fun onAttachedToRecyclerView(recyclerView: RecyclerView) {
-        super.onAttachedToRecyclerView(recyclerView)
-        addListener(data)
-    }
-
-    override fun onDetachedFromRecyclerView(recyclerView: RecyclerView) {
-        super.onDetachedFromRecyclerView(recyclerView)
-        removeListener(data)
-    }
-
-    private fun addListener(data: OrderedRealmCollection<T>?) {
-        when (data) {
-            is RealmResults<T> -> data.addChangeListener(emptyListener)
-            is RealmList<T> -> data.addChangeListener(emptyListener)
-        }
-    }
-
-    private fun removeListener(data: OrderedRealmCollection<T>?) {
-        when (data) {
-            is RealmResults<T> -> data.removeChangeListener(emptyListener)
-            is RealmList<T> -> data.removeChangeListener(emptyListener)
-        }
-    }
-
+/*
+ * Copyright (C) 2017 Moez Bhatti <moez.bhatti@gmail.com>
+ *
+ * This file is part of QKSMS.
+ *
+ * QKSMS is free software: you can redistribute it and/or modify
+ * it under the terms of the GNU General Public License as published by
+ * the Free Software Foundation, either version 3 of the License, or
+ * (at your option) any later version.
+ *
+ * QKSMS is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+ * GNU General Public License for more details.
+ *
+ * You should have received a copy of the GNU General Public License
+ * along with QKSMS.  If not, see <http://www.gnu.org/licenses/>.
+ */
+package com.moez.QKSMS.common.base
+
+import android.view.View
+import androidx.recyclerview.widget.RecyclerView
+import com.moez.QKSMS.common.util.extensions.setVisible
+import io.reactivex.subjects.BehaviorSubject
+import io.reactivex.subjects.Subject
+import io.realm.OrderedRealmCollection
+import io.realm.RealmList
+import io.realm.RealmModel
+import io.realm.RealmRecyclerViewAdapter
+import io.realm.RealmResults
+import timber.log.Timber
+
+abstract class QkRealmAdapter<T : RealmModel> : RealmRecyclerViewAdapter<T, QkViewHolder>(null, true) {
+
+    /**
+     * This view can be set, and the adapter will automatically control the visibility of this view
+     * based on the data
+     */
+    var emptyView: View? = null
+        set(value) {
+            if (field === value) return
+
+            field = value
+            value?.setVisible(data?.isLoaded == true && data?.isEmpty() == true)
+        }
+
+    private val emptyListener: (OrderedRealmCollection<T>) -> Unit = { data ->
+        emptyView?.setVisible(data.isLoaded && data.isEmpty())
+    }
+
+    val selectionChanges: Subject<List<Long>> = BehaviorSubject.create()
+
+    private var selection = listOf<Long>()
+
+    /**
+     * Toggles the selected state for a particular view
+     *
+     * If we are currently in selection mode (we have an active selection), then the state will
+     * toggle. If we are not in selection mode, then we will only toggle if [force]
+     */
+    protected fun toggleSelection(id: Long, force: Boolean = true): Boolean {
+        if (!force && selection.isEmpty()) return false
+
+        selection = when (selection.contains(id)) {
+            true -> selection - id
+            false -> selection + id
+        }
+
+        selectionChanges.onNext(selection)
+        return true
+    }
+
+    protected fun isSelected(id: Long): Boolean {
+        return selection.contains(id)
+    }
+
+    fun clearSelection() {
+        selection = listOf()
+        selectionChanges.onNext(selection)
+        notifyDataSetChanged()
+    }
+
+    override fun getItem(index: Int): T? {
+        if (index < 0) {
+            Timber.w("Only indexes >= 0 are allowed. Input was: $index")
+            return null
+        }
+
+        return super.getItem(index)
+    }
+
+    override fun updateData(data: OrderedRealmCollection<T>?) {
+        if (getData() === data) return
+
+        removeListener(getData())
+        addListener(data)
+
+        data?.run(emptyListener)
+
+        super.updateData(data)
+    }
+
+    override fun onAttachedToRecyclerView(recyclerView: RecyclerView) {
+        super.onAttachedToRecyclerView(recyclerView)
+        addListener(data)
+    }
+
+    override fun onDetachedFromRecyclerView(recyclerView: RecyclerView) {
+        super.onDetachedFromRecyclerView(recyclerView)
+        removeListener(data)
+    }
+
+    private fun addListener(data: OrderedRealmCollection<T>?) {
+        when (data) {
+            is RealmResults<T> -> data.addChangeListener(emptyListener)
+            is RealmList<T> -> data.addChangeListener(emptyListener)
+        }
+    }
+
+    private fun removeListener(data: OrderedRealmCollection<T>?) {
+        when (data) {
+            is RealmResults<T> -> data.removeChangeListener(emptyListener)
+            is RealmList<T> -> data.removeChangeListener(emptyListener)
+        }
+    }
+
 }
\ No newline at end of file
diff --git a/presentation/src/main/java/com/moez/QKSMS/common/base/QkThemedActivity.kt b/presentation/src/main/java/com/moez/QKSMS/common/base/QkThemedActivity.kt
index 14b858b2c..8e8054431 100644
--- a/presentation/src/main/java/com/moez/QKSMS/common/base/QkThemedActivity.kt
+++ b/presentation/src/main/java/com/moez/QKSMS/common/base/QkThemedActivity.kt
@@ -1,164 +1,164 @@
-/*
- * Copyright (C) 2017 Moez Bhatti <moez.bhatti@gmail.com>
- *
- * This file is part of QKSMS.
- *
- * QKSMS is free software: you can redistribute it and/or modify
- * it under the terms of the GNU General Public License as published by
- * the Free Software Foundation, either version 3 of the License, or
- * (at your option) any later version.
- *
- * QKSMS is distributed in the hope that it will be useful,
- * but WITHOUT ANY WARRANTY; without even the implied warranty of
- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
- * GNU General Public License for more details.
- *
- * You should have received a copy of the GNU General Public License
- * along with QKSMS.  If not, see <http://www.gnu.org/licenses/>.
- */
-package com.moez.QKSMS.common.base
-
-import android.annotation.SuppressLint
-import android.app.ActivityManager
-import android.graphics.BitmapFactory
-import android.os.Build
-import android.os.Bundle
-import android.view.View
-import androidx.core.view.iterator
-import androidx.lifecycle.Lifecycle
-import com.moez.QKSMS.R
-import com.moez.QKSMS.common.util.Colors
-import com.moez.QKSMS.common.util.extensions.resolveThemeBoolean
-import com.moez.QKSMS.common.util.extensions.resolveThemeColor
-import com.moez.QKSMS.extensions.Optional
-import com.moez.QKSMS.extensions.asObservable
-import com.moez.QKSMS.extensions.mapNotNull
-import com.moez.QKSMS.repository.ConversationRepository
-import com.moez.QKSMS.repository.MessageRepository
-import com.moez.QKSMS.util.PhoneNumberUtils
-import com.moez.QKSMS.util.Preferences
-import com.uber.autodispose.android.lifecycle.scope
-import com.uber.autodispose.autoDisposable
-import io.reactivex.Observable
-import io.reactivex.android.schedulers.AndroidSchedulers
-import io.reactivex.rxkotlin.Observables
-import io.reactivex.subjects.BehaviorSubject
-import io.reactivex.subjects.Subject
-import kotlinx.android.synthetic.main.toolbar.*
-import java.util.concurrent.TimeUnit
-import javax.inject.Inject
-
-/**
- * Base activity that automatically applies any necessary theme theme settings and colors
- *
- * In most cases, this should be used instead of the base QkActivity, except for when
- * an activity does not depend on the theme
- */
-abstract class QkThemedActivity : QkActivity() {
-
-    @Inject lateinit var colors: Colors
-    @Inject lateinit var conversationRepo: ConversationRepository
-    @Inject lateinit var messageRepo: MessageRepository
-    @Inject lateinit var phoneNumberUtils: PhoneNumberUtils
-    @Inject lateinit var prefs: Preferences
-
-    /**
-     * In case the activity should be themed for a specific conversation, the selected conversation
-     * can be changed by pushing the threadId to this subject
-     */
-    val threadId: Subject<Long> = BehaviorSubject.createDefault(0)
-
-    /**
-     * Switch the theme if the threadId changes
-     * Set it based on the latest message in the conversation
-     */
-    val theme: Observable<Colors.Theme> = threadId
-            .distinctUntilChanged()
-            .switchMap { threadId ->
-                val conversation = conversationRepo.getConversation(threadId)
-                when {
-                    conversation == null -> Observable.just(Optional(null))
-
-                    conversation.recipients.size == 1 -> Observable.just(Optional(conversation.recipients.first()))
-
-                    else -> messageRepo.getLastIncomingMessage(conversation.id)
-                            .asObservable()
-                            .mapNotNull { messages -> messages.firstOrNull() }
-                            .distinctUntilChanged { message -> message.address }
-                            .mapNotNull { message ->
-                                conversation.recipients.find { recipient ->
-                                    phoneNumberUtils.compare(recipient.address, message.address)
-                                }
-                            }
-                            .map { recipient -> Optional(recipient) }
-                            .startWith(Optional(conversation.recipients.firstOrNull()))
-                            .distinctUntilChanged()
-                }
-            }
-            .switchMap { colors.themeObservable(it.value) }
-
-    @SuppressLint("InlinedApi")
-    override fun onCreate(savedInstanceState: Bundle?) {
-        setTheme(getActivityThemeRes(prefs.black.get()))
-        super.onCreate(savedInstanceState)
-
-        // When certain preferences change, we need to recreate the activity
-        val triggers = listOf(prefs.nightMode, prefs.night, prefs.black, prefs.textSize, prefs.systemFont)
-        Observable.merge(triggers.map { it.asObservable().skip(1) })
-                .debounce(400, TimeUnit.MILLISECONDS)
-                .observeOn(AndroidSchedulers.mainThread())
-                .autoDisposable(scope())
-                .subscribe { recreate() }
-
-        // We can only set light nav bar on API 27 in attrs, but we can do it in API 26 here
-        if (Build.VERSION.SDK_INT == Build.VERSION_CODES.O) {
-            val night = !resolveThemeBoolean(R.attr.isLightTheme)
-            window.decorView.systemUiVisibility = if (night) 0 else
-                View.SYSTEM_UI_FLAG_LIGHT_STATUS_BAR or View.SYSTEM_UI_FLAG_LIGHT_NAVIGATION_BAR
-        }
-
-        // Some devices don't let you modify android.R.attr.navigationBarColor
-        if (Build.VERSION.SDK_INT >= Build.VERSION_CODES.O) {
-            window.navigationBarColor = resolveThemeColor(android.R.attr.windowBackground)
-        }
-
-        // Set the color for the recent apps title
-        val toolbarColor = resolveThemeColor(R.attr.colorPrimary)
-        val icon = BitmapFactory.decodeResource(resources, R.mipmap.ic_launcher)
-        val taskDesc = ActivityManager.TaskDescription(getString(R.string.app_name), icon, toolbarColor)
-        setTaskDescription(taskDesc)
-    }
-
-    override fun onPostCreate(savedInstanceState: Bundle?) {
-        super.onPostCreate(savedInstanceState)
-
-        // Set the color for the overflow and navigation icon
-        val textSecondary = resolveThemeColor(android.R.attr.textColorSecondary)
-        toolbar?.overflowIcon = toolbar?.overflowIcon?.apply { setTint(textSecondary) }
-
-        // Update the colours of the menu items
-        Observables.combineLatest(menu, theme) { menu, theme ->
-            menu.iterator().forEach { menuItem ->
-                val tint = when (menuItem.itemId) {
-                    in getColoredMenuItems() -> theme.theme
-                    else -> textSecondary
-                }
-
-                menuItem.icon = menuItem.icon?.apply { setTint(tint) }
-            }
-        }.autoDisposable(scope(Lifecycle.Event.ON_DESTROY)).subscribe()
-    }
-
-    open fun getColoredMenuItems(): List<Int> {
-        return listOf()
-    }
-
-    /**
-     * This can be overridden in case an activity does not want to use the default themes
-     */
-    open fun getActivityThemeRes(black: Boolean) = when {
-        black -> R.style.AppTheme_Black
-        else -> R.style.AppTheme
-    }
-
+/*
+ * Copyright (C) 2017 Moez Bhatti <moez.bhatti@gmail.com>
+ *
+ * This file is part of QKSMS.
+ *
+ * QKSMS is free software: you can redistribute it and/or modify
+ * it under the terms of the GNU General Public License as published by
+ * the Free Software Foundation, either version 3 of the License, or
+ * (at your option) any later version.
+ *
+ * QKSMS is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+ * GNU General Public License for more details.
+ *
+ * You should have received a copy of the GNU General Public License
+ * along with QKSMS.  If not, see <http://www.gnu.org/licenses/>.
+ */
+package com.moez.QKSMS.common.base
+
+import android.annotation.SuppressLint
+import android.app.ActivityManager
+import android.graphics.BitmapFactory
+import android.os.Build
+import android.os.Bundle
+import android.view.View
+import androidx.core.view.iterator
+import androidx.lifecycle.Lifecycle
+import com.moez.QKSMS.R
+import com.moez.QKSMS.common.util.Colors
+import com.moez.QKSMS.common.util.extensions.resolveThemeBoolean
+import com.moez.QKSMS.common.util.extensions.resolveThemeColor
+import com.moez.QKSMS.extensions.Optional
+import com.moez.QKSMS.extensions.asObservable
+import com.moez.QKSMS.extensions.mapNotNull
+import com.moez.QKSMS.repository.ConversationRepository
+import com.moez.QKSMS.repository.MessageRepository
+import com.moez.QKSMS.util.PhoneNumberUtils
+import com.moez.QKSMS.util.Preferences
+import com.uber.autodispose.android.lifecycle.scope
+import com.uber.autodispose.autoDisposable
+import io.reactivex.Observable
+import io.reactivex.android.schedulers.AndroidSchedulers
+import io.reactivex.rxkotlin.Observables
+import io.reactivex.subjects.BehaviorSubject
+import io.reactivex.subjects.Subject
+import kotlinx.android.synthetic.main.toolbar.*
+import java.util.concurrent.TimeUnit
+import javax.inject.Inject
+
+/**
+ * Base activity that automatically applies any necessary theme theme settings and colors
+ *
+ * In most cases, this should be used instead of the base QkActivity, except for when
+ * an activity does not depend on the theme
+ */
+abstract class QkThemedActivity : QkActivity() {
+
+    @Inject lateinit var colors: Colors
+    @Inject lateinit var conversationRepo: ConversationRepository
+    @Inject lateinit var messageRepo: MessageRepository
+    @Inject lateinit var phoneNumberUtils: PhoneNumberUtils
+    @Inject lateinit var prefs: Preferences
+
+    /**
+     * In case the activity should be themed for a specific conversation, the selected conversation
+     * can be changed by pushing the threadId to this subject
+     */
+    val threadId: Subject<Long> = BehaviorSubject.createDefault(0)
+
+    /**
+     * Switch the theme if the threadId changes
+     * Set it based on the latest message in the conversation
+     */
+    val theme: Observable<Colors.Theme> = threadId
+            .distinctUntilChanged()
+            .switchMap { threadId ->
+                val conversation = conversationRepo.getConversation(threadId)
+                when {
+                    conversation == null -> Observable.just(Optional(null))
+
+                    conversation.recipients.size == 1 -> Observable.just(Optional(conversation.recipients.first()))
+
+                    else -> messageRepo.getLastIncomingMessage(conversation.id)
+                            .asObservable()
+                            .mapNotNull { messages -> messages.firstOrNull() }
+                            .distinctUntilChanged { message -> message.address }
+                            .mapNotNull { message ->
+                                conversation.recipients.find { recipient ->
+                                    phoneNumberUtils.compare(recipient.address, message.address)
+                                }
+                            }
+                            .map { recipient -> Optional(recipient) }
+                            .startWith(Optional(conversation.recipients.firstOrNull()))
+                            .distinctUntilChanged()
+                }
+            }
+            .switchMap { colors.themeObservable(it.value) }
+
+    @SuppressLint("InlinedApi")
+    override fun onCreate(savedInstanceState: Bundle?) {
+        setTheme(getActivityThemeRes(prefs.black.get()))
+        super.onCreate(savedInstanceState)
+
+        // When certain preferences change, we need to recreate the activity
+        val triggers = listOf(prefs.nightMode, prefs.night, prefs.black, prefs.textSize, prefs.systemFont)
+        Observable.merge(triggers.map { it.asObservable().skip(1) })
+                .debounce(400, TimeUnit.MILLISECONDS)
+                .observeOn(AndroidSchedulers.mainThread())
+                .autoDisposable(scope())
+                .subscribe { recreate() }
+
+        // We can only set light nav bar on API 27 in attrs, but we can do it in API 26 here
+        if (Build.VERSION.SDK_INT == Build.VERSION_CODES.O) {
+            val night = !resolveThemeBoolean(R.attr.isLightTheme)
+            window.decorView.systemUiVisibility = if (night) 0 else
+                View.SYSTEM_UI_FLAG_LIGHT_STATUS_BAR or View.SYSTEM_UI_FLAG_LIGHT_NAVIGATION_BAR
+        }
+
+        // Some devices don't let you modify android.R.attr.navigationBarColor
+        if (Build.VERSION.SDK_INT >= Build.VERSION_CODES.O) {
+            window.navigationBarColor = resolveThemeColor(android.R.attr.windowBackground)
+        }
+
+        // Set the color for the recent apps title
+        val toolbarColor = resolveThemeColor(R.attr.colorPrimary)
+        val icon = BitmapFactory.decodeResource(resources, R.mipmap.ic_launcher)
+        val taskDesc = ActivityManager.TaskDescription(getString(R.string.app_name), icon, toolbarColor)
+        setTaskDescription(taskDesc)
+    }
+
+    override fun onPostCreate(savedInstanceState: Bundle?) {
+        super.onPostCreate(savedInstanceState)
+
+        // Set the color for the overflow and navigation icon
+        val textSecondary = resolveThemeColor(android.R.attr.textColorSecondary)
+        toolbar?.overflowIcon = toolbar?.overflowIcon?.apply { setTint(textSecondary) }
+
+        // Update the colours of the menu items
+        Observables.combineLatest(menu, theme) { menu, theme ->
+            menu.iterator().forEach { menuItem ->
+                val tint = when (menuItem.itemId) {
+                    in getColoredMenuItems() -> theme.theme
+                    else -> textSecondary
+                }
+
+                menuItem.icon = menuItem.icon?.apply { setTint(tint) }
+            }
+        }.autoDisposable(scope(Lifecycle.Event.ON_DESTROY)).subscribe()
+    }
+
+    open fun getColoredMenuItems(): List<Int> {
+        return listOf()
+    }
+
+    /**
+     * This can be overridden in case an activity does not want to use the default themes
+     */
+    open fun getActivityThemeRes(black: Boolean) = when {
+        black -> R.style.AppTheme_Black
+        else -> R.style.AppTheme
+    }
+
 }
\ No newline at end of file
diff --git a/presentation/src/main/java/com/moez/QKSMS/common/base/QkView.kt b/presentation/src/main/java/com/moez/QKSMS/common/base/QkView.kt
index 6d36be430..634f98403 100644
--- a/presentation/src/main/java/com/moez/QKSMS/common/base/QkView.kt
+++ b/presentation/src/main/java/com/moez/QKSMS/common/base/QkView.kt
@@ -1,27 +1,27 @@
-/*
- * Copyright (C) 2017 Moez Bhatti <moez.bhatti@gmail.com>
- *
- * This file is part of QKSMS.
- *
- * QKSMS is free software: you can redistribute it and/or modify
- * it under the terms of the GNU General Public License as published by
- * the Free Software Foundation, either version 3 of the License, or
- * (at your option) any later version.
- *
- * QKSMS is distributed in the hope that it will be useful,
- * but WITHOUT ANY WARRANTY; without even the implied warranty of
- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
- * GNU General Public License for more details.
- *
- * You should have received a copy of the GNU General Public License
- * along with QKSMS.  If not, see <http://www.gnu.org/licenses/>.
- */
-package com.moez.QKSMS.common.base
-
-import androidx.lifecycle.LifecycleOwner
-
-interface QkView<in State> : LifecycleOwner {
-
-    fun render(state: State)
-
+/*
+ * Copyright (C) 2017 Moez Bhatti <moez.bhatti@gmail.com>
+ *
+ * This file is part of QKSMS.
+ *
+ * QKSMS is free software: you can redistribute it and/or modify
+ * it under the terms of the GNU General Public License as published by
+ * the Free Software Foundation, either version 3 of the License, or
+ * (at your option) any later version.
+ *
+ * QKSMS is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+ * GNU General Public License for more details.
+ *
+ * You should have received a copy of the GNU General Public License
+ * along with QKSMS.  If not, see <http://www.gnu.org/licenses/>.
+ */
+package com.moez.QKSMS.common.base
+
+import androidx.lifecycle.LifecycleOwner
+
+interface QkView<in State> : LifecycleOwner {
+
+    fun render(state: State)
+
 }
\ No newline at end of file
diff --git a/presentation/src/main/java/com/moez/QKSMS/common/base/QkViewContract.kt b/presentation/src/main/java/com/moez/QKSMS/common/base/QkViewContract.kt
index 19ade510c..b056fbea5 100644
--- a/presentation/src/main/java/com/moez/QKSMS/common/base/QkViewContract.kt
+++ b/presentation/src/main/java/com/moez/QKSMS/common/base/QkViewContract.kt
@@ -1,27 +1,27 @@
-/*
- * Copyright (C) 2017 Moez Bhatti <moez.bhatti@gmail.com>
- *
- * This file is part of QKSMS.
- *
- * QKSMS is free software: you can redistribute it and/or modify
- * it under the terms of the GNU General Public License as published by
- * the Free Software Foundation, either version 3 of the License, or
- * (at your option) any later version.
- *
- * QKSMS is distributed in the hope that it will be useful,
- * but WITHOUT ANY WARRANTY; without even the implied warranty of
- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
- * GNU General Public License for more details.
- *
- * You should have received a copy of the GNU General Public License
- * along with QKSMS.  If not, see <http://www.gnu.org/licenses/>.
- */
-package com.moez.QKSMS.common.base
-
-import androidx.lifecycle.LifecycleOwner
-
-interface QkViewContract<in State>: LifecycleOwner {
-
-    fun render(state: State)
-
+/*
+ * Copyright (C) 2017 Moez Bhatti <moez.bhatti@gmail.com>
+ *
+ * This file is part of QKSMS.
+ *
+ * QKSMS is free software: you can redistribute it and/or modify
+ * it under the terms of the GNU General Public License as published by
+ * the Free Software Foundation, either version 3 of the License, or
+ * (at your option) any later version.
+ *
+ * QKSMS is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+ * GNU General Public License for more details.
+ *
+ * You should have received a copy of the GNU General Public License
+ * along with QKSMS.  If not, see <http://www.gnu.org/licenses/>.
+ */
+package com.moez.QKSMS.common.base
+
+import androidx.lifecycle.LifecycleOwner
+
+interface QkViewContract<in State>: LifecycleOwner {
+
+    fun render(state: State)
+
 }
\ No newline at end of file
diff --git a/presentation/src/main/java/com/moez/QKSMS/common/base/QkViewHolder.kt b/presentation/src/main/java/com/moez/QKSMS/common/base/QkViewHolder.kt
index 56e674349..f60bea28b 100644
--- a/presentation/src/main/java/com/moez/QKSMS/common/base/QkViewHolder.kt
+++ b/presentation/src/main/java/com/moez/QKSMS/common/base/QkViewHolder.kt
@@ -1,27 +1,27 @@
-/*
- * Copyright (C) 2017 Moez Bhatti <moez.bhatti@gmail.com>
- *
- * This file is part of QKSMS.
- *
- * QKSMS is free software: you can redistribute it and/or modify
- * it under the terms of the GNU General Public License as published by
- * the Free Software Foundation, either version 3 of the License, or
- * (at your option) any later version.
- *
- * QKSMS is distributed in the hope that it will be useful,
- * but WITHOUT ANY WARRANTY; without even the implied warranty of
- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
- * GNU General Public License for more details.
- *
- * You should have received a copy of the GNU General Public License
- * along with QKSMS.  If not, see <http://www.gnu.org/licenses/>.
- */
-package com.moez.QKSMS.common.base
-
-import android.view.View
-import androidx.recyclerview.widget.RecyclerView
-import kotlinx.android.extensions.LayoutContainer
-
-class QkViewHolder(view: View) : RecyclerView.ViewHolder(view), LayoutContainer {
-    override val containerView: View = view
-}
+/*
+ * Copyright (C) 2017 Moez Bhatti <moez.bhatti@gmail.com>
+ *
+ * This file is part of QKSMS.
+ *
+ * QKSMS is free software: you can redistribute it and/or modify
+ * it under the terms of the GNU General Public License as published by
+ * the Free Software Foundation, either version 3 of the License, or
+ * (at your option) any later version.
+ *
+ * QKSMS is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+ * GNU General Public License for more details.
+ *
+ * You should have received a copy of the GNU General Public License
+ * along with QKSMS.  If not, see <http://www.gnu.org/licenses/>.
+ */
+package com.moez.QKSMS.common.base
+
+import android.view.View
+import androidx.recyclerview.widget.RecyclerView
+import kotlinx.android.extensions.LayoutContainer
+
+class QkViewHolder(view: View) : RecyclerView.ViewHolder(view), LayoutContainer {
+    override val containerView: View = view
+}
diff --git a/presentation/src/main/java/com/moez/QKSMS/common/base/QkViewModel.kt b/presentation/src/main/java/com/moez/QKSMS/common/base/QkViewModel.kt
index a6aab3e83..b546fc1c4 100644
--- a/presentation/src/main/java/com/moez/QKSMS/common/base/QkViewModel.kt
+++ b/presentation/src/main/java/com/moez/QKSMS/common/base/QkViewModel.kt
@@ -1,60 +1,60 @@
-/*
- * Copyright (C) 2017 Moez Bhatti <moez.bhatti@gmail.com>
- *
- * This file is part of QKSMS.
- *
- * QKSMS is free software: you can redistribute it and/or modify
- * it under the terms of the GNU General Public License as published by
- * the Free Software Foundation, either version 3 of the License, or
- * (at your option) any later version.
- *
- * QKSMS is distributed in the hope that it will be useful,
- * but WITHOUT ANY WARRANTY; without even the implied warranty of
- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
- * GNU General Public License for more details.
- *
- * You should have received a copy of the GNU General Public License
- * along with QKSMS.  If not, see <http://www.gnu.org/licenses/>.
- */
-package com.moez.QKSMS.common.base
-
-import androidx.annotation.CallSuper
-import androidx.lifecycle.ViewModel
-import com.uber.autodispose.android.lifecycle.scope
-import com.uber.autodispose.autoDisposable
-import io.reactivex.android.schedulers.AndroidSchedulers
-import io.reactivex.disposables.CompositeDisposable
-import io.reactivex.rxkotlin.plusAssign
-import io.reactivex.subjects.BehaviorSubject
-import io.reactivex.subjects.PublishSubject
-import io.reactivex.subjects.Subject
-
-abstract class QkViewModel<in View : QkView<State>, State>(initialState: State) : ViewModel() {
-
-    protected val disposables = CompositeDisposable()
-    protected val state: Subject<State> = BehaviorSubject.createDefault(initialState)
-
-    private val stateReducer: Subject<State.() -> State> = PublishSubject.create()
-
-    init {
-        // If we accidentally push a realm object into the state on the wrong thread, switching
-        // to mainThread right here should immediately alert us of the issue
-        disposables += stateReducer
-                .observeOn(AndroidSchedulers.mainThread())
-                .scan(initialState) { state, reducer -> reducer(state) }
-                .subscribe(state::onNext)
-    }
-
-    @CallSuper
-    open fun bindView(view: View) {
-        state
-                .observeOn(AndroidSchedulers.mainThread())
-                .autoDisposable(view.scope())
-                .subscribe(view::render)
-    }
-
-    protected fun newState(reducer: State.() -> State) = stateReducer.onNext(reducer)
-
-    override fun onCleared() = disposables.dispose()
-
+/*
+ * Copyright (C) 2017 Moez Bhatti <moez.bhatti@gmail.com>
+ *
+ * This file is part of QKSMS.
+ *
+ * QKSMS is free software: you can redistribute it and/or modify
+ * it under the terms of the GNU General Public License as published by
+ * the Free Software Foundation, either version 3 of the License, or
+ * (at your option) any later version.
+ *
+ * QKSMS is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+ * GNU General Public License for more details.
+ *
+ * You should have received a copy of the GNU General Public License
+ * along with QKSMS.  If not, see <http://www.gnu.org/licenses/>.
+ */
+package com.moez.QKSMS.common.base
+
+import androidx.annotation.CallSuper
+import androidx.lifecycle.ViewModel
+import com.uber.autodispose.android.lifecycle.scope
+import com.uber.autodispose.autoDisposable
+import io.reactivex.android.schedulers.AndroidSchedulers
+import io.reactivex.disposables.CompositeDisposable
+import io.reactivex.rxkotlin.plusAssign
+import io.reactivex.subjects.BehaviorSubject
+import io.reactivex.subjects.PublishSubject
+import io.reactivex.subjects.Subject
+
+abstract class QkViewModel<in View : QkView<State>, State>(initialState: State) : ViewModel() {
+
+    protected val disposables = CompositeDisposable()
+    protected val state: Subject<State> = BehaviorSubject.createDefault(initialState)
+
+    private val stateReducer: Subject<State.() -> State> = PublishSubject.create()
+
+    init {
+        // If we accidentally push a realm object into the state on the wrong thread, switching
+        // to mainThread right here should immediately alert us of the issue
+        disposables += stateReducer
+                .observeOn(AndroidSchedulers.mainThread())
+                .scan(initialState) { state, reducer -> reducer(state) }
+                .subscribe(state::onNext)
+    }
+
+    @CallSuper
+    open fun bindView(view: View) {
+        state
+                .observeOn(AndroidSchedulers.mainThread())
+                .autoDisposable(view.scope())
+                .subscribe(view::render)
+    }
+
+    protected fun newState(reducer: State.() -> State) = stateReducer.onNext(reducer)
+
+    override fun onCleared() = disposables.dispose()
+
 }
\ No newline at end of file
diff --git a/presentation/src/main/java/com/moez/QKSMS/common/util/ClipboardUtils.kt b/presentation/src/main/java/com/moez/QKSMS/common/util/ClipboardUtils.kt
index 6e6e01396..6e9c0b077 100644
--- a/presentation/src/main/java/com/moez/QKSMS/common/util/ClipboardUtils.kt
+++ b/presentation/src/main/java/com/moez/QKSMS/common/util/ClipboardUtils.kt
@@ -1,33 +1,33 @@
-/*
- * Copyright (C) 2017 Moez Bhatti <moez.bhatti@gmail.com>
- *
- * This file is part of QKSMS.
- *
- * QKSMS is free software: you can redistribute it and/or modify
- * it under the terms of the GNU General Public License as published by
- * the Free Software Foundation, either version 3 of the License, or
- * (at your option) any later version.
- *
- * QKSMS is distributed in the hope that it will be useful,
- * but WITHOUT ANY WARRANTY; without even the implied warranty of
- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
- * GNU General Public License for more details.
- *
- * You should have received a copy of the GNU General Public License
- * along with QKSMS.  If not, see <http://www.gnu.org/licenses/>.
- */
-package com.moez.QKSMS.common.util
-
-import android.content.ClipData
-import android.content.ClipboardManager
-import android.content.Context
-
-object ClipboardUtils {
-
-    fun copy(context: Context, string: String) {
-        val clipboard = context.getSystemService(Context.CLIPBOARD_SERVICE) as ClipboardManager
-        val clip = ClipData.newPlainText("SMS", string)
-        clipboard.setPrimaryClip(clip)
-    }
-
-}
+/*
+ * Copyright (C) 2017 Moez Bhatti <moez.bhatti@gmail.com>
+ *
+ * This file is part of QKSMS.
+ *
+ * QKSMS is free software: you can redistribute it and/or modify
+ * it under the terms of the GNU General Public License as published by
+ * the Free Software Foundation, either version 3 of the License, or
+ * (at your option) any later version.
+ *
+ * QKSMS is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+ * GNU General Public License for more details.
+ *
+ * You should have received a copy of the GNU General Public License
+ * along with QKSMS.  If not, see <http://www.gnu.org/licenses/>.
+ */
+package com.moez.QKSMS.common.util
+
+import android.content.ClipData
+import android.content.ClipboardManager
+import android.content.Context
+
+object ClipboardUtils {
+
+    fun copy(context: Context, string: String) {
+        val clipboard = context.getSystemService(Context.CLIPBOARD_SERVICE) as ClipboardManager
+        val clip = ClipData.newPlainText("SMS", string)
+        clipboard.setPrimaryClip(clip)
+    }
+
+}
diff --git a/presentation/src/main/java/com/moez/QKSMS/common/util/Colors.kt b/presentation/src/main/java/com/moez/QKSMS/common/util/Colors.kt
index 35dfe09c0..84c566dee 100644
--- a/presentation/src/main/java/com/moez/QKSMS/common/util/Colors.kt
+++ b/presentation/src/main/java/com/moez/QKSMS/common/util/Colors.kt
@@ -1,141 +1,141 @@
-/*
- * Copyright (C) 2017 Moez Bhatti <moez.bhatti@gmail.com>
- *
- * This file is part of QKSMS.
- *
- * QKSMS is free software: you can redistribute it and/or modify
- * it under the terms of the GNU General Public License as published by
- * the Free Software Foundation, either version 3 of the License, or
- * (at your option) any later version.
- *
- * QKSMS is distributed in the hope that it will be useful,
- * but WITHOUT ANY WARRANTY; without even the implied warranty of
- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
- * GNU General Public License for more details.
- *
- * You should have received a copy of the GNU General Public License
- * along with QKSMS.  If not, see <http://www.gnu.org/licenses/>.
- */
-package com.moez.QKSMS.common.util
-
-import android.content.Context
-import android.graphics.Color
-import androidx.core.content.res.getColorOrThrow
-import com.moez.QKSMS.R
-import com.moez.QKSMS.common.util.extensions.getColorCompat
-import com.moez.QKSMS.model.Recipient
-import com.moez.QKSMS.util.PhoneNumberUtils
-import com.moez.QKSMS.util.Preferences
-import io.reactivex.Observable
-import javax.inject.Inject
-import javax.inject.Singleton
-import kotlin.math.absoluteValue
-
-@Singleton
-class Colors @Inject constructor(
-    private val context: Context,
-    private val phoneNumberUtils: PhoneNumberUtils,
-    private val prefs: Preferences
-) {
-
-    data class Theme(val theme: Int, private val colors: Colors) {
-        val highlight by lazy { colors.highlightColorForTheme(theme) }
-        val textPrimary by lazy { colors.textPrimaryOnThemeForColor(theme) }
-        val textSecondary by lazy { colors.textSecondaryOnThemeForColor(theme) }
-        val textTertiary by lazy { colors.textTertiaryOnThemeForColor(theme) }
-    }
-
-    val materialColors: List<List<Int>> = listOf(
-        R.array.material_red,
-        R.array.material_pink,
-        R.array.material_purple,
-        R.array.material_deep_purple,
-        R.array.material_indigo,
-        R.array.material_blue,
-        R.array.material_light_blue,
-        R.array.material_cyan,
-        R.array.material_teal,
-        R.array.material_green,
-        R.array.material_light_green,
-        R.array.material_lime,
-        R.array.material_yellow,
-        R.array.material_amber,
-        R.array.material_orange,
-        R.array.material_deep_orange,
-        R.array.material_brown,
-        R.array.material_gray,
-        R.array.material_blue_gray)
-            .map { res -> context.resources.obtainTypedArray(res) }
-            .map { typedArray -> (0 until typedArray.length()).map(typedArray::getColorOrThrow) }
-
-    private val randomColors: List<Int> = context.resources.obtainTypedArray(R.array.random_colors)
-            .let { typedArray -> (0 until typedArray.length()).map(typedArray::getColorOrThrow) }
-
-    private val minimumContrastRatio = 2
-
-    // Cache these values so they don't need to be recalculated
-    private val primaryTextLuminance = measureLuminance(context.getColorCompat(R.color.textPrimaryDark))
-    private val secondaryTextLuminance = measureLuminance(context.getColorCompat(R.color.textSecondaryDark))
-    private val tertiaryTextLuminance = measureLuminance(context.getColorCompat(R.color.textTertiaryDark))
-
-    fun theme(recipient: Recipient? = null): Theme {
-        val pref = prefs.theme(recipient?.id ?: 0)
-        val color = when {
-            recipient == null || !prefs.autoColor.get() || pref.isSet -> pref.get()
-            else -> generateColor(recipient)
-        }
-        return Theme(color, this)
-    }
-
-    fun themeObservable(recipient: Recipient? = null): Observable<Theme> {
-        val pref = when {
-            recipient == null -> prefs.theme()
-            prefs.autoColor.get() -> prefs.theme(recipient.id, generateColor(recipient))
-            else -> prefs.theme(recipient.id, prefs.theme().get())
-        }
-        return pref.asObservable()
-                .map { color -> Theme(color, this) }
-    }
-
-    fun highlightColorForTheme(theme: Int): Int = FloatArray(3)
-            .apply { Color.colorToHSV(theme, this) }
-            .let { hsv -> hsv.apply { set(2, 0.75f) } } // 75% value
-            .let { hsv -> Color.HSVToColor(85, hsv) } // 33% alpha
-
-    fun textPrimaryOnThemeForColor(color: Int): Int = color
-            .let { theme -> measureLuminance(theme) }
-            .let { themeLuminance -> primaryTextLuminance / themeLuminance }
-            .let { contrastRatio -> contrastRatio < minimumContrastRatio }
-            .let { contrastRatio -> if (contrastRatio) R.color.textPrimary else R.color.textPrimaryDark }
-            .let { res -> context.getColorCompat(res) }
-
-    fun textSecondaryOnThemeForColor(color: Int): Int = color
-            .let { theme -> measureLuminance(theme) }
-            .let { themeLuminance -> secondaryTextLuminance / themeLuminance }
-            .let { contrastRatio -> contrastRatio < minimumContrastRatio }
-            .let { contrastRatio -> if (contrastRatio) R.color.textSecondary else R.color.textSecondaryDark }
-            .let { res -> context.getColorCompat(res) }
-
-    fun textTertiaryOnThemeForColor(color: Int): Int = color
-            .let { theme -> measureLuminance(theme) }
-            .let { themeLuminance -> tertiaryTextLuminance / themeLuminance }
-            .let { contrastRatio -> contrastRatio < minimumContrastRatio }
-            .let { contrastRatio -> if (contrastRatio) R.color.textTertiary else R.color.textTertiaryDark }
-            .let { res -> context.getColorCompat(res) }
-
-    /**
-     * Measures the luminance value of a color to be able to measure the contrast ratio between two materialColors
-     * Based on https://stackoverflow.com/a/9733420
-     */
-    private fun measureLuminance(color: Int): Double {
-        val array = intArrayOf(Color.red(color), Color.green(color), Color.blue(color))
-                .map { if (it < 0.03928) it / 12.92 else Math.pow((it + 0.055) / 1.055, 2.4) }
-
-        return 0.2126 * array[0] + 0.7152 * array[1] + 0.0722 * array[2] + 0.05
-    }
-
-    private fun generateColor(recipient: Recipient): Int {
-        val index = recipient.address.hashCode().absoluteValue % randomColors.size
-        return randomColors[index]
-    }
-}
+/*
+ * Copyright (C) 2017 Moez Bhatti <moez.bhatti@gmail.com>
+ *
+ * This file is part of QKSMS.
+ *
+ * QKSMS is free software: you can redistribute it and/or modify
+ * it under the terms of the GNU General Public License as published by
+ * the Free Software Foundation, either version 3 of the License, or
+ * (at your option) any later version.
+ *
+ * QKSMS is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+ * GNU General Public License for more details.
+ *
+ * You should have received a copy of the GNU General Public License
+ * along with QKSMS.  If not, see <http://www.gnu.org/licenses/>.
+ */
+package com.moez.QKSMS.common.util
+
+import android.content.Context
+import android.graphics.Color
+import androidx.core.content.res.getColorOrThrow
+import com.moez.QKSMS.R
+import com.moez.QKSMS.common.util.extensions.getColorCompat
+import com.moez.QKSMS.model.Recipient
+import com.moez.QKSMS.util.PhoneNumberUtils
+import com.moez.QKSMS.util.Preferences
+import io.reactivex.Observable
+import javax.inject.Inject
+import javax.inject.Singleton
+import kotlin.math.absoluteValue
+
+@Singleton
+class Colors @Inject constructor(
+    private val context: Context,
+    private val phoneNumberUtils: PhoneNumberUtils,
+    private val prefs: Preferences
+) {
+
+    data class Theme(val theme: Int, private val colors: Colors) {
+        val highlight by lazy { colors.highlightColorForTheme(theme) }
+        val textPrimary by lazy { colors.textPrimaryOnThemeForColor(theme) }
+        val textSecondary by lazy { colors.textSecondaryOnThemeForColor(theme) }
+        val textTertiary by lazy { colors.textTertiaryOnThemeForColor(theme) }
+    }
+
+    val materialColors: List<List<Int>> = listOf(
+        R.array.material_red,
+        R.array.material_pink,
+        R.array.material_purple,
+        R.array.material_deep_purple,
+        R.array.material_indigo,
+        R.array.material_blue,
+        R.array.material_light_blue,
+        R.array.material_cyan,
+        R.array.material_teal,
+        R.array.material_green,
+        R.array.material_light_green,
+        R.array.material_lime,
+        R.array.material_yellow,
+        R.array.material_amber,
+        R.array.material_orange,
+        R.array.material_deep_orange,
+        R.array.material_brown,
+        R.array.material_gray,
+        R.array.material_blue_gray)
+            .map { res -> context.resources.obtainTypedArray(res) }
+            .map { typedArray -> (0 until typedArray.length()).map(typedArray::getColorOrThrow) }
+
+    private val randomColors: List<Int> = context.resources.obtainTypedArray(R.array.random_colors)
+            .let { typedArray -> (0 until typedArray.length()).map(typedArray::getColorOrThrow) }
+
+    private val minimumContrastRatio = 2
+
+    // Cache these values so they don't need to be recalculated
+    private val primaryTextLuminance = measureLuminance(context.getColorCompat(R.color.textPrimaryDark))
+    private val secondaryTextLuminance = measureLuminance(context.getColorCompat(R.color.textSecondaryDark))
+    private val tertiaryTextLuminance = measureLuminance(context.getColorCompat(R.color.textTertiaryDark))
+
+    fun theme(recipient: Recipient? = null): Theme {
+        val pref = prefs.theme(recipient?.id ?: 0)
+        val color = when {
+            recipient == null || !prefs.autoColor.get() || pref.isSet -> pref.get()
+            else -> generateColor(recipient)
+        }
+        return Theme(color, this)
+    }
+
+    fun themeObservable(recipient: Recipient? = null): Observable<Theme> {
+        val pref = when {
+            recipient == null -> prefs.theme()
+            prefs.autoColor.get() -> prefs.theme(recipient.id, generateColor(recipient))
+            else -> prefs.theme(recipient.id, prefs.theme().get())
+        }
+        return pref.asObservable()
+                .map { color -> Theme(color, this) }
+    }
+
+    fun highlightColorForTheme(theme: Int): Int = FloatArray(3)
+            .apply { Color.colorToHSV(theme, this) }
+            .let { hsv -> hsv.apply { set(2, 0.75f) } } // 75% value
+            .let { hsv -> Color.HSVToColor(85, hsv) } // 33% alpha
+
+    fun textPrimaryOnThemeForColor(color: Int): Int = color
+            .let { theme -> measureLuminance(theme) }
+            .let { themeLuminance -> primaryTextLuminance / themeLuminance }
+            .let { contrastRatio -> contrastRatio < minimumContrastRatio }
+            .let { contrastRatio -> if (contrastRatio) R.color.textPrimary else R.color.textPrimaryDark }
+            .let { res -> context.getColorCompat(res) }
+
+    fun textSecondaryOnThemeForColor(color: Int): Int = color
+            .let { theme -> measureLuminance(theme) }
+            .let { themeLuminance -> secondaryTextLuminance / themeLuminance }
+            .let { contrastRatio -> contrastRatio < minimumContrastRatio }
+            .let { contrastRatio -> if (contrastRatio) R.color.textSecondary else R.color.textSecondaryDark }
+            .let { res -> context.getColorCompat(res) }
+
+    fun textTertiaryOnThemeForColor(color: Int): Int = color
+            .let { theme -> measureLuminance(theme) }
+            .let { themeLuminance -> tertiaryTextLuminance / themeLuminance }
+            .let { contrastRatio -> contrastRatio < minimumContrastRatio }
+            .let { contrastRatio -> if (contrastRatio) R.color.textTertiary else R.color.textTertiaryDark }
+            .let { res -> context.getColorCompat(res) }
+
+    /**
+     * Measures the luminance value of a color to be able to measure the contrast ratio between two materialColors
+     * Based on https://stackoverflow.com/a/9733420
+     */
+    private fun measureLuminance(color: Int): Double {
+        val array = intArrayOf(Color.red(color), Color.green(color), Color.blue(color))
+                .map { if (it < 0.03928) it / 12.92 else Math.pow((it + 0.055) / 1.055, 2.4) }
+
+        return 0.2126 * array[0] + 0.7152 * array[1] + 0.0722 * array[2] + 0.05
+    }
+
+    private fun generateColor(recipient: Recipient): Int {
+        val index = recipient.address.hashCode().absoluteValue % randomColors.size
+        return randomColors[index]
+    }
+}
diff --git a/presentation/src/main/java/com/moez/QKSMS/common/util/DateFormatter.kt b/presentation/src/main/java/com/moez/QKSMS/common/util/DateFormatter.kt
index d4628c58f..1944048d6 100644
--- a/presentation/src/main/java/com/moez/QKSMS/common/util/DateFormatter.kt
+++ b/presentation/src/main/java/com/moez/QKSMS/common/util/DateFormatter.kt
@@ -1,97 +1,97 @@
-/*
- * Copyright (C) 2017 Moez Bhatti <moez.bhatti@gmail.com>
- *
- * This file is part of QKSMS.
- *
- * QKSMS is free software: you can redistribute it and/or modify
- * it under the terms of the GNU General Public License as published by
- * the Free Software Foundation, either version 3 of the License, or
- * (at your option) any later version.
- *
- * QKSMS is distributed in the hope that it will be useful,
- * but WITHOUT ANY WARRANTY; without even the implied warranty of
- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
- * GNU General Public License for more details.
- *
- * You should have received a copy of the GNU General Public License
- * along with QKSMS.  If not, see <http://www.gnu.org/licenses/>.
- */
-package com.moez.QKSMS.common.util
-
-import android.content.Context
-import android.text.format.DateFormat
-import com.moez.QKSMS.common.util.extensions.isSameDay
-import com.moez.QKSMS.common.util.extensions.isSameWeek
-import com.moez.QKSMS.common.util.extensions.isSameYear
-import java.text.SimpleDateFormat
-import java.util.*
-import javax.inject.Inject
-import javax.inject.Singleton
-
-@Singleton
-class DateFormatter @Inject constructor(val context: Context) {
-
-    /**
-     * Formats the [pattern] correctly for the current locale, and replaces 12 hour format with
-     * 24 hour format if necessary
-     */
-    private fun getFormatter(pattern: String): SimpleDateFormat {
-        var formattedPattern = DateFormat.getBestDateTimePattern(Locale.getDefault(), pattern)
-
-        if (DateFormat.is24HourFormat(context)) {
-            formattedPattern = formattedPattern
-                    .replace("h", "HH")
-                    .replace("K", "HH")
-                    .replace(" a".toRegex(), "")
-        }
-
-        return SimpleDateFormat(formattedPattern, Locale.getDefault())
-    }
-
-    fun getDetailedTimestamp(date: Long): String {
-        return getFormatter("M/d/y, h:mm:ss a").format(date)
-    }
-
-    fun getTimestamp(date: Long): String {
-        return getFormatter("h:mm a").format(date)
-    }
-
-    fun getMessageTimestamp(date: Long): String {
-        val now = Calendar.getInstance()
-        val then = Calendar.getInstance()
-        then.timeInMillis = date
-
-        return when {
-            now.isSameDay(then) -> getFormatter("h:mm a")
-            now.isSameWeek(then) -> getFormatter("E h:mm a")
-            now.isSameYear(then) -> getFormatter("MMM d, h:mm a")
-            else -> getFormatter("MMM d yyyy, h:mm a")
-        }.format(date)
-    }
-
-    fun getConversationTimestamp(date: Long): String {
-        val now = Calendar.getInstance()
-        val then = Calendar.getInstance()
-        then.timeInMillis = date
-
-        return when {
-            now.isSameDay(then) -> getFormatter("h:mm a")
-            now.isSameWeek(then) -> getFormatter("E")
-            now.isSameYear(then) -> getFormatter("MMM d")
-            else -> getFormatter("MM/d/yy")
-        }.format(date)
-    }
-
-    fun getScheduledTimestamp(date: Long): String {
-        val now = Calendar.getInstance()
-        val then = Calendar.getInstance()
-        then.timeInMillis = date
-
-        return when {
-            now.isSameDay(then) -> getFormatter("h:mm a")
-            now.isSameYear(then) -> getFormatter("MMM d h:mm a")
-            else -> getFormatter("MMM d yyyy h:mm a")
-        }.format(date)
-    }
-
+/*
+ * Copyright (C) 2017 Moez Bhatti <moez.bhatti@gmail.com>
+ *
+ * This file is part of QKSMS.
+ *
+ * QKSMS is free software: you can redistribute it and/or modify
+ * it under the terms of the GNU General Public License as published by
+ * the Free Software Foundation, either version 3 of the License, or
+ * (at your option) any later version.
+ *
+ * QKSMS is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+ * GNU General Public License for more details.
+ *
+ * You should have received a copy of the GNU General Public License
+ * along with QKSMS.  If not, see <http://www.gnu.org/licenses/>.
+ */
+package com.moez.QKSMS.common.util
+
+import android.content.Context
+import android.text.format.DateFormat
+import com.moez.QKSMS.common.util.extensions.isSameDay
+import com.moez.QKSMS.common.util.extensions.isSameWeek
+import com.moez.QKSMS.common.util.extensions.isSameYear
+import java.text.SimpleDateFormat
+import java.util.*
+import javax.inject.Inject
+import javax.inject.Singleton
+
+@Singleton
+class DateFormatter @Inject constructor(val context: Context) {
+
+    /**
+     * Formats the [pattern] correctly for the current locale, and replaces 12 hour format with
+     * 24 hour format if necessary
+     */
+    private fun getFormatter(pattern: String): SimpleDateFormat {
+        var formattedPattern = DateFormat.getBestDateTimePattern(Locale.getDefault(), pattern)
+
+        if (DateFormat.is24HourFormat(context)) {
+            formattedPattern = formattedPattern
+                    .replace("h", "HH")
+                    .replace("K", "HH")
+                    .replace(" a".toRegex(), "")
+        }
+
+        return SimpleDateFormat(formattedPattern, Locale.getDefault())
+    }
+
+    fun getDetailedTimestamp(date: Long): String {
+        return getFormatter("M/d/y, h:mm:ss a").format(date)
+    }
+
+    fun getTimestamp(date: Long): String {
+        return getFormatter("h:mm a").format(date)
+    }
+
+    fun getMessageTimestamp(date: Long): String {
+        val now = Calendar.getInstance()
+        val then = Calendar.getInstance()
+        then.timeInMillis = date
+
+        return when {
+            now.isSameDay(then) -> getFormatter("h:mm a")
+            now.isSameWeek(then) -> getFormatter("E h:mm a")
+            now.isSameYear(then) -> getFormatter("MMM d, h:mm a")
+            else -> getFormatter("MMM d yyyy, h:mm a")
+        }.format(date)
+    }
+
+    fun getConversationTimestamp(date: Long): String {
+        val now = Calendar.getInstance()
+        val then = Calendar.getInstance()
+        then.timeInMillis = date
+
+        return when {
+            now.isSameDay(then) -> getFormatter("h:mm a")
+            now.isSameWeek(then) -> getFormatter("E")
+            now.isSameYear(then) -> getFormatter("MMM d")
+            else -> getFormatter("MM/d/yy")
+        }.format(date)
+    }
+
+    fun getScheduledTimestamp(date: Long): String {
+        val now = Calendar.getInstance()
+        val then = Calendar.getInstance()
+        then.timeInMillis = date
+
+        return when {
+            now.isSameDay(then) -> getFormatter("h:mm a")
+            now.isSameYear(then) -> getFormatter("MMM d h:mm a")
+            else -> getFormatter("MMM d yyyy h:mm a")
+        }.format(date)
+    }
+
 }
\ No newline at end of file
diff --git a/presentation/src/main/java/com/moez/QKSMS/common/util/FileLoggingTree.kt b/presentation/src/main/java/com/moez/QKSMS/common/util/FileLoggingTree.kt
index aa1dd6322..b4677ee18 100644
--- a/presentation/src/main/java/com/moez/QKSMS/common/util/FileLoggingTree.kt
+++ b/presentation/src/main/java/com/moez/QKSMS/common/util/FileLoggingTree.kt
@@ -1,75 +1,75 @@
-/*
- * Copyright (C) 2017 Moez Bhatti <moez.bhatti@gmail.com>
- *
- * This file is part of QKSMS.
- *
- * QKSMS is free software: you can redistribute it and/or modify
- * it under the terms of the GNU General Public License as published by
- * the Free Software Foundation, either version 3 of the License, or
- * (at your option) any later version.
- *
- * QKSMS is distributed in the hope that it will be useful,
- * but WITHOUT ANY WARRANTY; without even the implied warranty of
- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
- * GNU General Public License for more details.
- *
- * You should have received a copy of the GNU General Public License
- * along with QKSMS.  If not, see <http://www.gnu.org/licenses/>.
- */
-package com.moez.QKSMS.common.util
-
-import android.os.Environment
-import android.util.Log
-import com.moez.QKSMS.util.Preferences
-import io.reactivex.schedulers.Schedulers
-import timber.log.Timber
-import java.io.File
-import java.io.FileOutputStream
-import java.text.SimpleDateFormat
-import java.util.*
-import javax.inject.Inject
-import javax.inject.Singleton
-
-/**
- * Based off Vipin Kumar's FileLoggingTree: https://medium.com/@vicky7230/file-logging-with-timber-4e63a1b86a66
- */
-@Singleton
-class FileLoggingTree @Inject constructor(private val prefs: Preferences) : Timber.DebugTree() {
-
-    private val fileLock: Boolean = false
-
-    override fun log(priority: Int, tag: String, message: String, t: Throwable?) {
-        if (!prefs.logging.get()) return
-
-        Schedulers.io().scheduleDirect {
-            val timestamp = SimpleDateFormat("yyyy-MM-dd HH:mm:ss:SSS", Locale.getDefault()).format(System.currentTimeMillis())
-            val priorityString = when (priority) {
-                Log.VERBOSE -> "V"
-                Log.DEBUG -> "D"
-                Log.INFO -> "I"
-                Log.WARN -> "W"
-                Log.ERROR -> "E"
-                else -> "WTF"
-            }
-
-            // Format the log to be written to the file
-            val log = "$timestamp $priorityString/$tag: $message ${Log.getStackTraceString(t)}\n".toByteArray()
-
-            // Ensure that only one thread is writing to the file at a time
-            synchronized(fileLock) {
-                try {
-                    // Create the directory
-                    val dir = File(Environment.getExternalStorageDirectory(), "QKSMS/Logs").apply { mkdirs() }
-
-                    // Create the file
-                    val file = File(dir, "${SimpleDateFormat("yyyy-MM-dd", Locale.getDefault()).format(System.currentTimeMillis())}.log")
-
-                    // Write the log to the file
-                    FileOutputStream(file, true).use { fileOutputStream -> fileOutputStream.write(log) }
-                } catch (e: Exception) {
-                    Log.e("FileLoggingTree", "Error while logging into file", e)
-                }
-            }
-        }
-    }
+/*
+ * Copyright (C) 2017 Moez Bhatti <moez.bhatti@gmail.com>
+ *
+ * This file is part of QKSMS.
+ *
+ * QKSMS is free software: you can redistribute it and/or modify
+ * it under the terms of the GNU General Public License as published by
+ * the Free Software Foundation, either version 3 of the License, or
+ * (at your option) any later version.
+ *
+ * QKSMS is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+ * GNU General Public License for more details.
+ *
+ * You should have received a copy of the GNU General Public License
+ * along with QKSMS.  If not, see <http://www.gnu.org/licenses/>.
+ */
+package com.moez.QKSMS.common.util
+
+import android.os.Environment
+import android.util.Log
+import com.moez.QKSMS.util.Preferences
+import io.reactivex.schedulers.Schedulers
+import timber.log.Timber
+import java.io.File
+import java.io.FileOutputStream
+import java.text.SimpleDateFormat
+import java.util.*
+import javax.inject.Inject
+import javax.inject.Singleton
+
+/**
+ * Based off Vipin Kumar's FileLoggingTree: https://medium.com/@vicky7230/file-logging-with-timber-4e63a1b86a66
+ */
+@Singleton
+class FileLoggingTree @Inject constructor(private val prefs: Preferences) : Timber.DebugTree() {
+
+    private val fileLock: Boolean = false
+
+    override fun log(priority: Int, tag: String, message: String, t: Throwable?) {
+        if (!prefs.logging.get()) return
+
+        Schedulers.io().scheduleDirect {
+            val timestamp = SimpleDateFormat("yyyy-MM-dd HH:mm:ss:SSS", Locale.getDefault()).format(System.currentTimeMillis())
+            val priorityString = when (priority) {
+                Log.VERBOSE -> "V"
+                Log.DEBUG -> "D"
+                Log.INFO -> "I"
+                Log.WARN -> "W"
+                Log.ERROR -> "E"
+                else -> "WTF"
+            }
+
+            // Format the log to be written to the file
+            val log = "$timestamp $priorityString/$tag: $message ${Log.getStackTraceString(t)}\n".toByteArray()
+
+            // Ensure that only one thread is writing to the file at a time
+            synchronized(fileLock) {
+                try {
+                    // Create the directory
+                    val dir = File(Environment.getExternalStorageDirectory(), "QKSMS/Logs").apply { mkdirs() }
+
+                    // Create the file
+                    val file = File(dir, "${SimpleDateFormat("yyyy-MM-dd", Locale.getDefault()).format(System.currentTimeMillis())}.log")
+
+                    // Write the log to the file
+                    FileOutputStream(file, true).use { fileOutputStream -> fileOutputStream.write(log) }
+                } catch (e: Exception) {
+                    Log.e("FileLoggingTree", "Error while logging into file", e)
+                }
+            }
+        }
+    }
 }
\ No newline at end of file
diff --git a/presentation/src/main/java/com/moez/QKSMS/common/util/FontProvider.kt b/presentation/src/main/java/com/moez/QKSMS/common/util/FontProvider.kt
index 229092781..d1aec9635 100644
--- a/presentation/src/main/java/com/moez/QKSMS/common/util/FontProvider.kt
+++ b/presentation/src/main/java/com/moez/QKSMS/common/util/FontProvider.kt
@@ -1,54 +1,54 @@
-/*
- * Copyright (C) 2017 Moez Bhatti <moez.bhatti@gmail.com>
- *
- * This file is part of QKSMS.
- *
- * QKSMS is free software: you can redistribute it and/or modify
- * it under the terms of the GNU General Public License as published by
- * the Free Software Foundation, either version 3 of the License, or
- * (at your option) any later version.
- *
- * QKSMS is distributed in the hope that it will be useful,
- * but WITHOUT ANY WARRANTY; without even the implied warranty of
- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
- * GNU General Public License for more details.
- *
- * You should have received a copy of the GNU General Public License
- * along with QKSMS.  If not, see <http://www.gnu.org/licenses/>.
- */
-package com.moez.QKSMS.common.util
-
-import android.content.Context
-import android.graphics.Typeface
-import androidx.core.content.res.ResourcesCompat
-import com.moez.QKSMS.R
-import timber.log.Timber
-import javax.inject.Inject
-import javax.inject.Singleton
-
-@Singleton
-class FontProvider @Inject constructor(context: Context) {
-
-    private var lato: Typeface? = null
-    private val pendingCallbacks = ArrayList<(Typeface) -> Unit>()
-
-    init {
-        ResourcesCompat.getFont(context, R.font.lato, object : ResourcesCompat.FontCallback() {
-            override fun onFontRetrievalFailed(reason: Int) {
-                Timber.w("Font retrieval failed: $reason")
-            }
-
-            override fun onFontRetrieved(typeface: Typeface) {
-                lato = typeface
-
-                pendingCallbacks.forEach { lato?.run(it) }
-                pendingCallbacks.clear()
-            }
-        }, null)
-    }
-
-    fun getLato(callback: (Typeface) -> Unit) {
-        lato?.run(callback) ?: pendingCallbacks.add(callback)
-    }
-
+/*
+ * Copyright (C) 2017 Moez Bhatti <moez.bhatti@gmail.com>
+ *
+ * This file is part of QKSMS.
+ *
+ * QKSMS is free software: you can redistribute it and/or modify
+ * it under the terms of the GNU General Public License as published by
+ * the Free Software Foundation, either version 3 of the License, or
+ * (at your option) any later version.
+ *
+ * QKSMS is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+ * GNU General Public License for more details.
+ *
+ * You should have received a copy of the GNU General Public License
+ * along with QKSMS.  If not, see <http://www.gnu.org/licenses/>.
+ */
+package com.moez.QKSMS.common.util
+
+import android.content.Context
+import android.graphics.Typeface
+import androidx.core.content.res.ResourcesCompat
+import com.moez.QKSMS.R
+import timber.log.Timber
+import javax.inject.Inject
+import javax.inject.Singleton
+
+@Singleton
+class FontProvider @Inject constructor(context: Context) {
+
+    private var lato: Typeface? = null
+    private val pendingCallbacks = ArrayList<(Typeface) -> Unit>()
+
+    init {
+        ResourcesCompat.getFont(context, R.font.lato, object : ResourcesCompat.FontCallback() {
+            override fun onFontRetrievalFailed(reason: Int) {
+                Timber.w("Font retrieval failed: $reason")
+            }
+
+            override fun onFontRetrieved(typeface: Typeface) {
+                lato = typeface
+
+                pendingCallbacks.forEach { lato?.run(it) }
+                pendingCallbacks.clear()
+            }
+        }, null)
+    }
+
+    fun getLato(callback: (Typeface) -> Unit) {
+        lato?.run(callback) ?: pendingCallbacks.add(callback)
+    }
+
 }
\ No newline at end of file
diff --git a/presentation/src/main/java/com/moez/QKSMS/common/util/LiveRealmData.kt b/presentation/src/main/java/com/moez/QKSMS/common/util/LiveRealmData.kt
index cd3a4b3b7..863f58d78 100644
--- a/presentation/src/main/java/com/moez/QKSMS/common/util/LiveRealmData.kt
+++ b/presentation/src/main/java/com/moez/QKSMS/common/util/LiveRealmData.kt
@@ -1,42 +1,42 @@
-/*
- * Copyright (C) 2017 Moez Bhatti <moez.bhatti@gmail.com>
- *
- * This file is part of QKSMS.
- *
- * QKSMS is free software: you can redistribute it and/or modify
- * it under the terms of the GNU General Public License as published by
- * the Free Software Foundation, either version 3 of the License, or
- * (at your option) any later version.
- *
- * QKSMS is distributed in the hope that it will be useful,
- * but WITHOUT ANY WARRANTY; without even the implied warranty of
- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
- * GNU General Public License for more details.
- *
- * You should have received a copy of the GNU General Public License
- * along with QKSMS.  If not, see <http://www.gnu.org/licenses/>.
- */
-package com.moez.QKSMS.common.util
-
-import androidx.lifecycle.LiveData
-import io.realm.RealmChangeListener
-import io.realm.RealmModel
-import io.realm.RealmResults
-
-class LiveRealmData<T : RealmModel>(private val results: RealmResults<T>) : LiveData<RealmResults<T>>() {
-
-    private val listener: RealmChangeListener<RealmResults<T>> = RealmChangeListener { results ->
-        value = results
-    }
-
-    override fun onActive() {
-        super.onActive()
-        results.addChangeListener(listener)
-    }
-
-    override fun onInactive() {
-        super.onInactive()
-        results.removeChangeListener(listener)
-    }
-
+/*
+ * Copyright (C) 2017 Moez Bhatti <moez.bhatti@gmail.com>
+ *
+ * This file is part of QKSMS.
+ *
+ * QKSMS is free software: you can redistribute it and/or modify
+ * it under the terms of the GNU General Public License as published by
+ * the Free Software Foundation, either version 3 of the License, or
+ * (at your option) any later version.
+ *
+ * QKSMS is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+ * GNU General Public License for more details.
+ *
+ * You should have received a copy of the GNU General Public License
+ * along with QKSMS.  If not, see <http://www.gnu.org/licenses/>.
+ */
+package com.moez.QKSMS.common.util
+
+import androidx.lifecycle.LiveData
+import io.realm.RealmChangeListener
+import io.realm.RealmModel
+import io.realm.RealmResults
+
+class LiveRealmData<T : RealmModel>(private val results: RealmResults<T>) : LiveData<RealmResults<T>>() {
+
+    private val listener: RealmChangeListener<RealmResults<T>> = RealmChangeListener { results ->
+        value = results
+    }
+
+    override fun onActive() {
+        super.onActive()
+        results.addChangeListener(listener)
+    }
+
+    override fun onInactive() {
+        super.onInactive()
+        results.removeChangeListener(listener)
+    }
+
 }
\ No newline at end of file
diff --git a/presentation/src/main/java/com/moez/QKSMS/common/util/MessageDetailsFormatter.kt b/presentation/src/main/java/com/moez/QKSMS/common/util/MessageDetailsFormatter.kt
index 371f2284c..6f4b7bd8d 100644
--- a/presentation/src/main/java/com/moez/QKSMS/common/util/MessageDetailsFormatter.kt
+++ b/presentation/src/main/java/com/moez/QKSMS/common/util/MessageDetailsFormatter.kt
@@ -1,105 +1,105 @@
-/*
- * Copyright (C) 2017 Moez Bhatti <moez.bhatti@gmail.com>
- *
- * This file is part of QKSMS.
- *
- * QKSMS is free software: you can redistribute it and/or modify
- * it under the terms of the GNU General Public License as published by
- * the Free Software Foundation, either version 3 of the License, or
- * (at your option) any later version.
- *
- * QKSMS is distributed in the hope that it will be useful,
- * but WITHOUT ANY WARRANTY; without even the implied warranty of
- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
- * GNU General Public License for more details.
- *
- * You should have received a copy of the GNU General Public License
- * along with QKSMS.  If not, see <http://www.gnu.org/licenses/>.
- */
-package com.moez.QKSMS.common.util
-
-import android.content.Context
-import com.google.android.mms.pdu_alt.EncodedStringValue
-import com.google.android.mms.pdu_alt.MultimediaMessagePdu
-import com.google.android.mms.pdu_alt.PduPersister
-import com.moez.QKSMS.R
-import com.moez.QKSMS.model.Message
-import com.moez.QKSMS.util.tryOrNull
-import javax.inject.Inject
-
-class MessageDetailsFormatter @Inject constructor(
-    private val context: Context,
-    private val dateFormatter: DateFormatter
-) {
-
-    fun format(message: Message): String {
-        val builder = StringBuilder()
-
-        message.type
-                .takeIf { it.isNotBlank() }
-                ?.toUpperCase()
-                ?.let { context.getString(R.string.compose_details_type, it) }
-                ?.let(builder::appendln)
-
-        if (message.isSms()) {
-            message.address
-                    .takeIf { it.isNotBlank() && !message.isMe() }
-                    ?.let { context.getString(R.string.compose_details_from, it) }
-                    ?.let(builder::appendln)
-
-            message.address
-                    .takeIf { it.isNotBlank() && message.isMe() }
-                    ?.let { context.getString(R.string.compose_details_to, it) }
-                    ?.let(builder::appendln)
-        } else {
-            val pdu = tryOrNull {
-                PduPersister.getPduPersister(context)
-                        .load(message.getUri())
-                        as MultimediaMessagePdu
-            }
-
-            pdu?.from?.string
-                    ?.takeIf { it.isNotBlank() }
-                    ?.let { context.getString(R.string.compose_details_from, it) }
-                    ?.let(builder::appendln)
-
-            pdu?.to
-                    ?.let(EncodedStringValue::concat)
-                    ?.takeIf { it.isNotBlank() }
-                    ?.let { context.getString(R.string.compose_details_to, it) }
-                    ?.let(builder::appendln)
-        }
-
-        message.date
-                .takeIf { it > 0 && message.isMe() }
-                ?.let(dateFormatter::getDetailedTimestamp)
-                ?.let { context.getString(R.string.compose_details_sent, it) }
-                ?.let(builder::appendln)
-
-        message.dateSent
-                .takeIf { it > 0 && !message.isMe() }
-                ?.let(dateFormatter::getDetailedTimestamp)
-                ?.let { context.getString(R.string.compose_details_sent, it) }
-                ?.let(builder::appendln)
-
-        message.date
-                .takeIf { it > 0 && !message.isMe() }
-                ?.let(dateFormatter::getDetailedTimestamp)
-                ?.let { context.getString(R.string.compose_details_received, it) }
-                ?.let(builder::appendln)
-
-        message.dateSent
-                .takeIf { it > 0 && message.isMe() }
-                ?.let(dateFormatter::getDetailedTimestamp)
-                ?.let { context.getString(R.string.compose_details_delivered, it) }
-                ?.let(builder::appendln)
-
-        message.errorCode
-                .takeIf { it != 0 && message.isSms() }
-                ?.let { context.getString(R.string.compose_details_error_code, it) }
-                ?.let(builder::appendln)
-
-        return builder.toString().trim()
-    }
-
+/*
+ * Copyright (C) 2017 Moez Bhatti <moez.bhatti@gmail.com>
+ *
+ * This file is part of QKSMS.
+ *
+ * QKSMS is free software: you can redistribute it and/or modify
+ * it under the terms of the GNU General Public License as published by
+ * the Free Software Foundation, either version 3 of the License, or
+ * (at your option) any later version.
+ *
+ * QKSMS is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+ * GNU General Public License for more details.
+ *
+ * You should have received a copy of the GNU General Public License
+ * along with QKSMS.  If not, see <http://www.gnu.org/licenses/>.
+ */
+package com.moez.QKSMS.common.util
+
+import android.content.Context
+import com.google.android.mms.pdu_alt.EncodedStringValue
+import com.google.android.mms.pdu_alt.MultimediaMessagePdu
+import com.google.android.mms.pdu_alt.PduPersister
+import com.moez.QKSMS.R
+import com.moez.QKSMS.model.Message
+import com.moez.QKSMS.util.tryOrNull
+import javax.inject.Inject
+
+class MessageDetailsFormatter @Inject constructor(
+    private val context: Context,
+    private val dateFormatter: DateFormatter
+) {
+
+    fun format(message: Message): String {
+        val builder = StringBuilder()
+
+        message.type
+                .takeIf { it.isNotBlank() }
+                ?.toUpperCase()
+                ?.let { context.getString(R.string.compose_details_type, it) }
+                ?.let(builder::appendln)
+
+        if (message.isSms()) {
+            message.address
+                    .takeIf { it.isNotBlank() && !message.isMe() }
+                    ?.let { context.getString(R.string.compose_details_from, it) }
+                    ?.let(builder::appendln)
+
+            message.address
+                    .takeIf { it.isNotBlank() && message.isMe() }
+                    ?.let { context.getString(R.string.compose_details_to, it) }
+                    ?.let(builder::appendln)
+        } else {
+            val pdu = tryOrNull {
+                PduPersister.getPduPersister(context)
+                        .load(message.getUri())
+                        as MultimediaMessagePdu
+            }
+
+            pdu?.from?.string
+                    ?.takeIf { it.isNotBlank() }
+                    ?.let { context.getString(R.string.compose_details_from, it) }
+                    ?.let(builder::appendln)
+
+            pdu?.to
+                    ?.let(EncodedStringValue::concat)
+                    ?.takeIf { it.isNotBlank() }
+                    ?.let { context.getString(R.string.compose_details_to, it) }
+                    ?.let(builder::appendln)
+        }
+
+        message.date
+                .takeIf { it > 0 && message.isMe() }
+                ?.let(dateFormatter::getDetailedTimestamp)
+                ?.let { context.getString(R.string.compose_details_sent, it) }
+                ?.let(builder::appendln)
+
+        message.dateSent
+                .takeIf { it > 0 && !message.isMe() }
+                ?.let(dateFormatter::getDetailedTimestamp)
+                ?.let { context.getString(R.string.compose_details_sent, it) }
+                ?.let(builder::appendln)
+
+        message.date
+                .takeIf { it > 0 && !message.isMe() }
+                ?.let(dateFormatter::getDetailedTimestamp)
+                ?.let { context.getString(R.string.compose_details_received, it) }
+                ?.let(builder::appendln)
+
+        message.dateSent
+                .takeIf { it > 0 && message.isMe() }
+                ?.let(dateFormatter::getDetailedTimestamp)
+                ?.let { context.getString(R.string.compose_details_delivered, it) }
+                ?.let(builder::appendln)
+
+        message.errorCode
+                .takeIf { it != 0 && message.isSms() }
+                ?.let { context.getString(R.string.compose_details_error_code, it) }
+                ?.let(builder::appendln)
+
+        return builder.toString().trim()
+    }
+
 }
\ No newline at end of file
diff --git a/presentation/src/main/java/com/moez/QKSMS/common/util/NotificationManagerImpl.kt b/presentation/src/main/java/com/moez/QKSMS/common/util/NotificationManagerImpl.kt
index f94eb3d34..436d8ecf1 100644
--- a/presentation/src/main/java/com/moez/QKSMS/common/util/NotificationManagerImpl.kt
+++ b/presentation/src/main/java/com/moez/QKSMS/common/util/NotificationManagerImpl.kt
@@ -1,477 +1,477 @@
-/*
- * Copyright (C) 2017 Moez Bhatti <moez.bhatti@gmail.com>
- *
- * This file is part of QKSMS.
- *
- * QKSMS is free software: you can redistribute it and/or modify
- * it under the terms of the GNU General Public License as published by
- * the Free Software Foundation, either version 3 of the License, or
- * (at your option) any later version.
- *
- * QKSMS is distributed in the hope that it will be useful,
- * but WITHOUT ANY WARRANTY; without even the implied warranty of
- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
- * GNU General Public License for more details.
- *
- * You should have received a copy of the GNU General Public License
- * along with QKSMS.  If not, see <http://www.gnu.org/licenses/>.
- */
-package com.moez.QKSMS.common.util
-
-import android.app.Notification
-import android.app.NotificationChannel
-import android.app.NotificationManager
-import android.app.PendingIntent
-import android.content.ContentUris
-import android.content.Context
-import android.content.Intent
-import android.graphics.Color
-import android.media.AudioAttributes
-import android.net.Uri
-import android.os.Build
-import android.os.PowerManager
-import android.provider.ContactsContract
-import androidx.core.app.NotificationCompat
-import androidx.core.app.NotificationManagerCompat
-import androidx.core.app.Person
-import androidx.core.app.RemoteInput
-import androidx.core.app.TaskStackBuilder
-import androidx.core.content.getSystemService
-import androidx.core.graphics.drawable.IconCompat
-import com.moez.QKSMS.R
-import com.moez.QKSMS.common.util.extensions.dpToPx
-import com.moez.QKSMS.extensions.isImage
-import com.moez.QKSMS.feature.compose.ComposeActivity
-import com.moez.QKSMS.feature.qkreply.QkReplyActivity
-import com.moez.QKSMS.manager.PermissionManager
-import com.moez.QKSMS.mapper.CursorToPartImpl
-import com.moez.QKSMS.receiver.BlockThreadReceiver
-import com.moez.QKSMS.receiver.DeleteMessagesReceiver
-import com.moez.QKSMS.receiver.MarkArchivedReceiver
-import com.moez.QKSMS.receiver.MarkReadReceiver
-import com.moez.QKSMS.receiver.MarkSeenReceiver
-import com.moez.QKSMS.receiver.RemoteMessagingReceiver
-import com.moez.QKSMS.repository.ConversationRepository
-import com.moez.QKSMS.repository.MessageRepository
-import com.moez.QKSMS.util.GlideApp
-import com.moez.QKSMS.util.PhoneNumberUtils
-import com.moez.QKSMS.util.Preferences
-import com.moez.QKSMS.util.tryOrNull
-import javax.inject.Inject
-import javax.inject.Singleton
-
-@Singleton
-class NotificationManagerImpl @Inject constructor(
-    private val context: Context,
-    private val colors: Colors,
-    private val conversationRepo: ConversationRepository,
-    private val prefs: Preferences,
-    private val messageRepo: MessageRepository,
-    private val permissions: PermissionManager,
-    private val phoneNumberUtils: PhoneNumberUtils
-) : com.moez.QKSMS.manager.NotificationManager {
-
-    companion object {
-        const val DEFAULT_CHANNEL_ID = "notifications_default"
-        const val BACKUP_RESTORE_CHANNEL_ID = "notifications_backup_restore"
-
-        val VIBRATE_PATTERN = longArrayOf(0, 200, 0, 200)
-    }
-
-    private val notificationManager = context.getSystemService(Context.NOTIFICATION_SERVICE) as NotificationManager
-
-    init {
-        // Make sure the default channel has been initialized
-        createNotificationChannel()
-    }
-
-    /**
-     * Updates the notification for a particular conversation
-     */
-    override fun update(threadId: Long) {
-        // If notifications are disabled, don't do anything
-        if (!prefs.notifications(threadId).get()) {
-            return
-        }
-
-        val messages = messageRepo.getUnreadUnseenMessages(threadId)
-
-        // If there are no messages to be displayed, make sure that the notification is dismissed
-        if (messages.isEmpty()) {
-            notificationManager.cancel(threadId.toInt())
-            notificationManager.cancel(threadId.toInt() + 100000)
-            return
-        }
-
-        val conversation = conversationRepo.getConversation(threadId) ?: return
-        val lastRecipient = conversation.lastMessage?.let { lastMessage ->
-            conversation.recipients.find { recipient ->
-                phoneNumberUtils.compare(recipient.address, lastMessage.address)
-            }
-        } ?: conversation.recipients.firstOrNull()
-
-        val contentIntent = Intent(context, ComposeActivity::class.java).putExtra("threadId", threadId)
-        val taskStackBuilder = TaskStackBuilder.create(context)
-                .addParentStack(ComposeActivity::class.java)
-                .addNextIntent(contentIntent)
-        val contentPI = taskStackBuilder.getPendingIntent(threadId.toInt(), PendingIntent.FLAG_UPDATE_CURRENT)
-
-        val seenIntent = Intent(context, MarkSeenReceiver::class.java).putExtra("threadId", threadId)
-        val seenPI = PendingIntent.getBroadcast(context, threadId.toInt(), seenIntent,
-                PendingIntent.FLAG_UPDATE_CURRENT)
-
-        // We can't store a null preference, so map it to a null Uri if the pref string is empty
-        val ringtone = prefs.ringtone(threadId).get()
-                .takeIf { it.isNotEmpty() }
-                ?.let(Uri::parse)
-                ?.also { uri ->
-                    // https://commonsware.com/blog/2016/09/07/notifications-sounds-android-7p0-aggravation.html
-                    context.grantUriPermission("com.android.systemui", uri, Intent.FLAG_GRANT_READ_URI_PERMISSION)
-                }
-
-        val notification = NotificationCompat.Builder(context, getChannelIdForNotification(threadId))
-                .setCategory(NotificationCompat.CATEGORY_MESSAGE)
-                .setColor(colors.theme(lastRecipient).theme)
-                .setPriority(NotificationCompat.PRIORITY_MAX)
-                .setSmallIcon(R.drawable.ic_notification)
-                .setNumber(messages.size)
-                .setAutoCancel(true)
-                .setContentIntent(contentPI)
-                .setDeleteIntent(seenPI)
-                .setSound(ringtone)
-                .setLights(Color.WHITE, 500, 2000)
-                .setWhen(conversation.lastMessage?.date ?: System.currentTimeMillis())
-                .setVibrate(if (prefs.vibration(threadId).get()) VIBRATE_PATTERN else longArrayOf(0))
-
-        // Tell the notification if it's a group message
-        val messagingStyle = NotificationCompat.MessagingStyle("Me")
-        if (conversation.recipients.size >= 2) {
-            messagingStyle.isGroupConversation = true
-            messagingStyle.conversationTitle = conversation.getTitle()
-        }
-
-        // Add the messages to the notification
-        messages.forEach { message ->
-            val person = Person.Builder()
-
-            if (!message.isMe()) {
-                val recipient = conversation.recipients.find { recipient ->
-                    phoneNumberUtils.compare(recipient.address, message.address)
-                }
-
-                person.setName(recipient?.getDisplayName() ?: message.address)
-                person.setIcon(GlideApp.with(context)
-                        .asBitmap()
-                        .circleCrop()
-                        .load(recipient?.contact?.photoUri)
-                        .submit(64.dpToPx(context), 64.dpToPx(context))
-                        .let { futureGet -> tryOrNull(false) { futureGet.get() } }
-                        ?.let(IconCompat::createWithBitmap))
-
-                recipient?.contact
-                        ?.let { contact -> "${ContactsContract.Contacts.CONTENT_LOOKUP_URI}/${contact.lookupKey}" }
-                        ?.let(person::setUri)
-            }
-
-            NotificationCompat.MessagingStyle.Message(message.getSummary(), message.date, person.build()).apply {
-                message.parts.firstOrNull { it.isImage() }?.let { part ->
-                    setData(part.type, ContentUris.withAppendedId(CursorToPartImpl.CONTENT_URI, part.id))
-                }
-                messagingStyle.addMessage(this)
-            }
-        }
-
-        // Set the large icon
-        val avatar = conversation.recipients.takeIf { it.size == 1 }
-                ?.first()?.contact?.photoUri
-                ?.let { photoUri ->
-                    GlideApp.with(context)
-                            .asBitmap()
-                            .circleCrop()
-                            .load(photoUri)
-                            .submit(64.dpToPx(context), 64.dpToPx(context))
-                }
-                ?.let { futureGet -> tryOrNull(false) { futureGet.get() } }
-
-        // Bind the notification contents based on the notification preview mode
-        when (prefs.notificationPreviews(threadId).get()) {
-            Preferences.NOTIFICATION_PREVIEWS_ALL -> {
-                notification
-                        .setLargeIcon(avatar)
-                        .setStyle(messagingStyle)
-            }
-
-            Preferences.NOTIFICATION_PREVIEWS_NAME -> {
-                notification
-                        .setLargeIcon(avatar)
-                        .setContentTitle(conversation.getTitle())
-                        .setContentText(context.resources.getQuantityString(
-                                R.plurals.notification_new_messages, messages.size, messages.size))
-            }
-
-            Preferences.NOTIFICATION_PREVIEWS_NONE -> {
-                notification
-                        .setContentTitle(context.getString(R.string.app_name))
-                        .setContentText(context.resources.getQuantityString(
-                                R.plurals.notification_new_messages, messages.size, messages.size))
-            }
-        }
-
-        // Add all of the people from this conversation to the notification, so that the system can
-        // appropriately bypass DND mode
-        conversation.recipients.forEach { recipient ->
-            notification.addPerson("tel:${recipient.address}")
-        }
-
-        // Add the action buttons
-        val actionLabels = context.resources.getStringArray(R.array.notification_actions)
-        listOf(prefs.notifAction1, prefs.notifAction2, prefs.notifAction3)
-                .map { preference -> preference.get() }
-                .distinct()
-                .mapNotNull { action ->
-                    when (action) {
-                        Preferences.NOTIFICATION_ACTION_ARCHIVE -> {
-                            val intent = Intent(context, MarkArchivedReceiver::class.java).putExtra("threadId", threadId)
-                            val pi = PendingIntent.getBroadcast(context, threadId.toInt(), intent,
-                                    PendingIntent.FLAG_UPDATE_CURRENT)
-                            NotificationCompat.Action.Builder(R.drawable.ic_archive_white_24dp, actionLabels[action], pi)
-                                    .setSemanticAction(NotificationCompat.Action.SEMANTIC_ACTION_ARCHIVE).build()
-                        }
-
-                        Preferences.NOTIFICATION_ACTION_DELETE -> {
-                            val messageIds = messages.map { it.id }.toLongArray()
-                            val intent = Intent(context, DeleteMessagesReceiver::class.java)
-                                    .putExtra("threadId", threadId)
-                                    .putExtra("messageIds", messageIds)
-                            val pi = PendingIntent.getBroadcast(context, threadId.toInt(), intent,
-                                    PendingIntent.FLAG_UPDATE_CURRENT)
-                            NotificationCompat.Action.Builder(R.drawable.ic_delete_white_24dp, actionLabels[action], pi)
-                                    .setSemanticAction(NotificationCompat.Action.SEMANTIC_ACTION_DELETE).build()
-                        }
-
-                        Preferences.NOTIFICATION_ACTION_BLOCK -> {
-                            val intent = Intent(context, BlockThreadReceiver::class.java).putExtra("threadId", threadId)
-                            val pi = PendingIntent.getBroadcast(context, threadId.toInt(), intent,
-                                    PendingIntent.FLAG_UPDATE_CURRENT)
-                            NotificationCompat.Action.Builder(R.drawable.ic_block_white_24dp, actionLabels[action], pi)
-                                    .setSemanticAction(NotificationCompat.Action.SEMANTIC_ACTION_MUTE).build()
-                        }
-
-                        Preferences.NOTIFICATION_ACTION_READ -> {
-                            val intent = Intent(context, MarkReadReceiver::class.java).putExtra("threadId", threadId)
-                            val pi = PendingIntent.getBroadcast(context, threadId.toInt(), intent,
-                                    PendingIntent.FLAG_UPDATE_CURRENT)
-                            NotificationCompat.Action.Builder(R.drawable.ic_check_white_24dp, actionLabels[action], pi)
-                                    .setSemanticAction(NotificationCompat.Action.SEMANTIC_ACTION_MARK_AS_READ).build()
-                        }
-
-                        Preferences.NOTIFICATION_ACTION_REPLY -> {
-                            if (Build.VERSION.SDK_INT >= 24) {
-                                getReplyAction(threadId)
-                            } else {
-                                val intent = Intent(context, QkReplyActivity::class.java).putExtra("threadId", threadId)
-                                val pi = PendingIntent.getActivity(context, threadId.toInt(), intent,
-                                        PendingIntent.FLAG_UPDATE_CURRENT)
-                                NotificationCompat.Action
-                                        .Builder(R.drawable.ic_reply_white_24dp, actionLabels[action], pi)
-                                        .setSemanticAction(NotificationCompat.Action.SEMANTIC_ACTION_REPLY).build()
-                            }
-                        }
-
-                        Preferences.NOTIFICATION_ACTION_CALL -> {
-                            val address = conversation.recipients[0]?.address
-                            val intentAction = if (permissions.hasCalling()) Intent.ACTION_CALL else Intent.ACTION_DIAL
-                            val intent = Intent(intentAction, Uri.parse("tel:$address"))
-                            val pi = PendingIntent.getActivity(context, threadId.toInt(), intent,
-                                    PendingIntent.FLAG_UPDATE_CURRENT)
-                            NotificationCompat.Action.Builder(R.drawable.ic_call_white_24dp, actionLabels[action], pi)
-                                    .setSemanticAction(NotificationCompat.Action.SEMANTIC_ACTION_CALL).build()
-                        }
-
-                        else -> null
-                    }
-                }
-                .forEach { notification.addAction(it) }
-
-        if (prefs.qkreply.get()) {
-            notification.priority = NotificationCompat.PRIORITY_DEFAULT
-
-            val intent = Intent(context, QkReplyActivity::class.java)
-                    .putExtra("threadId", threadId)
-                    .addFlags(Intent.FLAG_ACTIVITY_NEW_TASK)
-
-            context.startActivity(intent)
-        }
-
-        notificationManager.notify(threadId.toInt(), notification.build())
-
-        // Wake screen
-        if (prefs.wakeScreen(threadId).get()) {
-            context.getSystemService<PowerManager>()?.let { powerManager ->
-                if (!powerManager.isInteractive) {
-                    val flags = PowerManager.SCREEN_DIM_WAKE_LOCK or PowerManager.ACQUIRE_CAUSES_WAKEUP
-                    val wakeLock = powerManager.newWakeLock(flags, context.packageName)
-                    wakeLock.acquire(5000)
-                }
-            }
-        }
-    }
-
-    override fun notifyFailed(msgId: Long) {
-        val message = messageRepo.getMessage(msgId)
-
-        if (message == null || !message.isFailedMessage()) {
-            return
-        }
-
-        val conversation = conversationRepo.getConversation(message.threadId) ?: return
-        val lastRecipient = conversation.lastMessage?.let { lastMessage ->
-            conversation.recipients.find { recipient ->
-                phoneNumberUtils.compare(recipient.address, lastMessage.address)
-            }
-        } ?: conversation.recipients.firstOrNull()
-
-        val threadId = conversation.id
-
-        val contentIntent = Intent(context, ComposeActivity::class.java).putExtra("threadId", threadId)
-        val taskStackBuilder = TaskStackBuilder.create(context)
-            .addParentStack(ComposeActivity::class.java)
-            .addNextIntent(contentIntent)
-        val contentPI = taskStackBuilder.getPendingIntent(threadId.toInt(), PendingIntent.FLAG_UPDATE_CURRENT)
-
-        val notification = NotificationCompat.Builder(context, getChannelIdForNotification(threadId))
-                .setContentTitle(context.getString(R.string.notification_message_failed_title))
-                .setContentText(context.getString(R.string.notification_message_failed_text, conversation.getTitle()))
-                .setColor(colors.theme(lastRecipient).theme)
-                .setPriority(NotificationManagerCompat.IMPORTANCE_MAX)
-                .setSmallIcon(R.drawable.ic_notification_failed)
-                .setAutoCancel(true)
-                .setContentIntent(contentPI)
-                .setSound(Uri.parse(prefs.ringtone(threadId).get()))
-                .setLights(Color.WHITE, 500, 2000)
-                .setVibrate(if (prefs.vibration(threadId).get()) VIBRATE_PATTERN else longArrayOf(0))
-
-        notificationManager.notify(threadId.toInt() + 100000, notification.build())
-    }
-
-    private fun getReplyAction(threadId: Long): NotificationCompat.Action {
-        val replyIntent = Intent(context, RemoteMessagingReceiver::class.java).putExtra("threadId", threadId)
-        val replyPI = PendingIntent.getBroadcast(context, threadId.toInt(), replyIntent,
-                PendingIntent.FLAG_UPDATE_CURRENT)
-
-        val title = context.resources.getStringArray(R.array.notification_actions)[
-                Preferences.NOTIFICATION_ACTION_REPLY]
-        val responseSet = context.resources.getStringArray(R.array.qk_responses)
-        val remoteInput = RemoteInput.Builder("body")
-                .setLabel(title)
-
-        if (Build.VERSION.SDK_INT < Build.VERSION_CODES.P) {
-            remoteInput.setChoices(responseSet)
-        }
-
-        return NotificationCompat.Action.Builder(R.drawable.ic_reply_white_24dp, title, replyPI)
-                .setSemanticAction(NotificationCompat.Action.SEMANTIC_ACTION_REPLY)
-                .addRemoteInput(remoteInput.build())
-                .build()
-    }
-
-    /**
-     * Creates a notification channel for the given conversation
-     */
-    override fun createNotificationChannel(threadId: Long) {
-
-        // Only proceed if the android version supports notification channels, and the channel hasn't
-        // already been created
-        if (Build.VERSION.SDK_INT < Build.VERSION_CODES.O || getNotificationChannel(threadId) != null) {
-            return
-        }
-
-        val channel = when (threadId) {
-            0L -> NotificationChannel(DEFAULT_CHANNEL_ID, "Default", NotificationManager.IMPORTANCE_HIGH).apply {
-                enableLights(true)
-                lightColor = Color.WHITE
-                enableVibration(true)
-                vibrationPattern = VIBRATE_PATTERN
-            }
-
-            else -> {
-                val conversation = conversationRepo.getConversation(threadId) ?: return
-                val channelId = buildNotificationChannelId(threadId)
-                val title = conversation.getTitle()
-                NotificationChannel(channelId, title, NotificationManager.IMPORTANCE_HIGH).apply {
-                    enableLights(true)
-                    lightColor = Color.WHITE
-                    enableVibration(true)
-                    vibrationPattern = VIBRATE_PATTERN
-                    lockscreenVisibility = Notification.VISIBILITY_PUBLIC
-                    setSound(prefs.ringtone().get().let(Uri::parse), AudioAttributes.Builder()
-                            .setUsage(AudioAttributes.USAGE_NOTIFICATION)
-                            .setContentType(AudioAttributes.CONTENT_TYPE_SPEECH)
-                            .build())
-                }
-            }
-        }
-
-        notificationManager.createNotificationChannel(channel)
-    }
-
-    /**
-     * Returns the notification channel for the given conversation, or null if it doesn't exist
-     */
-    private fun getNotificationChannel(threadId: Long): NotificationChannel? {
-        val channelId = buildNotificationChannelId(threadId)
-
-        if (Build.VERSION.SDK_INT >= Build.VERSION_CODES.O) {
-            return notificationManager.notificationChannels
-                    .find { channel -> channel.id == channelId }
-        }
-
-        return null
-    }
-
-    /**
-     * Returns the channel id that should be used for a notification based on the threadId
-     *
-     * If a notification channel for the conversation exists, use the id for that. Otherwise return
-     * the default channel id
-     */
-    private fun getChannelIdForNotification(threadId: Long): String {
-        if (Build.VERSION.SDK_INT >= Build.VERSION_CODES.O) {
-            return getNotificationChannel(threadId)?.id ?: DEFAULT_CHANNEL_ID
-        }
-
-        return DEFAULT_CHANNEL_ID
-    }
-
-    /**
-     * Formats a notification channel id for a given thread id, whether the channel exists or not
-     */
-    override fun buildNotificationChannelId(threadId: Long): String {
-        return when (threadId) {
-            0L -> DEFAULT_CHANNEL_ID
-            else -> "notifications_$threadId"
-        }
-    }
-
-    override fun getNotificationForBackup(): NotificationCompat.Builder {
-        if (Build.VERSION.SDK_INT >= 26) {
-            val name = context.getString(R.string.backup_notification_channel_name)
-            val importance = NotificationManager.IMPORTANCE_LOW
-            val channel = NotificationChannel(BACKUP_RESTORE_CHANNEL_ID, name, importance)
-            val notificationManager = context.getSystemService(NotificationManager::class.java)
-            notificationManager.createNotificationChannel(channel)
-        }
-
-        return NotificationCompat.Builder(context, BACKUP_RESTORE_CHANNEL_ID)
-                .setContentTitle(context.getString(R.string.backup_restoring))
-                .setShowWhen(false)
-                .setWhen(System.currentTimeMillis()) // Set this anyway in case it's shown
-                .setSmallIcon(R.drawable.ic_file_download_black_24dp)
-                .setColor(colors.theme().theme)
-                .setCategory(NotificationCompat.CATEGORY_PROGRESS)
-                .setPriority(NotificationCompat.PRIORITY_MIN)
-                .setProgress(0, 0, true)
-                .setOngoing(true)
-    }
-
+/*
+ * Copyright (C) 2017 Moez Bhatti <moez.bhatti@gmail.com>
+ *
+ * This file is part of QKSMS.
+ *
+ * QKSMS is free software: you can redistribute it and/or modify
+ * it under the terms of the GNU General Public License as published by
+ * the Free Software Foundation, either version 3 of the License, or
+ * (at your option) any later version.
+ *
+ * QKSMS is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+ * GNU General Public License for more details.
+ *
+ * You should have received a copy of the GNU General Public License
+ * along with QKSMS.  If not, see <http://www.gnu.org/licenses/>.
+ */
+package com.moez.QKSMS.common.util
+
+import android.app.Notification
+import android.app.NotificationChannel
+import android.app.NotificationManager
+import android.app.PendingIntent
+import android.content.ContentUris
+import android.content.Context
+import android.content.Intent
+import android.graphics.Color
+import android.media.AudioAttributes
+import android.net.Uri
+import android.os.Build
+import android.os.PowerManager
+import android.provider.ContactsContract
+import androidx.core.app.NotificationCompat
+import androidx.core.app.NotificationManagerCompat
+import androidx.core.app.Person
+import androidx.core.app.RemoteInput
+import androidx.core.app.TaskStackBuilder
+import androidx.core.content.getSystemService
+import androidx.core.graphics.drawable.IconCompat
+import com.moez.QKSMS.R
+import com.moez.QKSMS.common.util.extensions.dpToPx
+import com.moez.QKSMS.extensions.isImage
+import com.moez.QKSMS.feature.compose.ComposeActivity
+import com.moez.QKSMS.feature.qkreply.QkReplyActivity
+import com.moez.QKSMS.manager.PermissionManager
+import com.moez.QKSMS.mapper.CursorToPartImpl
+import com.moez.QKSMS.receiver.BlockThreadReceiver
+import com.moez.QKSMS.receiver.DeleteMessagesReceiver
+import com.moez.QKSMS.receiver.MarkArchivedReceiver
+import com.moez.QKSMS.receiver.MarkReadReceiver
+import com.moez.QKSMS.receiver.MarkSeenReceiver
+import com.moez.QKSMS.receiver.RemoteMessagingReceiver
+import com.moez.QKSMS.repository.ConversationRepository
+import com.moez.QKSMS.repository.MessageRepository
+import com.moez.QKSMS.util.GlideApp
+import com.moez.QKSMS.util.PhoneNumberUtils
+import com.moez.QKSMS.util.Preferences
+import com.moez.QKSMS.util.tryOrNull
+import javax.inject.Inject
+import javax.inject.Singleton
+
+@Singleton
+class NotificationManagerImpl @Inject constructor(
+    private val context: Context,
+    private val colors: Colors,
+    private val conversationRepo: ConversationRepository,
+    private val prefs: Preferences,
+    private val messageRepo: MessageRepository,
+    private val permissions: PermissionManager,
+    private val phoneNumberUtils: PhoneNumberUtils
+) : com.moez.QKSMS.manager.NotificationManager {
+
+    companion object {
+        const val DEFAULT_CHANNEL_ID = "notifications_default"
+        const val BACKUP_RESTORE_CHANNEL_ID = "notifications_backup_restore"
+
+        val VIBRATE_PATTERN = longArrayOf(0, 200, 0, 200)
+    }
+
+    private val notificationManager = context.getSystemService(Context.NOTIFICATION_SERVICE) as NotificationManager
+
+    init {
+        // Make sure the default channel has been initialized
+        createNotificationChannel()
+    }
+
+    /**
+     * Updates the notification for a particular conversation
+     */
+    override fun update(threadId: Long) {
+        // If notifications are disabled, don't do anything
+        if (!prefs.notifications(threadId).get()) {
+            return
+        }
+
+        val messages = messageRepo.getUnreadUnseenMessages(threadId)
+
+        // If there are no messages to be displayed, make sure that the notification is dismissed
+        if (messages.isEmpty()) {
+            notificationManager.cancel(threadId.toInt())
+            notificationManager.cancel(threadId.toInt() + 100000)
+            return
+        }
+
+        val conversation = conversationRepo.getConversation(threadId) ?: return
+        val lastRecipient = conversation.lastMessage?.let { lastMessage ->
+            conversation.recipients.find { recipient ->
+                phoneNumberUtils.compare(recipient.address, lastMessage.address)
+            }
+        } ?: conversation.recipients.firstOrNull()
+
+        val contentIntent = Intent(context, ComposeActivity::class.java).putExtra("threadId", threadId)
+        val taskStackBuilder = TaskStackBuilder.create(context)
+                .addParentStack(ComposeActivity::class.java)
+                .addNextIntent(contentIntent)
+        val contentPI = taskStackBuilder.getPendingIntent(threadId.toInt(), PendingIntent.FLAG_UPDATE_CURRENT)
+
+        val seenIntent = Intent(context, MarkSeenReceiver::class.java).putExtra("threadId", threadId)
+        val seenPI = PendingIntent.getBroadcast(context, threadId.toInt(), seenIntent,
+                PendingIntent.FLAG_UPDATE_CURRENT)
+
+        // We can't store a null preference, so map it to a null Uri if the pref string is empty
+        val ringtone = prefs.ringtone(threadId).get()
+                .takeIf { it.isNotEmpty() }
+                ?.let(Uri::parse)
+                ?.also { uri ->
+                    // https://commonsware.com/blog/2016/09/07/notifications-sounds-android-7p0-aggravation.html
+                    context.grantUriPermission("com.android.systemui", uri, Intent.FLAG_GRANT_READ_URI_PERMISSION)
+                }
+
+        val notification = NotificationCompat.Builder(context, getChannelIdForNotification(threadId))
+                .setCategory(NotificationCompat.CATEGORY_MESSAGE)
+                .setColor(colors.theme(lastRecipient).theme)
+                .setPriority(NotificationCompat.PRIORITY_MAX)
+                .setSmallIcon(R.drawable.ic_notification)
+                .setNumber(messages.size)
+                .setAutoCancel(true)
+                .setContentIntent(contentPI)
+                .setDeleteIntent(seenPI)
+                .setSound(ringtone)
+                .setLights(Color.WHITE, 500, 2000)
+                .setWhen(conversation.lastMessage?.date ?: System.currentTimeMillis())
+                .setVibrate(if (prefs.vibration(threadId).get()) VIBRATE_PATTERN else longArrayOf(0))
+
+        // Tell the notification if it's a group message
+        val messagingStyle = NotificationCompat.MessagingStyle("Me")
+        if (conversation.recipients.size >= 2) {
+            messagingStyle.isGroupConversation = true
+            messagingStyle.conversationTitle = conversation.getTitle()
+        }
+
+        // Add the messages to the notification
+        messages.forEach { message ->
+            val person = Person.Builder()
+
+            if (!message.isMe()) {
+                val recipient = conversation.recipients.find { recipient ->
+                    phoneNumberUtils.compare(recipient.address, message.address)
+                }
+
+                person.setName(recipient?.getDisplayName() ?: message.address)
+                person.setIcon(GlideApp.with(context)
+                        .asBitmap()
+                        .circleCrop()
+                        .load(recipient?.contact?.photoUri)
+                        .submit(64.dpToPx(context), 64.dpToPx(context))
+                        .let { futureGet -> tryOrNull(false) { futureGet.get() } }
+                        ?.let(IconCompat::createWithBitmap))
+
+                recipient?.contact
+                        ?.let { contact -> "${ContactsContract.Contacts.CONTENT_LOOKUP_URI}/${contact.lookupKey}" }
+                        ?.let(person::setUri)
+            }
+
+            NotificationCompat.MessagingStyle.Message(message.getSummary(), message.date, person.build()).apply {
+                message.parts.firstOrNull { it.isImage() }?.let { part ->
+                    setData(part.type, ContentUris.withAppendedId(CursorToPartImpl.CONTENT_URI, part.id))
+                }
+                messagingStyle.addMessage(this)
+            }
+        }
+
+        // Set the large icon
+        val avatar = conversation.recipients.takeIf { it.size == 1 }
+                ?.first()?.contact?.photoUri
+                ?.let { photoUri ->
+                    GlideApp.with(context)
+                            .asBitmap()
+                            .circleCrop()
+                            .load(photoUri)
+                            .submit(64.dpToPx(context), 64.dpToPx(context))
+                }
+                ?.let { futureGet -> tryOrNull(false) { futureGet.get() } }
+
+        // Bind the notification contents based on the notification preview mode
+        when (prefs.notificationPreviews(threadId).get()) {
+            Preferences.NOTIFICATION_PREVIEWS_ALL -> {
+                notification
+                        .setLargeIcon(avatar)
+                        .setStyle(messagingStyle)
+            }
+
+            Preferences.NOTIFICATION_PREVIEWS_NAME -> {
+                notification
+                        .setLargeIcon(avatar)
+                        .setContentTitle(conversation.getTitle())
+                        .setContentText(context.resources.getQuantityString(
+                                R.plurals.notification_new_messages, messages.size, messages.size))
+            }
+
+            Preferences.NOTIFICATION_PREVIEWS_NONE -> {
+                notification
+                        .setContentTitle(context.getString(R.string.app_name))
+                        .setContentText(context.resources.getQuantityString(
+                                R.plurals.notification_new_messages, messages.size, messages.size))
+            }
+        }
+
+        // Add all of the people from this conversation to the notification, so that the system can
+        // appropriately bypass DND mode
+        conversation.recipients.forEach { recipient ->
+            notification.addPerson("tel:${recipient.address}")
+        }
+
+        // Add the action buttons
+        val actionLabels = context.resources.getStringArray(R.array.notification_actions)
+        listOf(prefs.notifAction1, prefs.notifAction2, prefs.notifAction3)
+                .map { preference -> preference.get() }
+                .distinct()
+                .mapNotNull { action ->
+                    when (action) {
+                        Preferences.NOTIFICATION_ACTION_ARCHIVE -> {
+                            val intent = Intent(context, MarkArchivedReceiver::class.java).putExtra("threadId", threadId)
+                            val pi = PendingIntent.getBroadcast(context, threadId.toInt(), intent,
+                                    PendingIntent.FLAG_UPDATE_CURRENT)
+                            NotificationCompat.Action.Builder(R.drawable.ic_archive_white_24dp, actionLabels[action], pi)
+                                    .setSemanticAction(NotificationCompat.Action.SEMANTIC_ACTION_ARCHIVE).build()
+                        }
+
+                        Preferences.NOTIFICATION_ACTION_DELETE -> {
+                            val messageIds = messages.map { it.id }.toLongArray()
+                            val intent = Intent(context, DeleteMessagesReceiver::class.java)
+                                    .putExtra("threadId", threadId)
+                                    .putExtra("messageIds", messageIds)
+                            val pi = PendingIntent.getBroadcast(context, threadId.toInt(), intent,
+                                    PendingIntent.FLAG_UPDATE_CURRENT)
+                            NotificationCompat.Action.Builder(R.drawable.ic_delete_white_24dp, actionLabels[action], pi)
+                                    .setSemanticAction(NotificationCompat.Action.SEMANTIC_ACTION_DELETE).build()
+                        }
+
+                        Preferences.NOTIFICATION_ACTION_BLOCK -> {
+                            val intent = Intent(context, BlockThreadReceiver::class.java).putExtra("threadId", threadId)
+                            val pi = PendingIntent.getBroadcast(context, threadId.toInt(), intent,
+                                    PendingIntent.FLAG_UPDATE_CURRENT)
+                            NotificationCompat.Action.Builder(R.drawable.ic_block_white_24dp, actionLabels[action], pi)
+                                    .setSemanticAction(NotificationCompat.Action.SEMANTIC_ACTION_MUTE).build()
+                        }
+
+                        Preferences.NOTIFICATION_ACTION_READ -> {
+                            val intent = Intent(context, MarkReadReceiver::class.java).putExtra("threadId", threadId)
+                            val pi = PendingIntent.getBroadcast(context, threadId.toInt(), intent,
+                                    PendingIntent.FLAG_UPDATE_CURRENT)
+                            NotificationCompat.Action.Builder(R.drawable.ic_check_white_24dp, actionLabels[action], pi)
+                                    .setSemanticAction(NotificationCompat.Action.SEMANTIC_ACTION_MARK_AS_READ).build()
+                        }
+
+                        Preferences.NOTIFICATION_ACTION_REPLY -> {
+                            if (Build.VERSION.SDK_INT >= 24) {
+                                getReplyAction(threadId)
+                            } else {
+                                val intent = Intent(context, QkReplyActivity::class.java).putExtra("threadId", threadId)
+                                val pi = PendingIntent.getActivity(context, threadId.toInt(), intent,
+                                        PendingIntent.FLAG_UPDATE_CURRENT)
+                                NotificationCompat.Action
+                                        .Builder(R.drawable.ic_reply_white_24dp, actionLabels[action], pi)
+                                        .setSemanticAction(NotificationCompat.Action.SEMANTIC_ACTION_REPLY).build()
+                            }
+                        }
+
+                        Preferences.NOTIFICATION_ACTION_CALL -> {
+                            val address = conversation.recipients[0]?.address
+                            val intentAction = if (permissions.hasCalling()) Intent.ACTION_CALL else Intent.ACTION_DIAL
+                            val intent = Intent(intentAction, Uri.parse("tel:$address"))
+                            val pi = PendingIntent.getActivity(context, threadId.toInt(), intent,
+                                    PendingIntent.FLAG_UPDATE_CURRENT)
+                            NotificationCompat.Action.Builder(R.drawable.ic_call_white_24dp, actionLabels[action], pi)
+                                    .setSemanticAction(NotificationCompat.Action.SEMANTIC_ACTION_CALL).build()
+                        }
+
+                        else -> null
+                    }
+                }
+                .forEach { notification.addAction(it) }
+
+        if (prefs.qkreply.get()) {
+            notification.priority = NotificationCompat.PRIORITY_DEFAULT
+
+            val intent = Intent(context, QkReplyActivity::class.java)
+                    .putExtra("threadId", threadId)
+                    .addFlags(Intent.FLAG_ACTIVITY_NEW_TASK)
+
+            context.startActivity(intent)
+        }
+
+        notificationManager.notify(threadId.toInt(), notification.build())
+
+        // Wake screen
+        if (prefs.wakeScreen(threadId).get()) {
+            context.getSystemService<PowerManager>()?.let { powerManager ->
+                if (!powerManager.isInteractive) {
+                    val flags = PowerManager.SCREEN_DIM_WAKE_LOCK or PowerManager.ACQUIRE_CAUSES_WAKEUP
+                    val wakeLock = powerManager.newWakeLock(flags, context.packageName)
+                    wakeLock.acquire(5000)
+                }
+            }
+        }
+    }
+
+    override fun notifyFailed(msgId: Long) {
+        val message = messageRepo.getMessage(msgId)
+
+        if (message == null || !message.isFailedMessage()) {
+            return
+        }
+
+        val conversation = conversationRepo.getConversation(message.threadId) ?: return
+        val lastRecipient = conversation.lastMessage?.let { lastMessage ->
+            conversation.recipients.find { recipient ->
+                phoneNumberUtils.compare(recipient.address, lastMessage.address)
+            }
+        } ?: conversation.recipients.firstOrNull()
+
+        val threadId = conversation.id
+
+        val contentIntent = Intent(context, ComposeActivity::class.java).putExtra("threadId", threadId)
+        val taskStackBuilder = TaskStackBuilder.create(context)
+            .addParentStack(ComposeActivity::class.java)
+            .addNextIntent(contentIntent)
+        val contentPI = taskStackBuilder.getPendingIntent(threadId.toInt(), PendingIntent.FLAG_UPDATE_CURRENT)
+
+        val notification = NotificationCompat.Builder(context, getChannelIdForNotification(threadId))
+                .setContentTitle(context.getString(R.string.notification_message_failed_title))
+                .setContentText(context.getString(R.string.notification_message_failed_text, conversation.getTitle()))
+                .setColor(colors.theme(lastRecipient).theme)
+                .setPriority(NotificationManagerCompat.IMPORTANCE_MAX)
+                .setSmallIcon(R.drawable.ic_notification_failed)
+                .setAutoCancel(true)
+                .setContentIntent(contentPI)
+                .setSound(Uri.parse(prefs.ringtone(threadId).get()))
+                .setLights(Color.WHITE, 500, 2000)
+                .setVibrate(if (prefs.vibration(threadId).get()) VIBRATE_PATTERN else longArrayOf(0))
+
+        notificationManager.notify(threadId.toInt() + 100000, notification.build())
+    }
+
+    private fun getReplyAction(threadId: Long): NotificationCompat.Action {
+        val replyIntent = Intent(context, RemoteMessagingReceiver::class.java).putExtra("threadId", threadId)
+        val replyPI = PendingIntent.getBroadcast(context, threadId.toInt(), replyIntent,
+                PendingIntent.FLAG_UPDATE_CURRENT)
+
+        val title = context.resources.getStringArray(R.array.notification_actions)[
+                Preferences.NOTIFICATION_ACTION_REPLY]
+        val responseSet = context.resources.getStringArray(R.array.qk_responses)
+        val remoteInput = RemoteInput.Builder("body")
+                .setLabel(title)
+
+        if (Build.VERSION.SDK_INT < Build.VERSION_CODES.P) {
+            remoteInput.setChoices(responseSet)
+        }
+
+        return NotificationCompat.Action.Builder(R.drawable.ic_reply_white_24dp, title, replyPI)
+                .setSemanticAction(NotificationCompat.Action.SEMANTIC_ACTION_REPLY)
+                .addRemoteInput(remoteInput.build())
+                .build()
+    }
+
+    /**
+     * Creates a notification channel for the given conversation
+     */
+    override fun createNotificationChannel(threadId: Long) {
+
+        // Only proceed if the android version supports notification channels, and the channel hasn't
+        // already been created
+        if (Build.VERSION.SDK_INT < Build.VERSION_CODES.O || getNotificationChannel(threadId) != null) {
+            return
+        }
+
+        val channel = when (threadId) {
+            0L -> NotificationChannel(DEFAULT_CHANNEL_ID, "Default", NotificationManager.IMPORTANCE_HIGH).apply {
+                enableLights(true)
+                lightColor = Color.WHITE
+                enableVibration(true)
+                vibrationPattern = VIBRATE_PATTERN
+            }
+
+            else -> {
+                val conversation = conversationRepo.getConversation(threadId) ?: return
+                val channelId = buildNotificationChannelId(threadId)
+                val title = conversation.getTitle()
+                NotificationChannel(channelId, title, NotificationManager.IMPORTANCE_HIGH).apply {
+                    enableLights(true)
+                    lightColor = Color.WHITE
+                    enableVibration(true)
+                    vibrationPattern = VIBRATE_PATTERN
+                    lockscreenVisibility = Notification.VISIBILITY_PUBLIC
+                    setSound(prefs.ringtone().get().let(Uri::parse), AudioAttributes.Builder()
+                            .setUsage(AudioAttributes.USAGE_NOTIFICATION)
+                            .setContentType(AudioAttributes.CONTENT_TYPE_SPEECH)
+                            .build())
+                }
+            }
+        }
+
+        notificationManager.createNotificationChannel(channel)
+    }
+
+    /**
+     * Returns the notification channel for the given conversation, or null if it doesn't exist
+     */
+    private fun getNotificationChannel(threadId: Long): NotificationChannel? {
+        val channelId = buildNotificationChannelId(threadId)
+
+        if (Build.VERSION.SDK_INT >= Build.VERSION_CODES.O) {
+            return notificationManager.notificationChannels
+                    .find { channel -> channel.id == channelId }
+        }
+
+        return null
+    }
+
+    /**
+     * Returns the channel id that should be used for a notification based on the threadId
+     *
+     * If a notification channel for the conversation exists, use the id for that. Otherwise return
+     * the default channel id
+     */
+    private fun getChannelIdForNotification(threadId: Long): String {
+        if (Build.VERSION.SDK_INT >= Build.VERSION_CODES.O) {
+            return getNotificationChannel(threadId)?.id ?: DEFAULT_CHANNEL_ID
+        }
+
+        return DEFAULT_CHANNEL_ID
+    }
+
+    /**
+     * Formats a notification channel id for a given thread id, whether the channel exists or not
+     */
+    override fun buildNotificationChannelId(threadId: Long): String {
+        return when (threadId) {
+            0L -> DEFAULT_CHANNEL_ID
+            else -> "notifications_$threadId"
+        }
+    }
+
+    override fun getNotificationForBackup(): NotificationCompat.Builder {
+        if (Build.VERSION.SDK_INT >= 26) {
+            val name = context.getString(R.string.backup_notification_channel_name)
+            val importance = NotificationManager.IMPORTANCE_LOW
+            val channel = NotificationChannel(BACKUP_RESTORE_CHANNEL_ID, name, importance)
+            val notificationManager = context.getSystemService(NotificationManager::class.java)
+            notificationManager.createNotificationChannel(channel)
+        }
+
+        return NotificationCompat.Builder(context, BACKUP_RESTORE_CHANNEL_ID)
+                .setContentTitle(context.getString(R.string.backup_restoring))
+                .setShowWhen(false)
+                .setWhen(System.currentTimeMillis()) // Set this anyway in case it's shown
+                .setSmallIcon(R.drawable.ic_file_download_black_24dp)
+                .setColor(colors.theme().theme)
+                .setCategory(NotificationCompat.CATEGORY_PROGRESS)
+                .setPriority(NotificationCompat.PRIORITY_MIN)
+                .setProgress(0, 0, true)
+                .setOngoing(true)
+    }
+
 }
\ No newline at end of file
diff --git a/presentation/src/main/java/com/moez/QKSMS/common/util/QkChooserTargetService.kt b/presentation/src/main/java/com/moez/QKSMS/common/util/QkChooserTargetService.kt
index 13cd86b0c..d36255e01 100644
--- a/presentation/src/main/java/com/moez/QKSMS/common/util/QkChooserTargetService.kt
+++ b/presentation/src/main/java/com/moez/QKSMS/common/util/QkChooserTargetService.kt
@@ -1,77 +1,77 @@
-/*
- * Copyright (C) 2017 Moez Bhatti <moez.bhatti@gmail.com>
- *
- * This file is part of QKSMS.
- *
- * QKSMS is free software: you can redistribute it and/or modify
- * it under the terms of the GNU General Public License as published by
- * the Free Software Foundation, either version 3 of the License, or
- * (at your option) any later version.
- *
- * QKSMS is distributed in the hope that it will be useful,
- * but WITHOUT ANY WARRANTY; without even the implied warranty of
- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
- * GNU General Public License for more details.
- *
- * You should have received a copy of the GNU General Public License
- * along with QKSMS.  If not, see <http://www.gnu.org/licenses/>.
- */
-package com.moez.QKSMS.common.util
-
-import android.content.ComponentName
-import android.content.IntentFilter
-import android.graphics.drawable.Icon
-import android.os.Build
-import android.service.chooser.ChooserTarget
-import android.service.chooser.ChooserTargetService
-import androidx.annotation.RequiresApi
-import androidx.core.os.bundleOf
-import com.moez.QKSMS.R
-import com.moez.QKSMS.feature.compose.ComposeActivity
-import com.moez.QKSMS.injection.appComponent
-import com.moez.QKSMS.model.Conversation
-import com.moez.QKSMS.repository.ConversationRepository
-import com.moez.QKSMS.util.GlideApp
-import com.moez.QKSMS.util.tryOrNull
-import javax.inject.Inject
-
-@RequiresApi(Build.VERSION_CODES.M)
-class QkChooserTargetService : ChooserTargetService() {
-
-    @Inject lateinit var conversationRepo: ConversationRepository
-
-    override fun onCreate() {
-        appComponent.inject(this)
-        super.onCreate()
-    }
-
-    override fun onGetChooserTargets(targetActivityName: ComponentName?, matchedFilter: IntentFilter?): List<ChooserTarget> {
-        return conversationRepo.getTopConversations()
-                .take(3)
-                .map(this::createShortcutForConversation)
-    }
-
-    private fun createShortcutForConversation(conversation: Conversation): ChooserTarget {
-        val icon = when (conversation.recipients.size) {
-            1 -> {
-                val photoUri = conversation.recipients.first()?.contact?.photoUri
-                val request = GlideApp.with(this)
-                        .asBitmap()
-                        .circleCrop()
-                        .load(photoUri)
-                        .submit()
-                val bitmap = tryOrNull(false) { request.get() }
-
-                if (bitmap != null) Icon.createWithBitmap(bitmap)
-                else Icon.createWithResource(this, R.mipmap.ic_shortcut_person)
-            }
-
-            else -> Icon.createWithResource(this, R.mipmap.ic_shortcut_people)
-        }
-
-        val componentName = ComponentName(this, ComposeActivity::class.java)
-
-        return ChooserTarget(conversation.getTitle(), icon, 1f, componentName, bundleOf("threadId" to conversation.id))
-    }
-
+/*
+ * Copyright (C) 2017 Moez Bhatti <moez.bhatti@gmail.com>
+ *
+ * This file is part of QKSMS.
+ *
+ * QKSMS is free software: you can redistribute it and/or modify
+ * it under the terms of the GNU General Public License as published by
+ * the Free Software Foundation, either version 3 of the License, or
+ * (at your option) any later version.
+ *
+ * QKSMS is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+ * GNU General Public License for more details.
+ *
+ * You should have received a copy of the GNU General Public License
+ * along with QKSMS.  If not, see <http://www.gnu.org/licenses/>.
+ */
+package com.moez.QKSMS.common.util
+
+import android.content.ComponentName
+import android.content.IntentFilter
+import android.graphics.drawable.Icon
+import android.os.Build
+import android.service.chooser.ChooserTarget
+import android.service.chooser.ChooserTargetService
+import androidx.annotation.RequiresApi
+import androidx.core.os.bundleOf
+import com.moez.QKSMS.R
+import com.moez.QKSMS.feature.compose.ComposeActivity
+import com.moez.QKSMS.injection.appComponent
+import com.moez.QKSMS.model.Conversation
+import com.moez.QKSMS.repository.ConversationRepository
+import com.moez.QKSMS.util.GlideApp
+import com.moez.QKSMS.util.tryOrNull
+import javax.inject.Inject
+
+@RequiresApi(Build.VERSION_CODES.M)
+class QkChooserTargetService : ChooserTargetService() {
+
+    @Inject lateinit var conversationRepo: ConversationRepository
+
+    override fun onCreate() {
+        appComponent.inject(this)
+        super.onCreate()
+    }
+
+    override fun onGetChooserTargets(targetActivityName: ComponentName?, matchedFilter: IntentFilter?): List<ChooserTarget> {
+        return conversationRepo.getTopConversations()
+                .take(3)
+                .map(this::createShortcutForConversation)
+    }
+
+    private fun createShortcutForConversation(conversation: Conversation): ChooserTarget {
+        val icon = when (conversation.recipients.size) {
+            1 -> {
+                val photoUri = conversation.recipients.first()?.contact?.photoUri
+                val request = GlideApp.with(this)
+                        .asBitmap()
+                        .circleCrop()
+                        .load(photoUri)
+                        .submit()
+                val bitmap = tryOrNull(false) { request.get() }
+
+                if (bitmap != null) Icon.createWithBitmap(bitmap)
+                else Icon.createWithResource(this, R.mipmap.ic_shortcut_person)
+            }
+
+            else -> Icon.createWithResource(this, R.mipmap.ic_shortcut_people)
+        }
+
+        val componentName = ComponentName(this, ComposeActivity::class.java)
+
+        return ChooserTarget(conversation.getTitle(), icon, 1f, componentName, bundleOf("threadId" to conversation.id))
+    }
+
 }
\ No newline at end of file
diff --git a/presentation/src/main/java/com/moez/QKSMS/common/util/ShortcutManagerImpl.kt b/presentation/src/main/java/com/moez/QKSMS/common/util/ShortcutManagerImpl.kt
index 7493b02f0..d27a67e7c 100644
--- a/presentation/src/main/java/com/moez/QKSMS/common/util/ShortcutManagerImpl.kt
+++ b/presentation/src/main/java/com/moez/QKSMS/common/util/ShortcutManagerImpl.kt
@@ -1,91 +1,91 @@
-/*
- * Copyright (C) 2017 Moez Bhatti <moez.bhatti@gmail.com>
- *
- * This file is part of QKSMS.
- *
- * QKSMS is free software: you can redistribute it and/or modify
- * it under the terms of the GNU General Public License as published by
- * the Free Software Foundation, either version 3 of the License, or
- * (at your option) any later version.
- *
- * QKSMS is distributed in the hope that it will be useful,
- * but WITHOUT ANY WARRANTY; without even the implied warranty of
- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
- * GNU General Public License for more details.
- *
- * You should have received a copy of the GNU General Public License
- * along with QKSMS.  If not, see <http://www.gnu.org/licenses/>.
- */
-package com.moez.QKSMS.common.util
-
-import android.annotation.TargetApi
-import android.content.Context
-import android.content.Intent
-import android.content.pm.ShortcutInfo
-import android.content.pm.ShortcutManager
-import android.graphics.drawable.Icon
-import android.os.Build
-import com.moez.QKSMS.R
-import com.moez.QKSMS.feature.compose.ComposeActivity
-import com.moez.QKSMS.model.Conversation
-import com.moez.QKSMS.repository.ConversationRepository
-import com.moez.QKSMS.repository.MessageRepository
-import com.moez.QKSMS.util.GlideApp
-import com.moez.QKSMS.util.tryOrNull
-import me.leolin.shortcutbadger.ShortcutBadger
-import javax.inject.Inject
-
-class ShortcutManagerImpl @Inject constructor(
-    private val context: Context,
-    private val conversationRepo: ConversationRepository,
-    private val messageRepo: MessageRepository
-) : com.moez.QKSMS.manager.ShortcutManager {
-
-    override fun updateBadge() {
-        val count = messageRepo.getUnreadCount().toInt()
-        ShortcutBadger.applyCount(context, count)
-    }
-
-    override fun updateShortcuts() {
-        if (Build.VERSION.SDK_INT >= Build.VERSION_CODES.N_MR1) {
-            val shortcutManager = context.getSystemService(Context.SHORTCUT_SERVICE) as ShortcutManager
-            if (shortcutManager.isRateLimitingActive) return
-
-            shortcutManager.dynamicShortcuts = conversationRepo.getTopConversations()
-                    .take(shortcutManager.maxShortcutCountPerActivity - shortcutManager.manifestShortcuts.size)
-                    .map { conversation -> createShortcutForConversation(conversation, shortcutManager) }
-        }
-    }
-
-    @TargetApi(25)
-    private fun createShortcutForConversation(conversation: Conversation, shortcutManager: ShortcutManager): ShortcutInfo {
-        val icon = when {
-            conversation.recipients.size == 1 -> {
-                val address = conversation.recipients.first()!!.address
-                val request = GlideApp.with(context)
-                        .asBitmap()
-                        .circleCrop()
-                        .load("tel:$address")
-                        .submit(shortcutManager.iconMaxWidth, shortcutManager.iconMaxHeight)
-                val bitmap = tryOrNull(false) { request.get() }
-
-                if (bitmap != null) Icon.createWithBitmap(bitmap)
-                else Icon.createWithResource(context, R.mipmap.ic_shortcut_person)
-            }
-
-            else -> Icon.createWithResource(context, R.mipmap.ic_shortcut_people)
-        }
-
-        val intent = Intent(context, ComposeActivity::class.java)
-                .setAction(Intent.ACTION_VIEW)
-                .putExtra("threadId", conversation.id)
-
-        return ShortcutInfo.Builder(context, "${conversation.id}")
-                .setShortLabel(conversation.getTitle())
-                .setLongLabel(conversation.getTitle())
-                .setIcon(icon)
-                .setIntent(intent)
-                .build()
-    }
-
+/*
+ * Copyright (C) 2017 Moez Bhatti <moez.bhatti@gmail.com>
+ *
+ * This file is part of QKSMS.
+ *
+ * QKSMS is free software: you can redistribute it and/or modify
+ * it under the terms of the GNU General Public License as published by
+ * the Free Software Foundation, either version 3 of the License, or
+ * (at your option) any later version.
+ *
+ * QKSMS is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+ * GNU General Public License for more details.
+ *
+ * You should have received a copy of the GNU General Public License
+ * along with QKSMS.  If not, see <http://www.gnu.org/licenses/>.
+ */
+package com.moez.QKSMS.common.util
+
+import android.annotation.TargetApi
+import android.content.Context
+import android.content.Intent
+import android.content.pm.ShortcutInfo
+import android.content.pm.ShortcutManager
+import android.graphics.drawable.Icon
+import android.os.Build
+import com.moez.QKSMS.R
+import com.moez.QKSMS.feature.compose.ComposeActivity
+import com.moez.QKSMS.model.Conversation
+import com.moez.QKSMS.repository.ConversationRepository
+import com.moez.QKSMS.repository.MessageRepository
+import com.moez.QKSMS.util.GlideApp
+import com.moez.QKSMS.util.tryOrNull
+import me.leolin.shortcutbadger.ShortcutBadger
+import javax.inject.Inject
+
+class ShortcutManagerImpl @Inject constructor(
+    private val context: Context,
+    private val conversationRepo: ConversationRepository,
+    private val messageRepo: MessageRepository
+) : com.moez.QKSMS.manager.ShortcutManager {
+
+    override fun updateBadge() {
+        val count = messageRepo.getUnreadCount().toInt()
+        ShortcutBadger.applyCount(context, count)
+    }
+
+    override fun updateShortcuts() {
+        if (Build.VERSION.SDK_INT >= Build.VERSION_CODES.N_MR1) {
+            val shortcutManager = context.getSystemService(Context.SHORTCUT_SERVICE) as ShortcutManager
+            if (shortcutManager.isRateLimitingActive) return
+
+            shortcutManager.dynamicShortcuts = conversationRepo.getTopConversations()
+                    .take(shortcutManager.maxShortcutCountPerActivity - shortcutManager.manifestShortcuts.size)
+                    .map { conversation -> createShortcutForConversation(conversation, shortcutManager) }
+        }
+    }
+
+    @TargetApi(25)
+    private fun createShortcutForConversation(conversation: Conversation, shortcutManager: ShortcutManager): ShortcutInfo {
+        val icon = when {
+            conversation.recipients.size == 1 -> {
+                val address = conversation.recipients.first()!!.address
+                val request = GlideApp.with(context)
+                        .asBitmap()
+                        .circleCrop()
+                        .load("tel:$address")
+                        .submit(shortcutManager.iconMaxWidth, shortcutManager.iconMaxHeight)
+                val bitmap = tryOrNull(false) { request.get() }
+
+                if (bitmap != null) Icon.createWithBitmap(bitmap)
+                else Icon.createWithResource(context, R.mipmap.ic_shortcut_person)
+            }
+
+            else -> Icon.createWithResource(context, R.mipmap.ic_shortcut_people)
+        }
+
+        val intent = Intent(context, ComposeActivity::class.java)
+                .setAction(Intent.ACTION_VIEW)
+                .putExtra("threadId", conversation.id)
+
+        return ShortcutInfo.Builder(context, "${conversation.id}")
+                .setShortLabel(conversation.getTitle())
+                .setLongLabel(conversation.getTitle())
+                .setIcon(icon)
+                .setIntent(intent)
+                .build()
+    }
+
 }
\ No newline at end of file
diff --git a/presentation/src/main/java/com/moez/QKSMS/common/util/TextViewStyler.kt b/presentation/src/main/java/com/moez/QKSMS/common/util/TextViewStyler.kt
index ccfd1f99d..f92a5ac98 100644
--- a/presentation/src/main/java/com/moez/QKSMS/common/util/TextViewStyler.kt
+++ b/presentation/src/main/java/com/moez/QKSMS/common/util/TextViewStyler.kt
@@ -1,201 +1,201 @@
-/*
- * Copyright (C) 2017 Moez Bhatti <moez.bhatti@gmail.com>
- *
- * This file is part of QKSMS.
- *
- * QKSMS is free software: you can redistribute it and/or modify
- * it under the terms of the GNU General Public License as published by
- * the Free Software Foundation, either version 3 of the License, or
- * (at your option) any later version.
- *
- * QKSMS is distributed in the hope that it will be useful,
- * but WITHOUT ANY WARRANTY; without even the implied warranty of
- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
- * GNU General Public License for more details.
- *
- * You should have received a copy of the GNU General Public License
- * along with QKSMS.  If not, see <http://www.gnu.org/licenses/>.
- */
-package com.moez.QKSMS.common.util
-
-import android.graphics.Typeface
-import android.os.Build
-import android.util.AttributeSet
-import android.widget.EditText
-import android.widget.TextView
-import com.moez.QKSMS.R
-import com.moez.QKSMS.common.util.TextViewStyler.Companion.SIZE_PRIMARY
-import com.moez.QKSMS.common.util.TextViewStyler.Companion.SIZE_SECONDARY
-import com.moez.QKSMS.common.util.TextViewStyler.Companion.SIZE_TERTIARY
-import com.moez.QKSMS.common.util.TextViewStyler.Companion.SIZE_TOOLBAR
-import com.moez.QKSMS.common.util.extensions.getColorCompat
-import com.moez.QKSMS.common.widget.QkEditText
-import com.moez.QKSMS.common.widget.QkTextView
-import com.moez.QKSMS.util.Preferences
-import javax.inject.Inject
-
-
-
-class TextViewStyler @Inject constructor(
-    private val prefs: Preferences,
-    private val colors: Colors,
-    private val fontProvider: FontProvider
-) {
-
-    companion object {
-        const val COLOR_THEME = 0
-        const val COLOR_PRIMARY_ON_THEME = 1
-        const val COLOR_SECONDARY_ON_THEME = 2
-        const val COLOR_TERTIARY_ON_THEME = 3
-
-        const val SIZE_PRIMARY = 0
-        const val SIZE_SECONDARY = 1
-        const val SIZE_TERTIARY = 2
-        const val SIZE_TOOLBAR = 3
-        const val SIZE_DIALOG = 4
-        const val SIZE_EMOJI = 5
-
-        fun applyEditModeAttributes(textView: TextView, attrs: AttributeSet?) {
-            textView.run {
-                var colorAttr = 0
-                var textSizeAttr = 0
-
-                when (this) {
-                    is QkTextView -> context.obtainStyledAttributes(attrs, R.styleable.QkTextView)?.run {
-                        colorAttr = getInt(R.styleable.QkTextView_textColor, -1)
-                        textSizeAttr = getInt(R.styleable.QkTextView_textSize, -1)
-                        recycle()
-                    }
-
-                    is QkEditText -> context.obtainStyledAttributes(attrs, R.styleable.QkEditText)?.run {
-                        colorAttr = getInt(R.styleable.QkEditText_textColor, -1)
-                        textSizeAttr = getInt(R.styleable.QkEditText_textSize, -1)
-                        recycle()
-                    }
-
-                    else -> return
-                }
-                setTextColor(when (colorAttr) {
-                    COLOR_PRIMARY_ON_THEME -> context.getColorCompat(R.color.textPrimaryDark)
-                    COLOR_SECONDARY_ON_THEME -> context.getColorCompat(R.color.textSecondaryDark)
-                    COLOR_TERTIARY_ON_THEME -> context.getColorCompat(R.color.textTertiaryDark)
-                    COLOR_THEME -> context.getColorCompat(R.color.tools_theme)
-                    else -> currentTextColor
-                })
-
-                textSize = when (textSizeAttr) {
-                    SIZE_PRIMARY -> 16f
-                    SIZE_SECONDARY -> 14f
-                    SIZE_TERTIARY -> 12f
-                    SIZE_TOOLBAR -> 20f
-                    SIZE_DIALOG -> 18f
-                    SIZE_EMOJI -> 32f
-                    else -> textSize / paint.density
-                }
-            }
-        }
-    }
-
-    fun applyAttributes(textView: TextView, attrs: AttributeSet?) {
-        var colorAttr = 0
-        var textSizeAttr = 0
-
-        if (!prefs.systemFont.get()) {
-            fontProvider.getLato { lato ->
-                textView.setTypeface(lato, textView.typeface?.style ?: Typeface.NORMAL)
-            }
-        }
-
-        when (textView) {
-            is QkTextView -> textView.context.obtainStyledAttributes(attrs, R.styleable.QkTextView).run {
-                colorAttr = getInt(R.styleable.QkTextView_textColor, -1)
-                textSizeAttr = getInt(R.styleable.QkTextView_textSize, -1)
-                recycle()
-            }
-
-            is QkEditText -> textView.context.obtainStyledAttributes(attrs, R.styleable.QkEditText).run {
-                colorAttr = getInt(R.styleable.QkEditText_textColor, -1)
-                textSizeAttr = getInt(R.styleable.QkEditText_textSize, -1)
-                recycle()
-            }
-
-            else -> return
-        }
-
-        when (colorAttr) {
-            COLOR_THEME -> textView.setTextColor(colors.theme().theme)
-            COLOR_PRIMARY_ON_THEME -> textView.setTextColor(colors.theme().textPrimary)
-            COLOR_SECONDARY_ON_THEME -> textView.setTextColor(colors.theme().textSecondary)
-            COLOR_TERTIARY_ON_THEME -> textView.setTextColor(colors.theme().textTertiary)
-        }
-
-        setTextSize(textView, textSizeAttr)
-
-        if (textView is EditText) {
-            val drawable = textView.resources.getDrawable(R.drawable.cursor).apply { setTint(colors.theme().theme) }
-            if (Build.VERSION.SDK_INT >= Build.VERSION_CODES.Q) {
-                textView.textCursorDrawable = drawable
-            }
-        }
-    }
-
-    /**
-     * @see SIZE_PRIMARY
-     * @see SIZE_SECONDARY
-     * @see SIZE_TERTIARY
-     * @see SIZE_TOOLBAR
-     */
-    fun setTextSize(textView: TextView, textSizeAttr: Int) {
-        val textSizePref = prefs.textSize.get()
-        when (textSizeAttr) {
-            SIZE_PRIMARY -> textView.textSize = when (textSizePref) {
-                Preferences.TEXT_SIZE_SMALL -> 14f
-                Preferences.TEXT_SIZE_NORMAL -> 16f
-                Preferences.TEXT_SIZE_LARGE -> 18f
-                Preferences.TEXT_SIZE_LARGER -> 20f
-                else -> 16f
-            }
-
-            SIZE_SECONDARY -> textView.textSize = when (textSizePref) {
-                Preferences.TEXT_SIZE_SMALL -> 12f
-                Preferences.TEXT_SIZE_NORMAL -> 14f
-                Preferences.TEXT_SIZE_LARGE -> 16f
-                Preferences.TEXT_SIZE_LARGER -> 18f
-                else -> 14f
-            }
-
-            SIZE_TERTIARY -> textView.textSize = when (textSizePref) {
-                Preferences.TEXT_SIZE_SMALL -> 10f
-                Preferences.TEXT_SIZE_NORMAL -> 12f
-                Preferences.TEXT_SIZE_LARGE -> 14f
-                Preferences.TEXT_SIZE_LARGER -> 16f
-                else -> 12f
-            }
-
-            SIZE_TOOLBAR -> textView.textSize = when (textSizePref) {
-                Preferences.TEXT_SIZE_SMALL -> 18f
-                Preferences.TEXT_SIZE_NORMAL -> 20f
-                Preferences.TEXT_SIZE_LARGE -> 22f
-                Preferences.TEXT_SIZE_LARGER -> 26f
-                else -> 20f
-            }
-
-            SIZE_DIALOG -> textView.textSize = when (textSizePref) {
-                Preferences.TEXT_SIZE_SMALL -> 16f
-                Preferences.TEXT_SIZE_NORMAL -> 18f
-                Preferences.TEXT_SIZE_LARGE -> 20f
-                Preferences.TEXT_SIZE_LARGER -> 24f
-                else -> 18f
-            }
-
-            SIZE_EMOJI -> textView.textSize = when (textSizePref) {
-                Preferences.TEXT_SIZE_SMALL -> 28f
-                Preferences.TEXT_SIZE_NORMAL -> 32f
-                Preferences.TEXT_SIZE_LARGE -> 36f
-                Preferences.TEXT_SIZE_LARGER -> 40f
-                else -> 32f
-            }
-        }
-    }
-
+/*
+ * Copyright (C) 2017 Moez Bhatti <moez.bhatti@gmail.com>
+ *
+ * This file is part of QKSMS.
+ *
+ * QKSMS is free software: you can redistribute it and/or modify
+ * it under the terms of the GNU General Public License as published by
+ * the Free Software Foundation, either version 3 of the License, or
+ * (at your option) any later version.
+ *
+ * QKSMS is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+ * GNU General Public License for more details.
+ *
+ * You should have received a copy of the GNU General Public License
+ * along with QKSMS.  If not, see <http://www.gnu.org/licenses/>.
+ */
+package com.moez.QKSMS.common.util
+
+import android.graphics.Typeface
+import android.os.Build
+import android.util.AttributeSet
+import android.widget.EditText
+import android.widget.TextView
+import com.moez.QKSMS.R
+import com.moez.QKSMS.common.util.TextViewStyler.Companion.SIZE_PRIMARY
+import com.moez.QKSMS.common.util.TextViewStyler.Companion.SIZE_SECONDARY
+import com.moez.QKSMS.common.util.TextViewStyler.Companion.SIZE_TERTIARY
+import com.moez.QKSMS.common.util.TextViewStyler.Companion.SIZE_TOOLBAR
+import com.moez.QKSMS.common.util.extensions.getColorCompat
+import com.moez.QKSMS.common.widget.QkEditText
+import com.moez.QKSMS.common.widget.QkTextView
+import com.moez.QKSMS.util.Preferences
+import javax.inject.Inject
+
+
+
+class TextViewStyler @Inject constructor(
+    private val prefs: Preferences,
+    private val colors: Colors,
+    private val fontProvider: FontProvider
+) {
+
+    companion object {
+        const val COLOR_THEME = 0
+        const val COLOR_PRIMARY_ON_THEME = 1
+        const val COLOR_SECONDARY_ON_THEME = 2
+        const val COLOR_TERTIARY_ON_THEME = 3
+
+        const val SIZE_PRIMARY = 0
+        const val SIZE_SECONDARY = 1
+        const val SIZE_TERTIARY = 2
+        const val SIZE_TOOLBAR = 3
+        const val SIZE_DIALOG = 4
+        const val SIZE_EMOJI = 5
+
+        fun applyEditModeAttributes(textView: TextView, attrs: AttributeSet?) {
+            textView.run {
+                var colorAttr = 0
+                var textSizeAttr = 0
+
+                when (this) {
+                    is QkTextView -> context.obtainStyledAttributes(attrs, R.styleable.QkTextView)?.run {
+                        colorAttr = getInt(R.styleable.QkTextView_textColor, -1)
+                        textSizeAttr = getInt(R.styleable.QkTextView_textSize, -1)
+                        recycle()
+                    }
+
+                    is QkEditText -> context.obtainStyledAttributes(attrs, R.styleable.QkEditText)?.run {
+                        colorAttr = getInt(R.styleable.QkEditText_textColor, -1)
+                        textSizeAttr = getInt(R.styleable.QkEditText_textSize, -1)
+                        recycle()
+                    }
+
+                    else -> return
+                }
+                setTextColor(when (colorAttr) {
+                    COLOR_PRIMARY_ON_THEME -> context.getColorCompat(R.color.textPrimaryDark)
+                    COLOR_SECONDARY_ON_THEME -> context.getColorCompat(R.color.textSecondaryDark)
+                    COLOR_TERTIARY_ON_THEME -> context.getColorCompat(R.color.textTertiaryDark)
+                    COLOR_THEME -> context.getColorCompat(R.color.tools_theme)
+                    else -> currentTextColor
+                })
+
+                textSize = when (textSizeAttr) {
+                    SIZE_PRIMARY -> 16f
+                    SIZE_SECONDARY -> 14f
+                    SIZE_TERTIARY -> 12f
+                    SIZE_TOOLBAR -> 20f
+                    SIZE_DIALOG -> 18f
+                    SIZE_EMOJI -> 32f
+                    else -> textSize / paint.density
+                }
+            }
+        }
+    }
+
+    fun applyAttributes(textView: TextView, attrs: AttributeSet?) {
+        var colorAttr = 0
+        var textSizeAttr = 0
+
+        if (!prefs.systemFont.get()) {
+            fontProvider.getLato { lato ->
+                textView.setTypeface(lato, textView.typeface?.style ?: Typeface.NORMAL)
+            }
+        }
+
+        when (textView) {
+            is QkTextView -> textView.context.obtainStyledAttributes(attrs, R.styleable.QkTextView).run {
+                colorAttr = getInt(R.styleable.QkTextView_textColor, -1)
+                textSizeAttr = getInt(R.styleable.QkTextView_textSize, -1)
+                recycle()
+            }
+
+            is QkEditText -> textView.context.obtainStyledAttributes(attrs, R.styleable.QkEditText).run {
+                colorAttr = getInt(R.styleable.QkEditText_textColor, -1)
+                textSizeAttr = getInt(R.styleable.QkEditText_textSize, -1)
+                recycle()
+            }
+
+            else -> return
+        }
+
+        when (colorAttr) {
+            COLOR_THEME -> textView.setTextColor(colors.theme().theme)
+            COLOR_PRIMARY_ON_THEME -> textView.setTextColor(colors.theme().textPrimary)
+            COLOR_SECONDARY_ON_THEME -> textView.setTextColor(colors.theme().textSecondary)
+            COLOR_TERTIARY_ON_THEME -> textView.setTextColor(colors.theme().textTertiary)
+        }
+
+        setTextSize(textView, textSizeAttr)
+
+        if (textView is EditText) {
+            val drawable = textView.resources.getDrawable(R.drawable.cursor).apply { setTint(colors.theme().theme) }
+            if (Build.VERSION.SDK_INT >= Build.VERSION_CODES.Q) {
+                textView.textCursorDrawable = drawable
+            }
+        }
+    }
+
+    /**
+     * @see SIZE_PRIMARY
+     * @see SIZE_SECONDARY
+     * @see SIZE_TERTIARY
+     * @see SIZE_TOOLBAR
+     */
+    fun setTextSize(textView: TextView, textSizeAttr: Int) {
+        val textSizePref = prefs.textSize.get()
+        when (textSizeAttr) {
+            SIZE_PRIMARY -> textView.textSize = when (textSizePref) {
+                Preferences.TEXT_SIZE_SMALL -> 14f
+                Preferences.TEXT_SIZE_NORMAL -> 16f
+                Preferences.TEXT_SIZE_LARGE -> 18f
+                Preferences.TEXT_SIZE_LARGER -> 20f
+                else -> 16f
+            }
+
+            SIZE_SECONDARY -> textView.textSize = when (textSizePref) {
+                Preferences.TEXT_SIZE_SMALL -> 12f
+                Preferences.TEXT_SIZE_NORMAL -> 14f
+                Preferences.TEXT_SIZE_LARGE -> 16f
+                Preferences.TEXT_SIZE_LARGER -> 18f
+                else -> 14f
+            }
+
+            SIZE_TERTIARY -> textView.textSize = when (textSizePref) {
+                Preferences.TEXT_SIZE_SMALL -> 10f
+                Preferences.TEXT_SIZE_NORMAL -> 12f
+                Preferences.TEXT_SIZE_LARGE -> 14f
+                Preferences.TEXT_SIZE_LARGER -> 16f
+                else -> 12f
+            }
+
+            SIZE_TOOLBAR -> textView.textSize = when (textSizePref) {
+                Preferences.TEXT_SIZE_SMALL -> 18f
+                Preferences.TEXT_SIZE_NORMAL -> 20f
+                Preferences.TEXT_SIZE_LARGE -> 22f
+                Preferences.TEXT_SIZE_LARGER -> 26f
+                else -> 20f
+            }
+
+            SIZE_DIALOG -> textView.textSize = when (textSizePref) {
+                Preferences.TEXT_SIZE_SMALL -> 16f
+                Preferences.TEXT_SIZE_NORMAL -> 18f
+                Preferences.TEXT_SIZE_LARGE -> 20f
+                Preferences.TEXT_SIZE_LARGER -> 24f
+                else -> 18f
+            }
+
+            SIZE_EMOJI -> textView.textSize = when (textSizePref) {
+                Preferences.TEXT_SIZE_SMALL -> 28f
+                Preferences.TEXT_SIZE_NORMAL -> 32f
+                Preferences.TEXT_SIZE_LARGE -> 36f
+                Preferences.TEXT_SIZE_LARGER -> 40f
+                else -> 32f
+            }
+        }
+    }
+
 }
\ No newline at end of file
diff --git a/presentation/src/main/java/com/moez/QKSMS/common/util/extensions/ActivityExtensions.kt b/presentation/src/main/java/com/moez/QKSMS/common/util/extensions/ActivityExtensions.kt
index 3d4f59f59..27e5895d3 100644
--- a/presentation/src/main/java/com/moez/QKSMS/common/util/extensions/ActivityExtensions.kt
+++ b/presentation/src/main/java/com/moez/QKSMS/common/util/extensions/ActivityExtensions.kt
@@ -1,32 +1,32 @@
-/*
- * Copyright (C) 2019 Moez Bhatti <moez.bhatti@gmail.com>
- *
- * This file is part of QKSMS.
- *
- * QKSMS is free software: you can redistribute it and/or modify
- * it under the terms of the GNU General Public License as published by
- * the Free Software Foundation, either version 3 of the License, or
- * (at your option) any later version.
- *
- * QKSMS is distributed in the hope that it will be useful,
- * but WITHOUT ANY WARRANTY; without even the implied warranty of
- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
- * GNU General Public License for more details.
- *
- * You should have received a copy of the GNU General Public License
- * along with QKSMS.  If not, see <http://www.gnu.org/licenses/>.
- */
-package com.moez.QKSMS.common.util.extensions
-
-import android.app.Activity
-import android.content.Context
-import android.view.inputmethod.InputMethodManager
-
-fun Activity.dismissKeyboard() {
-    window.currentFocus?.let { focus ->
-        val imm = getSystemService(Context.INPUT_METHOD_SERVICE) as InputMethodManager
-        imm.hideSoftInputFromWindow(focus.windowToken, 0)
-
-        focus.clearFocus()
-    }
-}
+/*
+ * Copyright (C) 2019 Moez Bhatti <moez.bhatti@gmail.com>
+ *
+ * This file is part of QKSMS.
+ *
+ * QKSMS is free software: you can redistribute it and/or modify
+ * it under the terms of the GNU General Public License as published by
+ * the Free Software Foundation, either version 3 of the License, or
+ * (at your option) any later version.
+ *
+ * QKSMS is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+ * GNU General Public License for more details.
+ *
+ * You should have received a copy of the GNU General Public License
+ * along with QKSMS.  If not, see <http://www.gnu.org/licenses/>.
+ */
+package com.moez.QKSMS.common.util.extensions
+
+import android.app.Activity
+import android.content.Context
+import android.view.inputmethod.InputMethodManager
+
+fun Activity.dismissKeyboard() {
+    window.currentFocus?.let { focus ->
+        val imm = getSystemService(Context.INPUT_METHOD_SERVICE) as InputMethodManager
+        imm.hideSoftInputFromWindow(focus.windowToken, 0)
+
+        focus.clearFocus()
+    }
+}
diff --git a/presentation/src/main/java/com/moez/QKSMS/common/util/extensions/AdapterExtensions.kt b/presentation/src/main/java/com/moez/QKSMS/common/util/extensions/AdapterExtensions.kt
index 50a808db5..589c77430 100644
--- a/presentation/src/main/java/com/moez/QKSMS/common/util/extensions/AdapterExtensions.kt
+++ b/presentation/src/main/java/com/moez/QKSMS/common/util/extensions/AdapterExtensions.kt
@@ -1,54 +1,54 @@
-/*
- * Copyright (C) 2017 Moez Bhatti <moez.bhatti@gmail.com>
- *
- * This file is part of QKSMS.
- *
- * QKSMS is free software: you can redistribute it and/or modify
- * it under the terms of the GNU General Public License as published by
- * the Free Software Foundation, either version 3 of the License, or
- * (at your option) any later version.
- *
- * QKSMS is distributed in the hope that it will be useful,
- * but WITHOUT ANY WARRANTY; without even the implied warranty of
- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
- * GNU General Public License for more details.
- *
- * You should have received a copy of the GNU General Public License
- * along with QKSMS.  If not, see <http://www.gnu.org/licenses/>.
- */
-package com.moez.QKSMS.common.util.extensions
-
-import androidx.recyclerview.widget.LinearLayoutManager
-import androidx.recyclerview.widget.RecyclerView
-
-fun RecyclerView.Adapter<*>.autoScrollToStart(recyclerView: RecyclerView) {
-    registerAdapterDataObserver(object : RecyclerView.AdapterDataObserver() {
-        override fun onItemRangeInserted(positionStart: Int, itemCount: Int) {
-            val layoutManager = recyclerView.layoutManager as? LinearLayoutManager ?: return
-
-            if (layoutManager.stackFromEnd) {
-                if (positionStart > 0) {
-                    notifyItemChanged(positionStart - 1)
-                }
-
-                val lastPosition = layoutManager.findLastVisibleItemPosition()
-                if (positionStart >= getItemCount() - 1 && lastPosition == positionStart - 1) {
-                    recyclerView.scrollToPosition(positionStart)
-                }
-            } else {
-                val firstVisiblePosition = layoutManager.findFirstVisibleItemPosition()
-                if (firstVisiblePosition == 0) {
-                    recyclerView.scrollToPosition(positionStart)
-                }
-            }
-        }
-
-        override fun onItemRangeChanged(positionStart: Int, itemCount: Int) {
-            val layoutManager = recyclerView.layoutManager as? LinearLayoutManager ?: return
-
-            if (!layoutManager.stackFromEnd) {
-                onItemRangeInserted(positionStart, itemCount)
-            }
-        }
-    })
+/*
+ * Copyright (C) 2017 Moez Bhatti <moez.bhatti@gmail.com>
+ *
+ * This file is part of QKSMS.
+ *
+ * QKSMS is free software: you can redistribute it and/or modify
+ * it under the terms of the GNU General Public License as published by
+ * the Free Software Foundation, either version 3 of the License, or
+ * (at your option) any later version.
+ *
+ * QKSMS is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+ * GNU General Public License for more details.
+ *
+ * You should have received a copy of the GNU General Public License
+ * along with QKSMS.  If not, see <http://www.gnu.org/licenses/>.
+ */
+package com.moez.QKSMS.common.util.extensions
+
+import androidx.recyclerview.widget.LinearLayoutManager
+import androidx.recyclerview.widget.RecyclerView
+
+fun RecyclerView.Adapter<*>.autoScrollToStart(recyclerView: RecyclerView) {
+    registerAdapterDataObserver(object : RecyclerView.AdapterDataObserver() {
+        override fun onItemRangeInserted(positionStart: Int, itemCount: Int) {
+            val layoutManager = recyclerView.layoutManager as? LinearLayoutManager ?: return
+
+            if (layoutManager.stackFromEnd) {
+                if (positionStart > 0) {
+                    notifyItemChanged(positionStart - 1)
+                }
+
+                val lastPosition = layoutManager.findLastVisibleItemPosition()
+                if (positionStart >= getItemCount() - 1 && lastPosition == positionStart - 1) {
+                    recyclerView.scrollToPosition(positionStart)
+                }
+            } else {
+                val firstVisiblePosition = layoutManager.findFirstVisibleItemPosition()
+                if (firstVisiblePosition == 0) {
+                    recyclerView.scrollToPosition(positionStart)
+                }
+            }
+        }
+
+        override fun onItemRangeChanged(positionStart: Int, itemCount: Int) {
+            val layoutManager = recyclerView.layoutManager as? LinearLayoutManager ?: return
+
+            if (!layoutManager.stackFromEnd) {
+                onItemRangeInserted(positionStart, itemCount)
+            }
+        }
+    })
 }
\ No newline at end of file
diff --git a/presentation/src/main/java/com/moez/QKSMS/common/util/extensions/CalendarExtensions.kt b/presentation/src/main/java/com/moez/QKSMS/common/util/extensions/CalendarExtensions.kt
index 6228b47ed..736044d48 100644
--- a/presentation/src/main/java/com/moez/QKSMS/common/util/extensions/CalendarExtensions.kt
+++ b/presentation/src/main/java/com/moez/QKSMS/common/util/extensions/CalendarExtensions.kt
@@ -1,33 +1,33 @@
-/*
- * Copyright (C) 2017 Moez Bhatti <moez.bhatti@gmail.com>
- *
- * This file is part of QKSMS.
- *
- * QKSMS is free software: you can redistribute it and/or modify
- * it under the terms of the GNU General Public License as published by
- * the Free Software Foundation, either version 3 of the License, or
- * (at your option) any later version.
- *
- * QKSMS is distributed in the hope that it will be useful,
- * but WITHOUT ANY WARRANTY; without even the implied warranty of
- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
- * GNU General Public License for more details.
- *
- * You should have received a copy of the GNU General Public License
- * along with QKSMS.  If not, see <http://www.gnu.org/licenses/>.
- */
-package com.moez.QKSMS.common.util.extensions
-
-import java.util.*
-
-fun Calendar.isSameDay(other: Calendar): Boolean {
-    return get(Calendar.YEAR) == other.get(Calendar.YEAR) && get(Calendar.DAY_OF_YEAR) == other.get(Calendar.DAY_OF_YEAR)
-}
-
-fun Calendar.isSameWeek(other: Calendar): Boolean {
-    return get(Calendar.YEAR) == other.get(Calendar.YEAR) && get(Calendar.WEEK_OF_YEAR) == other.get(Calendar.WEEK_OF_YEAR)
-}
-
-fun Calendar.isSameYear(other: Calendar): Boolean {
-    return get(Calendar.YEAR) == other.get(Calendar.YEAR)
+/*
+ * Copyright (C) 2017 Moez Bhatti <moez.bhatti@gmail.com>
+ *
+ * This file is part of QKSMS.
+ *
+ * QKSMS is free software: you can redistribute it and/or modify
+ * it under the terms of the GNU General Public License as published by
+ * the Free Software Foundation, either version 3 of the License, or
+ * (at your option) any later version.
+ *
+ * QKSMS is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+ * GNU General Public License for more details.
+ *
+ * You should have received a copy of the GNU General Public License
+ * along with QKSMS.  If not, see <http://www.gnu.org/licenses/>.
+ */
+package com.moez.QKSMS.common.util.extensions
+
+import java.util.*
+
+fun Calendar.isSameDay(other: Calendar): Boolean {
+    return get(Calendar.YEAR) == other.get(Calendar.YEAR) && get(Calendar.DAY_OF_YEAR) == other.get(Calendar.DAY_OF_YEAR)
+}
+
+fun Calendar.isSameWeek(other: Calendar): Boolean {
+    return get(Calendar.YEAR) == other.get(Calendar.YEAR) && get(Calendar.WEEK_OF_YEAR) == other.get(Calendar.WEEK_OF_YEAR)
+}
+
+fun Calendar.isSameYear(other: Calendar): Boolean {
+    return get(Calendar.YEAR) == other.get(Calendar.YEAR)
 }
\ No newline at end of file
diff --git a/presentation/src/main/java/com/moez/QKSMS/common/util/extensions/DialogExtensions.kt b/presentation/src/main/java/com/moez/QKSMS/common/util/extensions/DialogExtensions.kt
index cf8eff109..5e0e0be59 100644
--- a/presentation/src/main/java/com/moez/QKSMS/common/util/extensions/DialogExtensions.kt
+++ b/presentation/src/main/java/com/moez/QKSMS/common/util/extensions/DialogExtensions.kt
@@ -1,35 +1,35 @@
-/*
- * Copyright (C) 2017 Moez Bhatti <moez.bhatti@gmail.com>
- *
- * This file is part of QKSMS.
- *
- * QKSMS is free software: you can redistribute it and/or modify
- * it under the terms of the GNU General Public License as published by
- * the Free Software Foundation, either version 3 of the License, or
- * (at your option) any later version.
- *
- * QKSMS is distributed in the hope that it will be useful,
- * but WITHOUT ANY WARRANTY; without even the implied warranty of
- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
- * GNU General Public License for more details.
- *
- * You should have received a copy of the GNU General Public License
- * along with QKSMS.  If not, see <http://www.gnu.org/licenses/>.
- */
-package com.moez.QKSMS.common.util.extensions
-
-import androidx.annotation.StringRes
-import androidx.appcompat.app.AlertDialog
-import io.reactivex.subjects.Subject
-
-fun AlertDialog.Builder.setPositiveButton(@StringRes textId: Int, subject: Subject<Unit>): AlertDialog.Builder {
-    return setPositiveButton(textId) { _, _ -> subject.onNext(Unit) }
-}
-
-fun AlertDialog.Builder.setNegativeButton(@StringRes textId: Int, subject: Subject<Unit>): AlertDialog.Builder {
-    return setNegativeButton(textId) { _, _ -> subject.onNext(Unit) }
-}
-
-fun AlertDialog.Builder.setNeutralButton(@StringRes textId: Int, subject: Subject<Unit>): AlertDialog.Builder {
-    return setNeutralButton(textId) { _, _ -> subject.onNext(Unit) }
+/*
+ * Copyright (C) 2017 Moez Bhatti <moez.bhatti@gmail.com>
+ *
+ * This file is part of QKSMS.
+ *
+ * QKSMS is free software: you can redistribute it and/or modify
+ * it under the terms of the GNU General Public License as published by
+ * the Free Software Foundation, either version 3 of the License, or
+ * (at your option) any later version.
+ *
+ * QKSMS is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+ * GNU General Public License for more details.
+ *
+ * You should have received a copy of the GNU General Public License
+ * along with QKSMS.  If not, see <http://www.gnu.org/licenses/>.
+ */
+package com.moez.QKSMS.common.util.extensions
+
+import androidx.annotation.StringRes
+import androidx.appcompat.app.AlertDialog
+import io.reactivex.subjects.Subject
+
+fun AlertDialog.Builder.setPositiveButton(@StringRes textId: Int, subject: Subject<Unit>): AlertDialog.Builder {
+    return setPositiveButton(textId) { _, _ -> subject.onNext(Unit) }
+}
+
+fun AlertDialog.Builder.setNegativeButton(@StringRes textId: Int, subject: Subject<Unit>): AlertDialog.Builder {
+    return setNegativeButton(textId) { _, _ -> subject.onNext(Unit) }
+}
+
+fun AlertDialog.Builder.setNeutralButton(@StringRes textId: Int, subject: Subject<Unit>): AlertDialog.Builder {
+    return setNeutralButton(textId) { _, _ -> subject.onNext(Unit) }
 }
\ No newline at end of file
diff --git a/presentation/src/main/java/com/moez/QKSMS/common/util/extensions/NumberExtensions.kt b/presentation/src/main/java/com/moez/QKSMS/common/util/extensions/NumberExtensions.kt
index d4aff4781..61005d369 100644
--- a/presentation/src/main/java/com/moez/QKSMS/common/util/extensions/NumberExtensions.kt
+++ b/presentation/src/main/java/com/moez/QKSMS/common/util/extensions/NumberExtensions.kt
@@ -1,41 +1,41 @@
-/*
- * Copyright (C) 2017 Moez Bhatti <moez.bhatti@gmail.com>
- *
- * This file is part of QKSMS.
- *
- * QKSMS is free software: you can redistribute it and/or modify
- * it under the terms of the GNU General Public License as published by
- * the Free Software Foundation, either version 3 of the License, or
- * (at your option) any later version.
- *
- * QKSMS is distributed in the hope that it will be useful,
- * but WITHOUT ANY WARRANTY; without even the implied warranty of
- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
- * GNU General Public License for more details.
- *
- * You should have received a copy of the GNU General Public License
- * along with QKSMS.  If not, see <http://www.gnu.org/licenses/>.
- */
-package com.moez.QKSMS.common.util.extensions
-
-import android.content.Context
-import android.graphics.Color
-import android.util.TypedValue
-
-fun Int.dpToPx(context: Context): Int {
-    return TypedValue.applyDimension(TypedValue.COMPLEX_UNIT_DIP, this.toFloat(), context.resources.displayMetrics).toInt()
-}
-
-fun Int.withAlpha(alpha: Int): Int {
-    return Color.argb(alpha, Color.red(this), Color.green(this), Color.blue(this))
-}
-
-fun Int.forEach(action: (Int) -> Unit) {
-    for (index in 0 until this) {
-        action(index)
-    }
-}
-
-fun Float.within(min: Float, max: Float): Float {
-    return Math.min(max, Math.max(min, this))
+/*
+ * Copyright (C) 2017 Moez Bhatti <moez.bhatti@gmail.com>
+ *
+ * This file is part of QKSMS.
+ *
+ * QKSMS is free software: you can redistribute it and/or modify
+ * it under the terms of the GNU General Public License as published by
+ * the Free Software Foundation, either version 3 of the License, or
+ * (at your option) any later version.
+ *
+ * QKSMS is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+ * GNU General Public License for more details.
+ *
+ * You should have received a copy of the GNU General Public License
+ * along with QKSMS.  If not, see <http://www.gnu.org/licenses/>.
+ */
+package com.moez.QKSMS.common.util.extensions
+
+import android.content.Context
+import android.graphics.Color
+import android.util.TypedValue
+
+fun Int.dpToPx(context: Context): Int {
+    return TypedValue.applyDimension(TypedValue.COMPLEX_UNIT_DIP, this.toFloat(), context.resources.displayMetrics).toInt()
+}
+
+fun Int.withAlpha(alpha: Int): Int {
+    return Color.argb(alpha, Color.red(this), Color.green(this), Color.blue(this))
+}
+
+fun Int.forEach(action: (Int) -> Unit) {
+    for (index in 0 until this) {
+        action(index)
+    }
+}
+
+fun Float.within(min: Float, max: Float): Float {
+    return Math.min(max, Math.max(min, this))
 }
\ No newline at end of file
diff --git a/presentation/src/main/java/com/moez/QKSMS/common/util/extensions/ProgressExtensions.kt b/presentation/src/main/java/com/moez/QKSMS/common/util/extensions/ProgressExtensions.kt
index 7af20f2de..10b9b70cf 100644
--- a/presentation/src/main/java/com/moez/QKSMS/common/util/extensions/ProgressExtensions.kt
+++ b/presentation/src/main/java/com/moez/QKSMS/common/util/extensions/ProgressExtensions.kt
@@ -1,34 +1,34 @@
-/*
- * Copyright (C) 2017 Moez Bhatti <moez.bhatti@gmail.com>
- *
- * This file is part of QKSMS.
- *
- * QKSMS is free software: you can redistribute it and/or modify
- * it under the terms of the GNU General Public License as published by
- * the Free Software Foundation, either version 3 of the License, or
- * (at your option) any later version.
- *
- * QKSMS is distributed in the hope that it will be useful,
- * but WITHOUT ANY WARRANTY; without even the implied warranty of
- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
- * GNU General Public License for more details.
- *
- * You should have received a copy of the GNU General Public License
- * along with QKSMS.  If not, see <http://www.gnu.org/licenses/>.
- */
-package com.moez.QKSMS.common.util.extensions
-
-import android.content.Context
-import com.moez.QKSMS.R
-import com.moez.QKSMS.repository.BackupRepository
-
-fun BackupRepository.Progress.getLabel(context: Context): String? {
-    return when (this) {
-        is BackupRepository.Progress.Parsing -> context.getString(R.string.backup_progress_parsing)
-        is BackupRepository.Progress.Running -> context.getString(R.string.backup_progress_running, count, max)
-        is BackupRepository.Progress.Saving -> context.getString(R.string.backup_progress_saving)
-        is BackupRepository.Progress.Syncing -> context.getString(R.string.backup_progress_syncing)
-        is BackupRepository.Progress.Finished -> context.getString(R.string.backup_progress_finished)
-        else -> null
-    }
+/*
+ * Copyright (C) 2017 Moez Bhatti <moez.bhatti@gmail.com>
+ *
+ * This file is part of QKSMS.
+ *
+ * QKSMS is free software: you can redistribute it and/or modify
+ * it under the terms of the GNU General Public License as published by
+ * the Free Software Foundation, either version 3 of the License, or
+ * (at your option) any later version.
+ *
+ * QKSMS is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+ * GNU General Public License for more details.
+ *
+ * You should have received a copy of the GNU General Public License
+ * along with QKSMS.  If not, see <http://www.gnu.org/licenses/>.
+ */
+package com.moez.QKSMS.common.util.extensions
+
+import android.content.Context
+import com.moez.QKSMS.R
+import com.moez.QKSMS.repository.BackupRepository
+
+fun BackupRepository.Progress.getLabel(context: Context): String? {
+    return when (this) {
+        is BackupRepository.Progress.Parsing -> context.getString(R.string.backup_progress_parsing)
+        is BackupRepository.Progress.Running -> context.getString(R.string.backup_progress_running, count, max)
+        is BackupRepository.Progress.Saving -> context.getString(R.string.backup_progress_saving)
+        is BackupRepository.Progress.Syncing -> context.getString(R.string.backup_progress_syncing)
+        is BackupRepository.Progress.Finished -> context.getString(R.string.backup_progress_finished)
+        else -> null
+    }
 }
\ No newline at end of file
diff --git a/presentation/src/main/java/com/moez/QKSMS/common/util/extensions/ViewExtensions.kt b/presentation/src/main/java/com/moez/QKSMS/common/util/extensions/ViewExtensions.kt
index f2bf92d17..c40c0835f 100644
--- a/presentation/src/main/java/com/moez/QKSMS/common/util/extensions/ViewExtensions.kt
+++ b/presentation/src/main/java/com/moez/QKSMS/common/util/extensions/ViewExtensions.kt
@@ -1,125 +1,125 @@
-/*
- * Copyright (C) 2017 Moez Bhatti <moez.bhatti@gmail.com>
- *
- * This file is part of QKSMS.
- *
- * QKSMS is free software: you can redistribute it and/or modify
- * it under the terms of the GNU General Public License as published by
- * the Free Software Foundation, either version 3 of the License, or
- * (at your option) any later version.
- *
- * QKSMS is distributed in the hope that it will be useful,
- * but WITHOUT ANY WARRANTY; without even the implied warranty of
- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
- * GNU General Public License for more details.
- *
- * You should have received a copy of the GNU General Public License
- * along with QKSMS.  If not, see <http://www.gnu.org/licenses/>.
- */
-package com.moez.QKSMS.common.util.extensions
-
-import android.animation.LayoutTransition
-import android.content.Context
-import android.content.res.ColorStateList
-import android.graphics.PorterDuff
-import android.os.Build
-import android.view.MotionEvent
-import android.view.View
-import android.view.ViewGroup
-import android.view.inputmethod.InputMethodManager
-import android.widget.EditText
-import android.widget.ImageView
-import android.widget.ProgressBar
-import androidx.recyclerview.widget.RecyclerView
-import androidx.viewpager.widget.ViewPager
-
-var ViewGroup.animateLayoutChanges: Boolean
-    get() = layoutTransition != null
-    set(value) {
-        layoutTransition = if (value) LayoutTransition() else null
-    }
-
-fun EditText.showKeyboard() {
-    requestFocus()
-    val imm = context.getSystemService(Context.INPUT_METHOD_SERVICE) as InputMethodManager
-    imm.showSoftInput(this, InputMethodManager.SHOW_IMPLICIT)
-}
-
-fun EditText.hideKeyboard() {
-    requestFocus()
-    val imm = context.getSystemService(Context.INPUT_METHOD_SERVICE) as InputMethodManager
-    imm.hideSoftInputFromWindow(windowToken, 0)
-}
-
-fun ImageView.setTint(color: Int) {
-    imageTintList = ColorStateList.valueOf(color)
-}
-
-fun ProgressBar.setTint(color: Int) {
-    indeterminateTintList = ColorStateList.valueOf(color)
-    progressTintList = ColorStateList.valueOf(color)
-}
-
-fun View.setBackgroundTint(color: Int) {
-
-    // API 21 doesn't support this
-    if (Build.VERSION.SDK_INT < Build.VERSION_CODES.LOLLIPOP_MR1) {
-        background?.setColorFilter(color, PorterDuff.Mode.SRC_IN)
-    }
-
-    backgroundTintList = ColorStateList.valueOf(color)
-}
-
-fun View.setPadding(left: Int? = null, top: Int? = null, right: Int? = null, bottom: Int? = null) {
-    setPadding(left ?: paddingLeft, top ?: paddingTop, right ?: paddingRight, bottom ?: paddingBottom)
-}
-
-fun View.setVisible(visible: Boolean, invisible: Int = View.GONE) {
-    visibility = if (visible) View.VISIBLE else invisible
-}
-
-/**
- * If a view captures clicks at all, then the parent won't ever receive touch events. This is a
- * problem when we're trying to capture link clicks, but tapping or long pressing other areas of
- * the view no longer work. Also problematic when we try to long press on an image in the message
- * view
- */
-fun View.forwardTouches(parent: View) {
-    var isLongClick = false
-
-    setOnLongClickListener {
-        isLongClick = true
-        true
-    }
-
-    setOnTouchListener { v, event ->
-        parent.onTouchEvent(event)
-
-        when {
-            event.action == MotionEvent.ACTION_UP && isLongClick -> {
-                isLongClick = true
-                true
-            }
-
-            event.action == MotionEvent.ACTION_DOWN -> {
-                isLongClick = false
-                v.onTouchEvent(event)
-            }
-
-            else -> v.onTouchEvent(event)
-        }
-    }
-}
-
-fun ViewPager.addOnPageChangeListener(listener: (Int) -> Unit) {
-    addOnPageChangeListener(object : ViewPager.SimpleOnPageChangeListener() {
-        override fun onPageSelected(position: Int) {
-            listener(position)
-        }
-    })
-}
-
-fun RecyclerView.scrapViews() {
-    recycledViewPool.clear()
-    adapter?.notifyDataSetChanged()
-}
+/*
+ * Copyright (C) 2017 Moez Bhatti <moez.bhatti@gmail.com>
+ *
+ * This file is part of QKSMS.
+ *
+ * QKSMS is free software: you can redistribute it and/or modify
+ * it under the terms of the GNU General Public License as published by
+ * the Free Software Foundation, either version 3 of the License, or
+ * (at your option) any later version.
+ *
+ * QKSMS is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+ * GNU General Public License for more details.
+ *
+ * You should have received a copy of the GNU General Public License
+ * along with QKSMS.  If not, see <http://www.gnu.org/licenses/>.
+ */
+package com.moez.QKSMS.common.util.extensions
+
+import android.animation.LayoutTransition
+import android.content.Context
+import android.content.res.ColorStateList
+import android.graphics.PorterDuff
+import android.os.Build
+import android.view.MotionEvent
+import android.view.View
+import android.view.ViewGroup
+import android.view.inputmethod.InputMethodManager
+import android.widget.EditText
+import android.widget.ImageView
+import android.widget.ProgressBar
+import androidx.recyclerview.widget.RecyclerView
+import androidx.viewpager.widget.ViewPager
+
+var ViewGroup.animateLayoutChanges: Boolean
+    get() = layoutTransition != null
+    set(value) {
+        layoutTransition = if (value) LayoutTransition() else null
+    }
+
+fun EditText.showKeyboard() {
+    requestFocus()
+    val imm = context.getSystemService(Context.INPUT_METHOD_SERVICE) as InputMethodManager
+    imm.showSoftInput(this, InputMethodManager.SHOW_IMPLICIT)
+}
+
+fun EditText.hideKeyboard() {
+    requestFocus()
+    val imm = context.getSystemService(Context.INPUT_METHOD_SERVICE) as InputMethodManager
+    imm.hideSoftInputFromWindow(windowToken, 0)
+}
+
+fun ImageView.setTint(color: Int) {
+    imageTintList = ColorStateList.valueOf(color)
+}
+
+fun ProgressBar.setTint(color: Int) {
+    indeterminateTintList = ColorStateList.valueOf(color)
+    progressTintList = ColorStateList.valueOf(color)
+}
+
+fun View.setBackgroundTint(color: Int) {
+
+    // API 21 doesn't support this
+    if (Build.VERSION.SDK_INT < Build.VERSION_CODES.LOLLIPOP_MR1) {
+        background?.setColorFilter(color, PorterDuff.Mode.SRC_IN)
+    }
+
+    backgroundTintList = ColorStateList.valueOf(color)
+}
+
+fun View.setPadding(left: Int? = null, top: Int? = null, right: Int? = null, bottom: Int? = null) {
+    setPadding(left ?: paddingLeft, top ?: paddingTop, right ?: paddingRight, bottom ?: paddingBottom)
+}
+
+fun View.setVisible(visible: Boolean, invisible: Int = View.GONE) {
+    visibility = if (visible) View.VISIBLE else invisible
+}
+
+/**
+ * If a view captures clicks at all, then the parent won't ever receive touch events. This is a
+ * problem when we're trying to capture link clicks, but tapping or long pressing other areas of
+ * the view no longer work. Also problematic when we try to long press on an image in the message
+ * view
+ */
+fun View.forwardTouches(parent: View) {
+    var isLongClick = false
+
+    setOnLongClickListener {
+        isLongClick = true
+        true
+    }
+
+    setOnTouchListener { v, event ->
+        parent.onTouchEvent(event)
+
+        when {
+            event.action == MotionEvent.ACTION_UP && isLongClick -> {
+                isLongClick = true
+                true
+            }
+
+            event.action == MotionEvent.ACTION_DOWN -> {
+                isLongClick = false
+                v.onTouchEvent(event)
+            }
+
+            else -> v.onTouchEvent(event)
+        }
+    }
+}
+
+fun ViewPager.addOnPageChangeListener(listener: (Int) -> Unit) {
+    addOnPageChangeListener(object : ViewPager.SimpleOnPageChangeListener() {
+        override fun onPageSelected(position: Int) {
+            listener(position)
+        }
+    })
+}
+
+fun RecyclerView.scrapViews() {
+    recycledViewPool.clear()
+    adapter?.notifyDataSetChanged()
+}
diff --git a/presentation/src/main/java/com/moez/QKSMS/common/widget/AvatarView.kt b/presentation/src/main/java/com/moez/QKSMS/common/widget/AvatarView.kt
index f6703ed8a..153f8b8fc 100644
--- a/presentation/src/main/java/com/moez/QKSMS/common/widget/AvatarView.kt
+++ b/presentation/src/main/java/com/moez/QKSMS/common/widget/AvatarView.kt
@@ -1,110 +1,110 @@
-/*
- * Copyright (C) 2017 Moez Bhatti <moez.bhatti@gmail.com>
- *
- * This file is part of QKSMS.
- *
- * QKSMS is free software: you can redistribute it and/or modify
- * it under the terms of the GNU General Public License as published by
- * the Free Software Foundation, either version 3 of the License, or
- * (at your option) any later version.
- *
- * QKSMS is distributed in the hope that it will be useful,
- * but WITHOUT ANY WARRANTY; without even the implied warranty of
- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
- * GNU General Public License for more details.
- *
- * You should have received a copy of the GNU General Public License
- * along with QKSMS.  If not, see <http://www.gnu.org/licenses/>.
- */
-package com.moez.QKSMS.common.widget
-
-import android.content.Context
-import android.util.AttributeSet
-import android.view.View
-import android.widget.FrameLayout
-import com.moez.QKSMS.R
-import com.moez.QKSMS.common.Navigator
-import com.moez.QKSMS.common.util.Colors
-import com.moez.QKSMS.common.util.extensions.setBackgroundTint
-import com.moez.QKSMS.common.util.extensions.setTint
-import com.moez.QKSMS.injection.appComponent
-import com.moez.QKSMS.model.Recipient
-import com.moez.QKSMS.util.GlideApp
-import kotlinx.android.synthetic.main.avatar_view.view.*
-import javax.inject.Inject
-
-class AvatarView @JvmOverloads constructor(
-    context: Context, attrs: AttributeSet? = null
-) : FrameLayout(context, attrs) {
-
-    @Inject lateinit var colors: Colors
-    @Inject lateinit var navigator: Navigator
-
-    private var lookupKey: String? = null
-    private var fullName: String? = null
-    private var photoUri: String? = null
-    private var lastUpdated: Long? = null
-    private var theme: Colors.Theme
-
-    init {
-        if (!isInEditMode) {
-            appComponent.inject(this)
-        }
-
-        theme = colors.theme()
-
-        View.inflate(context, R.layout.avatar_view, this)
-        setBackgroundResource(R.drawable.circle)
-        clipToOutline = true
-    }
-
-    /**
-     * Use the [contact] information to display the avatar.
-     */
-    fun setRecipient(recipient: Recipient?) {
-        lookupKey = recipient?.contact?.lookupKey
-        fullName = recipient?.contact?.name
-        photoUri = recipient?.contact?.photoUri
-        lastUpdated = recipient?.contact?.lastUpdate
-        theme = colors.theme(recipient)
-        updateView()
-    }
-
-    override fun onFinishInflate() {
-        super.onFinishInflate()
-
-        if (!isInEditMode) {
-            updateView()
-        }
-    }
-
-    private fun updateView() {
-        // Apply theme
-        setBackgroundTint(theme.theme)
-        initial.setTextColor(theme.textPrimary)
-        icon.setTint(theme.textPrimary)
-
-        val initials = fullName
-                ?.substringBefore(',')
-                ?.split(" ").orEmpty()
-                .filter { name -> name.isNotEmpty() }
-                .map { name -> name[0] }
-                .filter { initial -> initial.isLetterOrDigit() }
-                .map { initial -> initial.toString() }
-
-        if (initials.isNotEmpty()) {
-            initial.text = if (initials.size > 1) initials.first() + initials.last() else initials.first()
-            icon.visibility = GONE
-        } else {
-            initial.text = null
-            icon.visibility = VISIBLE
-        }
-
-        photo.setImageDrawable(null)
-        photoUri?.let { photoUri ->
-            GlideApp.with(photo)
-                    .load(photoUri)
-                    .into(photo)
-        }
-    }
-}
+/*
+ * Copyright (C) 2017 Moez Bhatti <moez.bhatti@gmail.com>
+ *
+ * This file is part of QKSMS.
+ *
+ * QKSMS is free software: you can redistribute it and/or modify
+ * it under the terms of the GNU General Public License as published by
+ * the Free Software Foundation, either version 3 of the License, or
+ * (at your option) any later version.
+ *
+ * QKSMS is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+ * GNU General Public License for more details.
+ *
+ * You should have received a copy of the GNU General Public License
+ * along with QKSMS.  If not, see <http://www.gnu.org/licenses/>.
+ */
+package com.moez.QKSMS.common.widget
+
+import android.content.Context
+import android.util.AttributeSet
+import android.view.View
+import android.widget.FrameLayout
+import com.moez.QKSMS.R
+import com.moez.QKSMS.common.Navigator
+import com.moez.QKSMS.common.util.Colors
+import com.moez.QKSMS.common.util.extensions.setBackgroundTint
+import com.moez.QKSMS.common.util.extensions.setTint
+import com.moez.QKSMS.injection.appComponent
+import com.moez.QKSMS.model.Recipient
+import com.moez.QKSMS.util.GlideApp
+import kotlinx.android.synthetic.main.avatar_view.view.*
+import javax.inject.Inject
+
+class AvatarView @JvmOverloads constructor(
+    context: Context, attrs: AttributeSet? = null
+) : FrameLayout(context, attrs) {
+
+    @Inject lateinit var colors: Colors
+    @Inject lateinit var navigator: Navigator
+
+    private var lookupKey: String? = null
+    private var fullName: String? = null
+    private var photoUri: String? = null
+    private var lastUpdated: Long? = null
+    private var theme: Colors.Theme
+
+    init {
+        if (!isInEditMode) {
+            appComponent.inject(this)
+        }
+
+        theme = colors.theme()
+
+        View.inflate(context, R.layout.avatar_view, this)
+        setBackgroundResource(R.drawable.circle)
+        clipToOutline = true
+    }
+
+    /**
+     * Use the [contact] information to display the avatar.
+     */
+    fun setRecipient(recipient: Recipient?) {
+        lookupKey = recipient?.contact?.lookupKey
+        fullName = recipient?.contact?.name
+        photoUri = recipient?.contact?.photoUri
+        lastUpdated = recipient?.contact?.lastUpdate
+        theme = colors.theme(recipient)
+        updateView()
+    }
+
+    override fun onFinishInflate() {
+        super.onFinishInflate()
+
+        if (!isInEditMode) {
+            updateView()
+        }
+    }
+
+    private fun updateView() {
+        // Apply theme
+        setBackgroundTint(theme.theme)
+        initial.setTextColor(theme.textPrimary)
+        icon.setTint(theme.textPrimary)
+
+        val initials = fullName
+                ?.substringBefore(',')
+                ?.split(" ").orEmpty()
+                .filter { name -> name.isNotEmpty() }
+                .map { name -> name[0] }
+                .filter { initial -> initial.isLetterOrDigit() }
+                .map { initial -> initial.toString() }
+
+        if (initials.isNotEmpty()) {
+            initial.text = if (initials.size > 1) initials.first() + initials.last() else initials.first()
+            icon.visibility = GONE
+        } else {
+            initial.text = null
+            icon.visibility = VISIBLE
+        }
+
+        photo.setImageDrawable(null)
+        photoUri?.let { photoUri ->
+            GlideApp.with(photo)
+                    .load(photoUri)
+                    .into(photo)
+        }
+    }
+}
diff --git a/presentation/src/main/java/com/moez/QKSMS/common/widget/BubbleImageView.kt b/presentation/src/main/java/com/moez/QKSMS/common/widget/BubbleImageView.kt
index a37c39649..6cc34a008 100644
--- a/presentation/src/main/java/com/moez/QKSMS/common/widget/BubbleImageView.kt
+++ b/presentation/src/main/java/com/moez/QKSMS/common/widget/BubbleImageView.kt
@@ -1,110 +1,110 @@
-/*
- * Copyright (C) 2017 Moez Bhatti <moez.bhatti@gmail.com>
- *
- * This file is part of QKSMS.
- *
- * QKSMS is free software: you can redistribute it and/or modify
- * it under the terms of the GNU General Public License as published by
- * the Free Software Foundation, either version 3 of the License, or
- * (at your option) any later version.
- *
- * QKSMS is distributed in the hope that it will be useful,
- * but WITHOUT ANY WARRANTY; without even the implied warranty of
- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
- * GNU General Public License for more details.
- *
- * You should have received a copy of the GNU General Public License
- * along with QKSMS.  If not, see <http://www.gnu.org/licenses/>.
- */
-package com.moez.QKSMS.common.widget
-
-import android.content.Context
-import android.graphics.Canvas
-import android.graphics.Path
-import android.graphics.RectF
-import android.util.AttributeSet
-import android.widget.ImageView
-import com.moez.QKSMS.common.util.extensions.dpToPx
-
-class BubbleImageView @JvmOverloads constructor(context: Context, attrs: AttributeSet? = null) : ImageView(context, attrs) {
-
-    enum class Style(val topLeft: Boolean, val topRight: Boolean, val bottomRight: Boolean, val bottomLeft: Boolean) {
-
-        ONLY(true, true, true, true),
-        IN_FIRST(true, true, true, false),
-        IN_MIDDLE(false, true, true, false),
-        IN_LAST(false, true, true, true),
-        OUT_FIRST(true, true, false, true),
-        OUT_MIDDLE(true, false, false, true),
-        OUT_LAST(true, false, true, true)
-    }
-
-    var bubbleStyle = Style.ONLY
-        set(value) {
-            field = value
-            setPath()
-            invalidate()
-        }
-
-    private val path = Path()
-    private val radiusSmall = 4.dpToPx(context).toFloat()
-    private val radiusLarge = 18.dpToPx(context).toFloat()
-
-    override fun onSizeChanged(w: Int, h: Int, oldw: Int, oldh: Int) {
-        super.onSizeChanged(w, h, oldw, oldh)
-        setPath()
-    }
-
-    override fun onDraw(canvas: Canvas) {
-        if (!path.isEmpty) {
-            canvas.clipPath(path)
-        }
-
-        super.onDraw(canvas)
-    }
-
-    private fun setPath() {
-        path.rewind()
-
-        val width = width.toFloat()
-        val height = height.toFloat()
-
-        val cornerRectSmall = RectF().apply { set(-radiusSmall, -radiusSmall, radiusSmall, radiusSmall) }
-        val cornerRectLarge = RectF().apply { set(-radiusLarge, -radiusLarge, radiusLarge, radiusLarge) }
-
-        if (bubbleStyle.topLeft) {
-            cornerRectLarge.offsetTo(0f, 0f)
-            path.arcTo(cornerRectLarge, 180f, 90f)
-        } else {
-            cornerRectSmall.offsetTo(0f, 0f)
-            path.arcTo(cornerRectSmall, 180f, 90f)
-        }
-
-        if (bubbleStyle.topRight) {
-            cornerRectLarge.offsetTo(width - radiusLarge * 2, 0f)
-            path.arcTo(cornerRectLarge, 270f, 90f)
-        } else {
-            cornerRectSmall.offsetTo(width - radiusSmall * 2, 0f)
-            path.arcTo(cornerRectSmall, 270f, 90f)
-        }
-
-        if (bubbleStyle.bottomRight) {
-            cornerRectLarge.offsetTo(width - radiusLarge * 2, height - radiusLarge * 2)
-            path.arcTo(cornerRectLarge, 0f, 90f)
-        } else {
-            cornerRectSmall.offsetTo(width - radiusSmall * 2, height - radiusSmall * 2)
-            path.arcTo(cornerRectSmall, 0f, 90f)
-        }
-
-        if (bubbleStyle.bottomLeft) {
-            cornerRectLarge.offsetTo(0f, height - radiusLarge * 2)
-            path.arcTo(cornerRectLarge, 90f, 90f)
-        } else {
-            cornerRectSmall.offsetTo(0f, height - radiusSmall * 2)
-            path.arcTo(cornerRectSmall, 90f, 90f)
-        }
-
-        path.close()
-    }
-
+/*
+ * Copyright (C) 2017 Moez Bhatti <moez.bhatti@gmail.com>
+ *
+ * This file is part of QKSMS.
+ *
+ * QKSMS is free software: you can redistribute it and/or modify
+ * it under the terms of the GNU General Public License as published by
+ * the Free Software Foundation, either version 3 of the License, or
+ * (at your option) any later version.
+ *
+ * QKSMS is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+ * GNU General Public License for more details.
+ *
+ * You should have received a copy of the GNU General Public License
+ * along with QKSMS.  If not, see <http://www.gnu.org/licenses/>.
+ */
+package com.moez.QKSMS.common.widget
+
+import android.content.Context
+import android.graphics.Canvas
+import android.graphics.Path
+import android.graphics.RectF
+import android.util.AttributeSet
+import android.widget.ImageView
+import com.moez.QKSMS.common.util.extensions.dpToPx
+
+class BubbleImageView @JvmOverloads constructor(context: Context, attrs: AttributeSet? = null) : ImageView(context, attrs) {
+
+    enum class Style(val topLeft: Boolean, val topRight: Boolean, val bottomRight: Boolean, val bottomLeft: Boolean) {
+
+        ONLY(true, true, true, true),
+        IN_FIRST(true, true, true, false),
+        IN_MIDDLE(false, true, true, false),
+        IN_LAST(false, true, true, true),
+        OUT_FIRST(true, true, false, true),
+        OUT_MIDDLE(true, false, false, true),
+        OUT_LAST(true, false, true, true)
+    }
+
+    var bubbleStyle = Style.ONLY
+        set(value) {
+            field = value
+            setPath()
+            invalidate()
+        }
+
+    private val path = Path()
+    private val radiusSmall = 4.dpToPx(context).toFloat()
+    private val radiusLarge = 18.dpToPx(context).toFloat()
+
+    override fun onSizeChanged(w: Int, h: Int, oldw: Int, oldh: Int) {
+        super.onSizeChanged(w, h, oldw, oldh)
+        setPath()
+    }
+
+    override fun onDraw(canvas: Canvas) {
+        if (!path.isEmpty) {
+            canvas.clipPath(path)
+        }
+
+        super.onDraw(canvas)
+    }
+
+    private fun setPath() {
+        path.rewind()
+
+        val width = width.toFloat()
+        val height = height.toFloat()
+
+        val cornerRectSmall = RectF().apply { set(-radiusSmall, -radiusSmall, radiusSmall, radiusSmall) }
+        val cornerRectLarge = RectF().apply { set(-radiusLarge, -radiusLarge, radiusLarge, radiusLarge) }
+
+        if (bubbleStyle.topLeft) {
+            cornerRectLarge.offsetTo(0f, 0f)
+            path.arcTo(cornerRectLarge, 180f, 90f)
+        } else {
+            cornerRectSmall.offsetTo(0f, 0f)
+            path.arcTo(cornerRectSmall, 180f, 90f)
+        }
+
+        if (bubbleStyle.topRight) {
+            cornerRectLarge.offsetTo(width - radiusLarge * 2, 0f)
+            path.arcTo(cornerRectLarge, 270f, 90f)
+        } else {
+            cornerRectSmall.offsetTo(width - radiusSmall * 2, 0f)
+            path.arcTo(cornerRectSmall, 270f, 90f)
+        }
+
+        if (bubbleStyle.bottomRight) {
+            cornerRectLarge.offsetTo(width - radiusLarge * 2, height - radiusLarge * 2)
+            path.arcTo(cornerRectLarge, 0f, 90f)
+        } else {
+            cornerRectSmall.offsetTo(width - radiusSmall * 2, height - radiusSmall * 2)
+            path.arcTo(cornerRectSmall, 0f, 90f)
+        }
+
+        if (bubbleStyle.bottomLeft) {
+            cornerRectLarge.offsetTo(0f, height - radiusLarge * 2)
+            path.arcTo(cornerRectLarge, 90f, 90f)
+        } else {
+            cornerRectSmall.offsetTo(0f, height - radiusSmall * 2)
+            path.arcTo(cornerRectSmall, 90f, 90f)
+        }
+
+        path.close()
+    }
+
 }
\ No newline at end of file
diff --git a/presentation/src/main/java/com/moez/QKSMS/common/widget/GroupAvatarView.kt b/presentation/src/main/java/com/moez/QKSMS/common/widget/GroupAvatarView.kt
index 85b240a15..10136b5aa 100644
--- a/presentation/src/main/java/com/moez/QKSMS/common/widget/GroupAvatarView.kt
+++ b/presentation/src/main/java/com/moez/QKSMS/common/widget/GroupAvatarView.kt
@@ -1,71 +1,71 @@
-/*
- * Copyright (C) 2017 Moez Bhatti <moez.bhatti@gmail.com>
- *
- * This file is part of QKSMS.
- *
- * QKSMS is free software: you can redistribute it and/or modify
- * it under the terms of the GNU General Public License as published by
- * the Free Software Foundation, either version 3 of the License, or
- * (at your option) any later version.
- *
- * QKSMS is distributed in the hope that it will be useful,
- * but WITHOUT ANY WARRANTY; without even the implied warranty of
- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
- * GNU General Public License for more details.
- *
- * You should have received a copy of the GNU General Public License
- * along with QKSMS.  If not, see <http://www.gnu.org/licenses/>.
- */
-package com.moez.QKSMS.common.widget
-
-import android.content.Context
-import android.util.AttributeSet
-import android.view.View
-import androidx.constraintlayout.widget.ConstraintLayout
-import androidx.core.view.isVisible
-import androidx.core.view.updateLayoutParams
-import com.moez.QKSMS.R
-import com.moez.QKSMS.common.util.extensions.getColorCompat
-import com.moez.QKSMS.common.util.extensions.resolveThemeColor
-import com.moez.QKSMS.common.util.extensions.setBackgroundTint
-import com.moez.QKSMS.model.Recipient
-import kotlinx.android.synthetic.main.group_avatar_view.view.*
-
-class GroupAvatarView @JvmOverloads constructor(
-    context: Context, attrs: AttributeSet? = null
-) : ConstraintLayout(context, attrs) {
-
-    var recipients: List<Recipient> = ArrayList()
-        set(value) {
-            field = value.sortedWith(compareByDescending { contact -> contact.contact?.lookupKey })
-            updateView()
-        }
-
-    init {
-        View.inflate(context, R.layout.group_avatar_view, this)
-    }
-
-    override fun onFinishInflate() {
-        super.onFinishInflate()
-
-        if (!isInEditMode) {
-            updateView()
-        }
-    }
-
-    private fun updateView() {
-        avatar1Frame.setBackgroundTint(when (recipients.size > 1) {
-            true -> context.resolveThemeColor(android.R.attr.windowBackground)
-            false -> context.getColorCompat(android.R.color.transparent)
-        })
-        avatar1Frame.updateLayoutParams<LayoutParams> {
-            matchConstraintPercentWidth = if (recipients.size > 1) 0.75f else 1.0f
-        }
-        avatar2.isVisible = recipients.size > 1
-
-
-        recipients.getOrNull(0).run(avatar1::setRecipient)
-        recipients.getOrNull(1).run(avatar2::setRecipient)
-    }
-
-}
+/*
+ * Copyright (C) 2017 Moez Bhatti <moez.bhatti@gmail.com>
+ *
+ * This file is part of QKSMS.
+ *
+ * QKSMS is free software: you can redistribute it and/or modify
+ * it under the terms of the GNU General Public License as published by
+ * the Free Software Foundation, either version 3 of the License, or
+ * (at your option) any later version.
+ *
+ * QKSMS is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+ * GNU General Public License for more details.
+ *
+ * You should have received a copy of the GNU General Public License
+ * along with QKSMS.  If not, see <http://www.gnu.org/licenses/>.
+ */
+package com.moez.QKSMS.common.widget
+
+import android.content.Context
+import android.util.AttributeSet
+import android.view.View
+import androidx.constraintlayout.widget.ConstraintLayout
+import androidx.core.view.isVisible
+import androidx.core.view.updateLayoutParams
+import com.moez.QKSMS.R
+import com.moez.QKSMS.common.util.extensions.getColorCompat
+import com.moez.QKSMS.common.util.extensions.resolveThemeColor
+import com.moez.QKSMS.common.util.extensions.setBackgroundTint
+import com.moez.QKSMS.model.Recipient
+import kotlinx.android.synthetic.main.group_avatar_view.view.*
+
+class GroupAvatarView @JvmOverloads constructor(
+    context: Context, attrs: AttributeSet? = null
+) : ConstraintLayout(context, attrs) {
+
+    var recipients: List<Recipient> = ArrayList()
+        set(value) {
+            field = value.sortedWith(compareByDescending { contact -> contact.contact?.lookupKey })
+            updateView()
+        }
+
+    init {
+        View.inflate(context, R.layout.group_avatar_view, this)
+    }
+
+    override fun onFinishInflate() {
+        super.onFinishInflate()
+
+        if (!isInEditMode) {
+            updateView()
+        }
+    }
+
+    private fun updateView() {
+        avatar1Frame.setBackgroundTint(when (recipients.size > 1) {
+            true -> context.resolveThemeColor(android.R.attr.windowBackground)
+            false -> context.getColorCompat(android.R.color.transparent)
+        })
+        avatar1Frame.updateLayoutParams<LayoutParams> {
+            matchConstraintPercentWidth = if (recipients.size > 1) 0.75f else 1.0f
+        }
+        avatar2.isVisible = recipients.size > 1
+
+
+        recipients.getOrNull(0).run(avatar1::setRecipient)
+        recipients.getOrNull(1).run(avatar2::setRecipient)
+    }
+
+}
diff --git a/presentation/src/main/java/com/moez/QKSMS/common/widget/PagerTitleView.kt b/presentation/src/main/java/com/moez/QKSMS/common/widget/PagerTitleView.kt
index 0d3d5db6b..4aec80f08 100644
--- a/presentation/src/main/java/com/moez/QKSMS/common/widget/PagerTitleView.kt
+++ b/presentation/src/main/java/com/moez/QKSMS/common/widget/PagerTitleView.kt
@@ -1,112 +1,112 @@
-/*
- * Copyright (C) 2017 Moez Bhatti <moez.bhatti@gmail.com>
- *
- * This file is part of QKSMS.
- *
- * QKSMS is free software: you can redistribute it and/or modify
- * it under the terms of the GNU General Public License as published by
- * the Free Software Foundation, either version 3 of the License, or
- * (at your option) any later version.
- *
- * QKSMS is distributed in the hope that it will be useful,
- * but WITHOUT ANY WARRANTY; without even the implied warranty of
- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
- * GNU General Public License for more details.
- *
- * You should have received a copy of the GNU General Public License
- * along with QKSMS.  If not, see <http://www.gnu.org/licenses/>.
- */
-package com.moez.QKSMS.common.widget
-
-import android.content.Context
-import android.content.res.ColorStateList
-import android.util.AttributeSet
-import android.view.LayoutInflater
-import android.widget.LinearLayout
-import android.widget.TextView
-import androidx.viewpager.widget.ViewPager
-import com.moez.QKSMS.R
-import com.moez.QKSMS.common.util.Colors
-import com.moez.QKSMS.common.util.extensions.forEach
-import com.moez.QKSMS.common.util.extensions.resolveThemeColor
-import com.moez.QKSMS.extensions.Optional
-import com.moez.QKSMS.injection.appComponent
-import com.moez.QKSMS.repository.ConversationRepository
-import com.uber.autodispose.android.ViewScopeProvider
-import com.uber.autodispose.autoDisposable
-import io.reactivex.subjects.BehaviorSubject
-import io.reactivex.subjects.Subject
-import kotlinx.android.synthetic.main.tab_view.view.*
-import javax.inject.Inject
-
-class PagerTitleView @JvmOverloads constructor(context: Context, attrs: AttributeSet? = null) : LinearLayout(context, attrs) {
-
-    @Inject lateinit var colors: Colors
-    @Inject lateinit var conversationRepo: ConversationRepository
-
-    private val recipientId: Subject<Long> = BehaviorSubject.create()
-
-    var pager: ViewPager? = null
-        set(value) {
-            if (field !== value) {
-                field = value
-                recreate()
-            }
-        }
-
-    init {
-        if (!isInEditMode) appComponent.inject(this)
-    }
-
-    fun setRecipientId(id: Long) {
-        recipientId.onNext(id)
-    }
-
-    private fun recreate() {
-        removeAllViews()
-
-        pager?.adapter?.count?.forEach { position ->
-            val view = LayoutInflater.from(context).inflate(R.layout.tab_view, this, false)
-            view.label.text = pager?.adapter?.getPageTitle(position)
-            view.setOnClickListener { pager?.currentItem = position }
-
-            addView(view)
-        }
-
-        childCount.forEach { index ->
-            getChildAt(index).isActivated = index == pager?.currentItem
-        }
-
-        pager?.addOnPageChangeListener(object : ViewPager.SimpleOnPageChangeListener() {
-            override fun onPageSelected(position: Int) {
-                childCount.forEach { index ->
-                    getChildAt(index).isActivated = index == position
-                }
-            }
-        })
-    }
-
-    override fun onAttachedToWindow() {
-        super.onAttachedToWindow()
-
-        val states = arrayOf(
-                intArrayOf(android.R.attr.state_activated),
-                intArrayOf(-android.R.attr.state_activated))
-
-        recipientId
-                .distinctUntilChanged()
-                .map { recipientId -> Optional(conversationRepo.getRecipient(recipientId)) }
-                .switchMap { recipient -> colors.themeObservable(recipient.value) }
-                .map { theme ->
-                    val textSecondary = context.resolveThemeColor(android.R.attr.textColorSecondary)
-                    ColorStateList(states, intArrayOf(theme.theme, textSecondary))
-                }
-                .autoDisposable(ViewScopeProvider.from(this))
-                .subscribe { colorStateList ->
-                    childCount.forEach { index ->
-                        (getChildAt(index) as? TextView)?.setTextColor(colorStateList)
-                    }
-                }
-    }
-
-}
+/*
+ * Copyright (C) 2017 Moez Bhatti <moez.bhatti@gmail.com>
+ *
+ * This file is part of QKSMS.
+ *
+ * QKSMS is free software: you can redistribute it and/or modify
+ * it under the terms of the GNU General Public License as published by
+ * the Free Software Foundation, either version 3 of the License, or
+ * (at your option) any later version.
+ *
+ * QKSMS is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+ * GNU General Public License for more details.
+ *
+ * You should have received a copy of the GNU General Public License
+ * along with QKSMS.  If not, see <http://www.gnu.org/licenses/>.
+ */
+package com.moez.QKSMS.common.widget
+
+import android.content.Context
+import android.content.res.ColorStateList
+import android.util.AttributeSet
+import android.view.LayoutInflater
+import android.widget.LinearLayout
+import android.widget.TextView
+import androidx.viewpager.widget.ViewPager
+import com.moez.QKSMS.R
+import com.moez.QKSMS.common.util.Colors
+import com.moez.QKSMS.common.util.extensions.forEach
+import com.moez.QKSMS.common.util.extensions.resolveThemeColor
+import com.moez.QKSMS.extensions.Optional
+import com.moez.QKSMS.injection.appComponent
+import com.moez.QKSMS.repository.ConversationRepository
+import com.uber.autodispose.android.ViewScopeProvider
+import com.uber.autodispose.autoDisposable
+import io.reactivex.subjects.BehaviorSubject
+import io.reactivex.subjects.Subject
+import kotlinx.android.synthetic.main.tab_view.view.*
+import javax.inject.Inject
+
+class PagerTitleView @JvmOverloads constructor(context: Context, attrs: AttributeSet? = null) : LinearLayout(context, attrs) {
+
+    @Inject lateinit var colors: Colors
+    @Inject lateinit var conversationRepo: ConversationRepository
+
+    private val recipientId: Subject<Long> = BehaviorSubject.create()
+
+    var pager: ViewPager? = null
+        set(value) {
+            if (field !== value) {
+                field = value
+                recreate()
+            }
+        }
+
+    init {
+        if (!isInEditMode) appComponent.inject(this)
+    }
+
+    fun setRecipientId(id: Long) {
+        recipientId.onNext(id)
+    }
+
+    private fun recreate() {
+        removeAllViews()
+
+        pager?.adapter?.count?.forEach { position ->
+            val view = LayoutInflater.from(context).inflate(R.layout.tab_view, this, false)
+            view.label.text = pager?.adapter?.getPageTitle(position)
+            view.setOnClickListener { pager?.currentItem = position }
+
+            addView(view)
+        }
+
+        childCount.forEach { index ->
+            getChildAt(index).isActivated = index == pager?.currentItem
+        }
+
+        pager?.addOnPageChangeListener(object : ViewPager.SimpleOnPageChangeListener() {
+            override fun onPageSelected(position: Int) {
+                childCount.forEach { index ->
+                    getChildAt(index).isActivated = index == position
+                }
+            }
+        })
+    }
+
+    override fun onAttachedToWindow() {
+        super.onAttachedToWindow()
+
+        val states = arrayOf(
+                intArrayOf(android.R.attr.state_activated),
+                intArrayOf(-android.R.attr.state_activated))
+
+        recipientId
+                .distinctUntilChanged()
+                .map { recipientId -> Optional(conversationRepo.getRecipient(recipientId)) }
+                .switchMap { recipient -> colors.themeObservable(recipient.value) }
+                .map { theme ->
+                    val textSecondary = context.resolveThemeColor(android.R.attr.textColorSecondary)
+                    ColorStateList(states, intArrayOf(theme.theme, textSecondary))
+                }
+                .autoDisposable(ViewScopeProvider.from(this))
+                .subscribe { colorStateList ->
+                    childCount.forEach { index ->
+                        (getChildAt(index) as? TextView)?.setTextColor(colorStateList)
+                    }
+                }
+    }
+
+}
diff --git a/presentation/src/main/java/com/moez/QKSMS/common/widget/PreferenceView.kt b/presentation/src/main/java/com/moez/QKSMS/common/widget/PreferenceView.kt
index 4e1a724c7..1f49766a7 100644
--- a/presentation/src/main/java/com/moez/QKSMS/common/widget/PreferenceView.kt
+++ b/presentation/src/main/java/com/moez/QKSMS/common/widget/PreferenceView.kt
@@ -1,96 +1,96 @@
-/*
- * Copyright (C) 2017 Moez Bhatti <moez.bhatti@gmail.com>
- *
- * This file is part of QKSMS.
- *
- * QKSMS is free software: you can redistribute it and/or modify
- * it under the terms of the GNU General Public License as published by
- * the Free Software Foundation, either version 3 of the License, or
- * (at your option) any later version.
- *
- * QKSMS is distributed in the hope that it will be useful,
- * but WITHOUT ANY WARRANTY; without even the implied warranty of
- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
- * GNU General Public License for more details.
- *
- * You should have received a copy of the GNU General Public License
- * along with QKSMS.  If not, see <http://www.gnu.org/licenses/>.
- */
-package com.moez.QKSMS.common.widget
-
-import android.content.Context
-import android.util.AttributeSet
-import android.view.Gravity
-import android.view.View
-import android.widget.TextView
-import androidx.appcompat.widget.LinearLayoutCompat
-import com.moez.QKSMS.R
-import com.moez.QKSMS.common.util.extensions.resolveThemeAttribute
-import com.moez.QKSMS.common.util.extensions.resolveThemeColorStateList
-import com.moez.QKSMS.common.util.extensions.setVisible
-import com.moez.QKSMS.injection.appComponent
-import kotlinx.android.synthetic.main.preference_view.view.*
-
-class PreferenceView @JvmOverloads constructor(
-    context: Context, attrs: AttributeSet? = null
-) : LinearLayoutCompat(context, attrs) {
-
-    var title: String? = null
-        set(value) {
-            field = value
-
-            if (isInEditMode) {
-                findViewById<TextView>(R.id.titleView).text = value
-            } else {
-                titleView.text = value
-            }
-        }
-
-    var summary: String? = null
-        set(value) {
-            field = value
-
-
-            if (isInEditMode) {
-                findViewById<TextView>(R.id.summaryView).run {
-                    text = value
-                    setVisible(value?.isNotEmpty() == true)
-                }
-            } else {
-                summaryView.text = value
-                summaryView.setVisible(value?.isNotEmpty() == true)
-            }
-        }
-
-    init {
-        if (!isInEditMode) {
-            appComponent.inject(this)
-        }
-
-        View.inflate(context, R.layout.preference_view, this)
-        setBackgroundResource(context.resolveThemeAttribute(R.attr.selectableItemBackground))
-        orientation = HORIZONTAL
-        gravity = Gravity.CENTER_VERTICAL
-
-        icon.imageTintList = context.resolveThemeColorStateList(android.R.attr.textColorSecondary)
-
-        context.obtainStyledAttributes(attrs, R.styleable.PreferenceView).run {
-            title = getString(R.styleable.PreferenceView_title)
-            summary = getString(R.styleable.PreferenceView_summary)
-
-            // If there's a custom view used for the preference's widget, inflate it
-            getResourceId(R.styleable.PreferenceView_widget, -1).takeIf { it != -1 }?.let { id ->
-                View.inflate(context, id, widgetFrame)
-            }
-
-            // If an icon is being used, set up the icon view
-            getResourceId(R.styleable.PreferenceView_icon, -1).takeIf { it != -1 }?.let { id ->
-                icon.setVisible(true)
-                icon.setImageResource(id)
-            }
-
-            recycle()
-        }
-    }
-
+/*
+ * Copyright (C) 2017 Moez Bhatti <moez.bhatti@gmail.com>
+ *
+ * This file is part of QKSMS.
+ *
+ * QKSMS is free software: you can redistribute it and/or modify
+ * it under the terms of the GNU General Public License as published by
+ * the Free Software Foundation, either version 3 of the License, or
+ * (at your option) any later version.
+ *
+ * QKSMS is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+ * GNU General Public License for more details.
+ *
+ * You should have received a copy of the GNU General Public License
+ * along with QKSMS.  If not, see <http://www.gnu.org/licenses/>.
+ */
+package com.moez.QKSMS.common.widget
+
+import android.content.Context
+import android.util.AttributeSet
+import android.view.Gravity
+import android.view.View
+import android.widget.TextView
+import androidx.appcompat.widget.LinearLayoutCompat
+import com.moez.QKSMS.R
+import com.moez.QKSMS.common.util.extensions.resolveThemeAttribute
+import com.moez.QKSMS.common.util.extensions.resolveThemeColorStateList
+import com.moez.QKSMS.common.util.extensions.setVisible
+import com.moez.QKSMS.injection.appComponent
+import kotlinx.android.synthetic.main.preference_view.view.*
+
+class PreferenceView @JvmOverloads constructor(
+    context: Context, attrs: AttributeSet? = null
+) : LinearLayoutCompat(context, attrs) {
+
+    var title: String? = null
+        set(value) {
+            field = value
+
+            if (isInEditMode) {
+                findViewById<TextView>(R.id.titleView).text = value
+            } else {
+                titleView.text = value
+            }
+        }
+
+    var summary: String? = null
+        set(value) {
+            field = value
+
+
+            if (isInEditMode) {
+                findViewById<TextView>(R.id.summaryView).run {
+                    text = value
+                    setVisible(value?.isNotEmpty() == true)
+                }
+            } else {
+                summaryView.text = value
+                summaryView.setVisible(value?.isNotEmpty() == true)
+            }
+        }
+
+    init {
+        if (!isInEditMode) {
+            appComponent.inject(this)
+        }
+
+        View.inflate(context, R.layout.preference_view, this)
+        setBackgroundResource(context.resolveThemeAttribute(R.attr.selectableItemBackground))
+        orientation = HORIZONTAL
+        gravity = Gravity.CENTER_VERTICAL
+
+        icon.imageTintList = context.resolveThemeColorStateList(android.R.attr.textColorSecondary)
+
+        context.obtainStyledAttributes(attrs, R.styleable.PreferenceView).run {
+            title = getString(R.styleable.PreferenceView_title)
+            summary = getString(R.styleable.PreferenceView_summary)
+
+            // If there's a custom view used for the preference's widget, inflate it
+            getResourceId(R.styleable.PreferenceView_widget, -1).takeIf { it != -1 }?.let { id ->
+                View.inflate(context, id, widgetFrame)
+            }
+
+            // If an icon is being used, set up the icon view
+            getResourceId(R.styleable.PreferenceView_icon, -1).takeIf { it != -1 }?.let { id ->
+                icon.setVisible(true)
+                icon.setImageResource(id)
+            }
+
+            recycle()
+        }
+    }
+
 }
\ No newline at end of file
diff --git a/presentation/src/main/java/com/moez/QKSMS/common/widget/QkDialog.kt b/presentation/src/main/java/com/moez/QKSMS/common/widget/QkDialog.kt
index f275c8a0c..de098d982 100644
--- a/presentation/src/main/java/com/moez/QKSMS/common/widget/QkDialog.kt
+++ b/presentation/src/main/java/com/moez/QKSMS/common/widget/QkDialog.kt
@@ -1,105 +1,105 @@
-/*
- * Copyright (C) 2019 Moez Bhatti <moez.bhatti@gmail.com>
- *
- * This file is part of QKSMS.
- *
- * QKSMS is free software: you can redistribute it and/or modify
- * it under the terms of the GNU General Public License as published by
- * the Free Software Foundation, either version 3 of the License, or
- * (at your option) any later version.
- *
- * QKSMS is distributed in the hope that it will be useful,
- * but WITHOUT ANY WARRANTY; without even the implied warranty of
- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
- * GNU General Public License for more details.
- *
- * You should have received a copy of the GNU General Public License
- * along with QKSMS.  If not, see <http://www.gnu.org/licenses/>.
- */
-package com.moez.QKSMS.common.widget
-
-import android.app.Activity
-import android.view.LayoutInflater
-import androidx.annotation.StringRes
-import androidx.appcompat.app.AlertDialog
-import androidx.core.view.isVisible
-import com.moez.QKSMS.R
-import com.moez.QKSMS.common.base.QkAdapter
-import kotlinx.android.synthetic.main.qk_dialog.view.*
-
-class QkDialog(private val context: Activity) : AlertDialog(context) {
-
-    private val view = LayoutInflater.from(context).inflate(R.layout.qk_dialog, null)
-
-    @StringRes
-    var titleRes: Int? = null
-        set(value) {
-            field = value
-            title = value?.let(context::getString)
-        }
-
-    var title: String? = null
-        set(value) {
-            field = value
-            view.title.text = value
-            view.title.isVisible = !value.isNullOrBlank()
-        }
-
-    @StringRes
-    var subtitleRes: Int? = null
-        set(value) {
-            field = value
-            subtitle = value?.let(context::getString)
-        }
-
-    var subtitle: String? = null
-        set(value) {
-            field = value
-            view.subtitle.text = value
-            view.subtitle.isVisible = !value.isNullOrBlank()
-        }
-
-    var adapter: QkAdapter<*>? = null
-        set(value) {
-            field = value
-            view.list.isVisible = value != null
-            view.list.adapter = value
-        }
-
-    var positiveButtonListener: (() -> Unit)? = null
-
-    @StringRes
-    var positiveButton: Int? = null
-        set(value) {
-            field = value
-            value?.run(view.positiveButton::setText)
-            view.positiveButton.isVisible = value != null
-            view.positiveButton.setOnClickListener {
-                positiveButtonListener?.invoke() ?: dismiss()
-            }
-        }
-
-    var negativeButtonListener: (() -> Unit)? = null
-
-    @StringRes
-    var negativeButton: Int? = null
-        set(value) {
-            field = value
-            value?.run(view.negativeButton::setText)
-            view.negativeButton.isVisible = value != null
-            view.negativeButton.setOnClickListener {
-                negativeButtonListener?.invoke() ?: dismiss()
-            }
-        }
-
-    var cancelListener: (() -> Unit)? = null
-        set(value) {
-            field = value
-            setOnCancelListener { value?.invoke() }
-        }
-
-    init {
-        setView(view)
-    }
-
-}
+/*
+ * Copyright (C) 2019 Moez Bhatti <moez.bhatti@gmail.com>
+ *
+ * This file is part of QKSMS.
+ *
+ * QKSMS is free software: you can redistribute it and/or modify
+ * it under the terms of the GNU General Public License as published by
+ * the Free Software Foundation, either version 3 of the License, or
+ * (at your option) any later version.
+ *
+ * QKSMS is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+ * GNU General Public License for more details.
+ *
+ * You should have received a copy of the GNU General Public License
+ * along with QKSMS.  If not, see <http://www.gnu.org/licenses/>.
+ */
+package com.moez.QKSMS.common.widget
+
+import android.app.Activity
+import android.view.LayoutInflater
+import androidx.annotation.StringRes
+import androidx.appcompat.app.AlertDialog
+import androidx.core.view.isVisible
+import com.moez.QKSMS.R
+import com.moez.QKSMS.common.base.QkAdapter
+import kotlinx.android.synthetic.main.qk_dialog.view.*
+
+class QkDialog(private val context: Activity) : AlertDialog(context) {
+
+    private val view = LayoutInflater.from(context).inflate(R.layout.qk_dialog, null)
+
+    @StringRes
+    var titleRes: Int? = null
+        set(value) {
+            field = value
+            title = value?.let(context::getString)
+        }
+
+    var title: String? = null
+        set(value) {
+            field = value
+            view.title.text = value
+            view.title.isVisible = !value.isNullOrBlank()
+        }
+
+    @StringRes
+    var subtitleRes: Int? = null
+        set(value) {
+            field = value
+            subtitle = value?.let(context::getString)
+        }
+
+    var subtitle: String? = null
+        set(value) {
+            field = value
+            view.subtitle.text = value
+            view.subtitle.isVisible = !value.isNullOrBlank()
+        }
+
+    var adapter: QkAdapter<*>? = null
+        set(value) {
+            field = value
+            view.list.isVisible = value != null
+            view.list.adapter = value
+        }
+
+    var positiveButtonListener: (() -> Unit)? = null
+
+    @StringRes
+    var positiveButton: Int? = null
+        set(value) {
+            field = value
+            value?.run(view.positiveButton::setText)
+            view.positiveButton.isVisible = value != null
+            view.positiveButton.setOnClickListener {
+                positiveButtonListener?.invoke() ?: dismiss()
+            }
+        }
+
+    var negativeButtonListener: (() -> Unit)? = null
+
+    @StringRes
+    var negativeButton: Int? = null
+        set(value) {
+            field = value
+            value?.run(view.negativeButton::setText)
+            view.negativeButton.isVisible = value != null
+            view.negativeButton.setOnClickListener {
+                negativeButtonListener?.invoke() ?: dismiss()
+            }
+        }
+
+    var cancelListener: (() -> Unit)? = null
+        set(value) {
+            field = value
+            setOnCancelListener { value?.invoke() }
+        }
+
+    init {
+        setView(view)
+    }
+
+}
diff --git a/presentation/src/main/java/com/moez/QKSMS/common/widget/QkEditText.kt b/presentation/src/main/java/com/moez/QKSMS/common/widget/QkEditText.kt
index 80711e7f8..13142d2d7 100644
--- a/presentation/src/main/java/com/moez/QKSMS/common/widget/QkEditText.kt
+++ b/presentation/src/main/java/com/moez/QKSMS/common/widget/QkEditText.kt
@@ -1,109 +1,109 @@
-/*
- * Copyright (C) 2017 Moez Bhatti <moez.bhatti@gmail.com>
- *
- * This file is part of QKSMS.
- *
- * QKSMS is free software: you can redistribute it and/or modify
- * it under the terms of the GNU General Public License as published by
- * the Free Software Foundation, either version 3 of the License, or
- * (at your option) any later version.
- *
- * QKSMS is distributed in the hope that it will be useful,
- * but WITHOUT ANY WARRANTY; without even the implied warranty of
- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
- * GNU General Public License for more details.
- *
- * You should have received a copy of the GNU General Public License
- * along with QKSMS.  If not, see <http://www.gnu.org/licenses/>.
- */
-package com.moez.QKSMS.common.widget
-
-import android.content.Context
-import android.os.Build
-import android.util.AttributeSet
-import android.view.KeyEvent
-import android.view.inputmethod.EditorInfo
-import android.view.inputmethod.InputConnection
-import android.view.inputmethod.InputConnectionWrapper
-import android.widget.EditText
-import androidx.core.view.inputmethod.EditorInfoCompat
-import androidx.core.view.inputmethod.InputConnectionCompat
-import androidx.core.view.inputmethod.InputContentInfoCompat
-import com.google.android.mms.ContentType
-import com.moez.QKSMS.common.util.TextViewStyler
-import com.moez.QKSMS.injection.appComponent
-import com.moez.QKSMS.util.tryOrNull
-import io.reactivex.subjects.PublishSubject
-import io.reactivex.subjects.Subject
-import javax.inject.Inject
-
-
-/**
- * Custom implementation of EditText to allow for dynamic text colors
- *
- * Beware of updating to extend AppCompatTextView, as this inexplicably breaks the view in
- * the contacts chip view
- */
-class QkEditText @JvmOverloads constructor(context: Context, attrs: AttributeSet? = null) : EditText(context, attrs) {
-
-    @Inject lateinit var textViewStyler: TextViewStyler
-
-    val backspaces: Subject<Unit> = PublishSubject.create()
-    val inputContentSelected: Subject<InputContentInfoCompat> = PublishSubject.create()
-    var supportsInputContent: Boolean = false
-
-    init {
-        if (!isInEditMode) {
-            appComponent.inject(this)
-            textViewStyler.applyAttributes(this, attrs)
-        } else {
-            TextViewStyler.applyEditModeAttributes(this, attrs)
-        }
-    }
-
-    override fun onCreateInputConnection(editorInfo: EditorInfo): InputConnection {
-
-        val inputConnection = object : InputConnectionWrapper(super.onCreateInputConnection(editorInfo), true) {
-            override fun sendKeyEvent(event: KeyEvent): Boolean {
-                if (event.action == KeyEvent.ACTION_DOWN && event.keyCode == KeyEvent.KEYCODE_DEL) {
-                    backspaces.onNext(Unit)
-                }
-                return super.sendKeyEvent(event)
-            }
-
-
-            override fun deleteSurroundingText(beforeLength: Int, afterLength: Int): Boolean {
-                if (beforeLength == 1 && afterLength == 0) {
-                    backspaces.onNext(Unit)
-                }
-                return super.deleteSurroundingText(beforeLength, afterLength)
-            }
-        }
-
-        if (supportsInputContent) {
-            EditorInfoCompat.setContentMimeTypes(editorInfo, arrayOf(
-                    ContentType.IMAGE_JPEG,
-                    ContentType.IMAGE_JPG,
-                    ContentType.IMAGE_PNG,
-                    ContentType.IMAGE_GIF))
-        }
-
-        val callback = InputConnectionCompat.OnCommitContentListener { inputContentInfo, flags, opts ->
-            val grantReadPermission = flags and InputConnectionCompat.INPUT_CONTENT_GRANT_READ_URI_PERMISSION != 0
-
-            if (Build.VERSION.SDK_INT >= Build.VERSION_CODES.N_MR1 && grantReadPermission) {
-                return@OnCommitContentListener tryOrNull {
-                    inputContentInfo.requestPermission()
-                    inputContentSelected.onNext(inputContentInfo)
-                    true
-                } ?: false
-
-            }
-
-            true
-        }
-
-        return InputConnectionCompat.createWrapper(inputConnection, editorInfo, callback)
-    }
-
+/*
+ * Copyright (C) 2017 Moez Bhatti <moez.bhatti@gmail.com>
+ *
+ * This file is part of QKSMS.
+ *
+ * QKSMS is free software: you can redistribute it and/or modify
+ * it under the terms of the GNU General Public License as published by
+ * the Free Software Foundation, either version 3 of the License, or
+ * (at your option) any later version.
+ *
+ * QKSMS is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+ * GNU General Public License for more details.
+ *
+ * You should have received a copy of the GNU General Public License
+ * along with QKSMS.  If not, see <http://www.gnu.org/licenses/>.
+ */
+package com.moez.QKSMS.common.widget
+
+import android.content.Context
+import android.os.Build
+import android.util.AttributeSet
+import android.view.KeyEvent
+import android.view.inputmethod.EditorInfo
+import android.view.inputmethod.InputConnection
+import android.view.inputmethod.InputConnectionWrapper
+import android.widget.EditText
+import androidx.core.view.inputmethod.EditorInfoCompat
+import androidx.core.view.inputmethod.InputConnectionCompat
+import androidx.core.view.inputmethod.InputContentInfoCompat
+import com.google.android.mms.ContentType
+import com.moez.QKSMS.common.util.TextViewStyler
+import com.moez.QKSMS.injection.appComponent
+import com.moez.QKSMS.util.tryOrNull
+import io.reactivex.subjects.PublishSubject
+import io.reactivex.subjects.Subject
+import javax.inject.Inject
+
+
+/**
+ * Custom implementation of EditText to allow for dynamic text colors
+ *
+ * Beware of updating to extend AppCompatTextView, as this inexplicably breaks the view in
+ * the contacts chip view
+ */
+class QkEditText @JvmOverloads constructor(context: Context, attrs: AttributeSet? = null) : EditText(context, attrs) {
+
+    @Inject lateinit var textViewStyler: TextViewStyler
+
+    val backspaces: Subject<Unit> = PublishSubject.create()
+    val inputContentSelected: Subject<InputContentInfoCompat> = PublishSubject.create()
+    var supportsInputContent: Boolean = false
+
+    init {
+        if (!isInEditMode) {
+            appComponent.inject(this)
+            textViewStyler.applyAttributes(this, attrs)
+        } else {
+            TextViewStyler.applyEditModeAttributes(this, attrs)
+        }
+    }
+
+    override fun onCreateInputConnection(editorInfo: EditorInfo): InputConnection {
+
+        val inputConnection = object : InputConnectionWrapper(super.onCreateInputConnection(editorInfo), true) {
+            override fun sendKeyEvent(event: KeyEvent): Boolean {
+                if (event.action == KeyEvent.ACTION_DOWN && event.keyCode == KeyEvent.KEYCODE_DEL) {
+                    backspaces.onNext(Unit)
+                }
+                return super.sendKeyEvent(event)
+            }
+
+
+            override fun deleteSurroundingText(beforeLength: Int, afterLength: Int): Boolean {
+                if (beforeLength == 1 && afterLength == 0) {
+                    backspaces.onNext(Unit)
+                }
+                return super.deleteSurroundingText(beforeLength, afterLength)
+            }
+        }
+
+        if (supportsInputContent) {
+            EditorInfoCompat.setContentMimeTypes(editorInfo, arrayOf(
+                    ContentType.IMAGE_JPEG,
+                    ContentType.IMAGE_JPG,
+                    ContentType.IMAGE_PNG,
+                    ContentType.IMAGE_GIF))
+        }
+
+        val callback = InputConnectionCompat.OnCommitContentListener { inputContentInfo, flags, opts ->
+            val grantReadPermission = flags and InputConnectionCompat.INPUT_CONTENT_GRANT_READ_URI_PERMISSION != 0
+
+            if (Build.VERSION.SDK_INT >= Build.VERSION_CODES.N_MR1 && grantReadPermission) {
+                return@OnCommitContentListener tryOrNull {
+                    inputContentInfo.requestPermission()
+                    inputContentSelected.onNext(inputContentInfo)
+                    true
+                } ?: false
+
+            }
+
+            true
+        }
+
+        return InputConnectionCompat.createWrapper(inputConnection, editorInfo, callback)
+    }
+
 }
\ No newline at end of file
diff --git a/presentation/src/main/java/com/moez/QKSMS/common/widget/QkSwitch.kt b/presentation/src/main/java/com/moez/QKSMS/common/widget/QkSwitch.kt
index 500377d84..c3584950f 100644
--- a/presentation/src/main/java/com/moez/QKSMS/common/widget/QkSwitch.kt
+++ b/presentation/src/main/java/com/moez/QKSMS/common/widget/QkSwitch.kt
@@ -1,64 +1,64 @@
-/*
- * Copyright (C) 2017 Moez Bhatti <moez.bhatti@gmail.com>
- *
- * This file is part of QKSMS.
- *
- * QKSMS is free software: you can redistribute it and/or modify
- * it under the terms of the GNU General Public License as published by
- * the Free Software Foundation, either version 3 of the License, or
- * (at your option) any later version.
- *
- * QKSMS is distributed in the hope that it will be useful,
- * but WITHOUT ANY WARRANTY; without even the implied warranty of
- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
- * GNU General Public License for more details.
- *
- * You should have received a copy of the GNU General Public License
- * along with QKSMS.  If not, see <http://www.gnu.org/licenses/>.
- */
-package com.moez.QKSMS.common.widget
-
-import android.content.Context
-import android.content.res.ColorStateList
-import android.util.AttributeSet
-import androidx.appcompat.widget.SwitchCompat
-import com.moez.QKSMS.R
-import com.moez.QKSMS.common.util.Colors
-import com.moez.QKSMS.common.util.extensions.resolveThemeColor
-import com.moez.QKSMS.common.util.extensions.withAlpha
-import com.moez.QKSMS.injection.appComponent
-import com.moez.QKSMS.util.Preferences
-import javax.inject.Inject
-
-class QkSwitch @JvmOverloads constructor(context: Context, attrs: AttributeSet? = null) : SwitchCompat(context, attrs) {
-
-    @Inject lateinit var colors: Colors
-    @Inject lateinit var prefs: Preferences
-
-    init {
-        if (!isInEditMode) {
-            appComponent.inject(this)
-        }
-    }
-
-    override fun onAttachedToWindow() {
-        super.onAttachedToWindow()
-
-        if (!isInEditMode) {
-            val states = arrayOf(
-                    intArrayOf(-android.R.attr.state_enabled),
-                    intArrayOf(android.R.attr.state_checked),
-                    intArrayOf())
-
-            thumbTintList = ColorStateList(states, intArrayOf(
-                    context.resolveThemeColor(R.attr.switchThumbDisabled),
-                    colors.theme().theme,
-                    context.resolveThemeColor(R.attr.switchThumbEnabled)))
-
-            trackTintList = ColorStateList(states, intArrayOf(
-                    context.resolveThemeColor(R.attr.switchTrackDisabled),
-                    colors.theme().theme.withAlpha(0x4D),
-                    context.resolveThemeColor(R.attr.switchTrackEnabled)))
-        }
-    }
+/*
+ * Copyright (C) 2017 Moez Bhatti <moez.bhatti@gmail.com>
+ *
+ * This file is part of QKSMS.
+ *
+ * QKSMS is free software: you can redistribute it and/or modify
+ * it under the terms of the GNU General Public License as published by
+ * the Free Software Foundation, either version 3 of the License, or
+ * (at your option) any later version.
+ *
+ * QKSMS is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+ * GNU General Public License for more details.
+ *
+ * You should have received a copy of the GNU General Public License
+ * along with QKSMS.  If not, see <http://www.gnu.org/licenses/>.
+ */
+package com.moez.QKSMS.common.widget
+
+import android.content.Context
+import android.content.res.ColorStateList
+import android.util.AttributeSet
+import androidx.appcompat.widget.SwitchCompat
+import com.moez.QKSMS.R
+import com.moez.QKSMS.common.util.Colors
+import com.moez.QKSMS.common.util.extensions.resolveThemeColor
+import com.moez.QKSMS.common.util.extensions.withAlpha
+import com.moez.QKSMS.injection.appComponent
+import com.moez.QKSMS.util.Preferences
+import javax.inject.Inject
+
+class QkSwitch @JvmOverloads constructor(context: Context, attrs: AttributeSet? = null) : SwitchCompat(context, attrs) {
+
+    @Inject lateinit var colors: Colors
+    @Inject lateinit var prefs: Preferences
+
+    init {
+        if (!isInEditMode) {
+            appComponent.inject(this)
+        }
+    }
+
+    override fun onAttachedToWindow() {
+        super.onAttachedToWindow()
+
+        if (!isInEditMode) {
+            val states = arrayOf(
+                    intArrayOf(-android.R.attr.state_enabled),
+                    intArrayOf(android.R.attr.state_checked),
+                    intArrayOf())
+
+            thumbTintList = ColorStateList(states, intArrayOf(
+                    context.resolveThemeColor(R.attr.switchThumbDisabled),
+                    colors.theme().theme,
+                    context.resolveThemeColor(R.attr.switchThumbEnabled)))
+
+            trackTintList = ColorStateList(states, intArrayOf(
+                    context.resolveThemeColor(R.attr.switchTrackDisabled),
+                    colors.theme().theme.withAlpha(0x4D),
+                    context.resolveThemeColor(R.attr.switchTrackEnabled)))
+        }
+    }
 }
\ No newline at end of file
diff --git a/presentation/src/main/java/com/moez/QKSMS/common/widget/QkTextView.kt b/presentation/src/main/java/com/moez/QKSMS/common/widget/QkTextView.kt
index bc771a1cf..632d0e818 100644
--- a/presentation/src/main/java/com/moez/QKSMS/common/widget/QkTextView.kt
+++ b/presentation/src/main/java/com/moez/QKSMS/common/widget/QkTextView.kt
@@ -1,79 +1,79 @@
-/*
- * Copyright (C) 2017 Moez Bhatti <moez.bhatti@gmail.com>
- *
- * This file is part of QKSMS.
- *
- * QKSMS is free software: you can redistribute it and/or modify
- * it under the terms of the GNU General Public License as published by
- * the Free Software Foundation, either version 3 of the License, or
- * (at your option) any later version.
- *
- * QKSMS is distributed in the hope that it will be useful,
- * but WITHOUT ANY WARRANTY; without even the implied warranty of
- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
- * GNU General Public License for more details.
- *
- * You should have received a copy of the GNU General Public License
- * along with QKSMS.  If not, see <http://www.gnu.org/licenses/>.
- */
-package com.moez.QKSMS.common.widget
-
-import android.content.Context
-import android.util.AttributeSet
-import androidx.emoji.widget.EmojiAppCompatTextView
-import com.moez.QKSMS.common.util.TextViewStyler
-import com.moez.QKSMS.injection.appComponent
-import javax.inject.Inject
-
-open class QkTextView @JvmOverloads constructor(
-    context: Context, attrs: AttributeSet? = null
-) : EmojiAppCompatTextView(context, attrs) {
-
-    @Inject lateinit var textViewStyler: TextViewStyler
-
-    /**
-     * Collapse a multiline list of strings into a single line
-     *
-     * Ex.
-     *
-     * Toronto, New York, Los Angeles,
-     * Seattle, Portland
-     *
-     * Will be converted to
-     *
-     * Toronto, New York, Los Angeles, +2
-     */
-    var collapseEnabled: Boolean = false
-
-    init {
-        if (!isInEditMode) {
-            appComponent.inject(this)
-            textViewStyler.applyAttributes(this, attrs)
-        } else {
-            TextViewStyler.applyEditModeAttributes(this, attrs)
-        }
-    }
-
-    override fun onLayout(changed: Boolean, left: Int, top: Int, right: Int, bottom: Int) {
-        super.onLayout(changed, left, top, right, bottom)
-
-        if (collapseEnabled) {
-            layout
-                    ?.takeIf { layout -> layout.lineCount > 0 }
-                    ?.let { layout -> layout.getEllipsisCount(layout.lineCount - 1) }
-                    ?.takeIf { ellipsisCount -> ellipsisCount > 0 }
-                    ?.let { ellipsisCount -> text.dropLast(ellipsisCount).lastIndexOf(',') }
-                    ?.takeIf { lastComma -> lastComma >= 0 }
-                    ?.let { lastComma ->
-                        val remainingNames = text.drop(lastComma).count { c -> c == ',' }
-                        text = "${text.take(lastComma)}, +$remainingNames"
-                    }
-        }
-    }
-
-    override fun setTextColor(color: Int) {
-        super.setTextColor(color)
-        setLinkTextColor(color)
-    }
-
+/*
+ * Copyright (C) 2017 Moez Bhatti <moez.bhatti@gmail.com>
+ *
+ * This file is part of QKSMS.
+ *
+ * QKSMS is free software: you can redistribute it and/or modify
+ * it under the terms of the GNU General Public License as published by
+ * the Free Software Foundation, either version 3 of the License, or
+ * (at your option) any later version.
+ *
+ * QKSMS is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+ * GNU General Public License for more details.
+ *
+ * You should have received a copy of the GNU General Public License
+ * along with QKSMS.  If not, see <http://www.gnu.org/licenses/>.
+ */
+package com.moez.QKSMS.common.widget
+
+import android.content.Context
+import android.util.AttributeSet
+import androidx.emoji.widget.EmojiAppCompatTextView
+import com.moez.QKSMS.common.util.TextViewStyler
+import com.moez.QKSMS.injection.appComponent
+import javax.inject.Inject
+
+open class QkTextView @JvmOverloads constructor(
+    context: Context, attrs: AttributeSet? = null
+) : EmojiAppCompatTextView(context, attrs) {
+
+    @Inject lateinit var textViewStyler: TextViewStyler
+
+    /**
+     * Collapse a multiline list of strings into a single line
+     *
+     * Ex.
+     *
+     * Toronto, New York, Los Angeles,
+     * Seattle, Portland
+     *
+     * Will be converted to
+     *
+     * Toronto, New York, Los Angeles, +2
+     */
+    var collapseEnabled: Boolean = false
+
+    init {
+        if (!isInEditMode) {
+            appComponent.inject(this)
+            textViewStyler.applyAttributes(this, attrs)
+        } else {
+            TextViewStyler.applyEditModeAttributes(this, attrs)
+        }
+    }
+
+    override fun onLayout(changed: Boolean, left: Int, top: Int, right: Int, bottom: Int) {
+        super.onLayout(changed, left, top, right, bottom)
+
+        if (collapseEnabled) {
+            layout
+                    ?.takeIf { layout -> layout.lineCount > 0 }
+                    ?.let { layout -> layout.getEllipsisCount(layout.lineCount - 1) }
+                    ?.takeIf { ellipsisCount -> ellipsisCount > 0 }
+                    ?.let { ellipsisCount -> text.dropLast(ellipsisCount).lastIndexOf(',') }
+                    ?.takeIf { lastComma -> lastComma >= 0 }
+                    ?.let { lastComma ->
+                        val remainingNames = text.drop(lastComma).count { c -> c == ',' }
+                        text = "${text.take(lastComma)}, +$remainingNames"
+                    }
+        }
+    }
+
+    override fun setTextColor(color: Int) {
+        super.setTextColor(color)
+        setLinkTextColor(color)
+    }
+
 }
\ No newline at end of file
diff --git a/presentation/src/main/java/com/moez/QKSMS/common/widget/RadioPreferenceView.kt b/presentation/src/main/java/com/moez/QKSMS/common/widget/RadioPreferenceView.kt
index 9f129c1af..ad9c3ff96 100644
--- a/presentation/src/main/java/com/moez/QKSMS/common/widget/RadioPreferenceView.kt
+++ b/presentation/src/main/java/com/moez/QKSMS/common/widget/RadioPreferenceView.kt
@@ -1,103 +1,103 @@
-/*
- * Copyright (C) 2017 Moez Bhatti <moez.bhatti@gmail.com>
- *
- * This file is part of QKSMS.
- *
- * QKSMS is free software: you can redistribute it and/or modify
- * it under the terms of the GNU General Public License as published by
- * the Free Software Foundation, either version 3 of the License, or
- * (at your option) any later version.
- *
- * QKSMS is distributed in the hope that it will be useful,
- * but WITHOUT ANY WARRANTY; without even the implied warranty of
- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
- * GNU General Public License for more details.
- *
- * You should have received a copy of the GNU General Public License
- * along with QKSMS.  If not, see <http://www.gnu.org/licenses/>.
- */
-package com.moez.QKSMS.common.widget
-
-import android.content.Context
-import android.content.res.ColorStateList
-import android.util.AttributeSet
-import android.view.View
-import android.widget.TextView
-import androidx.constraintlayout.widget.ConstraintLayout
-import com.moez.QKSMS.R
-import com.moez.QKSMS.common.util.Colors
-import com.moez.QKSMS.common.util.extensions.forwardTouches
-import com.moez.QKSMS.common.util.extensions.resolveThemeAttribute
-import com.moez.QKSMS.common.util.extensions.resolveThemeColor
-import com.moez.QKSMS.common.util.extensions.setVisible
-import com.moez.QKSMS.injection.appComponent
-import kotlinx.android.synthetic.main.radio_preference_view.view.*
-import javax.inject.Inject
-
-class RadioPreferenceView @JvmOverloads constructor(
-    context: Context, attrs: AttributeSet? = null
-) : ConstraintLayout(context, attrs) {
-
-    @Inject lateinit var colors: Colors
-
-    var title: String? = null
-        set(value) {
-            field = value
-
-            if (isInEditMode) {
-                findViewById<TextView>(R.id.titleView).text = value
-            } else {
-                titleView.text = value
-            }
-        }
-
-    var summary: String? = null
-        set(value) {
-            field = value
-
-
-            if (isInEditMode) {
-                findViewById<TextView>(R.id.summaryView).run {
-                    text = value
-                    setVisible(value?.isNotEmpty() == true)
-                }
-            } else {
-                summaryView.text = value
-                summaryView.setVisible(value?.isNotEmpty() == true)
-            }
-        }
-
-    init {
-        if (!isInEditMode) {
-            appComponent.inject(this)
-        }
-
-        View.inflate(context, R.layout.radio_preference_view, this)
-        setBackgroundResource(context.resolveThemeAttribute(R.attr.selectableItemBackground))
-
-        val states = arrayOf(
-                intArrayOf(android.R.attr.state_checked),
-                intArrayOf(-android.R.attr.state_checked))
-
-        val themeColor = when (isInEditMode) {
-            true -> context.resources.getColor(R.color.tools_theme)
-            false -> colors.theme().theme
-        }
-        val textSecondary = context.resolveThemeColor(android.R.attr.textColorTertiary)
-        radioButton.buttonTintList = ColorStateList(states, intArrayOf(themeColor, textSecondary))
-        radioButton.forwardTouches(this)
-
-        context.obtainStyledAttributes(attrs, R.styleable.RadioPreferenceView)?.run {
-            title = getString(R.styleable.RadioPreferenceView_title)
-            summary = getString(R.styleable.RadioPreferenceView_summary)
-
-            // If there's a custom view used for the preference's widget, inflate it
-            getResourceId(R.styleable.RadioPreferenceView_widget, -1).takeIf { it != -1 }?.let { id ->
-                View.inflate(context, id, widgetFrame)
-            }
-
-            recycle()
-        }
-    }
-
+/*
+ * Copyright (C) 2017 Moez Bhatti <moez.bhatti@gmail.com>
+ *
+ * This file is part of QKSMS.
+ *
+ * QKSMS is free software: you can redistribute it and/or modify
+ * it under the terms of the GNU General Public License as published by
+ * the Free Software Foundation, either version 3 of the License, or
+ * (at your option) any later version.
+ *
+ * QKSMS is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+ * GNU General Public License for more details.
+ *
+ * You should have received a copy of the GNU General Public License
+ * along with QKSMS.  If not, see <http://www.gnu.org/licenses/>.
+ */
+package com.moez.QKSMS.common.widget
+
+import android.content.Context
+import android.content.res.ColorStateList
+import android.util.AttributeSet
+import android.view.View
+import android.widget.TextView
+import androidx.constraintlayout.widget.ConstraintLayout
+import com.moez.QKSMS.R
+import com.moez.QKSMS.common.util.Colors
+import com.moez.QKSMS.common.util.extensions.forwardTouches
+import com.moez.QKSMS.common.util.extensions.resolveThemeAttribute
+import com.moez.QKSMS.common.util.extensions.resolveThemeColor
+import com.moez.QKSMS.common.util.extensions.setVisible
+import com.moez.QKSMS.injection.appComponent
+import kotlinx.android.synthetic.main.radio_preference_view.view.*
+import javax.inject.Inject
+
+class RadioPreferenceView @JvmOverloads constructor(
+    context: Context, attrs: AttributeSet? = null
+) : ConstraintLayout(context, attrs) {
+
+    @Inject lateinit var colors: Colors
+
+    var title: String? = null
+        set(value) {
+            field = value
+
+            if (isInEditMode) {
+                findViewById<TextView>(R.id.titleView).text = value
+            } else {
+                titleView.text = value
+            }
+        }
+
+    var summary: String? = null
+        set(value) {
+            field = value
+
+
+            if (isInEditMode) {
+                findViewById<TextView>(R.id.summaryView).run {
+                    text = value
+                    setVisible(value?.isNotEmpty() == true)
+                }
+            } else {
+                summaryView.text = value
+                summaryView.setVisible(value?.isNotEmpty() == true)
+            }
+        }
+
+    init {
+        if (!isInEditMode) {
+            appComponent.inject(this)
+        }
+
+        View.inflate(context, R.layout.radio_preference_view, this)
+        setBackgroundResource(context.resolveThemeAttribute(R.attr.selectableItemBackground))
+
+        val states = arrayOf(
+                intArrayOf(android.R.attr.state_checked),
+                intArrayOf(-android.R.attr.state_checked))
+
+        val themeColor = when (isInEditMode) {
+            true -> context.resources.getColor(R.color.tools_theme)
+            false -> colors.theme().theme
+        }
+        val textSecondary = context.resolveThemeColor(android.R.attr.textColorTertiary)
+        radioButton.buttonTintList = ColorStateList(states, intArrayOf(themeColor, textSecondary))
+        radioButton.forwardTouches(this)
+
+        context.obtainStyledAttributes(attrs, R.styleable.RadioPreferenceView)?.run {
+            title = getString(R.styleable.RadioPreferenceView_title)
+            summary = getString(R.styleable.RadioPreferenceView_summary)
+
+            // If there's a custom view used for the preference's widget, inflate it
+            getResourceId(R.styleable.RadioPreferenceView_widget, -1).takeIf { it != -1 }?.let { id ->
+                View.inflate(context, id, widgetFrame)
+            }
+
+            recycle()
+        }
+    }
+
 }
\ No newline at end of file
diff --git a/presentation/src/main/java/com/moez/QKSMS/common/widget/SquareImageView.kt b/presentation/src/main/java/com/moez/QKSMS/common/widget/SquareImageView.kt
index c166a741b..79cf9f42c 100644
--- a/presentation/src/main/java/com/moez/QKSMS/common/widget/SquareImageView.kt
+++ b/presentation/src/main/java/com/moez/QKSMS/common/widget/SquareImageView.kt
@@ -1,31 +1,31 @@
-/*
- * Copyright (C) 2017 Moez Bhatti <moez.bhatti@gmail.com>
- *
- * This file is part of QKSMS.
- *
- * QKSMS is free software: you can redistribute it and/or modify
- * it under the terms of the GNU General Public License as published by
- * the Free Software Foundation, either version 3 of the License, or
- * (at your option) any later version.
- *
- * QKSMS is distributed in the hope that it will be useful,
- * but WITHOUT ANY WARRANTY; without even the implied warranty of
- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
- * GNU General Public License for more details.
- *
- * You should have received a copy of the GNU General Public License
- * along with QKSMS.  If not, see <http://www.gnu.org/licenses/>.
- */
-package com.moez.QKSMS.common.widget
-
-import android.content.Context
-import android.util.AttributeSet
-import android.widget.ImageView
-
-class SquareImageView @JvmOverloads constructor(context: Context, attrs: AttributeSet? = null) : ImageView(context, attrs) {
-
-    override fun onMeasure(widthMeasureSpec: Int, heightMeasureSpec: Int) {
-        super.onMeasure(widthMeasureSpec, widthMeasureSpec)
-    }
-
+/*
+ * Copyright (C) 2017 Moez Bhatti <moez.bhatti@gmail.com>
+ *
+ * This file is part of QKSMS.
+ *
+ * QKSMS is free software: you can redistribute it and/or modify
+ * it under the terms of the GNU General Public License as published by
+ * the Free Software Foundation, either version 3 of the License, or
+ * (at your option) any later version.
+ *
+ * QKSMS is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+ * GNU General Public License for more details.
+ *
+ * You should have received a copy of the GNU General Public License
+ * along with QKSMS.  If not, see <http://www.gnu.org/licenses/>.
+ */
+package com.moez.QKSMS.common.widget
+
+import android.content.Context
+import android.util.AttributeSet
+import android.widget.ImageView
+
+class SquareImageView @JvmOverloads constructor(context: Context, attrs: AttributeSet? = null) : ImageView(context, attrs) {
+
+    override fun onMeasure(widthMeasureSpec: Int, heightMeasureSpec: Int) {
+        super.onMeasure(widthMeasureSpec, widthMeasureSpec)
+    }
+
 }
\ No newline at end of file
diff --git a/presentation/src/main/java/com/moez/QKSMS/common/widget/TextInputDialog.kt b/presentation/src/main/java/com/moez/QKSMS/common/widget/TextInputDialog.kt
index 1f639a018..f5a1cb39c 100644
--- a/presentation/src/main/java/com/moez/QKSMS/common/widget/TextInputDialog.kt
+++ b/presentation/src/main/java/com/moez/QKSMS/common/widget/TextInputDialog.kt
@@ -1,48 +1,48 @@
-/*
- * Copyright (C) 2017 Moez Bhatti <moez.bhatti@gmail.com>
- *
- * This file is part of QKSMS.
- *
- * QKSMS is free software: you can redistribute it and/or modify
- * it under the terms of the GNU General Public License as published by
- * the Free Software Foundation, either version 3 of the License, or
- * (at your option) any later version.
- *
- * QKSMS is distributed in the hope that it will be useful,
- * but WITHOUT ANY WARRANTY; without even the implied warranty of
- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
- * GNU General Public License for more details.
- *
- * You should have received a copy of the GNU General Public License
- * along with QKSMS.  If not, see <http://www.gnu.org/licenses/>.
- */
-package com.moez.QKSMS.common.widget
-
-import android.app.Activity
-import android.content.DialogInterface
-import android.view.LayoutInflater
-import androidx.appcompat.app.AlertDialog
-import com.moez.QKSMS.R
-import kotlinx.android.synthetic.main.text_input_dialog.view.*
-
-class TextInputDialog(context: Activity, hint: String, listener: (String) -> Unit) : AlertDialog(context) {
-
-    private val layout = LayoutInflater.from(context).inflate(R.layout.text_input_dialog, null)
-
-    init {
-        layout.field.hint = hint
-
-        setView(layout)
-        setButton(DialogInterface.BUTTON_NEUTRAL, context.getString(R.string.button_cancel)) { _, _ -> }
-        setButton(DialogInterface.BUTTON_NEGATIVE, context.getString(R.string.button_delete)) { _, _ -> listener("") }
-        setButton(DialogInterface.BUTTON_POSITIVE, context.getString(R.string.button_save)) { _, _ ->
-            listener(layout.field.text.toString())
-        }
-    }
-
-    fun setText(text: String): TextInputDialog {
-        layout.field.setText(text)
-        return this
-    }
-
-}
+/*
+ * Copyright (C) 2017 Moez Bhatti <moez.bhatti@gmail.com>
+ *
+ * This file is part of QKSMS.
+ *
+ * QKSMS is free software: you can redistribute it and/or modify
+ * it under the terms of the GNU General Public License as published by
+ * the Free Software Foundation, either version 3 of the License, or
+ * (at your option) any later version.
+ *
+ * QKSMS is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+ * GNU General Public License for more details.
+ *
+ * You should have received a copy of the GNU General Public License
+ * along with QKSMS.  If not, see <http://www.gnu.org/licenses/>.
+ */
+package com.moez.QKSMS.common.widget
+
+import android.app.Activity
+import android.content.DialogInterface
+import android.view.LayoutInflater
+import androidx.appcompat.app.AlertDialog
+import com.moez.QKSMS.R
+import kotlinx.android.synthetic.main.text_input_dialog.view.*
+
+class TextInputDialog(context: Activity, hint: String, listener: (String) -> Unit) : AlertDialog(context) {
+
+    private val layout = LayoutInflater.from(context).inflate(R.layout.text_input_dialog, null)
+
+    init {
+        layout.field.hint = hint
+
+        setView(layout)
+        setButton(DialogInterface.BUTTON_NEUTRAL, context.getString(R.string.button_cancel)) { _, _ -> }
+        setButton(DialogInterface.BUTTON_NEGATIVE, context.getString(R.string.button_delete)) { _, _ -> listener("") }
+        setButton(DialogInterface.BUTTON_POSITIVE, context.getString(R.string.button_save)) { _, _ ->
+            listener(layout.field.text.toString())
+        }
+    }
+
+    fun setText(text: String): TextInputDialog {
+        layout.field.setText(text)
+        return this
+    }
+
+}
diff --git a/presentation/src/main/java/com/moez/QKSMS/common/widget/TightTextView.kt b/presentation/src/main/java/com/moez/QKSMS/common/widget/TightTextView.kt
index 0c104b81c..16ee50d29 100644
--- a/presentation/src/main/java/com/moez/QKSMS/common/widget/TightTextView.kt
+++ b/presentation/src/main/java/com/moez/QKSMS/common/widget/TightTextView.kt
@@ -1,49 +1,49 @@
-/*
- * Copyright (C) 2017 Moez Bhatti <moez.bhatti@gmail.com>
- *
- * This file is part of QKSMS.
- *
- * QKSMS is free software: you can redistribute it and/or modify
- * it under the terms of the GNU General Public License as published by
- * the Free Software Foundation, either version 3 of the License, or
- * (at your option) any later version.
- *
- * QKSMS is distributed in the hope that it will be useful,
- * but WITHOUT ANY WARRANTY; without even the implied warranty of
- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
- * GNU General Public License for more details.
- *
- * You should have received a copy of the GNU General Public License
- * along with QKSMS.  If not, see <http://www.gnu.org/licenses/>.
- */
-package com.moez.QKSMS.common.widget
-
-import android.content.Context
-import android.util.AttributeSet
-
-class TightTextView @JvmOverloads constructor(
-    context: Context,
-    attrs: AttributeSet? = null
-) : QkTextView(context, attrs) {
-
-    override fun onMeasure(widthMeasureSpec: Int, heightMeasureSpec: Int) {
-        super.onMeasure(widthMeasureSpec, heightMeasureSpec)
-
-        // Get a non-null copy of the layout, if available. Then ensure we've got multiple lines
-        val layout = layout ?: return
-        if (layout.lineCount <= 1) {
-            return
-        }
-
-        val maxLineWidth = (0 until layout.lineCount)
-                .map(layout::getLineWidth)
-                .max() ?: 0f
-
-        val width = Math.ceil(maxLineWidth.toDouble()).toInt() + compoundPaddingLeft + compoundPaddingRight
-        if (width < measuredWidth) {
-            val widthSpec = MeasureSpec.makeMeasureSpec(width, MeasureSpec.getMode(widthMeasureSpec))
-            super.onMeasure(widthSpec, heightMeasureSpec)
-        }
-    }
-
+/*
+ * Copyright (C) 2017 Moez Bhatti <moez.bhatti@gmail.com>
+ *
+ * This file is part of QKSMS.
+ *
+ * QKSMS is free software: you can redistribute it and/or modify
+ * it under the terms of the GNU General Public License as published by
+ * the Free Software Foundation, either version 3 of the License, or
+ * (at your option) any later version.
+ *
+ * QKSMS is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+ * GNU General Public License for more details.
+ *
+ * You should have received a copy of the GNU General Public License
+ * along with QKSMS.  If not, see <http://www.gnu.org/licenses/>.
+ */
+package com.moez.QKSMS.common.widget
+
+import android.content.Context
+import android.util.AttributeSet
+
+class TightTextView @JvmOverloads constructor(
+    context: Context,
+    attrs: AttributeSet? = null
+) : QkTextView(context, attrs) {
+
+    override fun onMeasure(widthMeasureSpec: Int, heightMeasureSpec: Int) {
+        super.onMeasure(widthMeasureSpec, heightMeasureSpec)
+
+        // Get a non-null copy of the layout, if available. Then ensure we've got multiple lines
+        val layout = layout ?: return
+        if (layout.lineCount <= 1) {
+            return
+        }
+
+        val maxLineWidth = (0 until layout.lineCount)
+                .map(layout::getLineWidth)
+                .max() ?: 0f
+
+        val width = Math.ceil(maxLineWidth.toDouble()).toInt() + compoundPaddingLeft + compoundPaddingRight
+        if (width < measuredWidth) {
+            val widthSpec = MeasureSpec.makeMeasureSpec(width, MeasureSpec.getMode(widthMeasureSpec))
+            super.onMeasure(widthSpec, heightMeasureSpec)
+        }
+    }
+
 }
\ No newline at end of file
diff --git a/presentation/src/main/java/com/moez/QKSMS/feature/backup/BackupActivity.kt b/presentation/src/main/java/com/moez/QKSMS/feature/backup/BackupActivity.kt
index 65c52b3ce..24f2eda34 100644
--- a/presentation/src/main/java/com/moez/QKSMS/feature/backup/BackupActivity.kt
+++ b/presentation/src/main/java/com/moez/QKSMS/feature/backup/BackupActivity.kt
@@ -1,52 +1,52 @@
-/*
- * Copyright (C) 2017 Moez Bhatti <moez.bhatti@gmail.com>
- *
- * This file is part of QKSMS.
- *
- * QKSMS is free software: you can redistribute it and/or modify
- * it under the terms of the GNU General Public License as published by
- * the Free Software Foundation, either version 3 of the License, or
- * (at your option) any later version.
- *
- * QKSMS is distributed in the hope that it will be useful,
- * but WITHOUT ANY WARRANTY; without even the implied warranty of
- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
- * GNU General Public License for more details.
- *
- * You should have received a copy of the GNU General Public License
- * along with QKSMS.  If not, see <http://www.gnu.org/licenses/>.
- */
-package com.moez.QKSMS.feature.backup
-
-import android.os.Bundle
-import com.bluelinelabs.conductor.Conductor
-import com.bluelinelabs.conductor.Router
-import com.bluelinelabs.conductor.RouterTransaction
-import com.moez.QKSMS.R
-import com.moez.QKSMS.common.base.QkThemedActivity
-import dagger.android.AndroidInjection
-import kotlinx.android.synthetic.main.container_activity.*
-
-
-class BackupActivity : QkThemedActivity() {
-
-    private lateinit var router: Router
-
-    override fun onCreate(savedInstanceState: Bundle?) {
-        AndroidInjection.inject(this)
-        super.onCreate(savedInstanceState)
-        setContentView(R.layout.container_activity)
-
-        router = Conductor.attachRouter(this, container, savedInstanceState)
-        if (!router.hasRootController()) {
-            router.setRoot(RouterTransaction.with(BackupController()))
-        }
-    }
-
-    override fun onBackPressed() {
-        if (!router.handleBack()) {
-            super.onBackPressed()
-        }
-    }
-
+/*
+ * Copyright (C) 2017 Moez Bhatti <moez.bhatti@gmail.com>
+ *
+ * This file is part of QKSMS.
+ *
+ * QKSMS is free software: you can redistribute it and/or modify
+ * it under the terms of the GNU General Public License as published by
+ * the Free Software Foundation, either version 3 of the License, or
+ * (at your option) any later version.
+ *
+ * QKSMS is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+ * GNU General Public License for more details.
+ *
+ * You should have received a copy of the GNU General Public License
+ * along with QKSMS.  If not, see <http://www.gnu.org/licenses/>.
+ */
+package com.moez.QKSMS.feature.backup
+
+import android.os.Bundle
+import com.bluelinelabs.conductor.Conductor
+import com.bluelinelabs.conductor.Router
+import com.bluelinelabs.conductor.RouterTransaction
+import com.moez.QKSMS.R
+import com.moez.QKSMS.common.base.QkThemedActivity
+import dagger.android.AndroidInjection
+import kotlinx.android.synthetic.main.container_activity.*
+
+
+class BackupActivity : QkThemedActivity() {
+
+    private lateinit var router: Router
+
+    override fun onCreate(savedInstanceState: Bundle?) {
+        AndroidInjection.inject(this)
+        super.onCreate(savedInstanceState)
+        setContentView(R.layout.container_activity)
+
+        router = Conductor.attachRouter(this, container, savedInstanceState)
+        if (!router.hasRootController()) {
+            router.setRoot(RouterTransaction.with(BackupController()))
+        }
+    }
+
+    override fun onBackPressed() {
+        if (!router.handleBack()) {
+            super.onBackPressed()
+        }
+    }
+
 }
\ No newline at end of file
diff --git a/presentation/src/main/java/com/moez/QKSMS/feature/backup/BackupAdapter.kt b/presentation/src/main/java/com/moez/QKSMS/feature/backup/BackupAdapter.kt
index 038295dc6..5e736cb08 100644
--- a/presentation/src/main/java/com/moez/QKSMS/feature/backup/BackupAdapter.kt
+++ b/presentation/src/main/java/com/moez/QKSMS/feature/backup/BackupAdapter.kt
@@ -1,61 +1,61 @@
-/*
- * Copyright (C) 2017 Moez Bhatti <moez.bhatti@gmail.com>
- *
- * This file is part of QKSMS.
- *
- * QKSMS is free software: you can redistribute it and/or modify
- * it under the terms of the GNU General Public License as published by
- * the Free Software Foundation, either version 3 of the License, or
- * (at your option) any later version.
- *
- * QKSMS is distributed in the hope that it will be useful,
- * but WITHOUT ANY WARRANTY; without even the implied warranty of
- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
- * GNU General Public License for more details.
- *
- * You should have received a copy of the GNU General Public License
- * along with QKSMS.  If not, see <http://www.gnu.org/licenses/>.
- */
-package com.moez.QKSMS.feature.backup
-
-import android.content.Context
-import android.text.format.Formatter
-import android.view.LayoutInflater
-import android.view.ViewGroup
-import com.moez.QKSMS.R
-import com.moez.QKSMS.common.base.FlowableAdapter
-import com.moez.QKSMS.common.base.QkViewHolder
-import com.moez.QKSMS.common.util.DateFormatter
-import com.moez.QKSMS.model.BackupFile
-import io.reactivex.subjects.PublishSubject
-import io.reactivex.subjects.Subject
-import kotlinx.android.synthetic.main.backup_list_item.*
-import javax.inject.Inject
-
-class BackupAdapter @Inject constructor(
-    private val context: Context,
-    private val dateFormatter: DateFormatter
-) : FlowableAdapter<BackupFile>() {
-
-    val backupSelected: Subject<BackupFile> = PublishSubject.create()
-
-    override fun onCreateViewHolder(parent: ViewGroup, viewType: Int): QkViewHolder {
-        val layoutInflater = LayoutInflater.from(parent.context)
-        val view = layoutInflater.inflate(R.layout.backup_list_item, parent, false)
-
-        return QkViewHolder(view).apply {
-            view.setOnClickListener { backupSelected.onNext(getItem(adapterPosition)) }
-        }
-    }
-
-    override fun onBindViewHolder(holder: QkViewHolder, position: Int) {
-        val backup = getItem(position)
-
-        val count = backup.messages
-
-        holder.title.text = dateFormatter.getDetailedTimestamp(backup.date)
-        holder.messages.text = context.resources.getQuantityString(R.plurals.backup_message_count, count, count)
-        holder.size.text = Formatter.formatFileSize(context, backup.size)
-    }
-
+/*
+ * Copyright (C) 2017 Moez Bhatti <moez.bhatti@gmail.com>
+ *
+ * This file is part of QKSMS.
+ *
+ * QKSMS is free software: you can redistribute it and/or modify
+ * it under the terms of the GNU General Public License as published by
+ * the Free Software Foundation, either version 3 of the License, or
+ * (at your option) any later version.
+ *
+ * QKSMS is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+ * GNU General Public License for more details.
+ *
+ * You should have received a copy of the GNU General Public License
+ * along with QKSMS.  If not, see <http://www.gnu.org/licenses/>.
+ */
+package com.moez.QKSMS.feature.backup
+
+import android.content.Context
+import android.text.format.Formatter
+import android.view.LayoutInflater
+import android.view.ViewGroup
+import com.moez.QKSMS.R
+import com.moez.QKSMS.common.base.FlowableAdapter
+import com.moez.QKSMS.common.base.QkViewHolder
+import com.moez.QKSMS.common.util.DateFormatter
+import com.moez.QKSMS.model.BackupFile
+import io.reactivex.subjects.PublishSubject
+import io.reactivex.subjects.Subject
+import kotlinx.android.synthetic.main.backup_list_item.*
+import javax.inject.Inject
+
+class BackupAdapter @Inject constructor(
+    private val context: Context,
+    private val dateFormatter: DateFormatter
+) : FlowableAdapter<BackupFile>() {
+
+    val backupSelected: Subject<BackupFile> = PublishSubject.create()
+
+    override fun onCreateViewHolder(parent: ViewGroup, viewType: Int): QkViewHolder {
+        val layoutInflater = LayoutInflater.from(parent.context)
+        val view = layoutInflater.inflate(R.layout.backup_list_item, parent, false)
+
+        return QkViewHolder(view).apply {
+            view.setOnClickListener { backupSelected.onNext(getItem(adapterPosition)) }
+        }
+    }
+
+    override fun onBindViewHolder(holder: QkViewHolder, position: Int) {
+        val backup = getItem(position)
+
+        val count = backup.messages
+
+        holder.title.text = dateFormatter.getDetailedTimestamp(backup.date)
+        holder.messages.text = context.resources.getQuantityString(R.plurals.backup_message_count, count, count)
+        holder.size.text = Formatter.formatFileSize(context, backup.size)
+    }
+
 }
\ No newline at end of file
diff --git a/presentation/src/main/java/com/moez/QKSMS/feature/backup/BackupController.kt b/presentation/src/main/java/com/moez/QKSMS/feature/backup/BackupController.kt
index 1439f5f47..990c0e60c 100644
--- a/presentation/src/main/java/com/moez/QKSMS/feature/backup/BackupController.kt
+++ b/presentation/src/main/java/com/moez/QKSMS/feature/backup/BackupController.kt
@@ -1,201 +1,201 @@
-/*
- * Copyright (C) 2017 Moez Bhatti <moez.bhatti@gmail.com>
- *
- * This file is part of QKSMS.
- *
- * QKSMS is free software: you can redistribute it and/or modify
- * it under the terms of the GNU General Public License as published by
- * the Free Software Foundation, either version 3 of the License, or
- * (at your option) any later version.
- *
- * QKSMS is distributed in the hope that it will be useful,
- * but WITHOUT ANY WARRANTY; without even the implied warranty of
- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
- * GNU General Public License for more details.
- *
- * You should have received a copy of the GNU General Public License
- * along with QKSMS.  If not, see <http://www.gnu.org/licenses/>.
- */
-package com.moez.QKSMS.feature.backup
-
-import android.Manifest
-import android.app.Activity
-import android.content.res.ColorStateList
-import android.graphics.Typeface
-import android.view.View
-import androidx.appcompat.app.AlertDialog
-import androidx.core.app.ActivityCompat
-import androidx.core.view.children
-import androidx.core.view.isVisible
-import com.jakewharton.rxbinding2.view.clicks
-import com.moez.QKSMS.R
-import com.moez.QKSMS.common.base.QkController
-import com.moez.QKSMS.common.util.DateFormatter
-import com.moez.QKSMS.common.util.extensions.getLabel
-import com.moez.QKSMS.common.util.extensions.setBackgroundTint
-import com.moez.QKSMS.common.util.extensions.setPositiveButton
-import com.moez.QKSMS.common.util.extensions.setTint
-import com.moez.QKSMS.common.widget.PreferenceView
-import com.moez.QKSMS.injection.appComponent
-import com.moez.QKSMS.model.BackupFile
-import com.moez.QKSMS.repository.BackupRepository
-import io.reactivex.Observable
-import io.reactivex.subjects.PublishSubject
-import io.reactivex.subjects.Subject
-import kotlinx.android.synthetic.main.backup_controller.*
-import kotlinx.android.synthetic.main.backup_list_dialog.view.*
-import kotlinx.android.synthetic.main.preference_view.view.*
-import javax.inject.Inject
-
-class BackupController : QkController<BackupView, BackupState, BackupPresenter>(), BackupView {
-
-    @Inject lateinit var adapter: BackupAdapter
-    @Inject lateinit var dateFormatter: DateFormatter
-    @Inject override lateinit var presenter: BackupPresenter
-
-    private val activityVisibleSubject: Subject<Unit> = PublishSubject.create()
-    private val confirmRestoreSubject: Subject<Unit> = PublishSubject.create()
-    private val stopRestoreSubject: Subject<Unit> = PublishSubject.create()
-
-    private val backupFilesDialog by lazy {
-        val view = View.inflate(activity, R.layout.backup_list_dialog, null)
-                .apply { files.adapter = adapter.apply { emptyView = empty } }
-
-        AlertDialog.Builder(activity!!)
-                .setView(view)
-                .setCancelable(true)
-                .create()
-    }
-
-    private val confirmRestoreDialog by lazy {
-        AlertDialog.Builder(activity!!)
-                .setTitle(R.string.backup_restore_confirm_title)
-                .setMessage(R.string.backup_restore_confirm_message)
-                .setPositiveButton(R.string.backup_restore_title, confirmRestoreSubject)
-                .setNegativeButton(R.string.button_cancel, null)
-                .create()
-    }
-
-    private val stopRestoreDialog by lazy {
-        AlertDialog.Builder(activity!!)
-                .setTitle(R.string.backup_restore_stop_title)
-                .setMessage(R.string.backup_restore_stop_message)
-                .setPositiveButton(R.string.button_stop, stopRestoreSubject)
-                .setNegativeButton(R.string.button_cancel, null)
-                .create()
-    }
-
-    init {
-        appComponent.inject(this)
-        layoutRes = R.layout.backup_controller
-    }
-
-    override fun onAttach(view: View) {
-        super.onAttach(view)
-        presenter.bindIntents(this)
-        setTitle(R.string.backup_title)
-        showBackButton(true)
-    }
-
-    override fun onViewCreated() {
-        super.onViewCreated()
-
-        themedActivity?.colors?.theme()?.let { theme ->
-            progressBar.indeterminateTintList = ColorStateList.valueOf(theme.theme)
-            progressBar.progressTintList = ColorStateList.valueOf(theme.theme)
-            fab.setBackgroundTint(theme.theme)
-            fabIcon.setTint(theme.textPrimary)
-            fabLabel.setTextColor(theme.textPrimary)
-        }
-
-        // Make the list titles bold
-        linearLayout.children
-                .mapNotNull { it as? PreferenceView }
-                .map { it.titleView }
-                .forEach { it.setTypeface(it.typeface, Typeface.BOLD) }
-    }
-
-    override fun onActivityResumed(activity: Activity) {
-        super.onActivityResumed(activity)
-        activityVisibleSubject.onNext(Unit)
-    }
-
-    override fun render(state: BackupState) {
-        when {
-            state.backupProgress.running -> {
-                progressIcon.setImageResource(R.drawable.ic_file_upload_black_24dp)
-                progressTitle.setText(R.string.backup_backing_up)
-                progressSummary.text = state.backupProgress.getLabel(activity!!)
-                progressSummary.isVisible = progressSummary.text.isNotEmpty()
-                progressCancel.isVisible = false
-                val running = (state.backupProgress as? BackupRepository.Progress.Running)
-                progressBar.isVisible = state.backupProgress.indeterminate || running?.max ?: 0 > 0
-                progressBar.isIndeterminate = state.backupProgress.indeterminate
-                progressBar.max = running?.max ?: 0
-                progressBar.progress = running?.count ?: 0
-                progress.isVisible = true
-                fab.isVisible = false
-            }
-
-            state.restoreProgress.running -> {
-                progressIcon.setImageResource(R.drawable.ic_file_download_black_24dp)
-                progressTitle.setText(R.string.backup_restoring)
-                progressSummary.text = state.restoreProgress.getLabel(activity!!)
-                progressSummary.isVisible = progressSummary.text.isNotEmpty()
-                progressCancel.isVisible = true
-                val running = (state.restoreProgress as? BackupRepository.Progress.Running)
-                progressBar.isVisible = state.restoreProgress.indeterminate || running?.max ?: 0 > 0
-                progressBar.isIndeterminate = state.restoreProgress.indeterminate
-                progressBar.max = running?.max ?: 0
-                progressBar.progress = running?.count ?: 0
-                progress.isVisible = true
-                fab.isVisible = false
-            }
-
-            else -> {
-                progress.isVisible = false
-                fab.isVisible = true
-            }
-        }
-
-        backup.summary = state.lastBackup
-
-        adapter.data = state.backups
-
-        fabIcon.setImageResource(when (state.upgraded) {
-            true -> R.drawable.ic_file_upload_black_24dp
-            false -> R.drawable.ic_star_black_24dp
-        })
-
-        fabLabel.setText(when (state.upgraded) {
-            true -> R.string.backup_now
-            false -> R.string.title_qksms_plus
-        })
-    }
-
-    override fun activityVisible(): Observable<*> = activityVisibleSubject
-
-    override fun restoreClicks(): Observable<*> = restore.clicks()
-
-    override fun restoreFileSelected(): Observable<BackupFile> = adapter.backupSelected
-            .doOnNext { backupFilesDialog.dismiss() }
-
-    override fun restoreConfirmed(): Observable<*> = confirmRestoreSubject
-
-    override fun stopRestoreClicks(): Observable<*> = progressCancel.clicks()
-
-    override fun stopRestoreConfirmed(): Observable<*> = stopRestoreSubject
-
-    override fun fabClicks(): Observable<*> = fab.clicks()
-
-    override fun requestStoragePermission() {
-        ActivityCompat.requestPermissions(activity!!, arrayOf(Manifest.permission.WRITE_EXTERNAL_STORAGE), 0)
-    }
-
-    override fun selectFile() = backupFilesDialog.show()
-
-    override fun confirmRestore() = confirmRestoreDialog.show()
-
-    override fun stopRestore() = stopRestoreDialog.show()
-
+/*
+ * Copyright (C) 2017 Moez Bhatti <moez.bhatti@gmail.com>
+ *
+ * This file is part of QKSMS.
+ *
+ * QKSMS is free software: you can redistribute it and/or modify
+ * it under the terms of the GNU General Public License as published by
+ * the Free Software Foundation, either version 3 of the License, or
+ * (at your option) any later version.
+ *
+ * QKSMS is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+ * GNU General Public License for more details.
+ *
+ * You should have received a copy of the GNU General Public License
+ * along with QKSMS.  If not, see <http://www.gnu.org/licenses/>.
+ */
+package com.moez.QKSMS.feature.backup
+
+import android.Manifest
+import android.app.Activity
+import android.content.res.ColorStateList
+import android.graphics.Typeface
+import android.view.View
+import androidx.appcompat.app.AlertDialog
+import androidx.core.app.ActivityCompat
+import androidx.core.view.children
+import androidx.core.view.isVisible
+import com.jakewharton.rxbinding2.view.clicks
+import com.moez.QKSMS.R
+import com.moez.QKSMS.common.base.QkController
+import com.moez.QKSMS.common.util.DateFormatter
+import com.moez.QKSMS.common.util.extensions.getLabel
+import com.moez.QKSMS.common.util.extensions.setBackgroundTint
+import com.moez.QKSMS.common.util.extensions.setPositiveButton
+import com.moez.QKSMS.common.util.extensions.setTint
+import com.moez.QKSMS.common.widget.PreferenceView
+import com.moez.QKSMS.injection.appComponent
+import com.moez.QKSMS.model.BackupFile
+import com.moez.QKSMS.repository.BackupRepository
+import io.reactivex.Observable
+import io.reactivex.subjects.PublishSubject
+import io.reactivex.subjects.Subject
+import kotlinx.android.synthetic.main.backup_controller.*
+import kotlinx.android.synthetic.main.backup_list_dialog.view.*
+import kotlinx.android.synthetic.main.preference_view.view.*
+import javax.inject.Inject
+
+class BackupController : QkController<BackupView, BackupState, BackupPresenter>(), BackupView {
+
+    @Inject lateinit var adapter: BackupAdapter
+    @Inject lateinit var dateFormatter: DateFormatter
+    @Inject override lateinit var presenter: BackupPresenter
+
+    private val activityVisibleSubject: Subject<Unit> = PublishSubject.create()
+    private val confirmRestoreSubject: Subject<Unit> = PublishSubject.create()
+    private val stopRestoreSubject: Subject<Unit> = PublishSubject.create()
+
+    private val backupFilesDialog by lazy {
+        val view = View.inflate(activity, R.layout.backup_list_dialog, null)
+                .apply { files.adapter = adapter.apply { emptyView = empty } }
+
+        AlertDialog.Builder(activity!!)
+                .setView(view)
+                .setCancelable(true)
+                .create()
+    }
+
+    private val confirmRestoreDialog by lazy {
+        AlertDialog.Builder(activity!!)
+                .setTitle(R.string.backup_restore_confirm_title)
+                .setMessage(R.string.backup_restore_confirm_message)
+                .setPositiveButton(R.string.backup_restore_title, confirmRestoreSubject)
+                .setNegativeButton(R.string.button_cancel, null)
+                .create()
+    }
+
+    private val stopRestoreDialog by lazy {
+        AlertDialog.Builder(activity!!)
+                .setTitle(R.string.backup_restore_stop_title)
+                .setMessage(R.string.backup_restore_stop_message)
+                .setPositiveButton(R.string.button_stop, stopRestoreSubject)
+                .setNegativeButton(R.string.button_cancel, null)
+                .create()
+    }
+
+    init {
+        appComponent.inject(this)
+        layoutRes = R.layout.backup_controller
+    }
+
+    override fun onAttach(view: View) {
+        super.onAttach(view)
+        presenter.bindIntents(this)
+        setTitle(R.string.backup_title)
+        showBackButton(true)
+    }
+
+    override fun onViewCreated() {
+        super.onViewCreated()
+
+        themedActivity?.colors?.theme()?.let { theme ->
+            progressBar.indeterminateTintList = ColorStateList.valueOf(theme.theme)
+            progressBar.progressTintList = ColorStateList.valueOf(theme.theme)
+            fab.setBackgroundTint(theme.theme)
+            fabIcon.setTint(theme.textPrimary)
+            fabLabel.setTextColor(theme.textPrimary)
+        }
+
+        // Make the list titles bold
+        linearLayout.children
+                .mapNotNull { it as? PreferenceView }
+                .map { it.titleView }
+                .forEach { it.setTypeface(it.typeface, Typeface.BOLD) }
+    }
+
+    override fun onActivityResumed(activity: Activity) {
+        super.onActivityResumed(activity)
+        activityVisibleSubject.onNext(Unit)
+    }
+
+    override fun render(state: BackupState) {
+        when {
+            state.backupProgress.running -> {
+                progressIcon.setImageResource(R.drawable.ic_file_upload_black_24dp)
+                progressTitle.setText(R.string.backup_backing_up)
+                progressSummary.text = state.backupProgress.getLabel(activity!!)
+                progressSummary.isVisible = progressSummary.text.isNotEmpty()
+                progressCancel.isVisible = false
+                val running = (state.backupProgress as? BackupRepository.Progress.Running)
+                progressBar.isVisible = state.backupProgress.indeterminate || running?.max ?: 0 > 0
+                progressBar.isIndeterminate = state.backupProgress.indeterminate
+                progressBar.max = running?.max ?: 0
+                progressBar.progress = running?.count ?: 0
+                progress.isVisible = true
+                fab.isVisible = false
+            }
+
+            state.restoreProgress.running -> {
+                progressIcon.setImageResource(R.drawable.ic_file_download_black_24dp)
+                progressTitle.setText(R.string.backup_restoring)
+                progressSummary.text = state.restoreProgress.getLabel(activity!!)
+                progressSummary.isVisible = progressSummary.text.isNotEmpty()
+                progressCancel.isVisible = true
+                val running = (state.restoreProgress as? BackupRepository.Progress.Running)
+                progressBar.isVisible = state.restoreProgress.indeterminate || running?.max ?: 0 > 0
+                progressBar.isIndeterminate = state.restoreProgress.indeterminate
+                progressBar.max = running?.max ?: 0
+                progressBar.progress = running?.count ?: 0
+                progress.isVisible = true
+                fab.isVisible = false
+            }
+
+            else -> {
+                progress.isVisible = false
+                fab.isVisible = true
+            }
+        }
+
+        backup.summary = state.lastBackup
+
+        adapter.data = state.backups
+
+        fabIcon.setImageResource(when (state.upgraded) {
+            true -> R.drawable.ic_file_upload_black_24dp
+            false -> R.drawable.ic_star_black_24dp
+        })
+
+        fabLabel.setText(when (state.upgraded) {
+            true -> R.string.backup_now
+            false -> R.string.title_qksms_plus
+        })
+    }
+
+    override fun activityVisible(): Observable<*> = activityVisibleSubject
+
+    override fun restoreClicks(): Observable<*> = restore.clicks()
+
+    override fun restoreFileSelected(): Observable<BackupFile> = adapter.backupSelected
+            .doOnNext { backupFilesDialog.dismiss() }
+
+    override fun restoreConfirmed(): Observable<*> = confirmRestoreSubject
+
+    override fun stopRestoreClicks(): Observable<*> = progressCancel.clicks()
+
+    override fun stopRestoreConfirmed(): Observable<*> = stopRestoreSubject
+
+    override fun fabClicks(): Observable<*> = fab.clicks()
+
+    override fun requestStoragePermission() {
+        ActivityCompat.requestPermissions(activity!!, arrayOf(Manifest.permission.WRITE_EXTERNAL_STORAGE), 0)
+    }
+
+    override fun selectFile() = backupFilesDialog.show()
+
+    override fun confirmRestore() = confirmRestoreDialog.show()
+
+    override fun stopRestore() = stopRestoreDialog.show()
+
 }
\ No newline at end of file
diff --git a/presentation/src/main/java/com/moez/QKSMS/feature/backup/BackupPresenter.kt b/presentation/src/main/java/com/moez/QKSMS/feature/backup/BackupPresenter.kt
index b547ec306..0f00655a5 100644
--- a/presentation/src/main/java/com/moez/QKSMS/feature/backup/BackupPresenter.kt
+++ b/presentation/src/main/java/com/moez/QKSMS/feature/backup/BackupPresenter.kt
@@ -1,135 +1,135 @@
-/*
- * Copyright (C) 2017 Moez Bhatti <moez.bhatti@gmail.com>
- *
- * This file is part of QKSMS.
- *
- * QKSMS is free software: you can redistribute it and/or modify
- * it under the terms of the GNU General Public License as published by
- * the Free Software Foundation, either version 3 of the License, or
- * (at your option) any later version.
- *
- * QKSMS is distributed in the hope that it will be useful,
- * but WITHOUT ANY WARRANTY; without even the implied warranty of
- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
- * GNU General Public License for more details.
- *
- * You should have received a copy of the GNU General Public License
- * along with QKSMS.  If not, see <http://www.gnu.org/licenses/>.
- */
-package com.moez.QKSMS.feature.backup
-
-import android.content.Context
-import com.moez.QKSMS.R
-import com.moez.QKSMS.common.Navigator
-import com.moez.QKSMS.common.base.QkPresenter
-import com.moez.QKSMS.common.util.DateFormatter
-import com.moez.QKSMS.common.util.extensions.makeToast
-import com.moez.QKSMS.interactor.PerformBackup
-import com.moez.QKSMS.manager.BillingManager
-import com.moez.QKSMS.manager.PermissionManager
-import com.moez.QKSMS.repository.BackupRepository
-import com.uber.autodispose.android.lifecycle.scope
-import com.uber.autodispose.autoDisposable
-import io.reactivex.rxkotlin.plusAssign
-import io.reactivex.rxkotlin.withLatestFrom
-import io.reactivex.subjects.BehaviorSubject
-import io.reactivex.subjects.Subject
-import java.util.concurrent.TimeUnit
-import javax.inject.Inject
-
-class BackupPresenter @Inject constructor(
-    private val backupRepo: BackupRepository,
-    private val billingManager: BillingManager,
-    private val context: Context,
-    private val dateFormatter: DateFormatter,
-    private val navigator: Navigator,
-    private val performBackup: PerformBackup,
-    private val permissionManager: PermissionManager
-) : QkPresenter<BackupView, BackupState>(BackupState()) {
-
-    private val storagePermissionSubject: Subject<Boolean> = BehaviorSubject.createDefault(permissionManager.hasStorage())
-
-    init {
-        disposables += backupRepo.getBackupProgress()
-                .sample(16, TimeUnit.MILLISECONDS)
-                .distinctUntilChanged()
-                .subscribe { progress -> newState { copy(backupProgress = progress) } }
-
-        disposables += backupRepo.getRestoreProgress()
-                .sample(16, TimeUnit.MILLISECONDS)
-                .distinctUntilChanged()
-                .subscribe { progress -> newState { copy(restoreProgress = progress) } }
-
-        disposables += storagePermissionSubject
-                .distinctUntilChanged()
-                .switchMap { backupRepo.getBackups() }
-                .doOnNext { backups -> newState { copy(backups = backups) } }
-                .map { backups -> backups.map { it.date }.max() ?: 0L }
-                .map { lastBackup ->
-                    when (lastBackup) {
-                        0L -> context.getString(R.string.backup_never)
-                        else -> dateFormatter.getDetailedTimestamp(lastBackup)
-                    }
-                }
-                .startWith(context.getString(R.string.backup_loading))
-                .subscribe { lastBackup -> newState { copy(lastBackup = lastBackup) } }
-
-        disposables += billingManager.upgradeStatus
-                .subscribe { upgraded -> newState { copy(upgraded = upgraded) } }
-    }
-
-    override fun bindIntents(view: BackupView) {
-        super.bindIntents(view)
-
-        view.activityVisible()
-                .map { permissionManager.hasStorage() }
-                .autoDisposable(view.scope())
-                .subscribe(storagePermissionSubject)
-
-        view.restoreClicks()
-                .withLatestFrom(
-                        backupRepo.getBackupProgress(),
-                        backupRepo.getRestoreProgress(),
-                        billingManager.upgradeStatus)
-                { _, backupProgress, restoreProgress, upgraded ->
-                    when {
-                        !upgraded -> context.makeToast(R.string.backup_restore_error_plus)
-                        backupProgress.running -> context.makeToast(R.string.backup_restore_error_backup)
-                        restoreProgress.running -> context.makeToast(R.string.backup_restore_error_restore)
-                        !permissionManager.hasStorage() -> view.requestStoragePermission()
-                        else -> view.selectFile()
-                    }
-                }
-                .autoDisposable(view.scope())
-                .subscribe()
-
-        view.restoreFileSelected()
-                .autoDisposable(view.scope())
-                .subscribe { view.confirmRestore() }
-
-        view.restoreConfirmed()
-                .withLatestFrom(view.restoreFileSelected()) { _, backup -> backup }
-                .autoDisposable(view.scope())
-                .subscribe { backup -> RestoreBackupService.start(context, backup.path) }
-
-        view.stopRestoreClicks()
-                .autoDisposable(view.scope())
-                .subscribe { view.stopRestore() }
-
-        view.stopRestoreConfirmed()
-                .autoDisposable(view.scope())
-                .subscribe { backupRepo.stopRestore() }
-
-        view.fabClicks()
-                .withLatestFrom(billingManager.upgradeStatus) { _, upgraded -> upgraded }
-                .autoDisposable(view.scope())
-                .subscribe { upgraded ->
-                    when {
-                        !upgraded -> navigator.showQksmsPlusActivity("backup_fab")
-                        !permissionManager.hasStorage() -> view.requestStoragePermission()
-                        upgraded -> performBackup.execute(Unit)
-                    }
-                }
-    }
-
+/*
+ * Copyright (C) 2017 Moez Bhatti <moez.bhatti@gmail.com>
+ *
+ * This file is part of QKSMS.
+ *
+ * QKSMS is free software: you can redistribute it and/or modify
+ * it under the terms of the GNU General Public License as published by
+ * the Free Software Foundation, either version 3 of the License, or
+ * (at your option) any later version.
+ *
+ * QKSMS is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+ * GNU General Public License for more details.
+ *
+ * You should have received a copy of the GNU General Public License
+ * along with QKSMS.  If not, see <http://www.gnu.org/licenses/>.
+ */
+package com.moez.QKSMS.feature.backup
+
+import android.content.Context
+import com.moez.QKSMS.R
+import com.moez.QKSMS.common.Navigator
+import com.moez.QKSMS.common.base.QkPresenter
+import com.moez.QKSMS.common.util.DateFormatter
+import com.moez.QKSMS.common.util.extensions.makeToast
+import com.moez.QKSMS.interactor.PerformBackup
+import com.moez.QKSMS.manager.BillingManager
+import com.moez.QKSMS.manager.PermissionManager
+import com.moez.QKSMS.repository.BackupRepository
+import com.uber.autodispose.android.lifecycle.scope
+import com.uber.autodispose.autoDisposable
+import io.reactivex.rxkotlin.plusAssign
+import io.reactivex.rxkotlin.withLatestFrom
+import io.reactivex.subjects.BehaviorSubject
+import io.reactivex.subjects.Subject
+import java.util.concurrent.TimeUnit
+import javax.inject.Inject
+
+class BackupPresenter @Inject constructor(
+    private val backupRepo: BackupRepository,
+    private val billingManager: BillingManager,
+    private val context: Context,
+    private val dateFormatter: DateFormatter,
+    private val navigator: Navigator,
+    private val performBackup: PerformBackup,
+    private val permissionManager: PermissionManager
+) : QkPresenter<BackupView, BackupState>(BackupState()) {
+
+    private val storagePermissionSubject: Subject<Boolean> = BehaviorSubject.createDefault(permissionManager.hasStorage())
+
+    init {
+        disposables += backupRepo.getBackupProgress()
+                .sample(16, TimeUnit.MILLISECONDS)
+                .distinctUntilChanged()
+                .subscribe { progress -> newState { copy(backupProgress = progress) } }
+
+        disposables += backupRepo.getRestoreProgress()
+                .sample(16, TimeUnit.MILLISECONDS)
+                .distinctUntilChanged()
+                .subscribe { progress -> newState { copy(restoreProgress = progress) } }
+
+        disposables += storagePermissionSubject
+                .distinctUntilChanged()
+                .switchMap { backupRepo.getBackups() }
+                .doOnNext { backups -> newState { copy(backups = backups) } }
+                .map { backups -> backups.map { it.date }.max() ?: 0L }
+                .map { lastBackup ->
+                    when (lastBackup) {
+                        0L -> context.getString(R.string.backup_never)
+                        else -> dateFormatter.getDetailedTimestamp(lastBackup)
+                    }
+                }
+                .startWith(context.getString(R.string.backup_loading))
+                .subscribe { lastBackup -> newState { copy(lastBackup = lastBackup) } }
+
+        disposables += billingManager.upgradeStatus
+                .subscribe { upgraded -> newState { copy(upgraded = upgraded) } }
+    }
+
+    override fun bindIntents(view: BackupView) {
+        super.bindIntents(view)
+
+        view.activityVisible()
+                .map { permissionManager.hasStorage() }
+                .autoDisposable(view.scope())
+                .subscribe(storagePermissionSubject)
+
+        view.restoreClicks()
+                .withLatestFrom(
+                        backupRepo.getBackupProgress(),
+                        backupRepo.getRestoreProgress(),
+                        billingManager.upgradeStatus)
+                { _, backupProgress, restoreProgress, upgraded ->
+                    when {
+                        !upgraded -> context.makeToast(R.string.backup_restore_error_plus)
+                        backupProgress.running -> context.makeToast(R.string.backup_restore_error_backup)
+                        restoreProgress.running -> context.makeToast(R.string.backup_restore_error_restore)
+                        !permissionManager.hasStorage() -> view.requestStoragePermission()
+                        else -> view.selectFile()
+                    }
+                }
+                .autoDisposable(view.scope())
+                .subscribe()
+
+        view.restoreFileSelected()
+                .autoDisposable(view.scope())
+                .subscribe { view.confirmRestore() }
+
+        view.restoreConfirmed()
+                .withLatestFrom(view.restoreFileSelected()) { _, backup -> backup }
+                .autoDisposable(view.scope())
+                .subscribe { backup -> RestoreBackupService.start(context, backup.path) }
+
+        view.stopRestoreClicks()
+                .autoDisposable(view.scope())
+                .subscribe { view.stopRestore() }
+
+        view.stopRestoreConfirmed()
+                .autoDisposable(view.scope())
+                .subscribe { backupRepo.stopRestore() }
+
+        view.fabClicks()
+                .withLatestFrom(billingManager.upgradeStatus) { _, upgraded -> upgraded }
+                .autoDisposable(view.scope())
+                .subscribe { upgraded ->
+                    when {
+                        !upgraded -> navigator.showQksmsPlusActivity("backup_fab")
+                        !permissionManager.hasStorage() -> view.requestStoragePermission()
+                        upgraded -> performBackup.execute(Unit)
+                    }
+                }
+    }
+
 }
\ No newline at end of file
diff --git a/presentation/src/main/java/com/moez/QKSMS/feature/backup/BackupState.kt b/presentation/src/main/java/com/moez/QKSMS/feature/backup/BackupState.kt
index b65858103..080a18ccd 100644
--- a/presentation/src/main/java/com/moez/QKSMS/feature/backup/BackupState.kt
+++ b/presentation/src/main/java/com/moez/QKSMS/feature/backup/BackupState.kt
@@ -1,30 +1,30 @@
-/*
- * Copyright (C) 2017 Moez Bhatti <moez.bhatti@gmail.com>
- *
- * This file is part of QKSMS.
- *
- * QKSMS is free software: you can redistribute it and/or modify
- * it under the terms of the GNU General Public License as published by
- * the Free Software Foundation, either version 3 of the License, or
- * (at your option) any later version.
- *
- * QKSMS is distributed in the hope that it will be useful,
- * but WITHOUT ANY WARRANTY; without even the implied warranty of
- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
- * GNU General Public License for more details.
- *
- * You should have received a copy of the GNU General Public License
- * along with QKSMS.  If not, see <http://www.gnu.org/licenses/>.
- */
-package com.moez.QKSMS.feature.backup
-
-import com.moez.QKSMS.model.BackupFile
-import com.moez.QKSMS.repository.BackupRepository
-
-data class BackupState(
-    val backupProgress: BackupRepository.Progress = BackupRepository.Progress.Idle(),
-    val restoreProgress: BackupRepository.Progress = BackupRepository.Progress.Idle(),
-    val lastBackup: String = "",
-    val backups: List<BackupFile> = listOf(),
-    val upgraded: Boolean = false
+/*
+ * Copyright (C) 2017 Moez Bhatti <moez.bhatti@gmail.com>
+ *
+ * This file is part of QKSMS.
+ *
+ * QKSMS is free software: you can redistribute it and/or modify
+ * it under the terms of the GNU General Public License as published by
+ * the Free Software Foundation, either version 3 of the License, or
+ * (at your option) any later version.
+ *
+ * QKSMS is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+ * GNU General Public License for more details.
+ *
+ * You should have received a copy of the GNU General Public License
+ * along with QKSMS.  If not, see <http://www.gnu.org/licenses/>.
+ */
+package com.moez.QKSMS.feature.backup
+
+import com.moez.QKSMS.model.BackupFile
+import com.moez.QKSMS.repository.BackupRepository
+
+data class BackupState(
+    val backupProgress: BackupRepository.Progress = BackupRepository.Progress.Idle(),
+    val restoreProgress: BackupRepository.Progress = BackupRepository.Progress.Idle(),
+    val lastBackup: String = "",
+    val backups: List<BackupFile> = listOf(),
+    val upgraded: Boolean = false
 )
\ No newline at end of file
diff --git a/presentation/src/main/java/com/moez/QKSMS/feature/backup/BackupView.kt b/presentation/src/main/java/com/moez/QKSMS/feature/backup/BackupView.kt
index abef9b0e6..c83e330aa 100644
--- a/presentation/src/main/java/com/moez/QKSMS/feature/backup/BackupView.kt
+++ b/presentation/src/main/java/com/moez/QKSMS/feature/backup/BackupView.kt
@@ -1,40 +1,40 @@
-/*
- * Copyright (C) 2017 Moez Bhatti <moez.bhatti@gmail.com>
- *
- * This file is part of QKSMS.
- *
- * QKSMS is free software: you can redistribute it and/or modify
- * it under the terms of the GNU General Public License as published by
- * the Free Software Foundation, either version 3 of the License, or
- * (at your option) any later version.
- *
- * QKSMS is distributed in the hope that it will be useful,
- * but WITHOUT ANY WARRANTY; without even the implied warranty of
- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
- * GNU General Public License for more details.
- *
- * You should have received a copy of the GNU General Public License
- * along with QKSMS.  If not, see <http://www.gnu.org/licenses/>.
- */
-package com.moez.QKSMS.feature.backup
-
-import com.moez.QKSMS.common.base.QkViewContract
-import com.moez.QKSMS.model.BackupFile
-import io.reactivex.Observable
-
-interface BackupView : QkViewContract<BackupState> {
-
-    fun activityVisible(): Observable<*>
-    fun restoreClicks(): Observable<*>
-    fun restoreFileSelected(): Observable<BackupFile>
-    fun restoreConfirmed(): Observable<*>
-    fun stopRestoreClicks(): Observable<*>
-    fun stopRestoreConfirmed(): Observable<*>
-    fun fabClicks(): Observable<*>
-
-    fun requestStoragePermission()
-    fun selectFile()
-    fun confirmRestore()
-    fun stopRestore()
-
+/*
+ * Copyright (C) 2017 Moez Bhatti <moez.bhatti@gmail.com>
+ *
+ * This file is part of QKSMS.
+ *
+ * QKSMS is free software: you can redistribute it and/or modify
+ * it under the terms of the GNU General Public License as published by
+ * the Free Software Foundation, either version 3 of the License, or
+ * (at your option) any later version.
+ *
+ * QKSMS is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+ * GNU General Public License for more details.
+ *
+ * You should have received a copy of the GNU General Public License
+ * along with QKSMS.  If not, see <http://www.gnu.org/licenses/>.
+ */
+package com.moez.QKSMS.feature.backup
+
+import com.moez.QKSMS.common.base.QkViewContract
+import com.moez.QKSMS.model.BackupFile
+import io.reactivex.Observable
+
+interface BackupView : QkViewContract<BackupState> {
+
+    fun activityVisible(): Observable<*>
+    fun restoreClicks(): Observable<*>
+    fun restoreFileSelected(): Observable<BackupFile>
+    fun restoreConfirmed(): Observable<*>
+    fun stopRestoreClicks(): Observable<*>
+    fun stopRestoreConfirmed(): Observable<*>
+    fun fabClicks(): Observable<*>
+
+    fun requestStoragePermission()
+    fun selectFile()
+    fun confirmRestore()
+    fun stopRestore()
+
 }
\ No newline at end of file
diff --git a/presentation/src/main/java/com/moez/QKSMS/feature/backup/RestoreBackupService.kt b/presentation/src/main/java/com/moez/QKSMS/feature/backup/RestoreBackupService.kt
index 49527ef0f..80585b9f7 100644
--- a/presentation/src/main/java/com/moez/QKSMS/feature/backup/RestoreBackupService.kt
+++ b/presentation/src/main/java/com/moez/QKSMS/feature/backup/RestoreBackupService.kt
@@ -1,114 +1,114 @@
-/*
- * Copyright (C) 2017 Moez Bhatti <moez.bhatti@gmail.com>
- *
- * This file is part of QKSMS.
- *
- * QKSMS is free software: you can redistribute it and/or modify
- * it under the terms of the GNU General Public License as published by
- * the Free Software Foundation, either version 3 of the License, or
- * (at your option) any later version.
- *
- * QKSMS is distributed in the hope that it will be useful,
- * but WITHOUT ANY WARRANTY; without even the implied warranty of
- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
- * GNU General Public License for more details.
- *
- * You should have received a copy of the GNU General Public License
- * along with QKSMS.  If not, see <http://www.gnu.org/licenses/>.
- */
-package com.moez.QKSMS.feature.backup
-
-import android.annotation.SuppressLint
-import android.app.Service
-import android.content.Context
-import android.content.Intent
-import android.os.IBinder
-import androidx.core.app.NotificationManagerCompat
-import androidx.core.content.ContextCompat
-import com.moez.QKSMS.common.util.extensions.getLabel
-import com.moez.QKSMS.manager.NotificationManager
-import com.moez.QKSMS.repository.BackupRepository
-import dagger.android.AndroidInjection
-import io.reactivex.Observable
-import io.reactivex.schedulers.Schedulers
-import timber.log.Timber
-import java.util.concurrent.TimeUnit
-import javax.inject.Inject
-
-
-class RestoreBackupService : Service() {
-
-    companion object {
-        private const val NOTIFICATION_ID = -1
-
-        private const val ACTION_START = "com.moez.QKSMS.ACTION_START"
-        private const val ACTION_STOP = "com.moez.QKSMS.ACTION_STOP"
-        private const val EXTRA_FILE_PATH = "com.moez.QKSMS.EXTRA_FILE_PATH"
-
-        fun start(context: Context, filePath: String) {
-            val intent = Intent(context, RestoreBackupService::class.java)
-                    .setAction(ACTION_START)
-                    .putExtra(EXTRA_FILE_PATH, filePath)
-
-            ContextCompat.startForegroundService(context, intent)
-        }
-    }
-
-    @Inject lateinit var backupRepo: BackupRepository
-    @Inject lateinit var notificationManager: NotificationManager
-
-    private val notification by lazy { notificationManager.getNotificationForBackup() }
-
-    override fun onCreate() = AndroidInjection.inject(this)
-
-    override fun onBind(intent: Intent?): IBinder? = null
-
-    override fun onStartCommand(intent: Intent, flags: Int, startId: Int): Int {
-        super.onStartCommand(intent, flags, startId)
-        when (intent.action) {
-            ACTION_START -> start(intent)
-            ACTION_STOP -> stop()
-        }
-
-        return Service.START_STICKY
-    }
-
-    @SuppressLint("CheckResult")
-    private fun start(intent: Intent) {
-        val notificationManager = NotificationManagerCompat.from(this)
-
-        startForeground(NOTIFICATION_ID, notification.build())
-
-        backupRepo.getRestoreProgress()
-                .sample(200, TimeUnit.MILLISECONDS, true)
-                .subscribeOn(Schedulers.io())
-                .subscribe { progress ->
-                    when (progress) {
-                        is BackupRepository.Progress.Idle -> stop()
-
-                        is BackupRepository.Progress.Running -> notification
-                                .setProgress(progress.max, progress.count, progress.indeterminate)
-                                .setContentText(progress.getLabel(this))
-                                .let { notificationManager.notify(NOTIFICATION_ID, it.build()) }
-
-                        else -> notification
-                                .setProgress(0, 0, progress.indeterminate)
-                                .setContentText(progress.getLabel(this))
-                                .let { notificationManager.notify(NOTIFICATION_ID, it.build()) }
-                    }
-                }
-
-        // Start the restore
-        Observable.just(intent)
-                .map { it.getStringExtra(EXTRA_FILE_PATH) }
-                .map(backupRepo::performRestore)
-                .subscribeOn(Schedulers.io())
-                .subscribe({}, Timber::w)
-    }
-
-    private fun stop() {
-        stopForeground(true)
-        stopSelf()
-    }
-
+/*
+ * Copyright (C) 2017 Moez Bhatti <moez.bhatti@gmail.com>
+ *
+ * This file is part of QKSMS.
+ *
+ * QKSMS is free software: you can redistribute it and/or modify
+ * it under the terms of the GNU General Public License as published by
+ * the Free Software Foundation, either version 3 of the License, or
+ * (at your option) any later version.
+ *
+ * QKSMS is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+ * GNU General Public License for more details.
+ *
+ * You should have received a copy of the GNU General Public License
+ * along with QKSMS.  If not, see <http://www.gnu.org/licenses/>.
+ */
+package com.moez.QKSMS.feature.backup
+
+import android.annotation.SuppressLint
+import android.app.Service
+import android.content.Context
+import android.content.Intent
+import android.os.IBinder
+import androidx.core.app.NotificationManagerCompat
+import androidx.core.content.ContextCompat
+import com.moez.QKSMS.common.util.extensions.getLabel
+import com.moez.QKSMS.manager.NotificationManager
+import com.moez.QKSMS.repository.BackupRepository
+import dagger.android.AndroidInjection
+import io.reactivex.Observable
+import io.reactivex.schedulers.Schedulers
+import timber.log.Timber
+import java.util.concurrent.TimeUnit
+import javax.inject.Inject
+
+
+class RestoreBackupService : Service() {
+
+    companion object {
+        private const val NOTIFICATION_ID = -1
+
+        private const val ACTION_START = "com.moez.QKSMS.ACTION_START"
+        private const val ACTION_STOP = "com.moez.QKSMS.ACTION_STOP"
+        private const val EXTRA_FILE_PATH = "com.moez.QKSMS.EXTRA_FILE_PATH"
+
+        fun start(context: Context, filePath: String) {
+            val intent = Intent(context, RestoreBackupService::class.java)
+                    .setAction(ACTION_START)
+                    .putExtra(EXTRA_FILE_PATH, filePath)
+
+            ContextCompat.startForegroundService(context, intent)
+        }
+    }
+
+    @Inject lateinit var backupRepo: BackupRepository
+    @Inject lateinit var notificationManager: NotificationManager
+
+    private val notification by lazy { notificationManager.getNotificationForBackup() }
+
+    override fun onCreate() = AndroidInjection.inject(this)
+
+    override fun onBind(intent: Intent?): IBinder? = null
+
+    override fun onStartCommand(intent: Intent, flags: Int, startId: Int): Int {
+        super.onStartCommand(intent, flags, startId)
+        when (intent.action) {
+            ACTION_START -> start(intent)
+            ACTION_STOP -> stop()
+        }
+
+        return Service.START_STICKY
+    }
+
+    @SuppressLint("CheckResult")
+    private fun start(intent: Intent) {
+        val notificationManager = NotificationManagerCompat.from(this)
+
+        startForeground(NOTIFICATION_ID, notification.build())
+
+        backupRepo.getRestoreProgress()
+                .sample(200, TimeUnit.MILLISECONDS, true)
+                .subscribeOn(Schedulers.io())
+                .subscribe { progress ->
+                    when (progress) {
+                        is BackupRepository.Progress.Idle -> stop()
+
+                        is BackupRepository.Progress.Running -> notification
+                                .setProgress(progress.max, progress.count, progress.indeterminate)
+                                .setContentText(progress.getLabel(this))
+                                .let { notificationManager.notify(NOTIFICATION_ID, it.build()) }
+
+                        else -> notification
+                                .setProgress(0, 0, progress.indeterminate)
+                                .setContentText(progress.getLabel(this))
+                                .let { notificationManager.notify(NOTIFICATION_ID, it.build()) }
+                    }
+                }
+
+        // Start the restore
+        Observable.just(intent)
+                .map { it.getStringExtra(EXTRA_FILE_PATH) }
+                .map(backupRepo::performRestore)
+                .subscribeOn(Schedulers.io())
+                .subscribe({}, Timber::w)
+    }
+
+    private fun stop() {
+        stopForeground(true)
+        stopSelf()
+    }
+
 }
\ No newline at end of file
diff --git a/presentation/src/main/java/com/moez/QKSMS/feature/blocking/BlockingActivity.kt b/presentation/src/main/java/com/moez/QKSMS/feature/blocking/BlockingActivity.kt
index e028400fb..be313721b 100644
--- a/presentation/src/main/java/com/moez/QKSMS/feature/blocking/BlockingActivity.kt
+++ b/presentation/src/main/java/com/moez/QKSMS/feature/blocking/BlockingActivity.kt
@@ -1,51 +1,51 @@
-/*
- * Copyright (C) 2017 Moez Bhatti <moez.bhatti@gmail.com>
- *
- * This file is part of QKSMS.
- *
- * QKSMS is free software: you can redistribute it and/or modify
- * it under the terms of the GNU General Public License as published by
- * the Free Software Foundation, either version 3 of the License, or
- * (at your option) any later version.
- *
- * QKSMS is distributed in the hope that it will be useful,
- * but WITHOUT ANY WARRANTY; without even the implied warranty of
- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
- * GNU General Public License for more details.
- *
- * You should have received a copy of the GNU General Public License
- * along with QKSMS.  If not, see <http://www.gnu.org/licenses/>.
- */
-package com.moez.QKSMS.feature.blocking
-
-import android.os.Bundle
-import com.bluelinelabs.conductor.Conductor
-import com.bluelinelabs.conductor.Router
-import com.bluelinelabs.conductor.RouterTransaction
-import com.moez.QKSMS.R
-import com.moez.QKSMS.common.base.QkThemedActivity
-import dagger.android.AndroidInjection
-import kotlinx.android.synthetic.main.container_activity.*
-
-class BlockingActivity : QkThemedActivity() {
-
-    private lateinit var router: Router
-
-    override fun onCreate(savedInstanceState: Bundle?) {
-        AndroidInjection.inject(this)
-        super.onCreate(savedInstanceState)
-        setContentView(R.layout.container_activity)
-
-        router = Conductor.attachRouter(this, container, savedInstanceState)
-        if (!router.hasRootController()) {
-            router.setRoot(RouterTransaction.with(BlockingController()))
-        }
-    }
-
-    override fun onBackPressed() {
-        if (!router.handleBack()) {
-            super.onBackPressed()
-        }
-    }
-
+/*
+ * Copyright (C) 2017 Moez Bhatti <moez.bhatti@gmail.com>
+ *
+ * This file is part of QKSMS.
+ *
+ * QKSMS is free software: you can redistribute it and/or modify
+ * it under the terms of the GNU General Public License as published by
+ * the Free Software Foundation, either version 3 of the License, or
+ * (at your option) any later version.
+ *
+ * QKSMS is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+ * GNU General Public License for more details.
+ *
+ * You should have received a copy of the GNU General Public License
+ * along with QKSMS.  If not, see <http://www.gnu.org/licenses/>.
+ */
+package com.moez.QKSMS.feature.blocking
+
+import android.os.Bundle
+import com.bluelinelabs.conductor.Conductor
+import com.bluelinelabs.conductor.Router
+import com.bluelinelabs.conductor.RouterTransaction
+import com.moez.QKSMS.R
+import com.moez.QKSMS.common.base.QkThemedActivity
+import dagger.android.AndroidInjection
+import kotlinx.android.synthetic.main.container_activity.*
+
+class BlockingActivity : QkThemedActivity() {
+
+    private lateinit var router: Router
+
+    override fun onCreate(savedInstanceState: Bundle?) {
+        AndroidInjection.inject(this)
+        super.onCreate(savedInstanceState)
+        setContentView(R.layout.container_activity)
+
+        router = Conductor.attachRouter(this, container, savedInstanceState)
+        if (!router.hasRootController()) {
+            router.setRoot(RouterTransaction.with(BlockingController()))
+        }
+    }
+
+    override fun onBackPressed() {
+        if (!router.handleBack()) {
+            super.onBackPressed()
+        }
+    }
+
 }
\ No newline at end of file
diff --git a/presentation/src/main/java/com/moez/QKSMS/feature/blocking/BlockingController.kt b/presentation/src/main/java/com/moez/QKSMS/feature/blocking/BlockingController.kt
index 1289b9c49..5bac16c7f 100644
--- a/presentation/src/main/java/com/moez/QKSMS/feature/blocking/BlockingController.kt
+++ b/presentation/src/main/java/com/moez/QKSMS/feature/blocking/BlockingController.kt
@@ -1,89 +1,89 @@
-/*
- * Copyright (C) 2017 Moez Bhatti <moez.bhatti@gmail.com>
- *
- * This file is part of QKSMS.
- *
- * QKSMS is free software: you can redistribute it and/or modify
- * it under the terms of the GNU General Public License as published by
- * the Free Software Foundation, either version 3 of the License, or
- * (at your option) any later version.
- *
- * QKSMS is distributed in the hope that it will be useful,
- * but WITHOUT ANY WARRANTY; without even the implied warranty of
- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
- * GNU General Public License for more details.
- *
- * You should have received a copy of the GNU General Public License
- * along with QKSMS.  If not, see <http://www.gnu.org/licenses/>.
- */
-package com.moez.QKSMS.feature.blocking
-
-import android.view.View
-import com.bluelinelabs.conductor.RouterTransaction
-import com.jakewharton.rxbinding2.view.clicks
-import com.moez.QKSMS.R
-import com.moez.QKSMS.common.QkChangeHandler
-import com.moez.QKSMS.common.base.QkController
-import com.moez.QKSMS.common.util.Colors
-import com.moez.QKSMS.common.util.extensions.animateLayoutChanges
-import com.moez.QKSMS.feature.blocking.manager.BlockingManagerController
-import com.moez.QKSMS.feature.blocking.messages.BlockedMessagesController
-import com.moez.QKSMS.feature.blocking.numbers.BlockedNumbersController
-import com.moez.QKSMS.injection.appComponent
-import kotlinx.android.synthetic.main.blocking_controller.*
-import kotlinx.android.synthetic.main.settings_switch_widget.view.*
-import javax.inject.Inject
-
-class BlockingController : QkController<BlockingView, BlockingState, BlockingPresenter>(), BlockingView {
-
-    override val blockingManagerIntent by lazy { blockingManager.clicks() }
-    override val blockedNumbersIntent by lazy { blockedNumbers.clicks() }
-    override val blockedMessagesIntent by lazy { blockedMessages.clicks() }
-    override val dropClickedIntent by lazy { drop.clicks() }
-
-    @Inject lateinit var colors: Colors
-    @Inject override lateinit var presenter: BlockingPresenter
-
-    init {
-        appComponent.inject(this)
-        retainViewMode = RetainViewMode.RETAIN_DETACH
-        layoutRes = R.layout.blocking_controller
-    }
-
-    override fun onViewCreated() {
-        super.onViewCreated()
-        parent.postDelayed({ parent?.animateLayoutChanges = true }, 100)
-    }
-
-    override fun onAttach(view: View) {
-        super.onAttach(view)
-        presenter.bindIntents(this)
-        setTitle(R.string.blocking_title)
-        showBackButton(true)
-    }
-
-    override fun render(state: BlockingState) {
-        blockingManager.summary = state.blockingManager
-        drop.checkbox.isChecked = state.dropEnabled
-        blockedMessages.isEnabled = !state.dropEnabled
-    }
-
-    override fun openBlockedNumbers() {
-        router.pushController(RouterTransaction.with(BlockedNumbersController())
-                .pushChangeHandler(QkChangeHandler())
-                .popChangeHandler(QkChangeHandler()))
-    }
-
-    override fun openBlockedMessages() {
-        router.pushController(RouterTransaction.with(BlockedMessagesController())
-                .pushChangeHandler(QkChangeHandler())
-                .popChangeHandler(QkChangeHandler()))
-    }
-
-    override fun openBlockingManager() {
-        router.pushController(RouterTransaction.with(BlockingManagerController())
-                .pushChangeHandler(QkChangeHandler())
-                .popChangeHandler(QkChangeHandler()))
-    }
-
-}
+/*
+ * Copyright (C) 2017 Moez Bhatti <moez.bhatti@gmail.com>
+ *
+ * This file is part of QKSMS.
+ *
+ * QKSMS is free software: you can redistribute it and/or modify
+ * it under the terms of the GNU General Public License as published by
+ * the Free Software Foundation, either version 3 of the License, or
+ * (at your option) any later version.
+ *
+ * QKSMS is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+ * GNU General Public License for more details.
+ *
+ * You should have received a copy of the GNU General Public License
+ * along with QKSMS.  If not, see <http://www.gnu.org/licenses/>.
+ */
+package com.moez.QKSMS.feature.blocking
+
+import android.view.View
+import com.bluelinelabs.conductor.RouterTransaction
+import com.jakewharton.rxbinding2.view.clicks
+import com.moez.QKSMS.R
+import com.moez.QKSMS.common.QkChangeHandler
+import com.moez.QKSMS.common.base.QkController
+import com.moez.QKSMS.common.util.Colors
+import com.moez.QKSMS.common.util.extensions.animateLayoutChanges
+import com.moez.QKSMS.feature.blocking.manager.BlockingManagerController
+import com.moez.QKSMS.feature.blocking.messages.BlockedMessagesController
+import com.moez.QKSMS.feature.blocking.numbers.BlockedNumbersController
+import com.moez.QKSMS.injection.appComponent
+import kotlinx.android.synthetic.main.blocking_controller.*
+import kotlinx.android.synthetic.main.settings_switch_widget.view.*
+import javax.inject.Inject
+
+class BlockingController : QkController<BlockingView, BlockingState, BlockingPresenter>(), BlockingView {
+
+    override val blockingManagerIntent by lazy { blockingManager.clicks() }
+    override val blockedNumbersIntent by lazy { blockedNumbers.clicks() }
+    override val blockedMessagesIntent by lazy { blockedMessages.clicks() }
+    override val dropClickedIntent by lazy { drop.clicks() }
+
+    @Inject lateinit var colors: Colors
+    @Inject override lateinit var presenter: BlockingPresenter
+
+    init {
+        appComponent.inject(this)
+        retainViewMode = RetainViewMode.RETAIN_DETACH
+        layoutRes = R.layout.blocking_controller
+    }
+
+    override fun onViewCreated() {
+        super.onViewCreated()
+        parent.postDelayed({ parent?.animateLayoutChanges = true }, 100)
+    }
+
+    override fun onAttach(view: View) {
+        super.onAttach(view)
+        presenter.bindIntents(this)
+        setTitle(R.string.blocking_title)
+        showBackButton(true)
+    }
+
+    override fun render(state: BlockingState) {
+        blockingManager.summary = state.blockingManager
+        drop.checkbox.isChecked = state.dropEnabled
+        blockedMessages.isEnabled = !state.dropEnabled
+    }
+
+    override fun openBlockedNumbers() {
+        router.pushController(RouterTransaction.with(BlockedNumbersController())
+                .pushChangeHandler(QkChangeHandler())
+                .popChangeHandler(QkChangeHandler()))
+    }
+
+    override fun openBlockedMessages() {
+        router.pushController(RouterTransaction.with(BlockedMessagesController())
+                .pushChangeHandler(QkChangeHandler())
+                .popChangeHandler(QkChangeHandler()))
+    }
+
+    override fun openBlockingManager() {
+        router.pushController(RouterTransaction.with(BlockingManagerController())
+                .pushChangeHandler(QkChangeHandler())
+                .popChangeHandler(QkChangeHandler()))
+    }
+
+}
diff --git a/presentation/src/main/java/com/moez/QKSMS/feature/blocking/BlockingDialog.kt b/presentation/src/main/java/com/moez/QKSMS/feature/blocking/BlockingDialog.kt
index 04d6daa59..77c702f6d 100644
--- a/presentation/src/main/java/com/moez/QKSMS/feature/blocking/BlockingDialog.kt
+++ b/presentation/src/main/java/com/moez/QKSMS/feature/blocking/BlockingDialog.kt
@@ -1,124 +1,124 @@
-/*
- * Copyright (C) 2017 Moez Bhatti <moez.bhatti@gmail.com>
- *
- * This file is part of QKSMS.
- *
- * QKSMS is free software: you can redistribute it and/or modify
- * it under the terms of the GNU General Public License as published by
- * the Free Software Foundation, either version 3 of the License, or
- * (at your option) any later version.
- *
- * QKSMS is distributed in the hope that it will be useful,
- * but WITHOUT ANY WARRANTY; without even the implied warranty of
- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
- * GNU General Public License for more details.
- *
- * You should have received a copy of the GNU General Public License
- * along with QKSMS.  If not, see <http://www.gnu.org/licenses/>.
- */
-package com.moez.QKSMS.feature.blocking
-
-import android.app.Activity
-import android.app.AlertDialog
-import android.content.Context
-import com.moez.QKSMS.R
-import com.moez.QKSMS.blocking.BlockingClient
-import com.moez.QKSMS.interactor.MarkBlocked
-import com.moez.QKSMS.interactor.MarkUnblocked
-import com.moez.QKSMS.repository.ConversationRepository
-import com.moez.QKSMS.util.Preferences
-import kotlinx.coroutines.GlobalScope
-import kotlinx.coroutines.MainScope
-import kotlinx.coroutines.launch
-import kotlinx.coroutines.withContext
-import javax.inject.Inject
-
-// TODO: Once we have a custom dialog based on conductor, turn this into a controller
-class BlockingDialog @Inject constructor(
-    private val blockingManager: BlockingClient,
-    private val context: Context,
-    private val conversationRepo: ConversationRepository,
-    private val prefs: Preferences,
-    private val markBlocked: MarkBlocked,
-    private val markUnblocked: MarkUnblocked
-) {
-
-    fun show(activity: Activity, conversationIds: List<Long>, block: Boolean) = GlobalScope.launch {
-        val addresses = conversationIds.toLongArray()
-                .let { conversationRepo.getConversations(*it) }
-                .flatMap { conversation -> conversation.recipients }
-                .map { it.address }
-                .distinct()
-
-        if (addresses.isEmpty()) {
-            return@launch
-        }
-
-        if (blockingManager.getClientCapability() == BlockingClient.Capability.BLOCK_WITHOUT_PERMISSION) {
-            // If we can block/unblock in the external manager, then just fire that off and exit
-            if (block) {
-                markBlocked.execute(MarkBlocked.Params(conversationIds, prefs.blockingManager.get(), null))
-                blockingManager.block(addresses).subscribe()
-            } else {
-                markUnblocked.execute(conversationIds)
-                blockingManager.unblock(addresses).subscribe()
-            }
-        } else if (block == allBlocked(addresses)) {
-            // If all of the addresses are already in their correct state in the blocking manager, just marked the
-            // conversations blocked and exit
-            when (block) {
-                true -> markBlocked.execute(MarkBlocked.Params(conversationIds, prefs.blockingManager.get(), null))
-                false -> markUnblocked.execute(conversationIds)
-            }
-        } else {
-            // Otherwise, show the UI that lets the users know they need to mark the number as blocked in the client
-            showDialog(activity, conversationIds, addresses, block)
-        }
-    }
-
-    private fun allBlocked(addresses: List<String>): Boolean = addresses.all { address ->
-        blockingManager.getAction(address).blockingGet() is BlockingClient.Action.Block
-    }
-
-    private suspend fun showDialog(
-        activity: Activity,
-        conversationIds: List<Long>,
-        addresses: List<String>,
-        block: Boolean
-    ) = withContext(MainScope().coroutineContext) {
-        val res = when (block) {
-            true -> R.plurals.blocking_block_external
-            false -> R.plurals.blocking_unblock_external
-        }
-
-        val manager = context.getString(when (prefs.blockingManager.get()) {
-            Preferences.BLOCKING_MANAGER_SIA -> R.string.blocking_manager_sia_title
-            Preferences.BLOCKING_MANAGER_CC -> R.string.blocking_manager_call_control_title
-            else -> R.string.blocking_manager_qksms_title
-        })
-
-        val message = context.resources.getQuantityString(res, addresses.size, manager)
-
-        // Otherwise, show a dialog asking the user if they want to be directed to the external
-        // blocking manager
-        AlertDialog.Builder(activity)
-                .setTitle(when (block) {
-                    true -> R.string.blocking_block_title
-                    false -> R.string.blocking_unblock_title
-                })
-                .setMessage(message)
-                .setPositiveButton(R.string.button_continue) { _, _ ->
-                    if (block) {
-                        markBlocked.execute(MarkBlocked.Params(conversationIds, prefs.blockingManager.get(), null))
-                        blockingManager.block(addresses).subscribe()
-                    } else {
-                        markUnblocked.execute(conversationIds)
-                        blockingManager.unblock(addresses).subscribe()
-                    }
-                }
-                .setNegativeButton(R.string.button_cancel) { _, _ -> }
-                .create()
-                .show()
-    }
-
-}
+/*
+ * Copyright (C) 2017 Moez Bhatti <moez.bhatti@gmail.com>
+ *
+ * This file is part of QKSMS.
+ *
+ * QKSMS is free software: you can redistribute it and/or modify
+ * it under the terms of the GNU General Public License as published by
+ * the Free Software Foundation, either version 3 of the License, or
+ * (at your option) any later version.
+ *
+ * QKSMS is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+ * GNU General Public License for more details.
+ *
+ * You should have received a copy of the GNU General Public License
+ * along with QKSMS.  If not, see <http://www.gnu.org/licenses/>.
+ */
+package com.moez.QKSMS.feature.blocking
+
+import android.app.Activity
+import android.app.AlertDialog
+import android.content.Context
+import com.moez.QKSMS.R
+import com.moez.QKSMS.blocking.BlockingClient
+import com.moez.QKSMS.interactor.MarkBlocked
+import com.moez.QKSMS.interactor.MarkUnblocked
+import com.moez.QKSMS.repository.ConversationRepository
+import com.moez.QKSMS.util.Preferences
+import kotlinx.coroutines.GlobalScope
+import kotlinx.coroutines.MainScope
+import kotlinx.coroutines.launch
+import kotlinx.coroutines.withContext
+import javax.inject.Inject
+
+// TODO: Once we have a custom dialog based on conductor, turn this into a controller
+class BlockingDialog @Inject constructor(
+    private val blockingManager: BlockingClient,
+    private val context: Context,
+    private val conversationRepo: ConversationRepository,
+    private val prefs: Preferences,
+    private val markBlocked: MarkBlocked,
+    private val markUnblocked: MarkUnblocked
+) {
+
+    fun show(activity: Activity, conversationIds: List<Long>, block: Boolean) = GlobalScope.launch {
+        val addresses = conversationIds.toLongArray()
+                .let { conversationRepo.getConversations(*it) }
+                .flatMap { conversation -> conversation.recipients }
+                .map { it.address }
+                .distinct()
+
+        if (addresses.isEmpty()) {
+            return@launch
+        }
+
+        if (blockingManager.getClientCapability() == BlockingClient.Capability.BLOCK_WITHOUT_PERMISSION) {
+            // If we can block/unblock in the external manager, then just fire that off and exit
+            if (block) {
+                markBlocked.execute(MarkBlocked.Params(conversationIds, prefs.blockingManager.get(), null))
+                blockingManager.block(addresses).subscribe()
+            } else {
+                markUnblocked.execute(conversationIds)
+                blockingManager.unblock(addresses).subscribe()
+            }
+        } else if (block == allBlocked(addresses)) {
+            // If all of the addresses are already in their correct state in the blocking manager, just marked the
+            // conversations blocked and exit
+            when (block) {
+                true -> markBlocked.execute(MarkBlocked.Params(conversationIds, prefs.blockingManager.get(), null))
+                false -> markUnblocked.execute(conversationIds)
+            }
+        } else {
+            // Otherwise, show the UI that lets the users know they need to mark the number as blocked in the client
+            showDialog(activity, conversationIds, addresses, block)
+        }
+    }
+
+    private fun allBlocked(addresses: List<String>): Boolean = addresses.all { address ->
+        blockingManager.getAction(address).blockingGet() is BlockingClient.Action.Block
+    }
+
+    private suspend fun showDialog(
+        activity: Activity,
+        conversationIds: List<Long>,
+        addresses: List<String>,
+        block: Boolean
+    ) = withContext(MainScope().coroutineContext) {
+        val res = when (block) {
+            true -> R.plurals.blocking_block_external
+            false -> R.plurals.blocking_unblock_external
+        }
+
+        val manager = context.getString(when (prefs.blockingManager.get()) {
+            Preferences.BLOCKING_MANAGER_SIA -> R.string.blocking_manager_sia_title
+            Preferences.BLOCKING_MANAGER_CC -> R.string.blocking_manager_call_control_title
+            else -> R.string.blocking_manager_qksms_title
+        })
+
+        val message = context.resources.getQuantityString(res, addresses.size, manager)
+
+        // Otherwise, show a dialog asking the user if they want to be directed to the external
+        // blocking manager
+        AlertDialog.Builder(activity)
+                .setTitle(when (block) {
+                    true -> R.string.blocking_block_title
+                    false -> R.string.blocking_unblock_title
+                })
+                .setMessage(message)
+                .setPositiveButton(R.string.button_continue) { _, _ ->
+                    if (block) {
+                        markBlocked.execute(MarkBlocked.Params(conversationIds, prefs.blockingManager.get(), null))
+                        blockingManager.block(addresses).subscribe()
+                    } else {
+                        markUnblocked.execute(conversationIds)
+                        blockingManager.unblock(addresses).subscribe()
+                    }
+                }
+                .setNegativeButton(R.string.button_cancel) { _, _ -> }
+                .create()
+                .show()
+    }
+
+}
diff --git a/presentation/src/main/java/com/moez/QKSMS/feature/blocking/BlockingPresenter.kt b/presentation/src/main/java/com/moez/QKSMS/feature/blocking/BlockingPresenter.kt
index 749ae6718..b95eeb73c 100644
--- a/presentation/src/main/java/com/moez/QKSMS/feature/blocking/BlockingPresenter.kt
+++ b/presentation/src/main/java/com/moez/QKSMS/feature/blocking/BlockingPresenter.kt
@@ -1,80 +1,80 @@
-/*
- * Copyright (C) 2017 Moez Bhatti <moez.bhatti@gmail.com>
- *
- * This file is part of QKSMS.
- *
- * QKSMS is free software: you can redistribute it and/or modify
- * it under the terms of the GNU General Public License as published by
- * the Free Software Foundation, either version 3 of the License, or
- * (at your option) any later version.
- *
- * QKSMS is distributed in the hope that it will be useful,
- * but WITHOUT ANY WARRANTY; without even the implied warranty of
- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
- * GNU General Public License for more details.
- *
- * You should have received a copy of the GNU General Public License
- * along with QKSMS.  If not, see <http://www.gnu.org/licenses/>.
- */
-package com.moez.QKSMS.feature.blocking
-
-import android.content.Context
-import com.moez.QKSMS.R
-import com.moez.QKSMS.blocking.BlockingClient
-import com.moez.QKSMS.common.base.QkPresenter
-import com.moez.QKSMS.util.Preferences
-import com.uber.autodispose.android.lifecycle.scope
-import com.uber.autodispose.autoDisposable
-import io.reactivex.rxkotlin.plusAssign
-import javax.inject.Inject
-
-class BlockingPresenter @Inject constructor(
-    context: Context,
-    private val blockingClient: BlockingClient,
-    private val prefs: Preferences
-) : QkPresenter<BlockingView, BlockingState>(BlockingState()) {
-
-    init {
-        disposables += prefs.blockingManager.asObservable()
-                .map { client ->
-                    when (client) {
-                        Preferences.BLOCKING_MANAGER_SIA -> R.string.blocking_manager_sia_title
-                        Preferences.BLOCKING_MANAGER_CC -> R.string.blocking_manager_call_control_title
-                        else -> R.string.blocking_manager_qksms_title
-                    }
-                }
-                .map(context::getString)
-                .subscribe { manager -> newState { copy(blockingManager = manager) } }
-
-        disposables += prefs.drop.asObservable()
-                .subscribe { enabled -> newState { copy(dropEnabled = enabled) } }
-    }
-
-    override fun bindIntents(view: BlockingView) {
-        super.bindIntents(view)
-
-        view.blockingManagerIntent
-                .autoDisposable(view.scope())
-                .subscribe { view.openBlockingManager() }
-
-        view.blockedNumbersIntent
-                .autoDisposable(view.scope())
-                .subscribe {
-                    if (prefs.blockingManager.get() == Preferences.BLOCKING_MANAGER_QKSMS) {
-                        // TODO: This is a hack, get rid of it once we implement AndroidX navigation
-                        view.openBlockedNumbers()
-                    } else {
-                        blockingClient.openSettings()
-                    }
-                }
-
-        view.blockedMessagesIntent
-                .autoDisposable(view.scope())
-                .subscribe { view.openBlockedMessages() }
-
-        view.dropClickedIntent
-                .autoDisposable(view.scope())
-                .subscribe { prefs.drop.set(!prefs.drop.get()) }
-    }
-
-}
+/*
+ * Copyright (C) 2017 Moez Bhatti <moez.bhatti@gmail.com>
+ *
+ * This file is part of QKSMS.
+ *
+ * QKSMS is free software: you can redistribute it and/or modify
+ * it under the terms of the GNU General Public License as published by
+ * the Free Software Foundation, either version 3 of the License, or
+ * (at your option) any later version.
+ *
+ * QKSMS is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+ * GNU General Public License for more details.
+ *
+ * You should have received a copy of the GNU General Public License
+ * along with QKSMS.  If not, see <http://www.gnu.org/licenses/>.
+ */
+package com.moez.QKSMS.feature.blocking
+
+import android.content.Context
+import com.moez.QKSMS.R
+import com.moez.QKSMS.blocking.BlockingClient
+import com.moez.QKSMS.common.base.QkPresenter
+import com.moez.QKSMS.util.Preferences
+import com.uber.autodispose.android.lifecycle.scope
+import com.uber.autodispose.autoDisposable
+import io.reactivex.rxkotlin.plusAssign
+import javax.inject.Inject
+
+class BlockingPresenter @Inject constructor(
+    context: Context,
+    private val blockingClient: BlockingClient,
+    private val prefs: Preferences
+) : QkPresenter<BlockingView, BlockingState>(BlockingState()) {
+
+    init {
+        disposables += prefs.blockingManager.asObservable()
+                .map { client ->
+                    when (client) {
+                        Preferences.BLOCKING_MANAGER_SIA -> R.string.blocking_manager_sia_title
+                        Preferences.BLOCKING_MANAGER_CC -> R.string.blocking_manager_call_control_title
+                        else -> R.string.blocking_manager_qksms_title
+                    }
+                }
+                .map(context::getString)
+                .subscribe { manager -> newState { copy(blockingManager = manager) } }
+
+        disposables += prefs.drop.asObservable()
+                .subscribe { enabled -> newState { copy(dropEnabled = enabled) } }
+    }
+
+    override fun bindIntents(view: BlockingView) {
+        super.bindIntents(view)
+
+        view.blockingManagerIntent
+                .autoDisposable(view.scope())
+                .subscribe { view.openBlockingManager() }
+
+        view.blockedNumbersIntent
+                .autoDisposable(view.scope())
+                .subscribe {
+                    if (prefs.blockingManager.get() == Preferences.BLOCKING_MANAGER_QKSMS) {
+                        // TODO: This is a hack, get rid of it once we implement AndroidX navigation
+                        view.openBlockedNumbers()
+                    } else {
+                        blockingClient.openSettings()
+                    }
+                }
+
+        view.blockedMessagesIntent
+                .autoDisposable(view.scope())
+                .subscribe { view.openBlockedMessages() }
+
+        view.dropClickedIntent
+                .autoDisposable(view.scope())
+                .subscribe { prefs.drop.set(!prefs.drop.get()) }
+    }
+
+}
diff --git a/presentation/src/main/java/com/moez/QKSMS/feature/blocking/BlockingState.kt b/presentation/src/main/java/com/moez/QKSMS/feature/blocking/BlockingState.kt
index 8f3e31256..60c21ce45 100644
--- a/presentation/src/main/java/com/moez/QKSMS/feature/blocking/BlockingState.kt
+++ b/presentation/src/main/java/com/moez/QKSMS/feature/blocking/BlockingState.kt
@@ -1,24 +1,24 @@
-/*
- * Copyright (C) 2017 Moez Bhatti <moez.bhatti@gmail.com>
- *
- * This file is part of QKSMS.
- *
- * QKSMS is free software: you can redistribute it and/or modify
- * it under the terms of the GNU General Public License as published by
- * the Free Software Foundation, either version 3 of the License, or
- * (at your option) any later version.
- *
- * QKSMS is distributed in the hope that it will be useful,
- * but WITHOUT ANY WARRANTY; without even the implied warranty of
- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
- * GNU General Public License for more details.
- *
- * You should have received a copy of the GNU General Public License
- * along with QKSMS.  If not, see <http://www.gnu.org/licenses/>.
- */
-package com.moez.QKSMS.feature.blocking
-
-data class BlockingState(
-    val blockingManager: String = "",
-    val dropEnabled: Boolean = false
-)
+/*
+ * Copyright (C) 2017 Moez Bhatti <moez.bhatti@gmail.com>
+ *
+ * This file is part of QKSMS.
+ *
+ * QKSMS is free software: you can redistribute it and/or modify
+ * it under the terms of the GNU General Public License as published by
+ * the Free Software Foundation, either version 3 of the License, or
+ * (at your option) any later version.
+ *
+ * QKSMS is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+ * GNU General Public License for more details.
+ *
+ * You should have received a copy of the GNU General Public License
+ * along with QKSMS.  If not, see <http://www.gnu.org/licenses/>.
+ */
+package com.moez.QKSMS.feature.blocking
+
+data class BlockingState(
+    val blockingManager: String = "",
+    val dropEnabled: Boolean = false
+)
diff --git a/presentation/src/main/java/com/moez/QKSMS/feature/blocking/BlockingView.kt b/presentation/src/main/java/com/moez/QKSMS/feature/blocking/BlockingView.kt
index 8ca05048e..361dff9a0 100644
--- a/presentation/src/main/java/com/moez/QKSMS/feature/blocking/BlockingView.kt
+++ b/presentation/src/main/java/com/moez/QKSMS/feature/blocking/BlockingView.kt
@@ -1,34 +1,34 @@
-/*
- * Copyright (C) 2017 Moez Bhatti <moez.bhatti@gmail.com>
- *
- * This file is part of QKSMS.
- *
- * QKSMS is free software: you can redistribute it and/or modify
- * it under the terms of the GNU General Public License as published by
- * the Free Software Foundation, either version 3 of the License, or
- * (at your option) any later version.
- *
- * QKSMS is distributed in the hope that it will be useful,
- * but WITHOUT ANY WARRANTY; without even the implied warranty of
- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
- * GNU General Public License for more details.
- *
- * You should have received a copy of the GNU General Public License
- * along with QKSMS.  If not, see <http://www.gnu.org/licenses/>.
- */
-package com.moez.QKSMS.feature.blocking
-
-import com.moez.QKSMS.common.base.QkViewContract
-import io.reactivex.Observable
-
-interface BlockingView : QkViewContract<BlockingState> {
-
-    val blockingManagerIntent: Observable<*>
-    val blockedNumbersIntent: Observable<*>
-    val blockedMessagesIntent: Observable<*>
-    val dropClickedIntent: Observable<*>
-
-    fun openBlockingManager()
-    fun openBlockedNumbers()
-    fun openBlockedMessages()
-}
+/*
+ * Copyright (C) 2017 Moez Bhatti <moez.bhatti@gmail.com>
+ *
+ * This file is part of QKSMS.
+ *
+ * QKSMS is free software: you can redistribute it and/or modify
+ * it under the terms of the GNU General Public License as published by
+ * the Free Software Foundation, either version 3 of the License, or
+ * (at your option) any later version.
+ *
+ * QKSMS is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+ * GNU General Public License for more details.
+ *
+ * You should have received a copy of the GNU General Public License
+ * along with QKSMS.  If not, see <http://www.gnu.org/licenses/>.
+ */
+package com.moez.QKSMS.feature.blocking
+
+import com.moez.QKSMS.common.base.QkViewContract
+import io.reactivex.Observable
+
+interface BlockingView : QkViewContract<BlockingState> {
+
+    val blockingManagerIntent: Observable<*>
+    val blockedNumbersIntent: Observable<*>
+    val blockedMessagesIntent: Observable<*>
+    val dropClickedIntent: Observable<*>
+
+    fun openBlockingManager()
+    fun openBlockedNumbers()
+    fun openBlockedMessages()
+}
diff --git a/presentation/src/main/java/com/moez/QKSMS/feature/blocking/manager/BlockingManagerController.kt b/presentation/src/main/java/com/moez/QKSMS/feature/blocking/manager/BlockingManagerController.kt
index ed64b1d5c..e43fdbb0f 100644
--- a/presentation/src/main/java/com/moez/QKSMS/feature/blocking/manager/BlockingManagerController.kt
+++ b/presentation/src/main/java/com/moez/QKSMS/feature/blocking/manager/BlockingManagerController.kt
@@ -1,69 +1,69 @@
-package com.moez.QKSMS.feature.blocking.manager
-
-import android.app.Activity
-import android.app.AlertDialog
-import android.view.View
-import androidx.core.view.isVisible
-import com.jakewharton.rxbinding2.view.clicks
-import com.moez.QKSMS.R
-import com.moez.QKSMS.common.base.QkController
-import com.moez.QKSMS.injection.appComponent
-import com.moez.QKSMS.util.Preferences
-import io.reactivex.Observable
-import io.reactivex.Single
-import io.reactivex.subjects.PublishSubject
-import kotlinx.android.synthetic.main.blocking_manager_controller.*
-import kotlinx.android.synthetic.main.blocking_manager_list_option.view.*
-import kotlinx.android.synthetic.main.radio_preference_view.view.*
-import javax.inject.Inject
-
-class BlockingManagerController : QkController<BlockingManagerView, BlockingManagerState, BlockingManagerPresenter>(),
-    BlockingManagerView {
-
-    @Inject override lateinit var presenter: BlockingManagerPresenter
-
-    private val activityResumedSubject: PublishSubject<Unit> = PublishSubject.create()
-
-    init {
-        appComponent.inject(this)
-        retainViewMode = RetainViewMode.RETAIN_DETACH
-        layoutRes = R.layout.blocking_manager_controller
-    }
-
-    override fun onAttach(view: View) {
-        super.onAttach(view)
-        presenter.bindIntents(this)
-        setTitle(R.string.blocking_manager_title)
-        showBackButton(true)
-    }
-
-    override fun onActivityResumed(activity: Activity) {
-        activityResumedSubject.onNext(Unit)
-    }
-
-    override fun render(state: BlockingManagerState) {
-        qksms.radioButton.isChecked = state.blockingManager == Preferences.BLOCKING_MANAGER_QKSMS
-
-        callControl.radioButton.isChecked = state.blockingManager == Preferences.BLOCKING_MANAGER_CC
-        callControl.install.isVisible = !state.callControlInstalled
-
-        shouldIAnswer.radioButton.isChecked = state.blockingManager == Preferences.BLOCKING_MANAGER_SIA
-        shouldIAnswer.install.isVisible = !state.siaInstalled
-    }
-
-    override fun activityResumed(): Observable<*> = activityResumedSubject
-    override fun qksmsClicked(): Observable<*> = qksms.clicks()
-    override fun callControlClicked(): Observable<*> = callControl.clicks()
-    override fun siaClicked(): Observable<*> = shouldIAnswer.clicks()
-
-    override fun showCopyDialog(manager: String): Single<Boolean> = Single.create { emitter ->
-        AlertDialog.Builder(activity)
-                .setTitle(R.string.blocking_manager_copy_title)
-                .setMessage(resources?.getString(R.string.blocking_manager_copy_summary, manager))
-                .setPositiveButton(R.string.button_continue) { _, _ -> emitter.onSuccess(true) }
-                .setNegativeButton(R.string.button_cancel) { _, _ -> emitter.onSuccess(false) }
-                .setCancelable(false)
-                .show()
-    }
-
-}
+package com.moez.QKSMS.feature.blocking.manager
+
+import android.app.Activity
+import android.app.AlertDialog
+import android.view.View
+import androidx.core.view.isVisible
+import com.jakewharton.rxbinding2.view.clicks
+import com.moez.QKSMS.R
+import com.moez.QKSMS.common.base.QkController
+import com.moez.QKSMS.injection.appComponent
+import com.moez.QKSMS.util.Preferences
+import io.reactivex.Observable
+import io.reactivex.Single
+import io.reactivex.subjects.PublishSubject
+import kotlinx.android.synthetic.main.blocking_manager_controller.*
+import kotlinx.android.synthetic.main.blocking_manager_list_option.view.*
+import kotlinx.android.synthetic.main.radio_preference_view.view.*
+import javax.inject.Inject
+
+class BlockingManagerController : QkController<BlockingManagerView, BlockingManagerState, BlockingManagerPresenter>(),
+    BlockingManagerView {
+
+    @Inject override lateinit var presenter: BlockingManagerPresenter
+
+    private val activityResumedSubject: PublishSubject<Unit> = PublishSubject.create()
+
+    init {
+        appComponent.inject(this)
+        retainViewMode = RetainViewMode.RETAIN_DETACH
+        layoutRes = R.layout.blocking_manager_controller
+    }
+
+    override fun onAttach(view: View) {
+        super.onAttach(view)
+        presenter.bindIntents(this)
+        setTitle(R.string.blocking_manager_title)
+        showBackButton(true)
+    }
+
+    override fun onActivityResumed(activity: Activity) {
+        activityResumedSubject.onNext(Unit)
+    }
+
+    override fun render(state: BlockingManagerState) {
+        qksms.radioButton.isChecked = state.blockingManager == Preferences.BLOCKING_MANAGER_QKSMS
+
+        callControl.radioButton.isChecked = state.blockingManager == Preferences.BLOCKING_MANAGER_CC
+        callControl.install.isVisible = !state.callControlInstalled
+
+        shouldIAnswer.radioButton.isChecked = state.blockingManager == Preferences.BLOCKING_MANAGER_SIA
+        shouldIAnswer.install.isVisible = !state.siaInstalled
+    }
+
+    override fun activityResumed(): Observable<*> = activityResumedSubject
+    override fun qksmsClicked(): Observable<*> = qksms.clicks()
+    override fun callControlClicked(): Observable<*> = callControl.clicks()
+    override fun siaClicked(): Observable<*> = shouldIAnswer.clicks()
+
+    override fun showCopyDialog(manager: String): Single<Boolean> = Single.create { emitter ->
+        AlertDialog.Builder(activity)
+                .setTitle(R.string.blocking_manager_copy_title)
+                .setMessage(resources?.getString(R.string.blocking_manager_copy_summary, manager))
+                .setPositiveButton(R.string.button_continue) { _, _ -> emitter.onSuccess(true) }
+                .setNegativeButton(R.string.button_cancel) { _, _ -> emitter.onSuccess(false) }
+                .setCancelable(false)
+                .show()
+    }
+
+}
diff --git a/presentation/src/main/java/com/moez/QKSMS/feature/blocking/manager/BlockingManagerPresenter.kt b/presentation/src/main/java/com/moez/QKSMS/feature/blocking/manager/BlockingManagerPresenter.kt
index 1ef5d91fc..a4da23c3f 100644
--- a/presentation/src/main/java/com/moez/QKSMS/feature/blocking/manager/BlockingManagerPresenter.kt
+++ b/presentation/src/main/java/com/moez/QKSMS/feature/blocking/manager/BlockingManagerPresenter.kt
@@ -1,122 +1,122 @@
-package com.moez.QKSMS.feature.blocking.manager
-
-import android.content.Context
-import com.moez.QKSMS.R
-import com.moez.QKSMS.blocking.BlockingClient
-import com.moez.QKSMS.blocking.CallControlBlockingClient
-import com.moez.QKSMS.blocking.QksmsBlockingClient
-import com.moez.QKSMS.blocking.ShouldIAnswerBlockingClient
-import com.moez.QKSMS.common.Navigator
-import com.moez.QKSMS.common.base.QkPresenter
-import com.moez.QKSMS.manager.AnalyticsManager
-import com.moez.QKSMS.repository.ConversationRepository
-import com.moez.QKSMS.util.Preferences
-import com.uber.autodispose.android.lifecycle.scope
-import com.uber.autodispose.autoDisposable
-import io.reactivex.Observable
-import io.reactivex.android.schedulers.AndroidSchedulers
-import io.reactivex.rxkotlin.plusAssign
-import io.reactivex.schedulers.Schedulers
-import javax.inject.Inject
-
-class BlockingManagerPresenter @Inject constructor(
-    private val analytics: AnalyticsManager,
-    private val callControl: CallControlBlockingClient,
-    private val context: Context,
-    private val conversationRepo: ConversationRepository,
-    private val navigator: Navigator,
-    private val prefs: Preferences,
-    private val qksms: QksmsBlockingClient,
-    private val shouldIAnswer: ShouldIAnswerBlockingClient
-) : QkPresenter<BlockingManagerView, BlockingManagerState>(BlockingManagerState(
-        blockingManager = prefs.blockingManager.get(),
-        callControlInstalled = callControl.isAvailable(),
-        siaInstalled = shouldIAnswer.isAvailable()
-)) {
-
-    init {
-        disposables += prefs.blockingManager.asObservable()
-                .subscribe { manager -> newState { copy(blockingManager = manager) } }
-    }
-
-    override fun bindIntents(view: BlockingManagerView) {
-        super.bindIntents(view)
-
-        view.activityResumed()
-                .map { callControl.isAvailable() }
-                .distinctUntilChanged()
-                .autoDisposable(view.scope())
-                .subscribe { available -> newState { copy(callControlInstalled = available) } }
-
-        view.activityResumed()
-                .map { shouldIAnswer.isAvailable() }
-                .distinctUntilChanged()
-                .autoDisposable(view.scope())
-                .subscribe { available -> newState { copy(siaInstalled = available) } }
-
-        view.qksmsClicked()
-                .observeOn(Schedulers.io())
-                .map { getAddressesToBlock(qksms) }
-                .switchMap { numbers -> qksms.block(numbers).andThen(Observable.just(Unit)) } // Hack
-                .autoDisposable(view.scope())
-                .subscribe {
-                    analytics.setUserProperty("Blocking Manager", "QKSMS")
-                    prefs.blockingManager.set(Preferences.BLOCKING_MANAGER_QKSMS)
-                }
-
-        view.callControlClicked()
-                .filter {
-                    val installed = callControl.isAvailable()
-                    if (!installed) {
-                        analytics.track("Install Call Control")
-                        navigator.installCallControl()
-                    }
-
-                    val enabled = prefs.blockingManager.get() == Preferences.BLOCKING_MANAGER_CC
-                    installed && !enabled
-                }
-                .observeOn(Schedulers.io())
-                .map { getAddressesToBlock(callControl) }
-                .observeOn(AndroidSchedulers.mainThread())
-                .switchMap { numbers ->
-                    when (numbers.size) {
-                        0 -> Observable.just(true)
-                        else -> view.showCopyDialog(context.getString(R.string.blocking_manager_call_control_title))
-                                .toObservable()
-                    }
-                }
-                .doOnNext { newState { copy() } } // Radio button may have been selected when it shouldn't, fix it
-                .filter { it }
-                .observeOn(Schedulers.io())
-                .map { getAddressesToBlock(callControl) } // This sucks. Can't wait to use coroutines
-                .switchMap { numbers -> callControl.block(numbers).andThen(Observable.just(Unit)) } // Hack
-                .autoDisposable(view.scope())
-                .subscribe {
-                    callControl.getAction("callcontrol").blockingGet()
-                    analytics.setUserProperty("Blocking Manager", "Call Control")
-                    prefs.blockingManager.set(Preferences.BLOCKING_MANAGER_CC)
-                }
-
-        view.siaClicked()
-                .filter {
-                    val installed = shouldIAnswer.isAvailable()
-                    if (!installed) {
-                        analytics.track("Install SIA")
-                        navigator.installSia()
-                    }
-
-                    val enabled = prefs.blockingManager.get() == Preferences.BLOCKING_MANAGER_SIA
-                    installed && !enabled
-                }
-                .autoDisposable(view.scope())
-                .subscribe {
-                    analytics.setUserProperty("Blocking Manager", "SIA")
-                    prefs.blockingManager.set(Preferences.BLOCKING_MANAGER_SIA)
-                }
-    }
-
-    private fun getAddressesToBlock(client: BlockingClient) = conversationRepo.getBlockedConversations()
-            .fold(listOf<String>(), { numbers, conversation -> numbers + conversation.recipients.map { it.address } })
-            .filter { number -> client.getAction(number).blockingGet() !is BlockingClient.Action.Block }
-
-}
+package com.moez.QKSMS.feature.blocking.manager
+
+import android.content.Context
+import com.moez.QKSMS.R
+import com.moez.QKSMS.blocking.BlockingClient
+import com.moez.QKSMS.blocking.CallControlBlockingClient
+import com.moez.QKSMS.blocking.QksmsBlockingClient
+import com.moez.QKSMS.blocking.ShouldIAnswerBlockingClient
+import com.moez.QKSMS.common.Navigator
+import com.moez.QKSMS.common.base.QkPresenter
+import com.moez.QKSMS.manager.AnalyticsManager
+import com.moez.QKSMS.repository.ConversationRepository
+import com.moez.QKSMS.util.Preferences
+import com.uber.autodispose.android.lifecycle.scope
+import com.uber.autodispose.autoDisposable
+import io.reactivex.Observable
+import io.reactivex.android.schedulers.AndroidSchedulers
+import io.reactivex.rxkotlin.plusAssign
+import io.reactivex.schedulers.Schedulers
+import javax.inject.Inject
+
+class BlockingManagerPresenter @Inject constructor(
+    private val analytics: AnalyticsManager,
+    private val callControl: CallControlBlockingClient,
+    private val context: Context,
+    private val conversationRepo: ConversationRepository,
+    private val navigator: Navigator,
+    private val prefs: Preferences,
+    private val qksms: QksmsBlockingClient,
+    private val shouldIAnswer: ShouldIAnswerBlockingClient
+) : QkPresenter<BlockingManagerView, BlockingManagerState>(BlockingManagerState(
+        blockingManager = prefs.blockingManager.get(),
+        callControlInstalled = callControl.isAvailable(),
+        siaInstalled = shouldIAnswer.isAvailable()
+)) {
+
+    init {
+        disposables += prefs.blockingManager.asObservable()
+                .subscribe { manager -> newState { copy(blockingManager = manager) } }
+    }
+
+    override fun bindIntents(view: BlockingManagerView) {
+        super.bindIntents(view)
+
+        view.activityResumed()
+                .map { callControl.isAvailable() }
+                .distinctUntilChanged()
+                .autoDisposable(view.scope())
+                .subscribe { available -> newState { copy(callControlInstalled = available) } }
+
+        view.activityResumed()
+                .map { shouldIAnswer.isAvailable() }
+                .distinctUntilChanged()
+                .autoDisposable(view.scope())
+                .subscribe { available -> newState { copy(siaInstalled = available) } }
+
+        view.qksmsClicked()
+                .observeOn(Schedulers.io())
+                .map { getAddressesToBlock(qksms) }
+                .switchMap { numbers -> qksms.block(numbers).andThen(Observable.just(Unit)) } // Hack
+                .autoDisposable(view.scope())
+                .subscribe {
+                    analytics.setUserProperty("Blocking Manager", "QKSMS")
+                    prefs.blockingManager.set(Preferences.BLOCKING_MANAGER_QKSMS)
+                }
+
+        view.callControlClicked()
+                .filter {
+                    val installed = callControl.isAvailable()
+                    if (!installed) {
+                        analytics.track("Install Call Control")
+                        navigator.installCallControl()
+                    }
+
+                    val enabled = prefs.blockingManager.get() == Preferences.BLOCKING_MANAGER_CC
+                    installed && !enabled
+                }
+                .observeOn(Schedulers.io())
+                .map { getAddressesToBlock(callControl) }
+                .observeOn(AndroidSchedulers.mainThread())
+                .switchMap { numbers ->
+                    when (numbers.size) {
+                        0 -> Observable.just(true)
+                        else -> view.showCopyDialog(context.getString(R.string.blocking_manager_call_control_title))
+                                .toObservable()
+                    }
+                }
+                .doOnNext { newState { copy() } } // Radio button may have been selected when it shouldn't, fix it
+                .filter { it }
+                .observeOn(Schedulers.io())
+                .map { getAddressesToBlock(callControl) } // This sucks. Can't wait to use coroutines
+                .switchMap { numbers -> callControl.block(numbers).andThen(Observable.just(Unit)) } // Hack
+                .autoDisposable(view.scope())
+                .subscribe {
+                    callControl.getAction("callcontrol").blockingGet()
+                    analytics.setUserProperty("Blocking Manager", "Call Control")
+                    prefs.blockingManager.set(Preferences.BLOCKING_MANAGER_CC)
+                }
+
+        view.siaClicked()
+                .filter {
+                    val installed = shouldIAnswer.isAvailable()
+                    if (!installed) {
+                        analytics.track("Install SIA")
+                        navigator.installSia()
+                    }
+
+                    val enabled = prefs.blockingManager.get() == Preferences.BLOCKING_MANAGER_SIA
+                    installed && !enabled
+                }
+                .autoDisposable(view.scope())
+                .subscribe {
+                    analytics.setUserProperty("Blocking Manager", "SIA")
+                    prefs.blockingManager.set(Preferences.BLOCKING_MANAGER_SIA)
+                }
+    }
+
+    private fun getAddressesToBlock(client: BlockingClient) = conversationRepo.getBlockedConversations()
+            .fold(listOf<String>(), { numbers, conversation -> numbers + conversation.recipients.map { it.address } })
+            .filter { number -> client.getAction(number).blockingGet() !is BlockingClient.Action.Block }
+
+}
diff --git a/presentation/src/main/java/com/moez/QKSMS/feature/blocking/manager/BlockingManagerState.kt b/presentation/src/main/java/com/moez/QKSMS/feature/blocking/manager/BlockingManagerState.kt
index 2663caf06..7147970cc 100644
--- a/presentation/src/main/java/com/moez/QKSMS/feature/blocking/manager/BlockingManagerState.kt
+++ b/presentation/src/main/java/com/moez/QKSMS/feature/blocking/manager/BlockingManagerState.kt
@@ -1,7 +1,7 @@
-package com.moez.QKSMS.feature.blocking.manager
-
-data class BlockingManagerState(
-    val blockingManager: Int = 0,
-    val callControlInstalled: Boolean = false,
-    val siaInstalled: Boolean = false
-)
+package com.moez.QKSMS.feature.blocking.manager
+
+data class BlockingManagerState(
+    val blockingManager: Int = 0,
+    val callControlInstalled: Boolean = false,
+    val siaInstalled: Boolean = false
+)
diff --git a/presentation/src/main/java/com/moez/QKSMS/feature/blocking/manager/BlockingManagerView.kt b/presentation/src/main/java/com/moez/QKSMS/feature/blocking/manager/BlockingManagerView.kt
index 7318e53a2..2dbb6bd7b 100644
--- a/presentation/src/main/java/com/moez/QKSMS/feature/blocking/manager/BlockingManagerView.kt
+++ b/presentation/src/main/java/com/moez/QKSMS/feature/blocking/manager/BlockingManagerView.kt
@@ -1,16 +1,16 @@
-package com.moez.QKSMS.feature.blocking.manager
-
-import com.moez.QKSMS.common.base.QkViewContract
-import io.reactivex.Observable
-import io.reactivex.Single
-
-interface BlockingManagerView : QkViewContract<BlockingManagerState> {
-
-    fun activityResumed(): Observable<*>
-    fun qksmsClicked(): Observable<*>
-    fun callControlClicked(): Observable<*>
-    fun siaClicked(): Observable<*>
-
-    fun showCopyDialog(manager: String): Single<Boolean>
-
-}
+package com.moez.QKSMS.feature.blocking.manager
+
+import com.moez.QKSMS.common.base.QkViewContract
+import io.reactivex.Observable
+import io.reactivex.Single
+
+interface BlockingManagerView : QkViewContract<BlockingManagerState> {
+
+    fun activityResumed(): Observable<*>
+    fun qksmsClicked(): Observable<*>
+    fun callControlClicked(): Observable<*>
+    fun siaClicked(): Observable<*>
+
+    fun showCopyDialog(manager: String): Single<Boolean>
+
+}
diff --git a/presentation/src/main/java/com/moez/QKSMS/feature/blocking/messages/BlockedMessagesAdapter.kt b/presentation/src/main/java/com/moez/QKSMS/feature/blocking/messages/BlockedMessagesAdapter.kt
index 9a4c37e38..2655ecd0c 100644
--- a/presentation/src/main/java/com/moez/QKSMS/feature/blocking/messages/BlockedMessagesAdapter.kt
+++ b/presentation/src/main/java/com/moez/QKSMS/feature/blocking/messages/BlockedMessagesAdapter.kt
@@ -1,97 +1,97 @@
-/*
- * Copyright (C) 2019 Moez Bhatti <moez.bhatti@gmail.com>
- *
- * This file is part of QKSMS.
- *
- * QKSMS is free software: you can redistribute it and/or modify
- * it under the terms of the GNU General Public License as published by
- * the Free Software Foundation, either version 3 of the License, or
- * (at your option) any later version.
- *
- * QKSMS is distributed in the hope that it will be useful,
- * but WITHOUT ANY WARRANTY; without even the implied warranty of
- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
- * GNU General Public License for more details.
- *
- * You should have received a copy of the GNU General Public License
- * along with QKSMS.  If not, see <http://www.gnu.org/licenses/>.
- */
-package com.moez.QKSMS.feature.blocking.messages
-
-import android.content.Context
-import android.graphics.Typeface
-import android.view.LayoutInflater
-import android.view.ViewGroup
-import androidx.core.view.isVisible
-import com.moez.QKSMS.R
-import com.moez.QKSMS.common.base.QkRealmAdapter
-import com.moez.QKSMS.common.base.QkViewHolder
-import com.moez.QKSMS.common.util.DateFormatter
-import com.moez.QKSMS.common.util.extensions.resolveThemeColor
-import com.moez.QKSMS.model.Conversation
-import com.moez.QKSMS.util.Preferences
-import io.reactivex.subjects.PublishSubject
-import kotlinx.android.synthetic.main.blocked_list_item.*
-import kotlinx.android.synthetic.main.blocked_list_item.view.*
-import javax.inject.Inject
-
-class BlockedMessagesAdapter @Inject constructor(
-    private val context: Context,
-    private val dateFormatter: DateFormatter
-) : QkRealmAdapter<Conversation>() {
-
-    val clicks: PublishSubject<Long> = PublishSubject.create()
-
-    override fun onCreateViewHolder(parent: ViewGroup, viewType: Int): QkViewHolder {
-        val view = LayoutInflater.from(parent.context).inflate(R.layout.blocked_list_item, parent, false)
-
-        if (viewType == 0) {
-            view.title.setTypeface(view.title.typeface, Typeface.BOLD)
-            view.date.setTypeface(view.date.typeface, Typeface.BOLD)
-            view.date.setTextColor(view.context.resolveThemeColor(android.R.attr.textColorPrimary))
-        }
-
-        return QkViewHolder(view).apply {
-            view.setOnClickListener {
-                val conversation = getItem(adapterPosition) ?: return@setOnClickListener
-                when (toggleSelection(conversation.id, false)) {
-                    true -> view.isActivated = isSelected(conversation.id)
-                    false -> clicks.onNext(conversation.id)
-                }
-            }
-            view.setOnLongClickListener {
-                val conversation = getItem(adapterPosition) ?: return@setOnLongClickListener true
-                toggleSelection(conversation.id)
-                view.isActivated = isSelected(conversation.id)
-                true
-            }
-        }
-    }
-
-    override fun onBindViewHolder(holder: QkViewHolder, position: Int) {
-        val conversation = getItem(position) ?: return
-
-        holder.containerView.isActivated = isSelected(conversation.id)
-
-        holder.avatars.recipients = conversation.recipients
-        holder.title.collapseEnabled = conversation.recipients.size > 1
-        holder.title.text = conversation.getTitle()
-        holder.date.text = dateFormatter.getConversationTimestamp(conversation.date)
-
-        holder.blocker.text = when (conversation.blockingClient) {
-            Preferences.BLOCKING_MANAGER_CC -> context.getString(R.string.blocking_manager_call_control_title)
-            Preferences.BLOCKING_MANAGER_SIA -> context.getString(R.string.blocking_manager_sia_title)
-            else -> null
-        }
-
-        holder.reason.text = conversation.blockReason
-        holder.blocker.isVisible = holder.blocker.text.isNotEmpty()
-        holder.reason.isVisible = holder.blocker.text.isNotEmpty()
-    }
-
-    override fun getItemViewType(position: Int): Int {
-        val conversation = getItem(position)
-        return if (conversation?.unread == false) 1 else 0
-    }
-
-}
+/*
+ * Copyright (C) 2019 Moez Bhatti <moez.bhatti@gmail.com>
+ *
+ * This file is part of QKSMS.
+ *
+ * QKSMS is free software: you can redistribute it and/or modify
+ * it under the terms of the GNU General Public License as published by
+ * the Free Software Foundation, either version 3 of the License, or
+ * (at your option) any later version.
+ *
+ * QKSMS is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+ * GNU General Public License for more details.
+ *
+ * You should have received a copy of the GNU General Public License
+ * along with QKSMS.  If not, see <http://www.gnu.org/licenses/>.
+ */
+package com.moez.QKSMS.feature.blocking.messages
+
+import android.content.Context
+import android.graphics.Typeface
+import android.view.LayoutInflater
+import android.view.ViewGroup
+import androidx.core.view.isVisible
+import com.moez.QKSMS.R
+import com.moez.QKSMS.common.base.QkRealmAdapter
+import com.moez.QKSMS.common.base.QkViewHolder
+import com.moez.QKSMS.common.util.DateFormatter
+import com.moez.QKSMS.common.util.extensions.resolveThemeColor
+import com.moez.QKSMS.model.Conversation
+import com.moez.QKSMS.util.Preferences
+import io.reactivex.subjects.PublishSubject
+import kotlinx.android.synthetic.main.blocked_list_item.*
+import kotlinx.android.synthetic.main.blocked_list_item.view.*
+import javax.inject.Inject
+
+class BlockedMessagesAdapter @Inject constructor(
+    private val context: Context,
+    private val dateFormatter: DateFormatter
+) : QkRealmAdapter<Conversation>() {
+
+    val clicks: PublishSubject<Long> = PublishSubject.create()
+
+    override fun onCreateViewHolder(parent: ViewGroup, viewType: Int): QkViewHolder {
+        val view = LayoutInflater.from(parent.context).inflate(R.layout.blocked_list_item, parent, false)
+
+        if (viewType == 0) {
+            view.title.setTypeface(view.title.typeface, Typeface.BOLD)
+            view.date.setTypeface(view.date.typeface, Typeface.BOLD)
+            view.date.setTextColor(view.context.resolveThemeColor(android.R.attr.textColorPrimary))
+        }
+
+        return QkViewHolder(view).apply {
+            view.setOnClickListener {
+                val conversation = getItem(adapterPosition) ?: return@setOnClickListener
+                when (toggleSelection(conversation.id, false)) {
+                    true -> view.isActivated = isSelected(conversation.id)
+                    false -> clicks.onNext(conversation.id)
+                }
+            }
+            view.setOnLongClickListener {
+                val conversation = getItem(adapterPosition) ?: return@setOnLongClickListener true
+                toggleSelection(conversation.id)
+                view.isActivated = isSelected(conversation.id)
+                true
+            }
+        }
+    }
+
+    override fun onBindViewHolder(holder: QkViewHolder, position: Int) {
+        val conversation = getItem(position) ?: return
+
+        holder.containerView.isActivated = isSelected(conversation.id)
+
+        holder.avatars.recipients = conversation.recipients
+        holder.title.collapseEnabled = conversation.recipients.size > 1
+        holder.title.text = conversation.getTitle()
+        holder.date.text = dateFormatter.getConversationTimestamp(conversation.date)
+
+        holder.blocker.text = when (conversation.blockingClient) {
+            Preferences.BLOCKING_MANAGER_CC -> context.getString(R.string.blocking_manager_call_control_title)
+            Preferences.BLOCKING_MANAGER_SIA -> context.getString(R.string.blocking_manager_sia_title)
+            else -> null
+        }
+
+        holder.reason.text = conversation.blockReason
+        holder.blocker.isVisible = holder.blocker.text.isNotEmpty()
+        holder.reason.isVisible = holder.blocker.text.isNotEmpty()
+    }
+
+    override fun getItemViewType(position: Int): Int {
+        val conversation = getItem(position)
+        return if (conversation?.unread == false) 1 else 0
+    }
+
+}
diff --git a/presentation/src/main/java/com/moez/QKSMS/feature/blocking/messages/BlockedMessagesController.kt b/presentation/src/main/java/com/moez/QKSMS/feature/blocking/messages/BlockedMessagesController.kt
index 92dfcac39..ecc2a909a 100644
--- a/presentation/src/main/java/com/moez/QKSMS/feature/blocking/messages/BlockedMessagesController.kt
+++ b/presentation/src/main/java/com/moez/QKSMS/feature/blocking/messages/BlockedMessagesController.kt
@@ -1,122 +1,122 @@
-/*
- * Copyright (C) 2019 Moez Bhatti <moez.bhatti@gmail.com>
- *
- * This file is part of QKSMS.
- *
- * QKSMS is free software: you can redistribute it and/or modify
- * it under the terms of the GNU General Public License as published by
- * the Free Software Foundation, either version 3 of the License, or
- * (at your option) any later version.
- *
- * QKSMS is distributed in the hope that it will be useful,
- * but WITHOUT ANY WARRANTY; without even the implied warranty of
- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
- * GNU General Public License for more details.
- *
- * You should have received a copy of the GNU General Public License
- * along with QKSMS.  If not, see <http://www.gnu.org/licenses/>.
- */
-package com.moez.QKSMS.feature.blocking.messages
-
-import android.app.AlertDialog
-import android.content.Context
-import android.view.Menu
-import android.view.MenuInflater
-import android.view.MenuItem
-import android.view.View
-import com.moez.QKSMS.R
-import com.moez.QKSMS.common.base.QkController
-import com.moez.QKSMS.common.util.Colors
-import com.moez.QKSMS.feature.blocking.BlockingDialog
-import com.moez.QKSMS.injection.appComponent
-import io.reactivex.subjects.PublishSubject
-import io.reactivex.subjects.Subject
-import kotlinx.android.synthetic.main.blocked_messages_controller.*
-import kotlinx.android.synthetic.main.container_activity.*
-import javax.inject.Inject
-
-class BlockedMessagesController : QkController<BlockedMessagesView, BlockedMessagesState, BlockedMessagesPresenter>(),
-    BlockedMessagesView {
-
-    override val menuReadyIntent: Subject<Unit> = PublishSubject.create()
-    override val optionsItemIntent: Subject<Int> = PublishSubject.create()
-    override val conversationClicks by lazy { blockedMessagesAdapter.clicks }
-    override val selectionChanges by lazy { blockedMessagesAdapter.selectionChanges }
-    override val confirmDeleteIntent: Subject<List<Long>> = PublishSubject.create()
-    override val backClicked: Subject<Unit> = PublishSubject.create()
-
-    @Inject lateinit var blockedMessagesAdapter: BlockedMessagesAdapter
-    @Inject lateinit var blockingDialog: BlockingDialog
-    @Inject lateinit var colors: Colors
-    @Inject lateinit var context: Context
-    @Inject override lateinit var presenter: BlockedMessagesPresenter
-
-    init {
-        appComponent.inject(this)
-        retainViewMode = RetainViewMode.RETAIN_DETACH
-        layoutRes = R.layout.blocked_messages_controller
-    }
-
-    override fun onViewCreated() {
-        super.onViewCreated()
-        blockedMessagesAdapter.emptyView = empty
-        conversations.adapter = blockedMessagesAdapter
-    }
-
-    override fun onAttach(view: View) {
-        super.onAttach(view)
-        presenter.bindIntents(this)
-        setTitle(R.string.blocked_messages_title)
-        showBackButton(true)
-        setHasOptionsMenu(true)
-    }
-
-    override fun onCreateOptionsMenu(menu: Menu, inflater: MenuInflater) {
-        super.onCreateOptionsMenu(menu, inflater)
-        inflater.inflate(R.menu.blocked_messages, menu)
-        menuReadyIntent.onNext(Unit)
-    }
-
-    override fun onOptionsItemSelected(item: MenuItem): Boolean {
-        optionsItemIntent.onNext(item.itemId)
-        return true
-    }
-
-    override fun handleBack(): Boolean {
-        backClicked.onNext(Unit)
-        return true
-    }
-
-    override fun render(state: BlockedMessagesState) {
-        blockedMessagesAdapter.updateData(state.data)
-
-        themedActivity?.toolbar?.menu?.findItem(R.id.block)?.isVisible = state.selected > 0
-        themedActivity?.toolbar?.menu?.findItem(R.id.delete)?.isVisible = state.selected > 0
-
-        setTitle(when (state.selected) {
-            0 -> context.getString(R.string.blocked_messages_title)
-            else -> context.getString(R.string.main_title_selected, state.selected)
-        })
-    }
-
-    override fun clearSelection() = blockedMessagesAdapter.clearSelection()
-
-    override fun showBlockingDialog(conversations: List<Long>, block: Boolean) {
-        blockingDialog.show(activity!!, conversations, block)
-    }
-
-    override fun showDeleteDialog(conversations: List<Long>) {
-        val count = conversations.size
-        AlertDialog.Builder(activity)
-                .setTitle(R.string.dialog_delete_title)
-                .setMessage(resources?.getQuantityString(R.plurals.dialog_delete_message, count, count))
-                .setPositiveButton(R.string.button_delete) { _, _ -> confirmDeleteIntent.onNext(conversations) }
-                .setNegativeButton(R.string.button_cancel, null)
-                .show()
-    }
-
-    override fun goBack() {
-        router.popCurrentController()
-    }
-
-}
+/*
+ * Copyright (C) 2019 Moez Bhatti <moez.bhatti@gmail.com>
+ *
+ * This file is part of QKSMS.
+ *
+ * QKSMS is free software: you can redistribute it and/or modify
+ * it under the terms of the GNU General Public License as published by
+ * the Free Software Foundation, either version 3 of the License, or
+ * (at your option) any later version.
+ *
+ * QKSMS is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+ * GNU General Public License for more details.
+ *
+ * You should have received a copy of the GNU General Public License
+ * along with QKSMS.  If not, see <http://www.gnu.org/licenses/>.
+ */
+package com.moez.QKSMS.feature.blocking.messages
+
+import android.app.AlertDialog
+import android.content.Context
+import android.view.Menu
+import android.view.MenuInflater
+import android.view.MenuItem
+import android.view.View
+import com.moez.QKSMS.R
+import com.moez.QKSMS.common.base.QkController
+import com.moez.QKSMS.common.util.Colors
+import com.moez.QKSMS.feature.blocking.BlockingDialog
+import com.moez.QKSMS.injection.appComponent
+import io.reactivex.subjects.PublishSubject
+import io.reactivex.subjects.Subject
+import kotlinx.android.synthetic.main.blocked_messages_controller.*
+import kotlinx.android.synthetic.main.container_activity.*
+import javax.inject.Inject
+
+class BlockedMessagesController : QkController<BlockedMessagesView, BlockedMessagesState, BlockedMessagesPresenter>(),
+    BlockedMessagesView {
+
+    override val menuReadyIntent: Subject<Unit> = PublishSubject.create()
+    override val optionsItemIntent: Subject<Int> = PublishSubject.create()
+    override val conversationClicks by lazy { blockedMessagesAdapter.clicks }
+    override val selectionChanges by lazy { blockedMessagesAdapter.selectionChanges }
+    override val confirmDeleteIntent: Subject<List<Long>> = PublishSubject.create()
+    override val backClicked: Subject<Unit> = PublishSubject.create()
+
+    @Inject lateinit var blockedMessagesAdapter: BlockedMessagesAdapter
+    @Inject lateinit var blockingDialog: BlockingDialog
+    @Inject lateinit var colors: Colors
+    @Inject lateinit var context: Context
+    @Inject override lateinit var presenter: BlockedMessagesPresenter
+
+    init {
+        appComponent.inject(this)
+        retainViewMode = RetainViewMode.RETAIN_DETACH
+        layoutRes = R.layout.blocked_messages_controller
+    }
+
+    override fun onViewCreated() {
+        super.onViewCreated()
+        blockedMessagesAdapter.emptyView = empty
+        conversations.adapter = blockedMessagesAdapter
+    }
+
+    override fun onAttach(view: View) {
+        super.onAttach(view)
+        presenter.bindIntents(this)
+        setTitle(R.string.blocked_messages_title)
+        showBackButton(true)
+        setHasOptionsMenu(true)
+    }
+
+    override fun onCreateOptionsMenu(menu: Menu, inflater: MenuInflater) {
+        super.onCreateOptionsMenu(menu, inflater)
+        inflater.inflate(R.menu.blocked_messages, menu)
+        menuReadyIntent.onNext(Unit)
+    }
+
+    override fun onOptionsItemSelected(item: MenuItem): Boolean {
+        optionsItemIntent.onNext(item.itemId)
+        return true
+    }
+
+    override fun handleBack(): Boolean {
+        backClicked.onNext(Unit)
+        return true
+    }
+
+    override fun render(state: BlockedMessagesState) {
+        blockedMessagesAdapter.updateData(state.data)
+
+        themedActivity?.toolbar?.menu?.findItem(R.id.block)?.isVisible = state.selected > 0
+        themedActivity?.toolbar?.menu?.findItem(R.id.delete)?.isVisible = state.selected > 0
+
+        setTitle(when (state.selected) {
+            0 -> context.getString(R.string.blocked_messages_title)
+            else -> context.getString(R.string.main_title_selected, state.selected)
+        })
+    }
+
+    override fun clearSelection() = blockedMessagesAdapter.clearSelection()
+
+    override fun showBlockingDialog(conversations: List<Long>, block: Boolean) {
+        blockingDialog.show(activity!!, conversations, block)
+    }
+
+    override fun showDeleteDialog(conversations: List<Long>) {
+        val count = conversations.size
+        AlertDialog.Builder(activity)
+                .setTitle(R.string.dialog_delete_title)
+                .setMessage(resources?.getQuantityString(R.plurals.dialog_delete_message, count, count))
+                .setPositiveButton(R.string.button_delete) { _, _ -> confirmDeleteIntent.onNext(conversations) }
+                .setNegativeButton(R.string.button_cancel, null)
+                .show()
+    }
+
+    override fun goBack() {
+        router.popCurrentController()
+    }
+
+}
diff --git a/presentation/src/main/java/com/moez/QKSMS/feature/blocking/messages/BlockedMessagesPresenter.kt b/presentation/src/main/java/com/moez/QKSMS/feature/blocking/messages/BlockedMessagesPresenter.kt
index d1fe9e782..e30e0f72f 100644
--- a/presentation/src/main/java/com/moez/QKSMS/feature/blocking/messages/BlockedMessagesPresenter.kt
+++ b/presentation/src/main/java/com/moez/QKSMS/feature/blocking/messages/BlockedMessagesPresenter.kt
@@ -1,90 +1,90 @@
-/*
- * Copyright (C) 2019 Moez Bhatti <moez.bhatti@gmail.com>
- *
- * This file is part of QKSMS.
- *
- * QKSMS is free software: you can redistribute it and/or modify
- * it under the terms of the GNU General Public License as published by
- * the Free Software Foundation, either version 3 of the License, or
- * (at your option) any later version.
- *
- * QKSMS is distributed in the hope that it will be useful,
- * but WITHOUT ANY WARRANTY; without even the implied warranty of
- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
- * GNU General Public License for more details.
- *
- * You should have received a copy of the GNU General Public License
- * along with QKSMS.  If not, see <http://www.gnu.org/licenses/>.
- */
-package com.moez.QKSMS.feature.blocking.messages
-
-import com.moez.QKSMS.R
-import com.moez.QKSMS.blocking.BlockingClient
-import com.moez.QKSMS.common.Navigator
-import com.moez.QKSMS.common.base.QkPresenter
-import com.moez.QKSMS.interactor.DeleteConversations
-import com.moez.QKSMS.repository.ConversationRepository
-import com.uber.autodispose.android.lifecycle.scope
-import com.uber.autodispose.autoDisposable
-import io.reactivex.rxkotlin.withLatestFrom
-import javax.inject.Inject
-
-class BlockedMessagesPresenter @Inject constructor(
-    conversationRepo: ConversationRepository,
-    private val blockingClient: BlockingClient,
-    private val deleteConversations: DeleteConversations,
-    private val navigator: Navigator
-) : QkPresenter<BlockedMessagesView, BlockedMessagesState>(BlockedMessagesState(
-        data = conversationRepo.getBlockedConversationsAsync()
-)) {
-
-    override fun bindIntents(view: BlockedMessagesView) {
-        super.bindIntents(view)
-
-        view.menuReadyIntent
-                .autoDisposable(view.scope())
-                .subscribe { newState { copy() } }
-
-        view.optionsItemIntent
-                .withLatestFrom(view.selectionChanges) { itemId, conversations ->
-                    when (itemId) {
-                        R.id.block -> {
-                            view.showBlockingDialog(conversations, false)
-                            view.clearSelection()
-                        }
-                        R.id.delete -> {
-                            view.showDeleteDialog(conversations)
-                        }
-                    }
-
-                }
-                .autoDisposable(view.scope())
-                .subscribe()
-
-        view.confirmDeleteIntent
-                .autoDisposable(view.scope())
-                .subscribe { conversations ->
-                    deleteConversations.execute(conversations)
-                    view.clearSelection()
-                }
-
-        view.conversationClicks
-                .autoDisposable(view.scope())
-                .subscribe { threadId -> navigator.showConversation(threadId) }
-
-        view.selectionChanges
-                .autoDisposable(view.scope())
-                .subscribe { selection -> newState { copy(selected = selection.size) } }
-
-        view.backClicked
-                .withLatestFrom(state) { _, state ->
-                    when (state.selected) {
-                        0 -> view.goBack()
-                        else -> view.clearSelection()
-                    }
-                }
-                .autoDisposable(view.scope())
-                .subscribe()
-    }
-
-}
+/*
+ * Copyright (C) 2019 Moez Bhatti <moez.bhatti@gmail.com>
+ *
+ * This file is part of QKSMS.
+ *
+ * QKSMS is free software: you can redistribute it and/or modify
+ * it under the terms of the GNU General Public License as published by
+ * the Free Software Foundation, either version 3 of the License, or
+ * (at your option) any later version.
+ *
+ * QKSMS is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+ * GNU General Public License for more details.
+ *
+ * You should have received a copy of the GNU General Public License
+ * along with QKSMS.  If not, see <http://www.gnu.org/licenses/>.
+ */
+package com.moez.QKSMS.feature.blocking.messages
+
+import com.moez.QKSMS.R
+import com.moez.QKSMS.blocking.BlockingClient
+import com.moez.QKSMS.common.Navigator
+import com.moez.QKSMS.common.base.QkPresenter
+import com.moez.QKSMS.interactor.DeleteConversations
+import com.moez.QKSMS.repository.ConversationRepository
+import com.uber.autodispose.android.lifecycle.scope
+import com.uber.autodispose.autoDisposable
+import io.reactivex.rxkotlin.withLatestFrom
+import javax.inject.Inject
+
+class BlockedMessagesPresenter @Inject constructor(
+    conversationRepo: ConversationRepository,
+    private val blockingClient: BlockingClient,
+    private val deleteConversations: DeleteConversations,
+    private val navigator: Navigator
+) : QkPresenter<BlockedMessagesView, BlockedMessagesState>(BlockedMessagesState(
+        data = conversationRepo.getBlockedConversationsAsync()
+)) {
+
+    override fun bindIntents(view: BlockedMessagesView) {
+        super.bindIntents(view)
+
+        view.menuReadyIntent
+                .autoDisposable(view.scope())
+                .subscribe { newState { copy() } }
+
+        view.optionsItemIntent
+                .withLatestFrom(view.selectionChanges) { itemId, conversations ->
+                    when (itemId) {
+                        R.id.block -> {
+                            view.showBlockingDialog(conversations, false)
+                            view.clearSelection()
+                        }
+                        R.id.delete -> {
+                            view.showDeleteDialog(conversations)
+                        }
+                    }
+
+                }
+                .autoDisposable(view.scope())
+                .subscribe()
+
+        view.confirmDeleteIntent
+                .autoDisposable(view.scope())
+                .subscribe { conversations ->
+                    deleteConversations.execute(conversations)
+                    view.clearSelection()
+                }
+
+        view.conversationClicks
+                .autoDisposable(view.scope())
+                .subscribe { threadId -> navigator.showConversation(threadId) }
+
+        view.selectionChanges
+                .autoDisposable(view.scope())
+                .subscribe { selection -> newState { copy(selected = selection.size) } }
+
+        view.backClicked
+                .withLatestFrom(state) { _, state ->
+                    when (state.selected) {
+                        0 -> view.goBack()
+                        else -> view.clearSelection()
+                    }
+                }
+                .autoDisposable(view.scope())
+                .subscribe()
+    }
+
+}
diff --git a/presentation/src/main/java/com/moez/QKSMS/feature/blocking/messages/BlockedMessagesState.kt b/presentation/src/main/java/com/moez/QKSMS/feature/blocking/messages/BlockedMessagesState.kt
index 2fe3201b5..f112b5ae5 100644
--- a/presentation/src/main/java/com/moez/QKSMS/feature/blocking/messages/BlockedMessagesState.kt
+++ b/presentation/src/main/java/com/moez/QKSMS/feature/blocking/messages/BlockedMessagesState.kt
@@ -1,27 +1,27 @@
-/*
- * Copyright (C) 2019 Moez Bhatti <moez.bhatti@gmail.com>
- *
- * This file is part of QKSMS.
- *
- * QKSMS is free software: you can redistribute it and/or modify
- * it under the terms of the GNU General Public License as published by
- * the Free Software Foundation, either version 3 of the License, or
- * (at your option) any later version.
- *
- * QKSMS is distributed in the hope that it will be useful,
- * but WITHOUT ANY WARRANTY; without even the implied warranty of
- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
- * GNU General Public License for more details.
- *
- * You should have received a copy of the GNU General Public License
- * along with QKSMS.  If not, see <http://www.gnu.org/licenses/>.
- */
-package com.moez.QKSMS.feature.blocking.messages
-
-import com.moez.QKSMS.model.Conversation
-import io.realm.RealmResults
-
-data class BlockedMessagesState(
-    val data: RealmResults<Conversation>? = null,
-    val selected: Int = 0
-)
+/*
+ * Copyright (C) 2019 Moez Bhatti <moez.bhatti@gmail.com>
+ *
+ * This file is part of QKSMS.
+ *
+ * QKSMS is free software: you can redistribute it and/or modify
+ * it under the terms of the GNU General Public License as published by
+ * the Free Software Foundation, either version 3 of the License, or
+ * (at your option) any later version.
+ *
+ * QKSMS is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+ * GNU General Public License for more details.
+ *
+ * You should have received a copy of the GNU General Public License
+ * along with QKSMS.  If not, see <http://www.gnu.org/licenses/>.
+ */
+package com.moez.QKSMS.feature.blocking.messages
+
+import com.moez.QKSMS.model.Conversation
+import io.realm.RealmResults
+
+data class BlockedMessagesState(
+    val data: RealmResults<Conversation>? = null,
+    val selected: Int = 0
+)
diff --git a/presentation/src/main/java/com/moez/QKSMS/feature/blocking/messages/BlockedMessagesView.kt b/presentation/src/main/java/com/moez/QKSMS/feature/blocking/messages/BlockedMessagesView.kt
index 8de0ad34c..38dbfebb3 100644
--- a/presentation/src/main/java/com/moez/QKSMS/feature/blocking/messages/BlockedMessagesView.kt
+++ b/presentation/src/main/java/com/moez/QKSMS/feature/blocking/messages/BlockedMessagesView.kt
@@ -1,38 +1,38 @@
-/*
- * Copyright (C) 2019 Moez Bhatti <moez.bhatti@gmail.com>
- *
- * This file is part of QKSMS.
- *
- * QKSMS is free software: you can redistribute it and/or modify
- * it under the terms of the GNU General Public License as published by
- * the Free Software Foundation, either version 3 of the License, or
- * (at your option) any later version.
- *
- * QKSMS is distributed in the hope that it will be useful,
- * but WITHOUT ANY WARRANTY; without even the implied warranty of
- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
- * GNU General Public License for more details.
- *
- * You should have received a copy of the GNU General Public License
- * along with QKSMS.  If not, see <http://www.gnu.org/licenses/>.
- */
-package com.moez.QKSMS.feature.blocking.messages
-
-import com.moez.QKSMS.common.base.QkViewContract
-import io.reactivex.Observable
-
-interface BlockedMessagesView : QkViewContract<BlockedMessagesState> {
-
-    val menuReadyIntent: Observable<Unit>
-    val optionsItemIntent: Observable<Int>
-    val conversationClicks: Observable<Long>
-    val selectionChanges: Observable<List<Long>>
-    val confirmDeleteIntent: Observable<List<Long>>
-    val backClicked: Observable<*>
-
-    fun clearSelection()
-    fun showBlockingDialog(conversations: List<Long>, block: Boolean)
-    fun showDeleteDialog(conversations: List<Long>)
-    fun goBack()
-
-}
+/*
+ * Copyright (C) 2019 Moez Bhatti <moez.bhatti@gmail.com>
+ *
+ * This file is part of QKSMS.
+ *
+ * QKSMS is free software: you can redistribute it and/or modify
+ * it under the terms of the GNU General Public License as published by
+ * the Free Software Foundation, either version 3 of the License, or
+ * (at your option) any later version.
+ *
+ * QKSMS is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+ * GNU General Public License for more details.
+ *
+ * You should have received a copy of the GNU General Public License
+ * along with QKSMS.  If not, see <http://www.gnu.org/licenses/>.
+ */
+package com.moez.QKSMS.feature.blocking.messages
+
+import com.moez.QKSMS.common.base.QkViewContract
+import io.reactivex.Observable
+
+interface BlockedMessagesView : QkViewContract<BlockedMessagesState> {
+
+    val menuReadyIntent: Observable<Unit>
+    val optionsItemIntent: Observable<Int>
+    val conversationClicks: Observable<Long>
+    val selectionChanges: Observable<List<Long>>
+    val confirmDeleteIntent: Observable<List<Long>>
+    val backClicked: Observable<*>
+
+    fun clearSelection()
+    fun showBlockingDialog(conversations: List<Long>, block: Boolean)
+    fun showDeleteDialog(conversations: List<Long>)
+    fun goBack()
+
+}
diff --git a/presentation/src/main/java/com/moez/QKSMS/feature/blocking/numbers/BlockedNumberTextWatcher.kt b/presentation/src/main/java/com/moez/QKSMS/feature/blocking/numbers/BlockedNumberTextWatcher.kt
index fae446ebd..a652525b4 100644
--- a/presentation/src/main/java/com/moez/QKSMS/feature/blocking/numbers/BlockedNumberTextWatcher.kt
+++ b/presentation/src/main/java/com/moez/QKSMS/feature/blocking/numbers/BlockedNumberTextWatcher.kt
@@ -1,56 +1,56 @@
-/*
- * Copyright (C) 2017 Moez Bhatti <moez.bhatti@gmail.com>
- *
- * This file is part of QKSMS.
- *
- * QKSMS is free software: you can redistribute it and/or modify
- * it under the terms of the GNU General Public License as published by
- * the Free Software Foundation, either version 3 of the License, or
- * (at your option) any later version.
- *
- * QKSMS is distributed in the hope that it will be useful,
- * but WITHOUT ANY WARRANTY; without even the implied warranty of
- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
- * GNU General Public License for more details.
- *
- * You should have received a copy of the GNU General Public License
- * along with QKSMS.  If not, see <http://www.gnu.org/licenses/>.
- */
-package com.moez.QKSMS.feature.blocking.numbers
-
-import android.text.Editable
-import android.text.TextWatcher
-import android.widget.EditText
-import com.moez.QKSMS.util.PhoneNumberUtils
-
-class BlockedNumberTextWatcher(
-    private val editText: EditText,
-    private val phoneNumberUtils: PhoneNumberUtils
-) : TextWatcher {
-
-    init {
-        editText.addTextChangedListener(this)
-    }
-
-    override fun afterTextChanged(s: Editable?) {
-        editText.removeTextChangedListener(this)
-
-        val formatted = s?.let(phoneNumberUtils::formatNumber)
-        if (s?.toString() != formatted && formatted != null) {
-            editText.setText(formatted)
-            editText.setSelection(formatted.length)
-        }
-
-        editText.addTextChangedListener(this)
-    }
-
-    override fun beforeTextChanged(s: CharSequence?, start: Int, count: Int, after: Int) = Unit
-
-    override fun onTextChanged(s: CharSequence?, start: Int, before: Int, count: Int) {
-    }
-
-    fun dispose() {
-        editText.removeTextChangedListener(this)
-    }
-
-}
+/*
+ * Copyright (C) 2017 Moez Bhatti <moez.bhatti@gmail.com>
+ *
+ * This file is part of QKSMS.
+ *
+ * QKSMS is free software: you can redistribute it and/or modify
+ * it under the terms of the GNU General Public License as published by
+ * the Free Software Foundation, either version 3 of the License, or
+ * (at your option) any later version.
+ *
+ * QKSMS is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+ * GNU General Public License for more details.
+ *
+ * You should have received a copy of the GNU General Public License
+ * along with QKSMS.  If not, see <http://www.gnu.org/licenses/>.
+ */
+package com.moez.QKSMS.feature.blocking.numbers
+
+import android.text.Editable
+import android.text.TextWatcher
+import android.widget.EditText
+import com.moez.QKSMS.util.PhoneNumberUtils
+
+class BlockedNumberTextWatcher(
+    private val editText: EditText,
+    private val phoneNumberUtils: PhoneNumberUtils
+) : TextWatcher {
+
+    init {
+        editText.addTextChangedListener(this)
+    }
+
+    override fun afterTextChanged(s: Editable?) {
+        editText.removeTextChangedListener(this)
+
+        val formatted = s?.let(phoneNumberUtils::formatNumber)
+        if (s?.toString() != formatted && formatted != null) {
+            editText.setText(formatted)
+            editText.setSelection(formatted.length)
+        }
+
+        editText.addTextChangedListener(this)
+    }
+
+    override fun beforeTextChanged(s: CharSequence?, start: Int, count: Int, after: Int) = Unit
+
+    override fun onTextChanged(s: CharSequence?, start: Int, before: Int, count: Int) {
+    }
+
+    fun dispose() {
+        editText.removeTextChangedListener(this)
+    }
+
+}
diff --git a/presentation/src/main/java/com/moez/QKSMS/feature/blocking/numbers/BlockedNumbersAdapter.kt b/presentation/src/main/java/com/moez/QKSMS/feature/blocking/numbers/BlockedNumbersAdapter.kt
index 9ddf541fa..7931eca05 100644
--- a/presentation/src/main/java/com/moez/QKSMS/feature/blocking/numbers/BlockedNumbersAdapter.kt
+++ b/presentation/src/main/java/com/moez/QKSMS/feature/blocking/numbers/BlockedNumbersAdapter.kt
@@ -1,52 +1,52 @@
-/*
- * Copyright (C) 2017 Moez Bhatti <moez.bhatti@gmail.com>
- *
- * This file is part of QKSMS.
- *
- * QKSMS is free software: you can redistribute it and/or modify
- * it under the terms of the GNU General Public License as published by
- * the Free Software Foundation, either version 3 of the License, or
- * (at your option) any later version.
- *
- * QKSMS is distributed in the hope that it will be useful,
- * but WITHOUT ANY WARRANTY; without even the implied warranty of
- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
- * GNU General Public License for more details.
- *
- * You should have received a copy of the GNU General Public License
- * along with QKSMS.  If not, see <http://www.gnu.org/licenses/>.
- */
-package com.moez.QKSMS.feature.blocking.numbers
-
-import android.view.LayoutInflater
-import android.view.ViewGroup
-import com.moez.QKSMS.R
-import com.moez.QKSMS.common.base.QkRealmAdapter
-import com.moez.QKSMS.common.base.QkViewHolder
-import com.moez.QKSMS.model.BlockedNumber
-import io.reactivex.subjects.PublishSubject
-import io.reactivex.subjects.Subject
-import kotlinx.android.synthetic.main.blocked_number_list_item.*
-import kotlinx.android.synthetic.main.blocked_number_list_item.view.*
-
-class BlockedNumbersAdapter : QkRealmAdapter<BlockedNumber>() {
-
-    val unblockAddress: Subject<Long> = PublishSubject.create()
-
-    override fun onCreateViewHolder(parent: ViewGroup, viewType: Int): QkViewHolder {
-        val view = LayoutInflater.from(parent.context).inflate(R.layout.blocked_number_list_item, parent, false)
-        return QkViewHolder(view).apply {
-            containerView.unblock.setOnClickListener {
-                val number = getItem(adapterPosition) ?: return@setOnClickListener
-                unblockAddress.onNext(number.id)
-            }
-        }
-    }
-
-    override fun onBindViewHolder(holder: QkViewHolder, position: Int) {
-        val item = getItem(position)!!
-
-        holder.number.text = item.address
-    }
-
-}
+/*
+ * Copyright (C) 2017 Moez Bhatti <moez.bhatti@gmail.com>
+ *
+ * This file is part of QKSMS.
+ *
+ * QKSMS is free software: you can redistribute it and/or modify
+ * it under the terms of the GNU General Public License as published by
+ * the Free Software Foundation, either version 3 of the License, or
+ * (at your option) any later version.
+ *
+ * QKSMS is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+ * GNU General Public License for more details.
+ *
+ * You should have received a copy of the GNU General Public License
+ * along with QKSMS.  If not, see <http://www.gnu.org/licenses/>.
+ */
+package com.moez.QKSMS.feature.blocking.numbers
+
+import android.view.LayoutInflater
+import android.view.ViewGroup
+import com.moez.QKSMS.R
+import com.moez.QKSMS.common.base.QkRealmAdapter
+import com.moez.QKSMS.common.base.QkViewHolder
+import com.moez.QKSMS.model.BlockedNumber
+import io.reactivex.subjects.PublishSubject
+import io.reactivex.subjects.Subject
+import kotlinx.android.synthetic.main.blocked_number_list_item.*
+import kotlinx.android.synthetic.main.blocked_number_list_item.view.*
+
+class BlockedNumbersAdapter : QkRealmAdapter<BlockedNumber>() {
+
+    val unblockAddress: Subject<Long> = PublishSubject.create()
+
+    override fun onCreateViewHolder(parent: ViewGroup, viewType: Int): QkViewHolder {
+        val view = LayoutInflater.from(parent.context).inflate(R.layout.blocked_number_list_item, parent, false)
+        return QkViewHolder(view).apply {
+            containerView.unblock.setOnClickListener {
+                val number = getItem(adapterPosition) ?: return@setOnClickListener
+                unblockAddress.onNext(number.id)
+            }
+        }
+    }
+
+    override fun onBindViewHolder(holder: QkViewHolder, position: Int) {
+        val item = getItem(position)!!
+
+        holder.number.text = item.address
+    }
+
+}
diff --git a/presentation/src/main/java/com/moez/QKSMS/feature/blocking/numbers/BlockedNumbersController.kt b/presentation/src/main/java/com/moez/QKSMS/feature/blocking/numbers/BlockedNumbersController.kt
index 8b0927eca..fffbb32af 100644
--- a/presentation/src/main/java/com/moez/QKSMS/feature/blocking/numbers/BlockedNumbersController.kt
+++ b/presentation/src/main/java/com/moez/QKSMS/feature/blocking/numbers/BlockedNumbersController.kt
@@ -1,91 +1,91 @@
-/*
- * Copyright (C) 2017 Moez Bhatti <moez.bhatti@gmail.com>
- *
- * This file is part of QKSMS.
- *
- * QKSMS is free software: you can redistribute it and/or modify
- * it under the terms of the GNU General Public License as published by
- * the Free Software Foundation, either version 3 of the License, or
- * (at your option) any later version.
- *
- * QKSMS is distributed in the hope that it will be useful,
- * but WITHOUT ANY WARRANTY; without even the implied warranty of
- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
- * GNU General Public License for more details.
- *
- * You should have received a copy of the GNU General Public License
- * along with QKSMS.  If not, see <http://www.gnu.org/licenses/>.
- */
-package com.moez.QKSMS.feature.blocking.numbers
-
-import android.view.LayoutInflater
-import android.view.View
-import androidx.appcompat.app.AlertDialog
-import com.jakewharton.rxbinding2.view.clicks
-import com.moez.QKSMS.R
-import com.moez.QKSMS.common.base.QkController
-import com.moez.QKSMS.common.util.Colors
-import com.moez.QKSMS.common.util.extensions.setBackgroundTint
-import com.moez.QKSMS.common.util.extensions.setTint
-import com.moez.QKSMS.injection.appComponent
-import com.moez.QKSMS.util.PhoneNumberUtils
-import io.reactivex.Observable
-import io.reactivex.subjects.PublishSubject
-import io.reactivex.subjects.Subject
-import kotlinx.android.synthetic.main.blocked_numbers_add_dialog.view.*
-import kotlinx.android.synthetic.main.blocked_numbers_controller.*
-import javax.inject.Inject
-
-class BlockedNumbersController : QkController<BlockedNumbersView, BlockedNumbersState, BlockedNumbersPresenter>(),
-    BlockedNumbersView {
-
-    @Inject override lateinit var presenter: BlockedNumbersPresenter
-    @Inject lateinit var colors: Colors
-    @Inject lateinit var phoneNumberUtils: PhoneNumberUtils
-
-    private val adapter = BlockedNumbersAdapter()
-    private val saveAddressSubject: Subject<String> = PublishSubject.create()
-
-    init {
-        appComponent.inject(this)
-        retainViewMode = RetainViewMode.RETAIN_DETACH
-        layoutRes = R.layout.blocked_numbers_controller
-    }
-
-    override fun onAttach(view: View) {
-        super.onAttach(view)
-        presenter.bindIntents(this)
-        setTitle(R.string.blocked_numbers_title)
-        showBackButton(true)
-    }
-
-    override fun onViewCreated() {
-        super.onViewCreated()
-        add.setBackgroundTint(colors.theme().theme)
-        add.setTint(colors.theme().textPrimary)
-        adapter.emptyView = empty
-        numbers.adapter = adapter
-    }
-
-    override fun render(state: BlockedNumbersState) {
-        adapter.updateData(state.numbers)
-    }
-
-    override fun unblockAddress(): Observable<Long> = adapter.unblockAddress
-    override fun addAddress(): Observable<*> = add.clicks()
-    override fun saveAddress(): Observable<String> = saveAddressSubject
-
-    override fun showAddDialog() {
-        val layout = LayoutInflater.from(activity).inflate(R.layout.blocked_numbers_add_dialog, null)
-        val textWatcher = BlockedNumberTextWatcher(layout.input, phoneNumberUtils)
-        val dialog = AlertDialog.Builder(activity!!)
-                .setView(layout)
-                .setPositiveButton(R.string.blocked_numbers_dialog_block) { _, _ ->
-                    saveAddressSubject.onNext(layout.input.text.toString())
-                }
-                .setNegativeButton(R.string.button_cancel) { _, _ -> }
-                .setOnDismissListener { textWatcher.dispose() }
-        dialog.show()
-    }
-
-}
+/*
+ * Copyright (C) 2017 Moez Bhatti <moez.bhatti@gmail.com>
+ *
+ * This file is part of QKSMS.
+ *
+ * QKSMS is free software: you can redistribute it and/or modify
+ * it under the terms of the GNU General Public License as published by
+ * the Free Software Foundation, either version 3 of the License, or
+ * (at your option) any later version.
+ *
+ * QKSMS is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+ * GNU General Public License for more details.
+ *
+ * You should have received a copy of the GNU General Public License
+ * along with QKSMS.  If not, see <http://www.gnu.org/licenses/>.
+ */
+package com.moez.QKSMS.feature.blocking.numbers
+
+import android.view.LayoutInflater
+import android.view.View
+import androidx.appcompat.app.AlertDialog
+import com.jakewharton.rxbinding2.view.clicks
+import com.moez.QKSMS.R
+import com.moez.QKSMS.common.base.QkController
+import com.moez.QKSMS.common.util.Colors
+import com.moez.QKSMS.common.util.extensions.setBackgroundTint
+import com.moez.QKSMS.common.util.extensions.setTint
+import com.moez.QKSMS.injection.appComponent
+import com.moez.QKSMS.util.PhoneNumberUtils
+import io.reactivex.Observable
+import io.reactivex.subjects.PublishSubject
+import io.reactivex.subjects.Subject
+import kotlinx.android.synthetic.main.blocked_numbers_add_dialog.view.*
+import kotlinx.android.synthetic.main.blocked_numbers_controller.*
+import javax.inject.Inject
+
+class BlockedNumbersController : QkController<BlockedNumbersView, BlockedNumbersState, BlockedNumbersPresenter>(),
+    BlockedNumbersView {
+
+    @Inject override lateinit var presenter: BlockedNumbersPresenter
+    @Inject lateinit var colors: Colors
+    @Inject lateinit var phoneNumberUtils: PhoneNumberUtils
+
+    private val adapter = BlockedNumbersAdapter()
+    private val saveAddressSubject: Subject<String> = PublishSubject.create()
+
+    init {
+        appComponent.inject(this)
+        retainViewMode = RetainViewMode.RETAIN_DETACH
+        layoutRes = R.layout.blocked_numbers_controller
+    }
+
+    override fun onAttach(view: View) {
+        super.onAttach(view)
+        presenter.bindIntents(this)
+        setTitle(R.string.blocked_numbers_title)
+        showBackButton(true)
+    }
+
+    override fun onViewCreated() {
+        super.onViewCreated()
+        add.setBackgroundTint(colors.theme().theme)
+        add.setTint(colors.theme().textPrimary)
+        adapter.emptyView = empty
+        numbers.adapter = adapter
+    }
+
+    override fun render(state: BlockedNumbersState) {
+        adapter.updateData(state.numbers)
+    }
+
+    override fun unblockAddress(): Observable<Long> = adapter.unblockAddress
+    override fun addAddress(): Observable<*> = add.clicks()
+    override fun saveAddress(): Observable<String> = saveAddressSubject
+
+    override fun showAddDialog() {
+        val layout = LayoutInflater.from(activity).inflate(R.layout.blocked_numbers_add_dialog, null)
+        val textWatcher = BlockedNumberTextWatcher(layout.input, phoneNumberUtils)
+        val dialog = AlertDialog.Builder(activity!!)
+                .setView(layout)
+                .setPositiveButton(R.string.blocked_numbers_dialog_block) { _, _ ->
+                    saveAddressSubject.onNext(layout.input.text.toString())
+                }
+                .setNegativeButton(R.string.button_cancel) { _, _ -> }
+                .setOnDismissListener { textWatcher.dispose() }
+        dialog.show()
+    }
+
+}
diff --git a/presentation/src/main/java/com/moez/QKSMS/feature/blocking/numbers/BlockedNumbersPresenter.kt b/presentation/src/main/java/com/moez/QKSMS/feature/blocking/numbers/BlockedNumbersPresenter.kt
index f9c4decd8..fbdfa6160 100644
--- a/presentation/src/main/java/com/moez/QKSMS/feature/blocking/numbers/BlockedNumbersPresenter.kt
+++ b/presentation/src/main/java/com/moez/QKSMS/feature/blocking/numbers/BlockedNumbersPresenter.kt
@@ -1,62 +1,62 @@
-/*
- * Copyright (C) 2017 Moez Bhatti <moez.bhatti@gmail.com>
- *
- * This file is part of QKSMS.
- *
- * QKSMS is free software: you can redistribute it and/or modify
- * it under the terms of the GNU General Public License as published by
- * the Free Software Foundation, either version 3 of the License, or
- * (at your option) any later version.
- *
- * QKSMS is distributed in the hope that it will be useful,
- * but WITHOUT ANY WARRANTY; without even the implied warranty of
- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
- * GNU General Public License for more details.
- *
- * You should have received a copy of the GNU General Public License
- * along with QKSMS.  If not, see <http://www.gnu.org/licenses/>.
- */
-package com.moez.QKSMS.feature.blocking.numbers
-
-import com.moez.QKSMS.common.base.QkPresenter
-import com.moez.QKSMS.interactor.MarkUnblocked
-import com.moez.QKSMS.repository.BlockingRepository
-import com.moez.QKSMS.repository.ConversationRepository
-import com.uber.autodispose.android.lifecycle.scope
-import com.uber.autodispose.autoDisposable
-import io.reactivex.schedulers.Schedulers
-import javax.inject.Inject
-
-class BlockedNumbersPresenter @Inject constructor(
-    private val blockingRepo: BlockingRepository,
-    private val conversationRepo: ConversationRepository,
-    private val markUnblocked: MarkUnblocked
-) : QkPresenter<BlockedNumbersView, BlockedNumbersState>(
-        BlockedNumbersState(numbers = blockingRepo.getBlockedNumbers())
-) {
-
-    override fun bindIntents(view: BlockedNumbersView) {
-        super.bindIntents(view)
-
-        view.unblockAddress()
-                .doOnNext { id ->
-                    blockingRepo.getBlockedNumber(id)?.address
-                            ?.let(conversationRepo::getThreadId)
-                            ?.let { threadId -> markUnblocked.execute(listOf(threadId)) }
-                }
-                .doOnNext(blockingRepo::unblockNumber)
-                .subscribeOn(Schedulers.io())
-                .autoDisposable(view.scope())
-                .subscribe()
-
-        view.addAddress()
-                .autoDisposable(view.scope())
-                .subscribe { view.showAddDialog() }
-
-        view.saveAddress()
-                .subscribeOn(Schedulers.io())
-                .autoDisposable(view.scope())
-                .subscribe { address -> blockingRepo.blockNumber(address) }
-    }
-
-}
+/*
+ * Copyright (C) 2017 Moez Bhatti <moez.bhatti@gmail.com>
+ *
+ * This file is part of QKSMS.
+ *
+ * QKSMS is free software: you can redistribute it and/or modify
+ * it under the terms of the GNU General Public License as published by
+ * the Free Software Foundation, either version 3 of the License, or
+ * (at your option) any later version.
+ *
+ * QKSMS is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+ * GNU General Public License for more details.
+ *
+ * You should have received a copy of the GNU General Public License
+ * along with QKSMS.  If not, see <http://www.gnu.org/licenses/>.
+ */
+package com.moez.QKSMS.feature.blocking.numbers
+
+import com.moez.QKSMS.common.base.QkPresenter
+import com.moez.QKSMS.interactor.MarkUnblocked
+import com.moez.QKSMS.repository.BlockingRepository
+import com.moez.QKSMS.repository.ConversationRepository
+import com.uber.autodispose.android.lifecycle.scope
+import com.uber.autodispose.autoDisposable
+import io.reactivex.schedulers.Schedulers
+import javax.inject.Inject
+
+class BlockedNumbersPresenter @Inject constructor(
+    private val blockingRepo: BlockingRepository,
+    private val conversationRepo: ConversationRepository,
+    private val markUnblocked: MarkUnblocked
+) : QkPresenter<BlockedNumbersView, BlockedNumbersState>(
+        BlockedNumbersState(numbers = blockingRepo.getBlockedNumbers())
+) {
+
+    override fun bindIntents(view: BlockedNumbersView) {
+        super.bindIntents(view)
+
+        view.unblockAddress()
+                .doOnNext { id ->
+                    blockingRepo.getBlockedNumber(id)?.address
+                            ?.let(conversationRepo::getThreadId)
+                            ?.let { threadId -> markUnblocked.execute(listOf(threadId)) }
+                }
+                .doOnNext(blockingRepo::unblockNumber)
+                .subscribeOn(Schedulers.io())
+                .autoDisposable(view.scope())
+                .subscribe()
+
+        view.addAddress()
+                .autoDisposable(view.scope())
+                .subscribe { view.showAddDialog() }
+
+        view.saveAddress()
+                .subscribeOn(Schedulers.io())
+                .autoDisposable(view.scope())
+                .subscribe { address -> blockingRepo.blockNumber(address) }
+    }
+
+}
diff --git a/presentation/src/main/java/com/moez/QKSMS/feature/blocking/numbers/BlockedNumbersState.kt b/presentation/src/main/java/com/moez/QKSMS/feature/blocking/numbers/BlockedNumbersState.kt
index abc206006..f542a5dc3 100644
--- a/presentation/src/main/java/com/moez/QKSMS/feature/blocking/numbers/BlockedNumbersState.kt
+++ b/presentation/src/main/java/com/moez/QKSMS/feature/blocking/numbers/BlockedNumbersState.kt
@@ -1,27 +1,27 @@
-/*
- * Copyright (C) 2017 Moez Bhatti <moez.bhatti@gmail.com>
- *
- * This file is part of QKSMS.
- *
- * QKSMS is free software: you can redistribute it and/or modify
- * it under the terms of the GNU General Public License as published by
- * the Free Software Foundation, either version 3 of the License, or
- * (at your option) any later version.
- *
- * QKSMS is distributed in the hope that it will be useful,
- * but WITHOUT ANY WARRANTY; without even the implied warranty of
- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
- * GNU General Public License for more details.
- *
- * You should have received a copy of the GNU General Public License
- * along with QKSMS.  If not, see <http://www.gnu.org/licenses/>.
- */
-package com.moez.QKSMS.feature.blocking.numbers
-
-import com.moez.QKSMS.model.BlockedNumber
-import io.realm.RealmList
-import io.realm.RealmResults
-
-data class BlockedNumbersState(
-    val numbers: RealmResults<BlockedNumber>? = null
-)
+/*
+ * Copyright (C) 2017 Moez Bhatti <moez.bhatti@gmail.com>
+ *
+ * This file is part of QKSMS.
+ *
+ * QKSMS is free software: you can redistribute it and/or modify
+ * it under the terms of the GNU General Public License as published by
+ * the Free Software Foundation, either version 3 of the License, or
+ * (at your option) any later version.
+ *
+ * QKSMS is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+ * GNU General Public License for more details.
+ *
+ * You should have received a copy of the GNU General Public License
+ * along with QKSMS.  If not, see <http://www.gnu.org/licenses/>.
+ */
+package com.moez.QKSMS.feature.blocking.numbers
+
+import com.moez.QKSMS.model.BlockedNumber
+import io.realm.RealmList
+import io.realm.RealmResults
+
+data class BlockedNumbersState(
+    val numbers: RealmResults<BlockedNumber>? = null
+)
diff --git a/presentation/src/main/java/com/moez/QKSMS/feature/blocking/numbers/BlockedNumbersView.kt b/presentation/src/main/java/com/moez/QKSMS/feature/blocking/numbers/BlockedNumbersView.kt
index b537c9446..43c0bcc93 100644
--- a/presentation/src/main/java/com/moez/QKSMS/feature/blocking/numbers/BlockedNumbersView.kt
+++ b/presentation/src/main/java/com/moez/QKSMS/feature/blocking/numbers/BlockedNumbersView.kt
@@ -1,32 +1,32 @@
-/*
- * Copyright (C) 2017 Moez Bhatti <moez.bhatti@gmail.com>
- *
- * This file is part of QKSMS.
- *
- * QKSMS is free software: you can redistribute it and/or modify
- * it under the terms of the GNU General Public License as published by
- * the Free Software Foundation, either version 3 of the License, or
- * (at your option) any later version.
- *
- * QKSMS is distributed in the hope that it will be useful,
- * but WITHOUT ANY WARRANTY; without even the implied warranty of
- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
- * GNU General Public License for more details.
- *
- * You should have received a copy of the GNU General Public License
- * along with QKSMS.  If not, see <http://www.gnu.org/licenses/>.
- */
-package com.moez.QKSMS.feature.blocking.numbers
-
-import com.moez.QKSMS.common.base.QkViewContract
-import io.reactivex.Observable
-
-interface BlockedNumbersView : QkViewContract<BlockedNumbersState> {
-
-    fun unblockAddress(): Observable<Long>
-    fun addAddress(): Observable<*>
-    fun saveAddress(): Observable<String>
-
-    fun showAddDialog()
-
-}
+/*
+ * Copyright (C) 2017 Moez Bhatti <moez.bhatti@gmail.com>
+ *
+ * This file is part of QKSMS.
+ *
+ * QKSMS is free software: you can redistribute it and/or modify
+ * it under the terms of the GNU General Public License as published by
+ * the Free Software Foundation, either version 3 of the License, or
+ * (at your option) any later version.
+ *
+ * QKSMS is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+ * GNU General Public License for more details.
+ *
+ * You should have received a copy of the GNU General Public License
+ * along with QKSMS.  If not, see <http://www.gnu.org/licenses/>.
+ */
+package com.moez.QKSMS.feature.blocking.numbers
+
+import com.moez.QKSMS.common.base.QkViewContract
+import io.reactivex.Observable
+
+interface BlockedNumbersView : QkViewContract<BlockedNumbersState> {
+
+    fun unblockAddress(): Observable<Long>
+    fun addAddress(): Observable<*>
+    fun saveAddress(): Observable<String>
+
+    fun showAddDialog()
+
+}
diff --git a/presentation/src/main/java/com/moez/QKSMS/feature/changelog/ChangelogAdapter.kt b/presentation/src/main/java/com/moez/QKSMS/feature/changelog/ChangelogAdapter.kt
index efba6cfc2..49c13cfe3 100644
--- a/presentation/src/main/java/com/moez/QKSMS/feature/changelog/ChangelogAdapter.kt
+++ b/presentation/src/main/java/com/moez/QKSMS/feature/changelog/ChangelogAdapter.kt
@@ -1,74 +1,74 @@
-/*
- * Copyright (C) 2017 Moez Bhatti <moez.bhatti@gmail.com>
- *
- * This file is part of QKSMS.
- *
- * QKSMS is free software: you can redistribute it and/or modify
- * it under the terms of the GNU General Public License as published by
- * the Free Software Foundation, either version 3 of the License, or
- * (at your option) any later version.
- *
- * QKSMS is distributed in the hope that it will be useful,
- * but WITHOUT ANY WARRANTY; without even the implied warranty of
- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
- * GNU General Public License for more details.
- *
- * You should have received a copy of the GNU General Public License
- * along with QKSMS.  If not, see <http://www.gnu.org/licenses/>.
- */
-package com.moez.QKSMS.feature.changelog
-
-import android.content.Context
-import android.graphics.Typeface
-import android.view.LayoutInflater
-import android.view.ViewGroup
-import com.moez.QKSMS.R
-import com.moez.QKSMS.common.base.QkAdapter
-import com.moez.QKSMS.common.base.QkViewHolder
-import com.moez.QKSMS.manager.ChangelogManager
-import kotlinx.android.synthetic.main.changelog_list_item.*
-
-class ChangelogAdapter(private val context: Context) : QkAdapter<ChangelogAdapter.ChangelogItem>() {
-
-    data class ChangelogItem(val type: Int, val label: String)
-
-    fun setChangelog(changelog: ChangelogManager.CumulativeChangelog) {
-        val changes = mutableListOf<ChangelogItem>()
-        if (changelog.added.isNotEmpty()) {
-            changes += ChangelogItem(0, context.getString(R.string.changelog_added))
-            changes += changelog.added.map { change -> ChangelogItem(1, "• $change") }
-            changes += ChangelogItem(0, "")
-        }
-        if (changelog.improved.isNotEmpty()) {
-            changes += ChangelogItem(0, context.getString(R.string.changelog_improved))
-            changes += changelog.improved.map { change -> ChangelogItem(1, "• $change") }
-            changes += ChangelogItem(0, "")
-        }
-        if (changelog.fixed.isNotEmpty()) {
-            changes += ChangelogItem(0, context.getString(R.string.changelog_fixed))
-            changes += changelog.fixed.map { change -> ChangelogItem(1, "• $change") }
-            changes += ChangelogItem(0, "")
-        }
-        data = changes
-    }
-
-    override fun onCreateViewHolder(parent: ViewGroup, viewType: Int): QkViewHolder {
-        val view = LayoutInflater.from(parent.context).inflate(R.layout.changelog_list_item, parent, false)
-        return QkViewHolder(view).apply {
-            if (viewType == 0) {
-                changelogItem.setTypeface(changelogItem.typeface, Typeface.BOLD)
-            }
-        }
-    }
-
-    override fun onBindViewHolder(holder: QkViewHolder, position: Int) {
-        val item = getItem(position)
-
-        holder.changelogItem.text = item.label
-    }
-
-    override fun getItemViewType(position: Int): Int {
-        return getItem(position).type
-    }
-
-}
+/*
+ * Copyright (C) 2017 Moez Bhatti <moez.bhatti@gmail.com>
+ *
+ * This file is part of QKSMS.
+ *
+ * QKSMS is free software: you can redistribute it and/or modify
+ * it under the terms of the GNU General Public License as published by
+ * the Free Software Foundation, either version 3 of the License, or
+ * (at your option) any later version.
+ *
+ * QKSMS is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+ * GNU General Public License for more details.
+ *
+ * You should have received a copy of the GNU General Public License
+ * along with QKSMS.  If not, see <http://www.gnu.org/licenses/>.
+ */
+package com.moez.QKSMS.feature.changelog
+
+import android.content.Context
+import android.graphics.Typeface
+import android.view.LayoutInflater
+import android.view.ViewGroup
+import com.moez.QKSMS.R
+import com.moez.QKSMS.common.base.QkAdapter
+import com.moez.QKSMS.common.base.QkViewHolder
+import com.moez.QKSMS.manager.ChangelogManager
+import kotlinx.android.synthetic.main.changelog_list_item.*
+
+class ChangelogAdapter(private val context: Context) : QkAdapter<ChangelogAdapter.ChangelogItem>() {
+
+    data class ChangelogItem(val type: Int, val label: String)
+
+    fun setChangelog(changelog: ChangelogManager.CumulativeChangelog) {
+        val changes = mutableListOf<ChangelogItem>()
+        if (changelog.added.isNotEmpty()) {
+            changes += ChangelogItem(0, context.getString(R.string.changelog_added))
+            changes += changelog.added.map { change -> ChangelogItem(1, "• $change") }
+            changes += ChangelogItem(0, "")
+        }
+        if (changelog.improved.isNotEmpty()) {
+            changes += ChangelogItem(0, context.getString(R.string.changelog_improved))
+            changes += changelog.improved.map { change -> ChangelogItem(1, "• $change") }
+            changes += ChangelogItem(0, "")
+        }
+        if (changelog.fixed.isNotEmpty()) {
+            changes += ChangelogItem(0, context.getString(R.string.changelog_fixed))
+            changes += changelog.fixed.map { change -> ChangelogItem(1, "• $change") }
+            changes += ChangelogItem(0, "")
+        }
+        data = changes
+    }
+
+    override fun onCreateViewHolder(parent: ViewGroup, viewType: Int): QkViewHolder {
+        val view = LayoutInflater.from(parent.context).inflate(R.layout.changelog_list_item, parent, false)
+        return QkViewHolder(view).apply {
+            if (viewType == 0) {
+                changelogItem.setTypeface(changelogItem.typeface, Typeface.BOLD)
+            }
+        }
+    }
+
+    override fun onBindViewHolder(holder: QkViewHolder, position: Int) {
+        val item = getItem(position)
+
+        holder.changelogItem.text = item.label
+    }
+
+    override fun getItemViewType(position: Int): Int {
+        return getItem(position).type
+    }
+
+}
diff --git a/presentation/src/main/java/com/moez/QKSMS/feature/changelog/ChangelogDialog.kt b/presentation/src/main/java/com/moez/QKSMS/feature/changelog/ChangelogDialog.kt
index 9d0deba6f..94e98ee19 100644
--- a/presentation/src/main/java/com/moez/QKSMS/feature/changelog/ChangelogDialog.kt
+++ b/presentation/src/main/java/com/moez/QKSMS/feature/changelog/ChangelogDialog.kt
@@ -1,57 +1,57 @@
-/*
- * Copyright (C) 2017 Moez Bhatti <moez.bhatti@gmail.com>
- *
- * This file is part of QKSMS.
- *
- * QKSMS is free software: you can redistribute it and/or modify
- * it under the terms of the GNU General Public License as published by
- * the Free Software Foundation, either version 3 of the License, or
- * (at your option) any later version.
- *
- * QKSMS is distributed in the hope that it will be useful,
- * but WITHOUT ANY WARRANTY; without even the implied warranty of
- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
- * GNU General Public License for more details.
- *
- * You should have received a copy of the GNU General Public License
- * along with QKSMS.  If not, see <http://www.gnu.org/licenses/>.
- */
-package com.moez.QKSMS.feature.changelog
-
-import android.view.LayoutInflater
-import androidx.appcompat.app.AlertDialog
-import com.moez.QKSMS.BuildConfig
-import com.moez.QKSMS.R
-import com.moez.QKSMS.feature.main.MainActivity
-import com.moez.QKSMS.manager.ChangelogManager
-import io.reactivex.subjects.PublishSubject
-import io.reactivex.subjects.Subject
-import kotlinx.android.synthetic.main.changelog_dialog.view.*
-
-class ChangelogDialog(activity: MainActivity) {
-
-    val moreClicks: Subject<Unit> = PublishSubject.create()
-
-    private val dialog: AlertDialog
-    private val adapter = ChangelogAdapter(activity)
-
-    init {
-        val layout = LayoutInflater.from(activity).inflate(R.layout.changelog_dialog, null)
-
-        dialog = AlertDialog.Builder(activity)
-                .setCancelable(true)
-                .setView(layout)
-                .create()
-
-        layout.version.text = activity.getString(R.string.changelog_version, BuildConfig.VERSION_NAME)
-        layout.changelog.adapter = adapter
-        layout.more.setOnClickListener { dialog.dismiss(); moreClicks.onNext(Unit) }
-        layout.dismiss.setOnClickListener { dialog.dismiss() }
-    }
-
-    fun show(changelog: ChangelogManager.CumulativeChangelog) {
-        adapter.setChangelog(changelog)
-        dialog.show()
-    }
-
-}
+/*
+ * Copyright (C) 2017 Moez Bhatti <moez.bhatti@gmail.com>
+ *
+ * This file is part of QKSMS.
+ *
+ * QKSMS is free software: you can redistribute it and/or modify
+ * it under the terms of the GNU General Public License as published by
+ * the Free Software Foundation, either version 3 of the License, or
+ * (at your option) any later version.
+ *
+ * QKSMS is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+ * GNU General Public License for more details.
+ *
+ * You should have received a copy of the GNU General Public License
+ * along with QKSMS.  If not, see <http://www.gnu.org/licenses/>.
+ */
+package com.moez.QKSMS.feature.changelog
+
+import android.view.LayoutInflater
+import androidx.appcompat.app.AlertDialog
+import com.moez.QKSMS.BuildConfig
+import com.moez.QKSMS.R
+import com.moez.QKSMS.feature.main.MainActivity
+import com.moez.QKSMS.manager.ChangelogManager
+import io.reactivex.subjects.PublishSubject
+import io.reactivex.subjects.Subject
+import kotlinx.android.synthetic.main.changelog_dialog.view.*
+
+class ChangelogDialog(activity: MainActivity) {
+
+    val moreClicks: Subject<Unit> = PublishSubject.create()
+
+    private val dialog: AlertDialog
+    private val adapter = ChangelogAdapter(activity)
+
+    init {
+        val layout = LayoutInflater.from(activity).inflate(R.layout.changelog_dialog, null)
+
+        dialog = AlertDialog.Builder(activity)
+                .setCancelable(true)
+                .setView(layout)
+                .create()
+
+        layout.version.text = activity.getString(R.string.changelog_version, BuildConfig.VERSION_NAME)
+        layout.changelog.adapter = adapter
+        layout.more.setOnClickListener { dialog.dismiss(); moreClicks.onNext(Unit) }
+        layout.dismiss.setOnClickListener { dialog.dismiss() }
+    }
+
+    fun show(changelog: ChangelogManager.CumulativeChangelog) {
+        adapter.setChangelog(changelog)
+        dialog.show()
+    }
+
+}
diff --git a/presentation/src/main/java/com/moez/QKSMS/feature/compose/AttachmentAdapter.kt b/presentation/src/main/java/com/moez/QKSMS/feature/compose/AttachmentAdapter.kt
index 3563798bc..b93e1c610 100644
--- a/presentation/src/main/java/com/moez/QKSMS/feature/compose/AttachmentAdapter.kt
+++ b/presentation/src/main/java/com/moez/QKSMS/feature/compose/AttachmentAdapter.kt
@@ -1,92 +1,92 @@
-/*
- * Copyright (C) 2017 Moez Bhatti <moez.bhatti@gmail.com>
- *
- * This file is part of QKSMS.
- *
- * QKSMS is free software: you can redistribute it and/or modify
- * it under the terms of the GNU General Public License as published by
- * the Free Software Foundation, either version 3 of the License, or
- * (at your option) any later version.
- *
- * QKSMS is distributed in the hope that it will be useful,
- * but WITHOUT ANY WARRANTY; without even the implied warranty of
- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
- * GNU General Public License for more details.
- *
- * You should have received a copy of the GNU General Public License
- * along with QKSMS.  If not, see <http://www.gnu.org/licenses/>.
- */
-package com.moez.QKSMS.feature.compose
-
-import android.content.Context
-import android.view.LayoutInflater
-import android.view.ViewGroup
-import com.bumptech.glide.Glide
-import com.moez.QKSMS.R
-import com.moez.QKSMS.common.base.QkAdapter
-import com.moez.QKSMS.common.base.QkViewHolder
-import com.moez.QKSMS.extensions.mapNotNull
-import com.moez.QKSMS.model.Attachment
-import ezvcard.Ezvcard
-import io.reactivex.Observable
-import io.reactivex.android.schedulers.AndroidSchedulers
-import io.reactivex.schedulers.Schedulers
-import io.reactivex.subjects.PublishSubject
-import io.reactivex.subjects.Subject
-import kotlinx.android.synthetic.main.attachment_contact_list_item.*
-import kotlinx.android.synthetic.main.attachment_image_list_item.*
-import kotlinx.android.synthetic.main.attachment_image_list_item.view.*
-import javax.inject.Inject
-
-class AttachmentAdapter @Inject constructor(
-    private val context: Context
-) : QkAdapter<Attachment>() {
-
-    companion object {
-        private const val VIEW_TYPE_IMAGE = 0
-        private const val VIEW_TYPE_CONTACT = 1
-    }
-
-    val attachmentDeleted: Subject<Attachment> = PublishSubject.create()
-
-    override fun onCreateViewHolder(parent: ViewGroup, viewType: Int): QkViewHolder {
-        val inflater = LayoutInflater.from(parent.context)
-        val view = when (viewType) {
-            VIEW_TYPE_IMAGE -> inflater.inflate(R.layout.attachment_image_list_item, parent, false)
-                    .apply { thumbnailBounds.clipToOutline = true }
-
-            VIEW_TYPE_CONTACT -> inflater.inflate(R.layout.attachment_contact_list_item, parent, false)
-
-            else -> null!! // Impossible
-        }
-
-        return QkViewHolder(view).apply {
-            view.setOnClickListener {
-                val attachment = getItem(adapterPosition)
-                attachmentDeleted.onNext(attachment)
-            }
-        }
-    }
-
-    override fun onBindViewHolder(holder: QkViewHolder, position: Int) {
-        val attachment = getItem(position)
-
-        when (attachment) {
-            is Attachment.Image -> Glide.with(context)
-                    .load(attachment.getUri())
-                    .into(holder.thumbnail)
-
-            is Attachment.Contact -> Observable.just(attachment.vCard)
-                    .mapNotNull { vCard -> Ezvcard.parse(vCard).first() }
-                    .subscribeOn(Schedulers.computation())
-                    .observeOn(AndroidSchedulers.mainThread())
-                    .subscribe { vcard -> holder.name?.text = vcard.formattedName.value }
-        }
-    }
-
-    override fun getItemViewType(position: Int) = when (getItem(position)) {
-        is Attachment.Image -> VIEW_TYPE_IMAGE
-        is Attachment.Contact -> VIEW_TYPE_CONTACT
-    }
-
+/*
+ * Copyright (C) 2017 Moez Bhatti <moez.bhatti@gmail.com>
+ *
+ * This file is part of QKSMS.
+ *
+ * QKSMS is free software: you can redistribute it and/or modify
+ * it under the terms of the GNU General Public License as published by
+ * the Free Software Foundation, either version 3 of the License, or
+ * (at your option) any later version.
+ *
+ * QKSMS is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+ * GNU General Public License for more details.
+ *
+ * You should have received a copy of the GNU General Public License
+ * along with QKSMS.  If not, see <http://www.gnu.org/licenses/>.
+ */
+package com.moez.QKSMS.feature.compose
+
+import android.content.Context
+import android.view.LayoutInflater
+import android.view.ViewGroup
+import com.bumptech.glide.Glide
+import com.moez.QKSMS.R
+import com.moez.QKSMS.common.base.QkAdapter
+import com.moez.QKSMS.common.base.QkViewHolder
+import com.moez.QKSMS.extensions.mapNotNull
+import com.moez.QKSMS.model.Attachment
+import ezvcard.Ezvcard
+import io.reactivex.Observable
+import io.reactivex.android.schedulers.AndroidSchedulers
+import io.reactivex.schedulers.Schedulers
+import io.reactivex.subjects.PublishSubject
+import io.reactivex.subjects.Subject
+import kotlinx.android.synthetic.main.attachment_contact_list_item.*
+import kotlinx.android.synthetic.main.attachment_image_list_item.*
+import kotlinx.android.synthetic.main.attachment_image_list_item.view.*
+import javax.inject.Inject
+
+class AttachmentAdapter @Inject constructor(
+    private val context: Context
+) : QkAdapter<Attachment>() {
+
+    companion object {
+        private const val VIEW_TYPE_IMAGE = 0
+        private const val VIEW_TYPE_CONTACT = 1
+    }
+
+    val attachmentDeleted: Subject<Attachment> = PublishSubject.create()
+
+    override fun onCreateViewHolder(parent: ViewGroup, viewType: Int): QkViewHolder {
+        val inflater = LayoutInflater.from(parent.context)
+        val view = when (viewType) {
+            VIEW_TYPE_IMAGE -> inflater.inflate(R.layout.attachment_image_list_item, parent, false)
+                    .apply { thumbnailBounds.clipToOutline = true }
+
+            VIEW_TYPE_CONTACT -> inflater.inflate(R.layout.attachment_contact_list_item, parent, false)
+
+            else -> null!! // Impossible
+        }
+
+        return QkViewHolder(view).apply {
+            view.setOnClickListener {
+                val attachment = getItem(adapterPosition)
+                attachmentDeleted.onNext(attachment)
+            }
+        }
+    }
+
+    override fun onBindViewHolder(holder: QkViewHolder, position: Int) {
+        val attachment = getItem(position)
+
+        when (attachment) {
+            is Attachment.Image -> Glide.with(context)
+                    .load(attachment.getUri())
+                    .into(holder.thumbnail)
+
+            is Attachment.Contact -> Observable.just(attachment.vCard)
+                    .mapNotNull { vCard -> Ezvcard.parse(vCard).first() }
+                    .subscribeOn(Schedulers.computation())
+                    .observeOn(AndroidSchedulers.mainThread())
+                    .subscribe { vcard -> holder.name?.text = vcard.formattedName.value }
+        }
+    }
+
+    override fun getItemViewType(position: Int) = when (getItem(position)) {
+        is Attachment.Image -> VIEW_TYPE_IMAGE
+        is Attachment.Contact -> VIEW_TYPE_CONTACT
+    }
+
 }
\ No newline at end of file
diff --git a/presentation/src/main/java/com/moez/QKSMS/feature/compose/BubbleUtils.kt b/presentation/src/main/java/com/moez/QKSMS/feature/compose/BubbleUtils.kt
index cb7dad0ec..84ff7a5da 100644
--- a/presentation/src/main/java/com/moez/QKSMS/feature/compose/BubbleUtils.kt
+++ b/presentation/src/main/java/com/moez/QKSMS/feature/compose/BubbleUtils.kt
@@ -1,45 +1,45 @@
-/*
- * Copyright (C) 2017 Moez Bhatti <moez.bhatti@gmail.com>
- *
- * This file is part of QKSMS.
- *
- * QKSMS is free software: you can redistribute it and/or modify
- * it under the terms of the GNU General Public License as published by
- * the Free Software Foundation, either version 3 of the License, or
- * (at your option) any later version.
- *
- * QKSMS is distributed in the hope that it will be useful,
- * but WITHOUT ANY WARRANTY; without even the implied warranty of
- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
- * GNU General Public License for more details.
- *
- * You should have received a copy of the GNU General Public License
- * along with QKSMS.  If not, see <http://www.gnu.org/licenses/>.
- */
-package com.moez.QKSMS.feature.compose
-
-import com.moez.QKSMS.R
-import com.moez.QKSMS.model.Message
-import java.util.concurrent.TimeUnit
-
-object BubbleUtils {
-
-    const val TIMESTAMP_THRESHOLD = 10
-
-    fun canGroup(message: Message, other: Message?): Boolean {
-        if (other == null) return false
-        val diff = TimeUnit.MILLISECONDS.toMinutes(Math.abs(message.date - other.date))
-        return message.compareSender(other) && diff < TIMESTAMP_THRESHOLD
-    }
-
-    fun getBubble(emojiOnly: Boolean, canGroupWithPrevious: Boolean, canGroupWithNext: Boolean, isMe: Boolean): Int {
-        return when {
-            emojiOnly -> R.drawable.message_emoji
-            !canGroupWithPrevious && canGroupWithNext -> if (isMe) R.drawable.message_out_first else R.drawable.message_in_first
-            canGroupWithPrevious && canGroupWithNext -> if (isMe) R.drawable.message_out_middle else R.drawable.message_in_middle
-            canGroupWithPrevious && !canGroupWithNext -> if (isMe) R.drawable.message_out_last else R.drawable.message_in_last
-            else -> R.drawable.message_only
-        }
-    }
-
+/*
+ * Copyright (C) 2017 Moez Bhatti <moez.bhatti@gmail.com>
+ *
+ * This file is part of QKSMS.
+ *
+ * QKSMS is free software: you can redistribute it and/or modify
+ * it under the terms of the GNU General Public License as published by
+ * the Free Software Foundation, either version 3 of the License, or
+ * (at your option) any later version.
+ *
+ * QKSMS is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+ * GNU General Public License for more details.
+ *
+ * You should have received a copy of the GNU General Public License
+ * along with QKSMS.  If not, see <http://www.gnu.org/licenses/>.
+ */
+package com.moez.QKSMS.feature.compose
+
+import com.moez.QKSMS.R
+import com.moez.QKSMS.model.Message
+import java.util.concurrent.TimeUnit
+
+object BubbleUtils {
+
+    const val TIMESTAMP_THRESHOLD = 10
+
+    fun canGroup(message: Message, other: Message?): Boolean {
+        if (other == null) return false
+        val diff = TimeUnit.MILLISECONDS.toMinutes(Math.abs(message.date - other.date))
+        return message.compareSender(other) && diff < TIMESTAMP_THRESHOLD
+    }
+
+    fun getBubble(emojiOnly: Boolean, canGroupWithPrevious: Boolean, canGroupWithNext: Boolean, isMe: Boolean): Int {
+        return when {
+            emojiOnly -> R.drawable.message_emoji
+            !canGroupWithPrevious && canGroupWithNext -> if (isMe) R.drawable.message_out_first else R.drawable.message_in_first
+            canGroupWithPrevious && canGroupWithNext -> if (isMe) R.drawable.message_out_middle else R.drawable.message_in_middle
+            canGroupWithPrevious && !canGroupWithNext -> if (isMe) R.drawable.message_out_last else R.drawable.message_in_last
+            else -> R.drawable.message_only
+        }
+    }
+
 }
\ No newline at end of file
diff --git a/presentation/src/main/java/com/moez/QKSMS/feature/compose/ComposeActivity.kt b/presentation/src/main/java/com/moez/QKSMS/feature/compose/ComposeActivity.kt
index 3b42535b6..cb38d86e6 100644
--- a/presentation/src/main/java/com/moez/QKSMS/feature/compose/ComposeActivity.kt
+++ b/presentation/src/main/java/com/moez/QKSMS/feature/compose/ComposeActivity.kt
@@ -1,402 +1,446 @@
-/*
- * Copyright (C) 2017 Moez Bhatti <moez.bhatti@gmail.com>
- *
- * This file is part of QKSMS.
- *
- * QKSMS is free software: you can redistribute it and/or modify
- * it under the terms of the GNU General Public License as published by
- * the Free Software Foundation, either version 3 of the License, or
- * (at your option) any later version.
- *
- * QKSMS is distributed in the hope that it will be useful,
- * but WITHOUT ANY WARRANTY; without even the implied warranty of
- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
- * GNU General Public License for more details.
- *
- * You should have received a copy of the GNU General Public License
- * along with QKSMS.  If not, see <http://www.gnu.org/licenses/>.
- */
-package com.moez.QKSMS.feature.compose
-
-import android.Manifest
-import android.animation.LayoutTransition
-import android.app.Activity
-import android.app.DatePickerDialog
-import android.app.TimePickerDialog
-import android.content.ContentValues
-import android.content.Intent
-import android.net.Uri
-import android.os.Build
-import android.os.Bundle
-import android.provider.ContactsContract
-import android.provider.MediaStore
-import android.text.format.DateFormat
-import android.view.Menu
-import android.view.MenuItem
-import androidx.appcompat.app.AlertDialog
-import androidx.core.app.ActivityCompat
-import androidx.core.view.isVisible
-import androidx.lifecycle.ViewModelProvider
-import androidx.lifecycle.ViewModelProviders
-import com.google.android.flexbox.FlexboxLayoutManager
-import com.google.android.material.snackbar.Snackbar
-import com.jakewharton.rxbinding2.view.clicks
-import com.jakewharton.rxbinding2.widget.textChanges
-import com.moez.QKSMS.R
-import com.moez.QKSMS.common.Navigator
-import com.moez.QKSMS.common.base.QkThemedActivity
-import com.moez.QKSMS.common.util.DateFormatter
-import com.moez.QKSMS.common.util.extensions.autoScrollToStart
-import com.moez.QKSMS.common.util.extensions.dismissKeyboard
-import com.moez.QKSMS.common.util.extensions.hideKeyboard
-import com.moez.QKSMS.common.util.extensions.resolveThemeColor
-import com.moez.QKSMS.common.util.extensions.scrapViews
-import com.moez.QKSMS.common.util.extensions.setBackgroundTint
-import com.moez.QKSMS.common.util.extensions.setTint
-import com.moez.QKSMS.common.util.extensions.setVisible
-import com.moez.QKSMS.common.util.extensions.showKeyboard
-import com.moez.QKSMS.feature.compose.editing.ChipsAdapter
-import com.moez.QKSMS.feature.contacts.ContactsActivity
-import com.moez.QKSMS.model.Attachment
-import com.moez.QKSMS.model.Recipient
-import com.uber.autodispose.android.lifecycle.scope
-import com.uber.autodispose.autoDisposable
-import dagger.android.AndroidInjection
-import io.reactivex.Observable
-import io.reactivex.subjects.PublishSubject
-import io.reactivex.subjects.Subject
-import kotlinx.android.synthetic.main.compose_activity.*
-import java.text.SimpleDateFormat
-import java.util.*
-import javax.inject.Inject
-import kotlin.collections.HashMap
-
-class ComposeActivity : QkThemedActivity(), ComposeView {
-
-    companion object {
-        private const val SelectContactRequestCode = 0
-        private const val TakePhotoRequestCode = 1
-        private const val AttachPhotoRequestCode = 2
-        private const val AttachContactRequestCode = 3
-
-        private const val CameraDestinationKey = "camera_destination"
-    }
-
-    @Inject lateinit var attachmentAdapter: AttachmentAdapter
-    @Inject lateinit var chipsAdapter: ChipsAdapter
-    @Inject lateinit var dateFormatter: DateFormatter
-    @Inject lateinit var messageAdapter: MessagesAdapter
-    @Inject lateinit var navigator: Navigator
-    @Inject lateinit var viewModelFactory: ViewModelProvider.Factory
-
-    override val activityVisibleIntent: Subject<Boolean> = PublishSubject.create()
-    override val chipsSelectedIntent: Subject<HashMap<String, String?>> = PublishSubject.create()
-    override val chipDeletedIntent: Subject<Recipient> by lazy { chipsAdapter.chipDeleted }
-    override val menuReadyIntent: Observable<Unit> = menu.map { Unit }
-    override val optionsItemIntent: Subject<Int> = PublishSubject.create()
-    override val sendAsGroupIntent by lazy { sendAsGroupBackground.clicks() }
-    override val messageClickIntent: Subject<Long> by lazy { messageAdapter.clicks }
-    override val messagePartClickIntent: Subject<Long> by lazy { messageAdapter.partClicks }
-    override val messagesSelectedIntent by lazy { messageAdapter.selectionChanges }
-    override val cancelSendingIntent: Subject<Long> by lazy { messageAdapter.cancelSending }
-    override val attachmentDeletedIntent: Subject<Attachment> by lazy { attachmentAdapter.attachmentDeleted }
-    override val textChangedIntent by lazy { message.textChanges() }
-    override val attachIntent by lazy { Observable.merge(attach.clicks(), attachingBackground.clicks()) }
-    override val cameraIntent by lazy { Observable.merge(camera.clicks(), cameraLabel.clicks()) }
-    override val galleryIntent by lazy { Observable.merge(gallery.clicks(), galleryLabel.clicks()) }
-    override val scheduleIntent by lazy { Observable.merge(schedule.clicks(), scheduleLabel.clicks()) }
-    override val attachContactIntent by lazy { Observable.merge(contact.clicks(), contactLabel.clicks()) }
-    override val attachmentSelectedIntent: Subject<Uri> = PublishSubject.create()
-    override val contactSelectedIntent: Subject<Uri> = PublishSubject.create()
-    override val inputContentIntent by lazy { message.inputContentSelected }
-    override val scheduleSelectedIntent: Subject<Long> = PublishSubject.create()
-    override val changeSimIntent by lazy { sim.clicks() }
-    override val scheduleCancelIntent by lazy { scheduledCancel.clicks() }
-    override val sendIntent by lazy { send.clicks() }
-    override val viewQksmsPlusIntent: Subject<Unit> = PublishSubject.create()
-    override val backPressedIntent: Subject<Unit> = PublishSubject.create()
-
-    private val viewModel by lazy { ViewModelProviders.of(this, viewModelFactory)[ComposeViewModel::class.java] }
-
-    private var cameraDestination: Uri? = null
-
-    override fun onCreate(savedInstanceState: Bundle?) {
-        AndroidInjection.inject(this)
-        super.onCreate(savedInstanceState)
-        setContentView(R.layout.compose_activity)
-        showBackButton(true)
-        viewModel.bindView(this)
-
-        contentView.layoutTransition = LayoutTransition().apply {
-            disableTransitionType(LayoutTransition.CHANGING)
-        }
-
-        chipsAdapter.view = chips
-
-        chips.itemAnimator = null
-        chips.layoutManager = FlexboxLayoutManager(this)
-
-        messageAdapter.autoScrollToStart(messageList)
-        messageAdapter.emptyView = messagesEmpty
-
-        messageList.setHasFixedSize(true)
-        messageList.adapter = messageAdapter
-
-        attachments.adapter = attachmentAdapter
-
-        message.supportsInputContent = true
-
-        theme
-                .doOnNext { loading.setTint(it.theme) }
-                .doOnNext { attach.setBackgroundTint(it.theme) }
-                .doOnNext { attach.setTint(it.textPrimary) }
-                .doOnNext { messageAdapter.theme = it }
-                .autoDisposable(scope())
-                .subscribe()
-
-        window.callback = ComposeWindowCallback(window.callback, this)
-
-        // These theme attributes don't apply themselves on API 21
-        if (Build.VERSION.SDK_INT <= 22) {
-            messageBackground.setBackgroundTint(resolveThemeColor(R.attr.bubbleColor))
-        }
-    }
-
-    override fun onStart() {
-        super.onStart()
-        activityVisibleIntent.onNext(true)
-    }
-
-    override fun onPause() {
-        super.onPause()
-        activityVisibleIntent.onNext(false)
-    }
-
-    override fun render(state: ComposeState) {
-        if (state.hasError) {
-            finish()
-            return
-        }
-
-        threadId.onNext(state.threadId)
-
-        title = when {
-            state.selectedMessages > 0 -> getString(R.string.compose_title_selected, state.selectedMessages)
-            state.query.isNotEmpty() -> state.query
-            else -> state.conversationtitle
-        }
-
-        toolbarSubtitle.setVisible(state.query.isNotEmpty())
-        toolbarSubtitle.text = getString(R.string.compose_subtitle_results, state.searchSelectionPosition,
-                state.searchResults)
-
-        toolbarTitle.setVisible(!state.editingMode)
-        chips.setVisible(state.editingMode)
-        composeBar.setVisible(!state.loading)
-
-        // Don't set the adapters unless needed
-        if (state.editingMode && chips.adapter == null) chips.adapter = chipsAdapter
-
-        toolbar.menu.findItem(R.id.add)?.isVisible = state.editingMode
-        toolbar.menu.findItem(R.id.call)?.isVisible = !state.editingMode && state.selectedMessages == 0
-                && state.query.isEmpty()
-        toolbar.menu.findItem(R.id.info)?.isVisible = !state.editingMode && state.selectedMessages == 0
-                && state.query.isEmpty()
-        toolbar.menu.findItem(R.id.copy)?.isVisible = !state.editingMode && state.selectedMessages > 0
-        toolbar.menu.findItem(R.id.details)?.isVisible = !state.editingMode && state.selectedMessages == 1
-        toolbar.menu.findItem(R.id.delete)?.isVisible = !state.editingMode && state.selectedMessages > 0
-        toolbar.menu.findItem(R.id.forward)?.isVisible = !state.editingMode && state.selectedMessages == 1
-        toolbar.menu.findItem(R.id.previous)?.isVisible = state.selectedMessages == 0 && state.query.isNotEmpty()
-        toolbar.menu.findItem(R.id.next)?.isVisible = state.selectedMessages == 0 && state.query.isNotEmpty()
-        toolbar.menu.findItem(R.id.clear)?.isVisible = state.selectedMessages == 0 && state.query.isNotEmpty()
-
-        chipsAdapter.data = state.selectedChips
-
-        loading.setVisible(state.loading)
-
-        sendAsGroup.setVisible(state.editingMode && state.selectedChips.size >= 2)
-        sendAsGroupSwitch.isChecked = state.sendAsGroup
-
-        messageList.setVisible(!state.editingMode || state.sendAsGroup || state.selectedChips.size == 1)
-        messageAdapter.data = state.messages
-        messageAdapter.highlight = state.searchSelectionId
-
-        scheduledGroup.isVisible = state.scheduled != 0L
-        scheduledTime.text = dateFormatter.getScheduledTimestamp(state.scheduled)
-
-        attachments.setVisible(state.attachments.isNotEmpty())
-        attachmentAdapter.data = state.attachments
-
-        attach.animate().rotation(if (state.attaching) 135f else 0f).start()
-        attaching.isVisible = state.attaching
-
-        counter.text = state.remaining
-        counter.setVisible(counter.text.isNotBlank())
-
-        sim.setVisible(state.subscription != null)
-        sim.contentDescription = getString(R.string.compose_sim_cd, state.subscription?.displayName)
-        simIndex.text = state.subscription?.simSlotIndex?.plus(1)?.toString()
-
-        send.isEnabled = state.canSend
-        send.imageAlpha = if (state.canSend) 255 else 128
-    }
-
-    override fun clearSelection() = messageAdapter.clearSelection()
-
-    override fun showDetails(details: String) {
-        AlertDialog.Builder(this)
-                .setTitle(R.string.compose_details_title)
-                .setMessage(details)
-                .setCancelable(true)
-                .show()
-    }
-
-    override fun requestDefaultSms() {
-        navigator.showDefaultSmsDialog(this)
-    }
-
-    override fun requestStoragePermission() {
-        ActivityCompat.requestPermissions(this, arrayOf(Manifest.permission.WRITE_EXTERNAL_STORAGE), 0)
-    }
-
-    override fun requestSmsPermission() {
-        ActivityCompat.requestPermissions(this, arrayOf(
-                Manifest.permission.READ_SMS,
-                Manifest.permission.SEND_SMS), 0)
-    }
-
-    override fun requestDatePicker() {
-        val calendar = Calendar.getInstance()
-        DatePickerDialog(this, DatePickerDialog.OnDateSetListener { _, year, month, day ->
-            TimePickerDialog(this, TimePickerDialog.OnTimeSetListener { _, hour, minute ->
-                calendar.set(Calendar.YEAR, year)
-                calendar.set(Calendar.MONTH, month)
-                calendar.set(Calendar.DAY_OF_MONTH, day)
-                calendar.set(Calendar.HOUR_OF_DAY, hour)
-                calendar.set(Calendar.MINUTE, minute)
-                scheduleSelectedIntent.onNext(calendar.timeInMillis)
-            }, calendar.get(Calendar.HOUR_OF_DAY), calendar.get(Calendar.MINUTE), DateFormat.is24HourFormat(this))
-                    .show()
-        }, calendar.get(Calendar.YEAR), calendar.get(Calendar.MONTH), calendar.get(Calendar.DAY_OF_MONTH)).show()
-
-        // On some devices, the keyboard can cover the date picker
-        message.hideKeyboard()
-    }
-
-    override fun requestContact() {
-        val intent = Intent(Intent.ACTION_PICK)
-                .setType(ContactsContract.CommonDataKinds.Phone.CONTENT_TYPE)
-
-        startActivityForResult(Intent.createChooser(intent, null), AttachContactRequestCode)
-    }
-
-    override fun showContacts(sharing: Boolean, chips: List<Recipient>) {
-        message.hideKeyboard()
-        val serialized = HashMap(chips.associate { chip -> chip.address to chip.contact?.lookupKey })
-        val intent = Intent(this, ContactsActivity::class.java)
-                .putExtra(ContactsActivity.SharingKey, sharing)
-                .putExtra(ContactsActivity.ChipsKey, serialized)
-        startActivityForResult(intent, SelectContactRequestCode)
-    }
-
-    override fun themeChanged() {
-        messageList.scrapViews()
-    }
-
-    override fun showKeyboard() {
-        message.postDelayed({
-            message.showKeyboard()
-        }, 200)
-    }
-
-    override fun requestCamera() {
-        cameraDestination = SimpleDateFormat("yyyyMMdd_HHmmss", Locale.getDefault()).format(Date())
-                .let { timestamp -> ContentValues().apply { put(MediaStore.Images.Media.TITLE, timestamp) } }
-                .let { cv -> contentResolver.insert(MediaStore.Images.Media.EXTERNAL_CONTENT_URI, cv) }
-
-        val intent = Intent(MediaStore.ACTION_IMAGE_CAPTURE)
-                .putExtra(MediaStore.EXTRA_OUTPUT, cameraDestination)
-        startActivityForResult(Intent.createChooser(intent, null), TakePhotoRequestCode)
-    }
-
-    override fun requestGallery() {
-        val intent = Intent(Intent.ACTION_PICK)
-                .putExtra(Intent.EXTRA_ALLOW_MULTIPLE, true)
-                .addFlags(Intent.FLAG_GRANT_PERSISTABLE_URI_PERMISSION)
-                .putExtra(Intent.EXTRA_LOCAL_ONLY, false)
-                .addFlags(Intent.FLAG_GRANT_READ_URI_PERMISSION)
-                .setType("image/*")
-        startActivityForResult(Intent.createChooser(intent, null), AttachPhotoRequestCode)
-    }
-
-    override fun setDraft(draft: String) {
-        message.setText(draft)
-        message.setSelection(draft.length)
-    }
-
-    override fun scrollToMessage(id: Long) {
-        messageAdapter.data?.second
-                ?.indexOfLast { message -> message.id == id }
-                ?.takeIf { position -> position != -1 }
-                ?.let(messageList::scrollToPosition)
-    }
-
-    override fun showQksmsPlusSnackbar(message: Int) {
-        Snackbar.make(contentView, message, Snackbar.LENGTH_LONG).run {
-            setAction(R.string.button_more) { viewQksmsPlusIntent.onNext(Unit) }
-            setActionTextColor(colors.theme().theme)
-            show()
-        }
-    }
-
-    override fun onCreateOptionsMenu(menu: Menu?): Boolean {
-        menuInflater.inflate(R.menu.compose, menu)
-        return super.onCreateOptionsMenu(menu)
-    }
-
-    override fun onOptionsItemSelected(item: MenuItem): Boolean {
-        optionsItemIntent.onNext(item.itemId)
-        return true
-    }
-
-    override fun getColoredMenuItems(): List<Int> {
-        return super.getColoredMenuItems() + R.id.call
-    }
-
-    override fun onActivityResult(requestCode: Int, resultCode: Int, data: Intent?) {
-        when {
-            requestCode == SelectContactRequestCode -> {
-                chipsSelectedIntent.onNext(data?.getSerializableExtra(ContactsActivity.ChipsKey)
-                        ?.let { serializable -> serializable as? HashMap<String, String?> }
-                        ?: hashMapOf())
-            }
-            requestCode == TakePhotoRequestCode && resultCode == Activity.RESULT_OK -> {
-                cameraDestination?.let(attachmentSelectedIntent::onNext)
-            }
-            requestCode == AttachPhotoRequestCode && resultCode == Activity.RESULT_OK -> {
-                data?.clipData?.itemCount
-                        ?.let { count -> 0 until count }
-                        ?.mapNotNull { i -> data.clipData?.getItemAt(i)?.uri }
-                        ?.forEach(attachmentSelectedIntent::onNext)
-                        ?: data?.data?.let(attachmentSelectedIntent::onNext)
-            }
-            requestCode == AttachContactRequestCode && resultCode == Activity.RESULT_OK -> {
-                data?.data?.let(contactSelectedIntent::onNext)
-            }
-            else -> super.onActivityResult(requestCode, resultCode, data)
-        }
-    }
-
-    override fun onSaveInstanceState(outState: Bundle) {
-        outState.putParcelable(CameraDestinationKey, cameraDestination)
-        super.onSaveInstanceState(outState)
-    }
-
-    override fun onRestoreInstanceState(savedInstanceState: Bundle?) {
-        cameraDestination = savedInstanceState?.getParcelable(CameraDestinationKey)
-        super.onRestoreInstanceState(savedInstanceState)
-    }
-
-    override fun onBackPressed() = backPressedIntent.onNext(Unit)
-
-}
+/*
+ * Copyright (C) 2017,2021 Moez Bhatti <moez.bhatti@gmail.com>,to268
+ *
+ * This file is part of QKSMS.
+ *
+ * QKSMS is free software: you can redistribute it and/or modify
+ * it under the terms of the GNU General Public License as published by
+ * the Free Software Foundation, either version 3 of the License, or
+ * (at your option) any later version.
+ *
+ * QKSMS is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+ * GNU General Public License for more details.
+ *
+ * You should have received a copy of the GNU General Public License
+ * along with QKSMS.  If not, see <http://www.gnu.org/licenses/>.
+ */
+package com.moez.QKSMS.feature.compose
+
+import android.Manifest
+import android.animation.LayoutTransition
+import android.app.Activity
+import android.app.DatePickerDialog
+import android.app.TimePickerDialog
+import android.content.ContentValues
+import android.content.Intent
+import android.net.Uri
+import android.os.Build
+import android.os.Bundle
+import android.provider.ContactsContract
+import android.provider.MediaStore
+import android.speech.tts.TextToSpeech
+import android.text.format.DateFormat
+import android.util.Log
+import android.view.Menu
+import android.view.MenuItem
+import androidx.appcompat.app.AlertDialog
+import androidx.core.app.ActivityCompat
+import androidx.core.view.isVisible
+import androidx.lifecycle.ViewModelProvider
+import androidx.lifecycle.ViewModelProviders
+import com.google.android.flexbox.FlexboxLayoutManager
+import com.google.android.material.snackbar.Snackbar
+import com.jakewharton.rxbinding2.view.clicks
+import com.jakewharton.rxbinding2.widget.textChanges
+import com.moez.QKSMS.R
+import com.moez.QKSMS.common.Navigator
+import com.moez.QKSMS.common.base.QkThemedActivity
+import com.moez.QKSMS.common.util.DateFormatter
+import com.moez.QKSMS.common.util.extensions.autoScrollToStart
+import com.moez.QKSMS.common.util.extensions.dismissKeyboard
+import com.moez.QKSMS.common.util.extensions.hideKeyboard
+import com.moez.QKSMS.common.util.extensions.resolveThemeColor
+import com.moez.QKSMS.common.util.extensions.scrapViews
+import com.moez.QKSMS.common.util.extensions.setBackgroundTint
+import com.moez.QKSMS.common.util.extensions.setTint
+import com.moez.QKSMS.common.util.extensions.setVisible
+import com.moez.QKSMS.common.util.extensions.showKeyboard
+import com.moez.QKSMS.feature.compose.editing.ChipsAdapter
+import com.moez.QKSMS.feature.contacts.ContactsActivity
+import com.moez.QKSMS.model.Attachment
+import com.moez.QKSMS.model.Recipient
+import com.uber.autodispose.android.lifecycle.scope
+import com.uber.autodispose.autoDisposable
+import dagger.android.AndroidInjection
+import io.reactivex.Observable
+import io.reactivex.subjects.PublishSubject
+import io.reactivex.subjects.Subject
+import kotlinx.android.synthetic.main.compose_activity.*
+import kotlinx.android.synthetic.main.compose_activity.attachments
+import kotlinx.android.synthetic.main.compose_activity.sim
+import kotlinx.android.synthetic.main.compose_activity.simIndex
+import kotlinx.android.synthetic.main.message_list_item_in.*
+import java.text.SimpleDateFormat
+import java.util.*
+import javax.inject.Inject
+import kotlin.collections.HashMap
+
+class ComposeActivity : QkThemedActivity(), ComposeView, TextToSpeech.OnInitListener {
+
+    companion object {
+        private const val SelectContactRequestCode = 0
+        private const val TakePhotoRequestCode = 1
+        private const val AttachPhotoRequestCode = 2
+        private const val AttachContactRequestCode = 3
+
+        private const val CameraDestinationKey = "camera_destination"
+    }
+
+    @Inject
+    lateinit var attachmentAdapter: AttachmentAdapter
+    @Inject
+    lateinit var chipsAdapter: ChipsAdapter
+    @Inject
+    lateinit var dateFormatter: DateFormatter
+    @Inject
+    lateinit var messageAdapter: MessagesAdapter
+    @Inject
+    lateinit var navigator: Navigator
+    @Inject
+    lateinit var viewModelFactory: ViewModelProvider.Factory
+
+    override val activityVisibleIntent: Subject<Boolean> = PublishSubject.create()
+    override val chipsSelectedIntent: Subject<HashMap<String, String?>> = PublishSubject.create()
+    override val chipDeletedIntent: Subject<Recipient> by lazy { chipsAdapter.chipDeleted }
+    override val menuReadyIntent: Observable<Unit> = menu.map { Unit }
+    override val optionsItemIntent: Subject<Int> = PublishSubject.create()
+    override val sendAsGroupIntent by lazy { sendAsGroupBackground.clicks() }
+    override val messageClickIntent: Subject<Long> by lazy { messageAdapter.clicks }
+    override val messagePartClickIntent: Subject<Long> by lazy { messageAdapter.partClicks }
+    override val messagesSelectedIntent by lazy { messageAdapter.selectionChanges }
+    override val cancelSendingIntent: Subject<Long> by lazy { messageAdapter.cancelSending }
+    override val attachmentDeletedIntent: Subject<Attachment> by lazy { attachmentAdapter.attachmentDeleted }
+    override val textChangedIntent by lazy { message.textChanges() }
+    override val attachIntent by lazy { Observable.merge(attach.clicks(), attachingBackground.clicks()) }
+    override val cameraIntent by lazy { Observable.merge(camera.clicks(), cameraLabel.clicks()) }
+    override val galleryIntent by lazy { Observable.merge(gallery.clicks(), galleryLabel.clicks()) }
+    override val scheduleIntent by lazy { Observable.merge(schedule.clicks(), scheduleLabel.clicks()) }
+    override val attachContactIntent by lazy { Observable.merge(contact.clicks(), contactLabel.clicks()) }
+    override val attachmentSelectedIntent: Subject<Uri> = PublishSubject.create()
+    override val contactSelectedIntent: Subject<Uri> = PublishSubject.create()
+    override val inputContentIntent by lazy { message.inputContentSelected }
+    override val scheduleSelectedIntent: Subject<Long> = PublishSubject.create()
+    override val changeSimIntent by lazy { sim.clicks() }
+    override val scheduleCancelIntent by lazy { scheduledCancel.clicks() }
+    override val sendIntent by lazy { send.clicks() }
+    override val viewQksmsPlusIntent: Subject<Unit> = PublishSubject.create()
+    override val backPressedIntent: Subject<Unit> = PublishSubject.create()
+
+    private val viewModel by lazy { ViewModelProviders.of(this, viewModelFactory)[ComposeViewModel::class.java] }
+
+    private var cameraDestination: Uri? = null
+    private var tts: TextToSpeech? = null
+
+    override fun onCreate(savedInstanceState: Bundle?) {
+        AndroidInjection.inject(this)
+        super.onCreate(savedInstanceState)
+        setContentView(R.layout.compose_activity)
+        showBackButton(true)
+        viewModel.bindView(this)
+
+        contentView.layoutTransition = LayoutTransition().apply {
+            disableTransitionType(LayoutTransition.CHANGING)
+        }
+
+        chipsAdapter.view = chips
+
+        chips.itemAnimator = null
+        chips.layoutManager = FlexboxLayoutManager(this)
+
+        messageAdapter.autoScrollToStart(messageList)
+        messageAdapter.emptyView = messagesEmpty
+
+        messageList.setHasFixedSize(true)
+        messageList.adapter = messageAdapter
+
+        attachments.adapter = attachmentAdapter
+
+        message.supportsInputContent = true
+
+        theme
+                .doOnNext { loading.setTint(it.theme) }
+                .doOnNext { attach.setBackgroundTint(it.theme) }
+                .doOnNext { attach.setTint(it.textPrimary) }
+                .doOnNext { messageAdapter.theme = it }
+                .autoDisposable(scope())
+                .subscribe()
+
+        window.callback = ComposeWindowCallback(window.callback, this)
+
+        // These theme attributes don't apply themselves on API 21
+        if (Build.VERSION.SDK_INT <= 22) {
+            messageBackground.setBackgroundTint(resolveThemeColor(R.attr.bubbleColor))
+        }
+
+        // Set tts info
+        tts = TextToSpeech(this, this)
+    }
+
+    override fun onStart() {
+        super.onStart()
+        activityVisibleIntent.onNext(true)
+    }
+
+    override fun onPause() {
+        super.onPause()
+        activityVisibleIntent.onNext(false)
+    }
+
+    override fun render(state: ComposeState) {
+        if (state.hasError) {
+            finish()
+            return
+        }
+
+        threadId.onNext(state.threadId)
+
+        title = when {
+            state.selectedMessages > 0 -> getString(R.string.compose_title_selected, state.selectedMessages)
+            state.query.isNotEmpty() -> state.query
+            else -> state.conversationtitle
+        }
+
+        toolbarSubtitle.setVisible(state.query.isNotEmpty())
+        toolbarSubtitle.text = getString(R.string.compose_subtitle_results, state.searchSelectionPosition,
+                state.searchResults)
+
+        toolbarTitle.setVisible(!state.editingMode)
+        chips.setVisible(state.editingMode)
+        composeBar.setVisible(!state.loading)
+
+        // Don't set the adapters unless needed
+        if (state.editingMode && chips.adapter == null) chips.adapter = chipsAdapter
+
+        toolbar.menu.findItem(R.id.add)?.isVisible = state.editingMode
+        toolbar.menu.findItem(R.id.call)?.isVisible = !state.editingMode && state.selectedMessages == 0
+                && state.query.isEmpty()
+        toolbar.menu.findItem(R.id.info)?.isVisible = !state.editingMode && state.selectedMessages == 0
+                && state.query.isEmpty()
+        toolbar.menu.findItem(R.id.copy)?.isVisible = !state.editingMode && state.selectedMessages > 0
+        toolbar.menu.findItem(R.id.details)?.isVisible = !state.editingMode && state.selectedMessages == 1
+        toolbar.menu.findItem(R.id.delete)?.isVisible = !state.editingMode && state.selectedMessages > 0
+        toolbar.menu.findItem(R.id.forward)?.isVisible = !state.editingMode && state.selectedMessages == 1
+        toolbar.menu.findItem(R.id.speech)?.isVisible = !state.editingMode && state.selectedMessages == 1
+        toolbar.menu.findItem(R.id.previous)?.isVisible = state.selectedMessages == 0 && state.query.isNotEmpty()
+        toolbar.menu.findItem(R.id.next)?.isVisible = state.selectedMessages == 0 && state.query.isNotEmpty()
+        toolbar.menu.findItem(R.id.clear)?.isVisible = state.selectedMessages == 0 && state.query.isNotEmpty()
+
+        chipsAdapter.data = state.selectedChips
+
+        loading.setVisible(state.loading)
+
+        sendAsGroup.setVisible(state.editingMode && state.selectedChips.size >= 2)
+        sendAsGroupSwitch.isChecked = state.sendAsGroup
+
+        messageList.setVisible(!state.editingMode || state.sendAsGroup || state.selectedChips.size == 1)
+        messageAdapter.data = state.messages
+        messageAdapter.highlight = state.searchSelectionId
+
+        scheduledGroup.isVisible = state.scheduled != 0L
+        scheduledTime.text = dateFormatter.getScheduledTimestamp(state.scheduled)
+
+        attachments.setVisible(state.attachments.isNotEmpty())
+        attachmentAdapter.data = state.attachments
+
+        attach.animate().rotation(if (state.attaching) 135f else 0f).start()
+        attaching.isVisible = state.attaching
+
+        counter.text = state.remaining
+        counter.setVisible(counter.text.isNotBlank())
+
+        sim.setVisible(state.subscription != null)
+        sim.contentDescription = getString(R.string.compose_sim_cd, state.subscription?.displayName)
+        simIndex.text = state.subscription?.simSlotIndex?.plus(1)?.toString()
+
+        send.isEnabled = state.canSend
+        send.imageAlpha = if (state.canSend) 255 else 128
+    }
+
+    override fun clearSelection() = messageAdapter.clearSelection()
+
+    override fun showDetails(details: String) {
+        AlertDialog.Builder(this)
+                .setTitle(R.string.compose_details_title)
+                .setMessage(details)
+                .setCancelable(true)
+                .show()
+    }
+
+    override fun speechText(text: String) {
+        tts!!.speak(text, TextToSpeech.QUEUE_FLUSH, null, "")
+    }
+
+    override fun requestDefaultSms() {
+        navigator.showDefaultSmsDialog(this)
+    }
+
+    override fun requestStoragePermission() {
+        ActivityCompat.requestPermissions(this, arrayOf(Manifest.permission.WRITE_EXTERNAL_STORAGE), 0)
+    }
+
+    override fun requestSmsPermission() {
+        ActivityCompat.requestPermissions(this, arrayOf(
+                Manifest.permission.READ_SMS,
+                Manifest.permission.SEND_SMS), 0)
+    }
+
+    override fun requestDatePicker() {
+        val calendar = Calendar.getInstance()
+        DatePickerDialog(this, DatePickerDialog.OnDateSetListener { _, year, month, day ->
+            TimePickerDialog(this, TimePickerDialog.OnTimeSetListener { _, hour, minute ->
+                calendar.set(Calendar.YEAR, year)
+                calendar.set(Calendar.MONTH, month)
+                calendar.set(Calendar.DAY_OF_MONTH, day)
+                calendar.set(Calendar.HOUR_OF_DAY, hour)
+                calendar.set(Calendar.MINUTE, minute)
+                scheduleSelectedIntent.onNext(calendar.timeInMillis)
+            }, calendar.get(Calendar.HOUR_OF_DAY), calendar.get(Calendar.MINUTE), DateFormat.is24HourFormat(this))
+                    .show()
+        }, calendar.get(Calendar.YEAR), calendar.get(Calendar.MONTH), calendar.get(Calendar.DAY_OF_MONTH)).show()
+
+        // On some devices, the keyboard can cover the date picker
+        message.hideKeyboard()
+    }
+
+    override fun requestContact() {
+        val intent = Intent(Intent.ACTION_PICK)
+                .setType(ContactsContract.CommonDataKinds.Phone.CONTENT_TYPE)
+
+        startActivityForResult(Intent.createChooser(intent, null), AttachContactRequestCode)
+    }
+
+    override fun showContacts(sharing: Boolean, chips: List<Recipient>) {
+        message.hideKeyboard()
+        val serialized = HashMap(chips.associate { chip -> chip.address to chip.contact?.lookupKey })
+        val intent = Intent(this, ContactsActivity::class.java)
+                .putExtra(ContactsActivity.SharingKey, sharing)
+                .putExtra(ContactsActivity.ChipsKey, serialized)
+        startActivityForResult(intent, SelectContactRequestCode)
+    }
+
+    override fun themeChanged() {
+        messageList.scrapViews()
+    }
+
+    override fun showKeyboard() {
+        message.postDelayed({
+            message.showKeyboard()
+        }, 200)
+    }
+
+    override fun requestCamera() {
+        cameraDestination = SimpleDateFormat("yyyyMMdd_HHmmss", Locale.getDefault()).format(Date())
+                .let { timestamp -> ContentValues().apply { put(MediaStore.Images.Media.TITLE, timestamp) } }
+                .let { cv -> contentResolver.insert(MediaStore.Images.Media.EXTERNAL_CONTENT_URI, cv) }
+
+        val intent = Intent(MediaStore.ACTION_IMAGE_CAPTURE)
+                .putExtra(MediaStore.EXTRA_OUTPUT, cameraDestination)
+        startActivityForResult(Intent.createChooser(intent, null), TakePhotoRequestCode)
+    }
+
+    override fun requestGallery() {
+        val intent = Intent(Intent.ACTION_PICK)
+                .putExtra(Intent.EXTRA_ALLOW_MULTIPLE, true)
+                .addFlags(Intent.FLAG_GRANT_PERSISTABLE_URI_PERMISSION)
+                .putExtra(Intent.EXTRA_LOCAL_ONLY, false)
+                .addFlags(Intent.FLAG_GRANT_READ_URI_PERMISSION)
+                .setType("image/*")
+        startActivityForResult(Intent.createChooser(intent, null), AttachPhotoRequestCode)
+    }
+
+    override fun setDraft(draft: String) {
+        message.setText(draft)
+        message.setSelection(draft.length)
+    }
+
+    override fun scrollToMessage(id: Long) {
+        messageAdapter.data?.second
+                ?.indexOfLast { message -> message.id == id }
+                ?.takeIf { position -> position != -1 }
+                ?.let(messageList::scrollToPosition)
+    }
+
+    override fun showQksmsPlusSnackbar(message: Int) {
+        Snackbar.make(contentView, message, Snackbar.LENGTH_LONG).run {
+            setAction(R.string.button_more) { viewQksmsPlusIntent.onNext(Unit) }
+            setActionTextColor(colors.theme().theme)
+            show()
+        }
+    }
+
+    override fun onCreateOptionsMenu(menu: Menu?): Boolean {
+        menuInflater.inflate(R.menu.compose, menu)
+        return super.onCreateOptionsMenu(menu)
+    }
+
+    override fun onOptionsItemSelected(item: MenuItem): Boolean {
+        optionsItemIntent.onNext(item.itemId)
+        return true
+    }
+
+    override fun getColoredMenuItems(): List<Int> {
+        return super.getColoredMenuItems() + R.id.call
+    }
+
+    override fun onActivityResult(requestCode: Int, resultCode: Int, data: Intent?) {
+        when {
+            requestCode == SelectContactRequestCode -> {
+                chipsSelectedIntent.onNext(data?.getSerializableExtra(ContactsActivity.ChipsKey)
+                        ?.let { serializable -> serializable as? HashMap<String, String?> }
+                        ?: hashMapOf())
+            }
+            requestCode == TakePhotoRequestCode && resultCode == Activity.RESULT_OK -> {
+                cameraDestination?.let(attachmentSelectedIntent::onNext)
+            }
+            requestCode == AttachPhotoRequestCode && resultCode == Activity.RESULT_OK -> {
+                data?.clipData?.itemCount
+                        ?.let { count -> 0 until count }
+                        ?.mapNotNull { i -> data.clipData?.getItemAt(i)?.uri }
+                        ?.forEach(attachmentSelectedIntent::onNext)
+                        ?: data?.data?.let(attachmentSelectedIntent::onNext)
+            }
+            requestCode == AttachContactRequestCode && resultCode == Activity.RESULT_OK -> {
+                data?.data?.let(contactSelectedIntent::onNext)
+            }
+            else -> super.onActivityResult(requestCode, resultCode, data)
+        }
+    }
+
+    override fun onSaveInstanceState(outState: Bundle) {
+        outState.putParcelable(CameraDestinationKey, cameraDestination)
+        super.onSaveInstanceState(outState)
+    }
+
+    override fun onRestoreInstanceState(savedInstanceState: Bundle?) {
+        cameraDestination = savedInstanceState?.getParcelable(CameraDestinationKey)
+        super.onRestoreInstanceState(savedInstanceState)
+    }
+
+    override fun onBackPressed() = backPressedIntent.onNext(Unit)
+
+    // Text to speech
+    override fun onInit(status: Int) {
+        if (status == TextToSpeech.SUCCESS) {
+            val result = tts!!.setLanguage(Locale.getDefault())
+
+            if (result == TextToSpeech.LANG_MISSING_DATA || result == TextToSpeech.LANG_NOT_SUPPORTED) {
+                Log.e("TTS", "The default language is not supported !")
+            }
+
+        } else {
+            Log.e("TTS", "Initialization failed !")
+        }
+    }
+
+    override fun onDestroy() {
+        if (tts != null) {
+            tts!!.stop()
+            tts!!.shutdown()
+        }
+
+        super.onDestroy()
+    }
+
+}
diff --git a/presentation/src/main/java/com/moez/QKSMS/feature/compose/ComposeActivityModule.kt b/presentation/src/main/java/com/moez/QKSMS/feature/compose/ComposeActivityModule.kt
index 8368dfa81..6e97d5041 100644
--- a/presentation/src/main/java/com/moez/QKSMS/feature/compose/ComposeActivityModule.kt
+++ b/presentation/src/main/java/com/moez/QKSMS/feature/compose/ComposeActivityModule.kt
@@ -1,113 +1,113 @@
-/*
- * Copyright (C) 2017 Moez Bhatti <moez.bhatti@gmail.com>
- *
- * This file is part of QKSMS.
- *
- * QKSMS is free software: you can redistribute it and/or modify
- * it under the terms of the GNU General Public License as published by
- * the Free Software Foundation, either version 3 of the License, or
- * (at your option) any later version.
- *
- * QKSMS is distributed in the hope that it will be useful,
- * but WITHOUT ANY WARRANTY; without even the implied warranty of
- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
- * GNU General Public License for more details.
- *
- * You should have received a copy of the GNU General Public License
- * along with QKSMS.  If not, see <http://www.gnu.org/licenses/>.
- */
-package com.moez.QKSMS.feature.compose
-
-import android.content.Intent
-import android.net.Uri
-import androidx.lifecycle.ViewModel
-import com.google.android.mms.ContentType
-import com.moez.QKSMS.injection.ViewModelKey
-import com.moez.QKSMS.model.Attachment
-import com.moez.QKSMS.model.Attachments
-import dagger.Module
-import dagger.Provides
-import dagger.multibindings.IntoMap
-import java.net.URLDecoder
-import java.nio.charset.Charset
-import javax.inject.Named
-
-@Module
-class ComposeActivityModule {
-
-    @Provides
-    @Named("query")
-    fun provideQuery(activity: ComposeActivity): String = activity.intent.extras?.getString("query") ?: ""
-
-    @Provides
-    @Named("threadId")
-    fun provideThreadId(activity: ComposeActivity): Long = activity.intent.extras?.getLong("threadId") ?: 0L
-
-    @Provides
-    @Named("addresses")
-    fun provideAddresses(activity: ComposeActivity): List<String> {
-        return activity.intent
-                ?.decodedDataString()
-                ?.substringAfter(':') // Remove scheme
-                ?.substringBefore("?") // Remove query
-                ?.split(",", ";")
-                ?.filter { number -> number.isNotEmpty() }
-                ?: listOf()
-    }
-
-    @Provides
-    @Named("text")
-    fun provideSharedText(activity: ComposeActivity): String {
-        var subject = activity.intent.getStringExtra(Intent.EXTRA_SUBJECT) ?: "";
-        if (subject != "") {
-            subject += "\n"
-        }
-
-        return subject + (activity.intent.extras?.getString(Intent.EXTRA_TEXT)
-                ?: activity.intent.extras?.getString("sms_body")
-                ?: activity.intent?.decodedDataString()
-                        ?.substringAfter('?') // Query string
-                        ?.takeIf { it.startsWith("body") }
-                        ?.substringAfter('=')
-                ?: "")
-    }
-
-    @Provides
-    @Named("attachments")
-    fun provideSharedAttachments(activity: ComposeActivity): Attachments {
-        val uris = mutableListOf<Uri>()
-        activity.intent.getParcelableExtra<Uri>(Intent.EXTRA_STREAM)?.run(uris::add)
-        activity.intent.getParcelableArrayListExtra<Uri>(Intent.EXTRA_STREAM)?.run(uris::addAll)
-        return Attachments(uris.mapNotNull { uri ->
-            val mimeType = activity.contentResolver.getType(uri)
-            when {
-                ContentType.isImageType(mimeType) -> {
-                    Attachment.Image(uri)
-                }
-
-                ContentType.TEXT_VCARD.equals(mimeType, true) -> {
-                    val inputStream = activity.contentResolver.openInputStream(uri)
-                    val text = inputStream?.reader(Charset.forName("utf-8"))?.readText()
-                    text?.let(Attachment::Contact)
-                }
-
-                else -> null
-            }
-        })
-    }
-
-    @Provides
-    @IntoMap
-    @ViewModelKey(ComposeViewModel::class)
-    fun provideComposeViewModel(viewModel: ComposeViewModel): ViewModel = viewModel
-
-    // The dialer app on Oreo sends a URL encoded string, make sure to decode it
-    private fun Intent.decodedDataString(): String? {
-        val data = data?.toString()
-        if (data?.contains('%') == true) {
-            return URLDecoder.decode(data, "UTF-8")
-        }
-        return data
-    }
-
-}
+/*
+ * Copyright (C) 2017 Moez Bhatti <moez.bhatti@gmail.com>
+ *
+ * This file is part of QKSMS.
+ *
+ * QKSMS is free software: you can redistribute it and/or modify
+ * it under the terms of the GNU General Public License as published by
+ * the Free Software Foundation, either version 3 of the License, or
+ * (at your option) any later version.
+ *
+ * QKSMS is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+ * GNU General Public License for more details.
+ *
+ * You should have received a copy of the GNU General Public License
+ * along with QKSMS.  If not, see <http://www.gnu.org/licenses/>.
+ */
+package com.moez.QKSMS.feature.compose
+
+import android.content.Intent
+import android.net.Uri
+import androidx.lifecycle.ViewModel
+import com.google.android.mms.ContentType
+import com.moez.QKSMS.injection.ViewModelKey
+import com.moez.QKSMS.model.Attachment
+import com.moez.QKSMS.model.Attachments
+import dagger.Module
+import dagger.Provides
+import dagger.multibindings.IntoMap
+import java.net.URLDecoder
+import java.nio.charset.Charset
+import javax.inject.Named
+
+@Module
+class ComposeActivityModule {
+
+    @Provides
+    @Named("query")
+    fun provideQuery(activity: ComposeActivity): String = activity.intent.extras?.getString("query") ?: ""
+
+    @Provides
+    @Named("threadId")
+    fun provideThreadId(activity: ComposeActivity): Long = activity.intent.extras?.getLong("threadId") ?: 0L
+
+    @Provides
+    @Named("addresses")
+    fun provideAddresses(activity: ComposeActivity): List<String> {
+        return activity.intent
+                ?.decodedDataString()
+                ?.substringAfter(':') // Remove scheme
+                ?.substringBefore("?") // Remove query
+                ?.split(",", ";")
+                ?.filter { number -> number.isNotEmpty() }
+                ?: listOf()
+    }
+
+    @Provides
+    @Named("text")
+    fun provideSharedText(activity: ComposeActivity): String {
+        var subject = activity.intent.getStringExtra(Intent.EXTRA_SUBJECT) ?: "";
+        if (subject != "") {
+            subject += "\n"
+        }
+
+        return subject + (activity.intent.extras?.getString(Intent.EXTRA_TEXT)
+                ?: activity.intent.extras?.getString("sms_body")
+                ?: activity.intent?.decodedDataString()
+                        ?.substringAfter('?') // Query string
+                        ?.takeIf { it.startsWith("body") }
+                        ?.substringAfter('=')
+                ?: "")
+    }
+
+    @Provides
+    @Named("attachments")
+    fun provideSharedAttachments(activity: ComposeActivity): Attachments {
+        val uris = mutableListOf<Uri>()
+        activity.intent.getParcelableExtra<Uri>(Intent.EXTRA_STREAM)?.run(uris::add)
+        activity.intent.getParcelableArrayListExtra<Uri>(Intent.EXTRA_STREAM)?.run(uris::addAll)
+        return Attachments(uris.mapNotNull { uri ->
+            val mimeType = activity.contentResolver.getType(uri)
+            when {
+                ContentType.isImageType(mimeType) -> {
+                    Attachment.Image(uri)
+                }
+
+                ContentType.TEXT_VCARD.equals(mimeType, true) -> {
+                    val inputStream = activity.contentResolver.openInputStream(uri)
+                    val text = inputStream?.reader(Charset.forName("utf-8"))?.readText()
+                    text?.let(Attachment::Contact)
+                }
+
+                else -> null
+            }
+        })
+    }
+
+    @Provides
+    @IntoMap
+    @ViewModelKey(ComposeViewModel::class)
+    fun provideComposeViewModel(viewModel: ComposeViewModel): ViewModel = viewModel
+
+    // The dialer app on Oreo sends a URL encoded string, make sure to decode it
+    private fun Intent.decodedDataString(): String? {
+        val data = data?.toString()
+        if (data?.contains('%') == true) {
+            return URLDecoder.decode(data, "UTF-8")
+        }
+        return data
+    }
+
+}
diff --git a/presentation/src/main/java/com/moez/QKSMS/feature/compose/ComposeState.kt b/presentation/src/main/java/com/moez/QKSMS/feature/compose/ComposeState.kt
index 1524b2018..ace600261 100644
--- a/presentation/src/main/java/com/moez/QKSMS/feature/compose/ComposeState.kt
+++ b/presentation/src/main/java/com/moez/QKSMS/feature/compose/ComposeState.kt
@@ -1,48 +1,48 @@
-/*
- * Copyright (C) 2017 Moez Bhatti <moez.bhatti@gmail.com>
- *
- * This file is part of QKSMS.
- *
- * QKSMS is free software: you can redistribute it and/or modify
- * it under the terms of the GNU General Public License as published by
- * the Free Software Foundation, either version 3 of the License, or
- * (at your option) any later version.
- *
- * QKSMS is distributed in the hope that it will be useful,
- * but WITHOUT ANY WARRANTY; without even the implied warranty of
- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
- * GNU General Public License for more details.
- *
- * You should have received a copy of the GNU General Public License
- * along with QKSMS.  If not, see <http://www.gnu.org/licenses/>.
- */
-package com.moez.QKSMS.feature.compose
-
-import com.moez.QKSMS.compat.SubscriptionInfoCompat
-import com.moez.QKSMS.model.Attachment
-import com.moez.QKSMS.model.Conversation
-import com.moez.QKSMS.model.Message
-import com.moez.QKSMS.model.Recipient
-import io.realm.RealmResults
-
-data class ComposeState(
-    val hasError: Boolean = false,
-    val editingMode: Boolean = false,
-    val threadId: Long = 0,
-    val selectedChips: List<Recipient> = ArrayList(),
-    val sendAsGroup: Boolean = true,
-    val conversationtitle: String = "",
-    val loading: Boolean = false,
-    val query: String = "",
-    val searchSelectionId: Long = -1,
-    val searchSelectionPosition: Int = 0,
-    val searchResults: Int = 0,
-    val messages: Pair<Conversation, RealmResults<Message>>? = null,
-    val selectedMessages: Int = 0,
-    val scheduled: Long = 0,
-    val attachments: List<Attachment> = ArrayList(),
-    val attaching: Boolean = false,
-    val remaining: String = "",
-    val subscription: SubscriptionInfoCompat? = null,
-    val canSend: Boolean = false
+/*
+ * Copyright (C) 2017 Moez Bhatti <moez.bhatti@gmail.com>
+ *
+ * This file is part of QKSMS.
+ *
+ * QKSMS is free software: you can redistribute it and/or modify
+ * it under the terms of the GNU General Public License as published by
+ * the Free Software Foundation, either version 3 of the License, or
+ * (at your option) any later version.
+ *
+ * QKSMS is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+ * GNU General Public License for more details.
+ *
+ * You should have received a copy of the GNU General Public License
+ * along with QKSMS.  If not, see <http://www.gnu.org/licenses/>.
+ */
+package com.moez.QKSMS.feature.compose
+
+import com.moez.QKSMS.compat.SubscriptionInfoCompat
+import com.moez.QKSMS.model.Attachment
+import com.moez.QKSMS.model.Conversation
+import com.moez.QKSMS.model.Message
+import com.moez.QKSMS.model.Recipient
+import io.realm.RealmResults
+
+data class ComposeState(
+    val hasError: Boolean = false,
+    val editingMode: Boolean = false,
+    val threadId: Long = 0,
+    val selectedChips: List<Recipient> = ArrayList(),
+    val sendAsGroup: Boolean = true,
+    val conversationtitle: String = "",
+    val loading: Boolean = false,
+    val query: String = "",
+    val searchSelectionId: Long = -1,
+    val searchSelectionPosition: Int = 0,
+    val searchResults: Int = 0,
+    val messages: Pair<Conversation, RealmResults<Message>>? = null,
+    val selectedMessages: Int = 0,
+    val scheduled: Long = 0,
+    val attachments: List<Attachment> = ArrayList(),
+    val attaching: Boolean = false,
+    val remaining: String = "",
+    val subscription: SubscriptionInfoCompat? = null,
+    val canSend: Boolean = false
 )
\ No newline at end of file
diff --git a/presentation/src/main/java/com/moez/QKSMS/feature/compose/ComposeView.kt b/presentation/src/main/java/com/moez/QKSMS/feature/compose/ComposeView.kt
index d8a78eec2..d99b1a36f 100644
--- a/presentation/src/main/java/com/moez/QKSMS/feature/compose/ComposeView.kt
+++ b/presentation/src/main/java/com/moez/QKSMS/feature/compose/ComposeView.kt
@@ -1,75 +1,76 @@
-/*
- * Copyright (C) 2017 Moez Bhatti <moez.bhatti@gmail.com>
- *
- * This file is part of QKSMS.
- *
- * QKSMS is free software: you can redistribute it and/or modify
- * it under the terms of the GNU General Public License as published by
- * the Free Software Foundation, either version 3 of the License, or
- * (at your option) any later version.
- *
- * QKSMS is distributed in the hope that it will be useful,
- * but WITHOUT ANY WARRANTY; without even the implied warranty of
- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
- * GNU General Public License for more details.
- *
- * You should have received a copy of the GNU General Public License
- * along with QKSMS.  If not, see <http://www.gnu.org/licenses/>.
- */
-package com.moez.QKSMS.feature.compose
-
-import android.net.Uri
-import androidx.annotation.StringRes
-import androidx.core.view.inputmethod.InputContentInfoCompat
-import com.moez.QKSMS.common.base.QkView
-import com.moez.QKSMS.model.Attachment
-import com.moez.QKSMS.model.Recipient
-import io.reactivex.Observable
-import io.reactivex.subjects.Subject
-
-interface ComposeView : QkView<ComposeState> {
-
-    val activityVisibleIntent: Observable<Boolean>
-    val chipsSelectedIntent: Subject<HashMap<String, String?>>
-    val chipDeletedIntent: Subject<Recipient>
-    val menuReadyIntent: Observable<Unit>
-    val optionsItemIntent: Observable<Int>
-    val sendAsGroupIntent: Observable<*>
-    val messageClickIntent: Subject<Long>
-    val messagePartClickIntent: Subject<Long>
-    val messagesSelectedIntent: Observable<List<Long>>
-    val cancelSendingIntent: Subject<Long>
-    val attachmentDeletedIntent: Subject<Attachment>
-    val textChangedIntent: Observable<CharSequence>
-    val attachIntent: Observable<Unit>
-    val cameraIntent: Observable<*>
-    val galleryIntent: Observable<*>
-    val scheduleIntent: Observable<*>
-    val attachContactIntent: Observable<*>
-    val attachmentSelectedIntent: Observable<Uri>
-    val contactSelectedIntent: Observable<Uri>
-    val inputContentIntent: Observable<InputContentInfoCompat>
-    val scheduleSelectedIntent: Observable<Long>
-    val scheduleCancelIntent: Observable<*>
-    val changeSimIntent: Observable<*>
-    val sendIntent: Observable<Unit>
-    val viewQksmsPlusIntent: Subject<Unit>
-    val backPressedIntent: Observable<Unit>
-
-    fun clearSelection()
-    fun showDetails(details: String)
-    fun requestDefaultSms()
-    fun requestStoragePermission()
-    fun requestSmsPermission()
-    fun showContacts(sharing: Boolean, chips: List<Recipient>)
-    fun themeChanged()
-    fun showKeyboard()
-    fun requestCamera()
-    fun requestGallery()
-    fun requestDatePicker()
-    fun requestContact()
-    fun setDraft(draft: String)
-    fun scrollToMessage(id: Long)
-    fun showQksmsPlusSnackbar(@StringRes message: Int)
-
+/*
+ * Copyright (C) 2017 Moez Bhatti <moez.bhatti@gmail.com>
+ *
+ * This file is part of QKSMS.
+ *
+ * QKSMS is free software: you can redistribute it and/or modify
+ * it under the terms of the GNU General Public License as published by
+ * the Free Software Foundation, either version 3 of the License, or
+ * (at your option) any later version.
+ *
+ * QKSMS is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+ * GNU General Public License for more details.
+ *
+ * You should have received a copy of the GNU General Public License
+ * along with QKSMS.  If not, see <http://www.gnu.org/licenses/>.
+ */
+package com.moez.QKSMS.feature.compose
+
+import android.net.Uri
+import androidx.annotation.StringRes
+import androidx.core.view.inputmethod.InputContentInfoCompat
+import com.moez.QKSMS.common.base.QkView
+import com.moez.QKSMS.model.Attachment
+import com.moez.QKSMS.model.Recipient
+import io.reactivex.Observable
+import io.reactivex.subjects.Subject
+
+interface ComposeView : QkView<ComposeState> {
+
+    val activityVisibleIntent: Observable<Boolean>
+    val chipsSelectedIntent: Subject<HashMap<String, String?>>
+    val chipDeletedIntent: Subject<Recipient>
+    val menuReadyIntent: Observable<Unit>
+    val optionsItemIntent: Observable<Int>
+    val sendAsGroupIntent: Observable<*>
+    val messageClickIntent: Subject<Long>
+    val messagePartClickIntent: Subject<Long>
+    val messagesSelectedIntent: Observable<List<Long>>
+    val cancelSendingIntent: Subject<Long>
+    val attachmentDeletedIntent: Subject<Attachment>
+    val textChangedIntent: Observable<CharSequence>
+    val attachIntent: Observable<Unit>
+    val cameraIntent: Observable<*>
+    val galleryIntent: Observable<*>
+    val scheduleIntent: Observable<*>
+    val attachContactIntent: Observable<*>
+    val attachmentSelectedIntent: Observable<Uri>
+    val contactSelectedIntent: Observable<Uri>
+    val inputContentIntent: Observable<InputContentInfoCompat>
+    val scheduleSelectedIntent: Observable<Long>
+    val scheduleCancelIntent: Observable<*>
+    val changeSimIntent: Observable<*>
+    val sendIntent: Observable<Unit>
+    val viewQksmsPlusIntent: Subject<Unit>
+    val backPressedIntent: Observable<Unit>
+
+    fun clearSelection()
+    fun showDetails(details: String)
+    fun speechText(text: String)
+    fun requestDefaultSms()
+    fun requestStoragePermission()
+    fun requestSmsPermission()
+    fun showContacts(sharing: Boolean, chips: List<Recipient>)
+    fun themeChanged()
+    fun showKeyboard()
+    fun requestCamera()
+    fun requestGallery()
+    fun requestDatePicker()
+    fun requestContact()
+    fun setDraft(draft: String)
+    fun scrollToMessage(id: Long)
+    fun showQksmsPlusSnackbar(@StringRes message: Int)
+
 }
\ No newline at end of file
diff --git a/presentation/src/main/java/com/moez/QKSMS/feature/compose/ComposeViewModel.kt b/presentation/src/main/java/com/moez/QKSMS/feature/compose/ComposeViewModel.kt
index ba601f2f7..14a253435 100644
--- a/presentation/src/main/java/com/moez/QKSMS/feature/compose/ComposeViewModel.kt
+++ b/presentation/src/main/java/com/moez/QKSMS/feature/compose/ComposeViewModel.kt
@@ -1,746 +1,756 @@
-/*
- * Copyright (C) 2017 Moez Bhatti <moez.bhatti@gmail.com>
- *
- * This file is part of QKSMS.
- *
- * QKSMS is free software: you can redistribute it and/or modify
- * it under the terms of the GNU General Public License as published by
- * the Free Software Foundation, either version 3 of the License, or
- * (at your option) any later version.
- *
- * QKSMS is distributed in the hope that it will be useful,
- * but WITHOUT ANY WARRANTY; without even the implied warranty of
- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
- * GNU General Public License for more details.
- *
- * You should have received a copy of the GNU General Public License
- * along with QKSMS.  If not, see <http://www.gnu.org/licenses/>.
- */
-package com.moez.QKSMS.feature.compose
-
-import android.content.Context
-import android.net.Uri
-import android.os.Vibrator
-import android.provider.ContactsContract
-import android.telephony.SmsMessage
-import androidx.core.content.getSystemService
-import com.moez.QKSMS.R
-import com.moez.QKSMS.common.Navigator
-import com.moez.QKSMS.common.base.QkViewModel
-import com.moez.QKSMS.common.util.ClipboardUtils
-import com.moez.QKSMS.common.util.MessageDetailsFormatter
-import com.moez.QKSMS.common.util.extensions.makeToast
-import com.moez.QKSMS.compat.SubscriptionManagerCompat
-import com.moez.QKSMS.compat.TelephonyCompat
-import com.moez.QKSMS.extensions.asObservable
-import com.moez.QKSMS.extensions.isImage
-import com.moez.QKSMS.extensions.isVideo
-import com.moez.QKSMS.extensions.mapNotNull
-import com.moez.QKSMS.interactor.AddScheduledMessage
-import com.moez.QKSMS.interactor.CancelDelayedMessage
-import com.moez.QKSMS.interactor.DeleteMessages
-import com.moez.QKSMS.interactor.MarkRead
-import com.moez.QKSMS.interactor.RetrySending
-import com.moez.QKSMS.interactor.SendMessage
-import com.moez.QKSMS.manager.ActiveConversationManager
-import com.moez.QKSMS.manager.BillingManager
-import com.moez.QKSMS.manager.PermissionManager
-import com.moez.QKSMS.model.Attachment
-import com.moez.QKSMS.model.Attachments
-import com.moez.QKSMS.model.Conversation
-import com.moez.QKSMS.model.Message
-import com.moez.QKSMS.model.Recipient
-import com.moez.QKSMS.repository.ContactRepository
-import com.moez.QKSMS.repository.ConversationRepository
-import com.moez.QKSMS.repository.MessageRepository
-import com.moez.QKSMS.util.ActiveSubscriptionObservable
-import com.moez.QKSMS.util.PhoneNumberUtils
-import com.moez.QKSMS.util.Preferences
-import com.moez.QKSMS.util.tryOrNull
-import com.uber.autodispose.android.lifecycle.scope
-import com.uber.autodispose.autoDisposable
-import io.reactivex.Observable
-import io.reactivex.android.schedulers.AndroidSchedulers
-import io.reactivex.rxkotlin.Observables
-import io.reactivex.rxkotlin.plusAssign
-import io.reactivex.rxkotlin.withLatestFrom
-import io.reactivex.schedulers.Schedulers
-import io.reactivex.subjects.BehaviorSubject
-import io.reactivex.subjects.PublishSubject
-import io.reactivex.subjects.Subject
-import timber.log.Timber
-import java.util.*
-import javax.inject.Inject
-import javax.inject.Named
-
-class ComposeViewModel @Inject constructor(
-    @Named("query") private val query: String,
-    @Named("threadId") private val threadId: Long,
-    @Named("addresses") private val addresses: List<String>,
-    @Named("text") private val sharedText: String,
-    @Named("attachments") private val sharedAttachments: Attachments,
-    private val contactRepo: ContactRepository,
-    private val context: Context,
-    private val activeConversationManager: ActiveConversationManager,
-    private val addScheduledMessage: AddScheduledMessage,
-    private val billingManager: BillingManager,
-    private val cancelMessage: CancelDelayedMessage,
-    private val conversationRepo: ConversationRepository,
-    private val deleteMessages: DeleteMessages,
-    private val markRead: MarkRead,
-    private val messageDetailsFormatter: MessageDetailsFormatter,
-    private val messageRepo: MessageRepository,
-    private val navigator: Navigator,
-    private val permissionManager: PermissionManager,
-    private val phoneNumberUtils: PhoneNumberUtils,
-    private val prefs: Preferences,
-    private val retrySending: RetrySending,
-    private val sendMessage: SendMessage,
-    private val subscriptionManager: SubscriptionManagerCompat
-) : QkViewModel<ComposeView, ComposeState>(ComposeState(
-        editingMode = threadId == 0L && addresses.isEmpty(),
-        threadId = threadId,
-        query = query)
-) {
-
-    private val attachments: Subject<List<Attachment>> = BehaviorSubject.createDefault(sharedAttachments)
-    private val chipsReducer: Subject<(List<Recipient>) -> List<Recipient>> = PublishSubject.create()
-    private val conversation: Subject<Conversation> = BehaviorSubject.create()
-    private val messages: Subject<List<Message>> = BehaviorSubject.create()
-    private val selectedChips: Subject<List<Recipient>> = BehaviorSubject.createDefault(listOf())
-    private val searchResults: Subject<List<Message>> = BehaviorSubject.create()
-    private val searchSelection: Subject<Long> = BehaviorSubject.createDefault(-1)
-
-    private var shouldShowContacts = threadId == 0L && addresses.isEmpty()
-
-    init {
-        val initialConversation = threadId.takeIf { it != 0L }
-                ?.let(conversationRepo::getConversationAsync)
-                ?.asObservable()
-                ?: Observable.empty()
-
-        val selectedConversation = selectedChips
-                .skipWhile { it.isEmpty() }
-                .map { chips -> chips.map { it.address } }
-                .distinctUntilChanged()
-                .doOnNext { newState { copy(loading = true) } }
-                .observeOn(Schedulers.io())
-                .map { addresses -> Pair(conversationRepo.getOrCreateConversation(addresses)?.id ?: 0, addresses) }
-                .observeOn(AndroidSchedulers.mainThread())
-                .doOnNext { newState { copy(loading = false) } }
-                .switchMap { (threadId, addresses) ->
-                    // If we already have this thread in realm, or we're able to obtain it from the
-                    // system, just return that.
-                    threadId.takeIf { it > 0 }?.let {
-                        return@switchMap conversationRepo.getConversationAsync(threadId).asObservable()
-                    }
-
-                    // Otherwise, we'll monitor the conversations until our expected conversation is created
-                    conversationRepo.getConversations().asObservable()
-                            .filter { it.isLoaded }
-                            .observeOn(Schedulers.io())
-                            .map { conversationRepo.getOrCreateConversation(addresses)?.id ?: 0 }
-                            .observeOn(AndroidSchedulers.mainThread())
-                            .switchMap { actualThreadId ->
-                                when (actualThreadId) {
-                                    0L -> Observable.just(Conversation(0))
-                                    else -> conversationRepo.getConversationAsync(actualThreadId).asObservable()
-                                }
-                            }
-                }
-
-        // Merges two potential conversation sources (threadId from constructor and contact selection) into a single
-        // stream of conversations. If the conversation was deleted, notify the activity to shut down
-        disposables += selectedConversation
-                .mergeWith(initialConversation)
-                .filter { conversation -> conversation.isLoaded }
-                .doOnNext { conversation ->
-                    if (!conversation.isValid) {
-                        newState { copy(hasError = true) }
-                    }
-                }
-                .filter { conversation -> conversation.isValid }
-                .subscribe(conversation::onNext)
-
-        if (addresses.isNotEmpty()) {
-            selectedChips.onNext(addresses.map { address -> Recipient(address = address) })
-        }
-
-        disposables += chipsReducer
-                .scan(listOf<Recipient>()) { previousState, reducer -> reducer(previousState) }
-                .doOnNext { chips -> newState { copy(selectedChips = chips) } }
-                .skipUntil(state.filter { state -> state.editingMode })
-                .takeUntil(state.filter { state -> !state.editingMode })
-                .subscribe(selectedChips::onNext)
-
-        // When the conversation changes, mark read, and update the recipientId and the messages for the adapter
-        disposables += conversation
-                .distinctUntilChanged { conversation -> conversation.id }
-                .observeOn(AndroidSchedulers.mainThread())
-                .map { conversation ->
-                    val messages = messageRepo.getMessages(conversation.id)
-                    newState { copy(threadId = conversation.id, messages = Pair(conversation, messages)) }
-                    messages
-                }
-                .switchMap { messages -> messages.asObservable() }
-                .subscribe(messages::onNext)
-
-        disposables += conversation
-                .map { conversation -> conversation.getTitle() }
-                .distinctUntilChanged()
-                .subscribe { title -> newState { copy(conversationtitle = title) } }
-
-        disposables += prefs.sendAsGroup.asObservable()
-                .distinctUntilChanged()
-                .subscribe { enabled -> newState { copy(sendAsGroup = enabled) } }
-
-        disposables += attachments
-                .subscribe { attachments -> newState { copy(attachments = attachments) } }
-
-        disposables += conversation
-                .map { conversation -> conversation.id }
-                .distinctUntilChanged()
-                .withLatestFrom(state) { id, state -> messageRepo.getMessages(id, state.query) }
-                .switchMap { messages -> messages.asObservable() }
-                .takeUntil(state.map { it.query }.filter { it.isEmpty() })
-                .filter { messages -> messages.isLoaded }
-                .filter { messages -> messages.isValid }
-                .subscribe(searchResults::onNext)
-
-        disposables += Observables.combineLatest(searchSelection, searchResults) { selected, messages ->
-            if (selected == -1L) {
-                messages.lastOrNull()?.let { message -> searchSelection.onNext(message.id) }
-            } else {
-                val position = messages.indexOfFirst { it.id == selected } + 1
-                newState { copy(searchSelectionPosition = position, searchResults = messages.size) }
-            }
-        }.subscribe()
-
-        val latestSubId = messages
-                .map { messages -> messages.lastOrNull()?.subId ?: -1 }
-                .distinctUntilChanged()
-
-        val subscriptions = ActiveSubscriptionObservable(subscriptionManager)
-        disposables += Observables.combineLatest(latestSubId, subscriptions) { subId, subs ->
-            val sub = if (subs.size > 1) subs.firstOrNull { it.subscriptionId == subId } ?: subs[0] else null
-            newState { copy(subscription = sub) }
-        }.subscribe()
-    }
-
-    override fun bindView(view: ComposeView) {
-        super.bindView(view)
-
-        val sharing = sharedText.isNotEmpty() || sharedAttachments.isNotEmpty()
-        if (shouldShowContacts) {
-            shouldShowContacts = false
-            view.showContacts(sharing, selectedChips.blockingFirst())
-        }
-
-        view.chipsSelectedIntent
-                .withLatestFrom(selectedChips) { hashmap, chips ->
-                    // If there's no contacts already selected, and the user cancelled the contact
-                    // selection, close the activity
-                    if (hashmap.isEmpty() && chips.isEmpty()) {
-                        newState { copy(hasError = true) }
-                    }
-                    // Filter out any numbers that are already selected
-                    hashmap.filter { (address) ->
-                        chips.none { recipient -> phoneNumberUtils.compare(address, recipient.address) }
-                    }
-                }
-                .filter { hashmap -> hashmap.isNotEmpty() }
-                .map { hashmap ->
-                    hashmap.map { (address, lookupKey) ->
-                        conversationRepo.getRecipients()
-                                .asSequence()
-                                .filter { recipient -> recipient.contact?.lookupKey == lookupKey }
-                                .firstOrNull { recipient -> phoneNumberUtils.compare(recipient.address, address) }
-                                ?: Recipient(
-                                        address = address,
-                                        contact = lookupKey?.let(contactRepo::getUnmanagedContact))
-                    }
-                }
-                .autoDisposable(view.scope())
-                .subscribe { chips ->
-                    chipsReducer.onNext { list -> list + chips }
-                    view.showKeyboard()
-                }
-
-        // Set the contact suggestions list to visible when the add button is pressed
-        view.optionsItemIntent
-                .filter { it == R.id.add }
-                .withLatestFrom(selectedChips) { _, chips ->
-                    view.showContacts(sharing, chips)
-                }
-                .autoDisposable(view.scope())
-                .subscribe()
-
-        // Update the list of selected contacts when a new contact is selected or an existing one is deselected
-        view.chipDeletedIntent
-                .autoDisposable(view.scope())
-                .subscribe { contact ->
-                    chipsReducer.onNext { contacts ->
-                        val result = contacts.filterNot { it == contact }
-                        if (result.isEmpty()) {
-                            view.showContacts(sharing, result)
-                        }
-                        result
-                    }
-                }
-
-        // When the menu is loaded, trigger a new state so that the menu options can be rendered correctly
-        view.menuReadyIntent
-                .autoDisposable(view.scope())
-                .subscribe { newState { copy() } }
-
-        // Open the phone dialer if the call button is clicked
-        view.optionsItemIntent
-                .filter { it == R.id.call }
-                .withLatestFrom(conversation) { _, conversation -> conversation }
-                .mapNotNull { conversation -> conversation.recipients.firstOrNull() }
-                .map { recipient -> recipient.address }
-                .autoDisposable(view.scope())
-                .subscribe { address -> navigator.makePhoneCall(address) }
-
-        // Open the conversation settings if info button is clicked
-        view.optionsItemIntent
-                .filter { it == R.id.info }
-                .withLatestFrom(conversation) { _, conversation -> conversation }
-                .autoDisposable(view.scope())
-                .subscribe { conversation -> navigator.showConversationInfo(conversation.id) }
-
-        // Copy the message contents
-        view.optionsItemIntent
-                .filter { it == R.id.copy }
-                .withLatestFrom(view.messagesSelectedIntent) { _, messageIds ->
-                    val messages = messageIds.mapNotNull(messageRepo::getMessage).sortedBy { it.date }
-                    val text = when (messages.size) {
-                        1 -> messages.first().getText()
-                        else -> messages.foldIndexed("") { index, acc, message ->
-                            when {
-                                index == 0 -> message.getText()
-                                messages[index - 1].compareSender(message) -> "$acc\n${message.getText()}"
-                                else -> "$acc\n\n${message.getText()}"
-                            }
-                        }
-                    }
-
-                    ClipboardUtils.copy(context, text)
-                }
-                .autoDisposable(view.scope())
-                .subscribe { view.clearSelection() }
-
-        // Show the message details
-        view.optionsItemIntent
-                .filter { it == R.id.details }
-                .withLatestFrom(view.messagesSelectedIntent) { _, messages -> messages }
-                .mapNotNull { messages -> messages.firstOrNull().also { view.clearSelection() } }
-                .mapNotNull(messageRepo::getMessage)
-                .map(messageDetailsFormatter::format)
-                .autoDisposable(view.scope())
-                .subscribe { view.showDetails(it) }
-
-        // Delete the messages
-        view.optionsItemIntent
-                .filter { it == R.id.delete }
-                .filter { permissionManager.isDefaultSms().also { if (!it) view.requestDefaultSms() } }
-                .withLatestFrom(view.messagesSelectedIntent, conversation) { _, messages, conversation ->
-                    deleteMessages.execute(DeleteMessages.Params(messages, conversation.id))
-                }
-                .autoDisposable(view.scope())
-                .subscribe { view.clearSelection() }
-
-        // Forward the message
-        view.optionsItemIntent
-                .filter { it == R.id.forward }
-                .withLatestFrom(view.messagesSelectedIntent) { _, messages ->
-                    messages?.firstOrNull()?.let { messageRepo.getMessage(it) }?.let { message ->
-                        val images = message.parts.filter { it.isImage() }.mapNotNull { it.getUri() }
-                        navigator.showCompose(message.getText(), images)
-                    }
-                }
-                .autoDisposable(view.scope())
-                .subscribe { view.clearSelection() }
-
-        // Show the previous search result
-        view.optionsItemIntent
-                .filter { it == R.id.previous }
-                .withLatestFrom(searchSelection, searchResults) { _, selection, messages ->
-                    val currentPosition = messages.indexOfFirst { it.id == selection }
-                    if (currentPosition <= 0L) messages.lastOrNull()?.id ?: -1
-                    else messages.getOrNull(currentPosition - 1)?.id ?: -1
-                }
-                .filter { id -> id != -1L }
-                .autoDisposable(view.scope())
-                .subscribe(searchSelection)
-
-        // Show the next search result
-        view.optionsItemIntent
-                .filter { it == R.id.next }
-                .withLatestFrom(searchSelection, searchResults) { _, selection, messages ->
-                    val currentPosition = messages.indexOfFirst { it.id == selection }
-                    if (currentPosition >= messages.size - 1) messages.firstOrNull()?.id ?: -1
-                    else messages.getOrNull(currentPosition + 1)?.id ?: -1
-                }
-                .filter { id -> id != -1L }
-                .autoDisposable(view.scope())
-                .subscribe(searchSelection)
-
-        // Clear the search
-        view.optionsItemIntent
-                .filter { it == R.id.clear }
-                .autoDisposable(view.scope())
-                .subscribe { newState { copy(query = "", searchSelectionId = -1) } }
-
-        // Toggle the group sending mode
-        view.sendAsGroupIntent
-                .autoDisposable(view.scope())
-                .subscribe { prefs.sendAsGroup.set(!prefs.sendAsGroup.get()) }
-
-        // Scroll to search position
-        searchSelection
-                .filter { id -> id != -1L }
-                .doOnNext { id -> newState { copy(searchSelectionId = id) } }
-                .autoDisposable(view.scope())
-                .subscribe(view::scrollToMessage)
-
-        // Theme changes
-        prefs.keyChanges
-                .filter { key -> key.contains("theme") }
-                .doOnNext { view.themeChanged() }
-                .autoDisposable(view.scope())
-                .subscribe()
-
-        // Retry sending
-        view.messageClickIntent
-                .mapNotNull(messageRepo::getMessage)
-                .filter { message -> message.isFailedMessage() }
-                .doOnNext { message -> retrySending.execute(message.id) }
-                .autoDisposable(view.scope())
-                .subscribe()
-
-        // Media attachment clicks
-        view.messagePartClickIntent
-                .mapNotNull(messageRepo::getPart)
-                .filter { part -> part.isImage() || part.isVideo() }
-                .autoDisposable(view.scope())
-                .subscribe { part -> navigator.showMedia(part.id) }
-
-        // Non-media attachment clicks
-        view.messagePartClickIntent
-                .mapNotNull(messageRepo::getPart)
-                .filter { part -> !part.isImage() && !part.isVideo() }
-                .autoDisposable(view.scope())
-                .subscribe { part ->
-                    if (permissionManager.hasStorage()) {
-                        messageRepo.savePart(part.id)?.let(navigator::viewFile)
-                    } else {
-                        view.requestStoragePermission()
-                    }
-                }
-
-        // Update the State when the message selected count changes
-        view.messagesSelectedIntent
-                .map { selection -> selection.size }
-                .autoDisposable(view.scope())
-                .subscribe { messages -> newState { copy(selectedMessages = messages, editingMode = false) } }
-
-        // Cancel sending a message
-        view.cancelSendingIntent
-                .mapNotNull(messageRepo::getMessage)
-                .doOnNext { message -> view.setDraft(message.getText()) }
-                .autoDisposable(view.scope())
-                .subscribe { message ->
-                    cancelMessage.execute(CancelDelayedMessage.Params(message.id, message.threadId))
-                }
-
-        // Set the current conversation
-        Observables
-                .combineLatest(
-                        view.activityVisibleIntent.distinctUntilChanged(),
-                        conversation.mapNotNull { conversation ->
-                            conversation.takeIf { it.isValid }?.id
-                        }.distinctUntilChanged())
-                { visible, threadId ->
-                    when (visible) {
-                        true -> {
-                            activeConversationManager.setActiveConversation(threadId)
-                            markRead.execute(listOf(threadId))
-                        }
-
-                        false -> activeConversationManager.setActiveConversation(null)
-                    }
-                }
-                .autoDisposable(view.scope())
-                .subscribe()
-
-        // Save draft when the activity goes into the background
-        view.activityVisibleIntent
-                .filter { visible -> !visible }
-                .withLatestFrom(conversation) { _, conversation -> conversation }
-                .mapNotNull { conversation -> conversation.takeIf { it.isValid }?.id }
-                .observeOn(Schedulers.io())
-                .withLatestFrom(view.textChangedIntent) { threadId, draft ->
-                    conversationRepo.saveDraft(threadId, draft.toString())
-                }
-                .autoDisposable(view.scope())
-                .subscribe()
-
-        // Open the attachment options
-        view.attachIntent
-                .autoDisposable(view.scope())
-                .subscribe { newState { copy(attaching = !attaching) } }
-
-        // Attach a photo from camera
-        view.cameraIntent
-                .autoDisposable(view.scope())
-                .subscribe {
-                    if (permissionManager.hasStorage()) {
-                        newState { copy(attaching = false) }
-                        view.requestCamera()
-                    } else {
-                        view.requestStoragePermission()
-                    }
-                }
-
-        // Attach a photo from gallery
-        view.galleryIntent
-                .doOnNext { newState { copy(attaching = false) } }
-                .autoDisposable(view.scope())
-                .subscribe { view.requestGallery() }
-
-        // Choose a time to schedule the message
-        view.scheduleIntent
-                .doOnNext { newState { copy(attaching = false) } }
-                .withLatestFrom(billingManager.upgradeStatus) { _, upgraded -> upgraded }
-                .filter { upgraded ->
-                    upgraded.also { if (!upgraded) view.showQksmsPlusSnackbar(R.string.compose_scheduled_plus) }
-                }
-                .autoDisposable(view.scope())
-                .subscribe { view.requestDatePicker() }
-
-        // A photo was selected
-        Observable.merge(
-                view.attachmentSelectedIntent.map { uri -> Attachment.Image(uri) },
-                view.inputContentIntent.map { inputContent -> Attachment.Image(inputContent = inputContent) })
-                .withLatestFrom(attachments) { attachment, attachments -> attachments + attachment }
-                .doOnNext(attachments::onNext)
-                .autoDisposable(view.scope())
-                .subscribe { newState { copy(attaching = false) } }
-
-        // Set the scheduled time
-        view.scheduleSelectedIntent
-                .filter { scheduled ->
-                    (scheduled > System.currentTimeMillis()).also { future ->
-                        if (!future) context.makeToast(R.string.compose_scheduled_future)
-                    }
-                }
-                .autoDisposable(view.scope())
-                .subscribe { scheduled -> newState { copy(scheduled = scheduled) } }
-
-        // Attach a contact
-        view.attachContactIntent
-                .doOnNext { newState { copy(attaching = false) } }
-                .autoDisposable(view.scope())
-                .subscribe { view.requestContact() }
-
-        // Contact was selected for attachment
-        view.contactSelectedIntent
-                .map { uri -> Attachment.Contact(getVCard(uri)!!) }
-                .withLatestFrom(attachments) { attachment, attachments -> attachments + attachment }
-                .subscribeOn(Schedulers.io())
-                .autoDisposable(view.scope())
-                .subscribe(attachments::onNext) { error ->
-                    context.makeToast(R.string.compose_contact_error)
-                    Timber.w(error)
-                }
-
-        // Detach a photo
-        view.attachmentDeletedIntent
-                .withLatestFrom(attachments) { bitmap, attachments -> attachments.filter { it !== bitmap } }
-                .autoDisposable(view.scope())
-                .subscribe { attachments.onNext(it) }
-
-        conversation
-                .map { conversation -> conversation.draft }
-                .distinctUntilChanged()
-                .autoDisposable(view.scope())
-                .subscribe { draft ->
-
-                    // If text was shared into the conversation, it should take priority over the
-                    // existing draft
-                    //
-                    // TODO: Show dialog warning user about overwriting draft
-                    if (sharedText.isNotBlank()) {
-                        view.setDraft(sharedText)
-                    } else {
-                        view.setDraft(draft)
-                    }
-                }
-
-        // Enable the send button when there is text input into the new message body or there's
-        // an attachment, disable otherwise
-        Observables
-                .combineLatest(view.textChangedIntent, attachments) { text, attachments ->
-                    text.isNotBlank() || attachments.isNotEmpty()
-                }
-                .autoDisposable(view.scope())
-                .subscribe { canSend -> newState { copy(canSend = canSend) } }
-
-        // Show the remaining character counter when necessary
-        view.textChangedIntent
-                .observeOn(Schedulers.computation())
-                .mapNotNull { draft -> tryOrNull { SmsMessage.calculateLength(draft, prefs.unicode.get()) } }
-                .map { array ->
-                    val messages = array[0]
-                    val remaining = array[2]
-
-                    when {
-                        messages <= 1 && remaining > 10 -> ""
-                        messages <= 1 && remaining <= 10 -> "$remaining"
-                        else -> "$remaining / $messages"
-                    }
-                }
-                .distinctUntilChanged()
-                .autoDisposable(view.scope())
-                .subscribe { remaining -> newState { copy(remaining = remaining) } }
-
-        // Cancel the scheduled time
-        view.scheduleCancelIntent
-                .autoDisposable(view.scope())
-                .subscribe { newState { copy(scheduled = 0) } }
-
-        // Toggle to the next sim slot
-        view.changeSimIntent
-                .withLatestFrom(state) { _, state ->
-                    val subs = subscriptionManager.activeSubscriptionInfoList
-                    val subIndex = subs.indexOfFirst { it.subscriptionId == state.subscription?.subscriptionId }
-                    val subscription = when {
-                        subIndex == -1 -> null
-                        subIndex < subs.size - 1 -> subs[subIndex + 1]
-                        else -> subs[0]
-                    }
-
-                    if (subscription != null) {
-                        context.getSystemService<Vibrator>()?.vibrate(40)
-                        context.makeToast(context.getString(R.string.compose_sim_changed_toast,
-                                subscription.simSlotIndex + 1, subscription.displayName))
-                    }
-
-                    newState { copy(subscription = subscription) }
-                }
-                .autoDisposable(view.scope())
-                .subscribe()
-
-        // Send a message when the send button is clicked, and disable editing mode if it's enabled
-        view.sendIntent
-                .filter { permissionManager.isDefaultSms().also { if (!it) view.requestDefaultSms() } }
-                .filter { permissionManager.hasSendSms().also { if (!it) view.requestSmsPermission() } }
-                .withLatestFrom(view.textChangedIntent) { _, body -> body }
-                .map { body -> body.toString() }
-                .withLatestFrom(state, attachments, conversation, selectedChips) { body, state, attachments,
-                                                                                   conversation, chips ->
-                    val subId = state.subscription?.subscriptionId ?: -1
-                    val addresses = when (conversation.recipients.isNotEmpty()) {
-                        true -> conversation.recipients.map { it.address }
-                        false -> chips.map { chip -> chip.address }
-                    }
-                    val delay = when (prefs.sendDelay.get()) {
-                        Preferences.SEND_DELAY_SHORT -> 3000
-                        Preferences.SEND_DELAY_MEDIUM -> 5000
-                        Preferences.SEND_DELAY_LONG -> 10000
-                        else -> 0
-                    }
-                    val sendAsGroup = !state.editingMode || state.sendAsGroup
-
-                    when {
-                        // Scheduling a message
-                        state.scheduled != 0L -> {
-                            newState { copy(scheduled = 0) }
-                            val uris = attachments
-                                    .mapNotNull { it as? Attachment.Image }
-                                    .map { it.getUri() }
-                                    .map { it.toString() }
-                            val params = AddScheduledMessage
-                                    .Params(state.scheduled, subId, addresses, sendAsGroup, body, uris)
-                            addScheduledMessage.execute(params)
-                            context.makeToast(R.string.compose_scheduled_toast)
-                        }
-
-                        // Sending a group message
-                        sendAsGroup -> {
-                            sendMessage.execute(SendMessage
-                                    .Params(subId, conversation.id, addresses, body, attachments, delay))
-                        }
-
-                        // Sending a message to an existing conversation with one recipient
-                        conversation.recipients.size == 1 -> {
-                            val address = conversation.recipients.map { it.address }
-                            sendMessage.execute(SendMessage.Params(subId, threadId, address, body, attachments, delay))
-                        }
-
-                        // Create a new conversation with one address
-                        addresses.size == 1 -> {
-                            sendMessage.execute(SendMessage
-                                    .Params(subId, threadId, addresses, body, attachments, delay))
-                        }
-
-                        // Send a message to multiple addresses
-                        else -> {
-                            addresses.forEach { addr ->
-                                val threadId = tryOrNull(false) {
-                                    TelephonyCompat.getOrCreateThreadId(context, addr)
-                                } ?: 0
-                                val address = listOf(conversationRepo
-                                        .getConversation(threadId)?.recipients?.firstOrNull()?.address ?: addr)
-                                sendMessage.execute(SendMessage
-                                        .Params(subId, threadId, address, body, attachments, delay))
-                            }
-                        }
-                    }
-
-                    view.setDraft("")
-                    this.attachments.onNext(ArrayList())
-
-                    if (state.editingMode) {
-                        newState { copy(editingMode = false, hasError = !sendAsGroup) }
-                    }
-                }
-                .autoDisposable(view.scope())
-                .subscribe()
-
-        // View QKSMS+
-        view.viewQksmsPlusIntent
-                .autoDisposable(view.scope())
-                .subscribe { navigator.showQksmsPlusActivity("compose_schedule") }
-
-        // Navigate back
-        view.optionsItemIntent
-                .filter { it == android.R.id.home }
-                .map { Unit }
-                .mergeWith(view.backPressedIntent)
-                .withLatestFrom(state) { _, state ->
-                    when {
-                        state.selectedMessages > 0 -> view.clearSelection()
-                        else -> newState { copy(hasError = true) }
-                    }
-                }
-                .autoDisposable(view.scope())
-                .subscribe()
-
-    }
-
-    private fun getVCard(contactData: Uri): String? {
-        val lookupKey = context.contentResolver.query(contactData, null, null, null, null)?.use { cursor ->
-            cursor.moveToFirst()
-            cursor.getString(cursor.getColumnIndex(ContactsContract.Contacts.LOOKUP_KEY))
-        }
-
-        val vCardUri = Uri.withAppendedPath(ContactsContract.Contacts.CONTENT_VCARD_URI, lookupKey)
-        return context.contentResolver.openAssetFileDescriptor(vCardUri, "r")
-                ?.createInputStream()
-                ?.readBytes()
-                ?.let { bytes -> String(bytes) }
-    }
-
+/*
+ * Copyright (C) 2017,2021 Moez Bhatti <moez.bhatti@gmail.com>,to268
+ *
+ * This file is part of QKSMS.
+ *
+ * QKSMS is free software: you can redistribute it and/or modify
+ * it under the terms of the GNU General Public License as published by
+ * the Free Software Foundation, either version 3 of the License, or
+ * (at your option) any later version.
+ *
+ * QKSMS is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+ * GNU General Public License for more details.
+ *
+ * You should have received a copy of the GNU General Public License
+ * along with QKSMS.  If not, see <http://www.gnu.org/licenses/>.
+ */
+package com.moez.QKSMS.feature.compose
+
+import android.content.Context
+import android.net.Uri
+import android.os.Vibrator
+import android.provider.ContactsContract
+import android.telephony.SmsMessage
+import androidx.core.content.getSystemService
+import com.moez.QKSMS.R
+import com.moez.QKSMS.common.Navigator
+import com.moez.QKSMS.common.base.QkViewModel
+import com.moez.QKSMS.common.util.ClipboardUtils
+import com.moez.QKSMS.common.util.MessageDetailsFormatter
+import com.moez.QKSMS.common.util.extensions.makeToast
+import com.moez.QKSMS.compat.SubscriptionManagerCompat
+import com.moez.QKSMS.compat.TelephonyCompat
+import com.moez.QKSMS.extensions.asObservable
+import com.moez.QKSMS.extensions.isImage
+import com.moez.QKSMS.extensions.isVideo
+import com.moez.QKSMS.extensions.mapNotNull
+import com.moez.QKSMS.interactor.AddScheduledMessage
+import com.moez.QKSMS.interactor.CancelDelayedMessage
+import com.moez.QKSMS.interactor.DeleteMessages
+import com.moez.QKSMS.interactor.MarkRead
+import com.moez.QKSMS.interactor.RetrySending
+import com.moez.QKSMS.interactor.SendMessage
+import com.moez.QKSMS.manager.ActiveConversationManager
+import com.moez.QKSMS.manager.BillingManager
+import com.moez.QKSMS.manager.PermissionManager
+import com.moez.QKSMS.model.Attachment
+import com.moez.QKSMS.model.Attachments
+import com.moez.QKSMS.model.Conversation
+import com.moez.QKSMS.model.Message
+import com.moez.QKSMS.model.Recipient
+import com.moez.QKSMS.repository.ContactRepository
+import com.moez.QKSMS.repository.ConversationRepository
+import com.moez.QKSMS.repository.MessageRepository
+import com.moez.QKSMS.util.ActiveSubscriptionObservable
+import com.moez.QKSMS.util.PhoneNumberUtils
+import com.moez.QKSMS.util.Preferences
+import com.moez.QKSMS.util.tryOrNull
+import com.uber.autodispose.android.lifecycle.scope
+import com.uber.autodispose.autoDisposable
+import io.reactivex.Observable
+import io.reactivex.android.schedulers.AndroidSchedulers
+import io.reactivex.rxkotlin.Observables
+import io.reactivex.rxkotlin.plusAssign
+import io.reactivex.rxkotlin.withLatestFrom
+import io.reactivex.schedulers.Schedulers
+import io.reactivex.subjects.BehaviorSubject
+import io.reactivex.subjects.PublishSubject
+import io.reactivex.subjects.Subject
+import timber.log.Timber
+import java.util.*
+import javax.inject.Inject
+import javax.inject.Named
+
+class ComposeViewModel @Inject constructor(
+        @Named("query") private val query: String,
+        @Named("threadId") private val threadId: Long,
+        @Named("addresses") private val addresses: List<String>,
+        @Named("text") private val sharedText: String,
+        @Named("attachments") private val sharedAttachments: Attachments,
+        private val contactRepo: ContactRepository,
+        private val context: Context,
+        private val activeConversationManager: ActiveConversationManager,
+        private val addScheduledMessage: AddScheduledMessage,
+        private val billingManager: BillingManager,
+        private val cancelMessage: CancelDelayedMessage,
+        private val conversationRepo: ConversationRepository,
+        private val deleteMessages: DeleteMessages,
+        private val markRead: MarkRead,
+        private val messageDetailsFormatter: MessageDetailsFormatter,
+        private val messageRepo: MessageRepository,
+        private val navigator: Navigator,
+        private val permissionManager: PermissionManager,
+        private val phoneNumberUtils: PhoneNumberUtils,
+        private val prefs: Preferences,
+        private val retrySending: RetrySending,
+        private val sendMessage: SendMessage,
+        private val subscriptionManager: SubscriptionManagerCompat
+) : QkViewModel<ComposeView, ComposeState>(ComposeState(
+        editingMode = threadId == 0L && addresses.isEmpty(),
+        threadId = threadId,
+        query = query)
+) {
+
+    private val attachments: Subject<List<Attachment>> = BehaviorSubject.createDefault(sharedAttachments)
+    private val chipsReducer: Subject<(List<Recipient>) -> List<Recipient>> = PublishSubject.create()
+    private val conversation: Subject<Conversation> = BehaviorSubject.create()
+    private val messages: Subject<List<Message>> = BehaviorSubject.create()
+    private val selectedChips: Subject<List<Recipient>> = BehaviorSubject.createDefault(listOf())
+    private val searchResults: Subject<List<Message>> = BehaviorSubject.create()
+    private val searchSelection: Subject<Long> = BehaviorSubject.createDefault(-1)
+
+    private var shouldShowContacts = threadId == 0L && addresses.isEmpty()
+
+    init {
+        val initialConversation = threadId.takeIf { it != 0L }
+                ?.let(conversationRepo::getConversationAsync)
+                ?.asObservable()
+                ?: Observable.empty()
+
+        val selectedConversation = selectedChips
+                .skipWhile { it.isEmpty() }
+                .map { chips -> chips.map { it.address } }
+                .distinctUntilChanged()
+                .doOnNext { newState { copy(loading = true) } }
+                .observeOn(Schedulers.io())
+                .map { addresses -> Pair(conversationRepo.getOrCreateConversation(addresses)?.id ?: 0, addresses) }
+                .observeOn(AndroidSchedulers.mainThread())
+                .doOnNext { newState { copy(loading = false) } }
+                .switchMap { (threadId, addresses) ->
+                    // If we already have this thread in realm, or we're able to obtain it from the
+                    // system, just return that.
+                    threadId.takeIf { it > 0 }?.let {
+                        return@switchMap conversationRepo.getConversationAsync(threadId).asObservable()
+                    }
+
+                    // Otherwise, we'll monitor the conversations until our expected conversation is created
+                    conversationRepo.getConversations().asObservable()
+                            .filter { it.isLoaded }
+                            .observeOn(Schedulers.io())
+                            .map { conversationRepo.getOrCreateConversation(addresses)?.id ?: 0 }
+                            .observeOn(AndroidSchedulers.mainThread())
+                            .switchMap { actualThreadId ->
+                                when (actualThreadId) {
+                                    0L -> Observable.just(Conversation(0))
+                                    else -> conversationRepo.getConversationAsync(actualThreadId).asObservable()
+                                }
+                            }
+                }
+
+        // Merges two potential conversation sources (threadId from constructor and contact selection) into a single
+        // stream of conversations. If the conversation was deleted, notify the activity to shut down
+        disposables += selectedConversation
+                .mergeWith(initialConversation)
+                .filter { conversation -> conversation.isLoaded }
+                .doOnNext { conversation ->
+                    if (!conversation.isValid) {
+                        newState { copy(hasError = true) }
+                    }
+                }
+                .filter { conversation -> conversation.isValid }
+                .subscribe(conversation::onNext)
+
+        if (addresses.isNotEmpty()) {
+            selectedChips.onNext(addresses.map { address -> Recipient(address = address) })
+        }
+
+        disposables += chipsReducer
+                .scan(listOf<Recipient>()) { previousState, reducer -> reducer(previousState) }
+                .doOnNext { chips -> newState { copy(selectedChips = chips) } }
+                .skipUntil(state.filter { state -> state.editingMode })
+                .takeUntil(state.filter { state -> !state.editingMode })
+                .subscribe(selectedChips::onNext)
+
+        // When the conversation changes, mark read, and update the recipientId and the messages for the adapter
+        disposables += conversation
+                .distinctUntilChanged { conversation -> conversation.id }
+                .observeOn(AndroidSchedulers.mainThread())
+                .map { conversation ->
+                    val messages = messageRepo.getMessages(conversation.id)
+                    newState { copy(threadId = conversation.id, messages = Pair(conversation, messages)) }
+                    messages
+                }
+                .switchMap { messages -> messages.asObservable() }
+                .subscribe(messages::onNext)
+
+        disposables += conversation
+                .map { conversation -> conversation.getTitle() }
+                .distinctUntilChanged()
+                .subscribe { title -> newState { copy(conversationtitle = title) } }
+
+        disposables += prefs.sendAsGroup.asObservable()
+                .distinctUntilChanged()
+                .subscribe { enabled -> newState { copy(sendAsGroup = enabled) } }
+
+        disposables += attachments
+                .subscribe { attachments -> newState { copy(attachments = attachments) } }
+
+        disposables += conversation
+                .map { conversation -> conversation.id }
+                .distinctUntilChanged()
+                .withLatestFrom(state) { id, state -> messageRepo.getMessages(id, state.query) }
+                .switchMap { messages -> messages.asObservable() }
+                .takeUntil(state.map { it.query }.filter { it.isEmpty() })
+                .filter { messages -> messages.isLoaded }
+                .filter { messages -> messages.isValid }
+                .subscribe(searchResults::onNext)
+
+        disposables += Observables.combineLatest(searchSelection, searchResults) { selected, messages ->
+            if (selected == -1L) {
+                messages.lastOrNull()?.let { message -> searchSelection.onNext(message.id) }
+            } else {
+                val position = messages.indexOfFirst { it.id == selected } + 1
+                newState { copy(searchSelectionPosition = position, searchResults = messages.size) }
+            }
+        }.subscribe()
+
+        val latestSubId = messages
+                .map { messages -> messages.lastOrNull()?.subId ?: -1 }
+                .distinctUntilChanged()
+
+        val subscriptions = ActiveSubscriptionObservable(subscriptionManager)
+        disposables += Observables.combineLatest(latestSubId, subscriptions) { subId, subs ->
+            val sub = if (subs.size > 1) subs.firstOrNull { it.subscriptionId == subId } ?: subs[0] else null
+            newState { copy(subscription = sub) }
+        }.subscribe()
+    }
+
+    override fun bindView(view: ComposeView) {
+        super.bindView(view)
+
+        val sharing = sharedText.isNotEmpty() || sharedAttachments.isNotEmpty()
+        if (shouldShowContacts) {
+            shouldShowContacts = false
+            view.showContacts(sharing, selectedChips.blockingFirst())
+        }
+
+        view.chipsSelectedIntent
+                .withLatestFrom(selectedChips) { hashmap, chips ->
+                    // If there's no contacts already selected, and the user cancelled the contact
+                    // selection, close the activity
+                    if (hashmap.isEmpty() && chips.isEmpty()) {
+                        newState { copy(hasError = true) }
+                    }
+                    // Filter out any numbers that are already selected
+                    hashmap.filter { (address) ->
+                        chips.none { recipient -> phoneNumberUtils.compare(address, recipient.address) }
+                    }
+                }
+                .filter { hashmap -> hashmap.isNotEmpty() }
+                .map { hashmap ->
+                    hashmap.map { (address, lookupKey) ->
+                        conversationRepo.getRecipients()
+                                .asSequence()
+                                .filter { recipient -> recipient.contact?.lookupKey == lookupKey }
+                                .firstOrNull { recipient -> phoneNumberUtils.compare(recipient.address, address) }
+                                ?: Recipient(
+                                        address = address,
+                                        contact = lookupKey?.let(contactRepo::getUnmanagedContact))
+                    }
+                }
+                .autoDisposable(view.scope())
+                .subscribe { chips ->
+                    chipsReducer.onNext { list -> list + chips }
+                    view.showKeyboard()
+                }
+
+        // Set the contact suggestions list to visible when the add button is pressed
+        view.optionsItemIntent
+                .filter { it == R.id.add }
+                .withLatestFrom(selectedChips) { _, chips ->
+                    view.showContacts(sharing, chips)
+                }
+                .autoDisposable(view.scope())
+                .subscribe()
+
+        // Update the list of selected contacts when a new contact is selected or an existing one is deselected
+        view.chipDeletedIntent
+                .autoDisposable(view.scope())
+                .subscribe { contact ->
+                    chipsReducer.onNext { contacts ->
+                        val result = contacts.filterNot { it == contact }
+                        if (result.isEmpty()) {
+                            view.showContacts(sharing, result)
+                        }
+                        result
+                    }
+                }
+
+        // When the menu is loaded, trigger a new state so that the menu options can be rendered correctly
+        view.menuReadyIntent
+                .autoDisposable(view.scope())
+                .subscribe { newState { copy() } }
+
+        // Open the phone dialer if the call button is clicked
+        view.optionsItemIntent
+                .filter { it == R.id.call }
+                .withLatestFrom(conversation) { _, conversation -> conversation }
+                .mapNotNull { conversation -> conversation.recipients.firstOrNull() }
+                .map { recipient -> recipient.address }
+                .autoDisposable(view.scope())
+                .subscribe { address -> navigator.makePhoneCall(address) }
+
+        // Open the conversation settings if info button is clicked
+        view.optionsItemIntent
+                .filter { it == R.id.info }
+                .withLatestFrom(conversation) { _, conversation -> conversation }
+                .autoDisposable(view.scope())
+                .subscribe { conversation -> navigator.showConversationInfo(conversation.id) }
+
+        // Copy the message contents
+        view.optionsItemIntent
+                .filter { it == R.id.copy }
+                .withLatestFrom(view.messagesSelectedIntent) { _, messageIds ->
+                    val messages = messageIds.mapNotNull(messageRepo::getMessage).sortedBy { it.date }
+                    val text = when (messages.size) {
+                        1 -> messages.first().getText()
+                        else -> messages.foldIndexed("") { index, acc, message ->
+                            when {
+                                index == 0 -> message.getText()
+                                messages[index - 1].compareSender(message) -> "$acc\n${message.getText()}"
+                                else -> "$acc\n\n${message.getText()}"
+                            }
+                        }
+                    }
+
+                    ClipboardUtils.copy(context, text)
+                }
+                .autoDisposable(view.scope())
+                .subscribe { view.clearSelection() }
+
+        // Show the message details
+        view.optionsItemIntent
+                .filter { it == R.id.details }
+                .withLatestFrom(view.messagesSelectedIntent) { _, messages -> messages }
+                .mapNotNull { messages -> messages.firstOrNull().also { view.clearSelection() } }
+                .mapNotNull(messageRepo::getMessage)
+                .map(messageDetailsFormatter::format)
+                .autoDisposable(view.scope())
+                .subscribe { view.showDetails(it) }
+
+        // Speech text
+        view.optionsItemIntent
+                .filter { it == R.id.speech }
+                .withLatestFrom(view.messagesSelectedIntent) { _, messages -> messages }
+                .mapNotNull { messages -> messages.firstOrNull().also { view.clearSelection() } }
+                .mapNotNull(messageRepo::getMessage)
+                .mapNotNull(Message::getText)
+                .autoDisposable(view.scope())
+                .subscribe { view.speechText(it) }
+
+        // Delete the messages
+        view.optionsItemIntent
+                .filter { it == R.id.delete }
+                .filter { permissionManager.isDefaultSms().also { if (!it) view.requestDefaultSms() } }
+                .withLatestFrom(view.messagesSelectedIntent, conversation) { _, messages, conversation ->
+                    deleteMessages.execute(DeleteMessages.Params(messages, conversation.id))
+                }
+                .autoDisposable(view.scope())
+                .subscribe { view.clearSelection() }
+
+        // Forward the message
+        view.optionsItemIntent
+                .filter { it == R.id.forward }
+                .withLatestFrom(view.messagesSelectedIntent) { _, messages ->
+                    messages?.firstOrNull()?.let { messageRepo.getMessage(it) }?.let { message ->
+                        val images = message.parts.filter { it.isImage() }.mapNotNull { it.getUri() }
+                        navigator.showCompose(message.getText(), images)
+                    }
+                }
+                .autoDisposable(view.scope())
+                .subscribe { view.clearSelection() }
+
+        // Show the previous search result
+        view.optionsItemIntent
+                .filter { it == R.id.previous }
+                .withLatestFrom(searchSelection, searchResults) { _, selection, messages ->
+                    val currentPosition = messages.indexOfFirst { it.id == selection }
+                    if (currentPosition <= 0L) messages.lastOrNull()?.id ?: -1
+                    else messages.getOrNull(currentPosition - 1)?.id ?: -1
+                }
+                .filter { id -> id != -1L }
+                .autoDisposable(view.scope())
+                .subscribe(searchSelection)
+
+        // Show the next search result
+        view.optionsItemIntent
+                .filter { it == R.id.next }
+                .withLatestFrom(searchSelection, searchResults) { _, selection, messages ->
+                    val currentPosition = messages.indexOfFirst { it.id == selection }
+                    if (currentPosition >= messages.size - 1) messages.firstOrNull()?.id ?: -1
+                    else messages.getOrNull(currentPosition + 1)?.id ?: -1
+                }
+                .filter { id -> id != -1L }
+                .autoDisposable(view.scope())
+                .subscribe(searchSelection)
+
+        // Clear the search
+        view.optionsItemIntent
+                .filter { it == R.id.clear }
+                .autoDisposable(view.scope())
+                .subscribe { newState { copy(query = "", searchSelectionId = -1) } }
+
+        // Toggle the group sending mode
+        view.sendAsGroupIntent
+                .autoDisposable(view.scope())
+                .subscribe { prefs.sendAsGroup.set(!prefs.sendAsGroup.get()) }
+
+        // Scroll to search position
+        searchSelection
+                .filter { id -> id != -1L }
+                .doOnNext { id -> newState { copy(searchSelectionId = id) } }
+                .autoDisposable(view.scope())
+                .subscribe(view::scrollToMessage)
+
+        // Theme changes
+        prefs.keyChanges
+                .filter { key -> key.contains("theme") }
+                .doOnNext { view.themeChanged() }
+                .autoDisposable(view.scope())
+                .subscribe()
+
+        // Retry sending
+        view.messageClickIntent
+                .mapNotNull(messageRepo::getMessage)
+                .filter { message -> message.isFailedMessage() }
+                .doOnNext { message -> retrySending.execute(message.id) }
+                .autoDisposable(view.scope())
+                .subscribe()
+
+        // Media attachment clicks
+        view.messagePartClickIntent
+                .mapNotNull(messageRepo::getPart)
+                .filter { part -> part.isImage() || part.isVideo() }
+                .autoDisposable(view.scope())
+                .subscribe { part -> navigator.showMedia(part.id) }
+
+        // Non-media attachment clicks
+        view.messagePartClickIntent
+                .mapNotNull(messageRepo::getPart)
+                .filter { part -> !part.isImage() && !part.isVideo() }
+                .autoDisposable(view.scope())
+                .subscribe { part ->
+                    if (permissionManager.hasStorage()) {
+                        messageRepo.savePart(part.id)?.let(navigator::viewFile)
+                    } else {
+                        view.requestStoragePermission()
+                    }
+                }
+
+        // Update the State when the message selected count changes
+        view.messagesSelectedIntent
+                .map { selection -> selection.size }
+                .autoDisposable(view.scope())
+                .subscribe { messages -> newState { copy(selectedMessages = messages, editingMode = false) } }
+
+        // Cancel sending a message
+        view.cancelSendingIntent
+                .mapNotNull(messageRepo::getMessage)
+                .doOnNext { message -> view.setDraft(message.getText()) }
+                .autoDisposable(view.scope())
+                .subscribe { message ->
+                    cancelMessage.execute(CancelDelayedMessage.Params(message.id, message.threadId))
+                }
+
+        // Set the current conversation
+        Observables
+                .combineLatest(
+                        view.activityVisibleIntent.distinctUntilChanged(),
+                        conversation.mapNotNull { conversation ->
+                            conversation.takeIf { it.isValid }?.id
+                        }.distinctUntilChanged())
+                { visible, threadId ->
+                    when (visible) {
+                        true -> {
+                            activeConversationManager.setActiveConversation(threadId)
+                            markRead.execute(listOf(threadId))
+                        }
+
+                        false -> activeConversationManager.setActiveConversation(null)
+                    }
+                }
+                .autoDisposable(view.scope())
+                .subscribe()
+
+        // Save draft when the activity goes into the background
+        view.activityVisibleIntent
+                .filter { visible -> !visible }
+                .withLatestFrom(conversation) { _, conversation -> conversation }
+                .mapNotNull { conversation -> conversation.takeIf { it.isValid }?.id }
+                .observeOn(Schedulers.io())
+                .withLatestFrom(view.textChangedIntent) { threadId, draft ->
+                    conversationRepo.saveDraft(threadId, draft.toString())
+                }
+                .autoDisposable(view.scope())
+                .subscribe()
+
+        // Open the attachment options
+        view.attachIntent
+                .autoDisposable(view.scope())
+                .subscribe { newState { copy(attaching = !attaching) } }
+
+        // Attach a photo from camera
+        view.cameraIntent
+                .autoDisposable(view.scope())
+                .subscribe {
+                    if (permissionManager.hasStorage()) {
+                        newState { copy(attaching = false) }
+                        view.requestCamera()
+                    } else {
+                        view.requestStoragePermission()
+                    }
+                }
+
+        // Attach a photo from gallery
+        view.galleryIntent
+                .doOnNext { newState { copy(attaching = false) } }
+                .autoDisposable(view.scope())
+                .subscribe { view.requestGallery() }
+
+        // Choose a time to schedule the message
+        view.scheduleIntent
+                .doOnNext { newState { copy(attaching = false) } }
+                .withLatestFrom(billingManager.upgradeStatus) { _, upgraded -> upgraded }
+                .filter { upgraded ->
+                    upgraded.also { if (!upgraded) view.showQksmsPlusSnackbar(R.string.compose_scheduled_plus) }
+                }
+                .autoDisposable(view.scope())
+                .subscribe { view.requestDatePicker() }
+
+        // A photo was selected
+        Observable.merge(
+                view.attachmentSelectedIntent.map { uri -> Attachment.Image(uri) },
+                view.inputContentIntent.map { inputContent -> Attachment.Image(inputContent = inputContent) })
+                .withLatestFrom(attachments) { attachment, attachments -> attachments + attachment }
+                .doOnNext(attachments::onNext)
+                .autoDisposable(view.scope())
+                .subscribe { newState { copy(attaching = false) } }
+
+        // Set the scheduled time
+        view.scheduleSelectedIntent
+                .filter { scheduled ->
+                    (scheduled > System.currentTimeMillis()).also { future ->
+                        if (!future) context.makeToast(R.string.compose_scheduled_future)
+                    }
+                }
+                .autoDisposable(view.scope())
+                .subscribe { scheduled -> newState { copy(scheduled = scheduled) } }
+
+        // Attach a contact
+        view.attachContactIntent
+                .doOnNext { newState { copy(attaching = false) } }
+                .autoDisposable(view.scope())
+                .subscribe { view.requestContact() }
+
+        // Contact was selected for attachment
+        view.contactSelectedIntent
+                .map { uri -> Attachment.Contact(getVCard(uri)!!) }
+                .withLatestFrom(attachments) { attachment, attachments -> attachments + attachment }
+                .subscribeOn(Schedulers.io())
+                .autoDisposable(view.scope())
+                .subscribe(attachments::onNext) { error ->
+                    context.makeToast(R.string.compose_contact_error)
+                    Timber.w(error)
+                }
+
+        // Detach a photo
+        view.attachmentDeletedIntent
+                .withLatestFrom(attachments) { bitmap, attachments -> attachments.filter { it !== bitmap } }
+                .autoDisposable(view.scope())
+                .subscribe { attachments.onNext(it) }
+
+        conversation
+                .map { conversation -> conversation.draft }
+                .distinctUntilChanged()
+                .autoDisposable(view.scope())
+                .subscribe { draft ->
+
+                    // If text was shared into the conversation, it should take priority over the
+                    // existing draft
+                    //
+                    // TODO: Show dialog warning user about overwriting draft
+                    if (sharedText.isNotBlank()) {
+                        view.setDraft(sharedText)
+                    } else {
+                        view.setDraft(draft)
+                    }
+                }
+
+        // Enable the send button when there is text input into the new message body or there's
+        // an attachment, disable otherwise
+        Observables
+                .combineLatest(view.textChangedIntent, attachments) { text, attachments ->
+                    text.isNotBlank() || attachments.isNotEmpty()
+                }
+                .autoDisposable(view.scope())
+                .subscribe { canSend -> newState { copy(canSend = canSend) } }
+
+        // Show the remaining character counter when necessary
+        view.textChangedIntent
+                .observeOn(Schedulers.computation())
+                .mapNotNull { draft -> tryOrNull { SmsMessage.calculateLength(draft, prefs.unicode.get()) } }
+                .map { array ->
+                    val messages = array[0]
+                    val remaining = array[2]
+
+                    when {
+                        messages <= 1 && remaining > 10 -> ""
+                        messages <= 1 && remaining <= 10 -> "$remaining"
+                        else -> "$remaining / $messages"
+                    }
+                }
+                .distinctUntilChanged()
+                .autoDisposable(view.scope())
+                .subscribe { remaining -> newState { copy(remaining = remaining) } }
+
+        // Cancel the scheduled time
+        view.scheduleCancelIntent
+                .autoDisposable(view.scope())
+                .subscribe { newState { copy(scheduled = 0) } }
+
+        // Toggle to the next sim slot
+        view.changeSimIntent
+                .withLatestFrom(state) { _, state ->
+                    val subs = subscriptionManager.activeSubscriptionInfoList
+                    val subIndex = subs.indexOfFirst { it.subscriptionId == state.subscription?.subscriptionId }
+                    val subscription = when {
+                        subIndex == -1 -> null
+                        subIndex < subs.size - 1 -> subs[subIndex + 1]
+                        else -> subs[0]
+                    }
+
+                    if (subscription != null) {
+                        context.getSystemService<Vibrator>()?.vibrate(40)
+                        context.makeToast(context.getString(R.string.compose_sim_changed_toast,
+                                subscription.simSlotIndex + 1, subscription.displayName))
+                    }
+
+                    newState { copy(subscription = subscription) }
+                }
+                .autoDisposable(view.scope())
+                .subscribe()
+
+        // Send a message when the send button is clicked, and disable editing mode if it's enabled
+        view.sendIntent
+                .filter { permissionManager.isDefaultSms().also { if (!it) view.requestDefaultSms() } }
+                .filter { permissionManager.hasSendSms().also { if (!it) view.requestSmsPermission() } }
+                .withLatestFrom(view.textChangedIntent) { _, body -> body }
+                .map { body -> body.toString() }
+                .withLatestFrom(state, attachments, conversation, selectedChips) { body, state, attachments,
+                                                                                   conversation, chips ->
+                    val subId = state.subscription?.subscriptionId ?: -1
+                    val addresses = when (conversation.recipients.isNotEmpty()) {
+                        true -> conversation.recipients.map { it.address }
+                        false -> chips.map { chip -> chip.address }
+                    }
+                    val delay = when (prefs.sendDelay.get()) {
+                        Preferences.SEND_DELAY_SHORT -> 3000
+                        Preferences.SEND_DELAY_MEDIUM -> 5000
+                        Preferences.SEND_DELAY_LONG -> 10000
+                        else -> 0
+                    }
+                    val sendAsGroup = !state.editingMode || state.sendAsGroup
+
+                    when {
+                        // Scheduling a message
+                        state.scheduled != 0L -> {
+                            newState { copy(scheduled = 0) }
+                            val uris = attachments
+                                    .mapNotNull { it as? Attachment.Image }
+                                    .map { it.getUri() }
+                                    .map { it.toString() }
+                            val params = AddScheduledMessage
+                                    .Params(state.scheduled, subId, addresses, sendAsGroup, body, uris)
+                            addScheduledMessage.execute(params)
+                            context.makeToast(R.string.compose_scheduled_toast)
+                        }
+
+                        // Sending a group message
+                        sendAsGroup -> {
+                            sendMessage.execute(SendMessage
+                                    .Params(subId, conversation.id, addresses, body, attachments, delay))
+                        }
+
+                        // Sending a message to an existing conversation with one recipient
+                        conversation.recipients.size == 1 -> {
+                            val address = conversation.recipients.map { it.address }
+                            sendMessage.execute(SendMessage.Params(subId, threadId, address, body, attachments, delay))
+                        }
+
+                        // Create a new conversation with one address
+                        addresses.size == 1 -> {
+                            sendMessage.execute(SendMessage
+                                    .Params(subId, threadId, addresses, body, attachments, delay))
+                        }
+
+                        // Send a message to multiple addresses
+                        else -> {
+                            addresses.forEach { addr ->
+                                val threadId = tryOrNull(false) {
+                                    TelephonyCompat.getOrCreateThreadId(context, addr)
+                                } ?: 0
+                                val address = listOf(conversationRepo
+                                        .getConversation(threadId)?.recipients?.firstOrNull()?.address ?: addr)
+                                sendMessage.execute(SendMessage
+                                        .Params(subId, threadId, address, body, attachments, delay))
+                            }
+                        }
+                    }
+
+                    view.setDraft("")
+                    this.attachments.onNext(ArrayList())
+
+                    if (state.editingMode) {
+                        newState { copy(editingMode = false, hasError = !sendAsGroup) }
+                    }
+                }
+                .autoDisposable(view.scope())
+                .subscribe()
+
+        // View QKSMS+
+        view.viewQksmsPlusIntent
+                .autoDisposable(view.scope())
+                .subscribe { navigator.showQksmsPlusActivity("compose_schedule") }
+
+        // Navigate back
+        view.optionsItemIntent
+                .filter { it == android.R.id.home }
+                .map { Unit }
+                .mergeWith(view.backPressedIntent)
+                .withLatestFrom(state) { _, state ->
+                    when {
+                        state.selectedMessages > 0 -> view.clearSelection()
+                        else -> newState { copy(hasError = true) }
+                    }
+                }
+                .autoDisposable(view.scope())
+                .subscribe()
+
+    }
+
+    private fun getVCard(contactData: Uri): String? {
+        val lookupKey = context.contentResolver.query(contactData, null, null, null, null)?.use { cursor ->
+            cursor.moveToFirst()
+            cursor.getString(cursor.getColumnIndex(ContactsContract.Contacts.LOOKUP_KEY))
+        }
+
+        val vCardUri = Uri.withAppendedPath(ContactsContract.Contacts.CONTENT_VCARD_URI, lookupKey)
+        return context.contentResolver.openAssetFileDescriptor(vCardUri, "r")
+                ?.createInputStream()
+                ?.readBytes()
+                ?.let { bytes -> String(bytes) }
+    }
+
 }
\ No newline at end of file
diff --git a/presentation/src/main/java/com/moez/QKSMS/feature/compose/ComposeWindowCallback.kt b/presentation/src/main/java/com/moez/QKSMS/feature/compose/ComposeWindowCallback.kt
index 0ea9eab79..6f5e694b8 100755
--- a/presentation/src/main/java/com/moez/QKSMS/feature/compose/ComposeWindowCallback.kt
+++ b/presentation/src/main/java/com/moez/QKSMS/feature/compose/ComposeWindowCallback.kt
@@ -1,147 +1,147 @@
-/*
- * Copyright (C) 2017 Moez Bhatti <moez.bhatti@gmail.com>
- *
- * This file is part of QKSMS.
- *
- * QKSMS is free software: you can redistribute it and/or modify
- * it under the terms of the GNU General Public License as published by
- * the Free Software Foundation, either version 3 of the License, or
- * (at your option) any later version.
- *
- * QKSMS is distributed in the hope that it will be useful,
- * but WITHOUT ANY WARRANTY; without even the implied warranty of
- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
- * GNU General Public License for more details.
- *
- * You should have received a copy of the GNU General Public License
- * along with QKSMS.  If not, see <http://www.gnu.org/licenses/>.
- */
-package com.moez.QKSMS.feature.compose
-
-import android.app.Activity
-import android.graphics.Rect
-import android.os.Build
-import android.view.ActionMode
-import android.view.KeyEvent
-import android.view.Menu
-import android.view.MenuItem
-import android.view.MotionEvent
-import android.view.SearchEvent
-import android.view.View
-import android.view.Window
-import android.view.WindowManager
-import android.view.accessibility.AccessibilityEvent
-import androidx.annotation.RequiresApi
-import com.moez.QKSMS.feature.compose.editing.DetailedChipView
-
-class ComposeWindowCallback(
-    private val localCallback: Window.Callback,
-    private val activity: Activity
-) : Window.Callback {
-
-    override fun dispatchKeyEvent(keyEvent: KeyEvent): Boolean {
-        return localCallback.dispatchKeyEvent(keyEvent)
-    }
-
-    override fun dispatchKeyShortcutEvent(keyEvent: KeyEvent): Boolean {
-        return localCallback.dispatchKeyShortcutEvent(keyEvent)
-    }
-
-    override fun dispatchTouchEvent(motionEvent: MotionEvent): Boolean {
-        if (motionEvent.action == MotionEvent.ACTION_DOWN) {
-            val v = activity.currentFocus
-            when (v) {
-                is DetailedChipView -> {
-                    val rect = Rect().apply { v.getGlobalVisibleRect(this) }
-                    if (!rect.contains(motionEvent.rawX.toInt(), motionEvent.rawY.toInt())) {
-                        v.hide()
-                        return true
-                    }
-                }
-            }
-        }
-        return localCallback.dispatchTouchEvent(motionEvent)
-    }
-
-    override fun dispatchTrackballEvent(motionEvent: MotionEvent): Boolean {
-        return localCallback.dispatchTrackballEvent(motionEvent)
-    }
-
-    override fun dispatchGenericMotionEvent(motionEvent: MotionEvent): Boolean {
-        return localCallback.dispatchGenericMotionEvent(motionEvent)
-    }
-
-    override fun dispatchPopulateAccessibilityEvent(accessibilityEvent: AccessibilityEvent): Boolean {
-        return localCallback.dispatchPopulateAccessibilityEvent(accessibilityEvent)
-    }
-
-    override fun onCreatePanelView(i: Int): View? {
-        return localCallback.onCreatePanelView(i)
-    }
-
-    override fun onCreatePanelMenu(i: Int, menu: Menu): Boolean {
-        return localCallback.onCreatePanelMenu(i, menu)
-    }
-
-    override fun onPreparePanel(i: Int, view: View, menu: Menu): Boolean {
-        return localCallback.onPreparePanel(i, view, menu)
-    }
-
-    override fun onMenuOpened(i: Int, menu: Menu): Boolean {
-        return localCallback.onMenuOpened(i, menu)
-    }
-
-    override fun onMenuItemSelected(i: Int, menuItem: MenuItem): Boolean {
-        return localCallback.onMenuItemSelected(i, menuItem)
-    }
-
-    override fun onWindowAttributesChanged(layoutParams: WindowManager.LayoutParams) {
-        localCallback.onWindowAttributesChanged(layoutParams)
-    }
-
-    override fun onContentChanged() {
-        localCallback.onContentChanged()
-    }
-
-    override fun onWindowFocusChanged(b: Boolean) {
-        localCallback.onWindowFocusChanged(b)
-    }
-
-    override fun onAttachedToWindow() {
-        localCallback.onAttachedToWindow()
-    }
-
-    override fun onDetachedFromWindow() {
-        localCallback.onDetachedFromWindow()
-    }
-
-    override fun onPanelClosed(i: Int, menu: Menu) {
-        localCallback.onPanelClosed(i, menu)
-    }
-
-    override fun onSearchRequested(): Boolean {
-        return localCallback.onSearchRequested()
-    }
-
-    @RequiresApi(api = Build.VERSION_CODES.M)
-    override fun onSearchRequested(searchEvent: SearchEvent): Boolean {
-        return localCallback.onSearchRequested(searchEvent)
-    }
-
-    override fun onWindowStartingActionMode(callback: ActionMode.Callback): ActionMode? {
-        return localCallback.onWindowStartingActionMode(callback)
-    }
-
-    @RequiresApi(api = Build.VERSION_CODES.M)
-    override fun onWindowStartingActionMode(callback: ActionMode.Callback, i: Int): ActionMode? {
-        return localCallback.onWindowStartingActionMode(callback, i)
-    }
-
-    override fun onActionModeStarted(actionMode: ActionMode) {
-        localCallback.onActionModeStarted(actionMode)
-    }
-
-    override fun onActionModeFinished(actionMode: ActionMode) {
-        localCallback.onActionModeFinished(actionMode)
-    }
-}
+/*
+ * Copyright (C) 2017 Moez Bhatti <moez.bhatti@gmail.com>
+ *
+ * This file is part of QKSMS.
+ *
+ * QKSMS is free software: you can redistribute it and/or modify
+ * it under the terms of the GNU General Public License as published by
+ * the Free Software Foundation, either version 3 of the License, or
+ * (at your option) any later version.
+ *
+ * QKSMS is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+ * GNU General Public License for more details.
+ *
+ * You should have received a copy of the GNU General Public License
+ * along with QKSMS.  If not, see <http://www.gnu.org/licenses/>.
+ */
+package com.moez.QKSMS.feature.compose
+
+import android.app.Activity
+import android.graphics.Rect
+import android.os.Build
+import android.view.ActionMode
+import android.view.KeyEvent
+import android.view.Menu
+import android.view.MenuItem
+import android.view.MotionEvent
+import android.view.SearchEvent
+import android.view.View
+import android.view.Window
+import android.view.WindowManager
+import android.view.accessibility.AccessibilityEvent
+import androidx.annotation.RequiresApi
+import com.moez.QKSMS.feature.compose.editing.DetailedChipView
+
+class ComposeWindowCallback(
+    private val localCallback: Window.Callback,
+    private val activity: Activity
+) : Window.Callback {
+
+    override fun dispatchKeyEvent(keyEvent: KeyEvent): Boolean {
+        return localCallback.dispatchKeyEvent(keyEvent)
+    }
+
+    override fun dispatchKeyShortcutEvent(keyEvent: KeyEvent): Boolean {
+        return localCallback.dispatchKeyShortcutEvent(keyEvent)
+    }
+
+    override fun dispatchTouchEvent(motionEvent: MotionEvent): Boolean {
+        if (motionEvent.action == MotionEvent.ACTION_DOWN) {
+            val v = activity.currentFocus
+            when (v) {
+                is DetailedChipView -> {
+                    val rect = Rect().apply { v.getGlobalVisibleRect(this) }
+                    if (!rect.contains(motionEvent.rawX.toInt(), motionEvent.rawY.toInt())) {
+                        v.hide()
+                        return true
+                    }
+                }
+            }
+        }
+        return localCallback.dispatchTouchEvent(motionEvent)
+    }
+
+    override fun dispatchTrackballEvent(motionEvent: MotionEvent): Boolean {
+        return localCallback.dispatchTrackballEvent(motionEvent)
+    }
+
+    override fun dispatchGenericMotionEvent(motionEvent: MotionEvent): Boolean {
+        return localCallback.dispatchGenericMotionEvent(motionEvent)
+    }
+
+    override fun dispatchPopulateAccessibilityEvent(accessibilityEvent: AccessibilityEvent): Boolean {
+        return localCallback.dispatchPopulateAccessibilityEvent(accessibilityEvent)
+    }
+
+    override fun onCreatePanelView(i: Int): View? {
+        return localCallback.onCreatePanelView(i)
+    }
+
+    override fun onCreatePanelMenu(i: Int, menu: Menu): Boolean {
+        return localCallback.onCreatePanelMenu(i, menu)
+    }
+
+    override fun onPreparePanel(i: Int, view: View, menu: Menu): Boolean {
+        return localCallback.onPreparePanel(i, view, menu)
+    }
+
+    override fun onMenuOpened(i: Int, menu: Menu): Boolean {
+        return localCallback.onMenuOpened(i, menu)
+    }
+
+    override fun onMenuItemSelected(i: Int, menuItem: MenuItem): Boolean {
+        return localCallback.onMenuItemSelected(i, menuItem)
+    }
+
+    override fun onWindowAttributesChanged(layoutParams: WindowManager.LayoutParams) {
+        localCallback.onWindowAttributesChanged(layoutParams)
+    }
+
+    override fun onContentChanged() {
+        localCallback.onContentChanged()
+    }
+
+    override fun onWindowFocusChanged(b: Boolean) {
+        localCallback.onWindowFocusChanged(b)
+    }
+
+    override fun onAttachedToWindow() {
+        localCallback.onAttachedToWindow()
+    }
+
+    override fun onDetachedFromWindow() {
+        localCallback.onDetachedFromWindow()
+    }
+
+    override fun onPanelClosed(i: Int, menu: Menu) {
+        localCallback.onPanelClosed(i, menu)
+    }
+
+    override fun onSearchRequested(): Boolean {
+        return localCallback.onSearchRequested()
+    }
+
+    @RequiresApi(api = Build.VERSION_CODES.M)
+    override fun onSearchRequested(searchEvent: SearchEvent): Boolean {
+        return localCallback.onSearchRequested(searchEvent)
+    }
+
+    override fun onWindowStartingActionMode(callback: ActionMode.Callback): ActionMode? {
+        return localCallback.onWindowStartingActionMode(callback)
+    }
+
+    @RequiresApi(api = Build.VERSION_CODES.M)
+    override fun onWindowStartingActionMode(callback: ActionMode.Callback, i: Int): ActionMode? {
+        return localCallback.onWindowStartingActionMode(callback, i)
+    }
+
+    override fun onActionModeStarted(actionMode: ActionMode) {
+        localCallback.onActionModeStarted(actionMode)
+    }
+
+    override fun onActionModeFinished(actionMode: ActionMode) {
+        localCallback.onActionModeFinished(actionMode)
+    }
+}
diff --git a/presentation/src/main/java/com/moez/QKSMS/feature/compose/MessagesAdapter.kt b/presentation/src/main/java/com/moez/QKSMS/feature/compose/MessagesAdapter.kt
index d892224b6..2624fdd5f 100644
--- a/presentation/src/main/java/com/moez/QKSMS/feature/compose/MessagesAdapter.kt
+++ b/presentation/src/main/java/com/moez/QKSMS/feature/compose/MessagesAdapter.kt
@@ -1,343 +1,343 @@
-/*
- * Copyright (C) 2017 Moez Bhatti <moez.bhatti@gmail.com>
- *
- * This file is part of QKSMS.
- *
- * QKSMS is free software: you can redistribute it and/or modify
- * it under the terms of the GNU General Public License as published by
- * the Free Software Foundation, either version 3 of the License, or
- * (at your option) any later version.
- *
- * QKSMS is distributed in the hope that it will be useful,
- * but WITHOUT ANY WARRANTY; without even the implied warranty of
- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
- * GNU General Public License for more details.
- *
- * You should have received a copy of the GNU General Public License
- * along with QKSMS.  If not, see <http://www.gnu.org/licenses/>.
- */
-package com.moez.QKSMS.feature.compose
-
-import android.animation.ObjectAnimator
-import android.content.Context
-import android.graphics.Typeface
-import android.os.Build
-import android.text.Layout
-import android.text.Spannable
-import android.text.SpannableString
-import android.text.style.StyleSpan
-import android.view.LayoutInflater
-import android.view.View
-import android.view.ViewGroup
-import android.widget.ImageView
-import android.widget.ProgressBar
-import androidx.recyclerview.widget.RecyclerView
-import com.jakewharton.rxbinding2.view.clicks
-import com.moez.QKSMS.R
-import com.moez.QKSMS.common.base.QkRealmAdapter
-import com.moez.QKSMS.common.base.QkViewHolder
-import com.moez.QKSMS.common.util.Colors
-import com.moez.QKSMS.common.util.DateFormatter
-import com.moez.QKSMS.common.util.TextViewStyler
-import com.moez.QKSMS.common.util.extensions.dpToPx
-import com.moez.QKSMS.common.util.extensions.forwardTouches
-import com.moez.QKSMS.common.util.extensions.setBackgroundTint
-import com.moez.QKSMS.common.util.extensions.setPadding
-import com.moez.QKSMS.common.util.extensions.setTint
-import com.moez.QKSMS.common.util.extensions.setVisible
-import com.moez.QKSMS.compat.SubscriptionManagerCompat
-import com.moez.QKSMS.extensions.isSmil
-import com.moez.QKSMS.extensions.isText
-import com.moez.QKSMS.feature.compose.BubbleUtils.canGroup
-import com.moez.QKSMS.feature.compose.BubbleUtils.getBubble
-import com.moez.QKSMS.feature.compose.part.PartsAdapter
-import com.moez.QKSMS.model.Conversation
-import com.moez.QKSMS.model.Message
-import com.moez.QKSMS.model.Recipient
-import com.moez.QKSMS.util.PhoneNumberUtils
-import com.moez.QKSMS.util.Preferences
-import io.reactivex.subjects.PublishSubject
-import io.reactivex.subjects.Subject
-import io.realm.RealmResults
-import kotlinx.android.synthetic.main.message_list_item_in.*
-import kotlinx.android.synthetic.main.message_list_item_in.attachments
-import kotlinx.android.synthetic.main.message_list_item_in.body
-import kotlinx.android.synthetic.main.message_list_item_in.sim
-import kotlinx.android.synthetic.main.message_list_item_in.simIndex
-import kotlinx.android.synthetic.main.message_list_item_in.status
-import kotlinx.android.synthetic.main.message_list_item_in.timestamp
-import kotlinx.android.synthetic.main.message_list_item_in.view.*
-import kotlinx.android.synthetic.main.message_list_item_out.*
-import java.util.*
-import java.util.concurrent.TimeUnit
-import javax.inject.Inject
-import javax.inject.Provider
-
-class MessagesAdapter @Inject constructor(
-    subscriptionManager: SubscriptionManagerCompat,
-    private val context: Context,
-    private val colors: Colors,
-    private val dateFormatter: DateFormatter,
-    private val partsAdapterProvider: Provider<PartsAdapter>,
-    private val phoneNumberUtils: PhoneNumberUtils,
-    private val prefs: Preferences,
-    private val textViewStyler: TextViewStyler
-) : QkRealmAdapter<Message>() {
-
-    companion object {
-        private const val VIEW_TYPE_MESSAGE_IN = 0
-        private const val VIEW_TYPE_MESSAGE_OUT = 1
-
-        // Thanks to Cory Kilger for this regex
-        // https://gist.github.com/cmkilger/b8f7dba3e76244a84e7e
-        private val EMOJI_REGEX = Regex(
-                "^[\\s\n\r]*(?:(?:[\u00a9\u00ae\u203c\u2049\u2122\u2139\u2194-\u2199\u21a9-\u21aa\u231a-\u231b\u2328\u23cf\u23e9-\u23f3\u23f8-\u23fa\u24c2\u25aa-\u25ab\u25b6\u25c0\u25fb-\u25fe\u2600-\u2604\u260e\u2611\u2614-\u2615\u2618\u261d\u2620\u2622-\u2623\u2626\u262a\u262e-\u262f\u2638-\u263a\u2648-\u2653\u2660\u2663\u2665-\u2666\u2668\u267b\u267f\u2692-\u2694\u2696-\u2697\u2699\u269b-\u269c\u26a0-\u26a1\u26aa-\u26ab\u26b0-\u26b1\u26bd-\u26be\u26c4-\u26c5\u26c8\u26ce-\u26cf\u26d1\u26d3-\u26d4\u26e9-\u26ea\u26f0-\u26f5\u26f7-\u26fa\u26fd\u2702\u2705\u2708-\u270d\u270f\u2712\u2714\u2716\u271d\u2721\u2728\u2733-\u2734\u2744\u2747\u274c\u274e\u2753-\u2755\u2757\u2763-\u2764\u2795-\u2797\u27a1\u27b0\u27bf\u2934-\u2935\u2b05-\u2b07\u2b1b-\u2b1c\u2b50\u2b55\u3030\u303d\u3297\u3299\ud83c\udc04\ud83c\udccf\ud83c\udd70-\ud83c\udd71\ud83c\udd7e-\ud83c\udd7f\ud83c\udd8e\ud83c\udd91-\ud83c\udd9a\ud83c\ude01-\ud83c\ude02\ud83c\ude1a\ud83c\ude2f\ud83c\ude32-\ud83c\ude3a\ud83c\ude50-\ud83c\ude51\u200d\ud83c\udf00-\ud83d\uddff\ud83d\ude00-\ud83d\ude4f\ud83d\ude80-\ud83d\udeff\ud83e\udd00-\ud83e\uddff\udb40\udc20-\udb40\udc7f]|\u200d[\u2640\u2642]|[\ud83c\udde6-\ud83c\uddff]{2}|.[\u20e0\u20e3\ufe0f]+)+[\\s\n\r]*)+$")
-
-    }
-
-    val clicks: Subject<Long> = PublishSubject.create()
-    val partClicks: Subject<Long> = PublishSubject.create()
-    val cancelSending: Subject<Long> = PublishSubject.create()
-
-    var data: Pair<Conversation, RealmResults<Message>>? = null
-        set(value) {
-            if (field === value) return
-
-            field = value
-            contactCache.clear()
-
-            updateData(value?.second)
-        }
-
-    /**
-     * Safely return the conversation, if available
-     */
-    private val conversation: Conversation?
-        get() = data?.first?.takeIf { it.isValid }
-
-    /**
-     * Mark this message as highlighted
-     */
-    var highlight: Long = -1L
-        set(value) {
-            if (field == value) return
-
-            field = value
-            notifyDataSetChanged()
-        }
-
-    private val contactCache = ContactCache()
-    private val expanded = HashMap<Long, Boolean>()
-    private val partsViewPool = RecyclerView.RecycledViewPool()
-    private val subs = subscriptionManager.activeSubscriptionInfoList
-
-    var theme: Colors.Theme = colors.theme()
-
-    /**
-     * If the viewType is negative, then the viewHolder has an attachment. We'll consider
-     * this a unique viewType even though it uses the same view, so that regular messages
-     * don't need clipToOutline set to true, and they don't need to worry about images
-     */
-    override fun onCreateViewHolder(parent: ViewGroup, viewType: Int): QkViewHolder {
-
-        // Use the parent's context to inflate the layout, otherwise link clicks will crash the app
-        val layoutInflater = LayoutInflater.from(parent.context)
-        val view: View
-
-        if (viewType == VIEW_TYPE_MESSAGE_OUT) {
-            view = layoutInflater.inflate(R.layout.message_list_item_out, parent, false)
-            view.findViewById<ImageView>(R.id.cancelIcon).setTint(theme.theme)
-            view.findViewById<ProgressBar>(R.id.cancel).setTint(theme.theme)
-        } else {
-            view = layoutInflater.inflate(R.layout.message_list_item_in, parent, false)
-        }
-
-        if (Build.VERSION.SDK_INT >= Build.VERSION_CODES.M) {
-            view.body.hyphenationFrequency = Layout.HYPHENATION_FREQUENCY_NONE
-        }
-
-        val partsAdapter = partsAdapterProvider.get()
-        partsAdapter.clicks.subscribe(partClicks)
-        view.attachments.adapter = partsAdapter
-        view.attachments.setRecycledViewPool(partsViewPool)
-        view.body.forwardTouches(view)
-
-        return QkViewHolder(view).apply {
-            view.setOnClickListener {
-                val message = getItem(adapterPosition) ?: return@setOnClickListener
-                when (toggleSelection(message.id, false)) {
-                    true -> view.isActivated = isSelected(message.id)
-                    false -> {
-                        clicks.onNext(message.id)
-                        expanded[message.id] = view.status.visibility != View.VISIBLE
-                        notifyItemChanged(adapterPosition)
-                    }
-                }
-            }
-            view.setOnLongClickListener {
-                val message = getItem(adapterPosition) ?: return@setOnLongClickListener true
-                toggleSelection(message.id)
-                view.isActivated = isSelected(message.id)
-                true
-            }
-        }
-    }
-
-    override fun onBindViewHolder(holder: QkViewHolder, position: Int) {
-        val message = getItem(position) ?: return
-        val previous = if (position == 0) null else getItem(position - 1)
-        val next = if (position == itemCount - 1) null else getItem(position + 1)
-
-        val theme = when (message.isOutgoingMessage()) {
-            true -> colors.theme()
-            false -> colors.theme(contactCache[message.address])
-        }
-
-        // Update the selected state
-        holder.containerView.isActivated = isSelected(message.id) || highlight == message.id
-
-        // Bind the cancel view
-        holder.cancel?.let { cancel ->
-            val isCancellable = message.isSending() && message.date > System.currentTimeMillis()
-            cancel.setVisible(isCancellable)
-            cancel.clicks().subscribe { cancelSending.onNext(message.id) }
-            cancel.progress = 2
-
-            if (isCancellable) {
-                val delay = when (prefs.sendDelay.get()) {
-                    Preferences.SEND_DELAY_SHORT -> 3000
-                    Preferences.SEND_DELAY_MEDIUM -> 5000
-                    Preferences.SEND_DELAY_LONG -> 10000
-                    else -> 0
-                }
-                val progress = (1 - (message.date - System.currentTimeMillis()) / delay.toFloat()) * 100
-
-                ObjectAnimator.ofInt(cancel, "progress", progress.toInt(), 100)
-                        .setDuration(message.date - System.currentTimeMillis())
-                        .start()
-            }
-        }
-
-        // Bind the message status
-        bindStatus(holder, message, next)
-
-        // Bind the timestamp
-        val timeSincePrevious = TimeUnit.MILLISECONDS.toMinutes(message.date - (previous?.date ?: 0))
-        val subscription = subs.find { sub -> sub.subscriptionId == message.subId }
-
-        holder.timestamp.text = dateFormatter.getMessageTimestamp(message.date)
-        holder.simIndex.text = subscription?.simSlotIndex?.plus(1)?.toString()
-
-        holder.timestamp.setVisible(timeSincePrevious >= BubbleUtils.TIMESTAMP_THRESHOLD
-                || message.subId != previous?.subId && subscription != null)
-
-        holder.sim.setVisible(message.subId != previous?.subId && subscription != null && subs.size > 1)
-        holder.simIndex.setVisible(message.subId != previous?.subId && subscription != null && subs.size > 1)
-
-        // Bind the grouping
-        val media = message.parts.filter { !it.isSmil() && !it.isText() }
-        holder.containerView.setPadding(bottom = if (canGroup(message, next)) 0 else 16.dpToPx(context))
-
-        // Bind the avatar and bubble colour
-        if (!message.isMe()) {
-            holder.avatar.setRecipient(contactCache[message.address])
-            holder.avatar.setVisible(!canGroup(message, next), View.INVISIBLE)
-
-            holder.body.setTextColor(theme.textPrimary)
-            holder.body.setBackgroundTint(theme.theme)
-        }
-
-        // Bind the body text
-        val messageText = when (message.isSms()) {
-            true -> message.body
-            false -> {
-                val subject = message.getCleansedSubject()
-                val body = message.parts
-                        .filter { part -> part.isText() }
-                        .mapNotNull { part -> part.text }
-                        .filter { text -> text.isNotBlank() }
-                        .joinToString("\n")
-
-                when {
-                    subject.isNotBlank() -> {
-                        val spannable = SpannableString(if (body.isNotBlank()) "$subject\n$body" else subject)
-                        spannable.setSpan(StyleSpan(Typeface.BOLD), 0, subject.length,
-                                Spannable.SPAN_INCLUSIVE_EXCLUSIVE)
-                        spannable
-                    }
-                    else -> body
-                }
-            }
-        }
-        val emojiOnly = messageText.isNotBlank() && messageText.matches(EMOJI_REGEX)
-        textViewStyler.setTextSize(holder.body, when (emojiOnly) {
-            true -> TextViewStyler.SIZE_EMOJI
-            false -> TextViewStyler.SIZE_PRIMARY
-        })
-
-        holder.body.text = messageText
-        holder.body.setVisible(message.isSms() || messageText.isNotBlank())
-        holder.body.setBackgroundResource(getBubble(
-                emojiOnly = emojiOnly,
-                canGroupWithPrevious = canGroup(message, previous) || media.isNotEmpty(),
-                canGroupWithNext = canGroup(message, next),
-                isMe = message.isMe()))
-
-        // Bind the attachments
-        val partsAdapter = holder.attachments.adapter as PartsAdapter
-        partsAdapter.theme = theme
-        partsAdapter.setData(message, previous, next, holder)
-    }
-
-    private fun bindStatus(holder: QkViewHolder, message: Message, next: Message?) {
-        val age = TimeUnit.MILLISECONDS.toMinutes(System.currentTimeMillis() - message.date)
-
-        holder.status.text = when {
-            message.isSending() -> context.getString(R.string.message_status_sending)
-            message.isDelivered() -> context.getString(R.string.message_status_delivered,
-                    dateFormatter.getTimestamp(message.dateSent))
-            message.isFailedMessage() -> context.getString(R.string.message_status_failed)
-
-            // Incoming group message
-            !message.isMe() && conversation?.recipients?.size ?: 0 > 1 -> {
-                "${contactCache[message.address]?.getDisplayName()} • ${dateFormatter.getTimestamp(message.date)}"
-            }
-
-            else -> dateFormatter.getTimestamp(message.date)
-        }
-
-        holder.status.setVisible(when {
-            expanded[message.id] == true -> true
-            message.isSending() -> true
-            message.isFailedMessage() -> true
-            expanded[message.id] == false -> false
-            conversation?.recipients?.size ?: 0 > 1 && !message.isMe() && next?.compareSender(message) != true -> true
-            message.isDelivered() && next?.isDelivered() != true && age <= BubbleUtils.TIMESTAMP_THRESHOLD -> true
-            else -> false
-        })
-    }
-
-    override fun getItemViewType(position: Int): Int {
-        val message = getItem(position) ?: return -1
-        return when (message.isMe()) {
-            true -> VIEW_TYPE_MESSAGE_OUT
-            false -> VIEW_TYPE_MESSAGE_IN
-        }
-    }
-
-    /**
-     * Cache the contacts in a map by the address, because the messages we're binding don't have
-     * a reference to the contact.
-     */
-    private inner class ContactCache : HashMap<String, Recipient?>() {
-
-        override fun get(key: String): Recipient? {
-            if (super.get(key)?.isValid != true) {
-                set(key, conversation?.recipients?.firstOrNull { phoneNumberUtils.compare(it.address, key) })
-            }
-
-            return super.get(key)?.takeIf { it.isValid }
-        }
-
-    }
+/*
+ * Copyright (C) 2017 Moez Bhatti <moez.bhatti@gmail.com>
+ *
+ * This file is part of QKSMS.
+ *
+ * QKSMS is free software: you can redistribute it and/or modify
+ * it under the terms of the GNU General Public License as published by
+ * the Free Software Foundation, either version 3 of the License, or
+ * (at your option) any later version.
+ *
+ * QKSMS is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+ * GNU General Public License for more details.
+ *
+ * You should have received a copy of the GNU General Public License
+ * along with QKSMS.  If not, see <http://www.gnu.org/licenses/>.
+ */
+package com.moez.QKSMS.feature.compose
+
+import android.animation.ObjectAnimator
+import android.content.Context
+import android.graphics.Typeface
+import android.os.Build
+import android.text.Layout
+import android.text.Spannable
+import android.text.SpannableString
+import android.text.style.StyleSpan
+import android.view.LayoutInflater
+import android.view.View
+import android.view.ViewGroup
+import android.widget.ImageView
+import android.widget.ProgressBar
+import androidx.recyclerview.widget.RecyclerView
+import com.jakewharton.rxbinding2.view.clicks
+import com.moez.QKSMS.R
+import com.moez.QKSMS.common.base.QkRealmAdapter
+import com.moez.QKSMS.common.base.QkViewHolder
+import com.moez.QKSMS.common.util.Colors
+import com.moez.QKSMS.common.util.DateFormatter
+import com.moez.QKSMS.common.util.TextViewStyler
+import com.moez.QKSMS.common.util.extensions.dpToPx
+import com.moez.QKSMS.common.util.extensions.forwardTouches
+import com.moez.QKSMS.common.util.extensions.setBackgroundTint
+import com.moez.QKSMS.common.util.extensions.setPadding
+import com.moez.QKSMS.common.util.extensions.setTint
+import com.moez.QKSMS.common.util.extensions.setVisible
+import com.moez.QKSMS.compat.SubscriptionManagerCompat
+import com.moez.QKSMS.extensions.isSmil
+import com.moez.QKSMS.extensions.isText
+import com.moez.QKSMS.feature.compose.BubbleUtils.canGroup
+import com.moez.QKSMS.feature.compose.BubbleUtils.getBubble
+import com.moez.QKSMS.feature.compose.part.PartsAdapter
+import com.moez.QKSMS.model.Conversation
+import com.moez.QKSMS.model.Message
+import com.moez.QKSMS.model.Recipient
+import com.moez.QKSMS.util.PhoneNumberUtils
+import com.moez.QKSMS.util.Preferences
+import io.reactivex.subjects.PublishSubject
+import io.reactivex.subjects.Subject
+import io.realm.RealmResults
+import kotlinx.android.synthetic.main.message_list_item_in.*
+import kotlinx.android.synthetic.main.message_list_item_in.attachments
+import kotlinx.android.synthetic.main.message_list_item_in.body
+import kotlinx.android.synthetic.main.message_list_item_in.sim
+import kotlinx.android.synthetic.main.message_list_item_in.simIndex
+import kotlinx.android.synthetic.main.message_list_item_in.status
+import kotlinx.android.synthetic.main.message_list_item_in.timestamp
+import kotlinx.android.synthetic.main.message_list_item_in.view.*
+import kotlinx.android.synthetic.main.message_list_item_out.*
+import java.util.*
+import java.util.concurrent.TimeUnit
+import javax.inject.Inject
+import javax.inject.Provider
+
+class MessagesAdapter @Inject constructor(
+    subscriptionManager: SubscriptionManagerCompat,
+    private val context: Context,
+    private val colors: Colors,
+    private val dateFormatter: DateFormatter,
+    private val partsAdapterProvider: Provider<PartsAdapter>,
+    private val phoneNumberUtils: PhoneNumberUtils,
+    private val prefs: Preferences,
+    private val textViewStyler: TextViewStyler
+) : QkRealmAdapter<Message>() {
+
+    companion object {
+        private const val VIEW_TYPE_MESSAGE_IN = 0
+        private const val VIEW_TYPE_MESSAGE_OUT = 1
+
+        // Thanks to Cory Kilger for this regex
+        // https://gist.github.com/cmkilger/b8f7dba3e76244a84e7e
+        private val EMOJI_REGEX = Regex(
+                "^[\\s\n\r]*(?:(?:[\u00a9\u00ae\u203c\u2049\u2122\u2139\u2194-\u2199\u21a9-\u21aa\u231a-\u231b\u2328\u23cf\u23e9-\u23f3\u23f8-\u23fa\u24c2\u25aa-\u25ab\u25b6\u25c0\u25fb-\u25fe\u2600-\u2604\u260e\u2611\u2614-\u2615\u2618\u261d\u2620\u2622-\u2623\u2626\u262a\u262e-\u262f\u2638-\u263a\u2648-\u2653\u2660\u2663\u2665-\u2666\u2668\u267b\u267f\u2692-\u2694\u2696-\u2697\u2699\u269b-\u269c\u26a0-\u26a1\u26aa-\u26ab\u26b0-\u26b1\u26bd-\u26be\u26c4-\u26c5\u26c8\u26ce-\u26cf\u26d1\u26d3-\u26d4\u26e9-\u26ea\u26f0-\u26f5\u26f7-\u26fa\u26fd\u2702\u2705\u2708-\u270d\u270f\u2712\u2714\u2716\u271d\u2721\u2728\u2733-\u2734\u2744\u2747\u274c\u274e\u2753-\u2755\u2757\u2763-\u2764\u2795-\u2797\u27a1\u27b0\u27bf\u2934-\u2935\u2b05-\u2b07\u2b1b-\u2b1c\u2b50\u2b55\u3030\u303d\u3297\u3299\ud83c\udc04\ud83c\udccf\ud83c\udd70-\ud83c\udd71\ud83c\udd7e-\ud83c\udd7f\ud83c\udd8e\ud83c\udd91-\ud83c\udd9a\ud83c\ude01-\ud83c\ude02\ud83c\ude1a\ud83c\ude2f\ud83c\ude32-\ud83c\ude3a\ud83c\ude50-\ud83c\ude51\u200d\ud83c\udf00-\ud83d\uddff\ud83d\ude00-\ud83d\ude4f\ud83d\ude80-\ud83d\udeff\ud83e\udd00-\ud83e\uddff\udb40\udc20-\udb40\udc7f]|\u200d[\u2640\u2642]|[\ud83c\udde6-\ud83c\uddff]{2}|.[\u20e0\u20e3\ufe0f]+)+[\\s\n\r]*)+$")
+
+    }
+
+    val clicks: Subject<Long> = PublishSubject.create()
+    val partClicks: Subject<Long> = PublishSubject.create()
+    val cancelSending: Subject<Long> = PublishSubject.create()
+
+    var data: Pair<Conversation, RealmResults<Message>>? = null
+        set(value) {
+            if (field === value) return
+
+            field = value
+            contactCache.clear()
+
+            updateData(value?.second)
+        }
+
+    /**
+     * Safely return the conversation, if available
+     */
+    private val conversation: Conversation?
+        get() = data?.first?.takeIf { it.isValid }
+
+    /**
+     * Mark this message as highlighted
+     */
+    var highlight: Long = -1L
+        set(value) {
+            if (field == value) return
+
+            field = value
+            notifyDataSetChanged()
+        }
+
+    private val contactCache = ContactCache()
+    private val expanded = HashMap<Long, Boolean>()
+    private val partsViewPool = RecyclerView.RecycledViewPool()
+    private val subs = subscriptionManager.activeSubscriptionInfoList
+
+    var theme: Colors.Theme = colors.theme()
+
+    /**
+     * If the viewType is negative, then the viewHolder has an attachment. We'll consider
+     * this a unique viewType even though it uses the same view, so that regular messages
+     * don't need clipToOutline set to true, and they don't need to worry about images
+     */
+    override fun onCreateViewHolder(parent: ViewGroup, viewType: Int): QkViewHolder {
+
+        // Use the parent's context to inflate the layout, otherwise link clicks will crash the app
+        val layoutInflater = LayoutInflater.from(parent.context)
+        val view: View
+
+        if (viewType == VIEW_TYPE_MESSAGE_OUT) {
+            view = layoutInflater.inflate(R.layout.message_list_item_out, parent, false)
+            view.findViewById<ImageView>(R.id.cancelIcon).setTint(theme.theme)
+            view.findViewById<ProgressBar>(R.id.cancel).setTint(theme.theme)
+        } else {
+            view = layoutInflater.inflate(R.layout.message_list_item_in, parent, false)
+        }
+
+        if (Build.VERSION.SDK_INT >= Build.VERSION_CODES.M) {
+            view.body.hyphenationFrequency = Layout.HYPHENATION_FREQUENCY_NONE
+        }
+
+        val partsAdapter = partsAdapterProvider.get()
+        partsAdapter.clicks.subscribe(partClicks)
+        view.attachments.adapter = partsAdapter
+        view.attachments.setRecycledViewPool(partsViewPool)
+        view.body.forwardTouches(view)
+
+        return QkViewHolder(view).apply {
+            view.setOnClickListener {
+                val message = getItem(adapterPosition) ?: return@setOnClickListener
+                when (toggleSelection(message.id, false)) {
+                    true -> view.isActivated = isSelected(message.id)
+                    false -> {
+                        clicks.onNext(message.id)
+                        expanded[message.id] = view.status.visibility != View.VISIBLE
+                        notifyItemChanged(adapterPosition)
+                    }
+                }
+            }
+            view.setOnLongClickListener {
+                val message = getItem(adapterPosition) ?: return@setOnLongClickListener true
+                toggleSelection(message.id)
+                view.isActivated = isSelected(message.id)
+                true
+            }
+        }
+    }
+
+    override fun onBindViewHolder(holder: QkViewHolder, position: Int) {
+        val message = getItem(position) ?: return
+        val previous = if (position == 0) null else getItem(position - 1)
+        val next = if (position == itemCount - 1) null else getItem(position + 1)
+
+        val theme = when (message.isOutgoingMessage()) {
+            true -> colors.theme()
+            false -> colors.theme(contactCache[message.address])
+        }
+
+        // Update the selected state
+        holder.containerView.isActivated = isSelected(message.id) || highlight == message.id
+
+        // Bind the cancel view
+        holder.cancel?.let { cancel ->
+            val isCancellable = message.isSending() && message.date > System.currentTimeMillis()
+            cancel.setVisible(isCancellable)
+            cancel.clicks().subscribe { cancelSending.onNext(message.id) }
+            cancel.progress = 2
+
+            if (isCancellable) {
+                val delay = when (prefs.sendDelay.get()) {
+                    Preferences.SEND_DELAY_SHORT -> 3000
+                    Preferences.SEND_DELAY_MEDIUM -> 5000
+                    Preferences.SEND_DELAY_LONG -> 10000
+                    else -> 0
+                }
+                val progress = (1 - (message.date - System.currentTimeMillis()) / delay.toFloat()) * 100
+
+                ObjectAnimator.ofInt(cancel, "progress", progress.toInt(), 100)
+                        .setDuration(message.date - System.currentTimeMillis())
+                        .start()
+            }
+        }
+
+        // Bind the message status
+        bindStatus(holder, message, next)
+
+        // Bind the timestamp
+        val timeSincePrevious = TimeUnit.MILLISECONDS.toMinutes(message.date - (previous?.date ?: 0))
+        val subscription = subs.find { sub -> sub.subscriptionId == message.subId }
+
+        holder.timestamp.text = dateFormatter.getMessageTimestamp(message.date)
+        holder.simIndex.text = subscription?.simSlotIndex?.plus(1)?.toString()
+
+        holder.timestamp.setVisible(timeSincePrevious >= BubbleUtils.TIMESTAMP_THRESHOLD
+                || message.subId != previous?.subId && subscription != null)
+
+        holder.sim.setVisible(message.subId != previous?.subId && subscription != null && subs.size > 1)
+        holder.simIndex.setVisible(message.subId != previous?.subId && subscription != null && subs.size > 1)
+
+        // Bind the grouping
+        val media = message.parts.filter { !it.isSmil() && !it.isText() }
+        holder.containerView.setPadding(bottom = if (canGroup(message, next)) 0 else 16.dpToPx(context))
+
+        // Bind the avatar and bubble colour
+        if (!message.isMe()) {
+            holder.avatar.setRecipient(contactCache[message.address])
+            holder.avatar.setVisible(!canGroup(message, next), View.INVISIBLE)
+
+            holder.body.setTextColor(theme.textPrimary)
+            holder.body.setBackgroundTint(theme.theme)
+        }
+
+        // Bind the body text
+        val messageText = when (message.isSms()) {
+            true -> message.body
+            false -> {
+                val subject = message.getCleansedSubject()
+                val body = message.parts
+                        .filter { part -> part.isText() }
+                        .mapNotNull { part -> part.text }
+                        .filter { text -> text.isNotBlank() }
+                        .joinToString("\n")
+
+                when {
+                    subject.isNotBlank() -> {
+                        val spannable = SpannableString(if (body.isNotBlank()) "$subject\n$body" else subject)
+                        spannable.setSpan(StyleSpan(Typeface.BOLD), 0, subject.length,
+                                Spannable.SPAN_INCLUSIVE_EXCLUSIVE)
+                        spannable
+                    }
+                    else -> body
+                }
+            }
+        }
+        val emojiOnly = messageText.isNotBlank() && messageText.matches(EMOJI_REGEX)
+        textViewStyler.setTextSize(holder.body, when (emojiOnly) {
+            true -> TextViewStyler.SIZE_EMOJI
+            false -> TextViewStyler.SIZE_PRIMARY
+        })
+
+        holder.body.text = messageText
+        holder.body.setVisible(message.isSms() || messageText.isNotBlank())
+        holder.body.setBackgroundResource(getBubble(
+                emojiOnly = emojiOnly,
+                canGroupWithPrevious = canGroup(message, previous) || media.isNotEmpty(),
+                canGroupWithNext = canGroup(message, next),
+                isMe = message.isMe()))
+
+        // Bind the attachments
+        val partsAdapter = holder.attachments.adapter as PartsAdapter
+        partsAdapter.theme = theme
+        partsAdapter.setData(message, previous, next, holder)
+    }
+
+    private fun bindStatus(holder: QkViewHolder, message: Message, next: Message?) {
+        val age = TimeUnit.MILLISECONDS.toMinutes(System.currentTimeMillis() - message.date)
+
+        holder.status.text = when {
+            message.isSending() -> context.getString(R.string.message_status_sending)
+            message.isDelivered() -> context.getString(R.string.message_status_delivered,
+                    dateFormatter.getTimestamp(message.dateSent))
+            message.isFailedMessage() -> context.getString(R.string.message_status_failed)
+
+            // Incoming group message
+            !message.isMe() && conversation?.recipients?.size ?: 0 > 1 -> {
+                "${contactCache[message.address]?.getDisplayName()} • ${dateFormatter.getTimestamp(message.date)}"
+            }
+
+            else -> dateFormatter.getTimestamp(message.date)
+        }
+
+        holder.status.setVisible(when {
+            expanded[message.id] == true -> true
+            message.isSending() -> true
+            message.isFailedMessage() -> true
+            expanded[message.id] == false -> false
+            conversation?.recipients?.size ?: 0 > 1 && !message.isMe() && next?.compareSender(message) != true -> true
+            message.isDelivered() && next?.isDelivered() != true && age <= BubbleUtils.TIMESTAMP_THRESHOLD -> true
+            else -> false
+        })
+    }
+
+    override fun getItemViewType(position: Int): Int {
+        val message = getItem(position) ?: return -1
+        return when (message.isMe()) {
+            true -> VIEW_TYPE_MESSAGE_OUT
+            false -> VIEW_TYPE_MESSAGE_IN
+        }
+    }
+
+    /**
+     * Cache the contacts in a map by the address, because the messages we're binding don't have
+     * a reference to the contact.
+     */
+    private inner class ContactCache : HashMap<String, Recipient?>() {
+
+        override fun get(key: String): Recipient? {
+            if (super.get(key)?.isValid != true) {
+                set(key, conversation?.recipients?.firstOrNull { phoneNumberUtils.compare(it.address, key) })
+            }
+
+            return super.get(key)?.takeIf { it.isValid }
+        }
+
+    }
 }
\ No newline at end of file
diff --git a/presentation/src/main/java/com/moez/QKSMS/feature/compose/editing/ChipsAdapter.kt b/presentation/src/main/java/com/moez/QKSMS/feature/compose/editing/ChipsAdapter.kt
index b415d32f3..9cf20075a 100755
--- a/presentation/src/main/java/com/moez/QKSMS/feature/compose/editing/ChipsAdapter.kt
+++ b/presentation/src/main/java/com/moez/QKSMS/feature/compose/editing/ChipsAdapter.kt
@@ -1,90 +1,90 @@
-/*
- * Copyright (C) 2019 Moez Bhatti <moez.bhatti@gmail.com>
- *
- * This file is part of QKSMS.
- *
- * QKSMS is free software: you can redistribute it and/or modify
- * it under the terms of the GNU General Public License as published by
- * the Free Software Foundation, either version 3 of the License, or
- * (at your option) any later version.
- *
- * QKSMS is distributed in the hope that it will be useful,
- * but WITHOUT ANY WARRANTY; without even the implied warranty of
- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
- * GNU General Public License for more details.
- *
- * You should have received a copy of the GNU General Public License
- * along with QKSMS.  If not, see <http://www.gnu.org/licenses/>.
- */
-package com.moez.QKSMS.feature.compose.editing
-
-import android.content.Context
-import android.os.Build
-import android.view.LayoutInflater
-import android.view.ViewGroup
-import android.widget.RelativeLayout
-import androidx.recyclerview.widget.RecyclerView
-import com.moez.QKSMS.R
-import com.moez.QKSMS.common.base.QkAdapter
-import com.moez.QKSMS.common.base.QkViewHolder
-import com.moez.QKSMS.common.util.extensions.dpToPx
-import com.moez.QKSMS.common.util.extensions.resolveThemeColor
-import com.moez.QKSMS.common.util.extensions.setBackgroundTint
-import com.moez.QKSMS.model.Recipient
-import io.reactivex.subjects.PublishSubject
-import kotlinx.android.synthetic.main.contact_chip.*
-import javax.inject.Inject
-
-class ChipsAdapter @Inject constructor() : QkAdapter<Recipient>() {
-
-    var view: RecyclerView? = null
-    val chipDeleted: PublishSubject<Recipient> = PublishSubject.create<Recipient>()
-
-    override fun onCreateViewHolder(parent: ViewGroup, viewType: Int): QkViewHolder {
-        val inflater = LayoutInflater.from(parent.context)
-        val view = inflater.inflate(R.layout.contact_chip, parent, false)
-        return QkViewHolder(view).apply {
-            // These theme attributes don't apply themselves on API 21
-            if (Build.VERSION.SDK_INT <= 22) {
-                content.setBackgroundTint(view.context.resolveThemeColor(R.attr.bubbleColor))
-            }
-
-            view.setOnClickListener {
-                val chip = getItem(adapterPosition)
-                showDetailedChip(view.context, chip)
-            }
-        }
-    }
-
-    override fun onBindViewHolder(holder: QkViewHolder, position: Int) {
-        val recipient = getItem(position)
-
-        holder.avatar.setRecipient(recipient)
-        holder.name.text = recipient.contact?.name?.takeIf { it.isNotBlank() } ?: recipient.address
-    }
-
-    /**
-     * The [context] has to come from a view, because we're inflating a view that used themed attrs
-     */
-    private fun showDetailedChip(context: Context, recipient: Recipient) {
-        val detailedChipView = DetailedChipView(context)
-        detailedChipView.setRecipient(recipient)
-
-        val rootView = view?.rootView as ViewGroup
-
-        val layoutParams = RelativeLayout.LayoutParams(
-                ViewGroup.LayoutParams.MATCH_PARENT,
-                ViewGroup.LayoutParams.WRAP_CONTENT)
-
-        layoutParams.topMargin = 24.dpToPx(context)
-        layoutParams.marginStart = 56.dpToPx(context)
-
-        rootView.addView(detailedChipView, layoutParams)
-        detailedChipView.show()
-
-        detailedChipView.setOnDeleteListener {
-            chipDeleted.onNext(recipient)
-            detailedChipView.hide()
-        }
-    }
-}
+/*
+ * Copyright (C) 2019 Moez Bhatti <moez.bhatti@gmail.com>
+ *
+ * This file is part of QKSMS.
+ *
+ * QKSMS is free software: you can redistribute it and/or modify
+ * it under the terms of the GNU General Public License as published by
+ * the Free Software Foundation, either version 3 of the License, or
+ * (at your option) any later version.
+ *
+ * QKSMS is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+ * GNU General Public License for more details.
+ *
+ * You should have received a copy of the GNU General Public License
+ * along with QKSMS.  If not, see <http://www.gnu.org/licenses/>.
+ */
+package com.moez.QKSMS.feature.compose.editing
+
+import android.content.Context
+import android.os.Build
+import android.view.LayoutInflater
+import android.view.ViewGroup
+import android.widget.RelativeLayout
+import androidx.recyclerview.widget.RecyclerView
+import com.moez.QKSMS.R
+import com.moez.QKSMS.common.base.QkAdapter
+import com.moez.QKSMS.common.base.QkViewHolder
+import com.moez.QKSMS.common.util.extensions.dpToPx
+import com.moez.QKSMS.common.util.extensions.resolveThemeColor
+import com.moez.QKSMS.common.util.extensions.setBackgroundTint
+import com.moez.QKSMS.model.Recipient
+import io.reactivex.subjects.PublishSubject
+import kotlinx.android.synthetic.main.contact_chip.*
+import javax.inject.Inject
+
+class ChipsAdapter @Inject constructor() : QkAdapter<Recipient>() {
+
+    var view: RecyclerView? = null
+    val chipDeleted: PublishSubject<Recipient> = PublishSubject.create<Recipient>()
+
+    override fun onCreateViewHolder(parent: ViewGroup, viewType: Int): QkViewHolder {
+        val inflater = LayoutInflater.from(parent.context)
+        val view = inflater.inflate(R.layout.contact_chip, parent, false)
+        return QkViewHolder(view).apply {
+            // These theme attributes don't apply themselves on API 21
+            if (Build.VERSION.SDK_INT <= 22) {
+                content.setBackgroundTint(view.context.resolveThemeColor(R.attr.bubbleColor))
+            }
+
+            view.setOnClickListener {
+                val chip = getItem(adapterPosition)
+                showDetailedChip(view.context, chip)
+            }
+        }
+    }
+
+    override fun onBindViewHolder(holder: QkViewHolder, position: Int) {
+        val recipient = getItem(position)
+
+        holder.avatar.setRecipient(recipient)
+        holder.name.text = recipient.contact?.name?.takeIf { it.isNotBlank() } ?: recipient.address
+    }
+
+    /**
+     * The [context] has to come from a view, because we're inflating a view that used themed attrs
+     */
+    private fun showDetailedChip(context: Context, recipient: Recipient) {
+        val detailedChipView = DetailedChipView(context)
+        detailedChipView.setRecipient(recipient)
+
+        val rootView = view?.rootView as ViewGroup
+
+        val layoutParams = RelativeLayout.LayoutParams(
+                ViewGroup.LayoutParams.MATCH_PARENT,
+                ViewGroup.LayoutParams.WRAP_CONTENT)
+
+        layoutParams.topMargin = 24.dpToPx(context)
+        layoutParams.marginStart = 56.dpToPx(context)
+
+        rootView.addView(detailedChipView, layoutParams)
+        detailedChipView.show()
+
+        detailedChipView.setOnDeleteListener {
+            chipDeleted.onNext(recipient)
+            detailedChipView.hide()
+        }
+    }
+}
diff --git a/presentation/src/main/java/com/moez/QKSMS/feature/compose/editing/ComposeItem.kt b/presentation/src/main/java/com/moez/QKSMS/feature/compose/editing/ComposeItem.kt
index 421418bf8..e288b9ada 100644
--- a/presentation/src/main/java/com/moez/QKSMS/feature/compose/editing/ComposeItem.kt
+++ b/presentation/src/main/java/com/moez/QKSMS/feature/compose/editing/ComposeItem.kt
@@ -1,52 +1,52 @@
-/*
- * Copyright (C) 2019 Moez Bhatti <moez.bhatti@gmail.com>
- *
- * This file is part of QKSMS.
- *
- * QKSMS is free software: you can redistribute it and/or modify
- * it under the terms of the GNU General Public License as published by
- * the Free Software Foundation, either version 3 of the License, or
- * (at your option) any later version.
- *
- * QKSMS is distributed in the hope that it will be useful,
- * but WITHOUT ANY WARRANTY; without even the implied warranty of
- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
- * GNU General Public License for more details.
- *
- * You should have received a copy of the GNU General Public License
- * along with QKSMS.  If not, see <http://www.gnu.org/licenses/>.
- */
-package com.moez.QKSMS.feature.compose.editing
-
-import com.moez.QKSMS.model.Contact
-import com.moez.QKSMS.model.ContactGroup
-import com.moez.QKSMS.model.Conversation
-import com.moez.QKSMS.model.PhoneNumber
-import io.realm.RealmList
-
-sealed class ComposeItem {
-
-    abstract fun getContacts(): List<Contact>
-
-    data class New(val value: Contact) : ComposeItem() {
-        override fun getContacts(): List<Contact> = listOf(value)
-    }
-
-    data class Recent(val value: Conversation) : ComposeItem() {
-        override fun getContacts(): List<Contact> = value.recipients.map { recipient ->
-            recipient.contact ?: Contact(numbers = RealmList(PhoneNumber(address = recipient.address)))
-        }
-    }
-
-    data class Starred(val value: Contact) : ComposeItem() {
-        override fun getContacts(): List<Contact> = listOf(value)
-    }
-
-    data class Group(val value: ContactGroup) : ComposeItem() {
-        override fun getContacts(): List<Contact> = value.contacts
-    }
-
-    data class Person(val value: Contact) : ComposeItem() {
-        override fun getContacts(): List<Contact> = listOf(value)
-    }
-}
+/*
+ * Copyright (C) 2019 Moez Bhatti <moez.bhatti@gmail.com>
+ *
+ * This file is part of QKSMS.
+ *
+ * QKSMS is free software: you can redistribute it and/or modify
+ * it under the terms of the GNU General Public License as published by
+ * the Free Software Foundation, either version 3 of the License, or
+ * (at your option) any later version.
+ *
+ * QKSMS is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+ * GNU General Public License for more details.
+ *
+ * You should have received a copy of the GNU General Public License
+ * along with QKSMS.  If not, see <http://www.gnu.org/licenses/>.
+ */
+package com.moez.QKSMS.feature.compose.editing
+
+import com.moez.QKSMS.model.Contact
+import com.moez.QKSMS.model.ContactGroup
+import com.moez.QKSMS.model.Conversation
+import com.moez.QKSMS.model.PhoneNumber
+import io.realm.RealmList
+
+sealed class ComposeItem {
+
+    abstract fun getContacts(): List<Contact>
+
+    data class New(val value: Contact) : ComposeItem() {
+        override fun getContacts(): List<Contact> = listOf(value)
+    }
+
+    data class Recent(val value: Conversation) : ComposeItem() {
+        override fun getContacts(): List<Contact> = value.recipients.map { recipient ->
+            recipient.contact ?: Contact(numbers = RealmList(PhoneNumber(address = recipient.address)))
+        }
+    }
+
+    data class Starred(val value: Contact) : ComposeItem() {
+        override fun getContacts(): List<Contact> = listOf(value)
+    }
+
+    data class Group(val value: ContactGroup) : ComposeItem() {
+        override fun getContacts(): List<Contact> = value.contacts
+    }
+
+    data class Person(val value: Contact) : ComposeItem() {
+        override fun getContacts(): List<Contact> = listOf(value)
+    }
+}
diff --git a/presentation/src/main/java/com/moez/QKSMS/feature/compose/editing/ComposeItemAdapter.kt b/presentation/src/main/java/com/moez/QKSMS/feature/compose/editing/ComposeItemAdapter.kt
index 2681d520b..6605d2b90 100644
--- a/presentation/src/main/java/com/moez/QKSMS/feature/compose/editing/ComposeItemAdapter.kt
+++ b/presentation/src/main/java/com/moez/QKSMS/feature/compose/editing/ComposeItemAdapter.kt
@@ -1,212 +1,212 @@
-/*
- * Copyright (C) 2019 Moez Bhatti <moez.bhatti@gmail.com>
- *
- * This file is part of QKSMS.
- *
- * QKSMS is free software: you can redistribute it and/or modify
- * it under the terms of the GNU General Public License as published by
- * the Free Software Foundation, either version 3 of the License, or
- * (at your option) any later version.
- *
- * QKSMS is distributed in the hope that it will be useful,
- * but WITHOUT ANY WARRANTY; without even the implied warranty of
- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
- * GNU General Public License for more details.
- *
- * You should have received a copy of the GNU General Public License
- * along with QKSMS.  If not, see <http://www.gnu.org/licenses/>.
- */
-package com.moez.QKSMS.feature.compose.editing
-
-import android.view.LayoutInflater
-import android.view.ViewGroup
-import androidx.core.view.isVisible
-import androidx.recyclerview.widget.RecyclerView
-import com.moez.QKSMS.R
-import com.moez.QKSMS.common.base.QkAdapter
-import com.moez.QKSMS.common.base.QkViewHolder
-import com.moez.QKSMS.common.util.Colors
-import com.moez.QKSMS.common.util.extensions.forwardTouches
-import com.moez.QKSMS.common.util.extensions.setTint
-import com.moez.QKSMS.extensions.associateByNotNull
-import com.moez.QKSMS.model.Contact
-import com.moez.QKSMS.model.ContactGroup
-import com.moez.QKSMS.model.Conversation
-import com.moez.QKSMS.model.Recipient
-import com.moez.QKSMS.repository.ConversationRepository
-import io.reactivex.disposables.CompositeDisposable
-import io.reactivex.rxkotlin.plusAssign
-import io.reactivex.subjects.PublishSubject
-import io.reactivex.subjects.Subject
-import kotlinx.android.synthetic.main.contact_list_item.*
-import kotlinx.android.synthetic.main.contact_list_item.view.*
-import javax.inject.Inject
-
-class ComposeItemAdapter @Inject constructor(
-    private val colors: Colors,
-    private val conversationRepo: ConversationRepository
-) : QkAdapter<ComposeItem>() {
-
-    val clicks: Subject<ComposeItem> = PublishSubject.create()
-    val longClicks: Subject<ComposeItem> = PublishSubject.create()
-
-    private val numbersViewPool = RecyclerView.RecycledViewPool()
-    private val disposables = CompositeDisposable()
-
-    var recipients: Map<String, Recipient> = mapOf()
-        set(value) {
-            field = value
-            notifyDataSetChanged()
-        }
-
-    override fun onCreateViewHolder(parent: ViewGroup, viewType: Int): QkViewHolder {
-        val layoutInflater = LayoutInflater.from(parent.context)
-        val view = layoutInflater.inflate(R.layout.contact_list_item, parent, false)
-
-        view.icon.setTint(colors.theme().theme)
-
-        view.numbers.setRecycledViewPool(numbersViewPool)
-        view.numbers.adapter = PhoneNumberAdapter()
-        view.numbers.forwardTouches(view)
-
-        return QkViewHolder(view).apply {
-            view.setOnClickListener {
-                val item = getItem(adapterPosition)
-                clicks.onNext(item)
-            }
-            view.setOnLongClickListener {
-                val item = getItem(adapterPosition)
-                longClicks.onNext(item)
-                true
-            }
-        }
-    }
-
-    override fun onBindViewHolder(holder: QkViewHolder, position: Int) {
-        val prevItem = if (position > 0) getItem(position - 1) else null
-        val item = getItem(position)
-
-        when (item) {
-            is ComposeItem.New -> bindNew(holder, item.value)
-            is ComposeItem.Recent -> bindRecent(holder, item.value, prevItem)
-            is ComposeItem.Starred -> bindStarred(holder, item.value, prevItem)
-            is ComposeItem.Person -> bindPerson(holder, item.value, prevItem)
-            is ComposeItem.Group -> bindGroup(holder, item.value, prevItem)
-        }
-    }
-
-    private fun bindNew(holder: QkViewHolder, contact: Contact) {
-        holder.index.isVisible = false
-
-        holder.icon.isVisible = false
-
-        holder.avatar.recipients = listOf(createRecipient(contact))
-
-        holder.title.text = contact.numbers.joinToString { it.address }
-
-        holder.subtitle.isVisible = false
-
-        holder.numbers.isVisible = false
-    }
-
-    private fun bindRecent(holder: QkViewHolder, conversation: Conversation, prev: ComposeItem?) {
-        holder.index.isVisible = false
-
-        holder.icon.isVisible = prev !is ComposeItem.Recent
-        holder.icon.setImageResource(R.drawable.ic_history_black_24dp)
-
-        holder.avatar.recipients = conversation.recipients
-
-        holder.title.text = conversation.getTitle()
-
-        holder.subtitle.isVisible = conversation.recipients.size > 1 && conversation.name.isBlank()
-        holder.subtitle.text = conversation.recipients.joinToString(", ") { recipient ->
-            recipient.contact?.name ?: recipient.address
-        }
-        holder.subtitle.collapseEnabled = conversation.recipients.size > 1
-
-        holder.numbers.isVisible = conversation.recipients.size == 1
-        (holder.numbers.adapter as PhoneNumberAdapter).data = conversation.recipients
-                .mapNotNull { recipient -> recipient.contact }
-                .flatMap { contact -> contact.numbers }
-    }
-
-    private fun bindStarred(holder: QkViewHolder, contact: Contact, prev: ComposeItem?) {
-        holder.index.isVisible = false
-
-        holder.icon.isVisible = prev !is ComposeItem.Starred
-        holder.icon.setImageResource(R.drawable.ic_star_black_24dp)
-
-        holder.avatar.recipients = listOf(createRecipient(contact))
-
-        holder.title.text = contact.name
-
-        holder.subtitle.isVisible = false
-
-        holder.numbers.isVisible = true
-        (holder.numbers.adapter as PhoneNumberAdapter).data = contact.numbers
-    }
-
-    private fun bindGroup(holder: QkViewHolder, group: ContactGroup, prev: ComposeItem?) {
-        holder.index.isVisible = false
-
-        holder.icon.isVisible = prev !is ComposeItem.Group
-        holder.icon.setImageResource(R.drawable.ic_people_black_24dp)
-
-        holder.avatar.recipients = group.contacts.map(::createRecipient)
-
-        holder.title.text = group.title
-
-        holder.subtitle.isVisible = true
-        holder.subtitle.text = group.contacts.joinToString(", ") { it.name }
-        holder.subtitle.collapseEnabled = group.contacts.size > 1
-
-        holder.numbers.isVisible = false
-    }
-
-    private fun bindPerson(holder: QkViewHolder, contact: Contact, prev: ComposeItem?) {
-        holder.index.isVisible = true
-        holder.index.text = if (contact.name.getOrNull(0)?.isLetter() == true) contact.name[0].toString() else "#"
-        holder.index.isVisible = prev !is ComposeItem.Person ||
-                (contact.name[0].isLetter() && !contact.name[0].equals(prev.value.name[0], ignoreCase = true)) ||
-                (!contact.name[0].isLetter() && prev.value.name[0].isLetter())
-
-        holder.icon.isVisible = false
-
-        holder.avatar.recipients = listOf(createRecipient(contact))
-
-        holder.title.text = contact.name
-
-        holder.subtitle.isVisible = false
-
-        holder.numbers.isVisible = true
-        (holder.numbers.adapter as PhoneNumberAdapter).data = contact.numbers
-    }
-
-    private fun createRecipient(contact: Contact): Recipient {
-        return recipients[contact.lookupKey] ?: Recipient(
-            address = contact.numbers.firstOrNull()?.address ?: "",
-            contact = contact)
-    }
-
-    override fun onAttachedToRecyclerView(recyclerView: RecyclerView) {
-        disposables += conversationRepo.getUnmanagedRecipients()
-                .map { recipients -> recipients.associateByNotNull { recipient -> recipient.contact?.lookupKey } }
-                .subscribe { recipients -> this@ComposeItemAdapter.recipients = recipients }
-    }
-
-    override fun onDetachedFromRecyclerView(recyclerView: RecyclerView) {
-        disposables.clear()
-    }
-
-    override fun areItemsTheSame(old: ComposeItem, new: ComposeItem): Boolean {
-        val oldIds = old.getContacts().map { contact -> contact.lookupKey }
-        val newIds = new.getContacts().map { contact -> contact.lookupKey }
-        return oldIds == newIds
-    }
-
-    override fun areContentsTheSame(old: ComposeItem, new: ComposeItem): Boolean {
-        return false
-    }
-
-}
+/*
+ * Copyright (C) 2019 Moez Bhatti <moez.bhatti@gmail.com>
+ *
+ * This file is part of QKSMS.
+ *
+ * QKSMS is free software: you can redistribute it and/or modify
+ * it under the terms of the GNU General Public License as published by
+ * the Free Software Foundation, either version 3 of the License, or
+ * (at your option) any later version.
+ *
+ * QKSMS is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+ * GNU General Public License for more details.
+ *
+ * You should have received a copy of the GNU General Public License
+ * along with QKSMS.  If not, see <http://www.gnu.org/licenses/>.
+ */
+package com.moez.QKSMS.feature.compose.editing
+
+import android.view.LayoutInflater
+import android.view.ViewGroup
+import androidx.core.view.isVisible
+import androidx.recyclerview.widget.RecyclerView
+import com.moez.QKSMS.R
+import com.moez.QKSMS.common.base.QkAdapter
+import com.moez.QKSMS.common.base.QkViewHolder
+import com.moez.QKSMS.common.util.Colors
+import com.moez.QKSMS.common.util.extensions.forwardTouches
+import com.moez.QKSMS.common.util.extensions.setTint
+import com.moez.QKSMS.extensions.associateByNotNull
+import com.moez.QKSMS.model.Contact
+import com.moez.QKSMS.model.ContactGroup
+import com.moez.QKSMS.model.Conversation
+import com.moez.QKSMS.model.Recipient
+import com.moez.QKSMS.repository.ConversationRepository
+import io.reactivex.disposables.CompositeDisposable
+import io.reactivex.rxkotlin.plusAssign
+import io.reactivex.subjects.PublishSubject
+import io.reactivex.subjects.Subject
+import kotlinx.android.synthetic.main.contact_list_item.*
+import kotlinx.android.synthetic.main.contact_list_item.view.*
+import javax.inject.Inject
+
+class ComposeItemAdapter @Inject constructor(
+    private val colors: Colors,
+    private val conversationRepo: ConversationRepository
+) : QkAdapter<ComposeItem>() {
+
+    val clicks: Subject<ComposeItem> = PublishSubject.create()
+    val longClicks: Subject<ComposeItem> = PublishSubject.create()
+
+    private val numbersViewPool = RecyclerView.RecycledViewPool()
+    private val disposables = CompositeDisposable()
+
+    var recipients: Map<String, Recipient> = mapOf()
+        set(value) {
+            field = value
+            notifyDataSetChanged()
+        }
+
+    override fun onCreateViewHolder(parent: ViewGroup, viewType: Int): QkViewHolder {
+        val layoutInflater = LayoutInflater.from(parent.context)
+        val view = layoutInflater.inflate(R.layout.contact_list_item, parent, false)
+
+        view.icon.setTint(colors.theme().theme)
+
+        view.numbers.setRecycledViewPool(numbersViewPool)
+        view.numbers.adapter = PhoneNumberAdapter()
+        view.numbers.forwardTouches(view)
+
+        return QkViewHolder(view).apply {
+            view.setOnClickListener {
+                val item = getItem(adapterPosition)
+                clicks.onNext(item)
+            }
+            view.setOnLongClickListener {
+                val item = getItem(adapterPosition)
+                longClicks.onNext(item)
+                true
+            }
+        }
+    }
+
+    override fun onBindViewHolder(holder: QkViewHolder, position: Int) {
+        val prevItem = if (position > 0) getItem(position - 1) else null
+        val item = getItem(position)
+
+        when (item) {
+            is ComposeItem.New -> bindNew(holder, item.value)
+            is ComposeItem.Recent -> bindRecent(holder, item.value, prevItem)
+            is ComposeItem.Starred -> bindStarred(holder, item.value, prevItem)
+            is ComposeItem.Person -> bindPerson(holder, item.value, prevItem)
+            is ComposeItem.Group -> bindGroup(holder, item.value, prevItem)
+        }
+    }
+
+    private fun bindNew(holder: QkViewHolder, contact: Contact) {
+        holder.index.isVisible = false
+
+        holder.icon.isVisible = false
+
+        holder.avatar.recipients = listOf(createRecipient(contact))
+
+        holder.title.text = contact.numbers.joinToString { it.address }
+
+        holder.subtitle.isVisible = false
+
+        holder.numbers.isVisible = false
+    }
+
+    private fun bindRecent(holder: QkViewHolder, conversation: Conversation, prev: ComposeItem?) {
+        holder.index.isVisible = false
+
+        holder.icon.isVisible = prev !is ComposeItem.Recent
+        holder.icon.setImageResource(R.drawable.ic_history_black_24dp)
+
+        holder.avatar.recipients = conversation.recipients
+
+        holder.title.text = conversation.getTitle()
+
+        holder.subtitle.isVisible = conversation.recipients.size > 1 && conversation.name.isBlank()
+        holder.subtitle.text = conversation.recipients.joinToString(", ") { recipient ->
+            recipient.contact?.name ?: recipient.address
+        }
+        holder.subtitle.collapseEnabled = conversation.recipients.size > 1
+
+        holder.numbers.isVisible = conversation.recipients.size == 1
+        (holder.numbers.adapter as PhoneNumberAdapter).data = conversation.recipients
+                .mapNotNull { recipient -> recipient.contact }
+                .flatMap { contact -> contact.numbers }
+    }
+
+    private fun bindStarred(holder: QkViewHolder, contact: Contact, prev: ComposeItem?) {
+        holder.index.isVisible = false
+
+        holder.icon.isVisible = prev !is ComposeItem.Starred
+        holder.icon.setImageResource(R.drawable.ic_star_black_24dp)
+
+        holder.avatar.recipients = listOf(createRecipient(contact))
+
+        holder.title.text = contact.name
+
+        holder.subtitle.isVisible = false
+
+        holder.numbers.isVisible = true
+        (holder.numbers.adapter as PhoneNumberAdapter).data = contact.numbers
+    }
+
+    private fun bindGroup(holder: QkViewHolder, group: ContactGroup, prev: ComposeItem?) {
+        holder.index.isVisible = false
+
+        holder.icon.isVisible = prev !is ComposeItem.Group
+        holder.icon.setImageResource(R.drawable.ic_people_black_24dp)
+
+        holder.avatar.recipients = group.contacts.map(::createRecipient)
+
+        holder.title.text = group.title
+
+        holder.subtitle.isVisible = true
+        holder.subtitle.text = group.contacts.joinToString(", ") { it.name }
+        holder.subtitle.collapseEnabled = group.contacts.size > 1
+
+        holder.numbers.isVisible = false
+    }
+
+    private fun bindPerson(holder: QkViewHolder, contact: Contact, prev: ComposeItem?) {
+        holder.index.isVisible = true
+        holder.index.text = if (contact.name.getOrNull(0)?.isLetter() == true) contact.name[0].toString() else "#"
+        holder.index.isVisible = prev !is ComposeItem.Person ||
+                (contact.name[0].isLetter() && !contact.name[0].equals(prev.value.name[0], ignoreCase = true)) ||
+                (!contact.name[0].isLetter() && prev.value.name[0].isLetter())
+
+        holder.icon.isVisible = false
+
+        holder.avatar.recipients = listOf(createRecipient(contact))
+
+        holder.title.text = contact.name
+
+        holder.subtitle.isVisible = false
+
+        holder.numbers.isVisible = true
+        (holder.numbers.adapter as PhoneNumberAdapter).data = contact.numbers
+    }
+
+    private fun createRecipient(contact: Contact): Recipient {
+        return recipients[contact.lookupKey] ?: Recipient(
+            address = contact.numbers.firstOrNull()?.address ?: "",
+            contact = contact)
+    }
+
+    override fun onAttachedToRecyclerView(recyclerView: RecyclerView) {
+        disposables += conversationRepo.getUnmanagedRecipients()
+                .map { recipients -> recipients.associateByNotNull { recipient -> recipient.contact?.lookupKey } }
+                .subscribe { recipients -> this@ComposeItemAdapter.recipients = recipients }
+    }
+
+    override fun onDetachedFromRecyclerView(recyclerView: RecyclerView) {
+        disposables.clear()
+    }
+
+    override fun areItemsTheSame(old: ComposeItem, new: ComposeItem): Boolean {
+        val oldIds = old.getContacts().map { contact -> contact.lookupKey }
+        val newIds = new.getContacts().map { contact -> contact.lookupKey }
+        return oldIds == newIds
+    }
+
+    override fun areContentsTheSame(old: ComposeItem, new: ComposeItem): Boolean {
+        return false
+    }
+
+}
diff --git a/presentation/src/main/java/com/moez/QKSMS/feature/compose/editing/DetailedChipView.kt b/presentation/src/main/java/com/moez/QKSMS/feature/compose/editing/DetailedChipView.kt
index aa90cd994..f14462e86 100755
--- a/presentation/src/main/java/com/moez/QKSMS/feature/compose/editing/DetailedChipView.kt
+++ b/presentation/src/main/java/com/moez/QKSMS/feature/compose/editing/DetailedChipView.kt
@@ -1,83 +1,83 @@
-/*
- * Copyright (C) 2019 Moez Bhatti <moez.bhatti@gmail.com>
- *
- * This file is part of QKSMS.
- *
- * QKSMS is free software: you can redistribute it and/or modify
- * it under the terms of the GNU General Public License as published by
- * the Free Software Foundation, either version 3 of the License, or
- * (at your option) any later version.
- *
- * QKSMS is distributed in the hope that it will be useful,
- * but WITHOUT ANY WARRANTY; without even the implied warranty of
- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
- * GNU General Public License for more details.
- *
- * You should have received a copy of the GNU General Public License
- * along with QKSMS.  If not, see <http://www.gnu.org/licenses/>.
- */
-package com.moez.QKSMS.feature.compose.editing
-
-import android.content.Context
-import android.view.View
-import android.view.animation.AlphaAnimation
-import android.widget.RelativeLayout
-import com.moez.QKSMS.R
-import com.moez.QKSMS.common.util.Colors
-import com.moez.QKSMS.common.util.extensions.setBackgroundTint
-import com.moez.QKSMS.common.util.extensions.setTint
-import com.moez.QKSMS.injection.appComponent
-import com.moez.QKSMS.model.Recipient
-import kotlinx.android.synthetic.main.contact_chip_detailed.view.*
-import javax.inject.Inject
-
-class DetailedChipView(context: Context) : RelativeLayout(context) {
-
-    @Inject lateinit var colors: Colors
-
-    init {
-        View.inflate(context, R.layout.contact_chip_detailed, this)
-        appComponent.inject(this)
-
-        setOnClickListener { hide() }
-
-        visibility = View.GONE
-
-        isFocusable = true
-        isFocusableInTouchMode = true
-    }
-
-    fun setRecipient(recipient: Recipient) {
-        avatar.setRecipient(recipient)
-        name.text = recipient.contact?.name?.takeIf { it.isNotBlank() } ?: recipient.address
-        info.text = recipient.address
-
-        colors.theme(recipient).let { theme ->
-            card.setBackgroundTint(theme.theme)
-            name.setTextColor(theme.textPrimary)
-            info.setTextColor(theme.textTertiary)
-            delete.setTint(theme.textPrimary)
-        }
-    }
-
-    fun show() {
-        startAnimation(AlphaAnimation(0f, 1f).apply { duration = 200 })
-
-        visibility = View.VISIBLE
-        requestFocus()
-        isClickable = true
-    }
-
-    fun hide() {
-        startAnimation(AlphaAnimation(1f, 0f).apply { duration = 200 })
-
-        visibility = View.GONE
-        clearFocus()
-        isClickable = false
-    }
-
-    fun setOnDeleteListener(listener: (View) -> Unit) {
-        delete.setOnClickListener(listener)
-    }
-
-}
+/*
+ * Copyright (C) 2019 Moez Bhatti <moez.bhatti@gmail.com>
+ *
+ * This file is part of QKSMS.
+ *
+ * QKSMS is free software: you can redistribute it and/or modify
+ * it under the terms of the GNU General Public License as published by
+ * the Free Software Foundation, either version 3 of the License, or
+ * (at your option) any later version.
+ *
+ * QKSMS is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+ * GNU General Public License for more details.
+ *
+ * You should have received a copy of the GNU General Public License
+ * along with QKSMS.  If not, see <http://www.gnu.org/licenses/>.
+ */
+package com.moez.QKSMS.feature.compose.editing
+
+import android.content.Context
+import android.view.View
+import android.view.animation.AlphaAnimation
+import android.widget.RelativeLayout
+import com.moez.QKSMS.R
+import com.moez.QKSMS.common.util.Colors
+import com.moez.QKSMS.common.util.extensions.setBackgroundTint
+import com.moez.QKSMS.common.util.extensions.setTint
+import com.moez.QKSMS.injection.appComponent
+import com.moez.QKSMS.model.Recipient
+import kotlinx.android.synthetic.main.contact_chip_detailed.view.*
+import javax.inject.Inject
+
+class DetailedChipView(context: Context) : RelativeLayout(context) {
+
+    @Inject lateinit var colors: Colors
+
+    init {
+        View.inflate(context, R.layout.contact_chip_detailed, this)
+        appComponent.inject(this)
+
+        setOnClickListener { hide() }
+
+        visibility = View.GONE
+
+        isFocusable = true
+        isFocusableInTouchMode = true
+    }
+
+    fun setRecipient(recipient: Recipient) {
+        avatar.setRecipient(recipient)
+        name.text = recipient.contact?.name?.takeIf { it.isNotBlank() } ?: recipient.address
+        info.text = recipient.address
+
+        colors.theme(recipient).let { theme ->
+            card.setBackgroundTint(theme.theme)
+            name.setTextColor(theme.textPrimary)
+            info.setTextColor(theme.textTertiary)
+            delete.setTint(theme.textPrimary)
+        }
+    }
+
+    fun show() {
+        startAnimation(AlphaAnimation(0f, 1f).apply { duration = 200 })
+
+        visibility = View.VISIBLE
+        requestFocus()
+        isClickable = true
+    }
+
+    fun hide() {
+        startAnimation(AlphaAnimation(1f, 0f).apply { duration = 200 })
+
+        visibility = View.GONE
+        clearFocus()
+        isClickable = false
+    }
+
+    fun setOnDeleteListener(listener: (View) -> Unit) {
+        delete.setOnClickListener(listener)
+    }
+
+}
diff --git a/presentation/src/main/java/com/moez/QKSMS/feature/compose/editing/PhoneNumberAction.kt b/presentation/src/main/java/com/moez/QKSMS/feature/compose/editing/PhoneNumberAction.kt
index 7464cefd3..5f0f73766 100644
--- a/presentation/src/main/java/com/moez/QKSMS/feature/compose/editing/PhoneNumberAction.kt
+++ b/presentation/src/main/java/com/moez/QKSMS/feature/compose/editing/PhoneNumberAction.kt
@@ -1,25 +1,25 @@
-/*
- * Copyright (C) 2019 Moez Bhatti <moez.bhatti@gmail.com>
- *
- * This file is part of QKSMS.
- *
- * QKSMS is free software: you can redistribute it and/or modify
- * it under the terms of the GNU General Public License as published by
- * the Free Software Foundation, either version 3 of the License, or
- * (at your option) any later version.
- *
- * QKSMS is distributed in the hope that it will be useful,
- * but WITHOUT ANY WARRANTY; without even the implied warranty of
- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
- * GNU General Public License for more details.
- *
- * You should have received a copy of the GNU General Public License
- * along with QKSMS.  If not, see <http://www.gnu.org/licenses/>.
- */
-package com.moez.QKSMS.feature.compose.editing
-
-enum class PhoneNumberAction {
-    CANCEL,
-    JUST_ONCE,
-    ALWAYS
-}
+/*
+ * Copyright (C) 2019 Moez Bhatti <moez.bhatti@gmail.com>
+ *
+ * This file is part of QKSMS.
+ *
+ * QKSMS is free software: you can redistribute it and/or modify
+ * it under the terms of the GNU General Public License as published by
+ * the Free Software Foundation, either version 3 of the License, or
+ * (at your option) any later version.
+ *
+ * QKSMS is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+ * GNU General Public License for more details.
+ *
+ * You should have received a copy of the GNU General Public License
+ * along with QKSMS.  If not, see <http://www.gnu.org/licenses/>.
+ */
+package com.moez.QKSMS.feature.compose.editing
+
+enum class PhoneNumberAction {
+    CANCEL,
+    JUST_ONCE,
+    ALWAYS
+}
diff --git a/presentation/src/main/java/com/moez/QKSMS/feature/compose/editing/PhoneNumberAdapter.kt b/presentation/src/main/java/com/moez/QKSMS/feature/compose/editing/PhoneNumberAdapter.kt
index 534f013e9..345dcefca 100644
--- a/presentation/src/main/java/com/moez/QKSMS/feature/compose/editing/PhoneNumberAdapter.kt
+++ b/presentation/src/main/java/com/moez/QKSMS/feature/compose/editing/PhoneNumberAdapter.kt
@@ -1,52 +1,52 @@
-/*
- * Copyright (C) 2017 Moez Bhatti <moez.bhatti@gmail.com>
- *
- * This file is part of QKSMS.
- *
- * QKSMS is free software: you can redistribute it and/or modify
- * it under the terms of the GNU General Public License as published by
- * the Free Software Foundation, either version 3 of the License, or
- * (at your option) any later version.
- *
- * QKSMS is distributed in the hope that it will be useful,
- * but WITHOUT ANY WARRANTY; without even the implied warranty of
- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
- * GNU General Public License for more details.
- *
- * You should have received a copy of the GNU General Public License
- * along with QKSMS.  If not, see <http://www.gnu.org/licenses/>.
- */
-package com.moez.QKSMS.feature.compose.editing
-
-import android.view.LayoutInflater
-import android.view.ViewGroup
-import com.moez.QKSMS.R
-import com.moez.QKSMS.common.base.QkAdapter
-import com.moez.QKSMS.common.base.QkViewHolder
-import com.moez.QKSMS.model.PhoneNumber
-import kotlinx.android.synthetic.main.contact_number_list_item.*
-
-class PhoneNumberAdapter : QkAdapter<PhoneNumber>() {
-
-    override fun onCreateViewHolder(parent: ViewGroup, viewType: Int): QkViewHolder {
-        val inflater = LayoutInflater.from(parent.context)
-        val view = inflater.inflate(R.layout.contact_number_list_item, parent, false)
-        return QkViewHolder(view)
-    }
-
-    override fun onBindViewHolder(holder: QkViewHolder, position: Int) {
-        val number = getItem(position)
-
-        holder.address.text = number.address
-        holder.type.text = number.type
-    }
-
-    override fun areItemsTheSame(old: PhoneNumber, new: PhoneNumber): Boolean {
-        return old.type == new.type && old.address == new.address
-    }
-
-    override fun areContentsTheSame(old: PhoneNumber, new: PhoneNumber): Boolean {
-        return old.type == new.type && old.address == new.address
-    }
-
+/*
+ * Copyright (C) 2017 Moez Bhatti <moez.bhatti@gmail.com>
+ *
+ * This file is part of QKSMS.
+ *
+ * QKSMS is free software: you can redistribute it and/or modify
+ * it under the terms of the GNU General Public License as published by
+ * the Free Software Foundation, either version 3 of the License, or
+ * (at your option) any later version.
+ *
+ * QKSMS is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+ * GNU General Public License for more details.
+ *
+ * You should have received a copy of the GNU General Public License
+ * along with QKSMS.  If not, see <http://www.gnu.org/licenses/>.
+ */
+package com.moez.QKSMS.feature.compose.editing
+
+import android.view.LayoutInflater
+import android.view.ViewGroup
+import com.moez.QKSMS.R
+import com.moez.QKSMS.common.base.QkAdapter
+import com.moez.QKSMS.common.base.QkViewHolder
+import com.moez.QKSMS.model.PhoneNumber
+import kotlinx.android.synthetic.main.contact_number_list_item.*
+
+class PhoneNumberAdapter : QkAdapter<PhoneNumber>() {
+
+    override fun onCreateViewHolder(parent: ViewGroup, viewType: Int): QkViewHolder {
+        val inflater = LayoutInflater.from(parent.context)
+        val view = inflater.inflate(R.layout.contact_number_list_item, parent, false)
+        return QkViewHolder(view)
+    }
+
+    override fun onBindViewHolder(holder: QkViewHolder, position: Int) {
+        val number = getItem(position)
+
+        holder.address.text = number.address
+        holder.type.text = number.type
+    }
+
+    override fun areItemsTheSame(old: PhoneNumber, new: PhoneNumber): Boolean {
+        return old.type == new.type && old.address == new.address
+    }
+
+    override fun areContentsTheSame(old: PhoneNumber, new: PhoneNumber): Boolean {
+        return old.type == new.type && old.address == new.address
+    }
+
 }
\ No newline at end of file
diff --git a/presentation/src/main/java/com/moez/QKSMS/feature/compose/editing/PhoneNumberPickerAdapter.kt b/presentation/src/main/java/com/moez/QKSMS/feature/compose/editing/PhoneNumberPickerAdapter.kt
index 084e41a37..26554bfd3 100644
--- a/presentation/src/main/java/com/moez/QKSMS/feature/compose/editing/PhoneNumberPickerAdapter.kt
+++ b/presentation/src/main/java/com/moez/QKSMS/feature/compose/editing/PhoneNumberPickerAdapter.kt
@@ -1,80 +1,80 @@
-/*
- * Copyright (C) 2019 Moez Bhatti <moez.bhatti@gmail.com>
- *
- * This file is part of QKSMS.
- *
- * QKSMS is free software: you can redistribute it and/or modify
- * it under the terms of the GNU General Public License as published by
- * the Free Software Foundation, either version 3 of the License, or
- * (at your option) any later version.
- *
- * QKSMS is distributed in the hope that it will be useful,
- * but WITHOUT ANY WARRANTY; without even the implied warranty of
- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
- * GNU General Public License for more details.
- *
- * You should have received a copy of the GNU General Public License
- * along with QKSMS.  If not, see <http://www.gnu.org/licenses/>.
- */
-package com.moez.QKSMS.feature.compose.editing
-
-import android.content.Context
-import android.view.LayoutInflater
-import android.view.ViewGroup
-import com.moez.QKSMS.R
-import com.moez.QKSMS.common.base.QkAdapter
-import com.moez.QKSMS.common.base.QkViewHolder
-import com.moez.QKSMS.common.util.extensions.forwardTouches
-import com.moez.QKSMS.extensions.Optional
-import com.moez.QKSMS.model.PhoneNumber
-import io.reactivex.subjects.BehaviorSubject
-import io.reactivex.subjects.Subject
-import kotlinx.android.synthetic.main.phone_number_list_item.*
-import kotlinx.android.synthetic.main.radio_preference_view.*
-import kotlinx.android.synthetic.main.radio_preference_view.view.*
-import javax.inject.Inject
-
-class PhoneNumberPickerAdapter @Inject constructor(
-    private val context: Context
-) : QkAdapter<PhoneNumber>() {
-
-    val selectedItemChanges: Subject<Optional<Long>> = BehaviorSubject.create()
-
-    private var selectedItem: Long? = null
-        set(value) {
-            data.indexOfFirst { number -> number.id == field }.takeIf { it != -1 }?.run(::notifyItemChanged)
-            field = value
-            data.indexOfFirst { number -> number.id == field }.takeIf { it != -1 }?.run(::notifyItemChanged)
-            selectedItemChanges.onNext(Optional(value))
-        }
-
-    override fun onCreateViewHolder(parent: ViewGroup, viewType: Int): QkViewHolder {
-        val inflater = LayoutInflater.from(parent.context)
-        val view = inflater.inflate(R.layout.phone_number_list_item, parent, false)
-        return QkViewHolder(view).apply {
-            radioButton.forwardTouches(itemView)
-
-            view.setOnClickListener {
-                val phoneNumber = getItem(adapterPosition)
-                selectedItem = phoneNumber.id
-            }
-        }
-    }
-
-    override fun onBindViewHolder(holder: QkViewHolder, position: Int) {
-        val phoneNumber = getItem(position)
-
-        holder.number.radioButton.isChecked = phoneNumber.id == selectedItem
-        holder.number.titleView.text = phoneNumber.address
-        holder.number.summaryView.text = when (phoneNumber.isDefault) {
-            true -> context.getString(R.string.compose_number_picker_default, phoneNumber.type)
-            false -> phoneNumber.type
-        }
-    }
-
-    override fun onDatasetChanged() {
-        super.onDatasetChanged()
-        selectedItem = data.find { number -> number.isDefault }?.id ?: data.firstOrNull()?.id
-    }
-
-}
+/*
+ * Copyright (C) 2019 Moez Bhatti <moez.bhatti@gmail.com>
+ *
+ * This file is part of QKSMS.
+ *
+ * QKSMS is free software: you can redistribute it and/or modify
+ * it under the terms of the GNU General Public License as published by
+ * the Free Software Foundation, either version 3 of the License, or
+ * (at your option) any later version.
+ *
+ * QKSMS is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+ * GNU General Public License for more details.
+ *
+ * You should have received a copy of the GNU General Public License
+ * along with QKSMS.  If not, see <http://www.gnu.org/licenses/>.
+ */
+package com.moez.QKSMS.feature.compose.editing
+
+import android.content.Context
+import android.view.LayoutInflater
+import android.view.ViewGroup
+import com.moez.QKSMS.R
+import com.moez.QKSMS.common.base.QkAdapter
+import com.moez.QKSMS.common.base.QkViewHolder
+import com.moez.QKSMS.common.util.extensions.forwardTouches
+import com.moez.QKSMS.extensions.Optional
+import com.moez.QKSMS.model.PhoneNumber
+import io.reactivex.subjects.BehaviorSubject
+import io.reactivex.subjects.Subject
+import kotlinx.android.synthetic.main.phone_number_list_item.*
+import kotlinx.android.synthetic.main.radio_preference_view.*
+import kotlinx.android.synthetic.main.radio_preference_view.view.*
+import javax.inject.Inject
+
+class PhoneNumberPickerAdapter @Inject constructor(
+    private val context: Context
+) : QkAdapter<PhoneNumber>() {
+
+    val selectedItemChanges: Subject<Optional<Long>> = BehaviorSubject.create()
+
+    private var selectedItem: Long? = null
+        set(value) {
+            data.indexOfFirst { number -> number.id == field }.takeIf { it != -1 }?.run(::notifyItemChanged)
+            field = value
+            data.indexOfFirst { number -> number.id == field }.takeIf { it != -1 }?.run(::notifyItemChanged)
+            selectedItemChanges.onNext(Optional(value))
+        }
+
+    override fun onCreateViewHolder(parent: ViewGroup, viewType: Int): QkViewHolder {
+        val inflater = LayoutInflater.from(parent.context)
+        val view = inflater.inflate(R.layout.phone_number_list_item, parent, false)
+        return QkViewHolder(view).apply {
+            radioButton.forwardTouches(itemView)
+
+            view.setOnClickListener {
+                val phoneNumber = getItem(adapterPosition)
+                selectedItem = phoneNumber.id
+            }
+        }
+    }
+
+    override fun onBindViewHolder(holder: QkViewHolder, position: Int) {
+        val phoneNumber = getItem(position)
+
+        holder.number.radioButton.isChecked = phoneNumber.id == selectedItem
+        holder.number.titleView.text = phoneNumber.address
+        holder.number.summaryView.text = when (phoneNumber.isDefault) {
+            true -> context.getString(R.string.compose_number_picker_default, phoneNumber.type)
+            false -> phoneNumber.type
+        }
+    }
+
+    override fun onDatasetChanged() {
+        super.onDatasetChanged()
+        selectedItem = data.find { number -> number.isDefault }?.id ?: data.firstOrNull()?.id
+    }
+
+}
diff --git a/presentation/src/main/java/com/moez/QKSMS/feature/compose/part/FileBinder.kt b/presentation/src/main/java/com/moez/QKSMS/feature/compose/part/FileBinder.kt
index ff12a1bdd..02a79b9ea 100644
--- a/presentation/src/main/java/com/moez/QKSMS/feature/compose/part/FileBinder.kt
+++ b/presentation/src/main/java/com/moez/QKSMS/feature/compose/part/FileBinder.kt
@@ -1,94 +1,94 @@
-/*
- * Copyright (C) 2019 Moez Bhatti <moez.bhatti@gmail.com>
- *
- * This file is part of QKSMS.
- *
- * QKSMS is free software: you can redistribute it and/or modify
- * it under the terms of the GNU General Public License as published by
- * the Free Software Foundation, either version 3 of the License, or
- * (at your option) any later version.
- *
- * QKSMS is distributed in the hope that it will be useful,
- * but WITHOUT ANY WARRANTY; without even the implied warranty of
- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
- * GNU General Public License for more details.
- *
- * You should have received a copy of the GNU General Public License
- * along with QKSMS.  If not, see <http://www.gnu.org/licenses/>.
- */
-package com.moez.QKSMS.feature.compose.part
-
-import android.annotation.SuppressLint
-import android.content.Context
-import android.view.Gravity
-import android.widget.FrameLayout
-import com.moez.QKSMS.R
-import com.moez.QKSMS.common.base.QkViewHolder
-import com.moez.QKSMS.common.util.Colors
-import com.moez.QKSMS.common.util.extensions.resolveThemeColor
-import com.moez.QKSMS.common.util.extensions.setBackgroundTint
-import com.moez.QKSMS.common.util.extensions.setTint
-import com.moez.QKSMS.feature.compose.BubbleUtils
-import com.moez.QKSMS.model.Message
-import com.moez.QKSMS.model.MmsPart
-import io.reactivex.Observable
-import io.reactivex.android.schedulers.AndroidSchedulers
-import io.reactivex.schedulers.Schedulers
-import kotlinx.android.synthetic.main.mms_file_list_item.*
-import javax.inject.Inject
-
-class FileBinder @Inject constructor(colors: Colors, private val context: Context) : PartBinder() {
-
-    override val partLayout = R.layout.mms_file_list_item
-    override var theme = colors.theme()
-
-    // This is the last binder we check. If we're here, we can bind the part
-    override fun canBindPart(part: MmsPart) = true
-
-    @SuppressLint("CheckResult")
-    override fun bindPart(
-        holder: QkViewHolder,
-        part: MmsPart,
-        message: Message,
-        canGroupWithPrevious: Boolean,
-        canGroupWithNext: Boolean
-    ) {
-        BubbleUtils.getBubble(false, canGroupWithPrevious, canGroupWithNext, message.isMe())
-                .let(holder.fileBackground::setBackgroundResource)
-
-        holder.containerView.setOnClickListener { clicks.onNext(part.id) }
-
-        Observable.just(part.getUri())
-                .map(context.contentResolver::openInputStream)
-                .map { inputStream -> inputStream.use { it.available() } }
-                .map { bytes ->
-                    when (bytes) {
-                        in 0..999 -> "$bytes B"
-                        in 1000..999999 -> "${"%.1f".format(bytes / 1000f)} KB"
-                        in 1000000..9999999 -> "${"%.1f".format(bytes / 1000000f)} MB"
-                        else -> "${"%.1f".format(bytes / 1000000000f)} GB"
-                    }
-                }
-                .subscribeOn(Schedulers.io())
-                .observeOn(AndroidSchedulers.mainThread())
-                .subscribe { size -> holder.size.text = size }
-
-        holder.filename.text = part.name
-
-        val params = holder.fileBackground.layoutParams as FrameLayout.LayoutParams
-        if (!message.isMe()) {
-            holder.fileBackground.layoutParams = params.apply { gravity = Gravity.START }
-            holder.fileBackground.setBackgroundTint(theme.theme)
-            holder.icon.setTint(theme.textPrimary)
-            holder.filename.setTextColor(theme.textPrimary)
-            holder.size.setTextColor(theme.textTertiary)
-        } else {
-            holder.fileBackground.layoutParams = params.apply { gravity = Gravity.END }
-            holder.fileBackground.setBackgroundTint(holder.containerView.context.resolveThemeColor(R.attr.bubbleColor))
-            holder.icon.setTint(holder.containerView.context.resolveThemeColor(android.R.attr.textColorSecondary))
-            holder.filename.setTextColor(holder.containerView.context.resolveThemeColor(android.R.attr.textColorPrimary))
-            holder.size.setTextColor(holder.containerView.context.resolveThemeColor(android.R.attr.textColorTertiary))
-        }
-    }
-
+/*
+ * Copyright (C) 2019 Moez Bhatti <moez.bhatti@gmail.com>
+ *
+ * This file is part of QKSMS.
+ *
+ * QKSMS is free software: you can redistribute it and/or modify
+ * it under the terms of the GNU General Public License as published by
+ * the Free Software Foundation, either version 3 of the License, or
+ * (at your option) any later version.
+ *
+ * QKSMS is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+ * GNU General Public License for more details.
+ *
+ * You should have received a copy of the GNU General Public License
+ * along with QKSMS.  If not, see <http://www.gnu.org/licenses/>.
+ */
+package com.moez.QKSMS.feature.compose.part
+
+import android.annotation.SuppressLint
+import android.content.Context
+import android.view.Gravity
+import android.widget.FrameLayout
+import com.moez.QKSMS.R
+import com.moez.QKSMS.common.base.QkViewHolder
+import com.moez.QKSMS.common.util.Colors
+import com.moez.QKSMS.common.util.extensions.resolveThemeColor
+import com.moez.QKSMS.common.util.extensions.setBackgroundTint
+import com.moez.QKSMS.common.util.extensions.setTint
+import com.moez.QKSMS.feature.compose.BubbleUtils
+import com.moez.QKSMS.model.Message
+import com.moez.QKSMS.model.MmsPart
+import io.reactivex.Observable
+import io.reactivex.android.schedulers.AndroidSchedulers
+import io.reactivex.schedulers.Schedulers
+import kotlinx.android.synthetic.main.mms_file_list_item.*
+import javax.inject.Inject
+
+class FileBinder @Inject constructor(colors: Colors, private val context: Context) : PartBinder() {
+
+    override val partLayout = R.layout.mms_file_list_item
+    override var theme = colors.theme()
+
+    // This is the last binder we check. If we're here, we can bind the part
+    override fun canBindPart(part: MmsPart) = true
+
+    @SuppressLint("CheckResult")
+    override fun bindPart(
+        holder: QkViewHolder,
+        part: MmsPart,
+        message: Message,
+        canGroupWithPrevious: Boolean,
+        canGroupWithNext: Boolean
+    ) {
+        BubbleUtils.getBubble(false, canGroupWithPrevious, canGroupWithNext, message.isMe())
+                .let(holder.fileBackground::setBackgroundResource)
+
+        holder.containerView.setOnClickListener { clicks.onNext(part.id) }
+
+        Observable.just(part.getUri())
+                .map(context.contentResolver::openInputStream)
+                .map { inputStream -> inputStream.use { it.available() } }
+                .map { bytes ->
+                    when (bytes) {
+                        in 0..999 -> "$bytes B"
+                        in 1000..999999 -> "${"%.1f".format(bytes / 1000f)} KB"
+                        in 1000000..9999999 -> "${"%.1f".format(bytes / 1000000f)} MB"
+                        else -> "${"%.1f".format(bytes / 1000000000f)} GB"
+                    }
+                }
+                .subscribeOn(Schedulers.io())
+                .observeOn(AndroidSchedulers.mainThread())
+                .subscribe { size -> holder.size.text = size }
+
+        holder.filename.text = part.name
+
+        val params = holder.fileBackground.layoutParams as FrameLayout.LayoutParams
+        if (!message.isMe()) {
+            holder.fileBackground.layoutParams = params.apply { gravity = Gravity.START }
+            holder.fileBackground.setBackgroundTint(theme.theme)
+            holder.icon.setTint(theme.textPrimary)
+            holder.filename.setTextColor(theme.textPrimary)
+            holder.size.setTextColor(theme.textTertiary)
+        } else {
+            holder.fileBackground.layoutParams = params.apply { gravity = Gravity.END }
+            holder.fileBackground.setBackgroundTint(holder.containerView.context.resolveThemeColor(R.attr.bubbleColor))
+            holder.icon.setTint(holder.containerView.context.resolveThemeColor(android.R.attr.textColorSecondary))
+            holder.filename.setTextColor(holder.containerView.context.resolveThemeColor(android.R.attr.textColorPrimary))
+            holder.size.setTextColor(holder.containerView.context.resolveThemeColor(android.R.attr.textColorTertiary))
+        }
+    }
+
 }
\ No newline at end of file
diff --git a/presentation/src/main/java/com/moez/QKSMS/feature/compose/part/MediaBinder.kt b/presentation/src/main/java/com/moez/QKSMS/feature/compose/part/MediaBinder.kt
index 1ac437a5c..70f406b4d 100644
--- a/presentation/src/main/java/com/moez/QKSMS/feature/compose/part/MediaBinder.kt
+++ b/presentation/src/main/java/com/moez/QKSMS/feature/compose/part/MediaBinder.kt
@@ -1,62 +1,62 @@
-/*
- * Copyright (C) 2017 Moez Bhatti <moez.bhatti@gmail.com>
- *
- * This file is part of QKSMS.
- *
- * QKSMS is free software: you can redistribute it and/or modify
- * it under the terms of the GNU General Public License as published by
- * the Free Software Foundation, either version 3 of the License, or
- * (at your option) any later version.
- *
- * QKSMS is distributed in the hope that it will be useful,
- * but WITHOUT ANY WARRANTY; without even the implied warranty of
- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
- * GNU General Public License for more details.
- *
- * You should have received a copy of the GNU General Public License
- * along with QKSMS.  If not, see <http://www.gnu.org/licenses/>.
- */
-package com.moez.QKSMS.feature.compose.part
-
-import android.content.Context
-import com.moez.QKSMS.R
-import com.moez.QKSMS.common.base.QkViewHolder
-import com.moez.QKSMS.common.util.Colors
-import com.moez.QKSMS.common.util.extensions.setVisible
-import com.moez.QKSMS.common.widget.BubbleImageView
-import com.moez.QKSMS.extensions.isImage
-import com.moez.QKSMS.extensions.isVideo
-import com.moez.QKSMS.model.Message
-import com.moez.QKSMS.model.MmsPart
-import com.moez.QKSMS.util.GlideApp
-import kotlinx.android.synthetic.main.mms_preview_list_item.*
-import javax.inject.Inject
-
-class MediaBinder @Inject constructor(colors: Colors, private val context: Context) : PartBinder() {
-
-    override val partLayout = R.layout.mms_preview_list_item
-    override var theme = colors.theme()
-
-    override fun canBindPart(part: MmsPart) = part.isImage() || part.isVideo()
-
-    override fun bindPart(
-        holder: QkViewHolder,
-        part: MmsPart,
-        message: Message,
-        canGroupWithPrevious: Boolean,
-        canGroupWithNext: Boolean
-    ) {
-        holder.video.setVisible(part.isVideo())
-        holder.containerView.setOnClickListener { clicks.onNext(part.id) }
-
-        holder.thumbnail.bubbleStyle = when {
-            !canGroupWithPrevious && canGroupWithNext -> if (message.isMe()) BubbleImageView.Style.OUT_FIRST else BubbleImageView.Style.IN_FIRST
-            canGroupWithPrevious && canGroupWithNext -> if (message.isMe()) BubbleImageView.Style.OUT_MIDDLE else BubbleImageView.Style.IN_MIDDLE
-            canGroupWithPrevious && !canGroupWithNext -> if (message.isMe()) BubbleImageView.Style.OUT_LAST else BubbleImageView.Style.IN_LAST
-            else -> BubbleImageView.Style.ONLY
-        }
-
-        GlideApp.with(context).load(part.getUri()).fitCenter().into(holder.thumbnail)
-    }
-
+/*
+ * Copyright (C) 2017 Moez Bhatti <moez.bhatti@gmail.com>
+ *
+ * This file is part of QKSMS.
+ *
+ * QKSMS is free software: you can redistribute it and/or modify
+ * it under the terms of the GNU General Public License as published by
+ * the Free Software Foundation, either version 3 of the License, or
+ * (at your option) any later version.
+ *
+ * QKSMS is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+ * GNU General Public License for more details.
+ *
+ * You should have received a copy of the GNU General Public License
+ * along with QKSMS.  If not, see <http://www.gnu.org/licenses/>.
+ */
+package com.moez.QKSMS.feature.compose.part
+
+import android.content.Context
+import com.moez.QKSMS.R
+import com.moez.QKSMS.common.base.QkViewHolder
+import com.moez.QKSMS.common.util.Colors
+import com.moez.QKSMS.common.util.extensions.setVisible
+import com.moez.QKSMS.common.widget.BubbleImageView
+import com.moez.QKSMS.extensions.isImage
+import com.moez.QKSMS.extensions.isVideo
+import com.moez.QKSMS.model.Message
+import com.moez.QKSMS.model.MmsPart
+import com.moez.QKSMS.util.GlideApp
+import kotlinx.android.synthetic.main.mms_preview_list_item.*
+import javax.inject.Inject
+
+class MediaBinder @Inject constructor(colors: Colors, private val context: Context) : PartBinder() {
+
+    override val partLayout = R.layout.mms_preview_list_item
+    override var theme = colors.theme()
+
+    override fun canBindPart(part: MmsPart) = part.isImage() || part.isVideo()
+
+    override fun bindPart(
+        holder: QkViewHolder,
+        part: MmsPart,
+        message: Message,
+        canGroupWithPrevious: Boolean,
+        canGroupWithNext: Boolean
+    ) {
+        holder.video.setVisible(part.isVideo())
+        holder.containerView.setOnClickListener { clicks.onNext(part.id) }
+
+        holder.thumbnail.bubbleStyle = when {
+            !canGroupWithPrevious && canGroupWithNext -> if (message.isMe()) BubbleImageView.Style.OUT_FIRST else BubbleImageView.Style.IN_FIRST
+            canGroupWithPrevious && canGroupWithNext -> if (message.isMe()) BubbleImageView.Style.OUT_MIDDLE else BubbleImageView.Style.IN_MIDDLE
+            canGroupWithPrevious && !canGroupWithNext -> if (message.isMe()) BubbleImageView.Style.OUT_LAST else BubbleImageView.Style.IN_LAST
+            else -> BubbleImageView.Style.ONLY
+        }
+
+        GlideApp.with(context).load(part.getUri()).fitCenter().into(holder.thumbnail)
+    }
+
 }
\ No newline at end of file
diff --git a/presentation/src/main/java/com/moez/QKSMS/feature/compose/part/PartBinder.kt b/presentation/src/main/java/com/moez/QKSMS/feature/compose/part/PartBinder.kt
index d56f8547d..c23520a09 100644
--- a/presentation/src/main/java/com/moez/QKSMS/feature/compose/part/PartBinder.kt
+++ b/presentation/src/main/java/com/moez/QKSMS/feature/compose/part/PartBinder.kt
@@ -1,46 +1,46 @@
-/*
- * Copyright (C) 2017 Moez Bhatti <moez.bhatti@gmail.com>
- *
- * This file is part of QKSMS.
- *
- * QKSMS is free software: you can redistribute it and/or modify
- * it under the terms of the GNU General Public License as published by
- * the Free Software Foundation, either version 3 of the License, or
- * (at your option) any later version.
- *
- * QKSMS is distributed in the hope that it will be useful,
- * but WITHOUT ANY WARRANTY; without even the implied warranty of
- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
- * GNU General Public License for more details.
- *
- * You should have received a copy of the GNU General Public License
- * along with QKSMS.  If not, see <http://www.gnu.org/licenses/>.
- */
-package com.moez.QKSMS.feature.compose.part
-
-import com.moez.QKSMS.common.base.QkViewHolder
-import com.moez.QKSMS.common.util.Colors
-import com.moez.QKSMS.model.Message
-import com.moez.QKSMS.model.MmsPart
-import io.reactivex.subjects.PublishSubject
-import io.reactivex.subjects.Subject
-
-abstract class PartBinder {
-
-    val clicks: Subject<Long> = PublishSubject.create()
-
-    abstract val partLayout: Int
-
-    abstract var theme: Colors.Theme
-
-    abstract fun canBindPart(part: MmsPart): Boolean
-
-    abstract fun bindPart(
-        holder: QkViewHolder,
-        part: MmsPart,
-        message: Message,
-        canGroupWithPrevious: Boolean,
-        canGroupWithNext: Boolean
-    )
-
-}
+/*
+ * Copyright (C) 2017 Moez Bhatti <moez.bhatti@gmail.com>
+ *
+ * This file is part of QKSMS.
+ *
+ * QKSMS is free software: you can redistribute it and/or modify
+ * it under the terms of the GNU General Public License as published by
+ * the Free Software Foundation, either version 3 of the License, or
+ * (at your option) any later version.
+ *
+ * QKSMS is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+ * GNU General Public License for more details.
+ *
+ * You should have received a copy of the GNU General Public License
+ * along with QKSMS.  If not, see <http://www.gnu.org/licenses/>.
+ */
+package com.moez.QKSMS.feature.compose.part
+
+import com.moez.QKSMS.common.base.QkViewHolder
+import com.moez.QKSMS.common.util.Colors
+import com.moez.QKSMS.model.Message
+import com.moez.QKSMS.model.MmsPart
+import io.reactivex.subjects.PublishSubject
+import io.reactivex.subjects.Subject
+
+abstract class PartBinder {
+
+    val clicks: Subject<Long> = PublishSubject.create()
+
+    abstract val partLayout: Int
+
+    abstract var theme: Colors.Theme
+
+    abstract fun canBindPart(part: MmsPart): Boolean
+
+    abstract fun bindPart(
+        holder: QkViewHolder,
+        part: MmsPart,
+        message: Message,
+        canGroupWithPrevious: Boolean,
+        canGroupWithNext: Boolean
+    )
+
+}
diff --git a/presentation/src/main/java/com/moez/QKSMS/feature/compose/part/PartsAdapter.kt b/presentation/src/main/java/com/moez/QKSMS/feature/compose/part/PartsAdapter.kt
index 567f49268..9cd7b4b28 100644
--- a/presentation/src/main/java/com/moez/QKSMS/feature/compose/part/PartsAdapter.kt
+++ b/presentation/src/main/java/com/moez/QKSMS/feature/compose/part/PartsAdapter.kt
@@ -1,92 +1,92 @@
-/*
- * Copyright (C) 2017 Moez Bhatti <moez.bhatti@gmail.com>
- *
- * This file is part of QKSMS.
- *
- * QKSMS is free software: you can redistribute it and/or modify
- * it under the terms of the GNU General Public License as published by
- * the Free Software Foundation, either version 3 of the License, or
- * (at your option) any later version.
- *
- * QKSMS is distributed in the hope that it will be useful,
- * but WITHOUT ANY WARRANTY; without even the implied warranty of
- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
- * GNU General Public License for more details.
- *
- * You should have received a copy of the GNU General Public License
- * along with QKSMS.  If not, see <http://www.gnu.org/licenses/>.
- */
-package com.moez.QKSMS.feature.compose.part
-
-import android.view.LayoutInflater
-import android.view.View
-import android.view.ViewGroup
-import com.moez.QKSMS.common.base.QkAdapter
-import com.moez.QKSMS.common.base.QkViewHolder
-import com.moez.QKSMS.common.util.Colors
-import com.moez.QKSMS.common.util.extensions.forwardTouches
-import com.moez.QKSMS.extensions.isSmil
-import com.moez.QKSMS.extensions.isText
-import com.moez.QKSMS.feature.compose.BubbleUtils.canGroup
-import com.moez.QKSMS.model.Message
-import com.moez.QKSMS.model.MmsPart
-import io.reactivex.Observable
-import kotlinx.android.synthetic.main.message_list_item_in.*
-import javax.inject.Inject
-
-class PartsAdapter @Inject constructor(
-    colors: Colors,
-    fileBinder: FileBinder,
-    mediaBinder: MediaBinder,
-    vCardBinder: VCardBinder
-) : QkAdapter<MmsPart>() {
-
-    private val partBinders = listOf(mediaBinder, vCardBinder, fileBinder)
-
-    var theme: Colors.Theme = colors.theme()
-        set(value) {
-            field = value
-            partBinders.forEach { binder -> binder.theme = value }
-        }
-
-    val clicks: Observable<Long> = Observable.merge(partBinders.map { it.clicks })
-
-    private lateinit var message: Message
-    private var previous: Message? = null
-    private var next: Message? = null
-    private var holder: QkViewHolder? = null
-    private var bodyVisible: Boolean = true
-
-    fun setData(message: Message, previous: Message?, next: Message?, holder: QkViewHolder) {
-        this.message = message
-        this.previous = previous
-        this.next = next
-        this.holder = holder
-        this.bodyVisible = holder.body.visibility == View.VISIBLE
-        this.data = message.parts.filter { !it.isSmil() && !it.isText() }
-    }
-
-    override fun onCreateViewHolder(parent: ViewGroup, viewType: Int): QkViewHolder {
-        val layout = partBinders.getOrNull(viewType)?.partLayout ?: 0
-        val view = LayoutInflater.from(parent.context).inflate(layout, parent, false)
-        holder?.containerView?.let(view::forwardTouches)
-        return QkViewHolder(view)
-    }
-
-    override fun onBindViewHolder(holder: QkViewHolder, position: Int) {
-        val part = data[position]
-
-        val canGroupWithPrevious = canGroup(message, previous) || position > 0
-        val canGroupWithNext = canGroup(message, next) || position < itemCount - 1 || bodyVisible
-
-        partBinders
-                .firstOrNull { it.canBindPart(part) }
-                ?.bindPart(holder, part, message, canGroupWithPrevious, canGroupWithNext)
-    }
-
-    override fun getItemViewType(position: Int): Int {
-        val part = data[position]
-        return partBinders.indexOfFirst { it.canBindPart(part) }
-    }
-
+/*
+ * Copyright (C) 2017 Moez Bhatti <moez.bhatti@gmail.com>
+ *
+ * This file is part of QKSMS.
+ *
+ * QKSMS is free software: you can redistribute it and/or modify
+ * it under the terms of the GNU General Public License as published by
+ * the Free Software Foundation, either version 3 of the License, or
+ * (at your option) any later version.
+ *
+ * QKSMS is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+ * GNU General Public License for more details.
+ *
+ * You should have received a copy of the GNU General Public License
+ * along with QKSMS.  If not, see <http://www.gnu.org/licenses/>.
+ */
+package com.moez.QKSMS.feature.compose.part
+
+import android.view.LayoutInflater
+import android.view.View
+import android.view.ViewGroup
+import com.moez.QKSMS.common.base.QkAdapter
+import com.moez.QKSMS.common.base.QkViewHolder
+import com.moez.QKSMS.common.util.Colors
+import com.moez.QKSMS.common.util.extensions.forwardTouches
+import com.moez.QKSMS.extensions.isSmil
+import com.moez.QKSMS.extensions.isText
+import com.moez.QKSMS.feature.compose.BubbleUtils.canGroup
+import com.moez.QKSMS.model.Message
+import com.moez.QKSMS.model.MmsPart
+import io.reactivex.Observable
+import kotlinx.android.synthetic.main.message_list_item_in.*
+import javax.inject.Inject
+
+class PartsAdapter @Inject constructor(
+    colors: Colors,
+    fileBinder: FileBinder,
+    mediaBinder: MediaBinder,
+    vCardBinder: VCardBinder
+) : QkAdapter<MmsPart>() {
+
+    private val partBinders = listOf(mediaBinder, vCardBinder, fileBinder)
+
+    var theme: Colors.Theme = colors.theme()
+        set(value) {
+            field = value
+            partBinders.forEach { binder -> binder.theme = value }
+        }
+
+    val clicks: Observable<Long> = Observable.merge(partBinders.map { it.clicks })
+
+    private lateinit var message: Message
+    private var previous: Message? = null
+    private var next: Message? = null
+    private var holder: QkViewHolder? = null
+    private var bodyVisible: Boolean = true
+
+    fun setData(message: Message, previous: Message?, next: Message?, holder: QkViewHolder) {
+        this.message = message
+        this.previous = previous
+        this.next = next
+        this.holder = holder
+        this.bodyVisible = holder.body.visibility == View.VISIBLE
+        this.data = message.parts.filter { !it.isSmil() && !it.isText() }
+    }
+
+    override fun onCreateViewHolder(parent: ViewGroup, viewType: Int): QkViewHolder {
+        val layout = partBinders.getOrNull(viewType)?.partLayout ?: 0
+        val view = LayoutInflater.from(parent.context).inflate(layout, parent, false)
+        holder?.containerView?.let(view::forwardTouches)
+        return QkViewHolder(view)
+    }
+
+    override fun onBindViewHolder(holder: QkViewHolder, position: Int) {
+        val part = data[position]
+
+        val canGroupWithPrevious = canGroup(message, previous) || position > 0
+        val canGroupWithNext = canGroup(message, next) || position < itemCount - 1 || bodyVisible
+
+        partBinders
+                .firstOrNull { it.canBindPart(part) }
+                ?.bindPart(holder, part, message, canGroupWithPrevious, canGroupWithNext)
+    }
+
+    override fun getItemViewType(position: Int): Int {
+        val part = data[position]
+        return partBinders.indexOfFirst { it.canBindPart(part) }
+    }
+
 }
\ No newline at end of file
diff --git a/presentation/src/main/java/com/moez/QKSMS/feature/compose/part/VCardBinder.kt b/presentation/src/main/java/com/moez/QKSMS/feature/compose/part/VCardBinder.kt
index 9e068137d..f699e8eed 100644
--- a/presentation/src/main/java/com/moez/QKSMS/feature/compose/part/VCardBinder.kt
+++ b/presentation/src/main/java/com/moez/QKSMS/feature/compose/part/VCardBinder.kt
@@ -1,84 +1,84 @@
-/*
- * Copyright (C) 2017 Moez Bhatti <moez.bhatti@gmail.com>
- *
- * This file is part of QKSMS.
- *
- * QKSMS is free software: you can redistribute it and/or modify
- * it under the terms of the GNU General Public License as published by
- * the Free Software Foundation, either version 3 of the License, or
- * (at your option) any later version.
- *
- * QKSMS is distributed in the hope that it will be useful,
- * but WITHOUT ANY WARRANTY; without even the implied warranty of
- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
- * GNU General Public License for more details.
- *
- * You should have received a copy of the GNU General Public License
- * along with QKSMS.  If not, see <http://www.gnu.org/licenses/>.
- */
-package com.moez.QKSMS.feature.compose.part
-
-import android.content.Context
-import android.view.Gravity
-import android.widget.FrameLayout
-import com.moez.QKSMS.R
-import com.moez.QKSMS.common.base.QkViewHolder
-import com.moez.QKSMS.common.util.Colors
-import com.moez.QKSMS.common.util.extensions.resolveThemeColor
-import com.moez.QKSMS.common.util.extensions.setBackgroundTint
-import com.moez.QKSMS.common.util.extensions.setTint
-import com.moez.QKSMS.extensions.isVCard
-import com.moez.QKSMS.extensions.mapNotNull
-import com.moez.QKSMS.feature.compose.BubbleUtils
-import com.moez.QKSMS.model.Message
-import com.moez.QKSMS.model.MmsPart
-import ezvcard.Ezvcard
-import io.reactivex.Observable
-import io.reactivex.android.schedulers.AndroidSchedulers
-import io.reactivex.schedulers.Schedulers
-import kotlinx.android.synthetic.main.mms_vcard_list_item.*
-import javax.inject.Inject
-
-class VCardBinder @Inject constructor(colors: Colors, private val context: Context) : PartBinder() {
-
-    override val partLayout = R.layout.mms_vcard_list_item
-    override var theme = colors.theme()
-
-    override fun canBindPart(part: MmsPart) = part.isVCard()
-
-    override fun bindPart(
-        holder: QkViewHolder,
-        part: MmsPart,
-        message: Message,
-        canGroupWithPrevious: Boolean,
-        canGroupWithNext: Boolean
-    ) {
-        BubbleUtils.getBubble(false, canGroupWithPrevious, canGroupWithNext, message.isMe())
-                .let(holder.vCardBackground::setBackgroundResource)
-
-        holder.containerView.setOnClickListener { clicks.onNext(part.id) }
-
-        Observable.just(part.getUri())
-                .map(context.contentResolver::openInputStream)
-                .mapNotNull { inputStream -> inputStream.use { Ezvcard.parse(it).first() } }
-                .subscribeOn(Schedulers.computation())
-                .observeOn(AndroidSchedulers.mainThread())
-                .subscribe { vcard -> holder.name?.text = vcard.formattedName.value }
-
-        val params = holder.vCardBackground.layoutParams as FrameLayout.LayoutParams
-        if (!message.isMe()) {
-            holder.vCardBackground.layoutParams = params.apply { gravity = Gravity.START }
-            holder.vCardBackground.setBackgroundTint(theme.theme)
-            holder.vCardAvatar.setTint(theme.textPrimary)
-            holder.name.setTextColor(theme.textPrimary)
-            holder.label.setTextColor(theme.textTertiary)
-        } else {
-            holder.vCardBackground.layoutParams = params.apply { gravity = Gravity.END }
-            holder.vCardBackground.setBackgroundTint(holder.containerView.context.resolveThemeColor(R.attr.bubbleColor))
-            holder.vCardAvatar.setTint(holder.containerView.context.resolveThemeColor(android.R.attr.textColorSecondary))
-            holder.name.setTextColor(holder.containerView.context.resolveThemeColor(android.R.attr.textColorPrimary))
-            holder.label.setTextColor(holder.containerView.context.resolveThemeColor(android.R.attr.textColorTertiary))
-        }
-    }
-
+/*
+ * Copyright (C) 2017 Moez Bhatti <moez.bhatti@gmail.com>
+ *
+ * This file is part of QKSMS.
+ *
+ * QKSMS is free software: you can redistribute it and/or modify
+ * it under the terms of the GNU General Public License as published by
+ * the Free Software Foundation, either version 3 of the License, or
+ * (at your option) any later version.
+ *
+ * QKSMS is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+ * GNU General Public License for more details.
+ *
+ * You should have received a copy of the GNU General Public License
+ * along with QKSMS.  If not, see <http://www.gnu.org/licenses/>.
+ */
+package com.moez.QKSMS.feature.compose.part
+
+import android.content.Context
+import android.view.Gravity
+import android.widget.FrameLayout
+import com.moez.QKSMS.R
+import com.moez.QKSMS.common.base.QkViewHolder
+import com.moez.QKSMS.common.util.Colors
+import com.moez.QKSMS.common.util.extensions.resolveThemeColor
+import com.moez.QKSMS.common.util.extensions.setBackgroundTint
+import com.moez.QKSMS.common.util.extensions.setTint
+import com.moez.QKSMS.extensions.isVCard
+import com.moez.QKSMS.extensions.mapNotNull
+import com.moez.QKSMS.feature.compose.BubbleUtils
+import com.moez.QKSMS.model.Message
+import com.moez.QKSMS.model.MmsPart
+import ezvcard.Ezvcard
+import io.reactivex.Observable
+import io.reactivex.android.schedulers.AndroidSchedulers
+import io.reactivex.schedulers.Schedulers
+import kotlinx.android.synthetic.main.mms_vcard_list_item.*
+import javax.inject.Inject
+
+class VCardBinder @Inject constructor(colors: Colors, private val context: Context) : PartBinder() {
+
+    override val partLayout = R.layout.mms_vcard_list_item
+    override var theme = colors.theme()
+
+    override fun canBindPart(part: MmsPart) = part.isVCard()
+
+    override fun bindPart(
+        holder: QkViewHolder,
+        part: MmsPart,
+        message: Message,
+        canGroupWithPrevious: Boolean,
+        canGroupWithNext: Boolean
+    ) {
+        BubbleUtils.getBubble(false, canGroupWithPrevious, canGroupWithNext, message.isMe())
+                .let(holder.vCardBackground::setBackgroundResource)
+
+        holder.containerView.setOnClickListener { clicks.onNext(part.id) }
+
+        Observable.just(part.getUri())
+                .map(context.contentResolver::openInputStream)
+                .mapNotNull { inputStream -> inputStream.use { Ezvcard.parse(it).first() } }
+                .subscribeOn(Schedulers.computation())
+                .observeOn(AndroidSchedulers.mainThread())
+                .subscribe { vcard -> holder.name?.text = vcard.formattedName.value }
+
+        val params = holder.vCardBackground.layoutParams as FrameLayout.LayoutParams
+        if (!message.isMe()) {
+            holder.vCardBackground.layoutParams = params.apply { gravity = Gravity.START }
+            holder.vCardBackground.setBackgroundTint(theme.theme)
+            holder.vCardAvatar.setTint(theme.textPrimary)
+            holder.name.setTextColor(theme.textPrimary)
+            holder.label.setTextColor(theme.textTertiary)
+        } else {
+            holder.vCardBackground.layoutParams = params.apply { gravity = Gravity.END }
+            holder.vCardBackground.setBackgroundTint(holder.containerView.context.resolveThemeColor(R.attr.bubbleColor))
+            holder.vCardAvatar.setTint(holder.containerView.context.resolveThemeColor(android.R.attr.textColorSecondary))
+            holder.name.setTextColor(holder.containerView.context.resolveThemeColor(android.R.attr.textColorPrimary))
+            holder.label.setTextColor(holder.containerView.context.resolveThemeColor(android.R.attr.textColorTertiary))
+        }
+    }
+
 }
\ No newline at end of file
diff --git a/presentation/src/main/java/com/moez/QKSMS/feature/contacts/ContactsActivity.kt b/presentation/src/main/java/com/moez/QKSMS/feature/contacts/ContactsActivity.kt
index f5ca9f71d..7d4c21390 100644
--- a/presentation/src/main/java/com/moez/QKSMS/feature/contacts/ContactsActivity.kt
+++ b/presentation/src/main/java/com/moez/QKSMS/feature/contacts/ContactsActivity.kt
@@ -1,129 +1,129 @@
-/*
- * Copyright (C) 2019 Moez Bhatti <moez.bhatti@gmail.com>
- *
- * This file is part of QKSMS.
- *
- * QKSMS is free software: you can redistribute it and/or modify
- * it under the terms of the GNU General Public License as published by
- * the Free Software Foundation, either version 3 of the License, or
- * (at your option) any later version.
- *
- * QKSMS is distributed in the hope that it will be useful,
- * but WITHOUT ANY WARRANTY; without even the implied warranty of
- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
- * GNU General Public License for more details.
- *
- * You should have received a copy of the GNU General Public License
- * along with QKSMS.  If not, see <http://www.gnu.org/licenses/>.
- */
-package com.moez.QKSMS.feature.contacts
-
-import android.app.Activity
-import android.content.Intent
-import android.os.Build
-import android.os.Bundle
-import androidx.core.view.isVisible
-import androidx.lifecycle.ViewModelProviders
-import com.jakewharton.rxbinding2.view.clicks
-import com.jakewharton.rxbinding2.widget.editorActions
-import com.jakewharton.rxbinding2.widget.textChanges
-import com.moez.QKSMS.R
-import com.moez.QKSMS.common.ViewModelFactory
-import com.moez.QKSMS.common.base.QkThemedActivity
-import com.moez.QKSMS.common.util.extensions.hideKeyboard
-import com.moez.QKSMS.common.util.extensions.resolveThemeColor
-import com.moez.QKSMS.common.util.extensions.setBackgroundTint
-import com.moez.QKSMS.common.util.extensions.showKeyboard
-import com.moez.QKSMS.common.widget.QkDialog
-import com.moez.QKSMS.extensions.Optional
-import com.moez.QKSMS.feature.compose.editing.ComposeItem
-import com.moez.QKSMS.feature.compose.editing.ComposeItemAdapter
-import com.moez.QKSMS.feature.compose.editing.PhoneNumberAction
-import com.moez.QKSMS.feature.compose.editing.PhoneNumberPickerAdapter
-import dagger.android.AndroidInjection
-import io.reactivex.Observable
-import io.reactivex.subjects.PublishSubject
-import io.reactivex.subjects.Subject
-import kotlinx.android.synthetic.main.contacts_activity.*
-import javax.inject.Inject
-
-class ContactsActivity : QkThemedActivity(), ContactsContract {
-
-    companion object {
-        const val SharingKey = "sharing"
-        const val ChipsKey = "chips"
-    }
-
-    @Inject lateinit var contactsAdapter: ComposeItemAdapter
-    @Inject lateinit var phoneNumberAdapter: PhoneNumberPickerAdapter
-    @Inject lateinit var viewModelFactory: ViewModelFactory
-
-    override val queryChangedIntent: Observable<CharSequence> by lazy { search.textChanges() }
-    override val queryClearedIntent: Observable<*> by lazy { cancel.clicks() }
-    override val queryEditorActionIntent: Observable<Int> by lazy { search.editorActions() }
-    override val composeItemPressedIntent: Subject<ComposeItem> by lazy { contactsAdapter.clicks }
-    override val composeItemLongPressedIntent: Subject<ComposeItem> by lazy { contactsAdapter.longClicks }
-    override val phoneNumberSelectedIntent: Subject<Optional<Long>> by lazy { phoneNumberAdapter.selectedItemChanges }
-    override val phoneNumberActionIntent: Subject<PhoneNumberAction> = PublishSubject.create()
-
-    private val viewModel by lazy { ViewModelProviders.of(this, viewModelFactory)[ContactsViewModel::class.java] }
-
-    private val phoneNumberDialog by lazy {
-        QkDialog(this).apply {
-            titleRes = R.string.compose_number_picker_title
-            adapter = phoneNumberAdapter
-            positiveButton = R.string.compose_number_picker_always
-            positiveButtonListener = { phoneNumberActionIntent.onNext(PhoneNumberAction.ALWAYS) }
-            negativeButton = R.string.compose_number_picker_once
-            negativeButtonListener = { phoneNumberActionIntent.onNext(PhoneNumberAction.JUST_ONCE) }
-            cancelListener = { phoneNumberActionIntent.onNext(PhoneNumberAction.CANCEL) }
-        }
-    }
-
-    override fun onCreate(savedInstanceState: Bundle?) {
-        AndroidInjection.inject(this)
-        super.onCreate(savedInstanceState)
-        setContentView(R.layout.contacts_activity)
-        showBackButton(true)
-        viewModel.bindView(this)
-
-        contacts.adapter = contactsAdapter
-
-        // These theme attributes don't apply themselves on API 21
-        if (Build.VERSION.SDK_INT <= 22) {
-            search.setBackgroundTint(resolveThemeColor(R.attr.bubbleColor))
-        }
-    }
-
-    override fun render(state: ContactsState) {
-        cancel.isVisible = state.query.length > 1
-
-        contactsAdapter.data = state.composeItems
-
-        if (state.selectedContact != null && !phoneNumberDialog.isShowing) {
-            phoneNumberAdapter.data = state.selectedContact.numbers
-            phoneNumberDialog.subtitle = state.selectedContact.name
-            phoneNumberDialog.show()
-        } else if (state.selectedContact == null && phoneNumberDialog.isShowing) {
-            phoneNumberDialog.dismiss()
-        }
-    }
-
-    override fun clearQuery() {
-        search.text = null
-    }
-
-    override fun openKeyboard() {
-        search.postDelayed({
-            search.showKeyboard()
-        }, 200)
-    }
-
-    override fun finish(result: HashMap<String, String?>) {
-        search.hideKeyboard()
-        val intent = Intent().putExtra(ChipsKey, result)
-        setResult(Activity.RESULT_OK, intent)
-        finish()
-    }
-
-}
+/*
+ * Copyright (C) 2019 Moez Bhatti <moez.bhatti@gmail.com>
+ *
+ * This file is part of QKSMS.
+ *
+ * QKSMS is free software: you can redistribute it and/or modify
+ * it under the terms of the GNU General Public License as published by
+ * the Free Software Foundation, either version 3 of the License, or
+ * (at your option) any later version.
+ *
+ * QKSMS is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+ * GNU General Public License for more details.
+ *
+ * You should have received a copy of the GNU General Public License
+ * along with QKSMS.  If not, see <http://www.gnu.org/licenses/>.
+ */
+package com.moez.QKSMS.feature.contacts
+
+import android.app.Activity
+import android.content.Intent
+import android.os.Build
+import android.os.Bundle
+import androidx.core.view.isVisible
+import androidx.lifecycle.ViewModelProviders
+import com.jakewharton.rxbinding2.view.clicks
+import com.jakewharton.rxbinding2.widget.editorActions
+import com.jakewharton.rxbinding2.widget.textChanges
+import com.moez.QKSMS.R
+import com.moez.QKSMS.common.ViewModelFactory
+import com.moez.QKSMS.common.base.QkThemedActivity
+import com.moez.QKSMS.common.util.extensions.hideKeyboard
+import com.moez.QKSMS.common.util.extensions.resolveThemeColor
+import com.moez.QKSMS.common.util.extensions.setBackgroundTint
+import com.moez.QKSMS.common.util.extensions.showKeyboard
+import com.moez.QKSMS.common.widget.QkDialog
+import com.moez.QKSMS.extensions.Optional
+import com.moez.QKSMS.feature.compose.editing.ComposeItem
+import com.moez.QKSMS.feature.compose.editing.ComposeItemAdapter
+import com.moez.QKSMS.feature.compose.editing.PhoneNumberAction
+import com.moez.QKSMS.feature.compose.editing.PhoneNumberPickerAdapter
+import dagger.android.AndroidInjection
+import io.reactivex.Observable
+import io.reactivex.subjects.PublishSubject
+import io.reactivex.subjects.Subject
+import kotlinx.android.synthetic.main.contacts_activity.*
+import javax.inject.Inject
+
+class ContactsActivity : QkThemedActivity(), ContactsContract {
+
+    companion object {
+        const val SharingKey = "sharing"
+        const val ChipsKey = "chips"
+    }
+
+    @Inject lateinit var contactsAdapter: ComposeItemAdapter
+    @Inject lateinit var phoneNumberAdapter: PhoneNumberPickerAdapter
+    @Inject lateinit var viewModelFactory: ViewModelFactory
+
+    override val queryChangedIntent: Observable<CharSequence> by lazy { search.textChanges() }
+    override val queryClearedIntent: Observable<*> by lazy { cancel.clicks() }
+    override val queryEditorActionIntent: Observable<Int> by lazy { search.editorActions() }
+    override val composeItemPressedIntent: Subject<ComposeItem> by lazy { contactsAdapter.clicks }
+    override val composeItemLongPressedIntent: Subject<ComposeItem> by lazy { contactsAdapter.longClicks }
+    override val phoneNumberSelectedIntent: Subject<Optional<Long>> by lazy { phoneNumberAdapter.selectedItemChanges }
+    override val phoneNumberActionIntent: Subject<PhoneNumberAction> = PublishSubject.create()
+
+    private val viewModel by lazy { ViewModelProviders.of(this, viewModelFactory)[ContactsViewModel::class.java] }
+
+    private val phoneNumberDialog by lazy {
+        QkDialog(this).apply {
+            titleRes = R.string.compose_number_picker_title
+            adapter = phoneNumberAdapter
+            positiveButton = R.string.compose_number_picker_always
+            positiveButtonListener = { phoneNumberActionIntent.onNext(PhoneNumberAction.ALWAYS) }
+            negativeButton = R.string.compose_number_picker_once
+            negativeButtonListener = { phoneNumberActionIntent.onNext(PhoneNumberAction.JUST_ONCE) }
+            cancelListener = { phoneNumberActionIntent.onNext(PhoneNumberAction.CANCEL) }
+        }
+    }
+
+    override fun onCreate(savedInstanceState: Bundle?) {
+        AndroidInjection.inject(this)
+        super.onCreate(savedInstanceState)
+        setContentView(R.layout.contacts_activity)
+        showBackButton(true)
+        viewModel.bindView(this)
+
+        contacts.adapter = contactsAdapter
+
+        // These theme attributes don't apply themselves on API 21
+        if (Build.VERSION.SDK_INT <= 22) {
+            search.setBackgroundTint(resolveThemeColor(R.attr.bubbleColor))
+        }
+    }
+
+    override fun render(state: ContactsState) {
+        cancel.isVisible = state.query.length > 1
+
+        contactsAdapter.data = state.composeItems
+
+        if (state.selectedContact != null && !phoneNumberDialog.isShowing) {
+            phoneNumberAdapter.data = state.selectedContact.numbers
+            phoneNumberDialog.subtitle = state.selectedContact.name
+            phoneNumberDialog.show()
+        } else if (state.selectedContact == null && phoneNumberDialog.isShowing) {
+            phoneNumberDialog.dismiss()
+        }
+    }
+
+    override fun clearQuery() {
+        search.text = null
+    }
+
+    override fun openKeyboard() {
+        search.postDelayed({
+            search.showKeyboard()
+        }, 200)
+    }
+
+    override fun finish(result: HashMap<String, String?>) {
+        search.hideKeyboard()
+        val intent = Intent().putExtra(ChipsKey, result)
+        setResult(Activity.RESULT_OK, intent)
+        finish()
+    }
+
+}
diff --git a/presentation/src/main/java/com/moez/QKSMS/feature/contacts/ContactsActivityModule.kt b/presentation/src/main/java/com/moez/QKSMS/feature/contacts/ContactsActivityModule.kt
index a2d21b331..51f893fb7 100644
--- a/presentation/src/main/java/com/moez/QKSMS/feature/contacts/ContactsActivityModule.kt
+++ b/presentation/src/main/java/com/moez/QKSMS/feature/contacts/ContactsActivityModule.kt
@@ -1,47 +1,47 @@
-/*
- * Copyright (C) 2019 Moez Bhatti <moez.bhatti@gmail.com>
- *
- * This file is part of QKSMS.
- *
- * QKSMS is free software: you can redistribute it and/or modify
- * it under the terms of the GNU General Public License as published by
- * the Free Software Foundation, either version 3 of the License, or
- * (at your option) any later version.
- *
- * QKSMS is distributed in the hope that it will be useful,
- * but WITHOUT ANY WARRANTY; without even the implied warranty of
- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
- * GNU General Public License for more details.
- *
- * You should have received a copy of the GNU General Public License
- * along with QKSMS.  If not, see <http://www.gnu.org/licenses/>.
- */
-package com.moez.QKSMS.feature.contacts
-
-import androidx.lifecycle.ViewModel
-import com.moez.QKSMS.injection.ViewModelKey
-import dagger.Module
-import dagger.Provides
-import dagger.multibindings.IntoMap
-
-@Module
-class ContactsActivityModule {
-
-    @Provides
-    fun provideIsSharing(activity: ContactsActivity): Boolean {
-        return activity.intent.extras?.getBoolean(ContactsActivity.SharingKey, false) ?: false
-    }
-
-    @Provides
-    fun provideChips(activity: ContactsActivity): HashMap<String, String?> {
-        return activity.intent.extras?.getSerializable(ContactsActivity.ChipsKey)
-                ?.let { serializable -> serializable as? HashMap<String, String?> }
-                ?: hashMapOf()
-    }
-
-    @Provides
-    @IntoMap
-    @ViewModelKey(ContactsViewModel::class)
-    fun provideContactsViewModel(viewModel: ContactsViewModel): ViewModel = viewModel
-
-}
+/*
+ * Copyright (C) 2019 Moez Bhatti <moez.bhatti@gmail.com>
+ *
+ * This file is part of QKSMS.
+ *
+ * QKSMS is free software: you can redistribute it and/or modify
+ * it under the terms of the GNU General Public License as published by
+ * the Free Software Foundation, either version 3 of the License, or
+ * (at your option) any later version.
+ *
+ * QKSMS is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+ * GNU General Public License for more details.
+ *
+ * You should have received a copy of the GNU General Public License
+ * along with QKSMS.  If not, see <http://www.gnu.org/licenses/>.
+ */
+package com.moez.QKSMS.feature.contacts
+
+import androidx.lifecycle.ViewModel
+import com.moez.QKSMS.injection.ViewModelKey
+import dagger.Module
+import dagger.Provides
+import dagger.multibindings.IntoMap
+
+@Module
+class ContactsActivityModule {
+
+    @Provides
+    fun provideIsSharing(activity: ContactsActivity): Boolean {
+        return activity.intent.extras?.getBoolean(ContactsActivity.SharingKey, false) ?: false
+    }
+
+    @Provides
+    fun provideChips(activity: ContactsActivity): HashMap<String, String?> {
+        return activity.intent.extras?.getSerializable(ContactsActivity.ChipsKey)
+                ?.let { serializable -> serializable as? HashMap<String, String?> }
+                ?: hashMapOf()
+    }
+
+    @Provides
+    @IntoMap
+    @ViewModelKey(ContactsViewModel::class)
+    fun provideContactsViewModel(viewModel: ContactsViewModel): ViewModel = viewModel
+
+}
diff --git a/presentation/src/main/java/com/moez/QKSMS/feature/contacts/ContactsContract.kt b/presentation/src/main/java/com/moez/QKSMS/feature/contacts/ContactsContract.kt
index cf6c55095..88c2bac95 100644
--- a/presentation/src/main/java/com/moez/QKSMS/feature/contacts/ContactsContract.kt
+++ b/presentation/src/main/java/com/moez/QKSMS/feature/contacts/ContactsContract.kt
@@ -1,42 +1,42 @@
-/*
- * Copyright (C) 2019 Moez Bhatti <moez.bhatti@gmail.com>
- *
- * This file is part of QKSMS.
- *
- * QKSMS is free software: you can redistribute it and/or modify
- * it under the terms of the GNU General Public License as published by
- * the Free Software Foundation, either version 3 of the License, or
- * (at your option) any later version.
- *
- * QKSMS is distributed in the hope that it will be useful,
- * but WITHOUT ANY WARRANTY; without even the implied warranty of
- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
- * GNU General Public License for more details.
- *
- * You should have received a copy of the GNU General Public License
- * along with QKSMS.  If not, see <http://www.gnu.org/licenses/>.
- */
-package com.moez.QKSMS.feature.contacts
-
-import com.moez.QKSMS.common.base.QkView
-import com.moez.QKSMS.extensions.Optional
-import com.moez.QKSMS.feature.compose.editing.ComposeItem
-import com.moez.QKSMS.feature.compose.editing.PhoneNumberAction
-import io.reactivex.Observable
-import io.reactivex.subjects.Subject
-
-interface ContactsContract : QkView<ContactsState> {
-
-    val queryChangedIntent: Observable<CharSequence>
-    val queryClearedIntent: Observable<*>
-    val queryEditorActionIntent: Observable<Int>
-    val composeItemPressedIntent: Subject<ComposeItem>
-    val composeItemLongPressedIntent: Subject<ComposeItem>
-    val phoneNumberSelectedIntent: Subject<Optional<Long>>
-    val phoneNumberActionIntent: Subject<PhoneNumberAction>
-
-    fun clearQuery()
-    fun openKeyboard()
-    fun finish(result: HashMap<String, String?>)
-
-}
+/*
+ * Copyright (C) 2019 Moez Bhatti <moez.bhatti@gmail.com>
+ *
+ * This file is part of QKSMS.
+ *
+ * QKSMS is free software: you can redistribute it and/or modify
+ * it under the terms of the GNU General Public License as published by
+ * the Free Software Foundation, either version 3 of the License, or
+ * (at your option) any later version.
+ *
+ * QKSMS is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+ * GNU General Public License for more details.
+ *
+ * You should have received a copy of the GNU General Public License
+ * along with QKSMS.  If not, see <http://www.gnu.org/licenses/>.
+ */
+package com.moez.QKSMS.feature.contacts
+
+import com.moez.QKSMS.common.base.QkView
+import com.moez.QKSMS.extensions.Optional
+import com.moez.QKSMS.feature.compose.editing.ComposeItem
+import com.moez.QKSMS.feature.compose.editing.PhoneNumberAction
+import io.reactivex.Observable
+import io.reactivex.subjects.Subject
+
+interface ContactsContract : QkView<ContactsState> {
+
+    val queryChangedIntent: Observable<CharSequence>
+    val queryClearedIntent: Observable<*>
+    val queryEditorActionIntent: Observable<Int>
+    val composeItemPressedIntent: Subject<ComposeItem>
+    val composeItemLongPressedIntent: Subject<ComposeItem>
+    val phoneNumberSelectedIntent: Subject<Optional<Long>>
+    val phoneNumberActionIntent: Subject<PhoneNumberAction>
+
+    fun clearQuery()
+    fun openKeyboard()
+    fun finish(result: HashMap<String, String?>)
+
+}
diff --git a/presentation/src/main/java/com/moez/QKSMS/feature/contacts/ContactsState.kt b/presentation/src/main/java/com/moez/QKSMS/feature/contacts/ContactsState.kt
index 9829d905b..78b680aff 100644
--- a/presentation/src/main/java/com/moez/QKSMS/feature/contacts/ContactsState.kt
+++ b/presentation/src/main/java/com/moez/QKSMS/feature/contacts/ContactsState.kt
@@ -1,28 +1,28 @@
-/*
- * Copyright (C) 2019 Moez Bhatti <moez.bhatti@gmail.com>
- *
- * This file is part of QKSMS.
- *
- * QKSMS is free software: you can redistribute it and/or modify
- * it under the terms of the GNU General Public License as published by
- * the Free Software Foundation, either version 3 of the License, or
- * (at your option) any later version.
- *
- * QKSMS is distributed in the hope that it will be useful,
- * but WITHOUT ANY WARRANTY; without even the implied warranty of
- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
- * GNU General Public License for more details.
- *
- * You should have received a copy of the GNU General Public License
- * along with QKSMS.  If not, see <http://www.gnu.org/licenses/>.
- */
-package com.moez.QKSMS.feature.contacts
-
-import com.moez.QKSMS.feature.compose.editing.ComposeItem
-import com.moez.QKSMS.model.Contact
-
-data class ContactsState(
-    val query: String = "",
-    val composeItems: List<ComposeItem> = ArrayList(),
-    val selectedContact: Contact? = null // For phone number picker
-)
+/*
+ * Copyright (C) 2019 Moez Bhatti <moez.bhatti@gmail.com>
+ *
+ * This file is part of QKSMS.
+ *
+ * QKSMS is free software: you can redistribute it and/or modify
+ * it under the terms of the GNU General Public License as published by
+ * the Free Software Foundation, either version 3 of the License, or
+ * (at your option) any later version.
+ *
+ * QKSMS is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+ * GNU General Public License for more details.
+ *
+ * You should have received a copy of the GNU General Public License
+ * along with QKSMS.  If not, see <http://www.gnu.org/licenses/>.
+ */
+package com.moez.QKSMS.feature.contacts
+
+import com.moez.QKSMS.feature.compose.editing.ComposeItem
+import com.moez.QKSMS.model.Contact
+
+data class ContactsState(
+    val query: String = "",
+    val composeItems: List<ComposeItem> = ArrayList(),
+    val selectedContact: Contact? = null // For phone number picker
+)
diff --git a/presentation/src/main/java/com/moez/QKSMS/feature/contacts/ContactsViewModel.kt b/presentation/src/main/java/com/moez/QKSMS/feature/contacts/ContactsViewModel.kt
index e9960816d..77c467cc3 100644
--- a/presentation/src/main/java/com/moez/QKSMS/feature/contacts/ContactsViewModel.kt
+++ b/presentation/src/main/java/com/moez/QKSMS/feature/contacts/ContactsViewModel.kt
@@ -1,216 +1,216 @@
-/*
- * Copyright (C) 2019 Moez Bhatti <moez.bhatti@gmail.com>
- *
- * This file is part of QKSMS.
- *
- * QKSMS is free software: you can redistribute it and/or modify
- * it under the terms of the GNU General Public License as published by
- * the Free Software Foundation, either version 3 of the License, or
- * (at your option) any later version.
- *
- * QKSMS is distributed in the hope that it will be useful,
- * but WITHOUT ANY WARRANTY; without even the implied warranty of
- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
- * GNU General Public License for more details.
- *
- * You should have received a copy of the GNU General Public License
- * along with QKSMS.  If not, see <http://www.gnu.org/licenses/>.
- */
-package com.moez.QKSMS.feature.contacts
-
-import android.view.inputmethod.EditorInfo
-import com.moez.QKSMS.common.base.QkViewModel
-import com.moez.QKSMS.extensions.mapNotNull
-import com.moez.QKSMS.extensions.removeAccents
-import com.moez.QKSMS.feature.compose.editing.ComposeItem
-import com.moez.QKSMS.feature.compose.editing.PhoneNumberAction
-import com.moez.QKSMS.filter.ContactFilter
-import com.moez.QKSMS.filter.ContactGroupFilter
-import com.moez.QKSMS.interactor.SetDefaultPhoneNumber
-import com.moez.QKSMS.model.Contact
-import com.moez.QKSMS.model.ContactGroup
-import com.moez.QKSMS.model.Conversation
-import com.moez.QKSMS.model.PhoneNumber
-import com.moez.QKSMS.model.Recipient
-import com.moez.QKSMS.repository.ContactRepository
-import com.moez.QKSMS.repository.ConversationRepository
-import com.moez.QKSMS.util.PhoneNumberUtils
-import com.uber.autodispose.android.lifecycle.scope
-import com.uber.autodispose.autoDisposable
-import io.reactivex.Observable
-import io.reactivex.android.schedulers.AndroidSchedulers
-import io.reactivex.rxkotlin.Observables
-import io.reactivex.rxkotlin.withLatestFrom
-import io.reactivex.schedulers.Schedulers
-import io.realm.RealmList
-import kotlinx.coroutines.runBlocking
-import kotlinx.coroutines.rx2.awaitFirst
-import javax.inject.Inject
-
-class ContactsViewModel @Inject constructor(
-    sharing: Boolean,
-    serializedChips: HashMap<String, String?>,
-    private val contactFilter: ContactFilter,
-    private val contactGroupFilter: ContactGroupFilter,
-    private val contactsRepo: ContactRepository,
-    private val conversationRepo: ConversationRepository,
-    private val phoneNumberUtils: PhoneNumberUtils,
-    private val setDefaultPhoneNumber: SetDefaultPhoneNumber
-) : QkViewModel<ContactsContract, ContactsState>(ContactsState()) {
-
-    private val contactGroups: Observable<List<ContactGroup>> by lazy { contactsRepo.getUnmanagedContactGroups() }
-    private val contacts: Observable<List<Contact>> by lazy { contactsRepo.getUnmanagedContacts() }
-    private val recents: Observable<List<Conversation>> by lazy {
-        if (sharing) conversationRepo.getUnmanagedConversations() else Observable.just(listOf())
-    }
-    private val starredContacts: Observable<List<Contact>> by lazy { contactsRepo.getUnmanagedContacts(true) }
-
-    private val selectedChips = Observable.just(serializedChips)
-            .observeOn(Schedulers.io())
-            .map { hashmap ->
-                hashmap.map { (address, lookupKey) ->
-                    Recipient(address = address, contact = lookupKey?.let(contactsRepo::getUnmanagedContact))
-                }
-            }
-
-    private var shouldOpenKeyboard: Boolean = true
-
-    override fun bindView(view: ContactsContract) {
-        super.bindView(view)
-
-        if (shouldOpenKeyboard) {
-            view.openKeyboard()
-            shouldOpenKeyboard = false
-        }
-
-        // Update the state's query, so we know if we should show the cancel button
-        view.queryChangedIntent
-                .autoDisposable(view.scope())
-                .subscribe { query -> newState { copy(query = query.toString()) } }
-
-        // Clear the query
-        view.queryClearedIntent
-                .autoDisposable(view.scope())
-                .subscribe { view.clearQuery() }
-
-        // Update the list of contact suggestions based on the query input, while also filtering out any contacts
-        // that have already been selected
-        Observables
-                .combineLatest(
-                        view.queryChangedIntent, recents, starredContacts, contactGroups, contacts, selectedChips
-                ) { query, recents, starredContacts, contactGroups, contacts, selectedChips ->
-                    val composeItems = mutableListOf<ComposeItem>()
-                    if (query.isBlank()) {
-                        composeItems += recents
-                                .filter { conversation ->
-                                    conversation.recipients.any { recipient ->
-                                        selectedChips.none { chip ->
-                                            if (recipient.contact == null) {
-                                                chip.address == recipient.address
-                                            } else {
-                                                chip.contact?.lookupKey == recipient.contact?.lookupKey
-                                            }
-                                        }
-                                    }
-                                }
-                                .map(ComposeItem::Recent)
-
-                        composeItems += starredContacts
-                                .filter { contact -> selectedChips.none { it.contact?.lookupKey == contact.lookupKey } }
-                                .map(ComposeItem::Starred)
-
-                        composeItems += contactGroups
-                                .filter { group ->
-                                    group.contacts.any { contact ->
-                                        selectedChips.none { chip -> chip.contact?.lookupKey == contact.lookupKey }
-                                    }
-                                }
-                                .map(ComposeItem::Group)
-
-                        composeItems += contacts
-                                .filter { contact -> selectedChips.none { it.contact?.lookupKey == contact.lookupKey } }
-                                .map(ComposeItem::Person)
-                    } else {
-                        // If the entry is a valid destination, allow it as a recipient
-                        if (phoneNumberUtils.isPossibleNumber(query.toString())) {
-                            val newAddress = phoneNumberUtils.formatNumber(query)
-                            val newContact = Contact(numbers = RealmList(PhoneNumber(address = newAddress)))
-                            composeItems += ComposeItem.New(newContact)
-                        }
-
-                        // Strip the accents from the query. This can be an expensive operation, so
-                        // cache the result instead of doing it for each contact
-                        val normalizedQuery = query.removeAccents()
-                        composeItems += starredContacts
-                                .asSequence()
-                                .filter { contact -> selectedChips.none { it.contact?.lookupKey == contact.lookupKey } }
-                                .filter { contact -> contactFilter.filter(contact, normalizedQuery) }
-                                .map(ComposeItem::Starred)
-
-                        composeItems += contactGroups
-                                .asSequence()
-                                .filter { group ->
-                                    group.contacts.any { contact ->
-                                        selectedChips.none { chip -> chip.contact?.lookupKey == contact.lookupKey }
-                                    }
-                                }
-                                .filter { group -> contactGroupFilter.filter(group, normalizedQuery) }
-                                .map(ComposeItem::Group)
-
-                        composeItems += contacts
-                                .asSequence()
-                                .filter { contact -> selectedChips.none { it.contact?.lookupKey == contact.lookupKey } }
-                                .filter { contact -> contactFilter.filter(contact, normalizedQuery) }
-                                .map(ComposeItem::Person)
-                    }
-
-                    composeItems
-                }
-                .subscribeOn(Schedulers.computation())
-                .autoDisposable(view.scope())
-                .subscribe { items -> newState { copy(composeItems = items) } }
-
-        // Listen for ComposeItems being selected, and then send them off to the number picker dialog in case
-        // the user needs to select a phone number
-        view.queryEditorActionIntent
-                .filter { actionId -> actionId == EditorInfo.IME_ACTION_DONE }
-                .withLatestFrom(state) { _, state -> state }
-                .mapNotNull { state -> state.composeItems.firstOrNull() }
-                .mergeWith(view.composeItemPressedIntent)
-                .map { composeItem -> composeItem to false }
-                .mergeWith(view.composeItemLongPressedIntent.map { composeItem -> composeItem to true })
-                .observeOn(Schedulers.io())
-                .map { (composeItem, force) ->
-                    HashMap(composeItem.getContacts().associate { contact ->
-                        if (contact.numbers.size == 1 || contact.getDefaultNumber() != null && !force) {
-                            val address = contact.getDefaultNumber()?.address ?: contact.numbers[0]!!.address
-                            address to contact.lookupKey
-                        } else {
-                            runBlocking {
-                                newState { copy(selectedContact = contact) }
-                                val action = view.phoneNumberActionIntent.awaitFirst()
-                                newState { copy(selectedContact = null) }
-                                val numberId = view.phoneNumberSelectedIntent.awaitFirst().value
-                                val number = contact.numbers.find { number -> number.id == numberId }
-
-                                if (action == PhoneNumberAction.CANCEL || number == null) {
-                                    return@runBlocking null
-                                }
-
-                                if (action == PhoneNumberAction.ALWAYS) {
-                                    val params = SetDefaultPhoneNumber.Params(contact.lookupKey, number.id)
-                                    setDefaultPhoneNumber.execute(params)
-                                }
-
-                                number.address to contact.lookupKey
-                            } ?: return@map hashMapOf<String, String?>()
-                        }
-                    })
-                }
-                .filter { result -> result.isNotEmpty() }
-                .observeOn(AndroidSchedulers.mainThread())
-                .autoDisposable(view.scope())
-                .subscribe { result -> view.finish(result) }
-    }
-
-}
+/*
+ * Copyright (C) 2019 Moez Bhatti <moez.bhatti@gmail.com>
+ *
+ * This file is part of QKSMS.
+ *
+ * QKSMS is free software: you can redistribute it and/or modify
+ * it under the terms of the GNU General Public License as published by
+ * the Free Software Foundation, either version 3 of the License, or
+ * (at your option) any later version.
+ *
+ * QKSMS is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+ * GNU General Public License for more details.
+ *
+ * You should have received a copy of the GNU General Public License
+ * along with QKSMS.  If not, see <http://www.gnu.org/licenses/>.
+ */
+package com.moez.QKSMS.feature.contacts
+
+import android.view.inputmethod.EditorInfo
+import com.moez.QKSMS.common.base.QkViewModel
+import com.moez.QKSMS.extensions.mapNotNull
+import com.moez.QKSMS.extensions.removeAccents
+import com.moez.QKSMS.feature.compose.editing.ComposeItem
+import com.moez.QKSMS.feature.compose.editing.PhoneNumberAction
+import com.moez.QKSMS.filter.ContactFilter
+import com.moez.QKSMS.filter.ContactGroupFilter
+import com.moez.QKSMS.interactor.SetDefaultPhoneNumber
+import com.moez.QKSMS.model.Contact
+import com.moez.QKSMS.model.ContactGroup
+import com.moez.QKSMS.model.Conversation
+import com.moez.QKSMS.model.PhoneNumber
+import com.moez.QKSMS.model.Recipient
+import com.moez.QKSMS.repository.ContactRepository
+import com.moez.QKSMS.repository.ConversationRepository
+import com.moez.QKSMS.util.PhoneNumberUtils
+import com.uber.autodispose.android.lifecycle.scope
+import com.uber.autodispose.autoDisposable
+import io.reactivex.Observable
+import io.reactivex.android.schedulers.AndroidSchedulers
+import io.reactivex.rxkotlin.Observables
+import io.reactivex.rxkotlin.withLatestFrom
+import io.reactivex.schedulers.Schedulers
+import io.realm.RealmList
+import kotlinx.coroutines.runBlocking
+import kotlinx.coroutines.rx2.awaitFirst
+import javax.inject.Inject
+
+class ContactsViewModel @Inject constructor(
+    sharing: Boolean,
+    serializedChips: HashMap<String, String?>,
+    private val contactFilter: ContactFilter,
+    private val contactGroupFilter: ContactGroupFilter,
+    private val contactsRepo: ContactRepository,
+    private val conversationRepo: ConversationRepository,
+    private val phoneNumberUtils: PhoneNumberUtils,
+    private val setDefaultPhoneNumber: SetDefaultPhoneNumber
+) : QkViewModel<ContactsContract, ContactsState>(ContactsState()) {
+
+    private val contactGroups: Observable<List<ContactGroup>> by lazy { contactsRepo.getUnmanagedContactGroups() }
+    private val contacts: Observable<List<Contact>> by lazy { contactsRepo.getUnmanagedContacts() }
+    private val recents: Observable<List<Conversation>> by lazy {
+        if (sharing) conversationRepo.getUnmanagedConversations() else Observable.just(listOf())
+    }
+    private val starredContacts: Observable<List<Contact>> by lazy { contactsRepo.getUnmanagedContacts(true) }
+
+    private val selectedChips = Observable.just(serializedChips)
+            .observeOn(Schedulers.io())
+            .map { hashmap ->
+                hashmap.map { (address, lookupKey) ->
+                    Recipient(address = address, contact = lookupKey?.let(contactsRepo::getUnmanagedContact))
+                }
+            }
+
+    private var shouldOpenKeyboard: Boolean = true
+
+    override fun bindView(view: ContactsContract) {
+        super.bindView(view)
+
+        if (shouldOpenKeyboard) {
+            view.openKeyboard()
+            shouldOpenKeyboard = false
+        }
+
+        // Update the state's query, so we know if we should show the cancel button
+        view.queryChangedIntent
+                .autoDisposable(view.scope())
+                .subscribe { query -> newState { copy(query = query.toString()) } }
+
+        // Clear the query
+        view.queryClearedIntent
+                .autoDisposable(view.scope())
+                .subscribe { view.clearQuery() }
+
+        // Update the list of contact suggestions based on the query input, while also filtering out any contacts
+        // that have already been selected
+        Observables
+                .combineLatest(
+                        view.queryChangedIntent, recents, starredContacts, contactGroups, contacts, selectedChips
+                ) { query, recents, starredContacts, contactGroups, contacts, selectedChips ->
+                    val composeItems = mutableListOf<ComposeItem>()
+                    if (query.isBlank()) {
+                        composeItems += recents
+                                .filter { conversation ->
+                                    conversation.recipients.any { recipient ->
+                                        selectedChips.none { chip ->
+                                            if (recipient.contact == null) {
+                                                chip.address == recipient.address
+                                            } else {
+                                                chip.contact?.lookupKey == recipient.contact?.lookupKey
+                                            }
+                                        }
+                                    }
+                                }
+                                .map(ComposeItem::Recent)
+
+                        composeItems += starredContacts
+                                .filter { contact -> selectedChips.none { it.contact?.lookupKey == contact.lookupKey } }
+                                .map(ComposeItem::Starred)
+
+                        composeItems += contactGroups
+                                .filter { group ->
+                                    group.contacts.any { contact ->
+                                        selectedChips.none { chip -> chip.contact?.lookupKey == contact.lookupKey }
+                                    }
+                                }
+                                .map(ComposeItem::Group)
+
+                        composeItems += contacts
+                                .filter { contact -> selectedChips.none { it.contact?.lookupKey == contact.lookupKey } }
+                                .map(ComposeItem::Person)
+                    } else {
+                        // If the entry is a valid destination, allow it as a recipient
+                        if (phoneNumberUtils.isPossibleNumber(query.toString())) {
+                            val newAddress = phoneNumberUtils.formatNumber(query)
+                            val newContact = Contact(numbers = RealmList(PhoneNumber(address = newAddress)))
+                            composeItems += ComposeItem.New(newContact)
+                        }
+
+                        // Strip the accents from the query. This can be an expensive operation, so
+                        // cache the result instead of doing it for each contact
+                        val normalizedQuery = query.removeAccents()
+                        composeItems += starredContacts
+                                .asSequence()
+                                .filter { contact -> selectedChips.none { it.contact?.lookupKey == contact.lookupKey } }
+                                .filter { contact -> contactFilter.filter(contact, normalizedQuery) }
+                                .map(ComposeItem::Starred)
+
+                        composeItems += contactGroups
+                                .asSequence()
+                                .filter { group ->
+                                    group.contacts.any { contact ->
+                                        selectedChips.none { chip -> chip.contact?.lookupKey == contact.lookupKey }
+                                    }
+                                }
+                                .filter { group -> contactGroupFilter.filter(group, normalizedQuery) }
+                                .map(ComposeItem::Group)
+
+                        composeItems += contacts
+                                .asSequence()
+                                .filter { contact -> selectedChips.none { it.contact?.lookupKey == contact.lookupKey } }
+                                .filter { contact -> contactFilter.filter(contact, normalizedQuery) }
+                                .map(ComposeItem::Person)
+                    }
+
+                    composeItems
+                }
+                .subscribeOn(Schedulers.computation())
+                .autoDisposable(view.scope())
+                .subscribe { items -> newState { copy(composeItems = items) } }
+
+        // Listen for ComposeItems being selected, and then send them off to the number picker dialog in case
+        // the user needs to select a phone number
+        view.queryEditorActionIntent
+                .filter { actionId -> actionId == EditorInfo.IME_ACTION_DONE }
+                .withLatestFrom(state) { _, state -> state }
+                .mapNotNull { state -> state.composeItems.firstOrNull() }
+                .mergeWith(view.composeItemPressedIntent)
+                .map { composeItem -> composeItem to false }
+                .mergeWith(view.composeItemLongPressedIntent.map { composeItem -> composeItem to true })
+                .observeOn(Schedulers.io())
+                .map { (composeItem, force) ->
+                    HashMap(composeItem.getContacts().associate { contact ->
+                        if (contact.numbers.size == 1 || contact.getDefaultNumber() != null && !force) {
+                            val address = contact.getDefaultNumber()?.address ?: contact.numbers[0]!!.address
+                            address to contact.lookupKey
+                        } else {
+                            runBlocking {
+                                newState { copy(selectedContact = contact) }
+                                val action = view.phoneNumberActionIntent.awaitFirst()
+                                newState { copy(selectedContact = null) }
+                                val numberId = view.phoneNumberSelectedIntent.awaitFirst().value
+                                val number = contact.numbers.find { number -> number.id == numberId }
+
+                                if (action == PhoneNumberAction.CANCEL || number == null) {
+                                    return@runBlocking null
+                                }
+
+                                if (action == PhoneNumberAction.ALWAYS) {
+                                    val params = SetDefaultPhoneNumber.Params(contact.lookupKey, number.id)
+                                    setDefaultPhoneNumber.execute(params)
+                                }
+
+                                number.address to contact.lookupKey
+                            } ?: return@map hashMapOf<String, String?>()
+                        }
+                    })
+                }
+                .filter { result -> result.isNotEmpty() }
+                .observeOn(AndroidSchedulers.mainThread())
+                .autoDisposable(view.scope())
+                .subscribe { result -> view.finish(result) }
+    }
+
+}
diff --git a/presentation/src/main/java/com/moez/QKSMS/feature/conversationinfo/ConversationInfoActivity.kt b/presentation/src/main/java/com/moez/QKSMS/feature/conversationinfo/ConversationInfoActivity.kt
index 1b6e50378..372c9eb7c 100644
--- a/presentation/src/main/java/com/moez/QKSMS/feature/conversationinfo/ConversationInfoActivity.kt
+++ b/presentation/src/main/java/com/moez/QKSMS/feature/conversationinfo/ConversationInfoActivity.kt
@@ -1,52 +1,52 @@
-/*
- * Copyright (C) 2017 Moez Bhatti <moez.bhatti@gmail.com>
- *
- * This file is part of QKSMS.
- *
- * QKSMS is free software: you can redistribute it and/or modify
- * it under the terms of the GNU General Public License as published by
- * the Free Software Foundation, either version 3 of the License, or
- * (at your option) any later version.
- *
- * QKSMS is distributed in the hope that it will be useful,
- * but WITHOUT ANY WARRANTY; without even the implied warranty of
- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
- * GNU General Public License for more details.
- *
- * You should have received a copy of the GNU General Public License
- * along with QKSMS.  If not, see <http://www.gnu.org/licenses/>.
- */
-package com.moez.QKSMS.feature.conversationinfo
-
-import android.os.Bundle
-import com.bluelinelabs.conductor.Conductor
-import com.bluelinelabs.conductor.Router
-import com.bluelinelabs.conductor.RouterTransaction
-import com.moez.QKSMS.R
-import com.moez.QKSMS.common.base.QkThemedActivity
-import dagger.android.AndroidInjection
-import kotlinx.android.synthetic.main.container_activity.*
-
-class ConversationInfoActivity : QkThemedActivity() {
-
-    private lateinit var router: Router
-
-    override fun onCreate(savedInstanceState: Bundle?) {
-        AndroidInjection.inject(this)
-        super.onCreate(savedInstanceState)
-        setContentView(R.layout.container_activity)
-
-        router = Conductor.attachRouter(this, container, savedInstanceState)
-        if (!router.hasRootController()) {
-            val threadId = intent.extras?.getLong("threadId") ?: 0L
-            router.setRoot(RouterTransaction.with(ConversationInfoController(threadId)))
-        }
-    }
-
-    override fun onBackPressed() {
-        if (!router.handleBack()) {
-            super.onBackPressed()
-        }
-    }
-
+/*
+ * Copyright (C) 2017 Moez Bhatti <moez.bhatti@gmail.com>
+ *
+ * This file is part of QKSMS.
+ *
+ * QKSMS is free software: you can redistribute it and/or modify
+ * it under the terms of the GNU General Public License as published by
+ * the Free Software Foundation, either version 3 of the License, or
+ * (at your option) any later version.
+ *
+ * QKSMS is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+ * GNU General Public License for more details.
+ *
+ * You should have received a copy of the GNU General Public License
+ * along with QKSMS.  If not, see <http://www.gnu.org/licenses/>.
+ */
+package com.moez.QKSMS.feature.conversationinfo
+
+import android.os.Bundle
+import com.bluelinelabs.conductor.Conductor
+import com.bluelinelabs.conductor.Router
+import com.bluelinelabs.conductor.RouterTransaction
+import com.moez.QKSMS.R
+import com.moez.QKSMS.common.base.QkThemedActivity
+import dagger.android.AndroidInjection
+import kotlinx.android.synthetic.main.container_activity.*
+
+class ConversationInfoActivity : QkThemedActivity() {
+
+    private lateinit var router: Router
+
+    override fun onCreate(savedInstanceState: Bundle?) {
+        AndroidInjection.inject(this)
+        super.onCreate(savedInstanceState)
+        setContentView(R.layout.container_activity)
+
+        router = Conductor.attachRouter(this, container, savedInstanceState)
+        if (!router.hasRootController()) {
+            val threadId = intent.extras?.getLong("threadId") ?: 0L
+            router.setRoot(RouterTransaction.with(ConversationInfoController(threadId)))
+        }
+    }
+
+    override fun onBackPressed() {
+        if (!router.handleBack()) {
+            super.onBackPressed()
+        }
+    }
+
 }
\ No newline at end of file
diff --git a/presentation/src/main/java/com/moez/QKSMS/feature/conversationinfo/ConversationInfoAdapter.kt b/presentation/src/main/java/com/moez/QKSMS/feature/conversationinfo/ConversationInfoAdapter.kt
index f75034171..c5253b2ba 100644
--- a/presentation/src/main/java/com/moez/QKSMS/feature/conversationinfo/ConversationInfoAdapter.kt
+++ b/presentation/src/main/java/com/moez/QKSMS/feature/conversationinfo/ConversationInfoAdapter.kt
@@ -1,153 +1,153 @@
-package com.moez.QKSMS.feature.conversationinfo
-
-import android.content.Context
-import android.view.LayoutInflater
-import android.view.ViewGroup
-import androidx.core.view.isVisible
-import com.jakewharton.rxbinding2.view.clicks
-import com.moez.QKSMS.R
-import com.moez.QKSMS.common.base.QkAdapter
-import com.moez.QKSMS.common.base.QkViewHolder
-import com.moez.QKSMS.common.util.Colors
-import com.moez.QKSMS.common.util.extensions.setTint
-import com.moez.QKSMS.common.util.extensions.setVisible
-import com.moez.QKSMS.extensions.isVideo
-import com.moez.QKSMS.feature.conversationinfo.ConversationInfoItem.*
-import com.moez.QKSMS.util.GlideApp
-import io.reactivex.subjects.PublishSubject
-import io.reactivex.subjects.Subject
-import kotlinx.android.synthetic.main.conversation_info_settings.*
-import kotlinx.android.synthetic.main.conversation_media_list_item.*
-import kotlinx.android.synthetic.main.conversation_recipient_list_item.*
-import javax.inject.Inject
-
-class ConversationInfoAdapter @Inject constructor(
-    private val context: Context,
-    private val colors: Colors
-) : QkAdapter<ConversationInfoItem>() {
-
-    val recipientClicks: Subject<Long> = PublishSubject.create()
-    val recipientLongClicks: Subject<Long> = PublishSubject.create()
-    val themeClicks: Subject<Long> = PublishSubject.create()
-    val nameClicks: Subject<Unit> = PublishSubject.create()
-    val notificationClicks: Subject<Unit> = PublishSubject.create()
-    val archiveClicks: Subject<Unit> = PublishSubject.create()
-    val blockClicks: Subject<Unit> = PublishSubject.create()
-    val deleteClicks: Subject<Unit> = PublishSubject.create()
-    val mediaClicks: Subject<Long> = PublishSubject.create()
-
-    override fun onCreateViewHolder(parent: ViewGroup, viewType: Int): QkViewHolder {
-        val inflater = LayoutInflater.from(parent.context)
-        return when (viewType) {
-            0 -> QkViewHolder(inflater.inflate(R.layout.conversation_recipient_list_item, parent, false)).apply {
-                itemView.setOnClickListener {
-                    val item = getItem(adapterPosition) as? ConversationInfoRecipient
-                    item?.value?.id?.run(recipientClicks::onNext)
-                }
-
-                itemView.setOnLongClickListener {
-                    val item = getItem(adapterPosition) as? ConversationInfoRecipient
-                    item?.value?.id?.run(recipientLongClicks::onNext)
-                    true
-                }
-
-                theme.setOnClickListener {
-                    val item = getItem(adapterPosition) as? ConversationInfoRecipient
-                    item?.value?.id?.run(themeClicks::onNext)
-                }
-            }
-
-            1 -> QkViewHolder(inflater.inflate(R.layout.conversation_info_settings, parent, false)).apply {
-                groupName.clicks().subscribe(nameClicks)
-                notifications.clicks().subscribe(notificationClicks)
-                archive.clicks().subscribe(archiveClicks)
-                block.clicks().subscribe(blockClicks)
-                delete.clicks().subscribe(deleteClicks)
-            }
-
-            2 -> QkViewHolder(inflater.inflate(R.layout.conversation_media_list_item, parent, false)).apply {
-                itemView.setOnClickListener {
-                    val item = getItem(adapterPosition) as? ConversationInfoMedia
-                    item?.value?.id?.run(mediaClicks::onNext)
-                }
-            }
-
-            else -> throw IllegalStateException()
-        }
-    }
-
-    override fun onBindViewHolder(holder: QkViewHolder, position: Int) {
-        when (val item = getItem(position)) {
-            is ConversationInfoRecipient -> {
-                val recipient = item.value
-                holder.avatar.setRecipient(recipient)
-
-                holder.name.text = recipient.contact?.name ?: recipient.address
-
-                holder.address.text = recipient.address
-                holder.address.setVisible(recipient.contact != null)
-
-                holder.add.setVisible(recipient.contact == null)
-
-                val theme = colors.theme(recipient)
-                holder.theme.setTint(theme.theme)
-            }
-
-            is ConversationInfoSettings -> {
-                holder.groupName.isVisible = item.recipients.size > 1
-                holder.groupName.summary = item.name
-
-                holder.notifications.isEnabled = !item.blocked
-
-                holder.archive.isEnabled = !item.blocked
-                holder.archive.title = context.getString(when (item.archived) {
-                    true -> R.string.info_unarchive
-                    false -> R.string.info_archive
-                })
-
-                holder.block.title = context.getString(when (item.blocked) {
-                    true -> R.string.info_unblock
-                    false -> R.string.info_block
-                })
-            }
-
-            is ConversationInfoMedia -> {
-                val part = item.value
-
-                GlideApp.with(context)
-                        .load(part.getUri())
-                        .fitCenter()
-                        .into(holder.thumbnail)
-
-                holder.video.isVisible = part.isVideo()
-            }
-        }
-    }
-
-    override fun getItemViewType(position: Int): Int {
-        return when (data[position]) {
-            is ConversationInfoRecipient -> 0
-            is ConversationInfoSettings -> 1
-            is ConversationInfoMedia -> 2
-        }
-    }
-
-    override fun areItemsTheSame(old: ConversationInfoItem, new: ConversationInfoItem): Boolean {
-        return when {
-            old is ConversationInfoRecipient && new is ConversationInfoRecipient -> {
-               old.value.id == new.value.id
-            }
-
-            old is ConversationInfoSettings && new is ConversationInfoSettings -> {
-                true
-            }
-
-            old is ConversationInfoMedia && new is ConversationInfoMedia -> {
-                old.value.id == new.value.id
-            }
-
-            else -> false
-        }
-    }
-
-}
+package com.moez.QKSMS.feature.conversationinfo
+
+import android.content.Context
+import android.view.LayoutInflater
+import android.view.ViewGroup
+import androidx.core.view.isVisible
+import com.jakewharton.rxbinding2.view.clicks
+import com.moez.QKSMS.R
+import com.moez.QKSMS.common.base.QkAdapter
+import com.moez.QKSMS.common.base.QkViewHolder
+import com.moez.QKSMS.common.util.Colors
+import com.moez.QKSMS.common.util.extensions.setTint
+import com.moez.QKSMS.common.util.extensions.setVisible
+import com.moez.QKSMS.extensions.isVideo
+import com.moez.QKSMS.feature.conversationinfo.ConversationInfoItem.*
+import com.moez.QKSMS.util.GlideApp
+import io.reactivex.subjects.PublishSubject
+import io.reactivex.subjects.Subject
+import kotlinx.android.synthetic.main.conversation_info_settings.*
+import kotlinx.android.synthetic.main.conversation_media_list_item.*
+import kotlinx.android.synthetic.main.conversation_recipient_list_item.*
+import javax.inject.Inject
+
+class ConversationInfoAdapter @Inject constructor(
+    private val context: Context,
+    private val colors: Colors
+) : QkAdapter<ConversationInfoItem>() {
+
+    val recipientClicks: Subject<Long> = PublishSubject.create()
+    val recipientLongClicks: Subject<Long> = PublishSubject.create()
+    val themeClicks: Subject<Long> = PublishSubject.create()
+    val nameClicks: Subject<Unit> = PublishSubject.create()
+    val notificationClicks: Subject<Unit> = PublishSubject.create()
+    val archiveClicks: Subject<Unit> = PublishSubject.create()
+    val blockClicks: Subject<Unit> = PublishSubject.create()
+    val deleteClicks: Subject<Unit> = PublishSubject.create()
+    val mediaClicks: Subject<Long> = PublishSubject.create()
+
+    override fun onCreateViewHolder(parent: ViewGroup, viewType: Int): QkViewHolder {
+        val inflater = LayoutInflater.from(parent.context)
+        return when (viewType) {
+            0 -> QkViewHolder(inflater.inflate(R.layout.conversation_recipient_list_item, parent, false)).apply {
+                itemView.setOnClickListener {
+                    val item = getItem(adapterPosition) as? ConversationInfoRecipient
+                    item?.value?.id?.run(recipientClicks::onNext)
+                }
+
+                itemView.setOnLongClickListener {
+                    val item = getItem(adapterPosition) as? ConversationInfoRecipient
+                    item?.value?.id?.run(recipientLongClicks::onNext)
+                    true
+                }
+
+                theme.setOnClickListener {
+                    val item = getItem(adapterPosition) as? ConversationInfoRecipient
+                    item?.value?.id?.run(themeClicks::onNext)
+                }
+            }
+
+            1 -> QkViewHolder(inflater.inflate(R.layout.conversation_info_settings, parent, false)).apply {
+                groupName.clicks().subscribe(nameClicks)
+                notifications.clicks().subscribe(notificationClicks)
+                archive.clicks().subscribe(archiveClicks)
+                block.clicks().subscribe(blockClicks)
+                delete.clicks().subscribe(deleteClicks)
+            }
+
+            2 -> QkViewHolder(inflater.inflate(R.layout.conversation_media_list_item, parent, false)).apply {
+                itemView.setOnClickListener {
+                    val item = getItem(adapterPosition) as? ConversationInfoMedia
+                    item?.value?.id?.run(mediaClicks::onNext)
+                }
+            }
+
+            else -> throw IllegalStateException()
+        }
+    }
+
+    override fun onBindViewHolder(holder: QkViewHolder, position: Int) {
+        when (val item = getItem(position)) {
+            is ConversationInfoRecipient -> {
+                val recipient = item.value
+                holder.avatar.setRecipient(recipient)
+
+                holder.name.text = recipient.contact?.name ?: recipient.address
+
+                holder.address.text = recipient.address
+                holder.address.setVisible(recipient.contact != null)
+
+                holder.add.setVisible(recipient.contact == null)
+
+                val theme = colors.theme(recipient)
+                holder.theme.setTint(theme.theme)
+            }
+
+            is ConversationInfoSettings -> {
+                holder.groupName.isVisible = item.recipients.size > 1
+                holder.groupName.summary = item.name
+
+                holder.notifications.isEnabled = !item.blocked
+
+                holder.archive.isEnabled = !item.blocked
+                holder.archive.title = context.getString(when (item.archived) {
+                    true -> R.string.info_unarchive
+                    false -> R.string.info_archive
+                })
+
+                holder.block.title = context.getString(when (item.blocked) {
+                    true -> R.string.info_unblock
+                    false -> R.string.info_block
+                })
+            }
+
+            is ConversationInfoMedia -> {
+                val part = item.value
+
+                GlideApp.with(context)
+                        .load(part.getUri())
+                        .fitCenter()
+                        .into(holder.thumbnail)
+
+                holder.video.isVisible = part.isVideo()
+            }
+        }
+    }
+
+    override fun getItemViewType(position: Int): Int {
+        return when (data[position]) {
+            is ConversationInfoRecipient -> 0
+            is ConversationInfoSettings -> 1
+            is ConversationInfoMedia -> 2
+        }
+    }
+
+    override fun areItemsTheSame(old: ConversationInfoItem, new: ConversationInfoItem): Boolean {
+        return when {
+            old is ConversationInfoRecipient && new is ConversationInfoRecipient -> {
+               old.value.id == new.value.id
+            }
+
+            old is ConversationInfoSettings && new is ConversationInfoSettings -> {
+                true
+            }
+
+            old is ConversationInfoMedia && new is ConversationInfoMedia -> {
+                old.value.id == new.value.id
+            }
+
+            else -> false
+        }
+    }
+
+}
diff --git a/presentation/src/main/java/com/moez/QKSMS/feature/conversationinfo/ConversationInfoController.kt b/presentation/src/main/java/com/moez/QKSMS/feature/conversationinfo/ConversationInfoController.kt
index c33408798..7c88bfbc8 100644
--- a/presentation/src/main/java/com/moez/QKSMS/feature/conversationinfo/ConversationInfoController.kt
+++ b/presentation/src/main/java/com/moez/QKSMS/feature/conversationinfo/ConversationInfoController.kt
@@ -1,136 +1,136 @@
-/*
- * Copyright (C) 2017 Moez Bhatti <moez.bhatti@gmail.com>
- *
- * This file is part of QKSMS.
- *
- * QKSMS is free software: you can redistribute it and/or modify
- * it under the terms of the GNU General Public License as published by
- * the Free Software Foundation, either version 3 of the License, or
- * (at your option) any later version.
- *
- * QKSMS is distributed in the hope that it will be useful,
- * but WITHOUT ANY WARRANTY; without even the implied warranty of
- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
- * GNU General Public License for more details.
- *
- * You should have received a copy of the GNU General Public License
- * along with QKSMS.  If not, see <http://www.gnu.org/licenses/>.
- */
-package com.moez.QKSMS.feature.conversationinfo
-
-import android.view.View
-import androidx.appcompat.app.AlertDialog
-import androidx.recyclerview.widget.GridLayoutManager
-import com.bluelinelabs.conductor.RouterTransaction
-import com.moez.QKSMS.R
-import com.moez.QKSMS.common.Navigator
-import com.moez.QKSMS.common.QkChangeHandler
-import com.moez.QKSMS.common.base.QkController
-import com.moez.QKSMS.common.util.extensions.scrapViews
-import com.moez.QKSMS.common.widget.TextInputDialog
-import com.moez.QKSMS.feature.blocking.BlockingDialog
-import com.moez.QKSMS.feature.conversationinfo.injection.ConversationInfoModule
-import com.moez.QKSMS.feature.themepicker.ThemePickerController
-import com.moez.QKSMS.injection.appComponent
-import com.uber.autodispose.android.lifecycle.scope
-import com.uber.autodispose.autoDisposable
-import io.reactivex.Observable
-import io.reactivex.subjects.PublishSubject
-import io.reactivex.subjects.Subject
-import kotlinx.android.synthetic.main.conversation_info_controller.*
-import javax.inject.Inject
-
-class ConversationInfoController(
-    val threadId: Long = 0
-) : QkController<ConversationInfoView, ConversationInfoState, ConversationInfoPresenter>(), ConversationInfoView {
-
-    @Inject override lateinit var presenter: ConversationInfoPresenter
-    @Inject lateinit var blockingDialog: BlockingDialog
-    @Inject lateinit var navigator: Navigator
-    @Inject lateinit var adapter: ConversationInfoAdapter
-
-    private val nameDialog: TextInputDialog by lazy {
-        TextInputDialog(activity!!, activity!!.getString(R.string.info_name), nameChangeSubject::onNext)
-    }
-
-    private val nameChangeSubject: Subject<String> = PublishSubject.create()
-    private val confirmDeleteSubject: Subject<Unit> = PublishSubject.create()
-
-    init {
-        appComponent
-                .conversationInfoBuilder()
-                .conversationInfoModule(ConversationInfoModule(this))
-                .build()
-                .inject(this)
-
-        layoutRes = R.layout.conversation_info_controller
-    }
-
-    override fun onViewCreated() {
-        recyclerView.adapter = adapter
-        recyclerView.addItemDecoration(GridSpacingItemDecoration(adapter, activity!!))
-        recyclerView.layoutManager = GridLayoutManager(activity, 3).apply {
-            spanSizeLookup = object : GridLayoutManager.SpanSizeLookup() {
-                override fun getSpanSize(position: Int): Int = if (adapter.getItemViewType(position) == 2) 1 else 3
-            }
-        }
-
-        themedActivity?.theme
-                ?.autoDisposable(scope())
-                ?.subscribe { recyclerView.scrapViews() }
-    }
-
-    override fun onAttach(view: View) {
-        super.onAttach(view)
-        presenter.bindIntents(this)
-        setTitle(R.string.info_title)
-        showBackButton(true)
-    }
-
-    override fun render(state: ConversationInfoState) {
-        if (state.hasError) {
-            activity?.finish()
-            return
-        }
-
-        adapter.data = state.data
-    }
-
-    override fun recipientClicks(): Observable<Long> = adapter.recipientClicks
-    override fun recipientLongClicks(): Observable<Long> = adapter.recipientLongClicks
-    override fun themeClicks(): Observable<Long> = adapter.themeClicks
-    override fun nameClicks(): Observable<*> = adapter.nameClicks
-    override fun nameChanges(): Observable<String> = nameChangeSubject
-    override fun notificationClicks(): Observable<*> = adapter.notificationClicks
-    override fun archiveClicks(): Observable<*> = adapter.archiveClicks
-    override fun blockClicks(): Observable<*> = adapter.blockClicks
-    override fun deleteClicks(): Observable<*> = adapter.deleteClicks
-    override fun confirmDelete(): Observable<*> = confirmDeleteSubject
-    override fun mediaClicks(): Observable<Long> = adapter.mediaClicks
-
-    override fun showNameDialog(name: String) = nameDialog.setText(name).show()
-
-    override fun showThemePicker(recipientId: Long) {
-        router.pushController(RouterTransaction.with(ThemePickerController(recipientId))
-                .pushChangeHandler(QkChangeHandler())
-                .popChangeHandler(QkChangeHandler()))
-    }
-
-    override fun showBlockingDialog(conversations: List<Long>, block: Boolean) {
-        blockingDialog.show(activity!!, conversations, block)
-    }
-
-    override fun requestDefaultSms() {
-        navigator.showDefaultSmsDialog(activity!!)
-    }
-
-    override fun showDeleteDialog() {
-        AlertDialog.Builder(activity!!)
-                .setTitle(R.string.dialog_delete_title)
-                .setMessage(resources?.getQuantityString(R.plurals.dialog_delete_message, 1))
-                .setPositiveButton(R.string.button_delete) { _, _ -> confirmDeleteSubject.onNext(Unit) }
-                .setNegativeButton(R.string.button_cancel, null)
-                .show()
-    }
-
+/*
+ * Copyright (C) 2017 Moez Bhatti <moez.bhatti@gmail.com>
+ *
+ * This file is part of QKSMS.
+ *
+ * QKSMS is free software: you can redistribute it and/or modify
+ * it under the terms of the GNU General Public License as published by
+ * the Free Software Foundation, either version 3 of the License, or
+ * (at your option) any later version.
+ *
+ * QKSMS is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+ * GNU General Public License for more details.
+ *
+ * You should have received a copy of the GNU General Public License
+ * along with QKSMS.  If not, see <http://www.gnu.org/licenses/>.
+ */
+package com.moez.QKSMS.feature.conversationinfo
+
+import android.view.View
+import androidx.appcompat.app.AlertDialog
+import androidx.recyclerview.widget.GridLayoutManager
+import com.bluelinelabs.conductor.RouterTransaction
+import com.moez.QKSMS.R
+import com.moez.QKSMS.common.Navigator
+import com.moez.QKSMS.common.QkChangeHandler
+import com.moez.QKSMS.common.base.QkController
+import com.moez.QKSMS.common.util.extensions.scrapViews
+import com.moez.QKSMS.common.widget.TextInputDialog
+import com.moez.QKSMS.feature.blocking.BlockingDialog
+import com.moez.QKSMS.feature.conversationinfo.injection.ConversationInfoModule
+import com.moez.QKSMS.feature.themepicker.ThemePickerController
+import com.moez.QKSMS.injection.appComponent
+import com.uber.autodispose.android.lifecycle.scope
+import com.uber.autodispose.autoDisposable
+import io.reactivex.Observable
+import io.reactivex.subjects.PublishSubject
+import io.reactivex.subjects.Subject
+import kotlinx.android.synthetic.main.conversation_info_controller.*
+import javax.inject.Inject
+
+class ConversationInfoController(
+    val threadId: Long = 0
+) : QkController<ConversationInfoView, ConversationInfoState, ConversationInfoPresenter>(), ConversationInfoView {
+
+    @Inject override lateinit var presenter: ConversationInfoPresenter
+    @Inject lateinit var blockingDialog: BlockingDialog
+    @Inject lateinit var navigator: Navigator
+    @Inject lateinit var adapter: ConversationInfoAdapter
+
+    private val nameDialog: TextInputDialog by lazy {
+        TextInputDialog(activity!!, activity!!.getString(R.string.info_name), nameChangeSubject::onNext)
+    }
+
+    private val nameChangeSubject: Subject<String> = PublishSubject.create()
+    private val confirmDeleteSubject: Subject<Unit> = PublishSubject.create()
+
+    init {
+        appComponent
+                .conversationInfoBuilder()
+                .conversationInfoModule(ConversationInfoModule(this))
+                .build()
+                .inject(this)
+
+        layoutRes = R.layout.conversation_info_controller
+    }
+
+    override fun onViewCreated() {
+        recyclerView.adapter = adapter
+        recyclerView.addItemDecoration(GridSpacingItemDecoration(adapter, activity!!))
+        recyclerView.layoutManager = GridLayoutManager(activity, 3).apply {
+            spanSizeLookup = object : GridLayoutManager.SpanSizeLookup() {
+                override fun getSpanSize(position: Int): Int = if (adapter.getItemViewType(position) == 2) 1 else 3
+            }
+        }
+
+        themedActivity?.theme
+                ?.autoDisposable(scope())
+                ?.subscribe { recyclerView.scrapViews() }
+    }
+
+    override fun onAttach(view: View) {
+        super.onAttach(view)
+        presenter.bindIntents(this)
+        setTitle(R.string.info_title)
+        showBackButton(true)
+    }
+
+    override fun render(state: ConversationInfoState) {
+        if (state.hasError) {
+            activity?.finish()
+            return
+        }
+
+        adapter.data = state.data
+    }
+
+    override fun recipientClicks(): Observable<Long> = adapter.recipientClicks
+    override fun recipientLongClicks(): Observable<Long> = adapter.recipientLongClicks
+    override fun themeClicks(): Observable<Long> = adapter.themeClicks
+    override fun nameClicks(): Observable<*> = adapter.nameClicks
+    override fun nameChanges(): Observable<String> = nameChangeSubject
+    override fun notificationClicks(): Observable<*> = adapter.notificationClicks
+    override fun archiveClicks(): Observable<*> = adapter.archiveClicks
+    override fun blockClicks(): Observable<*> = adapter.blockClicks
+    override fun deleteClicks(): Observable<*> = adapter.deleteClicks
+    override fun confirmDelete(): Observable<*> = confirmDeleteSubject
+    override fun mediaClicks(): Observable<Long> = adapter.mediaClicks
+
+    override fun showNameDialog(name: String) = nameDialog.setText(name).show()
+
+    override fun showThemePicker(recipientId: Long) {
+        router.pushController(RouterTransaction.with(ThemePickerController(recipientId))
+                .pushChangeHandler(QkChangeHandler())
+                .popChangeHandler(QkChangeHandler()))
+    }
+
+    override fun showBlockingDialog(conversations: List<Long>, block: Boolean) {
+        blockingDialog.show(activity!!, conversations, block)
+    }
+
+    override fun requestDefaultSms() {
+        navigator.showDefaultSmsDialog(activity!!)
+    }
+
+    override fun showDeleteDialog() {
+        AlertDialog.Builder(activity!!)
+                .setTitle(R.string.dialog_delete_title)
+                .setMessage(resources?.getQuantityString(R.plurals.dialog_delete_message, 1))
+                .setPositiveButton(R.string.button_delete) { _, _ -> confirmDeleteSubject.onNext(Unit) }
+                .setNegativeButton(R.string.button_cancel, null)
+                .show()
+    }
+
 }
\ No newline at end of file
diff --git a/presentation/src/main/java/com/moez/QKSMS/feature/conversationinfo/ConversationInfoItem.kt b/presentation/src/main/java/com/moez/QKSMS/feature/conversationinfo/ConversationInfoItem.kt
index 810aa21c8..558c7cd4a 100644
--- a/presentation/src/main/java/com/moez/QKSMS/feature/conversationinfo/ConversationInfoItem.kt
+++ b/presentation/src/main/java/com/moez/QKSMS/feature/conversationinfo/ConversationInfoItem.kt
@@ -1,20 +1,20 @@
-package com.moez.QKSMS.feature.conversationinfo
-
-import com.moez.QKSMS.model.MmsPart
-import com.moez.QKSMS.model.Recipient
-import io.realm.RealmList
-
-sealed class ConversationInfoItem {
-
-    data class ConversationInfoRecipient(val value: Recipient) : ConversationInfoItem()
-
-    data class ConversationInfoSettings(
-        val name: String,
-        val recipients: RealmList<Recipient>,
-        val archived: Boolean,
-        val blocked: Boolean
-    ) : ConversationInfoItem()
-
-    data class ConversationInfoMedia(val value: MmsPart) : ConversationInfoItem()
-
-}
+package com.moez.QKSMS.feature.conversationinfo
+
+import com.moez.QKSMS.model.MmsPart
+import com.moez.QKSMS.model.Recipient
+import io.realm.RealmList
+
+sealed class ConversationInfoItem {
+
+    data class ConversationInfoRecipient(val value: Recipient) : ConversationInfoItem()
+
+    data class ConversationInfoSettings(
+        val name: String,
+        val recipients: RealmList<Recipient>,
+        val archived: Boolean,
+        val blocked: Boolean
+    ) : ConversationInfoItem()
+
+    data class ConversationInfoMedia(val value: MmsPart) : ConversationInfoItem()
+
+}
diff --git a/presentation/src/main/java/com/moez/QKSMS/feature/conversationinfo/ConversationInfoPresenter.kt b/presentation/src/main/java/com/moez/QKSMS/feature/conversationinfo/ConversationInfoPresenter.kt
index 07860ca2c..69d4e1bac 100644
--- a/presentation/src/main/java/com/moez/QKSMS/feature/conversationinfo/ConversationInfoPresenter.kt
+++ b/presentation/src/main/java/com/moez/QKSMS/feature/conversationinfo/ConversationInfoPresenter.kt
@@ -1,193 +1,193 @@
-/*
- * Copyright (C) 2017 Moez Bhatti <moez.bhatti@gmail.com>
- *
- * This file is part of QKSMS.
- *
- * QKSMS is free software: you can redistribute it and/or modify
- * it under the terms of the GNU General Public License as published by
- * the Free Software Foundation, either version 3 of the License, or
- * (at your option) any later version.
- *
- * QKSMS is distributed in the hope that it will be useful,
- * but WITHOUT ANY WARRANTY; without even the implied warranty of
- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
- * GNU General Public License for more details.
- *
- * You should have received a copy of the GNU General Public License
- * along with QKSMS.  If not, see <http://www.gnu.org/licenses/>.
- */
-package com.moez.QKSMS.feature.conversationinfo
-
-import android.content.Context
-import androidx.lifecycle.Lifecycle
-import com.moez.QKSMS.R
-import com.moez.QKSMS.common.Navigator
-import com.moez.QKSMS.common.base.QkPresenter
-import com.moez.QKSMS.common.util.ClipboardUtils
-import com.moez.QKSMS.common.util.extensions.makeToast
-import com.moez.QKSMS.extensions.asObservable
-import com.moez.QKSMS.extensions.mapNotNull
-import com.moez.QKSMS.feature.conversationinfo.ConversationInfoItem.ConversationInfoMedia
-import com.moez.QKSMS.feature.conversationinfo.ConversationInfoItem.ConversationInfoRecipient
-import com.moez.QKSMS.interactor.DeleteConversations
-import com.moez.QKSMS.interactor.MarkArchived
-import com.moez.QKSMS.interactor.MarkUnarchived
-import com.moez.QKSMS.manager.PermissionManager
-import com.moez.QKSMS.model.Conversation
-import com.moez.QKSMS.repository.ConversationRepository
-import com.moez.QKSMS.repository.MessageRepository
-import com.uber.autodispose.android.lifecycle.scope
-import com.uber.autodispose.autoDisposable
-import io.reactivex.android.schedulers.AndroidSchedulers
-import io.reactivex.rxkotlin.Observables
-import io.reactivex.rxkotlin.plusAssign
-import io.reactivex.rxkotlin.withLatestFrom
-import io.reactivex.subjects.BehaviorSubject
-import io.reactivex.subjects.Subject
-import javax.inject.Inject
-import javax.inject.Named
-
-class ConversationInfoPresenter @Inject constructor(
-    @Named("threadId") threadId: Long,
-    messageRepo: MessageRepository,
-    private val context: Context,
-    private val conversationRepo: ConversationRepository,
-    private val deleteConversations: DeleteConversations,
-    private val markArchived: MarkArchived,
-    private val markUnarchived: MarkUnarchived,
-    private val navigator: Navigator,
-    private val permissionManager: PermissionManager
-) : QkPresenter<ConversationInfoView, ConversationInfoState>(
-        ConversationInfoState(threadId = threadId)
-) {
-
-    private val conversation: Subject<Conversation> = BehaviorSubject.create()
-
-    init {
-        disposables += conversationRepo.getConversationAsync(threadId)
-                .asObservable()
-                .filter { conversation -> conversation.isLoaded }
-                .doOnNext { conversation ->
-                    if (!conversation.isValid) {
-                        newState { copy(hasError = true) }
-                    }
-                }
-                .filter { conversation -> conversation.isValid }
-                .filter { conversation -> conversation.id != 0L }
-                .subscribe(conversation::onNext)
-
-        disposables += markArchived
-        disposables += markUnarchived
-        disposables += deleteConversations
-
-        disposables += Observables
-                .combineLatest(
-                        conversation,
-                        messageRepo.getPartsForConversation(threadId).asObservable()
-                ) { conversation, parts ->
-                    val data = mutableListOf<ConversationInfoItem>()
-
-                    // If some data was deleted, this isn't the place to handle it
-                    if (!conversation.isLoaded || !conversation.isValid || !parts.isLoaded || !parts.isValid) {
-                        return@combineLatest
-                    }
-
-                    data += conversation.recipients.map(::ConversationInfoRecipient)
-                    data += ConversationInfoItem.ConversationInfoSettings(
-                            name = conversation.name,
-                            recipients = conversation.recipients,
-                            archived = conversation.archived,
-                            blocked = conversation.blocked)
-                    data += parts.map(::ConversationInfoMedia)
-
-                    newState { copy(data = data) }
-                }
-                .subscribe()
-    }
-
-    override fun bindIntents(view: ConversationInfoView) {
-        super.bindIntents(view)
-
-        // Add or display the contact
-        view.recipientClicks()
-                .mapNotNull(conversationRepo::getRecipient)
-                .doOnNext { recipient ->
-                    recipient.contact?.lookupKey?.let(navigator::showContact)
-                            ?: navigator.addContact(recipient.address)
-                }
-                .autoDisposable(view.scope(Lifecycle.Event.ON_DESTROY)) // ... this should be the default
-                .subscribe()
-
-        // Copy phone number
-        view.recipientLongClicks()
-                .mapNotNull(conversationRepo::getRecipient)
-                .map { recipient -> recipient.address }
-                .observeOn(AndroidSchedulers.mainThread())
-                .autoDisposable(view.scope())
-                .subscribe { address ->
-                    ClipboardUtils.copy(context, address)
-                    context.makeToast(R.string.info_copied_address)
-                }
-
-        // Show the theme settings for the conversation
-        view.themeClicks()
-                .autoDisposable(view.scope())
-                .subscribe(view::showThemePicker)
-
-        // Show the conversation title dialog
-        view.nameClicks()
-                .withLatestFrom(conversation) { _, conversation -> conversation }
-                .map { conversation -> conversation.name }
-                .autoDisposable(view.scope())
-                .subscribe(view::showNameDialog)
-
-        // Set the conversation title
-        view.nameChanges()
-                .withLatestFrom(conversation) { name, conversation ->
-                    conversationRepo.setConversationName(conversation.id, name)
-                }
-                .autoDisposable(view.scope())
-                .subscribe()
-
-        // Show the notifications settings for the conversation
-        view.notificationClicks()
-                .withLatestFrom(conversation) { _, conversation -> conversation }
-                .autoDisposable(view.scope())
-                .subscribe { conversation -> navigator.showNotificationSettings(conversation.id) }
-
-        // Toggle the archived state of the conversation
-        view.archiveClicks()
-                .withLatestFrom(conversation) { _, conversation -> conversation }
-                .autoDisposable(view.scope())
-                .subscribe { conversation ->
-                    when (conversation.archived) {
-                        true -> markUnarchived.execute(listOf(conversation.id))
-                        false -> markArchived.execute(listOf(conversation.id))
-                    }
-                }
-
-        // Toggle the blocked state of the conversation
-        view.blockClicks()
-                .withLatestFrom(conversation) { _, conversation -> conversation }
-                .autoDisposable(view.scope())
-                .subscribe { conversation -> view.showBlockingDialog(listOf(conversation.id), !conversation.blocked) }
-
-        // Show the delete confirmation dialog
-        view.deleteClicks()
-                .filter { permissionManager.isDefaultSms().also { if (!it) view.requestDefaultSms() } }
-                .autoDisposable(view.scope())
-                .subscribe { view.showDeleteDialog() }
-
-        // Delete the conversation
-        view.confirmDelete()
-                .withLatestFrom(conversation) { _, conversation -> conversation }
-                .autoDisposable(view.scope())
-                .subscribe { conversation -> deleteConversations.execute(listOf(conversation.id)) }
-
-        // Media
-        view.mediaClicks()
-                .autoDisposable(view.scope())
-                .subscribe(navigator::showMedia)
-    }
-
+/*
+ * Copyright (C) 2017 Moez Bhatti <moez.bhatti@gmail.com>
+ *
+ * This file is part of QKSMS.
+ *
+ * QKSMS is free software: you can redistribute it and/or modify
+ * it under the terms of the GNU General Public License as published by
+ * the Free Software Foundation, either version 3 of the License, or
+ * (at your option) any later version.
+ *
+ * QKSMS is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+ * GNU General Public License for more details.
+ *
+ * You should have received a copy of the GNU General Public License
+ * along with QKSMS.  If not, see <http://www.gnu.org/licenses/>.
+ */
+package com.moez.QKSMS.feature.conversationinfo
+
+import android.content.Context
+import androidx.lifecycle.Lifecycle
+import com.moez.QKSMS.R
+import com.moez.QKSMS.common.Navigator
+import com.moez.QKSMS.common.base.QkPresenter
+import com.moez.QKSMS.common.util.ClipboardUtils
+import com.moez.QKSMS.common.util.extensions.makeToast
+import com.moez.QKSMS.extensions.asObservable
+import com.moez.QKSMS.extensions.mapNotNull
+import com.moez.QKSMS.feature.conversationinfo.ConversationInfoItem.ConversationInfoMedia
+import com.moez.QKSMS.feature.conversationinfo.ConversationInfoItem.ConversationInfoRecipient
+import com.moez.QKSMS.interactor.DeleteConversations
+import com.moez.QKSMS.interactor.MarkArchived
+import com.moez.QKSMS.interactor.MarkUnarchived
+import com.moez.QKSMS.manager.PermissionManager
+import com.moez.QKSMS.model.Conversation
+import com.moez.QKSMS.repository.ConversationRepository
+import com.moez.QKSMS.repository.MessageRepository
+import com.uber.autodispose.android.lifecycle.scope
+import com.uber.autodispose.autoDisposable
+import io.reactivex.android.schedulers.AndroidSchedulers
+import io.reactivex.rxkotlin.Observables
+import io.reactivex.rxkotlin.plusAssign
+import io.reactivex.rxkotlin.withLatestFrom
+import io.reactivex.subjects.BehaviorSubject
+import io.reactivex.subjects.Subject
+import javax.inject.Inject
+import javax.inject.Named
+
+class ConversationInfoPresenter @Inject constructor(
+    @Named("threadId") threadId: Long,
+    messageRepo: MessageRepository,
+    private val context: Context,
+    private val conversationRepo: ConversationRepository,
+    private val deleteConversations: DeleteConversations,
+    private val markArchived: MarkArchived,
+    private val markUnarchived: MarkUnarchived,
+    private val navigator: Navigator,
+    private val permissionManager: PermissionManager
+) : QkPresenter<ConversationInfoView, ConversationInfoState>(
+        ConversationInfoState(threadId = threadId)
+) {
+
+    private val conversation: Subject<Conversation> = BehaviorSubject.create()
+
+    init {
+        disposables += conversationRepo.getConversationAsync(threadId)
+                .asObservable()
+                .filter { conversation -> conversation.isLoaded }
+                .doOnNext { conversation ->
+                    if (!conversation.isValid) {
+                        newState { copy(hasError = true) }
+                    }
+                }
+                .filter { conversation -> conversation.isValid }
+                .filter { conversation -> conversation.id != 0L }
+                .subscribe(conversation::onNext)
+
+        disposables += markArchived
+        disposables += markUnarchived
+        disposables += deleteConversations
+
+        disposables += Observables
+                .combineLatest(
+                        conversation,
+                        messageRepo.getPartsForConversation(threadId).asObservable()
+                ) { conversation, parts ->
+                    val data = mutableListOf<ConversationInfoItem>()
+
+                    // If some data was deleted, this isn't the place to handle it
+                    if (!conversation.isLoaded || !conversation.isValid || !parts.isLoaded || !parts.isValid) {
+                        return@combineLatest
+                    }
+
+                    data += conversation.recipients.map(::ConversationInfoRecipient)
+                    data += ConversationInfoItem.ConversationInfoSettings(
+                            name = conversation.name,
+                            recipients = conversation.recipients,
+                            archived = conversation.archived,
+                            blocked = conversation.blocked)
+                    data += parts.map(::ConversationInfoMedia)
+
+                    newState { copy(data = data) }
+                }
+                .subscribe()
+    }
+
+    override fun bindIntents(view: ConversationInfoView) {
+        super.bindIntents(view)
+
+        // Add or display the contact
+        view.recipientClicks()
+                .mapNotNull(conversationRepo::getRecipient)
+                .doOnNext { recipient ->
+                    recipient.contact?.lookupKey?.let(navigator::showContact)
+                            ?: navigator.addContact(recipient.address)
+                }
+                .autoDisposable(view.scope(Lifecycle.Event.ON_DESTROY)) // ... this should be the default
+                .subscribe()
+
+        // Copy phone number
+        view.recipientLongClicks()
+                .mapNotNull(conversationRepo::getRecipient)
+                .map { recipient -> recipient.address }
+                .observeOn(AndroidSchedulers.mainThread())
+                .autoDisposable(view.scope())
+                .subscribe { address ->
+                    ClipboardUtils.copy(context, address)
+                    context.makeToast(R.string.info_copied_address)
+                }
+
+        // Show the theme settings for the conversation
+        view.themeClicks()
+                .autoDisposable(view.scope())
+                .subscribe(view::showThemePicker)
+
+        // Show the conversation title dialog
+        view.nameClicks()
+                .withLatestFrom(conversation) { _, conversation -> conversation }
+                .map { conversation -> conversation.name }
+                .autoDisposable(view.scope())
+                .subscribe(view::showNameDialog)
+
+        // Set the conversation title
+        view.nameChanges()
+                .withLatestFrom(conversation) { name, conversation ->
+                    conversationRepo.setConversationName(conversation.id, name)
+                }
+                .autoDisposable(view.scope())
+                .subscribe()
+
+        // Show the notifications settings for the conversation
+        view.notificationClicks()
+                .withLatestFrom(conversation) { _, conversation -> conversation }
+                .autoDisposable(view.scope())
+                .subscribe { conversation -> navigator.showNotificationSettings(conversation.id) }
+
+        // Toggle the archived state of the conversation
+        view.archiveClicks()
+                .withLatestFrom(conversation) { _, conversation -> conversation }
+                .autoDisposable(view.scope())
+                .subscribe { conversation ->
+                    when (conversation.archived) {
+                        true -> markUnarchived.execute(listOf(conversation.id))
+                        false -> markArchived.execute(listOf(conversation.id))
+                    }
+                }
+
+        // Toggle the blocked state of the conversation
+        view.blockClicks()
+                .withLatestFrom(conversation) { _, conversation -> conversation }
+                .autoDisposable(view.scope())
+                .subscribe { conversation -> view.showBlockingDialog(listOf(conversation.id), !conversation.blocked) }
+
+        // Show the delete confirmation dialog
+        view.deleteClicks()
+                .filter { permissionManager.isDefaultSms().also { if (!it) view.requestDefaultSms() } }
+                .autoDisposable(view.scope())
+                .subscribe { view.showDeleteDialog() }
+
+        // Delete the conversation
+        view.confirmDelete()
+                .withLatestFrom(conversation) { _, conversation -> conversation }
+                .autoDisposable(view.scope())
+                .subscribe { conversation -> deleteConversations.execute(listOf(conversation.id)) }
+
+        // Media
+        view.mediaClicks()
+                .autoDisposable(view.scope())
+                .subscribe(navigator::showMedia)
+    }
+
 }
\ No newline at end of file
diff --git a/presentation/src/main/java/com/moez/QKSMS/feature/conversationinfo/ConversationInfoState.kt b/presentation/src/main/java/com/moez/QKSMS/feature/conversationinfo/ConversationInfoState.kt
index 693a862ee..8062b0834 100644
--- a/presentation/src/main/java/com/moez/QKSMS/feature/conversationinfo/ConversationInfoState.kt
+++ b/presentation/src/main/java/com/moez/QKSMS/feature/conversationinfo/ConversationInfoState.kt
@@ -1,25 +1,25 @@
-/*
- * Copyright (C) 2017 Moez Bhatti <moez.bhatti@gmail.com>
- *
- * This file is part of QKSMS.
- *
- * QKSMS is free software: you can redistribute it and/or modify
- * it under the terms of the GNU General Public License as published by
- * the Free Software Foundation, either version 3 of the License, or
- * (at your option) any later version.
- *
- * QKSMS is distributed in the hope that it will be useful,
- * but WITHOUT ANY WARRANTY; without even the implied warranty of
- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
- * GNU General Public License for more details.
- *
- * You should have received a copy of the GNU General Public License
- * along with QKSMS.  If not, see <http://www.gnu.org/licenses/>.
- */
-package com.moez.QKSMS.feature.conversationinfo
-
-data class ConversationInfoState(
-    val threadId: Long = 0,
-    val data: List<ConversationInfoItem> = listOf(),
-    val hasError: Boolean = false
-)
+/*
+ * Copyright (C) 2017 Moez Bhatti <moez.bhatti@gmail.com>
+ *
+ * This file is part of QKSMS.
+ *
+ * QKSMS is free software: you can redistribute it and/or modify
+ * it under the terms of the GNU General Public License as published by
+ * the Free Software Foundation, either version 3 of the License, or
+ * (at your option) any later version.
+ *
+ * QKSMS is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+ * GNU General Public License for more details.
+ *
+ * You should have received a copy of the GNU General Public License
+ * along with QKSMS.  If not, see <http://www.gnu.org/licenses/>.
+ */
+package com.moez.QKSMS.feature.conversationinfo
+
+data class ConversationInfoState(
+    val threadId: Long = 0,
+    val data: List<ConversationInfoItem> = listOf(),
+    val hasError: Boolean = false
+)
diff --git a/presentation/src/main/java/com/moez/QKSMS/feature/conversationinfo/ConversationInfoView.kt b/presentation/src/main/java/com/moez/QKSMS/feature/conversationinfo/ConversationInfoView.kt
index 5a86ffffe..45310e6f0 100644
--- a/presentation/src/main/java/com/moez/QKSMS/feature/conversationinfo/ConversationInfoView.kt
+++ b/presentation/src/main/java/com/moez/QKSMS/feature/conversationinfo/ConversationInfoView.kt
@@ -1,44 +1,44 @@
-/*
- * Copyright (C) 2017 Moez Bhatti <moez.bhatti@gmail.com>
- *
- * This file is part of QKSMS.
- *
- * QKSMS is free software: you can redistribute it and/or modify
- * it under the terms of the GNU General Public License as published by
- * the Free Software Foundation, either version 3 of the License, or
- * (at your option) any later version.
- *
- * QKSMS is distributed in the hope that it will be useful,
- * but WITHOUT ANY WARRANTY; without even the implied warranty of
- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
- * GNU General Public License for more details.
- *
- * You should have received a copy of the GNU General Public License
- * along with QKSMS.  If not, see <http://www.gnu.org/licenses/>.
- */
-package com.moez.QKSMS.feature.conversationinfo
-
-import com.moez.QKSMS.common.base.QkViewContract
-import io.reactivex.Observable
-
-interface ConversationInfoView : QkViewContract<ConversationInfoState> {
-
-    fun recipientClicks(): Observable<Long>
-    fun recipientLongClicks(): Observable<Long>
-    fun themeClicks(): Observable<Long>
-    fun nameClicks(): Observable<*>
-    fun nameChanges(): Observable<String>
-    fun notificationClicks(): Observable<*>
-    fun archiveClicks(): Observable<*>
-    fun blockClicks(): Observable<*>
-    fun deleteClicks(): Observable<*>
-    fun confirmDelete(): Observable<*>
-    fun mediaClicks(): Observable<Long>
-
-    fun showNameDialog(name: String)
-    fun showThemePicker(recipientId: Long)
-    fun showBlockingDialog(conversations: List<Long>, block: Boolean)
-    fun requestDefaultSms()
-    fun showDeleteDialog()
-
-}
+/*
+ * Copyright (C) 2017 Moez Bhatti <moez.bhatti@gmail.com>
+ *
+ * This file is part of QKSMS.
+ *
+ * QKSMS is free software: you can redistribute it and/or modify
+ * it under the terms of the GNU General Public License as published by
+ * the Free Software Foundation, either version 3 of the License, or
+ * (at your option) any later version.
+ *
+ * QKSMS is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+ * GNU General Public License for more details.
+ *
+ * You should have received a copy of the GNU General Public License
+ * along with QKSMS.  If not, see <http://www.gnu.org/licenses/>.
+ */
+package com.moez.QKSMS.feature.conversationinfo
+
+import com.moez.QKSMS.common.base.QkViewContract
+import io.reactivex.Observable
+
+interface ConversationInfoView : QkViewContract<ConversationInfoState> {
+
+    fun recipientClicks(): Observable<Long>
+    fun recipientLongClicks(): Observable<Long>
+    fun themeClicks(): Observable<Long>
+    fun nameClicks(): Observable<*>
+    fun nameChanges(): Observable<String>
+    fun notificationClicks(): Observable<*>
+    fun archiveClicks(): Observable<*>
+    fun blockClicks(): Observable<*>
+    fun deleteClicks(): Observable<*>
+    fun confirmDelete(): Observable<*>
+    fun mediaClicks(): Observable<Long>
+
+    fun showNameDialog(name: String)
+    fun showThemePicker(recipientId: Long)
+    fun showBlockingDialog(conversations: List<Long>, block: Boolean)
+    fun requestDefaultSms()
+    fun showDeleteDialog()
+
+}
diff --git a/presentation/src/main/java/com/moez/QKSMS/feature/conversationinfo/GridSpacingItemDecoration.kt b/presentation/src/main/java/com/moez/QKSMS/feature/conversationinfo/GridSpacingItemDecoration.kt
index 41bfdf906..3887b9d46 100644
--- a/presentation/src/main/java/com/moez/QKSMS/feature/conversationinfo/GridSpacingItemDecoration.kt
+++ b/presentation/src/main/java/com/moez/QKSMS/feature/conversationinfo/GridSpacingItemDecoration.kt
@@ -1,57 +1,57 @@
-/*
- * Copyright (C) 2017 Moez Bhatti <moez.bhatti@gmail.com>
- *
- * This file is part of QKSMS.
- *
- * QKSMS is free software: you can redistribute it and/or modify
- * it under the terms of the GNU General Public License as published by
- * the Free Software Foundation, either version 3 of the License, or
- * (at your option) any later version.
- *
- * QKSMS is distributed in the hope that it will be useful,
- * but WITHOUT ANY WARRANTY; without even the implied warranty of
- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
- * GNU General Public License for more details.
- *
- * You should have received a copy of the GNU General Public License
- * along with QKSMS.  If not, see <http://www.gnu.org/licenses/>.
- */
-package com.moez.QKSMS.feature.conversationinfo
-
-import android.content.Context
-import android.graphics.Rect
-import android.view.View
-import androidx.recyclerview.widget.RecyclerView
-import com.moez.QKSMS.common.util.extensions.dpToPx
-import com.moez.QKSMS.feature.conversationinfo.ConversationInfoItem.ConversationInfoMedia
-import com.moez.QKSMS.feature.conversationinfo.ConversationInfoItem.ConversationInfoRecipient
-
-class GridSpacingItemDecoration(
-    private val adapter: ConversationInfoAdapter,
-    private val context: Context
-) : RecyclerView.ItemDecoration() {
-
-    private val spanCount = 3
-    private val spacing = 2.dpToPx(context)
-
-    override fun getItemOffsets(outRect: Rect, view: View, parent: RecyclerView, state: RecyclerView.State) {
-        super.getItemOffsets(outRect, view, parent, state)
-
-        val position = parent.getChildAdapterPosition(view)
-        val item = adapter.getItem(position)
-
-        if (item is ConversationInfoRecipient && adapter.getItem(position + 1) !is ConversationInfoRecipient) {
-            outRect.bottom = 8.dpToPx(context)
-        } else if (item is ConversationInfoMedia) {
-            val firstPartIndex = adapter.data.indexOfFirst { it is ConversationInfoMedia }
-            val localPartIndex = position - firstPartIndex
-
-            val column = localPartIndex % spanCount
-
-            outRect.top = spacing
-            outRect.left = column * spacing / spanCount
-            outRect.right = spacing - (column + 1) * spacing / spanCount
-        }
-    }
-
+/*
+ * Copyright (C) 2017 Moez Bhatti <moez.bhatti@gmail.com>
+ *
+ * This file is part of QKSMS.
+ *
+ * QKSMS is free software: you can redistribute it and/or modify
+ * it under the terms of the GNU General Public License as published by
+ * the Free Software Foundation, either version 3 of the License, or
+ * (at your option) any later version.
+ *
+ * QKSMS is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+ * GNU General Public License for more details.
+ *
+ * You should have received a copy of the GNU General Public License
+ * along with QKSMS.  If not, see <http://www.gnu.org/licenses/>.
+ */
+package com.moez.QKSMS.feature.conversationinfo
+
+import android.content.Context
+import android.graphics.Rect
+import android.view.View
+import androidx.recyclerview.widget.RecyclerView
+import com.moez.QKSMS.common.util.extensions.dpToPx
+import com.moez.QKSMS.feature.conversationinfo.ConversationInfoItem.ConversationInfoMedia
+import com.moez.QKSMS.feature.conversationinfo.ConversationInfoItem.ConversationInfoRecipient
+
+class GridSpacingItemDecoration(
+    private val adapter: ConversationInfoAdapter,
+    private val context: Context
+) : RecyclerView.ItemDecoration() {
+
+    private val spanCount = 3
+    private val spacing = 2.dpToPx(context)
+
+    override fun getItemOffsets(outRect: Rect, view: View, parent: RecyclerView, state: RecyclerView.State) {
+        super.getItemOffsets(outRect, view, parent, state)
+
+        val position = parent.getChildAdapterPosition(view)
+        val item = adapter.getItem(position)
+
+        if (item is ConversationInfoRecipient && adapter.getItem(position + 1) !is ConversationInfoRecipient) {
+            outRect.bottom = 8.dpToPx(context)
+        } else if (item is ConversationInfoMedia) {
+            val firstPartIndex = adapter.data.indexOfFirst { it is ConversationInfoMedia }
+            val localPartIndex = position - firstPartIndex
+
+            val column = localPartIndex % spanCount
+
+            outRect.top = spacing
+            outRect.left = column * spacing / spanCount
+            outRect.right = spacing - (column + 1) * spacing / spanCount
+        }
+    }
+
 }
\ No newline at end of file
diff --git a/presentation/src/main/java/com/moez/QKSMS/feature/conversationinfo/injection/ConversationInfoComponent.kt b/presentation/src/main/java/com/moez/QKSMS/feature/conversationinfo/injection/ConversationInfoComponent.kt
index b95224e6a..8ee8f7f57 100644
--- a/presentation/src/main/java/com/moez/QKSMS/feature/conversationinfo/injection/ConversationInfoComponent.kt
+++ b/presentation/src/main/java/com/moez/QKSMS/feature/conversationinfo/injection/ConversationInfoComponent.kt
@@ -1,37 +1,37 @@
-/*
- * Copyright (C) 2017 Moez Bhatti <moez.bhatti@gmail.com>
- *
- * This file is part of QKSMS.
- *
- * QKSMS is free software: you can redistribute it and/or modify
- * it under the terms of the GNU General Public License as published by
- * the Free Software Foundation, either version 3 of the License, or
- * (at your option) any later version.
- *
- * QKSMS is distributed in the hope that it will be useful,
- * but WITHOUT ANY WARRANTY; without even the implied warranty of
- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
- * GNU General Public License for more details.
- *
- * You should have received a copy of the GNU General Public License
- * along with QKSMS.  If not, see <http://www.gnu.org/licenses/>.
- */
-package com.moez.QKSMS.feature.conversationinfo.injection
-
-import com.moez.QKSMS.feature.conversationinfo.ConversationInfoController
-import com.moez.QKSMS.injection.scope.ControllerScope
-import dagger.Subcomponent
-
-@ControllerScope
-@Subcomponent(modules = [ConversationInfoModule::class])
-interface ConversationInfoComponent {
-
-    fun inject(controller: ConversationInfoController)
-
-    @Subcomponent.Builder
-    interface Builder {
-        fun conversationInfoModule(module: ConversationInfoModule): Builder
-        fun build(): ConversationInfoComponent
-    }
-
+/*
+ * Copyright (C) 2017 Moez Bhatti <moez.bhatti@gmail.com>
+ *
+ * This file is part of QKSMS.
+ *
+ * QKSMS is free software: you can redistribute it and/or modify
+ * it under the terms of the GNU General Public License as published by
+ * the Free Software Foundation, either version 3 of the License, or
+ * (at your option) any later version.
+ *
+ * QKSMS is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+ * GNU General Public License for more details.
+ *
+ * You should have received a copy of the GNU General Public License
+ * along with QKSMS.  If not, see <http://www.gnu.org/licenses/>.
+ */
+package com.moez.QKSMS.feature.conversationinfo.injection
+
+import com.moez.QKSMS.feature.conversationinfo.ConversationInfoController
+import com.moez.QKSMS.injection.scope.ControllerScope
+import dagger.Subcomponent
+
+@ControllerScope
+@Subcomponent(modules = [ConversationInfoModule::class])
+interface ConversationInfoComponent {
+
+    fun inject(controller: ConversationInfoController)
+
+    @Subcomponent.Builder
+    interface Builder {
+        fun conversationInfoModule(module: ConversationInfoModule): Builder
+        fun build(): ConversationInfoComponent
+    }
+
 }
\ No newline at end of file
diff --git a/presentation/src/main/java/com/moez/QKSMS/feature/conversationinfo/injection/ConversationInfoModule.kt b/presentation/src/main/java/com/moez/QKSMS/feature/conversationinfo/injection/ConversationInfoModule.kt
index 29788eab5..d75df69c5 100644
--- a/presentation/src/main/java/com/moez/QKSMS/feature/conversationinfo/injection/ConversationInfoModule.kt
+++ b/presentation/src/main/java/com/moez/QKSMS/feature/conversationinfo/injection/ConversationInfoModule.kt
@@ -1,35 +1,35 @@
-/*
- * Copyright (C) 2017 Moez Bhatti <moez.bhatti@gmail.com>
- *
- * This file is part of QKSMS.
- *
- * QKSMS is free software: you can redistribute it and/or modify
- * it under the terms of the GNU General Public License as published by
- * the Free Software Foundation, either version 3 of the License, or
- * (at your option) any later version.
- *
- * QKSMS is distributed in the hope that it will be useful,
- * but WITHOUT ANY WARRANTY; without even the implied warranty of
- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
- * GNU General Public License for more details.
- *
- * You should have received a copy of the GNU General Public License
- * along with QKSMS.  If not, see <http://www.gnu.org/licenses/>.
- */
-package com.moez.QKSMS.feature.conversationinfo.injection
-
-import com.moez.QKSMS.feature.conversationinfo.ConversationInfoController
-import com.moez.QKSMS.injection.scope.ControllerScope
-import dagger.Module
-import dagger.Provides
-import javax.inject.Named
-
-@Module
-class ConversationInfoModule(private val controller: ConversationInfoController) {
-
-    @Provides
-    @ControllerScope
-    @Named("threadId")
-    fun provideThreadId(): Long = controller.threadId
-
+/*
+ * Copyright (C) 2017 Moez Bhatti <moez.bhatti@gmail.com>
+ *
+ * This file is part of QKSMS.
+ *
+ * QKSMS is free software: you can redistribute it and/or modify
+ * it under the terms of the GNU General Public License as published by
+ * the Free Software Foundation, either version 3 of the License, or
+ * (at your option) any later version.
+ *
+ * QKSMS is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+ * GNU General Public License for more details.
+ *
+ * You should have received a copy of the GNU General Public License
+ * along with QKSMS.  If not, see <http://www.gnu.org/licenses/>.
+ */
+package com.moez.QKSMS.feature.conversationinfo.injection
+
+import com.moez.QKSMS.feature.conversationinfo.ConversationInfoController
+import com.moez.QKSMS.injection.scope.ControllerScope
+import dagger.Module
+import dagger.Provides
+import javax.inject.Named
+
+@Module
+class ConversationInfoModule(private val controller: ConversationInfoController) {
+
+    @Provides
+    @ControllerScope
+    @Named("threadId")
+    fun provideThreadId(): Long = controller.threadId
+
 }
\ No newline at end of file
diff --git a/presentation/src/main/java/com/moez/QKSMS/feature/conversations/ConversationItemTouchCallback.kt b/presentation/src/main/java/com/moez/QKSMS/feature/conversations/ConversationItemTouchCallback.kt
index cb06c2131..387c04731 100644
--- a/presentation/src/main/java/com/moez/QKSMS/feature/conversations/ConversationItemTouchCallback.kt
+++ b/presentation/src/main/java/com/moez/QKSMS/feature/conversations/ConversationItemTouchCallback.kt
@@ -1,164 +1,164 @@
-/*
- * Copyright (C) 2017 Moez Bhatti <moez.bhatti@gmail.com>
- *
- * This file is part of QKSMS.
- *
- * QKSMS is free software: you can redistribute it and/or modify
- * it under the terms of the GNU General Public License as published by
- * the Free Software Foundation, either version 3 of the License, or
- * (at your option) any later version.
- *
- * QKSMS is distributed in the hope that it will be useful,
- * but WITHOUT ANY WARRANTY; without even the implied warranty of
- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
- * GNU General Public License for more details.
- *
- * You should have received a copy of the GNU General Public License
- * along with QKSMS.  If not, see <http://www.gnu.org/licenses/>.
- */
-package com.moez.QKSMS.feature.conversations
-
-import android.content.Context
-import android.graphics.Bitmap
-import android.graphics.Canvas
-import android.graphics.Paint
-import android.graphics.Rect
-import androidx.core.graphics.drawable.toBitmap
-import androidx.recyclerview.widget.ItemTouchHelper
-import androidx.recyclerview.widget.RecyclerView
-import com.moez.QKSMS.R
-import com.moez.QKSMS.common.util.Colors
-import com.moez.QKSMS.common.util.extensions.dpToPx
-import com.moez.QKSMS.util.Preferences
-import io.reactivex.disposables.CompositeDisposable
-import io.reactivex.rxkotlin.Observables
-import io.reactivex.rxkotlin.plusAssign
-import io.reactivex.schedulers.Schedulers
-import io.reactivex.subjects.PublishSubject
-import io.reactivex.subjects.Subject
-import javax.inject.Inject
-import kotlin.math.max
-import kotlin.math.min
-
-class ConversationItemTouchCallback @Inject constructor(
-    colors: Colors,
-    disposables: CompositeDisposable,
-    prefs: Preferences,
-    private val context: Context
-) : ItemTouchHelper.SimpleCallback(0, 0) {
-
-    val swipes: Subject<Pair<Long, Int>> = PublishSubject.create()
-
-    /**
-     * Setting the adapter allows us to animate back to the original position
-     */
-    var adapter: RecyclerView.Adapter<*>? = null
-
-    private val backgroundPaint = Paint()
-    private var rightAction = 0
-    private var swipeRightIcon: Bitmap? = null
-    private var leftAction = 0
-    private var swipeLeftIcon: Bitmap? = null
-
-    private val iconLength = 24.dpToPx(context)
-
-    init {
-        disposables += colors.themeObservable()
-                .doOnNext { theme -> backgroundPaint.color = theme.theme }
-                .subscribeOn(Schedulers.io())
-                .subscribe()
-
-        disposables += Observables
-                .combineLatest(prefs.swipeRight.asObservable(), prefs.swipeLeft.asObservable(), colors.themeObservable()
-                ) { right, left, theme ->
-                    rightAction = right
-                    swipeRightIcon = iconForAction(right, theme.textPrimary)
-                    leftAction = left
-                    swipeLeftIcon = iconForAction(left, theme.textPrimary)
-                    setDefaultSwipeDirs((if (right == Preferences.SWIPE_ACTION_NONE) 0 else ItemTouchHelper.RIGHT)
-                            or (if (left == Preferences.SWIPE_ACTION_NONE) 0 else ItemTouchHelper.LEFT))
-                }
-                .subscribeOn(Schedulers.io())
-                .subscribe()
-    }
-
-    override fun onMove(
-        recyclerView: RecyclerView,
-        viewHolder: RecyclerView.ViewHolder,
-        target: RecyclerView.ViewHolder
-    ): Boolean {
-        return false
-    }
-
-    override fun onChildDraw(
-        c: Canvas,
-        recyclerView: RecyclerView,
-        viewHolder: RecyclerView.ViewHolder,
-        dX: Float,
-        dY: Float,
-        actionState: Int,
-        isCurrentlyActive: Boolean
-    ) {
-        if (actionState == ItemTouchHelper.ACTION_STATE_SWIPE) {
-            val itemView = viewHolder.itemView
-
-            if (dX > 0) {
-                c.drawRect(itemView.left.toFloat(), itemView.top.toFloat(),
-                        dX, itemView.bottom.toFloat(), backgroundPaint)
-
-                swipeRightIcon?.let { icon ->
-                    val availablePx = dX.toInt() - iconLength
-                    if (availablePx > 0) {
-                        val src = Rect(0, 0, min(availablePx, icon.width), icon.height)
-                        val dstTop = itemView.top + (itemView.bottom - itemView.top - icon.height) / 2
-                        val dst = Rect(iconLength, dstTop, iconLength + src.width(), dstTop + src.height())
-                        c.drawBitmap(icon, src, dst, null)
-                    }
-                }
-            } else if (dX < 0) {
-                c.drawRect(itemView.right.toFloat() + dX, itemView.top.toFloat(),
-                        itemView.right.toFloat(), itemView.bottom.toFloat(), backgroundPaint)
-
-                swipeLeftIcon?.let { icon ->
-                    val availablePx = -dX.toInt() - iconLength
-                    if (availablePx > 0) {
-                        val src = Rect(max(0, icon.width - availablePx), 0, icon.width, icon.height)
-                        val dstTop = itemView.top + (itemView.bottom - itemView.top - icon.height) / 2
-                        val dst = Rect(itemView.right - iconLength - src.width(), dstTop,
-                                itemView.right - iconLength, dstTop + src.height())
-                        c.drawBitmap(icon, src, dst, null)
-                    }
-                }
-            }
-
-            super.onChildDraw(c, recyclerView, viewHolder, dX, dY, actionState, isCurrentlyActive)
-        }
-    }
-
-    override fun onSwiped(viewHolder: RecyclerView.ViewHolder, direction: Int) {
-        swipes.onNext(Pair(viewHolder.itemId, direction))
-
-        // This will trigger the animation back to neutral state
-        val action = if (direction == ItemTouchHelper.RIGHT) rightAction else leftAction
-        if (action != Preferences.SWIPE_ACTION_ARCHIVE) {
-            adapter?.notifyItemChanged(viewHolder.adapterPosition)
-        }
-    }
-
-    private fun iconForAction(action: Int, tint: Int): Bitmap? {
-        val res = when (action) {
-            Preferences.SWIPE_ACTION_ARCHIVE -> R.drawable.ic_archive_white_24dp
-            Preferences.SWIPE_ACTION_DELETE -> R.drawable.ic_delete_white_24dp
-            Preferences.SWIPE_ACTION_BLOCK -> R.drawable.ic_block_white_24dp
-            Preferences.SWIPE_ACTION_CALL -> R.drawable.ic_call_white_24dp
-            Preferences.SWIPE_ACTION_READ -> R.drawable.ic_check_white_24dp
-            Preferences.SWIPE_ACTION_UNREAD -> R.drawable.ic_markunread_black_24dp
-            else -> null
-        }
-
-        return res?.let(context.resources::getDrawable)
-                ?.apply { setTint(tint) }
-                ?.toBitmap(iconLength, iconLength)
-    }
-
+/*
+ * Copyright (C) 2017 Moez Bhatti <moez.bhatti@gmail.com>
+ *
+ * This file is part of QKSMS.
+ *
+ * QKSMS is free software: you can redistribute it and/or modify
+ * it under the terms of the GNU General Public License as published by
+ * the Free Software Foundation, either version 3 of the License, or
+ * (at your option) any later version.
+ *
+ * QKSMS is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+ * GNU General Public License for more details.
+ *
+ * You should have received a copy of the GNU General Public License
+ * along with QKSMS.  If not, see <http://www.gnu.org/licenses/>.
+ */
+package com.moez.QKSMS.feature.conversations
+
+import android.content.Context
+import android.graphics.Bitmap
+import android.graphics.Canvas
+import android.graphics.Paint
+import android.graphics.Rect
+import androidx.core.graphics.drawable.toBitmap
+import androidx.recyclerview.widget.ItemTouchHelper
+import androidx.recyclerview.widget.RecyclerView
+import com.moez.QKSMS.R
+import com.moez.QKSMS.common.util.Colors
+import com.moez.QKSMS.common.util.extensions.dpToPx
+import com.moez.QKSMS.util.Preferences
+import io.reactivex.disposables.CompositeDisposable
+import io.reactivex.rxkotlin.Observables
+import io.reactivex.rxkotlin.plusAssign
+import io.reactivex.schedulers.Schedulers
+import io.reactivex.subjects.PublishSubject
+import io.reactivex.subjects.Subject
+import javax.inject.Inject
+import kotlin.math.max
+import kotlin.math.min
+
+class ConversationItemTouchCallback @Inject constructor(
+    colors: Colors,
+    disposables: CompositeDisposable,
+    prefs: Preferences,
+    private val context: Context
+) : ItemTouchHelper.SimpleCallback(0, 0) {
+
+    val swipes: Subject<Pair<Long, Int>> = PublishSubject.create()
+
+    /**
+     * Setting the adapter allows us to animate back to the original position
+     */
+    var adapter: RecyclerView.Adapter<*>? = null
+
+    private val backgroundPaint = Paint()
+    private var rightAction = 0
+    private var swipeRightIcon: Bitmap? = null
+    private var leftAction = 0
+    private var swipeLeftIcon: Bitmap? = null
+
+    private val iconLength = 24.dpToPx(context)
+
+    init {
+        disposables += colors.themeObservable()
+                .doOnNext { theme -> backgroundPaint.color = theme.theme }
+                .subscribeOn(Schedulers.io())
+                .subscribe()
+
+        disposables += Observables
+                .combineLatest(prefs.swipeRight.asObservable(), prefs.swipeLeft.asObservable(), colors.themeObservable()
+                ) { right, left, theme ->
+                    rightAction = right
+                    swipeRightIcon = iconForAction(right, theme.textPrimary)
+                    leftAction = left
+                    swipeLeftIcon = iconForAction(left, theme.textPrimary)
+                    setDefaultSwipeDirs((if (right == Preferences.SWIPE_ACTION_NONE) 0 else ItemTouchHelper.RIGHT)
+                            or (if (left == Preferences.SWIPE_ACTION_NONE) 0 else ItemTouchHelper.LEFT))
+                }
+                .subscribeOn(Schedulers.io())
+                .subscribe()
+    }
+
+    override fun onMove(
+        recyclerView: RecyclerView,
+        viewHolder: RecyclerView.ViewHolder,
+        target: RecyclerView.ViewHolder
+    ): Boolean {
+        return false
+    }
+
+    override fun onChildDraw(
+        c: Canvas,
+        recyclerView: RecyclerView,
+        viewHolder: RecyclerView.ViewHolder,
+        dX: Float,
+        dY: Float,
+        actionState: Int,
+        isCurrentlyActive: Boolean
+    ) {
+        if (actionState == ItemTouchHelper.ACTION_STATE_SWIPE) {
+            val itemView = viewHolder.itemView
+
+            if (dX > 0) {
+                c.drawRect(itemView.left.toFloat(), itemView.top.toFloat(),
+                        dX, itemView.bottom.toFloat(), backgroundPaint)
+
+                swipeRightIcon?.let { icon ->
+                    val availablePx = dX.toInt() - iconLength
+                    if (availablePx > 0) {
+                        val src = Rect(0, 0, min(availablePx, icon.width), icon.height)
+                        val dstTop = itemView.top + (itemView.bottom - itemView.top - icon.height) / 2
+                        val dst = Rect(iconLength, dstTop, iconLength + src.width(), dstTop + src.height())
+                        c.drawBitmap(icon, src, dst, null)
+                    }
+                }
+            } else if (dX < 0) {
+                c.drawRect(itemView.right.toFloat() + dX, itemView.top.toFloat(),
+                        itemView.right.toFloat(), itemView.bottom.toFloat(), backgroundPaint)
+
+                swipeLeftIcon?.let { icon ->
+                    val availablePx = -dX.toInt() - iconLength
+                    if (availablePx > 0) {
+                        val src = Rect(max(0, icon.width - availablePx), 0, icon.width, icon.height)
+                        val dstTop = itemView.top + (itemView.bottom - itemView.top - icon.height) / 2
+                        val dst = Rect(itemView.right - iconLength - src.width(), dstTop,
+                                itemView.right - iconLength, dstTop + src.height())
+                        c.drawBitmap(icon, src, dst, null)
+                    }
+                }
+            }
+
+            super.onChildDraw(c, recyclerView, viewHolder, dX, dY, actionState, isCurrentlyActive)
+        }
+    }
+
+    override fun onSwiped(viewHolder: RecyclerView.ViewHolder, direction: Int) {
+        swipes.onNext(Pair(viewHolder.itemId, direction))
+
+        // This will trigger the animation back to neutral state
+        val action = if (direction == ItemTouchHelper.RIGHT) rightAction else leftAction
+        if (action != Preferences.SWIPE_ACTION_ARCHIVE) {
+            adapter?.notifyItemChanged(viewHolder.adapterPosition)
+        }
+    }
+
+    private fun iconForAction(action: Int, tint: Int): Bitmap? {
+        val res = when (action) {
+            Preferences.SWIPE_ACTION_ARCHIVE -> R.drawable.ic_archive_white_24dp
+            Preferences.SWIPE_ACTION_DELETE -> R.drawable.ic_delete_white_24dp
+            Preferences.SWIPE_ACTION_BLOCK -> R.drawable.ic_block_white_24dp
+            Preferences.SWIPE_ACTION_CALL -> R.drawable.ic_call_white_24dp
+            Preferences.SWIPE_ACTION_READ -> R.drawable.ic_check_white_24dp
+            Preferences.SWIPE_ACTION_UNREAD -> R.drawable.ic_markunread_black_24dp
+            else -> null
+        }
+
+        return res?.let(context.resources::getDrawable)
+                ?.apply { setTint(tint) }
+                ?.toBitmap(iconLength, iconLength)
+    }
+
 }
\ No newline at end of file
diff --git a/presentation/src/main/java/com/moez/QKSMS/feature/conversations/ConversationsAdapter.kt b/presentation/src/main/java/com/moez/QKSMS/feature/conversations/ConversationsAdapter.kt
index ed1a3f11a..f40350704 100644
--- a/presentation/src/main/java/com/moez/QKSMS/feature/conversations/ConversationsAdapter.kt
+++ b/presentation/src/main/java/com/moez/QKSMS/feature/conversations/ConversationsAdapter.kt
@@ -1,133 +1,133 @@
-/*
- * Copyright (C) 2017 Moez Bhatti <moez.bhatti@gmail.com>
- *
- * This file is part of QKSMS.
- *
- * QKSMS is free software: you can redistribute it and/or modify
- * it under the terms of the GNU General Public License as published by
- * the Free Software Foundation, either version 3 of the License, or
- * (at your option) any later version.
- *
- * QKSMS is distributed in the hope that it will be useful,
- * but WITHOUT ANY WARRANTY; without even the implied warranty of
- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
- * GNU General Public License for more details.
- *
- * You should have received a copy of the GNU General Public License
- * along with QKSMS.  If not, see <http://www.gnu.org/licenses/>.
- */
-package com.moez.QKSMS.feature.conversations
-
-import android.content.Context
-import android.graphics.Typeface
-import android.view.LayoutInflater
-import android.view.ViewGroup
-import androidx.core.text.bold
-import androidx.core.text.buildSpannedString
-import androidx.core.text.color
-import androidx.core.view.isInvisible
-import androidx.core.view.isVisible
-import com.moez.QKSMS.R
-import com.moez.QKSMS.common.Navigator
-import com.moez.QKSMS.common.base.QkRealmAdapter
-import com.moez.QKSMS.common.base.QkViewHolder
-import com.moez.QKSMS.common.util.Colors
-import com.moez.QKSMS.common.util.DateFormatter
-import com.moez.QKSMS.common.util.extensions.resolveThemeColor
-import com.moez.QKSMS.common.util.extensions.setTint
-import com.moez.QKSMS.model.Conversation
-import com.moez.QKSMS.util.PhoneNumberUtils
-import kotlinx.android.synthetic.main.conversation_list_item.*
-import kotlinx.android.synthetic.main.conversation_list_item.view.*
-import javax.inject.Inject
-
-class ConversationsAdapter @Inject constructor(
-    private val colors: Colors,
-    private val context: Context,
-    private val dateFormatter: DateFormatter,
-    private val navigator: Navigator,
-    private val phoneNumberUtils: PhoneNumberUtils
-) : QkRealmAdapter<Conversation>() {
-
-    init {
-        // This is how we access the threadId for the swipe actions
-        setHasStableIds(true)
-    }
-
-    override fun onCreateViewHolder(parent: ViewGroup, viewType: Int): QkViewHolder {
-        val layoutInflater = LayoutInflater.from(parent.context)
-        val view = layoutInflater.inflate(R.layout.conversation_list_item, parent, false)
-
-        if (viewType == 1) {
-            val textColorPrimary = parent.context.resolveThemeColor(android.R.attr.textColorPrimary)
-
-            view.title.setTypeface(view.title.typeface, Typeface.BOLD)
-
-            view.snippet.setTypeface(view.snippet.typeface, Typeface.BOLD)
-            view.snippet.setTextColor(textColorPrimary)
-            view.snippet.maxLines = 5
-
-            view.unread.isVisible = true
-
-            view.date.setTypeface(view.date.typeface, Typeface.BOLD)
-            view.date.setTextColor(textColorPrimary)
-        }
-
-        return QkViewHolder(view).apply {
-            view.setOnClickListener {
-                val conversation = getItem(adapterPosition) ?: return@setOnClickListener
-                when (toggleSelection(conversation.id, false)) {
-                    true -> view.isActivated = isSelected(conversation.id)
-                    false -> navigator.showConversation(conversation.id)
-                }
-            }
-            view.setOnLongClickListener {
-                val conversation = getItem(adapterPosition) ?: return@setOnLongClickListener true
-                toggleSelection(conversation.id)
-                view.isActivated = isSelected(conversation.id)
-                true
-            }
-        }
-    }
-
-    override fun onBindViewHolder(holder: QkViewHolder, position: Int) {
-        val conversation = getItem(position) ?: return
-
-        // If the last message wasn't incoming, then the colour doesn't really matter anyway
-        val lastMessage = conversation.lastMessage
-        val recipient = when {
-            conversation.recipients.size == 1 || lastMessage == null -> conversation.recipients.firstOrNull()
-            else -> conversation.recipients.find { recipient ->
-                phoneNumberUtils.compare(recipient.address, lastMessage.address)
-            }
-        }
-        val theme = colors.theme(recipient).theme
-
-        holder.containerView.isActivated = isSelected(conversation.id)
-
-        holder.avatars.recipients = conversation.recipients
-        holder.title.collapseEnabled = conversation.recipients.size > 1
-        holder.title.text = buildSpannedString {
-            append(conversation.getTitle())
-            if (conversation.draft.isNotEmpty()) {
-                color(theme) { append(" " + context.getString(R.string.main_draft)) }
-            }
-        }
-        holder.date.text = conversation.date.takeIf { it > 0 }?.let(dateFormatter::getConversationTimestamp)
-        holder.snippet.text = when {
-            conversation.draft.isNotEmpty() -> conversation.draft
-            conversation.me -> context.getString(R.string.main_sender_you, conversation.snippet)
-            else -> conversation.snippet
-        }
-        holder.pinned.isVisible = conversation.pinned
-        holder.unread.setTint(theme)
-    }
-
-    override fun getItemId(position: Int): Long {
-        return getItem(position)?.id ?: -1
-    }
-
-    override fun getItemViewType(position: Int): Int {
-        return if (getItem(position)?.unread == false) 0 else 1
-    }
-}
+/*
+ * Copyright (C) 2017 Moez Bhatti <moez.bhatti@gmail.com>
+ *
+ * This file is part of QKSMS.
+ *
+ * QKSMS is free software: you can redistribute it and/or modify
+ * it under the terms of the GNU General Public License as published by
+ * the Free Software Foundation, either version 3 of the License, or
+ * (at your option) any later version.
+ *
+ * QKSMS is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+ * GNU General Public License for more details.
+ *
+ * You should have received a copy of the GNU General Public License
+ * along with QKSMS.  If not, see <http://www.gnu.org/licenses/>.
+ */
+package com.moez.QKSMS.feature.conversations
+
+import android.content.Context
+import android.graphics.Typeface
+import android.view.LayoutInflater
+import android.view.ViewGroup
+import androidx.core.text.bold
+import androidx.core.text.buildSpannedString
+import androidx.core.text.color
+import androidx.core.view.isInvisible
+import androidx.core.view.isVisible
+import com.moez.QKSMS.R
+import com.moez.QKSMS.common.Navigator
+import com.moez.QKSMS.common.base.QkRealmAdapter
+import com.moez.QKSMS.common.base.QkViewHolder
+import com.moez.QKSMS.common.util.Colors
+import com.moez.QKSMS.common.util.DateFormatter
+import com.moez.QKSMS.common.util.extensions.resolveThemeColor
+import com.moez.QKSMS.common.util.extensions.setTint
+import com.moez.QKSMS.model.Conversation
+import com.moez.QKSMS.util.PhoneNumberUtils
+import kotlinx.android.synthetic.main.conversation_list_item.*
+import kotlinx.android.synthetic.main.conversation_list_item.view.*
+import javax.inject.Inject
+
+class ConversationsAdapter @Inject constructor(
+    private val colors: Colors,
+    private val context: Context,
+    private val dateFormatter: DateFormatter,
+    private val navigator: Navigator,
+    private val phoneNumberUtils: PhoneNumberUtils
+) : QkRealmAdapter<Conversation>() {
+
+    init {
+        // This is how we access the threadId for the swipe actions
+        setHasStableIds(true)
+    }
+
+    override fun onCreateViewHolder(parent: ViewGroup, viewType: Int): QkViewHolder {
+        val layoutInflater = LayoutInflater.from(parent.context)
+        val view = layoutInflater.inflate(R.layout.conversation_list_item, parent, false)
+
+        if (viewType == 1) {
+            val textColorPrimary = parent.context.resolveThemeColor(android.R.attr.textColorPrimary)
+
+            view.title.setTypeface(view.title.typeface, Typeface.BOLD)
+
+            view.snippet.setTypeface(view.snippet.typeface, Typeface.BOLD)
+            view.snippet.setTextColor(textColorPrimary)
+            view.snippet.maxLines = 5
+
+            view.unread.isVisible = true
+
+            view.date.setTypeface(view.date.typeface, Typeface.BOLD)
+            view.date.setTextColor(textColorPrimary)
+        }
+
+        return QkViewHolder(view).apply {
+            view.setOnClickListener {
+                val conversation = getItem(adapterPosition) ?: return@setOnClickListener
+                when (toggleSelection(conversation.id, false)) {
+                    true -> view.isActivated = isSelected(conversation.id)
+                    false -> navigator.showConversation(conversation.id)
+                }
+            }
+            view.setOnLongClickListener {
+                val conversation = getItem(adapterPosition) ?: return@setOnLongClickListener true
+                toggleSelection(conversation.id)
+                view.isActivated = isSelected(conversation.id)
+                true
+            }
+        }
+    }
+
+    override fun onBindViewHolder(holder: QkViewHolder, position: Int) {
+        val conversation = getItem(position) ?: return
+
+        // If the last message wasn't incoming, then the colour doesn't really matter anyway
+        val lastMessage = conversation.lastMessage
+        val recipient = when {
+            conversation.recipients.size == 1 || lastMessage == null -> conversation.recipients.firstOrNull()
+            else -> conversation.recipients.find { recipient ->
+                phoneNumberUtils.compare(recipient.address, lastMessage.address)
+            }
+        }
+        val theme = colors.theme(recipient).theme
+
+        holder.containerView.isActivated = isSelected(conversation.id)
+
+        holder.avatars.recipients = conversation.recipients
+        holder.title.collapseEnabled = conversation.recipients.size > 1
+        holder.title.text = buildSpannedString {
+            append(conversation.getTitle())
+            if (conversation.draft.isNotEmpty()) {
+                color(theme) { append(" " + context.getString(R.string.main_draft)) }
+            }
+        }
+        holder.date.text = conversation.date.takeIf { it > 0 }?.let(dateFormatter::getConversationTimestamp)
+        holder.snippet.text = when {
+            conversation.draft.isNotEmpty() -> conversation.draft
+            conversation.me -> context.getString(R.string.main_sender_you, conversation.snippet)
+            else -> conversation.snippet
+        }
+        holder.pinned.isVisible = conversation.pinned
+        holder.unread.setTint(theme)
+    }
+
+    override fun getItemId(position: Int): Long {
+        return getItem(position)?.id ?: -1
+    }
+
+    override fun getItemViewType(position: Int): Int {
+        return if (getItem(position)?.unread == false) 0 else 1
+    }
+}
diff --git a/presentation/src/main/java/com/moez/QKSMS/feature/gallery/GalleryActivity.kt b/presentation/src/main/java/com/moez/QKSMS/feature/gallery/GalleryActivity.kt
index f2c261b68..b3abb0ce3 100644
--- a/presentation/src/main/java/com/moez/QKSMS/feature/gallery/GalleryActivity.kt
+++ b/presentation/src/main/java/com/moez/QKSMS/feature/gallery/GalleryActivity.kt
@@ -1,127 +1,127 @@
-/*
- * Copyright (C) 2017 Moez Bhatti <moez.bhatti@gmail.com>
- *
- * This file is part of QKSMS.
- *
- * QKSMS is free software: you can redistribute it and/or modify
- * it under the terms of the GNU General Public License as published by
- * the Free Software Foundation, either version 3 of the License, or
- * (at your option) any later version.
- *
- * QKSMS is distributed in the hope that it will be useful,
- * but WITHOUT ANY WARRANTY; without even the implied warranty of
- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
- * GNU General Public License for more details.
- *
- * You should have received a copy of the GNU General Public License
- * along with QKSMS.  If not, see <http://www.gnu.org/licenses/>.
- */
-package com.moez.QKSMS.feature.gallery
-
-import android.Manifest
-import android.os.Bundle
-import android.view.Menu
-import android.view.MenuItem
-import androidx.appcompat.app.AppCompatDelegate
-import androidx.core.app.ActivityCompat
-import androidx.core.view.isVisible
-import androidx.lifecycle.ViewModelProvider
-import androidx.lifecycle.ViewModelProviders
-import androidx.recyclerview.widget.RecyclerView
-import androidx.viewpager2.widget.ViewPager2
-import com.moez.QKSMS.R
-import com.moez.QKSMS.common.base.QkActivity
-import com.moez.QKSMS.common.util.DateFormatter
-import com.moez.QKSMS.common.util.extensions.setVisible
-import com.moez.QKSMS.model.MmsPart
-import dagger.android.AndroidInjection
-import io.reactivex.Observable
-import io.reactivex.subjects.PublishSubject
-import io.reactivex.subjects.Subject
-import kotlinx.android.synthetic.main.gallery_activity.*
-import javax.inject.Inject
-
-class GalleryActivity : QkActivity(), GalleryView {
-
-    @Inject lateinit var dateFormatter: DateFormatter
-    @Inject lateinit var viewModelFactory: ViewModelProvider.Factory
-    @Inject lateinit var pagerAdapter: GalleryPagerAdapter
-
-    val partId by lazy { intent.getLongExtra("partId", 0L) }
-
-    private val optionsItemSubject: Subject<Int> = PublishSubject.create()
-    private val pageChangedSubject: Subject<MmsPart> = PublishSubject.create()
-    private val viewModel by lazy { ViewModelProviders.of(this, viewModelFactory)[GalleryViewModel::class.java] }
-
-    override fun onCreate(savedInstanceState: Bundle?) {
-        delegate.localNightMode = AppCompatDelegate.MODE_NIGHT_YES
-        AndroidInjection.inject(this)
-        super.onCreate(savedInstanceState)
-        setContentView(R.layout.gallery_activity)
-        showBackButton(true)
-        viewModel.bindView(this)
-
-        pager.adapter = pagerAdapter
-        pager.registerOnPageChangeCallback(object : ViewPager2.OnPageChangeCallback() {
-            override fun onPageSelected(position: Int) {
-                this@GalleryActivity.onPageSelected(position)
-            }
-        })
-
-        pagerAdapter.registerAdapterDataObserver(object : RecyclerView.AdapterDataObserver() {
-            override fun onChanged() {
-                pagerAdapter.data?.takeIf { pagerAdapter.itemCount > 0 }
-                        ?.indexOfFirst { part -> part.id == partId }
-                        ?.let { index ->
-                            onPageSelected(index)
-                            pager.setCurrentItem(index, false)
-                            pagerAdapter.unregisterAdapterDataObserver(this)
-                        }
-            }
-        })
-    }
-
-    fun onPageSelected(position: Int) {
-        toolbarSubtitle.text = pagerAdapter.getItem(position)?.messages?.firstOrNull()?.date
-                ?.let(dateFormatter::getDetailedTimestamp)
-        toolbarSubtitle.isVisible = toolbarTitle.text.isNotBlank()
-
-        pagerAdapter.getItem(position)?.run(pageChangedSubject::onNext)
-    }
-
-    override fun render(state: GalleryState) {
-        toolbar.setVisible(state.navigationVisible)
-
-        title = state.title
-        pagerAdapter.updateData(state.parts)
-    }
-
-    override fun optionsItemSelected(): Observable<Int> = optionsItemSubject
-
-    override fun screenTouched(): Observable<*> = pagerAdapter.clicks
-
-    override fun pageChanged(): Observable<MmsPart> = pageChangedSubject
-
-    override fun requestStoragePermission() {
-        ActivityCompat.requestPermissions(this, arrayOf(Manifest.permission.WRITE_EXTERNAL_STORAGE), 0)
-    }
-
-    override fun onCreateOptionsMenu(menu: Menu?): Boolean {
-        menuInflater.inflate(R.menu.gallery, menu)
-        return super.onCreateOptionsMenu(menu)
-    }
-
-    override fun onOptionsItemSelected(item: MenuItem): Boolean {
-        when (item.itemId) {
-            android.R.id.home -> onBackPressed()
-            else -> optionsItemSubject.onNext(item.itemId)
-        }
-        return true
-    }
-
-    override fun onDestroy() {
-        super.onDestroy()
-        pagerAdapter.destroy()
-    }
-
+/*
+ * Copyright (C) 2017 Moez Bhatti <moez.bhatti@gmail.com>
+ *
+ * This file is part of QKSMS.
+ *
+ * QKSMS is free software: you can redistribute it and/or modify
+ * it under the terms of the GNU General Public License as published by
+ * the Free Software Foundation, either version 3 of the License, or
+ * (at your option) any later version.
+ *
+ * QKSMS is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+ * GNU General Public License for more details.
+ *
+ * You should have received a copy of the GNU General Public License
+ * along with QKSMS.  If not, see <http://www.gnu.org/licenses/>.
+ */
+package com.moez.QKSMS.feature.gallery
+
+import android.Manifest
+import android.os.Bundle
+import android.view.Menu
+import android.view.MenuItem
+import androidx.appcompat.app.AppCompatDelegate
+import androidx.core.app.ActivityCompat
+import androidx.core.view.isVisible
+import androidx.lifecycle.ViewModelProvider
+import androidx.lifecycle.ViewModelProviders
+import androidx.recyclerview.widget.RecyclerView
+import androidx.viewpager2.widget.ViewPager2
+import com.moez.QKSMS.R
+import com.moez.QKSMS.common.base.QkActivity
+import com.moez.QKSMS.common.util.DateFormatter
+import com.moez.QKSMS.common.util.extensions.setVisible
+import com.moez.QKSMS.model.MmsPart
+import dagger.android.AndroidInjection
+import io.reactivex.Observable
+import io.reactivex.subjects.PublishSubject
+import io.reactivex.subjects.Subject
+import kotlinx.android.synthetic.main.gallery_activity.*
+import javax.inject.Inject
+
+class GalleryActivity : QkActivity(), GalleryView {
+
+    @Inject lateinit var dateFormatter: DateFormatter
+    @Inject lateinit var viewModelFactory: ViewModelProvider.Factory
+    @Inject lateinit var pagerAdapter: GalleryPagerAdapter
+
+    val partId by lazy { intent.getLongExtra("partId", 0L) }
+
+    private val optionsItemSubject: Subject<Int> = PublishSubject.create()
+    private val pageChangedSubject: Subject<MmsPart> = PublishSubject.create()
+    private val viewModel by lazy { ViewModelProviders.of(this, viewModelFactory)[GalleryViewModel::class.java] }
+
+    override fun onCreate(savedInstanceState: Bundle?) {
+        delegate.localNightMode = AppCompatDelegate.MODE_NIGHT_YES
+        AndroidInjection.inject(this)
+        super.onCreate(savedInstanceState)
+        setContentView(R.layout.gallery_activity)
+        showBackButton(true)
+        viewModel.bindView(this)
+
+        pager.adapter = pagerAdapter
+        pager.registerOnPageChangeCallback(object : ViewPager2.OnPageChangeCallback() {
+            override fun onPageSelected(position: Int) {
+                this@GalleryActivity.onPageSelected(position)
+            }
+        })
+
+        pagerAdapter.registerAdapterDataObserver(object : RecyclerView.AdapterDataObserver() {
+            override fun onChanged() {
+                pagerAdapter.data?.takeIf { pagerAdapter.itemCount > 0 }
+                        ?.indexOfFirst { part -> part.id == partId }
+                        ?.let { index ->
+                            onPageSelected(index)
+                            pager.setCurrentItem(index, false)
+                            pagerAdapter.unregisterAdapterDataObserver(this)
+                        }
+            }
+        })
+    }
+
+    fun onPageSelected(position: Int) {
+        toolbarSubtitle.text = pagerAdapter.getItem(position)?.messages?.firstOrNull()?.date
+                ?.let(dateFormatter::getDetailedTimestamp)
+        toolbarSubtitle.isVisible = toolbarTitle.text.isNotBlank()
+
+        pagerAdapter.getItem(position)?.run(pageChangedSubject::onNext)
+    }
+
+    override fun render(state: GalleryState) {
+        toolbar.setVisible(state.navigationVisible)
+
+        title = state.title
+        pagerAdapter.updateData(state.parts)
+    }
+
+    override fun optionsItemSelected(): Observable<Int> = optionsItemSubject
+
+    override fun screenTouched(): Observable<*> = pagerAdapter.clicks
+
+    override fun pageChanged(): Observable<MmsPart> = pageChangedSubject
+
+    override fun requestStoragePermission() {
+        ActivityCompat.requestPermissions(this, arrayOf(Manifest.permission.WRITE_EXTERNAL_STORAGE), 0)
+    }
+
+    override fun onCreateOptionsMenu(menu: Menu?): Boolean {
+        menuInflater.inflate(R.menu.gallery, menu)
+        return super.onCreateOptionsMenu(menu)
+    }
+
+    override fun onOptionsItemSelected(item: MenuItem): Boolean {
+        when (item.itemId) {
+            android.R.id.home -> onBackPressed()
+            else -> optionsItemSubject.onNext(item.itemId)
+        }
+        return true
+    }
+
+    override fun onDestroy() {
+        super.onDestroy()
+        pagerAdapter.destroy()
+    }
+
 }
\ No newline at end of file
diff --git a/presentation/src/main/java/com/moez/QKSMS/feature/gallery/GalleryActivityModule.kt b/presentation/src/main/java/com/moez/QKSMS/feature/gallery/GalleryActivityModule.kt
index 62cdcabe9..ab2757f71 100644
--- a/presentation/src/main/java/com/moez/QKSMS/feature/gallery/GalleryActivityModule.kt
+++ b/presentation/src/main/java/com/moez/QKSMS/feature/gallery/GalleryActivityModule.kt
@@ -1,44 +1,44 @@
-/*
- * Copyright (C) 2017 Moez Bhatti <moez.bhatti@gmail.com>
- *
- * This file is part of QKSMS.
- *
- * QKSMS is free software: you can redistribute it and/or modify
- * it under the terms of the GNU General Public License as published by
- * the Free Software Foundation, either version 3 of the License, or
- * (at your option) any later version.
- *
- * QKSMS is distributed in the hope that it will be useful,
- * but WITHOUT ANY WARRANTY; without even the implied warranty of
- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
- * GNU General Public License for more details.
- *
- * You should have received a copy of the GNU General Public License
- * along with QKSMS.  If not, see <http://www.gnu.org/licenses/>.
- */
-package com.moez.QKSMS.feature.gallery
-
-import android.content.Intent
-import androidx.lifecycle.ViewModel
-import com.moez.QKSMS.injection.ViewModelKey
-import dagger.Module
-import dagger.Provides
-import dagger.multibindings.IntoMap
-import javax.inject.Named
-
-@Module
-class GalleryActivityModule {
-
-    @Provides
-    fun provideIntent(activity: GalleryActivity): Intent = activity.intent
-
-    @Provides
-    @Named("partId")
-    fun providePartId(activity: GalleryActivity): Long = activity.partId
-
-    @Provides
-    @IntoMap
-    @ViewModelKey(GalleryViewModel::class)
-    fun provideGalleryViewModel(viewModel: GalleryViewModel): ViewModel = viewModel
-
+/*
+ * Copyright (C) 2017 Moez Bhatti <moez.bhatti@gmail.com>
+ *
+ * This file is part of QKSMS.
+ *
+ * QKSMS is free software: you can redistribute it and/or modify
+ * it under the terms of the GNU General Public License as published by
+ * the Free Software Foundation, either version 3 of the License, or
+ * (at your option) any later version.
+ *
+ * QKSMS is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+ * GNU General Public License for more details.
+ *
+ * You should have received a copy of the GNU General Public License
+ * along with QKSMS.  If not, see <http://www.gnu.org/licenses/>.
+ */
+package com.moez.QKSMS.feature.gallery
+
+import android.content.Intent
+import androidx.lifecycle.ViewModel
+import com.moez.QKSMS.injection.ViewModelKey
+import dagger.Module
+import dagger.Provides
+import dagger.multibindings.IntoMap
+import javax.inject.Named
+
+@Module
+class GalleryActivityModule {
+
+    @Provides
+    fun provideIntent(activity: GalleryActivity): Intent = activity.intent
+
+    @Provides
+    @Named("partId")
+    fun providePartId(activity: GalleryActivity): Long = activity.partId
+
+    @Provides
+    @IntoMap
+    @ViewModelKey(GalleryViewModel::class)
+    fun provideGalleryViewModel(viewModel: GalleryViewModel): ViewModel = viewModel
+
 }
\ No newline at end of file
diff --git a/presentation/src/main/java/com/moez/QKSMS/feature/gallery/GalleryPagerAdapter.kt b/presentation/src/main/java/com/moez/QKSMS/feature/gallery/GalleryPagerAdapter.kt
index f3a4405bc..150d57292 100644
--- a/presentation/src/main/java/com/moez/QKSMS/feature/gallery/GalleryPagerAdapter.kt
+++ b/presentation/src/main/java/com/moez/QKSMS/feature/gallery/GalleryPagerAdapter.kt
@@ -1,137 +1,137 @@
-/*
- * Copyright (C) 2017 Moez Bhatti <moez.bhatti@gmail.com>
- *
- * This file is part of QKSMS.
- *
- * QKSMS is free software: you can redistribute it and/or modify
- * it under the terms of the GNU General Public License as published by
- * the Free Software Foundation, either version 3 of the License, or
- * (at your option) any later version.
- *
- * QKSMS is distributed in the hope that it will be useful,
- * but WITHOUT ANY WARRANTY; without even the implied warranty of
- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
- * GNU General Public License for more details.
- *
- * You should have received a copy of the GNU General Public License
- * along with QKSMS.  If not, see <http://www.gnu.org/licenses/>.
- */
-package com.moez.QKSMS.feature.gallery
-
-import android.content.Context
-import android.view.LayoutInflater
-import android.view.View
-import android.view.ViewGroup
-import com.google.android.exoplayer2.ExoPlayer
-import com.google.android.exoplayer2.ExoPlayerFactory
-import com.google.android.exoplayer2.source.ExtractorMediaSource
-import com.google.android.exoplayer2.trackselection.AdaptiveTrackSelection
-import com.google.android.exoplayer2.trackselection.DefaultTrackSelector
-import com.google.android.exoplayer2.upstream.DefaultDataSourceFactory
-import com.google.android.exoplayer2.util.Util
-import com.google.android.mms.ContentType
-import com.moez.QKSMS.R
-import com.moez.QKSMS.common.base.QkRealmAdapter
-import com.moez.QKSMS.common.base.QkViewHolder
-import com.moez.QKSMS.extensions.isImage
-import com.moez.QKSMS.extensions.isVideo
-import com.moez.QKSMS.model.MmsPart
-import com.moez.QKSMS.util.GlideApp
-import io.reactivex.subjects.PublishSubject
-import io.reactivex.subjects.Subject
-import kotlinx.android.synthetic.main.gallery_image_page.*
-import kotlinx.android.synthetic.main.gallery_image_page.view.*
-import kotlinx.android.synthetic.main.gallery_video_page.*
-import java.util.*
-import javax.inject.Inject
-
-class GalleryPagerAdapter @Inject constructor(private val context: Context) : QkRealmAdapter<MmsPart>() {
-
-    companion object {
-        private const val VIEW_TYPE_INVALID = 0
-        private const val VIEW_TYPE_IMAGE = 1
-        private const val VIEW_TYPE_VIDEO = 2
-    }
-
-    val clicks: Subject<View> = PublishSubject.create()
-
-    private val contentResolver = context.contentResolver
-    private val exoPlayers = Collections.newSetFromMap(WeakHashMap<ExoPlayer?, Boolean>())
-
-    override fun onCreateViewHolder(parent: ViewGroup, viewType: Int): QkViewHolder {
-        val inflater = LayoutInflater.from(parent.context)
-        return QkViewHolder(when (viewType) {
-            VIEW_TYPE_IMAGE -> inflater.inflate(R.layout.gallery_image_page, parent, false).apply {
-
-                // When calling the public setter, it doesn't allow the midscale to be the same as the
-                // maxscale or the minscale. We don't want 3 levels and we don't want to modify the library
-                // so let's celebrate the invention of reflection!
-                image.attacher.run {
-                    javaClass.getDeclaredField("mMinScale").run {
-                        isAccessible = true
-                        setFloat(image.attacher, 1f)
-                    }
-                    javaClass.getDeclaredField("mMidScale").run {
-                        isAccessible = true
-                        setFloat(image.attacher, 1f)
-                    }
-                    javaClass.getDeclaredField("mMaxScale").run {
-                        isAccessible = true
-                        setFloat(image.attacher, 3f)
-                    }
-                }
-            }
-
-            VIEW_TYPE_VIDEO -> inflater.inflate(R.layout.gallery_video_page, parent, false)
-
-            else -> inflater.inflate(R.layout.gallery_invalid_page, parent, false)
-
-        }.apply { setOnClickListener(clicks::onNext) })
-    }
-
-    override fun onBindViewHolder(holder: QkViewHolder, position: Int) {
-        val part = getItem(position) ?: return
-        when (getItemViewType(position)) {
-            VIEW_TYPE_IMAGE -> {
-                // We need to explicitly request a gif from glide for animations to work
-                when (part.getUri().let(contentResolver::getType)) {
-                    ContentType.IMAGE_GIF -> GlideApp.with(context)
-                            .asGif()
-                            .load(part.getUri())
-                            .into(holder.image)
-
-                    else -> GlideApp.with(context)
-                            .asBitmap()
-                            .load(part.getUri())
-                            .into(holder.image)
-                }
-            }
-
-            VIEW_TYPE_VIDEO -> {
-                val videoTrackSelectionFactory = AdaptiveTrackSelection.Factory(null)
-                val trackSelector = DefaultTrackSelector(videoTrackSelectionFactory)
-                val exoPlayer = ExoPlayerFactory.newSimpleInstance(context, trackSelector)
-                holder.video.player = exoPlayer
-                exoPlayers.add(exoPlayer)
-
-                val dataSourceFactory = DefaultDataSourceFactory(context, Util.getUserAgent(context, "QKSMS"))
-                val videoSource = ExtractorMediaSource.Factory(dataSourceFactory).createMediaSource(part.getUri())
-                exoPlayer?.prepare(videoSource)
-            }
-        }
-    }
-
-    override fun getItemViewType(position: Int): Int {
-        val part = getItem(position)
-        return when {
-            part?.isImage() == true -> VIEW_TYPE_IMAGE
-            part?.isVideo() == true -> VIEW_TYPE_VIDEO
-            else -> VIEW_TYPE_INVALID
-        }
-    }
-
-    fun destroy() {
-        exoPlayers.forEach { exoPlayer -> exoPlayer?.release() }
-    }
-
-}
+/*
+ * Copyright (C) 2017 Moez Bhatti <moez.bhatti@gmail.com>
+ *
+ * This file is part of QKSMS.
+ *
+ * QKSMS is free software: you can redistribute it and/or modify
+ * it under the terms of the GNU General Public License as published by
+ * the Free Software Foundation, either version 3 of the License, or
+ * (at your option) any later version.
+ *
+ * QKSMS is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+ * GNU General Public License for more details.
+ *
+ * You should have received a copy of the GNU General Public License
+ * along with QKSMS.  If not, see <http://www.gnu.org/licenses/>.
+ */
+package com.moez.QKSMS.feature.gallery
+
+import android.content.Context
+import android.view.LayoutInflater
+import android.view.View
+import android.view.ViewGroup
+import com.google.android.exoplayer2.ExoPlayer
+import com.google.android.exoplayer2.ExoPlayerFactory
+import com.google.android.exoplayer2.source.ExtractorMediaSource
+import com.google.android.exoplayer2.trackselection.AdaptiveTrackSelection
+import com.google.android.exoplayer2.trackselection.DefaultTrackSelector
+import com.google.android.exoplayer2.upstream.DefaultDataSourceFactory
+import com.google.android.exoplayer2.util.Util
+import com.google.android.mms.ContentType
+import com.moez.QKSMS.R
+import com.moez.QKSMS.common.base.QkRealmAdapter
+import com.moez.QKSMS.common.base.QkViewHolder
+import com.moez.QKSMS.extensions.isImage
+import com.moez.QKSMS.extensions.isVideo
+import com.moez.QKSMS.model.MmsPart
+import com.moez.QKSMS.util.GlideApp
+import io.reactivex.subjects.PublishSubject
+import io.reactivex.subjects.Subject
+import kotlinx.android.synthetic.main.gallery_image_page.*
+import kotlinx.android.synthetic.main.gallery_image_page.view.*
+import kotlinx.android.synthetic.main.gallery_video_page.*
+import java.util.*
+import javax.inject.Inject
+
+class GalleryPagerAdapter @Inject constructor(private val context: Context) : QkRealmAdapter<MmsPart>() {
+
+    companion object {
+        private const val VIEW_TYPE_INVALID = 0
+        private const val VIEW_TYPE_IMAGE = 1
+        private const val VIEW_TYPE_VIDEO = 2
+    }
+
+    val clicks: Subject<View> = PublishSubject.create()
+
+    private val contentResolver = context.contentResolver
+    private val exoPlayers = Collections.newSetFromMap(WeakHashMap<ExoPlayer?, Boolean>())
+
+    override fun onCreateViewHolder(parent: ViewGroup, viewType: Int): QkViewHolder {
+        val inflater = LayoutInflater.from(parent.context)
+        return QkViewHolder(when (viewType) {
+            VIEW_TYPE_IMAGE -> inflater.inflate(R.layout.gallery_image_page, parent, false).apply {
+
+                // When calling the public setter, it doesn't allow the midscale to be the same as the
+                // maxscale or the minscale. We don't want 3 levels and we don't want to modify the library
+                // so let's celebrate the invention of reflection!
+                image.attacher.run {
+                    javaClass.getDeclaredField("mMinScale").run {
+                        isAccessible = true
+                        setFloat(image.attacher, 1f)
+                    }
+                    javaClass.getDeclaredField("mMidScale").run {
+                        isAccessible = true
+                        setFloat(image.attacher, 1f)
+                    }
+                    javaClass.getDeclaredField("mMaxScale").run {
+                        isAccessible = true
+                        setFloat(image.attacher, 3f)
+                    }
+                }
+            }
+
+            VIEW_TYPE_VIDEO -> inflater.inflate(R.layout.gallery_video_page, parent, false)
+
+            else -> inflater.inflate(R.layout.gallery_invalid_page, parent, false)
+
+        }.apply { setOnClickListener(clicks::onNext) })
+    }
+
+    override fun onBindViewHolder(holder: QkViewHolder, position: Int) {
+        val part = getItem(position) ?: return
+        when (getItemViewType(position)) {
+            VIEW_TYPE_IMAGE -> {
+                // We need to explicitly request a gif from glide for animations to work
+                when (part.getUri().let(contentResolver::getType)) {
+                    ContentType.IMAGE_GIF -> GlideApp.with(context)
+                            .asGif()
+                            .load(part.getUri())
+                            .into(holder.image)
+
+                    else -> GlideApp.with(context)
+                            .asBitmap()
+                            .load(part.getUri())
+                            .into(holder.image)
+                }
+            }
+
+            VIEW_TYPE_VIDEO -> {
+                val videoTrackSelectionFactory = AdaptiveTrackSelection.Factory(null)
+                val trackSelector = DefaultTrackSelector(videoTrackSelectionFactory)
+                val exoPlayer = ExoPlayerFactory.newSimpleInstance(context, trackSelector)
+                holder.video.player = exoPlayer
+                exoPlayers.add(exoPlayer)
+
+                val dataSourceFactory = DefaultDataSourceFactory(context, Util.getUserAgent(context, "QKSMS"))
+                val videoSource = ExtractorMediaSource.Factory(dataSourceFactory).createMediaSource(part.getUri())
+                exoPlayer?.prepare(videoSource)
+            }
+        }
+    }
+
+    override fun getItemViewType(position: Int): Int {
+        val part = getItem(position)
+        return when {
+            part?.isImage() == true -> VIEW_TYPE_IMAGE
+            part?.isVideo() == true -> VIEW_TYPE_VIDEO
+            else -> VIEW_TYPE_INVALID
+        }
+    }
+
+    fun destroy() {
+        exoPlayers.forEach { exoPlayer -> exoPlayer?.release() }
+    }
+
+}
diff --git a/presentation/src/main/java/com/moez/QKSMS/feature/gallery/GalleryState.kt b/presentation/src/main/java/com/moez/QKSMS/feature/gallery/GalleryState.kt
index b6fb7467e..f00da7c0a 100644
--- a/presentation/src/main/java/com/moez/QKSMS/feature/gallery/GalleryState.kt
+++ b/presentation/src/main/java/com/moez/QKSMS/feature/gallery/GalleryState.kt
@@ -1,28 +1,28 @@
-/*
- * Copyright (C) 2017 Moez Bhatti <moez.bhatti@gmail.com>
- *
- * This file is part of QKSMS.
- *
- * QKSMS is free software: you can redistribute it and/or modify
- * it under the terms of the GNU General Public License as published by
- * the Free Software Foundation, either version 3 of the License, or
- * (at your option) any later version.
- *
- * QKSMS is distributed in the hope that it will be useful,
- * but WITHOUT ANY WARRANTY; without even the implied warranty of
- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
- * GNU General Public License for more details.
- *
- * You should have received a copy of the GNU General Public License
- * along with QKSMS.  If not, see <http://www.gnu.org/licenses/>.
- */
-package com.moez.QKSMS.feature.gallery
-
-import com.moez.QKSMS.model.MmsPart
-import io.realm.RealmResults
-
-data class GalleryState(
-    val navigationVisible: Boolean = true,
-    val title: String? = "",
-    val parts: RealmResults<MmsPart>? = null
-)
+/*
+ * Copyright (C) 2017 Moez Bhatti <moez.bhatti@gmail.com>
+ *
+ * This file is part of QKSMS.
+ *
+ * QKSMS is free software: you can redistribute it and/or modify
+ * it under the terms of the GNU General Public License as published by
+ * the Free Software Foundation, either version 3 of the License, or
+ * (at your option) any later version.
+ *
+ * QKSMS is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+ * GNU General Public License for more details.
+ *
+ * You should have received a copy of the GNU General Public License
+ * along with QKSMS.  If not, see <http://www.gnu.org/licenses/>.
+ */
+package com.moez.QKSMS.feature.gallery
+
+import com.moez.QKSMS.model.MmsPart
+import io.realm.RealmResults
+
+data class GalleryState(
+    val navigationVisible: Boolean = true,
+    val title: String? = "",
+    val parts: RealmResults<MmsPart>? = null
+)
diff --git a/presentation/src/main/java/com/moez/QKSMS/feature/gallery/GalleryView.kt b/presentation/src/main/java/com/moez/QKSMS/feature/gallery/GalleryView.kt
index b51b823b9..041dd320c 100644
--- a/presentation/src/main/java/com/moez/QKSMS/feature/gallery/GalleryView.kt
+++ b/presentation/src/main/java/com/moez/QKSMS/feature/gallery/GalleryView.kt
@@ -1,33 +1,33 @@
-/*
- * Copyright (C) 2017 Moez Bhatti <moez.bhatti@gmail.com>
- *
- * This file is part of QKSMS.
- *
- * QKSMS is free software: you can redistribute it and/or modify
- * it under the terms of the GNU General Public License as published by
- * the Free Software Foundation, either version 3 of the License, or
- * (at your option) any later version.
- *
- * QKSMS is distributed in the hope that it will be useful,
- * but WITHOUT ANY WARRANTY; without even the implied warranty of
- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
- * GNU General Public License for more details.
- *
- * You should have received a copy of the GNU General Public License
- * along with QKSMS.  If not, see <http://www.gnu.org/licenses/>.
- */
-package com.moez.QKSMS.feature.gallery
-
-import com.moez.QKSMS.common.base.QkView
-import com.moez.QKSMS.model.MmsPart
-import io.reactivex.Observable
-
-interface GalleryView : QkView<GalleryState> {
-
-    fun optionsItemSelected(): Observable<Int>
-    fun screenTouched(): Observable<*>
-    fun pageChanged(): Observable<MmsPart>
-
-    fun requestStoragePermission()
-
+/*
+ * Copyright (C) 2017 Moez Bhatti <moez.bhatti@gmail.com>
+ *
+ * This file is part of QKSMS.
+ *
+ * QKSMS is free software: you can redistribute it and/or modify
+ * it under the terms of the GNU General Public License as published by
+ * the Free Software Foundation, either version 3 of the License, or
+ * (at your option) any later version.
+ *
+ * QKSMS is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+ * GNU General Public License for more details.
+ *
+ * You should have received a copy of the GNU General Public License
+ * along with QKSMS.  If not, see <http://www.gnu.org/licenses/>.
+ */
+package com.moez.QKSMS.feature.gallery
+
+import com.moez.QKSMS.common.base.QkView
+import com.moez.QKSMS.model.MmsPart
+import io.reactivex.Observable
+
+interface GalleryView : QkView<GalleryState> {
+
+    fun optionsItemSelected(): Observable<Int>
+    fun screenTouched(): Observable<*>
+    fun pageChanged(): Observable<MmsPart>
+
+    fun requestStoragePermission()
+
 }
\ No newline at end of file
diff --git a/presentation/src/main/java/com/moez/QKSMS/feature/gallery/GalleryViewModel.kt b/presentation/src/main/java/com/moez/QKSMS/feature/gallery/GalleryViewModel.kt
index d660d6cec..5da1644a0 100644
--- a/presentation/src/main/java/com/moez/QKSMS/feature/gallery/GalleryViewModel.kt
+++ b/presentation/src/main/java/com/moez/QKSMS/feature/gallery/GalleryViewModel.kt
@@ -1,89 +1,89 @@
-/*
- * Copyright (C) 2017 Moez Bhatti <moez.bhatti@gmail.com>
- *
- * This file is part of QKSMS.
- *
- * QKSMS is free software: you can redistribute it and/or modify
- * it under the terms of the GNU General Public License as published by
- * the Free Software Foundation, either version 3 of the License, or
- * (at your option) any later version.
- *
- * QKSMS is distributed in the hope that it will be useful,
- * but WITHOUT ANY WARRANTY; without even the implied warranty of
- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
- * GNU General Public License for more details.
- *
- * You should have received a copy of the GNU General Public License
- * along with QKSMS.  If not, see <http://www.gnu.org/licenses/>.
- */
-package com.moez.QKSMS.feature.gallery
-
-import android.content.Context
-import com.moez.QKSMS.R
-import com.moez.QKSMS.common.Navigator
-import com.moez.QKSMS.common.base.QkViewModel
-import com.moez.QKSMS.common.util.extensions.makeToast
-import com.moez.QKSMS.extensions.mapNotNull
-import com.moez.QKSMS.interactor.SaveImage
-import com.moez.QKSMS.manager.PermissionManager
-import com.moez.QKSMS.repository.ConversationRepository
-import com.moez.QKSMS.repository.MessageRepository
-import com.uber.autodispose.android.lifecycle.scope
-import com.uber.autodispose.autoDisposable
-import io.reactivex.Flowable
-import io.reactivex.rxkotlin.plusAssign
-import io.reactivex.rxkotlin.withLatestFrom
-import javax.inject.Inject
-import javax.inject.Named
-
-class GalleryViewModel @Inject constructor(
-    conversationRepo: ConversationRepository,
-    @Named("partId") private val partId: Long,
-    private val context: Context,
-    private val messageRepo: MessageRepository,
-    private val navigator: Navigator,
-    private val saveImage: SaveImage,
-    private val permissions: PermissionManager
-) : QkViewModel<GalleryView, GalleryState>(GalleryState()) {
-
-    init {
-        disposables += Flowable.just(partId)
-                .mapNotNull(messageRepo::getMessageForPart)
-                .mapNotNull { message -> message.threadId }
-                .doOnNext { threadId -> newState { copy(parts = messageRepo.getPartsForConversation(threadId)) } }
-                .doOnNext { threadId ->
-                    newState {
-                        copy(title = conversationRepo.getConversation(threadId)?.getTitle())
-                    }
-                }
-                .subscribe()
-    }
-
-    override fun bindView(view: GalleryView) {
-        super.bindView(view)
-
-        // When the screen is touched, toggle the visibility of the navigation UI
-        view.screenTouched()
-                .withLatestFrom(state) { _, state -> state.navigationVisible }
-                .map { navigationVisible -> !navigationVisible }
-                .autoDisposable(view.scope())
-                .subscribe { navigationVisible -> newState { copy(navigationVisible = navigationVisible) } }
-
-        // Save image to device
-        view.optionsItemSelected()
-                .filter { itemId -> itemId == R.id.save }
-                .filter { permissions.hasStorage().also { if (!it) view.requestStoragePermission() } }
-                .withLatestFrom(view.pageChanged()) { _, part -> part.id }
-                .autoDisposable(view.scope())
-                .subscribe { partId -> saveImage.execute(partId) { context.makeToast(R.string.gallery_toast_saved) } }
-
-        // Share image externally
-        view.optionsItemSelected()
-                .filter { itemId -> itemId == R.id.share }
-                .filter { permissions.hasStorage().also { if (!it) view.requestStoragePermission() } }
-                .withLatestFrom(view.pageChanged()) { _, part -> part.id }
-                .autoDisposable(view.scope())
-                .subscribe { partId -> messageRepo.savePart(partId)?.let(navigator::shareFile) }
-    }
-
-}
+/*
+ * Copyright (C) 2017 Moez Bhatti <moez.bhatti@gmail.com>
+ *
+ * This file is part of QKSMS.
+ *
+ * QKSMS is free software: you can redistribute it and/or modify
+ * it under the terms of the GNU General Public License as published by
+ * the Free Software Foundation, either version 3 of the License, or
+ * (at your option) any later version.
+ *
+ * QKSMS is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+ * GNU General Public License for more details.
+ *
+ * You should have received a copy of the GNU General Public License
+ * along with QKSMS.  If not, see <http://www.gnu.org/licenses/>.
+ */
+package com.moez.QKSMS.feature.gallery
+
+import android.content.Context
+import com.moez.QKSMS.R
+import com.moez.QKSMS.common.Navigator
+import com.moez.QKSMS.common.base.QkViewModel
+import com.moez.QKSMS.common.util.extensions.makeToast
+import com.moez.QKSMS.extensions.mapNotNull
+import com.moez.QKSMS.interactor.SaveImage
+import com.moez.QKSMS.manager.PermissionManager
+import com.moez.QKSMS.repository.ConversationRepository
+import com.moez.QKSMS.repository.MessageRepository
+import com.uber.autodispose.android.lifecycle.scope
+import com.uber.autodispose.autoDisposable
+import io.reactivex.Flowable
+import io.reactivex.rxkotlin.plusAssign
+import io.reactivex.rxkotlin.withLatestFrom
+import javax.inject.Inject
+import javax.inject.Named
+
+class GalleryViewModel @Inject constructor(
+    conversationRepo: ConversationRepository,
+    @Named("partId") private val partId: Long,
+    private val context: Context,
+    private val messageRepo: MessageRepository,
+    private val navigator: Navigator,
+    private val saveImage: SaveImage,
+    private val permissions: PermissionManager
+) : QkViewModel<GalleryView, GalleryState>(GalleryState()) {
+
+    init {
+        disposables += Flowable.just(partId)
+                .mapNotNull(messageRepo::getMessageForPart)
+                .mapNotNull { message -> message.threadId }
+                .doOnNext { threadId -> newState { copy(parts = messageRepo.getPartsForConversation(threadId)) } }
+                .doOnNext { threadId ->
+                    newState {
+                        copy(title = conversationRepo.getConversation(threadId)?.getTitle())
+                    }
+                }
+                .subscribe()
+    }
+
+    override fun bindView(view: GalleryView) {
+        super.bindView(view)
+
+        // When the screen is touched, toggle the visibility of the navigation UI
+        view.screenTouched()
+                .withLatestFrom(state) { _, state -> state.navigationVisible }
+                .map { navigationVisible -> !navigationVisible }
+                .autoDisposable(view.scope())
+                .subscribe { navigationVisible -> newState { copy(navigationVisible = navigationVisible) } }
+
+        // Save image to device
+        view.optionsItemSelected()
+                .filter { itemId -> itemId == R.id.save }
+                .filter { permissions.hasStorage().also { if (!it) view.requestStoragePermission() } }
+                .withLatestFrom(view.pageChanged()) { _, part -> part.id }
+                .autoDisposable(view.scope())
+                .subscribe { partId -> saveImage.execute(partId) { context.makeToast(R.string.gallery_toast_saved) } }
+
+        // Share image externally
+        view.optionsItemSelected()
+                .filter { itemId -> itemId == R.id.share }
+                .filter { permissions.hasStorage().also { if (!it) view.requestStoragePermission() } }
+                .withLatestFrom(view.pageChanged()) { _, part -> part.id }
+                .autoDisposable(view.scope())
+                .subscribe { partId -> messageRepo.savePart(partId)?.let(navigator::shareFile) }
+    }
+
+}
diff --git a/presentation/src/main/java/com/moez/QKSMS/feature/main/DrawerBadgesExperiment.kt b/presentation/src/main/java/com/moez/QKSMS/feature/main/DrawerBadgesExperiment.kt
index c06502863..bd550a528 100644
--- a/presentation/src/main/java/com/moez/QKSMS/feature/main/DrawerBadgesExperiment.kt
+++ b/presentation/src/main/java/com/moez/QKSMS/feature/main/DrawerBadgesExperiment.kt
@@ -1,42 +1,42 @@
-/*
- * Copyright (C) 2017 Moez Bhatti <moez.bhatti@gmail.com>
- *
- * This file is part of QKSMS.
- *
- * QKSMS is free software: you can redistribute it and/or modify
- * it under the terms of the GNU General Public License as published by
- * the Free Software Foundation, either version 3 of the License, or
- * (at your option) any later version.
- *
- * QKSMS is distributed in the hope that it will be useful,
- * but WITHOUT ANY WARRANTY; without even the implied warranty of
- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
- * GNU General Public License for more details.
- *
- * You should have received a copy of the GNU General Public License
- * along with QKSMS.  If not, see <http://www.gnu.org/licenses/>.
- */
-package com.moez.QKSMS.feature.main
-
-import android.content.Context
-import com.moez.QKSMS.experiment.Experiment
-import com.moez.QKSMS.experiment.Variant
-import com.moez.QKSMS.manager.AnalyticsManager
-import javax.inject.Inject
-
-class DrawerBadgesExperiment @Inject constructor(
-    context: Context,
-    analyticsManager: AnalyticsManager
-) : Experiment<Boolean>(context, analyticsManager) {
-
-    override val key: String = "Drawer Badges"
-
-    override val variants: List<Variant<Boolean>> = listOf(
-            Variant("variant_a", false),
-            Variant("variant_b", true))
-
-    override val default: Boolean = false
-
-    override val qualifies: Boolean = true
-
+/*
+ * Copyright (C) 2017 Moez Bhatti <moez.bhatti@gmail.com>
+ *
+ * This file is part of QKSMS.
+ *
+ * QKSMS is free software: you can redistribute it and/or modify
+ * it under the terms of the GNU General Public License as published by
+ * the Free Software Foundation, either version 3 of the License, or
+ * (at your option) any later version.
+ *
+ * QKSMS is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+ * GNU General Public License for more details.
+ *
+ * You should have received a copy of the GNU General Public License
+ * along with QKSMS.  If not, see <http://www.gnu.org/licenses/>.
+ */
+package com.moez.QKSMS.feature.main
+
+import android.content.Context
+import com.moez.QKSMS.experiment.Experiment
+import com.moez.QKSMS.experiment.Variant
+import com.moez.QKSMS.manager.AnalyticsManager
+import javax.inject.Inject
+
+class DrawerBadgesExperiment @Inject constructor(
+    context: Context,
+    analyticsManager: AnalyticsManager
+) : Experiment<Boolean>(context, analyticsManager) {
+
+    override val key: String = "Drawer Badges"
+
+    override val variants: List<Variant<Boolean>> = listOf(
+            Variant("variant_a", false),
+            Variant("variant_b", true))
+
+    override val default: Boolean = false
+
+    override val qualifies: Boolean = true
+
 }
\ No newline at end of file
diff --git a/presentation/src/main/java/com/moez/QKSMS/feature/main/MainActivity.kt b/presentation/src/main/java/com/moez/QKSMS/feature/main/MainActivity.kt
index 362f66a6d..3230a613d 100644
--- a/presentation/src/main/java/com/moez/QKSMS/feature/main/MainActivity.kt
+++ b/presentation/src/main/java/com/moez/QKSMS/feature/main/MainActivity.kt
@@ -1,417 +1,417 @@
-/*
- * Copyright (C) 2017 Moez Bhatti <moez.bhatti@gmail.com>
- *
- * This file is part of QKSMS.
- *
- * QKSMS is free software: you can redistribute it and/or modify
- * it under the terms of the GNU General Public License as published by
- * the Free Software Foundation, either version 3 of the License, or
- * (at your option) any later version.
- *
- * QKSMS is distributed in the hope that it will be useful,
- * but WITHOUT ANY WARRANTY; without even the implied warranty of
- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
- * GNU General Public License for more details.
- *
- * You should have received a copy of the GNU General Public License
- * along with QKSMS.  If not, see <http://www.gnu.org/licenses/>.
- */
-package com.moez.QKSMS.feature.main
-
-import android.Manifest
-import android.animation.ObjectAnimator
-import android.app.AlertDialog
-import android.content.Intent
-import android.content.res.ColorStateList
-import android.os.Build
-import android.os.Bundle
-import android.view.Gravity
-import android.view.Menu
-import android.view.MenuItem
-import android.view.View
-import android.view.ViewStub
-import androidx.appcompat.app.ActionBarDrawerToggle
-import androidx.core.app.ActivityCompat
-import androidx.core.view.GravityCompat
-import androidx.core.view.isVisible
-import androidx.lifecycle.Lifecycle
-import androidx.lifecycle.ViewModelProvider
-import androidx.lifecycle.ViewModelProviders
-import androidx.recyclerview.widget.ItemTouchHelper
-import com.google.android.material.snackbar.Snackbar
-import com.jakewharton.rxbinding2.view.clicks
-import com.jakewharton.rxbinding2.widget.textChanges
-import com.moez.QKSMS.R
-import com.moez.QKSMS.common.Navigator
-import com.moez.QKSMS.common.androidxcompat.drawerOpen
-import com.moez.QKSMS.common.base.QkThemedActivity
-import com.moez.QKSMS.common.util.extensions.autoScrollToStart
-import com.moez.QKSMS.common.util.extensions.dismissKeyboard
-import com.moez.QKSMS.common.util.extensions.resolveThemeColor
-import com.moez.QKSMS.common.util.extensions.scrapViews
-import com.moez.QKSMS.common.util.extensions.setBackgroundTint
-import com.moez.QKSMS.common.util.extensions.setTint
-import com.moez.QKSMS.common.util.extensions.setVisible
-import com.moez.QKSMS.feature.blocking.BlockingDialog
-import com.moez.QKSMS.feature.changelog.ChangelogDialog
-import com.moez.QKSMS.feature.conversations.ConversationItemTouchCallback
-import com.moez.QKSMS.feature.conversations.ConversationsAdapter
-import com.moez.QKSMS.manager.ChangelogManager
-import com.moez.QKSMS.repository.SyncRepository
-import com.uber.autodispose.android.lifecycle.scope
-import com.uber.autodispose.autoDisposable
-import dagger.android.AndroidInjection
-import io.reactivex.Observable
-import io.reactivex.disposables.CompositeDisposable
-import io.reactivex.subjects.PublishSubject
-import io.reactivex.subjects.Subject
-import kotlinx.android.synthetic.main.drawer_view.*
-import kotlinx.android.synthetic.main.main_activity.*
-import kotlinx.android.synthetic.main.main_permission_hint.*
-import kotlinx.android.synthetic.main.main_syncing.*
-import javax.inject.Inject
-
-class MainActivity : QkThemedActivity(), MainView {
-
-    @Inject lateinit var blockingDialog: BlockingDialog
-    @Inject lateinit var disposables: CompositeDisposable
-    @Inject lateinit var navigator: Navigator
-    @Inject lateinit var conversationsAdapter: ConversationsAdapter
-    @Inject lateinit var drawerBadgesExperiment: DrawerBadgesExperiment
-    @Inject lateinit var searchAdapter: SearchAdapter
-    @Inject lateinit var itemTouchCallback: ConversationItemTouchCallback
-    @Inject lateinit var viewModelFactory: ViewModelProvider.Factory
-
-    override val onNewIntentIntent: Subject<Intent> = PublishSubject.create()
-    override val activityResumedIntent: Subject<Boolean> = PublishSubject.create()
-    override val queryChangedIntent by lazy { toolbarSearch.textChanges() }
-    override val composeIntent by lazy { compose.clicks() }
-    override val drawerOpenIntent: Observable<Boolean> by lazy {
-        drawerLayout
-                .drawerOpen(Gravity.START)
-                .doOnNext { dismissKeyboard() }
-    }
-    override val homeIntent: Subject<Unit> = PublishSubject.create()
-    override val navigationIntent: Observable<NavItem> by lazy {
-        Observable.merge(listOf(
-                backPressedSubject,
-                inbox.clicks().map { NavItem.INBOX },
-                archived.clicks().map { NavItem.ARCHIVED },
-                backup.clicks().map { NavItem.BACKUP },
-                scheduled.clicks().map { NavItem.SCHEDULED },
-                blocking.clicks().map { NavItem.BLOCKING },
-                settings.clicks().map { NavItem.SETTINGS },
-                plus.clicks().map { NavItem.PLUS },
-                help.clicks().map { NavItem.HELP },
-                invite.clicks().map { NavItem.INVITE }))
-    }
-    override val optionsItemIntent: Subject<Int> = PublishSubject.create()
-    override val plusBannerIntent by lazy { plusBanner.clicks() }
-    override val dismissRatingIntent by lazy { rateDismiss.clicks() }
-    override val rateIntent by lazy { rateOkay.clicks() }
-    override val conversationsSelectedIntent by lazy { conversationsAdapter.selectionChanges }
-    override val confirmDeleteIntent: Subject<List<Long>> = PublishSubject.create()
-    override val swipeConversationIntent by lazy { itemTouchCallback.swipes }
-    override val changelogMoreIntent by lazy { changelogDialog.moreClicks }
-    override val undoArchiveIntent: Subject<Unit> = PublishSubject.create()
-    override val snackbarButtonIntent: Subject<Unit> = PublishSubject.create()
-
-    private val viewModel by lazy { ViewModelProviders.of(this, viewModelFactory)[MainViewModel::class.java] }
-    private val toggle by lazy { ActionBarDrawerToggle(this, drawerLayout, toolbar, R.string.main_drawer_open_cd, 0) }
-    private val itemTouchHelper by lazy { ItemTouchHelper(itemTouchCallback) }
-    private val progressAnimator by lazy { ObjectAnimator.ofInt(syncingProgress, "progress", 0, 0) }
-    private val changelogDialog by lazy { ChangelogDialog(this) }
-    private val snackbar by lazy { findViewById<View>(R.id.snackbar) }
-    private val syncing by lazy { findViewById<View>(R.id.syncing) }
-    private val backPressedSubject: Subject<NavItem> = PublishSubject.create()
-
-    override fun onCreate(savedInstanceState: Bundle?) {
-        AndroidInjection.inject(this)
-        super.onCreate(savedInstanceState)
-        setContentView(R.layout.main_activity)
-        viewModel.bindView(this)
-        onNewIntentIntent.onNext(intent)
-
-        (snackbar as? ViewStub)?.setOnInflateListener { _, _ ->
-            snackbarButton.clicks()
-                    .autoDisposable(scope(Lifecycle.Event.ON_DESTROY))
-                    .subscribe(snackbarButtonIntent)
-        }
-
-        (syncing as? ViewStub)?.setOnInflateListener { _, _ ->
-            syncingProgress?.progressTintList = ColorStateList.valueOf(theme.blockingFirst().theme)
-            syncingProgress?.indeterminateTintList = ColorStateList.valueOf(theme.blockingFirst().theme)
-        }
-
-        toggle.syncState()
-        toolbar.setNavigationOnClickListener {
-            dismissKeyboard()
-            homeIntent.onNext(Unit)
-        }
-
-        itemTouchCallback.adapter = conversationsAdapter
-        conversationsAdapter.autoScrollToStart(recyclerView)
-
-        // Don't allow clicks to pass through the drawer layout
-        drawer.clicks().autoDisposable(scope()).subscribe()
-
-        // Set the theme color tint to the recyclerView, progressbar, and FAB
-        theme
-                .autoDisposable(scope())
-                .subscribe { theme ->
-                    // Set the color for the drawer icons
-                    val states = arrayOf(
-                            intArrayOf(android.R.attr.state_activated),
-                            intArrayOf(-android.R.attr.state_activated))
-
-                    resolveThemeColor(android.R.attr.textColorSecondary)
-                            .let { textSecondary -> ColorStateList(states, intArrayOf(theme.theme, textSecondary)) }
-                            .let { tintList ->
-                                inboxIcon.imageTintList = tintList
-                                archivedIcon.imageTintList = tintList
-                            }
-
-                    // Miscellaneous views
-                    listOf(plusBadge1, plusBadge2).forEach { badge ->
-                        badge.setBackgroundTint(theme.theme)
-                        badge.setTextColor(theme.textPrimary)
-                    }
-                    syncingProgress?.progressTintList = ColorStateList.valueOf(theme.theme)
-                    syncingProgress?.indeterminateTintList = ColorStateList.valueOf(theme.theme)
-                    plusIcon.setTint(theme.theme)
-                    rateIcon.setTint(theme.theme)
-                    compose.setBackgroundTint(theme.theme)
-
-                    // Set the FAB compose icon color
-                    compose.setTint(theme.textPrimary)
-                }
-
-        // These theme attributes don't apply themselves on API 21
-        if (Build.VERSION.SDK_INT <= 22) {
-            toolbarSearch.setBackgroundTint(resolveThemeColor(R.attr.bubbleColor))
-        }
-    }
-
-    override fun onNewIntent(intent: Intent?) {
-        super.onNewIntent(intent)
-        intent?.run(onNewIntentIntent::onNext)
-    }
-
-    override fun render(state: MainState) {
-        if (state.hasError) {
-            finish()
-            return
-        }
-
-        val addContact = when (state.page) {
-            is Inbox -> state.page.addContact
-            is Archived -> state.page.addContact
-            else -> false
-        }
-
-        val markPinned = when (state.page) {
-            is Inbox -> state.page.markPinned
-            is Archived -> state.page.markPinned
-            else -> true
-        }
-
-        val markRead = when (state.page) {
-            is Inbox -> state.page.markRead
-            is Archived -> state.page.markRead
-            else -> true
-        }
-
-        val selectedConversations = when (state.page) {
-            is Inbox -> state.page.selected
-            is Archived -> state.page.selected
-            else -> 0
-        }
-
-        toolbarSearch.setVisible(state.page is Inbox && state.page.selected == 0 || state.page is Searching)
-        toolbarTitle.setVisible(toolbarSearch.visibility != View.VISIBLE)
-
-        toolbar.menu.findItem(R.id.archive)?.isVisible = state.page is Inbox && selectedConversations != 0
-        toolbar.menu.findItem(R.id.unarchive)?.isVisible = state.page is Archived && selectedConversations != 0
-        toolbar.menu.findItem(R.id.delete)?.isVisible = selectedConversations != 0
-        toolbar.menu.findItem(R.id.add)?.isVisible = addContact && selectedConversations != 0
-        toolbar.menu.findItem(R.id.pin)?.isVisible = markPinned && selectedConversations != 0
-        toolbar.menu.findItem(R.id.unpin)?.isVisible = !markPinned && selectedConversations != 0
-        toolbar.menu.findItem(R.id.read)?.isVisible = markRead && selectedConversations != 0
-        toolbar.menu.findItem(R.id.unread)?.isVisible = !markRead && selectedConversations != 0
-        toolbar.menu.findItem(R.id.block)?.isVisible = selectedConversations != 0
-
-        listOf(plusBadge1, plusBadge2).forEach { badge ->
-            badge.isVisible = drawerBadgesExperiment.variant && !state.upgraded
-        }
-        plus.isVisible = state.upgraded
-        plusBanner.isVisible = !state.upgraded
-        rateLayout.setVisible(state.showRating)
-
-        compose.setVisible(state.page is Inbox || state.page is Archived)
-        conversationsAdapter.emptyView = empty.takeIf { state.page is Inbox || state.page is Archived }
-        searchAdapter.emptyView = empty.takeIf { state.page is Searching }
-
-        when (state.page) {
-            is Inbox -> {
-                showBackButton(state.page.selected > 0)
-                title = getString(R.string.main_title_selected, state.page.selected)
-                if (recyclerView.adapter !== conversationsAdapter) recyclerView.adapter = conversationsAdapter
-                conversationsAdapter.updateData(state.page.data)
-                itemTouchHelper.attachToRecyclerView(recyclerView)
-                empty.setText(R.string.inbox_empty_text)
-            }
-
-            is Searching -> {
-                showBackButton(true)
-                if (recyclerView.adapter !== searchAdapter) recyclerView.adapter = searchAdapter
-                searchAdapter.data = state.page.data ?: listOf()
-                itemTouchHelper.attachToRecyclerView(null)
-                empty.setText(R.string.inbox_search_empty_text)
-            }
-
-            is Archived -> {
-                showBackButton(state.page.selected > 0)
-                title = when (state.page.selected != 0) {
-                    true -> getString(R.string.main_title_selected, state.page.selected)
-                    false -> getString(R.string.title_archived)
-                }
-                if (recyclerView.adapter !== conversationsAdapter) recyclerView.adapter = conversationsAdapter
-                conversationsAdapter.updateData(state.page.data)
-                itemTouchHelper.attachToRecyclerView(null)
-                empty.setText(R.string.archived_empty_text)
-            }
-        }
-
-        inbox.isActivated = state.page is Inbox
-        archived.isActivated = state.page is Archived
-
-        if (drawerLayout.isDrawerOpen(GravityCompat.START) && !state.drawerOpen) {
-            drawerLayout.closeDrawer(GravityCompat.START)
-        } else if (!drawerLayout.isDrawerVisible(GravityCompat.START) && state.drawerOpen) {
-            drawerLayout.openDrawer(GravityCompat.START)
-        }
-
-        when (state.syncing) {
-            is SyncRepository.SyncProgress.Idle -> {
-                syncing.isVisible = false
-                snackbar.isVisible = !state.defaultSms || !state.smsPermission || !state.contactPermission
-            }
-
-            is SyncRepository.SyncProgress.Running -> {
-                syncing.isVisible = true
-                syncingProgress.max = state.syncing.max
-                progressAnimator.apply { setIntValues(syncingProgress.progress, state.syncing.progress) }.start()
-                syncingProgress.isIndeterminate = state.syncing.indeterminate
-                snackbar.isVisible = false
-            }
-        }
-
-        when {
-            !state.defaultSms -> {
-                snackbarTitle?.setText(R.string.main_default_sms_title)
-                snackbarMessage?.setText(R.string.main_default_sms_message)
-                snackbarButton?.setText(R.string.main_default_sms_change)
-            }
-
-            !state.smsPermission -> {
-                snackbarTitle?.setText(R.string.main_permission_required)
-                snackbarMessage?.setText(R.string.main_permission_sms)
-                snackbarButton?.setText(R.string.main_permission_allow)
-            }
-
-            !state.contactPermission -> {
-                snackbarTitle?.setText(R.string.main_permission_required)
-                snackbarMessage?.setText(R.string.main_permission_contacts)
-                snackbarButton?.setText(R.string.main_permission_allow)
-            }
-        }
-    }
-
-    override fun onResume() {
-        super.onResume()
-        activityResumedIntent.onNext(true)
-    }
-
-    override fun onPause() {
-        super.onPause()
-        activityResumedIntent.onNext(false)
-    }
-
-    override fun onDestroy() {
-        super.onDestroy()
-        disposables.dispose()
-    }
-
-    override fun showBackButton(show: Boolean) {
-        toggle.onDrawerSlide(drawer, if (show) 1f else 0f)
-        toggle.drawerArrowDrawable.color = when (show) {
-            true -> resolveThemeColor(android.R.attr.textColorSecondary)
-            false -> resolveThemeColor(android.R.attr.textColorPrimary)
-        }
-    }
-
-    override fun requestDefaultSms() {
-        navigator.showDefaultSmsDialog(this)
-    }
-
-    override fun requestPermissions() {
-        ActivityCompat.requestPermissions(this, arrayOf(
-                Manifest.permission.READ_SMS,
-                Manifest.permission.SEND_SMS,
-                Manifest.permission.READ_CONTACTS), 0)
-    }
-
-    override fun clearSearch() {
-        dismissKeyboard()
-        toolbarSearch.text = null
-    }
-
-    override fun clearSelection() {
-        conversationsAdapter.clearSelection()
-    }
-
-    override fun themeChanged() {
-        recyclerView.scrapViews()
-    }
-
-    override fun showBlockingDialog(conversations: List<Long>, block: Boolean) {
-        blockingDialog.show(this, conversations, block)
-    }
-
-    override fun showDeleteDialog(conversations: List<Long>) {
-        val count = conversations.size
-        AlertDialog.Builder(this)
-                .setTitle(R.string.dialog_delete_title)
-                .setMessage(resources.getQuantityString(R.plurals.dialog_delete_message, count, count))
-                .setPositiveButton(R.string.button_delete) { _, _ -> confirmDeleteIntent.onNext(conversations) }
-                .setNegativeButton(R.string.button_cancel, null)
-                .show()
-    }
-
-    override fun showChangelog(changelog: ChangelogManager.CumulativeChangelog) {
-        changelogDialog.show(changelog)
-    }
-
-    override fun showArchivedSnackbar() {
-        Snackbar.make(drawerLayout, R.string.toast_archived, Snackbar.LENGTH_LONG).apply {
-            setAction(R.string.button_undo) { undoArchiveIntent.onNext(Unit) }
-            setActionTextColor(colors.theme().theme)
-            show()
-        }
-    }
-
-    override fun onCreateOptionsMenu(menu: Menu?): Boolean {
-        menuInflater.inflate(R.menu.main, menu)
-        return super.onCreateOptionsMenu(menu)
-    }
-
-    override fun onOptionsItemSelected(item: MenuItem): Boolean {
-        optionsItemIntent.onNext(item.itemId)
-        return true
-    }
-
-    override fun onBackPressed() {
-        backPressedSubject.onNext(NavItem.BACK)
-    }
-
-}
+/*
+ * Copyright (C) 2017 Moez Bhatti <moez.bhatti@gmail.com>
+ *
+ * This file is part of QKSMS.
+ *
+ * QKSMS is free software: you can redistribute it and/or modify
+ * it under the terms of the GNU General Public License as published by
+ * the Free Software Foundation, either version 3 of the License, or
+ * (at your option) any later version.
+ *
+ * QKSMS is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+ * GNU General Public License for more details.
+ *
+ * You should have received a copy of the GNU General Public License
+ * along with QKSMS.  If not, see <http://www.gnu.org/licenses/>.
+ */
+package com.moez.QKSMS.feature.main
+
+import android.Manifest
+import android.animation.ObjectAnimator
+import android.app.AlertDialog
+import android.content.Intent
+import android.content.res.ColorStateList
+import android.os.Build
+import android.os.Bundle
+import android.view.Gravity
+import android.view.Menu
+import android.view.MenuItem
+import android.view.View
+import android.view.ViewStub
+import androidx.appcompat.app.ActionBarDrawerToggle
+import androidx.core.app.ActivityCompat
+import androidx.core.view.GravityCompat
+import androidx.core.view.isVisible
+import androidx.lifecycle.Lifecycle
+import androidx.lifecycle.ViewModelProvider
+import androidx.lifecycle.ViewModelProviders
+import androidx.recyclerview.widget.ItemTouchHelper
+import com.google.android.material.snackbar.Snackbar
+import com.jakewharton.rxbinding2.view.clicks
+import com.jakewharton.rxbinding2.widget.textChanges
+import com.moez.QKSMS.R
+import com.moez.QKSMS.common.Navigator
+import com.moez.QKSMS.common.androidxcompat.drawerOpen
+import com.moez.QKSMS.common.base.QkThemedActivity
+import com.moez.QKSMS.common.util.extensions.autoScrollToStart
+import com.moez.QKSMS.common.util.extensions.dismissKeyboard
+import com.moez.QKSMS.common.util.extensions.resolveThemeColor
+import com.moez.QKSMS.common.util.extensions.scrapViews
+import com.moez.QKSMS.common.util.extensions.setBackgroundTint
+import com.moez.QKSMS.common.util.extensions.setTint
+import com.moez.QKSMS.common.util.extensions.setVisible
+import com.moez.QKSMS.feature.blocking.BlockingDialog
+import com.moez.QKSMS.feature.changelog.ChangelogDialog
+import com.moez.QKSMS.feature.conversations.ConversationItemTouchCallback
+import com.moez.QKSMS.feature.conversations.ConversationsAdapter
+import com.moez.QKSMS.manager.ChangelogManager
+import com.moez.QKSMS.repository.SyncRepository
+import com.uber.autodispose.android.lifecycle.scope
+import com.uber.autodispose.autoDisposable
+import dagger.android.AndroidInjection
+import io.reactivex.Observable
+import io.reactivex.disposables.CompositeDisposable
+import io.reactivex.subjects.PublishSubject
+import io.reactivex.subjects.Subject
+import kotlinx.android.synthetic.main.drawer_view.*
+import kotlinx.android.synthetic.main.main_activity.*
+import kotlinx.android.synthetic.main.main_permission_hint.*
+import kotlinx.android.synthetic.main.main_syncing.*
+import javax.inject.Inject
+
+class MainActivity : QkThemedActivity(), MainView {
+
+    @Inject lateinit var blockingDialog: BlockingDialog
+    @Inject lateinit var disposables: CompositeDisposable
+    @Inject lateinit var navigator: Navigator
+    @Inject lateinit var conversationsAdapter: ConversationsAdapter
+    @Inject lateinit var drawerBadgesExperiment: DrawerBadgesExperiment
+    @Inject lateinit var searchAdapter: SearchAdapter
+    @Inject lateinit var itemTouchCallback: ConversationItemTouchCallback
+    @Inject lateinit var viewModelFactory: ViewModelProvider.Factory
+
+    override val onNewIntentIntent: Subject<Intent> = PublishSubject.create()
+    override val activityResumedIntent: Subject<Boolean> = PublishSubject.create()
+    override val queryChangedIntent by lazy { toolbarSearch.textChanges() }
+    override val composeIntent by lazy { compose.clicks() }
+    override val drawerOpenIntent: Observable<Boolean> by lazy {
+        drawerLayout
+                .drawerOpen(Gravity.START)
+                .doOnNext { dismissKeyboard() }
+    }
+    override val homeIntent: Subject<Unit> = PublishSubject.create()
+    override val navigationIntent: Observable<NavItem> by lazy {
+        Observable.merge(listOf(
+                backPressedSubject,
+                inbox.clicks().map { NavItem.INBOX },
+                archived.clicks().map { NavItem.ARCHIVED },
+                backup.clicks().map { NavItem.BACKUP },
+                scheduled.clicks().map { NavItem.SCHEDULED },
+                blocking.clicks().map { NavItem.BLOCKING },
+                settings.clicks().map { NavItem.SETTINGS },
+                plus.clicks().map { NavItem.PLUS },
+                help.clicks().map { NavItem.HELP },
+                invite.clicks().map { NavItem.INVITE }))
+    }
+    override val optionsItemIntent: Subject<Int> = PublishSubject.create()
+    override val plusBannerIntent by lazy { plusBanner.clicks() }
+    override val dismissRatingIntent by lazy { rateDismiss.clicks() }
+    override val rateIntent by lazy { rateOkay.clicks() }
+    override val conversationsSelectedIntent by lazy { conversationsAdapter.selectionChanges }
+    override val confirmDeleteIntent: Subject<List<Long>> = PublishSubject.create()
+    override val swipeConversationIntent by lazy { itemTouchCallback.swipes }
+    override val changelogMoreIntent by lazy { changelogDialog.moreClicks }
+    override val undoArchiveIntent: Subject<Unit> = PublishSubject.create()
+    override val snackbarButtonIntent: Subject<Unit> = PublishSubject.create()
+
+    private val viewModel by lazy { ViewModelProviders.of(this, viewModelFactory)[MainViewModel::class.java] }
+    private val toggle by lazy { ActionBarDrawerToggle(this, drawerLayout, toolbar, R.string.main_drawer_open_cd, 0) }
+    private val itemTouchHelper by lazy { ItemTouchHelper(itemTouchCallback) }
+    private val progressAnimator by lazy { ObjectAnimator.ofInt(syncingProgress, "progress", 0, 0) }
+    private val changelogDialog by lazy { ChangelogDialog(this) }
+    private val snackbar by lazy { findViewById<View>(R.id.snackbar) }
+    private val syncing by lazy { findViewById<View>(R.id.syncing) }
+    private val backPressedSubject: Subject<NavItem> = PublishSubject.create()
+
+    override fun onCreate(savedInstanceState: Bundle?) {
+        AndroidInjection.inject(this)
+        super.onCreate(savedInstanceState)
+        setContentView(R.layout.main_activity)
+        viewModel.bindView(this)
+        onNewIntentIntent.onNext(intent)
+
+        (snackbar as? ViewStub)?.setOnInflateListener { _, _ ->
+            snackbarButton.clicks()
+                    .autoDisposable(scope(Lifecycle.Event.ON_DESTROY))
+                    .subscribe(snackbarButtonIntent)
+        }
+
+        (syncing as? ViewStub)?.setOnInflateListener { _, _ ->
+            syncingProgress?.progressTintList = ColorStateList.valueOf(theme.blockingFirst().theme)
+            syncingProgress?.indeterminateTintList = ColorStateList.valueOf(theme.blockingFirst().theme)
+        }
+
+        toggle.syncState()
+        toolbar.setNavigationOnClickListener {
+            dismissKeyboard()
+            homeIntent.onNext(Unit)
+        }
+
+        itemTouchCallback.adapter = conversationsAdapter
+        conversationsAdapter.autoScrollToStart(recyclerView)
+
+        // Don't allow clicks to pass through the drawer layout
+        drawer.clicks().autoDisposable(scope()).subscribe()
+
+        // Set the theme color tint to the recyclerView, progressbar, and FAB
+        theme
+                .autoDisposable(scope())
+                .subscribe { theme ->
+                    // Set the color for the drawer icons
+                    val states = arrayOf(
+                            intArrayOf(android.R.attr.state_activated),
+                            intArrayOf(-android.R.attr.state_activated))
+
+                    resolveThemeColor(android.R.attr.textColorSecondary)
+                            .let { textSecondary -> ColorStateList(states, intArrayOf(theme.theme, textSecondary)) }
+                            .let { tintList ->
+                                inboxIcon.imageTintList = tintList
+                                archivedIcon.imageTintList = tintList
+                            }
+
+                    // Miscellaneous views
+                    listOf(plusBadge1, plusBadge2).forEach { badge ->
+                        badge.setBackgroundTint(theme.theme)
+                        badge.setTextColor(theme.textPrimary)
+                    }
+                    syncingProgress?.progressTintList = ColorStateList.valueOf(theme.theme)
+                    syncingProgress?.indeterminateTintList = ColorStateList.valueOf(theme.theme)
+                    plusIcon.setTint(theme.theme)
+                    rateIcon.setTint(theme.theme)
+                    compose.setBackgroundTint(theme.theme)
+
+                    // Set the FAB compose icon color
+                    compose.setTint(theme.textPrimary)
+                }
+
+        // These theme attributes don't apply themselves on API 21
+        if (Build.VERSION.SDK_INT <= 22) {
+            toolbarSearch.setBackgroundTint(resolveThemeColor(R.attr.bubbleColor))
+        }
+    }
+
+    override fun onNewIntent(intent: Intent?) {
+        super.onNewIntent(intent)
+        intent?.run(onNewIntentIntent::onNext)
+    }
+
+    override fun render(state: MainState) {
+        if (state.hasError) {
+            finish()
+            return
+        }
+
+        val addContact = when (state.page) {
+            is Inbox -> state.page.addContact
+            is Archived -> state.page.addContact
+            else -> false
+        }
+
+        val markPinned = when (state.page) {
+            is Inbox -> state.page.markPinned
+            is Archived -> state.page.markPinned
+            else -> true
+        }
+
+        val markRead = when (state.page) {
+            is Inbox -> state.page.markRead
+            is Archived -> state.page.markRead
+            else -> true
+        }
+
+        val selectedConversations = when (state.page) {
+            is Inbox -> state.page.selected
+            is Archived -> state.page.selected
+            else -> 0
+        }
+
+        toolbarSearch.setVisible(state.page is Inbox && state.page.selected == 0 || state.page is Searching)
+        toolbarTitle.setVisible(toolbarSearch.visibility != View.VISIBLE)
+
+        toolbar.menu.findItem(R.id.archive)?.isVisible = state.page is Inbox && selectedConversations != 0
+        toolbar.menu.findItem(R.id.unarchive)?.isVisible = state.page is Archived && selectedConversations != 0
+        toolbar.menu.findItem(R.id.delete)?.isVisible = selectedConversations != 0
+        toolbar.menu.findItem(R.id.add)?.isVisible = addContact && selectedConversations != 0
+        toolbar.menu.findItem(R.id.pin)?.isVisible = markPinned && selectedConversations != 0
+        toolbar.menu.findItem(R.id.unpin)?.isVisible = !markPinned && selectedConversations != 0
+        toolbar.menu.findItem(R.id.read)?.isVisible = markRead && selectedConversations != 0
+        toolbar.menu.findItem(R.id.unread)?.isVisible = !markRead && selectedConversations != 0
+        toolbar.menu.findItem(R.id.block)?.isVisible = selectedConversations != 0
+
+        listOf(plusBadge1, plusBadge2).forEach { badge ->
+            badge.isVisible = drawerBadgesExperiment.variant && !state.upgraded
+        }
+        plus.isVisible = state.upgraded
+        plusBanner.isVisible = !state.upgraded
+        rateLayout.setVisible(state.showRating)
+
+        compose.setVisible(state.page is Inbox || state.page is Archived)
+        conversationsAdapter.emptyView = empty.takeIf { state.page is Inbox || state.page is Archived }
+        searchAdapter.emptyView = empty.takeIf { state.page is Searching }
+
+        when (state.page) {
+            is Inbox -> {
+                showBackButton(state.page.selected > 0)
+                title = getString(R.string.main_title_selected, state.page.selected)
+                if (recyclerView.adapter !== conversationsAdapter) recyclerView.adapter = conversationsAdapter
+                conversationsAdapter.updateData(state.page.data)
+                itemTouchHelper.attachToRecyclerView(recyclerView)
+                empty.setText(R.string.inbox_empty_text)
+            }
+
+            is Searching -> {
+                showBackButton(true)
+                if (recyclerView.adapter !== searchAdapter) recyclerView.adapter = searchAdapter
+                searchAdapter.data = state.page.data ?: listOf()
+                itemTouchHelper.attachToRecyclerView(null)
+                empty.setText(R.string.inbox_search_empty_text)
+            }
+
+            is Archived -> {
+                showBackButton(state.page.selected > 0)
+                title = when (state.page.selected != 0) {
+                    true -> getString(R.string.main_title_selected, state.page.selected)
+                    false -> getString(R.string.title_archived)
+                }
+                if (recyclerView.adapter !== conversationsAdapter) recyclerView.adapter = conversationsAdapter
+                conversationsAdapter.updateData(state.page.data)
+                itemTouchHelper.attachToRecyclerView(null)
+                empty.setText(R.string.archived_empty_text)
+            }
+        }
+
+        inbox.isActivated = state.page is Inbox
+        archived.isActivated = state.page is Archived
+
+        if (drawerLayout.isDrawerOpen(GravityCompat.START) && !state.drawerOpen) {
+            drawerLayout.closeDrawer(GravityCompat.START)
+        } else if (!drawerLayout.isDrawerVisible(GravityCompat.START) && state.drawerOpen) {
+            drawerLayout.openDrawer(GravityCompat.START)
+        }
+
+        when (state.syncing) {
+            is SyncRepository.SyncProgress.Idle -> {
+                syncing.isVisible = false
+                snackbar.isVisible = !state.defaultSms || !state.smsPermission || !state.contactPermission
+            }
+
+            is SyncRepository.SyncProgress.Running -> {
+                syncing.isVisible = true
+                syncingProgress.max = state.syncing.max
+                progressAnimator.apply { setIntValues(syncingProgress.progress, state.syncing.progress) }.start()
+                syncingProgress.isIndeterminate = state.syncing.indeterminate
+                snackbar.isVisible = false
+            }
+        }
+
+        when {
+            !state.defaultSms -> {
+                snackbarTitle?.setText(R.string.main_default_sms_title)
+                snackbarMessage?.setText(R.string.main_default_sms_message)
+                snackbarButton?.setText(R.string.main_default_sms_change)
+            }
+
+            !state.smsPermission -> {
+                snackbarTitle?.setText(R.string.main_permission_required)
+                snackbarMessage?.setText(R.string.main_permission_sms)
+                snackbarButton?.setText(R.string.main_permission_allow)
+            }
+
+            !state.contactPermission -> {
+                snackbarTitle?.setText(R.string.main_permission_required)
+                snackbarMessage?.setText(R.string.main_permission_contacts)
+                snackbarButton?.setText(R.string.main_permission_allow)
+            }
+        }
+    }
+
+    override fun onResume() {
+        super.onResume()
+        activityResumedIntent.onNext(true)
+    }
+
+    override fun onPause() {
+        super.onPause()
+        activityResumedIntent.onNext(false)
+    }
+
+    override fun onDestroy() {
+        super.onDestroy()
+        disposables.dispose()
+    }
+
+    override fun showBackButton(show: Boolean) {
+        toggle.onDrawerSlide(drawer, if (show) 1f else 0f)
+        toggle.drawerArrowDrawable.color = when (show) {
+            true -> resolveThemeColor(android.R.attr.textColorSecondary)
+            false -> resolveThemeColor(android.R.attr.textColorPrimary)
+        }
+    }
+
+    override fun requestDefaultSms() {
+        navigator.showDefaultSmsDialog(this)
+    }
+
+    override fun requestPermissions() {
+        ActivityCompat.requestPermissions(this, arrayOf(
+                Manifest.permission.READ_SMS,
+                Manifest.permission.SEND_SMS,
+                Manifest.permission.READ_CONTACTS), 0)
+    }
+
+    override fun clearSearch() {
+        dismissKeyboard()
+        toolbarSearch.text = null
+    }
+
+    override fun clearSelection() {
+        conversationsAdapter.clearSelection()
+    }
+
+    override fun themeChanged() {
+        recyclerView.scrapViews()
+    }
+
+    override fun showBlockingDialog(conversations: List<Long>, block: Boolean) {
+        blockingDialog.show(this, conversations, block)
+    }
+
+    override fun showDeleteDialog(conversations: List<Long>) {
+        val count = conversations.size
+        AlertDialog.Builder(this)
+                .setTitle(R.string.dialog_delete_title)
+                .setMessage(resources.getQuantityString(R.plurals.dialog_delete_message, count, count))
+                .setPositiveButton(R.string.button_delete) { _, _ -> confirmDeleteIntent.onNext(conversations) }
+                .setNegativeButton(R.string.button_cancel, null)
+                .show()
+    }
+
+    override fun showChangelog(changelog: ChangelogManager.CumulativeChangelog) {
+        changelogDialog.show(changelog)
+    }
+
+    override fun showArchivedSnackbar() {
+        Snackbar.make(drawerLayout, R.string.toast_archived, Snackbar.LENGTH_LONG).apply {
+            setAction(R.string.button_undo) { undoArchiveIntent.onNext(Unit) }
+            setActionTextColor(colors.theme().theme)
+            show()
+        }
+    }
+
+    override fun onCreateOptionsMenu(menu: Menu?): Boolean {
+        menuInflater.inflate(R.menu.main, menu)
+        return super.onCreateOptionsMenu(menu)
+    }
+
+    override fun onOptionsItemSelected(item: MenuItem): Boolean {
+        optionsItemIntent.onNext(item.itemId)
+        return true
+    }
+
+    override fun onBackPressed() {
+        backPressedSubject.onNext(NavItem.BACK)
+    }
+
+}
diff --git a/presentation/src/main/java/com/moez/QKSMS/feature/main/MainActivityModule.kt b/presentation/src/main/java/com/moez/QKSMS/feature/main/MainActivityModule.kt
index d616c4d24..5f4f739ad 100644
--- a/presentation/src/main/java/com/moez/QKSMS/feature/main/MainActivityModule.kt
+++ b/presentation/src/main/java/com/moez/QKSMS/feature/main/MainActivityModule.kt
@@ -1,41 +1,41 @@
-/*
- * Copyright (C) 2017 Moez Bhatti <moez.bhatti@gmail.com>
- *
- * This file is part of QKSMS.
- *
- * QKSMS is free software: you can redistribute it and/or modify
- * it under the terms of the GNU General Public License as published by
- * the Free Software Foundation, either version 3 of the License, or
- * (at your option) any later version.
- *
- * QKSMS is distributed in the hope that it will be useful,
- * but WITHOUT ANY WARRANTY; without even the implied warranty of
- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
- * GNU General Public License for more details.
- *
- * You should have received a copy of the GNU General Public License
- * along with QKSMS.  If not, see <http://www.gnu.org/licenses/>.
- */
-package com.moez.QKSMS.feature.main
-
-import androidx.lifecycle.ViewModel
-import com.moez.QKSMS.injection.ViewModelKey
-import com.moez.QKSMS.injection.scope.ActivityScope
-import dagger.Module
-import dagger.Provides
-import dagger.multibindings.IntoMap
-import io.reactivex.disposables.CompositeDisposable
-
-@Module
-class MainActivityModule {
-
-    @Provides
-    @ActivityScope
-    fun provideCompositeDiposableLifecycle(): CompositeDisposable = CompositeDisposable()
-
-    @Provides
-    @IntoMap
-    @ViewModelKey(MainViewModel::class)
-    fun provideMainViewModel(viewModel: MainViewModel): ViewModel = viewModel
-
+/*
+ * Copyright (C) 2017 Moez Bhatti <moez.bhatti@gmail.com>
+ *
+ * This file is part of QKSMS.
+ *
+ * QKSMS is free software: you can redistribute it and/or modify
+ * it under the terms of the GNU General Public License as published by
+ * the Free Software Foundation, either version 3 of the License, or
+ * (at your option) any later version.
+ *
+ * QKSMS is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+ * GNU General Public License for more details.
+ *
+ * You should have received a copy of the GNU General Public License
+ * along with QKSMS.  If not, see <http://www.gnu.org/licenses/>.
+ */
+package com.moez.QKSMS.feature.main
+
+import androidx.lifecycle.ViewModel
+import com.moez.QKSMS.injection.ViewModelKey
+import com.moez.QKSMS.injection.scope.ActivityScope
+import dagger.Module
+import dagger.Provides
+import dagger.multibindings.IntoMap
+import io.reactivex.disposables.CompositeDisposable
+
+@Module
+class MainActivityModule {
+
+    @Provides
+    @ActivityScope
+    fun provideCompositeDiposableLifecycle(): CompositeDisposable = CompositeDisposable()
+
+    @Provides
+    @IntoMap
+    @ViewModelKey(MainViewModel::class)
+    fun provideMainViewModel(viewModel: MainViewModel): ViewModel = viewModel
+
 }
\ No newline at end of file
diff --git a/presentation/src/main/java/com/moez/QKSMS/feature/main/MainState.kt b/presentation/src/main/java/com/moez/QKSMS/feature/main/MainState.kt
index 01697633a..b77959b44 100644
--- a/presentation/src/main/java/com/moez/QKSMS/feature/main/MainState.kt
+++ b/presentation/src/main/java/com/moez/QKSMS/feature/main/MainState.kt
@@ -1,59 +1,59 @@
-/*
- * Copyright (C) 2017 Moez Bhatti <moez.bhatti@gmail.com>
- *
- * This file is part of QKSMS.
- *
- * QKSMS is free software: you can redistribute it and/or modify
- * it under the terms of the GNU General Public License as published by
- * the Free Software Foundation, either version 3 of the License, or
- * (at your option) any later version.
- *
- * QKSMS is distributed in the hope that it will be useful,
- * but WITHOUT ANY WARRANTY; without even the implied warranty of
- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
- * GNU General Public License for more details.
- *
- * You should have received a copy of the GNU General Public License
- * along with QKSMS.  If not, see <http://www.gnu.org/licenses/>.
- */
-package com.moez.QKSMS.feature.main
-
-import com.moez.QKSMS.model.Conversation
-import com.moez.QKSMS.model.SearchResult
-import com.moez.QKSMS.repository.SyncRepository
-import io.realm.RealmResults
-
-data class MainState(
-    val hasError: Boolean = false,
-    val page: MainPage = Inbox(),
-    val drawerOpen: Boolean = false,
-    val upgraded: Boolean = true,
-    val showRating: Boolean = false,
-    val syncing: SyncRepository.SyncProgress = SyncRepository.SyncProgress.Idle,
-    val defaultSms: Boolean = true,
-    val smsPermission: Boolean = true,
-    val contactPermission: Boolean = true
-)
-
-sealed class MainPage
-
-data class Inbox(
-    val addContact: Boolean = false,
-    val markPinned: Boolean = true,
-    val markRead: Boolean = false,
-    val data: RealmResults<Conversation>? = null,
-    val selected: Int = 0
-) : MainPage()
-
-data class Searching(
-    val loading: Boolean = false,
-    val data: List<SearchResult>? = null
-) : MainPage()
-
-data class Archived(
-    val addContact: Boolean = false,
-    val markPinned: Boolean = true,
-    val markRead: Boolean = false,
-    val data: RealmResults<Conversation>? = null,
-    val selected: Int = 0
-) : MainPage()
+/*
+ * Copyright (C) 2017 Moez Bhatti <moez.bhatti@gmail.com>
+ *
+ * This file is part of QKSMS.
+ *
+ * QKSMS is free software: you can redistribute it and/or modify
+ * it under the terms of the GNU General Public License as published by
+ * the Free Software Foundation, either version 3 of the License, or
+ * (at your option) any later version.
+ *
+ * QKSMS is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+ * GNU General Public License for more details.
+ *
+ * You should have received a copy of the GNU General Public License
+ * along with QKSMS.  If not, see <http://www.gnu.org/licenses/>.
+ */
+package com.moez.QKSMS.feature.main
+
+import com.moez.QKSMS.model.Conversation
+import com.moez.QKSMS.model.SearchResult
+import com.moez.QKSMS.repository.SyncRepository
+import io.realm.RealmResults
+
+data class MainState(
+    val hasError: Boolean = false,
+    val page: MainPage = Inbox(),
+    val drawerOpen: Boolean = false,
+    val upgraded: Boolean = true,
+    val showRating: Boolean = false,
+    val syncing: SyncRepository.SyncProgress = SyncRepository.SyncProgress.Idle,
+    val defaultSms: Boolean = true,
+    val smsPermission: Boolean = true,
+    val contactPermission: Boolean = true
+)
+
+sealed class MainPage
+
+data class Inbox(
+    val addContact: Boolean = false,
+    val markPinned: Boolean = true,
+    val markRead: Boolean = false,
+    val data: RealmResults<Conversation>? = null,
+    val selected: Int = 0
+) : MainPage()
+
+data class Searching(
+    val loading: Boolean = false,
+    val data: List<SearchResult>? = null
+) : MainPage()
+
+data class Archived(
+    val addContact: Boolean = false,
+    val markPinned: Boolean = true,
+    val markRead: Boolean = false,
+    val data: RealmResults<Conversation>? = null,
+    val selected: Int = 0
+) : MainPage()
diff --git a/presentation/src/main/java/com/moez/QKSMS/feature/main/MainView.kt b/presentation/src/main/java/com/moez/QKSMS/feature/main/MainView.kt
index 70bbf36bc..717233fff 100644
--- a/presentation/src/main/java/com/moez/QKSMS/feature/main/MainView.kt
+++ b/presentation/src/main/java/com/moez/QKSMS/feature/main/MainView.kt
@@ -1,58 +1,58 @@
-/*
- * Copyright (C) 2017 Moez Bhatti <moez.bhatti@gmail.com>
- *
- * This file is part of QKSMS.
- *
- * QKSMS is free software: you can redistribute it and/or modify
- * it under the terms of the GNU General Public License as published by
- * the Free Software Foundation, either version 3 of the License, or
- * (at your option) any later version.
- *
- * QKSMS is distributed in the hope that it will be useful,
- * but WITHOUT ANY WARRANTY; without even the implied warranty of
- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
- * GNU General Public License for more details.
- *
- * You should have received a copy of the GNU General Public License
- * along with QKSMS.  If not, see <http://www.gnu.org/licenses/>.
- */
-package com.moez.QKSMS.feature.main
-
-import android.content.Intent
-import com.moez.QKSMS.common.base.QkView
-import com.moez.QKSMS.manager.ChangelogManager
-import io.reactivex.Observable
-
-interface MainView : QkView<MainState> {
-
-    val onNewIntentIntent: Observable<Intent>
-    val activityResumedIntent: Observable<Boolean>
-    val queryChangedIntent: Observable<CharSequence>
-    val composeIntent: Observable<Unit>
-    val drawerOpenIntent: Observable<Boolean>
-    val homeIntent: Observable<*>
-    val navigationIntent: Observable<NavItem>
-    val optionsItemIntent: Observable<Int>
-    val plusBannerIntent: Observable<*>
-    val dismissRatingIntent: Observable<*>
-    val rateIntent: Observable<*>
-    val conversationsSelectedIntent: Observable<List<Long>>
-    val confirmDeleteIntent: Observable<List<Long>>
-    val swipeConversationIntent: Observable<Pair<Long, Int>>
-    val changelogMoreIntent: Observable<*>
-    val undoArchiveIntent: Observable<Unit>
-    val snackbarButtonIntent: Observable<Unit>
-
-    fun requestDefaultSms()
-    fun requestPermissions()
-    fun clearSearch()
-    fun clearSelection()
-    fun themeChanged()
-    fun showBlockingDialog(conversations: List<Long>, block: Boolean)
-    fun showDeleteDialog(conversations: List<Long>)
-    fun showChangelog(changelog: ChangelogManager.CumulativeChangelog)
-    fun showArchivedSnackbar()
-
-}
-
-enum class NavItem { BACK, INBOX, ARCHIVED, BACKUP, SCHEDULED, BLOCKING, SETTINGS, PLUS, HELP, INVITE }
+/*
+ * Copyright (C) 2017 Moez Bhatti <moez.bhatti@gmail.com>
+ *
+ * This file is part of QKSMS.
+ *
+ * QKSMS is free software: you can redistribute it and/or modify
+ * it under the terms of the GNU General Public License as published by
+ * the Free Software Foundation, either version 3 of the License, or
+ * (at your option) any later version.
+ *
+ * QKSMS is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+ * GNU General Public License for more details.
+ *
+ * You should have received a copy of the GNU General Public License
+ * along with QKSMS.  If not, see <http://www.gnu.org/licenses/>.
+ */
+package com.moez.QKSMS.feature.main
+
+import android.content.Intent
+import com.moez.QKSMS.common.base.QkView
+import com.moez.QKSMS.manager.ChangelogManager
+import io.reactivex.Observable
+
+interface MainView : QkView<MainState> {
+
+    val onNewIntentIntent: Observable<Intent>
+    val activityResumedIntent: Observable<Boolean>
+    val queryChangedIntent: Observable<CharSequence>
+    val composeIntent: Observable<Unit>
+    val drawerOpenIntent: Observable<Boolean>
+    val homeIntent: Observable<*>
+    val navigationIntent: Observable<NavItem>
+    val optionsItemIntent: Observable<Int>
+    val plusBannerIntent: Observable<*>
+    val dismissRatingIntent: Observable<*>
+    val rateIntent: Observable<*>
+    val conversationsSelectedIntent: Observable<List<Long>>
+    val confirmDeleteIntent: Observable<List<Long>>
+    val swipeConversationIntent: Observable<Pair<Long, Int>>
+    val changelogMoreIntent: Observable<*>
+    val undoArchiveIntent: Observable<Unit>
+    val snackbarButtonIntent: Observable<Unit>
+
+    fun requestDefaultSms()
+    fun requestPermissions()
+    fun clearSearch()
+    fun clearSelection()
+    fun themeChanged()
+    fun showBlockingDialog(conversations: List<Long>, block: Boolean)
+    fun showDeleteDialog(conversations: List<Long>)
+    fun showChangelog(changelog: ChangelogManager.CumulativeChangelog)
+    fun showArchivedSnackbar()
+
+}
+
+enum class NavItem { BACK, INBOX, ARCHIVED, BACKUP, SCHEDULED, BLOCKING, SETTINGS, PLUS, HELP, INVITE }
diff --git a/presentation/src/main/java/com/moez/QKSMS/feature/main/MainViewModel.kt b/presentation/src/main/java/com/moez/QKSMS/feature/main/MainViewModel.kt
index e4fec32bd..39af8ca3c 100644
--- a/presentation/src/main/java/com/moez/QKSMS/feature/main/MainViewModel.kt
+++ b/presentation/src/main/java/com/moez/QKSMS/feature/main/MainViewModel.kt
@@ -1,455 +1,455 @@
-/*
- * Copyright (C) 2017 Moez Bhatti <moez.bhatti@gmail.com>
- *
- * This file is part of QKSMS.
- *
- * QKSMS is free software: you can redistribute it and/or modify
- * it under the terms of the GNU General Public License as published by
- * the Free Software Foundation, either version 3 of the License, or
- * (at your option) any later version.
- *
- * QKSMS is distributed in the hope that it will be useful,
- * but WITHOUT ANY WARRANTY; without even the implied warranty of
- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
- * GNU General Public License for more details.
- *
- * You should have received a copy of the GNU General Public License
- * along with QKSMS.  If not, see <http://www.gnu.org/licenses/>.
- */
-package com.moez.QKSMS.feature.main
-
-import androidx.recyclerview.widget.ItemTouchHelper
-import com.moez.QKSMS.R
-import com.moez.QKSMS.common.Navigator
-import com.moez.QKSMS.common.base.QkViewModel
-import com.moez.QKSMS.extensions.mapNotNull
-import com.moez.QKSMS.interactor.DeleteConversations
-import com.moez.QKSMS.interactor.MarkAllSeen
-import com.moez.QKSMS.interactor.MarkArchived
-import com.moez.QKSMS.interactor.MarkPinned
-import com.moez.QKSMS.interactor.MarkRead
-import com.moez.QKSMS.interactor.MarkUnarchived
-import com.moez.QKSMS.interactor.MarkUnpinned
-import com.moez.QKSMS.interactor.MarkUnread
-import com.moez.QKSMS.interactor.MigratePreferences
-import com.moez.QKSMS.interactor.SyncContacts
-import com.moez.QKSMS.interactor.SyncMessages
-import com.moez.QKSMS.listener.ContactAddedListener
-import com.moez.QKSMS.manager.BillingManager
-import com.moez.QKSMS.manager.ChangelogManager
-import com.moez.QKSMS.manager.PermissionManager
-import com.moez.QKSMS.manager.RatingManager
-import com.moez.QKSMS.model.SyncLog
-import com.moez.QKSMS.repository.ConversationRepository
-import com.moez.QKSMS.repository.SyncRepository
-import com.moez.QKSMS.util.Preferences
-import com.uber.autodispose.android.lifecycle.scope
-import com.uber.autodispose.autoDisposable
-import io.reactivex.android.schedulers.AndroidSchedulers
-import io.reactivex.rxkotlin.plusAssign
-import io.reactivex.rxkotlin.withLatestFrom
-import io.reactivex.schedulers.Schedulers
-import io.realm.Realm
-import kotlinx.coroutines.Dispatchers
-import kotlinx.coroutines.GlobalScope
-import kotlinx.coroutines.launch
-import java.util.*
-import java.util.concurrent.TimeUnit
-import javax.inject.Inject
-
-class MainViewModel @Inject constructor(
-    billingManager: BillingManager,
-    contactAddedListener: ContactAddedListener,
-    markAllSeen: MarkAllSeen,
-    migratePreferences: MigratePreferences,
-    syncRepository: SyncRepository,
-    private val changelogManager: ChangelogManager,
-    private val conversationRepo: ConversationRepository,
-    private val deleteConversations: DeleteConversations,
-    private val markArchived: MarkArchived,
-    private val markPinned: MarkPinned,
-    private val markRead: MarkRead,
-    private val markUnarchived: MarkUnarchived,
-    private val markUnpinned: MarkUnpinned,
-    private val markUnread: MarkUnread,
-    private val navigator: Navigator,
-    private val permissionManager: PermissionManager,
-    private val prefs: Preferences,
-    private val ratingManager: RatingManager,
-    private val syncContacts: SyncContacts,
-    private val syncMessages: SyncMessages
-) : QkViewModel<MainView, MainState>(MainState(page = Inbox(data = conversationRepo.getConversations()))) {
-
-    init {
-        disposables += deleteConversations
-        disposables += markAllSeen
-        disposables += markArchived
-        disposables += markUnarchived
-        disposables += migratePreferences
-        disposables += syncContacts
-        disposables += syncMessages
-
-        // Show the syncing UI
-        disposables += syncRepository.syncProgress
-                .sample(16, TimeUnit.MILLISECONDS)
-                .distinctUntilChanged()
-                .subscribe { syncing -> newState { copy(syncing = syncing) } }
-
-        // Update the upgraded status
-        disposables += billingManager.upgradeStatus
-                .subscribe { upgraded -> newState { copy(upgraded = upgraded) } }
-
-        // Show the rating UI
-        disposables += ratingManager.shouldShowRating
-                .subscribe { show -> newState { copy(showRating = show) } }
-
-
-        // Migrate the preferences from 2.7.3
-        migratePreferences.execute(Unit)
-
-
-        // If we have all permissions and we've never run a sync, run a sync. This will be the case
-        // when upgrading from 2.7.3, or if the app's data was cleared
-        val lastSync = Realm.getDefaultInstance().use { realm -> realm.where(SyncLog::class.java)?.max("date") ?: 0 }
-        if (lastSync == 0 && permissionManager.isDefaultSms() && permissionManager.hasReadSms() && permissionManager.hasContacts()) {
-            syncMessages.execute(Unit)
-        }
-
-        // Sync contacts when we detect a change
-        if (permissionManager.hasContacts()) {
-            disposables += contactAddedListener.listen()
-                    .debounce(1, TimeUnit.SECONDS)
-                    .subscribeOn(Schedulers.io())
-                    .subscribe { syncContacts.execute(Unit) }
-        }
-
-        ratingManager.addSession()
-        markAllSeen.execute(Unit)
-    }
-
-    override fun bindView(view: MainView) {
-        super.bindView(view)
-
-        when {
-            !permissionManager.isDefaultSms() -> view.requestDefaultSms()
-            !permissionManager.hasReadSms() || !permissionManager.hasContacts() -> view.requestPermissions()
-        }
-
-        val permissions = view.activityResumedIntent
-                .filter { resumed -> resumed }
-                .observeOn(Schedulers.io())
-                .map { Triple(permissionManager.isDefaultSms(), permissionManager.hasReadSms(), permissionManager.hasContacts()) }
-                .distinctUntilChanged()
-                .share()
-
-        // If the default SMS state or permission states change, update the ViewState
-        permissions
-                .doOnNext { (defaultSms, smsPermission, contactPermission) ->
-                    newState { copy(defaultSms = defaultSms, smsPermission = smsPermission, contactPermission = contactPermission) }
-                }
-                .autoDisposable(view.scope())
-                .subscribe()
-
-        // If we go from not having all permissions to having them, sync messages
-        permissions
-                .skip(1)
-                .filter { it.first && it.second && it.third }
-                .take(1)
-                .autoDisposable(view.scope())
-                .subscribe { syncMessages.execute(Unit) }
-
-        // Launch screen from intent
-        view.onNewIntentIntent
-                .autoDisposable(view.scope())
-                .subscribe { intent ->
-                    when (intent.getStringExtra("screen")) {
-                        "compose" -> navigator.showConversation(intent.getLongExtra("threadId", 0))
-                        "blocking" -> navigator.showBlockedConversations()
-                    }
-                }
-
-        // Show changelog
-        if (changelogManager.didUpdate()) {
-            if (Locale.getDefault().language.startsWith("en")) {
-                GlobalScope.launch(Dispatchers.Main) {
-                    val changelog = changelogManager.getChangelog()
-                    changelogManager.markChangelogSeen()
-                    view.showChangelog(changelog)
-                }
-            } else {
-                changelogManager.markChangelogSeen()
-            }
-        } else {
-            changelogManager.markChangelogSeen()
-        }
-
-        view.changelogMoreIntent
-                .autoDisposable(view.scope())
-                .subscribe { navigator.showChangelog() }
-
-        view.queryChangedIntent
-                .debounce(200, TimeUnit.MILLISECONDS)
-                .observeOn(AndroidSchedulers.mainThread())
-                .withLatestFrom(state) { query, state ->
-                    if (query.isEmpty() && state.page is Searching) {
-                        newState { copy(page = Inbox(data = conversationRepo.getConversations())) }
-                    }
-                    query
-                }
-                .filter { query -> query.length >= 2 }
-                .map { query -> query.trim() }
-                .distinctUntilChanged()
-                .doOnNext {
-                    newState {
-                        val page = (page as? Searching) ?: Searching()
-                        copy(page = page.copy(loading = true))
-                    }
-                }
-                .observeOn(Schedulers.io())
-                .map(conversationRepo::searchConversations)
-                .autoDisposable(view.scope())
-                .subscribe { data -> newState { copy(page = Searching(loading = false, data = data)) } }
-
-        view.activityResumedIntent
-                .filter { resumed -> !resumed }
-                .switchMap {
-                    // Take until the activity is resumed
-                    prefs.keyChanges
-                            .filter { key -> key.contains("theme") }
-                            .map { true }
-                            .mergeWith(prefs.autoColor.asObservable().skip(1))
-                            .doOnNext { view.themeChanged() }
-                            .takeUntil(view.activityResumedIntent.filter { resumed -> resumed })
-                }
-                .autoDisposable(view.scope())
-                .subscribe()
-
-        view.composeIntent
-                .autoDisposable(view.scope())
-                .subscribe { navigator.showCompose() }
-
-        view.homeIntent
-                .withLatestFrom(state) { _, state ->
-                    when {
-                        state.page is Searching -> view.clearSearch()
-                        state.page is Inbox && state.page.selected > 0 -> view.clearSelection()
-                        state.page is Archived && state.page.selected > 0 -> view.clearSelection()
-
-                        else -> newState { copy(drawerOpen = true) }
-                    }
-                }
-                .autoDisposable(view.scope())
-                .subscribe()
-
-        view.drawerOpenIntent
-                .autoDisposable(view.scope())
-                .subscribe { open -> newState { copy(drawerOpen = open) } }
-
-        view.navigationIntent
-                .withLatestFrom(state) { drawerItem, state ->
-                    newState { copy(drawerOpen = false) }
-                    when (drawerItem) {
-                        NavItem.BACK -> when {
-                            state.drawerOpen -> Unit
-                            state.page is Searching -> view.clearSearch()
-                            state.page is Inbox && state.page.selected > 0 -> view.clearSelection()
-                            state.page is Archived && state.page.selected > 0 -> view.clearSelection()
-                            state.page !is Inbox -> {
-                                newState { copy(page = Inbox(data = conversationRepo.getConversations())) }
-                            }
-                            else -> newState { copy(hasError = true) }
-                        }
-                        NavItem.BACKUP -> navigator.showBackup()
-                        NavItem.SCHEDULED -> navigator.showScheduled()
-                        NavItem.BLOCKING -> navigator.showBlockedConversations()
-                        NavItem.SETTINGS -> navigator.showSettings()
-                        NavItem.PLUS -> navigator.showQksmsPlusActivity("main_menu")
-                        NavItem.HELP -> navigator.showSupport()
-                        NavItem.INVITE -> navigator.showInvite()
-                        else -> Unit
-                    }
-                    drawerItem
-                }
-                .distinctUntilChanged()
-                .doOnNext { drawerItem ->
-                    when (drawerItem) {
-                        NavItem.INBOX -> newState { copy(page = Inbox(data = conversationRepo.getConversations())) }
-                        NavItem.ARCHIVED -> newState { copy(page = Archived(data = conversationRepo.getConversations(true))) }
-                        else -> Unit
-                    }
-                }
-                .autoDisposable(view.scope())
-                .subscribe()
-
-        view.optionsItemIntent
-                .filter { itemId -> itemId == R.id.archive }
-                .withLatestFrom(view.conversationsSelectedIntent) { _, conversations ->
-                    markArchived.execute(conversations)
-                    view.clearSelection()
-                }
-                .autoDisposable(view.scope())
-                .subscribe()
-
-        view.optionsItemIntent
-                .filter { itemId -> itemId == R.id.unarchive }
-                .withLatestFrom(view.conversationsSelectedIntent) { _, conversations ->
-                    markUnarchived.execute(conversations)
-                    view.clearSelection()
-                }
-                .autoDisposable(view.scope())
-                .subscribe()
-
-        view.optionsItemIntent
-                .filter { itemId -> itemId == R.id.delete }
-                .filter { permissionManager.isDefaultSms().also { if (!it) view.requestDefaultSms() } }
-                .withLatestFrom(view.conversationsSelectedIntent) { _, conversations ->
-                    view.showDeleteDialog(conversations)
-                }
-                .autoDisposable(view.scope())
-                .subscribe()
-
-        view.optionsItemIntent
-                .filter { itemId -> itemId == R.id.add }
-                .withLatestFrom(view.conversationsSelectedIntent) { _, conversations -> conversations }
-                .doOnNext { view.clearSelection() }
-                .filter { conversations -> conversations.size == 1 }
-                .map { conversations -> conversations.first() }
-                .mapNotNull(conversationRepo::getConversation)
-                .map { conversation -> conversation.recipients }
-                .mapNotNull { recipients -> recipients[0]?.address?.takeIf { recipients.size == 1 } }
-                .doOnNext(navigator::addContact)
-                .autoDisposable(view.scope())
-                .subscribe()
-
-        view.optionsItemIntent
-                .filter { itemId -> itemId == R.id.pin }
-                .withLatestFrom(view.conversationsSelectedIntent) { _, conversations ->
-                    markPinned.execute(conversations)
-                    view.clearSelection()
-                }
-                .autoDisposable(view.scope())
-                .subscribe()
-
-        view.optionsItemIntent
-                .filter { itemId -> itemId == R.id.unpin }
-                .withLatestFrom(view.conversationsSelectedIntent) { _, conversations ->
-                    markUnpinned.execute(conversations)
-                    view.clearSelection()
-                }
-                .autoDisposable(view.scope())
-                .subscribe()
-
-        view.optionsItemIntent
-                .filter { itemId -> itemId == R.id.read }
-                .filter { permissionManager.isDefaultSms().also { if (!it) view.requestDefaultSms() } }
-                .withLatestFrom(view.conversationsSelectedIntent) { _, conversations ->
-                    markRead.execute(conversations)
-                    view.clearSelection()
-                }
-                .autoDisposable(view.scope())
-                .subscribe()
-
-        view.optionsItemIntent
-                .filter { itemId -> itemId == R.id.unread }
-                .filter { permissionManager.isDefaultSms().also { if (!it) view.requestDefaultSms() } }
-                .withLatestFrom(view.conversationsSelectedIntent) { _, conversations ->
-                    markUnread.execute(conversations)
-                    view.clearSelection()
-                }
-                .autoDisposable(view.scope())
-                .subscribe()
-
-        view.optionsItemIntent
-                .filter { itemId -> itemId == R.id.block }
-                .withLatestFrom(view.conversationsSelectedIntent) { _, conversations ->
-                    view.showBlockingDialog(conversations, true)
-                    view.clearSelection()
-                }
-                .autoDisposable(view.scope())
-                .subscribe()
-
-        view.plusBannerIntent
-                .autoDisposable(view.scope())
-                .subscribe {
-                    newState { copy(drawerOpen = false) }
-                    navigator.showQksmsPlusActivity("main_banner")
-                }
-
-        view.rateIntent
-                .autoDisposable(view.scope())
-                .subscribe {
-                    navigator.showRating()
-                    ratingManager.rate()
-                }
-
-        view.dismissRatingIntent
-                .autoDisposable(view.scope())
-                .subscribe { ratingManager.dismiss() }
-
-        view.conversationsSelectedIntent
-                .withLatestFrom(state) { selection, state ->
-                    val conversations = selection.mapNotNull(conversationRepo::getConversation)
-                    val add = conversations.firstOrNull()
-                            ?.takeIf { conversations.size == 1 }
-                            ?.takeIf { conversation -> conversation.recipients.size == 1 }
-                            ?.recipients?.first()
-                            ?.takeIf { recipient -> recipient.contact == null } != null
-                    val pin = conversations.sumBy { if (it.pinned) -1 else 1 } >= 0
-                    val read = conversations.sumBy { if (!it.unread) -1 else 1 } >= 0
-                    val selected = selection.size
-
-                    when (state.page) {
-                        is Inbox -> {
-                            val page = state.page.copy(addContact = add, markPinned = pin, markRead = read, selected = selected)
-                            newState { copy(page = page) }
-                        }
-
-                        is Archived -> {
-                            val page = state.page.copy(addContact = add, markPinned = pin, markRead = read, selected = selected)
-                            newState { copy(page = page) }
-                        }
-                    }
-                }
-                .autoDisposable(view.scope())
-                .subscribe()
-
-        // Delete the conversation
-        view.confirmDeleteIntent
-                .autoDisposable(view.scope())
-                .subscribe { conversations ->
-                    deleteConversations.execute(conversations)
-                    view.clearSelection()
-                }
-
-        view.swipeConversationIntent
-                .autoDisposable(view.scope())
-                .subscribe { (threadId, direction) ->
-                    val action = if (direction == ItemTouchHelper.RIGHT) prefs.swipeRight.get() else prefs.swipeLeft.get()
-                    when (action) {
-                        Preferences.SWIPE_ACTION_ARCHIVE -> markArchived.execute(listOf(threadId)) { view.showArchivedSnackbar() }
-                        Preferences.SWIPE_ACTION_DELETE -> view.showDeleteDialog(listOf(threadId))
-                        Preferences.SWIPE_ACTION_BLOCK -> view.showBlockingDialog(listOf(threadId), true)
-                        Preferences.SWIPE_ACTION_CALL -> conversationRepo.getConversation(threadId)?.recipients?.firstOrNull()?.address?.let(navigator::makePhoneCall)
-                        Preferences.SWIPE_ACTION_READ -> markRead.execute(listOf(threadId))
-                        Preferences.SWIPE_ACTION_UNREAD -> markUnread.execute(listOf(threadId))
-                    }
-                }
-
-        view.undoArchiveIntent
-                .withLatestFrom(view.swipeConversationIntent) { _, pair -> pair.first }
-                .autoDisposable(view.scope())
-                .subscribe { threadId -> markUnarchived.execute(listOf(threadId)) }
-
-        view.snackbarButtonIntent
-                .withLatestFrom(state) { _, state ->
-                    when {
-                        !state.defaultSms -> view.requestDefaultSms()
-                        !state.smsPermission -> view.requestPermissions()
-                        !state.contactPermission -> view.requestPermissions()
-                    }
-                }
-                .autoDisposable(view.scope())
-                .subscribe()
-    }
-
+/*
+ * Copyright (C) 2017 Moez Bhatti <moez.bhatti@gmail.com>
+ *
+ * This file is part of QKSMS.
+ *
+ * QKSMS is free software: you can redistribute it and/or modify
+ * it under the terms of the GNU General Public License as published by
+ * the Free Software Foundation, either version 3 of the License, or
+ * (at your option) any later version.
+ *
+ * QKSMS is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+ * GNU General Public License for more details.
+ *
+ * You should have received a copy of the GNU General Public License
+ * along with QKSMS.  If not, see <http://www.gnu.org/licenses/>.
+ */
+package com.moez.QKSMS.feature.main
+
+import androidx.recyclerview.widget.ItemTouchHelper
+import com.moez.QKSMS.R
+import com.moez.QKSMS.common.Navigator
+import com.moez.QKSMS.common.base.QkViewModel
+import com.moez.QKSMS.extensions.mapNotNull
+import com.moez.QKSMS.interactor.DeleteConversations
+import com.moez.QKSMS.interactor.MarkAllSeen
+import com.moez.QKSMS.interactor.MarkArchived
+import com.moez.QKSMS.interactor.MarkPinned
+import com.moez.QKSMS.interactor.MarkRead
+import com.moez.QKSMS.interactor.MarkUnarchived
+import com.moez.QKSMS.interactor.MarkUnpinned
+import com.moez.QKSMS.interactor.MarkUnread
+import com.moez.QKSMS.interactor.MigratePreferences
+import com.moez.QKSMS.interactor.SyncContacts
+import com.moez.QKSMS.interactor.SyncMessages
+import com.moez.QKSMS.listener.ContactAddedListener
+import com.moez.QKSMS.manager.BillingManager
+import com.moez.QKSMS.manager.ChangelogManager
+import com.moez.QKSMS.manager.PermissionManager
+import com.moez.QKSMS.manager.RatingManager
+import com.moez.QKSMS.model.SyncLog
+import com.moez.QKSMS.repository.ConversationRepository
+import com.moez.QKSMS.repository.SyncRepository
+import com.moez.QKSMS.util.Preferences
+import com.uber.autodispose.android.lifecycle.scope
+import com.uber.autodispose.autoDisposable
+import io.reactivex.android.schedulers.AndroidSchedulers
+import io.reactivex.rxkotlin.plusAssign
+import io.reactivex.rxkotlin.withLatestFrom
+import io.reactivex.schedulers.Schedulers
+import io.realm.Realm
+import kotlinx.coroutines.Dispatchers
+import kotlinx.coroutines.GlobalScope
+import kotlinx.coroutines.launch
+import java.util.*
+import java.util.concurrent.TimeUnit
+import javax.inject.Inject
+
+class MainViewModel @Inject constructor(
+    billingManager: BillingManager,
+    contactAddedListener: ContactAddedListener,
+    markAllSeen: MarkAllSeen,
+    migratePreferences: MigratePreferences,
+    syncRepository: SyncRepository,
+    private val changelogManager: ChangelogManager,
+    private val conversationRepo: ConversationRepository,
+    private val deleteConversations: DeleteConversations,
+    private val markArchived: MarkArchived,
+    private val markPinned: MarkPinned,
+    private val markRead: MarkRead,
+    private val markUnarchived: MarkUnarchived,
+    private val markUnpinned: MarkUnpinned,
+    private val markUnread: MarkUnread,
+    private val navigator: Navigator,
+    private val permissionManager: PermissionManager,
+    private val prefs: Preferences,
+    private val ratingManager: RatingManager,
+    private val syncContacts: SyncContacts,
+    private val syncMessages: SyncMessages
+) : QkViewModel<MainView, MainState>(MainState(page = Inbox(data = conversationRepo.getConversations()))) {
+
+    init {
+        disposables += deleteConversations
+        disposables += markAllSeen
+        disposables += markArchived
+        disposables += markUnarchived
+        disposables += migratePreferences
+        disposables += syncContacts
+        disposables += syncMessages
+
+        // Show the syncing UI
+        disposables += syncRepository.syncProgress
+                .sample(16, TimeUnit.MILLISECONDS)
+                .distinctUntilChanged()
+                .subscribe { syncing -> newState { copy(syncing = syncing) } }
+
+        // Update the upgraded status
+        disposables += billingManager.upgradeStatus
+                .subscribe { upgraded -> newState { copy(upgraded = upgraded) } }
+
+        // Show the rating UI
+        disposables += ratingManager.shouldShowRating
+                .subscribe { show -> newState { copy(showRating = show) } }
+
+
+        // Migrate the preferences from 2.7.3
+        migratePreferences.execute(Unit)
+
+
+        // If we have all permissions and we've never run a sync, run a sync. This will be the case
+        // when upgrading from 2.7.3, or if the app's data was cleared
+        val lastSync = Realm.getDefaultInstance().use { realm -> realm.where(SyncLog::class.java)?.max("date") ?: 0 }
+        if (lastSync == 0 && permissionManager.isDefaultSms() && permissionManager.hasReadSms() && permissionManager.hasContacts()) {
+            syncMessages.execute(Unit)
+        }
+
+        // Sync contacts when we detect a change
+        if (permissionManager.hasContacts()) {
+            disposables += contactAddedListener.listen()
+                    .debounce(1, TimeUnit.SECONDS)
+                    .subscribeOn(Schedulers.io())
+                    .subscribe { syncContacts.execute(Unit) }
+        }
+
+        ratingManager.addSession()
+        markAllSeen.execute(Unit)
+    }
+
+    override fun bindView(view: MainView) {
+        super.bindView(view)
+
+        when {
+            !permissionManager.isDefaultSms() -> view.requestDefaultSms()
+            !permissionManager.hasReadSms() || !permissionManager.hasContacts() -> view.requestPermissions()
+        }
+
+        val permissions = view.activityResumedIntent
+                .filter { resumed -> resumed }
+                .observeOn(Schedulers.io())
+                .map { Triple(permissionManager.isDefaultSms(), permissionManager.hasReadSms(), permissionManager.hasContacts()) }
+                .distinctUntilChanged()
+                .share()
+
+        // If the default SMS state or permission states change, update the ViewState
+        permissions
+                .doOnNext { (defaultSms, smsPermission, contactPermission) ->
+                    newState { copy(defaultSms = defaultSms, smsPermission = smsPermission, contactPermission = contactPermission) }
+                }
+                .autoDisposable(view.scope())
+                .subscribe()
+
+        // If we go from not having all permissions to having them, sync messages
+        permissions
+                .skip(1)
+                .filter { it.first && it.second && it.third }
+                .take(1)
+                .autoDisposable(view.scope())
+                .subscribe { syncMessages.execute(Unit) }
+
+        // Launch screen from intent
+        view.onNewIntentIntent
+                .autoDisposable(view.scope())
+                .subscribe { intent ->
+                    when (intent.getStringExtra("screen")) {
+                        "compose" -> navigator.showConversation(intent.getLongExtra("threadId", 0))
+                        "blocking" -> navigator.showBlockedConversations()
+                    }
+                }
+
+        // Show changelog
+        if (changelogManager.didUpdate()) {
+            if (Locale.getDefault().language.startsWith("en")) {
+                GlobalScope.launch(Dispatchers.Main) {
+                    val changelog = changelogManager.getChangelog()
+                    changelogManager.markChangelogSeen()
+                    view.showChangelog(changelog)
+                }
+            } else {
+                changelogManager.markChangelogSeen()
+            }
+        } else {
+            changelogManager.markChangelogSeen()
+        }
+
+        view.changelogMoreIntent
+                .autoDisposable(view.scope())
+                .subscribe { navigator.showChangelog() }
+
+        view.queryChangedIntent
+                .debounce(200, TimeUnit.MILLISECONDS)
+                .observeOn(AndroidSchedulers.mainThread())
+                .withLatestFrom(state) { query, state ->
+                    if (query.isEmpty() && state.page is Searching) {
+                        newState { copy(page = Inbox(data = conversationRepo.getConversations())) }
+                    }
+                    query
+                }
+                .filter { query -> query.length >= 2 }
+                .map { query -> query.trim() }
+                .distinctUntilChanged()
+                .doOnNext {
+                    newState {
+                        val page = (page as? Searching) ?: Searching()
+                        copy(page = page.copy(loading = true))
+                    }
+                }
+                .observeOn(Schedulers.io())
+                .map(conversationRepo::searchConversations)
+                .autoDisposable(view.scope())
+                .subscribe { data -> newState { copy(page = Searching(loading = false, data = data)) } }
+
+        view.activityResumedIntent
+                .filter { resumed -> !resumed }
+                .switchMap {
+                    // Take until the activity is resumed
+                    prefs.keyChanges
+                            .filter { key -> key.contains("theme") }
+                            .map { true }
+                            .mergeWith(prefs.autoColor.asObservable().skip(1))
+                            .doOnNext { view.themeChanged() }
+                            .takeUntil(view.activityResumedIntent.filter { resumed -> resumed })
+                }
+                .autoDisposable(view.scope())
+                .subscribe()
+
+        view.composeIntent
+                .autoDisposable(view.scope())
+                .subscribe { navigator.showCompose() }
+
+        view.homeIntent
+                .withLatestFrom(state) { _, state ->
+                    when {
+                        state.page is Searching -> view.clearSearch()
+                        state.page is Inbox && state.page.selected > 0 -> view.clearSelection()
+                        state.page is Archived && state.page.selected > 0 -> view.clearSelection()
+
+                        else -> newState { copy(drawerOpen = true) }
+                    }
+                }
+                .autoDisposable(view.scope())
+                .subscribe()
+
+        view.drawerOpenIntent
+                .autoDisposable(view.scope())
+                .subscribe { open -> newState { copy(drawerOpen = open) } }
+
+        view.navigationIntent
+                .withLatestFrom(state) { drawerItem, state ->
+                    newState { copy(drawerOpen = false) }
+                    when (drawerItem) {
+                        NavItem.BACK -> when {
+                            state.drawerOpen -> Unit
+                            state.page is Searching -> view.clearSearch()
+                            state.page is Inbox && state.page.selected > 0 -> view.clearSelection()
+                            state.page is Archived && state.page.selected > 0 -> view.clearSelection()
+                            state.page !is Inbox -> {
+                                newState { copy(page = Inbox(data = conversationRepo.getConversations())) }
+                            }
+                            else -> newState { copy(hasError = true) }
+                        }
+                        NavItem.BACKUP -> navigator.showBackup()
+                        NavItem.SCHEDULED -> navigator.showScheduled()
+                        NavItem.BLOCKING -> navigator.showBlockedConversations()
+                        NavItem.SETTINGS -> navigator.showSettings()
+                        NavItem.PLUS -> navigator.showQksmsPlusActivity("main_menu")
+                        NavItem.HELP -> navigator.showSupport()
+                        NavItem.INVITE -> navigator.showInvite()
+                        else -> Unit
+                    }
+                    drawerItem
+                }
+                .distinctUntilChanged()
+                .doOnNext { drawerItem ->
+                    when (drawerItem) {
+                        NavItem.INBOX -> newState { copy(page = Inbox(data = conversationRepo.getConversations())) }
+                        NavItem.ARCHIVED -> newState { copy(page = Archived(data = conversationRepo.getConversations(true))) }
+                        else -> Unit
+                    }
+                }
+                .autoDisposable(view.scope())
+                .subscribe()
+
+        view.optionsItemIntent
+                .filter { itemId -> itemId == R.id.archive }
+                .withLatestFrom(view.conversationsSelectedIntent) { _, conversations ->
+                    markArchived.execute(conversations)
+                    view.clearSelection()
+                }
+                .autoDisposable(view.scope())
+                .subscribe()
+
+        view.optionsItemIntent
+                .filter { itemId -> itemId == R.id.unarchive }
+                .withLatestFrom(view.conversationsSelectedIntent) { _, conversations ->
+                    markUnarchived.execute(conversations)
+                    view.clearSelection()
+                }
+                .autoDisposable(view.scope())
+                .subscribe()
+
+        view.optionsItemIntent
+                .filter { itemId -> itemId == R.id.delete }
+                .filter { permissionManager.isDefaultSms().also { if (!it) view.requestDefaultSms() } }
+                .withLatestFrom(view.conversationsSelectedIntent) { _, conversations ->
+                    view.showDeleteDialog(conversations)
+                }
+                .autoDisposable(view.scope())
+                .subscribe()
+
+        view.optionsItemIntent
+                .filter { itemId -> itemId == R.id.add }
+                .withLatestFrom(view.conversationsSelectedIntent) { _, conversations -> conversations }
+                .doOnNext { view.clearSelection() }
+                .filter { conversations -> conversations.size == 1 }
+                .map { conversations -> conversations.first() }
+                .mapNotNull(conversationRepo::getConversation)
+                .map { conversation -> conversation.recipients }
+                .mapNotNull { recipients -> recipients[0]?.address?.takeIf { recipients.size == 1 } }
+                .doOnNext(navigator::addContact)
+                .autoDisposable(view.scope())
+                .subscribe()
+
+        view.optionsItemIntent
+                .filter { itemId -> itemId == R.id.pin }
+                .withLatestFrom(view.conversationsSelectedIntent) { _, conversations ->
+                    markPinned.execute(conversations)
+                    view.clearSelection()
+                }
+                .autoDisposable(view.scope())
+                .subscribe()
+
+        view.optionsItemIntent
+                .filter { itemId -> itemId == R.id.unpin }
+                .withLatestFrom(view.conversationsSelectedIntent) { _, conversations ->
+                    markUnpinned.execute(conversations)
+                    view.clearSelection()
+                }
+                .autoDisposable(view.scope())
+                .subscribe()
+
+        view.optionsItemIntent
+                .filter { itemId -> itemId == R.id.read }
+                .filter { permissionManager.isDefaultSms().also { if (!it) view.requestDefaultSms() } }
+                .withLatestFrom(view.conversationsSelectedIntent) { _, conversations ->
+                    markRead.execute(conversations)
+                    view.clearSelection()
+                }
+                .autoDisposable(view.scope())
+                .subscribe()
+
+        view.optionsItemIntent
+                .filter { itemId -> itemId == R.id.unread }
+                .filter { permissionManager.isDefaultSms().also { if (!it) view.requestDefaultSms() } }
+                .withLatestFrom(view.conversationsSelectedIntent) { _, conversations ->
+                    markUnread.execute(conversations)
+                    view.clearSelection()
+                }
+                .autoDisposable(view.scope())
+                .subscribe()
+
+        view.optionsItemIntent
+                .filter { itemId -> itemId == R.id.block }
+                .withLatestFrom(view.conversationsSelectedIntent) { _, conversations ->
+                    view.showBlockingDialog(conversations, true)
+                    view.clearSelection()
+                }
+                .autoDisposable(view.scope())
+                .subscribe()
+
+        view.plusBannerIntent
+                .autoDisposable(view.scope())
+                .subscribe {
+                    newState { copy(drawerOpen = false) }
+                    navigator.showQksmsPlusActivity("main_banner")
+                }
+
+        view.rateIntent
+                .autoDisposable(view.scope())
+                .subscribe {
+                    navigator.showRating()
+                    ratingManager.rate()
+                }
+
+        view.dismissRatingIntent
+                .autoDisposable(view.scope())
+                .subscribe { ratingManager.dismiss() }
+
+        view.conversationsSelectedIntent
+                .withLatestFrom(state) { selection, state ->
+                    val conversations = selection.mapNotNull(conversationRepo::getConversation)
+                    val add = conversations.firstOrNull()
+                            ?.takeIf { conversations.size == 1 }
+                            ?.takeIf { conversation -> conversation.recipients.size == 1 }
+                            ?.recipients?.first()
+                            ?.takeIf { recipient -> recipient.contact == null } != null
+                    val pin = conversations.sumBy { if (it.pinned) -1 else 1 } >= 0
+                    val read = conversations.sumBy { if (!it.unread) -1 else 1 } >= 0
+                    val selected = selection.size
+
+                    when (state.page) {
+                        is Inbox -> {
+                            val page = state.page.copy(addContact = add, markPinned = pin, markRead = read, selected = selected)
+                            newState { copy(page = page) }
+                        }
+
+                        is Archived -> {
+                            val page = state.page.copy(addContact = add, markPinned = pin, markRead = read, selected = selected)
+                            newState { copy(page = page) }
+                        }
+                    }
+                }
+                .autoDisposable(view.scope())
+                .subscribe()
+
+        // Delete the conversation
+        view.confirmDeleteIntent
+                .autoDisposable(view.scope())
+                .subscribe { conversations ->
+                    deleteConversations.execute(conversations)
+                    view.clearSelection()
+                }
+
+        view.swipeConversationIntent
+                .autoDisposable(view.scope())
+                .subscribe { (threadId, direction) ->
+                    val action = if (direction == ItemTouchHelper.RIGHT) prefs.swipeRight.get() else prefs.swipeLeft.get()
+                    when (action) {
+                        Preferences.SWIPE_ACTION_ARCHIVE -> markArchived.execute(listOf(threadId)) { view.showArchivedSnackbar() }
+                        Preferences.SWIPE_ACTION_DELETE -> view.showDeleteDialog(listOf(threadId))
+                        Preferences.SWIPE_ACTION_BLOCK -> view.showBlockingDialog(listOf(threadId), true)
+                        Preferences.SWIPE_ACTION_CALL -> conversationRepo.getConversation(threadId)?.recipients?.firstOrNull()?.address?.let(navigator::makePhoneCall)
+                        Preferences.SWIPE_ACTION_READ -> markRead.execute(listOf(threadId))
+                        Preferences.SWIPE_ACTION_UNREAD -> markUnread.execute(listOf(threadId))
+                    }
+                }
+
+        view.undoArchiveIntent
+                .withLatestFrom(view.swipeConversationIntent) { _, pair -> pair.first }
+                .autoDisposable(view.scope())
+                .subscribe { threadId -> markUnarchived.execute(listOf(threadId)) }
+
+        view.snackbarButtonIntent
+                .withLatestFrom(state) { _, state ->
+                    when {
+                        !state.defaultSms -> view.requestDefaultSms()
+                        !state.smsPermission -> view.requestPermissions()
+                        !state.contactPermission -> view.requestPermissions()
+                    }
+                }
+                .autoDisposable(view.scope())
+                .subscribe()
+    }
+
 }
\ No newline at end of file
diff --git a/presentation/src/main/java/com/moez/QKSMS/feature/main/SearchAdapter.kt b/presentation/src/main/java/com/moez/QKSMS/feature/main/SearchAdapter.kt
index 9a964a208..ebf27eb65 100644
--- a/presentation/src/main/java/com/moez/QKSMS/feature/main/SearchAdapter.kt
+++ b/presentation/src/main/java/com/moez/QKSMS/feature/main/SearchAdapter.kt
@@ -1,104 +1,104 @@
-/*
- * Copyright (C) 2017 Moez Bhatti <moez.bhatti@gmail.com>
- *
- * This file is part of QKSMS.
- *
- * QKSMS is free software: you can redistribute it and/or modify
- * it under the terms of the GNU General Public License as published by
- * the Free Software Foundation, either version 3 of the License, or
- * (at your option) any later version.
- *
- * QKSMS is distributed in the hope that it will be useful,
- * but WITHOUT ANY WARRANTY; without even the implied warranty of
- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
- * GNU General Public License for more details.
- *
- * You should have received a copy of the GNU General Public License
- * along with QKSMS.  If not, see <http://www.gnu.org/licenses/>.
- */
-package com.moez.QKSMS.feature.main
-
-import android.content.Context
-import android.text.SpannableString
-import android.text.Spanned
-import android.text.style.BackgroundColorSpan
-import android.view.LayoutInflater
-import android.view.ViewGroup
-import com.moez.QKSMS.R
-import com.moez.QKSMS.common.Navigator
-import com.moez.QKSMS.common.base.QkAdapter
-import com.moez.QKSMS.common.base.QkViewHolder
-import com.moez.QKSMS.common.util.Colors
-import com.moez.QKSMS.common.util.DateFormatter
-import com.moez.QKSMS.common.util.extensions.setVisible
-import com.moez.QKSMS.extensions.removeAccents
-import com.moez.QKSMS.model.SearchResult
-import kotlinx.android.synthetic.main.search_list_item.*
-import kotlinx.android.synthetic.main.search_list_item.view.*
-import javax.inject.Inject
-
-class SearchAdapter @Inject constructor(
-    colors: Colors,
-    private val context: Context,
-    private val dateFormatter: DateFormatter,
-    private val navigator: Navigator
-) : QkAdapter<SearchResult>() {
-
-    private val highlightColor: Int by lazy { colors.theme().highlight }
-
-    override fun onCreateViewHolder(parent: ViewGroup, viewType: Int): QkViewHolder {
-        val layoutInflater = LayoutInflater.from(parent.context)
-        val view = layoutInflater.inflate(R.layout.search_list_item, parent, false)
-        return QkViewHolder(view).apply {
-            view.setOnClickListener {
-                val result = getItem(adapterPosition)
-                navigator.showConversation(result.conversation.id, result.query.takeIf { result.messages > 0 })
-            }
-        }
-    }
-
-    override fun onBindViewHolder(holder: QkViewHolder, position: Int) {
-        val previous = data.getOrNull(position - 1)
-        val result = getItem(position)
-
-        holder.resultsHeader.setVisible(result.messages > 0 && previous?.messages == 0)
-
-        val query = result.query
-        val title = SpannableString(result.conversation.getTitle())
-        var index = title.removeAccents().indexOf(query, ignoreCase = true)
-
-        while (index >= 0) {
-            title.setSpan(BackgroundColorSpan(highlightColor), index, index + query.length, Spanned.SPAN_EXCLUSIVE_EXCLUSIVE)
-            index = title.indexOf(query, index + query.length, true)
-        }
-        holder.title.text = title
-
-        holder.avatars.recipients = result.conversation.recipients
-
-        when (result.messages == 0) {
-            true -> {
-                holder.date.setVisible(true)
-                holder.date.text = dateFormatter.getConversationTimestamp(result.conversation.date)
-                holder.snippet.text = when (result.conversation.me) {
-                    true -> context.getString(R.string.main_sender_you, result.conversation.snippet)
-                    false -> result.conversation.snippet
-                }
-            }
-
-            false -> {
-                holder.date.setVisible(false)
-                holder.snippet.text = context.getString(R.string.main_message_results, result.messages)
-            }
-        }
-    }
-
-    override fun areItemsTheSame(old: SearchResult, new: SearchResult): Boolean {
-        return old.conversation.id == new.conversation.id && old.messages > 0 == new.messages > 0
-    }
-
-    override fun areContentsTheSame(old: SearchResult, new: SearchResult): Boolean {
-        return old.query == new.query && // Queries are the same
-                old.conversation.id == new.conversation.id // Conversation id is the same
-                && old.messages == new.messages // Result count is the same
-    }
+/*
+ * Copyright (C) 2017 Moez Bhatti <moez.bhatti@gmail.com>
+ *
+ * This file is part of QKSMS.
+ *
+ * QKSMS is free software: you can redistribute it and/or modify
+ * it under the terms of the GNU General Public License as published by
+ * the Free Software Foundation, either version 3 of the License, or
+ * (at your option) any later version.
+ *
+ * QKSMS is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+ * GNU General Public License for more details.
+ *
+ * You should have received a copy of the GNU General Public License
+ * along with QKSMS.  If not, see <http://www.gnu.org/licenses/>.
+ */
+package com.moez.QKSMS.feature.main
+
+import android.content.Context
+import android.text.SpannableString
+import android.text.Spanned
+import android.text.style.BackgroundColorSpan
+import android.view.LayoutInflater
+import android.view.ViewGroup
+import com.moez.QKSMS.R
+import com.moez.QKSMS.common.Navigator
+import com.moez.QKSMS.common.base.QkAdapter
+import com.moez.QKSMS.common.base.QkViewHolder
+import com.moez.QKSMS.common.util.Colors
+import com.moez.QKSMS.common.util.DateFormatter
+import com.moez.QKSMS.common.util.extensions.setVisible
+import com.moez.QKSMS.extensions.removeAccents
+import com.moez.QKSMS.model.SearchResult
+import kotlinx.android.synthetic.main.search_list_item.*
+import kotlinx.android.synthetic.main.search_list_item.view.*
+import javax.inject.Inject
+
+class SearchAdapter @Inject constructor(
+    colors: Colors,
+    private val context: Context,
+    private val dateFormatter: DateFormatter,
+    private val navigator: Navigator
+) : QkAdapter<SearchResult>() {
+
+    private val highlightColor: Int by lazy { colors.theme().highlight }
+
+    override fun onCreateViewHolder(parent: ViewGroup, viewType: Int): QkViewHolder {
+        val layoutInflater = LayoutInflater.from(parent.context)
+        val view = layoutInflater.inflate(R.layout.search_list_item, parent, false)
+        return QkViewHolder(view).apply {
+            view.setOnClickListener {
+                val result = getItem(adapterPosition)
+                navigator.showConversation(result.conversation.id, result.query.takeIf { result.messages > 0 })
+            }
+        }
+    }
+
+    override fun onBindViewHolder(holder: QkViewHolder, position: Int) {
+        val previous = data.getOrNull(position - 1)
+        val result = getItem(position)
+
+        holder.resultsHeader.setVisible(result.messages > 0 && previous?.messages == 0)
+
+        val query = result.query
+        val title = SpannableString(result.conversation.getTitle())
+        var index = title.removeAccents().indexOf(query, ignoreCase = true)
+
+        while (index >= 0) {
+            title.setSpan(BackgroundColorSpan(highlightColor), index, index + query.length, Spanned.SPAN_EXCLUSIVE_EXCLUSIVE)
+            index = title.indexOf(query, index + query.length, true)
+        }
+        holder.title.text = title
+
+        holder.avatars.recipients = result.conversation.recipients
+
+        when (result.messages == 0) {
+            true -> {
+                holder.date.setVisible(true)
+                holder.date.text = dateFormatter.getConversationTimestamp(result.conversation.date)
+                holder.snippet.text = when (result.conversation.me) {
+                    true -> context.getString(R.string.main_sender_you, result.conversation.snippet)
+                    false -> result.conversation.snippet
+                }
+            }
+
+            false -> {
+                holder.date.setVisible(false)
+                holder.snippet.text = context.getString(R.string.main_message_results, result.messages)
+            }
+        }
+    }
+
+    override fun areItemsTheSame(old: SearchResult, new: SearchResult): Boolean {
+        return old.conversation.id == new.conversation.id && old.messages > 0 == new.messages > 0
+    }
+
+    override fun areContentsTheSame(old: SearchResult, new: SearchResult): Boolean {
+        return old.query == new.query && // Queries are the same
+                old.conversation.id == new.conversation.id // Conversation id is the same
+                && old.messages == new.messages // Result count is the same
+    }
 }
\ No newline at end of file
diff --git a/presentation/src/main/java/com/moez/QKSMS/feature/notificationprefs/NotificationPrefsActivity.kt b/presentation/src/main/java/com/moez/QKSMS/feature/notificationprefs/NotificationPrefsActivity.kt
index 210b5d3fe..cd1a8e6e3 100644
--- a/presentation/src/main/java/com/moez/QKSMS/feature/notificationprefs/NotificationPrefsActivity.kt
+++ b/presentation/src/main/java/com/moez/QKSMS/feature/notificationprefs/NotificationPrefsActivity.kt
@@ -1,147 +1,147 @@
-/*
- * Copyright (C) 2017 Moez Bhatti <moez.bhatti@gmail.com>
- *
- * This file is part of QKSMS.
- *
- * QKSMS is free software: you can redistribute it and/or modify
- * it under the terms of the GNU General Public License as published by
- * the Free Software Foundation, either version 3 of the License, or
- * (at your option) any later version.
- *
- * QKSMS is distributed in the hope that it will be useful,
- * but WITHOUT ANY WARRANTY; without even the implied warranty of
- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
- * GNU General Public License for more details.
- *
- * You should have received a copy of the GNU General Public License
- * along with QKSMS.  If not, see <http://www.gnu.org/licenses/>.
- */
-package com.moez.QKSMS.feature.notificationprefs
-
-import android.app.Activity
-import android.content.Intent
-import android.media.RingtoneManager
-import android.net.Uri
-import android.os.Build
-import android.os.Bundle
-import androidx.core.view.isVisible
-import androidx.lifecycle.ViewModelProvider
-import androidx.lifecycle.ViewModelProviders
-import com.jakewharton.rxbinding2.view.clicks
-import com.moez.QKSMS.R
-import com.moez.QKSMS.common.QkDialog
-import com.moez.QKSMS.common.base.QkThemedActivity
-import com.moez.QKSMS.common.util.extensions.animateLayoutChanges
-import com.moez.QKSMS.common.util.extensions.setVisible
-import com.moez.QKSMS.common.widget.PreferenceView
-import com.uber.autodispose.android.lifecycle.scope
-import com.uber.autodispose.autoDisposable
-import dagger.android.AndroidInjection
-import io.reactivex.Observable
-import io.reactivex.subjects.PublishSubject
-import io.reactivex.subjects.Subject
-import kotlinx.android.synthetic.main.notification_prefs_activity.*
-import kotlinx.android.synthetic.main.settings_switch_widget.view.*
-import javax.inject.Inject
-
-class NotificationPrefsActivity : QkThemedActivity(), NotificationPrefsView {
-
-    @Inject lateinit var previewModeDialog: QkDialog
-    @Inject lateinit var actionsDialog: QkDialog
-    @Inject lateinit var viewModelFactory: ViewModelProvider.Factory
-
-    override val preferenceClickIntent: Subject<PreferenceView> = PublishSubject.create()
-    override val previewModeSelectedIntent by lazy { previewModeDialog.adapter.menuItemClicks }
-    override val ringtoneSelectedIntent: Subject<String> = PublishSubject.create()
-    override val actionsSelectedIntent by lazy { actionsDialog.adapter.menuItemClicks }
-
-    private val viewModel by lazy {
-        ViewModelProviders.of(this, viewModelFactory)[NotificationPrefsViewModel::class.java]
-    }
-
-    override fun onCreate(savedInstanceState: Bundle?) {
-        AndroidInjection.inject(this)
-        super.onCreate(savedInstanceState)
-        setContentView(R.layout.notification_prefs_activity)
-        setTitle(R.string.title_notification_prefs)
-        showBackButton(true)
-        viewModel.bindView(this)
-
-        preferences.postDelayed({ preferences?.animateLayoutChanges = true }, 100)
-
-        val hasOreo = Build.VERSION.SDK_INT >= Build.VERSION_CODES.O
-
-        notificationsO.setVisible(hasOreo)
-        notifications.setVisible(!hasOreo)
-        vibration.setVisible(!hasOreo)
-        ringtone.setVisible(!hasOreo)
-
-        previewModeDialog.setTitle(R.string.settings_notification_previews_title)
-        previewModeDialog.adapter.setData(R.array.notification_preview_options)
-        actionsDialog.adapter.setData(R.array.notification_actions)
-
-        // Listen to clicks for all of the preferences
-        (0 until preferences.childCount)
-                .map { index -> preferences.getChildAt(index) }
-                .mapNotNull { view -> view as? PreferenceView }
-                .map { preference -> preference.clicks().map { preference } }
-                .let { Observable.merge(it) }
-                .autoDisposable(scope())
-                .subscribe(preferenceClickIntent)
-    }
-
-    override fun render(state: NotificationPrefsState) {
-        if (state.threadId != 0L) {
-            title = state.conversationTitle
-        }
-
-        notifications.checkbox.isChecked = state.notificationsEnabled
-        previews.summary = state.previewSummary
-        previewModeDialog.adapter.selectedItem = state.previewId
-        wake.checkbox.isChecked = state.wakeEnabled
-        vibration.checkbox.isChecked = state.vibrationEnabled
-        ringtone.summary = state.ringtoneName
-
-        actionsDivider.isVisible = state.threadId == 0L
-        actionsTitle.isVisible = state.threadId == 0L
-        action1.isVisible = state.threadId == 0L
-        action1.summary = state.action1Summary
-        action2.isVisible = state.threadId == 0L
-        action2.summary = state.action2Summary
-        action3.isVisible = state.threadId == 0L
-        action3.summary = state.action3Summary
-
-        qkreplyDivider.isVisible = state.threadId == 0L
-        qkreplyTitle.isVisible = state.threadId == 0L
-        qkreply.checkbox.isChecked = state.qkReplyEnabled
-        qkreply.isVisible = state.threadId == 0L
-        qkreplyTapDismiss.isVisible = state.threadId == 0L
-        qkreplyTapDismiss.isEnabled = state.qkReplyEnabled
-        qkreplyTapDismiss.checkbox.isChecked = state.qkReplyTapDismiss
-    }
-
-    override fun showPreviewModeDialog() = previewModeDialog.show(this)
-
-    override fun showRingtonePicker(default: Uri?) {
-        val intent = Intent(RingtoneManager.ACTION_RINGTONE_PICKER)
-        intent.putExtra(RingtoneManager.EXTRA_RINGTONE_SHOW_SILENT, true)
-        intent.putExtra(RingtoneManager.EXTRA_RINGTONE_SHOW_DEFAULT, true)
-        intent.putExtra(RingtoneManager.EXTRA_RINGTONE_EXISTING_URI, default)
-        intent.putExtra(RingtoneManager.EXTRA_RINGTONE_TYPE, RingtoneManager.TYPE_NOTIFICATION)
-        startActivityForResult(intent, 123)
-    }
-
-    override fun showActionDialog(selected: Int) {
-        actionsDialog.adapter.selectedItem = selected
-        actionsDialog.show(this)
-    }
-
-    override fun onActivityResult(requestCode: Int, resultCode: Int, data: Intent?) {
-        super.onActivityResult(requestCode, resultCode, data)
-        if (requestCode == 123 && resultCode == Activity.RESULT_OK) {
-            val uri: Uri? = data?.getParcelableExtra(RingtoneManager.EXTRA_RINGTONE_PICKED_URI)
-            ringtoneSelectedIntent.onNext(uri?.toString() ?: "")
-        }
-    }
-
+/*
+ * Copyright (C) 2017 Moez Bhatti <moez.bhatti@gmail.com>
+ *
+ * This file is part of QKSMS.
+ *
+ * QKSMS is free software: you can redistribute it and/or modify
+ * it under the terms of the GNU General Public License as published by
+ * the Free Software Foundation, either version 3 of the License, or
+ * (at your option) any later version.
+ *
+ * QKSMS is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+ * GNU General Public License for more details.
+ *
+ * You should have received a copy of the GNU General Public License
+ * along with QKSMS.  If not, see <http://www.gnu.org/licenses/>.
+ */
+package com.moez.QKSMS.feature.notificationprefs
+
+import android.app.Activity
+import android.content.Intent
+import android.media.RingtoneManager
+import android.net.Uri
+import android.os.Build
+import android.os.Bundle
+import androidx.core.view.isVisible
+import androidx.lifecycle.ViewModelProvider
+import androidx.lifecycle.ViewModelProviders
+import com.jakewharton.rxbinding2.view.clicks
+import com.moez.QKSMS.R
+import com.moez.QKSMS.common.QkDialog
+import com.moez.QKSMS.common.base.QkThemedActivity
+import com.moez.QKSMS.common.util.extensions.animateLayoutChanges
+import com.moez.QKSMS.common.util.extensions.setVisible
+import com.moez.QKSMS.common.widget.PreferenceView
+import com.uber.autodispose.android.lifecycle.scope
+import com.uber.autodispose.autoDisposable
+import dagger.android.AndroidInjection
+import io.reactivex.Observable
+import io.reactivex.subjects.PublishSubject
+import io.reactivex.subjects.Subject
+import kotlinx.android.synthetic.main.notification_prefs_activity.*
+import kotlinx.android.synthetic.main.settings_switch_widget.view.*
+import javax.inject.Inject
+
+class NotificationPrefsActivity : QkThemedActivity(), NotificationPrefsView {
+
+    @Inject lateinit var previewModeDialog: QkDialog
+    @Inject lateinit var actionsDialog: QkDialog
+    @Inject lateinit var viewModelFactory: ViewModelProvider.Factory
+
+    override val preferenceClickIntent: Subject<PreferenceView> = PublishSubject.create()
+    override val previewModeSelectedIntent by lazy { previewModeDialog.adapter.menuItemClicks }
+    override val ringtoneSelectedIntent: Subject<String> = PublishSubject.create()
+    override val actionsSelectedIntent by lazy { actionsDialog.adapter.menuItemClicks }
+
+    private val viewModel by lazy {
+        ViewModelProviders.of(this, viewModelFactory)[NotificationPrefsViewModel::class.java]
+    }
+
+    override fun onCreate(savedInstanceState: Bundle?) {
+        AndroidInjection.inject(this)
+        super.onCreate(savedInstanceState)
+        setContentView(R.layout.notification_prefs_activity)
+        setTitle(R.string.title_notification_prefs)
+        showBackButton(true)
+        viewModel.bindView(this)
+
+        preferences.postDelayed({ preferences?.animateLayoutChanges = true }, 100)
+
+        val hasOreo = Build.VERSION.SDK_INT >= Build.VERSION_CODES.O
+
+        notificationsO.setVisible(hasOreo)
+        notifications.setVisible(!hasOreo)
+        vibration.setVisible(!hasOreo)
+        ringtone.setVisible(!hasOreo)
+
+        previewModeDialog.setTitle(R.string.settings_notification_previews_title)
+        previewModeDialog.adapter.setData(R.array.notification_preview_options)
+        actionsDialog.adapter.setData(R.array.notification_actions)
+
+        // Listen to clicks for all of the preferences
+        (0 until preferences.childCount)
+                .map { index -> preferences.getChildAt(index) }
+                .mapNotNull { view -> view as? PreferenceView }
+                .map { preference -> preference.clicks().map { preference } }
+                .let { Observable.merge(it) }
+                .autoDisposable(scope())
+                .subscribe(preferenceClickIntent)
+    }
+
+    override fun render(state: NotificationPrefsState) {
+        if (state.threadId != 0L) {
+            title = state.conversationTitle
+        }
+
+        notifications.checkbox.isChecked = state.notificationsEnabled
+        previews.summary = state.previewSummary
+        previewModeDialog.adapter.selectedItem = state.previewId
+        wake.checkbox.isChecked = state.wakeEnabled
+        vibration.checkbox.isChecked = state.vibrationEnabled
+        ringtone.summary = state.ringtoneName
+
+        actionsDivider.isVisible = state.threadId == 0L
+        actionsTitle.isVisible = state.threadId == 0L
+        action1.isVisible = state.threadId == 0L
+        action1.summary = state.action1Summary
+        action2.isVisible = state.threadId == 0L
+        action2.summary = state.action2Summary
+        action3.isVisible = state.threadId == 0L
+        action3.summary = state.action3Summary
+
+        qkreplyDivider.isVisible = state.threadId == 0L
+        qkreplyTitle.isVisible = state.threadId == 0L
+        qkreply.checkbox.isChecked = state.qkReplyEnabled
+        qkreply.isVisible = state.threadId == 0L
+        qkreplyTapDismiss.isVisible = state.threadId == 0L
+        qkreplyTapDismiss.isEnabled = state.qkReplyEnabled
+        qkreplyTapDismiss.checkbox.isChecked = state.qkReplyTapDismiss
+    }
+
+    override fun showPreviewModeDialog() = previewModeDialog.show(this)
+
+    override fun showRingtonePicker(default: Uri?) {
+        val intent = Intent(RingtoneManager.ACTION_RINGTONE_PICKER)
+        intent.putExtra(RingtoneManager.EXTRA_RINGTONE_SHOW_SILENT, true)
+        intent.putExtra(RingtoneManager.EXTRA_RINGTONE_SHOW_DEFAULT, true)
+        intent.putExtra(RingtoneManager.EXTRA_RINGTONE_EXISTING_URI, default)
+        intent.putExtra(RingtoneManager.EXTRA_RINGTONE_TYPE, RingtoneManager.TYPE_NOTIFICATION)
+        startActivityForResult(intent, 123)
+    }
+
+    override fun showActionDialog(selected: Int) {
+        actionsDialog.adapter.selectedItem = selected
+        actionsDialog.show(this)
+    }
+
+    override fun onActivityResult(requestCode: Int, resultCode: Int, data: Intent?) {
+        super.onActivityResult(requestCode, resultCode, data)
+        if (requestCode == 123 && resultCode == Activity.RESULT_OK) {
+            val uri: Uri? = data?.getParcelableExtra(RingtoneManager.EXTRA_RINGTONE_PICKED_URI)
+            ringtoneSelectedIntent.onNext(uri?.toString() ?: "")
+        }
+    }
+
 }
\ No newline at end of file
diff --git a/presentation/src/main/java/com/moez/QKSMS/feature/notificationprefs/NotificationPrefsActivityModule.kt b/presentation/src/main/java/com/moez/QKSMS/feature/notificationprefs/NotificationPrefsActivityModule.kt
index d860fad36..31696d106 100644
--- a/presentation/src/main/java/com/moez/QKSMS/feature/notificationprefs/NotificationPrefsActivityModule.kt
+++ b/presentation/src/main/java/com/moez/QKSMS/feature/notificationprefs/NotificationPrefsActivityModule.kt
@@ -1,40 +1,40 @@
-/*
- * Copyright (C) 2017 Moez Bhatti <moez.bhatti@gmail.com>
- *
- * This file is part of QKSMS.
- *
- * QKSMS is free software: you can redistribute it and/or modify
- * it under the terms of the GNU General Public License as published by
- * the Free Software Foundation, either version 3 of the License, or
- * (at your option) any later version.
- *
- * QKSMS is distributed in the hope that it will be useful,
- * but WITHOUT ANY WARRANTY; without even the implied warranty of
- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
- * GNU General Public License for more details.
- *
- * You should have received a copy of the GNU General Public License
- * along with QKSMS.  If not, see <http://www.gnu.org/licenses/>.
- */
-package com.moez.QKSMS.feature.notificationprefs
-
-import androidx.lifecycle.ViewModel
-import com.moez.QKSMS.injection.ViewModelKey
-import dagger.Module
-import dagger.Provides
-import dagger.multibindings.IntoMap
-import javax.inject.Named
-
-@Module
-class NotificationPrefsActivityModule {
-
-    @Provides
-    @Named("threadId")
-    fun provideThreadId(activity: NotificationPrefsActivity): Long = activity.intent.extras?.getLong("threadId") ?: 0L
-
-    @Provides
-    @IntoMap
-    @ViewModelKey(NotificationPrefsViewModel::class)
-    fun provideNotificationPrefsViewModel(viewModel: NotificationPrefsViewModel): ViewModel = viewModel
-
+/*
+ * Copyright (C) 2017 Moez Bhatti <moez.bhatti@gmail.com>
+ *
+ * This file is part of QKSMS.
+ *
+ * QKSMS is free software: you can redistribute it and/or modify
+ * it under the terms of the GNU General Public License as published by
+ * the Free Software Foundation, either version 3 of the License, or
+ * (at your option) any later version.
+ *
+ * QKSMS is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+ * GNU General Public License for more details.
+ *
+ * You should have received a copy of the GNU General Public License
+ * along with QKSMS.  If not, see <http://www.gnu.org/licenses/>.
+ */
+package com.moez.QKSMS.feature.notificationprefs
+
+import androidx.lifecycle.ViewModel
+import com.moez.QKSMS.injection.ViewModelKey
+import dagger.Module
+import dagger.Provides
+import dagger.multibindings.IntoMap
+import javax.inject.Named
+
+@Module
+class NotificationPrefsActivityModule {
+
+    @Provides
+    @Named("threadId")
+    fun provideThreadId(activity: NotificationPrefsActivity): Long = activity.intent.extras?.getLong("threadId") ?: 0L
+
+    @Provides
+    @IntoMap
+    @ViewModelKey(NotificationPrefsViewModel::class)
+    fun provideNotificationPrefsViewModel(viewModel: NotificationPrefsViewModel): ViewModel = viewModel
+
 }
\ No newline at end of file
diff --git a/presentation/src/main/java/com/moez/QKSMS/feature/notificationprefs/NotificationPrefsState.kt b/presentation/src/main/java/com/moez/QKSMS/feature/notificationprefs/NotificationPrefsState.kt
index c0dcd0f24..41a185b1c 100644
--- a/presentation/src/main/java/com/moez/QKSMS/feature/notificationprefs/NotificationPrefsState.kt
+++ b/presentation/src/main/java/com/moez/QKSMS/feature/notificationprefs/NotificationPrefsState.kt
@@ -1,38 +1,38 @@
-/*
- * Copyright (C) 2017 Moez Bhatti <moez.bhatti@gmail.com>
- *
- * This file is part of QKSMS.
- *
- * QKSMS is free software: you can redistribute it and/or modify
- * it under the terms of the GNU General Public License as published by
- * the Free Software Foundation, either version 3 of the License, or
- * (at your option) any later version.
- *
- * QKSMS is distributed in the hope that it will be useful,
- * but WITHOUT ANY WARRANTY; without even the implied warranty of
- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
- * GNU General Public License for more details.
- *
- * You should have received a copy of the GNU General Public License
- * along with QKSMS.  If not, see <http://www.gnu.org/licenses/>.
- */
-package com.moez.QKSMS.feature.notificationprefs
-
-import android.os.Build
-import com.moez.QKSMS.util.Preferences
-
-data class NotificationPrefsState(
-    val threadId: Long = 0,
-    val conversationTitle: String = "",
-    val notificationsEnabled: Boolean = true,
-    val previewSummary: String = "",
-    val previewId: Int = Preferences.NOTIFICATION_PREVIEWS_ALL,
-    val wakeEnabled: Boolean = false,
-    val action1Summary: String = "",
-    val action2Summary: String = "",
-    val action3Summary: String = "",
-    val vibrationEnabled: Boolean = true,
-    val ringtoneName: String = "",
-    val qkReplyEnabled: Boolean = Build.VERSION.SDK_INT < Build.VERSION_CODES.N,
-    val qkReplyTapDismiss: Boolean = true
-)
+/*
+ * Copyright (C) 2017 Moez Bhatti <moez.bhatti@gmail.com>
+ *
+ * This file is part of QKSMS.
+ *
+ * QKSMS is free software: you can redistribute it and/or modify
+ * it under the terms of the GNU General Public License as published by
+ * the Free Software Foundation, either version 3 of the License, or
+ * (at your option) any later version.
+ *
+ * QKSMS is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+ * GNU General Public License for more details.
+ *
+ * You should have received a copy of the GNU General Public License
+ * along with QKSMS.  If not, see <http://www.gnu.org/licenses/>.
+ */
+package com.moez.QKSMS.feature.notificationprefs
+
+import android.os.Build
+import com.moez.QKSMS.util.Preferences
+
+data class NotificationPrefsState(
+    val threadId: Long = 0,
+    val conversationTitle: String = "",
+    val notificationsEnabled: Boolean = true,
+    val previewSummary: String = "",
+    val previewId: Int = Preferences.NOTIFICATION_PREVIEWS_ALL,
+    val wakeEnabled: Boolean = false,
+    val action1Summary: String = "",
+    val action2Summary: String = "",
+    val action3Summary: String = "",
+    val vibrationEnabled: Boolean = true,
+    val ringtoneName: String = "",
+    val qkReplyEnabled: Boolean = Build.VERSION.SDK_INT < Build.VERSION_CODES.N,
+    val qkReplyTapDismiss: Boolean = true
+)
diff --git a/presentation/src/main/java/com/moez/QKSMS/feature/notificationprefs/NotificationPrefsView.kt b/presentation/src/main/java/com/moez/QKSMS/feature/notificationprefs/NotificationPrefsView.kt
index 7857b8034..8798ea9cf 100644
--- a/presentation/src/main/java/com/moez/QKSMS/feature/notificationprefs/NotificationPrefsView.kt
+++ b/presentation/src/main/java/com/moez/QKSMS/feature/notificationprefs/NotificationPrefsView.kt
@@ -1,37 +1,37 @@
-/*
- * Copyright (C) 2017 Moez Bhatti <moez.bhatti@gmail.com>
- *
- * This file is part of QKSMS.
- *
- * QKSMS is free software: you can redistribute it and/or modify
- * it under the terms of the GNU General Public License as published by
- * the Free Software Foundation, either version 3 of the License, or
- * (at your option) any later version.
- *
- * QKSMS is distributed in the hope that it will be useful,
- * but WITHOUT ANY WARRANTY; without even the implied warranty of
- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
- * GNU General Public License for more details.
- *
- * You should have received a copy of the GNU General Public License
- * along with QKSMS.  If not, see <http://www.gnu.org/licenses/>.
- */
-package com.moez.QKSMS.feature.notificationprefs
-
-import android.net.Uri
-import com.moez.QKSMS.common.base.QkView
-import com.moez.QKSMS.common.widget.PreferenceView
-import io.reactivex.Observable
-import io.reactivex.subjects.Subject
-
-interface NotificationPrefsView : QkView<NotificationPrefsState> {
-
-    val preferenceClickIntent: Subject<PreferenceView>
-    val previewModeSelectedIntent: Subject<Int>
-    val ringtoneSelectedIntent: Observable<String>
-    val actionsSelectedIntent: Subject<Int>
-
-    fun showPreviewModeDialog()
-    fun showRingtonePicker(default: Uri?)
-    fun showActionDialog(selected: Int)
-}
+/*
+ * Copyright (C) 2017 Moez Bhatti <moez.bhatti@gmail.com>
+ *
+ * This file is part of QKSMS.
+ *
+ * QKSMS is free software: you can redistribute it and/or modify
+ * it under the terms of the GNU General Public License as published by
+ * the Free Software Foundation, either version 3 of the License, or
+ * (at your option) any later version.
+ *
+ * QKSMS is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+ * GNU General Public License for more details.
+ *
+ * You should have received a copy of the GNU General Public License
+ * along with QKSMS.  If not, see <http://www.gnu.org/licenses/>.
+ */
+package com.moez.QKSMS.feature.notificationprefs
+
+import android.net.Uri
+import com.moez.QKSMS.common.base.QkView
+import com.moez.QKSMS.common.widget.PreferenceView
+import io.reactivex.Observable
+import io.reactivex.subjects.Subject
+
+interface NotificationPrefsView : QkView<NotificationPrefsState> {
+
+    val preferenceClickIntent: Subject<PreferenceView>
+    val previewModeSelectedIntent: Subject<Int>
+    val ringtoneSelectedIntent: Observable<String>
+    val actionsSelectedIntent: Subject<Int>
+
+    fun showPreviewModeDialog()
+    fun showRingtonePicker(default: Uri?)
+    fun showActionDialog(selected: Int)
+}
diff --git a/presentation/src/main/java/com/moez/QKSMS/feature/notificationprefs/NotificationPrefsViewModel.kt b/presentation/src/main/java/com/moez/QKSMS/feature/notificationprefs/NotificationPrefsViewModel.kt
index 596423bb3..0a19a60aa 100644
--- a/presentation/src/main/java/com/moez/QKSMS/feature/notificationprefs/NotificationPrefsViewModel.kt
+++ b/presentation/src/main/java/com/moez/QKSMS/feature/notificationprefs/NotificationPrefsViewModel.kt
@@ -1,151 +1,151 @@
-/*
- * Copyright (C) 2017 Moez Bhatti <moez.bhatti@gmail.com>
- *
- * This file is part of QKSMS.
- *
- * QKSMS is free software: you can redistribute it and/or modify
- * it under the terms of the GNU General Public License as published by
- * the Free Software Foundation, either version 3 of the License, or
- * (at your option) any later version.
- *
- * QKSMS is distributed in the hope that it will be useful,
- * but WITHOUT ANY WARRANTY; without even the implied warranty of
- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
- * GNU General Public License for more details.
- *
- * You should have received a copy of the GNU General Public License
- * along with QKSMS.  If not, see <http://www.gnu.org/licenses/>.
- */
-package com.moez.QKSMS.feature.notificationprefs
-
-import android.content.Context
-import android.media.RingtoneManager
-import android.net.Uri
-import com.moez.QKSMS.R
-import com.moez.QKSMS.common.Navigator
-import com.moez.QKSMS.common.base.QkViewModel
-import com.moez.QKSMS.extensions.mapNotNull
-import com.moez.QKSMS.repository.ConversationRepository
-import com.moez.QKSMS.util.Preferences
-import com.uber.autodispose.android.lifecycle.scope
-import com.uber.autodispose.autoDisposable
-import io.reactivex.Flowable
-import io.reactivex.rxkotlin.plusAssign
-import io.reactivex.rxkotlin.withLatestFrom
-import io.reactivex.schedulers.Schedulers
-import javax.inject.Inject
-import javax.inject.Named
-
-class NotificationPrefsViewModel @Inject constructor(
-    @Named("threadId") private val threadId: Long,
-    private val context: Context,
-    private val conversationRepo: ConversationRepository,
-    private val navigator: Navigator,
-    private val prefs: Preferences
-) : QkViewModel<NotificationPrefsView, NotificationPrefsState>(NotificationPrefsState(threadId = threadId)) {
-
-    private val notifications = prefs.notifications(threadId)
-    private val previews = prefs.notificationPreviews(threadId)
-    private val wake = prefs.wakeScreen(threadId)
-    private val vibration = prefs.vibration(threadId)
-    private val ringtone = prefs.ringtone(threadId)
-
-    init {
-        disposables += Flowable.just(threadId)
-                .mapNotNull { threadId -> conversationRepo.getConversation(threadId) }
-                .map { conversation -> conversation.getTitle() }
-                .subscribeOn(Schedulers.io())
-                .subscribe { title -> newState { copy(conversationTitle = title) } }
-
-        disposables += notifications.asObservable()
-                .subscribe { enabled -> newState { copy(notificationsEnabled = enabled) } }
-
-        val previewLabels = context.resources.getStringArray(R.array.notification_preview_options)
-        disposables += previews.asObservable()
-                .subscribe { previewId ->
-                    newState { copy(previewSummary = previewLabels[previewId], previewId = previewId) }
-                }
-
-        val actionLabels = context.resources.getStringArray(R.array.notification_actions)
-        disposables += prefs.notifAction1.asObservable()
-                .subscribe { previewId -> newState { copy(action1Summary = actionLabels[previewId]) } }
-
-        disposables += prefs.notifAction2.asObservable()
-                .subscribe { previewId -> newState { copy(action2Summary = actionLabels[previewId]) } }
-
-        disposables += prefs.notifAction3.asObservable()
-                .subscribe { previewId -> newState { copy(action3Summary = actionLabels[previewId]) } }
-
-        disposables += wake.asObservable()
-                .subscribe { enabled -> newState { copy(wakeEnabled = enabled) } }
-
-        disposables += vibration.asObservable()
-                .subscribe { enabled -> newState { copy(vibrationEnabled = enabled) } }
-
-        disposables += ringtone.asObservable()
-                .map { uriString ->
-                    uriString.takeIf { it.isNotEmpty() }
-                            ?.let(Uri::parse)
-                            ?.let { uri -> RingtoneManager.getRingtone(context, uri) }?.getTitle(context)
-                            ?: context.getString(R.string.settings_ringtone_none)
-                }
-                .subscribe { title -> newState { copy(ringtoneName = title) } }
-
-        disposables += prefs.qkreply.asObservable()
-                .subscribe { enabled -> newState { copy(qkReplyEnabled = enabled) } }
-
-        disposables += prefs.qkreplyTapDismiss.asObservable()
-                .subscribe { enabled -> newState { copy(qkReplyTapDismiss = enabled) } }
-    }
-
-    override fun bindView(view: NotificationPrefsView) {
-        super.bindView(view)
-
-        view.preferenceClickIntent
-                .autoDisposable(view.scope())
-                .subscribe {
-                    when (it.id) {
-                        R.id.notificationsO -> navigator.showNotificationChannel(threadId)
-
-                        R.id.notifications -> notifications.set(!notifications.get())
-
-                        R.id.previews -> view.showPreviewModeDialog()
-
-                        R.id.wake -> wake.set(!wake.get())
-
-                        R.id.vibration -> vibration.set(!vibration.get())
-
-                        R.id.ringtone -> view.showRingtonePicker(ringtone.get().takeIf { it.isNotEmpty() }?.let(Uri::parse))
-
-                        R.id.action1 -> view.showActionDialog(prefs.notifAction1.get())
-
-                        R.id.action2 -> view.showActionDialog(prefs.notifAction2.get())
-
-                        R.id.action3 -> view.showActionDialog(prefs.notifAction3.get())
-
-                        R.id.qkreply -> prefs.qkreply.set(!prefs.qkreply.get())
-
-                        R.id.qkreplyTapDismiss -> prefs.qkreplyTapDismiss.set(!prefs.qkreplyTapDismiss.get())
-                    }
-                }
-
-        view.previewModeSelectedIntent
-                .autoDisposable(view.scope())
-                .subscribe { previews.set(it) }
-
-        view.ringtoneSelectedIntent
-                .autoDisposable(view.scope())
-                .subscribe { ringtone -> this.ringtone.set(ringtone) }
-
-        view.actionsSelectedIntent
-                .withLatestFrom(view.preferenceClickIntent) { action, preference ->
-                    when (preference.id) {
-                        R.id.action1 -> prefs.notifAction1.set(action)
-                        R.id.action2 -> prefs.notifAction2.set(action)
-                        R.id.action3 -> prefs.notifAction3.set(action)
-                    }
-                }
-                .autoDisposable(view.scope())
-                .subscribe()
-    }
+/*
+ * Copyright (C) 2017 Moez Bhatti <moez.bhatti@gmail.com>
+ *
+ * This file is part of QKSMS.
+ *
+ * QKSMS is free software: you can redistribute it and/or modify
+ * it under the terms of the GNU General Public License as published by
+ * the Free Software Foundation, either version 3 of the License, or
+ * (at your option) any later version.
+ *
+ * QKSMS is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+ * GNU General Public License for more details.
+ *
+ * You should have received a copy of the GNU General Public License
+ * along with QKSMS.  If not, see <http://www.gnu.org/licenses/>.
+ */
+package com.moez.QKSMS.feature.notificationprefs
+
+import android.content.Context
+import android.media.RingtoneManager
+import android.net.Uri
+import com.moez.QKSMS.R
+import com.moez.QKSMS.common.Navigator
+import com.moez.QKSMS.common.base.QkViewModel
+import com.moez.QKSMS.extensions.mapNotNull
+import com.moez.QKSMS.repository.ConversationRepository
+import com.moez.QKSMS.util.Preferences
+import com.uber.autodispose.android.lifecycle.scope
+import com.uber.autodispose.autoDisposable
+import io.reactivex.Flowable
+import io.reactivex.rxkotlin.plusAssign
+import io.reactivex.rxkotlin.withLatestFrom
+import io.reactivex.schedulers.Schedulers
+import javax.inject.Inject
+import javax.inject.Named
+
+class NotificationPrefsViewModel @Inject constructor(
+    @Named("threadId") private val threadId: Long,
+    private val context: Context,
+    private val conversationRepo: ConversationRepository,
+    private val navigator: Navigator,
+    private val prefs: Preferences
+) : QkViewModel<NotificationPrefsView, NotificationPrefsState>(NotificationPrefsState(threadId = threadId)) {
+
+    private val notifications = prefs.notifications(threadId)
+    private val previews = prefs.notificationPreviews(threadId)
+    private val wake = prefs.wakeScreen(threadId)
+    private val vibration = prefs.vibration(threadId)
+    private val ringtone = prefs.ringtone(threadId)
+
+    init {
+        disposables += Flowable.just(threadId)
+                .mapNotNull { threadId -> conversationRepo.getConversation(threadId) }
+                .map { conversation -> conversation.getTitle() }
+                .subscribeOn(Schedulers.io())
+                .subscribe { title -> newState { copy(conversationTitle = title) } }
+
+        disposables += notifications.asObservable()
+                .subscribe { enabled -> newState { copy(notificationsEnabled = enabled) } }
+
+        val previewLabels = context.resources.getStringArray(R.array.notification_preview_options)
+        disposables += previews.asObservable()
+                .subscribe { previewId ->
+                    newState { copy(previewSummary = previewLabels[previewId], previewId = previewId) }
+                }
+
+        val actionLabels = context.resources.getStringArray(R.array.notification_actions)
+        disposables += prefs.notifAction1.asObservable()
+                .subscribe { previewId -> newState { copy(action1Summary = actionLabels[previewId]) } }
+
+        disposables += prefs.notifAction2.asObservable()
+                .subscribe { previewId -> newState { copy(action2Summary = actionLabels[previewId]) } }
+
+        disposables += prefs.notifAction3.asObservable()
+                .subscribe { previewId -> newState { copy(action3Summary = actionLabels[previewId]) } }
+
+        disposables += wake.asObservable()
+                .subscribe { enabled -> newState { copy(wakeEnabled = enabled) } }
+
+        disposables += vibration.asObservable()
+                .subscribe { enabled -> newState { copy(vibrationEnabled = enabled) } }
+
+        disposables += ringtone.asObservable()
+                .map { uriString ->
+                    uriString.takeIf { it.isNotEmpty() }
+                            ?.let(Uri::parse)
+                            ?.let { uri -> RingtoneManager.getRingtone(context, uri) }?.getTitle(context)
+                            ?: context.getString(R.string.settings_ringtone_none)
+                }
+                .subscribe { title -> newState { copy(ringtoneName = title) } }
+
+        disposables += prefs.qkreply.asObservable()
+                .subscribe { enabled -> newState { copy(qkReplyEnabled = enabled) } }
+
+        disposables += prefs.qkreplyTapDismiss.asObservable()
+                .subscribe { enabled -> newState { copy(qkReplyTapDismiss = enabled) } }
+    }
+
+    override fun bindView(view: NotificationPrefsView) {
+        super.bindView(view)
+
+        view.preferenceClickIntent
+                .autoDisposable(view.scope())
+                .subscribe {
+                    when (it.id) {
+                        R.id.notificationsO -> navigator.showNotificationChannel(threadId)
+
+                        R.id.notifications -> notifications.set(!notifications.get())
+
+                        R.id.previews -> view.showPreviewModeDialog()
+
+                        R.id.wake -> wake.set(!wake.get())
+
+                        R.id.vibration -> vibration.set(!vibration.get())
+
+                        R.id.ringtone -> view.showRingtonePicker(ringtone.get().takeIf { it.isNotEmpty() }?.let(Uri::parse))
+
+                        R.id.action1 -> view.showActionDialog(prefs.notifAction1.get())
+
+                        R.id.action2 -> view.showActionDialog(prefs.notifAction2.get())
+
+                        R.id.action3 -> view.showActionDialog(prefs.notifAction3.get())
+
+                        R.id.qkreply -> prefs.qkreply.set(!prefs.qkreply.get())
+
+                        R.id.qkreplyTapDismiss -> prefs.qkreplyTapDismiss.set(!prefs.qkreplyTapDismiss.get())
+                    }
+                }
+
+        view.previewModeSelectedIntent
+                .autoDisposable(view.scope())
+                .subscribe { previews.set(it) }
+
+        view.ringtoneSelectedIntent
+                .autoDisposable(view.scope())
+                .subscribe { ringtone -> this.ringtone.set(ringtone) }
+
+        view.actionsSelectedIntent
+                .withLatestFrom(view.preferenceClickIntent) { action, preference ->
+                    when (preference.id) {
+                        R.id.action1 -> prefs.notifAction1.set(action)
+                        R.id.action2 -> prefs.notifAction2.set(action)
+                        R.id.action3 -> prefs.notifAction3.set(action)
+                    }
+                }
+                .autoDisposable(view.scope())
+                .subscribe()
+    }
 }
\ No newline at end of file
diff --git a/presentation/src/main/java/com/moez/QKSMS/feature/plus/PlusActivity.kt b/presentation/src/main/java/com/moez/QKSMS/feature/plus/PlusActivity.kt
index 90fc5ec1f..5b751d6bf 100644
--- a/presentation/src/main/java/com/moez/QKSMS/feature/plus/PlusActivity.kt
+++ b/presentation/src/main/java/com/moez/QKSMS/feature/plus/PlusActivity.kt
@@ -1,129 +1,129 @@
-/*
- * Copyright (C) 2017 Moez Bhatti <moez.bhatti@gmail.com>
- *
- * This file is part of QKSMS.
- *
- * QKSMS is free software: you can redistribute it and/or modify
- * it under the terms of the GNU General Public License as published by
- * the Free Software Foundation, either version 3 of the License, or
- * (at your option) any later version.
- *
- * QKSMS is distributed in the hope that it will be useful,
- * but WITHOUT ANY WARRANTY; without even the implied warranty of
- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
- * GNU General Public License for more details.
- *
- * You should have received a copy of the GNU General Public License
- * along with QKSMS.  If not, see <http://www.gnu.org/licenses/>.
- */
-package com.moez.QKSMS.feature.plus
-
-import android.graphics.Typeface
-import android.os.Bundle
-import androidx.core.view.children
-import androidx.lifecycle.ViewModelProvider
-import androidx.lifecycle.ViewModelProviders
-import com.jakewharton.rxbinding2.view.clicks
-import com.moez.QKSMS.BuildConfig
-import com.moez.QKSMS.R
-import com.moez.QKSMS.common.base.QkThemedActivity
-import com.moez.QKSMS.common.util.FontProvider
-import com.moez.QKSMS.common.util.extensions.makeToast
-import com.moez.QKSMS.common.util.extensions.resolveThemeColor
-import com.moez.QKSMS.common.util.extensions.setBackgroundTint
-import com.moez.QKSMS.common.util.extensions.setTint
-import com.moez.QKSMS.common.util.extensions.setVisible
-import com.moez.QKSMS.common.widget.PreferenceView
-import com.moez.QKSMS.feature.plus.experiment.UpgradeButtonExperiment
-import com.moez.QKSMS.manager.BillingManager
-import dagger.android.AndroidInjection
-import kotlinx.android.synthetic.main.collapsing_toolbar.*
-import kotlinx.android.synthetic.main.preference_view.view.*
-import kotlinx.android.synthetic.main.qksms_plus_activity.*
-import kotlinx.coroutines.Dispatchers
-import kotlinx.coroutines.GlobalScope
-import kotlinx.coroutines.launch
-import timber.log.Timber
-import javax.inject.Inject
-
-class PlusActivity : QkThemedActivity(), PlusView {
-
-    @Inject lateinit var fontProvider: FontProvider
-    @Inject lateinit var upgradeButtonExperiment: UpgradeButtonExperiment
-    @Inject lateinit var viewModelFactory: ViewModelProvider.Factory
-
-    private val viewModel by lazy { ViewModelProviders.of(this, viewModelFactory)[PlusViewModel::class.java] }
-
-    override val upgradeIntent by lazy { upgrade.clicks() }
-    override val upgradeDonateIntent by lazy { upgradeDonate.clicks() }
-    override val donateIntent by lazy { donate.clicks() }
-    override val themeClicks by lazy { themes.clicks() }
-    override val scheduleClicks by lazy { schedule.clicks() }
-    override val backupClicks by lazy { backup.clicks() }
-    override val delayedClicks by lazy { delayed.clicks() }
-    override val nightClicks by lazy { night.clicks() }
-
-    override fun onCreate(savedInstanceState: Bundle?) {
-        AndroidInjection.inject(this)
-        super.onCreate(savedInstanceState)
-        setContentView(R.layout.qksms_plus_activity)
-        setTitle(R.string.title_qksms_plus)
-        showBackButton(true)
-        viewModel.bindView(this)
-
-        free.setVisible(false)
-
-        if (!prefs.systemFont.get()) {
-            fontProvider.getLato { lato ->
-                val typeface = Typeface.create(lato, Typeface.BOLD)
-                collapsingToolbar.setCollapsedTitleTypeface(typeface)
-                collapsingToolbar.setExpandedTitleTypeface(typeface)
-            }
-        }
-
-        // Make the list titles bold
-        linearLayout.children
-                .mapNotNull { it as? PreferenceView }
-                .map { it.titleView }
-                .forEach { it.setTypeface(it.typeface, Typeface.BOLD) }
-
-        val textPrimary = resolveThemeColor(android.R.attr.textColorPrimary)
-        collapsingToolbar.setCollapsedTitleTextColor(textPrimary)
-        collapsingToolbar.setExpandedTitleColor(textPrimary)
-
-        val theme = colors.theme().theme
-        donate.setBackgroundTint(theme)
-        upgrade.setBackgroundTint(theme)
-        thanksIcon.setTint(theme)
-    }
-
-    override fun render(state: PlusState) {
-        description.text = getString(R.string.qksms_plus_description_summary, state.upgradePrice)
-        upgrade.text = getString(upgradeButtonExperiment.variant, state.upgradePrice, state.currency)
-        upgradeDonate.text = getString(R.string.qksms_plus_upgrade_donate, state.upgradeDonatePrice, state.currency)
-
-        val fdroid = BuildConfig.FLAVOR == "noAnalytics"
-
-        free.setVisible(fdroid)
-        toUpgrade.setVisible(!fdroid && !state.upgraded)
-        upgraded.setVisible(!fdroid && state.upgraded)
-
-        themes.isEnabled = state.upgraded
-        schedule.isEnabled = state.upgraded
-        backup.isEnabled = state.upgraded
-        delayed.isEnabled = state.upgraded
-        night.isEnabled = state.upgraded
-    }
-
-    override fun initiatePurchaseFlow(billingManager: BillingManager, sku: String) {
-        GlobalScope.launch(Dispatchers.Main) {
-            try {
-                billingManager.initiatePurchaseFlow(this@PlusActivity, sku)
-            } catch (e: Exception) {
-                Timber.w(e)
-                makeToast(R.string.qksms_plus_error)
-            }
-        }
-    }
-
+/*
+ * Copyright (C) 2017 Moez Bhatti <moez.bhatti@gmail.com>
+ *
+ * This file is part of QKSMS.
+ *
+ * QKSMS is free software: you can redistribute it and/or modify
+ * it under the terms of the GNU General Public License as published by
+ * the Free Software Foundation, either version 3 of the License, or
+ * (at your option) any later version.
+ *
+ * QKSMS is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+ * GNU General Public License for more details.
+ *
+ * You should have received a copy of the GNU General Public License
+ * along with QKSMS.  If not, see <http://www.gnu.org/licenses/>.
+ */
+package com.moez.QKSMS.feature.plus
+
+import android.graphics.Typeface
+import android.os.Bundle
+import androidx.core.view.children
+import androidx.lifecycle.ViewModelProvider
+import androidx.lifecycle.ViewModelProviders
+import com.jakewharton.rxbinding2.view.clicks
+import com.moez.QKSMS.BuildConfig
+import com.moez.QKSMS.R
+import com.moez.QKSMS.common.base.QkThemedActivity
+import com.moez.QKSMS.common.util.FontProvider
+import com.moez.QKSMS.common.util.extensions.makeToast
+import com.moez.QKSMS.common.util.extensions.resolveThemeColor
+import com.moez.QKSMS.common.util.extensions.setBackgroundTint
+import com.moez.QKSMS.common.util.extensions.setTint
+import com.moez.QKSMS.common.util.extensions.setVisible
+import com.moez.QKSMS.common.widget.PreferenceView
+import com.moez.QKSMS.feature.plus.experiment.UpgradeButtonExperiment
+import com.moez.QKSMS.manager.BillingManager
+import dagger.android.AndroidInjection
+import kotlinx.android.synthetic.main.collapsing_toolbar.*
+import kotlinx.android.synthetic.main.preference_view.view.*
+import kotlinx.android.synthetic.main.qksms_plus_activity.*
+import kotlinx.coroutines.Dispatchers
+import kotlinx.coroutines.GlobalScope
+import kotlinx.coroutines.launch
+import timber.log.Timber
+import javax.inject.Inject
+
+class PlusActivity : QkThemedActivity(), PlusView {
+
+    @Inject lateinit var fontProvider: FontProvider
+    @Inject lateinit var upgradeButtonExperiment: UpgradeButtonExperiment
+    @Inject lateinit var viewModelFactory: ViewModelProvider.Factory
+
+    private val viewModel by lazy { ViewModelProviders.of(this, viewModelFactory)[PlusViewModel::class.java] }
+
+    override val upgradeIntent by lazy { upgrade.clicks() }
+    override val upgradeDonateIntent by lazy { upgradeDonate.clicks() }
+    override val donateIntent by lazy { donate.clicks() }
+    override val themeClicks by lazy { themes.clicks() }
+    override val scheduleClicks by lazy { schedule.clicks() }
+    override val backupClicks by lazy { backup.clicks() }
+    override val delayedClicks by lazy { delayed.clicks() }
+    override val nightClicks by lazy { night.clicks() }
+
+    override fun onCreate(savedInstanceState: Bundle?) {
+        AndroidInjection.inject(this)
+        super.onCreate(savedInstanceState)
+        setContentView(R.layout.qksms_plus_activity)
+        setTitle(R.string.title_qksms_plus)
+        showBackButton(true)
+        viewModel.bindView(this)
+
+        free.setVisible(false)
+
+        if (!prefs.systemFont.get()) {
+            fontProvider.getLato { lato ->
+                val typeface = Typeface.create(lato, Typeface.BOLD)
+                collapsingToolbar.setCollapsedTitleTypeface(typeface)
+                collapsingToolbar.setExpandedTitleTypeface(typeface)
+            }
+        }
+
+        // Make the list titles bold
+        linearLayout.children
+                .mapNotNull { it as? PreferenceView }
+                .map { it.titleView }
+                .forEach { it.setTypeface(it.typeface, Typeface.BOLD) }
+
+        val textPrimary = resolveThemeColor(android.R.attr.textColorPrimary)
+        collapsingToolbar.setCollapsedTitleTextColor(textPrimary)
+        collapsingToolbar.setExpandedTitleColor(textPrimary)
+
+        val theme = colors.theme().theme
+        donate.setBackgroundTint(theme)
+        upgrade.setBackgroundTint(theme)
+        thanksIcon.setTint(theme)
+    }
+
+    override fun render(state: PlusState) {
+        description.text = getString(R.string.qksms_plus_description_summary, state.upgradePrice)
+        upgrade.text = getString(upgradeButtonExperiment.variant, state.upgradePrice, state.currency)
+        upgradeDonate.text = getString(R.string.qksms_plus_upgrade_donate, state.upgradeDonatePrice, state.currency)
+
+        val fdroid = BuildConfig.FLAVOR == "noAnalytics"
+
+        free.setVisible(fdroid)
+        toUpgrade.setVisible(!fdroid && !state.upgraded)
+        upgraded.setVisible(!fdroid && state.upgraded)
+
+        themes.isEnabled = state.upgraded
+        schedule.isEnabled = state.upgraded
+        backup.isEnabled = state.upgraded
+        delayed.isEnabled = state.upgraded
+        night.isEnabled = state.upgraded
+    }
+
+    override fun initiatePurchaseFlow(billingManager: BillingManager, sku: String) {
+        GlobalScope.launch(Dispatchers.Main) {
+            try {
+                billingManager.initiatePurchaseFlow(this@PlusActivity, sku)
+            } catch (e: Exception) {
+                Timber.w(e)
+                makeToast(R.string.qksms_plus_error)
+            }
+        }
+    }
+
 }
\ No newline at end of file
diff --git a/presentation/src/main/java/com/moez/QKSMS/feature/plus/PlusActivityModule.kt b/presentation/src/main/java/com/moez/QKSMS/feature/plus/PlusActivityModule.kt
index 26a3fe3d2..8f9fe05ae 100644
--- a/presentation/src/main/java/com/moez/QKSMS/feature/plus/PlusActivityModule.kt
+++ b/presentation/src/main/java/com/moez/QKSMS/feature/plus/PlusActivityModule.kt
@@ -1,35 +1,35 @@
-/*
- * Copyright (C) 2017 Moez Bhatti <moez.bhatti@gmail.com>
- *
- * This file is part of QKSMS.
- *
- * QKSMS is free software: you can redistribute it and/or modify
- * it under the terms of the GNU General Public License as published by
- * the Free Software Foundation, either version 3 of the License, or
- * (at your option) any later version.
- *
- * QKSMS is distributed in the hope that it will be useful,
- * but WITHOUT ANY WARRANTY; without even the implied warranty of
- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
- * GNU General Public License for more details.
- *
- * You should have received a copy of the GNU General Public License
- * along with QKSMS.  If not, see <http://www.gnu.org/licenses/>.
- */
-package com.moez.QKSMS.feature.plus
-
-import androidx.lifecycle.ViewModel
-import com.moez.QKSMS.injection.ViewModelKey
-import dagger.Module
-import dagger.Provides
-import dagger.multibindings.IntoMap
-
-@Module
-class PlusActivityModule {
-
-    @Provides
-    @IntoMap
-    @ViewModelKey(PlusViewModel::class)
-    fun providePlusViewModel(viewModel: PlusViewModel): ViewModel = viewModel
-
+/*
+ * Copyright (C) 2017 Moez Bhatti <moez.bhatti@gmail.com>
+ *
+ * This file is part of QKSMS.
+ *
+ * QKSMS is free software: you can redistribute it and/or modify
+ * it under the terms of the GNU General Public License as published by
+ * the Free Software Foundation, either version 3 of the License, or
+ * (at your option) any later version.
+ *
+ * QKSMS is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+ * GNU General Public License for more details.
+ *
+ * You should have received a copy of the GNU General Public License
+ * along with QKSMS.  If not, see <http://www.gnu.org/licenses/>.
+ */
+package com.moez.QKSMS.feature.plus
+
+import androidx.lifecycle.ViewModel
+import com.moez.QKSMS.injection.ViewModelKey
+import dagger.Module
+import dagger.Provides
+import dagger.multibindings.IntoMap
+
+@Module
+class PlusActivityModule {
+
+    @Provides
+    @IntoMap
+    @ViewModelKey(PlusViewModel::class)
+    fun providePlusViewModel(viewModel: PlusViewModel): ViewModel = viewModel
+
 }
\ No newline at end of file
diff --git a/presentation/src/main/java/com/moez/QKSMS/feature/plus/PlusState.kt b/presentation/src/main/java/com/moez/QKSMS/feature/plus/PlusState.kt
index b3d327606..23930ae19 100644
--- a/presentation/src/main/java/com/moez/QKSMS/feature/plus/PlusState.kt
+++ b/presentation/src/main/java/com/moez/QKSMS/feature/plus/PlusState.kt
@@ -1,26 +1,26 @@
-/*
- * Copyright (C) 2017 Moez Bhatti <moez.bhatti@gmail.com>
- *
- * This file is part of QKSMS.
- *
- * QKSMS is free software: you can redistribute it and/or modify
- * it under the terms of the GNU General Public License as published by
- * the Free Software Foundation, either version 3 of the License, or
- * (at your option) any later version.
- *
- * QKSMS is distributed in the hope that it will be useful,
- * but WITHOUT ANY WARRANTY; without even the implied warranty of
- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
- * GNU General Public License for more details.
- *
- * You should have received a copy of the GNU General Public License
- * along with QKSMS.  If not, see <http://www.gnu.org/licenses/>.
- */
-package com.moez.QKSMS.feature.plus
-
-data class PlusState(
-    val upgraded: Boolean = false,
-    val upgradePrice: String = "",
-    val upgradeDonatePrice: String = "",
-    val currency: String = ""
+/*
+ * Copyright (C) 2017 Moez Bhatti <moez.bhatti@gmail.com>
+ *
+ * This file is part of QKSMS.
+ *
+ * QKSMS is free software: you can redistribute it and/or modify
+ * it under the terms of the GNU General Public License as published by
+ * the Free Software Foundation, either version 3 of the License, or
+ * (at your option) any later version.
+ *
+ * QKSMS is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+ * GNU General Public License for more details.
+ *
+ * You should have received a copy of the GNU General Public License
+ * along with QKSMS.  If not, see <http://www.gnu.org/licenses/>.
+ */
+package com.moez.QKSMS.feature.plus
+
+data class PlusState(
+    val upgraded: Boolean = false,
+    val upgradePrice: String = "",
+    val upgradeDonatePrice: String = "",
+    val currency: String = ""
 )
\ No newline at end of file
diff --git a/presentation/src/main/java/com/moez/QKSMS/feature/plus/PlusView.kt b/presentation/src/main/java/com/moez/QKSMS/feature/plus/PlusView.kt
index 261f9a4c9..0f6b60e29 100644
--- a/presentation/src/main/java/com/moez/QKSMS/feature/plus/PlusView.kt
+++ b/presentation/src/main/java/com/moez/QKSMS/feature/plus/PlusView.kt
@@ -1,38 +1,38 @@
-/*
- * Copyright (C) 2017 Moez Bhatti <moez.bhatti@gmail.com>
- *
- * This file is part of QKSMS.
- *
- * QKSMS is free software: you can redistribute it and/or modify
- * it under the terms of the GNU General Public License as published by
- * the Free Software Foundation, either version 3 of the License, or
- * (at your option) any later version.
- *
- * QKSMS is distributed in the hope that it will be useful,
- * but WITHOUT ANY WARRANTY; without even the implied warranty of
- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
- * GNU General Public License for more details.
- *
- * You should have received a copy of the GNU General Public License
- * along with QKSMS.  If not, see <http://www.gnu.org/licenses/>.
- */
-package com.moez.QKSMS.feature.plus
-
-import com.moez.QKSMS.common.base.QkView
-import com.moez.QKSMS.manager.BillingManager
-import io.reactivex.Observable
-
-interface PlusView : QkView<PlusState> {
-
-    val upgradeIntent: Observable<Unit>
-    val upgradeDonateIntent: Observable<Unit>
-    val donateIntent: Observable<*>
-    val themeClicks: Observable<*>
-    val scheduleClicks: Observable<*>
-    val backupClicks: Observable<*>
-    val delayedClicks: Observable<*>
-    val nightClicks: Observable<*>
-
-    fun initiatePurchaseFlow(billingManager: BillingManager, sku: String)
-
+/*
+ * Copyright (C) 2017 Moez Bhatti <moez.bhatti@gmail.com>
+ *
+ * This file is part of QKSMS.
+ *
+ * QKSMS is free software: you can redistribute it and/or modify
+ * it under the terms of the GNU General Public License as published by
+ * the Free Software Foundation, either version 3 of the License, or
+ * (at your option) any later version.
+ *
+ * QKSMS is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+ * GNU General Public License for more details.
+ *
+ * You should have received a copy of the GNU General Public License
+ * along with QKSMS.  If not, see <http://www.gnu.org/licenses/>.
+ */
+package com.moez.QKSMS.feature.plus
+
+import com.moez.QKSMS.common.base.QkView
+import com.moez.QKSMS.manager.BillingManager
+import io.reactivex.Observable
+
+interface PlusView : QkView<PlusState> {
+
+    val upgradeIntent: Observable<Unit>
+    val upgradeDonateIntent: Observable<Unit>
+    val donateIntent: Observable<*>
+    val themeClicks: Observable<*>
+    val scheduleClicks: Observable<*>
+    val backupClicks: Observable<*>
+    val delayedClicks: Observable<*>
+    val nightClicks: Observable<*>
+
+    fun initiatePurchaseFlow(billingManager: BillingManager, sku: String)
+
 }
\ No newline at end of file
diff --git a/presentation/src/main/java/com/moez/QKSMS/feature/plus/PlusViewModel.kt b/presentation/src/main/java/com/moez/QKSMS/feature/plus/PlusViewModel.kt
index a669dbeb8..7c5fa92be 100644
--- a/presentation/src/main/java/com/moez/QKSMS/feature/plus/PlusViewModel.kt
+++ b/presentation/src/main/java/com/moez/QKSMS/feature/plus/PlusViewModel.kt
@@ -1,87 +1,87 @@
-/*
- * Copyright (C) 2017 Moez Bhatti <moez.bhatti@gmail.com>
- *
- * This file is part of QKSMS.
- *
- * QKSMS is free software: you can redistribute it and/or modify
- * it under the terms of the GNU General Public License as published by
- * the Free Software Foundation, either version 3 of the License, or
- * (at your option) any later version.
- *
- * QKSMS is distributed in the hope that it will be useful,
- * but WITHOUT ANY WARRANTY; without even the implied warranty of
- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
- * GNU General Public License for more details.
- *
- * You should have received a copy of the GNU General Public License
- * along with QKSMS.  If not, see <http://www.gnu.org/licenses/>.
- */
-package com.moez.QKSMS.feature.plus
-
-import com.moez.QKSMS.common.Navigator
-import com.moez.QKSMS.common.base.QkViewModel
-import com.moez.QKSMS.manager.AnalyticsManager
-import com.moez.QKSMS.manager.BillingManager
-import com.uber.autodispose.android.lifecycle.scope
-import com.uber.autodispose.autoDisposable
-import io.reactivex.Observable
-import io.reactivex.rxkotlin.plusAssign
-import javax.inject.Inject
-
-class PlusViewModel @Inject constructor(
-    private val analyticsManager: AnalyticsManager,
-    private val billingManager: BillingManager,
-    private val navigator: Navigator
-) : QkViewModel<PlusView, PlusState>(PlusState()) {
-
-    init {
-        disposables += billingManager.upgradeStatus
-                .subscribe { upgraded -> newState { copy(upgraded = upgraded) } }
-
-        disposables += billingManager.products
-                .subscribe { products ->
-                    newState {
-                        val upgrade = products.firstOrNull { it.sku == BillingManager.SKU_PLUS }
-                        val upgradeDonate = products.firstOrNull { it.sku == BillingManager.SKU_PLUS_DONATE }
-                        copy(upgradePrice = upgrade?.price ?: "", upgradeDonatePrice = upgradeDonate?.price ?: "",
-                                currency = upgrade?.priceCurrencyCode ?: upgradeDonate?.priceCurrencyCode ?: "")
-                    }
-                }
-    }
-
-    override fun bindView(view: PlusView) {
-        super.bindView(view)
-
-        Observable.merge(
-                view.upgradeIntent.map { BillingManager.SKU_PLUS },
-                view.upgradeDonateIntent.map { BillingManager.SKU_PLUS_DONATE })
-                .doOnNext { sku -> analyticsManager.track("Clicked Upgrade", Pair("sku", sku)) }
-                .autoDisposable(view.scope())
-                .subscribe { sku -> view.initiatePurchaseFlow(billingManager, sku) }
-
-        view.donateIntent
-                .autoDisposable(view.scope())
-                .subscribe { navigator.showDonation() }
-
-        view.themeClicks
-                .autoDisposable(view.scope())
-                .subscribe { navigator.showSettings() }
-
-        view.scheduleClicks
-                .autoDisposable(view.scope())
-                .subscribe { navigator.showScheduled() }
-
-        view.backupClicks
-                .autoDisposable(view.scope())
-                .subscribe { navigator.showBackup() }
-
-        view.delayedClicks
-                .autoDisposable(view.scope())
-                .subscribe { navigator.showSettings() }
-
-        view.nightClicks
-                .autoDisposable(view.scope())
-                .subscribe { navigator.showSettings() }
-    }
-
-}
+/*
+ * Copyright (C) 2017 Moez Bhatti <moez.bhatti@gmail.com>
+ *
+ * This file is part of QKSMS.
+ *
+ * QKSMS is free software: you can redistribute it and/or modify
+ * it under the terms of the GNU General Public License as published by
+ * the Free Software Foundation, either version 3 of the License, or
+ * (at your option) any later version.
+ *
+ * QKSMS is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+ * GNU General Public License for more details.
+ *
+ * You should have received a copy of the GNU General Public License
+ * along with QKSMS.  If not, see <http://www.gnu.org/licenses/>.
+ */
+package com.moez.QKSMS.feature.plus
+
+import com.moez.QKSMS.common.Navigator
+import com.moez.QKSMS.common.base.QkViewModel
+import com.moez.QKSMS.manager.AnalyticsManager
+import com.moez.QKSMS.manager.BillingManager
+import com.uber.autodispose.android.lifecycle.scope
+import com.uber.autodispose.autoDisposable
+import io.reactivex.Observable
+import io.reactivex.rxkotlin.plusAssign
+import javax.inject.Inject
+
+class PlusViewModel @Inject constructor(
+    private val analyticsManager: AnalyticsManager,
+    private val billingManager: BillingManager,
+    private val navigator: Navigator
+) : QkViewModel<PlusView, PlusState>(PlusState()) {
+
+    init {
+        disposables += billingManager.upgradeStatus
+                .subscribe { upgraded -> newState { copy(upgraded = upgraded) } }
+
+        disposables += billingManager.products
+                .subscribe { products ->
+                    newState {
+                        val upgrade = products.firstOrNull { it.sku == BillingManager.SKU_PLUS }
+                        val upgradeDonate = products.firstOrNull { it.sku == BillingManager.SKU_PLUS_DONATE }
+                        copy(upgradePrice = upgrade?.price ?: "", upgradeDonatePrice = upgradeDonate?.price ?: "",
+                                currency = upgrade?.priceCurrencyCode ?: upgradeDonate?.priceCurrencyCode ?: "")
+                    }
+                }
+    }
+
+    override fun bindView(view: PlusView) {
+        super.bindView(view)
+
+        Observable.merge(
+                view.upgradeIntent.map { BillingManager.SKU_PLUS },
+                view.upgradeDonateIntent.map { BillingManager.SKU_PLUS_DONATE })
+                .doOnNext { sku -> analyticsManager.track("Clicked Upgrade", Pair("sku", sku)) }
+                .autoDisposable(view.scope())
+                .subscribe { sku -> view.initiatePurchaseFlow(billingManager, sku) }
+
+        view.donateIntent
+                .autoDisposable(view.scope())
+                .subscribe { navigator.showDonation() }
+
+        view.themeClicks
+                .autoDisposable(view.scope())
+                .subscribe { navigator.showSettings() }
+
+        view.scheduleClicks
+                .autoDisposable(view.scope())
+                .subscribe { navigator.showScheduled() }
+
+        view.backupClicks
+                .autoDisposable(view.scope())
+                .subscribe { navigator.showBackup() }
+
+        view.delayedClicks
+                .autoDisposable(view.scope())
+                .subscribe { navigator.showSettings() }
+
+        view.nightClicks
+                .autoDisposable(view.scope())
+                .subscribe { navigator.showSettings() }
+    }
+
+}
diff --git a/presentation/src/main/java/com/moez/QKSMS/feature/plus/experiment/UpgradeButtonExperiment.kt b/presentation/src/main/java/com/moez/QKSMS/feature/plus/experiment/UpgradeButtonExperiment.kt
index c954a5592..8aafae397 100644
--- a/presentation/src/main/java/com/moez/QKSMS/feature/plus/experiment/UpgradeButtonExperiment.kt
+++ b/presentation/src/main/java/com/moez/QKSMS/feature/plus/experiment/UpgradeButtonExperiment.kt
@@ -1,44 +1,44 @@
-/*
- * Copyright (C) 2017 Moez Bhatti <moez.bhatti@gmail.com>
- *
- * This file is part of QKSMS.
- *
- * QKSMS is free software: you can redistribute it and/or modify
- * it under the terms of the GNU General Public License as published by
- * the Free Software Foundation, either version 3 of the License, or
- * (at your option) any later version.
- *
- * QKSMS is distributed in the hope that it will be useful,
- * but WITHOUT ANY WARRANTY; without even the implied warranty of
- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
- * GNU General Public License for more details.
- *
- * You should have received a copy of the GNU General Public License
- * along with QKSMS.  If not, see <http://www.gnu.org/licenses/>.
- */
-package com.moez.QKSMS.feature.plus.experiment
-
-import android.content.Context
-import androidx.annotation.StringRes
-import com.moez.QKSMS.R
-import com.moez.QKSMS.experiment.Experiment
-import com.moez.QKSMS.experiment.Variant
-import com.moez.QKSMS.manager.AnalyticsManager
-import javax.inject.Inject
-
-class UpgradeButtonExperiment @Inject constructor(
-    context: Context,
-    analytics: AnalyticsManager
-) : Experiment<@StringRes Int>(context, analytics) {
-
-    override val key: String = "Upgrade Button"
-
-    override val variants: List<Variant<Int>> = listOf(
-            Variant("variant_a", R.string.qksms_plus_upgrade),
-            Variant("variant_b", R.string.qksms_plus_upgrade_b),
-            Variant("variant_c", R.string.qksms_plus_upgrade_c),
-            Variant("variant_d", R.string.qksms_plus_upgrade_d))
-
-    override val default: Int = R.string.qksms_plus_upgrade
-
+/*
+ * Copyright (C) 2017 Moez Bhatti <moez.bhatti@gmail.com>
+ *
+ * This file is part of QKSMS.
+ *
+ * QKSMS is free software: you can redistribute it and/or modify
+ * it under the terms of the GNU General Public License as published by
+ * the Free Software Foundation, either version 3 of the License, or
+ * (at your option) any later version.
+ *
+ * QKSMS is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+ * GNU General Public License for more details.
+ *
+ * You should have received a copy of the GNU General Public License
+ * along with QKSMS.  If not, see <http://www.gnu.org/licenses/>.
+ */
+package com.moez.QKSMS.feature.plus.experiment
+
+import android.content.Context
+import androidx.annotation.StringRes
+import com.moez.QKSMS.R
+import com.moez.QKSMS.experiment.Experiment
+import com.moez.QKSMS.experiment.Variant
+import com.moez.QKSMS.manager.AnalyticsManager
+import javax.inject.Inject
+
+class UpgradeButtonExperiment @Inject constructor(
+    context: Context,
+    analytics: AnalyticsManager
+) : Experiment<@StringRes Int>(context, analytics) {
+
+    override val key: String = "Upgrade Button"
+
+    override val variants: List<Variant<Int>> = listOf(
+            Variant("variant_a", R.string.qksms_plus_upgrade),
+            Variant("variant_b", R.string.qksms_plus_upgrade_b),
+            Variant("variant_c", R.string.qksms_plus_upgrade_c),
+            Variant("variant_d", R.string.qksms_plus_upgrade_d))
+
+    override val default: Int = R.string.qksms_plus_upgrade
+
 }
\ No newline at end of file
diff --git a/presentation/src/main/java/com/moez/QKSMS/feature/qkreply/QkReplyActivity.kt b/presentation/src/main/java/com/moez/QKSMS/feature/qkreply/QkReplyActivity.kt
index 392196d41..23eebf152 100644
--- a/presentation/src/main/java/com/moez/QKSMS/feature/qkreply/QkReplyActivity.kt
+++ b/presentation/src/main/java/com/moez/QKSMS/feature/qkreply/QkReplyActivity.kt
@@ -1,132 +1,132 @@
-/*
- * Copyright (C) 2017 Moez Bhatti <moez.bhatti@gmail.com>
- *
- * This file is part of QKSMS.
- *
- * QKSMS is free software: you can redistribute it and/or modify
- * it under the terms of the GNU General Public License as published by
- * the Free Software Foundation, either version 3 of the License, or
- * (at your option) any later version.
- *
- * QKSMS is distributed in the hope that it will be useful,
- * but WITHOUT ANY WARRANTY; without even the implied warranty of
- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
- * GNU General Public License for more details.
- *
- * You should have received a copy of the GNU General Public License
- * along with QKSMS.  If not, see <http://www.gnu.org/licenses/>.
- */
-package com.moez.QKSMS.feature.qkreply
-
-import android.os.Build
-import android.os.Bundle
-import android.view.Menu
-import android.view.MenuItem
-import android.view.ViewGroup
-import android.view.Window
-import android.view.WindowManager
-import androidx.lifecycle.ViewModelProvider
-import androidx.lifecycle.ViewModelProviders
-import androidx.recyclerview.widget.RecyclerView
-import com.jakewharton.rxbinding2.view.clicks
-import com.jakewharton.rxbinding2.widget.textChanges
-import com.moez.QKSMS.R
-import com.moez.QKSMS.common.base.QkThemedActivity
-import com.moez.QKSMS.common.util.extensions.autoScrollToStart
-import com.moez.QKSMS.common.util.extensions.resolveThemeColor
-import com.moez.QKSMS.common.util.extensions.setBackgroundTint
-import com.moez.QKSMS.common.util.extensions.setVisible
-import com.moez.QKSMS.feature.compose.MessagesAdapter
-import dagger.android.AndroidInjection
-import io.reactivex.subjects.PublishSubject
-import io.reactivex.subjects.Subject
-import kotlinx.android.synthetic.main.qkreply_activity.*
-import javax.inject.Inject
-
-class QkReplyActivity : QkThemedActivity(), QkReplyView {
-
-    @Inject lateinit var adapter: MessagesAdapter
-    @Inject lateinit var viewModelFactory: ViewModelProvider.Factory
-
-    override val menuItemIntent: Subject<Int> = PublishSubject.create()
-    override val textChangedIntent by lazy { message.textChanges() }
-    override val changeSimIntent by lazy { sim.clicks() }
-    override val sendIntent by lazy { send.clicks() }
-
-    private val viewModel by lazy { ViewModelProviders.of(this, viewModelFactory)[QkReplyViewModel::class.java] }
-
-    override fun onCreate(savedInstanceState: Bundle?) {
-        AndroidInjection.inject(this)
-        supportRequestWindowFeature(Window.FEATURE_NO_TITLE)
-        super.onCreate(savedInstanceState)
-
-        setFinishOnTouchOutside(prefs.qkreplyTapDismiss.get())
-        setContentView(R.layout.qkreply_activity)
-        window.setBackgroundDrawable(null)
-        window.clearFlags(WindowManager.LayoutParams.FLAG_DIM_BEHIND)
-        window.setLayout(ViewGroup.LayoutParams.MATCH_PARENT, ViewGroup.LayoutParams.WRAP_CONTENT)
-        viewModel.bindView(this)
-
-        toolbar.clipToOutline = true
-
-        messages.adapter = adapter
-        messages.adapter?.autoScrollToStart(messages)
-        messages.adapter?.registerAdapterDataObserver(object : RecyclerView.AdapterDataObserver() {
-            override fun onChanged() = messages.scrollToPosition(adapter.itemCount - 1)
-        })
-
-        // These theme attributes don't apply themselves on API 21
-        if (Build.VERSION.SDK_INT <= 22) {
-            toolbar.setBackgroundTint(resolveThemeColor(R.attr.colorPrimary))
-            background.setBackgroundTint(resolveThemeColor(android.R.attr.windowBackground))
-            messageBackground.setBackgroundTint(resolveThemeColor(R.attr.bubbleColor))
-            composeBackgroundGradient.setBackgroundTint(resolveThemeColor(android.R.attr.windowBackground))
-            composeBackgroundSolid.setBackgroundTint(resolveThemeColor(android.R.attr.windowBackground))
-        }
-    }
-
-    override fun render(state: QkReplyState) {
-        if (state.hasError) {
-            finish()
-        }
-
-        threadId.onNext(state.threadId)
-
-        title = state.title
-
-        toolbar.menu.findItem(R.id.expand)?.isVisible = !state.expanded
-        toolbar.menu.findItem(R.id.collapse)?.isVisible = state.expanded
-
-        adapter.data = state.data
-
-        counter.text = state.remaining
-        counter.setVisible(counter.text.isNotBlank())
-
-        sim.setVisible(state.subscription != null)
-        sim.contentDescription = getString(R.string.compose_sim_cd, state.subscription?.displayName)
-        simIndex.text = "${state.subscription?.simSlotIndex?.plus(1)}"
-
-        send.isEnabled = state.canSend
-        send.imageAlpha = if (state.canSend) 255 else 128
-    }
-
-    override fun setDraft(draft: String) {
-        message.setText(draft)
-    }
-
-    override fun onCreateOptionsMenu(menu: Menu?): Boolean {
-        menuInflater.inflate(R.menu.qkreply, menu)
-        return super.onCreateOptionsMenu(menu)
-    }
-
-    override fun onOptionsItemSelected(item: MenuItem): Boolean {
-        menuItemIntent.onNext(item.itemId)
-        return true
-    }
-
-    override fun getActivityThemeRes(black: Boolean) = when {
-        black -> R.style.AppThemeDialog_Black
-        else -> R.style.AppThemeDialog
-    }
-
+/*
+ * Copyright (C) 2017 Moez Bhatti <moez.bhatti@gmail.com>
+ *
+ * This file is part of QKSMS.
+ *
+ * QKSMS is free software: you can redistribute it and/or modify
+ * it under the terms of the GNU General Public License as published by
+ * the Free Software Foundation, either version 3 of the License, or
+ * (at your option) any later version.
+ *
+ * QKSMS is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+ * GNU General Public License for more details.
+ *
+ * You should have received a copy of the GNU General Public License
+ * along with QKSMS.  If not, see <http://www.gnu.org/licenses/>.
+ */
+package com.moez.QKSMS.feature.qkreply
+
+import android.os.Build
+import android.os.Bundle
+import android.view.Menu
+import android.view.MenuItem
+import android.view.ViewGroup
+import android.view.Window
+import android.view.WindowManager
+import androidx.lifecycle.ViewModelProvider
+import androidx.lifecycle.ViewModelProviders
+import androidx.recyclerview.widget.RecyclerView
+import com.jakewharton.rxbinding2.view.clicks
+import com.jakewharton.rxbinding2.widget.textChanges
+import com.moez.QKSMS.R
+import com.moez.QKSMS.common.base.QkThemedActivity
+import com.moez.QKSMS.common.util.extensions.autoScrollToStart
+import com.moez.QKSMS.common.util.extensions.resolveThemeColor
+import com.moez.QKSMS.common.util.extensions.setBackgroundTint
+import com.moez.QKSMS.common.util.extensions.setVisible
+import com.moez.QKSMS.feature.compose.MessagesAdapter
+import dagger.android.AndroidInjection
+import io.reactivex.subjects.PublishSubject
+import io.reactivex.subjects.Subject
+import kotlinx.android.synthetic.main.qkreply_activity.*
+import javax.inject.Inject
+
+class QkReplyActivity : QkThemedActivity(), QkReplyView {
+
+    @Inject lateinit var adapter: MessagesAdapter
+    @Inject lateinit var viewModelFactory: ViewModelProvider.Factory
+
+    override val menuItemIntent: Subject<Int> = PublishSubject.create()
+    override val textChangedIntent by lazy { message.textChanges() }
+    override val changeSimIntent by lazy { sim.clicks() }
+    override val sendIntent by lazy { send.clicks() }
+
+    private val viewModel by lazy { ViewModelProviders.of(this, viewModelFactory)[QkReplyViewModel::class.java] }
+
+    override fun onCreate(savedInstanceState: Bundle?) {
+        AndroidInjection.inject(this)
+        supportRequestWindowFeature(Window.FEATURE_NO_TITLE)
+        super.onCreate(savedInstanceState)
+
+        setFinishOnTouchOutside(prefs.qkreplyTapDismiss.get())
+        setContentView(R.layout.qkreply_activity)
+        window.setBackgroundDrawable(null)
+        window.clearFlags(WindowManager.LayoutParams.FLAG_DIM_BEHIND)
+        window.setLayout(ViewGroup.LayoutParams.MATCH_PARENT, ViewGroup.LayoutParams.WRAP_CONTENT)
+        viewModel.bindView(this)
+
+        toolbar.clipToOutline = true
+
+        messages.adapter = adapter
+        messages.adapter?.autoScrollToStart(messages)
+        messages.adapter?.registerAdapterDataObserver(object : RecyclerView.AdapterDataObserver() {
+            override fun onChanged() = messages.scrollToPosition(adapter.itemCount - 1)
+        })
+
+        // These theme attributes don't apply themselves on API 21
+        if (Build.VERSION.SDK_INT <= 22) {
+            toolbar.setBackgroundTint(resolveThemeColor(R.attr.colorPrimary))
+            background.setBackgroundTint(resolveThemeColor(android.R.attr.windowBackground))
+            messageBackground.setBackgroundTint(resolveThemeColor(R.attr.bubbleColor))
+            composeBackgroundGradient.setBackgroundTint(resolveThemeColor(android.R.attr.windowBackground))
+            composeBackgroundSolid.setBackgroundTint(resolveThemeColor(android.R.attr.windowBackground))
+        }
+    }
+
+    override fun render(state: QkReplyState) {
+        if (state.hasError) {
+            finish()
+        }
+
+        threadId.onNext(state.threadId)
+
+        title = state.title
+
+        toolbar.menu.findItem(R.id.expand)?.isVisible = !state.expanded
+        toolbar.menu.findItem(R.id.collapse)?.isVisible = state.expanded
+
+        adapter.data = state.data
+
+        counter.text = state.remaining
+        counter.setVisible(counter.text.isNotBlank())
+
+        sim.setVisible(state.subscription != null)
+        sim.contentDescription = getString(R.string.compose_sim_cd, state.subscription?.displayName)
+        simIndex.text = "${state.subscription?.simSlotIndex?.plus(1)}"
+
+        send.isEnabled = state.canSend
+        send.imageAlpha = if (state.canSend) 255 else 128
+    }
+
+    override fun setDraft(draft: String) {
+        message.setText(draft)
+    }
+
+    override fun onCreateOptionsMenu(menu: Menu?): Boolean {
+        menuInflater.inflate(R.menu.qkreply, menu)
+        return super.onCreateOptionsMenu(menu)
+    }
+
+    override fun onOptionsItemSelected(item: MenuItem): Boolean {
+        menuItemIntent.onNext(item.itemId)
+        return true
+    }
+
+    override fun getActivityThemeRes(black: Boolean) = when {
+        black -> R.style.AppThemeDialog_Black
+        else -> R.style.AppThemeDialog
+    }
+
 }
\ No newline at end of file
diff --git a/presentation/src/main/java/com/moez/QKSMS/feature/qkreply/QkReplyActivityModule.kt b/presentation/src/main/java/com/moez/QKSMS/feature/qkreply/QkReplyActivityModule.kt
index 53392c14a..696d1494d 100644
--- a/presentation/src/main/java/com/moez/QKSMS/feature/qkreply/QkReplyActivityModule.kt
+++ b/presentation/src/main/java/com/moez/QKSMS/feature/qkreply/QkReplyActivityModule.kt
@@ -1,40 +1,40 @@
-/*
- * Copyright (C) 2017 Moez Bhatti <moez.bhatti@gmail.com>
- *
- * This file is part of QKSMS.
- *
- * QKSMS is free software: you can redistribute it and/or modify
- * it under the terms of the GNU General Public License as published by
- * the Free Software Foundation, either version 3 of the License, or
- * (at your option) any later version.
- *
- * QKSMS is distributed in the hope that it will be useful,
- * but WITHOUT ANY WARRANTY; without even the implied warranty of
- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
- * GNU General Public License for more details.
- *
- * You should have received a copy of the GNU General Public License
- * along with QKSMS.  If not, see <http://www.gnu.org/licenses/>.
- */
-package com.moez.QKSMS.feature.qkreply
-
-import androidx.lifecycle.ViewModel
-import com.moez.QKSMS.injection.ViewModelKey
-import dagger.Module
-import dagger.Provides
-import dagger.multibindings.IntoMap
-import javax.inject.Named
-
-@Module
-class QkReplyActivityModule {
-
-    @Provides
-    @Named("threadId")
-    fun provideThreadId(activity: QkReplyActivity): Long = activity.intent.extras?.getLong("threadId") ?: 0L
-
-    @Provides
-    @IntoMap
-    @ViewModelKey(QkReplyViewModel::class)
-    fun provideQkReplyViewModel(viewModel: QkReplyViewModel): ViewModel = viewModel
-
+/*
+ * Copyright (C) 2017 Moez Bhatti <moez.bhatti@gmail.com>
+ *
+ * This file is part of QKSMS.
+ *
+ * QKSMS is free software: you can redistribute it and/or modify
+ * it under the terms of the GNU General Public License as published by
+ * the Free Software Foundation, either version 3 of the License, or
+ * (at your option) any later version.
+ *
+ * QKSMS is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+ * GNU General Public License for more details.
+ *
+ * You should have received a copy of the GNU General Public License
+ * along with QKSMS.  If not, see <http://www.gnu.org/licenses/>.
+ */
+package com.moez.QKSMS.feature.qkreply
+
+import androidx.lifecycle.ViewModel
+import com.moez.QKSMS.injection.ViewModelKey
+import dagger.Module
+import dagger.Provides
+import dagger.multibindings.IntoMap
+import javax.inject.Named
+
+@Module
+class QkReplyActivityModule {
+
+    @Provides
+    @Named("threadId")
+    fun provideThreadId(activity: QkReplyActivity): Long = activity.intent.extras?.getLong("threadId") ?: 0L
+
+    @Provides
+    @IntoMap
+    @ViewModelKey(QkReplyViewModel::class)
+    fun provideQkReplyViewModel(viewModel: QkReplyViewModel): ViewModel = viewModel
+
 }
\ No newline at end of file
diff --git a/presentation/src/main/java/com/moez/QKSMS/feature/qkreply/QkReplyState.kt b/presentation/src/main/java/com/moez/QKSMS/feature/qkreply/QkReplyState.kt
index 34dae4c97..596f2a232 100644
--- a/presentation/src/main/java/com/moez/QKSMS/feature/qkreply/QkReplyState.kt
+++ b/presentation/src/main/java/com/moez/QKSMS/feature/qkreply/QkReplyState.kt
@@ -1,35 +1,35 @@
-/*
- * Copyright (C) 2017 Moez Bhatti <moez.bhatti@gmail.com>
- *
- * This file is part of QKSMS.
- *
- * QKSMS is free software: you can redistribute it and/or modify
- * it under the terms of the GNU General Public License as published by
- * the Free Software Foundation, either version 3 of the License, or
- * (at your option) any later version.
- *
- * QKSMS is distributed in the hope that it will be useful,
- * but WITHOUT ANY WARRANTY; without even the implied warranty of
- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
- * GNU General Public License for more details.
- *
- * You should have received a copy of the GNU General Public License
- * along with QKSMS.  If not, see <http://www.gnu.org/licenses/>.
- */
-package com.moez.QKSMS.feature.qkreply
-
-import com.moez.QKSMS.compat.SubscriptionInfoCompat
-import com.moez.QKSMS.model.Conversation
-import com.moez.QKSMS.model.Message
-import io.realm.RealmResults
-
-data class QkReplyState(
-    val hasError: Boolean = false,
-    val threadId: Long = 0,
-    val title: String = "",
-    val expanded: Boolean = false,
-    val data: Pair<Conversation, RealmResults<Message>>? = null,
-    val remaining: String = "",
-    val subscription: SubscriptionInfoCompat? = null,
-    val canSend: Boolean = false
+/*
+ * Copyright (C) 2017 Moez Bhatti <moez.bhatti@gmail.com>
+ *
+ * This file is part of QKSMS.
+ *
+ * QKSMS is free software: you can redistribute it and/or modify
+ * it under the terms of the GNU General Public License as published by
+ * the Free Software Foundation, either version 3 of the License, or
+ * (at your option) any later version.
+ *
+ * QKSMS is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+ * GNU General Public License for more details.
+ *
+ * You should have received a copy of the GNU General Public License
+ * along with QKSMS.  If not, see <http://www.gnu.org/licenses/>.
+ */
+package com.moez.QKSMS.feature.qkreply
+
+import com.moez.QKSMS.compat.SubscriptionInfoCompat
+import com.moez.QKSMS.model.Conversation
+import com.moez.QKSMS.model.Message
+import io.realm.RealmResults
+
+data class QkReplyState(
+    val hasError: Boolean = false,
+    val threadId: Long = 0,
+    val title: String = "",
+    val expanded: Boolean = false,
+    val data: Pair<Conversation, RealmResults<Message>>? = null,
+    val remaining: String = "",
+    val subscription: SubscriptionInfoCompat? = null,
+    val canSend: Boolean = false
 )
\ No newline at end of file
diff --git a/presentation/src/main/java/com/moez/QKSMS/feature/qkreply/QkReplyView.kt b/presentation/src/main/java/com/moez/QKSMS/feature/qkreply/QkReplyView.kt
index 19741d0f9..800f92e01 100644
--- a/presentation/src/main/java/com/moez/QKSMS/feature/qkreply/QkReplyView.kt
+++ b/presentation/src/main/java/com/moez/QKSMS/feature/qkreply/QkReplyView.kt
@@ -1,34 +1,34 @@
-/*
- * Copyright (C) 2017 Moez Bhatti <moez.bhatti@gmail.com>
- *
- * This file is part of QKSMS.
- *
- * QKSMS is free software: you can redistribute it and/or modify
- * it under the terms of the GNU General Public License as published by
- * the Free Software Foundation, either version 3 of the License, or
- * (at your option) any later version.
- *
- * QKSMS is distributed in the hope that it will be useful,
- * but WITHOUT ANY WARRANTY; without even the implied warranty of
- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
- * GNU General Public License for more details.
- *
- * You should have received a copy of the GNU General Public License
- * along with QKSMS.  If not, see <http://www.gnu.org/licenses/>.
- */
-package com.moez.QKSMS.feature.qkreply
-
-import com.moez.QKSMS.common.base.QkView
-import io.reactivex.Observable
-
-interface QkReplyView : QkView<QkReplyState> {
-
-    val menuItemIntent: Observable<Int>
-    val textChangedIntent: Observable<CharSequence>
-    val changeSimIntent: Observable<*>
-    val sendIntent: Observable<Unit>
-
-    fun setDraft(draft: String)
-    fun finish()
-
+/*
+ * Copyright (C) 2017 Moez Bhatti <moez.bhatti@gmail.com>
+ *
+ * This file is part of QKSMS.
+ *
+ * QKSMS is free software: you can redistribute it and/or modify
+ * it under the terms of the GNU General Public License as published by
+ * the Free Software Foundation, either version 3 of the License, or
+ * (at your option) any later version.
+ *
+ * QKSMS is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+ * GNU General Public License for more details.
+ *
+ * You should have received a copy of the GNU General Public License
+ * along with QKSMS.  If not, see <http://www.gnu.org/licenses/>.
+ */
+package com.moez.QKSMS.feature.qkreply
+
+import com.moez.QKSMS.common.base.QkView
+import io.reactivex.Observable
+
+interface QkReplyView : QkView<QkReplyState> {
+
+    val menuItemIntent: Observable<Int>
+    val textChangedIntent: Observable<CharSequence>
+    val changeSimIntent: Observable<*>
+    val sendIntent: Observable<Unit>
+
+    fun setDraft(draft: String)
+    fun finish()
+
 }
\ No newline at end of file
diff --git a/presentation/src/main/java/com/moez/QKSMS/feature/qkreply/QkReplyViewModel.kt b/presentation/src/main/java/com/moez/QKSMS/feature/qkreply/QkReplyViewModel.kt
index 4ef550cd1..9d3291ee0 100644
--- a/presentation/src/main/java/com/moez/QKSMS/feature/qkreply/QkReplyViewModel.kt
+++ b/presentation/src/main/java/com/moez/QKSMS/feature/qkreply/QkReplyViewModel.kt
@@ -1,226 +1,226 @@
-/*
- * Copyright (C) 2017 Moez Bhatti <moez.bhatti@gmail.com>
- *
- * This file is part of QKSMS.
- *
- * QKSMS is free software: you can redistribute it and/or modify
- * it under the terms of the GNU General Public License as published by
- * the Free Software Foundation, either version 3 of the License, or
- * (at your option) any later version.
- *
- * QKSMS is distributed in the hope that it will be useful,
- * but WITHOUT ANY WARRANTY; without even the implied warranty of
- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
- * GNU General Public License for more details.
- *
- * You should have received a copy of the GNU General Public License
- * along with QKSMS.  If not, see <http://www.gnu.org/licenses/>.
- */
-package com.moez.QKSMS.feature.qkreply
-
-import android.telephony.SmsMessage
-import com.moez.QKSMS.R
-import com.moez.QKSMS.common.Navigator
-import com.moez.QKSMS.common.base.QkViewModel
-import com.moez.QKSMS.compat.SubscriptionManagerCompat
-import com.moez.QKSMS.extensions.asObservable
-import com.moez.QKSMS.extensions.mapNotNull
-import com.moez.QKSMS.interactor.DeleteMessages
-import com.moez.QKSMS.interactor.MarkRead
-import com.moez.QKSMS.interactor.SendMessage
-import com.moez.QKSMS.model.Message
-import com.moez.QKSMS.repository.ConversationRepository
-import com.moez.QKSMS.repository.MessageRepository
-import com.moez.QKSMS.util.ActiveSubscriptionObservable
-import com.uber.autodispose.android.lifecycle.scope
-import com.uber.autodispose.autoDisposable
-import io.reactivex.rxkotlin.Observables
-import io.reactivex.rxkotlin.plusAssign
-import io.reactivex.rxkotlin.withLatestFrom
-import io.reactivex.schedulers.Schedulers
-import io.reactivex.subjects.BehaviorSubject
-import io.reactivex.subjects.Subject
-import io.realm.RealmResults
-import java.util.concurrent.TimeUnit
-import javax.inject.Inject
-import javax.inject.Named
-
-class QkReplyViewModel @Inject constructor(
-    @Named("threadId") private val threadId: Long,
-    private val conversationRepo: ConversationRepository,
-    private val deleteMessages: DeleteMessages,
-    private val markRead: MarkRead,
-    private val messageRepo: MessageRepository,
-    private val navigator: Navigator,
-    private val sendMessage: SendMessage,
-    private val subscriptionManager: SubscriptionManagerCompat
-) : QkViewModel<QkReplyView, QkReplyState>(QkReplyState(threadId = threadId)) {
-
-    private val conversation by lazy {
-        conversationRepo.getConversationAsync(threadId)
-                .asObservable()
-                .filter { it.isLoaded }
-                .filter { it.isValid }
-                .distinctUntilChanged()
-    }
-
-    private val messages: Subject<RealmResults<Message>> =
-            BehaviorSubject.createDefault(messageRepo.getUnreadMessages(threadId))
-
-    init {
-        disposables += markRead
-        disposables += sendMessage
-
-        // When the set of messages changes, update the state
-        // If we're ever showing an empty set of messages, then it's time to shut down to activity
-        disposables += Observables
-                .combineLatest(messages, conversation) { messages, conversation ->
-                    newState { copy(data = Pair(conversation, messages)) }
-                    messages
-                }
-                .switchMap { messages -> messages.asObservable() }
-                .filter { it.isLoaded }
-                .filter { it.isValid }
-                .filter { it.isEmpty() }
-                .subscribe { newState { copy(hasError = true) } }
-
-        disposables += conversation
-                .map { conversation -> conversation.getTitle() }
-                .distinctUntilChanged()
-                .subscribe { title -> newState { copy(title = title) } }
-
-        val latestSubId = messages
-                .map { messages -> messages.lastOrNull()?.subId ?: -1 }
-                .distinctUntilChanged()
-
-        val subscriptions = ActiveSubscriptionObservable(subscriptionManager)
-        disposables += Observables.combineLatest(latestSubId, subscriptions) { subId, subs ->
-            val sub = if (subs.size > 1) subs.firstOrNull { it.subscriptionId == subId } ?: subs[0] else null
-            newState { copy(subscription = sub) }
-        }.subscribe()
-    }
-
-    override fun bindView(view: QkReplyView) {
-        super.bindView(view)
-
-        conversation
-                .map { conversation -> conversation.draft }
-                .distinctUntilChanged()
-                .autoDisposable(view.scope())
-                .subscribe { draft -> view.setDraft(draft) }
-
-        // Mark read
-        view.menuItemIntent
-                .filter { id -> id == R.id.read }
-                .autoDisposable(view.scope())
-                .subscribe {
-                    markRead.execute(listOf(threadId)) { newState { copy(hasError = true) } }
-                }
-
-        // Call
-        view.menuItemIntent
-                .filter { id -> id == R.id.call }
-                .withLatestFrom(conversation) { _, conversation -> conversation }
-                .mapNotNull { conversation -> conversation.recipients.first()?.address }
-                .doOnNext { address -> navigator.makePhoneCall(address) }
-                .autoDisposable(view.scope())
-                .subscribe { newState { copy(hasError = true) } }
-
-        // Show all messages
-        view.menuItemIntent
-                .filter { id -> id == R.id.expand }
-                .map { messageRepo.getMessages(threadId) }
-                .doOnNext(messages::onNext)
-                .autoDisposable(view.scope())
-                .subscribe { newState { copy(expanded = true) } }
-
-        // Show unread messages only
-        view.menuItemIntent
-                .filter { id -> id == R.id.collapse }
-                .map { messageRepo.getUnreadMessages(threadId) }
-                .doOnNext(messages::onNext)
-                .autoDisposable(view.scope())
-                .subscribe { newState { copy(expanded = false) } }
-
-        // Delete new messages
-        view.menuItemIntent
-                .filter { id -> id == R.id.delete }
-                .observeOn(Schedulers.io())
-                .map { messageRepo.getUnreadMessages(threadId).map { it.id } }
-                .map { messages -> DeleteMessages.Params(messages, threadId) }
-                .autoDisposable(view.scope())
-                .subscribe { deleteMessages.execute(it) { newState { copy(hasError = true) } } }
-
-        // View conversation
-        view.menuItemIntent
-                .filter { id -> id == R.id.view }
-                .doOnNext { navigator.showConversation(threadId) }
-                .autoDisposable(view.scope())
-                .subscribe { newState { copy(hasError = true) } }
-
-        // Enable the send button when there is text input into the new message body or there's
-        // an attachment, disable otherwise
-        view.textChangedIntent
-                .map { text -> text.isNotBlank() }
-                .autoDisposable(view.scope())
-                .subscribe { canSend -> newState { copy(canSend = canSend) } }
-
-        // Show the remaining character counter when necessary
-        view.textChangedIntent
-                .observeOn(Schedulers.computation())
-                .map { draft -> SmsMessage.calculateLength(draft, false) }
-                .map { array ->
-                    val messages = array[0]
-                    val remaining = array[2]
-
-                    when {
-                        messages <= 1 && remaining > 10 -> ""
-                        messages <= 1 && remaining <= 10 -> "$remaining"
-                        else -> "$remaining / $messages"
-                    }
-                }
-                .distinctUntilChanged()
-                .autoDisposable(view.scope())
-                .subscribe { remaining -> newState { copy(remaining = remaining) } }
-
-        // Update the draft whenever the text is changed
-        view.textChangedIntent
-                .debounce(100, TimeUnit.MILLISECONDS)
-                .map { draft -> draft.toString() }
-                .observeOn(Schedulers.io())
-                .autoDisposable(view.scope())
-                .subscribe { draft -> conversationRepo.saveDraft(threadId, draft) }
-
-        // Toggle to the next sim slot
-        view.changeSimIntent
-                .withLatestFrom(state) { _, state ->
-                    val subs = subscriptionManager.activeSubscriptionInfoList
-                    val subIndex = subs.indexOfFirst { it.subscriptionId == state.subscription?.subscriptionId }
-                    val subscription = when {
-                        subIndex == -1 -> null
-                        subIndex < subs.size - 1 -> subs[subIndex + 1]
-                        else -> subs[0]
-                    }
-                    newState { copy(subscription = subscription) }
-                }
-                .autoDisposable(view.scope())
-                .subscribe()
-
-        // Send a message when the send button is clicked, and disable editing mode if it's enabled
-        view.sendIntent
-                .withLatestFrom(view.textChangedIntent) { _, body -> body }
-                .map { body -> body.toString() }
-                .withLatestFrom(state, conversation) { body, state, conversation ->
-                    val subId = state.subscription?.subscriptionId ?: -1
-                    val addresses = conversation.recipients.map { it.address }
-                    sendMessage.execute(SendMessage.Params(subId, threadId, addresses, body))
-                    view.setDraft("")
-                }
-                .doOnNext {
-                    markRead.execute(listOf(threadId)) { newState { copy(hasError = true) } }
-                }
-                .autoDisposable(view.scope())
-                .subscribe()
-    }
-
-}
+/*
+ * Copyright (C) 2017 Moez Bhatti <moez.bhatti@gmail.com>
+ *
+ * This file is part of QKSMS.
+ *
+ * QKSMS is free software: you can redistribute it and/or modify
+ * it under the terms of the GNU General Public License as published by
+ * the Free Software Foundation, either version 3 of the License, or
+ * (at your option) any later version.
+ *
+ * QKSMS is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+ * GNU General Public License for more details.
+ *
+ * You should have received a copy of the GNU General Public License
+ * along with QKSMS.  If not, see <http://www.gnu.org/licenses/>.
+ */
+package com.moez.QKSMS.feature.qkreply
+
+import android.telephony.SmsMessage
+import com.moez.QKSMS.R
+import com.moez.QKSMS.common.Navigator
+import com.moez.QKSMS.common.base.QkViewModel
+import com.moez.QKSMS.compat.SubscriptionManagerCompat
+import com.moez.QKSMS.extensions.asObservable
+import com.moez.QKSMS.extensions.mapNotNull
+import com.moez.QKSMS.interactor.DeleteMessages
+import com.moez.QKSMS.interactor.MarkRead
+import com.moez.QKSMS.interactor.SendMessage
+import com.moez.QKSMS.model.Message
+import com.moez.QKSMS.repository.ConversationRepository
+import com.moez.QKSMS.repository.MessageRepository
+import com.moez.QKSMS.util.ActiveSubscriptionObservable
+import com.uber.autodispose.android.lifecycle.scope
+import com.uber.autodispose.autoDisposable
+import io.reactivex.rxkotlin.Observables
+import io.reactivex.rxkotlin.plusAssign
+import io.reactivex.rxkotlin.withLatestFrom
+import io.reactivex.schedulers.Schedulers
+import io.reactivex.subjects.BehaviorSubject
+import io.reactivex.subjects.Subject
+import io.realm.RealmResults
+import java.util.concurrent.TimeUnit
+import javax.inject.Inject
+import javax.inject.Named
+
+class QkReplyViewModel @Inject constructor(
+    @Named("threadId") private val threadId: Long,
+    private val conversationRepo: ConversationRepository,
+    private val deleteMessages: DeleteMessages,
+    private val markRead: MarkRead,
+    private val messageRepo: MessageRepository,
+    private val navigator: Navigator,
+    private val sendMessage: SendMessage,
+    private val subscriptionManager: SubscriptionManagerCompat
+) : QkViewModel<QkReplyView, QkReplyState>(QkReplyState(threadId = threadId)) {
+
+    private val conversation by lazy {
+        conversationRepo.getConversationAsync(threadId)
+                .asObservable()
+                .filter { it.isLoaded }
+                .filter { it.isValid }
+                .distinctUntilChanged()
+    }
+
+    private val messages: Subject<RealmResults<Message>> =
+            BehaviorSubject.createDefault(messageRepo.getUnreadMessages(threadId))
+
+    init {
+        disposables += markRead
+        disposables += sendMessage
+
+        // When the set of messages changes, update the state
+        // If we're ever showing an empty set of messages, then it's time to shut down to activity
+        disposables += Observables
+                .combineLatest(messages, conversation) { messages, conversation ->
+                    newState { copy(data = Pair(conversation, messages)) }
+                    messages
+                }
+                .switchMap { messages -> messages.asObservable() }
+                .filter { it.isLoaded }
+                .filter { it.isValid }
+                .filter { it.isEmpty() }
+                .subscribe { newState { copy(hasError = true) } }
+
+        disposables += conversation
+                .map { conversation -> conversation.getTitle() }
+                .distinctUntilChanged()
+                .subscribe { title -> newState { copy(title = title) } }
+
+        val latestSubId = messages
+                .map { messages -> messages.lastOrNull()?.subId ?: -1 }
+                .distinctUntilChanged()
+
+        val subscriptions = ActiveSubscriptionObservable(subscriptionManager)
+        disposables += Observables.combineLatest(latestSubId, subscriptions) { subId, subs ->
+            val sub = if (subs.size > 1) subs.firstOrNull { it.subscriptionId == subId } ?: subs[0] else null
+            newState { copy(subscription = sub) }
+        }.subscribe()
+    }
+
+    override fun bindView(view: QkReplyView) {
+        super.bindView(view)
+
+        conversation
+                .map { conversation -> conversation.draft }
+                .distinctUntilChanged()
+                .autoDisposable(view.scope())
+                .subscribe { draft -> view.setDraft(draft) }
+
+        // Mark read
+        view.menuItemIntent
+                .filter { id -> id == R.id.read }
+                .autoDisposable(view.scope())
+                .subscribe {
+                    markRead.execute(listOf(threadId)) { newState { copy(hasError = true) } }
+                }
+
+        // Call
+        view.menuItemIntent
+                .filter { id -> id == R.id.call }
+                .withLatestFrom(conversation) { _, conversation -> conversation }
+                .mapNotNull { conversation -> conversation.recipients.first()?.address }
+                .doOnNext { address -> navigator.makePhoneCall(address) }
+                .autoDisposable(view.scope())
+                .subscribe { newState { copy(hasError = true) } }
+
+        // Show all messages
+        view.menuItemIntent
+                .filter { id -> id == R.id.expand }
+                .map { messageRepo.getMessages(threadId) }
+                .doOnNext(messages::onNext)
+                .autoDisposable(view.scope())
+                .subscribe { newState { copy(expanded = true) } }
+
+        // Show unread messages only
+        view.menuItemIntent
+                .filter { id -> id == R.id.collapse }
+                .map { messageRepo.getUnreadMessages(threadId) }
+                .doOnNext(messages::onNext)
+                .autoDisposable(view.scope())
+                .subscribe { newState { copy(expanded = false) } }
+
+        // Delete new messages
+        view.menuItemIntent
+                .filter { id -> id == R.id.delete }
+                .observeOn(Schedulers.io())
+                .map { messageRepo.getUnreadMessages(threadId).map { it.id } }
+                .map { messages -> DeleteMessages.Params(messages, threadId) }
+                .autoDisposable(view.scope())
+                .subscribe { deleteMessages.execute(it) { newState { copy(hasError = true) } } }
+
+        // View conversation
+        view.menuItemIntent
+                .filter { id -> id == R.id.view }
+                .doOnNext { navigator.showConversation(threadId) }
+                .autoDisposable(view.scope())
+                .subscribe { newState { copy(hasError = true) } }
+
+        // Enable the send button when there is text input into the new message body or there's
+        // an attachment, disable otherwise
+        view.textChangedIntent
+                .map { text -> text.isNotBlank() }
+                .autoDisposable(view.scope())
+                .subscribe { canSend -> newState { copy(canSend = canSend) } }
+
+        // Show the remaining character counter when necessary
+        view.textChangedIntent
+                .observeOn(Schedulers.computation())
+                .map { draft -> SmsMessage.calculateLength(draft, false) }
+                .map { array ->
+                    val messages = array[0]
+                    val remaining = array[2]
+
+                    when {
+                        messages <= 1 && remaining > 10 -> ""
+                        messages <= 1 && remaining <= 10 -> "$remaining"
+                        else -> "$remaining / $messages"
+                    }
+                }
+                .distinctUntilChanged()
+                .autoDisposable(view.scope())
+                .subscribe { remaining -> newState { copy(remaining = remaining) } }
+
+        // Update the draft whenever the text is changed
+        view.textChangedIntent
+                .debounce(100, TimeUnit.MILLISECONDS)
+                .map { draft -> draft.toString() }
+                .observeOn(Schedulers.io())
+                .autoDisposable(view.scope())
+                .subscribe { draft -> conversationRepo.saveDraft(threadId, draft) }
+
+        // Toggle to the next sim slot
+        view.changeSimIntent
+                .withLatestFrom(state) { _, state ->
+                    val subs = subscriptionManager.activeSubscriptionInfoList
+                    val subIndex = subs.indexOfFirst { it.subscriptionId == state.subscription?.subscriptionId }
+                    val subscription = when {
+                        subIndex == -1 -> null
+                        subIndex < subs.size - 1 -> subs[subIndex + 1]
+                        else -> subs[0]
+                    }
+                    newState { copy(subscription = subscription) }
+                }
+                .autoDisposable(view.scope())
+                .subscribe()
+
+        // Send a message when the send button is clicked, and disable editing mode if it's enabled
+        view.sendIntent
+                .withLatestFrom(view.textChangedIntent) { _, body -> body }
+                .map { body -> body.toString() }
+                .withLatestFrom(state, conversation) { body, state, conversation ->
+                    val subId = state.subscription?.subscriptionId ?: -1
+                    val addresses = conversation.recipients.map { it.address }
+                    sendMessage.execute(SendMessage.Params(subId, threadId, addresses, body))
+                    view.setDraft("")
+                }
+                .doOnNext {
+                    markRead.execute(listOf(threadId)) { newState { copy(hasError = true) } }
+                }
+                .autoDisposable(view.scope())
+                .subscribe()
+    }
+
+}
diff --git a/presentation/src/main/java/com/moez/QKSMS/feature/scheduled/ScheduledActivity.kt b/presentation/src/main/java/com/moez/QKSMS/feature/scheduled/ScheduledActivity.kt
index 9bcc3af5f..47fcb094c 100644
--- a/presentation/src/main/java/com/moez/QKSMS/feature/scheduled/ScheduledActivity.kt
+++ b/presentation/src/main/java/com/moez/QKSMS/feature/scheduled/ScheduledActivity.kt
@@ -1,97 +1,97 @@
-/*
- * Copyright (C) 2017 Moez Bhatti <moez.bhatti@gmail.com>
- *
- * This file is part of QKSMS.
- *
- * QKSMS is free software: you can redistribute it and/or modify
- * it under the terms of the GNU General Public License as published by
- * the Free Software Foundation, either version 3 of the License, or
- * (at your option) any later version.
- *
- * QKSMS is distributed in the hope that it will be useful,
- * but WITHOUT ANY WARRANTY; without even the implied warranty of
- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
- * GNU General Public License for more details.
- *
- * You should have received a copy of the GNU General Public License
- * along with QKSMS.  If not, see <http://www.gnu.org/licenses/>.
- */
-package com.moez.QKSMS.feature.scheduled
-
-import android.graphics.Typeface
-import android.os.Bundle
-import androidx.core.view.isVisible
-import androidx.lifecycle.ViewModelProvider
-import androidx.lifecycle.ViewModelProviders
-import com.jakewharton.rxbinding2.view.clicks
-import com.moez.QKSMS.R
-import com.moez.QKSMS.common.QkDialog
-import com.moez.QKSMS.common.base.QkThemedActivity
-import com.moez.QKSMS.common.util.FontProvider
-import com.moez.QKSMS.common.util.extensions.setBackgroundTint
-import com.moez.QKSMS.common.util.extensions.setTint
-import dagger.android.AndroidInjection
-import kotlinx.android.synthetic.main.collapsing_toolbar.*
-import kotlinx.android.synthetic.main.scheduled_activity.*
-import javax.inject.Inject
-
-
-class ScheduledActivity : QkThemedActivity(), ScheduledView {
-
-    @Inject lateinit var dialog: QkDialog
-    @Inject lateinit var fontProvider: FontProvider
-    @Inject lateinit var messageAdapter: ScheduledMessageAdapter
-    @Inject lateinit var viewModelFactory: ViewModelProvider.Factory
-
-    override val messageClickIntent by lazy { messageAdapter.clicks }
-    override val messageMenuIntent by lazy { dialog.adapter.menuItemClicks }
-    override val composeIntent by lazy { compose.clicks() }
-    override val upgradeIntent by lazy { upgrade.clicks() }
-
-    private val viewModel by lazy { ViewModelProviders.of(this, viewModelFactory)[ScheduledViewModel::class.java] }
-
-    override fun onCreate(savedInstanceState: Bundle?) {
-        AndroidInjection.inject(this)
-        super.onCreate(savedInstanceState)
-        setContentView(R.layout.scheduled_activity)
-        setTitle(R.string.scheduled_title)
-        showBackButton(true)
-        viewModel.bindView(this)
-
-        if (!prefs.systemFont.get()) {
-            fontProvider.getLato { lato ->
-                val typeface = Typeface.create(lato, Typeface.BOLD)
-                collapsingToolbar.setCollapsedTitleTypeface(typeface)
-                collapsingToolbar.setExpandedTitleTypeface(typeface)
-            }
-        }
-
-        dialog.title = getString(R.string.scheduled_options_title)
-        dialog.adapter.setData(R.array.scheduled_options)
-
-        messageAdapter.emptyView = empty
-        messages.adapter = messageAdapter
-
-        colors.theme().let { theme ->
-            sampleMessage.setBackgroundTint(theme.theme)
-            sampleMessage.setTextColor(theme.textPrimary)
-            compose.setTint(theme.textPrimary)
-            compose.setBackgroundTint(theme.theme)
-            upgrade.setBackgroundTint(theme.theme)
-            upgradeIcon.setTint(theme.textPrimary)
-            upgradeLabel.setTextColor(theme.textPrimary)
-        }
-    }
-
-    override fun render(state: ScheduledState) {
-        messageAdapter.updateData(state.scheduledMessages)
-
-        compose.isVisible = state.upgraded
-        upgrade.isVisible = !state.upgraded
-    }
-
-    override fun showMessageOptions() {
-        dialog.show(this)
-    }
-
+/*
+ * Copyright (C) 2017 Moez Bhatti <moez.bhatti@gmail.com>
+ *
+ * This file is part of QKSMS.
+ *
+ * QKSMS is free software: you can redistribute it and/or modify
+ * it under the terms of the GNU General Public License as published by
+ * the Free Software Foundation, either version 3 of the License, or
+ * (at your option) any later version.
+ *
+ * QKSMS is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+ * GNU General Public License for more details.
+ *
+ * You should have received a copy of the GNU General Public License
+ * along with QKSMS.  If not, see <http://www.gnu.org/licenses/>.
+ */
+package com.moez.QKSMS.feature.scheduled
+
+import android.graphics.Typeface
+import android.os.Bundle
+import androidx.core.view.isVisible
+import androidx.lifecycle.ViewModelProvider
+import androidx.lifecycle.ViewModelProviders
+import com.jakewharton.rxbinding2.view.clicks
+import com.moez.QKSMS.R
+import com.moez.QKSMS.common.QkDialog
+import com.moez.QKSMS.common.base.QkThemedActivity
+import com.moez.QKSMS.common.util.FontProvider
+import com.moez.QKSMS.common.util.extensions.setBackgroundTint
+import com.moez.QKSMS.common.util.extensions.setTint
+import dagger.android.AndroidInjection
+import kotlinx.android.synthetic.main.collapsing_toolbar.*
+import kotlinx.android.synthetic.main.scheduled_activity.*
+import javax.inject.Inject
+
+
+class ScheduledActivity : QkThemedActivity(), ScheduledView {
+
+    @Inject lateinit var dialog: QkDialog
+    @Inject lateinit var fontProvider: FontProvider
+    @Inject lateinit var messageAdapter: ScheduledMessageAdapter
+    @Inject lateinit var viewModelFactory: ViewModelProvider.Factory
+
+    override val messageClickIntent by lazy { messageAdapter.clicks }
+    override val messageMenuIntent by lazy { dialog.adapter.menuItemClicks }
+    override val composeIntent by lazy { compose.clicks() }
+    override val upgradeIntent by lazy { upgrade.clicks() }
+
+    private val viewModel by lazy { ViewModelProviders.of(this, viewModelFactory)[ScheduledViewModel::class.java] }
+
+    override fun onCreate(savedInstanceState: Bundle?) {
+        AndroidInjection.inject(this)
+        super.onCreate(savedInstanceState)
+        setContentView(R.layout.scheduled_activity)
+        setTitle(R.string.scheduled_title)
+        showBackButton(true)
+        viewModel.bindView(this)
+
+        if (!prefs.systemFont.get()) {
+            fontProvider.getLato { lato ->
+                val typeface = Typeface.create(lato, Typeface.BOLD)
+                collapsingToolbar.setCollapsedTitleTypeface(typeface)
+                collapsingToolbar.setExpandedTitleTypeface(typeface)
+            }
+        }
+
+        dialog.title = getString(R.string.scheduled_options_title)
+        dialog.adapter.setData(R.array.scheduled_options)
+
+        messageAdapter.emptyView = empty
+        messages.adapter = messageAdapter
+
+        colors.theme().let { theme ->
+            sampleMessage.setBackgroundTint(theme.theme)
+            sampleMessage.setTextColor(theme.textPrimary)
+            compose.setTint(theme.textPrimary)
+            compose.setBackgroundTint(theme.theme)
+            upgrade.setBackgroundTint(theme.theme)
+            upgradeIcon.setTint(theme.textPrimary)
+            upgradeLabel.setTextColor(theme.textPrimary)
+        }
+    }
+
+    override fun render(state: ScheduledState) {
+        messageAdapter.updateData(state.scheduledMessages)
+
+        compose.isVisible = state.upgraded
+        upgrade.isVisible = !state.upgraded
+    }
+
+    override fun showMessageOptions() {
+        dialog.show(this)
+    }
+
 }
\ No newline at end of file
diff --git a/presentation/src/main/java/com/moez/QKSMS/feature/scheduled/ScheduledActivityModule.kt b/presentation/src/main/java/com/moez/QKSMS/feature/scheduled/ScheduledActivityModule.kt
index dc22a6cba..64c9494a7 100644
--- a/presentation/src/main/java/com/moez/QKSMS/feature/scheduled/ScheduledActivityModule.kt
+++ b/presentation/src/main/java/com/moez/QKSMS/feature/scheduled/ScheduledActivityModule.kt
@@ -1,35 +1,35 @@
-/*
- * Copyright (C) 2017 Moez Bhatti <moez.bhatti@gmail.com>
- *
- * This file is part of QKSMS.
- *
- * QKSMS is free software: you can redistribute it and/or modify
- * it under the terms of the GNU General Public License as published by
- * the Free Software Foundation, either version 3 of the License, or
- * (at your option) any later version.
- *
- * QKSMS is distributed in the hope that it will be useful,
- * but WITHOUT ANY WARRANTY; without even the implied warranty of
- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
- * GNU General Public License for more details.
- *
- * You should have received a copy of the GNU General Public License
- * along with QKSMS.  If not, see <http://www.gnu.org/licenses/>.
- */
-package com.moez.QKSMS.feature.scheduled
-
-import androidx.lifecycle.ViewModel
-import com.moez.QKSMS.injection.ViewModelKey
-import dagger.Module
-import dagger.Provides
-import dagger.multibindings.IntoMap
-
-@Module
-class ScheduledActivityModule {
-
-    @Provides
-    @IntoMap
-    @ViewModelKey(ScheduledViewModel::class)
-    fun provideScheduledViewModel(viewModel: ScheduledViewModel): ViewModel = viewModel
-
+/*
+ * Copyright (C) 2017 Moez Bhatti <moez.bhatti@gmail.com>
+ *
+ * This file is part of QKSMS.
+ *
+ * QKSMS is free software: you can redistribute it and/or modify
+ * it under the terms of the GNU General Public License as published by
+ * the Free Software Foundation, either version 3 of the License, or
+ * (at your option) any later version.
+ *
+ * QKSMS is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+ * GNU General Public License for more details.
+ *
+ * You should have received a copy of the GNU General Public License
+ * along with QKSMS.  If not, see <http://www.gnu.org/licenses/>.
+ */
+package com.moez.QKSMS.feature.scheduled
+
+import androidx.lifecycle.ViewModel
+import com.moez.QKSMS.injection.ViewModelKey
+import dagger.Module
+import dagger.Provides
+import dagger.multibindings.IntoMap
+
+@Module
+class ScheduledActivityModule {
+
+    @Provides
+    @IntoMap
+    @ViewModelKey(ScheduledViewModel::class)
+    fun provideScheduledViewModel(viewModel: ScheduledViewModel): ViewModel = viewModel
+
 }
\ No newline at end of file
diff --git a/presentation/src/main/java/com/moez/QKSMS/feature/scheduled/ScheduledMessageAdapter.kt b/presentation/src/main/java/com/moez/QKSMS/feature/scheduled/ScheduledMessageAdapter.kt
index 23c09227c..e2360098c 100644
--- a/presentation/src/main/java/com/moez/QKSMS/feature/scheduled/ScheduledMessageAdapter.kt
+++ b/presentation/src/main/java/com/moez/QKSMS/feature/scheduled/ScheduledMessageAdapter.kt
@@ -1,107 +1,107 @@
-/*
- * Copyright (C) 2017 Moez Bhatti <moez.bhatti@gmail.com>
- *
- * This file is part of QKSMS.
- *
- * QKSMS is free software: you can redistribute it and/or modify
- * it under the terms of the GNU General Public License as published by
- * the Free Software Foundation, either version 3 of the License, or
- * (at your option) any later version.
- *
- * QKSMS is distributed in the hope that it will be useful,
- * but WITHOUT ANY WARRANTY; without even the implied warranty of
- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
- * GNU General Public License for more details.
- *
- * You should have received a copy of the GNU General Public License
- * along with QKSMS.  If not, see <http://www.gnu.org/licenses/>.
- */
-package com.moez.QKSMS.feature.scheduled
-
-import android.content.Context
-import android.net.Uri
-import android.view.LayoutInflater
-import android.view.ViewGroup
-import androidx.core.view.isVisible
-import androidx.recyclerview.widget.RecyclerView
-import com.moez.QKSMS.R
-import com.moez.QKSMS.common.base.QkRealmAdapter
-import com.moez.QKSMS.common.base.QkViewHolder
-import com.moez.QKSMS.common.util.DateFormatter
-import com.moez.QKSMS.model.Contact
-import com.moez.QKSMS.model.Recipient
-import com.moez.QKSMS.model.ScheduledMessage
-import com.moez.QKSMS.repository.ContactRepository
-import com.moez.QKSMS.util.PhoneNumberUtils
-import io.reactivex.subjects.PublishSubject
-import io.reactivex.subjects.Subject
-import kotlinx.android.synthetic.main.scheduled_message_list_item.*
-import kotlinx.android.synthetic.main.scheduled_message_list_item.view.*
-import javax.inject.Inject
-
-class ScheduledMessageAdapter @Inject constructor(
-    private val context: Context,
-    private val contactRepo: ContactRepository,
-    private val dateFormatter: DateFormatter,
-    private val phoneNumberUtils: PhoneNumberUtils
-) : QkRealmAdapter<ScheduledMessage>() {
-
-    private val contacts by lazy { contactRepo.getContacts() }
-    private val contactCache = ContactCache()
-    private val imagesViewPool = RecyclerView.RecycledViewPool()
-
-    val clicks: Subject<Long> = PublishSubject.create()
-
-    override fun onCreateViewHolder(parent: ViewGroup, viewType: Int): QkViewHolder {
-        val view = LayoutInflater.from(parent.context).inflate(R.layout.scheduled_message_list_item, parent, false)
-
-        view.attachments.adapter = ScheduledMessageAttachmentAdapter(context)
-        view.attachments.setRecycledViewPool(imagesViewPool)
-
-        return QkViewHolder(view).apply {
-            view.setOnClickListener {
-                val message = getItem(adapterPosition) ?: return@setOnClickListener
-                clicks.onNext(message.id)
-            }
-        }
-    }
-
-    override fun onBindViewHolder(holder: QkViewHolder, position: Int) {
-        val message = getItem(position) ?: return
-
-        // GroupAvatarView only accepts recipients, so map the phone numbers to recipients
-        holder.avatars.recipients = message.recipients.map { address -> Recipient(address = address) }
-
-        holder.recipients.text = message.recipients.joinToString(",") { address ->
-            contactCache[address]?.name?.takeIf { it.isNotBlank() } ?: address
-        }
-
-        holder.date.text = dateFormatter.getScheduledTimestamp(message.date)
-        holder.body.text = message.body
-
-        val adapter = holder.attachments.adapter as ScheduledMessageAttachmentAdapter
-        adapter.data = message.attachments.map(Uri::parse)
-        holder.attachments.isVisible = message.attachments.isNotEmpty()
-    }
-
-    /**
-     * Cache the contacts in a map by the address, because the messages we're binding don't have
-     * a reference to the contact.
-     */
-    private inner class ContactCache : HashMap<String, Contact?>() {
-
-        override fun get(key: String): Contact? {
-            if (super.get(key)?.isValid != true) {
-                set(key, contacts.firstOrNull { contact ->
-                    contact.numbers.any {
-                        phoneNumberUtils.compare(it.address, key)
-                    }
-                })
-            }
-
-            return super.get(key)?.takeIf { it.isValid }
-        }
-
-    }
-
-}
+/*
+ * Copyright (C) 2017 Moez Bhatti <moez.bhatti@gmail.com>
+ *
+ * This file is part of QKSMS.
+ *
+ * QKSMS is free software: you can redistribute it and/or modify
+ * it under the terms of the GNU General Public License as published by
+ * the Free Software Foundation, either version 3 of the License, or
+ * (at your option) any later version.
+ *
+ * QKSMS is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+ * GNU General Public License for more details.
+ *
+ * You should have received a copy of the GNU General Public License
+ * along with QKSMS.  If not, see <http://www.gnu.org/licenses/>.
+ */
+package com.moez.QKSMS.feature.scheduled
+
+import android.content.Context
+import android.net.Uri
+import android.view.LayoutInflater
+import android.view.ViewGroup
+import androidx.core.view.isVisible
+import androidx.recyclerview.widget.RecyclerView
+import com.moez.QKSMS.R
+import com.moez.QKSMS.common.base.QkRealmAdapter
+import com.moez.QKSMS.common.base.QkViewHolder
+import com.moez.QKSMS.common.util.DateFormatter
+import com.moez.QKSMS.model.Contact
+import com.moez.QKSMS.model.Recipient
+import com.moez.QKSMS.model.ScheduledMessage
+import com.moez.QKSMS.repository.ContactRepository
+import com.moez.QKSMS.util.PhoneNumberUtils
+import io.reactivex.subjects.PublishSubject
+import io.reactivex.subjects.Subject
+import kotlinx.android.synthetic.main.scheduled_message_list_item.*
+import kotlinx.android.synthetic.main.scheduled_message_list_item.view.*
+import javax.inject.Inject
+
+class ScheduledMessageAdapter @Inject constructor(
+    private val context: Context,
+    private val contactRepo: ContactRepository,
+    private val dateFormatter: DateFormatter,
+    private val phoneNumberUtils: PhoneNumberUtils
+) : QkRealmAdapter<ScheduledMessage>() {
+
+    private val contacts by lazy { contactRepo.getContacts() }
+    private val contactCache = ContactCache()
+    private val imagesViewPool = RecyclerView.RecycledViewPool()
+
+    val clicks: Subject<Long> = PublishSubject.create()
+
+    override fun onCreateViewHolder(parent: ViewGroup, viewType: Int): QkViewHolder {
+        val view = LayoutInflater.from(parent.context).inflate(R.layout.scheduled_message_list_item, parent, false)
+
+        view.attachments.adapter = ScheduledMessageAttachmentAdapter(context)
+        view.attachments.setRecycledViewPool(imagesViewPool)
+
+        return QkViewHolder(view).apply {
+            view.setOnClickListener {
+                val message = getItem(adapterPosition) ?: return@setOnClickListener
+                clicks.onNext(message.id)
+            }
+        }
+    }
+
+    override fun onBindViewHolder(holder: QkViewHolder, position: Int) {
+        val message = getItem(position) ?: return
+
+        // GroupAvatarView only accepts recipients, so map the phone numbers to recipients
+        holder.avatars.recipients = message.recipients.map { address -> Recipient(address = address) }
+
+        holder.recipients.text = message.recipients.joinToString(",") { address ->
+            contactCache[address]?.name?.takeIf { it.isNotBlank() } ?: address
+        }
+
+        holder.date.text = dateFormatter.getScheduledTimestamp(message.date)
+        holder.body.text = message.body
+
+        val adapter = holder.attachments.adapter as ScheduledMessageAttachmentAdapter
+        adapter.data = message.attachments.map(Uri::parse)
+        holder.attachments.isVisible = message.attachments.isNotEmpty()
+    }
+
+    /**
+     * Cache the contacts in a map by the address, because the messages we're binding don't have
+     * a reference to the contact.
+     */
+    private inner class ContactCache : HashMap<String, Contact?>() {
+
+        override fun get(key: String): Contact? {
+            if (super.get(key)?.isValid != true) {
+                set(key, contacts.firstOrNull { contact ->
+                    contact.numbers.any {
+                        phoneNumberUtils.compare(it.address, key)
+                    }
+                })
+            }
+
+            return super.get(key)?.takeIf { it.isValid }
+        }
+
+    }
+
+}
diff --git a/presentation/src/main/java/com/moez/QKSMS/feature/scheduled/ScheduledMessageAttachmentAdapter.kt b/presentation/src/main/java/com/moez/QKSMS/feature/scheduled/ScheduledMessageAttachmentAdapter.kt
index 558c8af7a..f227eef17 100644
--- a/presentation/src/main/java/com/moez/QKSMS/feature/scheduled/ScheduledMessageAttachmentAdapter.kt
+++ b/presentation/src/main/java/com/moez/QKSMS/feature/scheduled/ScheduledMessageAttachmentAdapter.kt
@@ -1,50 +1,50 @@
-/*
- * Copyright (C) 2017 Moez Bhatti <moez.bhatti@gmail.com>
- *
- * This file is part of QKSMS.
- *
- * QKSMS is free software: you can redistribute it and/or modify
- * it under the terms of the GNU General Public License as published by
- * the Free Software Foundation, either version 3 of the License, or
- * (at your option) any later version.
- *
- * QKSMS is distributed in the hope that it will be useful,
- * but WITHOUT ANY WARRANTY; without even the implied warranty of
- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
- * GNU General Public License for more details.
- *
- * You should have received a copy of the GNU General Public License
- * along with QKSMS.  If not, see <http://www.gnu.org/licenses/>.
- */
-package com.moez.QKSMS.feature.scheduled
-
-import android.content.Context
-import android.net.Uri
-import android.view.LayoutInflater
-import android.view.ViewGroup
-import com.moez.QKSMS.R
-import com.moez.QKSMS.common.base.QkAdapter
-import com.moez.QKSMS.common.base.QkViewHolder
-import com.moez.QKSMS.util.GlideApp
-import kotlinx.android.synthetic.main.attachment_image_list_item.view.*
-import kotlinx.android.synthetic.main.scheduled_message_image_list_item.*
-import javax.inject.Inject
-
-class ScheduledMessageAttachmentAdapter @Inject constructor(
-    private val context: Context
-) : QkAdapter<Uri>() {
-
-    override fun onCreateViewHolder(parent: ViewGroup, viewType: Int): QkViewHolder {
-        val view = LayoutInflater.from(parent.context).inflate(R.layout.scheduled_message_image_list_item, parent, false)
-        view.thumbnail.clipToOutline = true
-
-        return QkViewHolder(view)
-    }
-
-    override fun onBindViewHolder(holder: QkViewHolder, position: Int) {
-        val attachment = getItem(position)
-
-        GlideApp.with(context).load(attachment).into(holder.thumbnail)
-    }
-
-}
+/*
+ * Copyright (C) 2017 Moez Bhatti <moez.bhatti@gmail.com>
+ *
+ * This file is part of QKSMS.
+ *
+ * QKSMS is free software: you can redistribute it and/or modify
+ * it under the terms of the GNU General Public License as published by
+ * the Free Software Foundation, either version 3 of the License, or
+ * (at your option) any later version.
+ *
+ * QKSMS is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+ * GNU General Public License for more details.
+ *
+ * You should have received a copy of the GNU General Public License
+ * along with QKSMS.  If not, see <http://www.gnu.org/licenses/>.
+ */
+package com.moez.QKSMS.feature.scheduled
+
+import android.content.Context
+import android.net.Uri
+import android.view.LayoutInflater
+import android.view.ViewGroup
+import com.moez.QKSMS.R
+import com.moez.QKSMS.common.base.QkAdapter
+import com.moez.QKSMS.common.base.QkViewHolder
+import com.moez.QKSMS.util.GlideApp
+import kotlinx.android.synthetic.main.attachment_image_list_item.view.*
+import kotlinx.android.synthetic.main.scheduled_message_image_list_item.*
+import javax.inject.Inject
+
+class ScheduledMessageAttachmentAdapter @Inject constructor(
+    private val context: Context
+) : QkAdapter<Uri>() {
+
+    override fun onCreateViewHolder(parent: ViewGroup, viewType: Int): QkViewHolder {
+        val view = LayoutInflater.from(parent.context).inflate(R.layout.scheduled_message_image_list_item, parent, false)
+        view.thumbnail.clipToOutline = true
+
+        return QkViewHolder(view)
+    }
+
+    override fun onBindViewHolder(holder: QkViewHolder, position: Int) {
+        val attachment = getItem(position)
+
+        GlideApp.with(context).load(attachment).into(holder.thumbnail)
+    }
+
+}
diff --git a/presentation/src/main/java/com/moez/QKSMS/feature/scheduled/ScheduledState.kt b/presentation/src/main/java/com/moez/QKSMS/feature/scheduled/ScheduledState.kt
index e5d9fac04..e6a33ede5 100644
--- a/presentation/src/main/java/com/moez/QKSMS/feature/scheduled/ScheduledState.kt
+++ b/presentation/src/main/java/com/moez/QKSMS/feature/scheduled/ScheduledState.kt
@@ -1,27 +1,27 @@
-/*
- * Copyright (C) 2017 Moez Bhatti <moez.bhatti@gmail.com>
- *
- * This file is part of QKSMS.
- *
- * QKSMS is free software: you can redistribute it and/or modify
- * it under the terms of the GNU General Public License as published by
- * the Free Software Foundation, either version 3 of the License, or
- * (at your option) any later version.
- *
- * QKSMS is distributed in the hope that it will be useful,
- * but WITHOUT ANY WARRANTY; without even the implied warranty of
- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
- * GNU General Public License for more details.
- *
- * You should have received a copy of the GNU General Public License
- * along with QKSMS.  If not, see <http://www.gnu.org/licenses/>.
- */
-package com.moez.QKSMS.feature.scheduled
-
-import com.moez.QKSMS.model.ScheduledMessage
-import io.realm.RealmResults
-
-data class ScheduledState(
-    val scheduledMessages: RealmResults<ScheduledMessage>? = null,
-    val upgraded: Boolean = false
-)
+/*
+ * Copyright (C) 2017 Moez Bhatti <moez.bhatti@gmail.com>
+ *
+ * This file is part of QKSMS.
+ *
+ * QKSMS is free software: you can redistribute it and/or modify
+ * it under the terms of the GNU General Public License as published by
+ * the Free Software Foundation, either version 3 of the License, or
+ * (at your option) any later version.
+ *
+ * QKSMS is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+ * GNU General Public License for more details.
+ *
+ * You should have received a copy of the GNU General Public License
+ * along with QKSMS.  If not, see <http://www.gnu.org/licenses/>.
+ */
+package com.moez.QKSMS.feature.scheduled
+
+import com.moez.QKSMS.model.ScheduledMessage
+import io.realm.RealmResults
+
+data class ScheduledState(
+    val scheduledMessages: RealmResults<ScheduledMessage>? = null,
+    val upgraded: Boolean = false
+)
diff --git a/presentation/src/main/java/com/moez/QKSMS/feature/scheduled/ScheduledView.kt b/presentation/src/main/java/com/moez/QKSMS/feature/scheduled/ScheduledView.kt
index 684a183e2..e00968c72 100644
--- a/presentation/src/main/java/com/moez/QKSMS/feature/scheduled/ScheduledView.kt
+++ b/presentation/src/main/java/com/moez/QKSMS/feature/scheduled/ScheduledView.kt
@@ -1,33 +1,33 @@
-/*
- * Copyright (C) 2017 Moez Bhatti <moez.bhatti@gmail.com>
- *
- * This file is part of QKSMS.
- *
- * QKSMS is free software: you can redistribute it and/or modify
- * it under the terms of the GNU General Public License as published by
- * the Free Software Foundation, either version 3 of the License, or
- * (at your option) any later version.
- *
- * QKSMS is distributed in the hope that it will be useful,
- * but WITHOUT ANY WARRANTY; without even the implied warranty of
- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
- * GNU General Public License for more details.
- *
- * You should have received a copy of the GNU General Public License
- * along with QKSMS.  If not, see <http://www.gnu.org/licenses/>.
- */
-package com.moez.QKSMS.feature.scheduled
-
-import com.moez.QKSMS.common.base.QkView
-import io.reactivex.Observable
-
-interface ScheduledView : QkView<ScheduledState> {
-
-    val messageClickIntent: Observable<Long>
-    val messageMenuIntent: Observable<Int>
-    val composeIntent: Observable<*>
-    val upgradeIntent: Observable<*>
-
-    fun showMessageOptions()
-
-}
+/*
+ * Copyright (C) 2017 Moez Bhatti <moez.bhatti@gmail.com>
+ *
+ * This file is part of QKSMS.
+ *
+ * QKSMS is free software: you can redistribute it and/or modify
+ * it under the terms of the GNU General Public License as published by
+ * the Free Software Foundation, either version 3 of the License, or
+ * (at your option) any later version.
+ *
+ * QKSMS is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+ * GNU General Public License for more details.
+ *
+ * You should have received a copy of the GNU General Public License
+ * along with QKSMS.  If not, see <http://www.gnu.org/licenses/>.
+ */
+package com.moez.QKSMS.feature.scheduled
+
+import com.moez.QKSMS.common.base.QkView
+import io.reactivex.Observable
+
+interface ScheduledView : QkView<ScheduledState> {
+
+    val messageClickIntent: Observable<Long>
+    val messageMenuIntent: Observable<Int>
+    val composeIntent: Observable<*>
+    val upgradeIntent: Observable<*>
+
+    fun showMessageOptions()
+
+}
diff --git a/presentation/src/main/java/com/moez/QKSMS/feature/scheduled/ScheduledViewModel.kt b/presentation/src/main/java/com/moez/QKSMS/feature/scheduled/ScheduledViewModel.kt
index a6b22fbdb..22c5c5b64 100644
--- a/presentation/src/main/java/com/moez/QKSMS/feature/scheduled/ScheduledViewModel.kt
+++ b/presentation/src/main/java/com/moez/QKSMS/feature/scheduled/ScheduledViewModel.kt
@@ -1,82 +1,82 @@
-/*
- * Copyright (C) 2017 Moez Bhatti <moez.bhatti@gmail.com>
- *
- * This file is part of QKSMS.
- *
- * QKSMS is free software: you can redistribute it and/or modify
- * it under the terms of the GNU General Public License as published by
- * the Free Software Foundation, either version 3 of the License, or
- * (at your option) any later version.
- *
- * QKSMS is distributed in the hope that it will be useful,
- * but WITHOUT ANY WARRANTY; without even the implied warranty of
- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
- * GNU General Public License for more details.
- *
- * You should have received a copy of the GNU General Public License
- * along with QKSMS.  If not, see <http://www.gnu.org/licenses/>.
- */
-package com.moez.QKSMS.feature.scheduled
-
-import android.content.Context
-import com.moez.QKSMS.R
-import com.moez.QKSMS.common.Navigator
-import com.moez.QKSMS.common.base.QkViewModel
-import com.moez.QKSMS.common.util.ClipboardUtils
-import com.moez.QKSMS.common.util.extensions.makeToast
-import com.moez.QKSMS.interactor.SendScheduledMessage
-import com.moez.QKSMS.manager.BillingManager
-import com.moez.QKSMS.repository.ScheduledMessageRepository
-import com.uber.autodispose.android.lifecycle.scope
-import com.uber.autodispose.autoDisposable
-import io.reactivex.rxkotlin.plusAssign
-import io.reactivex.rxkotlin.withLatestFrom
-import javax.inject.Inject
-
-class ScheduledViewModel @Inject constructor(
-    billingManager: BillingManager,
-    private val context: Context,
-    private val navigator: Navigator,
-    private val scheduledMessageRepo: ScheduledMessageRepository,
-    private val sendScheduledMessage: SendScheduledMessage
-) : QkViewModel<ScheduledView, ScheduledState>(ScheduledState(
-        scheduledMessages = scheduledMessageRepo.getScheduledMessages()
-)) {
-
-    init {
-        disposables += billingManager.upgradeStatus
-                .subscribe { upgraded -> newState { copy(upgraded = upgraded) } }
-    }
-
-    override fun bindView(view: ScheduledView) {
-        super.bindView(view)
-
-        view.messageClickIntent
-                .autoDisposable(view.scope())
-                .subscribe { view.showMessageOptions() }
-
-        view.messageMenuIntent
-                .withLatestFrom(view.messageClickIntent) { itemId, messageId ->
-                    when (itemId) {
-                        0 -> sendScheduledMessage.execute(messageId)
-                        1 -> scheduledMessageRepo.getScheduledMessage(messageId)?.let { message ->
-                            ClipboardUtils.copy(context, message.body)
-                            context.makeToast(R.string.toast_copied)
-                        }
-                        2 -> scheduledMessageRepo.deleteScheduledMessage(messageId)
-                    }
-                    Unit
-                }
-                .autoDisposable(view.scope())
-                .subscribe()
-
-        view.composeIntent
-                .autoDisposable(view.scope())
-                .subscribe { navigator.showCompose() }
-
-        view.upgradeIntent
-                .autoDisposable(view.scope())
-                .subscribe { navigator.showQksmsPlusActivity("schedule_fab") }
-    }
-
+/*
+ * Copyright (C) 2017 Moez Bhatti <moez.bhatti@gmail.com>
+ *
+ * This file is part of QKSMS.
+ *
+ * QKSMS is free software: you can redistribute it and/or modify
+ * it under the terms of the GNU General Public License as published by
+ * the Free Software Foundation, either version 3 of the License, or
+ * (at your option) any later version.
+ *
+ * QKSMS is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+ * GNU General Public License for more details.
+ *
+ * You should have received a copy of the GNU General Public License
+ * along with QKSMS.  If not, see <http://www.gnu.org/licenses/>.
+ */
+package com.moez.QKSMS.feature.scheduled
+
+import android.content.Context
+import com.moez.QKSMS.R
+import com.moez.QKSMS.common.Navigator
+import com.moez.QKSMS.common.base.QkViewModel
+import com.moez.QKSMS.common.util.ClipboardUtils
+import com.moez.QKSMS.common.util.extensions.makeToast
+import com.moez.QKSMS.interactor.SendScheduledMessage
+import com.moez.QKSMS.manager.BillingManager
+import com.moez.QKSMS.repository.ScheduledMessageRepository
+import com.uber.autodispose.android.lifecycle.scope
+import com.uber.autodispose.autoDisposable
+import io.reactivex.rxkotlin.plusAssign
+import io.reactivex.rxkotlin.withLatestFrom
+import javax.inject.Inject
+
+class ScheduledViewModel @Inject constructor(
+    billingManager: BillingManager,
+    private val context: Context,
+    private val navigator: Navigator,
+    private val scheduledMessageRepo: ScheduledMessageRepository,
+    private val sendScheduledMessage: SendScheduledMessage
+) : QkViewModel<ScheduledView, ScheduledState>(ScheduledState(
+        scheduledMessages = scheduledMessageRepo.getScheduledMessages()
+)) {
+
+    init {
+        disposables += billingManager.upgradeStatus
+                .subscribe { upgraded -> newState { copy(upgraded = upgraded) } }
+    }
+
+    override fun bindView(view: ScheduledView) {
+        super.bindView(view)
+
+        view.messageClickIntent
+                .autoDisposable(view.scope())
+                .subscribe { view.showMessageOptions() }
+
+        view.messageMenuIntent
+                .withLatestFrom(view.messageClickIntent) { itemId, messageId ->
+                    when (itemId) {
+                        0 -> sendScheduledMessage.execute(messageId)
+                        1 -> scheduledMessageRepo.getScheduledMessage(messageId)?.let { message ->
+                            ClipboardUtils.copy(context, message.body)
+                            context.makeToast(R.string.toast_copied)
+                        }
+                        2 -> scheduledMessageRepo.deleteScheduledMessage(messageId)
+                    }
+                    Unit
+                }
+                .autoDisposable(view.scope())
+                .subscribe()
+
+        view.composeIntent
+                .autoDisposable(view.scope())
+                .subscribe { navigator.showCompose() }
+
+        view.upgradeIntent
+                .autoDisposable(view.scope())
+                .subscribe { navigator.showQksmsPlusActivity("schedule_fab") }
+    }
+
 }
\ No newline at end of file
diff --git a/presentation/src/main/java/com/moez/QKSMS/feature/settings/SettingsActivity.kt b/presentation/src/main/java/com/moez/QKSMS/feature/settings/SettingsActivity.kt
index 0d2bd59ee..71791fece 100644
--- a/presentation/src/main/java/com/moez/QKSMS/feature/settings/SettingsActivity.kt
+++ b/presentation/src/main/java/com/moez/QKSMS/feature/settings/SettingsActivity.kt
@@ -1,51 +1,51 @@
-/*
- * Copyright (C) 2017 Moez Bhatti <moez.bhatti@gmail.com>
- *
- * This file is part of QKSMS.
- *
- * QKSMS is free software: you can redistribute it and/or modify
- * it under the terms of the GNU General Public License as published by
- * the Free Software Foundation, either version 3 of the License, or
- * (at your option) any later version.
- *
- * QKSMS is distributed in the hope that it will be useful,
- * but WITHOUT ANY WARRANTY; without even the implied warranty of
- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
- * GNU General Public License for more details.
- *
- * You should have received a copy of the GNU General Public License
- * along with QKSMS.  If not, see <http://www.gnu.org/licenses/>.
- */
-package com.moez.QKSMS.feature.settings
-
-import android.os.Bundle
-import com.bluelinelabs.conductor.Conductor
-import com.bluelinelabs.conductor.Router
-import com.bluelinelabs.conductor.RouterTransaction
-import com.moez.QKSMS.R
-import com.moez.QKSMS.common.base.QkThemedActivity
-import dagger.android.AndroidInjection
-import kotlinx.android.synthetic.main.container_activity.*
-
-class SettingsActivity : QkThemedActivity() {
-
-    private lateinit var router: Router
-
-    override fun onCreate(savedInstanceState: Bundle?) {
-        AndroidInjection.inject(this)
-        super.onCreate(savedInstanceState)
-        setContentView(R.layout.container_activity)
-
-        router = Conductor.attachRouter(this, container, savedInstanceState)
-        if (!router.hasRootController()) {
-            router.setRoot(RouterTransaction.with(SettingsController()))
-        }
-    }
-
-    override fun onBackPressed() {
-        if (!router.handleBack()) {
-            super.onBackPressed()
-        }
-    }
-
+/*
+ * Copyright (C) 2017 Moez Bhatti <moez.bhatti@gmail.com>
+ *
+ * This file is part of QKSMS.
+ *
+ * QKSMS is free software: you can redistribute it and/or modify
+ * it under the terms of the GNU General Public License as published by
+ * the Free Software Foundation, either version 3 of the License, or
+ * (at your option) any later version.
+ *
+ * QKSMS is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+ * GNU General Public License for more details.
+ *
+ * You should have received a copy of the GNU General Public License
+ * along with QKSMS.  If not, see <http://www.gnu.org/licenses/>.
+ */
+package com.moez.QKSMS.feature.settings
+
+import android.os.Bundle
+import com.bluelinelabs.conductor.Conductor
+import com.bluelinelabs.conductor.Router
+import com.bluelinelabs.conductor.RouterTransaction
+import com.moez.QKSMS.R
+import com.moez.QKSMS.common.base.QkThemedActivity
+import dagger.android.AndroidInjection
+import kotlinx.android.synthetic.main.container_activity.*
+
+class SettingsActivity : QkThemedActivity() {
+
+    private lateinit var router: Router
+
+    override fun onCreate(savedInstanceState: Bundle?) {
+        AndroidInjection.inject(this)
+        super.onCreate(savedInstanceState)
+        setContentView(R.layout.container_activity)
+
+        router = Conductor.attachRouter(this, container, savedInstanceState)
+        if (!router.hasRootController()) {
+            router.setRoot(RouterTransaction.with(SettingsController()))
+        }
+    }
+
+    override fun onBackPressed() {
+        if (!router.handleBack()) {
+            super.onBackPressed()
+        }
+    }
+
 }
\ No newline at end of file
diff --git a/presentation/src/main/java/com/moez/QKSMS/feature/settings/SettingsController.kt b/presentation/src/main/java/com/moez/QKSMS/feature/settings/SettingsController.kt
index f09adc3e9..c574b5bb8 100644
--- a/presentation/src/main/java/com/moez/QKSMS/feature/settings/SettingsController.kt
+++ b/presentation/src/main/java/com/moez/QKSMS/feature/settings/SettingsController.kt
@@ -1,273 +1,273 @@
-/*
- * Copyright (C) 2017 Moez Bhatti <moez.bhatti@gmail.com>
- *
- * This file is part of QKSMS.
- *
- * QKSMS is free software: you can redistribute it and/or modify
- * it under the terms of the GNU General Public License as published by
- * the Free Software Foundation, either version 3 of the License, or
- * (at your option) any later version.
- *
- * QKSMS is distributed in the hope that it will be useful,
- * but WITHOUT ANY WARRANTY; without even the implied warranty of
- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
- * GNU General Public License for more details.
- *
- * You should have received a copy of the GNU General Public License
- * along with QKSMS.  If not, see <http://www.gnu.org/licenses/>.
- */
-package com.moez.QKSMS.feature.settings
-
-import android.animation.ObjectAnimator
-import android.app.TimePickerDialog
-import android.content.Context
-import android.os.Build
-import android.text.format.DateFormat
-import android.view.View
-import androidx.appcompat.app.AlertDialog
-import androidx.core.view.isVisible
-import com.bluelinelabs.conductor.RouterTransaction
-import com.google.android.material.snackbar.Snackbar
-import com.jakewharton.rxbinding2.view.clicks
-import com.jakewharton.rxbinding2.view.longClicks
-import com.moez.QKSMS.BuildConfig
-import com.moez.QKSMS.R
-import com.moez.QKSMS.common.MenuItem
-import com.moez.QKSMS.common.QkChangeHandler
-import com.moez.QKSMS.common.QkDialog
-import com.moez.QKSMS.common.base.QkController
-import com.moez.QKSMS.common.util.Colors
-import com.moez.QKSMS.common.util.extensions.animateLayoutChanges
-import com.moez.QKSMS.common.util.extensions.setBackgroundTint
-import com.moez.QKSMS.common.util.extensions.setVisible
-import com.moez.QKSMS.common.widget.PreferenceView
-import com.moez.QKSMS.common.widget.QkSwitch
-import com.moez.QKSMS.common.widget.TextInputDialog
-import com.moez.QKSMS.feature.settings.about.AboutController
-import com.moez.QKSMS.feature.settings.autodelete.AutoDeleteDialog
-import com.moez.QKSMS.feature.settings.swipe.SwipeActionsController
-import com.moez.QKSMS.feature.themepicker.ThemePickerController
-import com.moez.QKSMS.injection.appComponent
-import com.moez.QKSMS.repository.SyncRepository
-import com.moez.QKSMS.util.Preferences
-import com.uber.autodispose.android.lifecycle.scope
-import com.uber.autodispose.autoDisposable
-import io.reactivex.Observable
-import io.reactivex.subjects.PublishSubject
-import io.reactivex.subjects.Subject
-import kotlinx.coroutines.Dispatchers
-import kotlinx.coroutines.suspendCancellableCoroutine
-import kotlinx.coroutines.withContext
-import kotlinx.android.synthetic.main.settings_controller.*
-import kotlinx.android.synthetic.main.settings_controller.view.*
-import kotlinx.android.synthetic.main.settings_switch_widget.view.*
-import kotlinx.android.synthetic.main.settings_theme_widget.*
-import javax.inject.Inject
-import kotlin.coroutines.resume
-
-class SettingsController : QkController<SettingsView, SettingsState, SettingsPresenter>(), SettingsView {
-
-    @Inject lateinit var context: Context
-    @Inject lateinit var colors: Colors
-    @Inject lateinit var nightModeDialog: QkDialog
-    @Inject lateinit var textSizeDialog: QkDialog
-    @Inject lateinit var sendDelayDialog: QkDialog
-    @Inject lateinit var mmsSizeDialog: QkDialog
-
-    @Inject override lateinit var presenter: SettingsPresenter
-
-    private val signatureDialog: TextInputDialog by lazy {
-        TextInputDialog(activity!!, context.getString(R.string.settings_signature_title), signatureSubject::onNext)
-    }
-    private val autoDeleteDialog: AutoDeleteDialog by lazy {
-        AutoDeleteDialog(activity!!, autoDeleteSubject::onNext)
-    }
-
-    private val viewQksmsPlusSubject: Subject<Unit> = PublishSubject.create()
-    private val startTimeSelectedSubject: Subject<Pair<Int, Int>> = PublishSubject.create()
-    private val endTimeSelectedSubject: Subject<Pair<Int, Int>> = PublishSubject.create()
-    private val signatureSubject: Subject<String> = PublishSubject.create()
-    private val autoDeleteSubject: Subject<Int> = PublishSubject.create()
-
-    private val progressAnimator by lazy { ObjectAnimator.ofInt(syncingProgress, "progress", 0, 0) }
-
-    init {
-        appComponent.inject(this)
-        retainViewMode = RetainViewMode.RETAIN_DETACH
-        layoutRes = R.layout.settings_controller
-
-        colors.themeObservable()
-                .autoDisposable(scope())
-                .subscribe { activity?.recreate() }
-    }
-
-    override fun onViewCreated() {
-        preferences.postDelayed({ preferences?.animateLayoutChanges = true }, 100)
-
-        when (Build.VERSION.SDK_INT >= 29) {
-            true -> nightModeDialog.adapter.setData(R.array.night_modes)
-            false -> nightModeDialog.adapter.data = context.resources.getStringArray(R.array.night_modes)
-                    .mapIndexed { index, title -> MenuItem(title, index) }
-                    .drop(1)
-        }
-        textSizeDialog.adapter.setData(R.array.text_sizes)
-        sendDelayDialog.adapter.setData(R.array.delayed_sending_labels)
-        mmsSizeDialog.adapter.setData(R.array.mms_sizes, R.array.mms_sizes_ids)
-
-        about.summary = context.getString(R.string.settings_version, BuildConfig.VERSION_NAME)
-    }
-
-    override fun onAttach(view: View) {
-        super.onAttach(view)
-        presenter.bindIntents(this)
-        setTitle(R.string.title_settings)
-        showBackButton(true)
-    }
-
-    override fun preferenceClicks(): Observable<PreferenceView> = (0 until preferences.childCount)
-            .map { index -> preferences.getChildAt(index) }
-            .mapNotNull { view -> view as? PreferenceView }
-            .map { preference -> preference.clicks().map { preference } }
-            .let { preferences -> Observable.merge(preferences) }
-
-    override fun aboutLongClicks(): Observable<*> = about.longClicks()
-
-    override fun viewQksmsPlusClicks(): Observable<*> = viewQksmsPlusSubject
-
-    override fun nightModeSelected(): Observable<Int> = nightModeDialog.adapter.menuItemClicks
-
-    override fun nightStartSelected(): Observable<Pair<Int, Int>> = startTimeSelectedSubject
-
-    override fun nightEndSelected(): Observable<Pair<Int, Int>> = endTimeSelectedSubject
-
-    override fun textSizeSelected(): Observable<Int> = textSizeDialog.adapter.menuItemClicks
-
-    override fun sendDelaySelected(): Observable<Int> = sendDelayDialog.adapter.menuItemClicks
-
-    override fun signatureChanged(): Observable<String> = signatureSubject
-
-    override fun autoDeleteChanged(): Observable<Int> = autoDeleteSubject
-
-    override fun mmsSizeSelected(): Observable<Int> = mmsSizeDialog.adapter.menuItemClicks
-
-    override fun render(state: SettingsState) {
-        themePreview.setBackgroundTint(state.theme)
-        night.summary = state.nightModeSummary
-        nightModeDialog.adapter.selectedItem = state.nightModeId
-        nightStart.setVisible(state.nightModeId == Preferences.NIGHT_MODE_AUTO)
-        nightStart.summary = state.nightStart
-        nightEnd.setVisible(state.nightModeId == Preferences.NIGHT_MODE_AUTO)
-        nightEnd.summary = state.nightEnd
-
-        black.setVisible(state.nightModeId != Preferences.NIGHT_MODE_OFF)
-        black.checkbox.isChecked = state.black
-
-        autoEmoji.checkbox.isChecked = state.autoEmojiEnabled
-
-        delayed.summary = state.sendDelaySummary
-        sendDelayDialog.adapter.selectedItem = state.sendDelayId
-
-        delivery.checkbox.isChecked = state.deliveryEnabled
-
-        signature.summary = state.signature.takeIf { it.isNotBlank() }
-                ?: context.getString(R.string.settings_signature_summary)
-
-        textSize.summary = state.textSizeSummary
-        textSizeDialog.adapter.selectedItem = state.textSizeId
-
-        autoColor.checkbox.isChecked = state.autoColor
-
-        systemFont.checkbox.isChecked = state.systemFontEnabled
-
-        unicode.checkbox.isChecked = state.stripUnicodeEnabled
-        mobileOnly.checkbox.isChecked = state.mobileOnly
-
-        autoDelete.summary = when (state.autoDelete) {
-            0 -> context.getString(R.string.settings_auto_delete_never)
-            else -> context.resources.getQuantityString(
-                    R.plurals.settings_auto_delete_summary, state.autoDelete, state.autoDelete)
-        }
-
-        longAsMms.checkbox.isChecked = state.longAsMms
-
-        mmsSize.summary = state.maxMmsSizeSummary
-        mmsSizeDialog.adapter.selectedItem = state.maxMmsSizeId
-
-        when (state.syncProgress) {
-            is SyncRepository.SyncProgress.Idle -> syncingProgress.isVisible = false
-
-            is SyncRepository.SyncProgress.Running -> {
-                syncingProgress.isVisible = true
-                syncingProgress.max = state.syncProgress.max
-                progressAnimator.apply { setIntValues(syncingProgress.progress, state.syncProgress.progress) }.start()
-                syncingProgress.isIndeterminate = state.syncProgress.indeterminate
-            }
-        }
-    }
-
-    override fun showQksmsPlusSnackbar() {
-        view?.run {
-            Snackbar.make(contentView, R.string.toast_qksms_plus, Snackbar.LENGTH_LONG).run {
-                setAction(R.string.button_more) { viewQksmsPlusSubject.onNext(Unit) }
-                setActionTextColor(colors.theme().theme)
-                show()
-            }
-        }
-    }
-
-    // TODO change this to a PopupWindow
-    override fun showNightModeDialog() = nightModeDialog.show(activity!!)
-
-    override fun showStartTimePicker(hour: Int, minute: Int) {
-        TimePickerDialog(activity, { _, newHour, newMinute ->
-            startTimeSelectedSubject.onNext(Pair(newHour, newMinute))
-        }, hour, minute, DateFormat.is24HourFormat(activity)).show()
-    }
-
-    override fun showEndTimePicker(hour: Int, minute: Int) {
-        TimePickerDialog(activity, { _, newHour, newMinute ->
-            endTimeSelectedSubject.onNext(Pair(newHour, newMinute))
-        }, hour, minute, DateFormat.is24HourFormat(activity)).show()
-    }
-
-    override fun showTextSizePicker() = textSizeDialog.show(activity!!)
-
-    override fun showDelayDurationDialog() = sendDelayDialog.show(activity!!)
-
-    override fun showSignatureDialog(signature: String) = signatureDialog.setText(signature).show()
-
-    override fun showAutoDeleteDialog(days: Int) = autoDeleteDialog.setExpiry(days).show()
-
-    override suspend fun showAutoDeleteWarningDialog(messages: Int): Boolean = withContext(Dispatchers.Main) {
-        suspendCancellableCoroutine<Boolean> { cont ->
-            AlertDialog.Builder(activity!!)
-                    .setTitle(R.string.settings_auto_delete_warning)
-                    .setMessage(context.resources.getString(R.string.settings_auto_delete_warning_message, messages))
-                    .setOnCancelListener { cont.resume(false) }
-                    .setNegativeButton(R.string.button_cancel) { _, _ -> cont.resume(false) }
-                    .setPositiveButton(R.string.button_yes) { _, _ -> cont.resume(true) }
-                    .show()
-        }
-    }
-
-    override fun showMmsSizePicker() = mmsSizeDialog.show(activity!!)
-
-    override fun showSwipeActions() {
-        router.pushController(RouterTransaction.with(SwipeActionsController())
-                .pushChangeHandler(QkChangeHandler())
-                .popChangeHandler(QkChangeHandler()))
-    }
-
-    override fun showThemePicker() {
-        router.pushController(RouterTransaction.with(ThemePickerController())
-                .pushChangeHandler(QkChangeHandler())
-                .popChangeHandler(QkChangeHandler()))
-    }
-
-    override fun showAbout() {
-        router.pushController(RouterTransaction.with(AboutController())
-                .pushChangeHandler(QkChangeHandler())
-                .popChangeHandler(QkChangeHandler()))
-    }
-
+/*
+ * Copyright (C) 2017 Moez Bhatti <moez.bhatti@gmail.com>
+ *
+ * This file is part of QKSMS.
+ *
+ * QKSMS is free software: you can redistribute it and/or modify
+ * it under the terms of the GNU General Public License as published by
+ * the Free Software Foundation, either version 3 of the License, or
+ * (at your option) any later version.
+ *
+ * QKSMS is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+ * GNU General Public License for more details.
+ *
+ * You should have received a copy of the GNU General Public License
+ * along with QKSMS.  If not, see <http://www.gnu.org/licenses/>.
+ */
+package com.moez.QKSMS.feature.settings
+
+import android.animation.ObjectAnimator
+import android.app.TimePickerDialog
+import android.content.Context
+import android.os.Build
+import android.text.format.DateFormat
+import android.view.View
+import androidx.appcompat.app.AlertDialog
+import androidx.core.view.isVisible
+import com.bluelinelabs.conductor.RouterTransaction
+import com.google.android.material.snackbar.Snackbar
+import com.jakewharton.rxbinding2.view.clicks
+import com.jakewharton.rxbinding2.view.longClicks
+import com.moez.QKSMS.BuildConfig
+import com.moez.QKSMS.R
+import com.moez.QKSMS.common.MenuItem
+import com.moez.QKSMS.common.QkChangeHandler
+import com.moez.QKSMS.common.QkDialog
+import com.moez.QKSMS.common.base.QkController
+import com.moez.QKSMS.common.util.Colors
+import com.moez.QKSMS.common.util.extensions.animateLayoutChanges
+import com.moez.QKSMS.common.util.extensions.setBackgroundTint
+import com.moez.QKSMS.common.util.extensions.setVisible
+import com.moez.QKSMS.common.widget.PreferenceView
+import com.moez.QKSMS.common.widget.QkSwitch
+import com.moez.QKSMS.common.widget.TextInputDialog
+import com.moez.QKSMS.feature.settings.about.AboutController
+import com.moez.QKSMS.feature.settings.autodelete.AutoDeleteDialog
+import com.moez.QKSMS.feature.settings.swipe.SwipeActionsController
+import com.moez.QKSMS.feature.themepicker.ThemePickerController
+import com.moez.QKSMS.injection.appComponent
+import com.moez.QKSMS.repository.SyncRepository
+import com.moez.QKSMS.util.Preferences
+import com.uber.autodispose.android.lifecycle.scope
+import com.uber.autodispose.autoDisposable
+import io.reactivex.Observable
+import io.reactivex.subjects.PublishSubject
+import io.reactivex.subjects.Subject
+import kotlinx.coroutines.Dispatchers
+import kotlinx.coroutines.suspendCancellableCoroutine
+import kotlinx.coroutines.withContext
+import kotlinx.android.synthetic.main.settings_controller.*
+import kotlinx.android.synthetic.main.settings_controller.view.*
+import kotlinx.android.synthetic.main.settings_switch_widget.view.*
+import kotlinx.android.synthetic.main.settings_theme_widget.*
+import javax.inject.Inject
+import kotlin.coroutines.resume
+
+class SettingsController : QkController<SettingsView, SettingsState, SettingsPresenter>(), SettingsView {
+
+    @Inject lateinit var context: Context
+    @Inject lateinit var colors: Colors
+    @Inject lateinit var nightModeDialog: QkDialog
+    @Inject lateinit var textSizeDialog: QkDialog
+    @Inject lateinit var sendDelayDialog: QkDialog
+    @Inject lateinit var mmsSizeDialog: QkDialog
+
+    @Inject override lateinit var presenter: SettingsPresenter
+
+    private val signatureDialog: TextInputDialog by lazy {
+        TextInputDialog(activity!!, context.getString(R.string.settings_signature_title), signatureSubject::onNext)
+    }
+    private val autoDeleteDialog: AutoDeleteDialog by lazy {
+        AutoDeleteDialog(activity!!, autoDeleteSubject::onNext)
+    }
+
+    private val viewQksmsPlusSubject: Subject<Unit> = PublishSubject.create()
+    private val startTimeSelectedSubject: Subject<Pair<Int, Int>> = PublishSubject.create()
+    private val endTimeSelectedSubject: Subject<Pair<Int, Int>> = PublishSubject.create()
+    private val signatureSubject: Subject<String> = PublishSubject.create()
+    private val autoDeleteSubject: Subject<Int> = PublishSubject.create()
+
+    private val progressAnimator by lazy { ObjectAnimator.ofInt(syncingProgress, "progress", 0, 0) }
+
+    init {
+        appComponent.inject(this)
+        retainViewMode = RetainViewMode.RETAIN_DETACH
+        layoutRes = R.layout.settings_controller
+
+        colors.themeObservable()
+                .autoDisposable(scope())
+                .subscribe { activity?.recreate() }
+    }
+
+    override fun onViewCreated() {
+        preferences.postDelayed({ preferences?.animateLayoutChanges = true }, 100)
+
+        when (Build.VERSION.SDK_INT >= 29) {
+            true -> nightModeDialog.adapter.setData(R.array.night_modes)
+            false -> nightModeDialog.adapter.data = context.resources.getStringArray(R.array.night_modes)
+                    .mapIndexed { index, title -> MenuItem(title, index) }
+                    .drop(1)
+        }
+        textSizeDialog.adapter.setData(R.array.text_sizes)
+        sendDelayDialog.adapter.setData(R.array.delayed_sending_labels)
+        mmsSizeDialog.adapter.setData(R.array.mms_sizes, R.array.mms_sizes_ids)
+
+        about.summary = context.getString(R.string.settings_version, BuildConfig.VERSION_NAME)
+    }
+
+    override fun onAttach(view: View) {
+        super.onAttach(view)
+        presenter.bindIntents(this)
+        setTitle(R.string.title_settings)
+        showBackButton(true)
+    }
+
+    override fun preferenceClicks(): Observable<PreferenceView> = (0 until preferences.childCount)
+            .map { index -> preferences.getChildAt(index) }
+            .mapNotNull { view -> view as? PreferenceView }
+            .map { preference -> preference.clicks().map { preference } }
+            .let { preferences -> Observable.merge(preferences) }
+
+    override fun aboutLongClicks(): Observable<*> = about.longClicks()
+
+    override fun viewQksmsPlusClicks(): Observable<*> = viewQksmsPlusSubject
+
+    override fun nightModeSelected(): Observable<Int> = nightModeDialog.adapter.menuItemClicks
+
+    override fun nightStartSelected(): Observable<Pair<Int, Int>> = startTimeSelectedSubject
+
+    override fun nightEndSelected(): Observable<Pair<Int, Int>> = endTimeSelectedSubject
+
+    override fun textSizeSelected(): Observable<Int> = textSizeDialog.adapter.menuItemClicks
+
+    override fun sendDelaySelected(): Observable<Int> = sendDelayDialog.adapter.menuItemClicks
+
+    override fun signatureChanged(): Observable<String> = signatureSubject
+
+    override fun autoDeleteChanged(): Observable<Int> = autoDeleteSubject
+
+    override fun mmsSizeSelected(): Observable<Int> = mmsSizeDialog.adapter.menuItemClicks
+
+    override fun render(state: SettingsState) {
+        themePreview.setBackgroundTint(state.theme)
+        night.summary = state.nightModeSummary
+        nightModeDialog.adapter.selectedItem = state.nightModeId
+        nightStart.setVisible(state.nightModeId == Preferences.NIGHT_MODE_AUTO)
+        nightStart.summary = state.nightStart
+        nightEnd.setVisible(state.nightModeId == Preferences.NIGHT_MODE_AUTO)
+        nightEnd.summary = state.nightEnd
+
+        black.setVisible(state.nightModeId != Preferences.NIGHT_MODE_OFF)
+        black.checkbox.isChecked = state.black
+
+        autoEmoji.checkbox.isChecked = state.autoEmojiEnabled
+
+        delayed.summary = state.sendDelaySummary
+        sendDelayDialog.adapter.selectedItem = state.sendDelayId
+
+        delivery.checkbox.isChecked = state.deliveryEnabled
+
+        signature.summary = state.signature.takeIf { it.isNotBlank() }
+                ?: context.getString(R.string.settings_signature_summary)
+
+        textSize.summary = state.textSizeSummary
+        textSizeDialog.adapter.selectedItem = state.textSizeId
+
+        autoColor.checkbox.isChecked = state.autoColor
+
+        systemFont.checkbox.isChecked = state.systemFontEnabled
+
+        unicode.checkbox.isChecked = state.stripUnicodeEnabled
+        mobileOnly.checkbox.isChecked = state.mobileOnly
+
+        autoDelete.summary = when (state.autoDelete) {
+            0 -> context.getString(R.string.settings_auto_delete_never)
+            else -> context.resources.getQuantityString(
+                    R.plurals.settings_auto_delete_summary, state.autoDelete, state.autoDelete)
+        }
+
+        longAsMms.checkbox.isChecked = state.longAsMms
+
+        mmsSize.summary = state.maxMmsSizeSummary
+        mmsSizeDialog.adapter.selectedItem = state.maxMmsSizeId
+
+        when (state.syncProgress) {
+            is SyncRepository.SyncProgress.Idle -> syncingProgress.isVisible = false
+
+            is SyncRepository.SyncProgress.Running -> {
+                syncingProgress.isVisible = true
+                syncingProgress.max = state.syncProgress.max
+                progressAnimator.apply { setIntValues(syncingProgress.progress, state.syncProgress.progress) }.start()
+                syncingProgress.isIndeterminate = state.syncProgress.indeterminate
+            }
+        }
+    }
+
+    override fun showQksmsPlusSnackbar() {
+        view?.run {
+            Snackbar.make(contentView, R.string.toast_qksms_plus, Snackbar.LENGTH_LONG).run {
+                setAction(R.string.button_more) { viewQksmsPlusSubject.onNext(Unit) }
+                setActionTextColor(colors.theme().theme)
+                show()
+            }
+        }
+    }
+
+    // TODO change this to a PopupWindow
+    override fun showNightModeDialog() = nightModeDialog.show(activity!!)
+
+    override fun showStartTimePicker(hour: Int, minute: Int) {
+        TimePickerDialog(activity, { _, newHour, newMinute ->
+            startTimeSelectedSubject.onNext(Pair(newHour, newMinute))
+        }, hour, minute, DateFormat.is24HourFormat(activity)).show()
+    }
+
+    override fun showEndTimePicker(hour: Int, minute: Int) {
+        TimePickerDialog(activity, { _, newHour, newMinute ->
+            endTimeSelectedSubject.onNext(Pair(newHour, newMinute))
+        }, hour, minute, DateFormat.is24HourFormat(activity)).show()
+    }
+
+    override fun showTextSizePicker() = textSizeDialog.show(activity!!)
+
+    override fun showDelayDurationDialog() = sendDelayDialog.show(activity!!)
+
+    override fun showSignatureDialog(signature: String) = signatureDialog.setText(signature).show()
+
+    override fun showAutoDeleteDialog(days: Int) = autoDeleteDialog.setExpiry(days).show()
+
+    override suspend fun showAutoDeleteWarningDialog(messages: Int): Boolean = withContext(Dispatchers.Main) {
+        suspendCancellableCoroutine<Boolean> { cont ->
+            AlertDialog.Builder(activity!!)
+                    .setTitle(R.string.settings_auto_delete_warning)
+                    .setMessage(context.resources.getString(R.string.settings_auto_delete_warning_message, messages))
+                    .setOnCancelListener { cont.resume(false) }
+                    .setNegativeButton(R.string.button_cancel) { _, _ -> cont.resume(false) }
+                    .setPositiveButton(R.string.button_yes) { _, _ -> cont.resume(true) }
+                    .show()
+        }
+    }
+
+    override fun showMmsSizePicker() = mmsSizeDialog.show(activity!!)
+
+    override fun showSwipeActions() {
+        router.pushController(RouterTransaction.with(SwipeActionsController())
+                .pushChangeHandler(QkChangeHandler())
+                .popChangeHandler(QkChangeHandler()))
+    }
+
+    override fun showThemePicker() {
+        router.pushController(RouterTransaction.with(ThemePickerController())
+                .pushChangeHandler(QkChangeHandler())
+                .popChangeHandler(QkChangeHandler()))
+    }
+
+    override fun showAbout() {
+        router.pushController(RouterTransaction.with(AboutController())
+                .pushChangeHandler(QkChangeHandler())
+                .popChangeHandler(QkChangeHandler()))
+    }
+
 }
\ No newline at end of file
diff --git a/presentation/src/main/java/com/moez/QKSMS/feature/settings/SettingsPresenter.kt b/presentation/src/main/java/com/moez/QKSMS/feature/settings/SettingsPresenter.kt
index ba58580bc..9798d9429 100644
--- a/presentation/src/main/java/com/moez/QKSMS/feature/settings/SettingsPresenter.kt
+++ b/presentation/src/main/java/com/moez/QKSMS/feature/settings/SettingsPresenter.kt
@@ -1,294 +1,294 @@
-/*
- * Copyright (C) 2017 Moez Bhatti <moez.bhatti@gmail.com>
- *
- * This file is part of QKSMS.
- *
- * QKSMS is free software: you can redistribute it and/or modify
- * it under the terms of the GNU General Public License as published by
- * the Free Software Foundation, either version 3 of the License, or
- * (at your option) any later version.
- *
- * QKSMS is distributed in the hope that it will be useful,
- * but WITHOUT ANY WARRANTY; without even the implied warranty of
- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
- * GNU General Public License for more details.
- *
- * You should have received a copy of the GNU General Public License
- * along with QKSMS.  If not, see <http://www.gnu.org/licenses/>.
- */
-package com.moez.QKSMS.feature.settings
-
-import android.content.Context
-import com.moez.QKSMS.R
-import com.moez.QKSMS.common.Navigator
-import com.moez.QKSMS.common.base.QkPresenter
-import com.moez.QKSMS.common.util.Colors
-import com.moez.QKSMS.common.util.DateFormatter
-import com.moez.QKSMS.common.util.extensions.makeToast
-import com.moez.QKSMS.interactor.DeleteOldMessages
-import com.moez.QKSMS.interactor.SyncMessages
-import com.moez.QKSMS.manager.AnalyticsManager
-import com.moez.QKSMS.manager.BillingManager
-import com.moez.QKSMS.repository.MessageRepository
-import com.moez.QKSMS.repository.SyncRepository
-import com.moez.QKSMS.service.AutoDeleteService
-import com.moez.QKSMS.util.NightModeManager
-import com.moez.QKSMS.util.Preferences
-import com.uber.autodispose.android.lifecycle.scope
-import com.uber.autodispose.autoDisposable
-import io.reactivex.rxkotlin.plusAssign
-import io.reactivex.rxkotlin.withLatestFrom
-import io.reactivex.schedulers.Schedulers
-import kotlinx.coroutines.runBlocking
-import timber.log.Timber
-import java.util.*
-import java.util.concurrent.TimeUnit
-import javax.inject.Inject
-
-class SettingsPresenter @Inject constructor(
-    colors: Colors,
-    syncRepo: SyncRepository,
-    private val analytics: AnalyticsManager,
-    private val context: Context,
-    private val billingManager: BillingManager,
-    private val dateFormatter: DateFormatter,
-    private val deleteOldMessages: DeleteOldMessages,
-    private val messageRepo: MessageRepository,
-    private val navigator: Navigator,
-    private val nightModeManager: NightModeManager,
-    private val prefs: Preferences,
-    private val syncMessages: SyncMessages
-) : QkPresenter<SettingsView, SettingsState>(SettingsState(
-        nightModeId = prefs.nightMode.get()
-)) {
-
-    init {
-        disposables += colors.themeObservable()
-                .subscribe { theme -> newState { copy(theme = theme.theme) } }
-
-        val nightModeLabels = context.resources.getStringArray(R.array.night_modes)
-        disposables += prefs.nightMode.asObservable()
-                .subscribe { nightMode ->
-                    newState { copy(nightModeSummary = nightModeLabels[nightMode], nightModeId = nightMode) }
-                }
-
-        disposables += prefs.nightStart.asObservable()
-                .map { time -> nightModeManager.parseTime(time) }
-                .map { calendar -> calendar.timeInMillis }
-                .map { millis -> dateFormatter.getTimestamp(millis) }
-                .subscribe { nightStart -> newState { copy(nightStart = nightStart) } }
-
-        disposables += prefs.nightEnd.asObservable()
-                .map { time -> nightModeManager.parseTime(time) }
-                .map { calendar -> calendar.timeInMillis }
-                .map { millis -> dateFormatter.getTimestamp(millis) }
-                .subscribe { nightEnd -> newState { copy(nightEnd = nightEnd) } }
-
-        disposables += prefs.black.asObservable()
-                .subscribe { black -> newState { copy(black = black) } }
-
-        disposables += prefs.notifications().asObservable()
-                .subscribe { enabled -> newState { copy(notificationsEnabled = enabled) } }
-
-        disposables += prefs.autoEmoji.asObservable()
-                .subscribe { enabled -> newState { copy(autoEmojiEnabled = enabled) } }
-
-        val delayedSendingLabels = context.resources.getStringArray(R.array.delayed_sending_labels)
-        disposables += prefs.sendDelay.asObservable()
-                .subscribe { id -> newState { copy(sendDelaySummary = delayedSendingLabels[id], sendDelayId = id) } }
-
-        disposables += prefs.delivery.asObservable()
-                .subscribe { enabled -> newState { copy(deliveryEnabled = enabled) } }
-
-        disposables += prefs.signature.asObservable()
-                .subscribe { signature -> newState { copy(signature = signature) } }
-
-        val textSizeLabels = context.resources.getStringArray(R.array.text_sizes)
-        disposables += prefs.textSize.asObservable()
-                .subscribe { textSize ->
-                    newState { copy(textSizeSummary = textSizeLabels[textSize], textSizeId = textSize) }
-                }
-
-        disposables += prefs.autoColor.asObservable()
-                .subscribe { autoColor -> newState { copy(autoColor = autoColor) } }
-
-        disposables += prefs.systemFont.asObservable()
-                .subscribe { enabled -> newState { copy(systemFontEnabled = enabled) } }
-
-        disposables += prefs.unicode.asObservable()
-                .subscribe { enabled -> newState { copy(stripUnicodeEnabled = enabled) } }
-
-        disposables += prefs.mobileOnly.asObservable()
-                .subscribe { enabled -> newState { copy(mobileOnly = enabled) } }
-
-        disposables += prefs.autoDelete.asObservable()
-                .subscribe { autoDelete -> newState { copy(autoDelete = autoDelete) } }
-
-        disposables += prefs.longAsMms.asObservable()
-                .subscribe { enabled -> newState { copy(longAsMms = enabled) } }
-
-        val mmsSizeLabels = context.resources.getStringArray(R.array.mms_sizes)
-        val mmsSizeIds = context.resources.getIntArray(R.array.mms_sizes_ids)
-        disposables += prefs.mmsSize.asObservable()
-                .subscribe { maxMmsSize ->
-                    val index = mmsSizeIds.indexOf(maxMmsSize)
-                    newState { copy(maxMmsSizeSummary = mmsSizeLabels[index], maxMmsSizeId = maxMmsSize) }
-                }
-
-        disposables += syncRepo.syncProgress
-                .sample(16, TimeUnit.MILLISECONDS)
-                .distinctUntilChanged()
-                .subscribe { syncProgress -> newState { copy(syncProgress = syncProgress) } }
-
-        disposables += syncMessages
-    }
-
-    override fun bindIntents(view: SettingsView) {
-        super.bindIntents(view)
-
-        view.preferenceClicks()
-                .autoDisposable(view.scope())
-                .subscribe {
-                    Timber.v("Preference click: ${context.resources.getResourceName(it.id)}")
-
-                    when (it.id) {
-                        R.id.theme -> view.showThemePicker()
-
-                        R.id.night -> view.showNightModeDialog()
-
-                        R.id.nightStart -> {
-                            val date = nightModeManager.parseTime(prefs.nightStart.get())
-                            view.showStartTimePicker(date.get(Calendar.HOUR_OF_DAY), date.get(Calendar.MINUTE))
-                        }
-
-                        R.id.nightEnd -> {
-                            val date = nightModeManager.parseTime(prefs.nightEnd.get())
-                            view.showEndTimePicker(date.get(Calendar.HOUR_OF_DAY), date.get(Calendar.MINUTE))
-                        }
-
-                        R.id.black -> prefs.black.set(!prefs.black.get())
-
-                        R.id.autoEmoji -> prefs.autoEmoji.set(!prefs.autoEmoji.get())
-
-                        R.id.notifications -> navigator.showNotificationSettings()
-
-                        R.id.swipeActions -> view.showSwipeActions()
-
-                        R.id.delayed -> view.showDelayDurationDialog()
-
-                        R.id.delivery -> prefs.delivery.set(!prefs.delivery.get())
-
-                        R.id.signature -> view.showSignatureDialog(prefs.signature.get())
-
-                        R.id.textSize -> view.showTextSizePicker()
-
-                        R.id.autoColor -> {
-                            analytics.setUserProperty("Preference: Auto Color", !prefs.autoColor.get())
-                            prefs.autoColor.set(!prefs.autoColor.get())
-                        }
-
-                        R.id.systemFont -> prefs.systemFont.set(!prefs.systemFont.get())
-
-                        R.id.unicode -> prefs.unicode.set(!prefs.unicode.get())
-
-                        R.id.mobileOnly -> prefs.mobileOnly.set(!prefs.mobileOnly.get())
-
-                        R.id.autoDelete -> view.showAutoDeleteDialog(prefs.autoDelete.get())
-
-                        R.id.longAsMms -> prefs.longAsMms.set(!prefs.longAsMms.get())
-
-                        R.id.mmsSize -> view.showMmsSizePicker()
-
-                        R.id.sync -> syncMessages.execute(Unit)
-
-                        R.id.about -> view.showAbout()
-                    }
-                }
-
-        view.aboutLongClicks()
-                .map { !prefs.logging.get() }
-                .doOnNext { enabled -> prefs.logging.set(enabled) }
-                .autoDisposable(view.scope())
-                .subscribe { enabled ->
-                    context.makeToast(when (enabled) {
-                        true -> R.string.settings_logging_enabled
-                        false -> R.string.settings_logging_disabled
-                    })
-                }
-
-        view.nightModeSelected()
-                .withLatestFrom(billingManager.upgradeStatus) { mode, upgraded ->
-                    if (!upgraded && mode == Preferences.NIGHT_MODE_AUTO) {
-                        view.showQksmsPlusSnackbar()
-                    } else {
-                        nightModeManager.updateNightMode(mode)
-                    }
-                }
-                .autoDisposable(view.scope())
-                .subscribe()
-
-        view.viewQksmsPlusClicks()
-                .autoDisposable(view.scope())
-                .subscribe { navigator.showQksmsPlusActivity("settings_night") }
-
-        view.nightStartSelected()
-                .autoDisposable(view.scope())
-                .subscribe { nightModeManager.setNightStart(it.first, it.second) }
-
-        view.nightEndSelected()
-                .autoDisposable(view.scope())
-                .subscribe { nightModeManager.setNightEnd(it.first, it.second) }
-
-        view.textSizeSelected()
-                .autoDisposable(view.scope())
-                .subscribe(prefs.textSize::set)
-
-        view.sendDelaySelected()
-                .withLatestFrom(billingManager.upgradeStatus) { duration, upgraded ->
-                    if (!upgraded && duration != 0) {
-                        view.showQksmsPlusSnackbar()
-                    } else {
-                        prefs.sendDelay.set(duration)
-                    }
-                }
-                .autoDisposable(view.scope())
-                .subscribe()
-
-        view.signatureChanged()
-                .doOnNext(prefs.signature::set)
-                .autoDisposable(view.scope())
-                .subscribe()
-
-        view.autoDeleteChanged()
-                .observeOn(Schedulers.io())
-                .filter { maxAge ->
-                    if (maxAge == 0) {
-                        return@filter true
-                    }
-
-                    val counts = messageRepo.getOldMessageCounts(maxAge)
-                    if (counts.values.sum() == 0) {
-                        return@filter true
-                    }
-
-                    runBlocking { view.showAutoDeleteWarningDialog(counts.values.sum()) }
-                }
-                .doOnNext { maxAge ->
-                    when (maxAge == 0) {
-                        true -> AutoDeleteService.cancelJob(context)
-                        false -> {
-                            AutoDeleteService.scheduleJob(context)
-                            deleteOldMessages.execute(Unit)
-                        }
-                    }
-                }
-                .doOnNext(prefs.autoDelete::set)
-                .autoDisposable(view.scope())
-                .subscribe()
-
-        view.mmsSizeSelected()
-                .autoDisposable(view.scope())
-                .subscribe(prefs.mmsSize::set)
-    }
-
+/*
+ * Copyright (C) 2017 Moez Bhatti <moez.bhatti@gmail.com>
+ *
+ * This file is part of QKSMS.
+ *
+ * QKSMS is free software: you can redistribute it and/or modify
+ * it under the terms of the GNU General Public License as published by
+ * the Free Software Foundation, either version 3 of the License, or
+ * (at your option) any later version.
+ *
+ * QKSMS is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+ * GNU General Public License for more details.
+ *
+ * You should have received a copy of the GNU General Public License
+ * along with QKSMS.  If not, see <http://www.gnu.org/licenses/>.
+ */
+package com.moez.QKSMS.feature.settings
+
+import android.content.Context
+import com.moez.QKSMS.R
+import com.moez.QKSMS.common.Navigator
+import com.moez.QKSMS.common.base.QkPresenter
+import com.moez.QKSMS.common.util.Colors
+import com.moez.QKSMS.common.util.DateFormatter
+import com.moez.QKSMS.common.util.extensions.makeToast
+import com.moez.QKSMS.interactor.DeleteOldMessages
+import com.moez.QKSMS.interactor.SyncMessages
+import com.moez.QKSMS.manager.AnalyticsManager
+import com.moez.QKSMS.manager.BillingManager
+import com.moez.QKSMS.repository.MessageRepository
+import com.moez.QKSMS.repository.SyncRepository
+import com.moez.QKSMS.service.AutoDeleteService
+import com.moez.QKSMS.util.NightModeManager
+import com.moez.QKSMS.util.Preferences
+import com.uber.autodispose.android.lifecycle.scope
+import com.uber.autodispose.autoDisposable
+import io.reactivex.rxkotlin.plusAssign
+import io.reactivex.rxkotlin.withLatestFrom
+import io.reactivex.schedulers.Schedulers
+import kotlinx.coroutines.runBlocking
+import timber.log.Timber
+import java.util.*
+import java.util.concurrent.TimeUnit
+import javax.inject.Inject
+
+class SettingsPresenter @Inject constructor(
+    colors: Colors,
+    syncRepo: SyncRepository,
+    private val analytics: AnalyticsManager,
+    private val context: Context,
+    private val billingManager: BillingManager,
+    private val dateFormatter: DateFormatter,
+    private val deleteOldMessages: DeleteOldMessages,
+    private val messageRepo: MessageRepository,
+    private val navigator: Navigator,
+    private val nightModeManager: NightModeManager,
+    private val prefs: Preferences,
+    private val syncMessages: SyncMessages
+) : QkPresenter<SettingsView, SettingsState>(SettingsState(
+        nightModeId = prefs.nightMode.get()
+)) {
+
+    init {
+        disposables += colors.themeObservable()
+                .subscribe { theme -> newState { copy(theme = theme.theme) } }
+
+        val nightModeLabels = context.resources.getStringArray(R.array.night_modes)
+        disposables += prefs.nightMode.asObservable()
+                .subscribe { nightMode ->
+                    newState { copy(nightModeSummary = nightModeLabels[nightMode], nightModeId = nightMode) }
+                }
+
+        disposables += prefs.nightStart.asObservable()
+                .map { time -> nightModeManager.parseTime(time) }
+                .map { calendar -> calendar.timeInMillis }
+                .map { millis -> dateFormatter.getTimestamp(millis) }
+                .subscribe { nightStart -> newState { copy(nightStart = nightStart) } }
+
+        disposables += prefs.nightEnd.asObservable()
+                .map { time -> nightModeManager.parseTime(time) }
+                .map { calendar -> calendar.timeInMillis }
+                .map { millis -> dateFormatter.getTimestamp(millis) }
+                .subscribe { nightEnd -> newState { copy(nightEnd = nightEnd) } }
+
+        disposables += prefs.black.asObservable()
+                .subscribe { black -> newState { copy(black = black) } }
+
+        disposables += prefs.notifications().asObservable()
+                .subscribe { enabled -> newState { copy(notificationsEnabled = enabled) } }
+
+        disposables += prefs.autoEmoji.asObservable()
+                .subscribe { enabled -> newState { copy(autoEmojiEnabled = enabled) } }
+
+        val delayedSendingLabels = context.resources.getStringArray(R.array.delayed_sending_labels)
+        disposables += prefs.sendDelay.asObservable()
+                .subscribe { id -> newState { copy(sendDelaySummary = delayedSendingLabels[id], sendDelayId = id) } }
+
+        disposables += prefs.delivery.asObservable()
+                .subscribe { enabled -> newState { copy(deliveryEnabled = enabled) } }
+
+        disposables += prefs.signature.asObservable()
+                .subscribe { signature -> newState { copy(signature = signature) } }
+
+        val textSizeLabels = context.resources.getStringArray(R.array.text_sizes)
+        disposables += prefs.textSize.asObservable()
+                .subscribe { textSize ->
+                    newState { copy(textSizeSummary = textSizeLabels[textSize], textSizeId = textSize) }
+                }
+
+        disposables += prefs.autoColor.asObservable()
+                .subscribe { autoColor -> newState { copy(autoColor = autoColor) } }
+
+        disposables += prefs.systemFont.asObservable()
+                .subscribe { enabled -> newState { copy(systemFontEnabled = enabled) } }
+
+        disposables += prefs.unicode.asObservable()
+                .subscribe { enabled -> newState { copy(stripUnicodeEnabled = enabled) } }
+
+        disposables += prefs.mobileOnly.asObservable()
+                .subscribe { enabled -> newState { copy(mobileOnly = enabled) } }
+
+        disposables += prefs.autoDelete.asObservable()
+                .subscribe { autoDelete -> newState { copy(autoDelete = autoDelete) } }
+
+        disposables += prefs.longAsMms.asObservable()
+                .subscribe { enabled -> newState { copy(longAsMms = enabled) } }
+
+        val mmsSizeLabels = context.resources.getStringArray(R.array.mms_sizes)
+        val mmsSizeIds = context.resources.getIntArray(R.array.mms_sizes_ids)
+        disposables += prefs.mmsSize.asObservable()
+                .subscribe { maxMmsSize ->
+                    val index = mmsSizeIds.indexOf(maxMmsSize)
+                    newState { copy(maxMmsSizeSummary = mmsSizeLabels[index], maxMmsSizeId = maxMmsSize) }
+                }
+
+        disposables += syncRepo.syncProgress
+                .sample(16, TimeUnit.MILLISECONDS)
+                .distinctUntilChanged()
+                .subscribe { syncProgress -> newState { copy(syncProgress = syncProgress) } }
+
+        disposables += syncMessages
+    }
+
+    override fun bindIntents(view: SettingsView) {
+        super.bindIntents(view)
+
+        view.preferenceClicks()
+                .autoDisposable(view.scope())
+                .subscribe {
+                    Timber.v("Preference click: ${context.resources.getResourceName(it.id)}")
+
+                    when (it.id) {
+                        R.id.theme -> view.showThemePicker()
+
+                        R.id.night -> view.showNightModeDialog()
+
+                        R.id.nightStart -> {
+                            val date = nightModeManager.parseTime(prefs.nightStart.get())
+                            view.showStartTimePicker(date.get(Calendar.HOUR_OF_DAY), date.get(Calendar.MINUTE))
+                        }
+
+                        R.id.nightEnd -> {
+                            val date = nightModeManager.parseTime(prefs.nightEnd.get())
+                            view.showEndTimePicker(date.get(Calendar.HOUR_OF_DAY), date.get(Calendar.MINUTE))
+                        }
+
+                        R.id.black -> prefs.black.set(!prefs.black.get())
+
+                        R.id.autoEmoji -> prefs.autoEmoji.set(!prefs.autoEmoji.get())
+
+                        R.id.notifications -> navigator.showNotificationSettings()
+
+                        R.id.swipeActions -> view.showSwipeActions()
+
+                        R.id.delayed -> view.showDelayDurationDialog()
+
+                        R.id.delivery -> prefs.delivery.set(!prefs.delivery.get())
+
+                        R.id.signature -> view.showSignatureDialog(prefs.signature.get())
+
+                        R.id.textSize -> view.showTextSizePicker()
+
+                        R.id.autoColor -> {
+                            analytics.setUserProperty("Preference: Auto Color", !prefs.autoColor.get())
+                            prefs.autoColor.set(!prefs.autoColor.get())
+                        }
+
+                        R.id.systemFont -> prefs.systemFont.set(!prefs.systemFont.get())
+
+                        R.id.unicode -> prefs.unicode.set(!prefs.unicode.get())
+
+                        R.id.mobileOnly -> prefs.mobileOnly.set(!prefs.mobileOnly.get())
+
+                        R.id.autoDelete -> view.showAutoDeleteDialog(prefs.autoDelete.get())
+
+                        R.id.longAsMms -> prefs.longAsMms.set(!prefs.longAsMms.get())
+
+                        R.id.mmsSize -> view.showMmsSizePicker()
+
+                        R.id.sync -> syncMessages.execute(Unit)
+
+                        R.id.about -> view.showAbout()
+                    }
+                }
+
+        view.aboutLongClicks()
+                .map { !prefs.logging.get() }
+                .doOnNext { enabled -> prefs.logging.set(enabled) }
+                .autoDisposable(view.scope())
+                .subscribe { enabled ->
+                    context.makeToast(when (enabled) {
+                        true -> R.string.settings_logging_enabled
+                        false -> R.string.settings_logging_disabled
+                    })
+                }
+
+        view.nightModeSelected()
+                .withLatestFrom(billingManager.upgradeStatus) { mode, upgraded ->
+                    if (!upgraded && mode == Preferences.NIGHT_MODE_AUTO) {
+                        view.showQksmsPlusSnackbar()
+                    } else {
+                        nightModeManager.updateNightMode(mode)
+                    }
+                }
+                .autoDisposable(view.scope())
+                .subscribe()
+
+        view.viewQksmsPlusClicks()
+                .autoDisposable(view.scope())
+                .subscribe { navigator.showQksmsPlusActivity("settings_night") }
+
+        view.nightStartSelected()
+                .autoDisposable(view.scope())
+                .subscribe { nightModeManager.setNightStart(it.first, it.second) }
+
+        view.nightEndSelected()
+                .autoDisposable(view.scope())
+                .subscribe { nightModeManager.setNightEnd(it.first, it.second) }
+
+        view.textSizeSelected()
+                .autoDisposable(view.scope())
+                .subscribe(prefs.textSize::set)
+
+        view.sendDelaySelected()
+                .withLatestFrom(billingManager.upgradeStatus) { duration, upgraded ->
+                    if (!upgraded && duration != 0) {
+                        view.showQksmsPlusSnackbar()
+                    } else {
+                        prefs.sendDelay.set(duration)
+                    }
+                }
+                .autoDisposable(view.scope())
+                .subscribe()
+
+        view.signatureChanged()
+                .doOnNext(prefs.signature::set)
+                .autoDisposable(view.scope())
+                .subscribe()
+
+        view.autoDeleteChanged()
+                .observeOn(Schedulers.io())
+                .filter { maxAge ->
+                    if (maxAge == 0) {
+                        return@filter true
+                    }
+
+                    val counts = messageRepo.getOldMessageCounts(maxAge)
+                    if (counts.values.sum() == 0) {
+                        return@filter true
+                    }
+
+                    runBlocking { view.showAutoDeleteWarningDialog(counts.values.sum()) }
+                }
+                .doOnNext { maxAge ->
+                    when (maxAge == 0) {
+                        true -> AutoDeleteService.cancelJob(context)
+                        false -> {
+                            AutoDeleteService.scheduleJob(context)
+                            deleteOldMessages.execute(Unit)
+                        }
+                    }
+                }
+                .doOnNext(prefs.autoDelete::set)
+                .autoDisposable(view.scope())
+                .subscribe()
+
+        view.mmsSizeSelected()
+                .autoDisposable(view.scope())
+                .subscribe(prefs.mmsSize::set)
+    }
+
 }
\ No newline at end of file
diff --git a/presentation/src/main/java/com/moez/QKSMS/feature/settings/SettingsState.kt b/presentation/src/main/java/com/moez/QKSMS/feature/settings/SettingsState.kt
index 35cf2252a..6e7531390 100644
--- a/presentation/src/main/java/com/moez/QKSMS/feature/settings/SettingsState.kt
+++ b/presentation/src/main/java/com/moez/QKSMS/feature/settings/SettingsState.kt
@@ -1,49 +1,49 @@
-/*
- * Copyright (C) 2017 Moez Bhatti <moez.bhatti@gmail.com>
- *
- * This file is part of QKSMS.
- *
- * QKSMS is free software: you can redistribute it and/or modify
- * it under the terms of the GNU General Public License as published by
- * the Free Software Foundation, either version 3 of the License, or
- * (at your option) any later version.
- *
- * QKSMS is distributed in the hope that it will be useful,
- * but WITHOUT ANY WARRANTY; without even the implied warranty of
- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
- * GNU General Public License for more details.
- *
- * You should have received a copy of the GNU General Public License
- * along with QKSMS.  If not, see <http://www.gnu.org/licenses/>.
- */
-package com.moez.QKSMS.feature.settings
-
-import com.moez.QKSMS.repository.SyncRepository
-import com.moez.QKSMS.util.Preferences
-
-data class SettingsState(
-    val theme: Int = 0,
-    val nightModeSummary: String = "",
-    val nightModeId: Int = Preferences.NIGHT_MODE_OFF,
-    val nightStart: String = "",
-    val nightEnd: String = "",
-    val black: Boolean = false,
-    val autoColor: Boolean = true,
-    val autoEmojiEnabled: Boolean = true,
-    val notificationsEnabled: Boolean = true,
-    val sendDelaySummary: String = "",
-    val sendDelayId: Int = 0,
-    val deliveryEnabled: Boolean = false,
-    val signature: String = "",
-    val textSizeSummary: String = "",
-    val textSizeId: Int = Preferences.TEXT_SIZE_NORMAL,
-    val systemFontEnabled: Boolean = false,
-    val splitSmsEnabled: Boolean = false,
-    val stripUnicodeEnabled: Boolean = false,
-    val mobileOnly: Boolean = false,
-    val autoDelete: Int = 0,
-    val longAsMms: Boolean = false,
-    val maxMmsSizeSummary: String = "100KB",
-    val maxMmsSizeId: Int = 100,
-    val syncProgress: SyncRepository.SyncProgress = SyncRepository.SyncProgress.Idle
+/*
+ * Copyright (C) 2017 Moez Bhatti <moez.bhatti@gmail.com>
+ *
+ * This file is part of QKSMS.
+ *
+ * QKSMS is free software: you can redistribute it and/or modify
+ * it under the terms of the GNU General Public License as published by
+ * the Free Software Foundation, either version 3 of the License, or
+ * (at your option) any later version.
+ *
+ * QKSMS is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+ * GNU General Public License for more details.
+ *
+ * You should have received a copy of the GNU General Public License
+ * along with QKSMS.  If not, see <http://www.gnu.org/licenses/>.
+ */
+package com.moez.QKSMS.feature.settings
+
+import com.moez.QKSMS.repository.SyncRepository
+import com.moez.QKSMS.util.Preferences
+
+data class SettingsState(
+    val theme: Int = 0,
+    val nightModeSummary: String = "",
+    val nightModeId: Int = Preferences.NIGHT_MODE_OFF,
+    val nightStart: String = "",
+    val nightEnd: String = "",
+    val black: Boolean = false,
+    val autoColor: Boolean = true,
+    val autoEmojiEnabled: Boolean = true,
+    val notificationsEnabled: Boolean = true,
+    val sendDelaySummary: String = "",
+    val sendDelayId: Int = 0,
+    val deliveryEnabled: Boolean = false,
+    val signature: String = "",
+    val textSizeSummary: String = "",
+    val textSizeId: Int = Preferences.TEXT_SIZE_NORMAL,
+    val systemFontEnabled: Boolean = false,
+    val splitSmsEnabled: Boolean = false,
+    val stripUnicodeEnabled: Boolean = false,
+    val mobileOnly: Boolean = false,
+    val autoDelete: Int = 0,
+    val longAsMms: Boolean = false,
+    val maxMmsSizeSummary: String = "100KB",
+    val maxMmsSizeId: Int = 100,
+    val syncProgress: SyncRepository.SyncProgress = SyncRepository.SyncProgress.Idle
 )
\ No newline at end of file
diff --git a/presentation/src/main/java/com/moez/QKSMS/feature/settings/SettingsView.kt b/presentation/src/main/java/com/moez/QKSMS/feature/settings/SettingsView.kt
index 853b23d61..865a0d6d5 100644
--- a/presentation/src/main/java/com/moez/QKSMS/feature/settings/SettingsView.kt
+++ b/presentation/src/main/java/com/moez/QKSMS/feature/settings/SettingsView.kt
@@ -1,51 +1,51 @@
-/*
- * Copyright (C) 2017 Moez Bhatti <moez.bhatti@gmail.com>
- *
- * This file is part of QKSMS.
- *
- * QKSMS is free software: you can redistribute it and/or modify
- * it under the terms of the GNU General Public License as published by
- * the Free Software Foundation, either version 3 of the License, or
- * (at your option) any later version.
- *
- * QKSMS is distributed in the hope that it will be useful,
- * but WITHOUT ANY WARRANTY; without even the implied warranty of
- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
- * GNU General Public License for more details.
- *
- * You should have received a copy of the GNU General Public License
- * along with QKSMS.  If not, see <http://www.gnu.org/licenses/>.
- */
-package com.moez.QKSMS.feature.settings
-
-import com.moez.QKSMS.common.base.QkViewContract
-import com.moez.QKSMS.common.widget.PreferenceView
-import io.reactivex.Observable
-
-interface SettingsView : QkViewContract<SettingsState> {
-    fun preferenceClicks(): Observable<PreferenceView>
-    fun aboutLongClicks(): Observable<*>
-    fun viewQksmsPlusClicks(): Observable<*>
-    fun nightModeSelected(): Observable<Int>
-    fun nightStartSelected(): Observable<Pair<Int, Int>>
-    fun nightEndSelected(): Observable<Pair<Int, Int>>
-    fun textSizeSelected(): Observable<Int>
-    fun sendDelaySelected(): Observable<Int>
-    fun signatureChanged(): Observable<String>
-    fun autoDeleteChanged(): Observable<Int>
-    fun mmsSizeSelected(): Observable<Int>
-
-    fun showQksmsPlusSnackbar()
-    fun showNightModeDialog()
-    fun showStartTimePicker(hour: Int, minute: Int)
-    fun showEndTimePicker(hour: Int, minute: Int)
-    fun showTextSizePicker()
-    fun showDelayDurationDialog()
-    fun showSignatureDialog(signature: String)
-    fun showAutoDeleteDialog(days: Int)
-    suspend fun showAutoDeleteWarningDialog(messages: Int): Boolean
-    fun showMmsSizePicker()
-    fun showSwipeActions()
-    fun showThemePicker()
-    fun showAbout()
-}
+/*
+ * Copyright (C) 2017 Moez Bhatti <moez.bhatti@gmail.com>
+ *
+ * This file is part of QKSMS.
+ *
+ * QKSMS is free software: you can redistribute it and/or modify
+ * it under the terms of the GNU General Public License as published by
+ * the Free Software Foundation, either version 3 of the License, or
+ * (at your option) any later version.
+ *
+ * QKSMS is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+ * GNU General Public License for more details.
+ *
+ * You should have received a copy of the GNU General Public License
+ * along with QKSMS.  If not, see <http://www.gnu.org/licenses/>.
+ */
+package com.moez.QKSMS.feature.settings
+
+import com.moez.QKSMS.common.base.QkViewContract
+import com.moez.QKSMS.common.widget.PreferenceView
+import io.reactivex.Observable
+
+interface SettingsView : QkViewContract<SettingsState> {
+    fun preferenceClicks(): Observable<PreferenceView>
+    fun aboutLongClicks(): Observable<*>
+    fun viewQksmsPlusClicks(): Observable<*>
+    fun nightModeSelected(): Observable<Int>
+    fun nightStartSelected(): Observable<Pair<Int, Int>>
+    fun nightEndSelected(): Observable<Pair<Int, Int>>
+    fun textSizeSelected(): Observable<Int>
+    fun sendDelaySelected(): Observable<Int>
+    fun signatureChanged(): Observable<String>
+    fun autoDeleteChanged(): Observable<Int>
+    fun mmsSizeSelected(): Observable<Int>
+
+    fun showQksmsPlusSnackbar()
+    fun showNightModeDialog()
+    fun showStartTimePicker(hour: Int, minute: Int)
+    fun showEndTimePicker(hour: Int, minute: Int)
+    fun showTextSizePicker()
+    fun showDelayDurationDialog()
+    fun showSignatureDialog(signature: String)
+    fun showAutoDeleteDialog(days: Int)
+    suspend fun showAutoDeleteWarningDialog(messages: Int): Boolean
+    fun showMmsSizePicker()
+    fun showSwipeActions()
+    fun showThemePicker()
+    fun showAbout()
+}
diff --git a/presentation/src/main/java/com/moez/QKSMS/feature/settings/about/AboutController.kt b/presentation/src/main/java/com/moez/QKSMS/feature/settings/about/AboutController.kt
index 7385a29c9..5309258c8 100644
--- a/presentation/src/main/java/com/moez/QKSMS/feature/settings/about/AboutController.kt
+++ b/presentation/src/main/java/com/moez/QKSMS/feature/settings/about/AboutController.kt
@@ -1,62 +1,62 @@
-/*
- * Copyright (C) 2017 Moez Bhatti <moez.bhatti@gmail.com>
- *
- * This file is part of QKSMS.
- *
- * QKSMS is free software: you can redistribute it and/or modify
- * it under the terms of the GNU General Public License as published by
- * the Free Software Foundation, either version 3 of the License, or
- * (at your option) any later version.
- *
- * QKSMS is distributed in the hope that it will be useful,
- * but WITHOUT ANY WARRANTY; without even the implied warranty of
- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
- * GNU General Public License for more details.
- *
- * You should have received a copy of the GNU General Public License
- * along with QKSMS.  If not, see <http://www.gnu.org/licenses/>.
- */
-package com.moez.QKSMS.feature.settings.about
-
-import android.view.View
-import com.jakewharton.rxbinding2.view.clicks
-import com.moez.QKSMS.BuildConfig
-import com.moez.QKSMS.R
-import com.moez.QKSMS.common.base.QkController
-import com.moez.QKSMS.common.widget.PreferenceView
-import com.moez.QKSMS.injection.appComponent
-import io.reactivex.Observable
-import kotlinx.android.synthetic.main.about_controller.*
-import javax.inject.Inject
-
-class AboutController : QkController<AboutView, Unit, AboutPresenter>(), AboutView {
-
-    @Inject override lateinit var presenter: AboutPresenter
-
-    init {
-        appComponent.inject(this)
-        layoutRes = R.layout.about_controller
-    }
-
-    override fun onViewCreated() {
-        version.summary = BuildConfig.VERSION_NAME
-    }
-
-    override fun onAttach(view: View) {
-        super.onAttach(view)
-        presenter.bindIntents(this)
-        setTitle(R.string.about_title)
-        showBackButton(true)
-    }
-
-    override fun preferenceClicks(): Observable<PreferenceView> = (0 until preferences.childCount)
-            .map { index -> preferences.getChildAt(index) }
-            .mapNotNull { view -> view as? PreferenceView }
-            .map { preference -> preference.clicks().map { preference } }
-            .let { preferences -> Observable.merge(preferences) }
-
-    override fun render(state: Unit) {
-        // No special rendering required
-    }
-
+/*
+ * Copyright (C) 2017 Moez Bhatti <moez.bhatti@gmail.com>
+ *
+ * This file is part of QKSMS.
+ *
+ * QKSMS is free software: you can redistribute it and/or modify
+ * it under the terms of the GNU General Public License as published by
+ * the Free Software Foundation, either version 3 of the License, or
+ * (at your option) any later version.
+ *
+ * QKSMS is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+ * GNU General Public License for more details.
+ *
+ * You should have received a copy of the GNU General Public License
+ * along with QKSMS.  If not, see <http://www.gnu.org/licenses/>.
+ */
+package com.moez.QKSMS.feature.settings.about
+
+import android.view.View
+import com.jakewharton.rxbinding2.view.clicks
+import com.moez.QKSMS.BuildConfig
+import com.moez.QKSMS.R
+import com.moez.QKSMS.common.base.QkController
+import com.moez.QKSMS.common.widget.PreferenceView
+import com.moez.QKSMS.injection.appComponent
+import io.reactivex.Observable
+import kotlinx.android.synthetic.main.about_controller.*
+import javax.inject.Inject
+
+class AboutController : QkController<AboutView, Unit, AboutPresenter>(), AboutView {
+
+    @Inject override lateinit var presenter: AboutPresenter
+
+    init {
+        appComponent.inject(this)
+        layoutRes = R.layout.about_controller
+    }
+
+    override fun onViewCreated() {
+        version.summary = BuildConfig.VERSION_NAME
+    }
+
+    override fun onAttach(view: View) {
+        super.onAttach(view)
+        presenter.bindIntents(this)
+        setTitle(R.string.about_title)
+        showBackButton(true)
+    }
+
+    override fun preferenceClicks(): Observable<PreferenceView> = (0 until preferences.childCount)
+            .map { index -> preferences.getChildAt(index) }
+            .mapNotNull { view -> view as? PreferenceView }
+            .map { preference -> preference.clicks().map { preference } }
+            .let { preferences -> Observable.merge(preferences) }
+
+    override fun render(state: Unit) {
+        // No special rendering required
+    }
+
 }
\ No newline at end of file
diff --git a/presentation/src/main/java/com/moez/QKSMS/feature/settings/about/AboutPresenter.kt b/presentation/src/main/java/com/moez/QKSMS/feature/settings/about/AboutPresenter.kt
index 9ebc9b689..34b8f51ea 100644
--- a/presentation/src/main/java/com/moez/QKSMS/feature/settings/about/AboutPresenter.kt
+++ b/presentation/src/main/java/com/moez/QKSMS/feature/settings/about/AboutPresenter.kt
@@ -1,52 +1,52 @@
-/*
- * Copyright (C) 2017 Moez Bhatti <moez.bhatti@gmail.com>
- *
- * This file is part of QKSMS.
- *
- * QKSMS is free software: you can redistribute it and/or modify
- * it under the terms of the GNU General Public License as published by
- * the Free Software Foundation, either version 3 of the License, or
- * (at your option) any later version.
- *
- * QKSMS is distributed in the hope that it will be useful,
- * but WITHOUT ANY WARRANTY; without even the implied warranty of
- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
- * GNU General Public License for more details.
- *
- * You should have received a copy of the GNU General Public License
- * along with QKSMS.  If not, see <http://www.gnu.org/licenses/>.
- */
-package com.moez.QKSMS.feature.settings.about
-
-import com.moez.QKSMS.R
-import com.moez.QKSMS.common.Navigator
-import com.moez.QKSMS.common.base.QkPresenter
-import com.uber.autodispose.android.lifecycle.scope
-import com.uber.autodispose.autoDisposable
-import javax.inject.Inject
-
-class AboutPresenter @Inject constructor(
-    private val navigator: Navigator
-) : QkPresenter<AboutView, Unit>(Unit) {
-
-    override fun bindIntents(view: AboutView) {
-        super.bindIntents(view)
-
-        view.preferenceClicks()
-                .autoDisposable(view.scope())
-                .subscribe { preference ->
-                    when (preference.id) {
-                        R.id.developer -> navigator.showDeveloper()
-
-                        R.id.source -> navigator.showSourceCode()
-
-                        R.id.changelog -> navigator.showChangelog()
-
-                        R.id.contact -> navigator.showSupport()
-
-                        R.id.license -> navigator.showLicense()
-                    }
-                }
-    }
-
+/*
+ * Copyright (C) 2017 Moez Bhatti <moez.bhatti@gmail.com>
+ *
+ * This file is part of QKSMS.
+ *
+ * QKSMS is free software: you can redistribute it and/or modify
+ * it under the terms of the GNU General Public License as published by
+ * the Free Software Foundation, either version 3 of the License, or
+ * (at your option) any later version.
+ *
+ * QKSMS is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+ * GNU General Public License for more details.
+ *
+ * You should have received a copy of the GNU General Public License
+ * along with QKSMS.  If not, see <http://www.gnu.org/licenses/>.
+ */
+package com.moez.QKSMS.feature.settings.about
+
+import com.moez.QKSMS.R
+import com.moez.QKSMS.common.Navigator
+import com.moez.QKSMS.common.base.QkPresenter
+import com.uber.autodispose.android.lifecycle.scope
+import com.uber.autodispose.autoDisposable
+import javax.inject.Inject
+
+class AboutPresenter @Inject constructor(
+    private val navigator: Navigator
+) : QkPresenter<AboutView, Unit>(Unit) {
+
+    override fun bindIntents(view: AboutView) {
+        super.bindIntents(view)
+
+        view.preferenceClicks()
+                .autoDisposable(view.scope())
+                .subscribe { preference ->
+                    when (preference.id) {
+                        R.id.developer -> navigator.showDeveloper()
+
+                        R.id.source -> navigator.showSourceCode()
+
+                        R.id.changelog -> navigator.showChangelog()
+
+                        R.id.contact -> navigator.showSupport()
+
+                        R.id.license -> navigator.showLicense()
+                    }
+                }
+    }
+
 }
\ No newline at end of file
diff --git a/presentation/src/main/java/com/moez/QKSMS/feature/settings/about/AboutView.kt b/presentation/src/main/java/com/moez/QKSMS/feature/settings/about/AboutView.kt
index 0c180f1f9..601febdcb 100644
--- a/presentation/src/main/java/com/moez/QKSMS/feature/settings/about/AboutView.kt
+++ b/presentation/src/main/java/com/moez/QKSMS/feature/settings/about/AboutView.kt
@@ -1,29 +1,29 @@
-/*
- * Copyright (C) 2017 Moez Bhatti <moez.bhatti@gmail.com>
- *
- * This file is part of QKSMS.
- *
- * QKSMS is free software: you can redistribute it and/or modify
- * it under the terms of the GNU General Public License as published by
- * the Free Software Foundation, either version 3 of the License, or
- * (at your option) any later version.
- *
- * QKSMS is distributed in the hope that it will be useful,
- * but WITHOUT ANY WARRANTY; without even the implied warranty of
- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
- * GNU General Public License for more details.
- *
- * You should have received a copy of the GNU General Public License
- * along with QKSMS.  If not, see <http://www.gnu.org/licenses/>.
- */
-package com.moez.QKSMS.feature.settings.about
-
-import com.moez.QKSMS.common.base.QkViewContract
-import com.moez.QKSMS.common.widget.PreferenceView
-import io.reactivex.Observable
-
-interface AboutView : QkViewContract<Unit> {
-
-    fun preferenceClicks(): Observable<PreferenceView>
-
+/*
+ * Copyright (C) 2017 Moez Bhatti <moez.bhatti@gmail.com>
+ *
+ * This file is part of QKSMS.
+ *
+ * QKSMS is free software: you can redistribute it and/or modify
+ * it under the terms of the GNU General Public License as published by
+ * the Free Software Foundation, either version 3 of the License, or
+ * (at your option) any later version.
+ *
+ * QKSMS is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+ * GNU General Public License for more details.
+ *
+ * You should have received a copy of the GNU General Public License
+ * along with QKSMS.  If not, see <http://www.gnu.org/licenses/>.
+ */
+package com.moez.QKSMS.feature.settings.about
+
+import com.moez.QKSMS.common.base.QkViewContract
+import com.moez.QKSMS.common.widget.PreferenceView
+import io.reactivex.Observable
+
+interface AboutView : QkViewContract<Unit> {
+
+    fun preferenceClicks(): Observable<PreferenceView>
+
 }
\ No newline at end of file
diff --git a/presentation/src/main/java/com/moez/QKSMS/feature/settings/autodelete/AutoDeleteDialog.kt b/presentation/src/main/java/com/moez/QKSMS/feature/settings/autodelete/AutoDeleteDialog.kt
index 8f55c1413..b9b452a69 100644
--- a/presentation/src/main/java/com/moez/QKSMS/feature/settings/autodelete/AutoDeleteDialog.kt
+++ b/presentation/src/main/java/com/moez/QKSMS/feature/settings/autodelete/AutoDeleteDialog.kt
@@ -1,51 +1,51 @@
-/*
- * Copyright (C) 2017 Moez Bhatti <moez.bhatti@gmail.com>
- *
- * This file is part of QKSMS.
- *
- * QKSMS is free software: you can redistribute it and/or modify
- * it under the terms of the GNU General Public License as published by
- * the Free Software Foundation, either version 3 of the License, or
- * (at your option) any later version.
- *
- * QKSMS is distributed in the hope that it will be useful,
- * but WITHOUT ANY WARRANTY; without even the implied warranty of
- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
- * GNU General Public License for more details.
- *
- * You should have received a copy of the GNU General Public License
- * along with QKSMS.  If not, see <http://www.gnu.org/licenses/>.
- */
-package com.moez.QKSMS.feature.settings.autodelete
-
-import android.app.Activity
-import android.content.DialogInterface
-import android.view.LayoutInflater
-import androidx.appcompat.app.AlertDialog
-import com.moez.QKSMS.R
-import kotlinx.android.synthetic.main.settings_auto_delete_dialog.view.*
-
-class AutoDeleteDialog(context: Activity, listener: (Int) -> Unit) : AlertDialog(context) {
-
-    private val layout = LayoutInflater.from(context).inflate(R.layout.settings_auto_delete_dialog, null)
-
-    init {
-        setView(layout)
-        setTitle(R.string.settings_auto_delete)
-        setMessage(context.getString(R.string.settings_auto_delete_dialog_message))
-        setButton(DialogInterface.BUTTON_NEUTRAL, context.getString(R.string.button_cancel)) { _, _ -> }
-        setButton(DialogInterface.BUTTON_NEGATIVE, context.getString(R.string.settings_auto_delete_never)) { _, _ -> listener(0) }
-        setButton(DialogInterface.BUTTON_POSITIVE, context.getString(R.string.button_save)) { _, _ ->
-            listener(layout.field.text.toString().toIntOrNull() ?: 0)
-        }
-    }
-
-    fun setExpiry(days: Int): AutoDeleteDialog {
-        when (days) {
-            0 -> layout.field.text = null
-            else -> layout.field.setText(days.toString())
-        }
-        return this
-    }
-
-}
+/*
+ * Copyright (C) 2017 Moez Bhatti <moez.bhatti@gmail.com>
+ *
+ * This file is part of QKSMS.
+ *
+ * QKSMS is free software: you can redistribute it and/or modify
+ * it under the terms of the GNU General Public License as published by
+ * the Free Software Foundation, either version 3 of the License, or
+ * (at your option) any later version.
+ *
+ * QKSMS is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+ * GNU General Public License for more details.
+ *
+ * You should have received a copy of the GNU General Public License
+ * along with QKSMS.  If not, see <http://www.gnu.org/licenses/>.
+ */
+package com.moez.QKSMS.feature.settings.autodelete
+
+import android.app.Activity
+import android.content.DialogInterface
+import android.view.LayoutInflater
+import androidx.appcompat.app.AlertDialog
+import com.moez.QKSMS.R
+import kotlinx.android.synthetic.main.settings_auto_delete_dialog.view.*
+
+class AutoDeleteDialog(context: Activity, listener: (Int) -> Unit) : AlertDialog(context) {
+
+    private val layout = LayoutInflater.from(context).inflate(R.layout.settings_auto_delete_dialog, null)
+
+    init {
+        setView(layout)
+        setTitle(R.string.settings_auto_delete)
+        setMessage(context.getString(R.string.settings_auto_delete_dialog_message))
+        setButton(DialogInterface.BUTTON_NEUTRAL, context.getString(R.string.button_cancel)) { _, _ -> }
+        setButton(DialogInterface.BUTTON_NEGATIVE, context.getString(R.string.settings_auto_delete_never)) { _, _ -> listener(0) }
+        setButton(DialogInterface.BUTTON_POSITIVE, context.getString(R.string.button_save)) { _, _ ->
+            listener(layout.field.text.toString().toIntOrNull() ?: 0)
+        }
+    }
+
+    fun setExpiry(days: Int): AutoDeleteDialog {
+        when (days) {
+            0 -> layout.field.text = null
+            else -> layout.field.setText(days.toString())
+        }
+        return this
+    }
+
+}
diff --git a/presentation/src/main/java/com/moez/QKSMS/feature/settings/swipe/SwipeActionsController.kt b/presentation/src/main/java/com/moez/QKSMS/feature/settings/swipe/SwipeActionsController.kt
index 8121ad443..baba0e03c 100644
--- a/presentation/src/main/java/com/moez/QKSMS/feature/settings/swipe/SwipeActionsController.kt
+++ b/presentation/src/main/java/com/moez/QKSMS/feature/settings/swipe/SwipeActionsController.kt
@@ -1,102 +1,102 @@
-/*
- * Copyright (C) 2017 Moez Bhatti <moez.bhatti@gmail.com>
- *
- * This file is part of QKSMS.
- *
- * QKSMS is free software: you can redistribute it and/or modify
- * it under the terms of the GNU General Public License as published by
- * the Free Software Foundation, either version 3 of the License, or
- * (at your option) any later version.
- *
- * QKSMS is distributed in the hope that it will be useful,
- * but WITHOUT ANY WARRANTY; without even the implied warranty of
- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
- * GNU General Public License for more details.
- *
- * You should have received a copy of the GNU General Public License
- * along with QKSMS.  If not, see <http://www.gnu.org/licenses/>.
- */
-package com.moez.QKSMS.feature.settings.swipe
-
-import android.view.View
-import androidx.core.view.isVisible
-import com.jakewharton.rxbinding2.view.clicks
-import com.moez.QKSMS.R
-import com.moez.QKSMS.common.QkDialog
-import com.moez.QKSMS.common.base.QkController
-import com.moez.QKSMS.common.util.Colors
-import com.moez.QKSMS.common.util.extensions.animateLayoutChanges
-import com.moez.QKSMS.common.util.extensions.setBackgroundTint
-import com.moez.QKSMS.common.util.extensions.setTint
-import com.moez.QKSMS.injection.appComponent
-import com.uber.autodispose.android.lifecycle.scope
-import com.uber.autodispose.autoDisposable
-import io.reactivex.Observable
-import io.reactivex.subjects.PublishSubject
-import io.reactivex.subjects.Subject
-import kotlinx.android.synthetic.main.swipe_actions_controller.*
-import javax.inject.Inject
-
-class SwipeActionsController : QkController<SwipeActionsView, SwipeActionsState, SwipeActionsPresenter>(), SwipeActionsView {
-
-    @Inject override lateinit var presenter: SwipeActionsPresenter
-    @Inject lateinit var actionsDialog: QkDialog
-    @Inject lateinit var colors: Colors
-
-    /**
-     * Allows us to subscribe to [actionClicks] more than once
-     */
-    private val actionClicks: Subject<SwipeActionsView.Action> = PublishSubject.create()
-
-    init {
-        appComponent.inject(this)
-        layoutRes = R.layout.swipe_actions_controller
-
-        actionsDialog.adapter.setData(R.array.settings_swipe_actions)
-    }
-
-    override fun onViewCreated() {
-        colors.theme().let { theme ->
-            rightIcon.setBackgroundTint(theme.theme)
-            rightIcon.setTint(theme.textPrimary)
-            leftIcon.setBackgroundTint(theme.theme)
-            leftIcon.setTint(theme.textPrimary)
-        }
-
-        right.postDelayed({ right?.animateLayoutChanges = true }, 100)
-        left.postDelayed({ left?.animateLayoutChanges = true }, 100)
-
-        Observable.merge(
-                right.clicks().map { SwipeActionsView.Action.RIGHT },
-                left.clicks().map { SwipeActionsView.Action.LEFT })
-                .autoDisposable(scope())
-                .subscribe(actionClicks)
-    }
-
-    override fun onAttach(view: View) {
-        super.onAttach(view)
-        presenter.bindIntents(this)
-        setTitle(R.string.settings_swipe_actions)
-        showBackButton(true)
-    }
-
-    override fun actionClicks(): Observable<SwipeActionsView.Action> = actionClicks
-
-    override fun actionSelected(): Observable<Int> = actionsDialog.adapter.menuItemClicks
-
-    override fun showSwipeActions(selected: Int) {
-        actionsDialog.adapter.selectedItem = selected
-        activity?.let(actionsDialog::show)
-    }
-
-    override fun render(state: SwipeActionsState) {
-        rightIcon.isVisible = state.rightIcon != 0
-        rightIcon.setImageResource(state.rightIcon)
-        rightLabel.text = state.rightLabel
-
-        leftIcon.isVisible = state.leftIcon != 0
-        leftIcon.setImageResource(state.leftIcon)
-        leftLabel.text = state.leftLabel
-    }
-
+/*
+ * Copyright (C) 2017 Moez Bhatti <moez.bhatti@gmail.com>
+ *
+ * This file is part of QKSMS.
+ *
+ * QKSMS is free software: you can redistribute it and/or modify
+ * it under the terms of the GNU General Public License as published by
+ * the Free Software Foundation, either version 3 of the License, or
+ * (at your option) any later version.
+ *
+ * QKSMS is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+ * GNU General Public License for more details.
+ *
+ * You should have received a copy of the GNU General Public License
+ * along with QKSMS.  If not, see <http://www.gnu.org/licenses/>.
+ */
+package com.moez.QKSMS.feature.settings.swipe
+
+import android.view.View
+import androidx.core.view.isVisible
+import com.jakewharton.rxbinding2.view.clicks
+import com.moez.QKSMS.R
+import com.moez.QKSMS.common.QkDialog
+import com.moez.QKSMS.common.base.QkController
+import com.moez.QKSMS.common.util.Colors
+import com.moez.QKSMS.common.util.extensions.animateLayoutChanges
+import com.moez.QKSMS.common.util.extensions.setBackgroundTint
+import com.moez.QKSMS.common.util.extensions.setTint
+import com.moez.QKSMS.injection.appComponent
+import com.uber.autodispose.android.lifecycle.scope
+import com.uber.autodispose.autoDisposable
+import io.reactivex.Observable
+import io.reactivex.subjects.PublishSubject
+import io.reactivex.subjects.Subject
+import kotlinx.android.synthetic.main.swipe_actions_controller.*
+import javax.inject.Inject
+
+class SwipeActionsController : QkController<SwipeActionsView, SwipeActionsState, SwipeActionsPresenter>(), SwipeActionsView {
+
+    @Inject override lateinit var presenter: SwipeActionsPresenter
+    @Inject lateinit var actionsDialog: QkDialog
+    @Inject lateinit var colors: Colors
+
+    /**
+     * Allows us to subscribe to [actionClicks] more than once
+     */
+    private val actionClicks: Subject<SwipeActionsView.Action> = PublishSubject.create()
+
+    init {
+        appComponent.inject(this)
+        layoutRes = R.layout.swipe_actions_controller
+
+        actionsDialog.adapter.setData(R.array.settings_swipe_actions)
+    }
+
+    override fun onViewCreated() {
+        colors.theme().let { theme ->
+            rightIcon.setBackgroundTint(theme.theme)
+            rightIcon.setTint(theme.textPrimary)
+            leftIcon.setBackgroundTint(theme.theme)
+            leftIcon.setTint(theme.textPrimary)
+        }
+
+        right.postDelayed({ right?.animateLayoutChanges = true }, 100)
+        left.postDelayed({ left?.animateLayoutChanges = true }, 100)
+
+        Observable.merge(
+                right.clicks().map { SwipeActionsView.Action.RIGHT },
+                left.clicks().map { SwipeActionsView.Action.LEFT })
+                .autoDisposable(scope())
+                .subscribe(actionClicks)
+    }
+
+    override fun onAttach(view: View) {
+        super.onAttach(view)
+        presenter.bindIntents(this)
+        setTitle(R.string.settings_swipe_actions)
+        showBackButton(true)
+    }
+
+    override fun actionClicks(): Observable<SwipeActionsView.Action> = actionClicks
+
+    override fun actionSelected(): Observable<Int> = actionsDialog.adapter.menuItemClicks
+
+    override fun showSwipeActions(selected: Int) {
+        actionsDialog.adapter.selectedItem = selected
+        activity?.let(actionsDialog::show)
+    }
+
+    override fun render(state: SwipeActionsState) {
+        rightIcon.isVisible = state.rightIcon != 0
+        rightIcon.setImageResource(state.rightIcon)
+        rightLabel.text = state.rightLabel
+
+        leftIcon.isVisible = state.leftIcon != 0
+        leftIcon.setImageResource(state.leftIcon)
+        leftLabel.text = state.leftLabel
+    }
+
 }
\ No newline at end of file
diff --git a/presentation/src/main/java/com/moez/QKSMS/feature/settings/swipe/SwipeActionsPresenter.kt b/presentation/src/main/java/com/moez/QKSMS/feature/settings/swipe/SwipeActionsPresenter.kt
index ca02aac6d..9be4d2a3d 100644
--- a/presentation/src/main/java/com/moez/QKSMS/feature/settings/swipe/SwipeActionsPresenter.kt
+++ b/presentation/src/main/java/com/moez/QKSMS/feature/settings/swipe/SwipeActionsPresenter.kt
@@ -1,82 +1,82 @@
-/*
- * Copyright (C) 2017 Moez Bhatti <moez.bhatti@gmail.com>
- *
- * This file is part of QKSMS.
- *
- * QKSMS is free software: you can redistribute it and/or modify
- * it under the terms of the GNU General Public License as published by
- * the Free Software Foundation, either version 3 of the License, or
- * (at your option) any later version.
- *
- * QKSMS is distributed in the hope that it will be useful,
- * but WITHOUT ANY WARRANTY; without even the implied warranty of
- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
- * GNU General Public License for more details.
- *
- * You should have received a copy of the GNU General Public License
- * along with QKSMS.  If not, see <http://www.gnu.org/licenses/>.
- */
-package com.moez.QKSMS.feature.settings.swipe
-
-import android.content.Context
-import androidx.annotation.DrawableRes
-import com.moez.QKSMS.R
-import com.moez.QKSMS.common.base.QkPresenter
-import com.moez.QKSMS.util.Preferences
-import com.uber.autodispose.android.lifecycle.scope
-import com.uber.autodispose.autoDisposable
-import io.reactivex.rxkotlin.plusAssign
-import io.reactivex.rxkotlin.withLatestFrom
-import javax.inject.Inject
-
-class SwipeActionsPresenter @Inject constructor(
-    context: Context,
-    private val prefs: Preferences
-) : QkPresenter<SwipeActionsView, SwipeActionsState>(SwipeActionsState()) {
-
-    init {
-        val actionLabels = context.resources.getStringArray(R.array.settings_swipe_actions)
-
-        disposables += prefs.swipeRight.asObservable()
-                .subscribe { action -> newState { copy(rightLabel = actionLabels[action], rightIcon = iconForAction(action)) } }
-
-        disposables += prefs.swipeLeft.asObservable()
-                .subscribe { action -> newState { copy(leftLabel = actionLabels[action], leftIcon = iconForAction(action)) } }
-    }
-
-    override fun bindIntents(view: SwipeActionsView) {
-        super.bindIntents(view)
-
-        view.actionClicks()
-                .map { action ->
-                    when (action) {
-                        SwipeActionsView.Action.RIGHT -> prefs.swipeRight.get()
-                        SwipeActionsView.Action.LEFT -> prefs.swipeLeft.get()
-                    }
-                }
-                .autoDisposable(view.scope())
-                .subscribe(view::showSwipeActions)
-
-        view.actionSelected()
-                .withLatestFrom(view.actionClicks()) { actionId, action ->
-                    when (action) {
-                        SwipeActionsView.Action.RIGHT -> prefs.swipeRight.set(actionId)
-                        SwipeActionsView.Action.LEFT -> prefs.swipeLeft.set(actionId)
-                    }
-                }
-                .autoDisposable(view.scope())
-                .subscribe()
-    }
-
-    @DrawableRes
-    private fun iconForAction(action: Int) = when (action) {
-        Preferences.SWIPE_ACTION_ARCHIVE -> R.drawable.ic_archive_white_24dp
-        Preferences.SWIPE_ACTION_DELETE -> R.drawable.ic_delete_white_24dp
-        Preferences.SWIPE_ACTION_BLOCK -> R.drawable.ic_block_white_24dp
-        Preferences.SWIPE_ACTION_CALL -> R.drawable.ic_call_white_24dp
-        Preferences.SWIPE_ACTION_READ -> R.drawable.ic_check_white_24dp
-        Preferences.SWIPE_ACTION_UNREAD -> R.drawable.ic_markunread_black_24dp
-        else -> 0
-    }
-
+/*
+ * Copyright (C) 2017 Moez Bhatti <moez.bhatti@gmail.com>
+ *
+ * This file is part of QKSMS.
+ *
+ * QKSMS is free software: you can redistribute it and/or modify
+ * it under the terms of the GNU General Public License as published by
+ * the Free Software Foundation, either version 3 of the License, or
+ * (at your option) any later version.
+ *
+ * QKSMS is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+ * GNU General Public License for more details.
+ *
+ * You should have received a copy of the GNU General Public License
+ * along with QKSMS.  If not, see <http://www.gnu.org/licenses/>.
+ */
+package com.moez.QKSMS.feature.settings.swipe
+
+import android.content.Context
+import androidx.annotation.DrawableRes
+import com.moez.QKSMS.R
+import com.moez.QKSMS.common.base.QkPresenter
+import com.moez.QKSMS.util.Preferences
+import com.uber.autodispose.android.lifecycle.scope
+import com.uber.autodispose.autoDisposable
+import io.reactivex.rxkotlin.plusAssign
+import io.reactivex.rxkotlin.withLatestFrom
+import javax.inject.Inject
+
+class SwipeActionsPresenter @Inject constructor(
+    context: Context,
+    private val prefs: Preferences
+) : QkPresenter<SwipeActionsView, SwipeActionsState>(SwipeActionsState()) {
+
+    init {
+        val actionLabels = context.resources.getStringArray(R.array.settings_swipe_actions)
+
+        disposables += prefs.swipeRight.asObservable()
+                .subscribe { action -> newState { copy(rightLabel = actionLabels[action], rightIcon = iconForAction(action)) } }
+
+        disposables += prefs.swipeLeft.asObservable()
+                .subscribe { action -> newState { copy(leftLabel = actionLabels[action], leftIcon = iconForAction(action)) } }
+    }
+
+    override fun bindIntents(view: SwipeActionsView) {
+        super.bindIntents(view)
+
+        view.actionClicks()
+                .map { action ->
+                    when (action) {
+                        SwipeActionsView.Action.RIGHT -> prefs.swipeRight.get()
+                        SwipeActionsView.Action.LEFT -> prefs.swipeLeft.get()
+                    }
+                }
+                .autoDisposable(view.scope())
+                .subscribe(view::showSwipeActions)
+
+        view.actionSelected()
+                .withLatestFrom(view.actionClicks()) { actionId, action ->
+                    when (action) {
+                        SwipeActionsView.Action.RIGHT -> prefs.swipeRight.set(actionId)
+                        SwipeActionsView.Action.LEFT -> prefs.swipeLeft.set(actionId)
+                    }
+                }
+                .autoDisposable(view.scope())
+                .subscribe()
+    }
+
+    @DrawableRes
+    private fun iconForAction(action: Int) = when (action) {
+        Preferences.SWIPE_ACTION_ARCHIVE -> R.drawable.ic_archive_white_24dp
+        Preferences.SWIPE_ACTION_DELETE -> R.drawable.ic_delete_white_24dp
+        Preferences.SWIPE_ACTION_BLOCK -> R.drawable.ic_block_white_24dp
+        Preferences.SWIPE_ACTION_CALL -> R.drawable.ic_call_white_24dp
+        Preferences.SWIPE_ACTION_READ -> R.drawable.ic_check_white_24dp
+        Preferences.SWIPE_ACTION_UNREAD -> R.drawable.ic_markunread_black_24dp
+        else -> 0
+    }
+
 }
\ No newline at end of file
diff --git a/presentation/src/main/java/com/moez/QKSMS/feature/settings/swipe/SwipeActionsState.kt b/presentation/src/main/java/com/moez/QKSMS/feature/settings/swipe/SwipeActionsState.kt
index cc7d14bae..1c9c55de8 100644
--- a/presentation/src/main/java/com/moez/QKSMS/feature/settings/swipe/SwipeActionsState.kt
+++ b/presentation/src/main/java/com/moez/QKSMS/feature/settings/swipe/SwipeActionsState.kt
@@ -1,30 +1,30 @@
-/*
- * Copyright (C) 2017 Moez Bhatti <moez.bhatti@gmail.com>
- *
- * This file is part of QKSMS.
- *
- * QKSMS is free software: you can redistribute it and/or modify
- * it under the terms of the GNU General Public License as published by
- * the Free Software Foundation, either version 3 of the License, or
- * (at your option) any later version.
- *
- * QKSMS is distributed in the hope that it will be useful,
- * but WITHOUT ANY WARRANTY; without even the implied warranty of
- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
- * GNU General Public License for more details.
- *
- * You should have received a copy of the GNU General Public License
- * along with QKSMS.  If not, see <http://www.gnu.org/licenses/>.
- */
-package com.moez.QKSMS.feature.settings.swipe
-
-import androidx.annotation.DrawableRes
-import com.moez.QKSMS.R
-
-data class SwipeActionsState(
-    @DrawableRes val rightIcon: Int = R.drawable.ic_archive_white_24dp,
-    val rightLabel: String = "",
-
-    @DrawableRes val leftIcon: Int = R.drawable.ic_archive_white_24dp,
-    val leftLabel: String = ""
+/*
+ * Copyright (C) 2017 Moez Bhatti <moez.bhatti@gmail.com>
+ *
+ * This file is part of QKSMS.
+ *
+ * QKSMS is free software: you can redistribute it and/or modify
+ * it under the terms of the GNU General Public License as published by
+ * the Free Software Foundation, either version 3 of the License, or
+ * (at your option) any later version.
+ *
+ * QKSMS is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+ * GNU General Public License for more details.
+ *
+ * You should have received a copy of the GNU General Public License
+ * along with QKSMS.  If not, see <http://www.gnu.org/licenses/>.
+ */
+package com.moez.QKSMS.feature.settings.swipe
+
+import androidx.annotation.DrawableRes
+import com.moez.QKSMS.R
+
+data class SwipeActionsState(
+    @DrawableRes val rightIcon: Int = R.drawable.ic_archive_white_24dp,
+    val rightLabel: String = "",
+
+    @DrawableRes val leftIcon: Int = R.drawable.ic_archive_white_24dp,
+    val leftLabel: String = ""
 )
\ No newline at end of file
diff --git a/presentation/src/main/java/com/moez/QKSMS/feature/settings/swipe/SwipeActionsView.kt b/presentation/src/main/java/com/moez/QKSMS/feature/settings/swipe/SwipeActionsView.kt
index e8579195d..fbf53b191 100644
--- a/presentation/src/main/java/com/moez/QKSMS/feature/settings/swipe/SwipeActionsView.kt
+++ b/presentation/src/main/java/com/moez/QKSMS/feature/settings/swipe/SwipeActionsView.kt
@@ -1,33 +1,33 @@
-/*
- * Copyright (C) 2017 Moez Bhatti <moez.bhatti@gmail.com>
- *
- * This file is part of QKSMS.
- *
- * QKSMS is free software: you can redistribute it and/or modify
- * it under the terms of the GNU General Public License as published by
- * the Free Software Foundation, either version 3 of the License, or
- * (at your option) any later version.
- *
- * QKSMS is distributed in the hope that it will be useful,
- * but WITHOUT ANY WARRANTY; without even the implied warranty of
- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
- * GNU General Public License for more details.
- *
- * You should have received a copy of the GNU General Public License
- * along with QKSMS.  If not, see <http://www.gnu.org/licenses/>.
- */
-package com.moez.QKSMS.feature.settings.swipe
-
-import com.moez.QKSMS.common.base.QkViewContract
-import io.reactivex.Observable
-
-interface SwipeActionsView : QkViewContract<SwipeActionsState> {
-
-    enum class Action { LEFT, RIGHT }
-
-    fun actionClicks(): Observable<Action>
-    fun actionSelected(): Observable<Int>
-
-    fun showSwipeActions(selected: Int)
-
+/*
+ * Copyright (C) 2017 Moez Bhatti <moez.bhatti@gmail.com>
+ *
+ * This file is part of QKSMS.
+ *
+ * QKSMS is free software: you can redistribute it and/or modify
+ * it under the terms of the GNU General Public License as published by
+ * the Free Software Foundation, either version 3 of the License, or
+ * (at your option) any later version.
+ *
+ * QKSMS is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+ * GNU General Public License for more details.
+ *
+ * You should have received a copy of the GNU General Public License
+ * along with QKSMS.  If not, see <http://www.gnu.org/licenses/>.
+ */
+package com.moez.QKSMS.feature.settings.swipe
+
+import com.moez.QKSMS.common.base.QkViewContract
+import io.reactivex.Observable
+
+interface SwipeActionsView : QkViewContract<SwipeActionsState> {
+
+    enum class Action { LEFT, RIGHT }
+
+    fun actionClicks(): Observable<Action>
+    fun actionSelected(): Observable<Int>
+
+    fun showSwipeActions(selected: Int)
+
 }
\ No newline at end of file
diff --git a/presentation/src/main/java/com/moez/QKSMS/feature/themepicker/HSVPickerView.kt b/presentation/src/main/java/com/moez/QKSMS/feature/themepicker/HSVPickerView.kt
index 155224433..03e3de5a0 100644
--- a/presentation/src/main/java/com/moez/QKSMS/feature/themepicker/HSVPickerView.kt
+++ b/presentation/src/main/java/com/moez/QKSMS/feature/themepicker/HSVPickerView.kt
@@ -1,162 +1,162 @@
-/*
- * Copyright (C) 2017 Moez Bhatti <moez.bhatti@gmail.com>
- *
- * This file is part of QKSMS.
- *
- * QKSMS is free software: you can redistribute it and/or modify
- * it under the terms of the GNU General Public License as published by
- * the Free Software Foundation, either version 3 of the License, or
- * (at your option) any later version.
- *
- * QKSMS is distributed in the hope that it will be useful,
- * but WITHOUT ANY WARRANTY; without even the implied warranty of
- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
- * GNU General Public License for more details.
- *
- * You should have received a copy of the GNU General Public License
- * along with QKSMS.  If not, see <http://www.gnu.org/licenses/>.
- */
-package com.moez.QKSMS.feature.themepicker
-
-import android.content.Context
-import android.graphics.Color
-import android.graphics.drawable.GradientDrawable
-import android.util.AttributeSet
-import android.view.MotionEvent
-import android.view.View
-import androidx.constraintlayout.widget.ConstraintLayout
-import com.moez.QKSMS.R
-import com.moez.QKSMS.common.util.extensions.setBackgroundTint
-import com.moez.QKSMS.common.util.extensions.setTint
-import com.moez.QKSMS.common.util.extensions.within
-import io.reactivex.subjects.BehaviorSubject
-import io.reactivex.subjects.Subject
-import kotlinx.android.synthetic.main.hsv_picker_view.view.*
-
-class HSVPickerView @JvmOverloads constructor(
-    context: Context, attrs: AttributeSet? = null
-) : ConstraintLayout(context, attrs) {
-
-    val selectedColor: Subject<Int> = BehaviorSubject.create()
-
-    private val hues = arrayOf(0xFFFF0000, 0xFFFFFF00, 0xFF00FF00, 0xFF00FFFF, 0xFF0000FF, 0xFFFF00FF, 0xFFFF0000)
-            .map { it.toInt() }.toIntArray()
-
-    private var min: Float = 0f
-    private var max = 0f
-
-    private var hue = 0f
-        set(value) {
-            field = value
-            updateHue()
-        }
-
-    init {
-        View.inflate(context, R.layout.hsv_picker_view, this)
-
-        var swatchX = 0f
-        var swatchY = 0f
-
-        saturation.setOnTouchListener { _, event ->
-            setupBounds()
-            when (event.action) {
-                MotionEvent.ACTION_DOWN -> {
-                    swatchX = event.x - event.rawX
-                    swatchY = event.y - event.rawY
-                    parent.requestDisallowInterceptTouchEvent(true)
-                }
-
-                MotionEvent.ACTION_MOVE -> {
-                    // Calculate the new x/y position
-                    swatch.x = (event.rawX + swatchX + min).within(min, max)
-                    swatch.y = (event.rawY + swatchY + min).within(min, max)
-
-                    updateSelectedColor()
-                }
-
-                MotionEvent.ACTION_UP -> {
-                    parent.requestDisallowInterceptTouchEvent(false)
-                }
-
-                else -> return@setOnTouchListener false
-            }
-            true
-        }
-
-        var hueThumbX = 0f
-
-        hueGroup.setOnTouchListener { _, event ->
-            setupBounds()
-            when (event.action) {
-                MotionEvent.ACTION_DOWN -> {
-                    hueThumbX = event.x - event.rawX
-                    parent.requestDisallowInterceptTouchEvent(true)
-                }
-
-                MotionEvent.ACTION_MOVE -> {
-                    val x = (event.rawX + hueThumbX + min).within(min, max)
-
-                    hueThumb.x = x
-                    hue = (hueThumb.x - min) / (max - min) * 360
-
-                    updateSelectedColor()
-                }
-
-                MotionEvent.ACTION_UP -> {
-                    parent.requestDisallowInterceptTouchEvent(false)
-                }
-
-                else -> return@setOnTouchListener false
-            }
-            true
-        }
-
-        hueTrack.clipToOutline = true
-        hueTrack.setImageDrawable(GradientDrawable(GradientDrawable.Orientation.LEFT_RIGHT, hues))
-    }
-
-    private fun setupBounds() {
-        if (min == 0f || max == 0f) {
-            min = saturation.x - swatch.width / 2
-            max = min + saturation.width
-        }
-    }
-
-    private fun updateSelectedColor() {
-        setupBounds()
-
-        val range = max - min
-        val hsv = floatArrayOf(hue, (swatch.x - min) / range, 1 - (swatch.y - min) / range)
-        val color = Color.HSVToColor(hsv)
-
-        swatch.setTint(color)
-        selectedColor.onNext(color)
-    }
-
-    fun setColor(color: Int) {
-        // Convert the rgb color to HSV
-        val hsv = FloatArray(3).apply {
-            Color.colorToHSV(color, this)
-            hue = this[0]
-        }
-
-        // Set the position of the swatch
-        post {
-            setupBounds()
-            val range = max - min
-
-            hueThumb.x = range * hsv[0] / 360 + min
-            swatch.x = range * hsv[1] + min
-            swatch.y = range * (1 - hsv[2]) + min
-
-            updateSelectedColor()
-        }
-    }
-
-    private fun updateHue() {
-        val hsv = floatArrayOf(hue, 1f, 1f)
-        val tint = Color.HSVToColor(hsv)
-        saturation.setBackgroundTint(tint)
-    }
-
+/*
+ * Copyright (C) 2017 Moez Bhatti <moez.bhatti@gmail.com>
+ *
+ * This file is part of QKSMS.
+ *
+ * QKSMS is free software: you can redistribute it and/or modify
+ * it under the terms of the GNU General Public License as published by
+ * the Free Software Foundation, either version 3 of the License, or
+ * (at your option) any later version.
+ *
+ * QKSMS is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+ * GNU General Public License for more details.
+ *
+ * You should have received a copy of the GNU General Public License
+ * along with QKSMS.  If not, see <http://www.gnu.org/licenses/>.
+ */
+package com.moez.QKSMS.feature.themepicker
+
+import android.content.Context
+import android.graphics.Color
+import android.graphics.drawable.GradientDrawable
+import android.util.AttributeSet
+import android.view.MotionEvent
+import android.view.View
+import androidx.constraintlayout.widget.ConstraintLayout
+import com.moez.QKSMS.R
+import com.moez.QKSMS.common.util.extensions.setBackgroundTint
+import com.moez.QKSMS.common.util.extensions.setTint
+import com.moez.QKSMS.common.util.extensions.within
+import io.reactivex.subjects.BehaviorSubject
+import io.reactivex.subjects.Subject
+import kotlinx.android.synthetic.main.hsv_picker_view.view.*
+
+class HSVPickerView @JvmOverloads constructor(
+    context: Context, attrs: AttributeSet? = null
+) : ConstraintLayout(context, attrs) {
+
+    val selectedColor: Subject<Int> = BehaviorSubject.create()
+
+    private val hues = arrayOf(0xFFFF0000, 0xFFFFFF00, 0xFF00FF00, 0xFF00FFFF, 0xFF0000FF, 0xFFFF00FF, 0xFFFF0000)
+            .map { it.toInt() }.toIntArray()
+
+    private var min: Float = 0f
+    private var max = 0f
+
+    private var hue = 0f
+        set(value) {
+            field = value
+            updateHue()
+        }
+
+    init {
+        View.inflate(context, R.layout.hsv_picker_view, this)
+
+        var swatchX = 0f
+        var swatchY = 0f
+
+        saturation.setOnTouchListener { _, event ->
+            setupBounds()
+            when (event.action) {
+                MotionEvent.ACTION_DOWN -> {
+                    swatchX = event.x - event.rawX
+                    swatchY = event.y - event.rawY
+                    parent.requestDisallowInterceptTouchEvent(true)
+                }
+
+                MotionEvent.ACTION_MOVE -> {
+                    // Calculate the new x/y position
+                    swatch.x = (event.rawX + swatchX + min).within(min, max)
+                    swatch.y = (event.rawY + swatchY + min).within(min, max)
+
+                    updateSelectedColor()
+                }
+
+                MotionEvent.ACTION_UP -> {
+                    parent.requestDisallowInterceptTouchEvent(false)
+                }
+
+                else -> return@setOnTouchListener false
+            }
+            true
+        }
+
+        var hueThumbX = 0f
+
+        hueGroup.setOnTouchListener { _, event ->
+            setupBounds()
+            when (event.action) {
+                MotionEvent.ACTION_DOWN -> {
+                    hueThumbX = event.x - event.rawX
+                    parent.requestDisallowInterceptTouchEvent(true)
+                }
+
+                MotionEvent.ACTION_MOVE -> {
+                    val x = (event.rawX + hueThumbX + min).within(min, max)
+
+                    hueThumb.x = x
+                    hue = (hueThumb.x - min) / (max - min) * 360
+
+                    updateSelectedColor()
+                }
+
+                MotionEvent.ACTION_UP -> {
+                    parent.requestDisallowInterceptTouchEvent(false)
+                }
+
+                else -> return@setOnTouchListener false
+            }
+            true
+        }
+
+        hueTrack.clipToOutline = true
+        hueTrack.setImageDrawable(GradientDrawable(GradientDrawable.Orientation.LEFT_RIGHT, hues))
+    }
+
+    private fun setupBounds() {
+        if (min == 0f || max == 0f) {
+            min = saturation.x - swatch.width / 2
+            max = min + saturation.width
+        }
+    }
+
+    private fun updateSelectedColor() {
+        setupBounds()
+
+        val range = max - min
+        val hsv = floatArrayOf(hue, (swatch.x - min) / range, 1 - (swatch.y - min) / range)
+        val color = Color.HSVToColor(hsv)
+
+        swatch.setTint(color)
+        selectedColor.onNext(color)
+    }
+
+    fun setColor(color: Int) {
+        // Convert the rgb color to HSV
+        val hsv = FloatArray(3).apply {
+            Color.colorToHSV(color, this)
+            hue = this[0]
+        }
+
+        // Set the position of the swatch
+        post {
+            setupBounds()
+            val range = max - min
+
+            hueThumb.x = range * hsv[0] / 360 + min
+            swatch.x = range * hsv[1] + min
+            swatch.y = range * (1 - hsv[2]) + min
+
+            updateSelectedColor()
+        }
+    }
+
+    private fun updateHue() {
+        val hsv = floatArrayOf(hue, 1f, 1f)
+        val tint = Color.HSVToColor(hsv)
+        saturation.setBackgroundTint(tint)
+    }
+
 }
\ No newline at end of file
diff --git a/presentation/src/main/java/com/moez/QKSMS/feature/themepicker/ThemeAdapter.kt b/presentation/src/main/java/com/moez/QKSMS/feature/themepicker/ThemeAdapter.kt
index cf99614e7..e63916709 100644
--- a/presentation/src/main/java/com/moez/QKSMS/feature/themepicker/ThemeAdapter.kt
+++ b/presentation/src/main/java/com/moez/QKSMS/feature/themepicker/ThemeAdapter.kt
@@ -1,113 +1,113 @@
-/*
- * Copyright (C) 2017 Moez Bhatti <moez.bhatti@gmail.com>
- *
- * This file is part of QKSMS.
- *
- * QKSMS is free software: you can redistribute it and/or modify
- * it under the terms of the GNU General Public License as published by
- * the Free Software Foundation, either version 3 of the License, or
- * (at your option) any later version.
- *
- * QKSMS is distributed in the hope that it will be useful,
- * but WITHOUT ANY WARRANTY; without even the implied warranty of
- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
- * GNU General Public License for more details.
- *
- * You should have received a copy of the GNU General Public License
- * along with QKSMS.  If not, see <http://www.gnu.org/licenses/>.
- */
-package com.moez.QKSMS.feature.themepicker
-
-import android.content.Context
-import android.content.res.Resources
-import android.view.LayoutInflater
-import android.view.ViewGroup
-import com.google.android.flexbox.FlexDirection
-import com.google.android.flexbox.FlexWrap
-import com.google.android.flexbox.FlexboxLayout
-import com.moez.QKSMS.R
-import com.moez.QKSMS.common.base.QkAdapter
-import com.moez.QKSMS.common.base.QkViewHolder
-import com.moez.QKSMS.common.util.Colors
-import com.moez.QKSMS.common.util.extensions.dpToPx
-import com.moez.QKSMS.common.util.extensions.setBackgroundTint
-import com.moez.QKSMS.common.util.extensions.setTint
-import com.moez.QKSMS.common.util.extensions.setVisible
-import io.reactivex.subjects.PublishSubject
-import io.reactivex.subjects.Subject
-import kotlinx.android.synthetic.main.theme_list_item.view.*
-import kotlinx.android.synthetic.main.theme_palette_list_item.*
-import kotlinx.android.synthetic.main.theme_palette_list_item.view.*
-import javax.inject.Inject
-
-class ThemeAdapter @Inject constructor(
-    private val context: Context,
-    private val colors: Colors
-) : QkAdapter<List<Int>>() {
-
-    val colorSelected: Subject<Int> = PublishSubject.create()
-
-    var selectedColor: Int = -1
-        set(value) {
-            val oldPosition = data.indexOfFirst { it.contains(field) }
-            val newPosition = data.indexOfFirst { it.contains(value) }
-
-            field = value
-            iconTint = colors.textPrimaryOnThemeForColor(value)
-
-            oldPosition.takeIf { it != -1 }?.let { position -> notifyItemChanged(position) }
-            newPosition.takeIf { it != -1 }?.let { position -> notifyItemChanged(position) }
-        }
-
-    private var iconTint = 0
-
-    override fun onCreateViewHolder(parent: ViewGroup, viewType: Int): QkViewHolder {
-        val view = LayoutInflater.from(parent.context).inflate(R.layout.theme_palette_list_item, parent, false)
-        view.palette.flexWrap = FlexWrap.WRAP
-        view.palette.flexDirection = FlexDirection.ROW
-
-        return QkViewHolder(view)
-    }
-
-    override fun onBindViewHolder(holder: QkViewHolder, position: Int) {
-        val palette = getItem(position)
-
-        val screenWidth = Resources.getSystem().displayMetrics.widthPixels
-        val minPadding = (16 * 6).dpToPx(context)
-        val size = if (screenWidth - minPadding > (56 * 5).dpToPx(context)) {
-            56.dpToPx(context)
-        } else {
-            (screenWidth - minPadding) / 5
-        }
-        val swatchPadding = (screenWidth - size * 5) / 12
-
-        holder.palette.removeAllViews()
-        holder.palette.setPadding(swatchPadding, swatchPadding, swatchPadding, swatchPadding)
-
-        (palette.subList(0, 5) + palette.subList(5, 10).reversed())
-                .mapIndexed { index, color ->
-                    LayoutInflater.from(context).inflate(R.layout.theme_list_item, holder.palette, false).apply {
-
-                        // Send clicks to the selected subject
-                        setOnClickListener { colorSelected.onNext(color) }
-
-                        // Apply the color to the view
-                        theme.setBackgroundTint(color)
-
-                        // Control the check visibility and tint
-                        check.setVisible(color == selectedColor)
-                        check.setTint(iconTint)
-
-                        // Update the size so that the spacing is perfectly even
-                        layoutParams = (layoutParams as FlexboxLayout.LayoutParams).apply {
-                            height = size
-                            width = size
-                            isWrapBefore = index % 5 == 0
-                            setMargins(swatchPadding, swatchPadding, swatchPadding, swatchPadding)
-                        }
-                    }
-                }
-                .forEach { theme -> holder.palette.addView(theme) }
-    }
-
+/*
+ * Copyright (C) 2017 Moez Bhatti <moez.bhatti@gmail.com>
+ *
+ * This file is part of QKSMS.
+ *
+ * QKSMS is free software: you can redistribute it and/or modify
+ * it under the terms of the GNU General Public License as published by
+ * the Free Software Foundation, either version 3 of the License, or
+ * (at your option) any later version.
+ *
+ * QKSMS is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+ * GNU General Public License for more details.
+ *
+ * You should have received a copy of the GNU General Public License
+ * along with QKSMS.  If not, see <http://www.gnu.org/licenses/>.
+ */
+package com.moez.QKSMS.feature.themepicker
+
+import android.content.Context
+import android.content.res.Resources
+import android.view.LayoutInflater
+import android.view.ViewGroup
+import com.google.android.flexbox.FlexDirection
+import com.google.android.flexbox.FlexWrap
+import com.google.android.flexbox.FlexboxLayout
+import com.moez.QKSMS.R
+import com.moez.QKSMS.common.base.QkAdapter
+import com.moez.QKSMS.common.base.QkViewHolder
+import com.moez.QKSMS.common.util.Colors
+import com.moez.QKSMS.common.util.extensions.dpToPx
+import com.moez.QKSMS.common.util.extensions.setBackgroundTint
+import com.moez.QKSMS.common.util.extensions.setTint
+import com.moez.QKSMS.common.util.extensions.setVisible
+import io.reactivex.subjects.PublishSubject
+import io.reactivex.subjects.Subject
+import kotlinx.android.synthetic.main.theme_list_item.view.*
+import kotlinx.android.synthetic.main.theme_palette_list_item.*
+import kotlinx.android.synthetic.main.theme_palette_list_item.view.*
+import javax.inject.Inject
+
+class ThemeAdapter @Inject constructor(
+    private val context: Context,
+    private val colors: Colors
+) : QkAdapter<List<Int>>() {
+
+    val colorSelected: Subject<Int> = PublishSubject.create()
+
+    var selectedColor: Int = -1
+        set(value) {
+            val oldPosition = data.indexOfFirst { it.contains(field) }
+            val newPosition = data.indexOfFirst { it.contains(value) }
+
+            field = value
+            iconTint = colors.textPrimaryOnThemeForColor(value)
+
+            oldPosition.takeIf { it != -1 }?.let { position -> notifyItemChanged(position) }
+            newPosition.takeIf { it != -1 }?.let { position -> notifyItemChanged(position) }
+        }
+
+    private var iconTint = 0
+
+    override fun onCreateViewHolder(parent: ViewGroup, viewType: Int): QkViewHolder {
+        val view = LayoutInflater.from(parent.context).inflate(R.layout.theme_palette_list_item, parent, false)
+        view.palette.flexWrap = FlexWrap.WRAP
+        view.palette.flexDirection = FlexDirection.ROW
+
+        return QkViewHolder(view)
+    }
+
+    override fun onBindViewHolder(holder: QkViewHolder, position: Int) {
+        val palette = getItem(position)
+
+        val screenWidth = Resources.getSystem().displayMetrics.widthPixels
+        val minPadding = (16 * 6).dpToPx(context)
+        val size = if (screenWidth - minPadding > (56 * 5).dpToPx(context)) {
+            56.dpToPx(context)
+        } else {
+            (screenWidth - minPadding) / 5
+        }
+        val swatchPadding = (screenWidth - size * 5) / 12
+
+        holder.palette.removeAllViews()
+        holder.palette.setPadding(swatchPadding, swatchPadding, swatchPadding, swatchPadding)
+
+        (palette.subList(0, 5) + palette.subList(5, 10).reversed())
+                .mapIndexed { index, color ->
+                    LayoutInflater.from(context).inflate(R.layout.theme_list_item, holder.palette, false).apply {
+
+                        // Send clicks to the selected subject
+                        setOnClickListener { colorSelected.onNext(color) }
+
+                        // Apply the color to the view
+                        theme.setBackgroundTint(color)
+
+                        // Control the check visibility and tint
+                        check.setVisible(color == selectedColor)
+                        check.setTint(iconTint)
+
+                        // Update the size so that the spacing is perfectly even
+                        layoutParams = (layoutParams as FlexboxLayout.LayoutParams).apply {
+                            height = size
+                            width = size
+                            isWrapBefore = index % 5 == 0
+                            setMargins(swatchPadding, swatchPadding, swatchPadding, swatchPadding)
+                        }
+                    }
+                }
+                .forEach { theme -> holder.palette.addView(theme) }
+    }
+
 }
\ No newline at end of file
diff --git a/presentation/src/main/java/com/moez/QKSMS/feature/themepicker/ThemePagerAdapter.kt b/presentation/src/main/java/com/moez/QKSMS/feature/themepicker/ThemePagerAdapter.kt
index c7185c211..4cbdfed74 100644
--- a/presentation/src/main/java/com/moez/QKSMS/feature/themepicker/ThemePagerAdapter.kt
+++ b/presentation/src/main/java/com/moez/QKSMS/feature/themepicker/ThemePagerAdapter.kt
@@ -1,55 +1,55 @@
-/*
- * Copyright (C) 2017 Moez Bhatti <moez.bhatti@gmail.com>
- *
- * This file is part of QKSMS.
- *
- * QKSMS is free software: you can redistribute it and/or modify
- * it under the terms of the GNU General Public License as published by
- * the Free Software Foundation, either version 3 of the License, or
- * (at your option) any later version.
- *
- * QKSMS is distributed in the hope that it will be useful,
- * but WITHOUT ANY WARRANTY; without even the implied warranty of
- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
- * GNU General Public License for more details.
- *
- * You should have received a copy of the GNU General Public License
- * along with QKSMS.  If not, see <http://www.gnu.org/licenses/>.
- */
-package com.moez.QKSMS.feature.themepicker
-
-import android.content.Context
-import android.view.View
-import android.view.ViewGroup
-import androidx.viewpager.widget.PagerAdapter
-import com.moez.QKSMS.R
-import javax.inject.Inject
-
-class ThemePagerAdapter @Inject constructor(private val context: Context) : PagerAdapter() {
-
-    override fun instantiateItem(container: ViewGroup, position: Int): Any {
-        return when (position) {
-            1 -> container.findViewById(R.id.hsvPicker)
-            else -> container.findViewById(R.id.materialColors)
-        }
-    }
-
-    override fun getPageTitle(position: Int): CharSequence? {
-        return when (position) {
-            1 -> context.getString(R.string.theme_plus)
-            else -> context.getString(R.string.theme_material)
-        }
-    }
-
-    override fun isViewFromObject(view: View, `object`: Any): Boolean {
-        return view == `object`
-    }
-
-    override fun destroyItem(container: ViewGroup, position: Int, `object`: Any) {
-    }
-
-    override fun getCount(): Int {
-        return 2
-    }
-
+/*
+ * Copyright (C) 2017 Moez Bhatti <moez.bhatti@gmail.com>
+ *
+ * This file is part of QKSMS.
+ *
+ * QKSMS is free software: you can redistribute it and/or modify
+ * it under the terms of the GNU General Public License as published by
+ * the Free Software Foundation, either version 3 of the License, or
+ * (at your option) any later version.
+ *
+ * QKSMS is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+ * GNU General Public License for more details.
+ *
+ * You should have received a copy of the GNU General Public License
+ * along with QKSMS.  If not, see <http://www.gnu.org/licenses/>.
+ */
+package com.moez.QKSMS.feature.themepicker
+
+import android.content.Context
+import android.view.View
+import android.view.ViewGroup
+import androidx.viewpager.widget.PagerAdapter
+import com.moez.QKSMS.R
+import javax.inject.Inject
+
+class ThemePagerAdapter @Inject constructor(private val context: Context) : PagerAdapter() {
+
+    override fun instantiateItem(container: ViewGroup, position: Int): Any {
+        return when (position) {
+            1 -> container.findViewById(R.id.hsvPicker)
+            else -> container.findViewById(R.id.materialColors)
+        }
+    }
+
+    override fun getPageTitle(position: Int): CharSequence? {
+        return when (position) {
+            1 -> context.getString(R.string.theme_plus)
+            else -> context.getString(R.string.theme_material)
+        }
+    }
+
+    override fun isViewFromObject(view: View, `object`: Any): Boolean {
+        return view == `object`
+    }
+
+    override fun destroyItem(container: ViewGroup, position: Int, `object`: Any) {
+    }
+
+    override fun getCount(): Int {
+        return 2
+    }
+
 }
\ No newline at end of file
diff --git a/presentation/src/main/java/com/moez/QKSMS/feature/themepicker/ThemePickerController.kt b/presentation/src/main/java/com/moez/QKSMS/feature/themepicker/ThemePickerController.kt
index ae4dc56f2..6b7110b58 100644
--- a/presentation/src/main/java/com/moez/QKSMS/feature/themepicker/ThemePickerController.kt
+++ b/presentation/src/main/java/com/moez/QKSMS/feature/themepicker/ThemePickerController.kt
@@ -1,126 +1,126 @@
-/*
- * Copyright (C) 2017 Moez Bhatti <moez.bhatti@gmail.com>
- *
- * This file is part of QKSMS.
- *
- * QKSMS is free software: you can redistribute it and/or modify
- * it under the terms of the GNU General Public License as published by
- * the Free Software Foundation, either version 3 of the License, or
- * (at your option) any later version.
- *
- * QKSMS is distributed in the hope that it will be useful,
- * but WITHOUT ANY WARRANTY; without even the implied warranty of
- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
- * GNU General Public License for more details.
- *
- * You should have received a copy of the GNU General Public License
- * along with QKSMS.  If not, see <http://www.gnu.org/licenses/>.
- */
-package com.moez.QKSMS.feature.themepicker
-
-import android.animation.ObjectAnimator
-import android.view.View
-import androidx.recyclerview.widget.LinearLayoutManager
-import com.google.android.material.snackbar.Snackbar
-import com.jakewharton.rxbinding2.view.clicks
-import com.moez.QKSMS.R
-import com.moez.QKSMS.common.base.QkController
-import com.moez.QKSMS.common.util.Colors
-import com.moez.QKSMS.common.util.extensions.dpToPx
-import com.moez.QKSMS.common.util.extensions.setBackgroundTint
-import com.moez.QKSMS.common.util.extensions.setVisible
-import com.moez.QKSMS.feature.themepicker.injection.ThemePickerModule
-import com.moez.QKSMS.injection.appComponent
-import io.reactivex.Observable
-import io.reactivex.subjects.PublishSubject
-import io.reactivex.subjects.Subject
-import kotlinx.android.synthetic.main.theme_picker_controller.*
-import kotlinx.android.synthetic.main.theme_picker_hsv.*
-import javax.inject.Inject
-
-class ThemePickerController(
-    val recipientId: Long = 0L
-) : QkController<ThemePickerView, ThemePickerState, ThemePickerPresenter>(), ThemePickerView {
-
-    @Inject override lateinit var presenter: ThemePickerPresenter
-
-    @Inject lateinit var colors: Colors
-    @Inject lateinit var themeAdapter: ThemeAdapter
-    @Inject lateinit var themePagerAdapter: ThemePagerAdapter
-
-    private val viewQksmsPlusSubject: Subject<Unit> = PublishSubject.create()
-
-    init {
-        appComponent
-                .themePickerBuilder()
-                .themePickerModule(ThemePickerModule(this))
-                .build()
-                .inject(this)
-
-        layoutRes = R.layout.theme_picker_controller
-    }
-
-    override fun onViewCreated() {
-        pager.offscreenPageLimit = 1
-        pager.adapter = themePagerAdapter
-        tabs.pager = pager
-
-        themeAdapter.data = colors.materialColors
-
-        materialColors.layoutManager = LinearLayoutManager(activity)
-        materialColors.adapter = themeAdapter
-    }
-
-    override fun onAttach(view: View) {
-        super.onAttach(view)
-        presenter.bindIntents(this)
-        setTitle(R.string.title_theme)
-        showBackButton(true)
-
-        themedActivity?.supportActionBar?.let { toolbar ->
-            ObjectAnimator.ofFloat(toolbar, "elevation", toolbar.elevation, 0f).start()
-        }
-    }
-
-    override fun onDetach(view: View) {
-        super.onDetach(view)
-
-        themedActivity?.supportActionBar?.let { toolbar ->
-            ObjectAnimator.ofFloat(toolbar, "elevation", toolbar.elevation, 8.dpToPx(toolbar.themedContext).toFloat()).start()
-        }
-    }
-
-    override fun showQksmsPlusSnackbar() {
-        Snackbar.make(contentView, R.string.toast_qksms_plus, Snackbar.LENGTH_LONG).run {
-            setAction(R.string.button_more) { viewQksmsPlusSubject.onNext(Unit) }
-            setActionTextColor(colors.theme().theme)
-            show()
-        }
-    }
-
-    override fun themeSelected(): Observable<Int> = themeAdapter.colorSelected
-
-    override fun hsvThemeSelected(): Observable<Int> = picker.selectedColor
-
-    override fun clearHsvThemeClicks(): Observable<*> = clear.clicks()
-
-    override fun applyHsvThemeClicks(): Observable<*> = apply.clicks()
-
-    override fun viewQksmsPlusClicks(): Observable<*> = viewQksmsPlusSubject
-
-    override fun render(state: ThemePickerState) {
-        tabs.setRecipientId(state.recipientId)
-
-        hex.setText(Integer.toHexString(state.newColor).takeLast(6))
-
-        applyGroup.setVisible(state.applyThemeVisible)
-        apply.setBackgroundTint(state.newColor)
-        apply.setTextColor(state.newTextColor)
-    }
-
-    override fun setCurrentTheme(color: Int) {
-        picker.setColor(color)
-        themeAdapter.selectedColor = color
-    }
-
+/*
+ * Copyright (C) 2017 Moez Bhatti <moez.bhatti@gmail.com>
+ *
+ * This file is part of QKSMS.
+ *
+ * QKSMS is free software: you can redistribute it and/or modify
+ * it under the terms of the GNU General Public License as published by
+ * the Free Software Foundation, either version 3 of the License, or
+ * (at your option) any later version.
+ *
+ * QKSMS is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+ * GNU General Public License for more details.
+ *
+ * You should have received a copy of the GNU General Public License
+ * along with QKSMS.  If not, see <http://www.gnu.org/licenses/>.
+ */
+package com.moez.QKSMS.feature.themepicker
+
+import android.animation.ObjectAnimator
+import android.view.View
+import androidx.recyclerview.widget.LinearLayoutManager
+import com.google.android.material.snackbar.Snackbar
+import com.jakewharton.rxbinding2.view.clicks
+import com.moez.QKSMS.R
+import com.moez.QKSMS.common.base.QkController
+import com.moez.QKSMS.common.util.Colors
+import com.moez.QKSMS.common.util.extensions.dpToPx
+import com.moez.QKSMS.common.util.extensions.setBackgroundTint
+import com.moez.QKSMS.common.util.extensions.setVisible
+import com.moez.QKSMS.feature.themepicker.injection.ThemePickerModule
+import com.moez.QKSMS.injection.appComponent
+import io.reactivex.Observable
+import io.reactivex.subjects.PublishSubject
+import io.reactivex.subjects.Subject
+import kotlinx.android.synthetic.main.theme_picker_controller.*
+import kotlinx.android.synthetic.main.theme_picker_hsv.*
+import javax.inject.Inject
+
+class ThemePickerController(
+    val recipientId: Long = 0L
+) : QkController<ThemePickerView, ThemePickerState, ThemePickerPresenter>(), ThemePickerView {
+
+    @Inject override lateinit var presenter: ThemePickerPresenter
+
+    @Inject lateinit var colors: Colors
+    @Inject lateinit var themeAdapter: ThemeAdapter
+    @Inject lateinit var themePagerAdapter: ThemePagerAdapter
+
+    private val viewQksmsPlusSubject: Subject<Unit> = PublishSubject.create()
+
+    init {
+        appComponent
+                .themePickerBuilder()
+                .themePickerModule(ThemePickerModule(this))
+                .build()
+                .inject(this)
+
+        layoutRes = R.layout.theme_picker_controller
+    }
+
+    override fun onViewCreated() {
+        pager.offscreenPageLimit = 1
+        pager.adapter = themePagerAdapter
+        tabs.pager = pager
+
+        themeAdapter.data = colors.materialColors
+
+        materialColors.layoutManager = LinearLayoutManager(activity)
+        materialColors.adapter = themeAdapter
+    }
+
+    override fun onAttach(view: View) {
+        super.onAttach(view)
+        presenter.bindIntents(this)
+        setTitle(R.string.title_theme)
+        showBackButton(true)
+
+        themedActivity?.supportActionBar?.let { toolbar ->
+            ObjectAnimator.ofFloat(toolbar, "elevation", toolbar.elevation, 0f).start()
+        }
+    }
+
+    override fun onDetach(view: View) {
+        super.onDetach(view)
+
+        themedActivity?.supportActionBar?.let { toolbar ->
+            ObjectAnimator.ofFloat(toolbar, "elevation", toolbar.elevation, 8.dpToPx(toolbar.themedContext).toFloat()).start()
+        }
+    }
+
+    override fun showQksmsPlusSnackbar() {
+        Snackbar.make(contentView, R.string.toast_qksms_plus, Snackbar.LENGTH_LONG).run {
+            setAction(R.string.button_more) { viewQksmsPlusSubject.onNext(Unit) }
+            setActionTextColor(colors.theme().theme)
+            show()
+        }
+    }
+
+    override fun themeSelected(): Observable<Int> = themeAdapter.colorSelected
+
+    override fun hsvThemeSelected(): Observable<Int> = picker.selectedColor
+
+    override fun clearHsvThemeClicks(): Observable<*> = clear.clicks()
+
+    override fun applyHsvThemeClicks(): Observable<*> = apply.clicks()
+
+    override fun viewQksmsPlusClicks(): Observable<*> = viewQksmsPlusSubject
+
+    override fun render(state: ThemePickerState) {
+        tabs.setRecipientId(state.recipientId)
+
+        hex.setText(Integer.toHexString(state.newColor).takeLast(6))
+
+        applyGroup.setVisible(state.applyThemeVisible)
+        apply.setBackgroundTint(state.newColor)
+        apply.setTextColor(state.newTextColor)
+    }
+
+    override fun setCurrentTheme(color: Int) {
+        picker.setColor(color)
+        themeAdapter.selectedColor = color
+    }
+
 }
\ No newline at end of file
diff --git a/presentation/src/main/java/com/moez/QKSMS/feature/themepicker/ThemePickerPresenter.kt b/presentation/src/main/java/com/moez/QKSMS/feature/themepicker/ThemePickerPresenter.kt
index a27315ec9..d0a32bbb5 100644
--- a/presentation/src/main/java/com/moez/QKSMS/feature/themepicker/ThemePickerPresenter.kt
+++ b/presentation/src/main/java/com/moez/QKSMS/feature/themepicker/ThemePickerPresenter.kt
@@ -1,104 +1,104 @@
-/*
- * Copyright (C) 2017 Moez Bhatti <moez.bhatti@gmail.com>
- *
- * This file is part of QKSMS.
- *
- * QKSMS is free software: you can redistribute it and/or modify
- * it under the terms of the GNU General Public License as published by
- * the Free Software Foundation, either version 3 of the License, or
- * (at your option) any later version.
- *
- * QKSMS is distributed in the hope that it will be useful,
- * but WITHOUT ANY WARRANTY; without even the implied warranty of
- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
- * GNU General Public License for more details.
- *
- * You should have received a copy of the GNU General Public License
- * along with QKSMS.  If not, see <http://www.gnu.org/licenses/>.
- */
-package com.moez.QKSMS.feature.themepicker
-
-import com.f2prateek.rx.preferences2.Preference
-import com.moez.QKSMS.common.Navigator
-import com.moez.QKSMS.common.base.QkPresenter
-import com.moez.QKSMS.common.util.Colors
-import com.moez.QKSMS.manager.BillingManager
-import com.moez.QKSMS.manager.WidgetManager
-import com.moez.QKSMS.util.Preferences
-import com.uber.autodispose.android.lifecycle.scope
-import com.uber.autodispose.autoDisposable
-import io.reactivex.rxkotlin.Observables
-import io.reactivex.rxkotlin.withLatestFrom
-import javax.inject.Inject
-import javax.inject.Named
-
-class ThemePickerPresenter @Inject constructor(
-    prefs: Preferences,
-    @Named("recipientId") private val recipientId: Long,
-    private val billingManager: BillingManager,
-    private val colors: Colors,
-    private val navigator: Navigator,
-    private val widgetManager: WidgetManager
-) : QkPresenter<ThemePickerView, ThemePickerState>(ThemePickerState(recipientId = recipientId)) {
-
-    private val theme: Preference<Int> = prefs.theme(recipientId)
-
-    override fun bindIntents(view: ThemePickerView) {
-        super.bindIntents(view)
-
-        theme.asObservable()
-                .autoDisposable(view.scope())
-                .subscribe { color -> view.setCurrentTheme(color) }
-
-        // Update the theme when a material theme is clicked
-        view.themeSelected()
-                .autoDisposable(view.scope())
-                .subscribe { color ->
-                    theme.set(color)
-                    if (recipientId == 0L) {
-                        widgetManager.updateTheme()
-                    }
-                }
-
-        // Update the color of the apply button
-        view.hsvThemeSelected()
-                .doOnNext { color -> newState { copy(newColor = color) } }
-                .map { color -> colors.textPrimaryOnThemeForColor(color) }
-                .doOnNext { color -> newState { copy(newTextColor = color) } }
-                .autoDisposable(view.scope())
-                .subscribe()
-
-        // Toggle the visibility of the apply group
-        Observables.combineLatest(theme.asObservable(), view.hsvThemeSelected()) { old, new -> old != new }
-                .autoDisposable(view.scope())
-                .subscribe { themeChanged -> newState { copy(applyThemeVisible = themeChanged) } }
-
-        // Update the theme, when apply is clicked
-        view.applyHsvThemeClicks()
-                .withLatestFrom(view.hsvThemeSelected()) { _, color -> color }
-                .withLatestFrom(billingManager.upgradeStatus) { color, upgraded ->
-                    if (!upgraded) {
-                        view.showQksmsPlusSnackbar()
-                    } else {
-                        theme.set(color)
-                        if (recipientId == 0L) {
-                            widgetManager.updateTheme()
-                        }
-                    }
-                }
-                .autoDisposable(view.scope())
-                .subscribe()
-
-        // Show QKSMS+ activity
-        view.viewQksmsPlusClicks()
-                .autoDisposable(view.scope())
-                .subscribe { navigator.showQksmsPlusActivity("settings_theme") }
-
-        // Reset the theme
-        view.clearHsvThemeClicks()
-                .withLatestFrom(theme.asObservable()) { _, color -> color }
-                .autoDisposable(view.scope())
-                .subscribe { color -> view.setCurrentTheme(color) }
-    }
-
+/*
+ * Copyright (C) 2017 Moez Bhatti <moez.bhatti@gmail.com>
+ *
+ * This file is part of QKSMS.
+ *
+ * QKSMS is free software: you can redistribute it and/or modify
+ * it under the terms of the GNU General Public License as published by
+ * the Free Software Foundation, either version 3 of the License, or
+ * (at your option) any later version.
+ *
+ * QKSMS is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+ * GNU General Public License for more details.
+ *
+ * You should have received a copy of the GNU General Public License
+ * along with QKSMS.  If not, see <http://www.gnu.org/licenses/>.
+ */
+package com.moez.QKSMS.feature.themepicker
+
+import com.f2prateek.rx.preferences2.Preference
+import com.moez.QKSMS.common.Navigator
+import com.moez.QKSMS.common.base.QkPresenter
+import com.moez.QKSMS.common.util.Colors
+import com.moez.QKSMS.manager.BillingManager
+import com.moez.QKSMS.manager.WidgetManager
+import com.moez.QKSMS.util.Preferences
+import com.uber.autodispose.android.lifecycle.scope
+import com.uber.autodispose.autoDisposable
+import io.reactivex.rxkotlin.Observables
+import io.reactivex.rxkotlin.withLatestFrom
+import javax.inject.Inject
+import javax.inject.Named
+
+class ThemePickerPresenter @Inject constructor(
+    prefs: Preferences,
+    @Named("recipientId") private val recipientId: Long,
+    private val billingManager: BillingManager,
+    private val colors: Colors,
+    private val navigator: Navigator,
+    private val widgetManager: WidgetManager
+) : QkPresenter<ThemePickerView, ThemePickerState>(ThemePickerState(recipientId = recipientId)) {
+
+    private val theme: Preference<Int> = prefs.theme(recipientId)
+
+    override fun bindIntents(view: ThemePickerView) {
+        super.bindIntents(view)
+
+        theme.asObservable()
+                .autoDisposable(view.scope())
+                .subscribe { color -> view.setCurrentTheme(color) }
+
+        // Update the theme when a material theme is clicked
+        view.themeSelected()
+                .autoDisposable(view.scope())
+                .subscribe { color ->
+                    theme.set(color)
+                    if (recipientId == 0L) {
+                        widgetManager.updateTheme()
+                    }
+                }
+
+        // Update the color of the apply button
+        view.hsvThemeSelected()
+                .doOnNext { color -> newState { copy(newColor = color) } }
+                .map { color -> colors.textPrimaryOnThemeForColor(color) }
+                .doOnNext { color -> newState { copy(newTextColor = color) } }
+                .autoDisposable(view.scope())
+                .subscribe()
+
+        // Toggle the visibility of the apply group
+        Observables.combineLatest(theme.asObservable(), view.hsvThemeSelected()) { old, new -> old != new }
+                .autoDisposable(view.scope())
+                .subscribe { themeChanged -> newState { copy(applyThemeVisible = themeChanged) } }
+
+        // Update the theme, when apply is clicked
+        view.applyHsvThemeClicks()
+                .withLatestFrom(view.hsvThemeSelected()) { _, color -> color }
+                .withLatestFrom(billingManager.upgradeStatus) { color, upgraded ->
+                    if (!upgraded) {
+                        view.showQksmsPlusSnackbar()
+                    } else {
+                        theme.set(color)
+                        if (recipientId == 0L) {
+                            widgetManager.updateTheme()
+                        }
+                    }
+                }
+                .autoDisposable(view.scope())
+                .subscribe()
+
+        // Show QKSMS+ activity
+        view.viewQksmsPlusClicks()
+                .autoDisposable(view.scope())
+                .subscribe { navigator.showQksmsPlusActivity("settings_theme") }
+
+        // Reset the theme
+        view.clearHsvThemeClicks()
+                .withLatestFrom(theme.asObservable()) { _, color -> color }
+                .autoDisposable(view.scope())
+                .subscribe { color -> view.setCurrentTheme(color) }
+    }
+
 }
\ No newline at end of file
diff --git a/presentation/src/main/java/com/moez/QKSMS/feature/themepicker/ThemePickerState.kt b/presentation/src/main/java/com/moez/QKSMS/feature/themepicker/ThemePickerState.kt
index 81c44dcf1..959fff747 100644
--- a/presentation/src/main/java/com/moez/QKSMS/feature/themepicker/ThemePickerState.kt
+++ b/presentation/src/main/java/com/moez/QKSMS/feature/themepicker/ThemePickerState.kt
@@ -1,26 +1,26 @@
-/*
- * Copyright (C) 2017 Moez Bhatti <moez.bhatti@gmail.com>
- *
- * This file is part of QKSMS.
- *
- * QKSMS is free software: you can redistribute it and/or modify
- * it under the terms of the GNU General Public License as published by
- * the Free Software Foundation, either version 3 of the License, or
- * (at your option) any later version.
- *
- * QKSMS is distributed in the hope that it will be useful,
- * but WITHOUT ANY WARRANTY; without even the implied warranty of
- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
- * GNU General Public License for more details.
- *
- * You should have received a copy of the GNU General Public License
- * along with QKSMS.  If not, see <http://www.gnu.org/licenses/>.
- */
-package com.moez.QKSMS.feature.themepicker
-
-data class ThemePickerState(
-    val recipientId: Long = 0,
-    val applyThemeVisible: Boolean = false,
-    val newColor: Int = -1,
-    val newTextColor: Int = -1
+/*
+ * Copyright (C) 2017 Moez Bhatti <moez.bhatti@gmail.com>
+ *
+ * This file is part of QKSMS.
+ *
+ * QKSMS is free software: you can redistribute it and/or modify
+ * it under the terms of the GNU General Public License as published by
+ * the Free Software Foundation, either version 3 of the License, or
+ * (at your option) any later version.
+ *
+ * QKSMS is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+ * GNU General Public License for more details.
+ *
+ * You should have received a copy of the GNU General Public License
+ * along with QKSMS.  If not, see <http://www.gnu.org/licenses/>.
+ */
+package com.moez.QKSMS.feature.themepicker
+
+data class ThemePickerState(
+    val recipientId: Long = 0,
+    val applyThemeVisible: Boolean = false,
+    val newColor: Int = -1,
+    val newTextColor: Int = -1
 )
\ No newline at end of file
diff --git a/presentation/src/main/java/com/moez/QKSMS/feature/themepicker/ThemePickerView.kt b/presentation/src/main/java/com/moez/QKSMS/feature/themepicker/ThemePickerView.kt
index a3005f01c..b55729349 100644
--- a/presentation/src/main/java/com/moez/QKSMS/feature/themepicker/ThemePickerView.kt
+++ b/presentation/src/main/java/com/moez/QKSMS/feature/themepicker/ThemePickerView.kt
@@ -1,35 +1,35 @@
-/*
- * Copyright (C) 2017 Moez Bhatti <moez.bhatti@gmail.com>
- *
- * This file is part of QKSMS.
- *
- * QKSMS is free software: you can redistribute it and/or modify
- * it under the terms of the GNU General Public License as published by
- * the Free Software Foundation, either version 3 of the License, or
- * (at your option) any later version.
- *
- * QKSMS is distributed in the hope that it will be useful,
- * but WITHOUT ANY WARRANTY; without even the implied warranty of
- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
- * GNU General Public License for more details.
- *
- * You should have received a copy of the GNU General Public License
- * along with QKSMS.  If not, see <http://www.gnu.org/licenses/>.
- */
-package com.moez.QKSMS.feature.themepicker
-
-import com.moez.QKSMS.common.base.QkViewContract
-import io.reactivex.Observable
-
-interface ThemePickerView : QkViewContract<ThemePickerState> {
-
-    fun themeSelected(): Observable<Int>
-    fun hsvThemeSelected(): Observable<Int>
-    fun clearHsvThemeClicks(): Observable<*>
-    fun applyHsvThemeClicks(): Observable<*>
-    fun viewQksmsPlusClicks(): Observable<*>
-
-    fun setCurrentTheme(color: Int)
-    fun showQksmsPlusSnackbar()
-
+/*
+ * Copyright (C) 2017 Moez Bhatti <moez.bhatti@gmail.com>
+ *
+ * This file is part of QKSMS.
+ *
+ * QKSMS is free software: you can redistribute it and/or modify
+ * it under the terms of the GNU General Public License as published by
+ * the Free Software Foundation, either version 3 of the License, or
+ * (at your option) any later version.
+ *
+ * QKSMS is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+ * GNU General Public License for more details.
+ *
+ * You should have received a copy of the GNU General Public License
+ * along with QKSMS.  If not, see <http://www.gnu.org/licenses/>.
+ */
+package com.moez.QKSMS.feature.themepicker
+
+import com.moez.QKSMS.common.base.QkViewContract
+import io.reactivex.Observable
+
+interface ThemePickerView : QkViewContract<ThemePickerState> {
+
+    fun themeSelected(): Observable<Int>
+    fun hsvThemeSelected(): Observable<Int>
+    fun clearHsvThemeClicks(): Observable<*>
+    fun applyHsvThemeClicks(): Observable<*>
+    fun viewQksmsPlusClicks(): Observable<*>
+
+    fun setCurrentTheme(color: Int)
+    fun showQksmsPlusSnackbar()
+
 }
\ No newline at end of file
diff --git a/presentation/src/main/java/com/moez/QKSMS/feature/themepicker/injection/ThemePickerComponent.kt b/presentation/src/main/java/com/moez/QKSMS/feature/themepicker/injection/ThemePickerComponent.kt
index 6cc684553..e10cb4861 100644
--- a/presentation/src/main/java/com/moez/QKSMS/feature/themepicker/injection/ThemePickerComponent.kt
+++ b/presentation/src/main/java/com/moez/QKSMS/feature/themepicker/injection/ThemePickerComponent.kt
@@ -1,37 +1,37 @@
-/*
- * Copyright (C) 2017 Moez Bhatti <moez.bhatti@gmail.com>
- *
- * This file is part of QKSMS.
- *
- * QKSMS is free software: you can redistribute it and/or modify
- * it under the terms of the GNU General Public License as published by
- * the Free Software Foundation, either version 3 of the License, or
- * (at your option) any later version.
- *
- * QKSMS is distributed in the hope that it will be useful,
- * but WITHOUT ANY WARRANTY; without even the implied warranty of
- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
- * GNU General Public License for more details.
- *
- * You should have received a copy of the GNU General Public License
- * along with QKSMS.  If not, see <http://www.gnu.org/licenses/>.
- */
-package com.moez.QKSMS.feature.themepicker.injection
-
-import com.moez.QKSMS.feature.themepicker.ThemePickerController
-import com.moez.QKSMS.injection.scope.ControllerScope
-import dagger.Subcomponent
-
-@ControllerScope
-@Subcomponent(modules = [ThemePickerModule::class])
-interface ThemePickerComponent {
-
-    fun inject(controller: ThemePickerController)
-
-    @Subcomponent.Builder
-    interface Builder {
-        fun themePickerModule(module: ThemePickerModule): Builder
-        fun build(): ThemePickerComponent
-    }
-
+/*
+ * Copyright (C) 2017 Moez Bhatti <moez.bhatti@gmail.com>
+ *
+ * This file is part of QKSMS.
+ *
+ * QKSMS is free software: you can redistribute it and/or modify
+ * it under the terms of the GNU General Public License as published by
+ * the Free Software Foundation, either version 3 of the License, or
+ * (at your option) any later version.
+ *
+ * QKSMS is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+ * GNU General Public License for more details.
+ *
+ * You should have received a copy of the GNU General Public License
+ * along with QKSMS.  If not, see <http://www.gnu.org/licenses/>.
+ */
+package com.moez.QKSMS.feature.themepicker.injection
+
+import com.moez.QKSMS.feature.themepicker.ThemePickerController
+import com.moez.QKSMS.injection.scope.ControllerScope
+import dagger.Subcomponent
+
+@ControllerScope
+@Subcomponent(modules = [ThemePickerModule::class])
+interface ThemePickerComponent {
+
+    fun inject(controller: ThemePickerController)
+
+    @Subcomponent.Builder
+    interface Builder {
+        fun themePickerModule(module: ThemePickerModule): Builder
+        fun build(): ThemePickerComponent
+    }
+
 }
\ No newline at end of file
diff --git a/presentation/src/main/java/com/moez/QKSMS/feature/themepicker/injection/ThemePickerModule.kt b/presentation/src/main/java/com/moez/QKSMS/feature/themepicker/injection/ThemePickerModule.kt
index c5c9b8d15..290ff5286 100644
--- a/presentation/src/main/java/com/moez/QKSMS/feature/themepicker/injection/ThemePickerModule.kt
+++ b/presentation/src/main/java/com/moez/QKSMS/feature/themepicker/injection/ThemePickerModule.kt
@@ -1,35 +1,35 @@
-/*
- * Copyright (C) 2017 Moez Bhatti <moez.bhatti@gmail.com>
- *
- * This file is part of QKSMS.
- *
- * QKSMS is free software: you can redistribute it and/or modify
- * it under the terms of the GNU General Public License as published by
- * the Free Software Foundation, either version 3 of the License, or
- * (at your option) any later version.
- *
- * QKSMS is distributed in the hope that it will be useful,
- * but WITHOUT ANY WARRANTY; without even the implied warranty of
- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
- * GNU General Public License for more details.
- *
- * You should have received a copy of the GNU General Public License
- * along with QKSMS.  If not, see <http://www.gnu.org/licenses/>.
- */
-package com.moez.QKSMS.feature.themepicker.injection
-
-import com.moez.QKSMS.feature.themepicker.ThemePickerController
-import com.moez.QKSMS.injection.scope.ControllerScope
-import dagger.Module
-import dagger.Provides
-import javax.inject.Named
-
-@Module
-class ThemePickerModule(private val controller: ThemePickerController) {
-
-    @Provides
-    @ControllerScope
-    @Named("recipientId")
-    fun provideThreadId(): Long = controller.recipientId
-
+/*
+ * Copyright (C) 2017 Moez Bhatti <moez.bhatti@gmail.com>
+ *
+ * This file is part of QKSMS.
+ *
+ * QKSMS is free software: you can redistribute it and/or modify
+ * it under the terms of the GNU General Public License as published by
+ * the Free Software Foundation, either version 3 of the License, or
+ * (at your option) any later version.
+ *
+ * QKSMS is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+ * GNU General Public License for more details.
+ *
+ * You should have received a copy of the GNU General Public License
+ * along with QKSMS.  If not, see <http://www.gnu.org/licenses/>.
+ */
+package com.moez.QKSMS.feature.themepicker.injection
+
+import com.moez.QKSMS.feature.themepicker.ThemePickerController
+import com.moez.QKSMS.injection.scope.ControllerScope
+import dagger.Module
+import dagger.Provides
+import javax.inject.Named
+
+@Module
+class ThemePickerModule(private val controller: ThemePickerController) {
+
+    @Provides
+    @ControllerScope
+    @Named("recipientId")
+    fun provideThreadId(): Long = controller.recipientId
+
 }
\ No newline at end of file
diff --git a/presentation/src/main/java/com/moez/QKSMS/feature/widget/WidgetAdapter.kt b/presentation/src/main/java/com/moez/QKSMS/feature/widget/WidgetAdapter.kt
index 325771ec2..5a4d2047e 100644
--- a/presentation/src/main/java/com/moez/QKSMS/feature/widget/WidgetAdapter.kt
+++ b/presentation/src/main/java/com/moez/QKSMS/feature/widget/WidgetAdapter.kt
@@ -1,210 +1,210 @@
-/*
- * Copyright (C) 2017 Moez Bhatti <moez.bhatti@gmail.com>
- *
- * This file is part of QKSMS.
- *
- * QKSMS is free software: you can redistribute it and/or modify
- * it under the terms of the GNU General Public License as published by
- * the Free Software Foundation, either version 3 of the License, or
- * (at your option) any later version.
- *
- * QKSMS is distributed in the hope that it will be useful,
- * but WITHOUT ANY WARRANTY; without even the implied warranty of
- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
- * GNU General Public License for more details.
- *
- * You should have received a copy of the GNU General Public License
- * along with QKSMS.  If not, see <http://www.gnu.org/licenses/>.
- */
-package com.moez.QKSMS.feature.widget
-
-import android.appwidget.AppWidgetManager
-import android.content.ComponentName
-import android.content.Context
-import android.content.Intent
-import android.text.SpannableStringBuilder
-import android.view.View
-import android.widget.RemoteViews
-import android.widget.RemoteViewsService
-import androidx.core.text.bold
-import androidx.core.text.buildSpannedString
-import androidx.core.text.color
-import com.moez.QKSMS.R
-import com.moez.QKSMS.common.util.Colors
-import com.moez.QKSMS.common.util.DateFormatter
-import com.moez.QKSMS.common.util.extensions.dpToPx
-import com.moez.QKSMS.common.util.extensions.getColorCompat
-import com.moez.QKSMS.feature.compose.ComposeActivity
-import com.moez.QKSMS.feature.main.MainActivity
-import com.moez.QKSMS.injection.appComponent
-import com.moez.QKSMS.model.Contact
-import com.moez.QKSMS.model.Conversation
-import com.moez.QKSMS.model.PhoneNumber
-import com.moez.QKSMS.repository.ConversationRepository
-import com.moez.QKSMS.util.GlideApp
-import com.moez.QKSMS.util.Preferences
-import com.moez.QKSMS.util.tryOrNull
-import javax.inject.Inject
-
-class WidgetAdapter(intent: Intent) : RemoteViewsService.RemoteViewsFactory {
-
-    companion object {
-        private const val MAX_CONVERSATIONS_COUNT = 25
-    }
-
-    @Inject lateinit var context: Context
-    @Inject lateinit var colors: Colors
-    @Inject lateinit var conversationRepo: ConversationRepository
-    @Inject lateinit var dateFormatter: DateFormatter
-    @Inject lateinit var prefs: Preferences
-
-    private val appWidgetId = intent.getIntExtra(AppWidgetManager.EXTRA_APPWIDGET_ID,
-            AppWidgetManager.INVALID_APPWIDGET_ID)
-    private val smallWidget = intent.getBooleanExtra("small_widget", false)
-    private var conversations: List<Conversation> = listOf()
-    private val appWidgetManager by lazy { AppWidgetManager.getInstance(context) }
-
-    private val night get() = prefs.night.get()
-    private val black get() = prefs.black.get()
-    private val theme get() = colors.theme()
-    private val background
-        get() = context.getColorCompat(when {
-            night && black -> R.color.black
-            night && !black -> R.color.backgroundDark
-            else -> R.color.white
-        })
-    private val textPrimary
-        get() = context.getColorCompat(if (night) R.color.textPrimaryDark else R.color.textPrimary)
-    private val textSecondary
-        get() = context.getColorCompat(if (night) R.color.textSecondaryDark else R.color.textSecondary)
-    private val textTertiary
-        get() = context.getColorCompat(if (night) R.color.textTertiaryDark else R.color.textTertiary)
-
-    override fun onCreate() {
-        appComponent.inject(this)
-    }
-
-    override fun onDataSetChanged() {
-        conversations = conversationRepo.getConversationsSnapshot()
-
-        val remoteViews = RemoteViews(context.packageName, R.layout.widget)
-        appWidgetManager.partiallyUpdateAppWidget(appWidgetId, remoteViews)
-    }
-
-    /**
-     * Returns the number of rows to show. If there are more conversations than the max count,
-     * we'll return the max count + 1, where the last row just shows "View more conversations"
-     */
-    override fun getCount(): Int {
-        val count = Math.min(conversations.size, MAX_CONVERSATIONS_COUNT)
-        val shouldShowViewMore = count < conversations.size
-        return count + if (shouldShowViewMore) 1 else 0
-    }
-
-    override fun getViewAt(position: Int): RemoteViews {
-        return when {
-            position >= MAX_CONVERSATIONS_COUNT -> getOverflowView()
-            else -> getConversationView(position)
-        }
-    }
-
-    private fun getConversationView(position: Int): RemoteViews {
-        val conversation = conversations[position]
-
-        val remoteViews = RemoteViews(context.packageName, R.layout.widget_list_item)
-
-        // Avatar
-        remoteViews.setViewVisibility(R.id.avatar, if (smallWidget) View.GONE else View.VISIBLE)
-        remoteViews.setInt(R.id.avatar, "setBackgroundColor", theme.theme)
-        remoteViews.setTextColor(R.id.initial, theme.textPrimary)
-        remoteViews.setInt(R.id.icon, "setColorFilter", theme.textPrimary)
-        remoteViews.setInt(R.id.avatarMask, "setColorFilter", background)
-
-        val contact = conversation.recipients.map { recipient ->
-            recipient.contact ?: Contact().apply { numbers.add(PhoneNumber().apply { address = recipient.address }) }
-        }.firstOrNull()
-
-        // Use the icon if there's no name, otherwise show an initial
-        if (contact?.name.orEmpty().isNotEmpty()) {
-            remoteViews.setTextViewText(R.id.initial, contact?.name?.substring(0, 1))
-            remoteViews.setViewVisibility(R.id.icon, View.GONE)
-        } else {
-            remoteViews.setTextViewText(R.id.initial, null)
-            remoteViews.setViewVisibility(R.id.icon, View.VISIBLE)
-        }
-
-        remoteViews.setImageViewBitmap(R.id.photo, null)
-        val futureGet = GlideApp.with(context)
-                .asBitmap()
-                .load(contact?.photoUri)
-                .submit(48.dpToPx(context), 48.dpToPx(context))
-        tryOrNull(false) { remoteViews.setImageViewBitmap(R.id.photo, futureGet.get()) }
-
-        // Name
-        remoteViews.setTextColor(R.id.name, textPrimary)
-        remoteViews.setTextViewText(R.id.name, boldText(buildSpannedString {
-            append(conversation.getTitle())
-            if (conversation.draft.isNotEmpty()) {
-                color(theme.theme) { append(" " + context.getString(R.string.main_draft)) }
-            }
-        }, conversation.unread))
-
-        // Date
-        val timestamp = conversation.date.takeIf { it > 0 }?.let(dateFormatter::getConversationTimestamp)
-        remoteViews.setTextColor(R.id.date, if (conversation.unread) textPrimary else textTertiary)
-        remoteViews.setTextViewText(R.id.date, boldText(timestamp, conversation.unread))
-
-        // Snippet
-        val snippet = when {
-            conversation.draft.isNotEmpty() -> conversation.draft
-            conversation.me -> context.getString(R.string.main_sender_you, conversation.snippet)
-            else -> conversation.snippet
-        }
-        remoteViews.setTextColor(R.id.snippet, if (conversation.unread) textPrimary else textTertiary)
-        remoteViews.setTextViewText(R.id.snippet, boldText(snippet, conversation.unread))
-
-        // Launch conversation on click
-        val clickIntent = Intent()
-                .putExtra("screen", "compose")
-                .putExtra("threadId", conversation.id)
-        remoteViews.setOnClickFillInIntent(R.id.conversation, clickIntent)
-
-        return remoteViews
-    }
-
-    private fun getOverflowView(): RemoteViews {
-        val view = RemoteViews(context.packageName, R.layout.widget_loading)
-        view.setTextColor(R.id.loadingText, textSecondary)
-        view.setTextViewText(R.id.loadingText, context.getString(R.string.widget_more))
-        view.setOnClickFillInIntent(R.id.loading, Intent())
-        return view
-    }
-
-    private fun boldText(text: CharSequence?, shouldBold: Boolean): CharSequence? = when {
-        shouldBold -> SpannableStringBuilder()
-                .bold { append(text) }
-        else -> text
-    }
-
-    override fun getLoadingView(): RemoteViews {
-        val view = RemoteViews(context.packageName, R.layout.widget_loading)
-        view.setTextViewText(R.id.loadingText, context.getText(R.string.widget_loading))
-        return view
-    }
-
-    override fun getViewTypeCount(): Int {
-        return 2
-    }
-
-    override fun getItemId(position: Int): Long {
-        return position.toLong()
-    }
-
-    override fun hasStableIds(): Boolean {
-        return false
-    }
-
-    override fun onDestroy() {
-    }
-
+/*
+ * Copyright (C) 2017 Moez Bhatti <moez.bhatti@gmail.com>
+ *
+ * This file is part of QKSMS.
+ *
+ * QKSMS is free software: you can redistribute it and/or modify
+ * it under the terms of the GNU General Public License as published by
+ * the Free Software Foundation, either version 3 of the License, or
+ * (at your option) any later version.
+ *
+ * QKSMS is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+ * GNU General Public License for more details.
+ *
+ * You should have received a copy of the GNU General Public License
+ * along with QKSMS.  If not, see <http://www.gnu.org/licenses/>.
+ */
+package com.moez.QKSMS.feature.widget
+
+import android.appwidget.AppWidgetManager
+import android.content.ComponentName
+import android.content.Context
+import android.content.Intent
+import android.text.SpannableStringBuilder
+import android.view.View
+import android.widget.RemoteViews
+import android.widget.RemoteViewsService
+import androidx.core.text.bold
+import androidx.core.text.buildSpannedString
+import androidx.core.text.color
+import com.moez.QKSMS.R
+import com.moez.QKSMS.common.util.Colors
+import com.moez.QKSMS.common.util.DateFormatter
+import com.moez.QKSMS.common.util.extensions.dpToPx
+import com.moez.QKSMS.common.util.extensions.getColorCompat
+import com.moez.QKSMS.feature.compose.ComposeActivity
+import com.moez.QKSMS.feature.main.MainActivity
+import com.moez.QKSMS.injection.appComponent
+import com.moez.QKSMS.model.Contact
+import com.moez.QKSMS.model.Conversation
+import com.moez.QKSMS.model.PhoneNumber
+import com.moez.QKSMS.repository.ConversationRepository
+import com.moez.QKSMS.util.GlideApp
+import com.moez.QKSMS.util.Preferences
+import com.moez.QKSMS.util.tryOrNull
+import javax.inject.Inject
+
+class WidgetAdapter(intent: Intent) : RemoteViewsService.RemoteViewsFactory {
+
+    companion object {
+        private const val MAX_CONVERSATIONS_COUNT = 25
+    }
+
+    @Inject lateinit var context: Context
+    @Inject lateinit var colors: Colors
+    @Inject lateinit var conversationRepo: ConversationRepository
+    @Inject lateinit var dateFormatter: DateFormatter
+    @Inject lateinit var prefs: Preferences
+
+    private val appWidgetId = intent.getIntExtra(AppWidgetManager.EXTRA_APPWIDGET_ID,
+            AppWidgetManager.INVALID_APPWIDGET_ID)
+    private val smallWidget = intent.getBooleanExtra("small_widget", false)
+    private var conversations: List<Conversation> = listOf()
+    private val appWidgetManager by lazy { AppWidgetManager.getInstance(context) }
+
+    private val night get() = prefs.night.get()
+    private val black get() = prefs.black.get()
+    private val theme get() = colors.theme()
+    private val background
+        get() = context.getColorCompat(when {
+            night && black -> R.color.black
+            night && !black -> R.color.backgroundDark
+            else -> R.color.white
+        })
+    private val textPrimary
+        get() = context.getColorCompat(if (night) R.color.textPrimaryDark else R.color.textPrimary)
+    private val textSecondary
+        get() = context.getColorCompat(if (night) R.color.textSecondaryDark else R.color.textSecondary)
+    private val textTertiary
+        get() = context.getColorCompat(if (night) R.color.textTertiaryDark else R.color.textTertiary)
+
+    override fun onCreate() {
+        appComponent.inject(this)
+    }
+
+    override fun onDataSetChanged() {
+        conversations = conversationRepo.getConversationsSnapshot()
+
+        val remoteViews = RemoteViews(context.packageName, R.layout.widget)
+        appWidgetManager.partiallyUpdateAppWidget(appWidgetId, remoteViews)
+    }
+
+    /**
+     * Returns the number of rows to show. If there are more conversations than the max count,
+     * we'll return the max count + 1, where the last row just shows "View more conversations"
+     */
+    override fun getCount(): Int {
+        val count = Math.min(conversations.size, MAX_CONVERSATIONS_COUNT)
+        val shouldShowViewMore = count < conversations.size
+        return count + if (shouldShowViewMore) 1 else 0
+    }
+
+    override fun getViewAt(position: Int): RemoteViews {
+        return when {
+            position >= MAX_CONVERSATIONS_COUNT -> getOverflowView()
+            else -> getConversationView(position)
+        }
+    }
+
+    private fun getConversationView(position: Int): RemoteViews {
+        val conversation = conversations[position]
+
+        val remoteViews = RemoteViews(context.packageName, R.layout.widget_list_item)
+
+        // Avatar
+        remoteViews.setViewVisibility(R.id.avatar, if (smallWidget) View.GONE else View.VISIBLE)
+        remoteViews.setInt(R.id.avatar, "setBackgroundColor", theme.theme)
+        remoteViews.setTextColor(R.id.initial, theme.textPrimary)
+        remoteViews.setInt(R.id.icon, "setColorFilter", theme.textPrimary)
+        remoteViews.setInt(R.id.avatarMask, "setColorFilter", background)
+
+        val contact = conversation.recipients.map { recipient ->
+            recipient.contact ?: Contact().apply { numbers.add(PhoneNumber().apply { address = recipient.address }) }
+        }.firstOrNull()
+
+        // Use the icon if there's no name, otherwise show an initial
+        if (contact?.name.orEmpty().isNotEmpty()) {
+            remoteViews.setTextViewText(R.id.initial, contact?.name?.substring(0, 1))
+            remoteViews.setViewVisibility(R.id.icon, View.GONE)
+        } else {
+            remoteViews.setTextViewText(R.id.initial, null)
+            remoteViews.setViewVisibility(R.id.icon, View.VISIBLE)
+        }
+
+        remoteViews.setImageViewBitmap(R.id.photo, null)
+        val futureGet = GlideApp.with(context)
+                .asBitmap()
+                .load(contact?.photoUri)
+                .submit(48.dpToPx(context), 48.dpToPx(context))
+        tryOrNull(false) { remoteViews.setImageViewBitmap(R.id.photo, futureGet.get()) }
+
+        // Name
+        remoteViews.setTextColor(R.id.name, textPrimary)
+        remoteViews.setTextViewText(R.id.name, boldText(buildSpannedString {
+            append(conversation.getTitle())
+            if (conversation.draft.isNotEmpty()) {
+                color(theme.theme) { append(" " + context.getString(R.string.main_draft)) }
+            }
+        }, conversation.unread))
+
+        // Date
+        val timestamp = conversation.date.takeIf { it > 0 }?.let(dateFormatter::getConversationTimestamp)
+        remoteViews.setTextColor(R.id.date, if (conversation.unread) textPrimary else textTertiary)
+        remoteViews.setTextViewText(R.id.date, boldText(timestamp, conversation.unread))
+
+        // Snippet
+        val snippet = when {
+            conversation.draft.isNotEmpty() -> conversation.draft
+            conversation.me -> context.getString(R.string.main_sender_you, conversation.snippet)
+            else -> conversation.snippet
+        }
+        remoteViews.setTextColor(R.id.snippet, if (conversation.unread) textPrimary else textTertiary)
+        remoteViews.setTextViewText(R.id.snippet, boldText(snippet, conversation.unread))
+
+        // Launch conversation on click
+        val clickIntent = Intent()
+                .putExtra("screen", "compose")
+                .putExtra("threadId", conversation.id)
+        remoteViews.setOnClickFillInIntent(R.id.conversation, clickIntent)
+
+        return remoteViews
+    }
+
+    private fun getOverflowView(): RemoteViews {
+        val view = RemoteViews(context.packageName, R.layout.widget_loading)
+        view.setTextColor(R.id.loadingText, textSecondary)
+        view.setTextViewText(R.id.loadingText, context.getString(R.string.widget_more))
+        view.setOnClickFillInIntent(R.id.loading, Intent())
+        return view
+    }
+
+    private fun boldText(text: CharSequence?, shouldBold: Boolean): CharSequence? = when {
+        shouldBold -> SpannableStringBuilder()
+                .bold { append(text) }
+        else -> text
+    }
+
+    override fun getLoadingView(): RemoteViews {
+        val view = RemoteViews(context.packageName, R.layout.widget_loading)
+        view.setTextViewText(R.id.loadingText, context.getText(R.string.widget_loading))
+        return view
+    }
+
+    override fun getViewTypeCount(): Int {
+        return 2
+    }
+
+    override fun getItemId(position: Int): Long {
+        return position.toLong()
+    }
+
+    override fun hasStableIds(): Boolean {
+        return false
+    }
+
+    override fun onDestroy() {
+    }
+
 }
\ No newline at end of file
diff --git a/presentation/src/main/java/com/moez/QKSMS/feature/widget/WidgetProvider.kt b/presentation/src/main/java/com/moez/QKSMS/feature/widget/WidgetProvider.kt
index 696823f16..0431f55b9 100644
--- a/presentation/src/main/java/com/moez/QKSMS/feature/widget/WidgetProvider.kt
+++ b/presentation/src/main/java/com/moez/QKSMS/feature/widget/WidgetProvider.kt
@@ -1,159 +1,159 @@
-/*
- * Copyright (C) 2017 Moez Bhatti <moez.bhatti@gmail.com>
- *
- * This file is part of QKSMS.
- *
- * QKSMS is free software: you can redistribute it and/or modify
- * it under the terms of the GNU General Public License as published by
- * the Free Software Foundation, either version 3 of the License, or
- * (at your option) any later version.
- *
- * QKSMS is distributed in the hope that it will be useful,
- * but WITHOUT ANY WARRANTY; without even the implied warranty of
- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
- * GNU General Public License for more details.
- *
- * You should have received a copy of the GNU General Public License
- * along with QKSMS.  If not, see <http://www.gnu.org/licenses/>.
- */
-
-package com.moez.QKSMS.feature.widget
-
-import android.app.PendingIntent
-import android.appwidget.AppWidgetManager
-import android.appwidget.AppWidgetProvider
-import android.content.ComponentName
-import android.content.Context
-import android.content.Intent
-import android.net.Uri
-import android.os.Bundle
-import android.widget.RemoteViews
-import com.moez.QKSMS.R
-import com.moez.QKSMS.common.util.Colors
-import com.moez.QKSMS.common.util.extensions.getColorCompat
-import com.moez.QKSMS.feature.compose.ComposeActivity
-import com.moez.QKSMS.feature.main.MainActivity
-import com.moez.QKSMS.manager.WidgetManager
-import com.moez.QKSMS.util.Preferences
-import dagger.android.AndroidInjection
-import timber.log.Timber
-import javax.inject.Inject
-
-class WidgetProvider : AppWidgetProvider() {
-
-    @Inject lateinit var colors: Colors
-    @Inject lateinit var prefs: Preferences
-
-    override fun onReceive(context: Context, intent: Intent) {
-        AndroidInjection.inject(this, context)
-
-        when (intent.action) {
-            WidgetManager.ACTION_NOTIFY_DATASET_CHANGED -> updateData(context)
-            else -> super.onReceive(context, intent)
-        }
-    }
-
-    /**
-     * Update all widgets in the list
-     */
-    override fun onUpdate(context: Context, appWidgetManager: AppWidgetManager, appWidgetIds: IntArray) {
-        super.onUpdate(context, appWidgetManager, appWidgetIds)
-
-        updateData(context)
-        for (appWidgetId in appWidgetIds) {
-            updateWidget(context, appWidgetId, isSmallWidget(appWidgetManager, appWidgetId))
-        }
-    }
-
-    /**
-     * Notify all the widgets that they should update their adapter data
-     */
-    private fun updateData(context: Context) {
-        val appWidgetManager = AppWidgetManager.getInstance(context)
-        val appWidgetIds = appWidgetManager.getAppWidgetIds(ComponentName(context, WidgetProvider::class.java))
-
-        // We need to update all Mms appwidgets on the home screen.
-        appWidgetManager.notifyAppWidgetViewDataChanged(appWidgetIds, R.id.conversations)
-    }
-
-    /**
-     * Update widget when widget size changes
-     */
-    override fun onAppWidgetOptionsChanged(context: Context, appWidgetManager: AppWidgetManager, appWidgetId: Int, newOptions: Bundle) {
-        updateWidget(context, appWidgetId, isSmallWidget(appWidgetManager, appWidgetId))
-        super.onAppWidgetOptionsChanged(context, appWidgetManager, appWidgetId, newOptions)
-    }
-
-    /**
-     * Returns true when widget has less than 4 columns, else false
-     */
-    private fun isSmallWidget(appWidgetManager: AppWidgetManager, appWidgetId: Int): Boolean {
-        val options = appWidgetManager.getAppWidgetOptions(appWidgetId)
-        val size = options.getInt(AppWidgetManager.OPTION_APPWIDGET_MIN_WIDTH)
-
-        var n = 2
-        while (70 * n - 30 < size) {
-            ++n
-        }
-
-        val columns = n - 1
-
-        return columns < 4
-    }
-
-    /**
-     * Update the widget appWidgetId
-     */
-    private fun updateWidget(context: Context, appWidgetId: Int, smallWidget: Boolean) {
-        Timber.v("updateWidget appWidgetId: $appWidgetId")
-        val remoteViews = RemoteViews(context.packageName, R.layout.widget)
-
-        // Apply colors from theme
-        val night = prefs.night.get()
-        val black = prefs.black.get()
-
-        remoteViews.setInt(R.id.background, "setColorFilter", context.getColorCompat(when {
-            night && black -> R.color.black
-            night && !black -> R.color.backgroundDark
-            else -> R.color.white
-        }))
-
-        remoteViews.setInt(R.id.toolbar, "setColorFilter", context.getColorCompat(when {
-            night && black -> R.color.black
-            night && !black -> R.color.backgroundDark
-            else -> R.color.backgroundLight
-        }))
-
-        remoteViews.setTextColor(R.id.title, context.getColorCompat(when (night) {
-            true -> R.color.textPrimaryDark
-            false -> R.color.textPrimary
-        }))
-
-        remoteViews.setInt(R.id.compose, "setColorFilter", colors.theme().theme)
-
-        // Set adapter for conversations
-        val intent = Intent(context, WidgetService::class.java)
-                .putExtra(AppWidgetManager.EXTRA_APPWIDGET_ID, appWidgetId)
-                .putExtra("small_widget", smallWidget)
-        intent.data = Uri.parse(intent.toUri(Intent.URI_INTENT_SCHEME))
-        remoteViews.setRemoteAdapter(R.id.conversations, intent)
-
-        // Main intent
-        val mainIntent = Intent(context, MainActivity::class.java)
-        val mainPI = PendingIntent.getActivity(context, 0, mainIntent, PendingIntent.FLAG_UPDATE_CURRENT)
-        remoteViews.setOnClickPendingIntent(R.id.title, mainPI)
-
-        // Compose intent
-        val composeIntent = Intent(context, ComposeActivity::class.java)
-        val composePI = PendingIntent.getActivity(context, 0, composeIntent, PendingIntent.FLAG_UPDATE_CURRENT)
-        remoteViews.setOnClickPendingIntent(R.id.compose, composePI)
-
-        // Conversation intent
-        val startActivityIntent = Intent(context, MainActivity::class.java)
-        val startActivityPendingIntent = PendingIntent.getActivity(context, 0, startActivityIntent, PendingIntent.FLAG_UPDATE_CURRENT)
-        remoteViews.setPendingIntentTemplate(R.id.conversations, startActivityPendingIntent)
-
-        AppWidgetManager.getInstance(context).updateAppWidget(appWidgetId, remoteViews)
-    }
-
-}
+/*
+ * Copyright (C) 2017 Moez Bhatti <moez.bhatti@gmail.com>
+ *
+ * This file is part of QKSMS.
+ *
+ * QKSMS is free software: you can redistribute it and/or modify
+ * it under the terms of the GNU General Public License as published by
+ * the Free Software Foundation, either version 3 of the License, or
+ * (at your option) any later version.
+ *
+ * QKSMS is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+ * GNU General Public License for more details.
+ *
+ * You should have received a copy of the GNU General Public License
+ * along with QKSMS.  If not, see <http://www.gnu.org/licenses/>.
+ */
+
+package com.moez.QKSMS.feature.widget
+
+import android.app.PendingIntent
+import android.appwidget.AppWidgetManager
+import android.appwidget.AppWidgetProvider
+import android.content.ComponentName
+import android.content.Context
+import android.content.Intent
+import android.net.Uri
+import android.os.Bundle
+import android.widget.RemoteViews
+import com.moez.QKSMS.R
+import com.moez.QKSMS.common.util.Colors
+import com.moez.QKSMS.common.util.extensions.getColorCompat
+import com.moez.QKSMS.feature.compose.ComposeActivity
+import com.moez.QKSMS.feature.main.MainActivity
+import com.moez.QKSMS.manager.WidgetManager
+import com.moez.QKSMS.util.Preferences
+import dagger.android.AndroidInjection
+import timber.log.Timber
+import javax.inject.Inject
+
+class WidgetProvider : AppWidgetProvider() {
+
+    @Inject lateinit var colors: Colors
+    @Inject lateinit var prefs: Preferences
+
+    override fun onReceive(context: Context, intent: Intent) {
+        AndroidInjection.inject(this, context)
+
+        when (intent.action) {
+            WidgetManager.ACTION_NOTIFY_DATASET_CHANGED -> updateData(context)
+            else -> super.onReceive(context, intent)
+        }
+    }
+
+    /**
+     * Update all widgets in the list
+     */
+    override fun onUpdate(context: Context, appWidgetManager: AppWidgetManager, appWidgetIds: IntArray) {
+        super.onUpdate(context, appWidgetManager, appWidgetIds)
+
+        updateData(context)
+        for (appWidgetId in appWidgetIds) {
+            updateWidget(context, appWidgetId, isSmallWidget(appWidgetManager, appWidgetId))
+        }
+    }
+
+    /**
+     * Notify all the widgets that they should update their adapter data
+     */
+    private fun updateData(context: Context) {
+        val appWidgetManager = AppWidgetManager.getInstance(context)
+        val appWidgetIds = appWidgetManager.getAppWidgetIds(ComponentName(context, WidgetProvider::class.java))
+
+        // We need to update all Mms appwidgets on the home screen.
+        appWidgetManager.notifyAppWidgetViewDataChanged(appWidgetIds, R.id.conversations)
+    }
+
+    /**
+     * Update widget when widget size changes
+     */
+    override fun onAppWidgetOptionsChanged(context: Context, appWidgetManager: AppWidgetManager, appWidgetId: Int, newOptions: Bundle) {
+        updateWidget(context, appWidgetId, isSmallWidget(appWidgetManager, appWidgetId))
+        super.onAppWidgetOptionsChanged(context, appWidgetManager, appWidgetId, newOptions)
+    }
+
+    /**
+     * Returns true when widget has less than 4 columns, else false
+     */
+    private fun isSmallWidget(appWidgetManager: AppWidgetManager, appWidgetId: Int): Boolean {
+        val options = appWidgetManager.getAppWidgetOptions(appWidgetId)
+        val size = options.getInt(AppWidgetManager.OPTION_APPWIDGET_MIN_WIDTH)
+
+        var n = 2
+        while (70 * n - 30 < size) {
+            ++n
+        }
+
+        val columns = n - 1
+
+        return columns < 4
+    }
+
+    /**
+     * Update the widget appWidgetId
+     */
+    private fun updateWidget(context: Context, appWidgetId: Int, smallWidget: Boolean) {
+        Timber.v("updateWidget appWidgetId: $appWidgetId")
+        val remoteViews = RemoteViews(context.packageName, R.layout.widget)
+
+        // Apply colors from theme
+        val night = prefs.night.get()
+        val black = prefs.black.get()
+
+        remoteViews.setInt(R.id.background, "setColorFilter", context.getColorCompat(when {
+            night && black -> R.color.black
+            night && !black -> R.color.backgroundDark
+            else -> R.color.white
+        }))
+
+        remoteViews.setInt(R.id.toolbar, "setColorFilter", context.getColorCompat(when {
+            night && black -> R.color.black
+            night && !black -> R.color.backgroundDark
+            else -> R.color.backgroundLight
+        }))
+
+        remoteViews.setTextColor(R.id.title, context.getColorCompat(when (night) {
+            true -> R.color.textPrimaryDark
+            false -> R.color.textPrimary
+        }))
+
+        remoteViews.setInt(R.id.compose, "setColorFilter", colors.theme().theme)
+
+        // Set adapter for conversations
+        val intent = Intent(context, WidgetService::class.java)
+                .putExtra(AppWidgetManager.EXTRA_APPWIDGET_ID, appWidgetId)
+                .putExtra("small_widget", smallWidget)
+        intent.data = Uri.parse(intent.toUri(Intent.URI_INTENT_SCHEME))
+        remoteViews.setRemoteAdapter(R.id.conversations, intent)
+
+        // Main intent
+        val mainIntent = Intent(context, MainActivity::class.java)
+        val mainPI = PendingIntent.getActivity(context, 0, mainIntent, PendingIntent.FLAG_UPDATE_CURRENT)
+        remoteViews.setOnClickPendingIntent(R.id.title, mainPI)
+
+        // Compose intent
+        val composeIntent = Intent(context, ComposeActivity::class.java)
+        val composePI = PendingIntent.getActivity(context, 0, composeIntent, PendingIntent.FLAG_UPDATE_CURRENT)
+        remoteViews.setOnClickPendingIntent(R.id.compose, composePI)
+
+        // Conversation intent
+        val startActivityIntent = Intent(context, MainActivity::class.java)
+        val startActivityPendingIntent = PendingIntent.getActivity(context, 0, startActivityIntent, PendingIntent.FLAG_UPDATE_CURRENT)
+        remoteViews.setPendingIntentTemplate(R.id.conversations, startActivityPendingIntent)
+
+        AppWidgetManager.getInstance(context).updateAppWidget(appWidgetId, remoteViews)
+    }
+
+}
diff --git a/presentation/src/main/java/com/moez/QKSMS/feature/widget/WidgetService.kt b/presentation/src/main/java/com/moez/QKSMS/feature/widget/WidgetService.kt
index 17d99ebf8..54509c7c6 100644
--- a/presentation/src/main/java/com/moez/QKSMS/feature/widget/WidgetService.kt
+++ b/presentation/src/main/java/com/moez/QKSMS/feature/widget/WidgetService.kt
@@ -1,31 +1,31 @@
-/*
- * Copyright (C) 2017 Moez Bhatti <moez.bhatti@gmail.com>
- *
- * This file is part of QKSMS.
- *
- * QKSMS is free software: you can redistribute it and/or modify
- * it under the terms of the GNU General Public License as published by
- * the Free Software Foundation, either version 3 of the License, or
- * (at your option) any later version.
- *
- * QKSMS is distributed in the hope that it will be useful,
- * but WITHOUT ANY WARRANTY; without even the implied warranty of
- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
- * GNU General Public License for more details.
- *
- * You should have received a copy of the GNU General Public License
- * along with QKSMS.  If not, see <http://www.gnu.org/licenses/>.
- */
-
-package com.moez.QKSMS.feature.widget
-
-import android.content.Intent
-import android.widget.RemoteViewsService
-
-class WidgetService : RemoteViewsService() {
-
-    override fun onGetViewFactory(intent: Intent): RemoteViewsService.RemoteViewsFactory {
-        return WidgetAdapter(intent)
-    }
-
-}
+/*
+ * Copyright (C) 2017 Moez Bhatti <moez.bhatti@gmail.com>
+ *
+ * This file is part of QKSMS.
+ *
+ * QKSMS is free software: you can redistribute it and/or modify
+ * it under the terms of the GNU General Public License as published by
+ * the Free Software Foundation, either version 3 of the License, or
+ * (at your option) any later version.
+ *
+ * QKSMS is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+ * GNU General Public License for more details.
+ *
+ * You should have received a copy of the GNU General Public License
+ * along with QKSMS.  If not, see <http://www.gnu.org/licenses/>.
+ */
+
+package com.moez.QKSMS.feature.widget
+
+import android.content.Intent
+import android.widget.RemoteViewsService
+
+class WidgetService : RemoteViewsService() {
+
+    override fun onGetViewFactory(intent: Intent): RemoteViewsService.RemoteViewsFactory {
+        return WidgetAdapter(intent)
+    }
+
+}
diff --git a/presentation/src/main/java/com/moez/QKSMS/injection/AppComponent.kt b/presentation/src/main/java/com/moez/QKSMS/injection/AppComponent.kt
index a1208c9b5..957052252 100644
--- a/presentation/src/main/java/com/moez/QKSMS/injection/AppComponent.kt
+++ b/presentation/src/main/java/com/moez/QKSMS/injection/AppComponent.kt
@@ -1,91 +1,91 @@
-/*
- * Copyright (C) 2017 Moez Bhatti <moez.bhatti@gmail.com>
- *
- * This file is part of QKSMS.
- *
- * QKSMS is free software: you can redistribute it and/or modify
- * it under the terms of the GNU General Public License as published by
- * the Free Software Foundation, either version 3 of the License, or
- * (at your option) any later version.
- *
- * QKSMS is distributed in the hope that it will be useful,
- * but WITHOUT ANY WARRANTY; without even the implied warranty of
- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
- * GNU General Public License for more details.
- *
- * You should have received a copy of the GNU General Public License
- * along with QKSMS.  If not, see <http://www.gnu.org/licenses/>.
- */
-package com.moez.QKSMS.injection
-
-import com.moez.QKSMS.common.QKApplication
-import com.moez.QKSMS.common.QkDialog
-import com.moez.QKSMS.common.util.QkChooserTargetService
-import com.moez.QKSMS.common.widget.AvatarView
-import com.moez.QKSMS.common.widget.PagerTitleView
-import com.moez.QKSMS.common.widget.PreferenceView
-import com.moez.QKSMS.common.widget.QkEditText
-import com.moez.QKSMS.common.widget.QkSwitch
-import com.moez.QKSMS.common.widget.QkTextView
-import com.moez.QKSMS.common.widget.RadioPreferenceView
-import com.moez.QKSMS.feature.backup.BackupController
-import com.moez.QKSMS.feature.blocking.BlockingController
-import com.moez.QKSMS.feature.blocking.manager.BlockingManagerController
-import com.moez.QKSMS.feature.blocking.messages.BlockedMessagesController
-import com.moez.QKSMS.feature.blocking.numbers.BlockedNumbersController
-import com.moez.QKSMS.feature.compose.editing.DetailedChipView
-import com.moez.QKSMS.feature.conversationinfo.injection.ConversationInfoComponent
-import com.moez.QKSMS.feature.settings.SettingsController
-import com.moez.QKSMS.feature.settings.about.AboutController
-import com.moez.QKSMS.feature.settings.swipe.SwipeActionsController
-import com.moez.QKSMS.feature.themepicker.injection.ThemePickerComponent
-import com.moez.QKSMS.feature.widget.WidgetAdapter
-import com.moez.QKSMS.injection.android.ActivityBuilderModule
-import com.moez.QKSMS.injection.android.BroadcastReceiverBuilderModule
-import com.moez.QKSMS.injection.android.ServiceBuilderModule
-import dagger.Component
-import dagger.android.support.AndroidSupportInjectionModule
-import javax.inject.Singleton
-
-@Singleton
-@Component(modules = [
-    AndroidSupportInjectionModule::class,
-    AppModule::class,
-    ActivityBuilderModule::class,
-    BroadcastReceiverBuilderModule::class,
-    ServiceBuilderModule::class])
-interface AppComponent {
-
-    fun conversationInfoBuilder(): ConversationInfoComponent.Builder
-    fun themePickerBuilder(): ThemePickerComponent.Builder
-
-    fun inject(application: QKApplication)
-
-    fun inject(controller: AboutController)
-    fun inject(controller: BackupController)
-    fun inject(controller: BlockedMessagesController)
-    fun inject(controller: BlockedNumbersController)
-    fun inject(controller: BlockingController)
-    fun inject(controller: BlockingManagerController)
-    fun inject(controller: SettingsController)
-    fun inject(controller: SwipeActionsController)
-
-    fun inject(dialog: QkDialog)
-
-    fun inject(service: WidgetAdapter)
-
-    /**
-     * This can't use AndroidInjection, or else it will crash on pre-marshmallow devices
-     */
-    fun inject(service: QkChooserTargetService)
-
-    fun inject(view: AvatarView)
-    fun inject(view: DetailedChipView)
-    fun inject(view: PagerTitleView)
-    fun inject(view: PreferenceView)
-    fun inject(view: RadioPreferenceView)
-    fun inject(view: QkEditText)
-    fun inject(view: QkSwitch)
-    fun inject(view: QkTextView)
-
-}
+/*
+ * Copyright (C) 2017 Moez Bhatti <moez.bhatti@gmail.com>
+ *
+ * This file is part of QKSMS.
+ *
+ * QKSMS is free software: you can redistribute it and/or modify
+ * it under the terms of the GNU General Public License as published by
+ * the Free Software Foundation, either version 3 of the License, or
+ * (at your option) any later version.
+ *
+ * QKSMS is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+ * GNU General Public License for more details.
+ *
+ * You should have received a copy of the GNU General Public License
+ * along with QKSMS.  If not, see <http://www.gnu.org/licenses/>.
+ */
+package com.moez.QKSMS.injection
+
+import com.moez.QKSMS.common.QKApplication
+import com.moez.QKSMS.common.QkDialog
+import com.moez.QKSMS.common.util.QkChooserTargetService
+import com.moez.QKSMS.common.widget.AvatarView
+import com.moez.QKSMS.common.widget.PagerTitleView
+import com.moez.QKSMS.common.widget.PreferenceView
+import com.moez.QKSMS.common.widget.QkEditText
+import com.moez.QKSMS.common.widget.QkSwitch
+import com.moez.QKSMS.common.widget.QkTextView
+import com.moez.QKSMS.common.widget.RadioPreferenceView
+import com.moez.QKSMS.feature.backup.BackupController
+import com.moez.QKSMS.feature.blocking.BlockingController
+import com.moez.QKSMS.feature.blocking.manager.BlockingManagerController
+import com.moez.QKSMS.feature.blocking.messages.BlockedMessagesController
+import com.moez.QKSMS.feature.blocking.numbers.BlockedNumbersController
+import com.moez.QKSMS.feature.compose.editing.DetailedChipView
+import com.moez.QKSMS.feature.conversationinfo.injection.ConversationInfoComponent
+import com.moez.QKSMS.feature.settings.SettingsController
+import com.moez.QKSMS.feature.settings.about.AboutController
+import com.moez.QKSMS.feature.settings.swipe.SwipeActionsController
+import com.moez.QKSMS.feature.themepicker.injection.ThemePickerComponent
+import com.moez.QKSMS.feature.widget.WidgetAdapter
+import com.moez.QKSMS.injection.android.ActivityBuilderModule
+import com.moez.QKSMS.injection.android.BroadcastReceiverBuilderModule
+import com.moez.QKSMS.injection.android.ServiceBuilderModule
+import dagger.Component
+import dagger.android.support.AndroidSupportInjectionModule
+import javax.inject.Singleton
+
+@Singleton
+@Component(modules = [
+    AndroidSupportInjectionModule::class,
+    AppModule::class,
+    ActivityBuilderModule::class,
+    BroadcastReceiverBuilderModule::class,
+    ServiceBuilderModule::class])
+interface AppComponent {
+
+    fun conversationInfoBuilder(): ConversationInfoComponent.Builder
+    fun themePickerBuilder(): ThemePickerComponent.Builder
+
+    fun inject(application: QKApplication)
+
+    fun inject(controller: AboutController)
+    fun inject(controller: BackupController)
+    fun inject(controller: BlockedMessagesController)
+    fun inject(controller: BlockedNumbersController)
+    fun inject(controller: BlockingController)
+    fun inject(controller: BlockingManagerController)
+    fun inject(controller: SettingsController)
+    fun inject(controller: SwipeActionsController)
+
+    fun inject(dialog: QkDialog)
+
+    fun inject(service: WidgetAdapter)
+
+    /**
+     * This can't use AndroidInjection, or else it will crash on pre-marshmallow devices
+     */
+    fun inject(service: QkChooserTargetService)
+
+    fun inject(view: AvatarView)
+    fun inject(view: DetailedChipView)
+    fun inject(view: PagerTitleView)
+    fun inject(view: PreferenceView)
+    fun inject(view: RadioPreferenceView)
+    fun inject(view: QkEditText)
+    fun inject(view: QkSwitch)
+    fun inject(view: QkTextView)
+
+}
diff --git a/presentation/src/main/java/com/moez/QKSMS/injection/AppComponentManager.kt b/presentation/src/main/java/com/moez/QKSMS/injection/AppComponentManager.kt
index 726081546..13d0ccca4 100644
--- a/presentation/src/main/java/com/moez/QKSMS/injection/AppComponentManager.kt
+++ b/presentation/src/main/java/com/moez/QKSMS/injection/AppComponentManager.kt
@@ -1,34 +1,34 @@
-/*
- * Copyright (C) 2017 Moez Bhatti <moez.bhatti@gmail.com>
- *
- * This file is part of QKSMS.
- *
- * QKSMS is free software: you can redistribute it and/or modify
- * it under the terms of the GNU General Public License as published by
- * the Free Software Foundation, either version 3 of the License, or
- * (at your option) any later version.
- *
- * QKSMS is distributed in the hope that it will be useful,
- * but WITHOUT ANY WARRANTY; without even the implied warranty of
- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
- * GNU General Public License for more details.
- *
- * You should have received a copy of the GNU General Public License
- * along with QKSMS.  If not, see <http://www.gnu.org/licenses/>.
- */
-package com.moez.QKSMS.injection
-
-import com.moez.QKSMS.common.QKApplication
-
-internal lateinit var appComponent: AppComponent
-    private set
-
-internal object AppComponentManager {
-
-    fun init(application: QKApplication) {
-        appComponent = DaggerAppComponent.builder()
-                .appModule(AppModule(application))
-                .build()
-    }
-
+/*
+ * Copyright (C) 2017 Moez Bhatti <moez.bhatti@gmail.com>
+ *
+ * This file is part of QKSMS.
+ *
+ * QKSMS is free software: you can redistribute it and/or modify
+ * it under the terms of the GNU General Public License as published by
+ * the Free Software Foundation, either version 3 of the License, or
+ * (at your option) any later version.
+ *
+ * QKSMS is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+ * GNU General Public License for more details.
+ *
+ * You should have received a copy of the GNU General Public License
+ * along with QKSMS.  If not, see <http://www.gnu.org/licenses/>.
+ */
+package com.moez.QKSMS.injection
+
+import com.moez.QKSMS.common.QKApplication
+
+internal lateinit var appComponent: AppComponent
+    private set
+
+internal object AppComponentManager {
+
+    fun init(application: QKApplication) {
+        appComponent = DaggerAppComponent.builder()
+                .appModule(AppModule(application))
+                .build()
+    }
+
 }
\ No newline at end of file
diff --git a/presentation/src/main/java/com/moez/QKSMS/injection/AppModule.kt b/presentation/src/main/java/com/moez/QKSMS/injection/AppModule.kt
index afab6678c..7225af7e7 100644
--- a/presentation/src/main/java/com/moez/QKSMS/injection/AppModule.kt
+++ b/presentation/src/main/java/com/moez/QKSMS/injection/AppModule.kt
@@ -1,220 +1,220 @@
-/*
- * Copyright (C) 2017 Moez Bhatti <moez.bhatti@gmail.com>
- *
- * This file is part of QKSMS.
- *
- * QKSMS is free software: you can redistribute it and/or modify
- * it under the terms of the GNU General Public License as published by
- * the Free Software Foundation, either version 3 of the License, or
- * (at your option) any later version.
- *
- * QKSMS is distributed in the hope that it will be useful,
- * but WITHOUT ANY WARRANTY; without even the implied warranty of
- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
- * GNU General Public License for more details.
- *
- * You should have received a copy of the GNU General Public License
- * along with QKSMS.  If not, see <http://www.gnu.org/licenses/>.
- */
-package com.moez.QKSMS.injection
-
-import android.app.Application
-import android.content.ContentResolver
-import android.content.Context
-import android.content.SharedPreferences
-import android.preference.PreferenceManager
-import androidx.lifecycle.ViewModelProvider
-import com.f2prateek.rx.preferences2.RxSharedPreferences
-import com.moez.QKSMS.blocking.BlockingClient
-import com.moez.QKSMS.blocking.BlockingManager
-import com.moez.QKSMS.common.ViewModelFactory
-import com.moez.QKSMS.common.util.BillingManagerImpl
-import com.moez.QKSMS.common.util.NotificationManagerImpl
-import com.moez.QKSMS.common.util.ShortcutManagerImpl
-import com.moez.QKSMS.feature.conversationinfo.injection.ConversationInfoComponent
-import com.moez.QKSMS.feature.themepicker.injection.ThemePickerComponent
-import com.moez.QKSMS.listener.ContactAddedListener
-import com.moez.QKSMS.listener.ContactAddedListenerImpl
-import com.moez.QKSMS.manager.ActiveConversationManager
-import com.moez.QKSMS.manager.ActiveConversationManagerImpl
-import com.moez.QKSMS.manager.AlarmManager
-import com.moez.QKSMS.manager.AlarmManagerImpl
-import com.moez.QKSMS.manager.AnalyticsManager
-import com.moez.QKSMS.manager.AnalyticsManagerImpl
-import com.moez.QKSMS.manager.BillingManager
-import com.moez.QKSMS.manager.ChangelogManager
-import com.moez.QKSMS.manager.ChangelogManagerImpl
-import com.moez.QKSMS.manager.KeyManager
-import com.moez.QKSMS.manager.KeyManagerImpl
-import com.moez.QKSMS.manager.NotificationManager
-import com.moez.QKSMS.manager.PermissionManager
-import com.moez.QKSMS.manager.PermissionManagerImpl
-import com.moez.QKSMS.manager.RatingManager
-import com.moez.QKSMS.manager.ReferralManager
-import com.moez.QKSMS.manager.ReferralManagerImpl
-import com.moez.QKSMS.manager.ShortcutManager
-import com.moez.QKSMS.manager.WidgetManager
-import com.moez.QKSMS.manager.WidgetManagerImpl
-import com.moez.QKSMS.mapper.CursorToContact
-import com.moez.QKSMS.mapper.CursorToContactGroup
-import com.moez.QKSMS.mapper.CursorToContactGroupImpl
-import com.moez.QKSMS.mapper.CursorToContactGroupMember
-import com.moez.QKSMS.mapper.CursorToContactGroupMemberImpl
-import com.moez.QKSMS.mapper.CursorToContactImpl
-import com.moez.QKSMS.mapper.CursorToConversation
-import com.moez.QKSMS.mapper.CursorToConversationImpl
-import com.moez.QKSMS.mapper.CursorToMessage
-import com.moez.QKSMS.mapper.CursorToMessageImpl
-import com.moez.QKSMS.mapper.CursorToPart
-import com.moez.QKSMS.mapper.CursorToPartImpl
-import com.moez.QKSMS.mapper.CursorToRecipient
-import com.moez.QKSMS.mapper.CursorToRecipientImpl
-import com.moez.QKSMS.mapper.RatingManagerImpl
-import com.moez.QKSMS.repository.BackupRepository
-import com.moez.QKSMS.repository.BackupRepositoryImpl
-import com.moez.QKSMS.repository.BlockingRepository
-import com.moez.QKSMS.repository.BlockingRepositoryImpl
-import com.moez.QKSMS.repository.ContactRepository
-import com.moez.QKSMS.repository.ContactRepositoryImpl
-import com.moez.QKSMS.repository.ConversationRepository
-import com.moez.QKSMS.repository.ConversationRepositoryImpl
-import com.moez.QKSMS.repository.MessageRepository
-import com.moez.QKSMS.repository.MessageRepositoryImpl
-import com.moez.QKSMS.repository.ScheduledMessageRepository
-import com.moez.QKSMS.repository.ScheduledMessageRepositoryImpl
-import com.moez.QKSMS.repository.SyncRepository
-import com.moez.QKSMS.repository.SyncRepositoryImpl
-import com.squareup.moshi.Moshi
-import com.squareup.moshi.kotlin.reflect.KotlinJsonAdapterFactory
-import dagger.Module
-import dagger.Provides
-import javax.inject.Singleton
-
-@Module(subcomponents = [
-    ConversationInfoComponent::class,
-    ThemePickerComponent::class])
-class AppModule(private var application: Application) {
-
-    @Provides
-    @Singleton
-    fun provideContext(): Context = application
-
-    @Provides
-    fun provideContentResolver(context: Context): ContentResolver = context.contentResolver
-
-    @Provides
-    @Singleton
-    fun provideSharedPreferences(context: Context): SharedPreferences {
-        return PreferenceManager.getDefaultSharedPreferences(context)
-    }
-
-    @Provides
-    @Singleton
-    fun provideRxPreferences(preferences: SharedPreferences): RxSharedPreferences {
-        return RxSharedPreferences.create(preferences)
-    }
-
-    @Provides
-    @Singleton
-    fun provideMoshi(): Moshi {
-        return Moshi.Builder()
-                .add(KotlinJsonAdapterFactory())
-                .build()
-    }
-
-    @Provides
-    fun provideViewModelFactory(factory: ViewModelFactory): ViewModelProvider.Factory = factory
-
-    // Listener
-
-    @Provides
-    fun provideContactAddedListener(listener: ContactAddedListenerImpl): ContactAddedListener = listener
-
-    // Manager
-
-    @Provides
-    fun provideBillingManager(manager: BillingManagerImpl): BillingManager = manager
-
-    @Provides
-    fun provideActiveConversationManager(manager: ActiveConversationManagerImpl): ActiveConversationManager = manager
-
-    @Provides
-    fun provideAlarmManager(manager: AlarmManagerImpl): AlarmManager = manager
-
-    @Provides
-    fun provideAnalyticsManager(manager: AnalyticsManagerImpl): AnalyticsManager = manager
-
-    @Provides
-    fun blockingClient(manager: BlockingManager): BlockingClient = manager
-
-    @Provides
-    fun changelogManager(manager: ChangelogManagerImpl): ChangelogManager = manager
-
-    @Provides
-    fun provideKeyManager(manager: KeyManagerImpl): KeyManager = manager
-
-    @Provides
-    fun provideNotificationsManager(manager: NotificationManagerImpl): NotificationManager = manager
-
-    @Provides
-    fun providePermissionsManager(manager: PermissionManagerImpl): PermissionManager = manager
-
-    @Provides
-    fun provideRatingManager(manager: RatingManagerImpl): RatingManager = manager
-
-    @Provides
-    fun provideShortcutManager(manager: ShortcutManagerImpl): ShortcutManager = manager
-
-    @Provides
-    fun provideReferralManager(manager: ReferralManagerImpl): ReferralManager = manager
-
-    @Provides
-    fun provideWidgetManager(manager: WidgetManagerImpl): WidgetManager = manager
-
-    // Mapper
-
-    @Provides
-    fun provideCursorToContact(mapper: CursorToContactImpl): CursorToContact = mapper
-
-    @Provides
-    fun provideCursorToContactGroup(mapper: CursorToContactGroupImpl): CursorToContactGroup = mapper
-
-    @Provides
-    fun provideCursorToContactGroupMember(mapper: CursorToContactGroupMemberImpl): CursorToContactGroupMember = mapper
-
-    @Provides
-    fun provideCursorToConversation(mapper: CursorToConversationImpl): CursorToConversation = mapper
-
-    @Provides
-    fun provideCursorToMessage(mapper: CursorToMessageImpl): CursorToMessage = mapper
-
-    @Provides
-    fun provideCursorToPart(mapper: CursorToPartImpl): CursorToPart = mapper
-
-    @Provides
-    fun provideCursorToRecipient(mapper: CursorToRecipientImpl): CursorToRecipient = mapper
-
-    // Repository
-
-    @Provides
-    fun provideBackupRepository(repository: BackupRepositoryImpl): BackupRepository = repository
-
-    @Provides
-    fun provideBlockingRepository(repository: BlockingRepositoryImpl): BlockingRepository = repository
-
-    @Provides
-    fun provideContactRepository(repository: ContactRepositoryImpl): ContactRepository = repository
-
-    @Provides
-    fun provideConversationRepository(repository: ConversationRepositoryImpl): ConversationRepository = repository
-
-    @Provides
-    fun provideMessageRepository(repository: MessageRepositoryImpl): MessageRepository = repository
-
-    @Provides
-    fun provideScheduledMessagesRepository(repository: ScheduledMessageRepositoryImpl): ScheduledMessageRepository = repository
-
-    @Provides
-    fun provideSyncRepository(repository: SyncRepositoryImpl): SyncRepository = repository
-
+/*
+ * Copyright (C) 2017 Moez Bhatti <moez.bhatti@gmail.com>
+ *
+ * This file is part of QKSMS.
+ *
+ * QKSMS is free software: you can redistribute it and/or modify
+ * it under the terms of the GNU General Public License as published by
+ * the Free Software Foundation, either version 3 of the License, or
+ * (at your option) any later version.
+ *
+ * QKSMS is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+ * GNU General Public License for more details.
+ *
+ * You should have received a copy of the GNU General Public License
+ * along with QKSMS.  If not, see <http://www.gnu.org/licenses/>.
+ */
+package com.moez.QKSMS.injection
+
+import android.app.Application
+import android.content.ContentResolver
+import android.content.Context
+import android.content.SharedPreferences
+import android.preference.PreferenceManager
+import androidx.lifecycle.ViewModelProvider
+import com.f2prateek.rx.preferences2.RxSharedPreferences
+import com.moez.QKSMS.blocking.BlockingClient
+import com.moez.QKSMS.blocking.BlockingManager
+import com.moez.QKSMS.common.ViewModelFactory
+import com.moez.QKSMS.common.util.BillingManagerImpl
+import com.moez.QKSMS.common.util.NotificationManagerImpl
+import com.moez.QKSMS.common.util.ShortcutManagerImpl
+import com.moez.QKSMS.feature.conversationinfo.injection.ConversationInfoComponent
+import com.moez.QKSMS.feature.themepicker.injection.ThemePickerComponent
+import com.moez.QKSMS.listener.ContactAddedListener
+import com.moez.QKSMS.listener.ContactAddedListenerImpl
+import com.moez.QKSMS.manager.ActiveConversationManager
+import com.moez.QKSMS.manager.ActiveConversationManagerImpl
+import com.moez.QKSMS.manager.AlarmManager
+import com.moez.QKSMS.manager.AlarmManagerImpl
+import com.moez.QKSMS.manager.AnalyticsManager
+import com.moez.QKSMS.manager.AnalyticsManagerImpl
+import com.moez.QKSMS.manager.BillingManager
+import com.moez.QKSMS.manager.ChangelogManager
+import com.moez.QKSMS.manager.ChangelogManagerImpl
+import com.moez.QKSMS.manager.KeyManager
+import com.moez.QKSMS.manager.KeyManagerImpl
+import com.moez.QKSMS.manager.NotificationManager
+import com.moez.QKSMS.manager.PermissionManager
+import com.moez.QKSMS.manager.PermissionManagerImpl
+import com.moez.QKSMS.manager.RatingManager
+import com.moez.QKSMS.manager.ReferralManager
+import com.moez.QKSMS.manager.ReferralManagerImpl
+import com.moez.QKSMS.manager.ShortcutManager
+import com.moez.QKSMS.manager.WidgetManager
+import com.moez.QKSMS.manager.WidgetManagerImpl
+import com.moez.QKSMS.mapper.CursorToContact
+import com.moez.QKSMS.mapper.CursorToContactGroup
+import com.moez.QKSMS.mapper.CursorToContactGroupImpl
+import com.moez.QKSMS.mapper.CursorToContactGroupMember
+import com.moez.QKSMS.mapper.CursorToContactGroupMemberImpl
+import com.moez.QKSMS.mapper.CursorToContactImpl
+import com.moez.QKSMS.mapper.CursorToConversation
+import com.moez.QKSMS.mapper.CursorToConversationImpl
+import com.moez.QKSMS.mapper.CursorToMessage
+import com.moez.QKSMS.mapper.CursorToMessageImpl
+import com.moez.QKSMS.mapper.CursorToPart
+import com.moez.QKSMS.mapper.CursorToPartImpl
+import com.moez.QKSMS.mapper.CursorToRecipient
+import com.moez.QKSMS.mapper.CursorToRecipientImpl
+import com.moez.QKSMS.mapper.RatingManagerImpl
+import com.moez.QKSMS.repository.BackupRepository
+import com.moez.QKSMS.repository.BackupRepositoryImpl
+import com.moez.QKSMS.repository.BlockingRepository
+import com.moez.QKSMS.repository.BlockingRepositoryImpl
+import com.moez.QKSMS.repository.ContactRepository
+import com.moez.QKSMS.repository.ContactRepositoryImpl
+import com.moez.QKSMS.repository.ConversationRepository
+import com.moez.QKSMS.repository.ConversationRepositoryImpl
+import com.moez.QKSMS.repository.MessageRepository
+import com.moez.QKSMS.repository.MessageRepositoryImpl
+import com.moez.QKSMS.repository.ScheduledMessageRepository
+import com.moez.QKSMS.repository.ScheduledMessageRepositoryImpl
+import com.moez.QKSMS.repository.SyncRepository
+import com.moez.QKSMS.repository.SyncRepositoryImpl
+import com.squareup.moshi.Moshi
+import com.squareup.moshi.kotlin.reflect.KotlinJsonAdapterFactory
+import dagger.Module
+import dagger.Provides
+import javax.inject.Singleton
+
+@Module(subcomponents = [
+    ConversationInfoComponent::class,
+    ThemePickerComponent::class])
+class AppModule(private var application: Application) {
+
+    @Provides
+    @Singleton
+    fun provideContext(): Context = application
+
+    @Provides
+    fun provideContentResolver(context: Context): ContentResolver = context.contentResolver
+
+    @Provides
+    @Singleton
+    fun provideSharedPreferences(context: Context): SharedPreferences {
+        return PreferenceManager.getDefaultSharedPreferences(context)
+    }
+
+    @Provides
+    @Singleton
+    fun provideRxPreferences(preferences: SharedPreferences): RxSharedPreferences {
+        return RxSharedPreferences.create(preferences)
+    }
+
+    @Provides
+    @Singleton
+    fun provideMoshi(): Moshi {
+        return Moshi.Builder()
+                .add(KotlinJsonAdapterFactory())
+                .build()
+    }
+
+    @Provides
+    fun provideViewModelFactory(factory: ViewModelFactory): ViewModelProvider.Factory = factory
+
+    // Listener
+
+    @Provides
+    fun provideContactAddedListener(listener: ContactAddedListenerImpl): ContactAddedListener = listener
+
+    // Manager
+
+    @Provides
+    fun provideBillingManager(manager: BillingManagerImpl): BillingManager = manager
+
+    @Provides
+    fun provideActiveConversationManager(manager: ActiveConversationManagerImpl): ActiveConversationManager = manager
+
+    @Provides
+    fun provideAlarmManager(manager: AlarmManagerImpl): AlarmManager = manager
+
+    @Provides
+    fun provideAnalyticsManager(manager: AnalyticsManagerImpl): AnalyticsManager = manager
+
+    @Provides
+    fun blockingClient(manager: BlockingManager): BlockingClient = manager
+
+    @Provides
+    fun changelogManager(manager: ChangelogManagerImpl): ChangelogManager = manager
+
+    @Provides
+    fun provideKeyManager(manager: KeyManagerImpl): KeyManager = manager
+
+    @Provides
+    fun provideNotificationsManager(manager: NotificationManagerImpl): NotificationManager = manager
+
+    @Provides
+    fun providePermissionsManager(manager: PermissionManagerImpl): PermissionManager = manager
+
+    @Provides
+    fun provideRatingManager(manager: RatingManagerImpl): RatingManager = manager
+
+    @Provides
+    fun provideShortcutManager(manager: ShortcutManagerImpl): ShortcutManager = manager
+
+    @Provides
+    fun provideReferralManager(manager: ReferralManagerImpl): ReferralManager = manager
+
+    @Provides
+    fun provideWidgetManager(manager: WidgetManagerImpl): WidgetManager = manager
+
+    // Mapper
+
+    @Provides
+    fun provideCursorToContact(mapper: CursorToContactImpl): CursorToContact = mapper
+
+    @Provides
+    fun provideCursorToContactGroup(mapper: CursorToContactGroupImpl): CursorToContactGroup = mapper
+
+    @Provides
+    fun provideCursorToContactGroupMember(mapper: CursorToContactGroupMemberImpl): CursorToContactGroupMember = mapper
+
+    @Provides
+    fun provideCursorToConversation(mapper: CursorToConversationImpl): CursorToConversation = mapper
+
+    @Provides
+    fun provideCursorToMessage(mapper: CursorToMessageImpl): CursorToMessage = mapper
+
+    @Provides
+    fun provideCursorToPart(mapper: CursorToPartImpl): CursorToPart = mapper
+
+    @Provides
+    fun provideCursorToRecipient(mapper: CursorToRecipientImpl): CursorToRecipient = mapper
+
+    // Repository
+
+    @Provides
+    fun provideBackupRepository(repository: BackupRepositoryImpl): BackupRepository = repository
+
+    @Provides
+    fun provideBlockingRepository(repository: BlockingRepositoryImpl): BlockingRepository = repository
+
+    @Provides
+    fun provideContactRepository(repository: ContactRepositoryImpl): ContactRepository = repository
+
+    @Provides
+    fun provideConversationRepository(repository: ConversationRepositoryImpl): ConversationRepository = repository
+
+    @Provides
+    fun provideMessageRepository(repository: MessageRepositoryImpl): MessageRepository = repository
+
+    @Provides
+    fun provideScheduledMessagesRepository(repository: ScheduledMessageRepositoryImpl): ScheduledMessageRepository = repository
+
+    @Provides
+    fun provideSyncRepository(repository: SyncRepositoryImpl): SyncRepository = repository
+
 }
\ No newline at end of file
diff --git a/presentation/src/main/java/com/moez/QKSMS/injection/ViewModelKey.kt b/presentation/src/main/java/com/moez/QKSMS/injection/ViewModelKey.kt
index 2654cbc1e..78e98cd04 100644
--- a/presentation/src/main/java/com/moez/QKSMS/injection/ViewModelKey.kt
+++ b/presentation/src/main/java/com/moez/QKSMS/injection/ViewModelKey.kt
@@ -1,28 +1,28 @@
-/*
- * Copyright (C) 2017 Moez Bhatti <moez.bhatti@gmail.com>
- *
- * This file is part of QKSMS.
- *
- * QKSMS is free software: you can redistribute it and/or modify
- * it under the terms of the GNU General Public License as published by
- * the Free Software Foundation, either version 3 of the License, or
- * (at your option) any later version.
- *
- * QKSMS is distributed in the hope that it will be useful,
- * but WITHOUT ANY WARRANTY; without even the implied warranty of
- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
- * GNU General Public License for more details.
- *
- * You should have received a copy of the GNU General Public License
- * along with QKSMS.  If not, see <http://www.gnu.org/licenses/>.
- */
-package com.moez.QKSMS.injection
-
-import androidx.lifecycle.ViewModel
-import dagger.MapKey
-import kotlin.reflect.KClass
-
-@Target(AnnotationTarget.FUNCTION, AnnotationTarget.PROPERTY_GETTER, AnnotationTarget.PROPERTY_SETTER)
-@Retention(AnnotationRetention.RUNTIME)
-@MapKey
+/*
+ * Copyright (C) 2017 Moez Bhatti <moez.bhatti@gmail.com>
+ *
+ * This file is part of QKSMS.
+ *
+ * QKSMS is free software: you can redistribute it and/or modify
+ * it under the terms of the GNU General Public License as published by
+ * the Free Software Foundation, either version 3 of the License, or
+ * (at your option) any later version.
+ *
+ * QKSMS is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+ * GNU General Public License for more details.
+ *
+ * You should have received a copy of the GNU General Public License
+ * along with QKSMS.  If not, see <http://www.gnu.org/licenses/>.
+ */
+package com.moez.QKSMS.injection
+
+import androidx.lifecycle.ViewModel
+import dagger.MapKey
+import kotlin.reflect.KClass
+
+@Target(AnnotationTarget.FUNCTION, AnnotationTarget.PROPERTY_GETTER, AnnotationTarget.PROPERTY_SETTER)
+@Retention(AnnotationRetention.RUNTIME)
+@MapKey
 internal annotation class ViewModelKey(val value: KClass<out ViewModel>)
\ No newline at end of file
diff --git a/presentation/src/main/java/com/moez/QKSMS/injection/android/ActivityBuilderModule.kt b/presentation/src/main/java/com/moez/QKSMS/injection/android/ActivityBuilderModule.kt
index 808345092..aa81e5ecf 100644
--- a/presentation/src/main/java/com/moez/QKSMS/injection/android/ActivityBuilderModule.kt
+++ b/presentation/src/main/java/com/moez/QKSMS/injection/android/ActivityBuilderModule.kt
@@ -1,96 +1,96 @@
-/*
- * Copyright (C) 2017 Moez Bhatti <moez.bhatti@gmail.com>
- *
- * This file is part of QKSMS.
- *
- * QKSMS is free software: you can redistribute it and/or modify
- * it under the terms of the GNU General Public License as published by
- * the Free Software Foundation, either version 3 of the License, or
- * (at your option) any later version.
- *
- * QKSMS is distributed in the hope that it will be useful,
- * but WITHOUT ANY WARRANTY; without even the implied warranty of
- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
- * GNU General Public License for more details.
- *
- * You should have received a copy of the GNU General Public License
- * along with QKSMS.  If not, see <http://www.gnu.org/licenses/>.
- */
-package com.moez.QKSMS.injection.android
-
-import com.moez.QKSMS.feature.backup.BackupActivity
-import com.moez.QKSMS.feature.blocking.BlockingActivity
-import com.moez.QKSMS.feature.compose.ComposeActivity
-import com.moez.QKSMS.feature.compose.ComposeActivityModule
-import com.moez.QKSMS.feature.contacts.ContactsActivity
-import com.moez.QKSMS.feature.contacts.ContactsActivityModule
-import com.moez.QKSMS.feature.conversationinfo.ConversationInfoActivity
-import com.moez.QKSMS.feature.gallery.GalleryActivity
-import com.moez.QKSMS.feature.gallery.GalleryActivityModule
-import com.moez.QKSMS.feature.main.MainActivity
-import com.moez.QKSMS.feature.main.MainActivityModule
-import com.moez.QKSMS.feature.notificationprefs.NotificationPrefsActivity
-import com.moez.QKSMS.feature.notificationprefs.NotificationPrefsActivityModule
-import com.moez.QKSMS.feature.plus.PlusActivity
-import com.moez.QKSMS.feature.plus.PlusActivityModule
-import com.moez.QKSMS.feature.qkreply.QkReplyActivity
-import com.moez.QKSMS.feature.qkreply.QkReplyActivityModule
-import com.moez.QKSMS.feature.scheduled.ScheduledActivity
-import com.moez.QKSMS.feature.scheduled.ScheduledActivityModule
-import com.moez.QKSMS.feature.settings.SettingsActivity
-import com.moez.QKSMS.injection.scope.ActivityScope
-import dagger.Module
-import dagger.android.ContributesAndroidInjector
-
-@Module
-abstract class ActivityBuilderModule {
-
-    @ActivityScope
-    @ContributesAndroidInjector(modules = [MainActivityModule::class])
-    abstract fun bindMainActivity(): MainActivity
-
-    @ActivityScope
-    @ContributesAndroidInjector(modules = [PlusActivityModule::class])
-    abstract fun bindPlusActivity(): PlusActivity
-
-    @ActivityScope
-    @ContributesAndroidInjector(modules = [])
-    abstract fun bindBackupActivity(): BackupActivity
-
-    @ActivityScope
-    @ContributesAndroidInjector(modules = [ComposeActivityModule::class])
-    abstract fun bindComposeActivity(): ComposeActivity
-
-    @ActivityScope
-    @ContributesAndroidInjector(modules = [ContactsActivityModule::class])
-    abstract fun bindContactsActivity(): ContactsActivity
-
-    @ActivityScope
-    @ContributesAndroidInjector(modules = [])
-    abstract fun bindConversationInfoActivity(): ConversationInfoActivity
-
-    @ActivityScope
-    @ContributesAndroidInjector(modules = [GalleryActivityModule::class])
-    abstract fun bindGalleryActivity(): GalleryActivity
-
-    @ActivityScope
-    @ContributesAndroidInjector(modules = [NotificationPrefsActivityModule::class])
-    abstract fun bindNotificationPrefsActivity(): NotificationPrefsActivity
-
-    @ActivityScope
-    @ContributesAndroidInjector(modules = [QkReplyActivityModule::class])
-    abstract fun bindQkReplyActivity(): QkReplyActivity
-
-    @ActivityScope
-    @ContributesAndroidInjector(modules = [ScheduledActivityModule::class])
-    abstract fun bindScheduledActivity(): ScheduledActivity
-
-    @ActivityScope
-    @ContributesAndroidInjector(modules = [])
-    abstract fun bindSettingsActivity(): SettingsActivity
-
-    @ActivityScope
-    @ContributesAndroidInjector(modules = [])
-    abstract fun bindBlockingActivity(): BlockingActivity
-
-}
+/*
+ * Copyright (C) 2017 Moez Bhatti <moez.bhatti@gmail.com>
+ *
+ * This file is part of QKSMS.
+ *
+ * QKSMS is free software: you can redistribute it and/or modify
+ * it under the terms of the GNU General Public License as published by
+ * the Free Software Foundation, either version 3 of the License, or
+ * (at your option) any later version.
+ *
+ * QKSMS is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+ * GNU General Public License for more details.
+ *
+ * You should have received a copy of the GNU General Public License
+ * along with QKSMS.  If not, see <http://www.gnu.org/licenses/>.
+ */
+package com.moez.QKSMS.injection.android
+
+import com.moez.QKSMS.feature.backup.BackupActivity
+import com.moez.QKSMS.feature.blocking.BlockingActivity
+import com.moez.QKSMS.feature.compose.ComposeActivity
+import com.moez.QKSMS.feature.compose.ComposeActivityModule
+import com.moez.QKSMS.feature.contacts.ContactsActivity
+import com.moez.QKSMS.feature.contacts.ContactsActivityModule
+import com.moez.QKSMS.feature.conversationinfo.ConversationInfoActivity
+import com.moez.QKSMS.feature.gallery.GalleryActivity
+import com.moez.QKSMS.feature.gallery.GalleryActivityModule
+import com.moez.QKSMS.feature.main.MainActivity
+import com.moez.QKSMS.feature.main.MainActivityModule
+import com.moez.QKSMS.feature.notificationprefs.NotificationPrefsActivity
+import com.moez.QKSMS.feature.notificationprefs.NotificationPrefsActivityModule
+import com.moez.QKSMS.feature.plus.PlusActivity
+import com.moez.QKSMS.feature.plus.PlusActivityModule
+import com.moez.QKSMS.feature.qkreply.QkReplyActivity
+import com.moez.QKSMS.feature.qkreply.QkReplyActivityModule
+import com.moez.QKSMS.feature.scheduled.ScheduledActivity
+import com.moez.QKSMS.feature.scheduled.ScheduledActivityModule
+import com.moez.QKSMS.feature.settings.SettingsActivity
+import com.moez.QKSMS.injection.scope.ActivityScope
+import dagger.Module
+import dagger.android.ContributesAndroidInjector
+
+@Module
+abstract class ActivityBuilderModule {
+
+    @ActivityScope
+    @ContributesAndroidInjector(modules = [MainActivityModule::class])
+    abstract fun bindMainActivity(): MainActivity
+
+    @ActivityScope
+    @ContributesAndroidInjector(modules = [PlusActivityModule::class])
+    abstract fun bindPlusActivity(): PlusActivity
+
+    @ActivityScope
+    @ContributesAndroidInjector(modules = [])
+    abstract fun bindBackupActivity(): BackupActivity
+
+    @ActivityScope
+    @ContributesAndroidInjector(modules = [ComposeActivityModule::class])
+    abstract fun bindComposeActivity(): ComposeActivity
+
+    @ActivityScope
+    @ContributesAndroidInjector(modules = [ContactsActivityModule::class])
+    abstract fun bindContactsActivity(): ContactsActivity
+
+    @ActivityScope
+    @ContributesAndroidInjector(modules = [])
+    abstract fun bindConversationInfoActivity(): ConversationInfoActivity
+
+    @ActivityScope
+    @ContributesAndroidInjector(modules = [GalleryActivityModule::class])
+    abstract fun bindGalleryActivity(): GalleryActivity
+
+    @ActivityScope
+    @ContributesAndroidInjector(modules = [NotificationPrefsActivityModule::class])
+    abstract fun bindNotificationPrefsActivity(): NotificationPrefsActivity
+
+    @ActivityScope
+    @ContributesAndroidInjector(modules = [QkReplyActivityModule::class])
+    abstract fun bindQkReplyActivity(): QkReplyActivity
+
+    @ActivityScope
+    @ContributesAndroidInjector(modules = [ScheduledActivityModule::class])
+    abstract fun bindScheduledActivity(): ScheduledActivity
+
+    @ActivityScope
+    @ContributesAndroidInjector(modules = [])
+    abstract fun bindSettingsActivity(): SettingsActivity
+
+    @ActivityScope
+    @ContributesAndroidInjector(modules = [])
+    abstract fun bindBlockingActivity(): BlockingActivity
+
+}
diff --git a/presentation/src/main/java/com/moez/QKSMS/injection/android/BroadcastReceiverBuilderModule.kt b/presentation/src/main/java/com/moez/QKSMS/injection/android/BroadcastReceiverBuilderModule.kt
index 77cf22287..d817e2cc5 100644
--- a/presentation/src/main/java/com/moez/QKSMS/injection/android/BroadcastReceiverBuilderModule.kt
+++ b/presentation/src/main/java/com/moez/QKSMS/injection/android/BroadcastReceiverBuilderModule.kt
@@ -1,123 +1,123 @@
-/*
- * Copyright (C) 2017 Moez Bhatti <moez.bhatti@gmail.com>
- *
- * This file is part of QKSMS.
- *
- * QKSMS is free software: you can redistribute it and/or modify
- * it under the terms of the GNU General Public License as published by
- * the Free Software Foundation, either version 3 of the License, or
- * (at your option) any later version.
- *
- * QKSMS is distributed in the hope that it will be useful,
- * but WITHOUT ANY WARRANTY; without even the implied warranty of
- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
- * GNU General Public License for more details.
- *
- * You should have received a copy of the GNU General Public License
- * along with QKSMS.  If not, see <http://www.gnu.org/licenses/>.
- */
-package com.moez.QKSMS.injection.android
-
-import com.moez.QKSMS.feature.widget.WidgetProvider
-import com.moez.QKSMS.injection.scope.ActivityScope
-import com.moez.QKSMS.receiver.BlockThreadReceiver
-import com.moez.QKSMS.receiver.BootReceiver
-import com.moez.QKSMS.receiver.DefaultSmsChangedReceiver
-import com.moez.QKSMS.receiver.DeleteMessagesReceiver
-import com.moez.QKSMS.receiver.MarkArchivedReceiver
-import com.moez.QKSMS.receiver.MarkReadReceiver
-import com.moez.QKSMS.receiver.MarkSeenReceiver
-import com.moez.QKSMS.receiver.MmsReceivedReceiver
-import com.moez.QKSMS.receiver.MmsReceiver
-import com.moez.QKSMS.receiver.MmsSentReceiver
-import com.moez.QKSMS.receiver.MmsUpdatedReceiver
-import com.moez.QKSMS.receiver.NightModeReceiver
-import com.moez.QKSMS.receiver.RemoteMessagingReceiver
-import com.moez.QKSMS.receiver.SendScheduledMessageReceiver
-import com.moez.QKSMS.receiver.SmsDeliveredReceiver
-import com.moez.QKSMS.receiver.SmsProviderChangedReceiver
-import com.moez.QKSMS.receiver.SmsReceiver
-import com.moez.QKSMS.receiver.SmsSentReceiver
-import dagger.Module
-import dagger.android.ContributesAndroidInjector
-
-@Module
-abstract class BroadcastReceiverBuilderModule {
-
-    @ActivityScope
-    @ContributesAndroidInjector()
-    abstract fun bindBlockThreadReceiver(): BlockThreadReceiver
-
-    @ActivityScope
-    @ContributesAndroidInjector()
-    abstract fun bindBootReceiver(): BootReceiver
-
-    @ActivityScope
-    @ContributesAndroidInjector()
-    abstract fun bindDefaultSmsChangedReceiver(): DefaultSmsChangedReceiver
-
-    @ActivityScope
-    @ContributesAndroidInjector()
-    abstract fun bindDeleteMessagesReceiver(): DeleteMessagesReceiver
-
-    @ActivityScope
-    @ContributesAndroidInjector
-    abstract fun bindMarkArchivedReceiver(): MarkArchivedReceiver
-
-    @ActivityScope
-    @ContributesAndroidInjector()
-    abstract fun bindMarkReadReceiver(): MarkReadReceiver
-
-    @ActivityScope
-    @ContributesAndroidInjector()
-    abstract fun bindMarkSeenReceiver(): MarkSeenReceiver
-
-    @ActivityScope
-    @ContributesAndroidInjector()
-    abstract fun bindMmsReceivedReceiver(): MmsReceivedReceiver
-
-    @ActivityScope
-    @ContributesAndroidInjector()
-    abstract fun bindMmsReceiver(): MmsReceiver
-
-    @ActivityScope
-    @ContributesAndroidInjector()
-    abstract fun bindMmsSentReceiver(): MmsSentReceiver
-
-    @ActivityScope
-    @ContributesAndroidInjector()
-    abstract fun bindMmsUpdatedReceiver(): MmsUpdatedReceiver
-
-    @ActivityScope
-    @ContributesAndroidInjector()
-    abstract fun bindNightModeReceiver(): NightModeReceiver
-
-    @ActivityScope
-    @ContributesAndroidInjector()
-    abstract fun bindRemoteMessagingReceiver(): RemoteMessagingReceiver
-
-    @ActivityScope
-    @ContributesAndroidInjector()
-    abstract fun bindSendScheduledMessageReceiver(): SendScheduledMessageReceiver
-
-    @ActivityScope
-    @ContributesAndroidInjector()
-    abstract fun bindSmsDeliveredReceiver(): SmsDeliveredReceiver
-
-    @ActivityScope
-    @ContributesAndroidInjector()
-    abstract fun bindSmsProviderChangedReceiver(): SmsProviderChangedReceiver
-
-    @ActivityScope
-    @ContributesAndroidInjector()
-    abstract fun bindSmsReceiver(): SmsReceiver
-
-    @ActivityScope
-    @ContributesAndroidInjector()
-    abstract fun bindSmsSentReceiver(): SmsSentReceiver
-
-    @ActivityScope
-    @ContributesAndroidInjector()
-    abstract fun bindWidgetProvider(): WidgetProvider
-
+/*
+ * Copyright (C) 2017 Moez Bhatti <moez.bhatti@gmail.com>
+ *
+ * This file is part of QKSMS.
+ *
+ * QKSMS is free software: you can redistribute it and/or modify
+ * it under the terms of the GNU General Public License as published by
+ * the Free Software Foundation, either version 3 of the License, or
+ * (at your option) any later version.
+ *
+ * QKSMS is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+ * GNU General Public License for more details.
+ *
+ * You should have received a copy of the GNU General Public License
+ * along with QKSMS.  If not, see <http://www.gnu.org/licenses/>.
+ */
+package com.moez.QKSMS.injection.android
+
+import com.moez.QKSMS.feature.widget.WidgetProvider
+import com.moez.QKSMS.injection.scope.ActivityScope
+import com.moez.QKSMS.receiver.BlockThreadReceiver
+import com.moez.QKSMS.receiver.BootReceiver
+import com.moez.QKSMS.receiver.DefaultSmsChangedReceiver
+import com.moez.QKSMS.receiver.DeleteMessagesReceiver
+import com.moez.QKSMS.receiver.MarkArchivedReceiver
+import com.moez.QKSMS.receiver.MarkReadReceiver
+import com.moez.QKSMS.receiver.MarkSeenReceiver
+import com.moez.QKSMS.receiver.MmsReceivedReceiver
+import com.moez.QKSMS.receiver.MmsReceiver
+import com.moez.QKSMS.receiver.MmsSentReceiver
+import com.moez.QKSMS.receiver.MmsUpdatedReceiver
+import com.moez.QKSMS.receiver.NightModeReceiver
+import com.moez.QKSMS.receiver.RemoteMessagingReceiver
+import com.moez.QKSMS.receiver.SendScheduledMessageReceiver
+import com.moez.QKSMS.receiver.SmsDeliveredReceiver
+import com.moez.QKSMS.receiver.SmsProviderChangedReceiver
+import com.moez.QKSMS.receiver.SmsReceiver
+import com.moez.QKSMS.receiver.SmsSentReceiver
+import dagger.Module
+import dagger.android.ContributesAndroidInjector
+
+@Module
+abstract class BroadcastReceiverBuilderModule {
+
+    @ActivityScope
+    @ContributesAndroidInjector()
+    abstract fun bindBlockThreadReceiver(): BlockThreadReceiver
+
+    @ActivityScope
+    @ContributesAndroidInjector()
+    abstract fun bindBootReceiver(): BootReceiver
+
+    @ActivityScope
+    @ContributesAndroidInjector()
+    abstract fun bindDefaultSmsChangedReceiver(): DefaultSmsChangedReceiver
+
+    @ActivityScope
+    @ContributesAndroidInjector()
+    abstract fun bindDeleteMessagesReceiver(): DeleteMessagesReceiver
+
+    @ActivityScope
+    @ContributesAndroidInjector
+    abstract fun bindMarkArchivedReceiver(): MarkArchivedReceiver
+
+    @ActivityScope
+    @ContributesAndroidInjector()
+    abstract fun bindMarkReadReceiver(): MarkReadReceiver
+
+    @ActivityScope
+    @ContributesAndroidInjector()
+    abstract fun bindMarkSeenReceiver(): MarkSeenReceiver
+
+    @ActivityScope
+    @ContributesAndroidInjector()
+    abstract fun bindMmsReceivedReceiver(): MmsReceivedReceiver
+
+    @ActivityScope
+    @ContributesAndroidInjector()
+    abstract fun bindMmsReceiver(): MmsReceiver
+
+    @ActivityScope
+    @ContributesAndroidInjector()
+    abstract fun bindMmsSentReceiver(): MmsSentReceiver
+
+    @ActivityScope
+    @ContributesAndroidInjector()
+    abstract fun bindMmsUpdatedReceiver(): MmsUpdatedReceiver
+
+    @ActivityScope
+    @ContributesAndroidInjector()
+    abstract fun bindNightModeReceiver(): NightModeReceiver
+
+    @ActivityScope
+    @ContributesAndroidInjector()
+    abstract fun bindRemoteMessagingReceiver(): RemoteMessagingReceiver
+
+    @ActivityScope
+    @ContributesAndroidInjector()
+    abstract fun bindSendScheduledMessageReceiver(): SendScheduledMessageReceiver
+
+    @ActivityScope
+    @ContributesAndroidInjector()
+    abstract fun bindSmsDeliveredReceiver(): SmsDeliveredReceiver
+
+    @ActivityScope
+    @ContributesAndroidInjector()
+    abstract fun bindSmsProviderChangedReceiver(): SmsProviderChangedReceiver
+
+    @ActivityScope
+    @ContributesAndroidInjector()
+    abstract fun bindSmsReceiver(): SmsReceiver
+
+    @ActivityScope
+    @ContributesAndroidInjector()
+    abstract fun bindSmsSentReceiver(): SmsSentReceiver
+
+    @ActivityScope
+    @ContributesAndroidInjector()
+    abstract fun bindWidgetProvider(): WidgetProvider
+
 }
\ No newline at end of file
diff --git a/presentation/src/main/java/com/moez/QKSMS/injection/android/ServiceBuilderModule.kt b/presentation/src/main/java/com/moez/QKSMS/injection/android/ServiceBuilderModule.kt
index ffc30e5c6..d39c0b07b 100644
--- a/presentation/src/main/java/com/moez/QKSMS/injection/android/ServiceBuilderModule.kt
+++ b/presentation/src/main/java/com/moez/QKSMS/injection/android/ServiceBuilderModule.kt
@@ -1,48 +1,48 @@
-/*
- * Copyright (C) 2017 Moez Bhatti <moez.bhatti@gmail.com>
- *
- * This file is part of QKSMS.
- *
- * QKSMS is free software: you can redistribute it and/or modify
- * it under the terms of the GNU General Public License as published by
- * the Free Software Foundation, either version 3 of the License, or
- * (at your option) any later version.
- *
- * QKSMS is distributed in the hope that it will be useful,
- * but WITHOUT ANY WARRANTY; without even the implied warranty of
- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
- * GNU General Public License for more details.
- *
- * You should have received a copy of the GNU General Public License
- * along with QKSMS.  If not, see <http://www.gnu.org/licenses/>.
- */
-package com.moez.QKSMS.injection.android
-
-import com.moez.QKSMS.feature.backup.RestoreBackupService
-import com.moez.QKSMS.injection.scope.ActivityScope
-import com.moez.QKSMS.service.HeadlessSmsSendService
-import com.moez.QKSMS.receiver.SendSmsReceiver
-import com.moez.QKSMS.service.AutoDeleteService
-import dagger.Module
-import dagger.android.ContributesAndroidInjector
-
-@Module
-abstract class ServiceBuilderModule {
-
-    @ActivityScope
-    @ContributesAndroidInjector()
-    abstract fun bindAutoDeleteService(): AutoDeleteService
-
-    @ActivityScope
-    @ContributesAndroidInjector()
-    abstract fun bindHeadlessSmsSendService(): HeadlessSmsSendService
-
-    @ActivityScope
-    @ContributesAndroidInjector()
-    abstract fun bindRestoreBackupService(): RestoreBackupService
-
-    @ActivityScope
-    @ContributesAndroidInjector()
-    abstract fun bindSendSmsReceiver(): SendSmsReceiver
-
-}
+/*
+ * Copyright (C) 2017 Moez Bhatti <moez.bhatti@gmail.com>
+ *
+ * This file is part of QKSMS.
+ *
+ * QKSMS is free software: you can redistribute it and/or modify
+ * it under the terms of the GNU General Public License as published by
+ * the Free Software Foundation, either version 3 of the License, or
+ * (at your option) any later version.
+ *
+ * QKSMS is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+ * GNU General Public License for more details.
+ *
+ * You should have received a copy of the GNU General Public License
+ * along with QKSMS.  If not, see <http://www.gnu.org/licenses/>.
+ */
+package com.moez.QKSMS.injection.android
+
+import com.moez.QKSMS.feature.backup.RestoreBackupService
+import com.moez.QKSMS.injection.scope.ActivityScope
+import com.moez.QKSMS.service.HeadlessSmsSendService
+import com.moez.QKSMS.receiver.SendSmsReceiver
+import com.moez.QKSMS.service.AutoDeleteService
+import dagger.Module
+import dagger.android.ContributesAndroidInjector
+
+@Module
+abstract class ServiceBuilderModule {
+
+    @ActivityScope
+    @ContributesAndroidInjector()
+    abstract fun bindAutoDeleteService(): AutoDeleteService
+
+    @ActivityScope
+    @ContributesAndroidInjector()
+    abstract fun bindHeadlessSmsSendService(): HeadlessSmsSendService
+
+    @ActivityScope
+    @ContributesAndroidInjector()
+    abstract fun bindRestoreBackupService(): RestoreBackupService
+
+    @ActivityScope
+    @ContributesAndroidInjector()
+    abstract fun bindSendSmsReceiver(): SendSmsReceiver
+
+}
diff --git a/presentation/src/main/java/com/moez/QKSMS/injection/scope/ActivityScope.kt b/presentation/src/main/java/com/moez/QKSMS/injection/scope/ActivityScope.kt
index 007e63f45..3df892185 100644
--- a/presentation/src/main/java/com/moez/QKSMS/injection/scope/ActivityScope.kt
+++ b/presentation/src/main/java/com/moez/QKSMS/injection/scope/ActivityScope.kt
@@ -1,24 +1,24 @@
-/*
- * Copyright (C) 2017 Moez Bhatti <moez.bhatti@gmail.com>
- *
- * This file is part of QKSMS.
- *
- * QKSMS is free software: you can redistribute it and/or modify
- * it under the terms of the GNU General Public License as published by
- * the Free Software Foundation, either version 3 of the License, or
- * (at your option) any later version.
- *
- * QKSMS is distributed in the hope that it will be useful,
- * but WITHOUT ANY WARRANTY; without even the implied warranty of
- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
- * GNU General Public License for more details.
- *
- * You should have received a copy of the GNU General Public License
- * along with QKSMS.  If not, see <http://www.gnu.org/licenses/>.
- */
-package com.moez.QKSMS.injection.scope
-
-import javax.inject.Scope
-
-@Scope
-annotation class ActivityScope
+/*
+ * Copyright (C) 2017 Moez Bhatti <moez.bhatti@gmail.com>
+ *
+ * This file is part of QKSMS.
+ *
+ * QKSMS is free software: you can redistribute it and/or modify
+ * it under the terms of the GNU General Public License as published by
+ * the Free Software Foundation, either version 3 of the License, or
+ * (at your option) any later version.
+ *
+ * QKSMS is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+ * GNU General Public License for more details.
+ *
+ * You should have received a copy of the GNU General Public License
+ * along with QKSMS.  If not, see <http://www.gnu.org/licenses/>.
+ */
+package com.moez.QKSMS.injection.scope
+
+import javax.inject.Scope
+
+@Scope
+annotation class ActivityScope
diff --git a/presentation/src/main/java/com/moez/QKSMS/injection/scope/ControllerScope.kt b/presentation/src/main/java/com/moez/QKSMS/injection/scope/ControllerScope.kt
index 883a1eaa3..ba6772218 100644
--- a/presentation/src/main/java/com/moez/QKSMS/injection/scope/ControllerScope.kt
+++ b/presentation/src/main/java/com/moez/QKSMS/injection/scope/ControllerScope.kt
@@ -1,24 +1,24 @@
-/*
- * Copyright (C) 2017 Moez Bhatti <moez.bhatti@gmail.com>
- *
- * This file is part of QKSMS.
- *
- * QKSMS is free software: you can redistribute it and/or modify
- * it under the terms of the GNU General Public License as published by
- * the Free Software Foundation, either version 3 of the License, or
- * (at your option) any later version.
- *
- * QKSMS is distributed in the hope that it will be useful,
- * but WITHOUT ANY WARRANTY; without even the implied warranty of
- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
- * GNU General Public License for more details.
- *
- * You should have received a copy of the GNU General Public License
- * along with QKSMS.  If not, see <http://www.gnu.org/licenses/>.
- */
-package com.moez.QKSMS.injection.scope
-
-import javax.inject.Scope
-
-@Scope
+/*
+ * Copyright (C) 2017 Moez Bhatti <moez.bhatti@gmail.com>
+ *
+ * This file is part of QKSMS.
+ *
+ * QKSMS is free software: you can redistribute it and/or modify
+ * it under the terms of the GNU General Public License as published by
+ * the Free Software Foundation, either version 3 of the License, or
+ * (at your option) any later version.
+ *
+ * QKSMS is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+ * GNU General Public License for more details.
+ *
+ * You should have received a copy of the GNU General Public License
+ * along with QKSMS.  If not, see <http://www.gnu.org/licenses/>.
+ */
+package com.moez.QKSMS.injection.scope
+
+import javax.inject.Scope
+
+@Scope
 annotation class ControllerScope
\ No newline at end of file
diff --git a/presentation/src/main/java/com/moez/QKSMS/interactor/MigratePreferences.kt b/presentation/src/main/java/com/moez/QKSMS/interactor/MigratePreferences.kt
index a13d8e755..0d8b6a94a 100644
--- a/presentation/src/main/java/com/moez/QKSMS/interactor/MigratePreferences.kt
+++ b/presentation/src/main/java/com/moez/QKSMS/interactor/MigratePreferences.kt
@@ -1,76 +1,76 @@
-/*
- * Copyright (C) 2017 Moez Bhatti <moez.bhatti@gmail.com>
- *
- * This file is part of QKSMS.
- *
- * QKSMS is free software: you can redistribute it and/or modify
- * it under the terms of the GNU General Public License as published by
- * the Free Software Foundation, either version 3 of the License, or
- * (at your option) any later version.
- *
- * QKSMS is distributed in the hope that it will be useful,
- * but WITHOUT ANY WARRANTY; without even the implied warranty of
- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
- * GNU General Public License for more details.
- *
- * You should have received a copy of the GNU General Public License
- * along with QKSMS.  If not, see <http://www.gnu.org/licenses/>.
- */
-package com.moez.QKSMS.interactor
-
-import com.f2prateek.rx.preferences2.RxSharedPreferences
-import com.moez.QKSMS.util.NightModeManager
-import com.moez.QKSMS.util.Preferences
-import io.reactivex.Flowable
-import javax.inject.Inject
-
-/**
- * When upgrading from 2.7.3 to 3.0, migrate the preferences
- *
- * Blocked conversations will be migrated in SyncManager
- */
-class MigratePreferences @Inject constructor(
-    private val nightModeManager: NightModeManager,
-    private val prefs: Preferences,
-    private val rxPrefs: RxSharedPreferences
-) : Interactor<Unit>() {
-
-    override fun buildObservable(params: Unit): Flowable<*> {
-        return Flowable.fromCallable { rxPrefs.getBoolean("pref_key_welcome_seen", false) }
-                .filter { seen -> seen.get() } // Only proceed if this value is true. It will be set false at the end
-                .doOnNext {
-                    // Theme
-                    val defaultTheme = prefs.theme().get().toString()
-                    val oldTheme = rxPrefs.getString("pref_key_theme", defaultTheme).get()
-                    prefs.theme().set(Integer.parseInt(oldTheme))
-
-                    // Night mode
-                    val background = rxPrefs.getString("pref_key_background", "light").get()
-                    val autoNight = rxPrefs.getBoolean("pref_key_night_auto", false).get()
-                    when {
-                        autoNight -> nightModeManager.updateNightMode(Preferences.NIGHT_MODE_AUTO)
-                        background == "light" -> nightModeManager.updateNightMode(Preferences.NIGHT_MODE_OFF)
-                        background == "grey" -> nightModeManager.updateNightMode(Preferences.NIGHT_MODE_ON)
-                        background == "black" -> {
-                            nightModeManager.updateNightMode(Preferences.NIGHT_MODE_ON)
-                            prefs.black.set(true)
-                        }
-                    }
-
-                    // Delivery
-                    prefs.delivery.set(rxPrefs.getBoolean("pref_key_delivery", prefs.delivery.get()).get())
-
-                    // Quickreply
-                    prefs.qkreply.set(rxPrefs.getBoolean("pref_key_quickreply_enabled", prefs.qkreply.get()).get())
-                    prefs.qkreplyTapDismiss.set(rxPrefs.getBoolean("pref_key_quickreply_dismiss", prefs.qkreplyTapDismiss.get()).get())
-
-                    // Font size
-                    prefs.textSize.set(rxPrefs.getString("pref_key_font_size", "${prefs.textSize.get()}").get().toInt())
-
-                    // Unicode
-                    prefs.unicode.set(rxPrefs.getBoolean("pref_key_strip_unicode", prefs.unicode.get()).get())
-                }
-                .doOnNext { seen -> seen.delete() } // Clear this value so that we don't need to migrate again
-    }
-
+/*
+ * Copyright (C) 2017 Moez Bhatti <moez.bhatti@gmail.com>
+ *
+ * This file is part of QKSMS.
+ *
+ * QKSMS is free software: you can redistribute it and/or modify
+ * it under the terms of the GNU General Public License as published by
+ * the Free Software Foundation, either version 3 of the License, or
+ * (at your option) any later version.
+ *
+ * QKSMS is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+ * GNU General Public License for more details.
+ *
+ * You should have received a copy of the GNU General Public License
+ * along with QKSMS.  If not, see <http://www.gnu.org/licenses/>.
+ */
+package com.moez.QKSMS.interactor
+
+import com.f2prateek.rx.preferences2.RxSharedPreferences
+import com.moez.QKSMS.util.NightModeManager
+import com.moez.QKSMS.util.Preferences
+import io.reactivex.Flowable
+import javax.inject.Inject
+
+/**
+ * When upgrading from 2.7.3 to 3.0, migrate the preferences
+ *
+ * Blocked conversations will be migrated in SyncManager
+ */
+class MigratePreferences @Inject constructor(
+    private val nightModeManager: NightModeManager,
+    private val prefs: Preferences,
+    private val rxPrefs: RxSharedPreferences
+) : Interactor<Unit>() {
+
+    override fun buildObservable(params: Unit): Flowable<*> {
+        return Flowable.fromCallable { rxPrefs.getBoolean("pref_key_welcome_seen", false) }
+                .filter { seen -> seen.get() } // Only proceed if this value is true. It will be set false at the end
+                .doOnNext {
+                    // Theme
+                    val defaultTheme = prefs.theme().get().toString()
+                    val oldTheme = rxPrefs.getString("pref_key_theme", defaultTheme).get()
+                    prefs.theme().set(Integer.parseInt(oldTheme))
+
+                    // Night mode
+                    val background = rxPrefs.getString("pref_key_background", "light").get()
+                    val autoNight = rxPrefs.getBoolean("pref_key_night_auto", false).get()
+                    when {
+                        autoNight -> nightModeManager.updateNightMode(Preferences.NIGHT_MODE_AUTO)
+                        background == "light" -> nightModeManager.updateNightMode(Preferences.NIGHT_MODE_OFF)
+                        background == "grey" -> nightModeManager.updateNightMode(Preferences.NIGHT_MODE_ON)
+                        background == "black" -> {
+                            nightModeManager.updateNightMode(Preferences.NIGHT_MODE_ON)
+                            prefs.black.set(true)
+                        }
+                    }
+
+                    // Delivery
+                    prefs.delivery.set(rxPrefs.getBoolean("pref_key_delivery", prefs.delivery.get()).get())
+
+                    // Quickreply
+                    prefs.qkreply.set(rxPrefs.getBoolean("pref_key_quickreply_enabled", prefs.qkreply.get()).get())
+                    prefs.qkreplyTapDismiss.set(rxPrefs.getBoolean("pref_key_quickreply_dismiss", prefs.qkreplyTapDismiss.get()).get())
+
+                    // Font size
+                    prefs.textSize.set(rxPrefs.getString("pref_key_font_size", "${prefs.textSize.get()}").get().toInt())
+
+                    // Unicode
+                    prefs.unicode.set(rxPrefs.getBoolean("pref_key_strip_unicode", prefs.unicode.get()).get())
+                }
+                .doOnNext { seen -> seen.delete() } // Clear this value so that we don't need to migrate again
+    }
+
 }
\ No newline at end of file
diff --git a/presentation/src/main/res/color-night/text_primary.xml b/presentation/src/main/res/color-night/text_primary.xml
index c97dc9b25..028769ece 100644
--- a/presentation/src/main/res/color-night/text_primary.xml
+++ b/presentation/src/main/res/color-night/text_primary.xml
@@ -1,23 +1,23 @@
-<?xml version="1.0" encoding="utf-8"?>
-<!--
-  ~ Copyright (C) 2019 Moez Bhatti <moez.bhatti@gmail.com>
-  ~
-  ~ This file is part of QKSMS.
-  ~
-  ~ QKSMS is free software: you can redistribute it and/or modify
-  ~ it under the terms of the GNU General Public License as published by
-  ~ the Free Software Foundation, either version 3 of the License, or
-  ~ (at your option) any later version.
-  ~
-  ~ QKSMS is distributed in the hope that it will be useful,
-  ~ but WITHOUT ANY WARRANTY; without even the implied warranty of
-  ~ MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
-  ~ GNU General Public License for more details.
-  ~
-  ~ You should have received a copy of the GNU General Public License
-  ~ along with QKSMS.  If not, see <http://www.gnu.org/licenses/>.
-  -->
-<selector xmlns:android="http://schemas.android.com/apk/res/android">
-    <item android:color="@color/textPrimaryDisabledDark" android:state_enabled="false" />
-    <item android:color="@color/textPrimaryDark" />
-</selector>
+<?xml version="1.0" encoding="utf-8"?>
+<!--
+  ~ Copyright (C) 2019 Moez Bhatti <moez.bhatti@gmail.com>
+  ~
+  ~ This file is part of QKSMS.
+  ~
+  ~ QKSMS is free software: you can redistribute it and/or modify
+  ~ it under the terms of the GNU General Public License as published by
+  ~ the Free Software Foundation, either version 3 of the License, or
+  ~ (at your option) any later version.
+  ~
+  ~ QKSMS is distributed in the hope that it will be useful,
+  ~ but WITHOUT ANY WARRANTY; without even the implied warranty of
+  ~ MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+  ~ GNU General Public License for more details.
+  ~
+  ~ You should have received a copy of the GNU General Public License
+  ~ along with QKSMS.  If not, see <http://www.gnu.org/licenses/>.
+  -->
+<selector xmlns:android="http://schemas.android.com/apk/res/android">
+    <item android:color="@color/textPrimaryDisabledDark" android:state_enabled="false" />
+    <item android:color="@color/textPrimaryDark" />
+</selector>
diff --git a/presentation/src/main/res/color-night/text_secondary.xml b/presentation/src/main/res/color-night/text_secondary.xml
index 653e10ea5..f5f245d4c 100644
--- a/presentation/src/main/res/color-night/text_secondary.xml
+++ b/presentation/src/main/res/color-night/text_secondary.xml
@@ -1,23 +1,23 @@
-<?xml version="1.0" encoding="utf-8"?>
-<!--
-  ~ Copyright (C) 2019 Moez Bhatti <moez.bhatti@gmail.com>
-  ~
-  ~ This file is part of QKSMS.
-  ~
-  ~ QKSMS is free software: you can redistribute it and/or modify
-  ~ it under the terms of the GNU General Public License as published by
-  ~ the Free Software Foundation, either version 3 of the License, or
-  ~ (at your option) any later version.
-  ~
-  ~ QKSMS is distributed in the hope that it will be useful,
-  ~ but WITHOUT ANY WARRANTY; without even the implied warranty of
-  ~ MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
-  ~ GNU General Public License for more details.
-  ~
-  ~ You should have received a copy of the GNU General Public License
-  ~ along with QKSMS.  If not, see <http://www.gnu.org/licenses/>.
-  -->
-<selector xmlns:android="http://schemas.android.com/apk/res/android">
-    <item android:color="@color/textSecondaryDisabledDark" android:state_enabled="false" />
-    <item android:color="@color/textSecondaryDark" />
-</selector>
+<?xml version="1.0" encoding="utf-8"?>
+<!--
+  ~ Copyright (C) 2019 Moez Bhatti <moez.bhatti@gmail.com>
+  ~
+  ~ This file is part of QKSMS.
+  ~
+  ~ QKSMS is free software: you can redistribute it and/or modify
+  ~ it under the terms of the GNU General Public License as published by
+  ~ the Free Software Foundation, either version 3 of the License, or
+  ~ (at your option) any later version.
+  ~
+  ~ QKSMS is distributed in the hope that it will be useful,
+  ~ but WITHOUT ANY WARRANTY; without even the implied warranty of
+  ~ MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+  ~ GNU General Public License for more details.
+  ~
+  ~ You should have received a copy of the GNU General Public License
+  ~ along with QKSMS.  If not, see <http://www.gnu.org/licenses/>.
+  -->
+<selector xmlns:android="http://schemas.android.com/apk/res/android">
+    <item android:color="@color/textSecondaryDisabledDark" android:state_enabled="false" />
+    <item android:color="@color/textSecondaryDark" />
+</selector>
diff --git a/presentation/src/main/res/color-night/text_tertiary.xml b/presentation/src/main/res/color-night/text_tertiary.xml
index 195ffca83..332b0e8eb 100644
--- a/presentation/src/main/res/color-night/text_tertiary.xml
+++ b/presentation/src/main/res/color-night/text_tertiary.xml
@@ -1,22 +1,22 @@
-<?xml version="1.0" encoding="utf-8"?>
-<!--
-  ~ Copyright (C) 2019 Moez Bhatti <moez.bhatti@gmail.com>
-  ~
-  ~ This file is part of QKSMS.
-  ~
-  ~ QKSMS is free software: you can redistribute it and/or modify
-  ~ it under the terms of the GNU General Public License as published by
-  ~ the Free Software Foundation, either version 3 of the License, or
-  ~ (at your option) any later version.
-  ~
-  ~ QKSMS is distributed in the hope that it will be useful,
-  ~ but WITHOUT ANY WARRANTY; without even the implied warranty of
-  ~ MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
-  ~ GNU General Public License for more details.
-  ~
-  ~ You should have received a copy of the GNU General Public License
-  ~ along with QKSMS.  If not, see <http://www.gnu.org/licenses/>.
-  -->
-<selector xmlns:android="http://schemas.android.com/apk/res/android">
-    <item android:color="@color/textTertiaryDark" />
-</selector>
+<?xml version="1.0" encoding="utf-8"?>
+<!--
+  ~ Copyright (C) 2019 Moez Bhatti <moez.bhatti@gmail.com>
+  ~
+  ~ This file is part of QKSMS.
+  ~
+  ~ QKSMS is free software: you can redistribute it and/or modify
+  ~ it under the terms of the GNU General Public License as published by
+  ~ the Free Software Foundation, either version 3 of the License, or
+  ~ (at your option) any later version.
+  ~
+  ~ QKSMS is distributed in the hope that it will be useful,
+  ~ but WITHOUT ANY WARRANTY; without even the implied warranty of
+  ~ MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+  ~ GNU General Public License for more details.
+  ~
+  ~ You should have received a copy of the GNU General Public License
+  ~ along with QKSMS.  If not, see <http://www.gnu.org/licenses/>.
+  -->
+<selector xmlns:android="http://schemas.android.com/apk/res/android">
+    <item android:color="@color/textTertiaryDark" />
+</selector>
diff --git a/presentation/src/main/res/color/text_primary.xml b/presentation/src/main/res/color/text_primary.xml
index 2e8e52498..65e88e44f 100644
--- a/presentation/src/main/res/color/text_primary.xml
+++ b/presentation/src/main/res/color/text_primary.xml
@@ -1,23 +1,23 @@
-<?xml version="1.0" encoding="utf-8"?>
-<!--
-  ~ Copyright (C) 2019 Moez Bhatti <moez.bhatti@gmail.com>
-  ~
-  ~ This file is part of QKSMS.
-  ~
-  ~ QKSMS is free software: you can redistribute it and/or modify
-  ~ it under the terms of the GNU General Public License as published by
-  ~ the Free Software Foundation, either version 3 of the License, or
-  ~ (at your option) any later version.
-  ~
-  ~ QKSMS is distributed in the hope that it will be useful,
-  ~ but WITHOUT ANY WARRANTY; without even the implied warranty of
-  ~ MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
-  ~ GNU General Public License for more details.
-  ~
-  ~ You should have received a copy of the GNU General Public License
-  ~ along with QKSMS.  If not, see <http://www.gnu.org/licenses/>.
-  -->
-<selector xmlns:android="http://schemas.android.com/apk/res/android">
-    <item android:color="@color/textPrimaryDisabled" android:state_enabled="false" />
-    <item android:color="@color/textPrimary" />
-</selector>
+<?xml version="1.0" encoding="utf-8"?>
+<!--
+  ~ Copyright (C) 2019 Moez Bhatti <moez.bhatti@gmail.com>
+  ~
+  ~ This file is part of QKSMS.
+  ~
+  ~ QKSMS is free software: you can redistribute it and/or modify
+  ~ it under the terms of the GNU General Public License as published by
+  ~ the Free Software Foundation, either version 3 of the License, or
+  ~ (at your option) any later version.
+  ~
+  ~ QKSMS is distributed in the hope that it will be useful,
+  ~ but WITHOUT ANY WARRANTY; without even the implied warranty of
+  ~ MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+  ~ GNU General Public License for more details.
+  ~
+  ~ You should have received a copy of the GNU General Public License
+  ~ along with QKSMS.  If not, see <http://www.gnu.org/licenses/>.
+  -->
+<selector xmlns:android="http://schemas.android.com/apk/res/android">
+    <item android:color="@color/textPrimaryDisabled" android:state_enabled="false" />
+    <item android:color="@color/textPrimary" />
+</selector>
diff --git a/presentation/src/main/res/color/text_secondary.xml b/presentation/src/main/res/color/text_secondary.xml
index 8e32a5ff8..141e16730 100644
--- a/presentation/src/main/res/color/text_secondary.xml
+++ b/presentation/src/main/res/color/text_secondary.xml
@@ -1,23 +1,23 @@
-<?xml version="1.0" encoding="utf-8"?>
-<!--
-  ~ Copyright (C) 2019 Moez Bhatti <moez.bhatti@gmail.com>
-  ~
-  ~ This file is part of QKSMS.
-  ~
-  ~ QKSMS is free software: you can redistribute it and/or modify
-  ~ it under the terms of the GNU General Public License as published by
-  ~ the Free Software Foundation, either version 3 of the License, or
-  ~ (at your option) any later version.
-  ~
-  ~ QKSMS is distributed in the hope that it will be useful,
-  ~ but WITHOUT ANY WARRANTY; without even the implied warranty of
-  ~ MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
-  ~ GNU General Public License for more details.
-  ~
-  ~ You should have received a copy of the GNU General Public License
-  ~ along with QKSMS.  If not, see <http://www.gnu.org/licenses/>.
-  -->
-<selector xmlns:android="http://schemas.android.com/apk/res/android">
-    <item android:color="@color/textSecondaryDisabled" android:state_enabled="false" />
-    <item android:color="@color/textSecondary" />
-</selector>
+<?xml version="1.0" encoding="utf-8"?>
+<!--
+  ~ Copyright (C) 2019 Moez Bhatti <moez.bhatti@gmail.com>
+  ~
+  ~ This file is part of QKSMS.
+  ~
+  ~ QKSMS is free software: you can redistribute it and/or modify
+  ~ it under the terms of the GNU General Public License as published by
+  ~ the Free Software Foundation, either version 3 of the License, or
+  ~ (at your option) any later version.
+  ~
+  ~ QKSMS is distributed in the hope that it will be useful,
+  ~ but WITHOUT ANY WARRANTY; without even the implied warranty of
+  ~ MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+  ~ GNU General Public License for more details.
+  ~
+  ~ You should have received a copy of the GNU General Public License
+  ~ along with QKSMS.  If not, see <http://www.gnu.org/licenses/>.
+  -->
+<selector xmlns:android="http://schemas.android.com/apk/res/android">
+    <item android:color="@color/textSecondaryDisabled" android:state_enabled="false" />
+    <item android:color="@color/textSecondary" />
+</selector>
diff --git a/presentation/src/main/res/color/text_tertiary.xml b/presentation/src/main/res/color/text_tertiary.xml
index 89d232e2d..0af2246ab 100644
--- a/presentation/src/main/res/color/text_tertiary.xml
+++ b/presentation/src/main/res/color/text_tertiary.xml
@@ -1,22 +1,22 @@
-<?xml version="1.0" encoding="utf-8"?>
-<!--
-  ~ Copyright (C) 2019 Moez Bhatti <moez.bhatti@gmail.com>
-  ~
-  ~ This file is part of QKSMS.
-  ~
-  ~ QKSMS is free software: you can redistribute it and/or modify
-  ~ it under the terms of the GNU General Public License as published by
-  ~ the Free Software Foundation, either version 3 of the License, or
-  ~ (at your option) any later version.
-  ~
-  ~ QKSMS is distributed in the hope that it will be useful,
-  ~ but WITHOUT ANY WARRANTY; without even the implied warranty of
-  ~ MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
-  ~ GNU General Public License for more details.
-  ~
-  ~ You should have received a copy of the GNU General Public License
-  ~ along with QKSMS.  If not, see <http://www.gnu.org/licenses/>.
-  -->
-<selector xmlns:android="http://schemas.android.com/apk/res/android">
-    <item android:color="@color/textTertiary" />
-</selector>
+<?xml version="1.0" encoding="utf-8"?>
+<!--
+  ~ Copyright (C) 2019 Moez Bhatti <moez.bhatti@gmail.com>
+  ~
+  ~ This file is part of QKSMS.
+  ~
+  ~ QKSMS is free software: you can redistribute it and/or modify
+  ~ it under the terms of the GNU General Public License as published by
+  ~ the Free Software Foundation, either version 3 of the License, or
+  ~ (at your option) any later version.
+  ~
+  ~ QKSMS is distributed in the hope that it will be useful,
+  ~ but WITHOUT ANY WARRANTY; without even the implied warranty of
+  ~ MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+  ~ GNU General Public License for more details.
+  ~
+  ~ You should have received a copy of the GNU General Public License
+  ~ along with QKSMS.  If not, see <http://www.gnu.org/licenses/>.
+  -->
+<selector xmlns:android="http://schemas.android.com/apk/res/android">
+    <item android:color="@color/textTertiary" />
+</selector>
diff --git a/presentation/src/main/res/drawable/ab_shadow.xml b/presentation/src/main/res/drawable/ab_shadow.xml
index e4100d939..6fd538f69 100644
--- a/presentation/src/main/res/drawable/ab_shadow.xml
+++ b/presentation/src/main/res/drawable/ab_shadow.xml
@@ -1,28 +1,28 @@
-<?xml version="1.0" encoding="utf-8"?>
-<!--
-  ~ Copyright (C) 2019 Moez Bhatti <moez.bhatti@gmail.com>
-  ~
-  ~ This file is part of QKSMS.
-  ~
-  ~ QKSMS is free software: you can redistribute it and/or modify
-  ~ it under the terms of the GNU General Public License as published by
-  ~ the Free Software Foundation, either version 3 of the License, or
-  ~ (at your option) any later version.
-  ~
-  ~ QKSMS is distributed in the hope that it will be useful,
-  ~ but WITHOUT ANY WARRANTY; without even the implied warranty of
-  ~ MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
-  ~ GNU General Public License for more details.
-  ~
-  ~ You should have received a copy of the GNU General Public License
-  ~ along with QKSMS.  If not, see <http://www.gnu.org/licenses/>.
-  -->
-<shape xmlns:android="http://schemas.android.com/apk/res/android"
-    android:shape="rectangle">
-
-    <gradient
-        android:angle="90"
-        android:endColor="#14000000"
-        android:startColor="#00000000" />
-
+<?xml version="1.0" encoding="utf-8"?>
+<!--
+  ~ Copyright (C) 2019 Moez Bhatti <moez.bhatti@gmail.com>
+  ~
+  ~ This file is part of QKSMS.
+  ~
+  ~ QKSMS is free software: you can redistribute it and/or modify
+  ~ it under the terms of the GNU General Public License as published by
+  ~ the Free Software Foundation, either version 3 of the License, or
+  ~ (at your option) any later version.
+  ~
+  ~ QKSMS is distributed in the hope that it will be useful,
+  ~ but WITHOUT ANY WARRANTY; without even the implied warranty of
+  ~ MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+  ~ GNU General Public License for more details.
+  ~
+  ~ You should have received a copy of the GNU General Public License
+  ~ along with QKSMS.  If not, see <http://www.gnu.org/licenses/>.
+  -->
+<shape xmlns:android="http://schemas.android.com/apk/res/android"
+    android:shape="rectangle">
+
+    <gradient
+        android:angle="90"
+        android:endColor="#14000000"
+        android:startColor="#00000000" />
+
 </shape>
\ No newline at end of file
diff --git a/presentation/src/main/res/drawable/chip_background.xml b/presentation/src/main/res/drawable/chip_background.xml
index 5eba9499c..b42de5bd3 100755
--- a/presentation/src/main/res/drawable/chip_background.xml
+++ b/presentation/src/main/res/drawable/chip_background.xml
@@ -1,28 +1,28 @@
-<?xml version="1.0" encoding="utf-8"?>
-<!--
-  ~ Copyright (C) 2019 Moez Bhatti <moez.bhatti@gmail.com>
-  ~
-  ~ This file is part of QKSMS.
-  ~
-  ~ QKSMS is free software: you can redistribute it and/or modify
-  ~ it under the terms of the GNU General Public License as published by
-  ~ the Free Software Foundation, either version 3 of the License, or
-  ~ (at your option) any later version.
-  ~
-  ~ QKSMS is distributed in the hope that it will be useful,
-  ~ but WITHOUT ANY WARRANTY; without even the implied warranty of
-  ~ MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
-  ~ GNU General Public License for more details.
-  ~
-  ~ You should have received a copy of the GNU General Public License
-  ~ along with QKSMS.  If not, see <http://www.gnu.org/licenses/>.
-  -->
-<ripple xmlns:android="http://schemas.android.com/apk/res/android"
-    android:color="?android:attr/colorControlHighlight">
-    <item>
-        <shape android:shape="rectangle">
-            <solid android:color="@color/bubbleLight" />
-            <corners android:radius="18dp" />
-        </shape>
-    </item>
+<?xml version="1.0" encoding="utf-8"?>
+<!--
+  ~ Copyright (C) 2019 Moez Bhatti <moez.bhatti@gmail.com>
+  ~
+  ~ This file is part of QKSMS.
+  ~
+  ~ QKSMS is free software: you can redistribute it and/or modify
+  ~ it under the terms of the GNU General Public License as published by
+  ~ the Free Software Foundation, either version 3 of the License, or
+  ~ (at your option) any later version.
+  ~
+  ~ QKSMS is distributed in the hope that it will be useful,
+  ~ but WITHOUT ANY WARRANTY; without even the implied warranty of
+  ~ MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+  ~ GNU General Public License for more details.
+  ~
+  ~ You should have received a copy of the GNU General Public License
+  ~ along with QKSMS.  If not, see <http://www.gnu.org/licenses/>.
+  -->
+<ripple xmlns:android="http://schemas.android.com/apk/res/android"
+    android:color="?android:attr/colorControlHighlight">
+    <item>
+        <shape android:shape="rectangle">
+            <solid android:color="@color/bubbleLight" />
+            <corners android:radius="18dp" />
+        </shape>
+    </item>
 </ripple>
\ No newline at end of file
diff --git a/presentation/src/main/res/drawable/circle.xml b/presentation/src/main/res/drawable/circle.xml
index a073500be..a3f582a75 100644
--- a/presentation/src/main/res/drawable/circle.xml
+++ b/presentation/src/main/res/drawable/circle.xml
@@ -1,26 +1,26 @@
-<?xml version="1.0" encoding="utf-8"?>
-<!--
-  ~ Copyright (C) 2019 Moez Bhatti <moez.bhatti@gmail.com>
-  ~
-  ~ This file is part of QKSMS.
-  ~
-  ~ QKSMS is free software: you can redistribute it and/or modify
-  ~ it under the terms of the GNU General Public License as published by
-  ~ the Free Software Foundation, either version 3 of the License, or
-  ~ (at your option) any later version.
-  ~
-  ~ QKSMS is distributed in the hope that it will be useful,
-  ~ but WITHOUT ANY WARRANTY; without even the implied warranty of
-  ~ MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
-  ~ GNU General Public License for more details.
-  ~
-  ~ You should have received a copy of the GNU General Public License
-  ~ along with QKSMS.  If not, see <http://www.gnu.org/licenses/>.
-  -->
-<shape xmlns:android="http://schemas.android.com/apk/res/android"
-    android:shape="rectangle">
-
-    <corners android:radius="1000dp" />
-    <solid android:color="@android:color/white" />
-
-</shape>
+<?xml version="1.0" encoding="utf-8"?>
+<!--
+  ~ Copyright (C) 2019 Moez Bhatti <moez.bhatti@gmail.com>
+  ~
+  ~ This file is part of QKSMS.
+  ~
+  ~ QKSMS is free software: you can redistribute it and/or modify
+  ~ it under the terms of the GNU General Public License as published by
+  ~ the Free Software Foundation, either version 3 of the License, or
+  ~ (at your option) any later version.
+  ~
+  ~ QKSMS is distributed in the hope that it will be useful,
+  ~ but WITHOUT ANY WARRANTY; without even the implied warranty of
+  ~ MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+  ~ GNU General Public License for more details.
+  ~
+  ~ You should have received a copy of the GNU General Public License
+  ~ along with QKSMS.  If not, see <http://www.gnu.org/licenses/>.
+  -->
+<shape xmlns:android="http://schemas.android.com/apk/res/android"
+    android:shape="rectangle">
+
+    <corners android:radius="1000dp" />
+    <solid android:color="@android:color/white" />
+
+</shape>
diff --git a/presentation/src/main/res/drawable/circle_ripple.xml b/presentation/src/main/res/drawable/circle_ripple.xml
index fb3179c79..db568356a 100644
--- a/presentation/src/main/res/drawable/circle_ripple.xml
+++ b/presentation/src/main/res/drawable/circle_ripple.xml
@@ -1,35 +1,35 @@
-<?xml version="1.0" encoding="utf-8"?>
-<!--
-  ~ Copyright (C) 2019 Moez Bhatti <moez.bhatti@gmail.com>
-  ~
-  ~ This file is part of QKSMS.
-  ~
-  ~ QKSMS is free software: you can redistribute it and/or modify
-  ~ it under the terms of the GNU General Public License as published by
-  ~ the Free Software Foundation, either version 3 of the License, or
-  ~ (at your option) any later version.
-  ~
-  ~ QKSMS is distributed in the hope that it will be useful,
-  ~ but WITHOUT ANY WARRANTY; without even the implied warranty of
-  ~ MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
-  ~ GNU General Public License for more details.
-  ~
-  ~ You should have received a copy of the GNU General Public License
-  ~ along with QKSMS.  If not, see <http://www.gnu.org/licenses/>.
-  -->
-<ripple xmlns:android="http://schemas.android.com/apk/res/android"
-    android:color="@color/rippleLight">
-
-    <item android:id="@android:id/mask">
-        <shape android:shape="oval">
-            <solid android:color="@color/white" />
-        </shape>
-    </item>
-
-    <item>
-        <shape android:shape="oval">
-            <solid android:color="@color/white" />
-        </shape>
-    </item>
-
+<?xml version="1.0" encoding="utf-8"?>
+<!--
+  ~ Copyright (C) 2019 Moez Bhatti <moez.bhatti@gmail.com>
+  ~
+  ~ This file is part of QKSMS.
+  ~
+  ~ QKSMS is free software: you can redistribute it and/or modify
+  ~ it under the terms of the GNU General Public License as published by
+  ~ the Free Software Foundation, either version 3 of the License, or
+  ~ (at your option) any later version.
+  ~
+  ~ QKSMS is distributed in the hope that it will be useful,
+  ~ but WITHOUT ANY WARRANTY; without even the implied warranty of
+  ~ MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+  ~ GNU General Public License for more details.
+  ~
+  ~ You should have received a copy of the GNU General Public License
+  ~ along with QKSMS.  If not, see <http://www.gnu.org/licenses/>.
+  -->
+<ripple xmlns:android="http://schemas.android.com/apk/res/android"
+    android:color="@color/rippleLight">
+
+    <item android:id="@android:id/mask">
+        <shape android:shape="oval">
+            <solid android:color="@color/white" />
+        </shape>
+    </item>
+
+    <item>
+        <shape android:shape="oval">
+            <solid android:color="@color/white" />
+        </shape>
+    </item>
+
 </ripple>
\ No newline at end of file
diff --git a/presentation/src/main/res/drawable/circular_progress_bar.xml b/presentation/src/main/res/drawable/circular_progress_bar.xml
index 7b536665f..e805a5231 100644
--- a/presentation/src/main/res/drawable/circular_progress_bar.xml
+++ b/presentation/src/main/res/drawable/circular_progress_bar.xml
@@ -1,39 +1,39 @@
-<?xml version="1.0" encoding="utf-8"?>
-<!--
-  ~ Copyright (C) 2019 Moez Bhatti <moez.bhatti@gmail.com>
-  ~
-  ~ This file is part of QKSMS.
-  ~
-  ~ QKSMS is free software: you can redistribute it and/or modify
-  ~ it under the terms of the GNU General Public License as published by
-  ~ the Free Software Foundation, either version 3 of the License, or
-  ~ (at your option) any later version.
-  ~
-  ~ QKSMS is distributed in the hope that it will be useful,
-  ~ but WITHOUT ANY WARRANTY; without even the implied warranty of
-  ~ MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
-  ~ GNU General Public License for more details.
-  ~
-  ~ You should have received a copy of the GNU General Public License
-  ~ along with QKSMS.  If not, see <http://www.gnu.org/licenses/>.
-  -->
-<rotate xmlns:android="http://schemas.android.com/apk/res/android"
-    android:fromDegrees="270"
-    android:toDegrees="270">
-
-    <shape
-        android:innerRadius="16dp"
-        android:shape="ring"
-        android:thickness="2dp"
-        android:useLevel="true">
-
-        <gradient
-            android:angle="0"
-            android:endColor="@color/white"
-            android:startColor="@color/white"
-            android:type="sweep"
-            android:useLevel="false" />
-
-    </shape>
-
+<?xml version="1.0" encoding="utf-8"?>
+<!--
+  ~ Copyright (C) 2019 Moez Bhatti <moez.bhatti@gmail.com>
+  ~
+  ~ This file is part of QKSMS.
+  ~
+  ~ QKSMS is free software: you can redistribute it and/or modify
+  ~ it under the terms of the GNU General Public License as published by
+  ~ the Free Software Foundation, either version 3 of the License, or
+  ~ (at your option) any later version.
+  ~
+  ~ QKSMS is distributed in the hope that it will be useful,
+  ~ but WITHOUT ANY WARRANTY; without even the implied warranty of
+  ~ MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+  ~ GNU General Public License for more details.
+  ~
+  ~ You should have received a copy of the GNU General Public License
+  ~ along with QKSMS.  If not, see <http://www.gnu.org/licenses/>.
+  -->
+<rotate xmlns:android="http://schemas.android.com/apk/res/android"
+    android:fromDegrees="270"
+    android:toDegrees="270">
+
+    <shape
+        android:innerRadius="16dp"
+        android:shape="ring"
+        android:thickness="2dp"
+        android:useLevel="true">
+
+        <gradient
+            android:angle="0"
+            android:endColor="@color/white"
+            android:startColor="@color/white"
+            android:type="sweep"
+            android:useLevel="false" />
+
+    </shape>
+
 </rotate>
\ No newline at end of file
diff --git a/presentation/src/main/res/drawable/color_picker_gradient.xml b/presentation/src/main/res/drawable/color_picker_gradient.xml
index 50f0d5cef..7ca820b6a 100644
--- a/presentation/src/main/res/drawable/color_picker_gradient.xml
+++ b/presentation/src/main/res/drawable/color_picker_gradient.xml
@@ -1,30 +1,30 @@
-<?xml version="1.0" encoding="utf-8"?>
-<!--
-  ~ Copyright (C) 2019 Moez Bhatti <moez.bhatti@gmail.com>
-  ~
-  ~ This file is part of QKSMS.
-  ~
-  ~ QKSMS is free software: you can redistribute it and/or modify
-  ~ it under the terms of the GNU General Public License as published by
-  ~ the Free Software Foundation, either version 3 of the License, or
-  ~ (at your option) any later version.
-  ~
-  ~ QKSMS is distributed in the hope that it will be useful,
-  ~ but WITHOUT ANY WARRANTY; without even the implied warranty of
-  ~ MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
-  ~ GNU General Public License for more details.
-  ~
-  ~ You should have received a copy of the GNU General Public License
-  ~ along with QKSMS.  If not, see <http://www.gnu.org/licenses/>.
-  -->
-<shape xmlns:android="http://schemas.android.com/apk/res/android"
-    android:shape="rectangle">
-
-    <corners android:radius="4dp" />
-
-    <gradient
-        android:angle="0"
-        android:endColor="#ff000000"
-        android:startColor="#00000000" />
-
-</shape>
+<?xml version="1.0" encoding="utf-8"?>
+<!--
+  ~ Copyright (C) 2019 Moez Bhatti <moez.bhatti@gmail.com>
+  ~
+  ~ This file is part of QKSMS.
+  ~
+  ~ QKSMS is free software: you can redistribute it and/or modify
+  ~ it under the terms of the GNU General Public License as published by
+  ~ the Free Software Foundation, either version 3 of the License, or
+  ~ (at your option) any later version.
+  ~
+  ~ QKSMS is distributed in the hope that it will be useful,
+  ~ but WITHOUT ANY WARRANTY; without even the implied warranty of
+  ~ MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+  ~ GNU General Public License for more details.
+  ~
+  ~ You should have received a copy of the GNU General Public License
+  ~ along with QKSMS.  If not, see <http://www.gnu.org/licenses/>.
+  -->
+<shape xmlns:android="http://schemas.android.com/apk/res/android"
+    android:shape="rectangle">
+
+    <corners android:radius="4dp" />
+
+    <gradient
+        android:angle="0"
+        android:endColor="#ff000000"
+        android:startColor="#00000000" />
+
+</shape>
diff --git a/presentation/src/main/res/drawable/cursor.xml b/presentation/src/main/res/drawable/cursor.xml
index 3d6e9310a..7dc02119f 100644
--- a/presentation/src/main/res/drawable/cursor.xml
+++ b/presentation/src/main/res/drawable/cursor.xml
@@ -1,24 +1,24 @@
-<?xml version="1.0" encoding="utf-8"?>
-<!--
-  ~ Copyright (C) 2019 Moez Bhatti <moez.bhatti@gmail.com>
-  ~
-  ~ This file is part of QKSMS.
-  ~
-  ~ QKSMS is free software: you can redistribute it and/or modify
-  ~ it under the terms of the GNU General Public License as published by
-  ~ the Free Software Foundation, either version 3 of the License, or
-  ~ (at your option) any later version.
-  ~
-  ~ QKSMS is distributed in the hope that it will be useful,
-  ~ but WITHOUT ANY WARRANTY; without even the implied warranty of
-  ~ MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
-  ~ GNU General Public License for more details.
-  ~
-  ~ You should have received a copy of the GNU General Public License
-  ~ along with QKSMS.  If not, see <http://www.gnu.org/licenses/>.
-  -->
-<shape xmlns:android="http://schemas.android.com/apk/res/android"
-    android:shape="rectangle">
-    <solid android:color="@color/white" />
-    <size android:width="2dp" />
-</shape>
+<?xml version="1.0" encoding="utf-8"?>
+<!--
+  ~ Copyright (C) 2019 Moez Bhatti <moez.bhatti@gmail.com>
+  ~
+  ~ This file is part of QKSMS.
+  ~
+  ~ QKSMS is free software: you can redistribute it and/or modify
+  ~ it under the terms of the GNU General Public License as published by
+  ~ the Free Software Foundation, either version 3 of the License, or
+  ~ (at your option) any later version.
+  ~
+  ~ QKSMS is distributed in the hope that it will be useful,
+  ~ but WITHOUT ANY WARRANTY; without even the implied warranty of
+  ~ MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+  ~ GNU General Public License for more details.
+  ~
+  ~ You should have received a copy of the GNU General Public License
+  ~ along with QKSMS.  If not, see <http://www.gnu.org/licenses/>.
+  -->
+<shape xmlns:android="http://schemas.android.com/apk/res/android"
+    android:shape="rectangle">
+    <solid android:color="@color/white" />
+    <size android:width="2dp" />
+</shape>
diff --git a/presentation/src/main/res/drawable/ic_add_black_24dp.xml b/presentation/src/main/res/drawable/ic_add_black_24dp.xml
index 8b7299f41..403a5616a 100644
--- a/presentation/src/main/res/drawable/ic_add_black_24dp.xml
+++ b/presentation/src/main/res/drawable/ic_add_black_24dp.xml
@@ -1,27 +1,27 @@
-<!--
-  ~ Copyright (C) 2019 Moez Bhatti <moez.bhatti@gmail.com>
-  ~
-  ~ This file is part of QKSMS.
-  ~
-  ~ QKSMS is free software: you can redistribute it and/or modify
-  ~ it under the terms of the GNU General Public License as published by
-  ~ the Free Software Foundation, either version 3 of the License, or
-  ~ (at your option) any later version.
-  ~
-  ~ QKSMS is distributed in the hope that it will be useful,
-  ~ but WITHOUT ANY WARRANTY; without even the implied warranty of
-  ~ MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
-  ~ GNU General Public License for more details.
-  ~
-  ~ You should have received a copy of the GNU General Public License
-  ~ along with QKSMS.  If not, see <http://www.gnu.org/licenses/>.
-  -->
-<vector xmlns:android="http://schemas.android.com/apk/res/android"
-    android:width="24dp"
-    android:height="24dp"
-    android:viewportWidth="24.0"
-    android:viewportHeight="24.0">
-    <path
-        android:fillColor="#FF000000"
-        android:pathData="M19,13h-6v6h-2v-6H5v-2h6V5h2v6h6v2z" />
-</vector>
+<!--
+  ~ Copyright (C) 2019 Moez Bhatti <moez.bhatti@gmail.com>
+  ~
+  ~ This file is part of QKSMS.
+  ~
+  ~ QKSMS is free software: you can redistribute it and/or modify
+  ~ it under the terms of the GNU General Public License as published by
+  ~ the Free Software Foundation, either version 3 of the License, or
+  ~ (at your option) any later version.
+  ~
+  ~ QKSMS is distributed in the hope that it will be useful,
+  ~ but WITHOUT ANY WARRANTY; without even the implied warranty of
+  ~ MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+  ~ GNU General Public License for more details.
+  ~
+  ~ You should have received a copy of the GNU General Public License
+  ~ along with QKSMS.  If not, see <http://www.gnu.org/licenses/>.
+  -->
+<vector xmlns:android="http://schemas.android.com/apk/res/android"
+    android:width="24dp"
+    android:height="24dp"
+    android:viewportWidth="24.0"
+    android:viewportHeight="24.0">
+    <path
+        android:fillColor="#FF000000"
+        android:pathData="M19,13h-6v6h-2v-6H5v-2h6V5h2v6h6v2z" />
+</vector>
diff --git a/presentation/src/main/res/drawable/ic_add_circle_black_24dp.xml b/presentation/src/main/res/drawable/ic_add_circle_black_24dp.xml
index ecadd0eb1..1a1764039 100644
--- a/presentation/src/main/res/drawable/ic_add_circle_black_24dp.xml
+++ b/presentation/src/main/res/drawable/ic_add_circle_black_24dp.xml
@@ -1,27 +1,27 @@
-<!--
-  ~ Copyright (C) 2019 Moez Bhatti <moez.bhatti@gmail.com>
-  ~
-  ~ This file is part of QKSMS.
-  ~
-  ~ QKSMS is free software: you can redistribute it and/or modify
-  ~ it under the terms of the GNU General Public License as published by
-  ~ the Free Software Foundation, either version 3 of the License, or
-  ~ (at your option) any later version.
-  ~
-  ~ QKSMS is distributed in the hope that it will be useful,
-  ~ but WITHOUT ANY WARRANTY; without even the implied warranty of
-  ~ MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
-  ~ GNU General Public License for more details.
-  ~
-  ~ You should have received a copy of the GNU General Public License
-  ~ along with QKSMS.  If not, see <http://www.gnu.org/licenses/>.
-  -->
-<vector xmlns:android="http://schemas.android.com/apk/res/android"
-    android:width="24dp"
-    android:height="24dp"
-    android:viewportWidth="24.0"
-    android:viewportHeight="24.0">
-    <path
-        android:fillColor="#FF000000"
-        android:pathData="M12,2C6.48,2 2,6.48 2,12s4.48,10 10,10 10,-4.48 10,-10S17.52,2 12,2zM17,13h-4v4h-2v-4L7,13v-2h4L11,7h2v4h4v2z" />
-</vector>
+<!--
+  ~ Copyright (C) 2019 Moez Bhatti <moez.bhatti@gmail.com>
+  ~
+  ~ This file is part of QKSMS.
+  ~
+  ~ QKSMS is free software: you can redistribute it and/or modify
+  ~ it under the terms of the GNU General Public License as published by
+  ~ the Free Software Foundation, either version 3 of the License, or
+  ~ (at your option) any later version.
+  ~
+  ~ QKSMS is distributed in the hope that it will be useful,
+  ~ but WITHOUT ANY WARRANTY; without even the implied warranty of
+  ~ MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+  ~ GNU General Public License for more details.
+  ~
+  ~ You should have received a copy of the GNU General Public License
+  ~ along with QKSMS.  If not, see <http://www.gnu.org/licenses/>.
+  -->
+<vector xmlns:android="http://schemas.android.com/apk/res/android"
+    android:width="24dp"
+    android:height="24dp"
+    android:viewportWidth="24.0"
+    android:viewportHeight="24.0">
+    <path
+        android:fillColor="#FF000000"
+        android:pathData="M12,2C6.48,2 2,6.48 2,12s4.48,10 10,10 10,-4.48 10,-10S17.52,2 12,2zM17,13h-4v4h-2v-4L7,13v-2h4L11,7h2v4h4v2z" />
+</vector>
diff --git a/presentation/src/main/res/drawable/ic_archive_white_24dp.xml b/presentation/src/main/res/drawable/ic_archive_white_24dp.xml
index 9a621d282..b39ac1f5f 100644
--- a/presentation/src/main/res/drawable/ic_archive_white_24dp.xml
+++ b/presentation/src/main/res/drawable/ic_archive_white_24dp.xml
@@ -1,27 +1,27 @@
-<!--
-  ~ Copyright (C) 2019 Moez Bhatti <moez.bhatti@gmail.com>
-  ~
-  ~ This file is part of QKSMS.
-  ~
-  ~ QKSMS is free software: you can redistribute it and/or modify
-  ~ it under the terms of the GNU General Public License as published by
-  ~ the Free Software Foundation, either version 3 of the License, or
-  ~ (at your option) any later version.
-  ~
-  ~ QKSMS is distributed in the hope that it will be useful,
-  ~ but WITHOUT ANY WARRANTY; without even the implied warranty of
-  ~ MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
-  ~ GNU General Public License for more details.
-  ~
-  ~ You should have received a copy of the GNU General Public License
-  ~ along with QKSMS.  If not, see <http://www.gnu.org/licenses/>.
-  -->
-<vector xmlns:android="http://schemas.android.com/apk/res/android"
-    android:width="24dp"
-    android:height="24dp"
-    android:viewportWidth="24.0"
-    android:viewportHeight="24.0">
-    <path
-        android:fillColor="#FFFFFFFF"
-        android:pathData="M20.54,5.23l-1.39,-1.68C18.88,3.21 18.47,3 18,3H6c-0.47,0 -0.88,0.21 -1.16,0.55L3.46,5.23C3.17,5.57 3,6.02 3,6.5V19c0,1.1 0.9,2 2,2h14c1.1,0 2,-0.9 2,-2V6.5c0,-0.48 -0.17,-0.93 -0.46,-1.27zM12,17.5L6.5,12H10v-2h4v2h3.5L12,17.5zM5.12,5l0.81,-1h12l0.94,1H5.12z" />
-</vector>
+<!--
+  ~ Copyright (C) 2019 Moez Bhatti <moez.bhatti@gmail.com>
+  ~
+  ~ This file is part of QKSMS.
+  ~
+  ~ QKSMS is free software: you can redistribute it and/or modify
+  ~ it under the terms of the GNU General Public License as published by
+  ~ the Free Software Foundation, either version 3 of the License, or
+  ~ (at your option) any later version.
+  ~
+  ~ QKSMS is distributed in the hope that it will be useful,
+  ~ but WITHOUT ANY WARRANTY; without even the implied warranty of
+  ~ MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+  ~ GNU General Public License for more details.
+  ~
+  ~ You should have received a copy of the GNU General Public License
+  ~ along with QKSMS.  If not, see <http://www.gnu.org/licenses/>.
+  -->
+<vector xmlns:android="http://schemas.android.com/apk/res/android"
+    android:width="24dp"
+    android:height="24dp"
+    android:viewportWidth="24.0"
+    android:viewportHeight="24.0">
+    <path
+        android:fillColor="#FFFFFFFF"
+        android:pathData="M20.54,5.23l-1.39,-1.68C18.88,3.21 18.47,3 18,3H6c-0.47,0 -0.88,0.21 -1.16,0.55L3.46,5.23C3.17,5.57 3,6.02 3,6.5V19c0,1.1 0.9,2 2,2h14c1.1,0 2,-0.9 2,-2V6.5c0,-0.48 -0.17,-0.93 -0.46,-1.27zM12,17.5L6.5,12H10v-2h4v2h3.5L12,17.5zM5.12,5l0.81,-1h12l0.94,1H5.12z" />
+</vector>
diff --git a/presentation/src/main/res/drawable/ic_attachment_black_24dp.xml b/presentation/src/main/res/drawable/ic_attachment_black_24dp.xml
index d9940a26b..b5c67e48f 100644
--- a/presentation/src/main/res/drawable/ic_attachment_black_24dp.xml
+++ b/presentation/src/main/res/drawable/ic_attachment_black_24dp.xml
@@ -1,27 +1,27 @@
-<!--
-  ~ Copyright (C) 2019 Moez Bhatti <moez.bhatti@gmail.com>
-  ~
-  ~ This file is part of QKSMS.
-  ~
-  ~ QKSMS is free software: you can redistribute it and/or modify
-  ~ it under the terms of the GNU General Public License as published by
-  ~ the Free Software Foundation, either version 3 of the License, or
-  ~ (at your option) any later version.
-  ~
-  ~ QKSMS is distributed in the hope that it will be useful,
-  ~ but WITHOUT ANY WARRANTY; without even the implied warranty of
-  ~ MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
-  ~ GNU General Public License for more details.
-  ~
-  ~ You should have received a copy of the GNU General Public License
-  ~ along with QKSMS.  If not, see <http://www.gnu.org/licenses/>.
-  -->
-<vector xmlns:android="http://schemas.android.com/apk/res/android"
-        android:width="24dp"
-        android:height="24dp"
-        android:viewportWidth="24.0"
-        android:viewportHeight="24.0">
-    <path
-        android:fillColor="#FF000000"
-        android:pathData="M2,12.5C2,9.46 4.46,7 7.5,7H18c2.21,0 4,1.79 4,4s-1.79,4 -4,4H9.5C8.12,15 7,13.88 7,12.5S8.12,10 9.5,10H17v2H9.41c-0.55,0 -0.55,1 0,1H18c1.1,0 2,-0.9 2,-2s-0.9,-2 -2,-2H7.5C5.57,9 4,10.57 4,12.5S5.57,16 7.5,16H17v2H7.5C4.46,18 2,15.54 2,12.5z"/>
-</vector>
+<!--
+  ~ Copyright (C) 2019 Moez Bhatti <moez.bhatti@gmail.com>
+  ~
+  ~ This file is part of QKSMS.
+  ~
+  ~ QKSMS is free software: you can redistribute it and/or modify
+  ~ it under the terms of the GNU General Public License as published by
+  ~ the Free Software Foundation, either version 3 of the License, or
+  ~ (at your option) any later version.
+  ~
+  ~ QKSMS is distributed in the hope that it will be useful,
+  ~ but WITHOUT ANY WARRANTY; without even the implied warranty of
+  ~ MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+  ~ GNU General Public License for more details.
+  ~
+  ~ You should have received a copy of the GNU General Public License
+  ~ along with QKSMS.  If not, see <http://www.gnu.org/licenses/>.
+  -->
+<vector xmlns:android="http://schemas.android.com/apk/res/android"
+        android:width="24dp"
+        android:height="24dp"
+        android:viewportWidth="24.0"
+        android:viewportHeight="24.0">
+    <path
+        android:fillColor="#FF000000"
+        android:pathData="M2,12.5C2,9.46 4.46,7 7.5,7H18c2.21,0 4,1.79 4,4s-1.79,4 -4,4H9.5C8.12,15 7,13.88 7,12.5S8.12,10 9.5,10H17v2H9.41c-0.55,0 -0.55,1 0,1H18c1.1,0 2,-0.9 2,-2s-0.9,-2 -2,-2H7.5C5.57,9 4,10.57 4,12.5S5.57,16 7.5,16H17v2H7.5C4.46,18 2,15.54 2,12.5z"/>
+</vector>
diff --git a/presentation/src/main/res/drawable/ic_av_timer_black_24dp.xml b/presentation/src/main/res/drawable/ic_av_timer_black_24dp.xml
index e1787230e..425724640 100644
--- a/presentation/src/main/res/drawable/ic_av_timer_black_24dp.xml
+++ b/presentation/src/main/res/drawable/ic_av_timer_black_24dp.xml
@@ -1,27 +1,27 @@
-<!--
-  ~ Copyright (C) 2019 Moez Bhatti <moez.bhatti@gmail.com>
-  ~
-  ~ This file is part of QKSMS.
-  ~
-  ~ QKSMS is free software: you can redistribute it and/or modify
-  ~ it under the terms of the GNU General Public License as published by
-  ~ the Free Software Foundation, either version 3 of the License, or
-  ~ (at your option) any later version.
-  ~
-  ~ QKSMS is distributed in the hope that it will be useful,
-  ~ but WITHOUT ANY WARRANTY; without even the implied warranty of
-  ~ MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
-  ~ GNU General Public License for more details.
-  ~
-  ~ You should have received a copy of the GNU General Public License
-  ~ along with QKSMS.  If not, see <http://www.gnu.org/licenses/>.
-  -->
-<vector xmlns:android="http://schemas.android.com/apk/res/android"
-    android:width="24dp"
-    android:height="24dp"
-    android:viewportWidth="24.0"
-    android:viewportHeight="24.0">
-    <path
-        android:fillColor="#FF000000"
-        android:pathData="M11,17c0,0.55 0.45,1 1,1s1,-0.45 1,-1 -0.45,-1 -1,-1 -1,0.45 -1,1zM11,3v4h2L13,5.08c3.39,0.49 6,3.39 6,6.92 0,3.87 -3.13,7 -7,7s-7,-3.13 -7,-7c0,-1.68 0.59,-3.22 1.58,-4.42L12,13l1.41,-1.41 -6.8,-6.8v0.02C4.42,6.45 3,9.05 3,12c0,4.97 4.02,9 9,9 4.97,0 9,-4.03 9,-9s-4.03,-9 -9,-9h-1zM18,12c0,-0.55 -0.45,-1 -1,-1s-1,0.45 -1,1 0.45,1 1,1 1,-0.45 1,-1zM6,12c0,0.55 0.45,1 1,1s1,-0.45 1,-1 -0.45,-1 -1,-1 -1,0.45 -1,1z" />
-</vector>
+<!--
+  ~ Copyright (C) 2019 Moez Bhatti <moez.bhatti@gmail.com>
+  ~
+  ~ This file is part of QKSMS.
+  ~
+  ~ QKSMS is free software: you can redistribute it and/or modify
+  ~ it under the terms of the GNU General Public License as published by
+  ~ the Free Software Foundation, either version 3 of the License, or
+  ~ (at your option) any later version.
+  ~
+  ~ QKSMS is distributed in the hope that it will be useful,
+  ~ but WITHOUT ANY WARRANTY; without even the implied warranty of
+  ~ MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+  ~ GNU General Public License for more details.
+  ~
+  ~ You should have received a copy of the GNU General Public License
+  ~ along with QKSMS.  If not, see <http://www.gnu.org/licenses/>.
+  -->
+<vector xmlns:android="http://schemas.android.com/apk/res/android"
+    android:width="24dp"
+    android:height="24dp"
+    android:viewportWidth="24.0"
+    android:viewportHeight="24.0">
+    <path
+        android:fillColor="#FF000000"
+        android:pathData="M11,17c0,0.55 0.45,1 1,1s1,-0.45 1,-1 -0.45,-1 -1,-1 -1,0.45 -1,1zM11,3v4h2L13,5.08c3.39,0.49 6,3.39 6,6.92 0,3.87 -3.13,7 -7,7s-7,-3.13 -7,-7c0,-1.68 0.59,-3.22 1.58,-4.42L12,13l1.41,-1.41 -6.8,-6.8v0.02C4.42,6.45 3,9.05 3,12c0,4.97 4.02,9 9,9 4.97,0 9,-4.03 9,-9s-4.03,-9 -9,-9h-1zM18,12c0,-0.55 -0.45,-1 -1,-1s-1,0.45 -1,1 0.45,1 1,1 1,-0.45 1,-1zM6,12c0,0.55 0.45,1 1,1s1,-0.45 1,-1 -0.45,-1 -1,-1 -1,0.45 -1,1z" />
+</vector>
diff --git a/presentation/src/main/res/drawable/ic_backup_black_24dp.xml b/presentation/src/main/res/drawable/ic_backup_black_24dp.xml
index 6ed84e448..0843265fd 100644
--- a/presentation/src/main/res/drawable/ic_backup_black_24dp.xml
+++ b/presentation/src/main/res/drawable/ic_backup_black_24dp.xml
@@ -1,27 +1,27 @@
-<!--
-  ~ Copyright (C) 2019 Moez Bhatti <moez.bhatti@gmail.com>
-  ~
-  ~ This file is part of QKSMS.
-  ~
-  ~ QKSMS is free software: you can redistribute it and/or modify
-  ~ it under the terms of the GNU General Public License as published by
-  ~ the Free Software Foundation, either version 3 of the License, or
-  ~ (at your option) any later version.
-  ~
-  ~ QKSMS is distributed in the hope that it will be useful,
-  ~ but WITHOUT ANY WARRANTY; without even the implied warranty of
-  ~ MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
-  ~ GNU General Public License for more details.
-  ~
-  ~ You should have received a copy of the GNU General Public License
-  ~ along with QKSMS.  If not, see <http://www.gnu.org/licenses/>.
-  -->
-<vector xmlns:android="http://schemas.android.com/apk/res/android"
-    android:width="24dp"
-    android:height="24dp"
-    android:viewportWidth="24.0"
-    android:viewportHeight="24.0">
-    <path
-        android:fillColor="#FF000000"
-        android:pathData="M19.35,10.04C18.67,6.59 15.64,4 12,4 9.11,4 6.6,5.64 5.35,8.04 2.34,8.36 0,10.91 0,14c0,3.31 2.69,6 6,6h13c2.76,0 5,-2.24 5,-5 0,-2.64 -2.05,-4.78 -4.65,-4.96zM14,13v4h-4v-4H7l5,-5 5,5h-3z" />
-</vector>
+<!--
+  ~ Copyright (C) 2019 Moez Bhatti <moez.bhatti@gmail.com>
+  ~
+  ~ This file is part of QKSMS.
+  ~
+  ~ QKSMS is free software: you can redistribute it and/or modify
+  ~ it under the terms of the GNU General Public License as published by
+  ~ the Free Software Foundation, either version 3 of the License, or
+  ~ (at your option) any later version.
+  ~
+  ~ QKSMS is distributed in the hope that it will be useful,
+  ~ but WITHOUT ANY WARRANTY; without even the implied warranty of
+  ~ MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+  ~ GNU General Public License for more details.
+  ~
+  ~ You should have received a copy of the GNU General Public License
+  ~ along with QKSMS.  If not, see <http://www.gnu.org/licenses/>.
+  -->
+<vector xmlns:android="http://schemas.android.com/apk/res/android"
+    android:width="24dp"
+    android:height="24dp"
+    android:viewportWidth="24.0"
+    android:viewportHeight="24.0">
+    <path
+        android:fillColor="#FF000000"
+        android:pathData="M19.35,10.04C18.67,6.59 15.64,4 12,4 9.11,4 6.6,5.64 5.35,8.04 2.34,8.36 0,10.91 0,14c0,3.31 2.69,6 6,6h13c2.76,0 5,-2.24 5,-5 0,-2.64 -2.05,-4.78 -4.65,-4.96zM14,13v4h-4v-4H7l5,-5 5,5h-3z" />
+</vector>
diff --git a/presentation/src/main/res/drawable/ic_baseline_history_toggle_off_24.xml b/presentation/src/main/res/drawable/ic_baseline_history_toggle_off_24.xml
index ece916dcc..ccdc6f7b4 100644
--- a/presentation/src/main/res/drawable/ic_baseline_history_toggle_off_24.xml
+++ b/presentation/src/main/res/drawable/ic_baseline_history_toggle_off_24.xml
@@ -1,10 +1,10 @@
-<vector xmlns:android="http://schemas.android.com/apk/res/android"
-    android:width="24dp"
-    android:height="24dp"
-    android:viewportWidth="24"
-    android:viewportHeight="24"
-    android:tint="?attr/colorControlNormal">
-  <path
-      android:fillColor="@android:color/white"
-      android:pathData="M15.1,19.37l1,1.74c-0.96,0.44 -2.01,0.73 -3.1,0.84v-2.02C13.74,19.84 14.44,19.65 15.1,19.37zM4.07,13H2.05c0.11,1.1 0.4,2.14 0.84,3.1l1.74,-1C4.35,14.44 4.16,13.74 4.07,13zM15.1,4.63l1,-1.74C15.14,2.45 14.1,2.16 13,2.05v2.02C13.74,4.16 14.44,4.35 15.1,4.63zM19.93,11h2.02c-0.11,-1.1 -0.4,-2.14 -0.84,-3.1l-1.74,1C19.65,9.56 19.84,10.26 19.93,11zM8.9,19.37l-1,1.74c0.96,0.44 2.01,0.73 3.1,0.84v-2.02C10.26,19.84 9.56,19.65 8.9,19.37zM11,4.07V2.05c-1.1,0.11 -2.14,0.4 -3.1,0.84l1,1.74C9.56,4.35 10.26,4.16 11,4.07zM18.36,7.17l1.74,-1.01c-0.63,-0.87 -1.4,-1.64 -2.27,-2.27l-1.01,1.74C17.41,6.08 17.92,6.59 18.36,7.17zM4.63,8.9l-1.74,-1C2.45,8.86 2.16,9.9 2.05,11h2.02C4.16,10.26 4.35,9.56 4.63,8.9zM19.93,13c-0.09,0.74 -0.28,1.44 -0.56,2.1l1.74,1c0.44,-0.96 0.73,-2.01 0.84,-3.1H19.93zM16.83,18.36l1.01,1.74c0.87,-0.63 1.64,-1.4 2.27,-2.27l-1.74,-1.01C17.92,17.41 17.41,17.92 16.83,18.36zM7.17,5.64L6.17,3.89C5.29,4.53 4.53,5.29 3.9,6.17l1.74,1.01C6.08,6.59 6.59,6.08 7.17,5.64zM5.64,16.83L3.9,17.83c0.63,0.87 1.4,1.64 2.27,2.27l1.01,-1.74C6.59,17.92 6.08,17.41 5.64,16.83zM13,7h-2v5.41l4.29,4.29l1.41,-1.41L13,11.59V7z"/>
-</vector>
+<vector xmlns:android="http://schemas.android.com/apk/res/android"
+    android:width="24dp"
+    android:height="24dp"
+    android:viewportWidth="24"
+    android:viewportHeight="24"
+    android:tint="?attr/colorControlNormal">
+  <path
+      android:fillColor="@android:color/white"
+      android:pathData="M15.1,19.37l1,1.74c-0.96,0.44 -2.01,0.73 -3.1,0.84v-2.02C13.74,19.84 14.44,19.65 15.1,19.37zM4.07,13H2.05c0.11,1.1 0.4,2.14 0.84,3.1l1.74,-1C4.35,14.44 4.16,13.74 4.07,13zM15.1,4.63l1,-1.74C15.14,2.45 14.1,2.16 13,2.05v2.02C13.74,4.16 14.44,4.35 15.1,4.63zM19.93,11h2.02c-0.11,-1.1 -0.4,-2.14 -0.84,-3.1l-1.74,1C19.65,9.56 19.84,10.26 19.93,11zM8.9,19.37l-1,1.74c0.96,0.44 2.01,0.73 3.1,0.84v-2.02C10.26,19.84 9.56,19.65 8.9,19.37zM11,4.07V2.05c-1.1,0.11 -2.14,0.4 -3.1,0.84l1,1.74C9.56,4.35 10.26,4.16 11,4.07zM18.36,7.17l1.74,-1.01c-0.63,-0.87 -1.4,-1.64 -2.27,-2.27l-1.01,1.74C17.41,6.08 17.92,6.59 18.36,7.17zM4.63,8.9l-1.74,-1C2.45,8.86 2.16,9.9 2.05,11h2.02C4.16,10.26 4.35,9.56 4.63,8.9zM19.93,13c-0.09,0.74 -0.28,1.44 -0.56,2.1l1.74,1c0.44,-0.96 0.73,-2.01 0.84,-3.1H19.93zM16.83,18.36l1.01,1.74c0.87,-0.63 1.64,-1.4 2.27,-2.27l-1.74,-1.01C17.92,17.41 17.41,17.92 16.83,18.36zM7.17,5.64L6.17,3.89C5.29,4.53 4.53,5.29 3.9,6.17l1.74,1.01C6.08,6.59 6.59,6.08 7.17,5.64zM5.64,16.83L3.9,17.83c0.63,0.87 1.4,1.64 2.27,2.27l1.01,-1.74C6.59,17.92 6.08,17.41 5.64,16.83zM13,7h-2v5.41l4.29,4.29l1.41,-1.41L13,11.59V7z"/>
+</vector>
diff --git a/presentation/src/main/res/drawable/ic_baseline_push_pin_24.xml b/presentation/src/main/res/drawable/ic_baseline_push_pin_24.xml
index e799af2a8..ad48c844e 100644
--- a/presentation/src/main/res/drawable/ic_baseline_push_pin_24.xml
+++ b/presentation/src/main/res/drawable/ic_baseline_push_pin_24.xml
@@ -1,28 +1,28 @@
-<!--
-  ~ Copyright (C) 2020 Moez Bhatti <moez.bhatti@gmail.com>
-  ~
-  ~ This file is part of QKSMS.
-  ~
-  ~ QKSMS is free software: you can redistribute it and/or modify
-  ~ it under the terms of the GNU General Public License as published by
-  ~ the Free Software Foundation, either version 3 of the License, or
-  ~ (at your option) any later version.
-  ~
-  ~ QKSMS is distributed in the hope that it will be useful,
-  ~ but WITHOUT ANY WARRANTY; without even the implied warranty of
-  ~ MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
-  ~ GNU General Public License for more details.
-  ~
-  ~ You should have received a copy of the GNU General Public License
-  ~ along with QKSMS.  If not, see <http://www.gnu.org/licenses/>.
-  -->
-
-<vector xmlns:android="http://schemas.android.com/apk/res/android"
-    android:width="24dp"
-    android:height="24dp"
-    android:viewportWidth="24"
-    android:viewportHeight="24">
-    <path
-        android:fillColor="#FF000000"
-        android:pathData="M16,9V4l1,0c0.55,0 1,-0.45 1,-1v0c0,-0.55 -0.45,-1 -1,-1H7C6.45,2 6,2.45 6,3v0c0,0.55 0.45,1 1,1l1,0v5c0,1.66 -1.34,3 -3,3h0v2h5.97v7l1,1l1,-1v-7H19v-2h0C17.34,12 16,10.66 16,9z" />
-</vector>
+<!--
+  ~ Copyright (C) 2020 Moez Bhatti <moez.bhatti@gmail.com>
+  ~
+  ~ This file is part of QKSMS.
+  ~
+  ~ QKSMS is free software: you can redistribute it and/or modify
+  ~ it under the terms of the GNU General Public License as published by
+  ~ the Free Software Foundation, either version 3 of the License, or
+  ~ (at your option) any later version.
+  ~
+  ~ QKSMS is distributed in the hope that it will be useful,
+  ~ but WITHOUT ANY WARRANTY; without even the implied warranty of
+  ~ MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+  ~ GNU General Public License for more details.
+  ~
+  ~ You should have received a copy of the GNU General Public License
+  ~ along with QKSMS.  If not, see <http://www.gnu.org/licenses/>.
+  -->
+
+<vector xmlns:android="http://schemas.android.com/apk/res/android"
+    android:width="24dp"
+    android:height="24dp"
+    android:viewportWidth="24"
+    android:viewportHeight="24">
+    <path
+        android:fillColor="#FF000000"
+        android:pathData="M16,9V4l1,0c0.55,0 1,-0.45 1,-1v0c0,-0.55 -0.45,-1 -1,-1H7C6.45,2 6,2.45 6,3v0c0,0.55 0.45,1 1,1l1,0v5c0,1.66 -1.34,3 -3,3h0v2h5.97v7l1,1l1,-1v-7H19v-2h0C17.34,12 16,10.66 16,9z" />
+</vector>
diff --git a/presentation/src/main/res/drawable/ic_block_white_24dp.xml b/presentation/src/main/res/drawable/ic_block_white_24dp.xml
index 82499c84b..8b6fdc3b6 100644
--- a/presentation/src/main/res/drawable/ic_block_white_24dp.xml
+++ b/presentation/src/main/res/drawable/ic_block_white_24dp.xml
@@ -1,27 +1,27 @@
-<!--
-  ~ Copyright (C) 2019 Moez Bhatti <moez.bhatti@gmail.com>
-  ~
-  ~ This file is part of QKSMS.
-  ~
-  ~ QKSMS is free software: you can redistribute it and/or modify
-  ~ it under the terms of the GNU General Public License as published by
-  ~ the Free Software Foundation, either version 3 of the License, or
-  ~ (at your option) any later version.
-  ~
-  ~ QKSMS is distributed in the hope that it will be useful,
-  ~ but WITHOUT ANY WARRANTY; without even the implied warranty of
-  ~ MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
-  ~ GNU General Public License for more details.
-  ~
-  ~ You should have received a copy of the GNU General Public License
-  ~ along with QKSMS.  If not, see <http://www.gnu.org/licenses/>.
-  -->
-<vector xmlns:android="http://schemas.android.com/apk/res/android"
-    android:width="24dp"
-    android:height="24dp"
-    android:viewportWidth="24.0"
-    android:viewportHeight="24.0">
-    <path
-        android:fillColor="#FFFFFFFF"
-        android:pathData="M12,2C6.48,2 2,6.48 2,12s4.48,10 10,10 10,-4.48 10,-10S17.52,2 12,2zM4,12c0,-4.42 3.58,-8 8,-8 1.85,0 3.55,0.63 4.9,1.69L5.69,16.9C4.63,15.55 4,13.85 4,12zM12,20c-1.85,0 -3.55,-0.63 -4.9,-1.69L18.31,7.1C19.37,8.45 20,10.15 20,12c0,4.42 -3.58,8 -8,8z" />
-</vector>
+<!--
+  ~ Copyright (C) 2019 Moez Bhatti <moez.bhatti@gmail.com>
+  ~
+  ~ This file is part of QKSMS.
+  ~
+  ~ QKSMS is free software: you can redistribute it and/or modify
+  ~ it under the terms of the GNU General Public License as published by
+  ~ the Free Software Foundation, either version 3 of the License, or
+  ~ (at your option) any later version.
+  ~
+  ~ QKSMS is distributed in the hope that it will be useful,
+  ~ but WITHOUT ANY WARRANTY; without even the implied warranty of
+  ~ MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+  ~ GNU General Public License for more details.
+  ~
+  ~ You should have received a copy of the GNU General Public License
+  ~ along with QKSMS.  If not, see <http://www.gnu.org/licenses/>.
+  -->
+<vector xmlns:android="http://schemas.android.com/apk/res/android"
+    android:width="24dp"
+    android:height="24dp"
+    android:viewportWidth="24.0"
+    android:viewportHeight="24.0">
+    <path
+        android:fillColor="#FFFFFFFF"
+        android:pathData="M12,2C6.48,2 2,6.48 2,12s4.48,10 10,10 10,-4.48 10,-10S17.52,2 12,2zM4,12c0,-4.42 3.58,-8 8,-8 1.85,0 3.55,0.63 4.9,1.69L5.69,16.9C4.63,15.55 4,13.85 4,12zM12,20c-1.85,0 -3.55,-0.63 -4.9,-1.69L18.31,7.1C19.37,8.45 20,10.15 20,12c0,4.42 -3.58,8 -8,8z" />
+</vector>
diff --git a/presentation/src/main/res/drawable/ic_call_white_24dp.xml b/presentation/src/main/res/drawable/ic_call_white_24dp.xml
index d37e9f4e5..4ea11becc 100644
--- a/presentation/src/main/res/drawable/ic_call_white_24dp.xml
+++ b/presentation/src/main/res/drawable/ic_call_white_24dp.xml
@@ -1,27 +1,27 @@
-<!--
-  ~ Copyright (C) 2019 Moez Bhatti <moez.bhatti@gmail.com>
-  ~
-  ~ This file is part of QKSMS.
-  ~
-  ~ QKSMS is free software: you can redistribute it and/or modify
-  ~ it under the terms of the GNU General Public License as published by
-  ~ the Free Software Foundation, either version 3 of the License, or
-  ~ (at your option) any later version.
-  ~
-  ~ QKSMS is distributed in the hope that it will be useful,
-  ~ but WITHOUT ANY WARRANTY; without even the implied warranty of
-  ~ MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
-  ~ GNU General Public License for more details.
-  ~
-  ~ You should have received a copy of the GNU General Public License
-  ~ along with QKSMS.  If not, see <http://www.gnu.org/licenses/>.
-  -->
-<vector xmlns:android="http://schemas.android.com/apk/res/android"
-    android:width="24dp"
-    android:height="24dp"
-    android:viewportWidth="24.0"
-    android:viewportHeight="24.0">
-    <path
-        android:fillColor="#FFF"
-        android:pathData="M6.62,10.79c1.44,2.83 3.76,5.14 6.59,6.59l2.2,-2.2c0.27,-0.27 0.67,-0.36 1.02,-0.24 1.12,0.37 2.33,0.57 3.57,0.57 0.55,0 1,0.45 1,1V20c0,0.55 -0.45,1 -1,1 -9.39,0 -17,-7.61 -17,-17 0,-0.55 0.45,-1 1,-1h3.5c0.55,0 1,0.45 1,1 0,1.25 0.2,2.45 0.57,3.57 0.11,0.35 0.03,0.74 -0.25,1.02l-2.2,2.2z" />
-</vector>
+<!--
+  ~ Copyright (C) 2019 Moez Bhatti <moez.bhatti@gmail.com>
+  ~
+  ~ This file is part of QKSMS.
+  ~
+  ~ QKSMS is free software: you can redistribute it and/or modify
+  ~ it under the terms of the GNU General Public License as published by
+  ~ the Free Software Foundation, either version 3 of the License, or
+  ~ (at your option) any later version.
+  ~
+  ~ QKSMS is distributed in the hope that it will be useful,
+  ~ but WITHOUT ANY WARRANTY; without even the implied warranty of
+  ~ MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+  ~ GNU General Public License for more details.
+  ~
+  ~ You should have received a copy of the GNU General Public License
+  ~ along with QKSMS.  If not, see <http://www.gnu.org/licenses/>.
+  -->
+<vector xmlns:android="http://schemas.android.com/apk/res/android"
+    android:width="24dp"
+    android:height="24dp"
+    android:viewportWidth="24.0"
+    android:viewportHeight="24.0">
+    <path
+        android:fillColor="#FFF"
+        android:pathData="M6.62,10.79c1.44,2.83 3.76,5.14 6.59,6.59l2.2,-2.2c0.27,-0.27 0.67,-0.36 1.02,-0.24 1.12,0.37 2.33,0.57 3.57,0.57 0.55,0 1,0.45 1,1V20c0,0.55 -0.45,1 -1,1 -9.39,0 -17,-7.61 -17,-17 0,-0.55 0.45,-1 1,-1h3.5c0.55,0 1,0.45 1,1 0,1.25 0.2,2.45 0.57,3.57 0.11,0.35 0.03,0.74 -0.25,1.02l-2.2,2.2z" />
+</vector>
diff --git a/presentation/src/main/res/drawable/ic_camera_alt_black_24dp.xml b/presentation/src/main/res/drawable/ic_camera_alt_black_24dp.xml
index 4f84c3c74..283fd6b39 100644
--- a/presentation/src/main/res/drawable/ic_camera_alt_black_24dp.xml
+++ b/presentation/src/main/res/drawable/ic_camera_alt_black_24dp.xml
@@ -1,30 +1,30 @@
-<!--
-  ~ Copyright (C) 2019 Moez Bhatti <moez.bhatti@gmail.com>
-  ~
-  ~ This file is part of QKSMS.
-  ~
-  ~ QKSMS is free software: you can redistribute it and/or modify
-  ~ it under the terms of the GNU General Public License as published by
-  ~ the Free Software Foundation, either version 3 of the License, or
-  ~ (at your option) any later version.
-  ~
-  ~ QKSMS is distributed in the hope that it will be useful,
-  ~ but WITHOUT ANY WARRANTY; without even the implied warranty of
-  ~ MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
-  ~ GNU General Public License for more details.
-  ~
-  ~ You should have received a copy of the GNU General Public License
-  ~ along with QKSMS.  If not, see <http://www.gnu.org/licenses/>.
-  -->
-<vector xmlns:android="http://schemas.android.com/apk/res/android"
-    android:width="24dp"
-    android:height="24dp"
-    android:viewportWidth="24.0"
-    android:viewportHeight="24.0">
-    <path
-        android:fillColor="#FF000000"
-        android:pathData="M12,12m-3.2,0a3.2,3.2 0,1 1,6.4 0a3.2,3.2 0,1 1,-6.4 0" />
-    <path
-        android:fillColor="#FF000000"
-        android:pathData="M9,2L7.17,4L4,4c-1.1,0 -2,0.9 -2,2v12c0,1.1 0.9,2 2,2h16c1.1,0 2,-0.9 2,-2L22,6c0,-1.1 -0.9,-2 -2,-2h-3.17L15,2L9,2zM12,17c-2.76,0 -5,-2.24 -5,-5s2.24,-5 5,-5 5,2.24 5,5 -2.24,5 -5,5z" />
-</vector>
+<!--
+  ~ Copyright (C) 2019 Moez Bhatti <moez.bhatti@gmail.com>
+  ~
+  ~ This file is part of QKSMS.
+  ~
+  ~ QKSMS is free software: you can redistribute it and/or modify
+  ~ it under the terms of the GNU General Public License as published by
+  ~ the Free Software Foundation, either version 3 of the License, or
+  ~ (at your option) any later version.
+  ~
+  ~ QKSMS is distributed in the hope that it will be useful,
+  ~ but WITHOUT ANY WARRANTY; without even the implied warranty of
+  ~ MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+  ~ GNU General Public License for more details.
+  ~
+  ~ You should have received a copy of the GNU General Public License
+  ~ along with QKSMS.  If not, see <http://www.gnu.org/licenses/>.
+  -->
+<vector xmlns:android="http://schemas.android.com/apk/res/android"
+    android:width="24dp"
+    android:height="24dp"
+    android:viewportWidth="24.0"
+    android:viewportHeight="24.0">
+    <path
+        android:fillColor="#FF000000"
+        android:pathData="M12,12m-3.2,0a3.2,3.2 0,1 1,6.4 0a3.2,3.2 0,1 1,-6.4 0" />
+    <path
+        android:fillColor="#FF000000"
+        android:pathData="M9,2L7.17,4L4,4c-1.1,0 -2,0.9 -2,2v12c0,1.1 0.9,2 2,2h16c1.1,0 2,-0.9 2,-2L22,6c0,-1.1 -0.9,-2 -2,-2h-3.17L15,2L9,2zM12,17c-2.76,0 -5,-2.24 -5,-5s2.24,-5 5,-5 5,2.24 5,5 -2.24,5 -5,5z" />
+</vector>
diff --git a/presentation/src/main/res/drawable/ic_cancel_black_24dp.xml b/presentation/src/main/res/drawable/ic_cancel_black_24dp.xml
index b05db58dd..af5cbd283 100755
--- a/presentation/src/main/res/drawable/ic_cancel_black_24dp.xml
+++ b/presentation/src/main/res/drawable/ic_cancel_black_24dp.xml
@@ -1,27 +1,27 @@
-<!--
-  ~ Copyright (C) 2019 Moez Bhatti <moez.bhatti@gmail.com>
-  ~
-  ~ This file is part of QKSMS.
-  ~
-  ~ QKSMS is free software: you can redistribute it and/or modify
-  ~ it under the terms of the GNU General Public License as published by
-  ~ the Free Software Foundation, either version 3 of the License, or
-  ~ (at your option) any later version.
-  ~
-  ~ QKSMS is distributed in the hope that it will be useful,
-  ~ but WITHOUT ANY WARRANTY; without even the implied warranty of
-  ~ MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
-  ~ GNU General Public License for more details.
-  ~
-  ~ You should have received a copy of the GNU General Public License
-  ~ along with QKSMS.  If not, see <http://www.gnu.org/licenses/>.
-  -->
-<vector xmlns:android="http://schemas.android.com/apk/res/android"
-    android:width="24dp"
-    android:height="24dp"
-    android:viewportWidth="24.0"
-    android:viewportHeight="24.0">
-    <path
-        android:fillColor="#000"
-        android:pathData="M12,2C6.47,2 2,6.47 2,12s4.47,10 10,10 10,-4.47 10,-10S17.53,2 12,2zM17,15.59L15.59,17 12,13.41 8.41,17 7,15.59 10.59,12 7,8.41 8.41,7 12,10.59 15.59,7 17,8.41 13.41,12 17,15.59z" />
-</vector>
+<!--
+  ~ Copyright (C) 2019 Moez Bhatti <moez.bhatti@gmail.com>
+  ~
+  ~ This file is part of QKSMS.
+  ~
+  ~ QKSMS is free software: you can redistribute it and/or modify
+  ~ it under the terms of the GNU General Public License as published by
+  ~ the Free Software Foundation, either version 3 of the License, or
+  ~ (at your option) any later version.
+  ~
+  ~ QKSMS is distributed in the hope that it will be useful,
+  ~ but WITHOUT ANY WARRANTY; without even the implied warranty of
+  ~ MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+  ~ GNU General Public License for more details.
+  ~
+  ~ You should have received a copy of the GNU General Public License
+  ~ along with QKSMS.  If not, see <http://www.gnu.org/licenses/>.
+  -->
+<vector xmlns:android="http://schemas.android.com/apk/res/android"
+    android:width="24dp"
+    android:height="24dp"
+    android:viewportWidth="24.0"
+    android:viewportHeight="24.0">
+    <path
+        android:fillColor="#000"
+        android:pathData="M12,2C6.47,2 2,6.47 2,12s4.47,10 10,10 10,-4.47 10,-10S17.53,2 12,2zM17,15.59L15.59,17 12,13.41 8.41,17 7,15.59 10.59,12 7,8.41 8.41,7 12,10.59 15.59,7 17,8.41 13.41,12 17,15.59z" />
+</vector>
diff --git a/presentation/src/main/res/drawable/ic_check_white_24dp.xml b/presentation/src/main/res/drawable/ic_check_white_24dp.xml
index ef211c1f1..f02528273 100644
--- a/presentation/src/main/res/drawable/ic_check_white_24dp.xml
+++ b/presentation/src/main/res/drawable/ic_check_white_24dp.xml
@@ -1,27 +1,27 @@
-<!--
-  ~ Copyright (C) 2019 Moez Bhatti <moez.bhatti@gmail.com>
-  ~
-  ~ This file is part of QKSMS.
-  ~
-  ~ QKSMS is free software: you can redistribute it and/or modify
-  ~ it under the terms of the GNU General Public License as published by
-  ~ the Free Software Foundation, either version 3 of the License, or
-  ~ (at your option) any later version.
-  ~
-  ~ QKSMS is distributed in the hope that it will be useful,
-  ~ but WITHOUT ANY WARRANTY; without even the implied warranty of
-  ~ MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
-  ~ GNU General Public License for more details.
-  ~
-  ~ You should have received a copy of the GNU General Public License
-  ~ along with QKSMS.  If not, see <http://www.gnu.org/licenses/>.
-  -->
-<vector xmlns:android="http://schemas.android.com/apk/res/android"
-    android:width="24dp"
-    android:height="24dp"
-    android:viewportWidth="24.0"
-    android:viewportHeight="24.0">
-    <path
-        android:fillColor="#FFFFFFFF"
-        android:pathData="M9,16.17L4.83,12l-1.42,1.41L9,19 21,7l-1.41,-1.41z" />
-</vector>
+<!--
+  ~ Copyright (C) 2019 Moez Bhatti <moez.bhatti@gmail.com>
+  ~
+  ~ This file is part of QKSMS.
+  ~
+  ~ QKSMS is free software: you can redistribute it and/or modify
+  ~ it under the terms of the GNU General Public License as published by
+  ~ the Free Software Foundation, either version 3 of the License, or
+  ~ (at your option) any later version.
+  ~
+  ~ QKSMS is distributed in the hope that it will be useful,
+  ~ but WITHOUT ANY WARRANTY; without even the implied warranty of
+  ~ MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+  ~ GNU General Public License for more details.
+  ~
+  ~ You should have received a copy of the GNU General Public License
+  ~ along with QKSMS.  If not, see <http://www.gnu.org/licenses/>.
+  -->
+<vector xmlns:android="http://schemas.android.com/apk/res/android"
+    android:width="24dp"
+    android:height="24dp"
+    android:viewportWidth="24.0"
+    android:viewportHeight="24.0">
+    <path
+        android:fillColor="#FFFFFFFF"
+        android:pathData="M9,16.17L4.83,12l-1.42,1.41L9,19 21,7l-1.41,-1.41z" />
+</vector>
diff --git a/presentation/src/main/res/drawable/ic_chevron_right_black_24dp.xml b/presentation/src/main/res/drawable/ic_chevron_right_black_24dp.xml
index 2891855b5..c31cbf767 100644
--- a/presentation/src/main/res/drawable/ic_chevron_right_black_24dp.xml
+++ b/presentation/src/main/res/drawable/ic_chevron_right_black_24dp.xml
@@ -1,27 +1,27 @@
-<!--
-  ~ Copyright (C) 2019 Moez Bhatti <moez.bhatti@gmail.com>
-  ~
-  ~ This file is part of QKSMS.
-  ~
-  ~ QKSMS is free software: you can redistribute it and/or modify
-  ~ it under the terms of the GNU General Public License as published by
-  ~ the Free Software Foundation, either version 3 of the License, or
-  ~ (at your option) any later version.
-  ~
-  ~ QKSMS is distributed in the hope that it will be useful,
-  ~ but WITHOUT ANY WARRANTY; without even the implied warranty of
-  ~ MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
-  ~ GNU General Public License for more details.
-  ~
-  ~ You should have received a copy of the GNU General Public License
-  ~ along with QKSMS.  If not, see <http://www.gnu.org/licenses/>.
-  -->
-<vector xmlns:android="http://schemas.android.com/apk/res/android"
-    android:width="24dp"
-    android:height="24dp"
-    android:viewportWidth="24.0"
-    android:viewportHeight="24.0">
-    <path
-        android:fillColor="#FF000000"
-        android:pathData="M10,6L8.59,7.41 13.17,12l-4.58,4.59L10,18l6,-6z" />
-</vector>
+<!--
+  ~ Copyright (C) 2019 Moez Bhatti <moez.bhatti@gmail.com>
+  ~
+  ~ This file is part of QKSMS.
+  ~
+  ~ QKSMS is free software: you can redistribute it and/or modify
+  ~ it under the terms of the GNU General Public License as published by
+  ~ the Free Software Foundation, either version 3 of the License, or
+  ~ (at your option) any later version.
+  ~
+  ~ QKSMS is distributed in the hope that it will be useful,
+  ~ but WITHOUT ANY WARRANTY; without even the implied warranty of
+  ~ MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+  ~ GNU General Public License for more details.
+  ~
+  ~ You should have received a copy of the GNU General Public License
+  ~ along with QKSMS.  If not, see <http://www.gnu.org/licenses/>.
+  -->
+<vector xmlns:android="http://schemas.android.com/apk/res/android"
+    android:width="24dp"
+    android:height="24dp"
+    android:viewportWidth="24.0"
+    android:viewportHeight="24.0">
+    <path
+        android:fillColor="#FF000000"
+        android:pathData="M10,6L8.59,7.41 13.17,12l-4.58,4.59L10,18l6,-6z" />
+</vector>
diff --git a/presentation/src/main/res/drawable/ic_clear_all_black_24dp.xml b/presentation/src/main/res/drawable/ic_clear_all_black_24dp.xml
index a9c72ce6f..88aef4ebe 100644
--- a/presentation/src/main/res/drawable/ic_clear_all_black_24dp.xml
+++ b/presentation/src/main/res/drawable/ic_clear_all_black_24dp.xml
@@ -1,27 +1,27 @@
-<!--
-  ~ Copyright (C) 2019 Moez Bhatti <moez.bhatti@gmail.com>
-  ~
-  ~ This file is part of QKSMS.
-  ~
-  ~ QKSMS is free software: you can redistribute it and/or modify
-  ~ it under the terms of the GNU General Public License as published by
-  ~ the Free Software Foundation, either version 3 of the License, or
-  ~ (at your option) any later version.
-  ~
-  ~ QKSMS is distributed in the hope that it will be useful,
-  ~ but WITHOUT ANY WARRANTY; without even the implied warranty of
-  ~ MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
-  ~ GNU General Public License for more details.
-  ~
-  ~ You should have received a copy of the GNU General Public License
-  ~ along with QKSMS.  If not, see <http://www.gnu.org/licenses/>.
-  -->
-<vector xmlns:android="http://schemas.android.com/apk/res/android"
-    android:width="24dp"
-    android:height="24dp"
-    android:viewportWidth="24.0"
-    android:viewportHeight="24.0">
-    <path
-        android:fillColor="#FF000000"
-        android:pathData="M5,13h14v-2L5,11v2zM3,17h14v-2L3,15v2zM7,7v2h14L21,7L7,7z" />
-</vector>
+<!--
+  ~ Copyright (C) 2019 Moez Bhatti <moez.bhatti@gmail.com>
+  ~
+  ~ This file is part of QKSMS.
+  ~
+  ~ QKSMS is free software: you can redistribute it and/or modify
+  ~ it under the terms of the GNU General Public License as published by
+  ~ the Free Software Foundation, either version 3 of the License, or
+  ~ (at your option) any later version.
+  ~
+  ~ QKSMS is distributed in the hope that it will be useful,
+  ~ but WITHOUT ANY WARRANTY; without even the implied warranty of
+  ~ MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+  ~ GNU General Public License for more details.
+  ~
+  ~ You should have received a copy of the GNU General Public License
+  ~ along with QKSMS.  If not, see <http://www.gnu.org/licenses/>.
+  -->
+<vector xmlns:android="http://schemas.android.com/apk/res/android"
+    android:width="24dp"
+    android:height="24dp"
+    android:viewportWidth="24.0"
+    android:viewportHeight="24.0">
+    <path
+        android:fillColor="#FF000000"
+        android:pathData="M5,13h14v-2L5,11v2zM3,17h14v-2L3,15v2zM7,7v2h14L21,7L7,7z" />
+</vector>
diff --git a/presentation/src/main/res/drawable/ic_clear_black_24dp.xml b/presentation/src/main/res/drawable/ic_clear_black_24dp.xml
index 2ec0059a6..29d1cad99 100644
--- a/presentation/src/main/res/drawable/ic_clear_black_24dp.xml
+++ b/presentation/src/main/res/drawable/ic_clear_black_24dp.xml
@@ -1,27 +1,27 @@
-<!--
-  ~ Copyright (C) 2019 Moez Bhatti <moez.bhatti@gmail.com>
-  ~
-  ~ This file is part of QKSMS.
-  ~
-  ~ QKSMS is free software: you can redistribute it and/or modify
-  ~ it under the terms of the GNU General Public License as published by
-  ~ the Free Software Foundation, either version 3 of the License, or
-  ~ (at your option) any later version.
-  ~
-  ~ QKSMS is distributed in the hope that it will be useful,
-  ~ but WITHOUT ANY WARRANTY; without even the implied warranty of
-  ~ MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
-  ~ GNU General Public License for more details.
-  ~
-  ~ You should have received a copy of the GNU General Public License
-  ~ along with QKSMS.  If not, see <http://www.gnu.org/licenses/>.
-  -->
-<vector xmlns:android="http://schemas.android.com/apk/res/android"
-    android:width="24dp"
-    android:height="24dp"
-    android:viewportWidth="24.0"
-    android:viewportHeight="24.0">
-    <path
-        android:fillColor="#FF000000"
-        android:pathData="M19,6.41L17.59,5 12,10.59 6.41,5 5,6.41 10.59,12 5,17.59 6.41,19 12,13.41 17.59,19 19,17.59 13.41,12z" />
-</vector>
+<!--
+  ~ Copyright (C) 2019 Moez Bhatti <moez.bhatti@gmail.com>
+  ~
+  ~ This file is part of QKSMS.
+  ~
+  ~ QKSMS is free software: you can redistribute it and/or modify
+  ~ it under the terms of the GNU General Public License as published by
+  ~ the Free Software Foundation, either version 3 of the License, or
+  ~ (at your option) any later version.
+  ~
+  ~ QKSMS is distributed in the hope that it will be useful,
+  ~ but WITHOUT ANY WARRANTY; without even the implied warranty of
+  ~ MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+  ~ GNU General Public License for more details.
+  ~
+  ~ You should have received a copy of the GNU General Public License
+  ~ along with QKSMS.  If not, see <http://www.gnu.org/licenses/>.
+  -->
+<vector xmlns:android="http://schemas.android.com/apk/res/android"
+    android:width="24dp"
+    android:height="24dp"
+    android:viewportWidth="24.0"
+    android:viewportHeight="24.0">
+    <path
+        android:fillColor="#FF000000"
+        android:pathData="M19,6.41L17.59,5 12,10.59 6.41,5 5,6.41 10.59,12 5,17.59 6.41,19 12,13.41 17.59,19 19,17.59 13.41,12z" />
+</vector>
diff --git a/presentation/src/main/res/drawable/ic_close_black_24dp.xml b/presentation/src/main/res/drawable/ic_close_black_24dp.xml
index 2ec0059a6..29d1cad99 100644
--- a/presentation/src/main/res/drawable/ic_close_black_24dp.xml
+++ b/presentation/src/main/res/drawable/ic_close_black_24dp.xml
@@ -1,27 +1,27 @@
-<!--
-  ~ Copyright (C) 2019 Moez Bhatti <moez.bhatti@gmail.com>
-  ~
-  ~ This file is part of QKSMS.
-  ~
-  ~ QKSMS is free software: you can redistribute it and/or modify
-  ~ it under the terms of the GNU General Public License as published by
-  ~ the Free Software Foundation, either version 3 of the License, or
-  ~ (at your option) any later version.
-  ~
-  ~ QKSMS is distributed in the hope that it will be useful,
-  ~ but WITHOUT ANY WARRANTY; without even the implied warranty of
-  ~ MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
-  ~ GNU General Public License for more details.
-  ~
-  ~ You should have received a copy of the GNU General Public License
-  ~ along with QKSMS.  If not, see <http://www.gnu.org/licenses/>.
-  -->
-<vector xmlns:android="http://schemas.android.com/apk/res/android"
-    android:width="24dp"
-    android:height="24dp"
-    android:viewportWidth="24.0"
-    android:viewportHeight="24.0">
-    <path
-        android:fillColor="#FF000000"
-        android:pathData="M19,6.41L17.59,5 12,10.59 6.41,5 5,6.41 10.59,12 5,17.59 6.41,19 12,13.41 17.59,19 19,17.59 13.41,12z" />
-</vector>
+<!--
+  ~ Copyright (C) 2019 Moez Bhatti <moez.bhatti@gmail.com>
+  ~
+  ~ This file is part of QKSMS.
+  ~
+  ~ QKSMS is free software: you can redistribute it and/or modify
+  ~ it under the terms of the GNU General Public License as published by
+  ~ the Free Software Foundation, either version 3 of the License, or
+  ~ (at your option) any later version.
+  ~
+  ~ QKSMS is distributed in the hope that it will be useful,
+  ~ but WITHOUT ANY WARRANTY; without even the implied warranty of
+  ~ MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+  ~ GNU General Public License for more details.
+  ~
+  ~ You should have received a copy of the GNU General Public License
+  ~ along with QKSMS.  If not, see <http://www.gnu.org/licenses/>.
+  -->
+<vector xmlns:android="http://schemas.android.com/apk/res/android"
+    android:width="24dp"
+    android:height="24dp"
+    android:viewportWidth="24.0"
+    android:viewportHeight="24.0">
+    <path
+        android:fillColor="#FF000000"
+        android:pathData="M19,6.41L17.59,5 12,10.59 6.41,5 5,6.41 10.59,12 5,17.59 6.41,19 12,13.41 17.59,19 19,17.59 13.41,12z" />
+</vector>
diff --git a/presentation/src/main/res/drawable/ic_color_lens_black_24dp.xml b/presentation/src/main/res/drawable/ic_color_lens_black_24dp.xml
index 2979b3a06..4cc5d02d2 100644
--- a/presentation/src/main/res/drawable/ic_color_lens_black_24dp.xml
+++ b/presentation/src/main/res/drawable/ic_color_lens_black_24dp.xml
@@ -1,27 +1,27 @@
-<!--
-  ~ Copyright (C) 2019 Moez Bhatti <moez.bhatti@gmail.com>
-  ~
-  ~ This file is part of QKSMS.
-  ~
-  ~ QKSMS is free software: you can redistribute it and/or modify
-  ~ it under the terms of the GNU General Public License as published by
-  ~ the Free Software Foundation, either version 3 of the License, or
-  ~ (at your option) any later version.
-  ~
-  ~ QKSMS is distributed in the hope that it will be useful,
-  ~ but WITHOUT ANY WARRANTY; without even the implied warranty of
-  ~ MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
-  ~ GNU General Public License for more details.
-  ~
-  ~ You should have received a copy of the GNU General Public License
-  ~ along with QKSMS.  If not, see <http://www.gnu.org/licenses/>.
-  -->
-<vector xmlns:android="http://schemas.android.com/apk/res/android"
-    android:width="24dp"
-    android:height="24dp"
-    android:viewportWidth="24.0"
-    android:viewportHeight="24.0">
-    <path
-        android:fillColor="#FF000000"
-        android:pathData="M12,3c-4.97,0 -9,4.03 -9,9s4.03,9 9,9c0.83,0 1.5,-0.67 1.5,-1.5 0,-0.39 -0.15,-0.74 -0.39,-1.01 -0.23,-0.26 -0.38,-0.61 -0.38,-0.99 0,-0.83 0.67,-1.5 1.5,-1.5L16,16c2.76,0 5,-2.24 5,-5 0,-4.42 -4.03,-8 -9,-8zM6.5,12c-0.83,0 -1.5,-0.67 -1.5,-1.5S5.67,9 6.5,9 8,9.67 8,10.5 7.33,12 6.5,12zM9.5,8C8.67,8 8,7.33 8,6.5S8.67,5 9.5,5s1.5,0.67 1.5,1.5S10.33,8 9.5,8zM14.5,8c-0.83,0 -1.5,-0.67 -1.5,-1.5S13.67,5 14.5,5s1.5,0.67 1.5,1.5S15.33,8 14.5,8zM17.5,12c-0.83,0 -1.5,-0.67 -1.5,-1.5S16.67,9 17.5,9s1.5,0.67 1.5,1.5 -0.67,1.5 -1.5,1.5z" />
-</vector>
+<!--
+  ~ Copyright (C) 2019 Moez Bhatti <moez.bhatti@gmail.com>
+  ~
+  ~ This file is part of QKSMS.
+  ~
+  ~ QKSMS is free software: you can redistribute it and/or modify
+  ~ it under the terms of the GNU General Public License as published by
+  ~ the Free Software Foundation, either version 3 of the License, or
+  ~ (at your option) any later version.
+  ~
+  ~ QKSMS is distributed in the hope that it will be useful,
+  ~ but WITHOUT ANY WARRANTY; without even the implied warranty of
+  ~ MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+  ~ GNU General Public License for more details.
+  ~
+  ~ You should have received a copy of the GNU General Public License
+  ~ along with QKSMS.  If not, see <http://www.gnu.org/licenses/>.
+  -->
+<vector xmlns:android="http://schemas.android.com/apk/res/android"
+    android:width="24dp"
+    android:height="24dp"
+    android:viewportWidth="24.0"
+    android:viewportHeight="24.0">
+    <path
+        android:fillColor="#FF000000"
+        android:pathData="M12,3c-4.97,0 -9,4.03 -9,9s4.03,9 9,9c0.83,0 1.5,-0.67 1.5,-1.5 0,-0.39 -0.15,-0.74 -0.39,-1.01 -0.23,-0.26 -0.38,-0.61 -0.38,-0.99 0,-0.83 0.67,-1.5 1.5,-1.5L16,16c2.76,0 5,-2.24 5,-5 0,-4.42 -4.03,-8 -9,-8zM6.5,12c-0.83,0 -1.5,-0.67 -1.5,-1.5S5.67,9 6.5,9 8,9.67 8,10.5 7.33,12 6.5,12zM9.5,8C8.67,8 8,7.33 8,6.5S8.67,5 9.5,5s1.5,0.67 1.5,1.5S10.33,8 9.5,8zM14.5,8c-0.83,0 -1.5,-0.67 -1.5,-1.5S13.67,5 14.5,5s1.5,0.67 1.5,1.5S15.33,8 14.5,8zM17.5,12c-0.83,0 -1.5,-0.67 -1.5,-1.5S16.67,9 17.5,9s1.5,0.67 1.5,1.5 -0.67,1.5 -1.5,1.5z" />
+</vector>
diff --git a/presentation/src/main/res/drawable/ic_content_copy_black_24dp.xml b/presentation/src/main/res/drawable/ic_content_copy_black_24dp.xml
index c4fa4e0c2..de51631ff 100644
--- a/presentation/src/main/res/drawable/ic_content_copy_black_24dp.xml
+++ b/presentation/src/main/res/drawable/ic_content_copy_black_24dp.xml
@@ -1,27 +1,27 @@
-<!--
-  ~ Copyright (C) 2019 Moez Bhatti <moez.bhatti@gmail.com>
-  ~
-  ~ This file is part of QKSMS.
-  ~
-  ~ QKSMS is free software: you can redistribute it and/or modify
-  ~ it under the terms of the GNU General Public License as published by
-  ~ the Free Software Foundation, either version 3 of the License, or
-  ~ (at your option) any later version.
-  ~
-  ~ QKSMS is distributed in the hope that it will be useful,
-  ~ but WITHOUT ANY WARRANTY; without even the implied warranty of
-  ~ MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
-  ~ GNU General Public License for more details.
-  ~
-  ~ You should have received a copy of the GNU General Public License
-  ~ along with QKSMS.  If not, see <http://www.gnu.org/licenses/>.
-  -->
-<vector xmlns:android="http://schemas.android.com/apk/res/android"
-    android:width="24dp"
-    android:height="24dp"
-    android:viewportWidth="24.0"
-    android:viewportHeight="24.0">
-    <path
-        android:fillColor="#FF000000"
-        android:pathData="M16,1L4,1c-1.1,0 -2,0.9 -2,2v14h2L4,3h12L16,1zM19,5L8,5c-1.1,0 -2,0.9 -2,2v14c0,1.1 0.9,2 2,2h11c1.1,0 2,-0.9 2,-2L21,7c0,-1.1 -0.9,-2 -2,-2zM19,21L8,21L8,7h11v14z" />
-</vector>
+<!--
+  ~ Copyright (C) 2019 Moez Bhatti <moez.bhatti@gmail.com>
+  ~
+  ~ This file is part of QKSMS.
+  ~
+  ~ QKSMS is free software: you can redistribute it and/or modify
+  ~ it under the terms of the GNU General Public License as published by
+  ~ the Free Software Foundation, either version 3 of the License, or
+  ~ (at your option) any later version.
+  ~
+  ~ QKSMS is distributed in the hope that it will be useful,
+  ~ but WITHOUT ANY WARRANTY; without even the implied warranty of
+  ~ MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+  ~ GNU General Public License for more details.
+  ~
+  ~ You should have received a copy of the GNU General Public License
+  ~ along with QKSMS.  If not, see <http://www.gnu.org/licenses/>.
+  -->
+<vector xmlns:android="http://schemas.android.com/apk/res/android"
+    android:width="24dp"
+    android:height="24dp"
+    android:viewportWidth="24.0"
+    android:viewportHeight="24.0">
+    <path
+        android:fillColor="#FF000000"
+        android:pathData="M16,1L4,1c-1.1,0 -2,0.9 -2,2v14h2L4,3h12L16,1zM19,5L8,5c-1.1,0 -2,0.9 -2,2v14c0,1.1 0.9,2 2,2h11c1.1,0 2,-0.9 2,-2L21,7c0,-1.1 -0.9,-2 -2,-2zM19,21L8,21L8,7h11v14z" />
+</vector>
diff --git a/presentation/src/main/res/drawable/ic_delete_white_24dp.xml b/presentation/src/main/res/drawable/ic_delete_white_24dp.xml
index ca0a7d594..6ff537f1f 100644
--- a/presentation/src/main/res/drawable/ic_delete_white_24dp.xml
+++ b/presentation/src/main/res/drawable/ic_delete_white_24dp.xml
@@ -1,27 +1,27 @@
-<!--
-  ~ Copyright (C) 2019 Moez Bhatti <moez.bhatti@gmail.com>
-  ~
-  ~ This file is part of QKSMS.
-  ~
-  ~ QKSMS is free software: you can redistribute it and/or modify
-  ~ it under the terms of the GNU General Public License as published by
-  ~ the Free Software Foundation, either version 3 of the License, or
-  ~ (at your option) any later version.
-  ~
-  ~ QKSMS is distributed in the hope that it will be useful,
-  ~ but WITHOUT ANY WARRANTY; without even the implied warranty of
-  ~ MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
-  ~ GNU General Public License for more details.
-  ~
-  ~ You should have received a copy of the GNU General Public License
-  ~ along with QKSMS.  If not, see <http://www.gnu.org/licenses/>.
-  -->
-<vector xmlns:android="http://schemas.android.com/apk/res/android"
-    android:width="24dp"
-    android:height="24dp"
-    android:viewportWidth="24.0"
-    android:viewportHeight="24.0">
-    <path
-        android:fillColor="#FFF"
-        android:pathData="M6,19c0,1.1 0.9,2 2,2h8c1.1,0 2,-0.9 2,-2V7H6v12zM19,4h-3.5l-1,-1h-5l-1,1H5v2h14V4z" />
-</vector>
+<!--
+  ~ Copyright (C) 2019 Moez Bhatti <moez.bhatti@gmail.com>
+  ~
+  ~ This file is part of QKSMS.
+  ~
+  ~ QKSMS is free software: you can redistribute it and/or modify
+  ~ it under the terms of the GNU General Public License as published by
+  ~ the Free Software Foundation, either version 3 of the License, or
+  ~ (at your option) any later version.
+  ~
+  ~ QKSMS is distributed in the hope that it will be useful,
+  ~ but WITHOUT ANY WARRANTY; without even the implied warranty of
+  ~ MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+  ~ GNU General Public License for more details.
+  ~
+  ~ You should have received a copy of the GNU General Public License
+  ~ along with QKSMS.  If not, see <http://www.gnu.org/licenses/>.
+  -->
+<vector xmlns:android="http://schemas.android.com/apk/res/android"
+    android:width="24dp"
+    android:height="24dp"
+    android:viewportWidth="24.0"
+    android:viewportHeight="24.0">
+    <path
+        android:fillColor="#FFF"
+        android:pathData="M6,19c0,1.1 0.9,2 2,2h8c1.1,0 2,-0.9 2,-2V7H6v12zM19,4h-3.5l-1,-1h-5l-1,1H5v2h14V4z" />
+</vector>
diff --git a/presentation/src/main/res/drawable/ic_drafts_black_24dp.xml b/presentation/src/main/res/drawable/ic_drafts_black_24dp.xml
index c945e2f24..bae43d600 100644
--- a/presentation/src/main/res/drawable/ic_drafts_black_24dp.xml
+++ b/presentation/src/main/res/drawable/ic_drafts_black_24dp.xml
@@ -1,27 +1,27 @@
-<!--
-  ~ Copyright (C) 2019 Moez Bhatti <moez.bhatti@gmail.com>
-  ~
-  ~ This file is part of QKSMS.
-  ~
-  ~ QKSMS is free software: you can redistribute it and/or modify
-  ~ it under the terms of the GNU General Public License as published by
-  ~ the Free Software Foundation, either version 3 of the License, or
-  ~ (at your option) any later version.
-  ~
-  ~ QKSMS is distributed in the hope that it will be useful,
-  ~ but WITHOUT ANY WARRANTY; without even the implied warranty of
-  ~ MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
-  ~ GNU General Public License for more details.
-  ~
-  ~ You should have received a copy of the GNU General Public License
-  ~ along with QKSMS.  If not, see <http://www.gnu.org/licenses/>.
-  -->
-<vector xmlns:android="http://schemas.android.com/apk/res/android"
-    android:width="24dp"
-    android:height="24dp"
-    android:viewportWidth="24.0"
-    android:viewportHeight="24.0">
-    <path
-        android:fillColor="#FF000000"
-        android:pathData="M21.99,8c0,-0.72 -0.37,-1.35 -0.94,-1.7L12,1 2.95,6.3C2.38,6.65 2,7.28 2,8v10c0,1.1 0.9,2 2,2h16c1.1,0 2,-0.9 2,-2l-0.01,-10zM12,13L3.74,7.84 12,3l8.26,4.84L12,13z" />
-</vector>
+<!--
+  ~ Copyright (C) 2019 Moez Bhatti <moez.bhatti@gmail.com>
+  ~
+  ~ This file is part of QKSMS.
+  ~
+  ~ QKSMS is free software: you can redistribute it and/or modify
+  ~ it under the terms of the GNU General Public License as published by
+  ~ the Free Software Foundation, either version 3 of the License, or
+  ~ (at your option) any later version.
+  ~
+  ~ QKSMS is distributed in the hope that it will be useful,
+  ~ but WITHOUT ANY WARRANTY; without even the implied warranty of
+  ~ MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+  ~ GNU General Public License for more details.
+  ~
+  ~ You should have received a copy of the GNU General Public License
+  ~ along with QKSMS.  If not, see <http://www.gnu.org/licenses/>.
+  -->
+<vector xmlns:android="http://schemas.android.com/apk/res/android"
+    android:width="24dp"
+    android:height="24dp"
+    android:viewportWidth="24.0"
+    android:viewportHeight="24.0">
+    <path
+        android:fillColor="#FF000000"
+        android:pathData="M21.99,8c0,-0.72 -0.37,-1.35 -0.94,-1.7L12,1 2.95,6.3C2.38,6.65 2,7.28 2,8v10c0,1.1 0.9,2 2,2h16c1.1,0 2,-0.9 2,-2l-0.01,-10zM12,13L3.74,7.84 12,3l8.26,4.84L12,13z" />
+</vector>
diff --git a/presentation/src/main/res/drawable/ic_event_black_24dp.xml b/presentation/src/main/res/drawable/ic_event_black_24dp.xml
index b39e17542..f4698e5a5 100644
--- a/presentation/src/main/res/drawable/ic_event_black_24dp.xml
+++ b/presentation/src/main/res/drawable/ic_event_black_24dp.xml
@@ -1,27 +1,27 @@
-<!--
-  ~ Copyright (C) 2019 Moez Bhatti <moez.bhatti@gmail.com>
-  ~
-  ~ This file is part of QKSMS.
-  ~
-  ~ QKSMS is free software: you can redistribute it and/or modify
-  ~ it under the terms of the GNU General Public License as published by
-  ~ the Free Software Foundation, either version 3 of the License, or
-  ~ (at your option) any later version.
-  ~
-  ~ QKSMS is distributed in the hope that it will be useful,
-  ~ but WITHOUT ANY WARRANTY; without even the implied warranty of
-  ~ MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
-  ~ GNU General Public License for more details.
-  ~
-  ~ You should have received a copy of the GNU General Public License
-  ~ along with QKSMS.  If not, see <http://www.gnu.org/licenses/>.
-  -->
-<vector xmlns:android="http://schemas.android.com/apk/res/android"
-    android:width="24dp"
-    android:height="24dp"
-    android:viewportWidth="24.0"
-    android:viewportHeight="24.0">
-    <path
-        android:fillColor="#FF000000"
-        android:pathData="M17,12h-5v5h5v-5zM16,1v2L8,3L8,1L6,1v2L5,3c-1.11,0 -1.99,0.9 -1.99,2L3,19c0,1.1 0.89,2 2,2h14c1.1,0 2,-0.9 2,-2L21,5c0,-1.1 -0.9,-2 -2,-2h-1L18,1h-2zM19,19L5,19L5,8h14v11z" />
-</vector>
+<!--
+  ~ Copyright (C) 2019 Moez Bhatti <moez.bhatti@gmail.com>
+  ~
+  ~ This file is part of QKSMS.
+  ~
+  ~ QKSMS is free software: you can redistribute it and/or modify
+  ~ it under the terms of the GNU General Public License as published by
+  ~ the Free Software Foundation, either version 3 of the License, or
+  ~ (at your option) any later version.
+  ~
+  ~ QKSMS is distributed in the hope that it will be useful,
+  ~ but WITHOUT ANY WARRANTY; without even the implied warranty of
+  ~ MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+  ~ GNU General Public License for more details.
+  ~
+  ~ You should have received a copy of the GNU General Public License
+  ~ along with QKSMS.  If not, see <http://www.gnu.org/licenses/>.
+  -->
+<vector xmlns:android="http://schemas.android.com/apk/res/android"
+    android:width="24dp"
+    android:height="24dp"
+    android:viewportWidth="24.0"
+    android:viewportHeight="24.0">
+    <path
+        android:fillColor="#FF000000"
+        android:pathData="M17,12h-5v5h5v-5zM16,1v2L8,3L8,1L6,1v2L5,3c-1.11,0 -1.99,0.9 -1.99,2L3,19c0,1.1 0.89,2 2,2h14c1.1,0 2,-0.9 2,-2L21,5c0,-1.1 -0.9,-2 -2,-2h-1L18,1h-2zM19,19L5,19L5,8h14v11z" />
+</vector>
diff --git a/presentation/src/main/res/drawable/ic_favorite_black_24dp.xml b/presentation/src/main/res/drawable/ic_favorite_black_24dp.xml
index f66dbb9f9..f7d0b6fc2 100644
--- a/presentation/src/main/res/drawable/ic_favorite_black_24dp.xml
+++ b/presentation/src/main/res/drawable/ic_favorite_black_24dp.xml
@@ -1,27 +1,27 @@
-<!--
-  ~ Copyright (C) 2019 Moez Bhatti <moez.bhatti@gmail.com>
-  ~
-  ~ This file is part of QKSMS.
-  ~
-  ~ QKSMS is free software: you can redistribute it and/or modify
-  ~ it under the terms of the GNU General Public License as published by
-  ~ the Free Software Foundation, either version 3 of the License, or
-  ~ (at your option) any later version.
-  ~
-  ~ QKSMS is distributed in the hope that it will be useful,
-  ~ but WITHOUT ANY WARRANTY; without even the implied warranty of
-  ~ MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
-  ~ GNU General Public License for more details.
-  ~
-  ~ You should have received a copy of the GNU General Public License
-  ~ along with QKSMS.  If not, see <http://www.gnu.org/licenses/>.
-  -->
-<vector xmlns:android="http://schemas.android.com/apk/res/android"
-    android:width="24dp"
-    android:height="24dp"
-    android:viewportWidth="24.0"
-    android:viewportHeight="24.0">
-    <path
-        android:fillColor="#FF000000"
-        android:pathData="M12,21.35l-1.45,-1.32C5.4,15.36 2,12.28 2,8.5 2,5.42 4.42,3 7.5,3c1.74,0 3.41,0.81 4.5,2.09C13.09,3.81 14.76,3 16.5,3 19.58,3 22,5.42 22,8.5c0,3.78 -3.4,6.86 -8.55,11.54L12,21.35z" />
-</vector>
+<!--
+  ~ Copyright (C) 2019 Moez Bhatti <moez.bhatti@gmail.com>
+  ~
+  ~ This file is part of QKSMS.
+  ~
+  ~ QKSMS is free software: you can redistribute it and/or modify
+  ~ it under the terms of the GNU General Public License as published by
+  ~ the Free Software Foundation, either version 3 of the License, or
+  ~ (at your option) any later version.
+  ~
+  ~ QKSMS is distributed in the hope that it will be useful,
+  ~ but WITHOUT ANY WARRANTY; without even the implied warranty of
+  ~ MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+  ~ GNU General Public License for more details.
+  ~
+  ~ You should have received a copy of the GNU General Public License
+  ~ along with QKSMS.  If not, see <http://www.gnu.org/licenses/>.
+  -->
+<vector xmlns:android="http://schemas.android.com/apk/res/android"
+    android:width="24dp"
+    android:height="24dp"
+    android:viewportWidth="24.0"
+    android:viewportHeight="24.0">
+    <path
+        android:fillColor="#FF000000"
+        android:pathData="M12,21.35l-1.45,-1.32C5.4,15.36 2,12.28 2,8.5 2,5.42 4.42,3 7.5,3c1.74,0 3.41,0.81 4.5,2.09C13.09,3.81 14.76,3 16.5,3 19.58,3 22,5.42 22,8.5c0,3.78 -3.4,6.86 -8.55,11.54L12,21.35z" />
+</vector>
diff --git a/presentation/src/main/res/drawable/ic_file_download_black_24dp.xml b/presentation/src/main/res/drawable/ic_file_download_black_24dp.xml
index edc7894e0..0e99de7be 100644
--- a/presentation/src/main/res/drawable/ic_file_download_black_24dp.xml
+++ b/presentation/src/main/res/drawable/ic_file_download_black_24dp.xml
@@ -1,27 +1,27 @@
-<!--
-  ~ Copyright (C) 2019 Moez Bhatti <moez.bhatti@gmail.com>
-  ~
-  ~ This file is part of QKSMS.
-  ~
-  ~ QKSMS is free software: you can redistribute it and/or modify
-  ~ it under the terms of the GNU General Public License as published by
-  ~ the Free Software Foundation, either version 3 of the License, or
-  ~ (at your option) any later version.
-  ~
-  ~ QKSMS is distributed in the hope that it will be useful,
-  ~ but WITHOUT ANY WARRANTY; without even the implied warranty of
-  ~ MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
-  ~ GNU General Public License for more details.
-  ~
-  ~ You should have received a copy of the GNU General Public License
-  ~ along with QKSMS.  If not, see <http://www.gnu.org/licenses/>.
-  -->
-<vector xmlns:android="http://schemas.android.com/apk/res/android"
-    android:width="24dp"
-    android:height="24dp"
-    android:viewportWidth="24.0"
-    android:viewportHeight="24.0">
-    <path
-        android:fillColor="#FF000000"
-        android:pathData="M19,9h-4V3H9v6H5l7,7 7,-7zM5,18v2h14v-2H5z" />
-</vector>
+<!--
+  ~ Copyright (C) 2019 Moez Bhatti <moez.bhatti@gmail.com>
+  ~
+  ~ This file is part of QKSMS.
+  ~
+  ~ QKSMS is free software: you can redistribute it and/or modify
+  ~ it under the terms of the GNU General Public License as published by
+  ~ the Free Software Foundation, either version 3 of the License, or
+  ~ (at your option) any later version.
+  ~
+  ~ QKSMS is distributed in the hope that it will be useful,
+  ~ but WITHOUT ANY WARRANTY; without even the implied warranty of
+  ~ MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+  ~ GNU General Public License for more details.
+  ~
+  ~ You should have received a copy of the GNU General Public License
+  ~ along with QKSMS.  If not, see <http://www.gnu.org/licenses/>.
+  -->
+<vector xmlns:android="http://schemas.android.com/apk/res/android"
+    android:width="24dp"
+    android:height="24dp"
+    android:viewportWidth="24.0"
+    android:viewportHeight="24.0">
+    <path
+        android:fillColor="#FF000000"
+        android:pathData="M19,9h-4V3H9v6H5l7,7 7,-7zM5,18v2h14v-2H5z" />
+</vector>
diff --git a/presentation/src/main/res/drawable/ic_file_upload_black_24dp.xml b/presentation/src/main/res/drawable/ic_file_upload_black_24dp.xml
index 1e7ce2fa3..cf605fabd 100644
--- a/presentation/src/main/res/drawable/ic_file_upload_black_24dp.xml
+++ b/presentation/src/main/res/drawable/ic_file_upload_black_24dp.xml
@@ -1,27 +1,27 @@
-<!--
-  ~ Copyright (C) 2019 Moez Bhatti <moez.bhatti@gmail.com>
-  ~
-  ~ This file is part of QKSMS.
-  ~
-  ~ QKSMS is free software: you can redistribute it and/or modify
-  ~ it under the terms of the GNU General Public License as published by
-  ~ the Free Software Foundation, either version 3 of the License, or
-  ~ (at your option) any later version.
-  ~
-  ~ QKSMS is distributed in the hope that it will be useful,
-  ~ but WITHOUT ANY WARRANTY; without even the implied warranty of
-  ~ MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
-  ~ GNU General Public License for more details.
-  ~
-  ~ You should have received a copy of the GNU General Public License
-  ~ along with QKSMS.  If not, see <http://www.gnu.org/licenses/>.
-  -->
-<vector xmlns:android="http://schemas.android.com/apk/res/android"
-    android:width="24dp"
-    android:height="24dp"
-    android:viewportWidth="24.0"
-    android:viewportHeight="24.0">
-    <path
-        android:fillColor="#FF000000"
-        android:pathData="M9,16h6v-6h4l-7,-7 -7,7h4zM5,18h14v2L5,20z" />
-</vector>
+<!--
+  ~ Copyright (C) 2019 Moez Bhatti <moez.bhatti@gmail.com>
+  ~
+  ~ This file is part of QKSMS.
+  ~
+  ~ QKSMS is free software: you can redistribute it and/or modify
+  ~ it under the terms of the GNU General Public License as published by
+  ~ the Free Software Foundation, either version 3 of the License, or
+  ~ (at your option) any later version.
+  ~
+  ~ QKSMS is distributed in the hope that it will be useful,
+  ~ but WITHOUT ANY WARRANTY; without even the implied warranty of
+  ~ MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+  ~ GNU General Public License for more details.
+  ~
+  ~ You should have received a copy of the GNU General Public License
+  ~ along with QKSMS.  If not, see <http://www.gnu.org/licenses/>.
+  -->
+<vector xmlns:android="http://schemas.android.com/apk/res/android"
+    android:width="24dp"
+    android:height="24dp"
+    android:viewportWidth="24.0"
+    android:viewportHeight="24.0">
+    <path
+        android:fillColor="#FF000000"
+        android:pathData="M9,16h6v-6h4l-7,-7 -7,7h4zM5,18h14v2L5,20z" />
+</vector>
diff --git a/presentation/src/main/res/drawable/ic_format_size_black_24dp.xml b/presentation/src/main/res/drawable/ic_format_size_black_24dp.xml
index 82c4792ac..0dca59db4 100644
--- a/presentation/src/main/res/drawable/ic_format_size_black_24dp.xml
+++ b/presentation/src/main/res/drawable/ic_format_size_black_24dp.xml
@@ -1,27 +1,27 @@
-<!--
-  ~ Copyright (C) 2019 Moez Bhatti <moez.bhatti@gmail.com>
-  ~
-  ~ This file is part of QKSMS.
-  ~
-  ~ QKSMS is free software: you can redistribute it and/or modify
-  ~ it under the terms of the GNU General Public License as published by
-  ~ the Free Software Foundation, either version 3 of the License, or
-  ~ (at your option) any later version.
-  ~
-  ~ QKSMS is distributed in the hope that it will be useful,
-  ~ but WITHOUT ANY WARRANTY; without even the implied warranty of
-  ~ MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
-  ~ GNU General Public License for more details.
-  ~
-  ~ You should have received a copy of the GNU General Public License
-  ~ along with QKSMS.  If not, see <http://www.gnu.org/licenses/>.
-  -->
-<vector xmlns:android="http://schemas.android.com/apk/res/android"
-    android:width="24dp"
-    android:height="24dp"
-    android:viewportWidth="24.0"
-    android:viewportHeight="24.0">
-    <path
-        android:fillColor="#FF000000"
-        android:pathData="M9,4v3h5v12h3L17,7h5L22,4L9,4zM3,12h3v7h3v-7h3L12,9L3,9v3z" />
-</vector>
+<!--
+  ~ Copyright (C) 2019 Moez Bhatti <moez.bhatti@gmail.com>
+  ~
+  ~ This file is part of QKSMS.
+  ~
+  ~ QKSMS is free software: you can redistribute it and/or modify
+  ~ it under the terms of the GNU General Public License as published by
+  ~ the Free Software Foundation, either version 3 of the License, or
+  ~ (at your option) any later version.
+  ~
+  ~ QKSMS is distributed in the hope that it will be useful,
+  ~ but WITHOUT ANY WARRANTY; without even the implied warranty of
+  ~ MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+  ~ GNU General Public License for more details.
+  ~
+  ~ You should have received a copy of the GNU General Public License
+  ~ along with QKSMS.  If not, see <http://www.gnu.org/licenses/>.
+  -->
+<vector xmlns:android="http://schemas.android.com/apk/res/android"
+    android:width="24dp"
+    android:height="24dp"
+    android:viewportWidth="24.0"
+    android:viewportHeight="24.0">
+    <path
+        android:fillColor="#FF000000"
+        android:pathData="M9,4v3h5v12h3L17,7h5L22,4L9,4zM3,12h3v7h3v-7h3L12,9L3,9v3z" />
+</vector>
diff --git a/presentation/src/main/res/drawable/ic_help_black_24dp.xml b/presentation/src/main/res/drawable/ic_help_black_24dp.xml
index e01b214f3..1a29ec120 100644
--- a/presentation/src/main/res/drawable/ic_help_black_24dp.xml
+++ b/presentation/src/main/res/drawable/ic_help_black_24dp.xml
@@ -1,27 +1,27 @@
-<!--
-  ~ Copyright (C) 2019 Moez Bhatti <moez.bhatti@gmail.com>
-  ~
-  ~ This file is part of QKSMS.
-  ~
-  ~ QKSMS is free software: you can redistribute it and/or modify
-  ~ it under the terms of the GNU General Public License as published by
-  ~ the Free Software Foundation, either version 3 of the License, or
-  ~ (at your option) any later version.
-  ~
-  ~ QKSMS is distributed in the hope that it will be useful,
-  ~ but WITHOUT ANY WARRANTY; without even the implied warranty of
-  ~ MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
-  ~ GNU General Public License for more details.
-  ~
-  ~ You should have received a copy of the GNU General Public License
-  ~ along with QKSMS.  If not, see <http://www.gnu.org/licenses/>.
-  -->
-<vector xmlns:android="http://schemas.android.com/apk/res/android"
-    android:width="24dp"
-    android:height="24dp"
-    android:viewportWidth="24.0"
-    android:viewportHeight="24.0">
-    <path
-        android:fillColor="#FF000000"
-        android:pathData="M12,2C6.48,2 2,6.48 2,12s4.48,10 10,10 10,-4.48 10,-10S17.52,2 12,2zM13,19h-2v-2h2v2zM15.07,11.25l-0.9,0.92C13.45,12.9 13,13.5 13,15h-2v-0.5c0,-1.1 0.45,-2.1 1.17,-2.83l1.24,-1.26c0.37,-0.36 0.59,-0.86 0.59,-1.41 0,-1.1 -0.9,-2 -2,-2s-2,0.9 -2,2L8,9c0,-2.21 1.79,-4 4,-4s4,1.79 4,4c0,0.88 -0.36,1.68 -0.93,2.25z" />
-</vector>
+<!--
+  ~ Copyright (C) 2019 Moez Bhatti <moez.bhatti@gmail.com>
+  ~
+  ~ This file is part of QKSMS.
+  ~
+  ~ QKSMS is free software: you can redistribute it and/or modify
+  ~ it under the terms of the GNU General Public License as published by
+  ~ the Free Software Foundation, either version 3 of the License, or
+  ~ (at your option) any later version.
+  ~
+  ~ QKSMS is distributed in the hope that it will be useful,
+  ~ but WITHOUT ANY WARRANTY; without even the implied warranty of
+  ~ MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+  ~ GNU General Public License for more details.
+  ~
+  ~ You should have received a copy of the GNU General Public License
+  ~ along with QKSMS.  If not, see <http://www.gnu.org/licenses/>.
+  -->
+<vector xmlns:android="http://schemas.android.com/apk/res/android"
+    android:width="24dp"
+    android:height="24dp"
+    android:viewportWidth="24.0"
+    android:viewportHeight="24.0">
+    <path
+        android:fillColor="#FF000000"
+        android:pathData="M12,2C6.48,2 2,6.48 2,12s4.48,10 10,10 10,-4.48 10,-10S17.52,2 12,2zM13,19h-2v-2h2v2zM15.07,11.25l-0.9,0.92C13.45,12.9 13,13.5 13,15h-2v-0.5c0,-1.1 0.45,-2.1 1.17,-2.83l1.24,-1.26c0.37,-0.36 0.59,-0.86 0.59,-1.41 0,-1.1 -0.9,-2 -2,-2s-2,0.9 -2,2L8,9c0,-2.21 1.79,-4 4,-4s4,1.79 4,4c0,0.88 -0.36,1.68 -0.93,2.25z" />
+</vector>
diff --git a/presentation/src/main/res/drawable/ic_history_black_24dp.xml b/presentation/src/main/res/drawable/ic_history_black_24dp.xml
index 82a978944..714796d23 100644
--- a/presentation/src/main/res/drawable/ic_history_black_24dp.xml
+++ b/presentation/src/main/res/drawable/ic_history_black_24dp.xml
@@ -1,27 +1,27 @@
-<!--
-  ~ Copyright (C) 2019 Moez Bhatti <moez.bhatti@gmail.com>
-  ~
-  ~ This file is part of QKSMS.
-  ~
-  ~ QKSMS is free software: you can redistribute it and/or modify
-  ~ it under the terms of the GNU General Public License as published by
-  ~ the Free Software Foundation, either version 3 of the License, or
-  ~ (at your option) any later version.
-  ~
-  ~ QKSMS is distributed in the hope that it will be useful,
-  ~ but WITHOUT ANY WARRANTY; without even the implied warranty of
-  ~ MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
-  ~ GNU General Public License for more details.
-  ~
-  ~ You should have received a copy of the GNU General Public License
-  ~ along with QKSMS.  If not, see <http://www.gnu.org/licenses/>.
-  -->
-<vector xmlns:android="http://schemas.android.com/apk/res/android"
-    android:width="24dp"
-    android:height="24dp"
-    android:viewportWidth="24.0"
-    android:viewportHeight="24.0">
-    <path
-        android:fillColor="#FF000000"
-        android:pathData="M13,3c-4.97,0 -9,4.03 -9,9L1,12l3.89,3.89 0.07,0.14L9,12L6,12c0,-3.87 3.13,-7 7,-7s7,3.13 7,7 -3.13,7 -7,7c-1.93,0 -3.68,-0.79 -4.94,-2.06l-1.42,1.42C8.27,19.99 10.51,21 13,21c4.97,0 9,-4.03 9,-9s-4.03,-9 -9,-9zM12,8v5l4.28,2.54 0.72,-1.21 -3.5,-2.08L13.5,8L12,8z" />
-</vector>
+<!--
+  ~ Copyright (C) 2019 Moez Bhatti <moez.bhatti@gmail.com>
+  ~
+  ~ This file is part of QKSMS.
+  ~
+  ~ QKSMS is free software: you can redistribute it and/or modify
+  ~ it under the terms of the GNU General Public License as published by
+  ~ the Free Software Foundation, either version 3 of the License, or
+  ~ (at your option) any later version.
+  ~
+  ~ QKSMS is distributed in the hope that it will be useful,
+  ~ but WITHOUT ANY WARRANTY; without even the implied warranty of
+  ~ MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+  ~ GNU General Public License for more details.
+  ~
+  ~ You should have received a copy of the GNU General Public License
+  ~ along with QKSMS.  If not, see <http://www.gnu.org/licenses/>.
+  -->
+<vector xmlns:android="http://schemas.android.com/apk/res/android"
+    android:width="24dp"
+    android:height="24dp"
+    android:viewportWidth="24.0"
+    android:viewportHeight="24.0">
+    <path
+        android:fillColor="#FF000000"
+        android:pathData="M13,3c-4.97,0 -9,4.03 -9,9L1,12l3.89,3.89 0.07,0.14L9,12L6,12c0,-3.87 3.13,-7 7,-7s7,3.13 7,7 -3.13,7 -7,7c-1.93,0 -3.68,-0.79 -4.94,-2.06l-1.42,1.42C8.27,19.99 10.51,21 13,21c4.97,0 9,-4.03 9,-9s-4.03,-9 -9,-9zM12,8v5l4.28,2.54 0.72,-1.21 -3.5,-2.08L13.5,8L12,8z" />
+</vector>
diff --git a/presentation/src/main/res/drawable/ic_import_export_black_24dp.xml b/presentation/src/main/res/drawable/ic_import_export_black_24dp.xml
index 820ba7bc3..ec31bcb15 100644
--- a/presentation/src/main/res/drawable/ic_import_export_black_24dp.xml
+++ b/presentation/src/main/res/drawable/ic_import_export_black_24dp.xml
@@ -1,27 +1,27 @@
-<!--
-  ~ Copyright (C) 2019 Moez Bhatti <moez.bhatti@gmail.com>
-  ~
-  ~ This file is part of QKSMS.
-  ~
-  ~ QKSMS is free software: you can redistribute it and/or modify
-  ~ it under the terms of the GNU General Public License as published by
-  ~ the Free Software Foundation, either version 3 of the License, or
-  ~ (at your option) any later version.
-  ~
-  ~ QKSMS is distributed in the hope that it will be useful,
-  ~ but WITHOUT ANY WARRANTY; without even the implied warranty of
-  ~ MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
-  ~ GNU General Public License for more details.
-  ~
-  ~ You should have received a copy of the GNU General Public License
-  ~ along with QKSMS.  If not, see <http://www.gnu.org/licenses/>.
-  -->
-<vector xmlns:android="http://schemas.android.com/apk/res/android"
-    android:width="24dp"
-    android:height="24dp"
-    android:viewportWidth="24.0"
-    android:viewportHeight="24.0">
-    <path
-        android:fillColor="#FF000000"
-        android:pathData="M9,3L5,6.99h3L8,14h2L10,6.99h3L9,3zM16,17.01L16,10h-2v7.01h-3L15,21l4,-3.99h-3z" />
-</vector>
+<!--
+  ~ Copyright (C) 2019 Moez Bhatti <moez.bhatti@gmail.com>
+  ~
+  ~ This file is part of QKSMS.
+  ~
+  ~ QKSMS is free software: you can redistribute it and/or modify
+  ~ it under the terms of the GNU General Public License as published by
+  ~ the Free Software Foundation, either version 3 of the License, or
+  ~ (at your option) any later version.
+  ~
+  ~ QKSMS is distributed in the hope that it will be useful,
+  ~ but WITHOUT ANY WARRANTY; without even the implied warranty of
+  ~ MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+  ~ GNU General Public License for more details.
+  ~
+  ~ You should have received a copy of the GNU General Public License
+  ~ along with QKSMS.  If not, see <http://www.gnu.org/licenses/>.
+  -->
+<vector xmlns:android="http://schemas.android.com/apk/res/android"
+    android:width="24dp"
+    android:height="24dp"
+    android:viewportWidth="24.0"
+    android:viewportHeight="24.0">
+    <path
+        android:fillColor="#FF000000"
+        android:pathData="M9,3L5,6.99h3L8,14h2L10,6.99h3L9,3zM16,17.01L16,10h-2v7.01h-3L15,21l4,-3.99h-3z" />
+</vector>
diff --git a/presentation/src/main/res/drawable/ic_inbox_black_24dp.xml b/presentation/src/main/res/drawable/ic_inbox_black_24dp.xml
index f0272cdb4..0ba7e0f99 100644
--- a/presentation/src/main/res/drawable/ic_inbox_black_24dp.xml
+++ b/presentation/src/main/res/drawable/ic_inbox_black_24dp.xml
@@ -1,27 +1,27 @@
-<!--
-  ~ Copyright (C) 2019 Moez Bhatti <moez.bhatti@gmail.com>
-  ~
-  ~ This file is part of QKSMS.
-  ~
-  ~ QKSMS is free software: you can redistribute it and/or modify
-  ~ it under the terms of the GNU General Public License as published by
-  ~ the Free Software Foundation, either version 3 of the License, or
-  ~ (at your option) any later version.
-  ~
-  ~ QKSMS is distributed in the hope that it will be useful,
-  ~ but WITHOUT ANY WARRANTY; without even the implied warranty of
-  ~ MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
-  ~ GNU General Public License for more details.
-  ~
-  ~ You should have received a copy of the GNU General Public License
-  ~ along with QKSMS.  If not, see <http://www.gnu.org/licenses/>.
-  -->
-<vector xmlns:android="http://schemas.android.com/apk/res/android"
-    android:width="24dp"
-    android:height="24dp"
-    android:viewportWidth="24.0"
-    android:viewportHeight="24.0">
-    <path
-        android:fillColor="#FF000000"
-        android:pathData="M19,3L4.99,3c-1.11,0 -1.98,0.89 -1.98,2L3,19c0,1.1 0.88,2 1.99,2L19,21c1.1,0 2,-0.9 2,-2L21,5c0,-1.11 -0.9,-2 -2,-2zM19,15h-4c0,1.66 -1.35,3 -3,3s-3,-1.34 -3,-3L4.99,15L4.99,5L19,5v10z" />
-</vector>
+<!--
+  ~ Copyright (C) 2019 Moez Bhatti <moez.bhatti@gmail.com>
+  ~
+  ~ This file is part of QKSMS.
+  ~
+  ~ QKSMS is free software: you can redistribute it and/or modify
+  ~ it under the terms of the GNU General Public License as published by
+  ~ the Free Software Foundation, either version 3 of the License, or
+  ~ (at your option) any later version.
+  ~
+  ~ QKSMS is distributed in the hope that it will be useful,
+  ~ but WITHOUT ANY WARRANTY; without even the implied warranty of
+  ~ MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+  ~ GNU General Public License for more details.
+  ~
+  ~ You should have received a copy of the GNU General Public License
+  ~ along with QKSMS.  If not, see <http://www.gnu.org/licenses/>.
+  -->
+<vector xmlns:android="http://schemas.android.com/apk/res/android"
+    android:width="24dp"
+    android:height="24dp"
+    android:viewportWidth="24.0"
+    android:viewportHeight="24.0">
+    <path
+        android:fillColor="#FF000000"
+        android:pathData="M19,3L4.99,3c-1.11,0 -1.98,0.89 -1.98,2L3,19c0,1.1 0.88,2 1.99,2L19,21c1.1,0 2,-0.9 2,-2L21,5c0,-1.11 -0.9,-2 -2,-2zM19,15h-4c0,1.66 -1.35,3 -3,3s-3,-1.34 -3,-3L4.99,15L4.99,5L19,5v10z" />
+</vector>
diff --git a/presentation/src/main/res/drawable/ic_info_black_24dp.xml b/presentation/src/main/res/drawable/ic_info_black_24dp.xml
index 36ed4eaf4..3fbe9f339 100644
--- a/presentation/src/main/res/drawable/ic_info_black_24dp.xml
+++ b/presentation/src/main/res/drawable/ic_info_black_24dp.xml
@@ -1,27 +1,27 @@
-<!--
-  ~ Copyright (C) 2019 Moez Bhatti <moez.bhatti@gmail.com>
-  ~
-  ~ This file is part of QKSMS.
-  ~
-  ~ QKSMS is free software: you can redistribute it and/or modify
-  ~ it under the terms of the GNU General Public License as published by
-  ~ the Free Software Foundation, either version 3 of the License, or
-  ~ (at your option) any later version.
-  ~
-  ~ QKSMS is distributed in the hope that it will be useful,
-  ~ but WITHOUT ANY WARRANTY; without even the implied warranty of
-  ~ MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
-  ~ GNU General Public License for more details.
-  ~
-  ~ You should have received a copy of the GNU General Public License
-  ~ along with QKSMS.  If not, see <http://www.gnu.org/licenses/>.
-  -->
-<vector xmlns:android="http://schemas.android.com/apk/res/android"
-    android:width="24dp"
-    android:height="24dp"
-    android:viewportWidth="24.0"
-    android:viewportHeight="24.0">
-    <path
-        android:fillColor="#FF000000"
-        android:pathData="M12,2C6.48,2 2,6.48 2,12s4.48,10 10,10 10,-4.48 10,-10S17.52,2 12,2zM13,17h-2v-6h2v6zM13,9h-2L11,7h2v2z" />
-</vector>
+<!--
+  ~ Copyright (C) 2019 Moez Bhatti <moez.bhatti@gmail.com>
+  ~
+  ~ This file is part of QKSMS.
+  ~
+  ~ QKSMS is free software: you can redistribute it and/or modify
+  ~ it under the terms of the GNU General Public License as published by
+  ~ the Free Software Foundation, either version 3 of the License, or
+  ~ (at your option) any later version.
+  ~
+  ~ QKSMS is distributed in the hope that it will be useful,
+  ~ but WITHOUT ANY WARRANTY; without even the implied warranty of
+  ~ MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+  ~ GNU General Public License for more details.
+  ~
+  ~ You should have received a copy of the GNU General Public License
+  ~ along with QKSMS.  If not, see <http://www.gnu.org/licenses/>.
+  -->
+<vector xmlns:android="http://schemas.android.com/apk/res/android"
+    android:width="24dp"
+    android:height="24dp"
+    android:viewportWidth="24.0"
+    android:viewportHeight="24.0">
+    <path
+        android:fillColor="#FF000000"
+        android:pathData="M12,2C6.48,2 2,6.48 2,12s4.48,10 10,10 10,-4.48 10,-10S17.52,2 12,2zM13,17h-2v-6h2v6zM13,9h-2L11,7h2v2z" />
+</vector>
diff --git a/presentation/src/main/res/drawable/ic_insert_photo_black_24dp.xml b/presentation/src/main/res/drawable/ic_insert_photo_black_24dp.xml
index c2a21b5dd..0e45a7f6e 100644
--- a/presentation/src/main/res/drawable/ic_insert_photo_black_24dp.xml
+++ b/presentation/src/main/res/drawable/ic_insert_photo_black_24dp.xml
@@ -1,27 +1,27 @@
-<!--
-  ~ Copyright (C) 2019 Moez Bhatti <moez.bhatti@gmail.com>
-  ~
-  ~ This file is part of QKSMS.
-  ~
-  ~ QKSMS is free software: you can redistribute it and/or modify
-  ~ it under the terms of the GNU General Public License as published by
-  ~ the Free Software Foundation, either version 3 of the License, or
-  ~ (at your option) any later version.
-  ~
-  ~ QKSMS is distributed in the hope that it will be useful,
-  ~ but WITHOUT ANY WARRANTY; without even the implied warranty of
-  ~ MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
-  ~ GNU General Public License for more details.
-  ~
-  ~ You should have received a copy of the GNU General Public License
-  ~ along with QKSMS.  If not, see <http://www.gnu.org/licenses/>.
-  -->
-<vector xmlns:android="http://schemas.android.com/apk/res/android"
-    android:width="24dp"
-    android:height="24dp"
-    android:viewportWidth="24.0"
-    android:viewportHeight="24.0">
-    <path
-        android:fillColor="#FF000000"
-        android:pathData="M21,19V5c0,-1.1 -0.9,-2 -2,-2H5c-1.1,0 -2,0.9 -2,2v14c0,1.1 0.9,2 2,2h14c1.1,0 2,-0.9 2,-2zM8.5,13.5l2.5,3.01L14.5,12l4.5,6H5l3.5,-4.5z" />
-</vector>
+<!--
+  ~ Copyright (C) 2019 Moez Bhatti <moez.bhatti@gmail.com>
+  ~
+  ~ This file is part of QKSMS.
+  ~
+  ~ QKSMS is free software: you can redistribute it and/or modify
+  ~ it under the terms of the GNU General Public License as published by
+  ~ the Free Software Foundation, either version 3 of the License, or
+  ~ (at your option) any later version.
+  ~
+  ~ QKSMS is distributed in the hope that it will be useful,
+  ~ but WITHOUT ANY WARRANTY; without even the implied warranty of
+  ~ MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+  ~ GNU General Public License for more details.
+  ~
+  ~ You should have received a copy of the GNU General Public License
+  ~ along with QKSMS.  If not, see <http://www.gnu.org/licenses/>.
+  -->
+<vector xmlns:android="http://schemas.android.com/apk/res/android"
+    android:width="24dp"
+    android:height="24dp"
+    android:viewportWidth="24.0"
+    android:viewportHeight="24.0">
+    <path
+        android:fillColor="#FF000000"
+        android:pathData="M21,19V5c0,-1.1 -0.9,-2 -2,-2H5c-1.1,0 -2,0.9 -2,2v14c0,1.1 0.9,2 2,2h14c1.1,0 2,-0.9 2,-2zM8.5,13.5l2.5,3.01L14.5,12l4.5,6H5l3.5,-4.5z" />
+</vector>
diff --git a/presentation/src/main/res/drawable/ic_invert_colors_black_24dp.xml b/presentation/src/main/res/drawable/ic_invert_colors_black_24dp.xml
index c3bc64e3a..7679e7110 100644
--- a/presentation/src/main/res/drawable/ic_invert_colors_black_24dp.xml
+++ b/presentation/src/main/res/drawable/ic_invert_colors_black_24dp.xml
@@ -1,27 +1,27 @@
-<!--
-  ~ Copyright (C) 2019 Moez Bhatti <moez.bhatti@gmail.com>
-  ~
-  ~ This file is part of QKSMS.
-  ~
-  ~ QKSMS is free software: you can redistribute it and/or modify
-  ~ it under the terms of the GNU General Public License as published by
-  ~ the Free Software Foundation, either version 3 of the License, or
-  ~ (at your option) any later version.
-  ~
-  ~ QKSMS is distributed in the hope that it will be useful,
-  ~ but WITHOUT ANY WARRANTY; without even the implied warranty of
-  ~ MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
-  ~ GNU General Public License for more details.
-  ~
-  ~ You should have received a copy of the GNU General Public License
-  ~ along with QKSMS.  If not, see <http://www.gnu.org/licenses/>.
-  -->
-<vector xmlns:android="http://schemas.android.com/apk/res/android"
-    android:width="24dp"
-    android:height="24dp"
-    android:viewportWidth="24.0"
-    android:viewportHeight="24.0">
-    <path
-        android:fillColor="#FF000000"
-        android:pathData="M17.66,7.93L12,2.27 6.34,7.93c-3.12,3.12 -3.12,8.19 0,11.31C7.9,20.8 9.95,21.58 12,21.58c2.05,0 4.1,-0.78 5.66,-2.34 3.12,-3.12 3.12,-8.19 0,-11.31zM12,19.59c-1.6,0 -3.11,-0.62 -4.24,-1.76C6.62,16.69 6,15.19 6,13.59s0.62,-3.11 1.76,-4.24L12,5.1v14.49z" />
-</vector>
+<!--
+  ~ Copyright (C) 2019 Moez Bhatti <moez.bhatti@gmail.com>
+  ~
+  ~ This file is part of QKSMS.
+  ~
+  ~ QKSMS is free software: you can redistribute it and/or modify
+  ~ it under the terms of the GNU General Public License as published by
+  ~ the Free Software Foundation, either version 3 of the License, or
+  ~ (at your option) any later version.
+  ~
+  ~ QKSMS is distributed in the hope that it will be useful,
+  ~ but WITHOUT ANY WARRANTY; without even the implied warranty of
+  ~ MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+  ~ GNU General Public License for more details.
+  ~
+  ~ You should have received a copy of the GNU General Public License
+  ~ along with QKSMS.  If not, see <http://www.gnu.org/licenses/>.
+  -->
+<vector xmlns:android="http://schemas.android.com/apk/res/android"
+    android:width="24dp"
+    android:height="24dp"
+    android:viewportWidth="24.0"
+    android:viewportHeight="24.0">
+    <path
+        android:fillColor="#FF000000"
+        android:pathData="M17.66,7.93L12,2.27 6.34,7.93c-3.12,3.12 -3.12,8.19 0,11.31C7.9,20.8 9.95,21.58 12,21.58c2.05,0 4.1,-0.78 5.66,-2.34 3.12,-3.12 3.12,-8.19 0,-11.31zM12,19.59c-1.6,0 -3.11,-0.62 -4.24,-1.76C6.62,16.69 6,15.19 6,13.59s0.62,-3.11 1.76,-4.24L12,5.1v14.49z" />
+</vector>
diff --git a/presentation/src/main/res/drawable/ic_keyboard_arrow_down_black_24dp.xml b/presentation/src/main/res/drawable/ic_keyboard_arrow_down_black_24dp.xml
index 7a6065d77..eb5d216f9 100644
--- a/presentation/src/main/res/drawable/ic_keyboard_arrow_down_black_24dp.xml
+++ b/presentation/src/main/res/drawable/ic_keyboard_arrow_down_black_24dp.xml
@@ -1,27 +1,27 @@
-<!--
-  ~ Copyright (C) 2019 Moez Bhatti <moez.bhatti@gmail.com>
-  ~
-  ~ This file is part of QKSMS.
-  ~
-  ~ QKSMS is free software: you can redistribute it and/or modify
-  ~ it under the terms of the GNU General Public License as published by
-  ~ the Free Software Foundation, either version 3 of the License, or
-  ~ (at your option) any later version.
-  ~
-  ~ QKSMS is distributed in the hope that it will be useful,
-  ~ but WITHOUT ANY WARRANTY; without even the implied warranty of
-  ~ MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
-  ~ GNU General Public License for more details.
-  ~
-  ~ You should have received a copy of the GNU General Public License
-  ~ along with QKSMS.  If not, see <http://www.gnu.org/licenses/>.
-  -->
-<vector xmlns:android="http://schemas.android.com/apk/res/android"
-    android:width="24dp"
-    android:height="24dp"
-    android:viewportWidth="24.0"
-    android:viewportHeight="24.0">
-    <path
-        android:fillColor="#FF000000"
-        android:pathData="M7.41,7.84L12,12.42l4.59,-4.58L18,9.25l-6,6 -6,-6z" />
-</vector>
+<!--
+  ~ Copyright (C) 2019 Moez Bhatti <moez.bhatti@gmail.com>
+  ~
+  ~ This file is part of QKSMS.
+  ~
+  ~ QKSMS is free software: you can redistribute it and/or modify
+  ~ it under the terms of the GNU General Public License as published by
+  ~ the Free Software Foundation, either version 3 of the License, or
+  ~ (at your option) any later version.
+  ~
+  ~ QKSMS is distributed in the hope that it will be useful,
+  ~ but WITHOUT ANY WARRANTY; without even the implied warranty of
+  ~ MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+  ~ GNU General Public License for more details.
+  ~
+  ~ You should have received a copy of the GNU General Public License
+  ~ along with QKSMS.  If not, see <http://www.gnu.org/licenses/>.
+  -->
+<vector xmlns:android="http://schemas.android.com/apk/res/android"
+    android:width="24dp"
+    android:height="24dp"
+    android:viewportWidth="24.0"
+    android:viewportHeight="24.0">
+    <path
+        android:fillColor="#FF000000"
+        android:pathData="M7.41,7.84L12,12.42l4.59,-4.58L18,9.25l-6,6 -6,-6z" />
+</vector>
diff --git a/presentation/src/main/res/drawable/ic_keyboard_arrow_up_black_24dp.xml b/presentation/src/main/res/drawable/ic_keyboard_arrow_up_black_24dp.xml
index 7a625c27f..6e0c36ce1 100644
--- a/presentation/src/main/res/drawable/ic_keyboard_arrow_up_black_24dp.xml
+++ b/presentation/src/main/res/drawable/ic_keyboard_arrow_up_black_24dp.xml
@@ -1,27 +1,27 @@
-<!--
-  ~ Copyright (C) 2019 Moez Bhatti <moez.bhatti@gmail.com>
-  ~
-  ~ This file is part of QKSMS.
-  ~
-  ~ QKSMS is free software: you can redistribute it and/or modify
-  ~ it under the terms of the GNU General Public License as published by
-  ~ the Free Software Foundation, either version 3 of the License, or
-  ~ (at your option) any later version.
-  ~
-  ~ QKSMS is distributed in the hope that it will be useful,
-  ~ but WITHOUT ANY WARRANTY; without even the implied warranty of
-  ~ MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
-  ~ GNU General Public License for more details.
-  ~
-  ~ You should have received a copy of the GNU General Public License
-  ~ along with QKSMS.  If not, see <http://www.gnu.org/licenses/>.
-  -->
-<vector xmlns:android="http://schemas.android.com/apk/res/android"
-    android:width="24dp"
-    android:height="24dp"
-    android:viewportWidth="24.0"
-    android:viewportHeight="24.0">
-    <path
-        android:fillColor="#FF000000"
-        android:pathData="M7.41,15.41L12,10.83l4.59,4.58L18,14l-6,-6 -6,6z" />
-</vector>
+<!--
+  ~ Copyright (C) 2019 Moez Bhatti <moez.bhatti@gmail.com>
+  ~
+  ~ This file is part of QKSMS.
+  ~
+  ~ QKSMS is free software: you can redistribute it and/or modify
+  ~ it under the terms of the GNU General Public License as published by
+  ~ the Free Software Foundation, either version 3 of the License, or
+  ~ (at your option) any later version.
+  ~
+  ~ QKSMS is distributed in the hope that it will be useful,
+  ~ but WITHOUT ANY WARRANTY; without even the implied warranty of
+  ~ MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+  ~ GNU General Public License for more details.
+  ~
+  ~ You should have received a copy of the GNU General Public License
+  ~ along with QKSMS.  If not, see <http://www.gnu.org/licenses/>.
+  -->
+<vector xmlns:android="http://schemas.android.com/apk/res/android"
+    android:width="24dp"
+    android:height="24dp"
+    android:viewportWidth="24.0"
+    android:viewportHeight="24.0">
+    <path
+        android:fillColor="#FF000000"
+        android:pathData="M7.41,15.41L12,10.83l4.59,4.58L18,14l-6,-6 -6,6z" />
+</vector>
diff --git a/presentation/src/main/res/drawable/ic_markunread_black_24dp.xml b/presentation/src/main/res/drawable/ic_markunread_black_24dp.xml
index 783b4ee31..dcadc3163 100644
--- a/presentation/src/main/res/drawable/ic_markunread_black_24dp.xml
+++ b/presentation/src/main/res/drawable/ic_markunread_black_24dp.xml
@@ -1,27 +1,27 @@
-<!--
-  ~ Copyright (C) 2019 Moez Bhatti <moez.bhatti@gmail.com>
-  ~
-  ~ This file is part of QKSMS.
-  ~
-  ~ QKSMS is free software: you can redistribute it and/or modify
-  ~ it under the terms of the GNU General Public License as published by
-  ~ the Free Software Foundation, either version 3 of the License, or
-  ~ (at your option) any later version.
-  ~
-  ~ QKSMS is distributed in the hope that it will be useful,
-  ~ but WITHOUT ANY WARRANTY; without even the implied warranty of
-  ~ MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
-  ~ GNU General Public License for more details.
-  ~
-  ~ You should have received a copy of the GNU General Public License
-  ~ along with QKSMS.  If not, see <http://www.gnu.org/licenses/>.
-  -->
-<vector xmlns:android="http://schemas.android.com/apk/res/android"
-    android:width="24dp"
-    android:height="24dp"
-    android:viewportWidth="24.0"
-    android:viewportHeight="24.0">
-    <path
-        android:fillColor="#FF000000"
-        android:pathData="M20,4L4,4c-1.1,0 -1.99,0.9 -1.99,2L2,18c0,1.1 0.9,2 2,2h16c1.1,0 2,-0.9 2,-2L22,6c0,-1.1 -0.9,-2 -2,-2zM20,8l-8,5 -8,-5L4,6l8,5 8,-5v2z" />
-</vector>
+<!--
+  ~ Copyright (C) 2019 Moez Bhatti <moez.bhatti@gmail.com>
+  ~
+  ~ This file is part of QKSMS.
+  ~
+  ~ QKSMS is free software: you can redistribute it and/or modify
+  ~ it under the terms of the GNU General Public License as published by
+  ~ the Free Software Foundation, either version 3 of the License, or
+  ~ (at your option) any later version.
+  ~
+  ~ QKSMS is distributed in the hope that it will be useful,
+  ~ but WITHOUT ANY WARRANTY; without even the implied warranty of
+  ~ MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+  ~ GNU General Public License for more details.
+  ~
+  ~ You should have received a copy of the GNU General Public License
+  ~ along with QKSMS.  If not, see <http://www.gnu.org/licenses/>.
+  -->
+<vector xmlns:android="http://schemas.android.com/apk/res/android"
+    android:width="24dp"
+    android:height="24dp"
+    android:viewportWidth="24.0"
+    android:viewportHeight="24.0">
+    <path
+        android:fillColor="#FF000000"
+        android:pathData="M20,4L4,4c-1.1,0 -1.99,0.9 -1.99,2L2,18c0,1.1 0.9,2 2,2h16c1.1,0 2,-0.9 2,-2L22,6c0,-1.1 -0.9,-2 -2,-2zM20,8l-8,5 -8,-5L4,6l8,5 8,-5v2z" />
+</vector>
diff --git a/presentation/src/main/res/drawable/ic_message_black_24dp.xml b/presentation/src/main/res/drawable/ic_message_black_24dp.xml
index d2876bfad..73891bf4f 100644
--- a/presentation/src/main/res/drawable/ic_message_black_24dp.xml
+++ b/presentation/src/main/res/drawable/ic_message_black_24dp.xml
@@ -1,9 +1,9 @@
-<vector xmlns:android="http://schemas.android.com/apk/res/android"
-        android:width="24dp"
-        android:height="24dp"
-        android:viewportWidth="24.0"
-        android:viewportHeight="24.0">
-    <path
-        android:fillColor="#FF000000"
-        android:pathData="M20,2L4,2c-1.1,0 -1.99,0.9 -1.99,2L2,22l4,-4h14c1.1,0 2,-0.9 2,-2L22,4c0,-1.1 -0.9,-2 -2,-2zM18,14L6,14v-2h12v2zM18,11L6,11L6,9h12v2zM18,8L6,8L6,6h12v2z"/>
-</vector>
+<vector xmlns:android="http://schemas.android.com/apk/res/android"
+        android:width="24dp"
+        android:height="24dp"
+        android:viewportWidth="24.0"
+        android:viewportHeight="24.0">
+    <path
+        android:fillColor="#FF000000"
+        android:pathData="M20,2L4,2c-1.1,0 -1.99,0.9 -1.99,2L2,22l4,-4h14c1.1,0 2,-0.9 2,-2L22,4c0,-1.1 -0.9,-2 -2,-2zM18,14L6,14v-2h12v2zM18,11L6,11L6,9h12v2zM18,8L6,8L6,6h12v2z"/>
+</vector>
diff --git a/presentation/src/main/res/drawable/ic_more_horiz_black_24dp.xml b/presentation/src/main/res/drawable/ic_more_horiz_black_24dp.xml
index 797ea991d..a7fb931aa 100644
--- a/presentation/src/main/res/drawable/ic_more_horiz_black_24dp.xml
+++ b/presentation/src/main/res/drawable/ic_more_horiz_black_24dp.xml
@@ -1,27 +1,27 @@
-<!--
-  ~ Copyright (C) 2019 Moez Bhatti <moez.bhatti@gmail.com>
-  ~
-  ~ This file is part of QKSMS.
-  ~
-  ~ QKSMS is free software: you can redistribute it and/or modify
-  ~ it under the terms of the GNU General Public License as published by
-  ~ the Free Software Foundation, either version 3 of the License, or
-  ~ (at your option) any later version.
-  ~
-  ~ QKSMS is distributed in the hope that it will be useful,
-  ~ but WITHOUT ANY WARRANTY; without even the implied warranty of
-  ~ MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
-  ~ GNU General Public License for more details.
-  ~
-  ~ You should have received a copy of the GNU General Public License
-  ~ along with QKSMS.  If not, see <http://www.gnu.org/licenses/>.
-  -->
-<vector xmlns:android="http://schemas.android.com/apk/res/android"
-    android:width="24dp"
-    android:height="24dp"
-    android:viewportWidth="24.0"
-    android:viewportHeight="24.0">
-    <path
-        android:fillColor="#FF000000"
-        android:pathData="M6,10c-1.1,0 -2,0.9 -2,2s0.9,2 2,2 2,-0.9 2,-2 -0.9,-2 -2,-2zM18,10c-1.1,0 -2,0.9 -2,2s0.9,2 2,2 2,-0.9 2,-2 -0.9,-2 -2,-2zM12,10c-1.1,0 -2,0.9 -2,2s0.9,2 2,2 2,-0.9 2,-2 -0.9,-2 -2,-2z" />
-</vector>
+<!--
+  ~ Copyright (C) 2019 Moez Bhatti <moez.bhatti@gmail.com>
+  ~
+  ~ This file is part of QKSMS.
+  ~
+  ~ QKSMS is free software: you can redistribute it and/or modify
+  ~ it under the terms of the GNU General Public License as published by
+  ~ the Free Software Foundation, either version 3 of the License, or
+  ~ (at your option) any later version.
+  ~
+  ~ QKSMS is distributed in the hope that it will be useful,
+  ~ but WITHOUT ANY WARRANTY; without even the implied warranty of
+  ~ MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+  ~ GNU General Public License for more details.
+  ~
+  ~ You should have received a copy of the GNU General Public License
+  ~ along with QKSMS.  If not, see <http://www.gnu.org/licenses/>.
+  -->
+<vector xmlns:android="http://schemas.android.com/apk/res/android"
+    android:width="24dp"
+    android:height="24dp"
+    android:viewportWidth="24.0"
+    android:viewportHeight="24.0">
+    <path
+        android:fillColor="#FF000000"
+        android:pathData="M6,10c-1.1,0 -2,0.9 -2,2s0.9,2 2,2 2,-0.9 2,-2 -0.9,-2 -2,-2zM18,10c-1.1,0 -2,0.9 -2,2s0.9,2 2,2 2,-0.9 2,-2 -0.9,-2 -2,-2zM12,10c-1.1,0 -2,0.9 -2,2s0.9,2 2,2 2,-0.9 2,-2 -0.9,-2 -2,-2z" />
+</vector>
diff --git a/presentation/src/main/res/drawable/ic_more_vert_black_24dp.xml b/presentation/src/main/res/drawable/ic_more_vert_black_24dp.xml
index f738148ff..12d5d33e9 100644
--- a/presentation/src/main/res/drawable/ic_more_vert_black_24dp.xml
+++ b/presentation/src/main/res/drawable/ic_more_vert_black_24dp.xml
@@ -1,27 +1,27 @@
-<!--
-  ~ Copyright (C) 2019 Moez Bhatti <moez.bhatti@gmail.com>
-  ~
-  ~ This file is part of QKSMS.
-  ~
-  ~ QKSMS is free software: you can redistribute it and/or modify
-  ~ it under the terms of the GNU General Public License as published by
-  ~ the Free Software Foundation, either version 3 of the License, or
-  ~ (at your option) any later version.
-  ~
-  ~ QKSMS is distributed in the hope that it will be useful,
-  ~ but WITHOUT ANY WARRANTY; without even the implied warranty of
-  ~ MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
-  ~ GNU General Public License for more details.
-  ~
-  ~ You should have received a copy of the GNU General Public License
-  ~ along with QKSMS.  If not, see <http://www.gnu.org/licenses/>.
-  -->
-<vector xmlns:android="http://schemas.android.com/apk/res/android"
-    android:width="24dp"
-    android:height="24dp"
-    android:viewportWidth="24.0"
-    android:viewportHeight="24.0">
-    <path
-        android:fillColor="#FF000000"
-        android:pathData="M12,8c1.1,0 2,-0.9 2,-2s-0.9,-2 -2,-2 -2,0.9 -2,2 0.9,2 2,2zM12,10c-1.1,0 -2,0.9 -2,2s0.9,2 2,2 2,-0.9 2,-2 -0.9,-2 -2,-2zM12,16c-1.1,0 -2,0.9 -2,2s0.9,2 2,2 2,-0.9 2,-2 -0.9,-2 -2,-2z" />
-</vector>
+<!--
+  ~ Copyright (C) 2019 Moez Bhatti <moez.bhatti@gmail.com>
+  ~
+  ~ This file is part of QKSMS.
+  ~
+  ~ QKSMS is free software: you can redistribute it and/or modify
+  ~ it under the terms of the GNU General Public License as published by
+  ~ the Free Software Foundation, either version 3 of the License, or
+  ~ (at your option) any later version.
+  ~
+  ~ QKSMS is distributed in the hope that it will be useful,
+  ~ but WITHOUT ANY WARRANTY; without even the implied warranty of
+  ~ MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+  ~ GNU General Public License for more details.
+  ~
+  ~ You should have received a copy of the GNU General Public License
+  ~ along with QKSMS.  If not, see <http://www.gnu.org/licenses/>.
+  -->
+<vector xmlns:android="http://schemas.android.com/apk/res/android"
+    android:width="24dp"
+    android:height="24dp"
+    android:viewportWidth="24.0"
+    android:viewportHeight="24.0">
+    <path
+        android:fillColor="#FF000000"
+        android:pathData="M12,8c1.1,0 2,-0.9 2,-2s-0.9,-2 -2,-2 -2,0.9 -2,2 0.9,2 2,2zM12,10c-1.1,0 -2,0.9 -2,2s0.9,2 2,2 2,-0.9 2,-2 -0.9,-2 -2,-2zM12,16c-1.1,0 -2,0.9 -2,2s0.9,2 2,2 2,-0.9 2,-2 -0.9,-2 -2,-2z" />
+</vector>
diff --git a/presentation/src/main/res/drawable/ic_notifications_black_24dp.xml b/presentation/src/main/res/drawable/ic_notifications_black_24dp.xml
index fcc373d06..7f6763283 100644
--- a/presentation/src/main/res/drawable/ic_notifications_black_24dp.xml
+++ b/presentation/src/main/res/drawable/ic_notifications_black_24dp.xml
@@ -1,27 +1,27 @@
-<!--
-  ~ Copyright (C) 2019 Moez Bhatti <moez.bhatti@gmail.com>
-  ~
-  ~ This file is part of QKSMS.
-  ~
-  ~ QKSMS is free software: you can redistribute it and/or modify
-  ~ it under the terms of the GNU General Public License as published by
-  ~ the Free Software Foundation, either version 3 of the License, or
-  ~ (at your option) any later version.
-  ~
-  ~ QKSMS is distributed in the hope that it will be useful,
-  ~ but WITHOUT ANY WARRANTY; without even the implied warranty of
-  ~ MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
-  ~ GNU General Public License for more details.
-  ~
-  ~ You should have received a copy of the GNU General Public License
-  ~ along with QKSMS.  If not, see <http://www.gnu.org/licenses/>.
-  -->
-<vector xmlns:android="http://schemas.android.com/apk/res/android"
-    android:width="24dp"
-    android:height="24dp"
-    android:viewportWidth="24.0"
-    android:viewportHeight="24.0">
-    <path
-        android:fillColor="#FF000000"
-        android:pathData="M12,22c1.1,0 2,-0.9 2,-2h-4c0,1.1 0.89,2 2,2zM18,16v-5c0,-3.07 -1.64,-5.64 -4.5,-6.32L13.5,4c0,-0.83 -0.67,-1.5 -1.5,-1.5s-1.5,0.67 -1.5,1.5v0.68C7.63,5.36 6,7.92 6,11v5l-2,2v1h16v-1l-2,-2z" />
-</vector>
+<!--
+  ~ Copyright (C) 2019 Moez Bhatti <moez.bhatti@gmail.com>
+  ~
+  ~ This file is part of QKSMS.
+  ~
+  ~ QKSMS is free software: you can redistribute it and/or modify
+  ~ it under the terms of the GNU General Public License as published by
+  ~ the Free Software Foundation, either version 3 of the License, or
+  ~ (at your option) any later version.
+  ~
+  ~ QKSMS is distributed in the hope that it will be useful,
+  ~ but WITHOUT ANY WARRANTY; without even the implied warranty of
+  ~ MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+  ~ GNU General Public License for more details.
+  ~
+  ~ You should have received a copy of the GNU General Public License
+  ~ along with QKSMS.  If not, see <http://www.gnu.org/licenses/>.
+  -->
+<vector xmlns:android="http://schemas.android.com/apk/res/android"
+    android:width="24dp"
+    android:height="24dp"
+    android:viewportWidth="24.0"
+    android:viewportHeight="24.0">
+    <path
+        android:fillColor="#FF000000"
+        android:pathData="M12,22c1.1,0 2,-0.9 2,-2h-4c0,1.1 0.89,2 2,2zM18,16v-5c0,-3.07 -1.64,-5.64 -4.5,-6.32L13.5,4c0,-0.83 -0.67,-1.5 -1.5,-1.5s-1.5,0.67 -1.5,1.5v0.68C7.63,5.36 6,7.92 6,11v5l-2,2v1h16v-1l-2,-2z" />
+</vector>
diff --git a/presentation/src/main/res/drawable/ic_palette_black_24dp.xml b/presentation/src/main/res/drawable/ic_palette_black_24dp.xml
index 2979b3a06..4cc5d02d2 100644
--- a/presentation/src/main/res/drawable/ic_palette_black_24dp.xml
+++ b/presentation/src/main/res/drawable/ic_palette_black_24dp.xml
@@ -1,27 +1,27 @@
-<!--
-  ~ Copyright (C) 2019 Moez Bhatti <moez.bhatti@gmail.com>
-  ~
-  ~ This file is part of QKSMS.
-  ~
-  ~ QKSMS is free software: you can redistribute it and/or modify
-  ~ it under the terms of the GNU General Public License as published by
-  ~ the Free Software Foundation, either version 3 of the License, or
-  ~ (at your option) any later version.
-  ~
-  ~ QKSMS is distributed in the hope that it will be useful,
-  ~ but WITHOUT ANY WARRANTY; without even the implied warranty of
-  ~ MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
-  ~ GNU General Public License for more details.
-  ~
-  ~ You should have received a copy of the GNU General Public License
-  ~ along with QKSMS.  If not, see <http://www.gnu.org/licenses/>.
-  -->
-<vector xmlns:android="http://schemas.android.com/apk/res/android"
-    android:width="24dp"
-    android:height="24dp"
-    android:viewportWidth="24.0"
-    android:viewportHeight="24.0">
-    <path
-        android:fillColor="#FF000000"
-        android:pathData="M12,3c-4.97,0 -9,4.03 -9,9s4.03,9 9,9c0.83,0 1.5,-0.67 1.5,-1.5 0,-0.39 -0.15,-0.74 -0.39,-1.01 -0.23,-0.26 -0.38,-0.61 -0.38,-0.99 0,-0.83 0.67,-1.5 1.5,-1.5L16,16c2.76,0 5,-2.24 5,-5 0,-4.42 -4.03,-8 -9,-8zM6.5,12c-0.83,0 -1.5,-0.67 -1.5,-1.5S5.67,9 6.5,9 8,9.67 8,10.5 7.33,12 6.5,12zM9.5,8C8.67,8 8,7.33 8,6.5S8.67,5 9.5,5s1.5,0.67 1.5,1.5S10.33,8 9.5,8zM14.5,8c-0.83,0 -1.5,-0.67 -1.5,-1.5S13.67,5 14.5,5s1.5,0.67 1.5,1.5S15.33,8 14.5,8zM17.5,12c-0.83,0 -1.5,-0.67 -1.5,-1.5S16.67,9 17.5,9s1.5,0.67 1.5,1.5 -0.67,1.5 -1.5,1.5z" />
-</vector>
+<!--
+  ~ Copyright (C) 2019 Moez Bhatti <moez.bhatti@gmail.com>
+  ~
+  ~ This file is part of QKSMS.
+  ~
+  ~ QKSMS is free software: you can redistribute it and/or modify
+  ~ it under the terms of the GNU General Public License as published by
+  ~ the Free Software Foundation, either version 3 of the License, or
+  ~ (at your option) any later version.
+  ~
+  ~ QKSMS is distributed in the hope that it will be useful,
+  ~ but WITHOUT ANY WARRANTY; without even the implied warranty of
+  ~ MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+  ~ GNU General Public License for more details.
+  ~
+  ~ You should have received a copy of the GNU General Public License
+  ~ along with QKSMS.  If not, see <http://www.gnu.org/licenses/>.
+  -->
+<vector xmlns:android="http://schemas.android.com/apk/res/android"
+    android:width="24dp"
+    android:height="24dp"
+    android:viewportWidth="24.0"
+    android:viewportHeight="24.0">
+    <path
+        android:fillColor="#FF000000"
+        android:pathData="M12,3c-4.97,0 -9,4.03 -9,9s4.03,9 9,9c0.83,0 1.5,-0.67 1.5,-1.5 0,-0.39 -0.15,-0.74 -0.39,-1.01 -0.23,-0.26 -0.38,-0.61 -0.38,-0.99 0,-0.83 0.67,-1.5 1.5,-1.5L16,16c2.76,0 5,-2.24 5,-5 0,-4.42 -4.03,-8 -9,-8zM6.5,12c-0.83,0 -1.5,-0.67 -1.5,-1.5S5.67,9 6.5,9 8,9.67 8,10.5 7.33,12 6.5,12zM9.5,8C8.67,8 8,7.33 8,6.5S8.67,5 9.5,5s1.5,0.67 1.5,1.5S10.33,8 9.5,8zM14.5,8c-0.83,0 -1.5,-0.67 -1.5,-1.5S13.67,5 14.5,5s1.5,0.67 1.5,1.5S15.33,8 14.5,8zM17.5,12c-0.83,0 -1.5,-0.67 -1.5,-1.5S16.67,9 17.5,9s1.5,0.67 1.5,1.5 -0.67,1.5 -1.5,1.5z" />
+</vector>
diff --git a/presentation/src/main/res/drawable/ic_people_black_24dp.xml b/presentation/src/main/res/drawable/ic_people_black_24dp.xml
index 91306539f..e5747f450 100644
--- a/presentation/src/main/res/drawable/ic_people_black_24dp.xml
+++ b/presentation/src/main/res/drawable/ic_people_black_24dp.xml
@@ -1,27 +1,27 @@
-<!--
-  ~ Copyright (C) 2019 Moez Bhatti <moez.bhatti@gmail.com>
-  ~
-  ~ This file is part of QKSMS.
-  ~
-  ~ QKSMS is free software: you can redistribute it and/or modify
-  ~ it under the terms of the GNU General Public License as published by
-  ~ the Free Software Foundation, either version 3 of the License, or
-  ~ (at your option) any later version.
-  ~
-  ~ QKSMS is distributed in the hope that it will be useful,
-  ~ but WITHOUT ANY WARRANTY; without even the implied warranty of
-  ~ MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
-  ~ GNU General Public License for more details.
-  ~
-  ~ You should have received a copy of the GNU General Public License
-  ~ along with QKSMS.  If not, see <http://www.gnu.org/licenses/>.
-  -->
-<vector xmlns:android="http://schemas.android.com/apk/res/android"
-    android:width="24dp"
-    android:height="24dp"
-    android:viewportWidth="24.0"
-    android:viewportHeight="24.0">
-    <path
-        android:fillColor="#FF000000"
-        android:pathData="M16,11c1.66,0 2.99,-1.34 2.99,-3S17.66,5 16,5c-1.66,0 -3,1.34 -3,3s1.34,3 3,3zM8,11c1.66,0 2.99,-1.34 2.99,-3S9.66,5 8,5C6.34,5 5,6.34 5,8s1.34,3 3,3zM8,13c-2.33,0 -7,1.17 -7,3.5L1,19h14v-2.5c0,-2.33 -4.67,-3.5 -7,-3.5zM16,13c-0.29,0 -0.62,0.02 -0.97,0.05 1.16,0.84 1.97,1.97 1.97,3.45L17,19h6v-2.5c0,-2.33 -4.67,-3.5 -7,-3.5z" />
-</vector>
+<!--
+  ~ Copyright (C) 2019 Moez Bhatti <moez.bhatti@gmail.com>
+  ~
+  ~ This file is part of QKSMS.
+  ~
+  ~ QKSMS is free software: you can redistribute it and/or modify
+  ~ it under the terms of the GNU General Public License as published by
+  ~ the Free Software Foundation, either version 3 of the License, or
+  ~ (at your option) any later version.
+  ~
+  ~ QKSMS is distributed in the hope that it will be useful,
+  ~ but WITHOUT ANY WARRANTY; without even the implied warranty of
+  ~ MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+  ~ GNU General Public License for more details.
+  ~
+  ~ You should have received a copy of the GNU General Public License
+  ~ along with QKSMS.  If not, see <http://www.gnu.org/licenses/>.
+  -->
+<vector xmlns:android="http://schemas.android.com/apk/res/android"
+    android:width="24dp"
+    android:height="24dp"
+    android:viewportWidth="24.0"
+    android:viewportHeight="24.0">
+    <path
+        android:fillColor="#FF000000"
+        android:pathData="M16,11c1.66,0 2.99,-1.34 2.99,-3S17.66,5 16,5c-1.66,0 -3,1.34 -3,3s1.34,3 3,3zM8,11c1.66,0 2.99,-1.34 2.99,-3S9.66,5 8,5C6.34,5 5,6.34 5,8s1.34,3 3,3zM8,13c-2.33,0 -7,1.17 -7,3.5L1,19h14v-2.5c0,-2.33 -4.67,-3.5 -7,-3.5zM16,13c-0.29,0 -0.62,0.02 -0.97,0.05 1.16,0.84 1.97,1.97 1.97,3.45L17,19h6v-2.5c0,-2.33 -4.67,-3.5 -7,-3.5z" />
+</vector>
diff --git a/presentation/src/main/res/drawable/ic_person_add_black_24dp.xml b/presentation/src/main/res/drawable/ic_person_add_black_24dp.xml
index 78aea7745..0920de6bf 100644
--- a/presentation/src/main/res/drawable/ic_person_add_black_24dp.xml
+++ b/presentation/src/main/res/drawable/ic_person_add_black_24dp.xml
@@ -1,27 +1,27 @@
-<!--
-  ~ Copyright (C) 2019 Moez Bhatti <moez.bhatti@gmail.com>
-  ~
-  ~ This file is part of QKSMS.
-  ~
-  ~ QKSMS is free software: you can redistribute it and/or modify
-  ~ it under the terms of the GNU General Public License as published by
-  ~ the Free Software Foundation, either version 3 of the License, or
-  ~ (at your option) any later version.
-  ~
-  ~ QKSMS is distributed in the hope that it will be useful,
-  ~ but WITHOUT ANY WARRANTY; without even the implied warranty of
-  ~ MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
-  ~ GNU General Public License for more details.
-  ~
-  ~ You should have received a copy of the GNU General Public License
-  ~ along with QKSMS.  If not, see <http://www.gnu.org/licenses/>.
-  -->
-<vector xmlns:android="http://schemas.android.com/apk/res/android"
-    android:width="24dp"
-    android:height="24dp"
-    android:viewportWidth="24.0"
-    android:viewportHeight="24.0">
-    <path
-        android:fillColor="#FF000000"
-        android:pathData="M15,12c2.21,0 4,-1.79 4,-4s-1.79,-4 -4,-4 -4,1.79 -4,4 1.79,4 4,4zM6,10L6,7L4,7v3L1,10v2h3v3h2v-3h3v-2L6,10zM15,14c-2.67,0 -8,1.34 -8,4v2h16v-2c0,-2.66 -5.33,-4 -8,-4z" />
-</vector>
+<!--
+  ~ Copyright (C) 2019 Moez Bhatti <moez.bhatti@gmail.com>
+  ~
+  ~ This file is part of QKSMS.
+  ~
+  ~ QKSMS is free software: you can redistribute it and/or modify
+  ~ it under the terms of the GNU General Public License as published by
+  ~ the Free Software Foundation, either version 3 of the License, or
+  ~ (at your option) any later version.
+  ~
+  ~ QKSMS is distributed in the hope that it will be useful,
+  ~ but WITHOUT ANY WARRANTY; without even the implied warranty of
+  ~ MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+  ~ GNU General Public License for more details.
+  ~
+  ~ You should have received a copy of the GNU General Public License
+  ~ along with QKSMS.  If not, see <http://www.gnu.org/licenses/>.
+  -->
+<vector xmlns:android="http://schemas.android.com/apk/res/android"
+    android:width="24dp"
+    android:height="24dp"
+    android:viewportWidth="24.0"
+    android:viewportHeight="24.0">
+    <path
+        android:fillColor="#FF000000"
+        android:pathData="M15,12c2.21,0 4,-1.79 4,-4s-1.79,-4 -4,-4 -4,1.79 -4,4 1.79,4 4,4zM6,10L6,7L4,7v3L1,10v2h3v3h2v-3h3v-2L6,10zM15,14c-2.67,0 -8,1.34 -8,4v2h16v-2c0,-2.66 -5.33,-4 -8,-4z" />
+</vector>
diff --git a/presentation/src/main/res/drawable/ic_person_black_24dp.xml b/presentation/src/main/res/drawable/ic_person_black_24dp.xml
index 87586bebc..490378f49 100644
--- a/presentation/src/main/res/drawable/ic_person_black_24dp.xml
+++ b/presentation/src/main/res/drawable/ic_person_black_24dp.xml
@@ -1,27 +1,27 @@
-<!--
-  ~ Copyright (C) 2019 Moez Bhatti <moez.bhatti@gmail.com>
-  ~
-  ~ This file is part of QKSMS.
-  ~
-  ~ QKSMS is free software: you can redistribute it and/or modify
-  ~ it under the terms of the GNU General Public License as published by
-  ~ the Free Software Foundation, either version 3 of the License, or
-  ~ (at your option) any later version.
-  ~
-  ~ QKSMS is distributed in the hope that it will be useful,
-  ~ but WITHOUT ANY WARRANTY; without even the implied warranty of
-  ~ MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
-  ~ GNU General Public License for more details.
-  ~
-  ~ You should have received a copy of the GNU General Public License
-  ~ along with QKSMS.  If not, see <http://www.gnu.org/licenses/>.
-  -->
-<vector xmlns:android="http://schemas.android.com/apk/res/android"
-    android:width="24dp"
-    android:height="24dp"
-    android:viewportWidth="24.0"
-    android:viewportHeight="24.0">
-    <path
-        android:fillColor="#FF000000"
-        android:pathData="M12,12c2.21,0 4,-1.79 4,-4s-1.79,-4 -4,-4 -4,1.79 -4,4 1.79,4 4,4zM12,14c-2.67,0 -8,1.34 -8,4v2h16v-2c0,-2.66 -5.33,-4 -8,-4z" />
-</vector>
+<!--
+  ~ Copyright (C) 2019 Moez Bhatti <moez.bhatti@gmail.com>
+  ~
+  ~ This file is part of QKSMS.
+  ~
+  ~ QKSMS is free software: you can redistribute it and/or modify
+  ~ it under the terms of the GNU General Public License as published by
+  ~ the Free Software Foundation, either version 3 of the License, or
+  ~ (at your option) any later version.
+  ~
+  ~ QKSMS is distributed in the hope that it will be useful,
+  ~ but WITHOUT ANY WARRANTY; without even the implied warranty of
+  ~ MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+  ~ GNU General Public License for more details.
+  ~
+  ~ You should have received a copy of the GNU General Public License
+  ~ along with QKSMS.  If not, see <http://www.gnu.org/licenses/>.
+  -->
+<vector xmlns:android="http://schemas.android.com/apk/res/android"
+    android:width="24dp"
+    android:height="24dp"
+    android:viewportWidth="24.0"
+    android:viewportHeight="24.0">
+    <path
+        android:fillColor="#FF000000"
+        android:pathData="M12,12c2.21,0 4,-1.79 4,-4s-1.79,-4 -4,-4 -4,1.79 -4,4 1.79,4 4,4zM12,14c-2.67,0 -8,1.34 -8,4v2h16v-2c0,-2.66 -5.33,-4 -8,-4z" />
+</vector>
diff --git a/presentation/src/main/res/drawable/ic_photo_size_select_actual_black_24dp.xml b/presentation/src/main/res/drawable/ic_photo_size_select_actual_black_24dp.xml
index d7c900379..49c405612 100644
--- a/presentation/src/main/res/drawable/ic_photo_size_select_actual_black_24dp.xml
+++ b/presentation/src/main/res/drawable/ic_photo_size_select_actual_black_24dp.xml
@@ -1,27 +1,27 @@
-<!--
-  ~ Copyright (C) 2019 Moez Bhatti <moez.bhatti@gmail.com>
-  ~
-  ~ This file is part of QKSMS.
-  ~
-  ~ QKSMS is free software: you can redistribute it and/or modify
-  ~ it under the terms of the GNU General Public License as published by
-  ~ the Free Software Foundation, either version 3 of the License, or
-  ~ (at your option) any later version.
-  ~
-  ~ QKSMS is distributed in the hope that it will be useful,
-  ~ but WITHOUT ANY WARRANTY; without even the implied warranty of
-  ~ MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
-  ~ GNU General Public License for more details.
-  ~
-  ~ You should have received a copy of the GNU General Public License
-  ~ along with QKSMS.  If not, see <http://www.gnu.org/licenses/>.
-  -->
-<vector xmlns:android="http://schemas.android.com/apk/res/android"
-    android:width="24dp"
-    android:height="24dp"
-    android:viewportWidth="24.0"
-    android:viewportHeight="24.0">
-    <path
-        android:fillColor="#FF000000"
-        android:pathData="M21,3H3C2,3 1,4 1,5v14c0,1.1 0.9,2 2,2h18c1,0 2,-1 2,-2V5c0,-1 -1,-2 -2,-2zM5,17l3.5,-4.5 2.5,3.01L14.5,11l4.5,6H5z" />
-</vector>
+<!--
+  ~ Copyright (C) 2019 Moez Bhatti <moez.bhatti@gmail.com>
+  ~
+  ~ This file is part of QKSMS.
+  ~
+  ~ QKSMS is free software: you can redistribute it and/or modify
+  ~ it under the terms of the GNU General Public License as published by
+  ~ the Free Software Foundation, either version 3 of the License, or
+  ~ (at your option) any later version.
+  ~
+  ~ QKSMS is distributed in the hope that it will be useful,
+  ~ but WITHOUT ANY WARRANTY; without even the implied warranty of
+  ~ MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+  ~ GNU General Public License for more details.
+  ~
+  ~ You should have received a copy of the GNU General Public License
+  ~ along with QKSMS.  If not, see <http://www.gnu.org/licenses/>.
+  -->
+<vector xmlns:android="http://schemas.android.com/apk/res/android"
+    android:width="24dp"
+    android:height="24dp"
+    android:viewportWidth="24.0"
+    android:viewportHeight="24.0">
+    <path
+        android:fillColor="#FF000000"
+        android:pathData="M21,3H3C2,3 1,4 1,5v14c0,1.1 0.9,2 2,2h18c1,0 2,-1 2,-2V5c0,-1 -1,-2 -2,-2zM5,17l3.5,-4.5 2.5,3.01L14.5,11l4.5,6H5z" />
+</vector>
diff --git a/presentation/src/main/res/drawable/ic_play_circle_filled_white_24dp.xml b/presentation/src/main/res/drawable/ic_play_circle_filled_white_24dp.xml
index b41ae2cf8..7dbc11314 100644
--- a/presentation/src/main/res/drawable/ic_play_circle_filled_white_24dp.xml
+++ b/presentation/src/main/res/drawable/ic_play_circle_filled_white_24dp.xml
@@ -1,28 +1,28 @@
-<!--
-  ~ Copyright (C) 2019 Moez Bhatti <moez.bhatti@gmail.com>
-  ~
-  ~ This file is part of QKSMS.
-  ~
-  ~ QKSMS is free software: you can redistribute it and/or modify
-  ~ it under the terms of the GNU General Public License as published by
-  ~ the Free Software Foundation, either version 3 of the License, or
-  ~ (at your option) any later version.
-  ~
-  ~ QKSMS is distributed in the hope that it will be useful,
-  ~ but WITHOUT ANY WARRANTY; without even the implied warranty of
-  ~ MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
-  ~ GNU General Public License for more details.
-  ~
-  ~ You should have received a copy of the GNU General Public License
-  ~ along with QKSMS.  If not, see <http://www.gnu.org/licenses/>.
-  -->
-<vector xmlns:android="http://schemas.android.com/apk/res/android"
-    android:width="24dp"
-    android:height="24dp"
-    android:tint="#FFFFFF"
-    android:viewportWidth="24.0"
-    android:viewportHeight="24.0">
-    <path
-        android:fillColor="#FF000000"
-        android:pathData="M12,2C6.48,2 2,6.48 2,12s4.48,10 10,10 10,-4.48 10,-10S17.52,2 12,2zM10,16.5v-9l6,4.5 -6,4.5z" />
-</vector>
+<!--
+  ~ Copyright (C) 2019 Moez Bhatti <moez.bhatti@gmail.com>
+  ~
+  ~ This file is part of QKSMS.
+  ~
+  ~ QKSMS is free software: you can redistribute it and/or modify
+  ~ it under the terms of the GNU General Public License as published by
+  ~ the Free Software Foundation, either version 3 of the License, or
+  ~ (at your option) any later version.
+  ~
+  ~ QKSMS is distributed in the hope that it will be useful,
+  ~ but WITHOUT ANY WARRANTY; without even the implied warranty of
+  ~ MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+  ~ GNU General Public License for more details.
+  ~
+  ~ You should have received a copy of the GNU General Public License
+  ~ along with QKSMS.  If not, see <http://www.gnu.org/licenses/>.
+  -->
+<vector xmlns:android="http://schemas.android.com/apk/res/android"
+    android:width="24dp"
+    android:height="24dp"
+    android:tint="#FFFFFF"
+    android:viewportWidth="24.0"
+    android:viewportHeight="24.0">
+    <path
+        android:fillColor="#FF000000"
+        android:pathData="M12,2C6.48,2 2,6.48 2,12s4.48,10 10,10 10,-4.48 10,-10S17.52,2 12,2zM10,16.5v-9l6,4.5 -6,4.5z" />
+</vector>
diff --git a/presentation/src/main/res/drawable/ic_radio_button_checked_black_24dp.xml b/presentation/src/main/res/drawable/ic_radio_button_checked_black_24dp.xml
index d4692685e..65f8903e7 100644
--- a/presentation/src/main/res/drawable/ic_radio_button_checked_black_24dp.xml
+++ b/presentation/src/main/res/drawable/ic_radio_button_checked_black_24dp.xml
@@ -1,27 +1,27 @@
-<!--
-  ~ Copyright (C) 2019 Moez Bhatti <moez.bhatti@gmail.com>
-  ~
-  ~ This file is part of QKSMS.
-  ~
-  ~ QKSMS is free software: you can redistribute it and/or modify
-  ~ it under the terms of the GNU General Public License as published by
-  ~ the Free Software Foundation, either version 3 of the License, or
-  ~ (at your option) any later version.
-  ~
-  ~ QKSMS is distributed in the hope that it will be useful,
-  ~ but WITHOUT ANY WARRANTY; without even the implied warranty of
-  ~ MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
-  ~ GNU General Public License for more details.
-  ~
-  ~ You should have received a copy of the GNU General Public License
-  ~ along with QKSMS.  If not, see <http://www.gnu.org/licenses/>.
-  -->
-<vector xmlns:android="http://schemas.android.com/apk/res/android"
-    android:width="24dp"
-    android:height="24dp"
-    android:viewportWidth="24.0"
-    android:viewportHeight="24.0">
-    <path
-        android:fillColor="#FF000000"
-        android:pathData="M12,7c-2.76,0 -5,2.24 -5,5s2.24,5 5,5 5,-2.24 5,-5 -2.24,-5 -5,-5zM12,2C6.48,2 2,6.48 2,12s4.48,10 10,10 10,-4.48 10,-10S17.52,2 12,2zM12,20c-4.42,0 -8,-3.58 -8,-8s3.58,-8 8,-8 8,3.58 8,8 -3.58,8 -8,8z" />
-</vector>
+<!--
+  ~ Copyright (C) 2019 Moez Bhatti <moez.bhatti@gmail.com>
+  ~
+  ~ This file is part of QKSMS.
+  ~
+  ~ QKSMS is free software: you can redistribute it and/or modify
+  ~ it under the terms of the GNU General Public License as published by
+  ~ the Free Software Foundation, either version 3 of the License, or
+  ~ (at your option) any later version.
+  ~
+  ~ QKSMS is distributed in the hope that it will be useful,
+  ~ but WITHOUT ANY WARRANTY; without even the implied warranty of
+  ~ MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+  ~ GNU General Public License for more details.
+  ~
+  ~ You should have received a copy of the GNU General Public License
+  ~ along with QKSMS.  If not, see <http://www.gnu.org/licenses/>.
+  -->
+<vector xmlns:android="http://schemas.android.com/apk/res/android"
+    android:width="24dp"
+    android:height="24dp"
+    android:viewportWidth="24.0"
+    android:viewportHeight="24.0">
+    <path
+        android:fillColor="#FF000000"
+        android:pathData="M12,7c-2.76,0 -5,2.24 -5,5s2.24,5 5,5 5,-2.24 5,-5 -2.24,-5 -5,-5zM12,2C6.48,2 2,6.48 2,12s4.48,10 10,10 10,-4.48 10,-10S17.52,2 12,2zM12,20c-4.42,0 -8,-3.58 -8,-8s3.58,-8 8,-8 8,3.58 8,8 -3.58,8 -8,8z" />
+</vector>
diff --git a/presentation/src/main/res/drawable/ic_radio_button_unchecked_black_24dp.xml b/presentation/src/main/res/drawable/ic_radio_button_unchecked_black_24dp.xml
index 4225a079c..2952f4379 100644
--- a/presentation/src/main/res/drawable/ic_radio_button_unchecked_black_24dp.xml
+++ b/presentation/src/main/res/drawable/ic_radio_button_unchecked_black_24dp.xml
@@ -1,27 +1,27 @@
-<!--
-  ~ Copyright (C) 2019 Moez Bhatti <moez.bhatti@gmail.com>
-  ~
-  ~ This file is part of QKSMS.
-  ~
-  ~ QKSMS is free software: you can redistribute it and/or modify
-  ~ it under the terms of the GNU General Public License as published by
-  ~ the Free Software Foundation, either version 3 of the License, or
-  ~ (at your option) any later version.
-  ~
-  ~ QKSMS is distributed in the hope that it will be useful,
-  ~ but WITHOUT ANY WARRANTY; without even the implied warranty of
-  ~ MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
-  ~ GNU General Public License for more details.
-  ~
-  ~ You should have received a copy of the GNU General Public License
-  ~ along with QKSMS.  If not, see <http://www.gnu.org/licenses/>.
-  -->
-<vector xmlns:android="http://schemas.android.com/apk/res/android"
-    android:width="24dp"
-    android:height="24dp"
-    android:viewportWidth="24.0"
-    android:viewportHeight="24.0">
-    <path
-        android:fillColor="#FF000000"
-        android:pathData="M12,2C6.48,2 2,6.48 2,12s4.48,10 10,10 10,-4.48 10,-10S17.52,2 12,2zM12,20c-4.42,0 -8,-3.58 -8,-8s3.58,-8 8,-8 8,3.58 8,8 -3.58,8 -8,8z" />
-</vector>
+<!--
+  ~ Copyright (C) 2019 Moez Bhatti <moez.bhatti@gmail.com>
+  ~
+  ~ This file is part of QKSMS.
+  ~
+  ~ QKSMS is free software: you can redistribute it and/or modify
+  ~ it under the terms of the GNU General Public License as published by
+  ~ the Free Software Foundation, either version 3 of the License, or
+  ~ (at your option) any later version.
+  ~
+  ~ QKSMS is distributed in the hope that it will be useful,
+  ~ but WITHOUT ANY WARRANTY; without even the implied warranty of
+  ~ MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+  ~ GNU General Public License for more details.
+  ~
+  ~ You should have received a copy of the GNU General Public License
+  ~ along with QKSMS.  If not, see <http://www.gnu.org/licenses/>.
+  -->
+<vector xmlns:android="http://schemas.android.com/apk/res/android"
+    android:width="24dp"
+    android:height="24dp"
+    android:viewportWidth="24.0"
+    android:viewportHeight="24.0">
+    <path
+        android:fillColor="#FF000000"
+        android:pathData="M12,2C6.48,2 2,6.48 2,12s4.48,10 10,10 10,-4.48 10,-10S17.52,2 12,2zM12,20c-4.42,0 -8,-3.58 -8,-8s3.58,-8 8,-8 8,3.58 8,8 -3.58,8 -8,8z" />
+</vector>
diff --git a/presentation/src/main/res/drawable/ic_reply_white_24dp.xml b/presentation/src/main/res/drawable/ic_reply_white_24dp.xml
index 649cc2b08..4c6cfb25b 100644
--- a/presentation/src/main/res/drawable/ic_reply_white_24dp.xml
+++ b/presentation/src/main/res/drawable/ic_reply_white_24dp.xml
@@ -1,27 +1,27 @@
-<!--
-  ~ Copyright (C) 2019 Moez Bhatti <moez.bhatti@gmail.com>
-  ~
-  ~ This file is part of QKSMS.
-  ~
-  ~ QKSMS is free software: you can redistribute it and/or modify
-  ~ it under the terms of the GNU General Public License as published by
-  ~ the Free Software Foundation, either version 3 of the License, or
-  ~ (at your option) any later version.
-  ~
-  ~ QKSMS is distributed in the hope that it will be useful,
-  ~ but WITHOUT ANY WARRANTY; without even the implied warranty of
-  ~ MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
-  ~ GNU General Public License for more details.
-  ~
-  ~ You should have received a copy of the GNU General Public License
-  ~ along with QKSMS.  If not, see <http://www.gnu.org/licenses/>.
-  -->
-<vector xmlns:android="http://schemas.android.com/apk/res/android"
-    android:width="24dp"
-    android:height="24dp"
-    android:viewportWidth="24.0"
-    android:viewportHeight="24.0">
-    <path
-        android:fillColor="#FFFFFFFF"
-        android:pathData="M10,9V5l-7,7 7,7v-4.1c5,0 8.5,1.6 11,5.1 -1,-5 -4,-10 -11,-11z" />
-</vector>
+<!--
+  ~ Copyright (C) 2019 Moez Bhatti <moez.bhatti@gmail.com>
+  ~
+  ~ This file is part of QKSMS.
+  ~
+  ~ QKSMS is free software: you can redistribute it and/or modify
+  ~ it under the terms of the GNU General Public License as published by
+  ~ the Free Software Foundation, either version 3 of the License, or
+  ~ (at your option) any later version.
+  ~
+  ~ QKSMS is distributed in the hope that it will be useful,
+  ~ but WITHOUT ANY WARRANTY; without even the implied warranty of
+  ~ MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+  ~ GNU General Public License for more details.
+  ~
+  ~ You should have received a copy of the GNU General Public License
+  ~ along with QKSMS.  If not, see <http://www.gnu.org/licenses/>.
+  -->
+<vector xmlns:android="http://schemas.android.com/apk/res/android"
+    android:width="24dp"
+    android:height="24dp"
+    android:viewportWidth="24.0"
+    android:viewportHeight="24.0">
+    <path
+        android:fillColor="#FFFFFFFF"
+        android:pathData="M10,9V5l-7,7 7,7v-4.1c5,0 8.5,1.6 11,5.1 -1,-5 -4,-10 -11,-11z" />
+</vector>
diff --git a/presentation/src/main/res/drawable/ic_send_black_24dp.xml b/presentation/src/main/res/drawable/ic_send_black_24dp.xml
index 7cbdd66bf..34efa55e2 100644
--- a/presentation/src/main/res/drawable/ic_send_black_24dp.xml
+++ b/presentation/src/main/res/drawable/ic_send_black_24dp.xml
@@ -1,27 +1,27 @@
-<!--
-  ~ Copyright (C) 2019 Moez Bhatti <moez.bhatti@gmail.com>
-  ~
-  ~ This file is part of QKSMS.
-  ~
-  ~ QKSMS is free software: you can redistribute it and/or modify
-  ~ it under the terms of the GNU General Public License as published by
-  ~ the Free Software Foundation, either version 3 of the License, or
-  ~ (at your option) any later version.
-  ~
-  ~ QKSMS is distributed in the hope that it will be useful,
-  ~ but WITHOUT ANY WARRANTY; without even the implied warranty of
-  ~ MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
-  ~ GNU General Public License for more details.
-  ~
-  ~ You should have received a copy of the GNU General Public License
-  ~ along with QKSMS.  If not, see <http://www.gnu.org/licenses/>.
-  -->
-<vector xmlns:android="http://schemas.android.com/apk/res/android"
-    android:width="24dp"
-    android:height="24dp"
-    android:viewportWidth="24.0"
-    android:viewportHeight="24.0">
-    <path
-        android:fillColor="#FF000000"
-        android:pathData="M2.01,21L23,12 2.01,3 2,10l15,2 -15,2z" />
-</vector>
+<!--
+  ~ Copyright (C) 2019 Moez Bhatti <moez.bhatti@gmail.com>
+  ~
+  ~ This file is part of QKSMS.
+  ~
+  ~ QKSMS is free software: you can redistribute it and/or modify
+  ~ it under the terms of the GNU General Public License as published by
+  ~ the Free Software Foundation, either version 3 of the License, or
+  ~ (at your option) any later version.
+  ~
+  ~ QKSMS is distributed in the hope that it will be useful,
+  ~ but WITHOUT ANY WARRANTY; without even the implied warranty of
+  ~ MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+  ~ GNU General Public License for more details.
+  ~
+  ~ You should have received a copy of the GNU General Public License
+  ~ along with QKSMS.  If not, see <http://www.gnu.org/licenses/>.
+  -->
+<vector xmlns:android="http://schemas.android.com/apk/res/android"
+    android:width="24dp"
+    android:height="24dp"
+    android:viewportWidth="24.0"
+    android:viewportHeight="24.0">
+    <path
+        android:fillColor="#FF000000"
+        android:pathData="M2.01,21L23,12 2.01,3 2,10l15,2 -15,2z" />
+</vector>
diff --git a/presentation/src/main/res/drawable/ic_settings_black_24dp.xml b/presentation/src/main/res/drawable/ic_settings_black_24dp.xml
index 185215a39..8ed634f54 100644
--- a/presentation/src/main/res/drawable/ic_settings_black_24dp.xml
+++ b/presentation/src/main/res/drawable/ic_settings_black_24dp.xml
@@ -1,27 +1,27 @@
-<!--
-  ~ Copyright (C) 2019 Moez Bhatti <moez.bhatti@gmail.com>
-  ~
-  ~ This file is part of QKSMS.
-  ~
-  ~ QKSMS is free software: you can redistribute it and/or modify
-  ~ it under the terms of the GNU General Public License as published by
-  ~ the Free Software Foundation, either version 3 of the License, or
-  ~ (at your option) any later version.
-  ~
-  ~ QKSMS is distributed in the hope that it will be useful,
-  ~ but WITHOUT ANY WARRANTY; without even the implied warranty of
-  ~ MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
-  ~ GNU General Public License for more details.
-  ~
-  ~ You should have received a copy of the GNU General Public License
-  ~ along with QKSMS.  If not, see <http://www.gnu.org/licenses/>.
-  -->
-<vector xmlns:android="http://schemas.android.com/apk/res/android"
-    android:width="24dp"
-    android:height="24dp"
-    android:viewportWidth="24.0"
-    android:viewportHeight="24.0">
-    <path
-        android:fillColor="#FF000000"
-        android:pathData="M19.43,12.98c0.04,-0.32 0.07,-0.64 0.07,-0.98s-0.03,-0.66 -0.07,-0.98l2.11,-1.65c0.19,-0.15 0.24,-0.42 0.12,-0.64l-2,-3.46c-0.12,-0.22 -0.39,-0.3 -0.61,-0.22l-2.49,1c-0.52,-0.4 -1.08,-0.73 -1.69,-0.98l-0.38,-2.65C14.46,2.18 14.25,2 14,2h-4c-0.25,0 -0.46,0.18 -0.49,0.42l-0.38,2.65c-0.61,0.25 -1.17,0.59 -1.69,0.98l-2.49,-1c-0.23,-0.09 -0.49,0 -0.61,0.22l-2,3.46c-0.13,0.22 -0.07,0.49 0.12,0.64l2.11,1.65c-0.04,0.32 -0.07,0.65 -0.07,0.98s0.03,0.66 0.07,0.98l-2.11,1.65c-0.19,0.15 -0.24,0.42 -0.12,0.64l2,3.46c0.12,0.22 0.39,0.3 0.61,0.22l2.49,-1c0.52,0.4 1.08,0.73 1.69,0.98l0.38,2.65c0.03,0.24 0.24,0.42 0.49,0.42h4c0.25,0 0.46,-0.18 0.49,-0.42l0.38,-2.65c0.61,-0.25 1.17,-0.59 1.69,-0.98l2.49,1c0.23,0.09 0.49,0 0.61,-0.22l2,-3.46c0.12,-0.22 0.07,-0.49 -0.12,-0.64l-2.11,-1.65zM12,15.5c-1.93,0 -3.5,-1.57 -3.5,-3.5s1.57,-3.5 3.5,-3.5 3.5,1.57 3.5,3.5 -1.57,3.5 -3.5,3.5z" />
-</vector>
+<!--
+  ~ Copyright (C) 2019 Moez Bhatti <moez.bhatti@gmail.com>
+  ~
+  ~ This file is part of QKSMS.
+  ~
+  ~ QKSMS is free software: you can redistribute it and/or modify
+  ~ it under the terms of the GNU General Public License as published by
+  ~ the Free Software Foundation, either version 3 of the License, or
+  ~ (at your option) any later version.
+  ~
+  ~ QKSMS is distributed in the hope that it will be useful,
+  ~ but WITHOUT ANY WARRANTY; without even the implied warranty of
+  ~ MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+  ~ GNU General Public License for more details.
+  ~
+  ~ You should have received a copy of the GNU General Public License
+  ~ along with QKSMS.  If not, see <http://www.gnu.org/licenses/>.
+  -->
+<vector xmlns:android="http://schemas.android.com/apk/res/android"
+    android:width="24dp"
+    android:height="24dp"
+    android:viewportWidth="24.0"
+    android:viewportHeight="24.0">
+    <path
+        android:fillColor="#FF000000"
+        android:pathData="M19.43,12.98c0.04,-0.32 0.07,-0.64 0.07,-0.98s-0.03,-0.66 -0.07,-0.98l2.11,-1.65c0.19,-0.15 0.24,-0.42 0.12,-0.64l-2,-3.46c-0.12,-0.22 -0.39,-0.3 -0.61,-0.22l-2.49,1c-0.52,-0.4 -1.08,-0.73 -1.69,-0.98l-0.38,-2.65C14.46,2.18 14.25,2 14,2h-4c-0.25,0 -0.46,0.18 -0.49,0.42l-0.38,2.65c-0.61,0.25 -1.17,0.59 -1.69,0.98l-2.49,-1c-0.23,-0.09 -0.49,0 -0.61,0.22l-2,3.46c-0.13,0.22 -0.07,0.49 0.12,0.64l2.11,1.65c-0.04,0.32 -0.07,0.65 -0.07,0.98s0.03,0.66 0.07,0.98l-2.11,1.65c-0.19,0.15 -0.24,0.42 -0.12,0.64l2,3.46c0.12,0.22 0.39,0.3 0.61,0.22l2.49,-1c0.52,0.4 1.08,0.73 1.69,0.98l0.38,2.65c0.03,0.24 0.24,0.42 0.49,0.42h4c0.25,0 0.46,-0.18 0.49,-0.42l0.38,-2.65c0.61,-0.25 1.17,-0.59 1.69,-0.98l2.49,1c0.23,0.09 0.49,0 0.61,-0.22l2,-3.46c0.12,-0.22 0.07,-0.49 -0.12,-0.64l-2.11,-1.65zM12,15.5c-1.93,0 -3.5,-1.57 -3.5,-3.5s1.57,-3.5 3.5,-3.5 3.5,1.57 3.5,3.5 -1.57,3.5 -3.5,3.5z" />
+</vector>
diff --git a/presentation/src/main/res/drawable/ic_short_text_black_24dp.xml b/presentation/src/main/res/drawable/ic_short_text_black_24dp.xml
index cc092d480..af3f05ea2 100644
--- a/presentation/src/main/res/drawable/ic_short_text_black_24dp.xml
+++ b/presentation/src/main/res/drawable/ic_short_text_black_24dp.xml
@@ -1,27 +1,27 @@
-<!--
-  ~ Copyright (C) 2019 Moez Bhatti <moez.bhatti@gmail.com>
-  ~
-  ~ This file is part of QKSMS.
-  ~
-  ~ QKSMS is free software: you can redistribute it and/or modify
-  ~ it under the terms of the GNU General Public License as published by
-  ~ the Free Software Foundation, either version 3 of the License, or
-  ~ (at your option) any later version.
-  ~
-  ~ QKSMS is distributed in the hope that it will be useful,
-  ~ but WITHOUT ANY WARRANTY; without even the implied warranty of
-  ~ MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
-  ~ GNU General Public License for more details.
-  ~
-  ~ You should have received a copy of the GNU General Public License
-  ~ along with QKSMS.  If not, see <http://www.gnu.org/licenses/>.
-  -->
-<vector xmlns:android="http://schemas.android.com/apk/res/android"
-    android:width="24dp"
-    android:height="24dp"
-    android:viewportWidth="24.0"
-    android:viewportHeight="24.0">
-    <path
-        android:fillColor="#FF000000"
-        android:pathData="M4,9h16v2L4,11zM4,13h10v2L4,15z" />
-</vector>
+<!--
+  ~ Copyright (C) 2019 Moez Bhatti <moez.bhatti@gmail.com>
+  ~
+  ~ This file is part of QKSMS.
+  ~
+  ~ QKSMS is free software: you can redistribute it and/or modify
+  ~ it under the terms of the GNU General Public License as published by
+  ~ the Free Software Foundation, either version 3 of the License, or
+  ~ (at your option) any later version.
+  ~
+  ~ QKSMS is distributed in the hope that it will be useful,
+  ~ but WITHOUT ANY WARRANTY; without even the implied warranty of
+  ~ MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+  ~ GNU General Public License for more details.
+  ~
+  ~ You should have received a copy of the GNU General Public License
+  ~ along with QKSMS.  If not, see <http://www.gnu.org/licenses/>.
+  -->
+<vector xmlns:android="http://schemas.android.com/apk/res/android"
+    android:width="24dp"
+    android:height="24dp"
+    android:viewportWidth="24.0"
+    android:viewportHeight="24.0">
+    <path
+        android:fillColor="#FF000000"
+        android:pathData="M4,9h16v2L4,11zM4,13h10v2L4,15z" />
+</vector>
diff --git a/presentation/src/main/res/drawable/ic_sim_card_black_24dp.xml b/presentation/src/main/res/drawable/ic_sim_card_black_24dp.xml
index 862ac6a96..bd080d4fb 100644
--- a/presentation/src/main/res/drawable/ic_sim_card_black_24dp.xml
+++ b/presentation/src/main/res/drawable/ic_sim_card_black_24dp.xml
@@ -1,27 +1,27 @@
-<!--
-  ~ Copyright (C) 2019 Moez Bhatti <moez.bhatti@gmail.com>
-  ~
-  ~ This file is part of QKSMS.
-  ~
-  ~ QKSMS is free software: you can redistribute it and/or modify
-  ~ it under the terms of the GNU General Public License as published by
-  ~ the Free Software Foundation, either version 3 of the License, or
-  ~ (at your option) any later version.
-  ~
-  ~ QKSMS is distributed in the hope that it will be useful,
-  ~ but WITHOUT ANY WARRANTY; without even the implied warranty of
-  ~ MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
-  ~ GNU General Public License for more details.
-  ~
-  ~ You should have received a copy of the GNU General Public License
-  ~ along with QKSMS.  If not, see <http://www.gnu.org/licenses/>.
-  -->
-<vector xmlns:android="http://schemas.android.com/apk/res/android"
-    android:width="24dp"
-    android:height="24dp"
-    android:viewportWidth="24.0"
-    android:viewportHeight="24.0">
-    <path
-        android:fillColor="#FF000000"
-        android:pathData="M18,2h-8L4.02,8 4,20c0,1.1 0.9,2 2,2h12c1.1,0 2,-0.9 2,-2L20,4c0,-1.1 -0.9,-2 -2,-2zM14,8h" />
-</vector>
+<!--
+  ~ Copyright (C) 2019 Moez Bhatti <moez.bhatti@gmail.com>
+  ~
+  ~ This file is part of QKSMS.
+  ~
+  ~ QKSMS is free software: you can redistribute it and/or modify
+  ~ it under the terms of the GNU General Public License as published by
+  ~ the Free Software Foundation, either version 3 of the License, or
+  ~ (at your option) any later version.
+  ~
+  ~ QKSMS is distributed in the hope that it will be useful,
+  ~ but WITHOUT ANY WARRANTY; without even the implied warranty of
+  ~ MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+  ~ GNU General Public License for more details.
+  ~
+  ~ You should have received a copy of the GNU General Public License
+  ~ along with QKSMS.  If not, see <http://www.gnu.org/licenses/>.
+  -->
+<vector xmlns:android="http://schemas.android.com/apk/res/android"
+    android:width="24dp"
+    android:height="24dp"
+    android:viewportWidth="24.0"
+    android:viewportHeight="24.0">
+    <path
+        android:fillColor="#FF000000"
+        android:pathData="M18,2h-8L4.02,8 4,20c0,1.1 0.9,2 2,2h12c1.1,0 2,-0.9 2,-2L20,4c0,-1.1 -0.9,-2 -2,-2zM14,8h" />
+</vector>
diff --git a/presentation/src/main/res/drawable/ic_smartphone_black_24dp.xml b/presentation/src/main/res/drawable/ic_smartphone_black_24dp.xml
index 821a72449..2c8965db9 100644
--- a/presentation/src/main/res/drawable/ic_smartphone_black_24dp.xml
+++ b/presentation/src/main/res/drawable/ic_smartphone_black_24dp.xml
@@ -1,27 +1,27 @@
-<!--
-  ~ Copyright (C) 2019 Moez Bhatti <moez.bhatti@gmail.com>
-  ~
-  ~ This file is part of QKSMS.
-  ~
-  ~ QKSMS is free software: you can redistribute it and/or modify
-  ~ it under the terms of the GNU General Public License as published by
-  ~ the Free Software Foundation, either version 3 of the License, or
-  ~ (at your option) any later version.
-  ~
-  ~ QKSMS is distributed in the hope that it will be useful,
-  ~ but WITHOUT ANY WARRANTY; without even the implied warranty of
-  ~ MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
-  ~ GNU General Public License for more details.
-  ~
-  ~ You should have received a copy of the GNU General Public License
-  ~ along with QKSMS.  If not, see <http://www.gnu.org/licenses/>.
-  -->
-<vector xmlns:android="http://schemas.android.com/apk/res/android"
-    android:width="24dp"
-    android:height="24dp"
-    android:viewportWidth="24.0"
-    android:viewportHeight="24.0">
-    <path
-        android:fillColor="#FF000000"
-        android:pathData="M17,1.01L7,1c-1.1,0 -2,0.9 -2,2v18c0,1.1 0.9,2 2,2h10c1.1,0 2,-0.9 2,-2V3c0,-1.1 -0.9,-1.99 -2,-1.99zM17,19H7V5h10v14z" />
-</vector>
+<!--
+  ~ Copyright (C) 2019 Moez Bhatti <moez.bhatti@gmail.com>
+  ~
+  ~ This file is part of QKSMS.
+  ~
+  ~ QKSMS is free software: you can redistribute it and/or modify
+  ~ it under the terms of the GNU General Public License as published by
+  ~ the Free Software Foundation, either version 3 of the License, or
+  ~ (at your option) any later version.
+  ~
+  ~ QKSMS is distributed in the hope that it will be useful,
+  ~ but WITHOUT ANY WARRANTY; without even the implied warranty of
+  ~ MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+  ~ GNU General Public License for more details.
+  ~
+  ~ You should have received a copy of the GNU General Public License
+  ~ along with QKSMS.  If not, see <http://www.gnu.org/licenses/>.
+  -->
+<vector xmlns:android="http://schemas.android.com/apk/res/android"
+    android:width="24dp"
+    android:height="24dp"
+    android:viewportWidth="24.0"
+    android:viewportHeight="24.0">
+    <path
+        android:fillColor="#FF000000"
+        android:pathData="M17,1.01L7,1c-1.1,0 -2,0.9 -2,2v18c0,1.1 0.9,2 2,2h10c1.1,0 2,-0.9 2,-2V3c0,-1.1 -0.9,-1.99 -2,-1.99zM17,19H7V5h10v14z" />
+</vector>
diff --git a/presentation/src/main/res/drawable/ic_speech_black_24dp.xml b/presentation/src/main/res/drawable/ic_speech_black_24dp.xml
new file mode 100644
index 000000000..cba949793
--- /dev/null
+++ b/presentation/src/main/res/drawable/ic_speech_black_24dp.xml
@@ -0,0 +1,30 @@
+<!--
+  ~ Copyright (C) 2021 to268
+  ~
+  ~ This file is part of QKSMS.
+  ~
+  ~ QKSMS is free software: you can redistribute it and/or modify
+  ~ it under the terms of the GNU General Public License as published by
+  ~ the Free Software Foundation, either version 3 of the License, or
+  ~ (at your option) any later version.
+  ~
+  ~ QKSMS is distributed in the hope that it will be useful,
+  ~ but WITHOUT ANY WARRANTY; without even the implied warranty of
+  ~ MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+  ~ GNU General Public License for more details.
+  ~
+  ~ You should have received a copy of the GNU General Public License
+  ~ along with QKSMS.  If not, see <http://www.gnu.org/licenses/>.
+  -->
+<vector xmlns:android="http://schemas.android.com/apk/res/android"
+    android:width="24dp"
+    android:height="24dp"
+    android:viewportWidth="24"
+    android:viewportHeight="24">
+    <path
+        android:fillColor="#FF000000"
+        android:pathData="M9,9m-4,0a4,4 0,1 1,8 0a4,4 0,1 1,-8 0"/>
+    <path
+        android:fillColor="#FF000000"
+        android:pathData="M9,15c-2.67,0 -8,1.34 -8,4v2h16v-2c0,-2.66 -5.33,-4 -8,-4zM16.76,5.36l-1.68,1.69c0.84,1.18 0.84,2.71 0,3.89l1.68,1.69c2.02,-2.02 2.02,-5.07 0,-7.27zM20.07,2l-1.63,1.63c2.77,3.02 2.77,7.56 0,10.74L20.07,16c3.9,-3.89 3.91,-9.95 0,-14z"/>
+</vector>
diff --git a/presentation/src/main/res/drawable/ic_star_black_24dp.xml b/presentation/src/main/res/drawable/ic_star_black_24dp.xml
index a1b975f41..d66c11ea3 100644
--- a/presentation/src/main/res/drawable/ic_star_black_24dp.xml
+++ b/presentation/src/main/res/drawable/ic_star_black_24dp.xml
@@ -1,27 +1,27 @@
-<!--
-  ~ Copyright (C) 2019 Moez Bhatti <moez.bhatti@gmail.com>
-  ~
-  ~ This file is part of QKSMS.
-  ~
-  ~ QKSMS is free software: you can redistribute it and/or modify
-  ~ it under the terms of the GNU General Public License as published by
-  ~ the Free Software Foundation, either version 3 of the License, or
-  ~ (at your option) any later version.
-  ~
-  ~ QKSMS is distributed in the hope that it will be useful,
-  ~ but WITHOUT ANY WARRANTY; without even the implied warranty of
-  ~ MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
-  ~ GNU General Public License for more details.
-  ~
-  ~ You should have received a copy of the GNU General Public License
-  ~ along with QKSMS.  If not, see <http://www.gnu.org/licenses/>.
-  -->
-<vector xmlns:android="http://schemas.android.com/apk/res/android"
-    android:width="24dp"
-    android:height="24dp"
-    android:viewportWidth="24.0"
-    android:viewportHeight="24.0">
-    <path
-        android:fillColor="#FF000000"
-        android:pathData="M12,17.27L18.18,21l-1.64,-7.03L22,9.24l-7.19,-0.61L12,2 9.19,8.63 2,9.24l5.46,4.73L5.82,21z" />
-</vector>
+<!--
+  ~ Copyright (C) 2019 Moez Bhatti <moez.bhatti@gmail.com>
+  ~
+  ~ This file is part of QKSMS.
+  ~
+  ~ QKSMS is free software: you can redistribute it and/or modify
+  ~ it under the terms of the GNU General Public License as published by
+  ~ the Free Software Foundation, either version 3 of the License, or
+  ~ (at your option) any later version.
+  ~
+  ~ QKSMS is distributed in the hope that it will be useful,
+  ~ but WITHOUT ANY WARRANTY; without even the implied warranty of
+  ~ MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+  ~ GNU General Public License for more details.
+  ~
+  ~ You should have received a copy of the GNU General Public License
+  ~ along with QKSMS.  If not, see <http://www.gnu.org/licenses/>.
+  -->
+<vector xmlns:android="http://schemas.android.com/apk/res/android"
+    android:width="24dp"
+    android:height="24dp"
+    android:viewportWidth="24.0"
+    android:viewportHeight="24.0">
+    <path
+        android:fillColor="#FF000000"
+        android:pathData="M12,17.27L18.18,21l-1.64,-7.03L22,9.24l-7.19,-0.61L12,2 9.19,8.63 2,9.24l5.46,4.73L5.82,21z" />
+</vector>
diff --git a/presentation/src/main/res/drawable/ic_sync_black_24dp.xml b/presentation/src/main/res/drawable/ic_sync_black_24dp.xml
index b6347f01d..ff3305004 100644
--- a/presentation/src/main/res/drawable/ic_sync_black_24dp.xml
+++ b/presentation/src/main/res/drawable/ic_sync_black_24dp.xml
@@ -1,27 +1,27 @@
-<!--
-  ~ Copyright (C) 2019 Moez Bhatti <moez.bhatti@gmail.com>
-  ~
-  ~ This file is part of QKSMS.
-  ~
-  ~ QKSMS is free software: you can redistribute it and/or modify
-  ~ it under the terms of the GNU General Public License as published by
-  ~ the Free Software Foundation, either version 3 of the License, or
-  ~ (at your option) any later version.
-  ~
-  ~ QKSMS is distributed in the hope that it will be useful,
-  ~ but WITHOUT ANY WARRANTY; without even the implied warranty of
-  ~ MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
-  ~ GNU General Public License for more details.
-  ~
-  ~ You should have received a copy of the GNU General Public License
-  ~ along with QKSMS.  If not, see <http://www.gnu.org/licenses/>.
-  -->
-<vector xmlns:android="http://schemas.android.com/apk/res/android"
-    android:width="24dp"
-    android:height="24dp"
-    android:viewportWidth="24.0"
-    android:viewportHeight="24.0">
-    <path
-        android:fillColor="#FF000000"
-        android:pathData="M12,4L12,1L8,5l4,4L12,6c3.31,0 6,2.69 6,6 0,1.01 -0.25,1.97 -0.7,2.8l1.46,1.46C19.54,15.03 20,13.57 20,12c0,-4.42 -3.58,-8 -8,-8zM12,18c-3.31,0 -6,-2.69 -6,-6 0,-1.01 0.25,-1.97 0.7,-2.8L5.24,7.74C4.46,8.97 4,10.43 4,12c0,4.42 3.58,8 8,8v3l4,-4 -4,-4v3z" />
-</vector>
+<!--
+  ~ Copyright (C) 2019 Moez Bhatti <moez.bhatti@gmail.com>
+  ~
+  ~ This file is part of QKSMS.
+  ~
+  ~ QKSMS is free software: you can redistribute it and/or modify
+  ~ it under the terms of the GNU General Public License as published by
+  ~ the Free Software Foundation, either version 3 of the License, or
+  ~ (at your option) any later version.
+  ~
+  ~ QKSMS is distributed in the hope that it will be useful,
+  ~ but WITHOUT ANY WARRANTY; without even the implied warranty of
+  ~ MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+  ~ GNU General Public License for more details.
+  ~
+  ~ You should have received a copy of the GNU General Public License
+  ~ along with QKSMS.  If not, see <http://www.gnu.org/licenses/>.
+  -->
+<vector xmlns:android="http://schemas.android.com/apk/res/android"
+    android:width="24dp"
+    android:height="24dp"
+    android:viewportWidth="24.0"
+    android:viewportHeight="24.0">
+    <path
+        android:fillColor="#FF000000"
+        android:pathData="M12,4L12,1L8,5l4,4L12,6c3.31,0 6,2.69 6,6 0,1.01 -0.25,1.97 -0.7,2.8l1.46,1.46C19.54,15.03 20,13.57 20,12c0,-4.42 -3.58,-8 -8,-8zM12,18c-3.31,0 -6,-2.69 -6,-6 0,-1.01 0.25,-1.97 0.7,-2.8L5.24,7.74C4.46,8.97 4,10.43 4,12c0,4.42 3.58,8 8,8v3l4,-4 -4,-4v3z" />
+</vector>
diff --git a/presentation/src/main/res/drawable/ic_title_black_24dp.xml b/presentation/src/main/res/drawable/ic_title_black_24dp.xml
index 6db01c458..78ceb4e39 100644
--- a/presentation/src/main/res/drawable/ic_title_black_24dp.xml
+++ b/presentation/src/main/res/drawable/ic_title_black_24dp.xml
@@ -1,27 +1,27 @@
-<!--
-  ~ Copyright (C) 2019 Moez Bhatti <moez.bhatti@gmail.com>
-  ~
-  ~ This file is part of QKSMS.
-  ~
-  ~ QKSMS is free software: you can redistribute it and/or modify
-  ~ it under the terms of the GNU General Public License as published by
-  ~ the Free Software Foundation, either version 3 of the License, or
-  ~ (at your option) any later version.
-  ~
-  ~ QKSMS is distributed in the hope that it will be useful,
-  ~ but WITHOUT ANY WARRANTY; without even the implied warranty of
-  ~ MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
-  ~ GNU General Public License for more details.
-  ~
-  ~ You should have received a copy of the GNU General Public License
-  ~ along with QKSMS.  If not, see <http://www.gnu.org/licenses/>.
-  -->
-<vector xmlns:android="http://schemas.android.com/apk/res/android"
-    android:width="24dp"
-    android:height="24dp"
-    android:viewportWidth="24.0"
-    android:viewportHeight="24.0">
-    <path
-        android:fillColor="#FF000000"
-        android:pathData="M5,4v3h5.5v12h3V7H19V4z" />
-</vector>
+<!--
+  ~ Copyright (C) 2019 Moez Bhatti <moez.bhatti@gmail.com>
+  ~
+  ~ This file is part of QKSMS.
+  ~
+  ~ QKSMS is free software: you can redistribute it and/or modify
+  ~ it under the terms of the GNU General Public License as published by
+  ~ the Free Software Foundation, either version 3 of the License, or
+  ~ (at your option) any later version.
+  ~
+  ~ QKSMS is distributed in the hope that it will be useful,
+  ~ but WITHOUT ANY WARRANTY; without even the implied warranty of
+  ~ MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+  ~ GNU General Public License for more details.
+  ~
+  ~ You should have received a copy of the GNU General Public License
+  ~ along with QKSMS.  If not, see <http://www.gnu.org/licenses/>.
+  -->
+<vector xmlns:android="http://schemas.android.com/apk/res/android"
+    android:width="24dp"
+    android:height="24dp"
+    android:viewportWidth="24.0"
+    android:viewportHeight="24.0">
+    <path
+        android:fillColor="#FF000000"
+        android:pathData="M5,4v3h5.5v12h3V7H19V4z" />
+</vector>
diff --git a/presentation/src/main/res/drawable/ic_unfold_less_black_24dp.xml b/presentation/src/main/res/drawable/ic_unfold_less_black_24dp.xml
index 92ab6b508..31632a659 100644
--- a/presentation/src/main/res/drawable/ic_unfold_less_black_24dp.xml
+++ b/presentation/src/main/res/drawable/ic_unfold_less_black_24dp.xml
@@ -1,27 +1,27 @@
-<!--
-  ~ Copyright (C) 2019 Moez Bhatti <moez.bhatti@gmail.com>
-  ~
-  ~ This file is part of QKSMS.
-  ~
-  ~ QKSMS is free software: you can redistribute it and/or modify
-  ~ it under the terms of the GNU General Public License as published by
-  ~ the Free Software Foundation, either version 3 of the License, or
-  ~ (at your option) any later version.
-  ~
-  ~ QKSMS is distributed in the hope that it will be useful,
-  ~ but WITHOUT ANY WARRANTY; without even the implied warranty of
-  ~ MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
-  ~ GNU General Public License for more details.
-  ~
-  ~ You should have received a copy of the GNU General Public License
-  ~ along with QKSMS.  If not, see <http://www.gnu.org/licenses/>.
-  -->
-<vector xmlns:android="http://schemas.android.com/apk/res/android"
-    android:width="24dp"
-    android:height="24dp"
-    android:viewportWidth="24.0"
-    android:viewportHeight="24.0">
-    <path
-        android:fillColor="#FF000000"
-        android:pathData="M7.41,18.59L8.83,20 12,16.83 15.17,20l1.41,-1.41L12,14l-4.59,4.59zM16.59,5.41L15.17,4 12,7.17 8.83,4 7.41,5.41 12,10l4.59,-4.59z" />
-</vector>
+<!--
+  ~ Copyright (C) 2019 Moez Bhatti <moez.bhatti@gmail.com>
+  ~
+  ~ This file is part of QKSMS.
+  ~
+  ~ QKSMS is free software: you can redistribute it and/or modify
+  ~ it under the terms of the GNU General Public License as published by
+  ~ the Free Software Foundation, either version 3 of the License, or
+  ~ (at your option) any later version.
+  ~
+  ~ QKSMS is distributed in the hope that it will be useful,
+  ~ but WITHOUT ANY WARRANTY; without even the implied warranty of
+  ~ MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+  ~ GNU General Public License for more details.
+  ~
+  ~ You should have received a copy of the GNU General Public License
+  ~ along with QKSMS.  If not, see <http://www.gnu.org/licenses/>.
+  -->
+<vector xmlns:android="http://schemas.android.com/apk/res/android"
+    android:width="24dp"
+    android:height="24dp"
+    android:viewportWidth="24.0"
+    android:viewportHeight="24.0">
+    <path
+        android:fillColor="#FF000000"
+        android:pathData="M7.41,18.59L8.83,20 12,16.83 15.17,20l1.41,-1.41L12,14l-4.59,4.59zM16.59,5.41L15.17,4 12,7.17 8.83,4 7.41,5.41 12,10l4.59,-4.59z" />
+</vector>
diff --git a/presentation/src/main/res/drawable/ic_unfold_more_black_24dp.xml b/presentation/src/main/res/drawable/ic_unfold_more_black_24dp.xml
index 8aa8c0cd3..a9a3d3823 100644
--- a/presentation/src/main/res/drawable/ic_unfold_more_black_24dp.xml
+++ b/presentation/src/main/res/drawable/ic_unfold_more_black_24dp.xml
@@ -1,27 +1,27 @@
-<!--
-  ~ Copyright (C) 2019 Moez Bhatti <moez.bhatti@gmail.com>
-  ~
-  ~ This file is part of QKSMS.
-  ~
-  ~ QKSMS is free software: you can redistribute it and/or modify
-  ~ it under the terms of the GNU General Public License as published by
-  ~ the Free Software Foundation, either version 3 of the License, or
-  ~ (at your option) any later version.
-  ~
-  ~ QKSMS is distributed in the hope that it will be useful,
-  ~ but WITHOUT ANY WARRANTY; without even the implied warranty of
-  ~ MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
-  ~ GNU General Public License for more details.
-  ~
-  ~ You should have received a copy of the GNU General Public License
-  ~ along with QKSMS.  If not, see <http://www.gnu.org/licenses/>.
-  -->
-<vector xmlns:android="http://schemas.android.com/apk/res/android"
-    android:width="24dp"
-    android:height="24dp"
-    android:viewportWidth="24.0"
-    android:viewportHeight="24.0">
-    <path
-        android:fillColor="#FF000000"
-        android:pathData="M12,5.83L15.17,9l1.41,-1.41L12,3 7.41,7.59 8.83,9 12,5.83zM12,18.17L8.83,15l-1.41,1.41L12,21l4.59,-4.59L15.17,15 12,18.17z" />
-</vector>
+<!--
+  ~ Copyright (C) 2019 Moez Bhatti <moez.bhatti@gmail.com>
+  ~
+  ~ This file is part of QKSMS.
+  ~
+  ~ QKSMS is free software: you can redistribute it and/or modify
+  ~ it under the terms of the GNU General Public License as published by
+  ~ the Free Software Foundation, either version 3 of the License, or
+  ~ (at your option) any later version.
+  ~
+  ~ QKSMS is distributed in the hope that it will be useful,
+  ~ but WITHOUT ANY WARRANTY; without even the implied warranty of
+  ~ MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+  ~ GNU General Public License for more details.
+  ~
+  ~ You should have received a copy of the GNU General Public License
+  ~ along with QKSMS.  If not, see <http://www.gnu.org/licenses/>.
+  -->
+<vector xmlns:android="http://schemas.android.com/apk/res/android"
+    android:width="24dp"
+    android:height="24dp"
+    android:viewportWidth="24.0"
+    android:viewportHeight="24.0">
+    <path
+        android:fillColor="#FF000000"
+        android:pathData="M12,5.83L15.17,9l1.41,-1.41L12,3 7.41,7.59 8.83,9 12,5.83zM12,18.17L8.83,15l-1.41,1.41L12,21l4.59,-4.59L15.17,15 12,18.17z" />
+</vector>
diff --git a/presentation/src/main/res/drawable/message_emoji.xml b/presentation/src/main/res/drawable/message_emoji.xml
index 9d41280a6..bf8256652 100644
--- a/presentation/src/main/res/drawable/message_emoji.xml
+++ b/presentation/src/main/res/drawable/message_emoji.xml
@@ -1,28 +1,28 @@
-<?xml version="1.0" encoding="utf-8"?>
-<!--
-  ~ Copyright (C) 2019 Moez Bhatti <moez.bhatti@gmail.com>
-  ~
-  ~ This file is part of QKSMS.
-  ~
-  ~ QKSMS is free software: you can redistribute it and/or modify
-  ~ it under the terms of the GNU General Public License as published by
-  ~ the Free Software Foundation, either version 3 of the License, or
-  ~ (at your option) any later version.
-  ~
-  ~ QKSMS is distributed in the hope that it will be useful,
-  ~ but WITHOUT ANY WARRANTY; without even the implied warranty of
-  ~ MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
-  ~ GNU General Public License for more details.
-  ~
-  ~ You should have received a copy of the GNU General Public License
-  ~ along with QKSMS.  If not, see <http://www.gnu.org/licenses/>.
-  -->
-<shape xmlns:android="http://schemas.android.com/apk/res/android"
-    android:shape="rectangle">
-
-    <solid android:color="@android:color/transparent" />
-    <padding
-        android:bottom="8dp"
-        android:top="8dp" />
-
-</shape>
+<?xml version="1.0" encoding="utf-8"?>
+<!--
+  ~ Copyright (C) 2019 Moez Bhatti <moez.bhatti@gmail.com>
+  ~
+  ~ This file is part of QKSMS.
+  ~
+  ~ QKSMS is free software: you can redistribute it and/or modify
+  ~ it under the terms of the GNU General Public License as published by
+  ~ the Free Software Foundation, either version 3 of the License, or
+  ~ (at your option) any later version.
+  ~
+  ~ QKSMS is distributed in the hope that it will be useful,
+  ~ but WITHOUT ANY WARRANTY; without even the implied warranty of
+  ~ MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+  ~ GNU General Public License for more details.
+  ~
+  ~ You should have received a copy of the GNU General Public License
+  ~ along with QKSMS.  If not, see <http://www.gnu.org/licenses/>.
+  -->
+<shape xmlns:android="http://schemas.android.com/apk/res/android"
+    android:shape="rectangle">
+
+    <solid android:color="@android:color/transparent" />
+    <padding
+        android:bottom="8dp"
+        android:top="8dp" />
+
+</shape>
diff --git a/presentation/src/main/res/drawable/message_in_first.xml b/presentation/src/main/res/drawable/message_in_first.xml
index 782bf98a7..428d83e7a 100644
--- a/presentation/src/main/res/drawable/message_in_first.xml
+++ b/presentation/src/main/res/drawable/message_in_first.xml
@@ -1,35 +1,35 @@
-<?xml version="1.0" encoding="utf-8"?>
-<!--
-  ~ Copyright (C) 2019 Moez Bhatti <moez.bhatti@gmail.com>
-  ~
-  ~ This file is part of QKSMS.
-  ~
-  ~ QKSMS is free software: you can redistribute it and/or modify
-  ~ it under the terms of the GNU General Public License as published by
-  ~ the Free Software Foundation, either version 3 of the License, or
-  ~ (at your option) any later version.
-  ~
-  ~ QKSMS is distributed in the hope that it will be useful,
-  ~ but WITHOUT ANY WARRANTY; without even the implied warranty of
-  ~ MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
-  ~ GNU General Public License for more details.
-  ~
-  ~ You should have received a copy of the GNU General Public License
-  ~ along with QKSMS.  If not, see <http://www.gnu.org/licenses/>.
-  -->
-<shape xmlns:android="http://schemas.android.com/apk/res/android"
-    android:shape="rectangle">
-
-    <corners
-        android:bottomLeftRadius="4dp"
-        android:bottomRightRadius="18dp"
-        android:topLeftRadius="18dp"
-        android:topRightRadius="18dp" />
-    <solid android:color="@android:color/white" />
-    <padding
-        android:bottom="8dp"
-        android:left="12dp"
-        android:right="12dp"
-        android:top="8dp" />
-
+<?xml version="1.0" encoding="utf-8"?>
+<!--
+  ~ Copyright (C) 2019 Moez Bhatti <moez.bhatti@gmail.com>
+  ~
+  ~ This file is part of QKSMS.
+  ~
+  ~ QKSMS is free software: you can redistribute it and/or modify
+  ~ it under the terms of the GNU General Public License as published by
+  ~ the Free Software Foundation, either version 3 of the License, or
+  ~ (at your option) any later version.
+  ~
+  ~ QKSMS is distributed in the hope that it will be useful,
+  ~ but WITHOUT ANY WARRANTY; without even the implied warranty of
+  ~ MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+  ~ GNU General Public License for more details.
+  ~
+  ~ You should have received a copy of the GNU General Public License
+  ~ along with QKSMS.  If not, see <http://www.gnu.org/licenses/>.
+  -->
+<shape xmlns:android="http://schemas.android.com/apk/res/android"
+    android:shape="rectangle">
+
+    <corners
+        android:bottomLeftRadius="4dp"
+        android:bottomRightRadius="18dp"
+        android:topLeftRadius="18dp"
+        android:topRightRadius="18dp" />
+    <solid android:color="@android:color/white" />
+    <padding
+        android:bottom="8dp"
+        android:left="12dp"
+        android:right="12dp"
+        android:top="8dp" />
+
 </shape>
\ No newline at end of file
diff --git a/presentation/src/main/res/drawable/message_in_last.xml b/presentation/src/main/res/drawable/message_in_last.xml
index 56ef609b6..b87636230 100644
--- a/presentation/src/main/res/drawable/message_in_last.xml
+++ b/presentation/src/main/res/drawable/message_in_last.xml
@@ -1,35 +1,35 @@
-<?xml version="1.0" encoding="utf-8"?>
-<!--
-  ~ Copyright (C) 2019 Moez Bhatti <moez.bhatti@gmail.com>
-  ~
-  ~ This file is part of QKSMS.
-  ~
-  ~ QKSMS is free software: you can redistribute it and/or modify
-  ~ it under the terms of the GNU General Public License as published by
-  ~ the Free Software Foundation, either version 3 of the License, or
-  ~ (at your option) any later version.
-  ~
-  ~ QKSMS is distributed in the hope that it will be useful,
-  ~ but WITHOUT ANY WARRANTY; without even the implied warranty of
-  ~ MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
-  ~ GNU General Public License for more details.
-  ~
-  ~ You should have received a copy of the GNU General Public License
-  ~ along with QKSMS.  If not, see <http://www.gnu.org/licenses/>.
-  -->
-<shape xmlns:android="http://schemas.android.com/apk/res/android"
-    android:shape="rectangle">
-
-    <corners
-        android:bottomLeftRadius="18dp"
-        android:bottomRightRadius="18dp"
-        android:topLeftRadius="4dp"
-        android:topRightRadius="18dp" />
-    <solid android:color="@android:color/white" />
-    <padding
-        android:bottom="8dp"
-        android:left="12dp"
-        android:right="12dp"
-        android:top="8dp" />
-
+<?xml version="1.0" encoding="utf-8"?>
+<!--
+  ~ Copyright (C) 2019 Moez Bhatti <moez.bhatti@gmail.com>
+  ~
+  ~ This file is part of QKSMS.
+  ~
+  ~ QKSMS is free software: you can redistribute it and/or modify
+  ~ it under the terms of the GNU General Public License as published by
+  ~ the Free Software Foundation, either version 3 of the License, or
+  ~ (at your option) any later version.
+  ~
+  ~ QKSMS is distributed in the hope that it will be useful,
+  ~ but WITHOUT ANY WARRANTY; without even the implied warranty of
+  ~ MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+  ~ GNU General Public License for more details.
+  ~
+  ~ You should have received a copy of the GNU General Public License
+  ~ along with QKSMS.  If not, see <http://www.gnu.org/licenses/>.
+  -->
+<shape xmlns:android="http://schemas.android.com/apk/res/android"
+    android:shape="rectangle">
+
+    <corners
+        android:bottomLeftRadius="18dp"
+        android:bottomRightRadius="18dp"
+        android:topLeftRadius="4dp"
+        android:topRightRadius="18dp" />
+    <solid android:color="@android:color/white" />
+    <padding
+        android:bottom="8dp"
+        android:left="12dp"
+        android:right="12dp"
+        android:top="8dp" />
+
 </shape>
\ No newline at end of file
diff --git a/presentation/src/main/res/drawable/message_in_middle.xml b/presentation/src/main/res/drawable/message_in_middle.xml
index 2742f4d2c..c3120da89 100644
--- a/presentation/src/main/res/drawable/message_in_middle.xml
+++ b/presentation/src/main/res/drawable/message_in_middle.xml
@@ -1,35 +1,35 @@
-<?xml version="1.0" encoding="utf-8"?>
-<!--
-  ~ Copyright (C) 2019 Moez Bhatti <moez.bhatti@gmail.com>
-  ~
-  ~ This file is part of QKSMS.
-  ~
-  ~ QKSMS is free software: you can redistribute it and/or modify
-  ~ it under the terms of the GNU General Public License as published by
-  ~ the Free Software Foundation, either version 3 of the License, or
-  ~ (at your option) any later version.
-  ~
-  ~ QKSMS is distributed in the hope that it will be useful,
-  ~ but WITHOUT ANY WARRANTY; without even the implied warranty of
-  ~ MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
-  ~ GNU General Public License for more details.
-  ~
-  ~ You should have received a copy of the GNU General Public License
-  ~ along with QKSMS.  If not, see <http://www.gnu.org/licenses/>.
-  -->
-<shape xmlns:android="http://schemas.android.com/apk/res/android"
-    android:shape="rectangle">
-
-    <corners
-        android:bottomLeftRadius="4dp"
-        android:bottomRightRadius="18dp"
-        android:topLeftRadius="4dp"
-        android:topRightRadius="18dp" />
-    <solid android:color="@android:color/white" />
-    <padding
-        android:bottom="8dp"
-        android:left="12dp"
-        android:right="12dp"
-        android:top="8dp" />
-
+<?xml version="1.0" encoding="utf-8"?>
+<!--
+  ~ Copyright (C) 2019 Moez Bhatti <moez.bhatti@gmail.com>
+  ~
+  ~ This file is part of QKSMS.
+  ~
+  ~ QKSMS is free software: you can redistribute it and/or modify
+  ~ it under the terms of the GNU General Public License as published by
+  ~ the Free Software Foundation, either version 3 of the License, or
+  ~ (at your option) any later version.
+  ~
+  ~ QKSMS is distributed in the hope that it will be useful,
+  ~ but WITHOUT ANY WARRANTY; without even the implied warranty of
+  ~ MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+  ~ GNU General Public License for more details.
+  ~
+  ~ You should have received a copy of the GNU General Public License
+  ~ along with QKSMS.  If not, see <http://www.gnu.org/licenses/>.
+  -->
+<shape xmlns:android="http://schemas.android.com/apk/res/android"
+    android:shape="rectangle">
+
+    <corners
+        android:bottomLeftRadius="4dp"
+        android:bottomRightRadius="18dp"
+        android:topLeftRadius="4dp"
+        android:topRightRadius="18dp" />
+    <solid android:color="@android:color/white" />
+    <padding
+        android:bottom="8dp"
+        android:left="12dp"
+        android:right="12dp"
+        android:top="8dp" />
+
 </shape>
\ No newline at end of file
diff --git a/presentation/src/main/res/drawable/message_only.xml b/presentation/src/main/res/drawable/message_only.xml
index a3d866358..c4d27b5af 100644
--- a/presentation/src/main/res/drawable/message_only.xml
+++ b/presentation/src/main/res/drawable/message_only.xml
@@ -1,31 +1,31 @@
-<?xml version="1.0" encoding="utf-8"?>
-<!--
-  ~ Copyright (C) 2019 Moez Bhatti <moez.bhatti@gmail.com>
-  ~
-  ~ This file is part of QKSMS.
-  ~
-  ~ QKSMS is free software: you can redistribute it and/or modify
-  ~ it under the terms of the GNU General Public License as published by
-  ~ the Free Software Foundation, either version 3 of the License, or
-  ~ (at your option) any later version.
-  ~
-  ~ QKSMS is distributed in the hope that it will be useful,
-  ~ but WITHOUT ANY WARRANTY; without even the implied warranty of
-  ~ MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
-  ~ GNU General Public License for more details.
-  ~
-  ~ You should have received a copy of the GNU General Public License
-  ~ along with QKSMS.  If not, see <http://www.gnu.org/licenses/>.
-  -->
-<shape xmlns:android="http://schemas.android.com/apk/res/android"
-    android:shape="rectangle">
-
-    <corners android:radius="18dp" />
-    <solid android:color="@android:color/white" />
-    <padding
-        android:bottom="8dp"
-        android:left="12dp"
-        android:right="12dp"
-        android:top="8dp" />
-
+<?xml version="1.0" encoding="utf-8"?>
+<!--
+  ~ Copyright (C) 2019 Moez Bhatti <moez.bhatti@gmail.com>
+  ~
+  ~ This file is part of QKSMS.
+  ~
+  ~ QKSMS is free software: you can redistribute it and/or modify
+  ~ it under the terms of the GNU General Public License as published by
+  ~ the Free Software Foundation, either version 3 of the License, or
+  ~ (at your option) any later version.
+  ~
+  ~ QKSMS is distributed in the hope that it will be useful,
+  ~ but WITHOUT ANY WARRANTY; without even the implied warranty of
+  ~ MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+  ~ GNU General Public License for more details.
+  ~
+  ~ You should have received a copy of the GNU General Public License
+  ~ along with QKSMS.  If not, see <http://www.gnu.org/licenses/>.
+  -->
+<shape xmlns:android="http://schemas.android.com/apk/res/android"
+    android:shape="rectangle">
+
+    <corners android:radius="18dp" />
+    <solid android:color="@android:color/white" />
+    <padding
+        android:bottom="8dp"
+        android:left="12dp"
+        android:right="12dp"
+        android:top="8dp" />
+
 </shape>
\ No newline at end of file
diff --git a/presentation/src/main/res/drawable/message_out_first.xml b/presentation/src/main/res/drawable/message_out_first.xml
index 3a150c095..160348dbb 100644
--- a/presentation/src/main/res/drawable/message_out_first.xml
+++ b/presentation/src/main/res/drawable/message_out_first.xml
@@ -1,35 +1,35 @@
-<?xml version="1.0" encoding="utf-8"?>
-<!--
-  ~ Copyright (C) 2019 Moez Bhatti <moez.bhatti@gmail.com>
-  ~
-  ~ This file is part of QKSMS.
-  ~
-  ~ QKSMS is free software: you can redistribute it and/or modify
-  ~ it under the terms of the GNU General Public License as published by
-  ~ the Free Software Foundation, either version 3 of the License, or
-  ~ (at your option) any later version.
-  ~
-  ~ QKSMS is distributed in the hope that it will be useful,
-  ~ but WITHOUT ANY WARRANTY; without even the implied warranty of
-  ~ MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
-  ~ GNU General Public License for more details.
-  ~
-  ~ You should have received a copy of the GNU General Public License
-  ~ along with QKSMS.  If not, see <http://www.gnu.org/licenses/>.
-  -->
-<shape xmlns:android="http://schemas.android.com/apk/res/android"
-    android:shape="rectangle">
-
-    <corners
-        android:bottomLeftRadius="18dp"
-        android:bottomRightRadius="4dp"
-        android:topLeftRadius="18dp"
-        android:topRightRadius="18dp" />
-    <solid android:color="@android:color/white" />
-    <padding
-        android:bottom="8dp"
-        android:left="12dp"
-        android:right="12dp"
-        android:top="8dp" />
-
+<?xml version="1.0" encoding="utf-8"?>
+<!--
+  ~ Copyright (C) 2019 Moez Bhatti <moez.bhatti@gmail.com>
+  ~
+  ~ This file is part of QKSMS.
+  ~
+  ~ QKSMS is free software: you can redistribute it and/or modify
+  ~ it under the terms of the GNU General Public License as published by
+  ~ the Free Software Foundation, either version 3 of the License, or
+  ~ (at your option) any later version.
+  ~
+  ~ QKSMS is distributed in the hope that it will be useful,
+  ~ but WITHOUT ANY WARRANTY; without even the implied warranty of
+  ~ MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+  ~ GNU General Public License for more details.
+  ~
+  ~ You should have received a copy of the GNU General Public License
+  ~ along with QKSMS.  If not, see <http://www.gnu.org/licenses/>.
+  -->
+<shape xmlns:android="http://schemas.android.com/apk/res/android"
+    android:shape="rectangle">
+
+    <corners
+        android:bottomLeftRadius="18dp"
+        android:bottomRightRadius="4dp"
+        android:topLeftRadius="18dp"
+        android:topRightRadius="18dp" />
+    <solid android:color="@android:color/white" />
+    <padding
+        android:bottom="8dp"
+        android:left="12dp"
+        android:right="12dp"
+        android:top="8dp" />
+
 </shape>
\ No newline at end of file
diff --git a/presentation/src/main/res/drawable/message_out_last.xml b/presentation/src/main/res/drawable/message_out_last.xml
index 683cc9508..3625f1499 100644
--- a/presentation/src/main/res/drawable/message_out_last.xml
+++ b/presentation/src/main/res/drawable/message_out_last.xml
@@ -1,35 +1,35 @@
-<?xml version="1.0" encoding="utf-8"?>
-<!--
-  ~ Copyright (C) 2019 Moez Bhatti <moez.bhatti@gmail.com>
-  ~
-  ~ This file is part of QKSMS.
-  ~
-  ~ QKSMS is free software: you can redistribute it and/or modify
-  ~ it under the terms of the GNU General Public License as published by
-  ~ the Free Software Foundation, either version 3 of the License, or
-  ~ (at your option) any later version.
-  ~
-  ~ QKSMS is distributed in the hope that it will be useful,
-  ~ but WITHOUT ANY WARRANTY; without even the implied warranty of
-  ~ MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
-  ~ GNU General Public License for more details.
-  ~
-  ~ You should have received a copy of the GNU General Public License
-  ~ along with QKSMS.  If not, see <http://www.gnu.org/licenses/>.
-  -->
-<shape xmlns:android="http://schemas.android.com/apk/res/android"
-    android:shape="rectangle">
-
-    <corners
-        android:bottomLeftRadius="18dp"
-        android:bottomRightRadius="18dp"
-        android:topLeftRadius="18dp"
-        android:topRightRadius="4dp" />
-    <solid android:color="@android:color/white" />
-    <padding
-        android:bottom="8dp"
-        android:left="12dp"
-        android:right="12dp"
-        android:top="8dp" />
-
+<?xml version="1.0" encoding="utf-8"?>
+<!--
+  ~ Copyright (C) 2019 Moez Bhatti <moez.bhatti@gmail.com>
+  ~
+  ~ This file is part of QKSMS.
+  ~
+  ~ QKSMS is free software: you can redistribute it and/or modify
+  ~ it under the terms of the GNU General Public License as published by
+  ~ the Free Software Foundation, either version 3 of the License, or
+  ~ (at your option) any later version.
+  ~
+  ~ QKSMS is distributed in the hope that it will be useful,
+  ~ but WITHOUT ANY WARRANTY; without even the implied warranty of
+  ~ MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+  ~ GNU General Public License for more details.
+  ~
+  ~ You should have received a copy of the GNU General Public License
+  ~ along with QKSMS.  If not, see <http://www.gnu.org/licenses/>.
+  -->
+<shape xmlns:android="http://schemas.android.com/apk/res/android"
+    android:shape="rectangle">
+
+    <corners
+        android:bottomLeftRadius="18dp"
+        android:bottomRightRadius="18dp"
+        android:topLeftRadius="18dp"
+        android:topRightRadius="4dp" />
+    <solid android:color="@android:color/white" />
+    <padding
+        android:bottom="8dp"
+        android:left="12dp"
+        android:right="12dp"
+        android:top="8dp" />
+
 </shape>
\ No newline at end of file
diff --git a/presentation/src/main/res/drawable/message_out_middle.xml b/presentation/src/main/res/drawable/message_out_middle.xml
index 006b9480f..0b17a52eb 100644
--- a/presentation/src/main/res/drawable/message_out_middle.xml
+++ b/presentation/src/main/res/drawable/message_out_middle.xml
@@ -1,35 +1,35 @@
-<?xml version="1.0" encoding="utf-8"?>
-<!--
-  ~ Copyright (C) 2019 Moez Bhatti <moez.bhatti@gmail.com>
-  ~
-  ~ This file is part of QKSMS.
-  ~
-  ~ QKSMS is free software: you can redistribute it and/or modify
-  ~ it under the terms of the GNU General Public License as published by
-  ~ the Free Software Foundation, either version 3 of the License, or
-  ~ (at your option) any later version.
-  ~
-  ~ QKSMS is distributed in the hope that it will be useful,
-  ~ but WITHOUT ANY WARRANTY; without even the implied warranty of
-  ~ MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
-  ~ GNU General Public License for more details.
-  ~
-  ~ You should have received a copy of the GNU General Public License
-  ~ along with QKSMS.  If not, see <http://www.gnu.org/licenses/>.
-  -->
-<shape xmlns:android="http://schemas.android.com/apk/res/android"
-    android:shape="rectangle">
-
-    <corners
-        android:bottomLeftRadius="18dp"
-        android:bottomRightRadius="4dp"
-        android:topLeftRadius="18dp"
-        android:topRightRadius="4dp" />
-    <solid android:color="@android:color/white" />
-    <padding
-        android:bottom="8dp"
-        android:left="12dp"
-        android:right="12dp"
-        android:top="8dp" />
-
+<?xml version="1.0" encoding="utf-8"?>
+<!--
+  ~ Copyright (C) 2019 Moez Bhatti <moez.bhatti@gmail.com>
+  ~
+  ~ This file is part of QKSMS.
+  ~
+  ~ QKSMS is free software: you can redistribute it and/or modify
+  ~ it under the terms of the GNU General Public License as published by
+  ~ the Free Software Foundation, either version 3 of the License, or
+  ~ (at your option) any later version.
+  ~
+  ~ QKSMS is distributed in the hope that it will be useful,
+  ~ but WITHOUT ANY WARRANTY; without even the implied warranty of
+  ~ MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+  ~ GNU General Public License for more details.
+  ~
+  ~ You should have received a copy of the GNU General Public License
+  ~ along with QKSMS.  If not, see <http://www.gnu.org/licenses/>.
+  -->
+<shape xmlns:android="http://schemas.android.com/apk/res/android"
+    android:shape="rectangle">
+
+    <corners
+        android:bottomLeftRadius="18dp"
+        android:bottomRightRadius="4dp"
+        android:topLeftRadius="18dp"
+        android:topRightRadius="4dp" />
+    <solid android:color="@android:color/white" />
+    <padding
+        android:bottom="8dp"
+        android:left="12dp"
+        android:right="12dp"
+        android:top="8dp" />
+
 </shape>
\ No newline at end of file
diff --git a/presentation/src/main/res/drawable/radio_button.xml b/presentation/src/main/res/drawable/radio_button.xml
index ec929d050..d69a81c64 100644
--- a/presentation/src/main/res/drawable/radio_button.xml
+++ b/presentation/src/main/res/drawable/radio_button.xml
@@ -1,26 +1,26 @@
-<?xml version="1.0" encoding="utf-8"?>
-<!--
-  ~ Copyright (C) 2019 Moez Bhatti <moez.bhatti@gmail.com>
-  ~
-  ~ This file is part of QKSMS.
-  ~
-  ~ QKSMS is free software: you can redistribute it and/or modify
-  ~ it under the terms of the GNU General Public License as published by
-  ~ the Free Software Foundation, either version 3 of the License, or
-  ~ (at your option) any later version.
-  ~
-  ~ QKSMS is distributed in the hope that it will be useful,
-  ~ but WITHOUT ANY WARRANTY; without even the implied warranty of
-  ~ MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
-  ~ GNU General Public License for more details.
-  ~
-  ~ You should have received a copy of the GNU General Public License
-  ~ along with QKSMS.  If not, see <http://www.gnu.org/licenses/>.
-  -->
-<selector xmlns:android="http://schemas.android.com/apk/res/android">
-
-    <item android:drawable="@drawable/ic_radio_button_checked_black_24dp" android:state_activated="true" />
-
-    <item android:drawable="@drawable/ic_radio_button_unchecked_black_24dp" />
-
+<?xml version="1.0" encoding="utf-8"?>
+<!--
+  ~ Copyright (C) 2019 Moez Bhatti <moez.bhatti@gmail.com>
+  ~
+  ~ This file is part of QKSMS.
+  ~
+  ~ QKSMS is free software: you can redistribute it and/or modify
+  ~ it under the terms of the GNU General Public License as published by
+  ~ the Free Software Foundation, either version 3 of the License, or
+  ~ (at your option) any later version.
+  ~
+  ~ QKSMS is distributed in the hope that it will be useful,
+  ~ but WITHOUT ANY WARRANTY; without even the implied warranty of
+  ~ MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+  ~ GNU General Public License for more details.
+  ~
+  ~ You should have received a copy of the GNU General Public License
+  ~ along with QKSMS.  If not, see <http://www.gnu.org/licenses/>.
+  -->
+<selector xmlns:android="http://schemas.android.com/apk/res/android">
+
+    <item android:drawable="@drawable/ic_radio_button_checked_black_24dp" android:state_activated="true" />
+
+    <item android:drawable="@drawable/ic_radio_button_unchecked_black_24dp" />
+
 </selector>
\ No newline at end of file
diff --git a/presentation/src/main/res/drawable/rectangle.xml b/presentation/src/main/res/drawable/rectangle.xml
index d3984334e..40de5817d 100644
--- a/presentation/src/main/res/drawable/rectangle.xml
+++ b/presentation/src/main/res/drawable/rectangle.xml
@@ -1,25 +1,25 @@
-<?xml version="1.0" encoding="utf-8"?>
-<!--
-  ~ Copyright (C) 2019 Moez Bhatti <moez.bhatti@gmail.com>
-  ~
-  ~ This file is part of QKSMS.
-  ~
-  ~ QKSMS is free software: you can redistribute it and/or modify
-  ~ it under the terms of the GNU General Public License as published by
-  ~ the Free Software Foundation, either version 3 of the License, or
-  ~ (at your option) any later version.
-  ~
-  ~ QKSMS is distributed in the hope that it will be useful,
-  ~ but WITHOUT ANY WARRANTY; without even the implied warranty of
-  ~ MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
-  ~ GNU General Public License for more details.
-  ~
-  ~ You should have received a copy of the GNU General Public License
-  ~ along with QKSMS.  If not, see <http://www.gnu.org/licenses/>.
-  -->
-<shape xmlns:android="http://schemas.android.com/apk/res/android"
-    android:shape="rectangle">
-
-    <solid android:color="@android:color/white" />
-
+<?xml version="1.0" encoding="utf-8"?>
+<!--
+  ~ Copyright (C) 2019 Moez Bhatti <moez.bhatti@gmail.com>
+  ~
+  ~ This file is part of QKSMS.
+  ~
+  ~ QKSMS is free software: you can redistribute it and/or modify
+  ~ it under the terms of the GNU General Public License as published by
+  ~ the Free Software Foundation, either version 3 of the License, or
+  ~ (at your option) any later version.
+  ~
+  ~ QKSMS is distributed in the hope that it will be useful,
+  ~ but WITHOUT ANY WARRANTY; without even the implied warranty of
+  ~ MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+  ~ GNU General Public License for more details.
+  ~
+  ~ You should have received a copy of the GNU General Public License
+  ~ along with QKSMS.  If not, see <http://www.gnu.org/licenses/>.
+  -->
+<shape xmlns:android="http://schemas.android.com/apk/res/android"
+    android:shape="rectangle">
+
+    <solid android:color="@android:color/white" />
+
 </shape>
\ No newline at end of file
diff --git a/presentation/src/main/res/drawable/ripple.xml b/presentation/src/main/res/drawable/ripple.xml
index 176968899..a2d4471a5 100644
--- a/presentation/src/main/res/drawable/ripple.xml
+++ b/presentation/src/main/res/drawable/ripple.xml
@@ -1,42 +1,42 @@
-<?xml version="1.0" encoding="utf-8"?>
-<!--
-  ~ Copyright (C) 2019 Moez Bhatti <moez.bhatti@gmail.com>
-  ~
-  ~ This file is part of QKSMS.
-  ~
-  ~ QKSMS is free software: you can redistribute it and/or modify
-  ~ it under the terms of the GNU General Public License as published by
-  ~ the Free Software Foundation, either version 3 of the License, or
-  ~ (at your option) any later version.
-  ~
-  ~ QKSMS is distributed in the hope that it will be useful,
-  ~ but WITHOUT ANY WARRANTY; without even the implied warranty of
-  ~ MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
-  ~ GNU General Public License for more details.
-  ~
-  ~ You should have received a copy of the GNU General Public License
-  ~ along with QKSMS.  If not, see <http://www.gnu.org/licenses/>.
-  -->
-<ripple xmlns:android="http://schemas.android.com/apk/res/android"
-    android:color="@color/rippleLight">
-
-    <item android:id="@android:id/mask">
-        <shape android:shape="rectangle">
-            <solid android:color="@color/white" />
-            <corners android:radius="2dp" />
-        </shape>
-    </item>
-
-    <item>
-        <selector>
-            <item android:state_activated="true">
-                <color android:color="@color/separatorLight" />
-            </item>
-
-            <item>
-                <color android:color="@android:color/transparent" />
-            </item>
-        </selector>
-    </item>
-
+<?xml version="1.0" encoding="utf-8"?>
+<!--
+  ~ Copyright (C) 2019 Moez Bhatti <moez.bhatti@gmail.com>
+  ~
+  ~ This file is part of QKSMS.
+  ~
+  ~ QKSMS is free software: you can redistribute it and/or modify
+  ~ it under the terms of the GNU General Public License as published by
+  ~ the Free Software Foundation, either version 3 of the License, or
+  ~ (at your option) any later version.
+  ~
+  ~ QKSMS is distributed in the hope that it will be useful,
+  ~ but WITHOUT ANY WARRANTY; without even the implied warranty of
+  ~ MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+  ~ GNU General Public License for more details.
+  ~
+  ~ You should have received a copy of the GNU General Public License
+  ~ along with QKSMS.  If not, see <http://www.gnu.org/licenses/>.
+  -->
+<ripple xmlns:android="http://schemas.android.com/apk/res/android"
+    android:color="@color/rippleLight">
+
+    <item android:id="@android:id/mask">
+        <shape android:shape="rectangle">
+            <solid android:color="@color/white" />
+            <corners android:radius="2dp" />
+        </shape>
+    </item>
+
+    <item>
+        <selector>
+            <item android:state_activated="true">
+                <color android:color="@color/separatorLight" />
+            </item>
+
+            <item>
+                <color android:color="@android:color/transparent" />
+            </item>
+        </selector>
+    </item>
+
 </ripple>
\ No newline at end of file
diff --git a/presentation/src/main/res/drawable/ripple_dark.xml b/presentation/src/main/res/drawable/ripple_dark.xml
index e53de339f..805a8f1bf 100644
--- a/presentation/src/main/res/drawable/ripple_dark.xml
+++ b/presentation/src/main/res/drawable/ripple_dark.xml
@@ -1,42 +1,42 @@
-<?xml version="1.0" encoding="utf-8"?>
-<!--
-  ~ Copyright (C) 2019 Moez Bhatti <moez.bhatti@gmail.com>
-  ~
-  ~ This file is part of QKSMS.
-  ~
-  ~ QKSMS is free software: you can redistribute it and/or modify
-  ~ it under the terms of the GNU General Public License as published by
-  ~ the Free Software Foundation, either version 3 of the License, or
-  ~ (at your option) any later version.
-  ~
-  ~ QKSMS is distributed in the hope that it will be useful,
-  ~ but WITHOUT ANY WARRANTY; without even the implied warranty of
-  ~ MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
-  ~ GNU General Public License for more details.
-  ~
-  ~ You should have received a copy of the GNU General Public License
-  ~ along with QKSMS.  If not, see <http://www.gnu.org/licenses/>.
-  -->
-<ripple xmlns:android="http://schemas.android.com/apk/res/android"
-    android:color="@color/rippleDark">
-
-    <item android:id="@android:id/mask">
-        <shape android:shape="rectangle">
-            <solid android:color="@color/white" />
-            <corners android:radius="2dp" />
-        </shape>
-    </item>
-
-    <item>
-        <selector>
-            <item android:state_activated="true">
-                <color android:color="@color/separatorDark" />
-            </item>
-
-            <item>
-                <color android:color="@android:color/transparent" />
-            </item>
-        </selector>
-    </item>
-
+<?xml version="1.0" encoding="utf-8"?>
+<!--
+  ~ Copyright (C) 2019 Moez Bhatti <moez.bhatti@gmail.com>
+  ~
+  ~ This file is part of QKSMS.
+  ~
+  ~ QKSMS is free software: you can redistribute it and/or modify
+  ~ it under the terms of the GNU General Public License as published by
+  ~ the Free Software Foundation, either version 3 of the License, or
+  ~ (at your option) any later version.
+  ~
+  ~ QKSMS is distributed in the hope that it will be useful,
+  ~ but WITHOUT ANY WARRANTY; without even the implied warranty of
+  ~ MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+  ~ GNU General Public License for more details.
+  ~
+  ~ You should have received a copy of the GNU General Public License
+  ~ along with QKSMS.  If not, see <http://www.gnu.org/licenses/>.
+  -->
+<ripple xmlns:android="http://schemas.android.com/apk/res/android"
+    android:color="@color/rippleDark">
+
+    <item android:id="@android:id/mask">
+        <shape android:shape="rectangle">
+            <solid android:color="@color/white" />
+            <corners android:radius="2dp" />
+        </shape>
+    </item>
+
+    <item>
+        <selector>
+            <item android:state_activated="true">
+                <color android:color="@color/separatorDark" />
+            </item>
+
+            <item>
+                <color android:color="@android:color/transparent" />
+            </item>
+        </selector>
+    </item>
+
 </ripple>
\ No newline at end of file
diff --git a/presentation/src/main/res/drawable/rounded_rectangle_22dp.xml b/presentation/src/main/res/drawable/rounded_rectangle_22dp.xml
index 7a6af7bb2..57d9abd82 100755
--- a/presentation/src/main/res/drawable/rounded_rectangle_22dp.xml
+++ b/presentation/src/main/res/drawable/rounded_rectangle_22dp.xml
@@ -1,27 +1,27 @@
-<?xml version="1.0" encoding="utf-8"?>
-<!--
-  ~ Copyright (C) 2019 Moez Bhatti <moez.bhatti@gmail.com>
-  ~
-  ~ This file is part of QKSMS.
-  ~
-  ~ QKSMS is free software: you can redistribute it and/or modify
-  ~ it under the terms of the GNU General Public License as published by
-  ~ the Free Software Foundation, either version 3 of the License, or
-  ~ (at your option) any later version.
-  ~
-  ~ QKSMS is distributed in the hope that it will be useful,
-  ~ but WITHOUT ANY WARRANTY; without even the implied warranty of
-  ~ MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
-  ~ GNU General Public License for more details.
-  ~
-  ~ You should have received a copy of the GNU General Public License
-  ~ along with QKSMS.  If not, see <http://www.gnu.org/licenses/>.
-  -->
-<shape xmlns:android="http://schemas.android.com/apk/res/android"
-    android:shape="rectangle">
-
-    <solid android:color="@color/white" />
-
-    <corners android:radius="22dp" />
-
-</shape>
+<?xml version="1.0" encoding="utf-8"?>
+<!--
+  ~ Copyright (C) 2019 Moez Bhatti <moez.bhatti@gmail.com>
+  ~
+  ~ This file is part of QKSMS.
+  ~
+  ~ QKSMS is free software: you can redistribute it and/or modify
+  ~ it under the terms of the GNU General Public License as published by
+  ~ the Free Software Foundation, either version 3 of the License, or
+  ~ (at your option) any later version.
+  ~
+  ~ QKSMS is distributed in the hope that it will be useful,
+  ~ but WITHOUT ANY WARRANTY; without even the implied warranty of
+  ~ MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+  ~ GNU General Public License for more details.
+  ~
+  ~ You should have received a copy of the GNU General Public License
+  ~ along with QKSMS.  If not, see <http://www.gnu.org/licenses/>.
+  -->
+<shape xmlns:android="http://schemas.android.com/apk/res/android"
+    android:shape="rectangle">
+
+    <solid android:color="@color/white" />
+
+    <corners android:radius="22dp" />
+
+</shape>
diff --git a/presentation/src/main/res/drawable/rounded_rectangle_24dp.xml b/presentation/src/main/res/drawable/rounded_rectangle_24dp.xml
index 594643390..e31cb5608 100755
--- a/presentation/src/main/res/drawable/rounded_rectangle_24dp.xml
+++ b/presentation/src/main/res/drawable/rounded_rectangle_24dp.xml
@@ -1,27 +1,27 @@
-<?xml version="1.0" encoding="utf-8"?>
-<!--
-  ~ Copyright (C) 2019 Moez Bhatti <moez.bhatti@gmail.com>
-  ~
-  ~ This file is part of QKSMS.
-  ~
-  ~ QKSMS is free software: you can redistribute it and/or modify
-  ~ it under the terms of the GNU General Public License as published by
-  ~ the Free Software Foundation, either version 3 of the License, or
-  ~ (at your option) any later version.
-  ~
-  ~ QKSMS is distributed in the hope that it will be useful,
-  ~ but WITHOUT ANY WARRANTY; without even the implied warranty of
-  ~ MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
-  ~ GNU General Public License for more details.
-  ~
-  ~ You should have received a copy of the GNU General Public License
-  ~ along with QKSMS.  If not, see <http://www.gnu.org/licenses/>.
-  -->
-<shape xmlns:android="http://schemas.android.com/apk/res/android"
-    android:shape="rectangle">
-
-    <solid android:color="@color/white" />
-
-    <corners android:radius="24dp" />
-
+<?xml version="1.0" encoding="utf-8"?>
+<!--
+  ~ Copyright (C) 2019 Moez Bhatti <moez.bhatti@gmail.com>
+  ~
+  ~ This file is part of QKSMS.
+  ~
+  ~ QKSMS is free software: you can redistribute it and/or modify
+  ~ it under the terms of the GNU General Public License as published by
+  ~ the Free Software Foundation, either version 3 of the License, or
+  ~ (at your option) any later version.
+  ~
+  ~ QKSMS is distributed in the hope that it will be useful,
+  ~ but WITHOUT ANY WARRANTY; without even the implied warranty of
+  ~ MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+  ~ GNU General Public License for more details.
+  ~
+  ~ You should have received a copy of the GNU General Public License
+  ~ along with QKSMS.  If not, see <http://www.gnu.org/licenses/>.
+  -->
+<shape xmlns:android="http://schemas.android.com/apk/res/android"
+    android:shape="rectangle">
+
+    <solid android:color="@color/white" />
+
+    <corners android:radius="24dp" />
+
 </shape>
\ No newline at end of file
diff --git a/presentation/src/main/res/drawable/rounded_rectangle_2dp.xml b/presentation/src/main/res/drawable/rounded_rectangle_2dp.xml
index 5f9942e47..49dfc1ad0 100755
--- a/presentation/src/main/res/drawable/rounded_rectangle_2dp.xml
+++ b/presentation/src/main/res/drawable/rounded_rectangle_2dp.xml
@@ -1,27 +1,27 @@
-<?xml version="1.0" encoding="utf-8"?>
-<!--
-  ~ Copyright (C) 2019 Moez Bhatti <moez.bhatti@gmail.com>
-  ~
-  ~ This file is part of QKSMS.
-  ~
-  ~ QKSMS is free software: you can redistribute it and/or modify
-  ~ it under the terms of the GNU General Public License as published by
-  ~ the Free Software Foundation, either version 3 of the License, or
-  ~ (at your option) any later version.
-  ~
-  ~ QKSMS is distributed in the hope that it will be useful,
-  ~ but WITHOUT ANY WARRANTY; without even the implied warranty of
-  ~ MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
-  ~ GNU General Public License for more details.
-  ~
-  ~ You should have received a copy of the GNU General Public License
-  ~ along with QKSMS.  If not, see <http://www.gnu.org/licenses/>.
-  -->
-<layer-list xmlns:android="http://schemas.android.com/apk/res/android">
-    <item>
-        <shape android:shape="rectangle">
-            <solid android:color="@color/white" />
-            <corners android:radius="2dp" />
-        </shape>
-    </item>
+<?xml version="1.0" encoding="utf-8"?>
+<!--
+  ~ Copyright (C) 2019 Moez Bhatti <moez.bhatti@gmail.com>
+  ~
+  ~ This file is part of QKSMS.
+  ~
+  ~ QKSMS is free software: you can redistribute it and/or modify
+  ~ it under the terms of the GNU General Public License as published by
+  ~ the Free Software Foundation, either version 3 of the License, or
+  ~ (at your option) any later version.
+  ~
+  ~ QKSMS is distributed in the hope that it will be useful,
+  ~ but WITHOUT ANY WARRANTY; without even the implied warranty of
+  ~ MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+  ~ GNU General Public License for more details.
+  ~
+  ~ You should have received a copy of the GNU General Public License
+  ~ along with QKSMS.  If not, see <http://www.gnu.org/licenses/>.
+  -->
+<layer-list xmlns:android="http://schemas.android.com/apk/res/android">
+    <item>
+        <shape android:shape="rectangle">
+            <solid android:color="@color/white" />
+            <corners android:radius="2dp" />
+        </shape>
+    </item>
 </layer-list>
\ No newline at end of file
diff --git a/presentation/src/main/res/drawable/rounded_rectangle_4dp.xml b/presentation/src/main/res/drawable/rounded_rectangle_4dp.xml
index 19f0316f4..ab4084664 100755
--- a/presentation/src/main/res/drawable/rounded_rectangle_4dp.xml
+++ b/presentation/src/main/res/drawable/rounded_rectangle_4dp.xml
@@ -1,27 +1,27 @@
-<?xml version="1.0" encoding="utf-8"?>
-<!--
-  ~ Copyright (C) 2019 Moez Bhatti <moez.bhatti@gmail.com>
-  ~
-  ~ This file is part of QKSMS.
-  ~
-  ~ QKSMS is free software: you can redistribute it and/or modify
-  ~ it under the terms of the GNU General Public License as published by
-  ~ the Free Software Foundation, either version 3 of the License, or
-  ~ (at your option) any later version.
-  ~
-  ~ QKSMS is distributed in the hope that it will be useful,
-  ~ but WITHOUT ANY WARRANTY; without even the implied warranty of
-  ~ MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
-  ~ GNU General Public License for more details.
-  ~
-  ~ You should have received a copy of the GNU General Public License
-  ~ along with QKSMS.  If not, see <http://www.gnu.org/licenses/>.
-  -->
-<shape xmlns:android="http://schemas.android.com/apk/res/android"
-    android:shape="rectangle">
-
-    <solid android:color="@color/white" />
-
-    <corners android:radius="4dp" />
-
+<?xml version="1.0" encoding="utf-8"?>
+<!--
+  ~ Copyright (C) 2019 Moez Bhatti <moez.bhatti@gmail.com>
+  ~
+  ~ This file is part of QKSMS.
+  ~
+  ~ QKSMS is free software: you can redistribute it and/or modify
+  ~ it under the terms of the GNU General Public License as published by
+  ~ the Free Software Foundation, either version 3 of the License, or
+  ~ (at your option) any later version.
+  ~
+  ~ QKSMS is distributed in the hope that it will be useful,
+  ~ but WITHOUT ANY WARRANTY; without even the implied warranty of
+  ~ MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+  ~ GNU General Public License for more details.
+  ~
+  ~ You should have received a copy of the GNU General Public License
+  ~ along with QKSMS.  If not, see <http://www.gnu.org/licenses/>.
+  -->
+<shape xmlns:android="http://schemas.android.com/apk/res/android"
+    android:shape="rectangle">
+
+    <solid android:color="@color/white" />
+
+    <corners android:radius="4dp" />
+
 </shape>
\ No newline at end of file
diff --git a/presentation/src/main/res/drawable/rounded_rectangle_bottom_4dp.xml b/presentation/src/main/res/drawable/rounded_rectangle_bottom_4dp.xml
index aaa68d3db..27eb99a62 100755
--- a/presentation/src/main/res/drawable/rounded_rectangle_bottom_4dp.xml
+++ b/presentation/src/main/res/drawable/rounded_rectangle_bottom_4dp.xml
@@ -1,29 +1,29 @@
-<?xml version="1.0" encoding="utf-8"?>
-<!--
-  ~ Copyright (C) 2019 Moez Bhatti <moez.bhatti@gmail.com>
-  ~
-  ~ This file is part of QKSMS.
-  ~
-  ~ QKSMS is free software: you can redistribute it and/or modify
-  ~ it under the terms of the GNU General Public License as published by
-  ~ the Free Software Foundation, either version 3 of the License, or
-  ~ (at your option) any later version.
-  ~
-  ~ QKSMS is distributed in the hope that it will be useful,
-  ~ but WITHOUT ANY WARRANTY; without even the implied warranty of
-  ~ MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
-  ~ GNU General Public License for more details.
-  ~
-  ~ You should have received a copy of the GNU General Public License
-  ~ along with QKSMS.  If not, see <http://www.gnu.org/licenses/>.
-  -->
-<shape xmlns:android="http://schemas.android.com/apk/res/android"
-    android:shape="rectangle">
-
-    <solid android:color="@color/white" />
-
-    <corners
-        android:bottomLeftRadius="4dp"
-        android:bottomRightRadius="4dp" />
-
+<?xml version="1.0" encoding="utf-8"?>
+<!--
+  ~ Copyright (C) 2019 Moez Bhatti <moez.bhatti@gmail.com>
+  ~
+  ~ This file is part of QKSMS.
+  ~
+  ~ QKSMS is free software: you can redistribute it and/or modify
+  ~ it under the terms of the GNU General Public License as published by
+  ~ the Free Software Foundation, either version 3 of the License, or
+  ~ (at your option) any later version.
+  ~
+  ~ QKSMS is distributed in the hope that it will be useful,
+  ~ but WITHOUT ANY WARRANTY; without even the implied warranty of
+  ~ MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+  ~ GNU General Public License for more details.
+  ~
+  ~ You should have received a copy of the GNU General Public License
+  ~ along with QKSMS.  If not, see <http://www.gnu.org/licenses/>.
+  -->
+<shape xmlns:android="http://schemas.android.com/apk/res/android"
+    android:shape="rectangle">
+
+    <solid android:color="@color/white" />
+
+    <corners
+        android:bottomLeftRadius="4dp"
+        android:bottomRightRadius="4dp" />
+
 </shape>
\ No newline at end of file
diff --git a/presentation/src/main/res/drawable/rounded_rectangle_left_4dp.xml b/presentation/src/main/res/drawable/rounded_rectangle_left_4dp.xml
index c5de9c0cb..238a59bc9 100755
--- a/presentation/src/main/res/drawable/rounded_rectangle_left_4dp.xml
+++ b/presentation/src/main/res/drawable/rounded_rectangle_left_4dp.xml
@@ -1,29 +1,29 @@
-<?xml version="1.0" encoding="utf-8"?>
-<!--
-  ~ Copyright (C) 2019 Moez Bhatti <moez.bhatti@gmail.com>
-  ~
-  ~ This file is part of QKSMS.
-  ~
-  ~ QKSMS is free software: you can redistribute it and/or modify
-  ~ it under the terms of the GNU General Public License as published by
-  ~ the Free Software Foundation, either version 3 of the License, or
-  ~ (at your option) any later version.
-  ~
-  ~ QKSMS is distributed in the hope that it will be useful,
-  ~ but WITHOUT ANY WARRANTY; without even the implied warranty of
-  ~ MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
-  ~ GNU General Public License for more details.
-  ~
-  ~ You should have received a copy of the GNU General Public License
-  ~ along with QKSMS.  If not, see <http://www.gnu.org/licenses/>.
-  -->
-<layer-list xmlns:android="http://schemas.android.com/apk/res/android">
-    <item>
-        <shape android:shape="rectangle">
-            <solid android:color="@color/white" />
-            <corners
-                android:bottomLeftRadius="4dp"
-                android:topLeftRadius="4dp" />
-        </shape>
-    </item>
+<?xml version="1.0" encoding="utf-8"?>
+<!--
+  ~ Copyright (C) 2019 Moez Bhatti <moez.bhatti@gmail.com>
+  ~
+  ~ This file is part of QKSMS.
+  ~
+  ~ QKSMS is free software: you can redistribute it and/or modify
+  ~ it under the terms of the GNU General Public License as published by
+  ~ the Free Software Foundation, either version 3 of the License, or
+  ~ (at your option) any later version.
+  ~
+  ~ QKSMS is distributed in the hope that it will be useful,
+  ~ but WITHOUT ANY WARRANTY; without even the implied warranty of
+  ~ MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+  ~ GNU General Public License for more details.
+  ~
+  ~ You should have received a copy of the GNU General Public License
+  ~ along with QKSMS.  If not, see <http://www.gnu.org/licenses/>.
+  -->
+<layer-list xmlns:android="http://schemas.android.com/apk/res/android">
+    <item>
+        <shape android:shape="rectangle">
+            <solid android:color="@color/white" />
+            <corners
+                android:bottomLeftRadius="4dp"
+                android:topLeftRadius="4dp" />
+        </shape>
+    </item>
 </layer-list>
\ No newline at end of file
diff --git a/presentation/src/main/res/drawable/rounded_rectangle_outline_22dp.xml b/presentation/src/main/res/drawable/rounded_rectangle_outline_22dp.xml
index 95c404d8f..35d9f0f47 100755
--- a/presentation/src/main/res/drawable/rounded_rectangle_outline_22dp.xml
+++ b/presentation/src/main/res/drawable/rounded_rectangle_outline_22dp.xml
@@ -1,30 +1,30 @@
-<?xml version="1.0" encoding="utf-8"?>
-<!--
-  ~ Copyright (C) 2019 Moez Bhatti <moez.bhatti@gmail.com>
-  ~
-  ~ This file is part of QKSMS.
-  ~
-  ~ QKSMS is free software: you can redistribute it and/or modify
-  ~ it under the terms of the GNU General Public License as published by
-  ~ the Free Software Foundation, either version 3 of the License, or
-  ~ (at your option) any later version.
-  ~
-  ~ QKSMS is distributed in the hope that it will be useful,
-  ~ but WITHOUT ANY WARRANTY; without even the implied warranty of
-  ~ MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
-  ~ GNU General Public License for more details.
-  ~
-  ~ You should have received a copy of the GNU General Public License
-  ~ along with QKSMS.  If not, see <http://www.gnu.org/licenses/>.
-  -->
-<layer-list xmlns:android="http://schemas.android.com/apk/res/android">
-    <item>
-        <shape android:shape="rectangle">
-            <solid android:color="@android:color/transparent" />
-            <stroke
-                android:width="1dp"
-                android:color="@color/white" />
-            <corners android:radius="22dp" />
-        </shape>
-    </item>
+<?xml version="1.0" encoding="utf-8"?>
+<!--
+  ~ Copyright (C) 2019 Moez Bhatti <moez.bhatti@gmail.com>
+  ~
+  ~ This file is part of QKSMS.
+  ~
+  ~ QKSMS is free software: you can redistribute it and/or modify
+  ~ it under the terms of the GNU General Public License as published by
+  ~ the Free Software Foundation, either version 3 of the License, or
+  ~ (at your option) any later version.
+  ~
+  ~ QKSMS is distributed in the hope that it will be useful,
+  ~ but WITHOUT ANY WARRANTY; without even the implied warranty of
+  ~ MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+  ~ GNU General Public License for more details.
+  ~
+  ~ You should have received a copy of the GNU General Public License
+  ~ along with QKSMS.  If not, see <http://www.gnu.org/licenses/>.
+  -->
+<layer-list xmlns:android="http://schemas.android.com/apk/res/android">
+    <item>
+        <shape android:shape="rectangle">
+            <solid android:color="@android:color/transparent" />
+            <stroke
+                android:width="1dp"
+                android:color="@color/white" />
+            <corners android:radius="22dp" />
+        </shape>
+    </item>
 </layer-list>
\ No newline at end of file
diff --git a/presentation/src/main/res/drawable/rounded_rectangle_outline_2dp.xml b/presentation/src/main/res/drawable/rounded_rectangle_outline_2dp.xml
index 3fb6b08e0..17981372a 100755
--- a/presentation/src/main/res/drawable/rounded_rectangle_outline_2dp.xml
+++ b/presentation/src/main/res/drawable/rounded_rectangle_outline_2dp.xml
@@ -1,30 +1,30 @@
-<?xml version="1.0" encoding="utf-8"?>
-<!--
-  ~ Copyright (C) 2019 Moez Bhatti <moez.bhatti@gmail.com>
-  ~
-  ~ This file is part of QKSMS.
-  ~
-  ~ QKSMS is free software: you can redistribute it and/or modify
-  ~ it under the terms of the GNU General Public License as published by
-  ~ the Free Software Foundation, either version 3 of the License, or
-  ~ (at your option) any later version.
-  ~
-  ~ QKSMS is distributed in the hope that it will be useful,
-  ~ but WITHOUT ANY WARRANTY; without even the implied warranty of
-  ~ MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
-  ~ GNU General Public License for more details.
-  ~
-  ~ You should have received a copy of the GNU General Public License
-  ~ along with QKSMS.  If not, see <http://www.gnu.org/licenses/>.
-  -->
-<layer-list xmlns:android="http://schemas.android.com/apk/res/android">
-    <item>
-        <shape android:shape="rectangle">
-            <solid android:color="@android:color/transparent" />
-            <stroke
-                android:width="1dp"
-                android:color="@color/white" />
-            <corners android:radius="2dp" />
-        </shape>
-    </item>
+<?xml version="1.0" encoding="utf-8"?>
+<!--
+  ~ Copyright (C) 2019 Moez Bhatti <moez.bhatti@gmail.com>
+  ~
+  ~ This file is part of QKSMS.
+  ~
+  ~ QKSMS is free software: you can redistribute it and/or modify
+  ~ it under the terms of the GNU General Public License as published by
+  ~ the Free Software Foundation, either version 3 of the License, or
+  ~ (at your option) any later version.
+  ~
+  ~ QKSMS is distributed in the hope that it will be useful,
+  ~ but WITHOUT ANY WARRANTY; without even the implied warranty of
+  ~ MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+  ~ GNU General Public License for more details.
+  ~
+  ~ You should have received a copy of the GNU General Public License
+  ~ along with QKSMS.  If not, see <http://www.gnu.org/licenses/>.
+  -->
+<layer-list xmlns:android="http://schemas.android.com/apk/res/android">
+    <item>
+        <shape android:shape="rectangle">
+            <solid android:color="@android:color/transparent" />
+            <stroke
+                android:width="1dp"
+                android:color="@color/white" />
+            <corners android:radius="2dp" />
+        </shape>
+    </item>
 </layer-list>
\ No newline at end of file
diff --git a/presentation/src/main/res/drawable/rounded_rectangle_outline_4dp.xml b/presentation/src/main/res/drawable/rounded_rectangle_outline_4dp.xml
index 6230177a0..9004bf369 100755
--- a/presentation/src/main/res/drawable/rounded_rectangle_outline_4dp.xml
+++ b/presentation/src/main/res/drawable/rounded_rectangle_outline_4dp.xml
@@ -1,30 +1,30 @@
-<?xml version="1.0" encoding="utf-8"?>
-<!--
-  ~ Copyright (C) 2019 Moez Bhatti <moez.bhatti@gmail.com>
-  ~
-  ~ This file is part of QKSMS.
-  ~
-  ~ QKSMS is free software: you can redistribute it and/or modify
-  ~ it under the terms of the GNU General Public License as published by
-  ~ the Free Software Foundation, either version 3 of the License, or
-  ~ (at your option) any later version.
-  ~
-  ~ QKSMS is distributed in the hope that it will be useful,
-  ~ but WITHOUT ANY WARRANTY; without even the implied warranty of
-  ~ MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
-  ~ GNU General Public License for more details.
-  ~
-  ~ You should have received a copy of the GNU General Public License
-  ~ along with QKSMS.  If not, see <http://www.gnu.org/licenses/>.
-  -->
-<layer-list xmlns:android="http://schemas.android.com/apk/res/android">
-    <item>
-        <shape android:shape="rectangle">
-            <solid android:color="@android:color/transparent" />
-            <stroke
-                android:width="1dp"
-                android:color="@color/white" />
-            <corners android:radius="4dp" />
-        </shape>
-    </item>
+<?xml version="1.0" encoding="utf-8"?>
+<!--
+  ~ Copyright (C) 2019 Moez Bhatti <moez.bhatti@gmail.com>
+  ~
+  ~ This file is part of QKSMS.
+  ~
+  ~ QKSMS is free software: you can redistribute it and/or modify
+  ~ it under the terms of the GNU General Public License as published by
+  ~ the Free Software Foundation, either version 3 of the License, or
+  ~ (at your option) any later version.
+  ~
+  ~ QKSMS is distributed in the hope that it will be useful,
+  ~ but WITHOUT ANY WARRANTY; without even the implied warranty of
+  ~ MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+  ~ GNU General Public License for more details.
+  ~
+  ~ You should have received a copy of the GNU General Public License
+  ~ along with QKSMS.  If not, see <http://www.gnu.org/licenses/>.
+  -->
+<layer-list xmlns:android="http://schemas.android.com/apk/res/android">
+    <item>
+        <shape android:shape="rectangle">
+            <solid android:color="@android:color/transparent" />
+            <stroke
+                android:width="1dp"
+                android:color="@color/white" />
+            <corners android:radius="4dp" />
+        </shape>
+    </item>
 </layer-list>
\ No newline at end of file
diff --git a/presentation/src/main/res/drawable/rounded_rectangle_right_4dp.xml b/presentation/src/main/res/drawable/rounded_rectangle_right_4dp.xml
index 799bdec48..b9210f951 100755
--- a/presentation/src/main/res/drawable/rounded_rectangle_right_4dp.xml
+++ b/presentation/src/main/res/drawable/rounded_rectangle_right_4dp.xml
@@ -1,29 +1,29 @@
-<?xml version="1.0" encoding="utf-8"?>
-<!--
-  ~ Copyright (C) 2019 Moez Bhatti <moez.bhatti@gmail.com>
-  ~
-  ~ This file is part of QKSMS.
-  ~
-  ~ QKSMS is free software: you can redistribute it and/or modify
-  ~ it under the terms of the GNU General Public License as published by
-  ~ the Free Software Foundation, either version 3 of the License, or
-  ~ (at your option) any later version.
-  ~
-  ~ QKSMS is distributed in the hope that it will be useful,
-  ~ but WITHOUT ANY WARRANTY; without even the implied warranty of
-  ~ MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
-  ~ GNU General Public License for more details.
-  ~
-  ~ You should have received a copy of the GNU General Public License
-  ~ along with QKSMS.  If not, see <http://www.gnu.org/licenses/>.
-  -->
-<layer-list xmlns:android="http://schemas.android.com/apk/res/android">
-    <item>
-        <shape android:shape="rectangle">
-            <solid android:color="@color/white" />
-            <corners
-                android:bottomRightRadius="4dp"
-                android:topRightRadius="4dp" />
-        </shape>
-    </item>
+<?xml version="1.0" encoding="utf-8"?>
+<!--
+  ~ Copyright (C) 2019 Moez Bhatti <moez.bhatti@gmail.com>
+  ~
+  ~ This file is part of QKSMS.
+  ~
+  ~ QKSMS is free software: you can redistribute it and/or modify
+  ~ it under the terms of the GNU General Public License as published by
+  ~ the Free Software Foundation, either version 3 of the License, or
+  ~ (at your option) any later version.
+  ~
+  ~ QKSMS is distributed in the hope that it will be useful,
+  ~ but WITHOUT ANY WARRANTY; without even the implied warranty of
+  ~ MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+  ~ GNU General Public License for more details.
+  ~
+  ~ You should have received a copy of the GNU General Public License
+  ~ along with QKSMS.  If not, see <http://www.gnu.org/licenses/>.
+  -->
+<layer-list xmlns:android="http://schemas.android.com/apk/res/android">
+    <item>
+        <shape android:shape="rectangle">
+            <solid android:color="@color/white" />
+            <corners
+                android:bottomRightRadius="4dp"
+                android:topRightRadius="4dp" />
+        </shape>
+    </item>
 </layer-list>
\ No newline at end of file
diff --git a/presentation/src/main/res/drawable/rounded_rectangle_top_4dp.xml b/presentation/src/main/res/drawable/rounded_rectangle_top_4dp.xml
index da738ef00..55dc8d2ec 100755
--- a/presentation/src/main/res/drawable/rounded_rectangle_top_4dp.xml
+++ b/presentation/src/main/res/drawable/rounded_rectangle_top_4dp.xml
@@ -1,29 +1,29 @@
-<?xml version="1.0" encoding="utf-8"?>
-<!--
-  ~ Copyright (C) 2019 Moez Bhatti <moez.bhatti@gmail.com>
-  ~
-  ~ This file is part of QKSMS.
-  ~
-  ~ QKSMS is free software: you can redistribute it and/or modify
-  ~ it under the terms of the GNU General Public License as published by
-  ~ the Free Software Foundation, either version 3 of the License, or
-  ~ (at your option) any later version.
-  ~
-  ~ QKSMS is distributed in the hope that it will be useful,
-  ~ but WITHOUT ANY WARRANTY; without even the implied warranty of
-  ~ MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
-  ~ GNU General Public License for more details.
-  ~
-  ~ You should have received a copy of the GNU General Public License
-  ~ along with QKSMS.  If not, see <http://www.gnu.org/licenses/>.
-  -->
-<layer-list xmlns:android="http://schemas.android.com/apk/res/android">
-    <item>
-        <shape android:shape="rectangle">
-            <solid android:color="@color/white" />
-            <corners
-                android:topLeftRadius="4dp"
-                android:topRightRadius="4dp" />
-        </shape>
-    </item>
+<?xml version="1.0" encoding="utf-8"?>
+<!--
+  ~ Copyright (C) 2019 Moez Bhatti <moez.bhatti@gmail.com>
+  ~
+  ~ This file is part of QKSMS.
+  ~
+  ~ QKSMS is free software: you can redistribute it and/or modify
+  ~ it under the terms of the GNU General Public License as published by
+  ~ the Free Software Foundation, either version 3 of the License, or
+  ~ (at your option) any later version.
+  ~
+  ~ QKSMS is distributed in the hope that it will be useful,
+  ~ but WITHOUT ANY WARRANTY; without even the implied warranty of
+  ~ MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+  ~ GNU General Public License for more details.
+  ~
+  ~ You should have received a copy of the GNU General Public License
+  ~ along with QKSMS.  If not, see <http://www.gnu.org/licenses/>.
+  -->
+<layer-list xmlns:android="http://schemas.android.com/apk/res/android">
+    <item>
+        <shape android:shape="rectangle">
+            <solid android:color="@color/white" />
+            <corners
+                android:topLeftRadius="4dp"
+                android:topRightRadius="4dp" />
+        </shape>
+    </item>
 </layer-list>
\ No newline at end of file
diff --git a/presentation/src/main/res/font/lato.xml b/presentation/src/main/res/font/lato.xml
index 8e18a1267..917085c7a 100644
--- a/presentation/src/main/res/font/lato.xml
+++ b/presentation/src/main/res/font/lato.xml
@@ -1,24 +1,24 @@
-<?xml version="1.0" encoding="utf-8"?>
-<!--
-  ~ Copyright (C) 2019 Moez Bhatti <moez.bhatti@gmail.com>
-  ~
-  ~ This file is part of QKSMS.
-  ~
-  ~ QKSMS is free software: you can redistribute it and/or modify
-  ~ it under the terms of the GNU General Public License as published by
-  ~ the Free Software Foundation, either version 3 of the License, or
-  ~ (at your option) any later version.
-  ~
-  ~ QKSMS is distributed in the hope that it will be useful,
-  ~ but WITHOUT ANY WARRANTY; without even the implied warranty of
-  ~ MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
-  ~ GNU General Public License for more details.
-  ~
-  ~ You should have received a copy of the GNU General Public License
-  ~ along with QKSMS.  If not, see <http://www.gnu.org/licenses/>.
-  -->
-<font-family xmlns:app="http://schemas.android.com/apk/res-auto"
-    app:fontProviderAuthority="com.google.android.gms.fonts"
-    app:fontProviderCerts="@array/com_google_android_gms_fonts_certs"
-    app:fontProviderPackage="com.google.android.gms"
-    app:fontProviderQuery="Lato"></font-family>
+<?xml version="1.0" encoding="utf-8"?>
+<!--
+  ~ Copyright (C) 2019 Moez Bhatti <moez.bhatti@gmail.com>
+  ~
+  ~ This file is part of QKSMS.
+  ~
+  ~ QKSMS is free software: you can redistribute it and/or modify
+  ~ it under the terms of the GNU General Public License as published by
+  ~ the Free Software Foundation, either version 3 of the License, or
+  ~ (at your option) any later version.
+  ~
+  ~ QKSMS is distributed in the hope that it will be useful,
+  ~ but WITHOUT ANY WARRANTY; without even the implied warranty of
+  ~ MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+  ~ GNU General Public License for more details.
+  ~
+  ~ You should have received a copy of the GNU General Public License
+  ~ along with QKSMS.  If not, see <http://www.gnu.org/licenses/>.
+  -->
+<font-family xmlns:app="http://schemas.android.com/apk/res-auto"
+    app:fontProviderAuthority="com.google.android.gms.fonts"
+    app:fontProviderCerts="@array/com_google_android_gms_fonts_certs"
+    app:fontProviderPackage="com.google.android.gms"
+    app:fontProviderQuery="Lato"></font-family>
diff --git a/presentation/src/main/res/layout/about_controller.xml b/presentation/src/main/res/layout/about_controller.xml
index 22e9fe0d5..351ecbfce 100644
--- a/presentation/src/main/res/layout/about_controller.xml
+++ b/presentation/src/main/res/layout/about_controller.xml
@@ -1,87 +1,87 @@
-<?xml version="1.0" encoding="utf-8"?>
-<!--
-  ~ Copyright (C) 2019 Moez Bhatti <moez.bhatti@gmail.com>
-  ~
-  ~ This file is part of QKSMS.
-  ~
-  ~ QKSMS is free software: you can redistribute it and/or modify
-  ~ it under the terms of the GNU General Public License as published by
-  ~ the Free Software Foundation, either version 3 of the License, or
-  ~ (at your option) any later version.
-  ~
-  ~ QKSMS is distributed in the hope that it will be useful,
-  ~ but WITHOUT ANY WARRANTY; without even the implied warranty of
-  ~ MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
-  ~ GNU General Public License for more details.
-  ~
-  ~ You should have received a copy of the GNU General Public License
-  ~ along with QKSMS.  If not, see <http://www.gnu.org/licenses/>.
-  -->
-<ScrollView xmlns:android="http://schemas.android.com/apk/res/android"
-    xmlns:app="http://schemas.android.com/apk/res-auto"
-    xmlns:tools="http://schemas.android.com/tools"
-    android:layout_width="match_parent"
-    android:layout_height="match_parent"
-    android:background="?android:attr/windowBackground">
-
-    <LinearLayout
-        android:id="@+id/preferences"
-        android:layout_width="match_parent"
-        android:layout_height="wrap_content"
-        android:animateLayoutChanges="true"
-        android:orientation="vertical"
-        android:paddingTop="8dp"
-        android:paddingBottom="8dp">
-
-        <com.moez.QKSMS.common.widget.PreferenceView
-            android:id="@+id/version"
-            android:layout_width="match_parent"
-            android:layout_height="wrap_content"
-            app:title="@string/about_version_title"
-            tools:summary="3.0.8" />
-
-        <com.moez.QKSMS.common.widget.PreferenceView
-            android:id="@+id/developer"
-            android:layout_width="match_parent"
-            android:layout_height="wrap_content"
-            app:summary="@string/about_developer"
-            app:title="@string/about_developer_title" />
-
-        <com.moez.QKSMS.common.widget.PreferenceView
-            android:id="@+id/source"
-            android:layout_width="match_parent"
-            android:layout_height="wrap_content"
-            app:summary="@string/about_source"
-            app:title="@string/about_source_title" />
-
-        <com.moez.QKSMS.common.widget.PreferenceView
-            android:id="@+id/changelog"
-            android:layout_width="match_parent"
-            android:layout_height="wrap_content"
-            app:summary="@string/about_changelog"
-            app:title="@string/about_changelog_title" />
-
-        <com.moez.QKSMS.common.widget.PreferenceView
-            android:id="@+id/contact"
-            android:layout_width="match_parent"
-            android:layout_height="wrap_content"
-            app:summary="@string/about_contact"
-            app:title="@string/about_contact_title" />
-
-        <com.moez.QKSMS.common.widget.PreferenceView
-            android:id="@+id/license"
-            android:layout_width="match_parent"
-            android:layout_height="wrap_content"
-            app:summary="@string/about_license"
-            app:title="@string/about_license_title" />
-
-        <com.moez.QKSMS.common.widget.PreferenceView
-            android:id="@+id/copyright"
-            android:layout_width="match_parent"
-            android:layout_height="wrap_content"
-            app:summary="@string/about_copyright"
-            app:title="@string/about_copyright_title" />
-
-    </LinearLayout>
-
+<?xml version="1.0" encoding="utf-8"?>
+<!--
+  ~ Copyright (C) 2019 Moez Bhatti <moez.bhatti@gmail.com>
+  ~
+  ~ This file is part of QKSMS.
+  ~
+  ~ QKSMS is free software: you can redistribute it and/or modify
+  ~ it under the terms of the GNU General Public License as published by
+  ~ the Free Software Foundation, either version 3 of the License, or
+  ~ (at your option) any later version.
+  ~
+  ~ QKSMS is distributed in the hope that it will be useful,
+  ~ but WITHOUT ANY WARRANTY; without even the implied warranty of
+  ~ MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+  ~ GNU General Public License for more details.
+  ~
+  ~ You should have received a copy of the GNU General Public License
+  ~ along with QKSMS.  If not, see <http://www.gnu.org/licenses/>.
+  -->
+<ScrollView xmlns:android="http://schemas.android.com/apk/res/android"
+    xmlns:app="http://schemas.android.com/apk/res-auto"
+    xmlns:tools="http://schemas.android.com/tools"
+    android:layout_width="match_parent"
+    android:layout_height="match_parent"
+    android:background="?android:attr/windowBackground">
+
+    <LinearLayout
+        android:id="@+id/preferences"
+        android:layout_width="match_parent"
+        android:layout_height="wrap_content"
+        android:animateLayoutChanges="true"
+        android:orientation="vertical"
+        android:paddingTop="8dp"
+        android:paddingBottom="8dp">
+
+        <com.moez.QKSMS.common.widget.PreferenceView
+            android:id="@+id/version"
+            android:layout_width="match_parent"
+            android:layout_height="wrap_content"
+            app:title="@string/about_version_title"
+            tools:summary="3.0.8" />
+
+        <com.moez.QKSMS.common.widget.PreferenceView
+            android:id="@+id/developer"
+            android:layout_width="match_parent"
+            android:layout_height="wrap_content"
+            app:summary="@string/about_developer"
+            app:title="@string/about_developer_title" />
+
+        <com.moez.QKSMS.common.widget.PreferenceView
+            android:id="@+id/source"
+            android:layout_width="match_parent"
+            android:layout_height="wrap_content"
+            app:summary="@string/about_source"
+            app:title="@string/about_source_title" />
+
+        <com.moez.QKSMS.common.widget.PreferenceView
+            android:id="@+id/changelog"
+            android:layout_width="match_parent"
+            android:layout_height="wrap_content"
+            app:summary="@string/about_changelog"
+            app:title="@string/about_changelog_title" />
+
+        <com.moez.QKSMS.common.widget.PreferenceView
+            android:id="@+id/contact"
+            android:layout_width="match_parent"
+            android:layout_height="wrap_content"
+            app:summary="@string/about_contact"
+            app:title="@string/about_contact_title" />
+
+        <com.moez.QKSMS.common.widget.PreferenceView
+            android:id="@+id/license"
+            android:layout_width="match_parent"
+            android:layout_height="wrap_content"
+            app:summary="@string/about_license"
+            app:title="@string/about_license_title" />
+
+        <com.moez.QKSMS.common.widget.PreferenceView
+            android:id="@+id/copyright"
+            android:layout_width="match_parent"
+            android:layout_height="wrap_content"
+            app:summary="@string/about_copyright"
+            app:title="@string/about_copyright_title" />
+
+    </LinearLayout>
+
 </ScrollView>
\ No newline at end of file
diff --git a/presentation/src/main/res/layout/attachment_contact_list_item.xml b/presentation/src/main/res/layout/attachment_contact_list_item.xml
index 1c9f88837..b1c7d2796 100644
--- a/presentation/src/main/res/layout/attachment_contact_list_item.xml
+++ b/presentation/src/main/res/layout/attachment_contact_list_item.xml
@@ -1,93 +1,93 @@
-<?xml version="1.0" encoding="utf-8"?>
-<!--
-  ~ Copyright (C) 2019 Moez Bhatti <moez.bhatti@gmail.com>
-  ~
-  ~ This file is part of QKSMS.
-  ~
-  ~ QKSMS is free software: you can redistribute it and/or modify
-  ~ it under the terms of the GNU General Public License as published by
-  ~ the Free Software Foundation, either version 3 of the License, or
-  ~ (at your option) any later version.
-  ~
-  ~ QKSMS is distributed in the hope that it will be useful,
-  ~ but WITHOUT ANY WARRANTY; without even the implied warranty of
-  ~ MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
-  ~ GNU General Public License for more details.
-  ~
-  ~ You should have received a copy of the GNU General Public License
-  ~ along with QKSMS.  If not, see <http://www.gnu.org/licenses/>.
-  -->
-<FrameLayout xmlns:android="http://schemas.android.com/apk/res/android"
-    xmlns:app="http://schemas.android.com/apk/res-auto"
-    xmlns:tools="http://schemas.android.com/tools"
-    android:layout_width="wrap_content"
-    android:layout_height="wrap_content"
-    tools:background="?attr/bubbleColor">
-
-    <androidx.constraintlayout.widget.ConstraintLayout
-        android:layout_width="wrap_content"
-        android:layout_height="56dp"
-        android:layout_marginStart="8dp"
-        android:layout_marginTop="16dp"
-        android:layout_marginEnd="8dp"
-        android:background="@drawable/rounded_rectangle_outline_4dp"
-        android:backgroundTint="?android:attr/divider"
-        android:paddingEnd="8dp">
-
-        <ImageView
-            android:id="@+id/vCardAvatar"
-            android:layout_width="24dp"
-            android:layout_height="24dp"
-            android:layout_marginStart="16dp"
-            android:src="@drawable/ic_person_black_24dp"
-            android:tint="?android:attr/textColorSecondary"
-            app:layout_constraintBottom_toBottomOf="parent"
-            app:layout_constraintStart_toStartOf="parent"
-            app:layout_constraintTop_toTopOf="parent" />
-
-        <com.moez.QKSMS.common.widget.QkTextView
-            android:id="@+id/name"
-            android:layout_width="wrap_content"
-            android:layout_height="wrap_content"
-            android:layout_marginStart="16dp"
-            android:layout_marginEnd="16dp"
-            android:textColor="?android:attr/textColorPrimary"
-            app:layout_constraintBottom_toTopOf="@id/label"
-            app:layout_constraintEnd_toEndOf="parent"
-            app:layout_constraintHorizontal_bias="0"
-            app:layout_constraintStart_toEndOf="@id/vCardAvatar"
-            app:layout_constraintTop_toTopOf="parent"
-            app:layout_constraintVertical_chainStyle="packed"
-            app:textSize="primary"
-            tools:text="@tools:sample/full_names" />
-
-        <com.moez.QKSMS.common.widget.QkTextView
-            android:id="@+id/label"
-            android:layout_width="wrap_content"
-            android:layout_height="wrap_content"
-            android:layout_marginStart="16dp"
-            android:layout_marginEnd="16dp"
-            android:text="@string/compose_vcard_label"
-            android:textColor="?android:attr/textColorTertiary"
-            app:layout_constraintBottom_toBottomOf="parent"
-            app:layout_constraintEnd_toEndOf="parent"
-            app:layout_constraintHorizontal_bias="0"
-            app:layout_constraintStart_toEndOf="@id/vCardAvatar"
-            app:layout_constraintTop_toBottomOf="@id/name"
-            app:textSize="secondary" />
-
-    </androidx.constraintlayout.widget.ConstraintLayout>
-
-    <ImageView
-        android:id="@+id/detach"
-        android:layout_width="24dp"
-        android:layout_height="24dp"
-        android:layout_gravity="top|end"
-        android:layout_marginTop="10dp"
-        android:layout_marginEnd="2dp"
-        android:background="@drawable/circle"
-        android:backgroundTint="?attr/bubbleColor"
-        android:src="@drawable/ic_cancel_black_24dp"
-        android:tint="?android:attr/textColorSecondary" />
-
+<?xml version="1.0" encoding="utf-8"?>
+<!--
+  ~ Copyright (C) 2019 Moez Bhatti <moez.bhatti@gmail.com>
+  ~
+  ~ This file is part of QKSMS.
+  ~
+  ~ QKSMS is free software: you can redistribute it and/or modify
+  ~ it under the terms of the GNU General Public License as published by
+  ~ the Free Software Foundation, either version 3 of the License, or
+  ~ (at your option) any later version.
+  ~
+  ~ QKSMS is distributed in the hope that it will be useful,
+  ~ but WITHOUT ANY WARRANTY; without even the implied warranty of
+  ~ MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+  ~ GNU General Public License for more details.
+  ~
+  ~ You should have received a copy of the GNU General Public License
+  ~ along with QKSMS.  If not, see <http://www.gnu.org/licenses/>.
+  -->
+<FrameLayout xmlns:android="http://schemas.android.com/apk/res/android"
+    xmlns:app="http://schemas.android.com/apk/res-auto"
+    xmlns:tools="http://schemas.android.com/tools"
+    android:layout_width="wrap_content"
+    android:layout_height="wrap_content"
+    tools:background="?attr/bubbleColor">
+
+    <androidx.constraintlayout.widget.ConstraintLayout
+        android:layout_width="wrap_content"
+        android:layout_height="56dp"
+        android:layout_marginStart="8dp"
+        android:layout_marginTop="16dp"
+        android:layout_marginEnd="8dp"
+        android:background="@drawable/rounded_rectangle_outline_4dp"
+        android:backgroundTint="?android:attr/divider"
+        android:paddingEnd="8dp">
+
+        <ImageView
+            android:id="@+id/vCardAvatar"
+            android:layout_width="24dp"
+            android:layout_height="24dp"
+            android:layout_marginStart="16dp"
+            android:src="@drawable/ic_person_black_24dp"
+            android:tint="?android:attr/textColorSecondary"
+            app:layout_constraintBottom_toBottomOf="parent"
+            app:layout_constraintStart_toStartOf="parent"
+            app:layout_constraintTop_toTopOf="parent" />
+
+        <com.moez.QKSMS.common.widget.QkTextView
+            android:id="@+id/name"
+            android:layout_width="wrap_content"
+            android:layout_height="wrap_content"
+            android:layout_marginStart="16dp"
+            android:layout_marginEnd="16dp"
+            android:textColor="?android:attr/textColorPrimary"
+            app:layout_constraintBottom_toTopOf="@id/label"
+            app:layout_constraintEnd_toEndOf="parent"
+            app:layout_constraintHorizontal_bias="0"
+            app:layout_constraintStart_toEndOf="@id/vCardAvatar"
+            app:layout_constraintTop_toTopOf="parent"
+            app:layout_constraintVertical_chainStyle="packed"
+            app:textSize="primary"
+            tools:text="@tools:sample/full_names" />
+
+        <com.moez.QKSMS.common.widget.QkTextView
+            android:id="@+id/label"
+            android:layout_width="wrap_content"
+            android:layout_height="wrap_content"
+            android:layout_marginStart="16dp"
+            android:layout_marginEnd="16dp"
+            android:text="@string/compose_vcard_label"
+            android:textColor="?android:attr/textColorTertiary"
+            app:layout_constraintBottom_toBottomOf="parent"
+            app:layout_constraintEnd_toEndOf="parent"
+            app:layout_constraintHorizontal_bias="0"
+            app:layout_constraintStart_toEndOf="@id/vCardAvatar"
+            app:layout_constraintTop_toBottomOf="@id/name"
+            app:textSize="secondary" />
+
+    </androidx.constraintlayout.widget.ConstraintLayout>
+
+    <ImageView
+        android:id="@+id/detach"
+        android:layout_width="24dp"
+        android:layout_height="24dp"
+        android:layout_gravity="top|end"
+        android:layout_marginTop="10dp"
+        android:layout_marginEnd="2dp"
+        android:background="@drawable/circle"
+        android:backgroundTint="?attr/bubbleColor"
+        android:src="@drawable/ic_cancel_black_24dp"
+        android:tint="?android:attr/textColorSecondary" />
+
 </FrameLayout>
\ No newline at end of file
diff --git a/presentation/src/main/res/layout/attachment_image_list_item.xml b/presentation/src/main/res/layout/attachment_image_list_item.xml
index ff757f035..ed66791b2 100644
--- a/presentation/src/main/res/layout/attachment_image_list_item.xml
+++ b/presentation/src/main/res/layout/attachment_image_list_item.xml
@@ -1,56 +1,56 @@
-<?xml version="1.0" encoding="utf-8"?>
-<!--
-  ~ Copyright (C) 2019 Moez Bhatti <moez.bhatti@gmail.com>
-  ~
-  ~ This file is part of QKSMS.
-  ~
-  ~ QKSMS is free software: you can redistribute it and/or modify
-  ~ it under the terms of the GNU General Public License as published by
-  ~ the Free Software Foundation, either version 3 of the License, or
-  ~ (at your option) any later version.
-  ~
-  ~ QKSMS is distributed in the hope that it will be useful,
-  ~ but WITHOUT ANY WARRANTY; without even the implied warranty of
-  ~ MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
-  ~ GNU General Public License for more details.
-  ~
-  ~ You should have received a copy of the GNU General Public License
-  ~ along with QKSMS.  If not, see <http://www.gnu.org/licenses/>.
-  -->
-<FrameLayout xmlns:android="http://schemas.android.com/apk/res/android"
-    xmlns:tools="http://schemas.android.com/tools"
-    android:layout_width="wrap_content"
-    android:layout_height="wrap_content"
-    tools:background="?attr/bubbleColor">
-
-    <FrameLayout
-        android:id="@+id/thumbnailBounds"
-        android:layout_width="56dp"
-        android:layout_height="56dp"
-        android:layout_marginStart="8dp"
-        android:layout_marginTop="16dp"
-        android:layout_marginEnd="8dp"
-        android:background="@drawable/rounded_rectangle_4dp">
-
-        <ImageView
-            android:id="@+id/thumbnail"
-            android:layout_width="match_parent"
-            android:layout_height="match_parent"
-            android:scaleType="centerCrop"
-            tools:src="@tools:sample/avatars" />
-
-    </FrameLayout>
-
-    <ImageView
-        android:id="@+id/detach"
-        android:layout_width="24dp"
-        android:layout_height="24dp"
-        android:layout_gravity="top|end"
-        android:layout_marginTop="10dp"
-        android:layout_marginEnd="2dp"
-        android:background="@drawable/circle"
-        android:backgroundTint="?attr/bubbleColor"
-        android:src="@drawable/ic_cancel_black_24dp"
-        android:tint="?android:attr/textColorSecondary" />
-
+<?xml version="1.0" encoding="utf-8"?>
+<!--
+  ~ Copyright (C) 2019 Moez Bhatti <moez.bhatti@gmail.com>
+  ~
+  ~ This file is part of QKSMS.
+  ~
+  ~ QKSMS is free software: you can redistribute it and/or modify
+  ~ it under the terms of the GNU General Public License as published by
+  ~ the Free Software Foundation, either version 3 of the License, or
+  ~ (at your option) any later version.
+  ~
+  ~ QKSMS is distributed in the hope that it will be useful,
+  ~ but WITHOUT ANY WARRANTY; without even the implied warranty of
+  ~ MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+  ~ GNU General Public License for more details.
+  ~
+  ~ You should have received a copy of the GNU General Public License
+  ~ along with QKSMS.  If not, see <http://www.gnu.org/licenses/>.
+  -->
+<FrameLayout xmlns:android="http://schemas.android.com/apk/res/android"
+    xmlns:tools="http://schemas.android.com/tools"
+    android:layout_width="wrap_content"
+    android:layout_height="wrap_content"
+    tools:background="?attr/bubbleColor">
+
+    <FrameLayout
+        android:id="@+id/thumbnailBounds"
+        android:layout_width="56dp"
+        android:layout_height="56dp"
+        android:layout_marginStart="8dp"
+        android:layout_marginTop="16dp"
+        android:layout_marginEnd="8dp"
+        android:background="@drawable/rounded_rectangle_4dp">
+
+        <ImageView
+            android:id="@+id/thumbnail"
+            android:layout_width="match_parent"
+            android:layout_height="match_parent"
+            android:scaleType="centerCrop"
+            tools:src="@tools:sample/avatars" />
+
+    </FrameLayout>
+
+    <ImageView
+        android:id="@+id/detach"
+        android:layout_width="24dp"
+        android:layout_height="24dp"
+        android:layout_gravity="top|end"
+        android:layout_marginTop="10dp"
+        android:layout_marginEnd="2dp"
+        android:background="@drawable/circle"
+        android:backgroundTint="?attr/bubbleColor"
+        android:src="@drawable/ic_cancel_black_24dp"
+        android:tint="?android:attr/textColorSecondary" />
+
 </FrameLayout>
\ No newline at end of file
diff --git a/presentation/src/main/res/layout/avatar_view.xml b/presentation/src/main/res/layout/avatar_view.xml
index 420fb7960..95a713dbf 100644
--- a/presentation/src/main/res/layout/avatar_view.xml
+++ b/presentation/src/main/res/layout/avatar_view.xml
@@ -1,54 +1,54 @@
-<?xml version="1.0" encoding="utf-8"?>
-<!--
-  ~ Copyright (C) 2019 Moez Bhatti <moez.bhatti@gmail.com>
-  ~
-  ~ This file is part of QKSMS.
-  ~
-  ~ QKSMS is free software: you can redistribute it and/or modify
-  ~ it under the terms of the GNU General Public License as published by
-  ~ the Free Software Foundation, either version 3 of the License, or
-  ~ (at your option) any later version.
-  ~
-  ~ QKSMS is distributed in the hope that it will be useful,
-  ~ but WITHOUT ANY WARRANTY; without even the implied warranty of
-  ~ MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
-  ~ GNU General Public License for more details.
-  ~
-  ~ You should have received a copy of the GNU General Public License
-  ~ along with QKSMS.  If not, see <http://www.gnu.org/licenses/>.
-  -->
-<merge xmlns:android="http://schemas.android.com/apk/res/android"
-    xmlns:app="http://schemas.android.com/apk/res-auto"
-    xmlns:tools="http://schemas.android.com/tools"
-    android:id="@+id/avatar"
-    android:layout_width="match_parent"
-    android:layout_height="match_parent"
-    tools:parentTag="com.moez.QKSMS.common.widget.AvatarView">
-
-    <com.moez.QKSMS.common.widget.QkTextView
-        android:id="@+id/initial"
-        android:layout_width="match_parent"
-        android:layout_height="match_parent"
-        android:gravity="center"
-        android:padding="6dp"
-        android:textAllCaps="true"
-        app:autoSizeMaxTextSize="22sp"
-        app:autoSizeTextType="uniform" />
-
-    <ImageView
-        android:id="@+id/icon"
-        android:layout_width="24dp"
-        android:layout_height="24dp"
-        android:layout_gravity="center"
-        android:src="@drawable/ic_person_black_24dp"
-        android:tint="@color/white" />
-
-    <ImageView
-        android:id="@+id/photo"
-        android:layout_width="match_parent"
-        android:layout_height="match_parent"
-        android:scaleType="centerCrop"
-        tools:background="@color/tools_theme"
-        tools:src="@tools:sample/avatars" />
-
-</merge>
+<?xml version="1.0" encoding="utf-8"?>
+<!--
+  ~ Copyright (C) 2019 Moez Bhatti <moez.bhatti@gmail.com>
+  ~
+  ~ This file is part of QKSMS.
+  ~
+  ~ QKSMS is free software: you can redistribute it and/or modify
+  ~ it under the terms of the GNU General Public License as published by
+  ~ the Free Software Foundation, either version 3 of the License, or
+  ~ (at your option) any later version.
+  ~
+  ~ QKSMS is distributed in the hope that it will be useful,
+  ~ but WITHOUT ANY WARRANTY; without even the implied warranty of
+  ~ MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+  ~ GNU General Public License for more details.
+  ~
+  ~ You should have received a copy of the GNU General Public License
+  ~ along with QKSMS.  If not, see <http://www.gnu.org/licenses/>.
+  -->
+<merge xmlns:android="http://schemas.android.com/apk/res/android"
+    xmlns:app="http://schemas.android.com/apk/res-auto"
+    xmlns:tools="http://schemas.android.com/tools"
+    android:id="@+id/avatar"
+    android:layout_width="match_parent"
+    android:layout_height="match_parent"
+    tools:parentTag="com.moez.QKSMS.common.widget.AvatarView">
+
+    <com.moez.QKSMS.common.widget.QkTextView
+        android:id="@+id/initial"
+        android:layout_width="match_parent"
+        android:layout_height="match_parent"
+        android:gravity="center"
+        android:padding="6dp"
+        android:textAllCaps="true"
+        app:autoSizeMaxTextSize="22sp"
+        app:autoSizeTextType="uniform" />
+
+    <ImageView
+        android:id="@+id/icon"
+        android:layout_width="24dp"
+        android:layout_height="24dp"
+        android:layout_gravity="center"
+        android:src="@drawable/ic_person_black_24dp"
+        android:tint="@color/white" />
+
+    <ImageView
+        android:id="@+id/photo"
+        android:layout_width="match_parent"
+        android:layout_height="match_parent"
+        android:scaleType="centerCrop"
+        tools:background="@color/tools_theme"
+        tools:src="@tools:sample/avatars" />
+
+</merge>
diff --git a/presentation/src/main/res/layout/backup_controller.xml b/presentation/src/main/res/layout/backup_controller.xml
index 88983dbcc..d4441a740 100644
--- a/presentation/src/main/res/layout/backup_controller.xml
+++ b/presentation/src/main/res/layout/backup_controller.xml
@@ -1,186 +1,186 @@
-<?xml version="1.0" encoding="utf-8"?>
-<!--
-  ~ Copyright (C) 2019 Moez Bhatti <moez.bhatti@gmail.com>
-  ~
-  ~ This file is part of QKSMS.
-  ~
-  ~ QKSMS is free software: you can redistribute it and/or modify
-  ~ it under the terms of the GNU General Public License as published by
-  ~ the Free Software Foundation, either version 3 of the License, or
-  ~ (at your option) any later version.
-  ~
-  ~ QKSMS is distributed in the hope that it will be useful,
-  ~ but WITHOUT ANY WARRANTY; without even the implied warranty of
-  ~ MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
-  ~ GNU General Public License for more details.
-  ~
-  ~ You should have received a copy of the GNU General Public License
-  ~ along with QKSMS.  If not, see <http://www.gnu.org/licenses/>.
-  -->
-<FrameLayout xmlns:android="http://schemas.android.com/apk/res/android"
-    xmlns:app="http://schemas.android.com/apk/res-auto"
-    xmlns:tools="http://schemas.android.com/tools"
-    android:layout_width="match_parent"
-    android:layout_height="match_parent">
-
-    <ScrollView
-        android:layout_width="match_parent"
-        android:layout_height="match_parent"
-        android:paddingTop="8dp"
-        android:paddingBottom="8dp">
-
-        <LinearLayout
-            android:id="@+id/linearLayout"
-            android:layout_width="match_parent"
-            android:layout_height="wrap_content"
-            android:animateLayoutChanges="true"
-            android:orientation="vertical">
-
-            <androidx.constraintlayout.widget.ConstraintLayout
-                android:id="@+id/progress"
-                android:layout_width="match_parent"
-                android:layout_height="wrap_content"
-                android:animateLayoutChanges="true"
-                android:visibility="gone"
-                tools:visibility="visible">
-
-                <ImageView
-                    android:id="@+id/progressIcon"
-                    android:layout_width="24dp"
-                    android:layout_height="24dp"
-                    android:layout_marginStart="16dp"
-                    android:tint="?android:attr/textColorSecondary"
-                    app:layout_constraintBottom_toBottomOf="@id/progressSummary"
-                    app:layout_constraintStart_toStartOf="parent"
-                    app:layout_constraintTop_toTopOf="@id/progressTitle"
-                    tools:src="@drawable/ic_file_download_black_24dp" />
-
-                <com.moez.QKSMS.common.widget.QkTextView
-                    android:id="@+id/progressTitle"
-                    android:layout_width="0dp"
-                    android:layout_height="wrap_content"
-                    android:layout_marginStart="24dp"
-                    android:layout_marginTop="16dp"
-                    android:textColor="?android:attr/textColorPrimary"
-                    android:textStyle="bold"
-                    app:layout_constraintEnd_toStartOf="@id/progressCancel"
-                    app:layout_constraintStart_toEndOf="@id/progressIcon"
-                    app:layout_constraintTop_toTopOf="parent"
-                    app:textSize="primary"
-                    tools:text="Restoring from backup" />
-
-                <com.moez.QKSMS.common.widget.QkTextView
-                    android:id="@+id/progressSummary"
-                    android:layout_width="0dp"
-                    android:layout_height="wrap_content"
-                    android:layout_marginTop="2dp"
-                    android:textColor="?android:attr/textColorTertiary"
-                    app:layout_constraintEnd_toEndOf="@id/progressTitle"
-                    app:layout_constraintStart_toStartOf="@id/progressTitle"
-                    app:layout_constraintTop_toBottomOf="@id/progressTitle"
-                    app:textSize="secondary"
-                    tools:text="8 minutes remaining" />
-
-                <ImageView
-                    android:id="@+id/progressCancel"
-                    android:layout_width="56dp"
-                    android:layout_height="56dp"
-                    android:background="?android:attr/selectableItemBackground"
-                    android:padding="16dp"
-                    android:src="@drawable/ic_close_black_24dp"
-                    android:tint="?android:attr/textColorSecondary"
-                    app:layout_constraintBottom_toBottomOf="@id/progressSummary"
-                    app:layout_constraintEnd_toEndOf="parent"
-                    app:layout_constraintTop_toTopOf="@id/progressTitle" />
-
-                <ProgressBar
-                    android:id="@+id/progressBar"
-                    style="@style/Widget.AppCompat.ProgressBar.Horizontal"
-                    android:layout_width="0dp"
-                    android:layout_height="wrap_content"
-                    android:layout_marginTop="8dp"
-                    android:layout_marginEnd="16dp"
-                    android:indeterminate="true"
-                    android:visibility="gone"
-                    app:layout_constraintEnd_toEndOf="parent"
-                    app:layout_constraintStart_toStartOf="@id/progressTitle"
-                    app:layout_constraintTop_toBottomOf="@id/progressSummary" />
-
-                <View
-                    android:layout_width="0dp"
-                    android:layout_height="1dp"
-                    android:layout_marginTop="16dp"
-                    android:background="?android:attr/divider"
-                    app:layout_constraintBottom_toBottomOf="parent"
-                    app:layout_constraintEnd_toEndOf="parent"
-                    app:layout_constraintStart_toStartOf="parent"
-                    app:layout_constraintTop_toBottomOf="@id/progressBar" />
-
-            </androidx.constraintlayout.widget.ConstraintLayout>
-
-            <com.moez.QKSMS.common.widget.PreferenceView
-                android:id="@+id/backup"
-                android:layout_width="match_parent"
-                android:layout_height="wrap_content"
-                app:icon="@drawable/ic_history_black_24dp"
-                app:title="@string/backup_last"
-                tools:summary="@string/backup_never" />
-
-            <com.moez.QKSMS.common.widget.PreferenceView
-                android:id="@+id/restore"
-                android:layout_width="match_parent"
-                android:layout_height="wrap_content"
-                app:icon="@drawable/ic_file_download_black_24dp"
-                app:summary="@string/backup_restore_summary"
-                app:title="@string/backup_restore_title" />
-
-            <View
-                android:layout_width="match_parent"
-                android:layout_height="1dp"
-                android:background="?android:attr/divider" />
-
-            <com.moez.QKSMS.common.widget.QkTextView
-                android:layout_width="match_parent"
-                android:layout_height="wrap_content"
-                android:layout_margin="24dp"
-                android:text="@string/backup_disclaimer"
-                android:textColor="?android:attr/textColorTertiary"
-                app:textSize="secondary" />
-
-        </LinearLayout>
-
-    </ScrollView>
-
-    <LinearLayout
-        android:id="@+id/fab"
-        android:layout_width="wrap_content"
-        android:layout_height="48dp"
-        android:layout_gravity="bottom|end"
-        android:layout_margin="16dp"
-        android:background="@drawable/rounded_rectangle_24dp"
-        android:elevation="4dp"
-        android:gravity="center"
-        tools:backgroundTint="@color/tools_theme">
-
-        <ImageView
-            android:id="@+id/fabIcon"
-            android:layout_width="24dp"
-            android:layout_height="24dp"
-            android:layout_marginStart="12dp"
-            android:src="@drawable/ic_star_black_24dp"
-            tools:tint="@color/textPrimaryDark" />
-
-        <com.moez.QKSMS.common.widget.QkTextView
-            android:id="@+id/fabLabel"
-            android:layout_width="wrap_content"
-            android:layout_height="wrap_content"
-            android:layout_marginStart="16dp"
-            android:layout_marginEnd="16dp"
-            android:text="@string/title_qksms_plus"
-            android:textColor="@color/textPrimaryDark"
-            android:textStyle="bold"
-            app:textSize="primary" />
-
-    </LinearLayout>
-
+<?xml version="1.0" encoding="utf-8"?>
+<!--
+  ~ Copyright (C) 2019 Moez Bhatti <moez.bhatti@gmail.com>
+  ~
+  ~ This file is part of QKSMS.
+  ~
+  ~ QKSMS is free software: you can redistribute it and/or modify
+  ~ it under the terms of the GNU General Public License as published by
+  ~ the Free Software Foundation, either version 3 of the License, or
+  ~ (at your option) any later version.
+  ~
+  ~ QKSMS is distributed in the hope that it will be useful,
+  ~ but WITHOUT ANY WARRANTY; without even the implied warranty of
+  ~ MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+  ~ GNU General Public License for more details.
+  ~
+  ~ You should have received a copy of the GNU General Public License
+  ~ along with QKSMS.  If not, see <http://www.gnu.org/licenses/>.
+  -->
+<FrameLayout xmlns:android="http://schemas.android.com/apk/res/android"
+    xmlns:app="http://schemas.android.com/apk/res-auto"
+    xmlns:tools="http://schemas.android.com/tools"
+    android:layout_width="match_parent"
+    android:layout_height="match_parent">
+
+    <ScrollView
+        android:layout_width="match_parent"
+        android:layout_height="match_parent"
+        android:paddingTop="8dp"
+        android:paddingBottom="8dp">
+
+        <LinearLayout
+            android:id="@+id/linearLayout"
+            android:layout_width="match_parent"
+            android:layout_height="wrap_content"
+            android:animateLayoutChanges="true"
+            android:orientation="vertical">
+
+            <androidx.constraintlayout.widget.ConstraintLayout
+                android:id="@+id/progress"
+                android:layout_width="match_parent"
+                android:layout_height="wrap_content"
+                android:animateLayoutChanges="true"
+                android:visibility="gone"
+                tools:visibility="visible">
+
+                <ImageView
+                    android:id="@+id/progressIcon"
+                    android:layout_width="24dp"
+                    android:layout_height="24dp"
+                    android:layout_marginStart="16dp"
+                    android:tint="?android:attr/textColorSecondary"
+                    app:layout_constraintBottom_toBottomOf="@id/progressSummary"
+                    app:layout_constraintStart_toStartOf="parent"
+                    app:layout_constraintTop_toTopOf="@id/progressTitle"
+                    tools:src="@drawable/ic_file_download_black_24dp" />
+
+                <com.moez.QKSMS.common.widget.QkTextView
+                    android:id="@+id/progressTitle"
+                    android:layout_width="0dp"
+                    android:layout_height="wrap_content"
+                    android:layout_marginStart="24dp"
+                    android:layout_marginTop="16dp"
+                    android:textColor="?android:attr/textColorPrimary"
+                    android:textStyle="bold"
+                    app:layout_constraintEnd_toStartOf="@id/progressCancel"
+                    app:layout_constraintStart_toEndOf="@id/progressIcon"
+                    app:layout_constraintTop_toTopOf="parent"
+                    app:textSize="primary"
+                    tools:text="Restoring from backup" />
+
+                <com.moez.QKSMS.common.widget.QkTextView
+                    android:id="@+id/progressSummary"
+                    android:layout_width="0dp"
+                    android:layout_height="wrap_content"
+                    android:layout_marginTop="2dp"
+                    android:textColor="?android:attr/textColorTertiary"
+                    app:layout_constraintEnd_toEndOf="@id/progressTitle"
+                    app:layout_constraintStart_toStartOf="@id/progressTitle"
+                    app:layout_constraintTop_toBottomOf="@id/progressTitle"
+                    app:textSize="secondary"
+                    tools:text="8 minutes remaining" />
+
+                <ImageView
+                    android:id="@+id/progressCancel"
+                    android:layout_width="56dp"
+                    android:layout_height="56dp"
+                    android:background="?android:attr/selectableItemBackground"
+                    android:padding="16dp"
+                    android:src="@drawable/ic_close_black_24dp"
+                    android:tint="?android:attr/textColorSecondary"
+                    app:layout_constraintBottom_toBottomOf="@id/progressSummary"
+                    app:layout_constraintEnd_toEndOf="parent"
+                    app:layout_constraintTop_toTopOf="@id/progressTitle" />
+
+                <ProgressBar
+                    android:id="@+id/progressBar"
+                    style="@style/Widget.AppCompat.ProgressBar.Horizontal"
+                    android:layout_width="0dp"
+                    android:layout_height="wrap_content"
+                    android:layout_marginTop="8dp"
+                    android:layout_marginEnd="16dp"
+                    android:indeterminate="true"
+                    android:visibility="gone"
+                    app:layout_constraintEnd_toEndOf="parent"
+                    app:layout_constraintStart_toStartOf="@id/progressTitle"
+                    app:layout_constraintTop_toBottomOf="@id/progressSummary" />
+
+                <View
+                    android:layout_width="0dp"
+                    android:layout_height="1dp"
+                    android:layout_marginTop="16dp"
+                    android:background="?android:attr/divider"
+                    app:layout_constraintBottom_toBottomOf="parent"
+                    app:layout_constraintEnd_toEndOf="parent"
+                    app:layout_constraintStart_toStartOf="parent"
+                    app:layout_constraintTop_toBottomOf="@id/progressBar" />
+
+            </androidx.constraintlayout.widget.ConstraintLayout>
+
+            <com.moez.QKSMS.common.widget.PreferenceView
+                android:id="@+id/backup"
+                android:layout_width="match_parent"
+                android:layout_height="wrap_content"
+                app:icon="@drawable/ic_history_black_24dp"
+                app:title="@string/backup_last"
+                tools:summary="@string/backup_never" />
+
+            <com.moez.QKSMS.common.widget.PreferenceView
+                android:id="@+id/restore"
+                android:layout_width="match_parent"
+                android:layout_height="wrap_content"
+                app:icon="@drawable/ic_file_download_black_24dp"
+                app:summary="@string/backup_restore_summary"
+                app:title="@string/backup_restore_title" />
+
+            <View
+                android:layout_width="match_parent"
+                android:layout_height="1dp"
+                android:background="?android:attr/divider" />
+
+            <com.moez.QKSMS.common.widget.QkTextView
+                android:layout_width="match_parent"
+                android:layout_height="wrap_content"
+                android:layout_margin="24dp"
+                android:text="@string/backup_disclaimer"
+                android:textColor="?android:attr/textColorTertiary"
+                app:textSize="secondary" />
+
+        </LinearLayout>
+
+    </ScrollView>
+
+    <LinearLayout
+        android:id="@+id/fab"
+        android:layout_width="wrap_content"
+        android:layout_height="48dp"
+        android:layout_gravity="bottom|end"
+        android:layout_margin="16dp"
+        android:background="@drawable/rounded_rectangle_24dp"
+        android:elevation="4dp"
+        android:gravity="center"
+        tools:backgroundTint="@color/tools_theme">
+
+        <ImageView
+            android:id="@+id/fabIcon"
+            android:layout_width="24dp"
+            android:layout_height="24dp"
+            android:layout_marginStart="12dp"
+            android:src="@drawable/ic_star_black_24dp"
+            tools:tint="@color/textPrimaryDark" />
+
+        <com.moez.QKSMS.common.widget.QkTextView
+            android:id="@+id/fabLabel"
+            android:layout_width="wrap_content"
+            android:layout_height="wrap_content"
+            android:layout_marginStart="16dp"
+            android:layout_marginEnd="16dp"
+            android:text="@string/title_qksms_plus"
+            android:textColor="@color/textPrimaryDark"
+            android:textStyle="bold"
+            app:textSize="primary" />
+
+    </LinearLayout>
+
 </FrameLayout>
\ No newline at end of file
diff --git a/presentation/src/main/res/layout/backup_list_dialog.xml b/presentation/src/main/res/layout/backup_list_dialog.xml
index cc819e6ad..26542ae77 100644
--- a/presentation/src/main/res/layout/backup_list_dialog.xml
+++ b/presentation/src/main/res/layout/backup_list_dialog.xml
@@ -1,78 +1,78 @@
-<?xml version="1.0" encoding="utf-8"?>
-<!--
-  ~ Copyright (C) 2019 Moez Bhatti <moez.bhatti@gmail.com>
-  ~
-  ~ This file is part of QKSMS.
-  ~
-  ~ QKSMS is free software: you can redistribute it and/or modify
-  ~ it under the terms of the GNU General Public License as published by
-  ~ the Free Software Foundation, either version 3 of the License, or
-  ~ (at your option) any later version.
-  ~
-  ~ QKSMS is distributed in the hope that it will be useful,
-  ~ but WITHOUT ANY WARRANTY; without even the implied warranty of
-  ~ MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
-  ~ GNU General Public License for more details.
-  ~
-  ~ You should have received a copy of the GNU General Public License
-  ~ along with QKSMS.  If not, see <http://www.gnu.org/licenses/>.
-  -->
-<LinearLayout xmlns:android="http://schemas.android.com/apk/res/android"
-    xmlns:app="http://schemas.android.com/apk/res-auto"
-    xmlns:tools="http://schemas.android.com/tools"
-    android:layout_width="match_parent"
-    android:layout_height="wrap_content"
-    android:orientation="vertical">
-
-    <com.moez.QKSMS.common.widget.QkTextView
-        android:layout_width="match_parent"
-        android:layout_height="wrap_content"
-        android:layout_marginStart="24dp"
-        android:layout_marginTop="16dp"
-        android:layout_marginEnd="24dp"
-        android:text="@string/backup_restore_dialog_title"
-        android:textColor="?android:attr/textColorPrimary"
-        android:textStyle="bold"
-        app:textSize="primary" />
-
-    <com.moez.QKSMS.common.widget.QkTextView
-        android:layout_width="match_parent"
-        android:layout_height="wrap_content"
-        android:layout_marginStart="24dp"
-        android:layout_marginTop="2dp"
-        android:layout_marginEnd="24dp"
-        android:text="@string/backup_restore_dialog_summary"
-        android:textColor="?android:attr/textColorTertiary"
-        app:textSize="primary" />
-
-    <View
-        android:layout_width="match_parent"
-        android:layout_height="1dp"
-        android:layout_marginTop="16dp"
-        android:background="?android:attr/divider" />
-
-    <androidx.recyclerview.widget.RecyclerView
-        android:id="@+id/files"
-        android:layout_width="match_parent"
-        android:layout_height="wrap_content"
-        android:clipChildren="false"
-        android:clipToPadding="false"
-        android:paddingTop="8dp"
-        android:paddingBottom="8dp"
-        app:layoutManager="androidx.recyclerview.widget.LinearLayoutManager"
-        tools:itemCount="3"
-        tools:listitem="@layout/backup_list_item" />
-
-    <com.moez.QKSMS.common.widget.QkTextView
-        android:id="@+id/empty"
-        android:layout_width="match_parent"
-        android:layout_height="wrap_content"
-        android:layout_marginStart="24dp"
-        android:layout_marginEnd="24dp"
-        android:layout_marginBottom="16dp"
-        android:gravity="center"
-        android:text="@string/backup_restore_dialog_empty"
-        android:textColor="?android:attr/textColorSecondary"
-        app:textSize="secondary" />
-
+<?xml version="1.0" encoding="utf-8"?>
+<!--
+  ~ Copyright (C) 2019 Moez Bhatti <moez.bhatti@gmail.com>
+  ~
+  ~ This file is part of QKSMS.
+  ~
+  ~ QKSMS is free software: you can redistribute it and/or modify
+  ~ it under the terms of the GNU General Public License as published by
+  ~ the Free Software Foundation, either version 3 of the License, or
+  ~ (at your option) any later version.
+  ~
+  ~ QKSMS is distributed in the hope that it will be useful,
+  ~ but WITHOUT ANY WARRANTY; without even the implied warranty of
+  ~ MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+  ~ GNU General Public License for more details.
+  ~
+  ~ You should have received a copy of the GNU General Public License
+  ~ along with QKSMS.  If not, see <http://www.gnu.org/licenses/>.
+  -->
+<LinearLayout xmlns:android="http://schemas.android.com/apk/res/android"
+    xmlns:app="http://schemas.android.com/apk/res-auto"
+    xmlns:tools="http://schemas.android.com/tools"
+    android:layout_width="match_parent"
+    android:layout_height="wrap_content"
+    android:orientation="vertical">
+
+    <com.moez.QKSMS.common.widget.QkTextView
+        android:layout_width="match_parent"
+        android:layout_height="wrap_content"
+        android:layout_marginStart="24dp"
+        android:layout_marginTop="16dp"
+        android:layout_marginEnd="24dp"
+        android:text="@string/backup_restore_dialog_title"
+        android:textColor="?android:attr/textColorPrimary"
+        android:textStyle="bold"
+        app:textSize="primary" />
+
+    <com.moez.QKSMS.common.widget.QkTextView
+        android:layout_width="match_parent"
+        android:layout_height="wrap_content"
+        android:layout_marginStart="24dp"
+        android:layout_marginTop="2dp"
+        android:layout_marginEnd="24dp"
+        android:text="@string/backup_restore_dialog_summary"
+        android:textColor="?android:attr/textColorTertiary"
+        app:textSize="primary" />
+
+    <View
+        android:layout_width="match_parent"
+        android:layout_height="1dp"
+        android:layout_marginTop="16dp"
+        android:background="?android:attr/divider" />
+
+    <androidx.recyclerview.widget.RecyclerView
+        android:id="@+id/files"
+        android:layout_width="match_parent"
+        android:layout_height="wrap_content"
+        android:clipChildren="false"
+        android:clipToPadding="false"
+        android:paddingTop="8dp"
+        android:paddingBottom="8dp"
+        app:layoutManager="androidx.recyclerview.widget.LinearLayoutManager"
+        tools:itemCount="3"
+        tools:listitem="@layout/backup_list_item" />
+
+    <com.moez.QKSMS.common.widget.QkTextView
+        android:id="@+id/empty"
+        android:layout_width="match_parent"
+        android:layout_height="wrap_content"
+        android:layout_marginStart="24dp"
+        android:layout_marginEnd="24dp"
+        android:layout_marginBottom="16dp"
+        android:gravity="center"
+        android:text="@string/backup_restore_dialog_empty"
+        android:textColor="?android:attr/textColorSecondary"
+        app:textSize="secondary" />
+
 </LinearLayout>
\ No newline at end of file
diff --git a/presentation/src/main/res/layout/backup_list_item.xml b/presentation/src/main/res/layout/backup_list_item.xml
index 0ccd89a43..de62a5abd 100644
--- a/presentation/src/main/res/layout/backup_list_item.xml
+++ b/presentation/src/main/res/layout/backup_list_item.xml
@@ -1,66 +1,66 @@
-<?xml version="1.0" encoding="utf-8"?>
-<!--
-  ~ Copyright (C) 2019 Moez Bhatti <moez.bhatti@gmail.com>
-  ~
-  ~ This file is part of QKSMS.
-  ~
-  ~ QKSMS is free software: you can redistribute it and/or modify
-  ~ it under the terms of the GNU General Public License as published by
-  ~ the Free Software Foundation, either version 3 of the License, or
-  ~ (at your option) any later version.
-  ~
-  ~ QKSMS is distributed in the hope that it will be useful,
-  ~ but WITHOUT ANY WARRANTY; without even the implied warranty of
-  ~ MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
-  ~ GNU General Public License for more details.
-  ~
-  ~ You should have received a copy of the GNU General Public License
-  ~ along with QKSMS.  If not, see <http://www.gnu.org/licenses/>.
-  -->
-<androidx.constraintlayout.widget.ConstraintLayout xmlns:android="http://schemas.android.com/apk/res/android"
-    xmlns:app="http://schemas.android.com/apk/res-auto"
-    xmlns:tools="http://schemas.android.com/tools"
-    android:layout_width="match_parent"
-    android:layout_height="wrap_content"
-    android:orientation="vertical"
-    android:paddingStart="24dp"
-    android:paddingTop="8dp"
-    android:paddingEnd="24dp"
-    android:paddingBottom="8dp">
-
-    <com.moez.QKSMS.common.widget.QkTextView
-        android:id="@+id/title"
-        android:layout_width="0dp"
-        android:layout_height="wrap_content"
-        android:textColor="?android:attr/textColorPrimary"
-        android:textStyle="bold"
-        app:layout_constraintEnd_toStartOf="@id/size"
-        app:layout_constraintStart_toStartOf="parent"
-        app:layout_constraintTop_toTopOf="parent"
-        app:textSize="secondary"
-        tools:text="5/7/18 4:18 PM" />
-
-    <com.moez.QKSMS.common.widget.QkTextView
-        android:id="@+id/messages"
-        android:layout_width="0dp"
-        android:layout_height="wrap_content"
-        android:layout_marginTop="2dp"
-        android:textColor="?android:attr/textColorTertiary"
-        app:layout_constraintBottom_toBottomOf="parent"
-        app:layout_constraintEnd_toEndOf="parent"
-        app:layout_constraintStart_toStartOf="parent"
-        app:layout_constraintTop_toBottomOf="@id/title"
-        app:textSize="secondary"
-        tools:text="72,302 messages" />
-
-    <com.moez.QKSMS.common.widget.QkTextView
-        android:id="@+id/size"
-        android:layout_width="wrap_content"
-        android:layout_height="wrap_content"
-        android:textColor="?android:attr/textColorTertiary"
-        app:layout_constraintEnd_toEndOf="parent"
-        app:layout_constraintTop_toTopOf="parent"
-        app:textSize="secondary"
-        tools:text="31.8 MB" />
-
+<?xml version="1.0" encoding="utf-8"?>
+<!--
+  ~ Copyright (C) 2019 Moez Bhatti <moez.bhatti@gmail.com>
+  ~
+  ~ This file is part of QKSMS.
+  ~
+  ~ QKSMS is free software: you can redistribute it and/or modify
+  ~ it under the terms of the GNU General Public License as published by
+  ~ the Free Software Foundation, either version 3 of the License, or
+  ~ (at your option) any later version.
+  ~
+  ~ QKSMS is distributed in the hope that it will be useful,
+  ~ but WITHOUT ANY WARRANTY; without even the implied warranty of
+  ~ MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+  ~ GNU General Public License for more details.
+  ~
+  ~ You should have received a copy of the GNU General Public License
+  ~ along with QKSMS.  If not, see <http://www.gnu.org/licenses/>.
+  -->
+<androidx.constraintlayout.widget.ConstraintLayout xmlns:android="http://schemas.android.com/apk/res/android"
+    xmlns:app="http://schemas.android.com/apk/res-auto"
+    xmlns:tools="http://schemas.android.com/tools"
+    android:layout_width="match_parent"
+    android:layout_height="wrap_content"
+    android:orientation="vertical"
+    android:paddingStart="24dp"
+    android:paddingTop="8dp"
+    android:paddingEnd="24dp"
+    android:paddingBottom="8dp">
+
+    <com.moez.QKSMS.common.widget.QkTextView
+        android:id="@+id/title"
+        android:layout_width="0dp"
+        android:layout_height="wrap_content"
+        android:textColor="?android:attr/textColorPrimary"
+        android:textStyle="bold"
+        app:layout_constraintEnd_toStartOf="@id/size"
+        app:layout_constraintStart_toStartOf="parent"
+        app:layout_constraintTop_toTopOf="parent"
+        app:textSize="secondary"
+        tools:text="5/7/18 4:18 PM" />
+
+    <com.moez.QKSMS.common.widget.QkTextView
+        android:id="@+id/messages"
+        android:layout_width="0dp"
+        android:layout_height="wrap_content"
+        android:layout_marginTop="2dp"
+        android:textColor="?android:attr/textColorTertiary"
+        app:layout_constraintBottom_toBottomOf="parent"
+        app:layout_constraintEnd_toEndOf="parent"
+        app:layout_constraintStart_toStartOf="parent"
+        app:layout_constraintTop_toBottomOf="@id/title"
+        app:textSize="secondary"
+        tools:text="72,302 messages" />
+
+    <com.moez.QKSMS.common.widget.QkTextView
+        android:id="@+id/size"
+        android:layout_width="wrap_content"
+        android:layout_height="wrap_content"
+        android:textColor="?android:attr/textColorTertiary"
+        app:layout_constraintEnd_toEndOf="parent"
+        app:layout_constraintTop_toTopOf="parent"
+        app:textSize="secondary"
+        tools:text="31.8 MB" />
+
 </androidx.constraintlayout.widget.ConstraintLayout>
\ No newline at end of file
diff --git a/presentation/src/main/res/layout/blocked_list_item.xml b/presentation/src/main/res/layout/blocked_list_item.xml
index a70b945eb..e2e0ceff5 100644
--- a/presentation/src/main/res/layout/blocked_list_item.xml
+++ b/presentation/src/main/res/layout/blocked_list_item.xml
@@ -1,95 +1,95 @@
-<?xml version="1.0" encoding="utf-8"?>
-<!--
-  ~ Copyright (C) 2019 Moez Bhatti <moez.bhatti@gmail.com>
-  ~
-  ~ This file is part of QKSMS.
-  ~
-  ~ QKSMS is free software: you can redistribute it and/or modify
-  ~ it under the terms of the GNU General Public License as published by
-  ~ the Free Software Foundation, either version 3 of the License, or
-  ~ (at your option) any later version.
-  ~
-  ~ QKSMS is distributed in the hope that it will be useful,
-  ~ but WITHOUT ANY WARRANTY; without even the implied warranty of
-  ~ MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
-  ~ GNU General Public License for more details.
-  ~
-  ~ You should have received a copy of the GNU General Public License
-  ~ along with QKSMS.  If not, see <http://www.gnu.org/licenses/>.
-  -->
-<androidx.constraintlayout.widget.ConstraintLayout xmlns:android="http://schemas.android.com/apk/res/android"
-    xmlns:app="http://schemas.android.com/apk/res-auto"
-    xmlns:tools="http://schemas.android.com/tools"
-    android:layout_width="match_parent"
-    android:layout_height="wrap_content"
-    android:background="?attr/selectableItemBackground"
-    android:paddingTop="4dp"
-    android:paddingBottom="4dp"
-    app:layout_constraintVertical_chainStyle="packed">
-
-    <com.moez.QKSMS.common.widget.GroupAvatarView
-        android:id="@+id/avatars"
-        android:layout_width="56dp"
-        android:layout_height="56dp"
-        android:layout_marginStart="12dp"
-        app:layout_constraintBottom_toBottomOf="parent"
-        app:layout_constraintEnd_toStartOf="@id/title"
-        app:layout_constraintStart_toStartOf="parent"
-        app:layout_constraintTop_toTopOf="parent" />
-
-    <com.moez.QKSMS.common.widget.QkTextView
-        android:id="@+id/title"
-        style="@style/TextPrimary"
-        android:layout_width="0dp"
-        android:layout_height="wrap_content"
-        android:layout_marginStart="12dp"
-        android:layout_marginEnd="16dp"
-        app:layout_constraintBottom_toTopOf="@id/blocker"
-        app:layout_constraintEnd_toStartOf="@id/date"
-        app:layout_constraintHorizontal_bias="0"
-        app:layout_constraintStart_toEndOf="@id/avatars"
-        app:layout_constraintTop_toTopOf="parent"
-        app:layout_constraintVertical_chainStyle="packed"
-        app:textSize="primary"
-        tools:text="@tools:sample/full_names" />
-
-    <com.moez.QKSMS.common.widget.QkTextView
-        android:id="@+id/date"
-        android:layout_width="wrap_content"
-        android:layout_height="wrap_content"
-        android:layout_marginEnd="16dp"
-        android:textColor="?android:attr/textColorTertiary"
-        app:layout_constraintBottom_toBottomOf="@id/title"
-        app:layout_constraintEnd_toEndOf="parent"
-        app:layout_constraintStart_toEndOf="@id/title"
-        app:layout_constraintTop_toTopOf="@id/title"
-        app:textSize="tertiary"
-        tools:text="Oct 5" />
-
-    <com.moez.QKSMS.common.widget.QkTextView
-        android:id="@+id/blocker"
-        android:layout_width="wrap_content"
-        android:layout_height="wrap_content"
-        android:layout_marginTop="2dp"
-        android:textColor="?android:attr/textColorTertiary"
-        android:textStyle="bold"
-        app:layout_constraintBottom_toBottomOf="parent"
-        app:layout_constraintStart_toStartOf="@id/title"
-        app:layout_constraintTop_toBottomOf="@id/title"
-        app:textSize="secondary"
-        tools:text="Call Control" />
-
-    <com.moez.QKSMS.common.widget.QkTextView
-        android:id="@+id/reason"
-        android:layout_width="0dp"
-        android:layout_height="wrap_content"
-        android:layout_marginStart="4dp"
-        android:layout_marginEnd="16dp"
-        android:textColor="?android:attr/textColorTertiary"
-        app:layout_constraintEnd_toEndOf="parent"
-        app:layout_constraintStart_toEndOf="@id/blocker"
-        app:layout_constraintTop_toTopOf="@id/blocker"
-        app:textSize="secondary"
-        tools:text="Manually Blocked" />
-
-</androidx.constraintlayout.widget.ConstraintLayout>
+<?xml version="1.0" encoding="utf-8"?>
+<!--
+  ~ Copyright (C) 2019 Moez Bhatti <moez.bhatti@gmail.com>
+  ~
+  ~ This file is part of QKSMS.
+  ~
+  ~ QKSMS is free software: you can redistribute it and/or modify
+  ~ it under the terms of the GNU General Public License as published by
+  ~ the Free Software Foundation, either version 3 of the License, or
+  ~ (at your option) any later version.
+  ~
+  ~ QKSMS is distributed in the hope that it will be useful,
+  ~ but WITHOUT ANY WARRANTY; without even the implied warranty of
+  ~ MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+  ~ GNU General Public License for more details.
+  ~
+  ~ You should have received a copy of the GNU General Public License
+  ~ along with QKSMS.  If not, see <http://www.gnu.org/licenses/>.
+  -->
+<androidx.constraintlayout.widget.ConstraintLayout xmlns:android="http://schemas.android.com/apk/res/android"
+    xmlns:app="http://schemas.android.com/apk/res-auto"
+    xmlns:tools="http://schemas.android.com/tools"
+    android:layout_width="match_parent"
+    android:layout_height="wrap_content"
+    android:background="?attr/selectableItemBackground"
+    android:paddingTop="4dp"
+    android:paddingBottom="4dp"
+    app:layout_constraintVertical_chainStyle="packed">
+
+    <com.moez.QKSMS.common.widget.GroupAvatarView
+        android:id="@+id/avatars"
+        android:layout_width="56dp"
+        android:layout_height="56dp"
+        android:layout_marginStart="12dp"
+        app:layout_constraintBottom_toBottomOf="parent"
+        app:layout_constraintEnd_toStartOf="@id/title"
+        app:layout_constraintStart_toStartOf="parent"
+        app:layout_constraintTop_toTopOf="parent" />
+
+    <com.moez.QKSMS.common.widget.QkTextView
+        android:id="@+id/title"
+        style="@style/TextPrimary"
+        android:layout_width="0dp"
+        android:layout_height="wrap_content"
+        android:layout_marginStart="12dp"
+        android:layout_marginEnd="16dp"
+        app:layout_constraintBottom_toTopOf="@id/blocker"
+        app:layout_constraintEnd_toStartOf="@id/date"
+        app:layout_constraintHorizontal_bias="0"
+        app:layout_constraintStart_toEndOf="@id/avatars"
+        app:layout_constraintTop_toTopOf="parent"
+        app:layout_constraintVertical_chainStyle="packed"
+        app:textSize="primary"
+        tools:text="@tools:sample/full_names" />
+
+    <com.moez.QKSMS.common.widget.QkTextView
+        android:id="@+id/date"
+        android:layout_width="wrap_content"
+        android:layout_height="wrap_content"
+        android:layout_marginEnd="16dp"
+        android:textColor="?android:attr/textColorTertiary"
+        app:layout_constraintBottom_toBottomOf="@id/title"
+        app:layout_constraintEnd_toEndOf="parent"
+        app:layout_constraintStart_toEndOf="@id/title"
+        app:layout_constraintTop_toTopOf="@id/title"
+        app:textSize="tertiary"
+        tools:text="Oct 5" />
+
+    <com.moez.QKSMS.common.widget.QkTextView
+        android:id="@+id/blocker"
+        android:layout_width="wrap_content"
+        android:layout_height="wrap_content"
+        android:layout_marginTop="2dp"
+        android:textColor="?android:attr/textColorTertiary"
+        android:textStyle="bold"
+        app:layout_constraintBottom_toBottomOf="parent"
+        app:layout_constraintStart_toStartOf="@id/title"
+        app:layout_constraintTop_toBottomOf="@id/title"
+        app:textSize="secondary"
+        tools:text="Call Control" />
+
+    <com.moez.QKSMS.common.widget.QkTextView
+        android:id="@+id/reason"
+        android:layout_width="0dp"
+        android:layout_height="wrap_content"
+        android:layout_marginStart="4dp"
+        android:layout_marginEnd="16dp"
+        android:textColor="?android:attr/textColorTertiary"
+        app:layout_constraintEnd_toEndOf="parent"
+        app:layout_constraintStart_toEndOf="@id/blocker"
+        app:layout_constraintTop_toTopOf="@id/blocker"
+        app:textSize="secondary"
+        tools:text="Manually Blocked" />
+
+</androidx.constraintlayout.widget.ConstraintLayout>
diff --git a/presentation/src/main/res/layout/blocked_messages_controller.xml b/presentation/src/main/res/layout/blocked_messages_controller.xml
index 4979bcc0a..248406596 100644
--- a/presentation/src/main/res/layout/blocked_messages_controller.xml
+++ b/presentation/src/main/res/layout/blocked_messages_controller.xml
@@ -1,45 +1,45 @@
-<?xml version="1.0" encoding="utf-8"?>
-<!--
-  ~ Copyright (C) 2019 Moez Bhatti <moez.bhatti@gmail.com>
-  ~
-  ~ This file is part of QKSMS.
-  ~
-  ~ QKSMS is free software: you can redistribute it and/or modify
-  ~ it under the terms of the GNU General Public License as published by
-  ~ the Free Software Foundation, either version 3 of the License, or
-  ~ (at your option) any later version.
-  ~
-  ~ QKSMS is distributed in the hope that it will be useful,
-  ~ but WITHOUT ANY WARRANTY; without even the implied warranty of
-  ~ MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
-  ~ GNU General Public License for more details.
-  ~
-  ~ You should have received a copy of the GNU General Public License
-  ~ along with QKSMS.  If not, see <http://www.gnu.org/licenses/>.
-  -->
-<FrameLayout xmlns:android="http://schemas.android.com/apk/res/android"
-    xmlns:app="http://schemas.android.com/apk/res-auto"
-    xmlns:tools="http://schemas.android.com/tools"
-    android:layout_width="match_parent"
-    android:layout_height="match_parent"
-    android:background="?android:attr/windowBackground">
-
-    <com.moez.QKSMS.common.widget.QkTextView
-        android:id="@+id/empty"
-        style="@style/TextSecondary"
-        android:layout_width="match_parent"
-        android:layout_height="match_parent"
-        android:gravity="center"
-        android:padding="56dp"
-        android:text="@string/blocked_messages_empty" />
-
-    <androidx.recyclerview.widget.RecyclerView
-        android:id="@+id/conversations"
-        android:layout_width="match_parent"
-        android:layout_height="match_parent"
-        android:paddingTop="8dp"
-        android:paddingBottom="8dp"
-        app:layoutManager="androidx.recyclerview.widget.LinearLayoutManager"
-        tools:listitem="@layout/blocked_list_item" />
-
-</FrameLayout>
+<?xml version="1.0" encoding="utf-8"?>
+<!--
+  ~ Copyright (C) 2019 Moez Bhatti <moez.bhatti@gmail.com>
+  ~
+  ~ This file is part of QKSMS.
+  ~
+  ~ QKSMS is free software: you can redistribute it and/or modify
+  ~ it under the terms of the GNU General Public License as published by
+  ~ the Free Software Foundation, either version 3 of the License, or
+  ~ (at your option) any later version.
+  ~
+  ~ QKSMS is distributed in the hope that it will be useful,
+  ~ but WITHOUT ANY WARRANTY; without even the implied warranty of
+  ~ MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+  ~ GNU General Public License for more details.
+  ~
+  ~ You should have received a copy of the GNU General Public License
+  ~ along with QKSMS.  If not, see <http://www.gnu.org/licenses/>.
+  -->
+<FrameLayout xmlns:android="http://schemas.android.com/apk/res/android"
+    xmlns:app="http://schemas.android.com/apk/res-auto"
+    xmlns:tools="http://schemas.android.com/tools"
+    android:layout_width="match_parent"
+    android:layout_height="match_parent"
+    android:background="?android:attr/windowBackground">
+
+    <com.moez.QKSMS.common.widget.QkTextView
+        android:id="@+id/empty"
+        style="@style/TextSecondary"
+        android:layout_width="match_parent"
+        android:layout_height="match_parent"
+        android:gravity="center"
+        android:padding="56dp"
+        android:text="@string/blocked_messages_empty" />
+
+    <androidx.recyclerview.widget.RecyclerView
+        android:id="@+id/conversations"
+        android:layout_width="match_parent"
+        android:layout_height="match_parent"
+        android:paddingTop="8dp"
+        android:paddingBottom="8dp"
+        app:layoutManager="androidx.recyclerview.widget.LinearLayoutManager"
+        tools:listitem="@layout/blocked_list_item" />
+
+</FrameLayout>
diff --git a/presentation/src/main/res/layout/blocked_number_list_item.xml b/presentation/src/main/res/layout/blocked_number_list_item.xml
index 93bcb8934..6840440aa 100644
--- a/presentation/src/main/res/layout/blocked_number_list_item.xml
+++ b/presentation/src/main/res/layout/blocked_number_list_item.xml
@@ -1,47 +1,47 @@
-<?xml version="1.0" encoding="utf-8"?>
-<!--
-  ~ Copyright (C) 2017 Moez Bhatti <moez.bhatti@gmail.com>
-  ~
-  ~ This file is part of QKSMS.
-  ~
-  ~ QKSMS is free software: you can redistribute it and/or modify
-  ~ it under the terms of the GNU General Public License as published by
-  ~ the Free Software Foundation, either version 3 of the License, or
-  ~ (at your option) any later version.
-  ~
-  ~ QKSMS is distributed in the hope that it will be useful,
-  ~ but WITHOUT ANY WARRANTY; without even the implied warranty of
-  ~ MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
-  ~ GNU General Public License for more details.
-  ~
-  ~ You should have received a copy of the GNU General Public License
-  ~ along with QKSMS.  If not, see <http://www.gnu.org/licenses/>.
-  -->
-<LinearLayout xmlns:android="http://schemas.android.com/apk/res/android"
-    xmlns:tools="http://schemas.android.com/tools"
-    android:layout_width="match_parent"
-    android:layout_height="48dp"
-    android:orientation="horizontal">
-
-    <com.moez.QKSMS.common.widget.QkTextView
-        android:id="@+id/number"
-        style="@style/TextPrimary"
-        android:layout_width="0dp"
-        android:layout_height="match_parent"
-        android:layout_weight="1"
-        android:gravity="center_vertical"
-        android:paddingStart="24dp"
-        tools:text="(123) 456-7890" />
-
-    <ImageView
-        android:id="@+id/unblock"
-        android:layout_width="48dp"
-        android:layout_height="48dp"
-        android:layout_marginStart="8dp"
-        android:layout_marginEnd="8dp"
-        android:background="?android:attr/selectableItemBackground"
-        android:padding="12dp"
-        android:src="@drawable/ic_close_black_24dp"
-        android:tint="?android:attr/textColorSecondary" />
-
+<?xml version="1.0" encoding="utf-8"?>
+<!--
+  ~ Copyright (C) 2017 Moez Bhatti <moez.bhatti@gmail.com>
+  ~
+  ~ This file is part of QKSMS.
+  ~
+  ~ QKSMS is free software: you can redistribute it and/or modify
+  ~ it under the terms of the GNU General Public License as published by
+  ~ the Free Software Foundation, either version 3 of the License, or
+  ~ (at your option) any later version.
+  ~
+  ~ QKSMS is distributed in the hope that it will be useful,
+  ~ but WITHOUT ANY WARRANTY; without even the implied warranty of
+  ~ MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+  ~ GNU General Public License for more details.
+  ~
+  ~ You should have received a copy of the GNU General Public License
+  ~ along with QKSMS.  If not, see <http://www.gnu.org/licenses/>.
+  -->
+<LinearLayout xmlns:android="http://schemas.android.com/apk/res/android"
+    xmlns:tools="http://schemas.android.com/tools"
+    android:layout_width="match_parent"
+    android:layout_height="48dp"
+    android:orientation="horizontal">
+
+    <com.moez.QKSMS.common.widget.QkTextView
+        android:id="@+id/number"
+        style="@style/TextPrimary"
+        android:layout_width="0dp"
+        android:layout_height="match_parent"
+        android:layout_weight="1"
+        android:gravity="center_vertical"
+        android:paddingStart="24dp"
+        tools:text="(123) 456-7890" />
+
+    <ImageView
+        android:id="@+id/unblock"
+        android:layout_width="48dp"
+        android:layout_height="48dp"
+        android:layout_marginStart="8dp"
+        android:layout_marginEnd="8dp"
+        android:background="?android:attr/selectableItemBackground"
+        android:padding="12dp"
+        android:src="@drawable/ic_close_black_24dp"
+        android:tint="?android:attr/textColorSecondary" />
+
 </LinearLayout>
\ No newline at end of file
diff --git a/presentation/src/main/res/layout/blocked_numbers_add_dialog.xml b/presentation/src/main/res/layout/blocked_numbers_add_dialog.xml
index 9f0c1b8e8..f331571d7 100644
--- a/presentation/src/main/res/layout/blocked_numbers_add_dialog.xml
+++ b/presentation/src/main/res/layout/blocked_numbers_add_dialog.xml
@@ -1,49 +1,49 @@
-<?xml version="1.0" encoding="utf-8"?>
-<!--
-  ~ Copyright (C) 2017 Moez Bhatti <moez.bhatti@gmail.com>
-  ~
-  ~ This file is part of QKSMS.
-  ~
-  ~ QKSMS is free software: you can redistribute it and/or modify
-  ~ it under the terms of the GNU General Public License as published by
-  ~ the Free Software Foundation, either version 3 of the License, or
-  ~ (at your option) any later version.
-  ~
-  ~ QKSMS is distributed in the hope that it will be useful,
-  ~ but WITHOUT ANY WARRANTY; without even the implied warranty of
-  ~ MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
-  ~ GNU General Public License for more details.
-  ~
-  ~ You should have received a copy of the GNU General Public License
-  ~ along with QKSMS.  If not, see <http://www.gnu.org/licenses/>.
-  -->
-<LinearLayout xmlns:android="http://schemas.android.com/apk/res/android"
-    xmlns:app="http://schemas.android.com/apk/res-auto"
-    android:layout_width="match_parent"
-    android:layout_height="match_parent"
-    android:orientation="vertical">
-
-    <com.moez.QKSMS.common.widget.QkTextView
-        android:layout_width="match_parent"
-        android:layout_height="wrap_content"
-        android:layout_marginStart="24dp"
-        android:layout_marginTop="16dp"
-        android:layout_marginEnd="24dp"
-        android:text="@string/blocked_numbers_dialog_title"
-        android:textColor="?android:attr/textColorPrimary"
-        app:textSize="dialog" />
-
-    <com.moez.QKSMS.common.widget.QkEditText
-        android:id="@+id/input"
-        android:layout_width="match_parent"
-        android:layout_height="wrap_content"
-        android:background="@null"
-        android:hint="@string/blocked_numbers_dialog_hint"
-        android:paddingStart="24dp"
-        android:paddingTop="16dp"
-        android:paddingEnd="24dp"
-        android:paddingBottom="16dp"
-        android:textColorHint="?android:attr/textColorTertiary"
-        app:textSize="primary" />
-
-</LinearLayout>
+<?xml version="1.0" encoding="utf-8"?>
+<!--
+  ~ Copyright (C) 2017 Moez Bhatti <moez.bhatti@gmail.com>
+  ~
+  ~ This file is part of QKSMS.
+  ~
+  ~ QKSMS is free software: you can redistribute it and/or modify
+  ~ it under the terms of the GNU General Public License as published by
+  ~ the Free Software Foundation, either version 3 of the License, or
+  ~ (at your option) any later version.
+  ~
+  ~ QKSMS is distributed in the hope that it will be useful,
+  ~ but WITHOUT ANY WARRANTY; without even the implied warranty of
+  ~ MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+  ~ GNU General Public License for more details.
+  ~
+  ~ You should have received a copy of the GNU General Public License
+  ~ along with QKSMS.  If not, see <http://www.gnu.org/licenses/>.
+  -->
+<LinearLayout xmlns:android="http://schemas.android.com/apk/res/android"
+    xmlns:app="http://schemas.android.com/apk/res-auto"
+    android:layout_width="match_parent"
+    android:layout_height="match_parent"
+    android:orientation="vertical">
+
+    <com.moez.QKSMS.common.widget.QkTextView
+        android:layout_width="match_parent"
+        android:layout_height="wrap_content"
+        android:layout_marginStart="24dp"
+        android:layout_marginTop="16dp"
+        android:layout_marginEnd="24dp"
+        android:text="@string/blocked_numbers_dialog_title"
+        android:textColor="?android:attr/textColorPrimary"
+        app:textSize="dialog" />
+
+    <com.moez.QKSMS.common.widget.QkEditText
+        android:id="@+id/input"
+        android:layout_width="match_parent"
+        android:layout_height="wrap_content"
+        android:background="@null"
+        android:hint="@string/blocked_numbers_dialog_hint"
+        android:paddingStart="24dp"
+        android:paddingTop="16dp"
+        android:paddingEnd="24dp"
+        android:paddingBottom="16dp"
+        android:textColorHint="?android:attr/textColorTertiary"
+        app:textSize="primary" />
+
+</LinearLayout>
diff --git a/presentation/src/main/res/layout/blocked_numbers_controller.xml b/presentation/src/main/res/layout/blocked_numbers_controller.xml
index 9534dce17..eaeac8f49 100644
--- a/presentation/src/main/res/layout/blocked_numbers_controller.xml
+++ b/presentation/src/main/res/layout/blocked_numbers_controller.xml
@@ -1,59 +1,59 @@
-<?xml version="1.0" encoding="utf-8"?>
-<!--
-  ~ Copyright (C) 2017 Moez Bhatti <moez.bhatti@gmail.com>
-  ~
-  ~ This file is part of QKSMS.
-  ~
-  ~ QKSMS is free software: you can redistribute it and/or modify
-  ~ it under the terms of the GNU General Public License as published by
-  ~ the Free Software Foundation, either version 3 of the License, or
-  ~ (at your option) any later version.
-  ~
-  ~ QKSMS is distributed in the hope that it will be useful,
-  ~ but WITHOUT ANY WARRANTY; without even the implied warranty of
-  ~ MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
-  ~ GNU General Public License for more details.
-  ~
-  ~ You should have received a copy of the GNU General Public License
-  ~ along with QKSMS.  If not, see <http://www.gnu.org/licenses/>.
-  -->
-<FrameLayout xmlns:android="http://schemas.android.com/apk/res/android"
-    xmlns:app="http://schemas.android.com/apk/res-auto"
-    xmlns:tools="http://schemas.android.com/tools"
-    android:layout_width="match_parent"
-    android:layout_height="match_parent"
-    android:background="?android:attr/windowBackground"
-    android:orientation="vertical">
-
-    <androidx.recyclerview.widget.RecyclerView
-        android:id="@+id/numbers"
-        android:layout_width="match_parent"
-        android:layout_height="match_parent"
-        android:clipToPadding="false"
-        android:paddingTop="8dp"
-        android:paddingBottom="8dp"
-        app:layoutManager="androidx.recyclerview.widget.LinearLayoutManager" />
-
-    <com.moez.QKSMS.common.widget.QkTextView
-        android:id="@+id/empty"
-        android:layout_width="match_parent"
-        android:layout_height="match_parent"
-        android:gravity="center"
-        android:text="@string/blocked_numbers_empty"
-        android:textColor="?android:attr/textColorTertiary" />
-
-    <ImageView
-        android:id="@+id/add"
-        android:layout_width="56dp"
-        android:layout_height="56dp"
-        android:layout_gravity="bottom|end"
-        android:layout_margin="16dp"
-        android:background="@drawable/circle_ripple"
-        android:contentDescription="@string/blocked_numbers_add_cd"
-        android:elevation="8dp"
-        android:padding="16dp"
-        android:src="@drawable/ic_add_black_24dp"
-        android:tint="@color/white"
-        tools:backgroundTint="@color/tools_theme" />
-
+<?xml version="1.0" encoding="utf-8"?>
+<!--
+  ~ Copyright (C) 2017 Moez Bhatti <moez.bhatti@gmail.com>
+  ~
+  ~ This file is part of QKSMS.
+  ~
+  ~ QKSMS is free software: you can redistribute it and/or modify
+  ~ it under the terms of the GNU General Public License as published by
+  ~ the Free Software Foundation, either version 3 of the License, or
+  ~ (at your option) any later version.
+  ~
+  ~ QKSMS is distributed in the hope that it will be useful,
+  ~ but WITHOUT ANY WARRANTY; without even the implied warranty of
+  ~ MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+  ~ GNU General Public License for more details.
+  ~
+  ~ You should have received a copy of the GNU General Public License
+  ~ along with QKSMS.  If not, see <http://www.gnu.org/licenses/>.
+  -->
+<FrameLayout xmlns:android="http://schemas.android.com/apk/res/android"
+    xmlns:app="http://schemas.android.com/apk/res-auto"
+    xmlns:tools="http://schemas.android.com/tools"
+    android:layout_width="match_parent"
+    android:layout_height="match_parent"
+    android:background="?android:attr/windowBackground"
+    android:orientation="vertical">
+
+    <androidx.recyclerview.widget.RecyclerView
+        android:id="@+id/numbers"
+        android:layout_width="match_parent"
+        android:layout_height="match_parent"
+        android:clipToPadding="false"
+        android:paddingTop="8dp"
+        android:paddingBottom="8dp"
+        app:layoutManager="androidx.recyclerview.widget.LinearLayoutManager" />
+
+    <com.moez.QKSMS.common.widget.QkTextView
+        android:id="@+id/empty"
+        android:layout_width="match_parent"
+        android:layout_height="match_parent"
+        android:gravity="center"
+        android:text="@string/blocked_numbers_empty"
+        android:textColor="?android:attr/textColorTertiary" />
+
+    <ImageView
+        android:id="@+id/add"
+        android:layout_width="56dp"
+        android:layout_height="56dp"
+        android:layout_gravity="bottom|end"
+        android:layout_margin="16dp"
+        android:background="@drawable/circle_ripple"
+        android:contentDescription="@string/blocked_numbers_add_cd"
+        android:elevation="8dp"
+        android:padding="16dp"
+        android:src="@drawable/ic_add_black_24dp"
+        android:tint="@color/white"
+        tools:backgroundTint="@color/tools_theme" />
+
 </FrameLayout>
\ No newline at end of file
diff --git a/presentation/src/main/res/layout/blocking_controller.xml b/presentation/src/main/res/layout/blocking_controller.xml
index 5602fc9df..5495947fa 100644
--- a/presentation/src/main/res/layout/blocking_controller.xml
+++ b/presentation/src/main/res/layout/blocking_controller.xml
@@ -1,65 +1,65 @@
-<?xml version="1.0" encoding="utf-8"?>
-<!--
-  ~ Copyright (C) 2019 Moez Bhatti <moez.bhatti@gmail.com>
-  ~
-  ~ This file is part of QKSMS.
-  ~
-  ~ QKSMS is free software: you can redistribute it and/or modify
-  ~ it under the terms of the GNU General Public License as published by
-  ~ the Free Software Foundation, either version 3 of the License, or
-  ~ (at your option) any later version.
-  ~
-  ~ QKSMS is distributed in the hope that it will be useful,
-  ~ but WITHOUT ANY WARRANTY; without even the implied warranty of
-  ~ MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
-  ~ GNU General Public License for more details.
-  ~
-  ~ You should have received a copy of the GNU General Public License
-  ~ along with QKSMS.  If not, see <http://www.gnu.org/licenses/>.
-  -->
-<ScrollView xmlns:android="http://schemas.android.com/apk/res/android"
-    xmlns:app="http://schemas.android.com/apk/res-auto"
-    xmlns:tools="http://schemas.android.com/tools"
-    android:layout_width="match_parent"
-    android:layout_height="match_parent"
-    android:background="?android:attr/windowBackground"
-    android:clipToPadding="false">
-
-    <LinearLayout
-        android:id="@+id/parent"
-        android:layout_width="match_parent"
-        android:layout_height="wrap_content"
-        android:orientation="vertical"
-        android:paddingTop="16dp"
-        android:paddingBottom="16dp">
-
-        <com.moez.QKSMS.common.widget.PreferenceView
-            android:id="@+id/blockingManager"
-            android:layout_width="match_parent"
-            android:layout_height="wrap_content"
-            app:title="@string/blocking_manager_title"
-            tools:summary="@string/blocking_manager_qksms_title" />
-
-        <com.moez.QKSMS.common.widget.PreferenceView
-            android:id="@+id/blockedNumbers"
-            android:layout_width="match_parent"
-            android:layout_height="wrap_content"
-            app:title="@string/blocked_numbers_title" />
-
-        <com.moez.QKSMS.common.widget.PreferenceView
-            android:id="@+id/drop"
-            android:layout_width="match_parent"
-            android:layout_height="wrap_content"
-            app:summary="@string/blocking_drop_summary"
-            app:title="@string/blocking_drop_title"
-            app:widget="@layout/settings_switch_widget" />
-
-        <com.moez.QKSMS.common.widget.PreferenceView
-            android:id="@+id/blockedMessages"
-            android:layout_width="match_parent"
-            android:layout_height="wrap_content"
-            app:title="@string/blocked_messages_title" />
-
-    </LinearLayout>
-
-</ScrollView>
+<?xml version="1.0" encoding="utf-8"?>
+<!--
+  ~ Copyright (C) 2019 Moez Bhatti <moez.bhatti@gmail.com>
+  ~
+  ~ This file is part of QKSMS.
+  ~
+  ~ QKSMS is free software: you can redistribute it and/or modify
+  ~ it under the terms of the GNU General Public License as published by
+  ~ the Free Software Foundation, either version 3 of the License, or
+  ~ (at your option) any later version.
+  ~
+  ~ QKSMS is distributed in the hope that it will be useful,
+  ~ but WITHOUT ANY WARRANTY; without even the implied warranty of
+  ~ MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+  ~ GNU General Public License for more details.
+  ~
+  ~ You should have received a copy of the GNU General Public License
+  ~ along with QKSMS.  If not, see <http://www.gnu.org/licenses/>.
+  -->
+<ScrollView xmlns:android="http://schemas.android.com/apk/res/android"
+    xmlns:app="http://schemas.android.com/apk/res-auto"
+    xmlns:tools="http://schemas.android.com/tools"
+    android:layout_width="match_parent"
+    android:layout_height="match_parent"
+    android:background="?android:attr/windowBackground"
+    android:clipToPadding="false">
+
+    <LinearLayout
+        android:id="@+id/parent"
+        android:layout_width="match_parent"
+        android:layout_height="wrap_content"
+        android:orientation="vertical"
+        android:paddingTop="16dp"
+        android:paddingBottom="16dp">
+
+        <com.moez.QKSMS.common.widget.PreferenceView
+            android:id="@+id/blockingManager"
+            android:layout_width="match_parent"
+            android:layout_height="wrap_content"
+            app:title="@string/blocking_manager_title"
+            tools:summary="@string/blocking_manager_qksms_title" />
+
+        <com.moez.QKSMS.common.widget.PreferenceView
+            android:id="@+id/blockedNumbers"
+            android:layout_width="match_parent"
+            android:layout_height="wrap_content"
+            app:title="@string/blocked_numbers_title" />
+
+        <com.moez.QKSMS.common.widget.PreferenceView
+            android:id="@+id/drop"
+            android:layout_width="match_parent"
+            android:layout_height="wrap_content"
+            app:summary="@string/blocking_drop_summary"
+            app:title="@string/blocking_drop_title"
+            app:widget="@layout/settings_switch_widget" />
+
+        <com.moez.QKSMS.common.widget.PreferenceView
+            android:id="@+id/blockedMessages"
+            android:layout_width="match_parent"
+            android:layout_height="wrap_content"
+            app:title="@string/blocked_messages_title" />
+
+    </LinearLayout>
+
+</ScrollView>
diff --git a/presentation/src/main/res/layout/blocking_manager_controller.xml b/presentation/src/main/res/layout/blocking_manager_controller.xml
index 03575c7b3..f3aacee19 100644
--- a/presentation/src/main/res/layout/blocking_manager_controller.xml
+++ b/presentation/src/main/res/layout/blocking_manager_controller.xml
@@ -1,58 +1,58 @@
-<?xml version="1.0" encoding="utf-8"?>
-<!--
-  ~ Copyright (C) 2017 Moez Bhatti <moez.bhatti@gmail.com>
-  ~
-  ~ This file is part of QKSMS.
-  ~
-  ~ QKSMS is free software: you can redistribute it and/or modify
-  ~ it under the terms of the GNU General Public License as published by
-  ~ the Free Software Foundation, either version 3 of the License, or
-  ~ (at your option) any later version.
-  ~
-  ~ QKSMS is distributed in the hope that it will be useful,
-  ~ but WITHOUT ANY WARRANTY; without even the implied warranty of
-  ~ MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
-  ~ GNU General Public License for more details.
-  ~
-  ~ You should have received a copy of the GNU General Public License
-  ~ along with QKSMS.  If not, see <http://www.gnu.org/licenses/>.
-  -->
-<ScrollView xmlns:android="http://schemas.android.com/apk/res/android"
-    xmlns:app="http://schemas.android.com/apk/res-auto"
-    android:layout_width="match_parent"
-    android:layout_height="match_parent"
-    android:background="?android:attr/windowBackground">
-
-    <LinearLayout
-        android:layout_width="match_parent"
-        android:layout_height="wrap_content"
-        android:orientation="vertical"
-        android:paddingTop="8dp"
-        android:paddingBottom="8dp">
-
-        <com.moez.QKSMS.common.widget.RadioPreferenceView
-            android:id="@+id/qksms"
-            android:layout_width="match_parent"
-            android:layout_height="wrap_content"
-            app:summary="@string/blocking_manager_qksms_summary"
-            app:title="@string/blocking_manager_qksms_title" />
-
-        <com.moez.QKSMS.common.widget.RadioPreferenceView
-            android:id="@+id/callControl"
-            android:layout_width="match_parent"
-            android:layout_height="wrap_content"
-            app:summary="@string/blocking_manager_call_control_summary"
-            app:title="@string/blocking_manager_call_control_title"
-            app:widget="@layout/blocking_manager_list_option" />
-
-        <com.moez.QKSMS.common.widget.RadioPreferenceView
-            android:id="@+id/shouldIAnswer"
-            android:layout_width="match_parent"
-            android:layout_height="wrap_content"
-            app:summary="@string/blocking_manager_sia_summary"
-            app:title="@string/blocking_manager_sia_title"
-            app:widget="@layout/blocking_manager_list_option" />
-
-    </LinearLayout>
-
-</ScrollView>
+<?xml version="1.0" encoding="utf-8"?>
+<!--
+  ~ Copyright (C) 2017 Moez Bhatti <moez.bhatti@gmail.com>
+  ~
+  ~ This file is part of QKSMS.
+  ~
+  ~ QKSMS is free software: you can redistribute it and/or modify
+  ~ it under the terms of the GNU General Public License as published by
+  ~ the Free Software Foundation, either version 3 of the License, or
+  ~ (at your option) any later version.
+  ~
+  ~ QKSMS is distributed in the hope that it will be useful,
+  ~ but WITHOUT ANY WARRANTY; without even the implied warranty of
+  ~ MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+  ~ GNU General Public License for more details.
+  ~
+  ~ You should have received a copy of the GNU General Public License
+  ~ along with QKSMS.  If not, see <http://www.gnu.org/licenses/>.
+  -->
+<ScrollView xmlns:android="http://schemas.android.com/apk/res/android"
+    xmlns:app="http://schemas.android.com/apk/res-auto"
+    android:layout_width="match_parent"
+    android:layout_height="match_parent"
+    android:background="?android:attr/windowBackground">
+
+    <LinearLayout
+        android:layout_width="match_parent"
+        android:layout_height="wrap_content"
+        android:orientation="vertical"
+        android:paddingTop="8dp"
+        android:paddingBottom="8dp">
+
+        <com.moez.QKSMS.common.widget.RadioPreferenceView
+            android:id="@+id/qksms"
+            android:layout_width="match_parent"
+            android:layout_height="wrap_content"
+            app:summary="@string/blocking_manager_qksms_summary"
+            app:title="@string/blocking_manager_qksms_title" />
+
+        <com.moez.QKSMS.common.widget.RadioPreferenceView
+            android:id="@+id/callControl"
+            android:layout_width="match_parent"
+            android:layout_height="wrap_content"
+            app:summary="@string/blocking_manager_call_control_summary"
+            app:title="@string/blocking_manager_call_control_title"
+            app:widget="@layout/blocking_manager_list_option" />
+
+        <com.moez.QKSMS.common.widget.RadioPreferenceView
+            android:id="@+id/shouldIAnswer"
+            android:layout_width="match_parent"
+            android:layout_height="wrap_content"
+            app:summary="@string/blocking_manager_sia_summary"
+            app:title="@string/blocking_manager_sia_title"
+            app:widget="@layout/blocking_manager_list_option" />
+
+    </LinearLayout>
+
+</ScrollView>
diff --git a/presentation/src/main/res/layout/blocking_manager_list_option.xml b/presentation/src/main/res/layout/blocking_manager_list_option.xml
index 06d4f8274..12e90f17f 100644
--- a/presentation/src/main/res/layout/blocking_manager_list_option.xml
+++ b/presentation/src/main/res/layout/blocking_manager_list_option.xml
@@ -1,28 +1,28 @@
-<?xml version="1.0" encoding="utf-8"?>
-<!--
-  ~ Copyright (C) 2019 Moez Bhatti <moez.bhatti@gmail.com>
-  ~
-  ~ This file is part of QKSMS.
-  ~
-  ~ QKSMS is free software: you can redistribute it and/or modify
-  ~ it under the terms of the GNU General Public License as published by
-  ~ the Free Software Foundation, either version 3 of the License, or
-  ~ (at your option) any later version.
-  ~
-  ~ QKSMS is distributed in the hope that it will be useful,
-  ~ but WITHOUT ANY WARRANTY; without even the implied warranty of
-  ~ MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
-  ~ GNU General Public License for more details.
-  ~
-  ~ You should have received a copy of the GNU General Public License
-  ~ along with QKSMS.  If not, see <http://www.gnu.org/licenses/>.
-  -->
-<ImageView xmlns:android="http://schemas.android.com/apk/res/android"
-    android:id="@+id/install"
-    android:layout_width="56dp"
-    android:layout_height="match_parent"
-    android:background="?attr/selectableItemBackground"
-    android:orientation="vertical"
-    android:padding="16dp"
-    android:src="@drawable/ic_info_black_24dp"
-    android:tint="?android:attr/textColorTertiary" />
+<?xml version="1.0" encoding="utf-8"?>
+<!--
+  ~ Copyright (C) 2019 Moez Bhatti <moez.bhatti@gmail.com>
+  ~
+  ~ This file is part of QKSMS.
+  ~
+  ~ QKSMS is free software: you can redistribute it and/or modify
+  ~ it under the terms of the GNU General Public License as published by
+  ~ the Free Software Foundation, either version 3 of the License, or
+  ~ (at your option) any later version.
+  ~
+  ~ QKSMS is distributed in the hope that it will be useful,
+  ~ but WITHOUT ANY WARRANTY; without even the implied warranty of
+  ~ MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+  ~ GNU General Public License for more details.
+  ~
+  ~ You should have received a copy of the GNU General Public License
+  ~ along with QKSMS.  If not, see <http://www.gnu.org/licenses/>.
+  -->
+<ImageView xmlns:android="http://schemas.android.com/apk/res/android"
+    android:id="@+id/install"
+    android:layout_width="56dp"
+    android:layout_height="match_parent"
+    android:background="?attr/selectableItemBackground"
+    android:orientation="vertical"
+    android:padding="16dp"
+    android:src="@drawable/ic_info_black_24dp"
+    android:tint="?android:attr/textColorTertiary" />
diff --git a/presentation/src/main/res/layout/changelog_dialog.xml b/presentation/src/main/res/layout/changelog_dialog.xml
index 2d98cad2d..8c2520552 100644
--- a/presentation/src/main/res/layout/changelog_dialog.xml
+++ b/presentation/src/main/res/layout/changelog_dialog.xml
@@ -1,111 +1,111 @@
-<?xml version="1.0" encoding="utf-8"?>
-<!--
-  ~ Copyright (C) 2019 Moez Bhatti <moez.bhatti@gmail.com>
-  ~
-  ~ This file is part of QKSMS.
-  ~
-  ~ QKSMS is free software: you can redistribute it and/or modify
-  ~ it under the terms of the GNU General Public License as published by
-  ~ the Free Software Foundation, either version 3 of the License, or
-  ~ (at your option) any later version.
-  ~
-  ~ QKSMS is distributed in the hope that it will be useful,
-  ~ but WITHOUT ANY WARRANTY; without even the implied warranty of
-  ~ MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
-  ~ GNU General Public License for more details.
-  ~
-  ~ You should have received a copy of the GNU General Public License
-  ~ along with QKSMS.  If not, see <http://www.gnu.org/licenses/>.
-  -->
-<androidx.constraintlayout.widget.ConstraintLayout xmlns:android="http://schemas.android.com/apk/res/android"
-    xmlns:app="http://schemas.android.com/apk/res-auto"
-    xmlns:tools="http://schemas.android.com/tools"
-    android:layout_width="match_parent"
-    android:layout_height="wrap_content">
-
-    <com.moez.QKSMS.common.widget.QkTextView
-        android:id="@+id/title"
-        android:layout_width="match_parent"
-        android:layout_height="wrap_content"
-        android:layout_marginStart="24dp"
-        android:layout_marginTop="16dp"
-        android:layout_marginEnd="24dp"
-        android:text="@string/changelog_title"
-        android:textColor="?android:attr/textColorPrimary"
-        android:textStyle="bold"
-        app:layout_constraintBottom_toTopOf="@id/version"
-        app:layout_constraintTop_toTopOf="parent"
-        app:layout_constraintVertical_weight="1"
-        app:textSize="dialog" />
-
-    <com.moez.QKSMS.common.widget.QkTextView
-        android:id="@+id/version"
-        style="@style/TextSecondary"
-        android:layout_width="match_parent"
-        android:layout_height="wrap_content"
-        android:layout_marginStart="24dp"
-        android:layout_marginTop="4dp"
-        android:layout_marginEnd="24dp"
-        app:layout_constraintBottom_toTopOf="@id/changelog"
-        app:layout_constraintTop_toBottomOf="@id/title"
-        app:layout_constraintVertical_weight="1"
-        tools:text="Version 3.6.5" />
-
-    <androidx.recyclerview.widget.RecyclerView
-        android:id="@+id/changelog"
-        android:layout_width="match_parent"
-        android:layout_height="wrap_content"
-        android:layout_marginStart="24dp"
-        android:layout_marginTop="16dp"
-        android:layout_marginEnd="24dp"
-        android:overScrollMode="ifContentScrolls"
-        app:layoutManager="androidx.recyclerview.widget.LinearLayoutManager"
-        app:layout_constrainedHeight="true"
-        app:layout_constraintBottom_toTopOf="@id/dismiss"
-        app:layout_constraintTop_toBottomOf="@id/version"
-        app:layout_constraintVertical_weight="0"
-        tools:listitem="@layout/changelog_list_item" />
-
-    <com.moez.QKSMS.common.widget.QkTextView
-        android:id="@+id/more"
-        style="@style/TextSecondary"
-        android:layout_width="wrap_content"
-        android:layout_height="wrap_content"
-        android:layout_marginTop="8dp"
-        android:layout_marginBottom="8dp"
-        android:background="?attr/selectableItemBackground"
-        android:paddingStart="16dp"
-        android:paddingTop="8dp"
-        android:paddingEnd="16dp"
-        android:paddingBottom="8dp"
-        android:text="@string/changelog_more"
-        android:textAllCaps="true"
-        android:textStyle="bold"
-        app:layout_constraintBottom_toBottomOf="parent"
-        app:layout_constraintEnd_toStartOf="@id/dismiss"
-        app:layout_constraintTop_toBottomOf="@id/changelog"
-        app:layout_constraintVertical_weight="1" />
-
-    <com.moez.QKSMS.common.widget.QkTextView
-        android:id="@+id/dismiss"
-        style="@style/TextSecondary"
-        android:layout_width="wrap_content"
-        android:layout_height="wrap_content"
-        android:layout_marginTop="8dp"
-        android:layout_marginEnd="8dp"
-        android:layout_marginBottom="8dp"
-        android:background="?attr/selectableItemBackground"
-        android:paddingStart="16dp"
-        android:paddingTop="8dp"
-        android:paddingEnd="16dp"
-        android:paddingBottom="8dp"
-        android:text="@string/changelog_dismiss"
-        android:textAllCaps="true"
-        android:textStyle="bold"
-        app:layout_constraintBottom_toBottomOf="parent"
-        app:layout_constraintEnd_toEndOf="parent"
-        app:layout_constraintTop_toBottomOf="@id/changelog"
-        app:layout_constraintVertical_weight="1"
-        app:layout_goneMarginEnd="8dp" />
-
-</androidx.constraintlayout.widget.ConstraintLayout>
+<?xml version="1.0" encoding="utf-8"?>
+<!--
+  ~ Copyright (C) 2019 Moez Bhatti <moez.bhatti@gmail.com>
+  ~
+  ~ This file is part of QKSMS.
+  ~
+  ~ QKSMS is free software: you can redistribute it and/or modify
+  ~ it under the terms of the GNU General Public License as published by
+  ~ the Free Software Foundation, either version 3 of the License, or
+  ~ (at your option) any later version.
+  ~
+  ~ QKSMS is distributed in the hope that it will be useful,
+  ~ but WITHOUT ANY WARRANTY; without even the implied warranty of
+  ~ MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+  ~ GNU General Public License for more details.
+  ~
+  ~ You should have received a copy of the GNU General Public License
+  ~ along with QKSMS.  If not, see <http://www.gnu.org/licenses/>.
+  -->
+<androidx.constraintlayout.widget.ConstraintLayout xmlns:android="http://schemas.android.com/apk/res/android"
+    xmlns:app="http://schemas.android.com/apk/res-auto"
+    xmlns:tools="http://schemas.android.com/tools"
+    android:layout_width="match_parent"
+    android:layout_height="wrap_content">
+
+    <com.moez.QKSMS.common.widget.QkTextView
+        android:id="@+id/title"
+        android:layout_width="match_parent"
+        android:layout_height="wrap_content"
+        android:layout_marginStart="24dp"
+        android:layout_marginTop="16dp"
+        android:layout_marginEnd="24dp"
+        android:text="@string/changelog_title"
+        android:textColor="?android:attr/textColorPrimary"
+        android:textStyle="bold"
+        app:layout_constraintBottom_toTopOf="@id/version"
+        app:layout_constraintTop_toTopOf="parent"
+        app:layout_constraintVertical_weight="1"
+        app:textSize="dialog" />
+
+    <com.moez.QKSMS.common.widget.QkTextView
+        android:id="@+id/version"
+        style="@style/TextSecondary"
+        android:layout_width="match_parent"
+        android:layout_height="wrap_content"
+        android:layout_marginStart="24dp"
+        android:layout_marginTop="4dp"
+        android:layout_marginEnd="24dp"
+        app:layout_constraintBottom_toTopOf="@id/changelog"
+        app:layout_constraintTop_toBottomOf="@id/title"
+        app:layout_constraintVertical_weight="1"
+        tools:text="Version 3.6.5" />
+
+    <androidx.recyclerview.widget.RecyclerView
+        android:id="@+id/changelog"
+        android:layout_width="match_parent"
+        android:layout_height="wrap_content"
+        android:layout_marginStart="24dp"
+        android:layout_marginTop="16dp"
+        android:layout_marginEnd="24dp"
+        android:overScrollMode="ifContentScrolls"
+        app:layoutManager="androidx.recyclerview.widget.LinearLayoutManager"
+        app:layout_constrainedHeight="true"
+        app:layout_constraintBottom_toTopOf="@id/dismiss"
+        app:layout_constraintTop_toBottomOf="@id/version"
+        app:layout_constraintVertical_weight="0"
+        tools:listitem="@layout/changelog_list_item" />
+
+    <com.moez.QKSMS.common.widget.QkTextView
+        android:id="@+id/more"
+        style="@style/TextSecondary"
+        android:layout_width="wrap_content"
+        android:layout_height="wrap_content"
+        android:layout_marginTop="8dp"
+        android:layout_marginBottom="8dp"
+        android:background="?attr/selectableItemBackground"
+        android:paddingStart="16dp"
+        android:paddingTop="8dp"
+        android:paddingEnd="16dp"
+        android:paddingBottom="8dp"
+        android:text="@string/changelog_more"
+        android:textAllCaps="true"
+        android:textStyle="bold"
+        app:layout_constraintBottom_toBottomOf="parent"
+        app:layout_constraintEnd_toStartOf="@id/dismiss"
+        app:layout_constraintTop_toBottomOf="@id/changelog"
+        app:layout_constraintVertical_weight="1" />
+
+    <com.moez.QKSMS.common.widget.QkTextView
+        android:id="@+id/dismiss"
+        style="@style/TextSecondary"
+        android:layout_width="wrap_content"
+        android:layout_height="wrap_content"
+        android:layout_marginTop="8dp"
+        android:layout_marginEnd="8dp"
+        android:layout_marginBottom="8dp"
+        android:background="?attr/selectableItemBackground"
+        android:paddingStart="16dp"
+        android:paddingTop="8dp"
+        android:paddingEnd="16dp"
+        android:paddingBottom="8dp"
+        android:text="@string/changelog_dismiss"
+        android:textAllCaps="true"
+        android:textStyle="bold"
+        app:layout_constraintBottom_toBottomOf="parent"
+        app:layout_constraintEnd_toEndOf="parent"
+        app:layout_constraintTop_toBottomOf="@id/changelog"
+        app:layout_constraintVertical_weight="1"
+        app:layout_goneMarginEnd="8dp" />
+
+</androidx.constraintlayout.widget.ConstraintLayout>
diff --git a/presentation/src/main/res/layout/changelog_list_item.xml b/presentation/src/main/res/layout/changelog_list_item.xml
index 9046a0cac..efcca0bb6 100644
--- a/presentation/src/main/res/layout/changelog_list_item.xml
+++ b/presentation/src/main/res/layout/changelog_list_item.xml
@@ -1,30 +1,30 @@
-<?xml version="1.0" encoding="utf-8"?>
-<!--
-  ~ Copyright (C) 2019 Moez Bhatti <moez.bhatti@gmail.com>
-  ~
-  ~ This file is part of QKSMS.
-  ~
-  ~ QKSMS is free software: you can redistribute it and/or modify
-  ~ it under the terms of the GNU General Public License as published by
-  ~ the Free Software Foundation, either version 3 of the License, or
-  ~ (at your option) any later version.
-  ~
-  ~ QKSMS is distributed in the hope that it will be useful,
-  ~ but WITHOUT ANY WARRANTY; without even the implied warranty of
-  ~ MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
-  ~ GNU General Public License for more details.
-  ~
-  ~ You should have received a copy of the GNU General Public License
-  ~ along with QKSMS.  If not, see <http://www.gnu.org/licenses/>.
-  -->
-<com.moez.QKSMS.common.widget.QkTextView xmlns:android="http://schemas.android.com/apk/res/android"
-    xmlns:app="http://schemas.android.com/apk/res-auto"
-    xmlns:tools="http://schemas.android.com/tools"
-    android:id="@+id/changelogItem"
-    android:layout_width="match_parent"
-    android:layout_height="wrap_content"
-    android:orientation="vertical"
-    android:paddingBottom="4dp"
-    android:textColor="?android:attr/textColorPrimary"
-    app:textSize="secondary"
-    tools:text="- Changelog item" />
+<?xml version="1.0" encoding="utf-8"?>
+<!--
+  ~ Copyright (C) 2019 Moez Bhatti <moez.bhatti@gmail.com>
+  ~
+  ~ This file is part of QKSMS.
+  ~
+  ~ QKSMS is free software: you can redistribute it and/or modify
+  ~ it under the terms of the GNU General Public License as published by
+  ~ the Free Software Foundation, either version 3 of the License, or
+  ~ (at your option) any later version.
+  ~
+  ~ QKSMS is distributed in the hope that it will be useful,
+  ~ but WITHOUT ANY WARRANTY; without even the implied warranty of
+  ~ MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+  ~ GNU General Public License for more details.
+  ~
+  ~ You should have received a copy of the GNU General Public License
+  ~ along with QKSMS.  If not, see <http://www.gnu.org/licenses/>.
+  -->
+<com.moez.QKSMS.common.widget.QkTextView xmlns:android="http://schemas.android.com/apk/res/android"
+    xmlns:app="http://schemas.android.com/apk/res-auto"
+    xmlns:tools="http://schemas.android.com/tools"
+    android:id="@+id/changelogItem"
+    android:layout_width="match_parent"
+    android:layout_height="wrap_content"
+    android:orientation="vertical"
+    android:paddingBottom="4dp"
+    android:textColor="?android:attr/textColorPrimary"
+    app:textSize="secondary"
+    tools:text="- Changelog item" />
diff --git a/presentation/src/main/res/layout/chip_input_list_item.xml b/presentation/src/main/res/layout/chip_input_list_item.xml
index 4d3969591..482072e58 100644
--- a/presentation/src/main/res/layout/chip_input_list_item.xml
+++ b/presentation/src/main/res/layout/chip_input_list_item.xml
@@ -1,30 +1,30 @@
-<?xml version="1.0" encoding="utf-8"?>
-<!--
-  ~ Copyright (C) 2019 Moez Bhatti <moez.bhatti@gmail.com>
-  ~
-  ~ This file is part of QKSMS.
-  ~
-  ~ QKSMS is free software: you can redistribute it and/or modify
-  ~ it under the terms of the GNU General Public License as published by
-  ~ the Free Software Foundation, either version 3 of the License, or
-  ~ (at your option) any later version.
-  ~
-  ~ QKSMS is distributed in the hope that it will be useful,
-  ~ but WITHOUT ANY WARRANTY; without even the implied warranty of
-  ~ MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
-  ~ GNU General Public License for more details.
-  ~
-  ~ You should have received a copy of the GNU General Public License
-  ~ along with QKSMS.  If not, see <http://www.gnu.org/licenses/>.
-  -->
-<com.moez.QKSMS.common.widget.QkEditText xmlns:android="http://schemas.android.com/apk/res/android"
-    xmlns:app="http://schemas.android.com/apk/res-auto"
-    android:layout_width="match_parent"
-    android:layout_height="match_parent"
-    android:background="@null"
-    android:imeOptions="flagNoExtractUi"
-    android:inputType="textFilter|textNoSuggestions"
-    android:privateImeOptions="nm"
-    android:textColor="?android:attr/textColorPrimary"
-    android:textColorHint="?android:attr/textColorTertiary"
+<?xml version="1.0" encoding="utf-8"?>
+<!--
+  ~ Copyright (C) 2019 Moez Bhatti <moez.bhatti@gmail.com>
+  ~
+  ~ This file is part of QKSMS.
+  ~
+  ~ QKSMS is free software: you can redistribute it and/or modify
+  ~ it under the terms of the GNU General Public License as published by
+  ~ the Free Software Foundation, either version 3 of the License, or
+  ~ (at your option) any later version.
+  ~
+  ~ QKSMS is distributed in the hope that it will be useful,
+  ~ but WITHOUT ANY WARRANTY; without even the implied warranty of
+  ~ MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+  ~ GNU General Public License for more details.
+  ~
+  ~ You should have received a copy of the GNU General Public License
+  ~ along with QKSMS.  If not, see <http://www.gnu.org/licenses/>.
+  -->
+<com.moez.QKSMS.common.widget.QkEditText xmlns:android="http://schemas.android.com/apk/res/android"
+    xmlns:app="http://schemas.android.com/apk/res-auto"
+    android:layout_width="match_parent"
+    android:layout_height="match_parent"
+    android:background="@null"
+    android:imeOptions="flagNoExtractUi"
+    android:inputType="textFilter|textNoSuggestions"
+    android:privateImeOptions="nm"
+    android:textColor="?android:attr/textColorPrimary"
+    android:textColorHint="?android:attr/textColorTertiary"
     app:textSize="primary" />
\ No newline at end of file
diff --git a/presentation/src/main/res/layout/collapsing_toolbar.xml b/presentation/src/main/res/layout/collapsing_toolbar.xml
index 1994eb710..9edef90bf 100644
--- a/presentation/src/main/res/layout/collapsing_toolbar.xml
+++ b/presentation/src/main/res/layout/collapsing_toolbar.xml
@@ -1,48 +1,48 @@
-<?xml version="1.0" encoding="utf-8"?>
-<!--
-  ~ Copyright (C) 2019 Moez Bhatti <moez.bhatti@gmail.com>
-  ~
-  ~ This file is part of QKSMS.
-  ~
-  ~ QKSMS is free software: you can redistribute it and/or modify
-  ~ it under the terms of the GNU General Public License as published by
-  ~ the Free Software Foundation, either version 3 of the License, or
-  ~ (at your option) any later version.
-  ~
-  ~ QKSMS is distributed in the hope that it will be useful,
-  ~ but WITHOUT ANY WARRANTY; without even the implied warranty of
-  ~ MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
-  ~ GNU General Public License for more details.
-  ~
-  ~ You should have received a copy of the GNU General Public License
-  ~ along with QKSMS.  If not, see <http://www.gnu.org/licenses/>.
-  -->
-<com.google.android.material.appbar.AppBarLayout xmlns:android="http://schemas.android.com/apk/res/android"
-    xmlns:app="http://schemas.android.com/apk/res-auto"
-    xmlns:tools="http://schemas.android.com/tools"
-    android:id="@+id/appBarLayout"
-    android:layout_width="match_parent"
-    android:layout_height="108dp"
-    android:fitsSystemWindows="true">
-
-    <com.google.android.material.appbar.CollapsingToolbarLayout
-        android:id="@+id/collapsingToolbar"
-        android:layout_width="match_parent"
-        android:layout_height="match_parent"
-        app:collapsedTitleTextAppearance="@style/CollapsingToolbarCollapsedText"
-        app:expandedTitleMarginBottom="8dp"
-        app:expandedTitleMarginEnd="24dp"
-        app:expandedTitleMarginStart="24dp"
-        app:expandedTitleTextAppearance="@style/CollapsingToolbarExpandedText"
-        app:layout_scrollFlags="scroll|exitUntilCollapsed">
-
-        <androidx.appcompat.widget.Toolbar
-            android:id="@+id/toolbar"
-            android:layout_width="match_parent"
-            android:layout_height="?attr/actionBarSize"
-            app:layout_collapseMode="pin"
-            tools:title="Title" />
-
-    </com.google.android.material.appbar.CollapsingToolbarLayout>
-
+<?xml version="1.0" encoding="utf-8"?>
+<!--
+  ~ Copyright (C) 2019 Moez Bhatti <moez.bhatti@gmail.com>
+  ~
+  ~ This file is part of QKSMS.
+  ~
+  ~ QKSMS is free software: you can redistribute it and/or modify
+  ~ it under the terms of the GNU General Public License as published by
+  ~ the Free Software Foundation, either version 3 of the License, or
+  ~ (at your option) any later version.
+  ~
+  ~ QKSMS is distributed in the hope that it will be useful,
+  ~ but WITHOUT ANY WARRANTY; without even the implied warranty of
+  ~ MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+  ~ GNU General Public License for more details.
+  ~
+  ~ You should have received a copy of the GNU General Public License
+  ~ along with QKSMS.  If not, see <http://www.gnu.org/licenses/>.
+  -->
+<com.google.android.material.appbar.AppBarLayout xmlns:android="http://schemas.android.com/apk/res/android"
+    xmlns:app="http://schemas.android.com/apk/res-auto"
+    xmlns:tools="http://schemas.android.com/tools"
+    android:id="@+id/appBarLayout"
+    android:layout_width="match_parent"
+    android:layout_height="108dp"
+    android:fitsSystemWindows="true">
+
+    <com.google.android.material.appbar.CollapsingToolbarLayout
+        android:id="@+id/collapsingToolbar"
+        android:layout_width="match_parent"
+        android:layout_height="match_parent"
+        app:collapsedTitleTextAppearance="@style/CollapsingToolbarCollapsedText"
+        app:expandedTitleMarginBottom="8dp"
+        app:expandedTitleMarginEnd="24dp"
+        app:expandedTitleMarginStart="24dp"
+        app:expandedTitleTextAppearance="@style/CollapsingToolbarExpandedText"
+        app:layout_scrollFlags="scroll|exitUntilCollapsed">
+
+        <androidx.appcompat.widget.Toolbar
+            android:id="@+id/toolbar"
+            android:layout_width="match_parent"
+            android:layout_height="?attr/actionBarSize"
+            app:layout_collapseMode="pin"
+            tools:title="Title" />
+
+    </com.google.android.material.appbar.CollapsingToolbarLayout>
+
 </com.google.android.material.appbar.AppBarLayout>
\ No newline at end of file
diff --git a/presentation/src/main/res/layout/compose_activity.xml b/presentation/src/main/res/layout/compose_activity.xml
index 19900e0ad..d3eabc732 100644
--- a/presentation/src/main/res/layout/compose_activity.xml
+++ b/presentation/src/main/res/layout/compose_activity.xml
@@ -1,534 +1,534 @@
-<?xml version="1.0" encoding="utf-8"?>
-<!--
-  ~ Copyright (C) 2019 Moez Bhatti <moez.bhatti@gmail.com>
-  ~
-  ~ This file is part of QKSMS.
-  ~
-  ~ QKSMS is free software: you can redistribute it and/or modify
-  ~ it under the terms of the GNU General Public License as published by
-  ~ the Free Software Foundation, either version 3 of the License, or
-  ~ (at your option) any later version.
-  ~
-  ~ QKSMS is distributed in the hope that it will be useful,
-  ~ but WITHOUT ANY WARRANTY; without even the implied warranty of
-  ~ MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
-  ~ GNU General Public License for more details.
-  ~
-  ~ You should have received a copy of the GNU General Public License
-  ~ along with QKSMS.  If not, see <http://www.gnu.org/licenses/>.
-  -->
-<androidx.constraintlayout.widget.ConstraintLayout xmlns:android="http://schemas.android.com/apk/res/android"
-    xmlns:app="http://schemas.android.com/apk/res-auto"
-    xmlns:tools="http://schemas.android.com/tools"
-    android:id="@+id/contentView"
-    android:layout_width="match_parent"
-    android:layout_height="match_parent"
-    android:background="?android:attr/windowBackground"
-    android:orientation="vertical"
-    tools:context="com.moez.QKSMS.feature.compose.ComposeActivity">
-
-    <androidx.recyclerview.widget.RecyclerView
-        android:id="@+id/messageList"
-        android:layout_width="0dp"
-        android:layout_height="0dp"
-        android:layout_marginBottom="12dp"
-        android:clipChildren="false"
-        android:clipToPadding="false"
-        android:paddingTop="8dp"
-        app:layoutManager="androidx.recyclerview.widget.LinearLayoutManager"
-        app:layout_constraintBottom_toTopOf="@id/messageBackground"
-        app:layout_constraintEnd_toEndOf="parent"
-        app:layout_constraintStart_toStartOf="parent"
-        app:layout_constraintTop_toBottomOf="@id/sendAsGroupBackground"
-        app:stackFromEnd="true"
-        tools:listitem="@layout/message_list_item_in" />
-
-    <com.moez.QKSMS.common.widget.QkTextView
-        android:id="@+id/messagesEmpty"
-        android:layout_width="match_parent"
-        android:layout_height="wrap_content"
-        android:layout_marginStart="56dp"
-        android:layout_marginTop="32dp"
-        android:layout_marginEnd="56dp"
-        android:gravity="center"
-        android:text="@string/compose_messages_empty"
-        android:textColor="?android:attr/textColorTertiary"
-        android:visibility="gone"
-        app:layout_constraintTop_toBottomOf="@id/sendAsGroupBackground"
-        app:textSize="secondary" />
-
-    <ProgressBar
-        android:id="@+id/loading"
-        style="?android:attr/progressBarStyleLarge"
-        android:layout_width="36dp"
-        android:layout_height="36dp"
-        android:layout_marginTop="16dp"
-        android:visibility="gone"
-        app:layout_constraintEnd_toEndOf="parent"
-        app:layout_constraintStart_toStartOf="parent"
-        app:layout_constraintTop_toBottomOf="@id/toolbar"
-        tools:progress="45"
-        tools:progressTint="@color/tools_theme" />
-
-    <androidx.constraintlayout.widget.Group
-        android:id="@+id/sendAsGroup"
-        android:layout_width="wrap_content"
-        android:layout_height="wrap_content"
-        android:visibility="gone"
-        app:constraint_referenced_ids="sendAsGroupBackground,sendAsGroupTitle,sendAsGroupSummary,sendAsGroupSwitch,sendAsGroupShadow"
-        tools:visibility="visible" />
-
-    <View
-        android:id="@+id/sendAsGroupBackground"
-        android:layout_width="match_parent"
-        android:layout_height="0dp"
-        android:background="?attr/colorPrimary"
-        app:layout_constraintBottom_toBottomOf="@id/sendAsGroupSummary"
-        app:layout_constraintTop_toBottomOf="@id/toolbar" />
-
-    <com.moez.QKSMS.common.widget.QkTextView
-        android:id="@+id/sendAsGroupTitle"
-        android:layout_width="0dp"
-        android:layout_height="wrap_content"
-        android:layout_marginStart="16dp"
-        android:layout_marginTop="16dp"
-        android:layout_marginEnd="16dp"
-        android:text="@string/compose_send_group_title"
-        android:textColor="?android:attr/textColorPrimary"
-        android:textStyle="bold"
-        app:layout_constraintEnd_toStartOf="@id/sendAsGroupSwitch"
-        app:layout_constraintStart_toStartOf="@id/sendAsGroupBackground"
-        app:layout_constraintTop_toTopOf="@id/sendAsGroupBackground"
-        app:textSize="primary" />
-
-    <com.moez.QKSMS.common.widget.QkTextView
-        android:id="@+id/sendAsGroupSummary"
-        android:layout_width="0dp"
-        android:layout_height="wrap_content"
-        android:paddingBottom="16dp"
-        android:text="@string/compose_send_group_summary"
-        android:textColor="?android:attr/textColorTertiary"
-        app:layout_constraintEnd_toEndOf="@id/sendAsGroupTitle"
-        app:layout_constraintStart_toStartOf="@id/sendAsGroupTitle"
-        app:layout_constraintTop_toBottomOf="@id/sendAsGroupTitle"
-        app:textSize="secondary" />
-
-    <com.moez.QKSMS.common.widget.QkSwitch
-        android:id="@+id/sendAsGroupSwitch"
-        android:layout_width="wrap_content"
-        android:layout_height="wrap_content"
-        android:layout_marginEnd="16dp"
-        android:checked="true"
-        android:clickable="false"
-        app:layout_constraintBottom_toBottomOf="@id/sendAsGroupBackground"
-        app:layout_constraintEnd_toEndOf="@id/sendAsGroupBackground"
-        app:layout_constraintTop_toTopOf="@id/sendAsGroupBackground" />
-
-    <View
-        android:id="@+id/sendAsGroupShadow"
-        android:layout_width="match_parent"
-        android:layout_height="8dp"
-        android:background="@drawable/ab_shadow"
-        app:layout_constraintTop_toBottomOf="@id/sendAsGroupBackground" />
-
-    <androidx.constraintlayout.widget.Group
-        android:id="@+id/composeBar"
-        android:layout_width="wrap_content"
-        android:layout_height="wrap_content"
-        app:constraint_referenced_ids="messageBackground,attachments,attach,message,counter,send" />
-
-    <View
-        android:id="@+id/composeDivider"
-        android:layout_width="match_parent"
-        android:layout_height="1dp"
-        android:layout_marginBottom="12dp"
-        android:background="?android:attr/divider"
-        android:visibility="gone"
-        app:layout_constraintBottom_toTopOf="@id/messageBackground"
-        app:layout_goneMarginBottom="12dp" />
-
-    <View
-        android:id="@+id/messageBackground"
-        android:layout_width="0dp"
-        android:layout_height="0dp"
-        android:layout_marginStart="12dp"
-        android:layout_marginEnd="8dp"
-        android:layout_marginBottom="12dp"
-        android:background="@drawable/rounded_rectangle_22dp"
-        android:backgroundTint="?attr/bubbleColor"
-        app:layout_constraintBottom_toBottomOf="parent"
-        app:layout_constraintEnd_toStartOf="@id/send"
-        app:layout_constraintStart_toEndOf="@id/attach"
-        app:layout_constraintTop_toTopOf="@id/scheduledCancel" />
-
-    <androidx.constraintlayout.widget.Group
-        android:id="@+id/scheduledGroup"
-        android:layout_width="wrap_content"
-        android:layout_height="wrap_content"
-        android:visibility="gone"
-        app:constraint_referenced_ids="scheduledTitle,scheduledTime,scheduledCancel,scheduledSeparator" />
-
-    <com.moez.QKSMS.common.widget.QkTextView
-        android:id="@+id/scheduledTitle"
-        android:layout_width="0dp"
-        android:layout_height="wrap_content"
-        android:paddingStart="16dp"
-        android:paddingEnd="16dp"
-        android:text="@string/compose_scheduled_for"
-        android:textColor="?android:attr/textColorPrimary"
-        android:textStyle="bold"
-        app:layout_constraintBottom_toTopOf="@id/scheduledTime"
-        app:layout_constraintEnd_toStartOf="@id/scheduledCancel"
-        app:layout_constraintStart_toStartOf="@id/messageBackground"
-        app:layout_constraintTop_toTopOf="@id/scheduledCancel"
-        app:layout_constraintVertical_chainStyle="packed"
-        app:textSize="secondary" />
-
-    <com.moez.QKSMS.common.widget.QkTextView
-        android:id="@+id/scheduledTime"
-        android:layout_width="0dp"
-        android:layout_height="wrap_content"
-        android:paddingStart="16dp"
-        android:paddingEnd="16dp"
-        android:textColor="?android:attr/textColorTertiary"
-        app:layout_constraintBottom_toBottomOf="@id/scheduledCancel"
-        app:layout_constraintEnd_toStartOf="@id/scheduledCancel"
-        app:layout_constraintStart_toStartOf="@id/messageBackground"
-        app:layout_constraintTop_toBottomOf="@id/scheduledTitle"
-        app:textSize="secondary"
-        tools:text="Decemeber 23rd at 12:00AM" />
-
-    <ImageView
-        android:id="@+id/scheduledCancel"
-        android:layout_width="44dp"
-        android:layout_height="56dp"
-        android:padding="10dp"
-        android:src="@drawable/ic_cancel_black_24dp"
-        android:tint="?android:attr/textColorSecondary"
-        app:layout_constraintBottom_toTopOf="@id/scheduledSeparator"
-        app:layout_constraintEnd_toEndOf="@id/messageBackground" />
-
-    <View
-        android:id="@+id/scheduledSeparator"
-        android:layout_width="0dp"
-        android:layout_height="1dp"
-        android:background="?android:attr/divider"
-        app:layout_constraintBottom_toTopOf="@id/attachments"
-        app:layout_constraintEnd_toEndOf="@id/messageBackground"
-        app:layout_constraintStart_toStartOf="@id/messageBackground" />
-
-    <androidx.recyclerview.widget.RecyclerView
-        android:id="@+id/attachments"
-        android:layout_width="0dp"
-        android:layout_height="wrap_content"
-        android:clipChildren="false"
-        android:clipToPadding="false"
-        android:orientation="horizontal"
-        android:paddingStart="8dp"
-        android:paddingEnd="8dp"
-        app:layoutManager="androidx.recyclerview.widget.LinearLayoutManager"
-        app:layout_constraintBottom_toTopOf="@id/message"
-        app:layout_constraintEnd_toEndOf="@id/messageBackground"
-        app:layout_constraintStart_toStartOf="@id/messageBackground"
-        tools:listitem="@layout/attachment_image_list_item" />
-
-    <com.moez.QKSMS.common.widget.QkEditText
-        android:id="@+id/message"
-        style="@style/TextPrimary"
-        android:layout_width="0dp"
-        android:layout_height="wrap_content"
-        android:layout_weight="1"
-        android:background="@null"
-        android:gravity="center_vertical"
-        android:hint="@string/compose_hint"
-        android:inputType="textLongMessage|textCapSentences|textMultiLine"
-        android:maxLines="6"
-        android:minHeight="44dp"
-        android:paddingStart="16dp"
-        android:paddingTop="12dp"
-        android:paddingEnd="16dp"
-        android:paddingBottom="12dp"
-        android:textColorHint="?android:attr/textColorTertiary"
-        app:layout_constraintBottom_toBottomOf="@id/messageBackground"
-        app:layout_constraintEnd_toStartOf="@id/sim"
-        app:layout_constraintStart_toStartOf="@id/messageBackground" />
-
-    <ImageView
-        android:id="@+id/sim"
-        android:layout_width="44dp"
-        android:layout_height="44dp"
-        android:background="?android:attr/selectableItemBackgroundBorderless"
-        android:contentDescription="@string/compose_sim_cd"
-        android:padding="8dp"
-        android:src="@drawable/ic_sim_card_black_24dp"
-        android:tint="?android:attr/textColorSecondary"
-        android:visibility="gone"
-        app:layout_constraintBottom_toBottomOf="@id/messageBackground"
-        app:layout_constraintEnd_toEndOf="@id/messageBackground" />
-
-    <com.moez.QKSMS.common.widget.QkTextView
-        android:id="@+id/simIndex"
-        android:layout_width="0dp"
-        android:layout_height="0dp"
-        android:gravity="center"
-        android:textColor="?android:attr/textColorPrimaryInverse"
-        android:textSize="14dp"
-        android:textStyle="bold"
-        app:layout_constraintBottom_toBottomOf="@id/sim"
-        app:layout_constraintEnd_toEndOf="@id/sim"
-        app:layout_constraintStart_toStartOf="@id/sim"
-        app:layout_constraintTop_toTopOf="@id/sim"
-        tools:ignore="SpUsage"
-        tools:text="1" />
-
-    <com.moez.QKSMS.common.widget.QkTextView
-        android:id="@+id/counter"
-        android:layout_width="0dp"
-        android:layout_height="wrap_content"
-        android:layout_marginBottom="4dp"
-        android:gravity="center"
-        android:textColor="?android:attr/textColorSecondary"
-        app:layout_constraintBottom_toTopOf="@id/send"
-        app:layout_constraintEnd_toEndOf="@id/send"
-        app:layout_constraintStart_toStartOf="@id/send"
-        app:textSize="tertiary"
-        tools:text="108 / 2" />
-
-    <ImageView
-        android:id="@+id/send"
-        android:layout_width="44dp"
-        android:layout_height="44dp"
-        android:layout_marginEnd="8dp"
-        android:background="?android:attr/selectableItemBackgroundBorderless"
-        android:contentDescription="@string/compose_send_cd"
-        android:padding="10dp"
-        android:src="@drawable/ic_send_black_24dp"
-        android:tint="?android:textColorSecondary"
-        app:layout_constraintBottom_toBottomOf="@id/messageBackground"
-        app:layout_constraintEnd_toEndOf="parent" />
-
-    <androidx.appcompat.widget.Toolbar
-        android:id="@+id/toolbar"
-        style="@style/Toolbar"
-        android:layout_width="match_parent"
-        android:layout_height="wrap_content"
-        android:gravity="center_vertical"
-        app:layout_constrainedHeight="true"
-        app:layout_constraintHeight_max="140dp"
-        app:layout_constraintTop_toTopOf="parent">
-
-        <LinearLayout
-            android:layout_width="match_parent"
-            android:layout_height="match_parent"
-            android:gravity="center_vertical"
-            android:orientation="vertical">
-
-            <com.moez.QKSMS.common.widget.QkTextView
-                android:id="@+id/toolbarTitle"
-                style="@style/ToolbarText"
-                android:layout_height="wrap_content"
-                tools:text="Moez Bhatti" />
-
-            <com.moez.QKSMS.common.widget.QkTextView
-                android:id="@+id/toolbarSubtitle"
-                style="@style/ToolbarText"
-                android:textColor="?android:attr/textColorTertiary"
-                android:visibility="gone"
-                app:textSize="secondary"
-                tools:text="3 of 9 results" />
-
-            <androidx.recyclerview.widget.RecyclerView
-                android:id="@+id/chips"
-                android:layout_width="match_parent"
-                android:layout_height="wrap_content"
-                android:layout_marginTop="4dp"
-                android:layout_marginBottom="4dp"
-                android:scrollbars="vertical"
-                tools:visibility="gone" />
-
-        </LinearLayout>
-
-    </androidx.appcompat.widget.Toolbar>
-
-    <View
-        android:layout_width="match_parent"
-        android:layout_height="8dp"
-        android:background="@drawable/ab_shadow"
-        app:layout_constraintTop_toBottomOf="@id/toolbar" />
-
-    <View
-        android:layout_width="match_parent"
-        android:layout_height="1dp"
-        android:background="?android:attr/divider"
-        app:layout_constraintBottom_toBottomOf="parent" />
-
-    <androidx.constraintlayout.widget.Group
-        android:id="@+id/attaching"
-        android:layout_width="wrap_content"
-        android:layout_height="wrap_content"
-        android:visibility="gone"
-        app:constraint_referenced_ids="contact,contactLabel,schedule,scheduleLabel,gallery,galleryLabel,camera,cameraLabel,attachingBackground" />
-
-    <View
-        android:id="@+id/attachingBackground"
-        android:layout_width="0dp"
-        android:layout_height="0dp"
-        android:background="#44000000"
-        android:elevation="4dp"
-        app:layout_constraintBottom_toBottomOf="parent"
-        app:layout_constraintEnd_toEndOf="parent"
-        app:layout_constraintStart_toStartOf="parent"
-        app:layout_constraintTop_toTopOf="parent" />
-
-    <ImageView
-        android:id="@+id/contact"
-        android:layout_width="40dp"
-        android:layout_height="40dp"
-        android:layout_marginBottom="12dp"
-        android:background="@drawable/circle"
-        android:backgroundTint="?attr/bubbleColor"
-        android:contentDescription="@string/compose_contact_cd"
-        android:elevation="4dp"
-        android:padding="10dp"
-        android:src="@drawable/ic_person_black_24dp"
-        android:tint="?android:attr/textColorSecondary"
-        android:visibility="visible"
-        app:layout_constraintBottom_toTopOf="@id/schedule"
-        app:layout_constraintEnd_toEndOf="@id/attach"
-        app:layout_constraintStart_toStartOf="@id/attach" />
-
-    <com.moez.QKSMS.common.widget.QkTextView
-        android:id="@+id/contactLabel"
-        android:layout_width="wrap_content"
-        android:layout_height="32dp"
-        android:layout_marginStart="8dp"
-        android:background="@drawable/rounded_rectangle_4dp"
-        android:backgroundTint="?attr/bubbleColor"
-        android:elevation="4dp"
-        android:gravity="center_vertical"
-        android:paddingStart="8dp"
-        android:paddingEnd="8dp"
-        android:text="@string/compose_contact_cd"
-        android:textColor="?android:attr/textColorPrimary"
-        app:layout_constraintBottom_toBottomOf="@id/contact"
-        app:layout_constraintStart_toEndOf="@id/contact"
-        app:layout_constraintTop_toTopOf="@id/contact" />
-
-    <ImageView
-        android:id="@+id/schedule"
-        android:layout_width="40dp"
-        android:layout_height="40dp"
-        android:layout_marginBottom="12dp"
-        android:background="@drawable/circle"
-        android:backgroundTint="?attr/bubbleColor"
-        android:contentDescription="@string/compose_schedule_cd"
-        android:elevation="4dp"
-        android:padding="10dp"
-        android:src="@drawable/ic_event_black_24dp"
-        android:tint="?android:attr/textColorSecondary"
-        android:visibility="visible"
-        app:layout_constraintBottom_toTopOf="@id/gallery"
-        app:layout_constraintEnd_toEndOf="@id/attach"
-        app:layout_constraintStart_toStartOf="@id/attach" />
-
-    <com.moez.QKSMS.common.widget.QkTextView
-        android:id="@+id/scheduleLabel"
-        android:layout_width="wrap_content"
-        android:layout_height="32dp"
-        android:layout_marginStart="8dp"
-        android:background="@drawable/rounded_rectangle_4dp"
-        android:backgroundTint="?attr/bubbleColor"
-        android:elevation="4dp"
-        android:gravity="center_vertical"
-        android:paddingStart="8dp"
-        android:paddingEnd="8dp"
-        android:text="@string/compose_schedule_cd"
-        android:textColor="?android:attr/textColorPrimary"
-        app:layout_constraintBottom_toBottomOf="@id/schedule"
-        app:layout_constraintStart_toEndOf="@id/schedule"
-        app:layout_constraintTop_toTopOf="@id/schedule" />
-
-    <ImageView
-        android:id="@+id/gallery"
-        android:layout_width="40dp"
-        android:layout_height="40dp"
-        android:layout_marginBottom="12dp"
-        android:background="@drawable/circle"
-        android:backgroundTint="?attr/bubbleColor"
-        android:contentDescription="@string/compose_gallery_cd"
-        android:elevation="4dp"
-        android:padding="10dp"
-        android:src="@drawable/ic_insert_photo_black_24dp"
-        android:tint="?android:attr/textColorSecondary"
-        android:visibility="visible"
-        app:layout_constraintBottom_toTopOf="@id/camera"
-        app:layout_constraintEnd_toEndOf="@id/attach"
-        app:layout_constraintStart_toStartOf="@id/attach" />
-
-    <com.moez.QKSMS.common.widget.QkTextView
-        android:id="@+id/galleryLabel"
-        android:layout_width="wrap_content"
-        android:layout_height="32dp"
-        android:layout_marginStart="8dp"
-        android:background="@drawable/rounded_rectangle_4dp"
-        android:backgroundTint="?attr/bubbleColor"
-        android:elevation="4dp"
-        android:gravity="center_vertical"
-        android:paddingStart="8dp"
-        android:paddingEnd="8dp"
-        android:text="@string/compose_gallery_cd"
-        android:textColor="?android:attr/textColorPrimary"
-        app:layout_constraintBottom_toBottomOf="@id/gallery"
-        app:layout_constraintStart_toEndOf="@id/gallery"
-        app:layout_constraintTop_toTopOf="@id/gallery" />
-
-    <ImageView
-        android:id="@+id/camera"
-        android:layout_width="40dp"
-        android:layout_height="40dp"
-        android:layout_marginBottom="16dp"
-        android:background="@drawable/circle"
-        android:backgroundTint="?attr/bubbleColor"
-        android:contentDescription="@string/compose_camera_cd"
-        android:elevation="4dp"
-        android:padding="10dp"
-        android:src="@drawable/ic_camera_alt_black_24dp"
-        android:tint="?android:attr/textColorSecondary"
-        android:visibility="visible"
-        app:layout_constraintBottom_toTopOf="@id/attach"
-        app:layout_constraintEnd_toEndOf="@id/attach"
-        app:layout_constraintStart_toStartOf="@id/attach" />
-
-    <com.moez.QKSMS.common.widget.QkTextView
-        android:id="@+id/cameraLabel"
-        android:layout_width="wrap_content"
-        android:layout_height="32dp"
-        android:layout_marginStart="8dp"
-        android:background="@drawable/rounded_rectangle_4dp"
-        android:backgroundTint="?attr/bubbleColor"
-        android:elevation="4dp"
-        android:gravity="center_vertical"
-        android:paddingStart="8dp"
-        android:paddingEnd="8dp"
-        android:text="@string/compose_camera_cd"
-        android:textColor="?android:attr/textColorPrimary"
-        app:layout_constraintBottom_toBottomOf="@id/camera"
-        app:layout_constraintStart_toEndOf="@id/gallery"
-        app:layout_constraintTop_toTopOf="@id/camera" />
-
-    <ImageView
-        android:id="@+id/attach"
-        android:layout_width="44dp"
-        android:layout_height="44dp"
-        android:layout_marginStart="12dp"
-        android:background="@drawable/circle"
-        android:contentDescription="@string/compose_attach_cd"
-        android:elevation="4dp"
-        android:padding="10dp"
-        android:src="@drawable/ic_add_black_24dp"
-        app:layout_constraintBottom_toBottomOf="@id/messageBackground"
-        app:layout_constraintStart_toStartOf="parent"
-        tools:backgroundTint="@color/tools_theme"
-        tools:tint="@color/textPrimaryDark" />
-
+<?xml version="1.0" encoding="utf-8"?>
+<!--
+  ~ Copyright (C) 2019 Moez Bhatti <moez.bhatti@gmail.com>
+  ~
+  ~ This file is part of QKSMS.
+  ~
+  ~ QKSMS is free software: you can redistribute it and/or modify
+  ~ it under the terms of the GNU General Public License as published by
+  ~ the Free Software Foundation, either version 3 of the License, or
+  ~ (at your option) any later version.
+  ~
+  ~ QKSMS is distributed in the hope that it will be useful,
+  ~ but WITHOUT ANY WARRANTY; without even the implied warranty of
+  ~ MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+  ~ GNU General Public License for more details.
+  ~
+  ~ You should have received a copy of the GNU General Public License
+  ~ along with QKSMS.  If not, see <http://www.gnu.org/licenses/>.
+  -->
+<androidx.constraintlayout.widget.ConstraintLayout xmlns:android="http://schemas.android.com/apk/res/android"
+    xmlns:app="http://schemas.android.com/apk/res-auto"
+    xmlns:tools="http://schemas.android.com/tools"
+    android:id="@+id/contentView"
+    android:layout_width="match_parent"
+    android:layout_height="match_parent"
+    android:background="?android:attr/windowBackground"
+    android:orientation="vertical"
+    tools:context="com.moez.QKSMS.feature.compose.ComposeActivity">
+
+    <androidx.recyclerview.widget.RecyclerView
+        android:id="@+id/messageList"
+        android:layout_width="0dp"
+        android:layout_height="0dp"
+        android:layout_marginBottom="12dp"
+        android:clipChildren="false"
+        android:clipToPadding="false"
+        android:paddingTop="8dp"
+        app:layoutManager="androidx.recyclerview.widget.LinearLayoutManager"
+        app:layout_constraintBottom_toTopOf="@id/messageBackground"
+        app:layout_constraintEnd_toEndOf="parent"
+        app:layout_constraintStart_toStartOf="parent"
+        app:layout_constraintTop_toBottomOf="@id/sendAsGroupBackground"
+        app:stackFromEnd="true"
+        tools:listitem="@layout/message_list_item_in" />
+
+    <com.moez.QKSMS.common.widget.QkTextView
+        android:id="@+id/messagesEmpty"
+        android:layout_width="match_parent"
+        android:layout_height="wrap_content"
+        android:layout_marginStart="56dp"
+        android:layout_marginTop="32dp"
+        android:layout_marginEnd="56dp"
+        android:gravity="center"
+        android:text="@string/compose_messages_empty"
+        android:textColor="?android:attr/textColorTertiary"
+        android:visibility="gone"
+        app:layout_constraintTop_toBottomOf="@id/sendAsGroupBackground"
+        app:textSize="secondary" />
+
+    <ProgressBar
+        android:id="@+id/loading"
+        style="?android:attr/progressBarStyleLarge"
+        android:layout_width="36dp"
+        android:layout_height="36dp"
+        android:layout_marginTop="16dp"
+        android:visibility="gone"
+        app:layout_constraintEnd_toEndOf="parent"
+        app:layout_constraintStart_toStartOf="parent"
+        app:layout_constraintTop_toBottomOf="@id/toolbar"
+        tools:progress="45"
+        tools:progressTint="@color/tools_theme" />
+
+    <androidx.constraintlayout.widget.Group
+        android:id="@+id/sendAsGroup"
+        android:layout_width="wrap_content"
+        android:layout_height="wrap_content"
+        android:visibility="gone"
+        app:constraint_referenced_ids="sendAsGroupBackground,sendAsGroupTitle,sendAsGroupSummary,sendAsGroupSwitch,sendAsGroupShadow"
+        tools:visibility="visible" />
+
+    <View
+        android:id="@+id/sendAsGroupBackground"
+        android:layout_width="match_parent"
+        android:layout_height="0dp"
+        android:background="?attr/colorPrimary"
+        app:layout_constraintBottom_toBottomOf="@id/sendAsGroupSummary"
+        app:layout_constraintTop_toBottomOf="@id/toolbar" />
+
+    <com.moez.QKSMS.common.widget.QkTextView
+        android:id="@+id/sendAsGroupTitle"
+        android:layout_width="0dp"
+        android:layout_height="wrap_content"
+        android:layout_marginStart="16dp"
+        android:layout_marginTop="16dp"
+        android:layout_marginEnd="16dp"
+        android:text="@string/compose_send_group_title"
+        android:textColor="?android:attr/textColorPrimary"
+        android:textStyle="bold"
+        app:layout_constraintEnd_toStartOf="@id/sendAsGroupSwitch"
+        app:layout_constraintStart_toStartOf="@id/sendAsGroupBackground"
+        app:layout_constraintTop_toTopOf="@id/sendAsGroupBackground"
+        app:textSize="primary" />
+
+    <com.moez.QKSMS.common.widget.QkTextView
+        android:id="@+id/sendAsGroupSummary"
+        android:layout_width="0dp"
+        android:layout_height="wrap_content"
+        android:paddingBottom="16dp"
+        android:text="@string/compose_send_group_summary"
+        android:textColor="?android:attr/textColorTertiary"
+        app:layout_constraintEnd_toEndOf="@id/sendAsGroupTitle"
+        app:layout_constraintStart_toStartOf="@id/sendAsGroupTitle"
+        app:layout_constraintTop_toBottomOf="@id/sendAsGroupTitle"
+        app:textSize="secondary" />
+
+    <com.moez.QKSMS.common.widget.QkSwitch
+        android:id="@+id/sendAsGroupSwitch"
+        android:layout_width="wrap_content"
+        android:layout_height="wrap_content"
+        android:layout_marginEnd="16dp"
+        android:checked="true"
+        android:clickable="false"
+        app:layout_constraintBottom_toBottomOf="@id/sendAsGroupBackground"
+        app:layout_constraintEnd_toEndOf="@id/sendAsGroupBackground"
+        app:layout_constraintTop_toTopOf="@id/sendAsGroupBackground" />
+
+    <View
+        android:id="@+id/sendAsGroupShadow"
+        android:layout_width="match_parent"
+        android:layout_height="8dp"
+        android:background="@drawable/ab_shadow"
+        app:layout_constraintTop_toBottomOf="@id/sendAsGroupBackground" />
+
+    <androidx.constraintlayout.widget.Group
+        android:id="@+id/composeBar"
+        android:layout_width="wrap_content"
+        android:layout_height="wrap_content"
+        app:constraint_referenced_ids="messageBackground,attachments,attach,message,counter,send" />
+
+    <View
+        android:id="@+id/composeDivider"
+        android:layout_width="match_parent"
+        android:layout_height="1dp"
+        android:layout_marginBottom="12dp"
+        android:background="?android:attr/divider"
+        android:visibility="gone"
+        app:layout_constraintBottom_toTopOf="@id/messageBackground"
+        app:layout_goneMarginBottom="12dp" />
+
+    <View
+        android:id="@+id/messageBackground"
+        android:layout_width="0dp"
+        android:layout_height="0dp"
+        android:layout_marginStart="12dp"
+        android:layout_marginEnd="8dp"
+        android:layout_marginBottom="12dp"
+        android:background="@drawable/rounded_rectangle_22dp"
+        android:backgroundTint="?attr/bubbleColor"
+        app:layout_constraintBottom_toBottomOf="parent"
+        app:layout_constraintEnd_toStartOf="@id/send"
+        app:layout_constraintStart_toEndOf="@id/attach"
+        app:layout_constraintTop_toTopOf="@id/scheduledCancel" />
+
+    <androidx.constraintlayout.widget.Group
+        android:id="@+id/scheduledGroup"
+        android:layout_width="wrap_content"
+        android:layout_height="wrap_content"
+        android:visibility="gone"
+        app:constraint_referenced_ids="scheduledTitle,scheduledTime,scheduledCancel,scheduledSeparator" />
+
+    <com.moez.QKSMS.common.widget.QkTextView
+        android:id="@+id/scheduledTitle"
+        android:layout_width="0dp"
+        android:layout_height="wrap_content"
+        android:paddingStart="16dp"
+        android:paddingEnd="16dp"
+        android:text="@string/compose_scheduled_for"
+        android:textColor="?android:attr/textColorPrimary"
+        android:textStyle="bold"
+        app:layout_constraintBottom_toTopOf="@id/scheduledTime"
+        app:layout_constraintEnd_toStartOf="@id/scheduledCancel"
+        app:layout_constraintStart_toStartOf="@id/messageBackground"
+        app:layout_constraintTop_toTopOf="@id/scheduledCancel"
+        app:layout_constraintVertical_chainStyle="packed"
+        app:textSize="secondary" />
+
+    <com.moez.QKSMS.common.widget.QkTextView
+        android:id="@+id/scheduledTime"
+        android:layout_width="0dp"
+        android:layout_height="wrap_content"
+        android:paddingStart="16dp"
+        android:paddingEnd="16dp"
+        android:textColor="?android:attr/textColorTertiary"
+        app:layout_constraintBottom_toBottomOf="@id/scheduledCancel"
+        app:layout_constraintEnd_toStartOf="@id/scheduledCancel"
+        app:layout_constraintStart_toStartOf="@id/messageBackground"
+        app:layout_constraintTop_toBottomOf="@id/scheduledTitle"
+        app:textSize="secondary"
+        tools:text="Decemeber 23rd at 12:00AM" />
+
+    <ImageView
+        android:id="@+id/scheduledCancel"
+        android:layout_width="44dp"
+        android:layout_height="56dp"
+        android:padding="10dp"
+        android:src="@drawable/ic_cancel_black_24dp"
+        android:tint="?android:attr/textColorSecondary"
+        app:layout_constraintBottom_toTopOf="@id/scheduledSeparator"
+        app:layout_constraintEnd_toEndOf="@id/messageBackground" />
+
+    <View
+        android:id="@+id/scheduledSeparator"
+        android:layout_width="0dp"
+        android:layout_height="1dp"
+        android:background="?android:attr/divider"
+        app:layout_constraintBottom_toTopOf="@id/attachments"
+        app:layout_constraintEnd_toEndOf="@id/messageBackground"
+        app:layout_constraintStart_toStartOf="@id/messageBackground" />
+
+    <androidx.recyclerview.widget.RecyclerView
+        android:id="@+id/attachments"
+        android:layout_width="0dp"
+        android:layout_height="wrap_content"
+        android:clipChildren="false"
+        android:clipToPadding="false"
+        android:orientation="horizontal"
+        android:paddingStart="8dp"
+        android:paddingEnd="8dp"
+        app:layoutManager="androidx.recyclerview.widget.LinearLayoutManager"
+        app:layout_constraintBottom_toTopOf="@id/message"
+        app:layout_constraintEnd_toEndOf="@id/messageBackground"
+        app:layout_constraintStart_toStartOf="@id/messageBackground"
+        tools:listitem="@layout/attachment_image_list_item" />
+
+    <com.moez.QKSMS.common.widget.QkEditText
+        android:id="@+id/message"
+        style="@style/TextPrimary"
+        android:layout_width="0dp"
+        android:layout_height="wrap_content"
+        android:layout_weight="1"
+        android:background="@null"
+        android:gravity="center_vertical"
+        android:hint="@string/compose_hint"
+        android:inputType="textLongMessage|textCapSentences|textMultiLine"
+        android:maxLines="6"
+        android:minHeight="44dp"
+        android:paddingStart="16dp"
+        android:paddingTop="12dp"
+        android:paddingEnd="16dp"
+        android:paddingBottom="12dp"
+        android:textColorHint="?android:attr/textColorTertiary"
+        app:layout_constraintBottom_toBottomOf="@id/messageBackground"
+        app:layout_constraintEnd_toStartOf="@id/sim"
+        app:layout_constraintStart_toStartOf="@id/messageBackground" />
+
+    <ImageView
+        android:id="@+id/sim"
+        android:layout_width="44dp"
+        android:layout_height="44dp"
+        android:background="?android:attr/selectableItemBackgroundBorderless"
+        android:contentDescription="@string/compose_sim_cd"
+        android:padding="8dp"
+        android:src="@drawable/ic_sim_card_black_24dp"
+        android:tint="?android:attr/textColorSecondary"
+        android:visibility="gone"
+        app:layout_constraintBottom_toBottomOf="@id/messageBackground"
+        app:layout_constraintEnd_toEndOf="@id/messageBackground" />
+
+    <com.moez.QKSMS.common.widget.QkTextView
+        android:id="@+id/simIndex"
+        android:layout_width="0dp"
+        android:layout_height="0dp"
+        android:gravity="center"
+        android:textColor="?android:attr/textColorPrimaryInverse"
+        android:textSize="14dp"
+        android:textStyle="bold"
+        app:layout_constraintBottom_toBottomOf="@id/sim"
+        app:layout_constraintEnd_toEndOf="@id/sim"
+        app:layout_constraintStart_toStartOf="@id/sim"
+        app:layout_constraintTop_toTopOf="@id/sim"
+        tools:ignore="SpUsage"
+        tools:text="1" />
+
+    <com.moez.QKSMS.common.widget.QkTextView
+        android:id="@+id/counter"
+        android:layout_width="0dp"
+        android:layout_height="wrap_content"
+        android:layout_marginBottom="4dp"
+        android:gravity="center"
+        android:textColor="?android:attr/textColorSecondary"
+        app:layout_constraintBottom_toTopOf="@id/send"
+        app:layout_constraintEnd_toEndOf="@id/send"
+        app:layout_constraintStart_toStartOf="@id/send"
+        app:textSize="tertiary"
+        tools:text="108 / 2" />
+
+    <ImageView
+        android:id="@+id/send"
+        android:layout_width="44dp"
+        android:layout_height="44dp"
+        android:layout_marginEnd="8dp"
+        android:background="?android:attr/selectableItemBackgroundBorderless"
+        android:contentDescription="@string/compose_send_cd"
+        android:padding="10dp"
+        android:src="@drawable/ic_send_black_24dp"
+        android:tint="?android:textColorSecondary"
+        app:layout_constraintBottom_toBottomOf="@id/messageBackground"
+        app:layout_constraintEnd_toEndOf="parent" />
+
+    <androidx.appcompat.widget.Toolbar
+        android:id="@+id/toolbar"
+        style="@style/Toolbar"
+        android:layout_width="match_parent"
+        android:layout_height="wrap_content"
+        android:gravity="center_vertical"
+        app:layout_constrainedHeight="true"
+        app:layout_constraintHeight_max="140dp"
+        app:layout_constraintTop_toTopOf="parent">
+
+        <LinearLayout
+            android:layout_width="match_parent"
+            android:layout_height="match_parent"
+            android:gravity="center_vertical"
+            android:orientation="vertical">
+
+            <com.moez.QKSMS.common.widget.QkTextView
+                android:id="@+id/toolbarTitle"
+                style="@style/ToolbarText"
+                android:layout_height="wrap_content"
+                tools:text="Moez Bhatti" />
+
+            <com.moez.QKSMS.common.widget.QkTextView
+                android:id="@+id/toolbarSubtitle"
+                style="@style/ToolbarText"
+                android:textColor="?android:attr/textColorTertiary"
+                android:visibility="gone"
+                app:textSize="secondary"
+                tools:text="3 of 9 results" />
+
+            <androidx.recyclerview.widget.RecyclerView
+                android:id="@+id/chips"
+                android:layout_width="match_parent"
+                android:layout_height="wrap_content"
+                android:layout_marginTop="4dp"
+                android:layout_marginBottom="4dp"
+                android:scrollbars="vertical"
+                tools:visibility="gone" />
+
+        </LinearLayout>
+
+    </androidx.appcompat.widget.Toolbar>
+
+    <View
+        android:layout_width="match_parent"
+        android:layout_height="8dp"
+        android:background="@drawable/ab_shadow"
+        app:layout_constraintTop_toBottomOf="@id/toolbar" />
+
+    <View
+        android:layout_width="match_parent"
+        android:layout_height="1dp"
+        android:background="?android:attr/divider"
+        app:layout_constraintBottom_toBottomOf="parent" />
+
+    <androidx.constraintlayout.widget.Group
+        android:id="@+id/attaching"
+        android:layout_width="wrap_content"
+        android:layout_height="wrap_content"
+        android:visibility="gone"
+        app:constraint_referenced_ids="contact,contactLabel,schedule,scheduleLabel,gallery,galleryLabel,camera,cameraLabel,attachingBackground" />
+
+    <View
+        android:id="@+id/attachingBackground"
+        android:layout_width="0dp"
+        android:layout_height="0dp"
+        android:background="#44000000"
+        android:elevation="4dp"
+        app:layout_constraintBottom_toBottomOf="parent"
+        app:layout_constraintEnd_toEndOf="parent"
+        app:layout_constraintStart_toStartOf="parent"
+        app:layout_constraintTop_toTopOf="parent" />
+
+    <ImageView
+        android:id="@+id/contact"
+        android:layout_width="40dp"
+        android:layout_height="40dp"
+        android:layout_marginBottom="12dp"
+        android:background="@drawable/circle"
+        android:backgroundTint="?attr/bubbleColor"
+        android:contentDescription="@string/compose_contact_cd"
+        android:elevation="4dp"
+        android:padding="10dp"
+        android:src="@drawable/ic_person_black_24dp"
+        android:tint="?android:attr/textColorSecondary"
+        android:visibility="visible"
+        app:layout_constraintBottom_toTopOf="@id/schedule"
+        app:layout_constraintEnd_toEndOf="@id/attach"
+        app:layout_constraintStart_toStartOf="@id/attach" />
+
+    <com.moez.QKSMS.common.widget.QkTextView
+        android:id="@+id/contactLabel"
+        android:layout_width="wrap_content"
+        android:layout_height="32dp"
+        android:layout_marginStart="8dp"
+        android:background="@drawable/rounded_rectangle_4dp"
+        android:backgroundTint="?attr/bubbleColor"
+        android:elevation="4dp"
+        android:gravity="center_vertical"
+        android:paddingStart="8dp"
+        android:paddingEnd="8dp"
+        android:text="@string/compose_contact_cd"
+        android:textColor="?android:attr/textColorPrimary"
+        app:layout_constraintBottom_toBottomOf="@id/contact"
+        app:layout_constraintStart_toEndOf="@id/contact"
+        app:layout_constraintTop_toTopOf="@id/contact" />
+
+    <ImageView
+        android:id="@+id/schedule"
+        android:layout_width="40dp"
+        android:layout_height="40dp"
+        android:layout_marginBottom="12dp"
+        android:background="@drawable/circle"
+        android:backgroundTint="?attr/bubbleColor"
+        android:contentDescription="@string/compose_schedule_cd"
+        android:elevation="4dp"
+        android:padding="10dp"
+        android:src="@drawable/ic_event_black_24dp"
+        android:tint="?android:attr/textColorSecondary"
+        android:visibility="visible"
+        app:layout_constraintBottom_toTopOf="@id/gallery"
+        app:layout_constraintEnd_toEndOf="@id/attach"
+        app:layout_constraintStart_toStartOf="@id/attach" />
+
+    <com.moez.QKSMS.common.widget.QkTextView
+        android:id="@+id/scheduleLabel"
+        android:layout_width="wrap_content"
+        android:layout_height="32dp"
+        android:layout_marginStart="8dp"
+        android:background="@drawable/rounded_rectangle_4dp"
+        android:backgroundTint="?attr/bubbleColor"
+        android:elevation="4dp"
+        android:gravity="center_vertical"
+        android:paddingStart="8dp"
+        android:paddingEnd="8dp"
+        android:text="@string/compose_schedule_cd"
+        android:textColor="?android:attr/textColorPrimary"
+        app:layout_constraintBottom_toBottomOf="@id/schedule"
+        app:layout_constraintStart_toEndOf="@id/schedule"
+        app:layout_constraintTop_toTopOf="@id/schedule" />
+
+    <ImageView
+        android:id="@+id/gallery"
+        android:layout_width="40dp"
+        android:layout_height="40dp"
+        android:layout_marginBottom="12dp"
+        android:background="@drawable/circle"
+        android:backgroundTint="?attr/bubbleColor"
+        android:contentDescription="@string/compose_gallery_cd"
+        android:elevation="4dp"
+        android:padding="10dp"
+        android:src="@drawable/ic_insert_photo_black_24dp"
+        android:tint="?android:attr/textColorSecondary"
+        android:visibility="visible"
+        app:layout_constraintBottom_toTopOf="@id/camera"
+        app:layout_constraintEnd_toEndOf="@id/attach"
+        app:layout_constraintStart_toStartOf="@id/attach" />
+
+    <com.moez.QKSMS.common.widget.QkTextView
+        android:id="@+id/galleryLabel"
+        android:layout_width="wrap_content"
+        android:layout_height="32dp"
+        android:layout_marginStart="8dp"
+        android:background="@drawable/rounded_rectangle_4dp"
+        android:backgroundTint="?attr/bubbleColor"
+        android:elevation="4dp"
+        android:gravity="center_vertical"
+        android:paddingStart="8dp"
+        android:paddingEnd="8dp"
+        android:text="@string/compose_gallery_cd"
+        android:textColor="?android:attr/textColorPrimary"
+        app:layout_constraintBottom_toBottomOf="@id/gallery"
+        app:layout_constraintStart_toEndOf="@id/gallery"
+        app:layout_constraintTop_toTopOf="@id/gallery" />
+
+    <ImageView
+        android:id="@+id/camera"
+        android:layout_width="40dp"
+        android:layout_height="40dp"
+        android:layout_marginBottom="16dp"
+        android:background="@drawable/circle"
+        android:backgroundTint="?attr/bubbleColor"
+        android:contentDescription="@string/compose_camera_cd"
+        android:elevation="4dp"
+        android:padding="10dp"
+        android:src="@drawable/ic_camera_alt_black_24dp"
+        android:tint="?android:attr/textColorSecondary"
+        android:visibility="visible"
+        app:layout_constraintBottom_toTopOf="@id/attach"
+        app:layout_constraintEnd_toEndOf="@id/attach"
+        app:layout_constraintStart_toStartOf="@id/attach" />
+
+    <com.moez.QKSMS.common.widget.QkTextView
+        android:id="@+id/cameraLabel"
+        android:layout_width="wrap_content"
+        android:layout_height="32dp"
+        android:layout_marginStart="8dp"
+        android:background="@drawable/rounded_rectangle_4dp"
+        android:backgroundTint="?attr/bubbleColor"
+        android:elevation="4dp"
+        android:gravity="center_vertical"
+        android:paddingStart="8dp"
+        android:paddingEnd="8dp"
+        android:text="@string/compose_camera_cd"
+        android:textColor="?android:attr/textColorPrimary"
+        app:layout_constraintBottom_toBottomOf="@id/camera"
+        app:layout_constraintStart_toEndOf="@id/gallery"
+        app:layout_constraintTop_toTopOf="@id/camera" />
+
+    <ImageView
+        android:id="@+id/attach"
+        android:layout_width="44dp"
+        android:layout_height="44dp"
+        android:layout_marginStart="12dp"
+        android:background="@drawable/circle"
+        android:contentDescription="@string/compose_attach_cd"
+        android:elevation="4dp"
+        android:padding="10dp"
+        android:src="@drawable/ic_add_black_24dp"
+        app:layout_constraintBottom_toBottomOf="@id/messageBackground"
+        app:layout_constraintStart_toStartOf="parent"
+        tools:backgroundTint="@color/tools_theme"
+        tools:tint="@color/textPrimaryDark" />
+
 </androidx.constraintlayout.widget.ConstraintLayout>
\ No newline at end of file
diff --git a/presentation/src/main/res/layout/contact_chip.xml b/presentation/src/main/res/layout/contact_chip.xml
index 6627a4434..1cf28db70 100755
--- a/presentation/src/main/res/layout/contact_chip.xml
+++ b/presentation/src/main/res/layout/contact_chip.xml
@@ -1,55 +1,55 @@
-<?xml version="1.0" encoding="utf-8"?>
-<!--
-  ~ Copyright (C) 2019 Moez Bhatti <moez.bhatti@gmail.com>
-  ~
-  ~ This file is part of QKSMS.
-  ~
-  ~ QKSMS is free software: you can redistribute it and/or modify
-  ~ it under the terms of the GNU General Public License as published by
-  ~ the Free Software Foundation, either version 3 of the License, or
-  ~ (at your option) any later version.
-  ~
-  ~ QKSMS is distributed in the hope that it will be useful,
-  ~ but WITHOUT ANY WARRANTY; without even the implied warranty of
-  ~ MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
-  ~ GNU General Public License for more details.
-  ~
-  ~ You should have received a copy of the GNU General Public License
-  ~ along with QKSMS.  If not, see <http://www.gnu.org/licenses/>.
-  -->
-<RelativeLayout xmlns:android="http://schemas.android.com/apk/res/android"
-    xmlns:app="http://schemas.android.com/apk/res-auto"
-    xmlns:tools="http://schemas.android.com/tools"
-    android:id="@+id/container"
-    android:layout_width="wrap_content"
-    android:layout_height="wrap_content">
-
-    <LinearLayout
-        android:id="@+id/content"
-        android:layout_width="wrap_content"
-        android:layout_height="36dp"
-        android:layout_margin="4dp"
-        android:background="@drawable/chip_background"
-        android:backgroundTint="?attr/bubbleColor"
-        android:orientation="horizontal">
-
-        <com.moez.QKSMS.common.widget.AvatarView
-            android:id="@+id/avatar"
-            android:layout_width="36dp"
-            android:layout_height="36dp" />
-
-        <com.moez.QKSMS.common.widget.QkTextView
-            android:id="@+id/name"
-            android:layout_width="wrap_content"
-            android:layout_height="wrap_content"
-            android:layout_gravity="center_vertical"
-            android:layout_marginLeft="8dp"
-            android:layout_marginRight="12dp"
-            android:textColor="?android:attr/textColorPrimary"
-            android:textStyle="bold"
-            app:textSize="secondary"
-            tools:text="Moez Bhatti" />
-
-    </LinearLayout>
-
+<?xml version="1.0" encoding="utf-8"?>
+<!--
+  ~ Copyright (C) 2019 Moez Bhatti <moez.bhatti@gmail.com>
+  ~
+  ~ This file is part of QKSMS.
+  ~
+  ~ QKSMS is free software: you can redistribute it and/or modify
+  ~ it under the terms of the GNU General Public License as published by
+  ~ the Free Software Foundation, either version 3 of the License, or
+  ~ (at your option) any later version.
+  ~
+  ~ QKSMS is distributed in the hope that it will be useful,
+  ~ but WITHOUT ANY WARRANTY; without even the implied warranty of
+  ~ MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+  ~ GNU General Public License for more details.
+  ~
+  ~ You should have received a copy of the GNU General Public License
+  ~ along with QKSMS.  If not, see <http://www.gnu.org/licenses/>.
+  -->
+<RelativeLayout xmlns:android="http://schemas.android.com/apk/res/android"
+    xmlns:app="http://schemas.android.com/apk/res-auto"
+    xmlns:tools="http://schemas.android.com/tools"
+    android:id="@+id/container"
+    android:layout_width="wrap_content"
+    android:layout_height="wrap_content">
+
+    <LinearLayout
+        android:id="@+id/content"
+        android:layout_width="wrap_content"
+        android:layout_height="36dp"
+        android:layout_margin="4dp"
+        android:background="@drawable/chip_background"
+        android:backgroundTint="?attr/bubbleColor"
+        android:orientation="horizontal">
+
+        <com.moez.QKSMS.common.widget.AvatarView
+            android:id="@+id/avatar"
+            android:layout_width="36dp"
+            android:layout_height="36dp" />
+
+        <com.moez.QKSMS.common.widget.QkTextView
+            android:id="@+id/name"
+            android:layout_width="wrap_content"
+            android:layout_height="wrap_content"
+            android:layout_gravity="center_vertical"
+            android:layout_marginLeft="8dp"
+            android:layout_marginRight="12dp"
+            android:textColor="?android:attr/textColorPrimary"
+            android:textStyle="bold"
+            app:textSize="secondary"
+            tools:text="Moez Bhatti" />
+
+    </LinearLayout>
+
 </RelativeLayout>
\ No newline at end of file
diff --git a/presentation/src/main/res/layout/contact_chip_detailed.xml b/presentation/src/main/res/layout/contact_chip_detailed.xml
index 786e160fd..e49335fab 100755
--- a/presentation/src/main/res/layout/contact_chip_detailed.xml
+++ b/presentation/src/main/res/layout/contact_chip_detailed.xml
@@ -1,87 +1,87 @@
-<?xml version="1.0" encoding="utf-8"?>
-<!--
-  ~ Copyright (C) 2019 Moez Bhatti <moez.bhatti@gmail.com>
-  ~
-  ~ This file is part of QKSMS.
-  ~
-  ~ QKSMS is free software: you can redistribute it and/or modify
-  ~ it under the terms of the GNU General Public License as published by
-  ~ the Free Software Foundation, either version 3 of the License, or
-  ~ (at your option) any later version.
-  ~
-  ~ QKSMS is distributed in the hope that it will be useful,
-  ~ but WITHOUT ANY WARRANTY; without even the implied warranty of
-  ~ MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
-  ~ GNU General Public License for more details.
-  ~
-  ~ You should have received a copy of the GNU General Public License
-  ~ along with QKSMS.  If not, see <http://www.gnu.org/licenses/>.
-  -->
-<androidx.constraintlayout.widget.ConstraintLayout xmlns:android="http://schemas.android.com/apk/res/android"
-    xmlns:app="http://schemas.android.com/apk/res-auto"
-    xmlns:tools="http://schemas.android.com/tools"
-    android:id="@+id/card"
-    android:layout_width="match_parent"
-    android:layout_height="wrap_content"
-    android:layout_margin="8dp"
-    android:background="@drawable/rounded_rectangle_2dp"
-    android:elevation="8dp"
-    android:gravity="center_vertical"
-    android:paddingStart="16dp"
-    android:paddingTop="8dp"
-    android:paddingBottom="8dp"
-    tools:backgroundTint="@color/tools_theme">
-
-    <com.moez.QKSMS.common.widget.AvatarView
-        android:id="@+id/avatar"
-        android:layout_width="40dp"
-        android:layout_height="40dp"
-        app:layout_constraintBottom_toBottomOf="parent"
-        app:layout_constraintStart_toStartOf="parent"
-        app:layout_constraintTop_toTopOf="parent" />
-
-    <com.moez.QKSMS.common.widget.QkTextView
-        android:id="@+id/name"
-        android:layout_width="0dp"
-        android:layout_height="wrap_content"
-        android:layout_marginStart="16dp"
-        android:ellipsize="end"
-        android:maxLines="1"
-        android:scrollHorizontally="true"
-        app:layout_constraintBottom_toTopOf="@id/info"
-        app:layout_constraintEnd_toStartOf="@id/delete"
-        app:layout_constraintHorizontal_bias="0"
-        app:layout_constraintStart_toEndOf="@id/avatar"
-        app:layout_constraintTop_toTopOf="parent"
-        app:layout_constraintVertical_chainStyle="packed"
-        app:textSize="primary"
-        tools:text="Moez Bhatti"
-        tools:textColor="@color/textPrimaryDark" />
-
-    <com.moez.QKSMS.common.widget.QkTextView
-        android:id="@+id/info"
-        android:layout_width="0dp"
-        android:layout_height="wrap_content"
-        android:layout_marginTop="2dp"
-        android:ellipsize="end"
-        android:maxLines="1"
-        android:scrollHorizontally="true"
-        app:layout_constraintBottom_toBottomOf="parent"
-        app:layout_constraintEnd_toEndOf="@id/name"
-        app:layout_constraintStart_toStartOf="@id/name"
-        app:layout_constraintTop_toBottomOf="@id/name"
-        app:textSize="secondary"
-        tools:text="(123) 456-7890"
-        tools:textColor="@color/textTertiaryDark" />
-
-    <ImageView
-        android:id="@+id/delete"
-        android:layout_width="56dp"
-        android:layout_height="56dp"
-        android:background="?attr/selectableItemBackground"
-        android:padding="16dp"
-        android:src="@drawable/ic_cancel_black_24dp"
-        app:layout_constraintEnd_toEndOf="parent"
-        tools:tint="@color/white" />
-
+<?xml version="1.0" encoding="utf-8"?>
+<!--
+  ~ Copyright (C) 2019 Moez Bhatti <moez.bhatti@gmail.com>
+  ~
+  ~ This file is part of QKSMS.
+  ~
+  ~ QKSMS is free software: you can redistribute it and/or modify
+  ~ it under the terms of the GNU General Public License as published by
+  ~ the Free Software Foundation, either version 3 of the License, or
+  ~ (at your option) any later version.
+  ~
+  ~ QKSMS is distributed in the hope that it will be useful,
+  ~ but WITHOUT ANY WARRANTY; without even the implied warranty of
+  ~ MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+  ~ GNU General Public License for more details.
+  ~
+  ~ You should have received a copy of the GNU General Public License
+  ~ along with QKSMS.  If not, see <http://www.gnu.org/licenses/>.
+  -->
+<androidx.constraintlayout.widget.ConstraintLayout xmlns:android="http://schemas.android.com/apk/res/android"
+    xmlns:app="http://schemas.android.com/apk/res-auto"
+    xmlns:tools="http://schemas.android.com/tools"
+    android:id="@+id/card"
+    android:layout_width="match_parent"
+    android:layout_height="wrap_content"
+    android:layout_margin="8dp"
+    android:background="@drawable/rounded_rectangle_2dp"
+    android:elevation="8dp"
+    android:gravity="center_vertical"
+    android:paddingStart="16dp"
+    android:paddingTop="8dp"
+    android:paddingBottom="8dp"
+    tools:backgroundTint="@color/tools_theme">
+
+    <com.moez.QKSMS.common.widget.AvatarView
+        android:id="@+id/avatar"
+        android:layout_width="40dp"
+        android:layout_height="40dp"
+        app:layout_constraintBottom_toBottomOf="parent"
+        app:layout_constraintStart_toStartOf="parent"
+        app:layout_constraintTop_toTopOf="parent" />
+
+    <com.moez.QKSMS.common.widget.QkTextView
+        android:id="@+id/name"
+        android:layout_width="0dp"
+        android:layout_height="wrap_content"
+        android:layout_marginStart="16dp"
+        android:ellipsize="end"
+        android:maxLines="1"
+        android:scrollHorizontally="true"
+        app:layout_constraintBottom_toTopOf="@id/info"
+        app:layout_constraintEnd_toStartOf="@id/delete"
+        app:layout_constraintHorizontal_bias="0"
+        app:layout_constraintStart_toEndOf="@id/avatar"
+        app:layout_constraintTop_toTopOf="parent"
+        app:layout_constraintVertical_chainStyle="packed"
+        app:textSize="primary"
+        tools:text="Moez Bhatti"
+        tools:textColor="@color/textPrimaryDark" />
+
+    <com.moez.QKSMS.common.widget.QkTextView
+        android:id="@+id/info"
+        android:layout_width="0dp"
+        android:layout_height="wrap_content"
+        android:layout_marginTop="2dp"
+        android:ellipsize="end"
+        android:maxLines="1"
+        android:scrollHorizontally="true"
+        app:layout_constraintBottom_toBottomOf="parent"
+        app:layout_constraintEnd_toEndOf="@id/name"
+        app:layout_constraintStart_toStartOf="@id/name"
+        app:layout_constraintTop_toBottomOf="@id/name"
+        app:textSize="secondary"
+        tools:text="(123) 456-7890"
+        tools:textColor="@color/textTertiaryDark" />
+
+    <ImageView
+        android:id="@+id/delete"
+        android:layout_width="56dp"
+        android:layout_height="56dp"
+        android:background="?attr/selectableItemBackground"
+        android:padding="16dp"
+        android:src="@drawable/ic_cancel_black_24dp"
+        app:layout_constraintEnd_toEndOf="parent"
+        tools:tint="@color/white" />
+
 </androidx.constraintlayout.widget.ConstraintLayout>
\ No newline at end of file
diff --git a/presentation/src/main/res/layout/contact_list_item.xml b/presentation/src/main/res/layout/contact_list_item.xml
index e35f9e032..bfda61c5c 100644
--- a/presentation/src/main/res/layout/contact_list_item.xml
+++ b/presentation/src/main/res/layout/contact_list_item.xml
@@ -1,110 +1,110 @@
-<?xml version="1.0" encoding="utf-8"?>
-<!--
-  ~ Copyright (C) 2019 Moez Bhatti <moez.bhatti@gmail.com>
-  ~
-  ~ This file is part of QKSMS.
-  ~
-  ~ QKSMS is free software: you can redistribute it and/or modify
-  ~ it under the terms of the GNU General Public License as published by
-  ~ the Free Software Foundation, either version 3 of the License, or
-  ~ (at your option) any later version.
-  ~
-  ~ QKSMS is distributed in the hope that it will be useful,
-  ~ but WITHOUT ANY WARRANTY; without even the implied warranty of
-  ~ MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
-  ~ GNU General Public License for more details.
-  ~
-  ~ You should have received a copy of the GNU General Public License
-  ~ along with QKSMS.  If not, see <http://www.gnu.org/licenses/>.
-  -->
-<androidx.constraintlayout.widget.ConstraintLayout xmlns:android="http://schemas.android.com/apk/res/android"
-    xmlns:app="http://schemas.android.com/apk/res-auto"
-    xmlns:tools="http://schemas.android.com/tools"
-    android:layout_width="match_parent"
-    android:layout_height="wrap_content"
-    android:background="?attr/selectableItemBackground">
-
-    <com.moez.QKSMS.common.widget.QkTextView
-        android:id="@+id/index"
-        android:layout_width="24dp"
-        android:layout_height="wrap_content"
-        android:layout_marginStart="16dp"
-        android:gravity="center_horizontal"
-        android:maxLength="1"
-        android:textStyle="bold"
-        android:visibility="invisible"
-        app:layout_constraintBottom_toBottomOf="@id/avatar"
-        app:layout_constraintStart_toStartOf="parent"
-        app:layout_constraintTop_toTopOf="@id/avatar"
-        app:textColor="theme"
-        app:textSize="primary"
-        tools:text="M"
-        tools:visibility="visible" />
-
-    <androidx.appcompat.widget.AppCompatImageView
-        android:id="@+id/icon"
-        android:layout_width="24dp"
-        android:layout_height="24dp"
-        android:layout_marginStart="16dp"
-        android:visibility="invisible"
-        app:layout_constraintBottom_toBottomOf="@id/avatar"
-        app:layout_constraintStart_toStartOf="parent"
-        app:layout_constraintTop_toTopOf="@id/avatar" />
-
-    <com.moez.QKSMS.common.widget.GroupAvatarView
-        android:id="@+id/avatar"
-        android:layout_width="48dp"
-        android:layout_height="48dp"
-        android:layout_marginStart="68dp"
-        android:layout_marginTop="4dp"
-        android:layout_marginBottom="4dp"
-        app:layout_constraintBottom_toBottomOf="parent"
-        app:layout_constraintStart_toStartOf="parent"
-        app:layout_constraintTop_toTopOf="parent"
-        app:layout_constraintVertical_bias="0" />
-
-    <com.moez.QKSMS.common.widget.QkTextView
-        android:id="@+id/title"
-        style="@style/TextPrimary"
-        android:layout_width="0dp"
-        android:layout_height="wrap_content"
-        android:layout_marginStart="12dp"
-        android:layout_marginTop="8dp"
-        android:layout_marginEnd="16dp"
-        android:textStyle="bold"
-        app:layout_constraintBottom_toTopOf="@id/subtitle"
-        app:layout_constraintEnd_toEndOf="parent"
-        app:layout_constraintHorizontal_bias="0"
-        app:layout_constraintStart_toEndOf="@id/avatar"
-        app:layout_constraintTop_toTopOf="parent"
-        app:layout_constraintVertical_chainStyle="packed"
-        tools:text="Moez Bhatti" />
-
-    <com.moez.QKSMS.common.widget.QkTextView
-        android:id="@+id/subtitle"
-        android:layout_width="0dp"
-        android:layout_height="wrap_content"
-        android:layout_marginTop="2dp"
-        android:ellipsize="end"
-        android:lines="1"
-        android:textColor="?android:attr/textColorTertiary"
-        app:layout_constraintBottom_toTopOf="@id/numbers"
-        app:layout_constraintEnd_toEndOf="@id/title"
-        app:layout_constraintStart_toStartOf="@id/title"
-        app:layout_constraintTop_toBottomOf="@id/title"
-        app:textSize="secondary"
-        tools:text="Moez Bhatti" />
-
-    <androidx.recyclerview.widget.RecyclerView
-        android:id="@+id/numbers"
-        android:layout_width="0dp"
-        android:layout_height="wrap_content"
-        android:layout_marginBottom="8dp"
-        app:layoutManager="androidx.recyclerview.widget.LinearLayoutManager"
-        app:layout_constraintBottom_toBottomOf="parent"
-        app:layout_constraintEnd_toEndOf="@id/title"
-        app:layout_constraintStart_toStartOf="@id/title"
-        app:layout_constraintTop_toBottomOf="@id/subtitle"
-        tools:listitem="@layout/contact_number_list_item" />
-
+<?xml version="1.0" encoding="utf-8"?>
+<!--
+  ~ Copyright (C) 2019 Moez Bhatti <moez.bhatti@gmail.com>
+  ~
+  ~ This file is part of QKSMS.
+  ~
+  ~ QKSMS is free software: you can redistribute it and/or modify
+  ~ it under the terms of the GNU General Public License as published by
+  ~ the Free Software Foundation, either version 3 of the License, or
+  ~ (at your option) any later version.
+  ~
+  ~ QKSMS is distributed in the hope that it will be useful,
+  ~ but WITHOUT ANY WARRANTY; without even the implied warranty of
+  ~ MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+  ~ GNU General Public License for more details.
+  ~
+  ~ You should have received a copy of the GNU General Public License
+  ~ along with QKSMS.  If not, see <http://www.gnu.org/licenses/>.
+  -->
+<androidx.constraintlayout.widget.ConstraintLayout xmlns:android="http://schemas.android.com/apk/res/android"
+    xmlns:app="http://schemas.android.com/apk/res-auto"
+    xmlns:tools="http://schemas.android.com/tools"
+    android:layout_width="match_parent"
+    android:layout_height="wrap_content"
+    android:background="?attr/selectableItemBackground">
+
+    <com.moez.QKSMS.common.widget.QkTextView
+        android:id="@+id/index"
+        android:layout_width="24dp"
+        android:layout_height="wrap_content"
+        android:layout_marginStart="16dp"
+        android:gravity="center_horizontal"
+        android:maxLength="1"
+        android:textStyle="bold"
+        android:visibility="invisible"
+        app:layout_constraintBottom_toBottomOf="@id/avatar"
+        app:layout_constraintStart_toStartOf="parent"
+        app:layout_constraintTop_toTopOf="@id/avatar"
+        app:textColor="theme"
+        app:textSize="primary"
+        tools:text="M"
+        tools:visibility="visible" />
+
+    <androidx.appcompat.widget.AppCompatImageView
+        android:id="@+id/icon"
+        android:layout_width="24dp"
+        android:layout_height="24dp"
+        android:layout_marginStart="16dp"
+        android:visibility="invisible"
+        app:layout_constraintBottom_toBottomOf="@id/avatar"
+        app:layout_constraintStart_toStartOf="parent"
+        app:layout_constraintTop_toTopOf="@id/avatar" />
+
+    <com.moez.QKSMS.common.widget.GroupAvatarView
+        android:id="@+id/avatar"
+        android:layout_width="48dp"
+        android:layout_height="48dp"
+        android:layout_marginStart="68dp"
+        android:layout_marginTop="4dp"
+        android:layout_marginBottom="4dp"
+        app:layout_constraintBottom_toBottomOf="parent"
+        app:layout_constraintStart_toStartOf="parent"
+        app:layout_constraintTop_toTopOf="parent"
+        app:layout_constraintVertical_bias="0" />
+
+    <com.moez.QKSMS.common.widget.QkTextView
+        android:id="@+id/title"
+        style="@style/TextPrimary"
+        android:layout_width="0dp"
+        android:layout_height="wrap_content"
+        android:layout_marginStart="12dp"
+        android:layout_marginTop="8dp"
+        android:layout_marginEnd="16dp"
+        android:textStyle="bold"
+        app:layout_constraintBottom_toTopOf="@id/subtitle"
+        app:layout_constraintEnd_toEndOf="parent"
+        app:layout_constraintHorizontal_bias="0"
+        app:layout_constraintStart_toEndOf="@id/avatar"
+        app:layout_constraintTop_toTopOf="parent"
+        app:layout_constraintVertical_chainStyle="packed"
+        tools:text="Moez Bhatti" />
+
+    <com.moez.QKSMS.common.widget.QkTextView
+        android:id="@+id/subtitle"
+        android:layout_width="0dp"
+        android:layout_height="wrap_content"
+        android:layout_marginTop="2dp"
+        android:ellipsize="end"
+        android:lines="1"
+        android:textColor="?android:attr/textColorTertiary"
+        app:layout_constraintBottom_toTopOf="@id/numbers"
+        app:layout_constraintEnd_toEndOf="@id/title"
+        app:layout_constraintStart_toStartOf="@id/title"
+        app:layout_constraintTop_toBottomOf="@id/title"
+        app:textSize="secondary"
+        tools:text="Moez Bhatti" />
+
+    <androidx.recyclerview.widget.RecyclerView
+        android:id="@+id/numbers"
+        android:layout_width="0dp"
+        android:layout_height="wrap_content"
+        android:layout_marginBottom="8dp"
+        app:layoutManager="androidx.recyclerview.widget.LinearLayoutManager"
+        app:layout_constraintBottom_toBottomOf="parent"
+        app:layout_constraintEnd_toEndOf="@id/title"
+        app:layout_constraintStart_toStartOf="@id/title"
+        app:layout_constraintTop_toBottomOf="@id/subtitle"
+        tools:listitem="@layout/contact_number_list_item" />
+
 </androidx.constraintlayout.widget.ConstraintLayout>
\ No newline at end of file
diff --git a/presentation/src/main/res/layout/contact_number_list_item.xml b/presentation/src/main/res/layout/contact_number_list_item.xml
index 0ea6fab36..f47f5e3a6 100644
--- a/presentation/src/main/res/layout/contact_number_list_item.xml
+++ b/presentation/src/main/res/layout/contact_number_list_item.xml
@@ -1,48 +1,48 @@
-<?xml version="1.0" encoding="utf-8"?>
-<!--
-  ~ Copyright (C) 2019 Moez Bhatti <moez.bhatti@gmail.com>
-  ~
-  ~ This file is part of QKSMS.
-  ~
-  ~ QKSMS is free software: you can redistribute it and/or modify
-  ~ it under the terms of the GNU General Public License as published by
-  ~ the Free Software Foundation, either version 3 of the License, or
-  ~ (at your option) any later version.
-  ~
-  ~ QKSMS is distributed in the hope that it will be useful,
-  ~ but WITHOUT ANY WARRANTY; without even the implied warranty of
-  ~ MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
-  ~ GNU General Public License for more details.
-  ~
-  ~ You should have received a copy of the GNU General Public License
-  ~ along with QKSMS.  If not, see <http://www.gnu.org/licenses/>.
-  -->
-<LinearLayout xmlns:android="http://schemas.android.com/apk/res/android"
-    xmlns:app="http://schemas.android.com/apk/res-auto"
-    xmlns:tools="http://schemas.android.com/tools"
-    android:layout_width="match_parent"
-    android:layout_height="wrap_content"
-    android:paddingTop="2dp">
-
-    <com.moez.QKSMS.common.widget.QkTextView
-        android:id="@+id/type"
-        android:layout_width="wrap_content"
-        android:layout_height="wrap_content"
-        android:gravity="center_vertical"
-        android:textColor="?android:attr/textColorTertiary"
-        android:textStyle="bold"
-        app:textSize="secondary"
-        tools:text="Mobile" />
-
-    <com.moez.QKSMS.common.widget.QkTextView
-        android:id="@+id/address"
-        android:layout_width="0dp"
-        android:layout_height="wrap_content"
-        android:layout_marginStart="8dp"
-        android:layout_weight="1"
-        android:gravity="center_vertical"
-        android:textColor="?android:attr/textColorTertiary"
-        app:textSize="secondary"
-        tools:text="(123) 456-7890" />
-
+<?xml version="1.0" encoding="utf-8"?>
+<!--
+  ~ Copyright (C) 2019 Moez Bhatti <moez.bhatti@gmail.com>
+  ~
+  ~ This file is part of QKSMS.
+  ~
+  ~ QKSMS is free software: you can redistribute it and/or modify
+  ~ it under the terms of the GNU General Public License as published by
+  ~ the Free Software Foundation, either version 3 of the License, or
+  ~ (at your option) any later version.
+  ~
+  ~ QKSMS is distributed in the hope that it will be useful,
+  ~ but WITHOUT ANY WARRANTY; without even the implied warranty of
+  ~ MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+  ~ GNU General Public License for more details.
+  ~
+  ~ You should have received a copy of the GNU General Public License
+  ~ along with QKSMS.  If not, see <http://www.gnu.org/licenses/>.
+  -->
+<LinearLayout xmlns:android="http://schemas.android.com/apk/res/android"
+    xmlns:app="http://schemas.android.com/apk/res-auto"
+    xmlns:tools="http://schemas.android.com/tools"
+    android:layout_width="match_parent"
+    android:layout_height="wrap_content"
+    android:paddingTop="2dp">
+
+    <com.moez.QKSMS.common.widget.QkTextView
+        android:id="@+id/type"
+        android:layout_width="wrap_content"
+        android:layout_height="wrap_content"
+        android:gravity="center_vertical"
+        android:textColor="?android:attr/textColorTertiary"
+        android:textStyle="bold"
+        app:textSize="secondary"
+        tools:text="Mobile" />
+
+    <com.moez.QKSMS.common.widget.QkTextView
+        android:id="@+id/address"
+        android:layout_width="0dp"
+        android:layout_height="wrap_content"
+        android:layout_marginStart="8dp"
+        android:layout_weight="1"
+        android:gravity="center_vertical"
+        android:textColor="?android:attr/textColorTertiary"
+        app:textSize="secondary"
+        tools:text="(123) 456-7890" />
+
 </LinearLayout>
\ No newline at end of file
diff --git a/presentation/src/main/res/layout/contacts_activity.xml b/presentation/src/main/res/layout/contacts_activity.xml
index 3ded424f1..a285aea75 100644
--- a/presentation/src/main/res/layout/contacts_activity.xml
+++ b/presentation/src/main/res/layout/contacts_activity.xml
@@ -1,106 +1,106 @@
-<?xml version="1.0" encoding="utf-8"?>
-<!--
-  ~ Copyright (C) 2019 Moez Bhatti <moez.bhatti@gmail.com>
-  ~
-  ~ This file is part of QKSMS.
-  ~
-  ~ QKSMS is free software: you can redistribute it and/or modify
-  ~ it under the terms of the GNU General Public License as published by
-  ~ the Free Software Foundation, either version 3 of the License, or
-  ~ (at your option) any later version.
-  ~
-  ~ QKSMS is distributed in the hope that it will be useful,
-  ~ but WITHOUT ANY WARRANTY; without even the implied warranty of
-  ~ MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
-  ~ GNU General Public License for more details.
-  ~
-  ~ You should have received a copy of the GNU General Public License
-  ~ along with QKSMS.  If not, see <http://www.gnu.org/licenses/>.
-  -->
-<androidx.constraintlayout.widget.ConstraintLayout xmlns:android="http://schemas.android.com/apk/res/android"
-    xmlns:app="http://schemas.android.com/apk/res-auto"
-    xmlns:tools="http://schemas.android.com/tools"
-    android:id="@+id/contentView"
-    android:layout_width="match_parent"
-    android:layout_height="match_parent"
-    android:orientation="vertical"
-    tools:context="com.moez.QKSMS.feature.compose.ComposeActivity">
-
-    <androidx.recyclerview.widget.RecyclerView
-        android:id="@+id/contacts"
-        android:layout_width="0dp"
-        android:layout_height="0dp"
-        android:background="?android:attr/windowBackground"
-        android:clipChildren="false"
-        android:clipToPadding="false"
-        android:paddingTop="8dp"
-        android:paddingBottom="8dp"
-        app:layoutManager="androidx.recyclerview.widget.LinearLayoutManager"
-        app:layout_constraintBottom_toBottomOf="parent"
-        app:layout_constraintEnd_toEndOf="parent"
-        app:layout_constraintStart_toStartOf="parent"
-        app:layout_constraintTop_toBottomOf="@id/toolbar"
-        tools:listitem="@layout/contact_list_item" />
-
-    <androidx.appcompat.widget.Toolbar
-        android:id="@+id/toolbar"
-        style="@style/Toolbar"
-        android:layout_width="match_parent"
-        android:layout_height="wrap_content"
-        app:contentInsetStartWithNavigation="0dp"
-        app:layout_constrainedHeight="true"
-        app:layout_constraintTop_toTopOf="parent">
-
-        <FrameLayout
-            android:layout_width="match_parent"
-            android:layout_height="match_parent"
-            android:animateLayoutChanges="true">
-
-            <com.moez.QKSMS.common.widget.QkEditText
-                android:id="@+id/search"
-                android:layout_width="match_parent"
-                android:layout_height="match_parent"
-                android:layout_marginTop="8dp"
-                android:layout_marginEnd="8dp"
-                android:layout_marginBottom="8dp"
-                android:background="@drawable/rounded_rectangle_24dp"
-                android:backgroundTint="?attr/bubbleColor"
-                android:hint="@string/title_compose"
-                android:imeOptions="flagNoExtractUi"
-                android:inputType="textFilter|textNoSuggestions"
-                android:paddingStart="16dp"
-                android:paddingEnd="40dp"
-                android:privateImeOptions="nm"
-                android:textColor="?android:attr/textColorPrimary"
-                android:textColorHint="?android:attr/textColorTertiary"
-                app:textSize="primary" />
-
-            <ImageView
-                android:id="@+id/cancel"
-                android:layout_width="40dp"
-                android:layout_height="40dp"
-                android:layout_gravity="center_vertical|end"
-                android:layout_marginEnd="8dp"
-                android:background="?android:attr/selectableItemBackgroundBorderless"
-                android:padding="8dp"
-                android:src="@drawable/ic_cancel_black_24dp"
-                android:tint="?android:attr/textColorSecondary"
-                android:visibility="gone" />
-
-        </FrameLayout>
-
-    </androidx.appcompat.widget.Toolbar>
-
-    <View
-        android:layout_width="match_parent"
-        android:layout_height="8dp"
-        android:background="@drawable/ab_shadow"
-        app:layout_constraintTop_toBottomOf="@id/toolbar" />
-
-    <View
-        android:layout_width="match_parent"
-        android:layout_height="1dp"
-        android:background="?android:attr/divider"
-        app:layout_constraintBottom_toBottomOf="parent" />
-
-</androidx.constraintlayout.widget.ConstraintLayout>
+<?xml version="1.0" encoding="utf-8"?>
+<!--
+  ~ Copyright (C) 2019 Moez Bhatti <moez.bhatti@gmail.com>
+  ~
+  ~ This file is part of QKSMS.
+  ~
+  ~ QKSMS is free software: you can redistribute it and/or modify
+  ~ it under the terms of the GNU General Public License as published by
+  ~ the Free Software Foundation, either version 3 of the License, or
+  ~ (at your option) any later version.
+  ~
+  ~ QKSMS is distributed in the hope that it will be useful,
+  ~ but WITHOUT ANY WARRANTY; without even the implied warranty of
+  ~ MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+  ~ GNU General Public License for more details.
+  ~
+  ~ You should have received a copy of the GNU General Public License
+  ~ along with QKSMS.  If not, see <http://www.gnu.org/licenses/>.
+  -->
+<androidx.constraintlayout.widget.ConstraintLayout xmlns:android="http://schemas.android.com/apk/res/android"
+    xmlns:app="http://schemas.android.com/apk/res-auto"
+    xmlns:tools="http://schemas.android.com/tools"
+    android:id="@+id/contentView"
+    android:layout_width="match_parent"
+    android:layout_height="match_parent"
+    android:orientation="vertical"
+    tools:context="com.moez.QKSMS.feature.compose.ComposeActivity">
+
+    <androidx.recyclerview.widget.RecyclerView
+        android:id="@+id/contacts"
+        android:layout_width="0dp"
+        android:layout_height="0dp"
+        android:background="?android:attr/windowBackground"
+        android:clipChildren="false"
+        android:clipToPadding="false"
+        android:paddingTop="8dp"
+        android:paddingBottom="8dp"
+        app:layoutManager="androidx.recyclerview.widget.LinearLayoutManager"
+        app:layout_constraintBottom_toBottomOf="parent"
+        app:layout_constraintEnd_toEndOf="parent"
+        app:layout_constraintStart_toStartOf="parent"
+        app:layout_constraintTop_toBottomOf="@id/toolbar"
+        tools:listitem="@layout/contact_list_item" />
+
+    <androidx.appcompat.widget.Toolbar
+        android:id="@+id/toolbar"
+        style="@style/Toolbar"
+        android:layout_width="match_parent"
+        android:layout_height="wrap_content"
+        app:contentInsetStartWithNavigation="0dp"
+        app:layout_constrainedHeight="true"
+        app:layout_constraintTop_toTopOf="parent">
+
+        <FrameLayout
+            android:layout_width="match_parent"
+            android:layout_height="match_parent"
+            android:animateLayoutChanges="true">
+
+            <com.moez.QKSMS.common.widget.QkEditText
+                android:id="@+id/search"
+                android:layout_width="match_parent"
+                android:layout_height="match_parent"
+                android:layout_marginTop="8dp"
+                android:layout_marginEnd="8dp"
+                android:layout_marginBottom="8dp"
+                android:background="@drawable/rounded_rectangle_24dp"
+                android:backgroundTint="?attr/bubbleColor"
+                android:hint="@string/title_compose"
+                android:imeOptions="flagNoExtractUi"
+                android:inputType="textFilter|textNoSuggestions"
+                android:paddingStart="16dp"
+                android:paddingEnd="40dp"
+                android:privateImeOptions="nm"
+                android:textColor="?android:attr/textColorPrimary"
+                android:textColorHint="?android:attr/textColorTertiary"
+                app:textSize="primary" />
+
+            <ImageView
+                android:id="@+id/cancel"
+                android:layout_width="40dp"
+                android:layout_height="40dp"
+                android:layout_gravity="center_vertical|end"
+                android:layout_marginEnd="8dp"
+                android:background="?android:attr/selectableItemBackgroundBorderless"
+                android:padding="8dp"
+                android:src="@drawable/ic_cancel_black_24dp"
+                android:tint="?android:attr/textColorSecondary"
+                android:visibility="gone" />
+
+        </FrameLayout>
+
+    </androidx.appcompat.widget.Toolbar>
+
+    <View
+        android:layout_width="match_parent"
+        android:layout_height="8dp"
+        android:background="@drawable/ab_shadow"
+        app:layout_constraintTop_toBottomOf="@id/toolbar" />
+
+    <View
+        android:layout_width="match_parent"
+        android:layout_height="1dp"
+        android:background="?android:attr/divider"
+        app:layout_constraintBottom_toBottomOf="parent" />
+
+</androidx.constraintlayout.widget.ConstraintLayout>
diff --git a/presentation/src/main/res/layout/container_activity.xml b/presentation/src/main/res/layout/container_activity.xml
index 1f4c959c3..3d592d21a 100644
--- a/presentation/src/main/res/layout/container_activity.xml
+++ b/presentation/src/main/res/layout/container_activity.xml
@@ -1,49 +1,49 @@
-<?xml version="1.0" encoding="utf-8"?>
-<!--
-  ~ Copyright (C) 2019 Moez Bhatti <moez.bhatti@gmail.com>
-  ~
-  ~ This file is part of QKSMS.
-  ~
-  ~ QKSMS is free software: you can redistribute it and/or modify
-  ~ it under the terms of the GNU General Public License as published by
-  ~ the Free Software Foundation, either version 3 of the License, or
-  ~ (at your option) any later version.
-  ~
-  ~ QKSMS is distributed in the hope that it will be useful,
-  ~ but WITHOUT ANY WARRANTY; without even the implied warranty of
-  ~ MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
-  ~ GNU General Public License for more details.
-  ~
-  ~ You should have received a copy of the GNU General Public License
-  ~ along with QKSMS.  If not, see <http://www.gnu.org/licenses/>.
-  -->
-<LinearLayout xmlns:android="http://schemas.android.com/apk/res/android"
-    android:layout_width="match_parent"
-    android:layout_height="match_parent"
-    android:orientation="vertical">
-
-    <androidx.appcompat.widget.Toolbar xmlns:android="http://schemas.android.com/apk/res/android"
-        xmlns:tools="http://schemas.android.com/tools"
-        android:id="@+id/toolbar"
-        style="@style/Toolbar"
-        android:elevation="8dp">
-
-        <com.moez.QKSMS.common.widget.QkTextView
-            android:id="@+id/toolbarTitle"
-            style="@style/ToolbarText"
-            tools:text="Conversations" />
-
-    </androidx.appcompat.widget.Toolbar>
-
-    <com.bluelinelabs.conductor.ChangeHandlerFrameLayout
-        android:id="@+id/container"
-        android:layout_width="match_parent"
-        android:layout_height="0dp"
-        android:layout_weight="1" />
-
-    <View
-        android:layout_width="match_parent"
-        android:layout_height="1dp"
-        android:background="?android:attr/divider" />
-
+<?xml version="1.0" encoding="utf-8"?>
+<!--
+  ~ Copyright (C) 2019 Moez Bhatti <moez.bhatti@gmail.com>
+  ~
+  ~ This file is part of QKSMS.
+  ~
+  ~ QKSMS is free software: you can redistribute it and/or modify
+  ~ it under the terms of the GNU General Public License as published by
+  ~ the Free Software Foundation, either version 3 of the License, or
+  ~ (at your option) any later version.
+  ~
+  ~ QKSMS is distributed in the hope that it will be useful,
+  ~ but WITHOUT ANY WARRANTY; without even the implied warranty of
+  ~ MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+  ~ GNU General Public License for more details.
+  ~
+  ~ You should have received a copy of the GNU General Public License
+  ~ along with QKSMS.  If not, see <http://www.gnu.org/licenses/>.
+  -->
+<LinearLayout xmlns:android="http://schemas.android.com/apk/res/android"
+    android:layout_width="match_parent"
+    android:layout_height="match_parent"
+    android:orientation="vertical">
+
+    <androidx.appcompat.widget.Toolbar xmlns:android="http://schemas.android.com/apk/res/android"
+        xmlns:tools="http://schemas.android.com/tools"
+        android:id="@+id/toolbar"
+        style="@style/Toolbar"
+        android:elevation="8dp">
+
+        <com.moez.QKSMS.common.widget.QkTextView
+            android:id="@+id/toolbarTitle"
+            style="@style/ToolbarText"
+            tools:text="Conversations" />
+
+    </androidx.appcompat.widget.Toolbar>
+
+    <com.bluelinelabs.conductor.ChangeHandlerFrameLayout
+        android:id="@+id/container"
+        android:layout_width="match_parent"
+        android:layout_height="0dp"
+        android:layout_weight="1" />
+
+    <View
+        android:layout_width="match_parent"
+        android:layout_height="1dp"
+        android:background="?android:attr/divider" />
+
 </LinearLayout>
\ No newline at end of file
diff --git a/presentation/src/main/res/layout/conversation_info_controller.xml b/presentation/src/main/res/layout/conversation_info_controller.xml
index 65558d5d7..af697e78f 100644
--- a/presentation/src/main/res/layout/conversation_info_controller.xml
+++ b/presentation/src/main/res/layout/conversation_info_controller.xml
@@ -1,27 +1,27 @@
-<?xml version="1.0" encoding="utf-8"?>
-<!--
-  ~ Copyright (C) 2019 Moez Bhatti <moez.bhatti@gmail.com>
-  ~
-  ~ This file is part of QKSMS.
-  ~
-  ~ QKSMS is free software: you can redistribute it and/or modify
-  ~ it under the terms of the GNU General Public License as published by
-  ~ the Free Software Foundation, either version 3 of the License, or
-  ~ (at your option) any later version.
-  ~
-  ~ QKSMS is distributed in the hope that it will be useful,
-  ~ but WITHOUT ANY WARRANTY; without even the implied warranty of
-  ~ MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
-  ~ GNU General Public License for more details.
-  ~
-  ~ You should have received a copy of the GNU General Public License
-  ~ along with QKSMS.  If not, see <http://www.gnu.org/licenses/>.
-  -->
-<androidx.recyclerview.widget.RecyclerView xmlns:android="http://schemas.android.com/apk/res/android"
-    android:id="@+id/recyclerView"
-    android:layout_width="match_parent"
-    android:layout_height="match_parent"
-    android:clipChildren="false"
-    android:clipToPadding="false"
-    android:paddingTop="8dp"
-    android:paddingBottom="8dp" />
+<?xml version="1.0" encoding="utf-8"?>
+<!--
+  ~ Copyright (C) 2019 Moez Bhatti <moez.bhatti@gmail.com>
+  ~
+  ~ This file is part of QKSMS.
+  ~
+  ~ QKSMS is free software: you can redistribute it and/or modify
+  ~ it under the terms of the GNU General Public License as published by
+  ~ the Free Software Foundation, either version 3 of the License, or
+  ~ (at your option) any later version.
+  ~
+  ~ QKSMS is distributed in the hope that it will be useful,
+  ~ but WITHOUT ANY WARRANTY; without even the implied warranty of
+  ~ MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+  ~ GNU General Public License for more details.
+  ~
+  ~ You should have received a copy of the GNU General Public License
+  ~ along with QKSMS.  If not, see <http://www.gnu.org/licenses/>.
+  -->
+<androidx.recyclerview.widget.RecyclerView xmlns:android="http://schemas.android.com/apk/res/android"
+    android:id="@+id/recyclerView"
+    android:layout_width="match_parent"
+    android:layout_height="match_parent"
+    android:clipChildren="false"
+    android:clipToPadding="false"
+    android:paddingTop="8dp"
+    android:paddingBottom="8dp" />
diff --git a/presentation/src/main/res/layout/conversation_info_settings.xml b/presentation/src/main/res/layout/conversation_info_settings.xml
index 9fc371aab..f82062b98 100644
--- a/presentation/src/main/res/layout/conversation_info_settings.xml
+++ b/presentation/src/main/res/layout/conversation_info_settings.xml
@@ -1,74 +1,74 @@
-<?xml version="1.0" encoding="utf-8"?>
-<!--
-  ~ Copyright (C) 2019 Moez Bhatti <moez.bhatti@gmail.com>
-  ~
-  ~ This file is part of QKSMS.
-  ~
-  ~ QKSMS is free software: you can redistribute it and/or modify
-  ~ it under the terms of the GNU General Public License as published by
-  ~ the Free Software Foundation, either version 3 of the License, or
-  ~ (at your option) any later version.
-  ~
-  ~ QKSMS is distributed in the hope that it will be useful,
-  ~ but WITHOUT ANY WARRANTY; without even the implied warranty of
-  ~ MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
-  ~ GNU General Public License for more details.
-  ~
-  ~ You should have received a copy of the GNU General Public License
-  ~ along with QKSMS.  If not, see <http://www.gnu.org/licenses/>.
-  -->
-<LinearLayout xmlns:android="http://schemas.android.com/apk/res/android"
-    xmlns:app="http://schemas.android.com/apk/res-auto"
-    android:layout_width="match_parent"
-    android:layout_height="wrap_content"
-    android:orientation="vertical">
-
-    <View
-        android:layout_width="match_parent"
-        android:layout_height="1dp"
-        android:layout_marginBottom="8dp"
-        android:background="?android:attr/divider" />
-
-    <com.moez.QKSMS.common.widget.PreferenceView
-        android:id="@+id/groupName"
-        android:layout_width="match_parent"
-        android:layout_height="wrap_content"
-        android:visibility="gone"
-        app:icon="@drawable/ic_people_black_24dp"
-        app:title="@string/info_name" />
-
-    <com.moez.QKSMS.common.widget.PreferenceView
-        android:id="@+id/notifications"
-        android:layout_width="match_parent"
-        android:layout_height="wrap_content"
-        app:icon="@drawable/ic_notifications_black_24dp"
-        app:title="@string/info_notifications" />
-
-    <com.moez.QKSMS.common.widget.PreferenceView
-        android:id="@+id/archive"
-        android:layout_width="match_parent"
-        android:layout_height="wrap_content"
-        app:icon="@drawable/ic_archive_white_24dp"
-        app:title="@string/info_archive" />
-
-    <com.moez.QKSMS.common.widget.PreferenceView
-        android:id="@+id/block"
-        android:layout_width="match_parent"
-        android:layout_height="wrap_content"
-        app:icon="@drawable/ic_block_white_24dp"
-        app:title="@string/info_block" />
-
-    <com.moez.QKSMS.common.widget.PreferenceView
-        android:id="@+id/delete"
-        android:layout_width="match_parent"
-        android:layout_height="wrap_content"
-        app:icon="@drawable/ic_delete_white_24dp"
-        app:title="@string/info_delete" />
-
-    <View
-        android:layout_width="match_parent"
-        android:layout_height="1dp"
-        android:layout_marginTop="8dp"
-        android:background="?android:attr/divider" />
-
-</LinearLayout>
+<?xml version="1.0" encoding="utf-8"?>
+<!--
+  ~ Copyright (C) 2019 Moez Bhatti <moez.bhatti@gmail.com>
+  ~
+  ~ This file is part of QKSMS.
+  ~
+  ~ QKSMS is free software: you can redistribute it and/or modify
+  ~ it under the terms of the GNU General Public License as published by
+  ~ the Free Software Foundation, either version 3 of the License, or
+  ~ (at your option) any later version.
+  ~
+  ~ QKSMS is distributed in the hope that it will be useful,
+  ~ but WITHOUT ANY WARRANTY; without even the implied warranty of
+  ~ MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+  ~ GNU General Public License for more details.
+  ~
+  ~ You should have received a copy of the GNU General Public License
+  ~ along with QKSMS.  If not, see <http://www.gnu.org/licenses/>.
+  -->
+<LinearLayout xmlns:android="http://schemas.android.com/apk/res/android"
+    xmlns:app="http://schemas.android.com/apk/res-auto"
+    android:layout_width="match_parent"
+    android:layout_height="wrap_content"
+    android:orientation="vertical">
+
+    <View
+        android:layout_width="match_parent"
+        android:layout_height="1dp"
+        android:layout_marginBottom="8dp"
+        android:background="?android:attr/divider" />
+
+    <com.moez.QKSMS.common.widget.PreferenceView
+        android:id="@+id/groupName"
+        android:layout_width="match_parent"
+        android:layout_height="wrap_content"
+        android:visibility="gone"
+        app:icon="@drawable/ic_people_black_24dp"
+        app:title="@string/info_name" />
+
+    <com.moez.QKSMS.common.widget.PreferenceView
+        android:id="@+id/notifications"
+        android:layout_width="match_parent"
+        android:layout_height="wrap_content"
+        app:icon="@drawable/ic_notifications_black_24dp"
+        app:title="@string/info_notifications" />
+
+    <com.moez.QKSMS.common.widget.PreferenceView
+        android:id="@+id/archive"
+        android:layout_width="match_parent"
+        android:layout_height="wrap_content"
+        app:icon="@drawable/ic_archive_white_24dp"
+        app:title="@string/info_archive" />
+
+    <com.moez.QKSMS.common.widget.PreferenceView
+        android:id="@+id/block"
+        android:layout_width="match_parent"
+        android:layout_height="wrap_content"
+        app:icon="@drawable/ic_block_white_24dp"
+        app:title="@string/info_block" />
+
+    <com.moez.QKSMS.common.widget.PreferenceView
+        android:id="@+id/delete"
+        android:layout_width="match_parent"
+        android:layout_height="wrap_content"
+        app:icon="@drawable/ic_delete_white_24dp"
+        app:title="@string/info_delete" />
+
+    <View
+        android:layout_width="match_parent"
+        android:layout_height="1dp"
+        android:layout_marginTop="8dp"
+        android:background="?android:attr/divider" />
+
+</LinearLayout>
diff --git a/presentation/src/main/res/layout/conversation_list_item.xml b/presentation/src/main/res/layout/conversation_list_item.xml
index 70e1a2526..ba5391f7a 100644
--- a/presentation/src/main/res/layout/conversation_list_item.xml
+++ b/presentation/src/main/res/layout/conversation_list_item.xml
@@ -1,113 +1,113 @@
-<?xml version="1.0" encoding="utf-8"?>
-<!--
-  ~ Copyright (C) 2019 Moez Bhatti <moez.bhatti@gmail.com>
-  ~
-  ~ This file is part of QKSMS.
-  ~
-  ~ QKSMS is free software: you can redistribute it and/or modify
-  ~ it under the terms of the GNU General Public License as published by
-  ~ the Free Software Foundation, either version 3 of the License, or
-  ~ (at your option) any later version.
-  ~
-  ~ QKSMS is distributed in the hope that it will be useful,
-  ~ but WITHOUT ANY WARRANTY; without even the implied warranty of
-  ~ MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
-  ~ GNU General Public License for more details.
-  ~
-  ~ You should have received a copy of the GNU General Public License
-  ~ along with QKSMS.  If not, see <http://www.gnu.org/licenses/>.
-  -->
-<androidx.constraintlayout.widget.ConstraintLayout xmlns:android="http://schemas.android.com/apk/res/android"
-    xmlns:app="http://schemas.android.com/apk/res-auto"
-    xmlns:tools="http://schemas.android.com/tools"
-    android:layout_width="match_parent"
-    android:layout_height="wrap_content"
-    android:background="?attr/selectableItemBackground"
-    android:gravity="center_vertical"
-    android:orientation="horizontal"
-    android:paddingStart="12dp"
-    android:paddingTop="8dp"
-    android:paddingEnd="16dp"
-    android:paddingBottom="8dp">
-
-    <com.moez.QKSMS.common.widget.GroupAvatarView
-        android:id="@+id/avatars"
-        android:layout_width="56dp"
-        android:layout_height="56dp"
-        android:layout_gravity="top"
-        app:layout_constraintBottom_toBottomOf="parent"
-        app:layout_constraintStart_toStartOf="parent"
-        app:layout_constraintTop_toTopOf="parent"
-        app:layout_constraintVertical_bias="0" />
-
-    <com.moez.QKSMS.common.widget.QkTextView
-        android:id="@+id/title"
-        style="@style/TextPrimary"
-        android:layout_width="wrap_content"
-        android:layout_height="wrap_content"
-        android:layout_marginStart="12dp"
-        android:layout_marginEnd="16dp"
-        android:ellipsize="end"
-        android:lines="1"
-        app:layout_constrainedWidth="true"
-        app:layout_constraintBottom_toTopOf="@id/snippet"
-        app:layout_constraintEnd_toStartOf="@id/date"
-        app:layout_constraintHorizontal_bias="0"
-        app:layout_constraintStart_toEndOf="@id/avatars"
-        app:layout_constraintTop_toTopOf="parent"
-        app:layout_constraintVertical_chainStyle="packed"
-        tools:text="@tools:sample/full_names" />
-
-    <com.moez.QKSMS.common.widget.QkTextView
-        android:id="@+id/snippet"
-        style="@style/TextSecondary"
-        android:layout_width="0dp"
-        android:layout_height="wrap_content"
-        android:layout_marginTop="2dp"
-        android:ellipsize="end"
-        android:maxLines="1"
-        app:layout_constraintBottom_toBottomOf="parent"
-        app:layout_constraintEnd_toStartOf="@id/pinned"
-        app:layout_constraintStart_toStartOf="@id/title"
-        app:layout_constraintTop_toBottomOf="@id/title"
-        tools:text="@tools:sample/lorem/random" />
-
-    <ImageView
-        android:id="@+id/pinned"
-        android:layout_width="20dp"
-        android:layout_height="16dp"
-        android:layout_marginTop="2dp"
-        android:paddingStart="4dp"
-        android:src="@drawable/ic_baseline_push_pin_24"
-        android:tint="?android:attr/textColorTertiary"
-        android:visibility="gone"
-        app:layout_constraintEnd_toStartOf="@id/unread"
-        app:layout_constraintTop_toTopOf="@id/snippet"
-        tools:visibility="visible" />
-
-    <ImageView
-        android:id="@+id/unread"
-        android:layout_width="20dp"
-        android:layout_height="16sp"
-        android:paddingStart="8dp"
-        android:paddingTop="2dp"
-        android:paddingBottom="2dp"
-        android:src="@drawable/circle"
-        android:visibility="gone"
-        app:layout_constraintEnd_toEndOf="parent"
-        app:layout_constraintTop_toTopOf="@id/snippet"
-        tools:tint="@color/tools_theme"
-        tools:visibility="visible" />
-
-    <com.moez.QKSMS.common.widget.QkTextView
-        android:id="@+id/date"
-        style="@style/TextTertiary"
-        android:layout_width="wrap_content"
-        android:layout_height="wrap_content"
-        android:gravity="center_vertical"
-        app:layout_constraintBottom_toBottomOf="@id/title"
-        app:layout_constraintEnd_toEndOf="parent"
-        app:layout_constraintHorizontal_bias="100"
-        tools:text="Oct 11" />
-
-</androidx.constraintlayout.widget.ConstraintLayout>
+<?xml version="1.0" encoding="utf-8"?>
+<!--
+  ~ Copyright (C) 2019 Moez Bhatti <moez.bhatti@gmail.com>
+  ~
+  ~ This file is part of QKSMS.
+  ~
+  ~ QKSMS is free software: you can redistribute it and/or modify
+  ~ it under the terms of the GNU General Public License as published by
+  ~ the Free Software Foundation, either version 3 of the License, or
+  ~ (at your option) any later version.
+  ~
+  ~ QKSMS is distributed in the hope that it will be useful,
+  ~ but WITHOUT ANY WARRANTY; without even the implied warranty of
+  ~ MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+  ~ GNU General Public License for more details.
+  ~
+  ~ You should have received a copy of the GNU General Public License
+  ~ along with QKSMS.  If not, see <http://www.gnu.org/licenses/>.
+  -->
+<androidx.constraintlayout.widget.ConstraintLayout xmlns:android="http://schemas.android.com/apk/res/android"
+    xmlns:app="http://schemas.android.com/apk/res-auto"
+    xmlns:tools="http://schemas.android.com/tools"
+    android:layout_width="match_parent"
+    android:layout_height="wrap_content"
+    android:background="?attr/selectableItemBackground"
+    android:gravity="center_vertical"
+    android:orientation="horizontal"
+    android:paddingStart="12dp"
+    android:paddingTop="8dp"
+    android:paddingEnd="16dp"
+    android:paddingBottom="8dp">
+
+    <com.moez.QKSMS.common.widget.GroupAvatarView
+        android:id="@+id/avatars"
+        android:layout_width="56dp"
+        android:layout_height="56dp"
+        android:layout_gravity="top"
+        app:layout_constraintBottom_toBottomOf="parent"
+        app:layout_constraintStart_toStartOf="parent"
+        app:layout_constraintTop_toTopOf="parent"
+        app:layout_constraintVertical_bias="0" />
+
+    <com.moez.QKSMS.common.widget.QkTextView
+        android:id="@+id/title"
+        style="@style/TextPrimary"
+        android:layout_width="wrap_content"
+        android:layout_height="wrap_content"
+        android:layout_marginStart="12dp"
+        android:layout_marginEnd="16dp"
+        android:ellipsize="end"
+        android:lines="1"
+        app:layout_constrainedWidth="true"
+        app:layout_constraintBottom_toTopOf="@id/snippet"
+        app:layout_constraintEnd_toStartOf="@id/date"
+        app:layout_constraintHorizontal_bias="0"
+        app:layout_constraintStart_toEndOf="@id/avatars"
+        app:layout_constraintTop_toTopOf="parent"
+        app:layout_constraintVertical_chainStyle="packed"
+        tools:text="@tools:sample/full_names" />
+
+    <com.moez.QKSMS.common.widget.QkTextView
+        android:id="@+id/snippet"
+        style="@style/TextSecondary"
+        android:layout_width="0dp"
+        android:layout_height="wrap_content"
+        android:layout_marginTop="2dp"
+        android:ellipsize="end"
+        android:maxLines="1"
+        app:layout_constraintBottom_toBottomOf="parent"
+        app:layout_constraintEnd_toStartOf="@id/pinned"
+        app:layout_constraintStart_toStartOf="@id/title"
+        app:layout_constraintTop_toBottomOf="@id/title"
+        tools:text="@tools:sample/lorem/random" />
+
+    <ImageView
+        android:id="@+id/pinned"
+        android:layout_width="20dp"
+        android:layout_height="16dp"
+        android:layout_marginTop="2dp"
+        android:paddingStart="4dp"
+        android:src="@drawable/ic_baseline_push_pin_24"
+        android:tint="?android:attr/textColorTertiary"
+        android:visibility="gone"
+        app:layout_constraintEnd_toStartOf="@id/unread"
+        app:layout_constraintTop_toTopOf="@id/snippet"
+        tools:visibility="visible" />
+
+    <ImageView
+        android:id="@+id/unread"
+        android:layout_width="20dp"
+        android:layout_height="16sp"
+        android:paddingStart="8dp"
+        android:paddingTop="2dp"
+        android:paddingBottom="2dp"
+        android:src="@drawable/circle"
+        android:visibility="gone"
+        app:layout_constraintEnd_toEndOf="parent"
+        app:layout_constraintTop_toTopOf="@id/snippet"
+        tools:tint="@color/tools_theme"
+        tools:visibility="visible" />
+
+    <com.moez.QKSMS.common.widget.QkTextView
+        android:id="@+id/date"
+        style="@style/TextTertiary"
+        android:layout_width="wrap_content"
+        android:layout_height="wrap_content"
+        android:gravity="center_vertical"
+        app:layout_constraintBottom_toBottomOf="@id/title"
+        app:layout_constraintEnd_toEndOf="parent"
+        app:layout_constraintHorizontal_bias="100"
+        tools:text="Oct 11" />
+
+</androidx.constraintlayout.widget.ConstraintLayout>
diff --git a/presentation/src/main/res/layout/conversation_media_list_item.xml b/presentation/src/main/res/layout/conversation_media_list_item.xml
index aeee85976..7ad82b791 100644
--- a/presentation/src/main/res/layout/conversation_media_list_item.xml
+++ b/presentation/src/main/res/layout/conversation_media_list_item.xml
@@ -1,41 +1,41 @@
-<?xml version="1.0" encoding="utf-8"?>
-<!--
-  ~ Copyright (C) 2019 Moez Bhatti <moez.bhatti@gmail.com>
-  ~
-  ~ This file is part of QKSMS.
-  ~
-  ~ QKSMS is free software: you can redistribute it and/or modify
-  ~ it under the terms of the GNU General Public License as published by
-  ~ the Free Software Foundation, either version 3 of the License, or
-  ~ (at your option) any later version.
-  ~
-  ~ QKSMS is distributed in the hope that it will be useful,
-  ~ but WITHOUT ANY WARRANTY; without even the implied warranty of
-  ~ MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
-  ~ GNU General Public License for more details.
-  ~
-  ~ You should have received a copy of the GNU General Public License
-  ~ along with QKSMS.  If not, see <http://www.gnu.org/licenses/>.
-  -->
-<FrameLayout xmlns:android="http://schemas.android.com/apk/res/android"
-    xmlns:tools="http://schemas.android.com/tools"
-    android:layout_width="match_parent"
-    android:layout_height="wrap_content">
-
-    <com.moez.QKSMS.common.widget.SquareImageView
-        android:id="@+id/thumbnail"
-        android:layout_width="match_parent"
-        android:layout_height="match_parent"
-        android:background="?android:attr/divider"
-        android:scaleType="centerCrop"
-        tools:src="@tools:sample/backgrounds/scenic" />
-
-    <ImageView
-        android:id="@+id/video"
-        android:layout_width="24dp"
-        android:layout_height="24dp"
-        android:layout_gravity="top|end"
-        android:layout_margin="16dp"
-        android:src="@drawable/ic_play_circle_filled_white_24dp" />
-
+<?xml version="1.0" encoding="utf-8"?>
+<!--
+  ~ Copyright (C) 2019 Moez Bhatti <moez.bhatti@gmail.com>
+  ~
+  ~ This file is part of QKSMS.
+  ~
+  ~ QKSMS is free software: you can redistribute it and/or modify
+  ~ it under the terms of the GNU General Public License as published by
+  ~ the Free Software Foundation, either version 3 of the License, or
+  ~ (at your option) any later version.
+  ~
+  ~ QKSMS is distributed in the hope that it will be useful,
+  ~ but WITHOUT ANY WARRANTY; without even the implied warranty of
+  ~ MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+  ~ GNU General Public License for more details.
+  ~
+  ~ You should have received a copy of the GNU General Public License
+  ~ along with QKSMS.  If not, see <http://www.gnu.org/licenses/>.
+  -->
+<FrameLayout xmlns:android="http://schemas.android.com/apk/res/android"
+    xmlns:tools="http://schemas.android.com/tools"
+    android:layout_width="match_parent"
+    android:layout_height="wrap_content">
+
+    <com.moez.QKSMS.common.widget.SquareImageView
+        android:id="@+id/thumbnail"
+        android:layout_width="match_parent"
+        android:layout_height="match_parent"
+        android:background="?android:attr/divider"
+        android:scaleType="centerCrop"
+        tools:src="@tools:sample/backgrounds/scenic" />
+
+    <ImageView
+        android:id="@+id/video"
+        android:layout_width="24dp"
+        android:layout_height="24dp"
+        android:layout_gravity="top|end"
+        android:layout_margin="16dp"
+        android:src="@drawable/ic_play_circle_filled_white_24dp" />
+
 </FrameLayout>
\ No newline at end of file
diff --git a/presentation/src/main/res/layout/conversation_recipient_list_item.xml b/presentation/src/main/res/layout/conversation_recipient_list_item.xml
index 970d478ec..9a80cab95 100644
--- a/presentation/src/main/res/layout/conversation_recipient_list_item.xml
+++ b/presentation/src/main/res/layout/conversation_recipient_list_item.xml
@@ -1,89 +1,89 @@
-<?xml version="1.0" encoding="utf-8"?>
-<!--
-  ~ Copyright (C) 2019 Moez Bhatti <moez.bhatti@gmail.com>
-  ~
-  ~ This file is part of QKSMS.
-  ~
-  ~ QKSMS is free software: you can redistribute it and/or modify
-  ~ it under the terms of the GNU General Public License as published by
-  ~ the Free Software Foundation, either version 3 of the License, or
-  ~ (at your option) any later version.
-  ~
-  ~ QKSMS is distributed in the hope that it will be useful,
-  ~ but WITHOUT ANY WARRANTY; without even the implied warranty of
-  ~ MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
-  ~ GNU General Public License for more details.
-  ~
-  ~ You should have received a copy of the GNU General Public License
-  ~ along with QKSMS.  If not, see <http://www.gnu.org/licenses/>.
-  -->
-<androidx.constraintlayout.widget.ConstraintLayout xmlns:android="http://schemas.android.com/apk/res/android"
-    xmlns:app="http://schemas.android.com/apk/res-auto"
-    xmlns:tools="http://schemas.android.com/tools"
-    android:layout_width="match_parent"
-    android:layout_height="wrap_content"
-    android:background="?attr/selectableItemBackground"
-    android:paddingStart="24dp"
-    android:paddingTop="8dp"
-    android:paddingEnd="16dp"
-    android:paddingBottom="8dp">
-
-    <com.moez.QKSMS.common.widget.AvatarView
-        android:id="@+id/avatar"
-        android:layout_width="40dp"
-        android:layout_height="40dp"
-        app:layout_constraintBottom_toBottomOf="parent"
-        app:layout_constraintStart_toStartOf="parent"
-        app:layout_constraintTop_toTopOf="parent" />
-
-    <com.moez.QKSMS.common.widget.QkTextView
-        android:id="@+id/name"
-        style="@style/TextPrimary"
-        android:layout_width="0dp"
-        android:layout_height="wrap_content"
-        android:layout_marginStart="16dp"
-        android:layout_marginEnd="8dp"
-        app:layout_constraintBottom_toTopOf="@id/address"
-        app:layout_constraintEnd_toStartOf="@id/add"
-        app:layout_constraintHorizontal_bias="0"
-        app:layout_constraintStart_toEndOf="@id/avatar"
-        app:layout_constraintTop_toTopOf="parent"
-        app:layout_constraintVertical_chainStyle="packed"
-        tools:text="Moez Bhatti" />
-
-    <com.moez.QKSMS.common.widget.QkTextView
-        android:id="@+id/address"
-        style="@style/TextSecondary"
-        android:layout_width="0dp"
-        android:layout_height="wrap_content"
-        app:layout_constraintBottom_toBottomOf="parent"
-        app:layout_constraintEnd_toEndOf="@id/name"
-        app:layout_constraintStart_toStartOf="@id/name"
-        app:layout_constraintTop_toBottomOf="@id/name"
-        tools:text="(123) 456-7890" />
-
-    <ImageView
-        android:id="@+id/add"
-        android:layout_width="40dp"
-        android:layout_height="40dp"
-        android:layout_marginEnd="16dp"
-        android:padding="8dp"
-        android:src="@drawable/ic_person_add_black_24dp"
-        android:tint="?android:attr/textColorSecondary"
-        app:layout_constraintBottom_toBottomOf="parent"
-        app:layout_constraintEnd_toStartOf="@id/theme"
-        app:layout_constraintTop_toTopOf="parent" />
-
-    <ImageView
-        android:id="@+id/theme"
-        android:layout_width="40dp"
-        android:layout_height="40dp"
-        android:background="?android:attr/selectableItemBackgroundBorderless"
-        android:padding="8dp"
-        android:src="@drawable/ic_palette_black_24dp"
-        android:tint="?android:attr/textColorSecondary"
-        app:layout_constraintBottom_toBottomOf="parent"
-        app:layout_constraintEnd_toEndOf="parent"
-        app:layout_constraintTop_toTopOf="parent" />
-
-</androidx.constraintlayout.widget.ConstraintLayout>
+<?xml version="1.0" encoding="utf-8"?>
+<!--
+  ~ Copyright (C) 2019 Moez Bhatti <moez.bhatti@gmail.com>
+  ~
+  ~ This file is part of QKSMS.
+  ~
+  ~ QKSMS is free software: you can redistribute it and/or modify
+  ~ it under the terms of the GNU General Public License as published by
+  ~ the Free Software Foundation, either version 3 of the License, or
+  ~ (at your option) any later version.
+  ~
+  ~ QKSMS is distributed in the hope that it will be useful,
+  ~ but WITHOUT ANY WARRANTY; without even the implied warranty of
+  ~ MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+  ~ GNU General Public License for more details.
+  ~
+  ~ You should have received a copy of the GNU General Public License
+  ~ along with QKSMS.  If not, see <http://www.gnu.org/licenses/>.
+  -->
+<androidx.constraintlayout.widget.ConstraintLayout xmlns:android="http://schemas.android.com/apk/res/android"
+    xmlns:app="http://schemas.android.com/apk/res-auto"
+    xmlns:tools="http://schemas.android.com/tools"
+    android:layout_width="match_parent"
+    android:layout_height="wrap_content"
+    android:background="?attr/selectableItemBackground"
+    android:paddingStart="24dp"
+    android:paddingTop="8dp"
+    android:paddingEnd="16dp"
+    android:paddingBottom="8dp">
+
+    <com.moez.QKSMS.common.widget.AvatarView
+        android:id="@+id/avatar"
+        android:layout_width="40dp"
+        android:layout_height="40dp"
+        app:layout_constraintBottom_toBottomOf="parent"
+        app:layout_constraintStart_toStartOf="parent"
+        app:layout_constraintTop_toTopOf="parent" />
+
+    <com.moez.QKSMS.common.widget.QkTextView
+        android:id="@+id/name"
+        style="@style/TextPrimary"
+        android:layout_width="0dp"
+        android:layout_height="wrap_content"
+        android:layout_marginStart="16dp"
+        android:layout_marginEnd="8dp"
+        app:layout_constraintBottom_toTopOf="@id/address"
+        app:layout_constraintEnd_toStartOf="@id/add"
+        app:layout_constraintHorizontal_bias="0"
+        app:layout_constraintStart_toEndOf="@id/avatar"
+        app:layout_constraintTop_toTopOf="parent"
+        app:layout_constraintVertical_chainStyle="packed"
+        tools:text="Moez Bhatti" />
+
+    <com.moez.QKSMS.common.widget.QkTextView
+        android:id="@+id/address"
+        style="@style/TextSecondary"
+        android:layout_width="0dp"
+        android:layout_height="wrap_content"
+        app:layout_constraintBottom_toBottomOf="parent"
+        app:layout_constraintEnd_toEndOf="@id/name"
+        app:layout_constraintStart_toStartOf="@id/name"
+        app:layout_constraintTop_toBottomOf="@id/name"
+        tools:text="(123) 456-7890" />
+
+    <ImageView
+        android:id="@+id/add"
+        android:layout_width="40dp"
+        android:layout_height="40dp"
+        android:layout_marginEnd="16dp"
+        android:padding="8dp"
+        android:src="@drawable/ic_person_add_black_24dp"
+        android:tint="?android:attr/textColorSecondary"
+        app:layout_constraintBottom_toBottomOf="parent"
+        app:layout_constraintEnd_toStartOf="@id/theme"
+        app:layout_constraintTop_toTopOf="parent" />
+
+    <ImageView
+        android:id="@+id/theme"
+        android:layout_width="40dp"
+        android:layout_height="40dp"
+        android:background="?android:attr/selectableItemBackgroundBorderless"
+        android:padding="8dp"
+        android:src="@drawable/ic_palette_black_24dp"
+        android:tint="?android:attr/textColorSecondary"
+        app:layout_constraintBottom_toBottomOf="parent"
+        app:layout_constraintEnd_toEndOf="parent"
+        app:layout_constraintTop_toTopOf="parent" />
+
+</androidx.constraintlayout.widget.ConstraintLayout>
diff --git a/presentation/src/main/res/layout/drawer_view.xml b/presentation/src/main/res/layout/drawer_view.xml
index 5efa85282..36368db29 100644
--- a/presentation/src/main/res/layout/drawer_view.xml
+++ b/presentation/src/main/res/layout/drawer_view.xml
@@ -1,353 +1,353 @@
-<?xml version="1.0" encoding="utf-8"?>
-<!--
-  ~ Copyright (C) 2019 Moez Bhatti <moez.bhatti@gmail.com>
-  ~
-  ~ This file is part of QKSMS.
-  ~
-  ~ QKSMS is free software: you can redistribute it and/or modify
-  ~ it under the terms of the GNU General Public License as published by
-  ~ the Free Software Foundation, either version 3 of the License, or
-  ~ (at your option) any later version.
-  ~
-  ~ QKSMS is distributed in the hope that it will be useful,
-  ~ but WITHOUT ANY WARRANTY; without even the implied warranty of
-  ~ MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
-  ~ GNU General Public License for more details.
-  ~
-  ~ You should have received a copy of the GNU General Public License
-  ~ along with QKSMS.  If not, see <http://www.gnu.org/licenses/>.
-  -->
-<ScrollView xmlns:android="http://schemas.android.com/apk/res/android"
-    xmlns:app="http://schemas.android.com/apk/res-auto"
-    xmlns:tools="http://schemas.android.com/tools"
-    android:layout_width="match_parent"
-    android:layout_height="match_parent"
-    android:background="?android:attr/windowBackground">
-
-    <LinearLayout
-        android:layout_width="match_parent"
-        android:layout_height="wrap_content"
-        android:orientation="vertical"
-        android:paddingTop="8dp"
-        android:paddingBottom="8dp">
-
-        <LinearLayout
-            android:id="@+id/inbox"
-            style="@style/DrawerRow">
-
-            <ImageView
-                android:id="@+id/inboxIcon"
-                style="@style/DrawerIcon"
-                android:src="@drawable/ic_inbox_black_24dp"
-                tools:tint="@color/tools_theme" />
-
-            <com.moez.QKSMS.common.widget.QkTextView
-                style="@style/DrawerText"
-                android:text="@string/drawer_inbox" />
-
-        </LinearLayout>
-
-        <LinearLayout
-            android:id="@+id/archived"
-            style="@style/DrawerRow">
-
-            <ImageView
-                android:id="@+id/archivedIcon"
-                style="@style/DrawerIcon"
-                android:src="@drawable/ic_archive_white_24dp"
-                tools:tint="?android:attr/textColorSecondary" />
-
-            <com.moez.QKSMS.common.widget.QkTextView
-                style="@style/DrawerText"
-                android:text="@string/drawer_archived" />
-
-        </LinearLayout>
-
-        <View
-            android:layout_width="match_parent"
-            android:layout_height="1dp"
-            android:layout_marginTop="8dp"
-            android:layout_marginBottom="8dp"
-            android:background="?android:attr/divider" />
-
-        <LinearLayout
-            android:id="@+id/backup"
-            style="@style/DrawerRow">
-
-            <ImageView
-                style="@style/DrawerIcon"
-                android:src="@drawable/ic_import_export_black_24dp"
-                android:tint="?android:attr/textColorSecondary" />
-
-            <com.moez.QKSMS.common.widget.QkTextView
-                style="@style/DrawerText"
-                android:text="@string/backup_title" />
-
-            <com.moez.QKSMS.common.widget.QkTextView
-                android:id="@+id/plusBadge1"
-                android:layout_width="wrap_content"
-                android:layout_height="wrap_content"
-                android:background="@drawable/rounded_rectangle_2dp"
-                android:padding="4dp"
-                android:text="@string/title_qksms_plus"
-                android:textStyle="bold"
-                app:textSize="tertiary"
-                tools:backgroundTint="@color/tools_theme"
-                tools:textColor="@color/textPrimaryDark" />
-
-        </LinearLayout>
-
-        <LinearLayout
-            android:id="@+id/scheduled"
-            style="@style/DrawerRow">
-
-            <ImageView
-                style="@style/DrawerIcon"
-                android:src="@drawable/ic_event_black_24dp"
-                android:tint="?android:attr/textColorSecondary" />
-
-            <com.moez.QKSMS.common.widget.QkTextView
-                style="@style/DrawerText"
-                android:text="@string/drawer_scheduled" />
-
-            <com.moez.QKSMS.common.widget.QkTextView
-                android:id="@+id/plusBadge2"
-                android:layout_width="wrap_content"
-                android:layout_height="wrap_content"
-                android:background="@drawable/rounded_rectangle_2dp"
-                android:padding="4dp"
-                android:text="@string/title_qksms_plus"
-                android:textStyle="bold"
-                app:textSize="tertiary"
-                tools:backgroundTint="@color/tools_theme"
-                tools:textColor="@color/textPrimaryDark" />
-
-        </LinearLayout>
-
-        <LinearLayout
-            android:id="@+id/blocking"
-            style="@style/DrawerRow">
-
-            <ImageView
-                style="@style/DrawerIcon"
-                android:src="@drawable/ic_block_white_24dp"
-                android:tint="?android:attr/textColorSecondary" />
-
-            <com.moez.QKSMS.common.widget.QkTextView
-                style="@style/DrawerText"
-                android:text="@string/drawer_blocking" />
-
-        </LinearLayout>
-
-        <View
-            android:layout_width="match_parent"
-            android:layout_height="1dp"
-            android:layout_marginTop="8dp"
-            android:layout_marginBottom="8dp"
-            android:background="?android:attr/divider" />
-
-        <LinearLayout
-            android:id="@+id/settings"
-            style="@style/DrawerRow">
-
-            <ImageView
-                style="@style/DrawerIcon"
-                android:src="@drawable/ic_settings_black_24dp"
-                android:tint="?android:attr/textColorSecondary" />
-
-            <com.moez.QKSMS.common.widget.QkTextView
-                style="@style/DrawerText"
-                android:text="@string/drawer_settings" />
-
-        </LinearLayout>
-
-        <LinearLayout
-            android:id="@+id/plus"
-            style="@style/DrawerRow">
-
-            <ImageView
-                style="@style/DrawerIcon"
-                android:src="@drawable/ic_star_black_24dp"
-                android:tint="?android:attr/textColorSecondary" />
-
-            <com.moez.QKSMS.common.widget.QkTextView
-                style="@style/DrawerText"
-                android:text="@string/drawer_plus" />
-
-        </LinearLayout>
-
-        <LinearLayout
-            android:id="@+id/help"
-            style="@style/DrawerRow">
-
-            <ImageView
-                style="@style/DrawerIcon"
-                android:src="@drawable/ic_help_black_24dp"
-                android:tint="?android:attr/textColorSecondary" />
-
-            <com.moez.QKSMS.common.widget.QkTextView
-                style="@style/DrawerText"
-                android:text="@string/drawer_help" />
-
-        </LinearLayout>
-
-        <LinearLayout
-            android:id="@+id/invite"
-            style="@style/DrawerRow">
-
-            <ImageView
-                style="@style/DrawerIcon"
-                android:src="@drawable/ic_people_black_24dp"
-                android:tint="?android:attr/textColorSecondary" />
-
-            <com.moez.QKSMS.common.widget.QkTextView
-                style="@style/DrawerText"
-                android:text="@string/drawer_invite" />
-
-        </LinearLayout>
-
-        <androidx.constraintlayout.widget.ConstraintLayout
-            android:id="@+id/plusBanner"
-            android:layout_width="match_parent"
-            android:layout_height="wrap_content"
-            android:layout_marginStart="8dp"
-            android:layout_marginTop="8dp"
-            android:layout_marginEnd="8dp"
-            android:background="@drawable/rounded_rectangle_outline_2dp"
-            android:backgroundTint="?android:attr/divider"
-            android:foreground="?attr/selectableItemBackground"
-            android:padding="16dp">
-
-            <ImageView
-                android:id="@+id/plusIcon"
-                android:layout_width="24dp"
-                android:layout_height="24dp"
-                android:src="@drawable/ic_star_black_24dp"
-                app:layout_constraintBottom_toBottomOf="parent"
-                app:layout_constraintStart_toStartOf="parent"
-                app:layout_constraintTop_toTopOf="parent"
-                tools:tint="@color/tools_theme" />
-
-            <com.moez.QKSMS.common.widget.QkTextView
-                android:id="@+id/plusTitle"
-                android:layout_width="0dp"
-                android:layout_height="wrap_content"
-                android:layout_marginStart="16dp"
-                android:layout_marginEnd="16dp"
-                android:text="@string/drawer_plus_banner_title"
-                android:textColor="?android:attr/textColorPrimary"
-                android:textStyle="bold"
-                app:layout_constraintEnd_toStartOf="@id/plusNext"
-                app:layout_constraintStart_toEndOf="@id/plusIcon"
-                app:layout_constraintTop_toTopOf="parent"
-                app:textSize="primary" />
-
-            <com.moez.QKSMS.common.widget.QkTextView
-                android:id="@+id/plusSummary"
-                android:layout_width="0dp"
-                android:layout_height="wrap_content"
-                android:layout_marginTop="2dp"
-                android:text="@string/drawer_plus_banner_summary"
-                android:textColor="?android:attr/textColorSecondary"
-                app:layout_constraintEnd_toEndOf="@id/plusTitle"
-                app:layout_constraintStart_toStartOf="@id/plusTitle"
-                app:layout_constraintTop_toBottomOf="@id/plusTitle"
-                app:textSize="secondary" />
-
-            <ImageView
-                android:id="@+id/plusNext"
-                android:layout_width="24dp"
-                android:layout_height="24dp"
-                android:src="@drawable/ic_chevron_right_black_24dp"
-                android:tint="?android:attr/textColorTertiary"
-                app:layout_constraintBottom_toBottomOf="parent"
-                app:layout_constraintEnd_toEndOf="parent"
-                app:layout_constraintTop_toTopOf="parent" />
-
-        </androidx.constraintlayout.widget.ConstraintLayout>
-
-        <androidx.constraintlayout.widget.ConstraintLayout
-            android:id="@+id/rateLayout"
-            android:layout_width="match_parent"
-            android:layout_height="wrap_content"
-            android:layout_marginStart="8dp"
-            android:layout_marginTop="8dp"
-            android:layout_marginEnd="8dp"
-            android:background="@drawable/rounded_rectangle_outline_2dp"
-            android:backgroundTint="?android:attr/divider">
-
-            <ImageView
-                android:id="@+id/rateIcon"
-                android:layout_width="24dp"
-                android:layout_height="24dp"
-                android:layout_marginStart="16dp"
-                android:src="@drawable/ic_favorite_black_24dp"
-                app:layout_constraintBottom_toBottomOf="@id/rateSummary"
-                app:layout_constraintStart_toStartOf="parent"
-                app:layout_constraintTop_toTopOf="@id/rateTitle"
-                tools:tint="@color/tools_theme" />
-
-            <com.moez.QKSMS.common.widget.QkTextView
-                android:id="@+id/rateTitle"
-                android:layout_width="0dp"
-                android:layout_height="wrap_content"
-                android:layout_marginStart="16dp"
-                android:layout_marginTop="16dp"
-                android:layout_marginEnd="16dp"
-                android:text="@string/rate_title"
-                android:textColor="?android:attr/textColorPrimary"
-                android:textStyle="bold"
-                app:layout_constraintEnd_toEndOf="parent"
-                app:layout_constraintStart_toEndOf="@id/rateIcon"
-                app:layout_constraintTop_toTopOf="parent"
-                app:textSize="primary" />
-
-            <com.moez.QKSMS.common.widget.QkTextView
-                android:id="@+id/rateSummary"
-                android:layout_width="0dp"
-                android:layout_height="wrap_content"
-                android:layout_marginTop="2dp"
-                android:layout_marginEnd="16dp"
-                android:text="@string/rate_summary"
-                android:textColor="?android:attr/textColorSecondary"
-                app:layout_constraintEnd_toEndOf="@id/rateTitle"
-                app:layout_constraintStart_toStartOf="@id/rateTitle"
-                app:layout_constraintTop_toBottomOf="@id/rateTitle"
-                app:textSize="secondary" />
-
-            <com.moez.QKSMS.common.widget.QkTextView
-                android:id="@+id/rateDismiss"
-                android:layout_width="wrap_content"
-                android:layout_height="wrap_content"
-                android:layout_marginStart="16dp"
-                android:layout_marginTop="8dp"
-                android:paddingStart="16dp"
-                android:paddingTop="16dp"
-                android:paddingBottom="16dp"
-                android:text="@string/rate_dismiss"
-                android:textColor="?android:attr/textColorTertiary"
-                android:textStyle="bold"
-                app:layout_constraintEnd_toStartOf="@id/rateOkay"
-                app:layout_constraintTop_toBottomOf="@id/rateSummary"
-                app:textSize="secondary" />
-
-            <com.moez.QKSMS.common.widget.QkTextView
-                android:id="@+id/rateOkay"
-                android:layout_width="wrap_content"
-                android:layout_height="wrap_content"
-                android:layout_marginTop="8dp"
-                android:layout_marginEnd="8dp"
-                android:background="?attr/selectableItemBackground"
-                android:padding="16dp"
-                android:text="@string/rate_okay"
-                android:textColor="?android:attr/textColorSecondary"
-                android:textStyle="bold"
-                app:layout_constraintEnd_toEndOf="parent"
-                app:layout_constraintTop_toBottomOf="@id/rateSummary"
-                app:textSize="secondary" />
-
-        </androidx.constraintlayout.widget.ConstraintLayout>
-
-    </LinearLayout>
-
+<?xml version="1.0" encoding="utf-8"?>
+<!--
+  ~ Copyright (C) 2019 Moez Bhatti <moez.bhatti@gmail.com>
+  ~
+  ~ This file is part of QKSMS.
+  ~
+  ~ QKSMS is free software: you can redistribute it and/or modify
+  ~ it under the terms of the GNU General Public License as published by
+  ~ the Free Software Foundation, either version 3 of the License, or
+  ~ (at your option) any later version.
+  ~
+  ~ QKSMS is distributed in the hope that it will be useful,
+  ~ but WITHOUT ANY WARRANTY; without even the implied warranty of
+  ~ MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+  ~ GNU General Public License for more details.
+  ~
+  ~ You should have received a copy of the GNU General Public License
+  ~ along with QKSMS.  If not, see <http://www.gnu.org/licenses/>.
+  -->
+<ScrollView xmlns:android="http://schemas.android.com/apk/res/android"
+    xmlns:app="http://schemas.android.com/apk/res-auto"
+    xmlns:tools="http://schemas.android.com/tools"
+    android:layout_width="match_parent"
+    android:layout_height="match_parent"
+    android:background="?android:attr/windowBackground">
+
+    <LinearLayout
+        android:layout_width="match_parent"
+        android:layout_height="wrap_content"
+        android:orientation="vertical"
+        android:paddingTop="8dp"
+        android:paddingBottom="8dp">
+
+        <LinearLayout
+            android:id="@+id/inbox"
+            style="@style/DrawerRow">
+
+            <ImageView
+                android:id="@+id/inboxIcon"
+                style="@style/DrawerIcon"
+                android:src="@drawable/ic_inbox_black_24dp"
+                tools:tint="@color/tools_theme" />
+
+            <com.moez.QKSMS.common.widget.QkTextView
+                style="@style/DrawerText"
+                android:text="@string/drawer_inbox" />
+
+        </LinearLayout>
+
+        <LinearLayout
+            android:id="@+id/archived"
+            style="@style/DrawerRow">
+
+            <ImageView
+                android:id="@+id/archivedIcon"
+                style="@style/DrawerIcon"
+                android:src="@drawable/ic_archive_white_24dp"
+                tools:tint="?android:attr/textColorSecondary" />
+
+            <com.moez.QKSMS.common.widget.QkTextView
+                style="@style/DrawerText"
+                android:text="@string/drawer_archived" />
+
+        </LinearLayout>
+
+        <View
+            android:layout_width="match_parent"
+            android:layout_height="1dp"
+            android:layout_marginTop="8dp"
+            android:layout_marginBottom="8dp"
+            android:background="?android:attr/divider" />
+
+        <LinearLayout
+            android:id="@+id/backup"
+            style="@style/DrawerRow">
+
+            <ImageView
+                style="@style/DrawerIcon"
+                android:src="@drawable/ic_import_export_black_24dp"
+                android:tint="?android:attr/textColorSecondary" />
+
+            <com.moez.QKSMS.common.widget.QkTextView
+                style="@style/DrawerText"
+                android:text="@string/backup_title" />
+
+            <com.moez.QKSMS.common.widget.QkTextView
+                android:id="@+id/plusBadge1"
+                android:layout_width="wrap_content"
+                android:layout_height="wrap_content"
+                android:background="@drawable/rounded_rectangle_2dp"
+                android:padding="4dp"
+                android:text="@string/title_qksms_plus"
+                android:textStyle="bold"
+                app:textSize="tertiary"
+                tools:backgroundTint="@color/tools_theme"
+                tools:textColor="@color/textPrimaryDark" />
+
+        </LinearLayout>
+
+        <LinearLayout
+            android:id="@+id/scheduled"
+            style="@style/DrawerRow">
+
+            <ImageView
+                style="@style/DrawerIcon"
+                android:src="@drawable/ic_event_black_24dp"
+                android:tint="?android:attr/textColorSecondary" />
+
+            <com.moez.QKSMS.common.widget.QkTextView
+                style="@style/DrawerText"
+                android:text="@string/drawer_scheduled" />
+
+            <com.moez.QKSMS.common.widget.QkTextView
+                android:id="@+id/plusBadge2"
+                android:layout_width="wrap_content"
+                android:layout_height="wrap_content"
+                android:background="@drawable/rounded_rectangle_2dp"
+                android:padding="4dp"
+                android:text="@string/title_qksms_plus"
+                android:textStyle="bold"
+                app:textSize="tertiary"
+                tools:backgroundTint="@color/tools_theme"
+                tools:textColor="@color/textPrimaryDark" />
+
+        </LinearLayout>
+
+        <LinearLayout
+            android:id="@+id/blocking"
+            style="@style/DrawerRow">
+
+            <ImageView
+                style="@style/DrawerIcon"
+                android:src="@drawable/ic_block_white_24dp"
+                android:tint="?android:attr/textColorSecondary" />
+
+            <com.moez.QKSMS.common.widget.QkTextView
+                style="@style/DrawerText"
+                android:text="@string/drawer_blocking" />
+
+        </LinearLayout>
+
+        <View
+            android:layout_width="match_parent"
+            android:layout_height="1dp"
+            android:layout_marginTop="8dp"
+            android:layout_marginBottom="8dp"
+            android:background="?android:attr/divider" />
+
+        <LinearLayout
+            android:id="@+id/settings"
+            style="@style/DrawerRow">
+
+            <ImageView
+                style="@style/DrawerIcon"
+                android:src="@drawable/ic_settings_black_24dp"
+                android:tint="?android:attr/textColorSecondary" />
+
+            <com.moez.QKSMS.common.widget.QkTextView
+                style="@style/DrawerText"
+                android:text="@string/drawer_settings" />
+
+        </LinearLayout>
+
+        <LinearLayout
+            android:id="@+id/plus"
+            style="@style/DrawerRow">
+
+            <ImageView
+                style="@style/DrawerIcon"
+                android:src="@drawable/ic_star_black_24dp"
+                android:tint="?android:attr/textColorSecondary" />
+
+            <com.moez.QKSMS.common.widget.QkTextView
+                style="@style/DrawerText"
+                android:text="@string/drawer_plus" />
+
+        </LinearLayout>
+
+        <LinearLayout
+            android:id="@+id/help"
+            style="@style/DrawerRow">
+
+            <ImageView
+                style="@style/DrawerIcon"
+                android:src="@drawable/ic_help_black_24dp"
+                android:tint="?android:attr/textColorSecondary" />
+
+            <com.moez.QKSMS.common.widget.QkTextView
+                style="@style/DrawerText"
+                android:text="@string/drawer_help" />
+
+        </LinearLayout>
+
+        <LinearLayout
+            android:id="@+id/invite"
+            style="@style/DrawerRow">
+
+            <ImageView
+                style="@style/DrawerIcon"
+                android:src="@drawable/ic_people_black_24dp"
+                android:tint="?android:attr/textColorSecondary" />
+
+            <com.moez.QKSMS.common.widget.QkTextView
+                style="@style/DrawerText"
+                android:text="@string/drawer_invite" />
+
+        </LinearLayout>
+
+        <androidx.constraintlayout.widget.ConstraintLayout
+            android:id="@+id/plusBanner"
+            android:layout_width="match_parent"
+            android:layout_height="wrap_content"
+            android:layout_marginStart="8dp"
+            android:layout_marginTop="8dp"
+            android:layout_marginEnd="8dp"
+            android:background="@drawable/rounded_rectangle_outline_2dp"
+            android:backgroundTint="?android:attr/divider"
+            android:foreground="?attr/selectableItemBackground"
+            android:padding="16dp">
+
+            <ImageView
+                android:id="@+id/plusIcon"
+                android:layout_width="24dp"
+                android:layout_height="24dp"
+                android:src="@drawable/ic_star_black_24dp"
+                app:layout_constraintBottom_toBottomOf="parent"
+                app:layout_constraintStart_toStartOf="parent"
+                app:layout_constraintTop_toTopOf="parent"
+                tools:tint="@color/tools_theme" />
+
+            <com.moez.QKSMS.common.widget.QkTextView
+                android:id="@+id/plusTitle"
+                android:layout_width="0dp"
+                android:layout_height="wrap_content"
+                android:layout_marginStart="16dp"
+                android:layout_marginEnd="16dp"
+                android:text="@string/drawer_plus_banner_title"
+                android:textColor="?android:attr/textColorPrimary"
+                android:textStyle="bold"
+                app:layout_constraintEnd_toStartOf="@id/plusNext"
+                app:layout_constraintStart_toEndOf="@id/plusIcon"
+                app:layout_constraintTop_toTopOf="parent"
+                app:textSize="primary" />
+
+            <com.moez.QKSMS.common.widget.QkTextView
+                android:id="@+id/plusSummary"
+                android:layout_width="0dp"
+                android:layout_height="wrap_content"
+                android:layout_marginTop="2dp"
+                android:text="@string/drawer_plus_banner_summary"
+                android:textColor="?android:attr/textColorSecondary"
+                app:layout_constraintEnd_toEndOf="@id/plusTitle"
+                app:layout_constraintStart_toStartOf="@id/plusTitle"
+                app:layout_constraintTop_toBottomOf="@id/plusTitle"
+                app:textSize="secondary" />
+
+            <ImageView
+                android:id="@+id/plusNext"
+                android:layout_width="24dp"
+                android:layout_height="24dp"
+                android:src="@drawable/ic_chevron_right_black_24dp"
+                android:tint="?android:attr/textColorTertiary"
+                app:layout_constraintBottom_toBottomOf="parent"
+                app:layout_constraintEnd_toEndOf="parent"
+                app:layout_constraintTop_toTopOf="parent" />
+
+        </androidx.constraintlayout.widget.ConstraintLayout>
+
+        <androidx.constraintlayout.widget.ConstraintLayout
+            android:id="@+id/rateLayout"
+            android:layout_width="match_parent"
+            android:layout_height="wrap_content"
+            android:layout_marginStart="8dp"
+            android:layout_marginTop="8dp"
+            android:layout_marginEnd="8dp"
+            android:background="@drawable/rounded_rectangle_outline_2dp"
+            android:backgroundTint="?android:attr/divider">
+
+            <ImageView
+                android:id="@+id/rateIcon"
+                android:layout_width="24dp"
+                android:layout_height="24dp"
+                android:layout_marginStart="16dp"
+                android:src="@drawable/ic_favorite_black_24dp"
+                app:layout_constraintBottom_toBottomOf="@id/rateSummary"
+                app:layout_constraintStart_toStartOf="parent"
+                app:layout_constraintTop_toTopOf="@id/rateTitle"
+                tools:tint="@color/tools_theme" />
+
+            <com.moez.QKSMS.common.widget.QkTextView
+                android:id="@+id/rateTitle"
+                android:layout_width="0dp"
+                android:layout_height="wrap_content"
+                android:layout_marginStart="16dp"
+                android:layout_marginTop="16dp"
+                android:layout_marginEnd="16dp"
+                android:text="@string/rate_title"
+                android:textColor="?android:attr/textColorPrimary"
+                android:textStyle="bold"
+                app:layout_constraintEnd_toEndOf="parent"
+                app:layout_constraintStart_toEndOf="@id/rateIcon"
+                app:layout_constraintTop_toTopOf="parent"
+                app:textSize="primary" />
+
+            <com.moez.QKSMS.common.widget.QkTextView
+                android:id="@+id/rateSummary"
+                android:layout_width="0dp"
+                android:layout_height="wrap_content"
+                android:layout_marginTop="2dp"
+                android:layout_marginEnd="16dp"
+                android:text="@string/rate_summary"
+                android:textColor="?android:attr/textColorSecondary"
+                app:layout_constraintEnd_toEndOf="@id/rateTitle"
+                app:layout_constraintStart_toStartOf="@id/rateTitle"
+                app:layout_constraintTop_toBottomOf="@id/rateTitle"
+                app:textSize="secondary" />
+
+            <com.moez.QKSMS.common.widget.QkTextView
+                android:id="@+id/rateDismiss"
+                android:layout_width="wrap_content"
+                android:layout_height="wrap_content"
+                android:layout_marginStart="16dp"
+                android:layout_marginTop="8dp"
+                android:paddingStart="16dp"
+                android:paddingTop="16dp"
+                android:paddingBottom="16dp"
+                android:text="@string/rate_dismiss"
+                android:textColor="?android:attr/textColorTertiary"
+                android:textStyle="bold"
+                app:layout_constraintEnd_toStartOf="@id/rateOkay"
+                app:layout_constraintTop_toBottomOf="@id/rateSummary"
+                app:textSize="secondary" />
+
+            <com.moez.QKSMS.common.widget.QkTextView
+                android:id="@+id/rateOkay"
+                android:layout_width="wrap_content"
+                android:layout_height="wrap_content"
+                android:layout_marginTop="8dp"
+                android:layout_marginEnd="8dp"
+                android:background="?attr/selectableItemBackground"
+                android:padding="16dp"
+                android:text="@string/rate_okay"
+                android:textColor="?android:attr/textColorSecondary"
+                android:textStyle="bold"
+                app:layout_constraintEnd_toEndOf="parent"
+                app:layout_constraintTop_toBottomOf="@id/rateSummary"
+                app:textSize="secondary" />
+
+        </androidx.constraintlayout.widget.ConstraintLayout>
+
+    </LinearLayout>
+
 </ScrollView>
\ No newline at end of file
diff --git a/presentation/src/main/res/layout/gallery_activity.xml b/presentation/src/main/res/layout/gallery_activity.xml
index fe2a4f1da..0fef73b3f 100644
--- a/presentation/src/main/res/layout/gallery_activity.xml
+++ b/presentation/src/main/res/layout/gallery_activity.xml
@@ -1,72 +1,72 @@
-<?xml version="1.0" encoding="utf-8"?>
-<!--
-  ~ Copyright (C) 2019 Moez Bhatti <moez.bhatti@gmail.com>
-  ~
-  ~ This file is part of QKSMS.
-  ~
-  ~ QKSMS is free software: you can redistribute it and/or modify
-  ~ it under the terms of the GNU General Public License as published by
-  ~ the Free Software Foundation, either version 3 of the License, or
-  ~ (at your option) any later version.
-  ~
-  ~ QKSMS is distributed in the hope that it will be useful,
-  ~ but WITHOUT ANY WARRANTY; without even the implied warranty of
-  ~ MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
-  ~ GNU General Public License for more details.
-  ~
-  ~ You should have received a copy of the GNU General Public License
-  ~ along with QKSMS.  If not, see <http://www.gnu.org/licenses/>.
-  -->
-<FrameLayout xmlns:android="http://schemas.android.com/apk/res/android"
-    xmlns:app="http://schemas.android.com/apk/res-auto"
-    xmlns:tools="http://schemas.android.com/tools"
-    android:id="@+id/root"
-    android:layout_width="match_parent"
-    android:layout_height="match_parent"
-    tools:context="com.moez.QKSMS.feature.gallery.GalleryActivity">
-
-    <androidx.viewpager2.widget.ViewPager2
-        android:id="@+id/pager"
-        android:layout_width="match_parent"
-        android:layout_height="match_parent" />
-
-    <androidx.appcompat.widget.Toolbar
-        android:id="@+id/toolbar"
-        android:layout_width="match_parent"
-        android:layout_height="56dp"
-        android:background="@color/toolbarTranslucent"
-        android:gravity="center_vertical"
-        android:minHeight="56dp">
-
-        <LinearLayout
-            android:layout_width="match_parent"
-            android:layout_height="match_parent"
-            android:gravity="center_vertical"
-            android:orientation="vertical">
-
-            <com.moez.QKSMS.common.widget.QkTextView
-                android:id="@+id/toolbarTitle"
-                android:layout_width="match_parent"
-                android:layout_height="wrap_content"
-                android:background="@null"
-                android:gravity="start"
-                android:maxLines="1"
-                android:singleLine="true"
-                android:textColor="@color/textPrimaryDark"
-                app:textSize="toolbar"
-                tools:text="Conversations" />
-
-            <com.moez.QKSMS.common.widget.QkTextView
-                android:id="@+id/toolbarSubtitle"
-                android:layout_width="match_parent"
-                android:layout_height="wrap_content"
-                android:layout_marginTop="2dp"
-                android:textColor="@color/textTertiaryDark"
-                android:visibility="gone"
-                app:textSize="secondary" />
-
-        </LinearLayout>
-
-    </androidx.appcompat.widget.Toolbar>
-
+<?xml version="1.0" encoding="utf-8"?>
+<!--
+  ~ Copyright (C) 2019 Moez Bhatti <moez.bhatti@gmail.com>
+  ~
+  ~ This file is part of QKSMS.
+  ~
+  ~ QKSMS is free software: you can redistribute it and/or modify
+  ~ it under the terms of the GNU General Public License as published by
+  ~ the Free Software Foundation, either version 3 of the License, or
+  ~ (at your option) any later version.
+  ~
+  ~ QKSMS is distributed in the hope that it will be useful,
+  ~ but WITHOUT ANY WARRANTY; without even the implied warranty of
+  ~ MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+  ~ GNU General Public License for more details.
+  ~
+  ~ You should have received a copy of the GNU General Public License
+  ~ along with QKSMS.  If not, see <http://www.gnu.org/licenses/>.
+  -->
+<FrameLayout xmlns:android="http://schemas.android.com/apk/res/android"
+    xmlns:app="http://schemas.android.com/apk/res-auto"
+    xmlns:tools="http://schemas.android.com/tools"
+    android:id="@+id/root"
+    android:layout_width="match_parent"
+    android:layout_height="match_parent"
+    tools:context="com.moez.QKSMS.feature.gallery.GalleryActivity">
+
+    <androidx.viewpager2.widget.ViewPager2
+        android:id="@+id/pager"
+        android:layout_width="match_parent"
+        android:layout_height="match_parent" />
+
+    <androidx.appcompat.widget.Toolbar
+        android:id="@+id/toolbar"
+        android:layout_width="match_parent"
+        android:layout_height="56dp"
+        android:background="@color/toolbarTranslucent"
+        android:gravity="center_vertical"
+        android:minHeight="56dp">
+
+        <LinearLayout
+            android:layout_width="match_parent"
+            android:layout_height="match_parent"
+            android:gravity="center_vertical"
+            android:orientation="vertical">
+
+            <com.moez.QKSMS.common.widget.QkTextView
+                android:id="@+id/toolbarTitle"
+                android:layout_width="match_parent"
+                android:layout_height="wrap_content"
+                android:background="@null"
+                android:gravity="start"
+                android:maxLines="1"
+                android:singleLine="true"
+                android:textColor="@color/textPrimaryDark"
+                app:textSize="toolbar"
+                tools:text="Conversations" />
+
+            <com.moez.QKSMS.common.widget.QkTextView
+                android:id="@+id/toolbarSubtitle"
+                android:layout_width="match_parent"
+                android:layout_height="wrap_content"
+                android:layout_marginTop="2dp"
+                android:textColor="@color/textTertiaryDark"
+                android:visibility="gone"
+                app:textSize="secondary" />
+
+        </LinearLayout>
+
+    </androidx.appcompat.widget.Toolbar>
+
 </FrameLayout>
\ No newline at end of file
diff --git a/presentation/src/main/res/layout/gallery_image_page.xml b/presentation/src/main/res/layout/gallery_image_page.xml
index a6360c21f..e0fdab027 100644
--- a/presentation/src/main/res/layout/gallery_image_page.xml
+++ b/presentation/src/main/res/layout/gallery_image_page.xml
@@ -1,23 +1,23 @@
-<?xml version="1.0" encoding="utf-8"?>
-<!--
-  ~ Copyright (C) 2019 Moez Bhatti <moez.bhatti@gmail.com>
-  ~
-  ~ This file is part of QKSMS.
-  ~
-  ~ QKSMS is free software: you can redistribute it and/or modify
-  ~ it under the terms of the GNU General Public License as published by
-  ~ the Free Software Foundation, either version 3 of the License, or
-  ~ (at your option) any later version.
-  ~
-  ~ QKSMS is distributed in the hope that it will be useful,
-  ~ but WITHOUT ANY WARRANTY; without even the implied warranty of
-  ~ MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
-  ~ GNU General Public License for more details.
-  ~
-  ~ You should have received a copy of the GNU General Public License
-  ~ along with QKSMS.  If not, see <http://www.gnu.org/licenses/>.
-  -->
-<com.github.chrisbanes.photoview.PhotoView xmlns:android="http://schemas.android.com/apk/res/android"
-    android:id="@+id/image"
-    android:layout_width="match_parent"
+<?xml version="1.0" encoding="utf-8"?>
+<!--
+  ~ Copyright (C) 2019 Moez Bhatti <moez.bhatti@gmail.com>
+  ~
+  ~ This file is part of QKSMS.
+  ~
+  ~ QKSMS is free software: you can redistribute it and/or modify
+  ~ it under the terms of the GNU General Public License as published by
+  ~ the Free Software Foundation, either version 3 of the License, or
+  ~ (at your option) any later version.
+  ~
+  ~ QKSMS is distributed in the hope that it will be useful,
+  ~ but WITHOUT ANY WARRANTY; without even the implied warranty of
+  ~ MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+  ~ GNU General Public License for more details.
+  ~
+  ~ You should have received a copy of the GNU General Public License
+  ~ along with QKSMS.  If not, see <http://www.gnu.org/licenses/>.
+  -->
+<com.github.chrisbanes.photoview.PhotoView xmlns:android="http://schemas.android.com/apk/res/android"
+    android:id="@+id/image"
+    android:layout_width="match_parent"
     android:layout_height="match_parent" />
\ No newline at end of file
diff --git a/presentation/src/main/res/layout/gallery_invalid_page.xml b/presentation/src/main/res/layout/gallery_invalid_page.xml
index dd09cddee..57daa31e7 100644
--- a/presentation/src/main/res/layout/gallery_invalid_page.xml
+++ b/presentation/src/main/res/layout/gallery_invalid_page.xml
@@ -1,27 +1,27 @@
-<?xml version="1.0" encoding="utf-8"?>
-<!--
-  ~ Copyright (C) 2019 Moez Bhatti <moez.bhatti@gmail.com>
-  ~
-  ~ This file is part of QKSMS.
-  ~
-  ~ QKSMS is free software: you can redistribute it and/or modify
-  ~ it under the terms of the GNU General Public License as published by
-  ~ the Free Software Foundation, either version 3 of the License, or
-  ~ (at your option) any later version.
-  ~
-  ~ QKSMS is distributed in the hope that it will be useful,
-  ~ but WITHOUT ANY WARRANTY; without even the implied warranty of
-  ~ MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
-  ~ GNU General Public License for more details.
-  ~
-  ~ You should have received a copy of the GNU General Public License
-  ~ along with QKSMS.  If not, see <http://www.gnu.org/licenses/>.
-  -->
-<com.moez.QKSMS.common.widget.QkTextView xmlns:android="http://schemas.android.com/apk/res/android"
-    xmlns:app="http://schemas.android.com/apk/res-auto"
-    android:layout_width="match_parent"
-    android:layout_height="match_parent"
-    android:gravity="center"
-    android:text="@string/gallery_error"
-    android:textColor="?android:attr/textColorSecondary"
+<?xml version="1.0" encoding="utf-8"?>
+<!--
+  ~ Copyright (C) 2019 Moez Bhatti <moez.bhatti@gmail.com>
+  ~
+  ~ This file is part of QKSMS.
+  ~
+  ~ QKSMS is free software: you can redistribute it and/or modify
+  ~ it under the terms of the GNU General Public License as published by
+  ~ the Free Software Foundation, either version 3 of the License, or
+  ~ (at your option) any later version.
+  ~
+  ~ QKSMS is distributed in the hope that it will be useful,
+  ~ but WITHOUT ANY WARRANTY; without even the implied warranty of
+  ~ MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+  ~ GNU General Public License for more details.
+  ~
+  ~ You should have received a copy of the GNU General Public License
+  ~ along with QKSMS.  If not, see <http://www.gnu.org/licenses/>.
+  -->
+<com.moez.QKSMS.common.widget.QkTextView xmlns:android="http://schemas.android.com/apk/res/android"
+    xmlns:app="http://schemas.android.com/apk/res-auto"
+    android:layout_width="match_parent"
+    android:layout_height="match_parent"
+    android:gravity="center"
+    android:text="@string/gallery_error"
+    android:textColor="?android:attr/textColorSecondary"
     app:textSize="primary" />
\ No newline at end of file
diff --git a/presentation/src/main/res/layout/gallery_video_page.xml b/presentation/src/main/res/layout/gallery_video_page.xml
index 5e3b32447..f4797d9cf 100644
--- a/presentation/src/main/res/layout/gallery_video_page.xml
+++ b/presentation/src/main/res/layout/gallery_video_page.xml
@@ -1,23 +1,23 @@
-<?xml version="1.0" encoding="utf-8"?>
-<!--
-  ~ Copyright (C) 2019 Moez Bhatti <moez.bhatti@gmail.com>
-  ~
-  ~ This file is part of QKSMS.
-  ~
-  ~ QKSMS is free software: you can redistribute it and/or modify
-  ~ it under the terms of the GNU General Public License as published by
-  ~ the Free Software Foundation, either version 3 of the License, or
-  ~ (at your option) any later version.
-  ~
-  ~ QKSMS is distributed in the hope that it will be useful,
-  ~ but WITHOUT ANY WARRANTY; without even the implied warranty of
-  ~ MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
-  ~ GNU General Public License for more details.
-  ~
-  ~ You should have received a copy of the GNU General Public License
-  ~ along with QKSMS.  If not, see <http://www.gnu.org/licenses/>.
-  -->
-<com.google.android.exoplayer2.ui.PlayerView xmlns:android="http://schemas.android.com/apk/res/android"
-    android:id="@+id/video"
-    android:layout_width="match_parent"
+<?xml version="1.0" encoding="utf-8"?>
+<!--
+  ~ Copyright (C) 2019 Moez Bhatti <moez.bhatti@gmail.com>
+  ~
+  ~ This file is part of QKSMS.
+  ~
+  ~ QKSMS is free software: you can redistribute it and/or modify
+  ~ it under the terms of the GNU General Public License as published by
+  ~ the Free Software Foundation, either version 3 of the License, or
+  ~ (at your option) any later version.
+  ~
+  ~ QKSMS is distributed in the hope that it will be useful,
+  ~ but WITHOUT ANY WARRANTY; without even the implied warranty of
+  ~ MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+  ~ GNU General Public License for more details.
+  ~
+  ~ You should have received a copy of the GNU General Public License
+  ~ along with QKSMS.  If not, see <http://www.gnu.org/licenses/>.
+  -->
+<com.google.android.exoplayer2.ui.PlayerView xmlns:android="http://schemas.android.com/apk/res/android"
+    android:id="@+id/video"
+    android:layout_width="match_parent"
     android:layout_height="match_parent" />
\ No newline at end of file
diff --git a/presentation/src/main/res/layout/group_avatar_view.xml b/presentation/src/main/res/layout/group_avatar_view.xml
index 52a524267..06685a53f 100644
--- a/presentation/src/main/res/layout/group_avatar_view.xml
+++ b/presentation/src/main/res/layout/group_avatar_view.xml
@@ -1,71 +1,71 @@
-<?xml version="1.0" encoding="utf-8"?>
-<!--
-  ~ Copyright (C) 2019 Moez Bhatti <moez.bhatti@gmail.com>
-  ~
-  ~ This file is part of QKSMS.
-  ~
-  ~ QKSMS is free software: you can redistribute it and/or modify
-  ~ it under the terms of the GNU General Public License as published by
-  ~ the Free Software Foundation, either version 3 of the License, or
-  ~ (at your option) any later version.
-  ~
-  ~ QKSMS is distributed in the hope that it will be useful,
-  ~ but WITHOUT ANY WARRANTY; without even the implied warranty of
-  ~ MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
-  ~ GNU General Public License for more details.
-  ~
-  ~ You should have received a copy of the GNU General Public License
-  ~ along with QKSMS.  If not, see <http://www.gnu.org/licenses/>.
-  -->
-<merge xmlns:android="http://schemas.android.com/apk/res/android"
-    xmlns:app="http://schemas.android.com/apk/res-auto"
-    xmlns:tools="http://schemas.android.com/tools"
-    android:layout_width="match_parent"
-    android:layout_height="match_parent"
-    tools:parentTag="com.moez.QKSMS.common.widget.GroupAvatarView">
-
-    <FrameLayout
-        android:id="@+id/avatar2Frame"
-        android:layout_width="0dp"
-        android:layout_height="0dp"
-        android:padding="4dp"
-        app:layout_constraintBottom_toBottomOf="parent"
-        app:layout_constraintDimensionRatio="1:1"
-        app:layout_constraintEnd_toEndOf="parent"
-        app:layout_constraintHorizontal_bias="1"
-        app:layout_constraintStart_toStartOf="parent"
-        app:layout_constraintTop_toTopOf="parent"
-        app:layout_constraintVertical_bias="0"
-        app:layout_constraintWidth_percent=".75">
-
-        <com.moez.QKSMS.common.widget.AvatarView
-            android:id="@+id/avatar2"
-            android:layout_width="match_parent"
-            android:layout_height="match_parent" />
-
-    </FrameLayout>
-
-    <FrameLayout
-        android:id="@+id/avatar1Frame"
-        android:layout_width="0dp"
-        android:layout_height="0dp"
-        android:background="@drawable/circle"
-        android:backgroundTint="?android:attr/windowBackground"
-        android:padding="4dp"
-        app:layout_constraintBottom_toBottomOf="parent"
-        app:layout_constraintDimensionRatio="1:1"
-        app:layout_constraintEnd_toEndOf="parent"
-        app:layout_constraintHorizontal_bias="0"
-        app:layout_constraintStart_toStartOf="parent"
-        app:layout_constraintTop_toTopOf="parent"
-        app:layout_constraintVertical_bias="1"
-        app:layout_constraintWidth_percent=".75">
-
-        <com.moez.QKSMS.common.widget.AvatarView
-            android:id="@+id/avatar1"
-            android:layout_width="match_parent"
-            android:layout_height="match_parent" />
-
-    </FrameLayout>
-
+<?xml version="1.0" encoding="utf-8"?>
+<!--
+  ~ Copyright (C) 2019 Moez Bhatti <moez.bhatti@gmail.com>
+  ~
+  ~ This file is part of QKSMS.
+  ~
+  ~ QKSMS is free software: you can redistribute it and/or modify
+  ~ it under the terms of the GNU General Public License as published by
+  ~ the Free Software Foundation, either version 3 of the License, or
+  ~ (at your option) any later version.
+  ~
+  ~ QKSMS is distributed in the hope that it will be useful,
+  ~ but WITHOUT ANY WARRANTY; without even the implied warranty of
+  ~ MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+  ~ GNU General Public License for more details.
+  ~
+  ~ You should have received a copy of the GNU General Public License
+  ~ along with QKSMS.  If not, see <http://www.gnu.org/licenses/>.
+  -->
+<merge xmlns:android="http://schemas.android.com/apk/res/android"
+    xmlns:app="http://schemas.android.com/apk/res-auto"
+    xmlns:tools="http://schemas.android.com/tools"
+    android:layout_width="match_parent"
+    android:layout_height="match_parent"
+    tools:parentTag="com.moez.QKSMS.common.widget.GroupAvatarView">
+
+    <FrameLayout
+        android:id="@+id/avatar2Frame"
+        android:layout_width="0dp"
+        android:layout_height="0dp"
+        android:padding="4dp"
+        app:layout_constraintBottom_toBottomOf="parent"
+        app:layout_constraintDimensionRatio="1:1"
+        app:layout_constraintEnd_toEndOf="parent"
+        app:layout_constraintHorizontal_bias="1"
+        app:layout_constraintStart_toStartOf="parent"
+        app:layout_constraintTop_toTopOf="parent"
+        app:layout_constraintVertical_bias="0"
+        app:layout_constraintWidth_percent=".75">
+
+        <com.moez.QKSMS.common.widget.AvatarView
+            android:id="@+id/avatar2"
+            android:layout_width="match_parent"
+            android:layout_height="match_parent" />
+
+    </FrameLayout>
+
+    <FrameLayout
+        android:id="@+id/avatar1Frame"
+        android:layout_width="0dp"
+        android:layout_height="0dp"
+        android:background="@drawable/circle"
+        android:backgroundTint="?android:attr/windowBackground"
+        android:padding="4dp"
+        app:layout_constraintBottom_toBottomOf="parent"
+        app:layout_constraintDimensionRatio="1:1"
+        app:layout_constraintEnd_toEndOf="parent"
+        app:layout_constraintHorizontal_bias="0"
+        app:layout_constraintStart_toStartOf="parent"
+        app:layout_constraintTop_toTopOf="parent"
+        app:layout_constraintVertical_bias="1"
+        app:layout_constraintWidth_percent=".75">
+
+        <com.moez.QKSMS.common.widget.AvatarView
+            android:id="@+id/avatar1"
+            android:layout_width="match_parent"
+            android:layout_height="match_parent" />
+
+    </FrameLayout>
+
 </merge>
\ No newline at end of file
diff --git a/presentation/src/main/res/layout/hsv_picker_view.xml b/presentation/src/main/res/layout/hsv_picker_view.xml
index bdc1685a7..09bbfa3ca 100644
--- a/presentation/src/main/res/layout/hsv_picker_view.xml
+++ b/presentation/src/main/res/layout/hsv_picker_view.xml
@@ -1,104 +1,104 @@
-<?xml version="1.0" encoding="utf-8"?>
-<!--
-  ~ Copyright (C) 2019 Moez Bhatti <moez.bhatti@gmail.com>
-  ~
-  ~ This file is part of QKSMS.
-  ~
-  ~ QKSMS is free software: you can redistribute it and/or modify
-  ~ it under the terms of the GNU General Public License as published by
-  ~ the Free Software Foundation, either version 3 of the License, or
-  ~ (at your option) any later version.
-  ~
-  ~ QKSMS is distributed in the hope that it will be useful,
-  ~ but WITHOUT ANY WARRANTY; without even the implied warranty of
-  ~ MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
-  ~ GNU General Public License for more details.
-  ~
-  ~ You should have received a copy of the GNU General Public License
-  ~ along with QKSMS.  If not, see <http://www.gnu.org/licenses/>.
-  -->
-<merge xmlns:android="http://schemas.android.com/apk/res/android"
-    xmlns:app="http://schemas.android.com/apk/res-auto"
-    xmlns:tools="http://schemas.android.com/tools"
-    android:layout_width="match_parent"
-    android:layout_height="wrap_content"
-    tools:parentTag="com.moez.QKSMS.feature.themepicker.HSVPickerView">
-
-    <View
-        android:layout_width="0dp"
-        android:layout_height="0dp"
-        android:background="@drawable/rounded_rectangle_4dp"
-        android:backgroundTint="@color/white"
-        app:layout_constraintBottom_toBottomOf="@id/saturation"
-        app:layout_constraintEnd_toEndOf="@id/saturation"
-        app:layout_constraintStart_toStartOf="@id/saturation"
-        app:layout_constraintTop_toTopOf="@id/saturation" />
-
-    <View
-        android:id="@+id/saturation"
-        android:layout_width="0dp"
-        android:layout_height="0dp"
-        android:layout_marginStart="24dp"
-        android:layout_marginTop="24dp"
-        android:layout_marginEnd="24dp"
-        android:background="@drawable/color_picker_gradient"
-        app:layout_constraintDimensionRatio="1"
-        app:layout_constraintEnd_toEndOf="parent"
-        app:layout_constraintStart_toStartOf="parent"
-        app:layout_constraintTop_toTopOf="parent"
-        tools:backgroundTint="@color/tools_theme" />
-
-    <View
-        android:layout_width="0dp"
-        android:layout_height="0dp"
-        android:background="@drawable/color_picker_gradient"
-        android:rotation="90"
-        app:layout_constraintBottom_toBottomOf="@id/saturation"
-        app:layout_constraintEnd_toEndOf="@id/saturation"
-        app:layout_constraintStart_toStartOf="@id/saturation"
-        app:layout_constraintTop_toTopOf="@id/saturation" />
-
-    <ImageView
-        android:id="@+id/swatch"
-        android:layout_width="16dp"
-        android:layout_height="16dp"
-        android:background="@drawable/circle"
-        android:elevation="4dp"
-        android:padding="2dp"
-        android:src="@drawable/circle"
-        tools:tint="@color/tools_theme"
-        tools:translationX="240dp"
-        tools:translationY="120dp" />
-
-    <FrameLayout
-        android:id="@+id/hueGroup"
-        android:layout_width="0dp"
-        android:layout_height="wrap_content"
-        android:clipToPadding="false"
-        android:paddingStart="24dp"
-        android:paddingTop="16dp"
-        android:paddingEnd="24dp"
-        android:paddingBottom="16dp"
-        app:layout_constraintBottom_toBottomOf="parent"
-        app:layout_constraintEnd_toEndOf="parent"
-        app:layout_constraintStart_toStartOf="parent"
-        app:layout_constraintTop_toBottomOf="@id/saturation">
-
-        <ImageView
-            android:id="@+id/hueTrack"
-            android:layout_width="match_parent"
-            android:layout_height="2dp"
-            android:layout_gravity="center_vertical"
-            android:background="@drawable/rounded_rectangle_2dp" />
-
-        <View
-            android:id="@+id/hueThumb"
-            android:layout_width="16dp"
-            android:layout_height="16dp"
-            android:background="@drawable/circle"
-            android:elevation="4dp"
-            tools:tint="@color/tools_theme" />
-
-    </FrameLayout>
-
+<?xml version="1.0" encoding="utf-8"?>
+<!--
+  ~ Copyright (C) 2019 Moez Bhatti <moez.bhatti@gmail.com>
+  ~
+  ~ This file is part of QKSMS.
+  ~
+  ~ QKSMS is free software: you can redistribute it and/or modify
+  ~ it under the terms of the GNU General Public License as published by
+  ~ the Free Software Foundation, either version 3 of the License, or
+  ~ (at your option) any later version.
+  ~
+  ~ QKSMS is distributed in the hope that it will be useful,
+  ~ but WITHOUT ANY WARRANTY; without even the implied warranty of
+  ~ MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+  ~ GNU General Public License for more details.
+  ~
+  ~ You should have received a copy of the GNU General Public License
+  ~ along with QKSMS.  If not, see <http://www.gnu.org/licenses/>.
+  -->
+<merge xmlns:android="http://schemas.android.com/apk/res/android"
+    xmlns:app="http://schemas.android.com/apk/res-auto"
+    xmlns:tools="http://schemas.android.com/tools"
+    android:layout_width="match_parent"
+    android:layout_height="wrap_content"
+    tools:parentTag="com.moez.QKSMS.feature.themepicker.HSVPickerView">
+
+    <View
+        android:layout_width="0dp"
+        android:layout_height="0dp"
+        android:background="@drawable/rounded_rectangle_4dp"
+        android:backgroundTint="@color/white"
+        app:layout_constraintBottom_toBottomOf="@id/saturation"
+        app:layout_constraintEnd_toEndOf="@id/saturation"
+        app:layout_constraintStart_toStartOf="@id/saturation"
+        app:layout_constraintTop_toTopOf="@id/saturation" />
+
+    <View
+        android:id="@+id/saturation"
+        android:layout_width="0dp"
+        android:layout_height="0dp"
+        android:layout_marginStart="24dp"
+        android:layout_marginTop="24dp"
+        android:layout_marginEnd="24dp"
+        android:background="@drawable/color_picker_gradient"
+        app:layout_constraintDimensionRatio="1"
+        app:layout_constraintEnd_toEndOf="parent"
+        app:layout_constraintStart_toStartOf="parent"
+        app:layout_constraintTop_toTopOf="parent"
+        tools:backgroundTint="@color/tools_theme" />
+
+    <View
+        android:layout_width="0dp"
+        android:layout_height="0dp"
+        android:background="@drawable/color_picker_gradient"
+        android:rotation="90"
+        app:layout_constraintBottom_toBottomOf="@id/saturation"
+        app:layout_constraintEnd_toEndOf="@id/saturation"
+        app:layout_constraintStart_toStartOf="@id/saturation"
+        app:layout_constraintTop_toTopOf="@id/saturation" />
+
+    <ImageView
+        android:id="@+id/swatch"
+        android:layout_width="16dp"
+        android:layout_height="16dp"
+        android:background="@drawable/circle"
+        android:elevation="4dp"
+        android:padding="2dp"
+        android:src="@drawable/circle"
+        tools:tint="@color/tools_theme"
+        tools:translationX="240dp"
+        tools:translationY="120dp" />
+
+    <FrameLayout
+        android:id="@+id/hueGroup"
+        android:layout_width="0dp"
+        android:layout_height="wrap_content"
+        android:clipToPadding="false"
+        android:paddingStart="24dp"
+        android:paddingTop="16dp"
+        android:paddingEnd="24dp"
+        android:paddingBottom="16dp"
+        app:layout_constraintBottom_toBottomOf="parent"
+        app:layout_constraintEnd_toEndOf="parent"
+        app:layout_constraintStart_toStartOf="parent"
+        app:layout_constraintTop_toBottomOf="@id/saturation">
+
+        <ImageView
+            android:id="@+id/hueTrack"
+            android:layout_width="match_parent"
+            android:layout_height="2dp"
+            android:layout_gravity="center_vertical"
+            android:background="@drawable/rounded_rectangle_2dp" />
+
+        <View
+            android:id="@+id/hueThumb"
+            android:layout_width="16dp"
+            android:layout_height="16dp"
+            android:background="@drawable/circle"
+            android:elevation="4dp"
+            tools:tint="@color/tools_theme" />
+
+    </FrameLayout>
+
 </merge>
\ No newline at end of file
diff --git a/presentation/src/main/res/layout/main_activity.xml b/presentation/src/main/res/layout/main_activity.xml
index 4b9bebf2a..4355cda93 100644
--- a/presentation/src/main/res/layout/main_activity.xml
+++ b/presentation/src/main/res/layout/main_activity.xml
@@ -1,149 +1,149 @@
-<?xml version="1.0" encoding="utf-8"?>
-<!--
-  ~ Copyright (C) 2019 Moez Bhatti <moez.bhatti@gmail.com>
-  ~
-  ~ This file is part of QKSMS.
-  ~
-  ~ QKSMS is free software: you can redistribute it and/or modify
-  ~ it under the terms of the GNU General Public License as published by
-  ~ the Free Software Foundation, either version 3 of the License, or
-  ~ (at your option) any later version.
-  ~
-  ~ QKSMS is distributed in the hope that it will be useful,
-  ~ but WITHOUT ANY WARRANTY; without even the implied warranty of
-  ~ MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
-  ~ GNU General Public License for more details.
-  ~
-  ~ You should have received a copy of the GNU General Public License
-  ~ along with QKSMS.  If not, see <http://www.gnu.org/licenses/>.
-  -->
-<androidx.drawerlayout.widget.DrawerLayout xmlns:android="http://schemas.android.com/apk/res/android"
-    xmlns:app="http://schemas.android.com/apk/res-auto"
-    xmlns:tools="http://schemas.android.com/tools"
-    android:id="@+id/drawerLayout"
-    android:layout_width="match_parent"
-    android:layout_height="match_parent">
-
-    <androidx.constraintlayout.widget.ConstraintLayout
-        android:layout_width="match_parent"
-        android:layout_height="match_parent"
-        android:animateLayoutChanges="true">
-
-        <androidx.appcompat.widget.Toolbar
-            android:id="@+id/toolbar"
-            style="@style/Toolbar"
-            android:animateLayoutChanges="true"
-            android:focusable="true"
-            android:focusableInTouchMode="true"
-            app:contentInsetStartWithNavigation="0dp"
-            app:layout_constraintEnd_toEndOf="parent"
-            app:layout_constraintStart_toStartOf="parent"
-            app:layout_constraintTop_toTopOf="parent">
-
-            <com.moez.QKSMS.common.widget.QkTextView
-                android:id="@+id/toolbarTitle"
-                style="@style/ToolbarText"
-                android:layout_marginStart="16dp"
-                android:visibility="gone" />
-
-            <com.moez.QKSMS.common.widget.QkEditText
-                android:id="@+id/toolbarSearch"
-                style="@style/ToolbarText"
-                android:layout_marginTop="8dp"
-                android:layout_marginEnd="8dp"
-                android:layout_marginBottom="8dp"
-                android:background="@drawable/rounded_rectangle_24dp"
-                android:backgroundTint="?attr/bubbleColor"
-                android:hint="@string/title_conversations"
-                android:inputType="text"
-                android:maxLines="1"
-                android:paddingStart="16dp"
-                android:paddingEnd="16dp"
-                android:textColorHint="?android:attr/textColorTertiary"
-                app:textSize="primary"
-                tools:textSize="16sp" />
-
-        </androidx.appcompat.widget.Toolbar>
-
-        <com.moez.QKSMS.common.widget.QkTextView
-            android:id="@+id/empty"
-            style="@style/TextSecondary"
-            android:layout_width="match_parent"
-            android:layout_height="0dp"
-            android:layout_gravity="center"
-            android:gravity="center"
-            android:padding="56dp"
-            app:layout_constraintBottom_toTopOf="@id/bottom"
-            app:layout_constraintTop_toBottomOf="@id/toolbar"
-            tools:text="Your conversations will appear here"
-            tools:visibility="invisible" />
-
-        <androidx.recyclerview.widget.RecyclerView
-            android:id="@+id/recyclerView"
-            android:layout_width="match_parent"
-            android:layout_height="0dp"
-            android:clipChildren="false"
-            android:clipToPadding="false"
-            android:paddingTop="8dp"
-            android:paddingBottom="8dp"
-            app:layoutManager="androidx.recyclerview.widget.LinearLayoutManager"
-            app:layout_constraintBottom_toTopOf="@id/bottom"
-            app:layout_constraintTop_toBottomOf="@id/toolbar"
-            tools:listitem="@layout/conversation_list_item" />
-
-        <ImageView
-            android:id="@+id/compose"
-            android:layout_width="56dp"
-            android:layout_height="56dp"
-            android:layout_margin="16dp"
-            android:background="@drawable/circle_ripple"
-            android:contentDescription="@string/main_fab_cd"
-            android:elevation="8dp"
-            android:padding="16dp"
-            android:src="@drawable/ic_add_black_24dp"
-            android:tint="@color/white"
-            app:layout_constraintBottom_toTopOf="@id/bottom"
-            app:layout_constraintEnd_toEndOf="parent"
-            tools:backgroundTint="@color/tools_theme" />
-
-        <View
-            android:layout_width="0dp"
-            android:layout_height="8dp"
-            android:background="@drawable/ab_shadow"
-            app:layout_constraintEnd_toEndOf="parent"
-            app:layout_constraintStart_toStartOf="parent"
-            app:layout_constraintTop_toBottomOf="@id/toolbar" />
-
-        <View
-            android:id="@+id/bottom"
-            android:layout_width="match_parent"
-            android:layout_height="1dp"
-            android:background="?android:attr/divider"
-            app:layout_constraintBottom_toTopOf="@id/snackbar" />
-
-        <ViewStub
-            android:id="@+id/snackbar"
-            android:layout_width="match_parent"
-            android:layout_height="wrap_content"
-            android:inflatedId="@id/snackbar"
-            android:layout="@layout/main_permission_hint"
-            app:layout_constraintBottom_toTopOf="@id/syncing" />
-
-        <ViewStub
-            android:id="@+id/syncing"
-            android:layout_width="match_parent"
-            android:layout_height="wrap_content"
-            android:inflatedId="@id/syncing"
-            android:layout="@layout/main_syncing"
-            app:layout_constraintBottom_toBottomOf="parent" />
-
-    </androidx.constraintlayout.widget.ConstraintLayout>
-
-    <include
-        android:id="@+id/drawer"
-        layout="@layout/drawer_view"
-        android:layout_width="320dp"
-        android:layout_height="match_parent"
-        android:layout_gravity="start" />
-
+<?xml version="1.0" encoding="utf-8"?>
+<!--
+  ~ Copyright (C) 2019 Moez Bhatti <moez.bhatti@gmail.com>
+  ~
+  ~ This file is part of QKSMS.
+  ~
+  ~ QKSMS is free software: you can redistribute it and/or modify
+  ~ it under the terms of the GNU General Public License as published by
+  ~ the Free Software Foundation, either version 3 of the License, or
+  ~ (at your option) any later version.
+  ~
+  ~ QKSMS is distributed in the hope that it will be useful,
+  ~ but WITHOUT ANY WARRANTY; without even the implied warranty of
+  ~ MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+  ~ GNU General Public License for more details.
+  ~
+  ~ You should have received a copy of the GNU General Public License
+  ~ along with QKSMS.  If not, see <http://www.gnu.org/licenses/>.
+  -->
+<androidx.drawerlayout.widget.DrawerLayout xmlns:android="http://schemas.android.com/apk/res/android"
+    xmlns:app="http://schemas.android.com/apk/res-auto"
+    xmlns:tools="http://schemas.android.com/tools"
+    android:id="@+id/drawerLayout"
+    android:layout_width="match_parent"
+    android:layout_height="match_parent">
+
+    <androidx.constraintlayout.widget.ConstraintLayout
+        android:layout_width="match_parent"
+        android:layout_height="match_parent"
+        android:animateLayoutChanges="true">
+
+        <androidx.appcompat.widget.Toolbar
+            android:id="@+id/toolbar"
+            style="@style/Toolbar"
+            android:animateLayoutChanges="true"
+            android:focusable="true"
+            android:focusableInTouchMode="true"
+            app:contentInsetStartWithNavigation="0dp"
+            app:layout_constraintEnd_toEndOf="parent"
+            app:layout_constraintStart_toStartOf="parent"
+            app:layout_constraintTop_toTopOf="parent">
+
+            <com.moez.QKSMS.common.widget.QkTextView
+                android:id="@+id/toolbarTitle"
+                style="@style/ToolbarText"
+                android:layout_marginStart="16dp"
+                android:visibility="gone" />
+
+            <com.moez.QKSMS.common.widget.QkEditText
+                android:id="@+id/toolbarSearch"
+                style="@style/ToolbarText"
+                android:layout_marginTop="8dp"
+                android:layout_marginEnd="8dp"
+                android:layout_marginBottom="8dp"
+                android:background="@drawable/rounded_rectangle_24dp"
+                android:backgroundTint="?attr/bubbleColor"
+                android:hint="@string/title_conversations"
+                android:inputType="text"
+                android:maxLines="1"
+                android:paddingStart="16dp"
+                android:paddingEnd="16dp"
+                android:textColorHint="?android:attr/textColorTertiary"
+                app:textSize="primary"
+                tools:textSize="16sp" />
+
+        </androidx.appcompat.widget.Toolbar>
+
+        <com.moez.QKSMS.common.widget.QkTextView
+            android:id="@+id/empty"
+            style="@style/TextSecondary"
+            android:layout_width="match_parent"
+            android:layout_height="0dp"
+            android:layout_gravity="center"
+            android:gravity="center"
+            android:padding="56dp"
+            app:layout_constraintBottom_toTopOf="@id/bottom"
+            app:layout_constraintTop_toBottomOf="@id/toolbar"
+            tools:text="Your conversations will appear here"
+            tools:visibility="invisible" />
+
+        <androidx.recyclerview.widget.RecyclerView
+            android:id="@+id/recyclerView"
+            android:layout_width="match_parent"
+            android:layout_height="0dp"
+            android:clipChildren="false"
+            android:clipToPadding="false"
+            android:paddingTop="8dp"
+            android:paddingBottom="8dp"
+            app:layoutManager="androidx.recyclerview.widget.LinearLayoutManager"
+            app:layout_constraintBottom_toTopOf="@id/bottom"
+            app:layout_constraintTop_toBottomOf="@id/toolbar"
+            tools:listitem="@layout/conversation_list_item" />
+
+        <ImageView
+            android:id="@+id/compose"
+            android:layout_width="56dp"
+            android:layout_height="56dp"
+            android:layout_margin="16dp"
+            android:background="@drawable/circle_ripple"
+            android:contentDescription="@string/main_fab_cd"
+            android:elevation="8dp"
+            android:padding="16dp"
+            android:src="@drawable/ic_add_black_24dp"
+            android:tint="@color/white"
+            app:layout_constraintBottom_toTopOf="@id/bottom"
+            app:layout_constraintEnd_toEndOf="parent"
+            tools:backgroundTint="@color/tools_theme" />
+
+        <View
+            android:layout_width="0dp"
+            android:layout_height="8dp"
+            android:background="@drawable/ab_shadow"
+            app:layout_constraintEnd_toEndOf="parent"
+            app:layout_constraintStart_toStartOf="parent"
+            app:layout_constraintTop_toBottomOf="@id/toolbar" />
+
+        <View
+            android:id="@+id/bottom"
+            android:layout_width="match_parent"
+            android:layout_height="1dp"
+            android:background="?android:attr/divider"
+            app:layout_constraintBottom_toTopOf="@id/snackbar" />
+
+        <ViewStub
+            android:id="@+id/snackbar"
+            android:layout_width="match_parent"
+            android:layout_height="wrap_content"
+            android:inflatedId="@id/snackbar"
+            android:layout="@layout/main_permission_hint"
+            app:layout_constraintBottom_toTopOf="@id/syncing" />
+
+        <ViewStub
+            android:id="@+id/syncing"
+            android:layout_width="match_parent"
+            android:layout_height="wrap_content"
+            android:inflatedId="@id/syncing"
+            android:layout="@layout/main_syncing"
+            app:layout_constraintBottom_toBottomOf="parent" />
+
+    </androidx.constraintlayout.widget.ConstraintLayout>
+
+    <include
+        android:id="@+id/drawer"
+        layout="@layout/drawer_view"
+        android:layout_width="320dp"
+        android:layout_height="match_parent"
+        android:layout_gravity="start" />
+
 </androidx.drawerlayout.widget.DrawerLayout>
\ No newline at end of file
diff --git a/presentation/src/main/res/layout/main_permission_hint.xml b/presentation/src/main/res/layout/main_permission_hint.xml
index 932134456..5929bd482 100644
--- a/presentation/src/main/res/layout/main_permission_hint.xml
+++ b/presentation/src/main/res/layout/main_permission_hint.xml
@@ -1,73 +1,73 @@
-<?xml version="1.0" encoding="utf-8"?>
-<!--
-  ~ Copyright (C) 2019 Moez Bhatti <moez.bhatti@gmail.com>
-  ~
-  ~ This file is part of QKSMS.
-  ~
-  ~ QKSMS is free software: you can redistribute it and/or modify
-  ~ it under the terms of the GNU General Public License as published by
-  ~ the Free Software Foundation, either version 3 of the License, or
-  ~ (at your option) any later version.
-  ~
-  ~ QKSMS is distributed in the hope that it will be useful,
-  ~ but WITHOUT ANY WARRANTY; without even the implied warranty of
-  ~ MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
-  ~ GNU General Public License for more details.
-  ~
-  ~ You should have received a copy of the GNU General Public License
-  ~ along with QKSMS.  If not, see <http://www.gnu.org/licenses/>.
-  -->
-<androidx.constraintlayout.widget.ConstraintLayout xmlns:android="http://schemas.android.com/apk/res/android"
-    xmlns:app="http://schemas.android.com/apk/res-auto"
-    xmlns:tools="http://schemas.android.com/tools"
-    android:layout_width="match_parent"
-    android:layout_height="wrap_content">
-
-    <com.moez.QKSMS.common.widget.QkTextView
-        android:id="@+id/snackbarTitle"
-        android:layout_width="0dp"
-        android:layout_height="wrap_content"
-        android:layout_marginStart="16dp"
-        android:paddingTop="16dp"
-        android:textColor="?android:attr/textColorPrimary"
-        android:textStyle="bold"
-        app:layout_constraintBottom_toTopOf="@id/snackbarMessage"
-        app:layout_constraintEnd_toStartOf="@id/snackbarButton"
-        app:layout_constraintHorizontal_bias="0"
-        app:layout_constraintStart_toStartOf="parent"
-        app:textSize="primary"
-        tools:text="Love texting again" />
-
-    <com.moez.QKSMS.common.widget.QkTextView
-        android:id="@+id/snackbarMessage"
-        android:layout_width="0dp"
-        android:layout_height="wrap_content"
-        android:layout_marginStart="16dp"
-        android:layout_marginTop="2dp"
-        android:paddingBottom="16dp"
-        android:textColor="?android:attr/textColorSecondary"
-        app:layout_constraintBottom_toBottomOf="parent"
-        app:layout_constraintEnd_toStartOf="@id/snackbarButton"
-        app:layout_constraintHorizontal_bias="0"
-        app:layout_constraintStart_toStartOf="parent"
-        app:textSize="secondary"
-        tools:text="Make QKSMS your default SMS app" />
-
-    <com.moez.QKSMS.common.widget.QkTextView
-        android:id="@+id/snackbarButton"
-        android:layout_width="wrap_content"
-        android:layout_height="wrap_content"
-        android:layout_marginEnd="8dp"
-        android:background="?attr/selectableItemBackground"
-        android:padding="16dp"
-        android:textAllCaps="true"
-        android:textColor="@color/tools_theme"
-        android:textStyle="bold"
-        app:layout_constraintBottom_toBottomOf="@id/snackbarMessage"
-        app:layout_constraintEnd_toEndOf="parent"
-        app:layout_constraintTop_toTopOf="@id/snackbarTitle"
-        app:textColor="theme"
-        app:textSize="secondary"
-        tools:text="Change" />
-
+<?xml version="1.0" encoding="utf-8"?>
+<!--
+  ~ Copyright (C) 2019 Moez Bhatti <moez.bhatti@gmail.com>
+  ~
+  ~ This file is part of QKSMS.
+  ~
+  ~ QKSMS is free software: you can redistribute it and/or modify
+  ~ it under the terms of the GNU General Public License as published by
+  ~ the Free Software Foundation, either version 3 of the License, or
+  ~ (at your option) any later version.
+  ~
+  ~ QKSMS is distributed in the hope that it will be useful,
+  ~ but WITHOUT ANY WARRANTY; without even the implied warranty of
+  ~ MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+  ~ GNU General Public License for more details.
+  ~
+  ~ You should have received a copy of the GNU General Public License
+  ~ along with QKSMS.  If not, see <http://www.gnu.org/licenses/>.
+  -->
+<androidx.constraintlayout.widget.ConstraintLayout xmlns:android="http://schemas.android.com/apk/res/android"
+    xmlns:app="http://schemas.android.com/apk/res-auto"
+    xmlns:tools="http://schemas.android.com/tools"
+    android:layout_width="match_parent"
+    android:layout_height="wrap_content">
+
+    <com.moez.QKSMS.common.widget.QkTextView
+        android:id="@+id/snackbarTitle"
+        android:layout_width="0dp"
+        android:layout_height="wrap_content"
+        android:layout_marginStart="16dp"
+        android:paddingTop="16dp"
+        android:textColor="?android:attr/textColorPrimary"
+        android:textStyle="bold"
+        app:layout_constraintBottom_toTopOf="@id/snackbarMessage"
+        app:layout_constraintEnd_toStartOf="@id/snackbarButton"
+        app:layout_constraintHorizontal_bias="0"
+        app:layout_constraintStart_toStartOf="parent"
+        app:textSize="primary"
+        tools:text="Love texting again" />
+
+    <com.moez.QKSMS.common.widget.QkTextView
+        android:id="@+id/snackbarMessage"
+        android:layout_width="0dp"
+        android:layout_height="wrap_content"
+        android:layout_marginStart="16dp"
+        android:layout_marginTop="2dp"
+        android:paddingBottom="16dp"
+        android:textColor="?android:attr/textColorSecondary"
+        app:layout_constraintBottom_toBottomOf="parent"
+        app:layout_constraintEnd_toStartOf="@id/snackbarButton"
+        app:layout_constraintHorizontal_bias="0"
+        app:layout_constraintStart_toStartOf="parent"
+        app:textSize="secondary"
+        tools:text="Make QKSMS your default SMS app" />
+
+    <com.moez.QKSMS.common.widget.QkTextView
+        android:id="@+id/snackbarButton"
+        android:layout_width="wrap_content"
+        android:layout_height="wrap_content"
+        android:layout_marginEnd="8dp"
+        android:background="?attr/selectableItemBackground"
+        android:padding="16dp"
+        android:textAllCaps="true"
+        android:textColor="@color/tools_theme"
+        android:textStyle="bold"
+        app:layout_constraintBottom_toBottomOf="@id/snackbarMessage"
+        app:layout_constraintEnd_toEndOf="parent"
+        app:layout_constraintTop_toTopOf="@id/snackbarTitle"
+        app:textColor="theme"
+        app:textSize="secondary"
+        tools:text="Change" />
+
 </androidx.constraintlayout.widget.ConstraintLayout>
\ No newline at end of file
diff --git a/presentation/src/main/res/layout/main_syncing.xml b/presentation/src/main/res/layout/main_syncing.xml
index d3b17e59c..8c98bc7d9 100644
--- a/presentation/src/main/res/layout/main_syncing.xml
+++ b/presentation/src/main/res/layout/main_syncing.xml
@@ -1,46 +1,46 @@
-<?xml version="1.0" encoding="utf-8"?>
-<!--
-  ~ Copyright (C) 2019 Moez Bhatti <moez.bhatti@gmail.com>
-  ~
-  ~ This file is part of QKSMS.
-  ~
-  ~ QKSMS is free software: you can redistribute it and/or modify
-  ~ it under the terms of the GNU General Public License as published by
-  ~ the Free Software Foundation, either version 3 of the License, or
-  ~ (at your option) any later version.
-  ~
-  ~ QKSMS is distributed in the hope that it will be useful,
-  ~ but WITHOUT ANY WARRANTY; without even the implied warranty of
-  ~ MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
-  ~ GNU General Public License for more details.
-  ~
-  ~ You should have received a copy of the GNU General Public License
-  ~ along with QKSMS.  If not, see <http://www.gnu.org/licenses/>.
-  -->
-<LinearLayout xmlns:android="http://schemas.android.com/apk/res/android"
-    android:layout_width="match_parent"
-    android:layout_height="wrap_content"
-    android:orientation="vertical">
-
-    <com.moez.QKSMS.common.widget.QkTextView
-        android:id="@+id/syncingLabel"
-        style="@style/TextPrimary"
-        android:layout_width="match_parent"
-        android:layout_height="wrap_content"
-        android:layout_marginStart="16dp"
-        android:layout_marginEnd="16dp"
-        android:paddingTop="16dp"
-        android:text="@string/main_syncing"
-        android:textStyle="bold" />
-
-    <ProgressBar
-        android:id="@+id/syncingProgress"
-        style="@style/Widget.AppCompat.ProgressBar.Horizontal"
-        android:layout_width="match_parent"
-        android:layout_height="wrap_content"
-        android:layout_marginStart="16dp"
-        android:layout_marginEnd="16dp"
-        android:layout_marginBottom="16dp"
-        android:indeterminate="true" />
-
+<?xml version="1.0" encoding="utf-8"?>
+<!--
+  ~ Copyright (C) 2019 Moez Bhatti <moez.bhatti@gmail.com>
+  ~
+  ~ This file is part of QKSMS.
+  ~
+  ~ QKSMS is free software: you can redistribute it and/or modify
+  ~ it under the terms of the GNU General Public License as published by
+  ~ the Free Software Foundation, either version 3 of the License, or
+  ~ (at your option) any later version.
+  ~
+  ~ QKSMS is distributed in the hope that it will be useful,
+  ~ but WITHOUT ANY WARRANTY; without even the implied warranty of
+  ~ MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+  ~ GNU General Public License for more details.
+  ~
+  ~ You should have received a copy of the GNU General Public License
+  ~ along with QKSMS.  If not, see <http://www.gnu.org/licenses/>.
+  -->
+<LinearLayout xmlns:android="http://schemas.android.com/apk/res/android"
+    android:layout_width="match_parent"
+    android:layout_height="wrap_content"
+    android:orientation="vertical">
+
+    <com.moez.QKSMS.common.widget.QkTextView
+        android:id="@+id/syncingLabel"
+        style="@style/TextPrimary"
+        android:layout_width="match_parent"
+        android:layout_height="wrap_content"
+        android:layout_marginStart="16dp"
+        android:layout_marginEnd="16dp"
+        android:paddingTop="16dp"
+        android:text="@string/main_syncing"
+        android:textStyle="bold" />
+
+    <ProgressBar
+        android:id="@+id/syncingProgress"
+        style="@style/Widget.AppCompat.ProgressBar.Horizontal"
+        android:layout_width="match_parent"
+        android:layout_height="wrap_content"
+        android:layout_marginStart="16dp"
+        android:layout_marginEnd="16dp"
+        android:layout_marginBottom="16dp"
+        android:indeterminate="true" />
+
 </LinearLayout>
\ No newline at end of file
diff --git a/presentation/src/main/res/layout/menu_list_item.xml b/presentation/src/main/res/layout/menu_list_item.xml
index 95e117278..0eac423cd 100644
--- a/presentation/src/main/res/layout/menu_list_item.xml
+++ b/presentation/src/main/res/layout/menu_list_item.xml
@@ -1,48 +1,48 @@
-<?xml version="1.0" encoding="utf-8"?>
-<!--
-  ~ Copyright (C) 2019 Moez Bhatti <moez.bhatti@gmail.com>
-  ~
-  ~ This file is part of QKSMS.
-  ~
-  ~ QKSMS is free software: you can redistribute it and/or modify
-  ~ it under the terms of the GNU General Public License as published by
-  ~ the Free Software Foundation, either version 3 of the License, or
-  ~ (at your option) any later version.
-  ~
-  ~ QKSMS is distributed in the hope that it will be useful,
-  ~ but WITHOUT ANY WARRANTY; without even the implied warranty of
-  ~ MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
-  ~ GNU General Public License for more details.
-  ~
-  ~ You should have received a copy of the GNU General Public License
-  ~ along with QKSMS.  If not, see <http://www.gnu.org/licenses/>.
-  -->
-<LinearLayout xmlns:android="http://schemas.android.com/apk/res/android"
-    xmlns:tools="http://schemas.android.com/tools"
-    android:layout_width="match_parent"
-    android:layout_height="wrap_content"
-    android:background="?attr/selectableItemBackground"
-    android:gravity="center_vertical"
-    android:orientation="horizontal">
-
-    <ImageView
-        android:id="@+id/check"
-        android:layout_width="24dp"
-        android:layout_height="24dp"
-        android:layout_marginStart="24dp"
-        android:src="@drawable/radio_button"
-        tools:tint="?android:attr/textColorTertiary" />
-
-    <com.moez.QKSMS.common.widget.QkTextView
-        android:id="@+id/title"
-        style="@style/TextPrimary"
-        android:layout_width="0dp"
-        android:layout_height="wrap_content"
-        android:layout_weight="1"
-        android:paddingLeft="24dp"
-        android:paddingTop="12dp"
-        android:paddingRight="24dp"
-        android:paddingBottom="12dp"
-        tools:text="Testing" />
-
+<?xml version="1.0" encoding="utf-8"?>
+<!--
+  ~ Copyright (C) 2019 Moez Bhatti <moez.bhatti@gmail.com>
+  ~
+  ~ This file is part of QKSMS.
+  ~
+  ~ QKSMS is free software: you can redistribute it and/or modify
+  ~ it under the terms of the GNU General Public License as published by
+  ~ the Free Software Foundation, either version 3 of the License, or
+  ~ (at your option) any later version.
+  ~
+  ~ QKSMS is distributed in the hope that it will be useful,
+  ~ but WITHOUT ANY WARRANTY; without even the implied warranty of
+  ~ MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+  ~ GNU General Public License for more details.
+  ~
+  ~ You should have received a copy of the GNU General Public License
+  ~ along with QKSMS.  If not, see <http://www.gnu.org/licenses/>.
+  -->
+<LinearLayout xmlns:android="http://schemas.android.com/apk/res/android"
+    xmlns:tools="http://schemas.android.com/tools"
+    android:layout_width="match_parent"
+    android:layout_height="wrap_content"
+    android:background="?attr/selectableItemBackground"
+    android:gravity="center_vertical"
+    android:orientation="horizontal">
+
+    <ImageView
+        android:id="@+id/check"
+        android:layout_width="24dp"
+        android:layout_height="24dp"
+        android:layout_marginStart="24dp"
+        android:src="@drawable/radio_button"
+        tools:tint="?android:attr/textColorTertiary" />
+
+    <com.moez.QKSMS.common.widget.QkTextView
+        android:id="@+id/title"
+        style="@style/TextPrimary"
+        android:layout_width="0dp"
+        android:layout_height="wrap_content"
+        android:layout_weight="1"
+        android:paddingLeft="24dp"
+        android:paddingTop="12dp"
+        android:paddingRight="24dp"
+        android:paddingBottom="12dp"
+        tools:text="Testing" />
+
 </LinearLayout>
\ No newline at end of file
diff --git a/presentation/src/main/res/layout/message_list_item_in.xml b/presentation/src/main/res/layout/message_list_item_in.xml
index 0c5d7f90a..0d062320c 100644
--- a/presentation/src/main/res/layout/message_list_item_in.xml
+++ b/presentation/src/main/res/layout/message_list_item_in.xml
@@ -1,125 +1,125 @@
-<?xml version="1.0" encoding="utf-8"?>
-<!--
-  ~ Copyright (C) 2019 Moez Bhatti <moez.bhatti@gmail.com>
-  ~
-  ~ This file is part of QKSMS.
-  ~
-  ~ QKSMS is free software: you can redistribute it and/or modify
-  ~ it under the terms of the GNU General Public License as published by
-  ~ the Free Software Foundation, either version 3 of the License, or
-  ~ (at your option) any later version.
-  ~
-  ~ QKSMS is distributed in the hope that it will be useful,
-  ~ but WITHOUT ANY WARRANTY; without even the implied warranty of
-  ~ MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
-  ~ GNU General Public License for more details.
-  ~
-  ~ You should have received a copy of the GNU General Public License
-  ~ along with QKSMS.  If not, see <http://www.gnu.org/licenses/>.
-  -->
-<androidx.constraintlayout.widget.ConstraintLayout xmlns:android="http://schemas.android.com/apk/res/android"
-    xmlns:app="http://schemas.android.com/apk/res-auto"
-    xmlns:tools="http://schemas.android.com/tools"
-    android:layout_width="match_parent"
-    android:layout_height="wrap_content"
-    android:background="?attr/selectableItemBackground">
-
-    <com.moez.QKSMS.common.widget.QkTextView
-        android:id="@+id/timestamp"
-        style="@style/TextSecondary"
-        android:layout_width="wrap_content"
-        android:layout_height="wrap_content"
-        android:gravity="center"
-        android:padding="8dp"
-        app:layout_constraintEnd_toStartOf="@id/sim"
-        app:layout_constraintHorizontal_chainStyle="packed"
-        app:layout_constraintStart_toStartOf="parent"
-        app:layout_constraintTop_toTopOf="parent"
-        tools:text="Tue at 11:39pm" />
-
-    <ImageView
-        android:id="@+id/sim"
-        android:layout_width="16dp"
-        android:layout_height="16dp"
-        android:layout_marginEnd="2dp"
-        android:src="@drawable/ic_sim_card_black_24dp"
-        android:tint="?android:attr/textColorSecondary"
-        app:layout_constraintBottom_toBottomOf="@id/timestamp"
-        app:layout_constraintEnd_toStartOf="@id/simIndex"
-        app:layout_constraintStart_toEndOf="@id/timestamp"
-        app:layout_constraintTop_toTopOf="@id/timestamp" />
-
-    <com.moez.QKSMS.common.widget.QkTextView
-        android:id="@+id/simIndex"
-        android:layout_width="wrap_content"
-        android:layout_height="wrap_content"
-        android:textColor="?android:attr/textColorSecondary"
-        app:layout_constraintBottom_toBottomOf="@id/timestamp"
-        app:layout_constraintEnd_toEndOf="parent"
-        app:layout_constraintStart_toEndOf="@id/sim"
-        app:layout_constraintTop_toTopOf="@id/timestamp"
-        app:textSize="tertiary"
-        tools:text="1" />
-
-    <androidx.recyclerview.widget.RecyclerView
-        android:id="@+id/attachments"
-        android:layout_width="wrap_content"
-        android:layout_height="wrap_content"
-        android:layout_marginStart="12dp"
-        android:layout_marginEnd="12dp"
-        android:nestedScrollingEnabled="false"
-        android:orientation="vertical"
-        app:layoutManager="androidx.recyclerview.widget.LinearLayoutManager"
-        app:layout_constrainedWidth="true"
-        app:layout_constraintEnd_toEndOf="parent"
-        app:layout_constraintHorizontal_bias="0"
-        app:layout_constraintStart_toEndOf="@id/avatar"
-        app:layout_constraintTop_toBottomOf="@id/timestamp"
-        tools:itemCount="1"
-        tools:listitem="@layout/mms_preview_list_item" />
-
-    <com.moez.QKSMS.common.widget.AvatarView
-        android:id="@+id/avatar"
-        android:layout_width="36dp"
-        android:layout_height="36dp"
-        android:layout_marginStart="12dp"
-        app:layout_constraintBottom_toBottomOf="@id/body"
-        app:layout_constraintStart_toStartOf="parent" />
-
-    <com.moez.QKSMS.common.widget.TightTextView
-        android:id="@+id/body"
-        style="@style/TextPrimary"
-        android:layout_width="wrap_content"
-        android:layout_height="wrap_content"
-        android:layout_marginStart="12dp"
-        android:layout_marginTop="2dp"
-        android:layout_marginEnd="12dp"
-        android:autoLink="email|phone|web"
-        android:background="@drawable/message_only"
-        android:gravity="start|center_vertical"
-        android:minHeight="36dp"
-        app:layout_constrainedWidth="true"
-        app:layout_constraintEnd_toEndOf="parent"
-        app:layout_constraintHorizontal_bias="0"
-        app:layout_constraintStart_toEndOf="@id/avatar"
-        app:layout_constraintTop_toBottomOf="@id/attachments"
-        app:layout_constraintWidth_max="384dp"
-        tools:backgroundTint="@color/tools_theme"
-        tools:text="@tools:sample/lorem/random" />
-
-    <com.moez.QKSMS.common.widget.QkTextView
-        android:id="@+id/status"
-        android:layout_width="wrap_content"
-        android:layout_height="wrap_content"
-        android:layout_gravity="start"
-        android:layout_marginStart="72dp"
-        android:layout_marginTop="4dp"
-        android:layout_marginBottom="4dp"
-        android:textColor="?android:attr/textColorSecondary"
-        app:layout_constraintBottom_toBottomOf="parent"
-        app:layout_constraintStart_toStartOf="parent"
-        app:layout_constraintTop_toBottomOf="@id/body"
-        app:textSize="tertiary"
-        tools:text="Sending..." />
-
+<?xml version="1.0" encoding="utf-8"?>
+<!--
+  ~ Copyright (C) 2019 Moez Bhatti <moez.bhatti@gmail.com>
+  ~
+  ~ This file is part of QKSMS.
+  ~
+  ~ QKSMS is free software: you can redistribute it and/or modify
+  ~ it under the terms of the GNU General Public License as published by
+  ~ the Free Software Foundation, either version 3 of the License, or
+  ~ (at your option) any later version.
+  ~
+  ~ QKSMS is distributed in the hope that it will be useful,
+  ~ but WITHOUT ANY WARRANTY; without even the implied warranty of
+  ~ MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+  ~ GNU General Public License for more details.
+  ~
+  ~ You should have received a copy of the GNU General Public License
+  ~ along with QKSMS.  If not, see <http://www.gnu.org/licenses/>.
+  -->
+<androidx.constraintlayout.widget.ConstraintLayout xmlns:android="http://schemas.android.com/apk/res/android"
+    xmlns:app="http://schemas.android.com/apk/res-auto"
+    xmlns:tools="http://schemas.android.com/tools"
+    android:layout_width="match_parent"
+    android:layout_height="wrap_content"
+    android:background="?attr/selectableItemBackground">
+
+    <com.moez.QKSMS.common.widget.QkTextView
+        android:id="@+id/timestamp"
+        style="@style/TextSecondary"
+        android:layout_width="wrap_content"
+        android:layout_height="wrap_content"
+        android:gravity="center"
+        android:padding="8dp"
+        app:layout_constraintEnd_toStartOf="@id/sim"
+        app:layout_constraintHorizontal_chainStyle="packed"
+        app:layout_constraintStart_toStartOf="parent"
+        app:layout_constraintTop_toTopOf="parent"
+        tools:text="Tue at 11:39pm" />
+
+    <ImageView
+        android:id="@+id/sim"
+        android:layout_width="16dp"
+        android:layout_height="16dp"
+        android:layout_marginEnd="2dp"
+        android:src="@drawable/ic_sim_card_black_24dp"
+        android:tint="?android:attr/textColorSecondary"
+        app:layout_constraintBottom_toBottomOf="@id/timestamp"
+        app:layout_constraintEnd_toStartOf="@id/simIndex"
+        app:layout_constraintStart_toEndOf="@id/timestamp"
+        app:layout_constraintTop_toTopOf="@id/timestamp" />
+
+    <com.moez.QKSMS.common.widget.QkTextView
+        android:id="@+id/simIndex"
+        android:layout_width="wrap_content"
+        android:layout_height="wrap_content"
+        android:textColor="?android:attr/textColorSecondary"
+        app:layout_constraintBottom_toBottomOf="@id/timestamp"
+        app:layout_constraintEnd_toEndOf="parent"
+        app:layout_constraintStart_toEndOf="@id/sim"
+        app:layout_constraintTop_toTopOf="@id/timestamp"
+        app:textSize="tertiary"
+        tools:text="1" />
+
+    <androidx.recyclerview.widget.RecyclerView
+        android:id="@+id/attachments"
+        android:layout_width="wrap_content"
+        android:layout_height="wrap_content"
+        android:layout_marginStart="12dp"
+        android:layout_marginEnd="12dp"
+        android:nestedScrollingEnabled="false"
+        android:orientation="vertical"
+        app:layoutManager="androidx.recyclerview.widget.LinearLayoutManager"
+        app:layout_constrainedWidth="true"
+        app:layout_constraintEnd_toEndOf="parent"
+        app:layout_constraintHorizontal_bias="0"
+        app:layout_constraintStart_toEndOf="@id/avatar"
+        app:layout_constraintTop_toBottomOf="@id/timestamp"
+        tools:itemCount="1"
+        tools:listitem="@layout/mms_preview_list_item" />
+
+    <com.moez.QKSMS.common.widget.AvatarView
+        android:id="@+id/avatar"
+        android:layout_width="36dp"
+        android:layout_height="36dp"
+        android:layout_marginStart="12dp"
+        app:layout_constraintBottom_toBottomOf="@id/body"
+        app:layout_constraintStart_toStartOf="parent" />
+
+    <com.moez.QKSMS.common.widget.TightTextView
+        android:id="@+id/body"
+        style="@style/TextPrimary"
+        android:layout_width="wrap_content"
+        android:layout_height="wrap_content"
+        android:layout_marginStart="12dp"
+        android:layout_marginTop="2dp"
+        android:layout_marginEnd="12dp"
+        android:autoLink="email|phone|web"
+        android:background="@drawable/message_only"
+        android:gravity="start|center_vertical"
+        android:minHeight="36dp"
+        app:layout_constrainedWidth="true"
+        app:layout_constraintEnd_toEndOf="parent"
+        app:layout_constraintHorizontal_bias="0"
+        app:layout_constraintStart_toEndOf="@id/avatar"
+        app:layout_constraintTop_toBottomOf="@id/attachments"
+        app:layout_constraintWidth_max="384dp"
+        tools:backgroundTint="@color/tools_theme"
+        tools:text="@tools:sample/lorem/random" />
+
+    <com.moez.QKSMS.common.widget.QkTextView
+        android:id="@+id/status"
+        android:layout_width="wrap_content"
+        android:layout_height="wrap_content"
+        android:layout_gravity="start"
+        android:layout_marginStart="72dp"
+        android:layout_marginTop="4dp"
+        android:layout_marginBottom="4dp"
+        android:textColor="?android:attr/textColorSecondary"
+        app:layout_constraintBottom_toBottomOf="parent"
+        app:layout_constraintStart_toStartOf="parent"
+        app:layout_constraintTop_toBottomOf="@id/body"
+        app:textSize="tertiary"
+        tools:text="Sending..." />
+
 </androidx.constraintlayout.widget.ConstraintLayout>
\ No newline at end of file
diff --git a/presentation/src/main/res/layout/message_list_item_out.xml b/presentation/src/main/res/layout/message_list_item_out.xml
index 0c934350c..428b21ab5 100644
--- a/presentation/src/main/res/layout/message_list_item_out.xml
+++ b/presentation/src/main/res/layout/message_list_item_out.xml
@@ -1,148 +1,148 @@
-<?xml version="1.0" encoding="utf-8"?>
-<!--
-  ~ Copyright (C) 2019 Moez Bhatti <moez.bhatti@gmail.com>
-  ~
-  ~ This file is part of QKSMS.
-  ~
-  ~ QKSMS is free software: you can redistribute it and/or modify
-  ~ it under the terms of the GNU General Public License as published by
-  ~ the Free Software Foundation, either version 3 of the License, or
-  ~ (at your option) any later version.
-  ~
-  ~ QKSMS is distributed in the hope that it will be useful,
-  ~ but WITHOUT ANY WARRANTY; without even the implied warranty of
-  ~ MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
-  ~ GNU General Public License for more details.
-  ~
-  ~ You should have received a copy of the GNU General Public License
-  ~ along with QKSMS.  If not, see <http://www.gnu.org/licenses/>.
-  -->
-<androidx.constraintlayout.widget.ConstraintLayout xmlns:android="http://schemas.android.com/apk/res/android"
-    xmlns:app="http://schemas.android.com/apk/res-auto"
-    xmlns:tools="http://schemas.android.com/tools"
-    android:layout_width="match_parent"
-    android:layout_height="wrap_content"
-    android:background="?attr/selectableItemBackground">
-
-    <com.moez.QKSMS.common.widget.QkTextView
-        android:id="@+id/timestamp"
-        style="@style/TextSecondary"
-        android:layout_width="wrap_content"
-        android:layout_height="wrap_content"
-        android:gravity="center"
-        android:padding="8dp"
-        app:layout_constraintEnd_toStartOf="@id/sim"
-        app:layout_constraintHorizontal_chainStyle="packed"
-        app:layout_constraintStart_toStartOf="parent"
-        app:layout_constraintTop_toTopOf="parent"
-        tools:text="Tue at 11:39pm" />
-
-    <ImageView
-        android:id="@+id/sim"
-        android:layout_width="16dp"
-        android:layout_height="16dp"
-        android:layout_marginEnd="2dp"
-        android:src="@drawable/ic_sim_card_black_24dp"
-        android:tint="?android:attr/textColorSecondary"
-        app:layout_constraintBottom_toBottomOf="@id/timestamp"
-        app:layout_constraintEnd_toStartOf="@id/simIndex"
-        app:layout_constraintStart_toEndOf="@id/timestamp"
-        app:layout_constraintTop_toTopOf="@id/timestamp" />
-
-    <com.moez.QKSMS.common.widget.QkTextView
-        android:id="@+id/simIndex"
-        android:layout_width="wrap_content"
-        android:layout_height="wrap_content"
-        android:textColor="?android:attr/textColorSecondary"
-        app:layout_constraintBottom_toBottomOf="@id/timestamp"
-        app:layout_constraintEnd_toEndOf="parent"
-        app:layout_constraintStart_toEndOf="@id/sim"
-        app:layout_constraintTop_toTopOf="@id/timestamp"
-        app:textSize="tertiary"
-        tools:text="1" />
-
-    <androidx.recyclerview.widget.RecyclerView
-        android:id="@+id/attachments"
-        android:layout_width="wrap_content"
-        android:layout_height="wrap_content"
-        android:layout_gravity="end"
-        android:layout_marginStart="60dp"
-        android:layout_marginEnd="12dp"
-        android:gravity="end"
-        android:nestedScrollingEnabled="false"
-        android:orientation="vertical"
-        app:layoutManager="androidx.recyclerview.widget.LinearLayoutManager"
-        app:layout_constrainedWidth="true"
-        app:layout_constraintEnd_toEndOf="parent"
-        app:layout_constraintHorizontal_bias="1"
-        app:layout_constraintTop_toBottomOf="@id/timestamp"
-        tools:itemCount="1"
-        tools:listitem="@layout/mms_preview_list_item" />
-
-    <com.moez.QKSMS.common.widget.TightTextView
-        android:id="@+id/body"
-        style="@style/TextPrimary"
-        android:layout_width="wrap_content"
-        android:layout_height="wrap_content"
-        android:layout_marginStart="60dp"
-        android:layout_marginTop="2dp"
-        android:layout_marginEnd="12dp"
-        android:autoLink="email|phone|web"
-        android:background="@drawable/message_only"
-        android:backgroundTint="?attr/bubbleColor"
-        android:gravity="start|center_vertical"
-        android:minHeight="36dp"
-        app:layout_constrainedWidth="true"
-        app:layout_constraintEnd_toEndOf="parent"
-        app:layout_constraintHorizontal_bias="1"
-        app:layout_constraintStart_toStartOf="parent"
-        app:layout_constraintTop_toBottomOf="@id/attachments"
-        app:layout_constraintWidth_max="384dp"
-        tools:text="Hey! How's it going?" />
-
-    <ProgressBar
-        android:id="@+id/cancel"
-        style="?android:attr/progressBarStyleHorizontal"
-        android:layout_width="36dp"
-        android:layout_height="36dp"
-        android:layout_marginEnd="8dp"
-        android:background="@drawable/circle"
-        android:backgroundTint="?attr/bubbleColor"
-        android:elevation="4dp"
-        android:foreground="?attr/selectableItemBackground"
-        android:indeterminate="false"
-        android:progressDrawable="@drawable/circular_progress_bar"
-        app:layout_constraintBottom_toBottomOf="@id/body"
-        app:layout_constraintEnd_toStartOf="@id/body"
-        tools:progress="45"
-        tools:progressTint="@color/tools_theme" />
-
-    <ImageView
-        android:id="@+id/cancelIcon"
-        android:layout_width="0dp"
-        android:layout_height="0dp"
-        android:elevation="4dp"
-        android:padding="6dp"
-        android:src="@drawable/ic_stop_black_24dp"
-        app:layout_constraintBottom_toBottomOf="@id/cancel"
-        app:layout_constraintEnd_toEndOf="@id/cancel"
-        app:layout_constraintStart_toStartOf="@id/cancel"
-        app:layout_constraintTop_toTopOf="@id/cancel"
-        tools:tint="@color/tools_theme" />
-
-    <com.moez.QKSMS.common.widget.QkTextView
-        android:id="@+id/status"
-        android:layout_width="wrap_content"
-        android:layout_height="wrap_content"
-        android:layout_gravity="end"
-        android:layout_marginTop="4dp"
-        android:layout_marginEnd="24dp"
-        android:layout_marginBottom="4dp"
-        android:textColor="?android:attr/textColorSecondary"
-        app:layout_constraintBottom_toBottomOf="parent"
-        app:layout_constraintEnd_toEndOf="parent"
-        app:layout_constraintTop_toBottomOf="@id/body"
-        app:textSize="tertiary"
-        tools:text="Sending..." />
-
+<?xml version="1.0" encoding="utf-8"?>
+<!--
+  ~ Copyright (C) 2019 Moez Bhatti <moez.bhatti@gmail.com>
+  ~
+  ~ This file is part of QKSMS.
+  ~
+  ~ QKSMS is free software: you can redistribute it and/or modify
+  ~ it under the terms of the GNU General Public License as published by
+  ~ the Free Software Foundation, either version 3 of the License, or
+  ~ (at your option) any later version.
+  ~
+  ~ QKSMS is distributed in the hope that it will be useful,
+  ~ but WITHOUT ANY WARRANTY; without even the implied warranty of
+  ~ MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+  ~ GNU General Public License for more details.
+  ~
+  ~ You should have received a copy of the GNU General Public License
+  ~ along with QKSMS.  If not, see <http://www.gnu.org/licenses/>.
+  -->
+<androidx.constraintlayout.widget.ConstraintLayout xmlns:android="http://schemas.android.com/apk/res/android"
+    xmlns:app="http://schemas.android.com/apk/res-auto"
+    xmlns:tools="http://schemas.android.com/tools"
+    android:layout_width="match_parent"
+    android:layout_height="wrap_content"
+    android:background="?attr/selectableItemBackground">
+
+    <com.moez.QKSMS.common.widget.QkTextView
+        android:id="@+id/timestamp"
+        style="@style/TextSecondary"
+        android:layout_width="wrap_content"
+        android:layout_height="wrap_content"
+        android:gravity="center"
+        android:padding="8dp"
+        app:layout_constraintEnd_toStartOf="@id/sim"
+        app:layout_constraintHorizontal_chainStyle="packed"
+        app:layout_constraintStart_toStartOf="parent"
+        app:layout_constraintTop_toTopOf="parent"
+        tools:text="Tue at 11:39pm" />
+
+    <ImageView
+        android:id="@+id/sim"
+        android:layout_width="16dp"
+        android:layout_height="16dp"
+        android:layout_marginEnd="2dp"
+        android:src="@drawable/ic_sim_card_black_24dp"
+        android:tint="?android:attr/textColorSecondary"
+        app:layout_constraintBottom_toBottomOf="@id/timestamp"
+        app:layout_constraintEnd_toStartOf="@id/simIndex"
+        app:layout_constraintStart_toEndOf="@id/timestamp"
+        app:layout_constraintTop_toTopOf="@id/timestamp" />
+
+    <com.moez.QKSMS.common.widget.QkTextView
+        android:id="@+id/simIndex"
+        android:layout_width="wrap_content"
+        android:layout_height="wrap_content"
+        android:textColor="?android:attr/textColorSecondary"
+        app:layout_constraintBottom_toBottomOf="@id/timestamp"
+        app:layout_constraintEnd_toEndOf="parent"
+        app:layout_constraintStart_toEndOf="@id/sim"
+        app:layout_constraintTop_toTopOf="@id/timestamp"
+        app:textSize="tertiary"
+        tools:text="1" />
+
+    <androidx.recyclerview.widget.RecyclerView
+        android:id="@+id/attachments"
+        android:layout_width="wrap_content"
+        android:layout_height="wrap_content"
+        android:layout_gravity="end"
+        android:layout_marginStart="60dp"
+        android:layout_marginEnd="12dp"
+        android:gravity="end"
+        android:nestedScrollingEnabled="false"
+        android:orientation="vertical"
+        app:layoutManager="androidx.recyclerview.widget.LinearLayoutManager"
+        app:layout_constrainedWidth="true"
+        app:layout_constraintEnd_toEndOf="parent"
+        app:layout_constraintHorizontal_bias="1"
+        app:layout_constraintTop_toBottomOf="@id/timestamp"
+        tools:itemCount="1"
+        tools:listitem="@layout/mms_preview_list_item" />
+
+    <com.moez.QKSMS.common.widget.TightTextView
+        android:id="@+id/body"
+        style="@style/TextPrimary"
+        android:layout_width="wrap_content"
+        android:layout_height="wrap_content"
+        android:layout_marginStart="60dp"
+        android:layout_marginTop="2dp"
+        android:layout_marginEnd="12dp"
+        android:autoLink="email|phone|web"
+        android:background="@drawable/message_only"
+        android:backgroundTint="?attr/bubbleColor"
+        android:gravity="start|center_vertical"
+        android:minHeight="36dp"
+        app:layout_constrainedWidth="true"
+        app:layout_constraintEnd_toEndOf="parent"
+        app:layout_constraintHorizontal_bias="1"
+        app:layout_constraintStart_toStartOf="parent"
+        app:layout_constraintTop_toBottomOf="@id/attachments"
+        app:layout_constraintWidth_max="384dp"
+        tools:text="Hey! How's it going?" />
+
+    <ProgressBar
+        android:id="@+id/cancel"
+        style="?android:attr/progressBarStyleHorizontal"
+        android:layout_width="36dp"
+        android:layout_height="36dp"
+        android:layout_marginEnd="8dp"
+        android:background="@drawable/circle"
+        android:backgroundTint="?attr/bubbleColor"
+        android:elevation="4dp"
+        android:foreground="?attr/selectableItemBackground"
+        android:indeterminate="false"
+        android:progressDrawable="@drawable/circular_progress_bar"
+        app:layout_constraintBottom_toBottomOf="@id/body"
+        app:layout_constraintEnd_toStartOf="@id/body"
+        tools:progress="45"
+        tools:progressTint="@color/tools_theme" />
+
+    <ImageView
+        android:id="@+id/cancelIcon"
+        android:layout_width="0dp"
+        android:layout_height="0dp"
+        android:elevation="4dp"
+        android:padding="6dp"
+        android:src="@drawable/ic_stop_black_24dp"
+        app:layout_constraintBottom_toBottomOf="@id/cancel"
+        app:layout_constraintEnd_toEndOf="@id/cancel"
+        app:layout_constraintStart_toStartOf="@id/cancel"
+        app:layout_constraintTop_toTopOf="@id/cancel"
+        tools:tint="@color/tools_theme" />
+
+    <com.moez.QKSMS.common.widget.QkTextView
+        android:id="@+id/status"
+        android:layout_width="wrap_content"
+        android:layout_height="wrap_content"
+        android:layout_gravity="end"
+        android:layout_marginTop="4dp"
+        android:layout_marginEnd="24dp"
+        android:layout_marginBottom="4dp"
+        android:textColor="?android:attr/textColorSecondary"
+        app:layout_constraintBottom_toBottomOf="parent"
+        app:layout_constraintEnd_toEndOf="parent"
+        app:layout_constraintTop_toBottomOf="@id/body"
+        app:textSize="tertiary"
+        tools:text="Sending..." />
+
 </androidx.constraintlayout.widget.ConstraintLayout>
\ No newline at end of file
diff --git a/presentation/src/main/res/layout/mms_file_list_item.xml b/presentation/src/main/res/layout/mms_file_list_item.xml
index 4c1550ee9..70557e9af 100644
--- a/presentation/src/main/res/layout/mms_file_list_item.xml
+++ b/presentation/src/main/res/layout/mms_file_list_item.xml
@@ -1,71 +1,71 @@
-<?xml version="1.0" encoding="utf-8"?>
-<!--
-  ~ Copyright (C) 2019 Moez Bhatti <moez.bhatti@gmail.com>
-  ~
-  ~ This file is part of QKSMS.
-  ~
-  ~ QKSMS is free software: you can redistribute it and/or modify
-  ~ it under the terms of the GNU General Public License as published by
-  ~ the Free Software Foundation, either version 3 of the License, or
-  ~ (at your option) any later version.
-  ~
-  ~ QKSMS is distributed in the hope that it will be useful,
-  ~ but WITHOUT ANY WARRANTY; without even the implied warranty of
-  ~ MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
-  ~ GNU General Public License for more details.
-  ~
-  ~ You should have received a copy of the GNU General Public License
-  ~ along with QKSMS.  If not, see <http://www.gnu.org/licenses/>.
-  -->
-<FrameLayout xmlns:android="http://schemas.android.com/apk/res/android"
-    xmlns:app="http://schemas.android.com/apk/res-auto"
-    xmlns:tools="http://schemas.android.com/tools"
-    android:layout_width="match_parent"
-    android:layout_height="wrap_content"
-    android:layout_marginTop="2dp">
-
-    <androidx.constraintlayout.widget.ConstraintLayout
-        android:id="@+id/fileBackground"
-        android:layout_width="wrap_content"
-        android:layout_height="wrap_content">
-
-        <ImageView
-            android:id="@+id/icon"
-            android:layout_width="24dp"
-            android:layout_height="24dp"
-            android:layout_marginStart="12dp"
-            android:src="@drawable/ic_attachment_black_24dp"
-            android:tint="?android:attr/textColorSecondary"
-            app:layout_constraintBottom_toBottomOf="@id/fileBackground"
-            app:layout_constraintStart_toStartOf="parent"
-            app:layout_constraintTop_toTopOf="@id/fileBackground" />
-
-        <com.moez.QKSMS.common.widget.QkTextView
-            android:id="@+id/filename"
-            android:layout_width="wrap_content"
-            android:layout_height="wrap_content"
-            android:paddingStart="12dp"
-            android:paddingTop="8dp"
-            android:paddingEnd="12dp"
-            app:layout_constraintTop_toTopOf="parent"
-            android:textColor="?android:attr/textColorPrimary"
-            app:layout_constraintStart_toEndOf="@id/icon"
-            app:textSize="primary"
-            tools:text="Resume.pdf" />
-
-        <com.moez.QKSMS.common.widget.QkTextView
-            android:id="@+id/size"
-            android:layout_width="wrap_content"
-            android:layout_height="wrap_content"
-            android:paddingStart="12dp"
-            android:paddingEnd="12dp"
-            tools:text="35 KB"
-            android:paddingBottom="8dp"
-            android:textColor="?android:attr/textColorTertiary"
-            app:layout_constraintStart_toStartOf="@id/filename"
-            app:layout_constraintTop_toBottomOf="@id/filename"
-            app:textSize="secondary" />
-
-    </androidx.constraintlayout.widget.ConstraintLayout>
-
-</FrameLayout>
+<?xml version="1.0" encoding="utf-8"?>
+<!--
+  ~ Copyright (C) 2019 Moez Bhatti <moez.bhatti@gmail.com>
+  ~
+  ~ This file is part of QKSMS.
+  ~
+  ~ QKSMS is free software: you can redistribute it and/or modify
+  ~ it under the terms of the GNU General Public License as published by
+  ~ the Free Software Foundation, either version 3 of the License, or
+  ~ (at your option) any later version.
+  ~
+  ~ QKSMS is distributed in the hope that it will be useful,
+  ~ but WITHOUT ANY WARRANTY; without even the implied warranty of
+  ~ MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+  ~ GNU General Public License for more details.
+  ~
+  ~ You should have received a copy of the GNU General Public License
+  ~ along with QKSMS.  If not, see <http://www.gnu.org/licenses/>.
+  -->
+<FrameLayout xmlns:android="http://schemas.android.com/apk/res/android"
+    xmlns:app="http://schemas.android.com/apk/res-auto"
+    xmlns:tools="http://schemas.android.com/tools"
+    android:layout_width="match_parent"
+    android:layout_height="wrap_content"
+    android:layout_marginTop="2dp">
+
+    <androidx.constraintlayout.widget.ConstraintLayout
+        android:id="@+id/fileBackground"
+        android:layout_width="wrap_content"
+        android:layout_height="wrap_content">
+
+        <ImageView
+            android:id="@+id/icon"
+            android:layout_width="24dp"
+            android:layout_height="24dp"
+            android:layout_marginStart="12dp"
+            android:src="@drawable/ic_attachment_black_24dp"
+            android:tint="?android:attr/textColorSecondary"
+            app:layout_constraintBottom_toBottomOf="@id/fileBackground"
+            app:layout_constraintStart_toStartOf="parent"
+            app:layout_constraintTop_toTopOf="@id/fileBackground" />
+
+        <com.moez.QKSMS.common.widget.QkTextView
+            android:id="@+id/filename"
+            android:layout_width="wrap_content"
+            android:layout_height="wrap_content"
+            android:paddingStart="12dp"
+            android:paddingTop="8dp"
+            android:paddingEnd="12dp"
+            app:layout_constraintTop_toTopOf="parent"
+            android:textColor="?android:attr/textColorPrimary"
+            app:layout_constraintStart_toEndOf="@id/icon"
+            app:textSize="primary"
+            tools:text="Resume.pdf" />
+
+        <com.moez.QKSMS.common.widget.QkTextView
+            android:id="@+id/size"
+            android:layout_width="wrap_content"
+            android:layout_height="wrap_content"
+            android:paddingStart="12dp"
+            android:paddingEnd="12dp"
+            tools:text="35 KB"
+            android:paddingBottom="8dp"
+            android:textColor="?android:attr/textColorTertiary"
+            app:layout_constraintStart_toStartOf="@id/filename"
+            app:layout_constraintTop_toBottomOf="@id/filename"
+            app:textSize="secondary" />
+
+    </androidx.constraintlayout.widget.ConstraintLayout>
+
+</FrameLayout>
diff --git a/presentation/src/main/res/layout/mms_preview_list_item.xml b/presentation/src/main/res/layout/mms_preview_list_item.xml
index 7b7628455..9f2fe0753 100644
--- a/presentation/src/main/res/layout/mms_preview_list_item.xml
+++ b/presentation/src/main/res/layout/mms_preview_list_item.xml
@@ -1,42 +1,42 @@
-<?xml version="1.0" encoding="utf-8"?>
-<!--
-  ~ Copyright (C) 2019 Moez Bhatti <moez.bhatti@gmail.com>
-  ~
-  ~ This file is part of QKSMS.
-  ~
-  ~ QKSMS is free software: you can redistribute it and/or modify
-  ~ it under the terms of the GNU General Public License as published by
-  ~ the Free Software Foundation, either version 3 of the License, or
-  ~ (at your option) any later version.
-  ~
-  ~ QKSMS is distributed in the hope that it will be useful,
-  ~ but WITHOUT ANY WARRANTY; without even the implied warranty of
-  ~ MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
-  ~ GNU General Public License for more details.
-  ~
-  ~ You should have received a copy of the GNU General Public License
-  ~ along with QKSMS.  If not, see <http://www.gnu.org/licenses/>.
-  -->
-<FrameLayout xmlns:android="http://schemas.android.com/apk/res/android"
-    xmlns:tools="http://schemas.android.com/tools"
-    android:layout_width="280dp"
-    android:layout_height="280dp"
-    android:layout_marginTop="2dp">
-
-    <com.moez.QKSMS.common.widget.BubbleImageView
-        android:id="@+id/thumbnail"
-        android:layout_width="match_parent"
-        android:layout_height="match_parent"
-        android:adjustViewBounds="true"
-        android:scaleType="centerCrop"
-        tools:src="@tools:sample/backgrounds/scenic" />
-
-    <ImageView
-        android:id="@+id/video"
-        android:layout_width="24dp"
-        android:layout_height="24dp"
-        android:layout_gravity="top|end"
-        android:layout_margin="16dp"
-        android:src="@drawable/ic_play_circle_filled_white_24dp" />
-
+<?xml version="1.0" encoding="utf-8"?>
+<!--
+  ~ Copyright (C) 2019 Moez Bhatti <moez.bhatti@gmail.com>
+  ~
+  ~ This file is part of QKSMS.
+  ~
+  ~ QKSMS is free software: you can redistribute it and/or modify
+  ~ it under the terms of the GNU General Public License as published by
+  ~ the Free Software Foundation, either version 3 of the License, or
+  ~ (at your option) any later version.
+  ~
+  ~ QKSMS is distributed in the hope that it will be useful,
+  ~ but WITHOUT ANY WARRANTY; without even the implied warranty of
+  ~ MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+  ~ GNU General Public License for more details.
+  ~
+  ~ You should have received a copy of the GNU General Public License
+  ~ along with QKSMS.  If not, see <http://www.gnu.org/licenses/>.
+  -->
+<FrameLayout xmlns:android="http://schemas.android.com/apk/res/android"
+    xmlns:tools="http://schemas.android.com/tools"
+    android:layout_width="280dp"
+    android:layout_height="280dp"
+    android:layout_marginTop="2dp">
+
+    <com.moez.QKSMS.common.widget.BubbleImageView
+        android:id="@+id/thumbnail"
+        android:layout_width="match_parent"
+        android:layout_height="match_parent"
+        android:adjustViewBounds="true"
+        android:scaleType="centerCrop"
+        tools:src="@tools:sample/backgrounds/scenic" />
+
+    <ImageView
+        android:id="@+id/video"
+        android:layout_width="24dp"
+        android:layout_height="24dp"
+        android:layout_gravity="top|end"
+        android:layout_margin="16dp"
+        android:src="@drawable/ic_play_circle_filled_white_24dp" />
+
 </FrameLayout>
\ No newline at end of file
diff --git a/presentation/src/main/res/layout/mms_vcard_list_item.xml b/presentation/src/main/res/layout/mms_vcard_list_item.xml
index b237b0165..81735c819 100644
--- a/presentation/src/main/res/layout/mms_vcard_list_item.xml
+++ b/presentation/src/main/res/layout/mms_vcard_list_item.xml
@@ -1,71 +1,71 @@
-<?xml version="1.0" encoding="utf-8"?>
-<!--
-  ~ Copyright (C) 2019 Moez Bhatti <moez.bhatti@gmail.com>
-  ~
-  ~ This file is part of QKSMS.
-  ~
-  ~ QKSMS is free software: you can redistribute it and/or modify
-  ~ it under the terms of the GNU General Public License as published by
-  ~ the Free Software Foundation, either version 3 of the License, or
-  ~ (at your option) any later version.
-  ~
-  ~ QKSMS is distributed in the hope that it will be useful,
-  ~ but WITHOUT ANY WARRANTY; without even the implied warranty of
-  ~ MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
-  ~ GNU General Public License for more details.
-  ~
-  ~ You should have received a copy of the GNU General Public License
-  ~ along with QKSMS.  If not, see <http://www.gnu.org/licenses/>.
-  -->
-<FrameLayout xmlns:android="http://schemas.android.com/apk/res/android"
-    xmlns:app="http://schemas.android.com/apk/res-auto"
-    xmlns:tools="http://schemas.android.com/tools"
-    android:layout_width="match_parent"
-    android:layout_height="wrap_content"
-    android:layout_marginTop="2dp">
-
-    <androidx.constraintlayout.widget.ConstraintLayout
-        android:id="@+id/vCardBackground"
-        android:layout_width="wrap_content"
-        android:layout_height="wrap_content">
-
-        <ImageView
-            android:id="@+id/vCardAvatar"
-            android:layout_width="24dp"
-            android:layout_height="24dp"
-            android:layout_marginStart="12dp"
-            android:src="@drawable/ic_person_black_24dp"
-            android:tint="?android:attr/textColorSecondary"
-            app:layout_constraintBottom_toBottomOf="@id/vCardBackground"
-            app:layout_constraintStart_toStartOf="parent"
-            app:layout_constraintTop_toTopOf="@id/vCardBackground" />
-
-        <com.moez.QKSMS.common.widget.QkTextView
-            android:id="@+id/name"
-            android:layout_width="wrap_content"
-            android:layout_height="wrap_content"
-            android:paddingStart="12dp"
-            android:paddingTop="8dp"
-            android:paddingEnd="12dp"
-            android:textColor="?android:attr/textColorPrimary"
-            app:layout_constraintStart_toEndOf="@id/vCardAvatar"
-            app:layout_constraintTop_toTopOf="parent"
-            app:textSize="primary"
-            tools:text="@tools:sample/full_names" />
-
-        <com.moez.QKSMS.common.widget.QkTextView
-            android:id="@+id/label"
-            android:layout_width="wrap_content"
-            android:layout_height="wrap_content"
-            android:paddingStart="12dp"
-            android:paddingEnd="12dp"
-            android:paddingBottom="8dp"
-            android:text="@string/compose_vcard_label"
-            android:textColor="?android:attr/textColorTertiary"
-            app:layout_constraintStart_toStartOf="@id/name"
-            app:layout_constraintTop_toBottomOf="@id/name"
-            app:textSize="secondary" />
-
-    </androidx.constraintlayout.widget.ConstraintLayout>
-
+<?xml version="1.0" encoding="utf-8"?>
+<!--
+  ~ Copyright (C) 2019 Moez Bhatti <moez.bhatti@gmail.com>
+  ~
+  ~ This file is part of QKSMS.
+  ~
+  ~ QKSMS is free software: you can redistribute it and/or modify
+  ~ it under the terms of the GNU General Public License as published by
+  ~ the Free Software Foundation, either version 3 of the License, or
+  ~ (at your option) any later version.
+  ~
+  ~ QKSMS is distributed in the hope that it will be useful,
+  ~ but WITHOUT ANY WARRANTY; without even the implied warranty of
+  ~ MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+  ~ GNU General Public License for more details.
+  ~
+  ~ You should have received a copy of the GNU General Public License
+  ~ along with QKSMS.  If not, see <http://www.gnu.org/licenses/>.
+  -->
+<FrameLayout xmlns:android="http://schemas.android.com/apk/res/android"
+    xmlns:app="http://schemas.android.com/apk/res-auto"
+    xmlns:tools="http://schemas.android.com/tools"
+    android:layout_width="match_parent"
+    android:layout_height="wrap_content"
+    android:layout_marginTop="2dp">
+
+    <androidx.constraintlayout.widget.ConstraintLayout
+        android:id="@+id/vCardBackground"
+        android:layout_width="wrap_content"
+        android:layout_height="wrap_content">
+
+        <ImageView
+            android:id="@+id/vCardAvatar"
+            android:layout_width="24dp"
+            android:layout_height="24dp"
+            android:layout_marginStart="12dp"
+            android:src="@drawable/ic_person_black_24dp"
+            android:tint="?android:attr/textColorSecondary"
+            app:layout_constraintBottom_toBottomOf="@id/vCardBackground"
+            app:layout_constraintStart_toStartOf="parent"
+            app:layout_constraintTop_toTopOf="@id/vCardBackground" />
+
+        <com.moez.QKSMS.common.widget.QkTextView
+            android:id="@+id/name"
+            android:layout_width="wrap_content"
+            android:layout_height="wrap_content"
+            android:paddingStart="12dp"
+            android:paddingTop="8dp"
+            android:paddingEnd="12dp"
+            android:textColor="?android:attr/textColorPrimary"
+            app:layout_constraintStart_toEndOf="@id/vCardAvatar"
+            app:layout_constraintTop_toTopOf="parent"
+            app:textSize="primary"
+            tools:text="@tools:sample/full_names" />
+
+        <com.moez.QKSMS.common.widget.QkTextView
+            android:id="@+id/label"
+            android:layout_width="wrap_content"
+            android:layout_height="wrap_content"
+            android:paddingStart="12dp"
+            android:paddingEnd="12dp"
+            android:paddingBottom="8dp"
+            android:text="@string/compose_vcard_label"
+            android:textColor="?android:attr/textColorTertiary"
+            app:layout_constraintStart_toStartOf="@id/name"
+            app:layout_constraintTop_toBottomOf="@id/name"
+            app:textSize="secondary" />
+
+    </androidx.constraintlayout.widget.ConstraintLayout>
+
 </FrameLayout>
\ No newline at end of file
diff --git a/presentation/src/main/res/layout/notification_prefs_activity.xml b/presentation/src/main/res/layout/notification_prefs_activity.xml
index 497490339..5e5a48dda 100644
--- a/presentation/src/main/res/layout/notification_prefs_activity.xml
+++ b/presentation/src/main/res/layout/notification_prefs_activity.xml
@@ -1,175 +1,175 @@
-<?xml version="1.0" encoding="utf-8"?>
-<!--
-  ~ Copyright (C) 2019 Moez Bhatti <moez.bhatti@gmail.com>
-  ~
-  ~ This file is part of QKSMS.
-  ~
-  ~ QKSMS is free software: you can redistribute it and/or modify
-  ~ it under the terms of the GNU General Public License as published by
-  ~ the Free Software Foundation, either version 3 of the License, or
-  ~ (at your option) any later version.
-  ~
-  ~ QKSMS is distributed in the hope that it will be useful,
-  ~ but WITHOUT ANY WARRANTY; without even the implied warranty of
-  ~ MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
-  ~ GNU General Public License for more details.
-  ~
-  ~ You should have received a copy of the GNU General Public License
-  ~ along with QKSMS.  If not, see <http://www.gnu.org/licenses/>.
-  -->
-<androidx.constraintlayout.widget.ConstraintLayout xmlns:android="http://schemas.android.com/apk/res/android"
-    xmlns:app="http://schemas.android.com/apk/res-auto"
-    xmlns:tools="http://schemas.android.com/tools"
-    android:layout_width="match_parent"
-    android:layout_height="match_parent"
-    android:orientation="vertical">
-
-    <androidx.appcompat.widget.Toolbar
-        android:id="@+id/toolbar"
-        style="@style/Toolbar"
-        app:layout_constraintTop_toTopOf="parent">
-
-        <com.moez.QKSMS.common.widget.QkTextView
-            android:id="@+id/toolbarTitle"
-            style="@style/ToolbarText"
-            tools:text="Notifications" />
-
-    </androidx.appcompat.widget.Toolbar>
-
-    <ScrollView
-        android:layout_width="match_parent"
-        android:layout_height="0dp"
-        app:layout_constraintBottom_toBottomOf="parent"
-        app:layout_constraintTop_toBottomOf="@id/toolbar">
-
-        <LinearLayout
-            android:id="@+id/preferences"
-            android:layout_width="match_parent"
-            android:layout_height="wrap_content"
-            android:orientation="vertical"
-            android:paddingTop="8dp"
-            android:paddingBottom="8dp">
-
-            <com.moez.QKSMS.common.widget.PreferenceView
-                android:id="@+id/notificationsO"
-                android:layout_width="match_parent"
-                android:layout_height="wrap_content"
-                app:summary="@string/settings_notifications_o_summary"
-                app:title="@string/settings_notifications_title"
-                tools:visibility="gone" />
-
-            <com.moez.QKSMS.common.widget.PreferenceView
-                android:id="@+id/notifications"
-                android:layout_width="match_parent"
-                android:layout_height="wrap_content"
-                app:title="@string/settings_notifications_title"
-                app:widget="@layout/settings_switch_widget" />
-
-            <com.moez.QKSMS.common.widget.PreferenceView
-                android:id="@+id/previews"
-                android:layout_width="match_parent"
-                android:layout_height="wrap_content"
-                app:title="@string/settings_notification_previews_title"
-                tools:summary="Show name and message" />
-
-            <com.moez.QKSMS.common.widget.PreferenceView
-                android:id="@+id/wake"
-                android:layout_width="match_parent"
-                android:layout_height="wrap_content"
-                app:title="@string/settings_notification_wake_title"
-                app:widget="@layout/settings_switch_widget" />
-
-            <com.moez.QKSMS.common.widget.PreferenceView
-                android:id="@+id/vibration"
-                android:layout_width="match_parent"
-                android:layout_height="wrap_content"
-                app:title="@string/settings_vibration_title"
-                app:widget="@layout/settings_switch_widget" />
-
-            <com.moez.QKSMS.common.widget.PreferenceView
-                android:id="@+id/ringtone"
-                android:layout_width="match_parent"
-                android:layout_height="wrap_content"
-                app:title="@string/settings_ringtone_title" />
-
-            <View
-                android:id="@+id/actionsDivider"
-                android:layout_width="match_parent"
-                android:layout_height="1dp"
-                android:layout_marginTop="8dp"
-                android:layout_marginBottom="8dp"
-                android:background="?android:attr/divider" />
-
-            <com.moez.QKSMS.common.widget.QkTextView
-                android:id="@+id/actionsTitle"
-                style="@style/PreferenceCategory"
-                android:text="@string/settings_notification_actions_title" />
-
-            <com.moez.QKSMS.common.widget.PreferenceView
-                android:id="@+id/action1"
-                android:layout_width="match_parent"
-                android:layout_height="wrap_content"
-                app:title="@string/settings_notification_action_1"
-                tools:summary="Mark read" />
-
-            <com.moez.QKSMS.common.widget.PreferenceView
-                android:id="@+id/action2"
-                android:layout_width="match_parent"
-                android:layout_height="wrap_content"
-                app:title="@string/settings_notification_action_2"
-                tools:summary="Reply" />
-
-            <com.moez.QKSMS.common.widget.PreferenceView
-                android:id="@+id/action3"
-                android:layout_width="match_parent"
-                android:layout_height="wrap_content"
-                app:title="@string/settings_notification_action_3"
-                tools:summary="None" />
-
-            <View
-                android:id="@+id/qkreplyDivider"
-                android:layout_width="match_parent"
-                android:layout_height="1dp"
-                android:layout_marginTop="8dp"
-                android:layout_marginBottom="8dp"
-                android:background="?android:attr/divider" />
-
-            <com.moez.QKSMS.common.widget.QkTextView
-                android:id="@+id/qkreplyTitle"
-                style="@style/PreferenceCategory"
-                android:text="@string/settings_category_qkreply" />
-
-            <com.moez.QKSMS.common.widget.PreferenceView
-                android:id="@+id/qkreply"
-                android:layout_width="match_parent"
-                android:layout_height="wrap_content"
-                app:summary="@string/settings_qkreply_summary"
-                app:title="@string/settings_qkreply_title"
-                app:widget="@layout/settings_switch_widget" />
-
-            <com.moez.QKSMS.common.widget.PreferenceView
-                android:id="@+id/qkreplyTapDismiss"
-                android:layout_width="match_parent"
-                android:layout_height="wrap_content"
-                app:summary="@string/settings_qkreply_tap_dismiss_summary"
-                app:title="@string/settings_qkreply_tap_dismiss_title"
-                app:widget="@layout/settings_switch_widget" />
-
-        </LinearLayout>
-
-    </ScrollView>
-
-    <View
-        android:layout_width="match_parent"
-        android:layout_height="8dp"
-        android:background="@drawable/ab_shadow"
-        app:layout_constraintTop_toBottomOf="@id/toolbar" />
-
-    <View
-        android:layout_width="match_parent"
-        android:layout_height="1dp"
-        android:layout_gravity="bottom"
-        android:background="?android:attr/divider"
-        app:layout_constraintBottom_toBottomOf="parent" />
-
+<?xml version="1.0" encoding="utf-8"?>
+<!--
+  ~ Copyright (C) 2019 Moez Bhatti <moez.bhatti@gmail.com>
+  ~
+  ~ This file is part of QKSMS.
+  ~
+  ~ QKSMS is free software: you can redistribute it and/or modify
+  ~ it under the terms of the GNU General Public License as published by
+  ~ the Free Software Foundation, either version 3 of the License, or
+  ~ (at your option) any later version.
+  ~
+  ~ QKSMS is distributed in the hope that it will be useful,
+  ~ but WITHOUT ANY WARRANTY; without even the implied warranty of
+  ~ MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+  ~ GNU General Public License for more details.
+  ~
+  ~ You should have received a copy of the GNU General Public License
+  ~ along with QKSMS.  If not, see <http://www.gnu.org/licenses/>.
+  -->
+<androidx.constraintlayout.widget.ConstraintLayout xmlns:android="http://schemas.android.com/apk/res/android"
+    xmlns:app="http://schemas.android.com/apk/res-auto"
+    xmlns:tools="http://schemas.android.com/tools"
+    android:layout_width="match_parent"
+    android:layout_height="match_parent"
+    android:orientation="vertical">
+
+    <androidx.appcompat.widget.Toolbar
+        android:id="@+id/toolbar"
+        style="@style/Toolbar"
+        app:layout_constraintTop_toTopOf="parent">
+
+        <com.moez.QKSMS.common.widget.QkTextView
+            android:id="@+id/toolbarTitle"
+            style="@style/ToolbarText"
+            tools:text="Notifications" />
+
+    </androidx.appcompat.widget.Toolbar>
+
+    <ScrollView
+        android:layout_width="match_parent"
+        android:layout_height="0dp"
+        app:layout_constraintBottom_toBottomOf="parent"
+        app:layout_constraintTop_toBottomOf="@id/toolbar">
+
+        <LinearLayout
+            android:id="@+id/preferences"
+            android:layout_width="match_parent"
+            android:layout_height="wrap_content"
+            android:orientation="vertical"
+            android:paddingTop="8dp"
+            android:paddingBottom="8dp">
+
+            <com.moez.QKSMS.common.widget.PreferenceView
+                android:id="@+id/notificationsO"
+                android:layout_width="match_parent"
+                android:layout_height="wrap_content"
+                app:summary="@string/settings_notifications_o_summary"
+                app:title="@string/settings_notifications_title"
+                tools:visibility="gone" />
+
+            <com.moez.QKSMS.common.widget.PreferenceView
+                android:id="@+id/notifications"
+                android:layout_width="match_parent"
+                android:layout_height="wrap_content"
+                app:title="@string/settings_notifications_title"
+                app:widget="@layout/settings_switch_widget" />
+
+            <com.moez.QKSMS.common.widget.PreferenceView
+                android:id="@+id/previews"
+                android:layout_width="match_parent"
+                android:layout_height="wrap_content"
+                app:title="@string/settings_notification_previews_title"
+                tools:summary="Show name and message" />
+
+            <com.moez.QKSMS.common.widget.PreferenceView
+                android:id="@+id/wake"
+                android:layout_width="match_parent"
+                android:layout_height="wrap_content"
+                app:title="@string/settings_notification_wake_title"
+                app:widget="@layout/settings_switch_widget" />
+
+            <com.moez.QKSMS.common.widget.PreferenceView
+                android:id="@+id/vibration"
+                android:layout_width="match_parent"
+                android:layout_height="wrap_content"
+                app:title="@string/settings_vibration_title"
+                app:widget="@layout/settings_switch_widget" />
+
+            <com.moez.QKSMS.common.widget.PreferenceView
+                android:id="@+id/ringtone"
+                android:layout_width="match_parent"
+                android:layout_height="wrap_content"
+                app:title="@string/settings_ringtone_title" />
+
+            <View
+                android:id="@+id/actionsDivider"
+                android:layout_width="match_parent"
+                android:layout_height="1dp"
+                android:layout_marginTop="8dp"
+                android:layout_marginBottom="8dp"
+                android:background="?android:attr/divider" />
+
+            <com.moez.QKSMS.common.widget.QkTextView
+                android:id="@+id/actionsTitle"
+                style="@style/PreferenceCategory"
+                android:text="@string/settings_notification_actions_title" />
+
+            <com.moez.QKSMS.common.widget.PreferenceView
+                android:id="@+id/action1"
+                android:layout_width="match_parent"
+                android:layout_height="wrap_content"
+                app:title="@string/settings_notification_action_1"
+                tools:summary="Mark read" />
+
+            <com.moez.QKSMS.common.widget.PreferenceView
+                android:id="@+id/action2"
+                android:layout_width="match_parent"
+                android:layout_height="wrap_content"
+                app:title="@string/settings_notification_action_2"
+                tools:summary="Reply" />
+
+            <com.moez.QKSMS.common.widget.PreferenceView
+                android:id="@+id/action3"
+                android:layout_width="match_parent"
+                android:layout_height="wrap_content"
+                app:title="@string/settings_notification_action_3"
+                tools:summary="None" />
+
+            <View
+                android:id="@+id/qkreplyDivider"
+                android:layout_width="match_parent"
+                android:layout_height="1dp"
+                android:layout_marginTop="8dp"
+                android:layout_marginBottom="8dp"
+                android:background="?android:attr/divider" />
+
+            <com.moez.QKSMS.common.widget.QkTextView
+                android:id="@+id/qkreplyTitle"
+                style="@style/PreferenceCategory"
+                android:text="@string/settings_category_qkreply" />
+
+            <com.moez.QKSMS.common.widget.PreferenceView
+                android:id="@+id/qkreply"
+                android:layout_width="match_parent"
+                android:layout_height="wrap_content"
+                app:summary="@string/settings_qkreply_summary"
+                app:title="@string/settings_qkreply_title"
+                app:widget="@layout/settings_switch_widget" />
+
+            <com.moez.QKSMS.common.widget.PreferenceView
+                android:id="@+id/qkreplyTapDismiss"
+                android:layout_width="match_parent"
+                android:layout_height="wrap_content"
+                app:summary="@string/settings_qkreply_tap_dismiss_summary"
+                app:title="@string/settings_qkreply_tap_dismiss_title"
+                app:widget="@layout/settings_switch_widget" />
+
+        </LinearLayout>
+
+    </ScrollView>
+
+    <View
+        android:layout_width="match_parent"
+        android:layout_height="8dp"
+        android:background="@drawable/ab_shadow"
+        app:layout_constraintTop_toBottomOf="@id/toolbar" />
+
+    <View
+        android:layout_width="match_parent"
+        android:layout_height="1dp"
+        android:layout_gravity="bottom"
+        android:background="?android:attr/divider"
+        app:layout_constraintBottom_toBottomOf="parent" />
+
 </androidx.constraintlayout.widget.ConstraintLayout>
\ No newline at end of file
diff --git a/presentation/src/main/res/layout/phone_number_list_item.xml b/presentation/src/main/res/layout/phone_number_list_item.xml
index c5a850483..4616a0b55 100644
--- a/presentation/src/main/res/layout/phone_number_list_item.xml
+++ b/presentation/src/main/res/layout/phone_number_list_item.xml
@@ -1,33 +1,33 @@
-<?xml version="1.0" encoding="utf-8"?>
-<!--
-  ~ Copyright (C) 2019 Moez Bhatti <moez.bhatti@gmail.com>
-  ~
-  ~ This file is part of QKSMS.
-  ~
-  ~ QKSMS is free software: you can redistribute it and/or modify
-  ~ it under the terms of the GNU General Public License as published by
-  ~ the Free Software Foundation, either version 3 of the License, or
-  ~ (at your option) any later version.
-  ~
-  ~ QKSMS is distributed in the hope that it will be useful,
-  ~ but WITHOUT ANY WARRANTY; without even the implied warranty of
-  ~ MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
-  ~ GNU General Public License for more details.
-  ~
-  ~ You should have received a copy of the GNU General Public License
-  ~ along with QKSMS.  If not, see <http://www.gnu.org/licenses/>.
-  -->
-<FrameLayout xmlns:android="http://schemas.android.com/apk/res/android"
-    xmlns:app="http://schemas.android.com/apk/res-auto"
-    xmlns:tools="http://schemas.android.com/tools"
-    android:layout_width="match_parent"
-    android:layout_height="wrap_content">
-
-    <com.moez.QKSMS.common.widget.RadioPreferenceView
-        android:id="@+id/number"
-        android:layout_width="match_parent"
-        android:layout_height="wrap_content"
-        app:summary="Mobile"
-        tools:title="(123) 456-7890" />
-
-</FrameLayout>
+<?xml version="1.0" encoding="utf-8"?>
+<!--
+  ~ Copyright (C) 2019 Moez Bhatti <moez.bhatti@gmail.com>
+  ~
+  ~ This file is part of QKSMS.
+  ~
+  ~ QKSMS is free software: you can redistribute it and/or modify
+  ~ it under the terms of the GNU General Public License as published by
+  ~ the Free Software Foundation, either version 3 of the License, or
+  ~ (at your option) any later version.
+  ~
+  ~ QKSMS is distributed in the hope that it will be useful,
+  ~ but WITHOUT ANY WARRANTY; without even the implied warranty of
+  ~ MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+  ~ GNU General Public License for more details.
+  ~
+  ~ You should have received a copy of the GNU General Public License
+  ~ along with QKSMS.  If not, see <http://www.gnu.org/licenses/>.
+  -->
+<FrameLayout xmlns:android="http://schemas.android.com/apk/res/android"
+    xmlns:app="http://schemas.android.com/apk/res-auto"
+    xmlns:tools="http://schemas.android.com/tools"
+    android:layout_width="match_parent"
+    android:layout_height="wrap_content">
+
+    <com.moez.QKSMS.common.widget.RadioPreferenceView
+        android:id="@+id/number"
+        android:layout_width="match_parent"
+        android:layout_height="wrap_content"
+        app:summary="Mobile"
+        tools:title="(123) 456-7890" />
+
+</FrameLayout>
diff --git a/presentation/src/main/res/layout/preference_view.xml b/presentation/src/main/res/layout/preference_view.xml
index 7a4800840..c7f06cde2 100644
--- a/presentation/src/main/res/layout/preference_view.xml
+++ b/presentation/src/main/res/layout/preference_view.xml
@@ -1,74 +1,74 @@
-<?xml version="1.0" encoding="utf-8"?>
-<!--
-  ~ Copyright (C) 2019 Moez Bhatti <moez.bhatti@gmail.com>
-  ~
-  ~ This file is part of QKSMS.
-  ~
-  ~ QKSMS is free software: you can redistribute it and/or modify
-  ~ it under the terms of the GNU General Public License as published by
-  ~ the Free Software Foundation, either version 3 of the License, or
-  ~ (at your option) any later version.
-  ~
-  ~ QKSMS is distributed in the hope that it will be useful,
-  ~ but WITHOUT ANY WARRANTY; without even the implied warranty of
-  ~ MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
-  ~ GNU General Public License for more details.
-  ~
-  ~ You should have received a copy of the GNU General Public License
-  ~ along with QKSMS.  If not, see <http://www.gnu.org/licenses/>.
-  -->
-<merge xmlns:android="http://schemas.android.com/apk/res/android"
-    xmlns:tools="http://schemas.android.com/tools"
-    android:layout_width="match_parent"
-    android:layout_height="wrap_content"
-    android:background="?attr/selectableItemBackground"
-    android:gravity="center_vertical"
-    android:orientation="horizontal"
-    tools:parentTag="com.moez.QKSMS.common.widget.PreferenceView">
-
-    <ImageView
-        android:id="@+id/icon"
-        android:layout_width="24dp"
-        android:layout_height="24dp"
-        android:layout_marginStart="24dp"
-        android:duplicateParentState="true"
-        android:visibility="invisible" />
-
-    <LinearLayout
-        android:layout_width="0dp"
-        android:layout_height="wrap_content"
-        android:layout_weight="1"
-        android:duplicateParentState="true"
-        android:orientation="vertical"
-        android:paddingLeft="24dp"
-        android:paddingTop="16dp"
-        android:paddingRight="24dp"
-        android:paddingBottom="16dp">
-
-        <com.moez.QKSMS.common.widget.QkTextView
-            android:id="@+id/titleView"
-            style="@style/TextPrimary"
-            android:layout_width="match_parent"
-            android:layout_height="wrap_content"
-            android:duplicateParentState="true"
-            tools:text="Default SMS App" />
-
-        <com.moez.QKSMS.common.widget.QkTextView
-            android:id="@+id/summaryView"
-            style="@style/TextSecondary"
-            android:layout_width="match_parent"
-            android:layout_height="wrap_content"
-            android:layout_marginTop="2dp"
-            android:duplicateParentState="true"
-            tools:text="QKSMS is your default SMS app" />
-
-    </LinearLayout>
-
-    <FrameLayout
-        android:id="@+id/widgetFrame"
-        android:layout_width="wrap_content"
-        android:layout_height="match_parent"
-        android:layout_marginEnd="16dp"
-        android:duplicateParentState="true" />
-
+<?xml version="1.0" encoding="utf-8"?>
+<!--
+  ~ Copyright (C) 2019 Moez Bhatti <moez.bhatti@gmail.com>
+  ~
+  ~ This file is part of QKSMS.
+  ~
+  ~ QKSMS is free software: you can redistribute it and/or modify
+  ~ it under the terms of the GNU General Public License as published by
+  ~ the Free Software Foundation, either version 3 of the License, or
+  ~ (at your option) any later version.
+  ~
+  ~ QKSMS is distributed in the hope that it will be useful,
+  ~ but WITHOUT ANY WARRANTY; without even the implied warranty of
+  ~ MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+  ~ GNU General Public License for more details.
+  ~
+  ~ You should have received a copy of the GNU General Public License
+  ~ along with QKSMS.  If not, see <http://www.gnu.org/licenses/>.
+  -->
+<merge xmlns:android="http://schemas.android.com/apk/res/android"
+    xmlns:tools="http://schemas.android.com/tools"
+    android:layout_width="match_parent"
+    android:layout_height="wrap_content"
+    android:background="?attr/selectableItemBackground"
+    android:gravity="center_vertical"
+    android:orientation="horizontal"
+    tools:parentTag="com.moez.QKSMS.common.widget.PreferenceView">
+
+    <ImageView
+        android:id="@+id/icon"
+        android:layout_width="24dp"
+        android:layout_height="24dp"
+        android:layout_marginStart="24dp"
+        android:duplicateParentState="true"
+        android:visibility="invisible" />
+
+    <LinearLayout
+        android:layout_width="0dp"
+        android:layout_height="wrap_content"
+        android:layout_weight="1"
+        android:duplicateParentState="true"
+        android:orientation="vertical"
+        android:paddingLeft="24dp"
+        android:paddingTop="16dp"
+        android:paddingRight="24dp"
+        android:paddingBottom="16dp">
+
+        <com.moez.QKSMS.common.widget.QkTextView
+            android:id="@+id/titleView"
+            style="@style/TextPrimary"
+            android:layout_width="match_parent"
+            android:layout_height="wrap_content"
+            android:duplicateParentState="true"
+            tools:text="Default SMS App" />
+
+        <com.moez.QKSMS.common.widget.QkTextView
+            android:id="@+id/summaryView"
+            style="@style/TextSecondary"
+            android:layout_width="match_parent"
+            android:layout_height="wrap_content"
+            android:layout_marginTop="2dp"
+            android:duplicateParentState="true"
+            tools:text="QKSMS is your default SMS app" />
+
+    </LinearLayout>
+
+    <FrameLayout
+        android:id="@+id/widgetFrame"
+        android:layout_width="wrap_content"
+        android:layout_height="match_parent"
+        android:layout_marginEnd="16dp"
+        android:duplicateParentState="true" />
+
 </merge>
\ No newline at end of file
diff --git a/presentation/src/main/res/layout/qk_dialog.xml b/presentation/src/main/res/layout/qk_dialog.xml
index daf3e9fd4..051bdf37b 100644
--- a/presentation/src/main/res/layout/qk_dialog.xml
+++ b/presentation/src/main/res/layout/qk_dialog.xml
@@ -1,109 +1,109 @@
-<?xml version="1.0" encoding="utf-8"?>
-<!--
-  ~ Copyright (C) 2019 Moez Bhatti <moez.bhatti@gmail.com>
-  ~
-  ~ This file is part of QKSMS.
-  ~
-  ~ QKSMS is free software: you can redistribute it and/or modify
-  ~ it under the terms of the GNU General Public License as published by
-  ~ the Free Software Foundation, either version 3 of the License, or
-  ~ (at your option) any later version.
-  ~
-  ~ QKSMS is distributed in the hope that it will be useful,
-  ~ but WITHOUT ANY WARRANTY; without even the implied warranty of
-  ~ MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
-  ~ GNU General Public License for more details.
-  ~
-  ~ You should have received a copy of the GNU General Public License
-  ~ along with QKSMS.  If not, see <http://www.gnu.org/licenses/>.
-  -->
-<androidx.constraintlayout.widget.ConstraintLayout xmlns:android="http://schemas.android.com/apk/res/android"
-    xmlns:app="http://schemas.android.com/apk/res-auto"
-    xmlns:tools="http://schemas.android.com/tools"
-    android:layout_width="match_parent"
-    android:layout_height="wrap_content"
-    android:background="?android:attr/windowBackground">
-
-    <com.moez.QKSMS.common.widget.QkTextView
-        android:id="@+id/title"
-        android:layout_width="match_parent"
-        android:layout_height="wrap_content"
-        android:layout_marginLeft="24dp"
-        android:layout_marginTop="16dp"
-        android:layout_marginRight="24dp"
-        android:textColor="?android:attr/textColorPrimary"
-        android:textStyle="bold"
-        android:visibility="gone"
-        app:layout_constraintBottom_toTopOf="@id/subtitle"
-        app:layout_constraintTop_toTopOf="parent"
-        app:textSize="dialog"
-        tools:text="Choose a phone number"
-        tools:visibility="visible" />
-
-    <com.moez.QKSMS.common.widget.QkTextView
-        android:id="@+id/subtitle"
-        android:layout_width="match_parent"
-        android:layout_height="wrap_content"
-        android:layout_marginLeft="24dp"
-        android:layout_marginTop="2dp"
-        android:layout_marginRight="24dp"
-        android:textColor="?android:attr/textColorPrimary"
-        android:visibility="gone"
-        app:layout_constraintBottom_toTopOf="@id/list"
-        app:layout_constraintTop_toBottomOf="@id/title"
-        app:textSize="primary"
-        tools:text="Moez Bhatti"
-        tools:visibility="visible" />
-
-    <androidx.recyclerview.widget.RecyclerView
-        android:id="@+id/list"
-        android:layout_width="match_parent"
-        android:layout_height="wrap_content"
-        android:paddingTop="8dp"
-        android:paddingBottom="8dp"
-        android:visibility="gone"
-        app:layoutManager="androidx.recyclerview.widget.LinearLayoutManager"
-        app:layout_constrainedHeight="true"
-        app:layout_constraintBottom_toTopOf="@id/positiveButton"
-        app:layout_constraintTop_toBottomOf="@id/subtitle"
-        tools:itemCount="20"
-        tools:listitem="@layout/phone_number_list_item"
-        tools:visibility="visible" />
-
-    <com.moez.QKSMS.common.widget.QkTextView
-        android:id="@+id/positiveButton"
-        android:layout_width="wrap_content"
-        android:layout_height="wrap_content"
-        android:layout_marginTop="8dp"
-        android:layout_marginEnd="8dp"
-        android:background="?attr/selectableItemBackground"
-        android:padding="16dp"
-        android:textColor="?android:attr/textColorSecondary"
-        android:textStyle="bold"
-        android:visibility="gone"
-        app:layout_constraintBottom_toBottomOf="parent"
-        app:layout_constraintEnd_toEndOf="parent"
-        app:layout_constraintTop_toBottomOf="@id/list"
-        app:layout_goneMarginRight="8dp"
-        app:textSize="secondary"
-        tools:text="Always"
-        tools:visibility="visible" />
-
-    <com.moez.QKSMS.common.widget.QkTextView
-        android:id="@+id/negativeButton"
-        android:layout_width="wrap_content"
-        android:layout_height="wrap_content"
-        android:layout_marginTop="8dp"
-        android:background="?attr/selectableItemBackground"
-        android:padding="16dp"
-        android:textColor="?android:attr/textColorSecondary"
-        android:textStyle="bold"
-        android:visibility="gone"
-        app:layout_constraintBottom_toBottomOf="parent"
-        app:layout_constraintEnd_toStartOf="@id/positiveButton"
-        app:layout_constraintTop_toBottomOf="@id/list"
-        app:textSize="secondary"
-        tools:text="Just once"
-        tools:visibility="visible" />
-
-</androidx.constraintlayout.widget.ConstraintLayout>
+<?xml version="1.0" encoding="utf-8"?>
+<!--
+  ~ Copyright (C) 2019 Moez Bhatti <moez.bhatti@gmail.com>
+  ~
+  ~ This file is part of QKSMS.
+  ~
+  ~ QKSMS is free software: you can redistribute it and/or modify
+  ~ it under the terms of the GNU General Public License as published by
+  ~ the Free Software Foundation, either version 3 of the License, or
+  ~ (at your option) any later version.
+  ~
+  ~ QKSMS is distributed in the hope that it will be useful,
+  ~ but WITHOUT ANY WARRANTY; without even the implied warranty of
+  ~ MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+  ~ GNU General Public License for more details.
+  ~
+  ~ You should have received a copy of the GNU General Public License
+  ~ along with QKSMS.  If not, see <http://www.gnu.org/licenses/>.
+  -->
+<androidx.constraintlayout.widget.ConstraintLayout xmlns:android="http://schemas.android.com/apk/res/android"
+    xmlns:app="http://schemas.android.com/apk/res-auto"
+    xmlns:tools="http://schemas.android.com/tools"
+    android:layout_width="match_parent"
+    android:layout_height="wrap_content"
+    android:background="?android:attr/windowBackground">
+
+    <com.moez.QKSMS.common.widget.QkTextView
+        android:id="@+id/title"
+        android:layout_width="match_parent"
+        android:layout_height="wrap_content"
+        android:layout_marginLeft="24dp"
+        android:layout_marginTop="16dp"
+        android:layout_marginRight="24dp"
+        android:textColor="?android:attr/textColorPrimary"
+        android:textStyle="bold"
+        android:visibility="gone"
+        app:layout_constraintBottom_toTopOf="@id/subtitle"
+        app:layout_constraintTop_toTopOf="parent"
+        app:textSize="dialog"
+        tools:text="Choose a phone number"
+        tools:visibility="visible" />
+
+    <com.moez.QKSMS.common.widget.QkTextView
+        android:id="@+id/subtitle"
+        android:layout_width="match_parent"
+        android:layout_height="wrap_content"
+        android:layout_marginLeft="24dp"
+        android:layout_marginTop="2dp"
+        android:layout_marginRight="24dp"
+        android:textColor="?android:attr/textColorPrimary"
+        android:visibility="gone"
+        app:layout_constraintBottom_toTopOf="@id/list"
+        app:layout_constraintTop_toBottomOf="@id/title"
+        app:textSize="primary"
+        tools:text="Moez Bhatti"
+        tools:visibility="visible" />
+
+    <androidx.recyclerview.widget.RecyclerView
+        android:id="@+id/list"
+        android:layout_width="match_parent"
+        android:layout_height="wrap_content"
+        android:paddingTop="8dp"
+        android:paddingBottom="8dp"
+        android:visibility="gone"
+        app:layoutManager="androidx.recyclerview.widget.LinearLayoutManager"
+        app:layout_constrainedHeight="true"
+        app:layout_constraintBottom_toTopOf="@id/positiveButton"
+        app:layout_constraintTop_toBottomOf="@id/subtitle"
+        tools:itemCount="20"
+        tools:listitem="@layout/phone_number_list_item"
+        tools:visibility="visible" />
+
+    <com.moez.QKSMS.common.widget.QkTextView
+        android:id="@+id/positiveButton"
+        android:layout_width="wrap_content"
+        android:layout_height="wrap_content"
+        android:layout_marginTop="8dp"
+        android:layout_marginEnd="8dp"
+        android:background="?attr/selectableItemBackground"
+        android:padding="16dp"
+        android:textColor="?android:attr/textColorSecondary"
+        android:textStyle="bold"
+        android:visibility="gone"
+        app:layout_constraintBottom_toBottomOf="parent"
+        app:layout_constraintEnd_toEndOf="parent"
+        app:layout_constraintTop_toBottomOf="@id/list"
+        app:layout_goneMarginRight="8dp"
+        app:textSize="secondary"
+        tools:text="Always"
+        tools:visibility="visible" />
+
+    <com.moez.QKSMS.common.widget.QkTextView
+        android:id="@+id/negativeButton"
+        android:layout_width="wrap_content"
+        android:layout_height="wrap_content"
+        android:layout_marginTop="8dp"
+        android:background="?attr/selectableItemBackground"
+        android:padding="16dp"
+        android:textColor="?android:attr/textColorSecondary"
+        android:textStyle="bold"
+        android:visibility="gone"
+        app:layout_constraintBottom_toBottomOf="parent"
+        app:layout_constraintEnd_toStartOf="@id/positiveButton"
+        app:layout_constraintTop_toBottomOf="@id/list"
+        app:textSize="secondary"
+        tools:text="Just once"
+        tools:visibility="visible" />
+
+</androidx.constraintlayout.widget.ConstraintLayout>
diff --git a/presentation/src/main/res/layout/qkreply_activity.xml b/presentation/src/main/res/layout/qkreply_activity.xml
index f7b51a277..f059f84cd 100644
--- a/presentation/src/main/res/layout/qkreply_activity.xml
+++ b/presentation/src/main/res/layout/qkreply_activity.xml
@@ -1,178 +1,178 @@
-<?xml version="1.0" encoding="utf-8"?>
-<!--
-  ~ Copyright (C) 2019 Moez Bhatti <moez.bhatti@gmail.com>
-  ~
-  ~ This file is part of QKSMS.
-  ~
-  ~ QKSMS is free software: you can redistribute it and/or modify
-  ~ it under the terms of the GNU General Public License as published by
-  ~ the Free Software Foundation, either version 3 of the License, or
-  ~ (at your option) any later version.
-  ~
-  ~ QKSMS is distributed in the hope that it will be useful,
-  ~ but WITHOUT ANY WARRANTY; without even the implied warranty of
-  ~ MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
-  ~ GNU General Public License for more details.
-  ~
-  ~ You should have received a copy of the GNU General Public License
-  ~ along with QKSMS.  If not, see <http://www.gnu.org/licenses/>.
-  -->
-<androidx.constraintlayout.widget.ConstraintLayout xmlns:android="http://schemas.android.com/apk/res/android"
-    xmlns:app="http://schemas.android.com/apk/res-auto"
-    xmlns:tools="http://schemas.android.com/tools"
-    android:id="@+id/background"
-    android:layout_width="match_parent"
-    android:layout_height="wrap_content"
-    android:layout_gravity="center"
-    android:layout_margin="24dp"
-    android:background="@drawable/rounded_rectangle_4dp"
-    android:backgroundTint="?android:attr/windowBackground"
-    android:elevation="8dp"
-    tools:context=".feature.qkreply.QkReplyActivity">
-
-    <androidx.recyclerview.widget.RecyclerView
-        android:id="@+id/messages"
-        android:layout_width="match_parent"
-        android:layout_height="wrap_content"
-        android:clipToPadding="false"
-        android:paddingTop="8dp"
-        android:paddingBottom="8dp"
-        app:layoutManager="androidx.recyclerview.widget.LinearLayoutManager"
-        app:layout_constrainedHeight="true"
-        app:layout_constraintBottom_toTopOf="@id/composeBackgroundSolid"
-        app:layout_constraintTop_toBottomOf="@id/toolbar"
-        app:layout_constraintVertical_weight="0"
-        app:stackFromEnd="true"
-        tools:listitem="@layout/message_list_item_in" />
-
-    <View
-        android:id="@+id/composeBackgroundGradient"
-        android:layout_width="match_parent"
-        android:layout_height="12dp"
-        android:layout_marginTop="8dp"
-        android:background="?android:attr/windowBackground"
-        app:layout_constraintBottom_toTopOf="@id/composeBackgroundSolid" />
-
-    <View
-        android:id="@+id/composeBackgroundSolid"
-        android:layout_width="match_parent"
-        android:layout_height="0dp"
-        android:background="@drawable/rounded_rectangle_bottom_4dp"
-        android:backgroundTint="?android:attr/windowBackground"
-        app:layout_constraintBottom_toBottomOf="parent"
-        app:layout_constraintTop_toBottomOf="@id/messages"
-        app:layout_constraintTop_toTopOf="@id/message"
-        app:layout_constraintVertical_weight="1" />
-
-    <View
-        android:id="@+id/messageBackground"
-        android:layout_width="0dp"
-        android:layout_height="0dp"
-        android:layout_marginEnd="8dp"
-        android:background="@drawable/rounded_rectangle_22dp"
-        android:backgroundTint="?attr/bubbleColor"
-        app:layout_constraintBottom_toBottomOf="@id/message"
-        app:layout_constraintEnd_toStartOf="@id/send"
-        app:layout_constraintStart_toStartOf="@id/message"
-        app:layout_constraintTop_toTopOf="@id/message" />
-
-    <com.moez.QKSMS.common.widget.QkEditText
-        android:id="@+id/message"
-        style="@style/TextPrimary"
-        android:layout_width="0dp"
-        android:layout_height="wrap_content"
-        android:layout_marginStart="12dp"
-        android:layout_marginBottom="12dp"
-        android:background="@null"
-        android:gravity="center_vertical"
-        android:hint="@string/compose_hint"
-        android:inputType="textLongMessage|textCapSentences|textMultiLine"
-        android:maxLines="6"
-        android:minHeight="44dp"
-        android:paddingStart="16dp"
-        android:paddingTop="12dp"
-        android:paddingEnd="16dp"
-        android:paddingBottom="12dp"
-        android:textColorHint="?android:attr/textColorTertiary"
-        app:layout_constraintBottom_toBottomOf="parent"
-        app:layout_constraintEnd_toStartOf="@id/sim"
-        app:layout_constraintStart_toStartOf="parent" />
-
-    <ImageView
-        android:id="@+id/sim"
-        android:layout_width="44dp"
-        android:layout_height="44dp"
-        android:background="?attr/selectableItemBackground"
-        android:contentDescription="@string/compose_sim_cd"
-        android:padding="10dp"
-        android:src="@drawable/ic_sim_card_black_24dp"
-        android:tint="?android:attr/textColorSecondary"
-        app:layout_constraintBottom_toBottomOf="@id/message"
-        app:layout_constraintEnd_toEndOf="@id/messageBackground" />
-
-    <com.moez.QKSMS.common.widget.QkTextView
-        android:id="@+id/simIndex"
-        android:layout_width="0dp"
-        android:layout_height="0dp"
-        android:gravity="center"
-        android:textColor="?android:attr/textColorPrimaryInverse"
-        android:textSize="14dp"
-        android:textStyle="bold"
-        app:layout_constraintBottom_toBottomOf="@id/sim"
-        app:layout_constraintEnd_toEndOf="@id/sim"
-        app:layout_constraintStart_toStartOf="@id/sim"
-        app:layout_constraintTop_toTopOf="@id/sim"
-        tools:ignore="SpUsage"
-        tools:text="1" />
-
-    <com.moez.QKSMS.common.widget.QkTextView
-        android:id="@+id/counter"
-        android:layout_width="0dp"
-        android:layout_height="wrap_content"
-        android:layout_marginBottom="4dp"
-        android:gravity="center"
-        android:textColor="?android:attr/textColorSecondary"
-        app:layout_constraintBottom_toTopOf="@id/send"
-        app:layout_constraintEnd_toEndOf="@id/send"
-        app:layout_constraintStart_toStartOf="@id/send"
-        app:textSize="tertiary"
-        tools:text="108 / 2" />
-
-    <ImageView
-        android:id="@+id/send"
-        android:layout_width="44dp"
-        android:layout_height="44dp"
-        android:layout_marginEnd="8dp"
-        android:contentDescription="@string/compose_send_cd"
-        android:padding="10dp"
-        android:src="@drawable/ic_send_black_24dp"
-        android:tint="?android:textColorSecondary"
-        app:layout_constraintBottom_toBottomOf="@id/message"
-        app:layout_constraintEnd_toEndOf="parent"
-        tools:backgroundTint="@color/tools_theme" />
-
-    <androidx.appcompat.widget.Toolbar
-        android:id="@+id/toolbar"
-        style="@style/Toolbar"
-        android:layout_width="match_parent"
-        android:background="@drawable/rounded_rectangle_top_4dp"
-        android:backgroundTint="?attr/colorPrimary"
-        app:layout_constraintBottom_toTopOf="@id/messages"
-        app:layout_constraintTop_toTopOf="parent"
-        app:layout_constraintVertical_weight="1">
-
-        <com.moez.QKSMS.common.widget.QkTextView
-            android:id="@+id/toolbarTitle"
-            style="@style/ToolbarText"
-            tools:text="Conversations" />
-
-    </androidx.appcompat.widget.Toolbar>
-
-    <View
-        android:id="@+id/view2"
-        android:layout_width="match_parent"
-        android:layout_height="8dp"
-        android:background="@drawable/ab_shadow"
-        app:layout_constraintTop_toBottomOf="@id/toolbar" />
-
+<?xml version="1.0" encoding="utf-8"?>
+<!--
+  ~ Copyright (C) 2019 Moez Bhatti <moez.bhatti@gmail.com>
+  ~
+  ~ This file is part of QKSMS.
+  ~
+  ~ QKSMS is free software: you can redistribute it and/or modify
+  ~ it under the terms of the GNU General Public License as published by
+  ~ the Free Software Foundation, either version 3 of the License, or
+  ~ (at your option) any later version.
+  ~
+  ~ QKSMS is distributed in the hope that it will be useful,
+  ~ but WITHOUT ANY WARRANTY; without even the implied warranty of
+  ~ MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+  ~ GNU General Public License for more details.
+  ~
+  ~ You should have received a copy of the GNU General Public License
+  ~ along with QKSMS.  If not, see <http://www.gnu.org/licenses/>.
+  -->
+<androidx.constraintlayout.widget.ConstraintLayout xmlns:android="http://schemas.android.com/apk/res/android"
+    xmlns:app="http://schemas.android.com/apk/res-auto"
+    xmlns:tools="http://schemas.android.com/tools"
+    android:id="@+id/background"
+    android:layout_width="match_parent"
+    android:layout_height="wrap_content"
+    android:layout_gravity="center"
+    android:layout_margin="24dp"
+    android:background="@drawable/rounded_rectangle_4dp"
+    android:backgroundTint="?android:attr/windowBackground"
+    android:elevation="8dp"
+    tools:context=".feature.qkreply.QkReplyActivity">
+
+    <androidx.recyclerview.widget.RecyclerView
+        android:id="@+id/messages"
+        android:layout_width="match_parent"
+        android:layout_height="wrap_content"
+        android:clipToPadding="false"
+        android:paddingTop="8dp"
+        android:paddingBottom="8dp"
+        app:layoutManager="androidx.recyclerview.widget.LinearLayoutManager"
+        app:layout_constrainedHeight="true"
+        app:layout_constraintBottom_toTopOf="@id/composeBackgroundSolid"
+        app:layout_constraintTop_toBottomOf="@id/toolbar"
+        app:layout_constraintVertical_weight="0"
+        app:stackFromEnd="true"
+        tools:listitem="@layout/message_list_item_in" />
+
+    <View
+        android:id="@+id/composeBackgroundGradient"
+        android:layout_width="match_parent"
+        android:layout_height="12dp"
+        android:layout_marginTop="8dp"
+        android:background="?android:attr/windowBackground"
+        app:layout_constraintBottom_toTopOf="@id/composeBackgroundSolid" />
+
+    <View
+        android:id="@+id/composeBackgroundSolid"
+        android:layout_width="match_parent"
+        android:layout_height="0dp"
+        android:background="@drawable/rounded_rectangle_bottom_4dp"
+        android:backgroundTint="?android:attr/windowBackground"
+        app:layout_constraintBottom_toBottomOf="parent"
+        app:layout_constraintTop_toBottomOf="@id/messages"
+        app:layout_constraintTop_toTopOf="@id/message"
+        app:layout_constraintVertical_weight="1" />
+
+    <View
+        android:id="@+id/messageBackground"
+        android:layout_width="0dp"
+        android:layout_height="0dp"
+        android:layout_marginEnd="8dp"
+        android:background="@drawable/rounded_rectangle_22dp"
+        android:backgroundTint="?attr/bubbleColor"
+        app:layout_constraintBottom_toBottomOf="@id/message"
+        app:layout_constraintEnd_toStartOf="@id/send"
+        app:layout_constraintStart_toStartOf="@id/message"
+        app:layout_constraintTop_toTopOf="@id/message" />
+
+    <com.moez.QKSMS.common.widget.QkEditText
+        android:id="@+id/message"
+        style="@style/TextPrimary"
+        android:layout_width="0dp"
+        android:layout_height="wrap_content"
+        android:layout_marginStart="12dp"
+        android:layout_marginBottom="12dp"
+        android:background="@null"
+        android:gravity="center_vertical"
+        android:hint="@string/compose_hint"
+        android:inputType="textLongMessage|textCapSentences|textMultiLine"
+        android:maxLines="6"
+        android:minHeight="44dp"
+        android:paddingStart="16dp"
+        android:paddingTop="12dp"
+        android:paddingEnd="16dp"
+        android:paddingBottom="12dp"
+        android:textColorHint="?android:attr/textColorTertiary"
+        app:layout_constraintBottom_toBottomOf="parent"
+        app:layout_constraintEnd_toStartOf="@id/sim"
+        app:layout_constraintStart_toStartOf="parent" />
+
+    <ImageView
+        android:id="@+id/sim"
+        android:layout_width="44dp"
+        android:layout_height="44dp"
+        android:background="?attr/selectableItemBackground"
+        android:contentDescription="@string/compose_sim_cd"
+        android:padding="10dp"
+        android:src="@drawable/ic_sim_card_black_24dp"
+        android:tint="?android:attr/textColorSecondary"
+        app:layout_constraintBottom_toBottomOf="@id/message"
+        app:layout_constraintEnd_toEndOf="@id/messageBackground" />
+
+    <com.moez.QKSMS.common.widget.QkTextView
+        android:id="@+id/simIndex"
+        android:layout_width="0dp"
+        android:layout_height="0dp"
+        android:gravity="center"
+        android:textColor="?android:attr/textColorPrimaryInverse"
+        android:textSize="14dp"
+        android:textStyle="bold"
+        app:layout_constraintBottom_toBottomOf="@id/sim"
+        app:layout_constraintEnd_toEndOf="@id/sim"
+        app:layout_constraintStart_toStartOf="@id/sim"
+        app:layout_constraintTop_toTopOf="@id/sim"
+        tools:ignore="SpUsage"
+        tools:text="1" />
+
+    <com.moez.QKSMS.common.widget.QkTextView
+        android:id="@+id/counter"
+        android:layout_width="0dp"
+        android:layout_height="wrap_content"
+        android:layout_marginBottom="4dp"
+        android:gravity="center"
+        android:textColor="?android:attr/textColorSecondary"
+        app:layout_constraintBottom_toTopOf="@id/send"
+        app:layout_constraintEnd_toEndOf="@id/send"
+        app:layout_constraintStart_toStartOf="@id/send"
+        app:textSize="tertiary"
+        tools:text="108 / 2" />
+
+    <ImageView
+        android:id="@+id/send"
+        android:layout_width="44dp"
+        android:layout_height="44dp"
+        android:layout_marginEnd="8dp"
+        android:contentDescription="@string/compose_send_cd"
+        android:padding="10dp"
+        android:src="@drawable/ic_send_black_24dp"
+        android:tint="?android:textColorSecondary"
+        app:layout_constraintBottom_toBottomOf="@id/message"
+        app:layout_constraintEnd_toEndOf="parent"
+        tools:backgroundTint="@color/tools_theme" />
+
+    <androidx.appcompat.widget.Toolbar
+        android:id="@+id/toolbar"
+        style="@style/Toolbar"
+        android:layout_width="match_parent"
+        android:background="@drawable/rounded_rectangle_top_4dp"
+        android:backgroundTint="?attr/colorPrimary"
+        app:layout_constraintBottom_toTopOf="@id/messages"
+        app:layout_constraintTop_toTopOf="parent"
+        app:layout_constraintVertical_weight="1">
+
+        <com.moez.QKSMS.common.widget.QkTextView
+            android:id="@+id/toolbarTitle"
+            style="@style/ToolbarText"
+            tools:text="Conversations" />
+
+    </androidx.appcompat.widget.Toolbar>
+
+    <View
+        android:id="@+id/view2"
+        android:layout_width="match_parent"
+        android:layout_height="8dp"
+        android:background="@drawable/ab_shadow"
+        app:layout_constraintTop_toBottomOf="@id/toolbar" />
+
 </androidx.constraintlayout.widget.ConstraintLayout>
\ No newline at end of file
diff --git a/presentation/src/main/res/layout/qksms_plus_activity.xml b/presentation/src/main/res/layout/qksms_plus_activity.xml
index eef115ddd..b11c0c283 100644
--- a/presentation/src/main/res/layout/qksms_plus_activity.xml
+++ b/presentation/src/main/res/layout/qksms_plus_activity.xml
@@ -1,265 +1,265 @@
-<?xml version="1.0" encoding="utf-8"?>
-<!--
-  ~ Copyright (C) 2019 Moez Bhatti <moez.bhatti@gmail.com>
-  ~
-  ~ This file is part of QKSMS.
-  ~
-  ~ QKSMS is free software: you can redistribute it and/or modify
-  ~ it under the terms of the GNU General Public License as published by
-  ~ the Free Software Foundation, either version 3 of the License, or
-  ~ (at your option) any later version.
-  ~
-  ~ QKSMS is distributed in the hope that it will be useful,
-  ~ but WITHOUT ANY WARRANTY; without even the implied warranty of
-  ~ MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
-  ~ GNU General Public License for more details.
-  ~
-  ~ You should have received a copy of the GNU General Public License
-  ~ along with QKSMS.  If not, see <http://www.gnu.org/licenses/>.
-  -->
-<androidx.coordinatorlayout.widget.CoordinatorLayout xmlns:android="http://schemas.android.com/apk/res/android"
-    xmlns:app="http://schemas.android.com/apk/res-auto"
-    xmlns:tools="http://schemas.android.com/tools"
-    android:layout_width="match_parent"
-    android:layout_height="match_parent">
-
-    <include layout="@layout/collapsing_toolbar" />
-
-    <androidx.core.widget.NestedScrollView
-        android:layout_width="match_parent"
-        android:layout_height="match_parent"
-        app:layout_behavior="@string/appbar_scrolling_view_behavior">
-
-        <LinearLayout
-            android:id="@+id/linearLayout"
-            android:layout_width="match_parent"
-            android:layout_height="wrap_content"
-            android:orientation="vertical"
-            android:paddingTop="8dp">
-
-            <LinearLayout
-                android:id="@+id/toUpgrade"
-                android:layout_width="match_parent"
-                android:layout_height="wrap_content"
-                android:layout_marginStart="32dp"
-                android:layout_marginEnd="32dp"
-                android:layout_marginBottom="32dp"
-                android:orientation="vertical">
-
-                <com.moez.QKSMS.common.widget.QkTextView
-                    android:layout_width="match_parent"
-                    android:layout_height="wrap_content"
-                    android:text="@string/qksms_plus_description_title"
-                    android:textColor="?android:attr/textColorPrimary"
-                    android:textStyle="bold"
-                    app:textSize="primary" />
-
-                <com.moez.QKSMS.common.widget.QkTextView
-                    android:id="@+id/description"
-                    android:layout_width="match_parent"
-                    android:layout_height="wrap_content"
-                    android:text="@string/qksms_plus_description_summary"
-                    android:textColor="?android:attr/textColorSecondary"
-                    app:textSize="secondary" />
-
-                <com.moez.QKSMS.common.widget.QkTextView
-                    android:id="@+id/upgrade"
-                    style="@style/TextButton"
-                    android:layout_marginTop="16dp"
-                    android:background="@drawable/rounded_rectangle_2dp"
-                    android:text="@string/qksms_plus_upgrade"
-                    app:textColor="primaryOnTheme"
-                    tools:backgroundTint="@color/tools_theme" />
-
-                <com.moez.QKSMS.common.widget.QkTextView
-                    android:id="@+id/upgradeDonate"
-                    style="@style/TextButton"
-                    android:layout_marginTop="8dp"
-                    android:background="@drawable/rounded_rectangle_outline_2dp"
-                    android:backgroundTint="?android:attr/divider"
-                    android:text="@string/qksms_plus_upgrade_donate"
-                    android:textColor="?android:attr/textColorPrimary"
-                    tools:backgroundTint="@color/separatorLight" />
-
-            </LinearLayout>
-
-            <androidx.constraintlayout.widget.ConstraintLayout
-                android:id="@+id/upgraded"
-                android:layout_width="match_parent"
-                android:layout_height="wrap_content"
-                android:layout_marginStart="24dp"
-                android:layout_marginEnd="24dp"
-                android:layout_marginBottom="24dp"
-                android:background="@drawable/rounded_rectangle_2dp"
-                android:backgroundTint="?android:attr/divider"
-                android:padding="16dp"
-                tools:backgroundTint="@color/separatorLight">
-
-                <ImageView
-                    android:id="@+id/thanksIcon"
-                    android:layout_width="24dp"
-                    android:layout_height="24dp"
-                    android:src="@drawable/ic_favorite_black_24dp"
-                    app:layout_constraintBottom_toBottomOf="parent"
-                    app:layout_constraintTop_toTopOf="parent"
-                    tools:tint="@color/tools_theme" />
-
-                <com.moez.QKSMS.common.widget.QkTextView
-                    android:id="@+id/thanksTitle"
-                    android:layout_width="0dp"
-                    android:layout_height="wrap_content"
-                    android:layout_marginStart="24dp"
-                    android:text="@string/qksms_plus_thanks_title"
-                    android:textColor="?android:attr/textColorPrimary"
-                    android:textStyle="bold"
-                    app:layout_constraintEnd_toEndOf="parent"
-                    app:layout_constraintStart_toEndOf="@id/thanksIcon"
-                    app:textSize="secondary" />
-
-                <com.moez.QKSMS.common.widget.QkTextView
-                    android:layout_width="0dp"
-                    android:layout_height="wrap_content"
-                    android:text="@string/qksms_plus_thanks_summary"
-                    android:textColor="?android:attr/textColorSecondary"
-                    app:layout_constraintEnd_toEndOf="@id/thanksTitle"
-                    app:layout_constraintStart_toStartOf="@id/thanksTitle"
-                    app:layout_constraintTop_toBottomOf="@id/thanksTitle"
-                    app:textSize="secondary" />
-
-            </androidx.constraintlayout.widget.ConstraintLayout>
-
-            <LinearLayout
-                android:id="@+id/free"
-                android:layout_width="match_parent"
-                android:layout_height="wrap_content"
-                android:layout_marginStart="32dp"
-                android:layout_marginEnd="32dp"
-                android:layout_marginBottom="24dp"
-                android:orientation="vertical">
-
-                <com.moez.QKSMS.common.widget.QkTextView
-                    android:layout_width="match_parent"
-                    android:layout_height="wrap_content"
-                    android:text="@string/qksms_plus_free_title"
-                    android:textColor="?android:attr/textColorSecondary"
-                    app:textSize="secondary" />
-
-                <com.moez.QKSMS.common.widget.QkTextView
-                    android:id="@+id/donate"
-                    style="@style/TextButton"
-                    android:layout_marginTop="16dp"
-                    android:background="@drawable/rounded_rectangle_2dp"
-                    android:text="@string/qksms_plus_donate"
-                    app:textColor="primaryOnTheme"
-                    tools:backgroundTint="@color/tools_theme" />
-
-            </LinearLayout>
-
-            <View
-                android:layout_width="match_parent"
-                android:layout_height="1dp"
-                android:layout_marginBottom="8dp"
-                android:background="?android:attr/divider" />
-
-            <com.moez.QKSMS.common.widget.PreferenceView
-                android:id="@+id/themes"
-                android:layout_width="match_parent"
-                android:layout_height="wrap_content"
-                app:icon="@drawable/ic_palette_black_24dp"
-                app:summary="@string/qksms_plus_themes_summary"
-                app:title="@string/qksms_plus_themes_title" />
-
-            <com.moez.QKSMS.common.widget.PreferenceView
-                android:id="@+id/schedule"
-                android:layout_width="match_parent"
-                android:layout_height="wrap_content"
-                app:icon="@drawable/ic_event_black_24dp"
-                app:summary="@string/qksms_plus_scheduled_summary"
-                app:title="@string/qksms_plus_scheduled_title" />
-
-            <com.moez.QKSMS.common.widget.PreferenceView
-                android:id="@+id/backup"
-                android:layout_width="match_parent"
-                android:layout_height="wrap_content"
-                app:icon="@drawable/ic_backup_black_24dp"
-                app:summary="@string/qksms_plus_backup_summary"
-                app:title="@string/qksms_plus_backup_title" />
-
-            <com.moez.QKSMS.common.widget.PreferenceView
-                android:id="@+id/delayed"
-                android:layout_width="match_parent"
-                android:layout_height="wrap_content"
-                app:icon="@drawable/ic_av_timer_black_24dp"
-                app:summary="@string/qksms_plus_delayed_summary"
-                app:title="@string/qksms_plus_delayed_title" />
-
-            <com.moez.QKSMS.common.widget.PreferenceView
-                android:id="@+id/night"
-                android:layout_width="match_parent"
-                android:layout_height="wrap_content"
-                app:icon="@drawable/ic_invert_colors_black_24dp"
-                app:summary="@string/qksms_plus_night_summary"
-                app:title="@string/qksms_plus_night_title" />
-
-            <com.moez.QKSMS.common.widget.PreferenceView
-                android:layout_width="match_parent"
-                android:layout_height="wrap_content"
-                app:icon="@drawable/ic_more_horiz_black_24dp"
-                app:summary="@string/qksms_plus_more_summary"
-                app:title="@string/qksms_plus_more_title" />
-
-            <com.moez.QKSMS.common.widget.QkTextView
-                android:layout_width="wrap_content"
-                android:layout_height="wrap_content"
-                android:layout_marginLeft="16dp"
-                android:layout_marginTop="24dp"
-                android:layout_marginRight="16dp"
-                android:layout_marginBottom="8dp"
-                android:text="@string/qksms_plus_coming_soon"
-                android:textColor="?android:attr/textColorPrimary"
-                android:textStyle="bold"
-                app:textSize="primary" />
-
-            <com.moez.QKSMS.common.widget.PreferenceView
-                android:layout_width="match_parent"
-                android:layout_height="wrap_content"
-                android:alpha="0.25"
-                app:icon="@drawable/ic_favorite_black_24dp"
-                app:summary="@string/qksms_plus_emoji_summary"
-                app:title="@string/qksms_plus_emoji_title" />
-
-            <com.moez.QKSMS.common.widget.PreferenceView
-                android:layout_width="match_parent"
-                android:layout_height="wrap_content"
-                android:alpha="0.25"
-                app:icon="@drawable/ic_block_white_24dp"
-                app:summary="@string/qksms_plus_blacklist_summary"
-                app:title="@string/qksms_plus_blacklist_title" />
-
-            <com.moez.QKSMS.common.widget.PreferenceView
-                android:layout_width="match_parent"
-                android:layout_height="wrap_content"
-                android:alpha="0.25"
-                app:icon="@drawable/ic_forward_black_24dp"
-                app:summary="@string/qksms_plus_forward_summary"
-                app:title="@string/qksms_plus_forward_title" />
-
-            <com.moez.QKSMS.common.widget.PreferenceView
-                android:layout_width="match_parent"
-                android:layout_height="wrap_content"
-                android:alpha="0.25"
-                app:icon="@drawable/ic_reply_white_24dp"
-                app:summary="@string/qksms_plus_respond_summary"
-                app:title="@string/qksms_plus_respond_title" />
-
-        </LinearLayout>
-
-    </androidx.core.widget.NestedScrollView>
-
-    <View
-        android:layout_width="match_parent"
-        android:layout_height="1dp"
-        android:layout_gravity="bottom"
-        android:background="?android:attr/divider" />
-
+<?xml version="1.0" encoding="utf-8"?>
+<!--
+  ~ Copyright (C) 2019 Moez Bhatti <moez.bhatti@gmail.com>
+  ~
+  ~ This file is part of QKSMS.
+  ~
+  ~ QKSMS is free software: you can redistribute it and/or modify
+  ~ it under the terms of the GNU General Public License as published by
+  ~ the Free Software Foundation, either version 3 of the License, or
+  ~ (at your option) any later version.
+  ~
+  ~ QKSMS is distributed in the hope that it will be useful,
+  ~ but WITHOUT ANY WARRANTY; without even the implied warranty of
+  ~ MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+  ~ GNU General Public License for more details.
+  ~
+  ~ You should have received a copy of the GNU General Public License
+  ~ along with QKSMS.  If not, see <http://www.gnu.org/licenses/>.
+  -->
+<androidx.coordinatorlayout.widget.CoordinatorLayout xmlns:android="http://schemas.android.com/apk/res/android"
+    xmlns:app="http://schemas.android.com/apk/res-auto"
+    xmlns:tools="http://schemas.android.com/tools"
+    android:layout_width="match_parent"
+    android:layout_height="match_parent">
+
+    <include layout="@layout/collapsing_toolbar" />
+
+    <androidx.core.widget.NestedScrollView
+        android:layout_width="match_parent"
+        android:layout_height="match_parent"
+        app:layout_behavior="@string/appbar_scrolling_view_behavior">
+
+        <LinearLayout
+            android:id="@+id/linearLayout"
+            android:layout_width="match_parent"
+            android:layout_height="wrap_content"
+            android:orientation="vertical"
+            android:paddingTop="8dp">
+
+            <LinearLayout
+                android:id="@+id/toUpgrade"
+                android:layout_width="match_parent"
+                android:layout_height="wrap_content"
+                android:layout_marginStart="32dp"
+                android:layout_marginEnd="32dp"
+                android:layout_marginBottom="32dp"
+                android:orientation="vertical">
+
+                <com.moez.QKSMS.common.widget.QkTextView
+                    android:layout_width="match_parent"
+                    android:layout_height="wrap_content"
+                    android:text="@string/qksms_plus_description_title"
+                    android:textColor="?android:attr/textColorPrimary"
+                    android:textStyle="bold"
+                    app:textSize="primary" />
+
+                <com.moez.QKSMS.common.widget.QkTextView
+                    android:id="@+id/description"
+                    android:layout_width="match_parent"
+                    android:layout_height="wrap_content"
+                    android:text="@string/qksms_plus_description_summary"
+                    android:textColor="?android:attr/textColorSecondary"
+                    app:textSize="secondary" />
+
+                <com.moez.QKSMS.common.widget.QkTextView
+                    android:id="@+id/upgrade"
+                    style="@style/TextButton"
+                    android:layout_marginTop="16dp"
+                    android:background="@drawable/rounded_rectangle_2dp"
+                    android:text="@string/qksms_plus_upgrade"
+                    app:textColor="primaryOnTheme"
+                    tools:backgroundTint="@color/tools_theme" />
+
+                <com.moez.QKSMS.common.widget.QkTextView
+                    android:id="@+id/upgradeDonate"
+                    style="@style/TextButton"
+                    android:layout_marginTop="8dp"
+                    android:background="@drawable/rounded_rectangle_outline_2dp"
+                    android:backgroundTint="?android:attr/divider"
+                    android:text="@string/qksms_plus_upgrade_donate"
+                    android:textColor="?android:attr/textColorPrimary"
+                    tools:backgroundTint="@color/separatorLight" />
+
+            </LinearLayout>
+
+            <androidx.constraintlayout.widget.ConstraintLayout
+                android:id="@+id/upgraded"
+                android:layout_width="match_parent"
+                android:layout_height="wrap_content"
+                android:layout_marginStart="24dp"
+                android:layout_marginEnd="24dp"
+                android:layout_marginBottom="24dp"
+                android:background="@drawable/rounded_rectangle_2dp"
+                android:backgroundTint="?android:attr/divider"
+                android:padding="16dp"
+                tools:backgroundTint="@color/separatorLight">
+
+                <ImageView
+                    android:id="@+id/thanksIcon"
+                    android:layout_width="24dp"
+                    android:layout_height="24dp"
+                    android:src="@drawable/ic_favorite_black_24dp"
+                    app:layout_constraintBottom_toBottomOf="parent"
+                    app:layout_constraintTop_toTopOf="parent"
+                    tools:tint="@color/tools_theme" />
+
+                <com.moez.QKSMS.common.widget.QkTextView
+                    android:id="@+id/thanksTitle"
+                    android:layout_width="0dp"
+                    android:layout_height="wrap_content"
+                    android:layout_marginStart="24dp"
+                    android:text="@string/qksms_plus_thanks_title"
+                    android:textColor="?android:attr/textColorPrimary"
+                    android:textStyle="bold"
+                    app:layout_constraintEnd_toEndOf="parent"
+                    app:layout_constraintStart_toEndOf="@id/thanksIcon"
+                    app:textSize="secondary" />
+
+                <com.moez.QKSMS.common.widget.QkTextView
+                    android:layout_width="0dp"
+                    android:layout_height="wrap_content"
+                    android:text="@string/qksms_plus_thanks_summary"
+                    android:textColor="?android:attr/textColorSecondary"
+                    app:layout_constraintEnd_toEndOf="@id/thanksTitle"
+                    app:layout_constraintStart_toStartOf="@id/thanksTitle"
+                    app:layout_constraintTop_toBottomOf="@id/thanksTitle"
+                    app:textSize="secondary" />
+
+            </androidx.constraintlayout.widget.ConstraintLayout>
+
+            <LinearLayout
+                android:id="@+id/free"
+                android:layout_width="match_parent"
+                android:layout_height="wrap_content"
+                android:layout_marginStart="32dp"
+                android:layout_marginEnd="32dp"
+                android:layout_marginBottom="24dp"
+                android:orientation="vertical">
+
+                <com.moez.QKSMS.common.widget.QkTextView
+                    android:layout_width="match_parent"
+                    android:layout_height="wrap_content"
+                    android:text="@string/qksms_plus_free_title"
+                    android:textColor="?android:attr/textColorSecondary"
+                    app:textSize="secondary" />
+
+                <com.moez.QKSMS.common.widget.QkTextView
+                    android:id="@+id/donate"
+                    style="@style/TextButton"
+                    android:layout_marginTop="16dp"
+                    android:background="@drawable/rounded_rectangle_2dp"
+                    android:text="@string/qksms_plus_donate"
+                    app:textColor="primaryOnTheme"
+                    tools:backgroundTint="@color/tools_theme" />
+
+            </LinearLayout>
+
+            <View
+                android:layout_width="match_parent"
+                android:layout_height="1dp"
+                android:layout_marginBottom="8dp"
+                android:background="?android:attr/divider" />
+
+            <com.moez.QKSMS.common.widget.PreferenceView
+                android:id="@+id/themes"
+                android:layout_width="match_parent"
+                android:layout_height="wrap_content"
+                app:icon="@drawable/ic_palette_black_24dp"
+                app:summary="@string/qksms_plus_themes_summary"
+                app:title="@string/qksms_plus_themes_title" />
+
+            <com.moez.QKSMS.common.widget.PreferenceView
+                android:id="@+id/schedule"
+                android:layout_width="match_parent"
+                android:layout_height="wrap_content"
+                app:icon="@drawable/ic_event_black_24dp"
+                app:summary="@string/qksms_plus_scheduled_summary"
+                app:title="@string/qksms_plus_scheduled_title" />
+
+            <com.moez.QKSMS.common.widget.PreferenceView
+                android:id="@+id/backup"
+                android:layout_width="match_parent"
+                android:layout_height="wrap_content"
+                app:icon="@drawable/ic_backup_black_24dp"
+                app:summary="@string/qksms_plus_backup_summary"
+                app:title="@string/qksms_plus_backup_title" />
+
+            <com.moez.QKSMS.common.widget.PreferenceView
+                android:id="@+id/delayed"
+                android:layout_width="match_parent"
+                android:layout_height="wrap_content"
+                app:icon="@drawable/ic_av_timer_black_24dp"
+                app:summary="@string/qksms_plus_delayed_summary"
+                app:title="@string/qksms_plus_delayed_title" />
+
+            <com.moez.QKSMS.common.widget.PreferenceView
+                android:id="@+id/night"
+                android:layout_width="match_parent"
+                android:layout_height="wrap_content"
+                app:icon="@drawable/ic_invert_colors_black_24dp"
+                app:summary="@string/qksms_plus_night_summary"
+                app:title="@string/qksms_plus_night_title" />
+
+            <com.moez.QKSMS.common.widget.PreferenceView
+                android:layout_width="match_parent"
+                android:layout_height="wrap_content"
+                app:icon="@drawable/ic_more_horiz_black_24dp"
+                app:summary="@string/qksms_plus_more_summary"
+                app:title="@string/qksms_plus_more_title" />
+
+            <com.moez.QKSMS.common.widget.QkTextView
+                android:layout_width="wrap_content"
+                android:layout_height="wrap_content"
+                android:layout_marginLeft="16dp"
+                android:layout_marginTop="24dp"
+                android:layout_marginRight="16dp"
+                android:layout_marginBottom="8dp"
+                android:text="@string/qksms_plus_coming_soon"
+                android:textColor="?android:attr/textColorPrimary"
+                android:textStyle="bold"
+                app:textSize="primary" />
+
+            <com.moez.QKSMS.common.widget.PreferenceView
+                android:layout_width="match_parent"
+                android:layout_height="wrap_content"
+                android:alpha="0.25"
+                app:icon="@drawable/ic_favorite_black_24dp"
+                app:summary="@string/qksms_plus_emoji_summary"
+                app:title="@string/qksms_plus_emoji_title" />
+
+            <com.moez.QKSMS.common.widget.PreferenceView
+                android:layout_width="match_parent"
+                android:layout_height="wrap_content"
+                android:alpha="0.25"
+                app:icon="@drawable/ic_block_white_24dp"
+                app:summary="@string/qksms_plus_blacklist_summary"
+                app:title="@string/qksms_plus_blacklist_title" />
+
+            <com.moez.QKSMS.common.widget.PreferenceView
+                android:layout_width="match_parent"
+                android:layout_height="wrap_content"
+                android:alpha="0.25"
+                app:icon="@drawable/ic_forward_black_24dp"
+                app:summary="@string/qksms_plus_forward_summary"
+                app:title="@string/qksms_plus_forward_title" />
+
+            <com.moez.QKSMS.common.widget.PreferenceView
+                android:layout_width="match_parent"
+                android:layout_height="wrap_content"
+                android:alpha="0.25"
+                app:icon="@drawable/ic_reply_white_24dp"
+                app:summary="@string/qksms_plus_respond_summary"
+                app:title="@string/qksms_plus_respond_title" />
+
+        </LinearLayout>
+
+    </androidx.core.widget.NestedScrollView>
+
+    <View
+        android:layout_width="match_parent"
+        android:layout_height="1dp"
+        android:layout_gravity="bottom"
+        android:background="?android:attr/divider" />
+
 </androidx.coordinatorlayout.widget.CoordinatorLayout>
\ No newline at end of file
diff --git a/presentation/src/main/res/layout/radio_preference_view.xml b/presentation/src/main/res/layout/radio_preference_view.xml
index 8a1d2a67e..47f55bb0f 100644
--- a/presentation/src/main/res/layout/radio_preference_view.xml
+++ b/presentation/src/main/res/layout/radio_preference_view.xml
@@ -1,74 +1,74 @@
-<?xml version="1.0" encoding="utf-8"?>
-<!--
-  ~ Copyright (C) 2017 Moez Bhatti <moez.bhatti@gmail.com>
-  ~
-  ~ This file is part of QKSMS.
-  ~
-  ~ QKSMS is free software: you can redistribute it and/or modify
-  ~ it under the terms of the GNU General Public License as published by
-  ~ the Free Software Foundation, either version 3 of the License, or
-  ~ (at your option) any later version.
-  ~
-  ~ QKSMS is distributed in the hope that it will be useful,
-  ~ but WITHOUT ANY WARRANTY; without even the implied warranty of
-  ~ MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
-  ~ GNU General Public License for more details.
-  ~
-  ~ You should have received a copy of the GNU General Public License
-  ~ along with QKSMS.  If not, see <http://www.gnu.org/licenses/>.
-  -->
-<merge xmlns:android="http://schemas.android.com/apk/res/android"
-    xmlns:app="http://schemas.android.com/apk/res-auto"
-    xmlns:tools="http://schemas.android.com/tools"
-    android:layout_width="match_parent"
-    android:layout_height="wrap_content"
-    android:background="?attr/selectableItemBackground"
-    tools:parentTag="com.moez.QKSMS.common.widget.RadioPreferenceView">
-
-    <androidx.appcompat.widget.AppCompatRadioButton
-        android:id="@+id/radioButton"
-        android:layout_width="wrap_content"
-        android:layout_height="wrap_content"
-        android:gravity="center"
-        android:src="@drawable/radio_button"
-        app:layout_constraintBottom_toBottomOf="parent"
-        app:layout_constraintEnd_toStartOf="@id/titleView"
-        app:layout_constraintStart_toStartOf="parent"
-        app:layout_constraintTop_toTopOf="parent" />
-
-    <com.moez.QKSMS.common.widget.QkTextView
-        android:id="@+id/titleView"
-        style="@style/TextPrimary"
-        android:layout_width="0dp"
-        android:layout_height="wrap_content"
-        android:layout_marginStart="72dp"
-        android:layout_marginTop="16dp"
-        app:layout_constraintEnd_toStartOf="@id/widgetFrame"
-        app:layout_constraintStart_toStartOf="parent"
-        app:layout_constraintTop_toTopOf="parent"
-        tools:text="Default SMS App" />
-
-    <com.moez.QKSMS.common.widget.QkTextView
-        android:id="@+id/summaryView"
-        style="@style/TextSecondary"
-        android:layout_width="0dp"
-        android:layout_height="wrap_content"
-        android:layout_marginTop="2dp"
-        android:layout_marginBottom="16dp"
-        app:layout_constraintBottom_toBottomOf="parent"
-        app:layout_constraintEnd_toEndOf="@id/titleView"
-        app:layout_constraintStart_toStartOf="@id/titleView"
-        app:layout_constraintTop_toBottomOf="@id/titleView"
-        tools:text="QKSMS is your default SMS app" />
-
-    <FrameLayout
-        android:id="@+id/widgetFrame"
-        android:layout_width="wrap_content"
-        android:layout_height="match_parent"
-        android:layout_marginEnd="16dp"
-        app:layout_constraintBottom_toBottomOf="parent"
-        app:layout_constraintEnd_toEndOf="parent"
-        app:layout_constraintTop_toTopOf="parent"
-        app:layout_goneMarginEnd="24dp" />
-
-</merge>
+<?xml version="1.0" encoding="utf-8"?>
+<!--
+  ~ Copyright (C) 2017 Moez Bhatti <moez.bhatti@gmail.com>
+  ~
+  ~ This file is part of QKSMS.
+  ~
+  ~ QKSMS is free software: you can redistribute it and/or modify
+  ~ it under the terms of the GNU General Public License as published by
+  ~ the Free Software Foundation, either version 3 of the License, or
+  ~ (at your option) any later version.
+  ~
+  ~ QKSMS is distributed in the hope that it will be useful,
+  ~ but WITHOUT ANY WARRANTY; without even the implied warranty of
+  ~ MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+  ~ GNU General Public License for more details.
+  ~
+  ~ You should have received a copy of the GNU General Public License
+  ~ along with QKSMS.  If not, see <http://www.gnu.org/licenses/>.
+  -->
+<merge xmlns:android="http://schemas.android.com/apk/res/android"
+    xmlns:app="http://schemas.android.com/apk/res-auto"
+    xmlns:tools="http://schemas.android.com/tools"
+    android:layout_width="match_parent"
+    android:layout_height="wrap_content"
+    android:background="?attr/selectableItemBackground"
+    tools:parentTag="com.moez.QKSMS.common.widget.RadioPreferenceView">
+
+    <androidx.appcompat.widget.AppCompatRadioButton
+        android:id="@+id/radioButton"
+        android:layout_width="wrap_content"
+        android:layout_height="wrap_content"
+        android:gravity="center"
+        android:src="@drawable/radio_button"
+        app:layout_constraintBottom_toBottomOf="parent"
+        app:layout_constraintEnd_toStartOf="@id/titleView"
+        app:layout_constraintStart_toStartOf="parent"
+        app:layout_constraintTop_toTopOf="parent" />
+
+    <com.moez.QKSMS.common.widget.QkTextView
+        android:id="@+id/titleView"
+        style="@style/TextPrimary"
+        android:layout_width="0dp"
+        android:layout_height="wrap_content"
+        android:layout_marginStart="72dp"
+        android:layout_marginTop="16dp"
+        app:layout_constraintEnd_toStartOf="@id/widgetFrame"
+        app:layout_constraintStart_toStartOf="parent"
+        app:layout_constraintTop_toTopOf="parent"
+        tools:text="Default SMS App" />
+
+    <com.moez.QKSMS.common.widget.QkTextView
+        android:id="@+id/summaryView"
+        style="@style/TextSecondary"
+        android:layout_width="0dp"
+        android:layout_height="wrap_content"
+        android:layout_marginTop="2dp"
+        android:layout_marginBottom="16dp"
+        app:layout_constraintBottom_toBottomOf="parent"
+        app:layout_constraintEnd_toEndOf="@id/titleView"
+        app:layout_constraintStart_toStartOf="@id/titleView"
+        app:layout_constraintTop_toBottomOf="@id/titleView"
+        tools:text="QKSMS is your default SMS app" />
+
+    <FrameLayout
+        android:id="@+id/widgetFrame"
+        android:layout_width="wrap_content"
+        android:layout_height="match_parent"
+        android:layout_marginEnd="16dp"
+        app:layout_constraintBottom_toBottomOf="parent"
+        app:layout_constraintEnd_toEndOf="parent"
+        app:layout_constraintTop_toTopOf="parent"
+        app:layout_goneMarginEnd="24dp" />
+
+</merge>
diff --git a/presentation/src/main/res/layout/scheduled_activity.xml b/presentation/src/main/res/layout/scheduled_activity.xml
index 5b5d00586..463d0e0e9 100644
--- a/presentation/src/main/res/layout/scheduled_activity.xml
+++ b/presentation/src/main/res/layout/scheduled_activity.xml
@@ -1,162 +1,162 @@
-<?xml version="1.0" encoding="utf-8"?>
-<!--
-  ~ Copyright (C) 2019 Moez Bhatti <moez.bhatti@gmail.com>
-  ~
-  ~ This file is part of QKSMS.
-  ~
-  ~ QKSMS is free software: you can redistribute it and/or modify
-  ~ it under the terms of the GNU General Public License as published by
-  ~ the Free Software Foundation, either version 3 of the License, or
-  ~ (at your option) any later version.
-  ~
-  ~ QKSMS is distributed in the hope that it will be useful,
-  ~ but WITHOUT ANY WARRANTY; without even the implied warranty of
-  ~ MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
-  ~ GNU General Public License for more details.
-  ~
-  ~ You should have received a copy of the GNU General Public License
-  ~ along with QKSMS.  If not, see <http://www.gnu.org/licenses/>.
-  -->
-<androidx.coordinatorlayout.widget.CoordinatorLayout xmlns:android="http://schemas.android.com/apk/res/android"
-    xmlns:app="http://schemas.android.com/apk/res-auto"
-    xmlns:tools="http://schemas.android.com/tools"
-    android:layout_width="match_parent"
-    android:layout_height="match_parent">
-
-    <androidx.core.widget.NestedScrollView
-        android:layout_width="match_parent"
-        android:layout_height="match_parent"
-        app:layout_behavior="@string/appbar_scrolling_view_behavior">
-
-        <LinearLayout
-            android:layout_width="match_parent"
-            android:layout_height="wrap_content"
-            android:animateLayoutChanges="true"
-            android:orientation="vertical">
-
-            <LinearLayout
-                android:id="@+id/empty"
-                android:layout_width="match_parent"
-                android:layout_height="wrap_content"
-                android:orientation="vertical"
-                android:paddingStart="24dp"
-                android:paddingEnd="24dp">
-
-                <com.moez.QKSMS.common.widget.QkTextView
-                    style="@style/TextPrimary"
-                    android:layout_width="match_parent"
-                    android:layout_height="wrap_content"
-                    android:layout_marginTop="8dp"
-                    android:text="@string/scheduled_empty_description"
-                    android:textColor="?android:attr/textColorSecondary" />
-
-                <Space
-                    android:layout_width="match_parent"
-                    android:layout_height="56dp" />
-
-                <com.moez.QKSMS.common.widget.TightTextView
-                    style="@style/ScheduledSampleTextStyle"
-                    android:layout_gravity="end"
-                    android:text="@string/scheduled_empty_message_1" />
-
-                <com.moez.QKSMS.common.widget.TightTextView
-                    android:id="@+id/sampleMessage"
-                    style="@style/ScheduledSampleTextStyle"
-                    android:layout_marginTop="16dp"
-                    android:background="@drawable/rounded_rectangle_22dp"
-                    android:text="@string/scheduled_empty_message_2"
-                    tools:backgroundTint="@color/tools_theme"
-                    tools:textColor="@color/textPrimaryDark" />
-
-                <com.moez.QKSMS.common.widget.TightTextView
-                    style="@style/ScheduledSampleTextStyle"
-                    android:layout_gravity="end"
-                    android:layout_marginTop="16dp"
-                    android:text="@string/scheduled_empty_message_3" />
-
-                <com.moez.QKSMS.common.widget.QkTextView
-                    android:layout_width="wrap_content"
-                    android:layout_height="wrap_content"
-                    android:layout_gravity="end"
-                    android:layout_marginTop="8dp"
-                    android:layout_marginEnd="16dp"
-                    android:gravity="end"
-                    android:text="@string/scheduled_empty_message_3_timestamp"
-                    android:textColor="?android:attr/textColorSecondary"
-                    android:textStyle="italic"
-                    app:textSize="secondary" />
-
-                <Space
-                    android:layout_width="match_parent"
-                    android:layout_height="56dp" />
-
-            </LinearLayout>
-
-            <androidx.recyclerview.widget.RecyclerView
-                android:id="@+id/messages"
-                android:layout_width="match_parent"
-                android:layout_height="wrap_content"
-                android:paddingTop="8dp"
-                android:paddingBottom="8dp"
-                app:layoutManager="androidx.recyclerview.widget.LinearLayoutManager"
-                tools:listitem="@layout/scheduled_message_list_item" />
-
-        </LinearLayout>
-
-    </androidx.core.widget.NestedScrollView>
-
-    <com.google.android.material.floatingactionbutton.FloatingActionButton
-        android:id="@+id/compose"
-        android:layout_width="wrap_content"
-        android:layout_height="wrap_content"
-        android:layout_gravity="bottom|end"
-        android:layout_margin="16dp"
-        android:contentDescription="@string/scheduled_compose_cd"
-        android:src="@drawable/ic_add_black_24dp"
-        android:tint="@color/white"
-        android:visibility="gone"
-        tools:backgroundTint="@color/tools_theme" />
-
-    <LinearLayout
-        android:id="@+id/upgrade"
-        android:layout_width="wrap_content"
-        android:layout_height="48dp"
-        android:layout_gravity="bottom|end"
-        android:layout_margin="16dp"
-        android:background="@drawable/rounded_rectangle_24dp"
-        android:elevation="4dp"
-        android:gravity="center"
-        android:visibility="gone"
-        tools:backgroundTint="@color/tools_theme"
-        tools:visibility="visible">
-
-        <ImageView
-            android:id="@+id/upgradeIcon"
-            android:layout_width="24dp"
-            android:layout_height="24dp"
-            android:layout_marginStart="12dp"
-            android:src="@drawable/ic_star_black_24dp"
-            tools:tint="@color/textPrimaryDark" />
-
-        <com.moez.QKSMS.common.widget.QkTextView
-            android:id="@+id/upgradeLabel"
-            android:layout_width="wrap_content"
-            android:layout_height="wrap_content"
-            android:layout_marginStart="16dp"
-            android:layout_marginEnd="16dp"
-            android:text="@string/title_qksms_plus"
-            android:textColor="@color/textPrimaryDark"
-            android:textStyle="bold"
-            app:textSize="primary" />
-
-    </LinearLayout>
-
-    <include layout="@layout/collapsing_toolbar" />
-
-    <View
-        android:layout_width="match_parent"
-        android:layout_height="1dp"
-        android:layout_gravity="bottom"
-        android:background="?android:attr/divider" />
-
+<?xml version="1.0" encoding="utf-8"?>
+<!--
+  ~ Copyright (C) 2019 Moez Bhatti <moez.bhatti@gmail.com>
+  ~
+  ~ This file is part of QKSMS.
+  ~
+  ~ QKSMS is free software: you can redistribute it and/or modify
+  ~ it under the terms of the GNU General Public License as published by
+  ~ the Free Software Foundation, either version 3 of the License, or
+  ~ (at your option) any later version.
+  ~
+  ~ QKSMS is distributed in the hope that it will be useful,
+  ~ but WITHOUT ANY WARRANTY; without even the implied warranty of
+  ~ MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+  ~ GNU General Public License for more details.
+  ~
+  ~ You should have received a copy of the GNU General Public License
+  ~ along with QKSMS.  If not, see <http://www.gnu.org/licenses/>.
+  -->
+<androidx.coordinatorlayout.widget.CoordinatorLayout xmlns:android="http://schemas.android.com/apk/res/android"
+    xmlns:app="http://schemas.android.com/apk/res-auto"
+    xmlns:tools="http://schemas.android.com/tools"
+    android:layout_width="match_parent"
+    android:layout_height="match_parent">
+
+    <androidx.core.widget.NestedScrollView
+        android:layout_width="match_parent"
+        android:layout_height="match_parent"
+        app:layout_behavior="@string/appbar_scrolling_view_behavior">
+
+        <LinearLayout
+            android:layout_width="match_parent"
+            android:layout_height="wrap_content"
+            android:animateLayoutChanges="true"
+            android:orientation="vertical">
+
+            <LinearLayout
+                android:id="@+id/empty"
+                android:layout_width="match_parent"
+                android:layout_height="wrap_content"
+                android:orientation="vertical"
+                android:paddingStart="24dp"
+                android:paddingEnd="24dp">
+
+                <com.moez.QKSMS.common.widget.QkTextView
+                    style="@style/TextPrimary"
+                    android:layout_width="match_parent"
+                    android:layout_height="wrap_content"
+                    android:layout_marginTop="8dp"
+                    android:text="@string/scheduled_empty_description"
+                    android:textColor="?android:attr/textColorSecondary" />
+
+                <Space
+                    android:layout_width="match_parent"
+                    android:layout_height="56dp" />
+
+                <com.moez.QKSMS.common.widget.TightTextView
+                    style="@style/ScheduledSampleTextStyle"
+                    android:layout_gravity="end"
+                    android:text="@string/scheduled_empty_message_1" />
+
+                <com.moez.QKSMS.common.widget.TightTextView
+                    android:id="@+id/sampleMessage"
+                    style="@style/ScheduledSampleTextStyle"
+                    android:layout_marginTop="16dp"
+                    android:background="@drawable/rounded_rectangle_22dp"
+                    android:text="@string/scheduled_empty_message_2"
+                    tools:backgroundTint="@color/tools_theme"
+                    tools:textColor="@color/textPrimaryDark" />
+
+                <com.moez.QKSMS.common.widget.TightTextView
+                    style="@style/ScheduledSampleTextStyle"
+                    android:layout_gravity="end"
+                    android:layout_marginTop="16dp"
+                    android:text="@string/scheduled_empty_message_3" />
+
+                <com.moez.QKSMS.common.widget.QkTextView
+                    android:layout_width="wrap_content"
+                    android:layout_height="wrap_content"
+                    android:layout_gravity="end"
+                    android:layout_marginTop="8dp"
+                    android:layout_marginEnd="16dp"
+                    android:gravity="end"
+                    android:text="@string/scheduled_empty_message_3_timestamp"
+                    android:textColor="?android:attr/textColorSecondary"
+                    android:textStyle="italic"
+                    app:textSize="secondary" />
+
+                <Space
+                    android:layout_width="match_parent"
+                    android:layout_height="56dp" />
+
+            </LinearLayout>
+
+            <androidx.recyclerview.widget.RecyclerView
+                android:id="@+id/messages"
+                android:layout_width="match_parent"
+                android:layout_height="wrap_content"
+                android:paddingTop="8dp"
+                android:paddingBottom="8dp"
+                app:layoutManager="androidx.recyclerview.widget.LinearLayoutManager"
+                tools:listitem="@layout/scheduled_message_list_item" />
+
+        </LinearLayout>
+
+    </androidx.core.widget.NestedScrollView>
+
+    <com.google.android.material.floatingactionbutton.FloatingActionButton
+        android:id="@+id/compose"
+        android:layout_width="wrap_content"
+        android:layout_height="wrap_content"
+        android:layout_gravity="bottom|end"
+        android:layout_margin="16dp"
+        android:contentDescription="@string/scheduled_compose_cd"
+        android:src="@drawable/ic_add_black_24dp"
+        android:tint="@color/white"
+        android:visibility="gone"
+        tools:backgroundTint="@color/tools_theme" />
+
+    <LinearLayout
+        android:id="@+id/upgrade"
+        android:layout_width="wrap_content"
+        android:layout_height="48dp"
+        android:layout_gravity="bottom|end"
+        android:layout_margin="16dp"
+        android:background="@drawable/rounded_rectangle_24dp"
+        android:elevation="4dp"
+        android:gravity="center"
+        android:visibility="gone"
+        tools:backgroundTint="@color/tools_theme"
+        tools:visibility="visible">
+
+        <ImageView
+            android:id="@+id/upgradeIcon"
+            android:layout_width="24dp"
+            android:layout_height="24dp"
+            android:layout_marginStart="12dp"
+            android:src="@drawable/ic_star_black_24dp"
+            tools:tint="@color/textPrimaryDark" />
+
+        <com.moez.QKSMS.common.widget.QkTextView
+            android:id="@+id/upgradeLabel"
+            android:layout_width="wrap_content"
+            android:layout_height="wrap_content"
+            android:layout_marginStart="16dp"
+            android:layout_marginEnd="16dp"
+            android:text="@string/title_qksms_plus"
+            android:textColor="@color/textPrimaryDark"
+            android:textStyle="bold"
+            app:textSize="primary" />
+
+    </LinearLayout>
+
+    <include layout="@layout/collapsing_toolbar" />
+
+    <View
+        android:layout_width="match_parent"
+        android:layout_height="1dp"
+        android:layout_gravity="bottom"
+        android:background="?android:attr/divider" />
+
 </androidx.coordinatorlayout.widget.CoordinatorLayout>
\ No newline at end of file
diff --git a/presentation/src/main/res/layout/scheduled_message_image_list_item.xml b/presentation/src/main/res/layout/scheduled_message_image_list_item.xml
index 560b73a91..a203d6e37 100644
--- a/presentation/src/main/res/layout/scheduled_message_image_list_item.xml
+++ b/presentation/src/main/res/layout/scheduled_message_image_list_item.xml
@@ -1,36 +1,36 @@
-<?xml version="1.0" encoding="utf-8"?>
-<!--
-  ~ Copyright (C) 2019 Moez Bhatti <moez.bhatti@gmail.com>
-  ~
-  ~ This file is part of QKSMS.
-  ~
-  ~ QKSMS is free software: you can redistribute it and/or modify
-  ~ it under the terms of the GNU General Public License as published by
-  ~ the Free Software Foundation, either version 3 of the License, or
-  ~ (at your option) any later version.
-  ~
-  ~ QKSMS is distributed in the hope that it will be useful,
-  ~ but WITHOUT ANY WARRANTY; without even the implied warranty of
-  ~ MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
-  ~ GNU General Public License for more details.
-  ~
-  ~ You should have received a copy of the GNU General Public License
-  ~ along with QKSMS.  If not, see <http://www.gnu.org/licenses/>.
-  -->
-<FrameLayout xmlns:android="http://schemas.android.com/apk/res/android"
-    xmlns:tools="http://schemas.android.com/tools"
-    android:layout_width="48dp"
-    android:layout_height="48dp"
-    android:layout_marginEnd="8dp">
-
-    <ImageView
-        android:id="@+id/thumbnail"
-        android:layout_width="match_parent"
-        android:layout_height="match_parent"
-        android:adjustViewBounds="true"
-        android:background="@drawable/rounded_rectangle_4dp"
-        android:backgroundTint="?android:attr/divider"
-        android:scaleType="centerCrop"
-        tools:src="@tools:sample/backgrounds/scenic" />
-
+<?xml version="1.0" encoding="utf-8"?>
+<!--
+  ~ Copyright (C) 2019 Moez Bhatti <moez.bhatti@gmail.com>
+  ~
+  ~ This file is part of QKSMS.
+  ~
+  ~ QKSMS is free software: you can redistribute it and/or modify
+  ~ it under the terms of the GNU General Public License as published by
+  ~ the Free Software Foundation, either version 3 of the License, or
+  ~ (at your option) any later version.
+  ~
+  ~ QKSMS is distributed in the hope that it will be useful,
+  ~ but WITHOUT ANY WARRANTY; without even the implied warranty of
+  ~ MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+  ~ GNU General Public License for more details.
+  ~
+  ~ You should have received a copy of the GNU General Public License
+  ~ along with QKSMS.  If not, see <http://www.gnu.org/licenses/>.
+  -->
+<FrameLayout xmlns:android="http://schemas.android.com/apk/res/android"
+    xmlns:tools="http://schemas.android.com/tools"
+    android:layout_width="48dp"
+    android:layout_height="48dp"
+    android:layout_marginEnd="8dp">
+
+    <ImageView
+        android:id="@+id/thumbnail"
+        android:layout_width="match_parent"
+        android:layout_height="match_parent"
+        android:adjustViewBounds="true"
+        android:background="@drawable/rounded_rectangle_4dp"
+        android:backgroundTint="?android:attr/divider"
+        android:scaleType="centerCrop"
+        tools:src="@tools:sample/backgrounds/scenic" />
+
 </FrameLayout>
\ No newline at end of file
diff --git a/presentation/src/main/res/layout/scheduled_message_list_item.xml b/presentation/src/main/res/layout/scheduled_message_list_item.xml
index 6520ea741..171513b37 100644
--- a/presentation/src/main/res/layout/scheduled_message_list_item.xml
+++ b/presentation/src/main/res/layout/scheduled_message_list_item.xml
@@ -1,90 +1,90 @@
-<?xml version="1.0" encoding="utf-8"?>
-<!--
-  ~ Copyright (C) 2019 Moez Bhatti <moez.bhatti@gmail.com>
-  ~
-  ~ This file is part of QKSMS.
-  ~
-  ~ QKSMS is free software: you can redistribute it and/or modify
-  ~ it under the terms of the GNU General Public License as published by
-  ~ the Free Software Foundation, either version 3 of the License, or
-  ~ (at your option) any later version.
-  ~
-  ~ QKSMS is distributed in the hope that it will be useful,
-  ~ but WITHOUT ANY WARRANTY; without even the implied warranty of
-  ~ MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
-  ~ GNU General Public License for more details.
-  ~
-  ~ You should have received a copy of the GNU General Public License
-  ~ along with QKSMS.  If not, see <http://www.gnu.org/licenses/>.
-  -->
-<androidx.constraintlayout.widget.ConstraintLayout xmlns:android="http://schemas.android.com/apk/res/android"
-    xmlns:app="http://schemas.android.com/apk/res-auto"
-    xmlns:tools="http://schemas.android.com/tools"
-    android:layout_width="match_parent"
-    android:layout_height="wrap_content"
-    android:background="?attr/selectableItemBackground"
-    android:gravity="center_vertical"
-    android:orientation="horizontal"
-    android:padding="12dp">
-
-    <com.moez.QKSMS.common.widget.GroupAvatarView
-        android:id="@+id/avatars"
-        android:layout_width="56dp"
-        android:layout_height="56dp"
-        android:layout_gravity="top"
-        app:layout_constraintBottom_toBottomOf="parent"
-        app:layout_constraintStart_toStartOf="parent"
-        app:layout_constraintTop_toTopOf="parent"
-        app:layout_constraintVertical_bias="0" />
-
-    <com.moez.QKSMS.common.widget.QkTextView
-        android:id="@+id/recipients"
-        style="@style/TextPrimary"
-        android:layout_width="0dp"
-        android:layout_height="wrap_content"
-        android:layout_marginStart="16dp"
-        android:layout_marginEnd="16dp"
-        android:textStyle="bold"
-        app:layout_constraintStart_toEndOf="@id/avatars"
-        app:layout_constraintTop_toTopOf="parent"
-        app:layout_constraintVertical_chainStyle="packed"
-        app:textSize="secondary"
-        tools:text="@tools:sample/full_names" />
-
-    <com.moez.QKSMS.common.widget.QkTextView
-        android:id="@+id/date"
-        style="@style/TextSecondary"
-        android:layout_width="wrap_content"
-        android:layout_height="wrap_content"
-        android:gravity="center_vertical"
-        app:layout_constraintStart_toStartOf="@id/recipients"
-        app:layout_constraintTop_toBottomOf="@id/recipients"
-        tools:text="Oct 11" />
-
-    <com.moez.QKSMS.common.widget.QkTextView
-        android:id="@+id/body"
-        style="@style/TextPrimary"
-        android:layout_width="0dp"
-        android:layout_height="wrap_content"
-        android:layout_marginTop="2dp"
-        app:layout_constraintEnd_toEndOf="parent"
-        app:layout_constraintStart_toStartOf="@id/recipients"
-        app:layout_constraintTop_toBottomOf="@id/date"
-        tools:text="@tools:sample/lorem/random" />
-
-    <androidx.recyclerview.widget.RecyclerView
-        android:id="@+id/attachments"
-        android:layout_width="0dp"
-        android:layout_height="wrap_content"
-        android:layout_marginTop="8dp"
-        android:nestedScrollingEnabled="false"
-        android:orientation="horizontal"
-        app:layoutManager="androidx.recyclerview.widget.LinearLayoutManager"
-        app:layout_constraintBottom_toBottomOf="parent"
-        app:layout_constraintEnd_toEndOf="parent"
-        app:layout_constraintHorizontal_bias="0"
-        app:layout_constraintStart_toStartOf="@id/recipients"
-        app:layout_constraintTop_toBottomOf="@id/body"
-        tools:listitem="@layout/scheduled_message_image_list_item" />
-
+<?xml version="1.0" encoding="utf-8"?>
+<!--
+  ~ Copyright (C) 2019 Moez Bhatti <moez.bhatti@gmail.com>
+  ~
+  ~ This file is part of QKSMS.
+  ~
+  ~ QKSMS is free software: you can redistribute it and/or modify
+  ~ it under the terms of the GNU General Public License as published by
+  ~ the Free Software Foundation, either version 3 of the License, or
+  ~ (at your option) any later version.
+  ~
+  ~ QKSMS is distributed in the hope that it will be useful,
+  ~ but WITHOUT ANY WARRANTY; without even the implied warranty of
+  ~ MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+  ~ GNU General Public License for more details.
+  ~
+  ~ You should have received a copy of the GNU General Public License
+  ~ along with QKSMS.  If not, see <http://www.gnu.org/licenses/>.
+  -->
+<androidx.constraintlayout.widget.ConstraintLayout xmlns:android="http://schemas.android.com/apk/res/android"
+    xmlns:app="http://schemas.android.com/apk/res-auto"
+    xmlns:tools="http://schemas.android.com/tools"
+    android:layout_width="match_parent"
+    android:layout_height="wrap_content"
+    android:background="?attr/selectableItemBackground"
+    android:gravity="center_vertical"
+    android:orientation="horizontal"
+    android:padding="12dp">
+
+    <com.moez.QKSMS.common.widget.GroupAvatarView
+        android:id="@+id/avatars"
+        android:layout_width="56dp"
+        android:layout_height="56dp"
+        android:layout_gravity="top"
+        app:layout_constraintBottom_toBottomOf="parent"
+        app:layout_constraintStart_toStartOf="parent"
+        app:layout_constraintTop_toTopOf="parent"
+        app:layout_constraintVertical_bias="0" />
+
+    <com.moez.QKSMS.common.widget.QkTextView
+        android:id="@+id/recipients"
+        style="@style/TextPrimary"
+        android:layout_width="0dp"
+        android:layout_height="wrap_content"
+        android:layout_marginStart="16dp"
+        android:layout_marginEnd="16dp"
+        android:textStyle="bold"
+        app:layout_constraintStart_toEndOf="@id/avatars"
+        app:layout_constraintTop_toTopOf="parent"
+        app:layout_constraintVertical_chainStyle="packed"
+        app:textSize="secondary"
+        tools:text="@tools:sample/full_names" />
+
+    <com.moez.QKSMS.common.widget.QkTextView
+        android:id="@+id/date"
+        style="@style/TextSecondary"
+        android:layout_width="wrap_content"
+        android:layout_height="wrap_content"
+        android:gravity="center_vertical"
+        app:layout_constraintStart_toStartOf="@id/recipients"
+        app:layout_constraintTop_toBottomOf="@id/recipients"
+        tools:text="Oct 11" />
+
+    <com.moez.QKSMS.common.widget.QkTextView
+        android:id="@+id/body"
+        style="@style/TextPrimary"
+        android:layout_width="0dp"
+        android:layout_height="wrap_content"
+        android:layout_marginTop="2dp"
+        app:layout_constraintEnd_toEndOf="parent"
+        app:layout_constraintStart_toStartOf="@id/recipients"
+        app:layout_constraintTop_toBottomOf="@id/date"
+        tools:text="@tools:sample/lorem/random" />
+
+    <androidx.recyclerview.widget.RecyclerView
+        android:id="@+id/attachments"
+        android:layout_width="0dp"
+        android:layout_height="wrap_content"
+        android:layout_marginTop="8dp"
+        android:nestedScrollingEnabled="false"
+        android:orientation="horizontal"
+        app:layoutManager="androidx.recyclerview.widget.LinearLayoutManager"
+        app:layout_constraintBottom_toBottomOf="parent"
+        app:layout_constraintEnd_toEndOf="parent"
+        app:layout_constraintHorizontal_bias="0"
+        app:layout_constraintStart_toStartOf="@id/recipients"
+        app:layout_constraintTop_toBottomOf="@id/body"
+        tools:listitem="@layout/scheduled_message_image_list_item" />
+
 </androidx.constraintlayout.widget.ConstraintLayout>
\ No newline at end of file
diff --git a/presentation/src/main/res/layout/search_list_item.xml b/presentation/src/main/res/layout/search_list_item.xml
index 5177569b7..ebeac0a44 100644
--- a/presentation/src/main/res/layout/search_list_item.xml
+++ b/presentation/src/main/res/layout/search_list_item.xml
@@ -1,114 +1,114 @@
-<?xml version="1.0" encoding="utf-8"?>
-<!--
-  ~ Copyright (C) 2019 Moez Bhatti <moez.bhatti@gmail.com>
-  ~
-  ~ This file is part of QKSMS.
-  ~
-  ~ QKSMS is free software: you can redistribute it and/or modify
-  ~ it under the terms of the GNU General Public License as published by
-  ~ the Free Software Foundation, either version 3 of the License, or
-  ~ (at your option) any later version.
-  ~
-  ~ QKSMS is distributed in the hope that it will be useful,
-  ~ but WITHOUT ANY WARRANTY; without even the implied warranty of
-  ~ MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
-  ~ GNU General Public License for more details.
-  ~
-  ~ You should have received a copy of the GNU General Public License
-  ~ along with QKSMS.  If not, see <http://www.gnu.org/licenses/>.
-  -->
-<androidx.constraintlayout.widget.ConstraintLayout xmlns:android="http://schemas.android.com/apk/res/android"
-    xmlns:app="http://schemas.android.com/apk/res-auto"
-    xmlns:tools="http://schemas.android.com/tools"
-    android:layout_width="match_parent"
-    android:layout_height="wrap_content"
-    android:background="?attr/selectableItemBackground"
-    android:gravity="center_vertical"
-    android:orientation="horizontal">
-
-    <androidx.constraintlayout.widget.Group
-        android:id="@+id/resultsHeader"
-        android:layout_width="wrap_content"
-        android:layout_height="wrap_content"
-        android:visibility="gone"
-        app:constraint_referenced_ids="resultsSeparator, resultsTitle" />
-
-    <View
-        android:id="@+id/resultsSeparator"
-        android:layout_width="match_parent"
-        android:layout_height="1dp"
-        android:layout_marginTop="12dp"
-        android:background="?android:attr/divider"
-        app:layout_constraintTop_toTopOf="parent" />
-
-    <com.moez.QKSMS.common.widget.QkTextView
-        android:id="@+id/resultsTitle"
-        android:layout_width="0dp"
-        android:layout_height="wrap_content"
-        android:layout_marginStart="16dp"
-        android:layout_marginTop="16dp"
-        android:layout_marginEnd="16dp"
-        android:text="@string/main_message_results_title"
-        android:textColor="?android:attr/textColorSecondary"
-        android:textStyle="bold"
-        app:layout_constraintEnd_toEndOf="parent"
-        app:layout_constraintStart_toStartOf="parent"
-        app:layout_constraintTop_toBottomOf="@id/resultsSeparator"
-        app:textSize="secondary" />
-
-    <com.moez.QKSMS.common.widget.GroupAvatarView
-        android:id="@+id/avatars"
-        android:layout_width="56dp"
-        android:layout_height="56dp"
-        android:layout_gravity="top"
-        android:layout_marginStart="12dp"
-        android:layout_marginTop="8dp"
-        android:layout_marginBottom="8dp"
-        app:layout_constraintBottom_toBottomOf="parent"
-        app:layout_constraintStart_toStartOf="parent"
-        app:layout_constraintTop_toBottomOf="@id/resultsTitle"
-        app:layout_constraintVertical_bias="0"
-        app:layout_constraintVertical_chainStyle="packed" />
-
-    <com.moez.QKSMS.common.widget.QkTextView
-        android:id="@+id/title"
-        style="@style/TextPrimary"
-        android:layout_width="0dp"
-        android:layout_height="wrap_content"
-        android:layout_marginStart="12dp"
-        android:layout_marginEnd="16dp"
-        app:layout_constraintBottom_toTopOf="@id/snippet"
-        app:layout_constraintEnd_toStartOf="@id/date"
-        app:layout_constraintStart_toEndOf="@id/avatars"
-        app:layout_constraintTop_toBottomOf="@id/resultsTitle"
-        app:layout_constraintVertical_chainStyle="packed"
-        tools:text="@tools:sample/full_names" />
-
-    <com.moez.QKSMS.common.widget.QkTextView
-        android:id="@+id/snippet"
-        style="@style/TextSecondary"
-        android:layout_width="0dp"
-        android:layout_height="wrap_content"
-        android:layout_marginTop="2dp"
-        android:layout_marginEnd="16dp"
-        android:ellipsize="end"
-        android:maxLines="1"
-        app:layout_constraintBottom_toBottomOf="parent"
-        app:layout_constraintEnd_toEndOf="parent"
-        app:layout_constraintStart_toStartOf="@id/title"
-        app:layout_constraintTop_toBottomOf="@id/title"
-        tools:text="@tools:sample/lorem/random" />
-
-    <com.moez.QKSMS.common.widget.QkTextView
-        android:id="@+id/date"
-        style="@style/TextTertiary"
-        android:layout_width="wrap_content"
-        android:layout_height="wrap_content"
-        android:layout_marginEnd="16dp"
-        android:gravity="center_vertical"
-        app:layout_constraintBottom_toBottomOf="@id/title"
-        app:layout_constraintEnd_toEndOf="parent"
-        app:layout_constraintHorizontal_bias="100"
-        tools:text="Oct 11" />
-
+<?xml version="1.0" encoding="utf-8"?>
+<!--
+  ~ Copyright (C) 2019 Moez Bhatti <moez.bhatti@gmail.com>
+  ~
+  ~ This file is part of QKSMS.
+  ~
+  ~ QKSMS is free software: you can redistribute it and/or modify
+  ~ it under the terms of the GNU General Public License as published by
+  ~ the Free Software Foundation, either version 3 of the License, or
+  ~ (at your option) any later version.
+  ~
+  ~ QKSMS is distributed in the hope that it will be useful,
+  ~ but WITHOUT ANY WARRANTY; without even the implied warranty of
+  ~ MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+  ~ GNU General Public License for more details.
+  ~
+  ~ You should have received a copy of the GNU General Public License
+  ~ along with QKSMS.  If not, see <http://www.gnu.org/licenses/>.
+  -->
+<androidx.constraintlayout.widget.ConstraintLayout xmlns:android="http://schemas.android.com/apk/res/android"
+    xmlns:app="http://schemas.android.com/apk/res-auto"
+    xmlns:tools="http://schemas.android.com/tools"
+    android:layout_width="match_parent"
+    android:layout_height="wrap_content"
+    android:background="?attr/selectableItemBackground"
+    android:gravity="center_vertical"
+    android:orientation="horizontal">
+
+    <androidx.constraintlayout.widget.Group
+        android:id="@+id/resultsHeader"
+        android:layout_width="wrap_content"
+        android:layout_height="wrap_content"
+        android:visibility="gone"
+        app:constraint_referenced_ids="resultsSeparator, resultsTitle" />
+
+    <View
+        android:id="@+id/resultsSeparator"
+        android:layout_width="match_parent"
+        android:layout_height="1dp"
+        android:layout_marginTop="12dp"
+        android:background="?android:attr/divider"
+        app:layout_constraintTop_toTopOf="parent" />
+
+    <com.moez.QKSMS.common.widget.QkTextView
+        android:id="@+id/resultsTitle"
+        android:layout_width="0dp"
+        android:layout_height="wrap_content"
+        android:layout_marginStart="16dp"
+        android:layout_marginTop="16dp"
+        android:layout_marginEnd="16dp"
+        android:text="@string/main_message_results_title"
+        android:textColor="?android:attr/textColorSecondary"
+        android:textStyle="bold"
+        app:layout_constraintEnd_toEndOf="parent"
+        app:layout_constraintStart_toStartOf="parent"
+        app:layout_constraintTop_toBottomOf="@id/resultsSeparator"
+        app:textSize="secondary" />
+
+    <com.moez.QKSMS.common.widget.GroupAvatarView
+        android:id="@+id/avatars"
+        android:layout_width="56dp"
+        android:layout_height="56dp"
+        android:layout_gravity="top"
+        android:layout_marginStart="12dp"
+        android:layout_marginTop="8dp"
+        android:layout_marginBottom="8dp"
+        app:layout_constraintBottom_toBottomOf="parent"
+        app:layout_constraintStart_toStartOf="parent"
+        app:layout_constraintTop_toBottomOf="@id/resultsTitle"
+        app:layout_constraintVertical_bias="0"
+        app:layout_constraintVertical_chainStyle="packed" />
+
+    <com.moez.QKSMS.common.widget.QkTextView
+        android:id="@+id/title"
+        style="@style/TextPrimary"
+        android:layout_width="0dp"
+        android:layout_height="wrap_content"
+        android:layout_marginStart="12dp"
+        android:layout_marginEnd="16dp"
+        app:layout_constraintBottom_toTopOf="@id/snippet"
+        app:layout_constraintEnd_toStartOf="@id/date"
+        app:layout_constraintStart_toEndOf="@id/avatars"
+        app:layout_constraintTop_toBottomOf="@id/resultsTitle"
+        app:layout_constraintVertical_chainStyle="packed"
+        tools:text="@tools:sample/full_names" />
+
+    <com.moez.QKSMS.common.widget.QkTextView
+        android:id="@+id/snippet"
+        style="@style/TextSecondary"
+        android:layout_width="0dp"
+        android:layout_height="wrap_content"
+        android:layout_marginTop="2dp"
+        android:layout_marginEnd="16dp"
+        android:ellipsize="end"
+        android:maxLines="1"
+        app:layout_constraintBottom_toBottomOf="parent"
+        app:layout_constraintEnd_toEndOf="parent"
+        app:layout_constraintStart_toStartOf="@id/title"
+        app:layout_constraintTop_toBottomOf="@id/title"
+        tools:text="@tools:sample/lorem/random" />
+
+    <com.moez.QKSMS.common.widget.QkTextView
+        android:id="@+id/date"
+        style="@style/TextTertiary"
+        android:layout_width="wrap_content"
+        android:layout_height="wrap_content"
+        android:layout_marginEnd="16dp"
+        android:gravity="center_vertical"
+        app:layout_constraintBottom_toBottomOf="@id/title"
+        app:layout_constraintEnd_toEndOf="parent"
+        app:layout_constraintHorizontal_bias="100"
+        tools:text="Oct 11" />
+
 </androidx.constraintlayout.widget.ConstraintLayout>
\ No newline at end of file
diff --git a/presentation/src/main/res/layout/settings_auto_delete_dialog.xml b/presentation/src/main/res/layout/settings_auto_delete_dialog.xml
index 92830e5c5..594b455be 100644
--- a/presentation/src/main/res/layout/settings_auto_delete_dialog.xml
+++ b/presentation/src/main/res/layout/settings_auto_delete_dialog.xml
@@ -1,35 +1,35 @@
-<?xml version="1.0" encoding="utf-8"?>
-<!--
-  ~ Copyright (C) 2019 Moez Bhatti <moez.bhatti@gmail.com>
-  ~
-  ~ This file is part of QKSMS.
-  ~
-  ~ QKSMS is free software: you can redistribute it and/or modify
-  ~ it under the terms of the GNU General Public License as published by
-  ~ the Free Software Foundation, either version 3 of the License, or
-  ~ (at your option) any later version.
-  ~
-  ~ QKSMS is distributed in the hope that it will be useful,
-  ~ but WITHOUT ANY WARRANTY; without even the implied warranty of
-  ~ MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
-  ~ GNU General Public License for more details.
-  ~
-  ~ You should have received a copy of the GNU General Public License
-  ~ along with QKSMS.  If not, see <http://www.gnu.org/licenses/>.
-  -->
-<com.moez.QKSMS.common.widget.QkEditText xmlns:android="http://schemas.android.com/apk/res/android"
-    xmlns:app="http://schemas.android.com/apk/res-auto"
-    xmlns:tools="http://schemas.android.com/tools"
-    android:id="@+id/field"
-    android:layout_width="match_parent"
-    android:layout_height="wrap_content"
-    android:background="@null"
-    android:hint="@string/settings_auto_delete_dialog_hint"
-    android:inputType="number"
-    android:lines="1"
-    android:maxLength="3"
-    android:padding="24dp"
-    android:singleLine="true"
-    android:textStyle="bold"
-    app:textSize="dialog"
-    tools:hint="Enter something" />
+<?xml version="1.0" encoding="utf-8"?>
+<!--
+  ~ Copyright (C) 2019 Moez Bhatti <moez.bhatti@gmail.com>
+  ~
+  ~ This file is part of QKSMS.
+  ~
+  ~ QKSMS is free software: you can redistribute it and/or modify
+  ~ it under the terms of the GNU General Public License as published by
+  ~ the Free Software Foundation, either version 3 of the License, or
+  ~ (at your option) any later version.
+  ~
+  ~ QKSMS is distributed in the hope that it will be useful,
+  ~ but WITHOUT ANY WARRANTY; without even the implied warranty of
+  ~ MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+  ~ GNU General Public License for more details.
+  ~
+  ~ You should have received a copy of the GNU General Public License
+  ~ along with QKSMS.  If not, see <http://www.gnu.org/licenses/>.
+  -->
+<com.moez.QKSMS.common.widget.QkEditText xmlns:android="http://schemas.android.com/apk/res/android"
+    xmlns:app="http://schemas.android.com/apk/res-auto"
+    xmlns:tools="http://schemas.android.com/tools"
+    android:id="@+id/field"
+    android:layout_width="match_parent"
+    android:layout_height="wrap_content"
+    android:background="@null"
+    android:hint="@string/settings_auto_delete_dialog_hint"
+    android:inputType="number"
+    android:lines="1"
+    android:maxLength="3"
+    android:padding="24dp"
+    android:singleLine="true"
+    android:textStyle="bold"
+    app:textSize="dialog"
+    tools:hint="Enter something" />
diff --git a/presentation/src/main/res/layout/settings_controller.xml b/presentation/src/main/res/layout/settings_controller.xml
index 4fe6e9b3d..8d40273a7 100644
--- a/presentation/src/main/res/layout/settings_controller.xml
+++ b/presentation/src/main/res/layout/settings_controller.xml
@@ -1,242 +1,242 @@
-<?xml version="1.0" encoding="utf-8"?>
-<!--
-  ~ Copyright (C) 2019 Moez Bhatti <moez.bhatti@gmail.com>
-  ~
-  ~ This file is part of QKSMS.
-  ~
-  ~ QKSMS is free software: you can redistribute it and/or modify
-  ~ it under the terms of the GNU General Public License as published by
-  ~ the Free Software Foundation, either version 3 of the License, or
-  ~ (at your option) any later version.
-  ~
-  ~ QKSMS is distributed in the hope that it will be useful,
-  ~ but WITHOUT ANY WARRANTY; without even the implied warranty of
-  ~ MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
-  ~ GNU General Public License for more details.
-  ~
-  ~ You should have received a copy of the GNU General Public License
-  ~ along with QKSMS.  If not, see <http://www.gnu.org/licenses/>.
-  -->
-<ScrollView xmlns:android="http://schemas.android.com/apk/res/android"
-    xmlns:app="http://schemas.android.com/apk/res-auto"
-    xmlns:tools="http://schemas.android.com/tools"
-    android:id="@+id/contentView"
-    android:layout_width="match_parent"
-    android:layout_height="match_parent"
-    android:background="?android:attr/windowBackground">
-
-    <LinearLayout
-        android:id="@+id/preferences"
-        android:layout_width="match_parent"
-        android:layout_height="wrap_content"
-        android:orientation="vertical"
-        android:paddingTop="8dp"
-        android:paddingBottom="8dp">
-
-        <com.moez.QKSMS.common.widget.QkTextView
-            style="@style/PreferenceCategory"
-            android:text="@string/settings_category_appearance" />
-
-        <com.moez.QKSMS.common.widget.PreferenceView
-            android:id="@+id/theme"
-            android:layout_width="match_parent"
-            android:layout_height="wrap_content"
-            app:icon="@drawable/ic_color_lens_black_24dp"
-            app:title="@string/settings_theme_title"
-            app:widget="@layout/settings_theme_widget" />
-
-        <com.moez.QKSMS.common.widget.PreferenceView
-            android:id="@+id/night"
-            android:layout_width="match_parent"
-            android:layout_height="wrap_content"
-            app:icon="@drawable/ic_invert_colors_black_24dp"
-            app:title="@string/settings_night_title"
-            tools:summary="Automatic" />
-
-        <com.moez.QKSMS.common.widget.PreferenceView
-            android:id="@+id/black"
-            android:layout_width="match_parent"
-            android:layout_height="wrap_content"
-            android:visibility="gone"
-            app:title="@string/settings_black_title"
-            app:widget="@layout/settings_switch_widget" />
-
-        <com.moez.QKSMS.common.widget.PreferenceView
-            android:id="@+id/nightStart"
-            android:layout_width="match_parent"
-            android:layout_height="wrap_content"
-            android:visibility="gone"
-            app:title="@string/settings_night_start_title"
-            tools:summary="6:00PM" />
-
-        <com.moez.QKSMS.common.widget.PreferenceView
-            android:id="@+id/nightEnd"
-            android:layout_width="match_parent"
-            android:layout_height="wrap_content"
-            android:visibility="gone"
-            app:title="@string/settings_night_end_title"
-            tools:summary="9:00AM" />
-
-        <com.moez.QKSMS.common.widget.PreferenceView
-            android:id="@+id/textSize"
-            android:layout_width="match_parent"
-            android:layout_height="wrap_content"
-            app:icon="@drawable/ic_format_size_black_24dp"
-            app:title="@string/settings_text_size_title" />
-
-        <com.moez.QKSMS.common.widget.PreferenceView
-            android:id="@+id/autoColor"
-            android:layout_width="match_parent"
-            android:layout_height="wrap_content"
-            app:icon="@drawable/ic_person_black_24dp"
-            app:title="@string/settings_automatic_colors_title"
-            app:widget="@layout/settings_switch_widget" />
-
-        <com.moez.QKSMS.common.widget.PreferenceView
-            android:id="@+id/systemFont"
-            android:layout_width="match_parent"
-            android:layout_height="wrap_content"
-            app:icon="@drawable/ic_title_black_24dp"
-            app:title="@string/settings_system_font_title"
-            app:widget="@layout/settings_switch_widget" />
-
-        <View
-            android:layout_width="match_parent"
-            android:layout_height="1dp"
-            android:layout_marginTop="8dp"
-            android:layout_marginBottom="8dp"
-            android:background="?android:attr/divider" />
-
-        <com.moez.QKSMS.common.widget.QkTextView
-            style="@style/PreferenceCategory"
-            android:text="@string/settings_category_general" />
-
-        <com.moez.QKSMS.common.widget.PreferenceView
-            android:id="@+id/notifications"
-            android:layout_width="match_parent"
-            android:layout_height="wrap_content"
-            app:icon="@drawable/ic_notifications_black_24dp"
-            app:title="@string/settings_notifications_title" />
-
-        <com.moez.QKSMS.common.widget.PreferenceView
-            android:id="@+id/autoEmoji"
-            android:layout_width="match_parent"
-            android:layout_height="wrap_content"
-            android:visibility="gone"
-            app:title="@string/settings_auto_emoji_title"
-            app:widget="@layout/settings_switch_widget" />
-
-        <com.moez.QKSMS.common.widget.PreferenceView
-            android:id="@+id/delayed"
-            android:layout_width="match_parent"
-            android:layout_height="wrap_content"
-            app:icon="@drawable/ic_av_timer_black_24dp"
-            app:title="@string/settings_delayed_title"
-            tools:summary="No delay" />
-
-        <com.moez.QKSMS.common.widget.PreferenceView
-            android:id="@+id/swipeActions"
-            android:layout_width="match_parent"
-            android:layout_height="wrap_content"
-            android:visibility="visible"
-            app:icon="@drawable/ic_clear_all_black_24dp"
-            app:summary="@string/settings_swipe_actions_summary"
-            app:title="@string/settings_swipe_actions" />
-
-        <com.moez.QKSMS.common.widget.PreferenceView
-            android:id="@+id/delivery"
-            android:layout_width="match_parent"
-            android:layout_height="wrap_content"
-            app:icon="@drawable/ic_check_white_24dp"
-            app:summary="@string/settings_delivery_summary"
-            app:title="@string/settings_delivery_title"
-            app:widget="@layout/settings_switch_widget" />
-
-        <com.moez.QKSMS.common.widget.PreferenceView
-            android:id="@+id/signature"
-            android:layout_width="match_parent"
-            android:layout_height="wrap_content"
-            app:icon="@drawable/ic_short_text_black_24dp"
-            app:title="@string/settings_signature_title" />
-
-        <com.moez.QKSMS.common.widget.PreferenceView
-            android:id="@+id/unicode"
-            android:layout_width="match_parent"
-            android:layout_height="wrap_content"
-            app:icon="@drawable/ic_translate_black_24dp"
-            app:summary="@string/settings_unicode_summary"
-            app:title="@string/settings_unicode_title"
-            app:widget="@layout/settings_switch_widget" />
-
-        <com.moez.QKSMS.common.widget.PreferenceView
-            android:id="@+id/mobileOnly"
-            android:layout_width="match_parent"
-            android:layout_height="wrap_content"
-            app:icon="@drawable/ic_smartphone_black_24dp"
-            app:summary="@string/settings_mobile_summary"
-            app:title="@string/settings_mobile_title"
-            app:widget="@layout/settings_switch_widget" />
-
-        <com.moez.QKSMS.common.widget.PreferenceView
-            android:id="@+id/autoDelete"
-            android:layout_width="match_parent"
-            android:layout_height="wrap_content"
-            app:icon="@drawable/ic_baseline_history_toggle_off_24"
-            app:title="@string/settings_auto_delete"
-            tools:summary="Never" />
-
-        <com.moez.QKSMS.common.widget.PreferenceView
-            android:id="@+id/longAsMms"
-            android:layout_width="match_parent"
-            android:layout_height="wrap_content"
-            app:icon="@drawable/ic_message_black_24dp"
-            app:summary="@string/settings_long_as_mms_summary"
-            app:title="@string/settings_long_as_mms_title"
-            app:widget="@layout/settings_switch_widget" />
-
-        <com.moez.QKSMS.common.widget.PreferenceView
-            android:id="@+id/mmsSize"
-            android:layout_width="match_parent"
-            android:layout_height="wrap_content"
-            android:visibility="visible"
-            app:icon="@drawable/ic_photo_size_select_actual_black_24dp"
-            app:title="@string/settings_mms_size_title"
-            tools:summary="100KB" />
-
-        <View
-            android:layout_width="match_parent"
-            android:layout_height="1dp"
-            android:layout_marginTop="8dp"
-            android:layout_marginBottom="8dp"
-            android:background="?android:attr/divider" />
-
-        <com.moez.QKSMS.common.widget.PreferenceView
-            android:id="@+id/sync"
-            android:layout_width="match_parent"
-            android:layout_height="wrap_content"
-            app:icon="@drawable/ic_sync_black_24dp"
-            app:summary="@string/settings_sync_summary"
-            app:title="@string/settings_sync_title" />
-
-        <ProgressBar
-            android:id="@+id/syncingProgress"
-            style="@style/Widget.AppCompat.ProgressBar.Horizontal"
-            android:layout_width="match_parent"
-            android:layout_height="wrap_content"
-            android:layout_marginStart="72dp"
-            android:layout_marginEnd="16dp"
-            android:layout_marginBottom="16dp"
-            android:indeterminate="true"
-            app:layout_constraintBottom_toBottomOf="parent" />
-
-        <com.moez.QKSMS.common.widget.PreferenceView
-            android:id="@+id/about"
-            android:layout_width="match_parent"
-            android:layout_height="wrap_content"
-            app:icon="@drawable/ic_info_black_24dp"
-            app:title="@string/settings_about_title"
-            tools:summary="Version 3.0.7" />
-
-    </LinearLayout>
-
-</ScrollView>
+<?xml version="1.0" encoding="utf-8"?>
+<!--
+  ~ Copyright (C) 2019 Moez Bhatti <moez.bhatti@gmail.com>
+  ~
+  ~ This file is part of QKSMS.
+  ~
+  ~ QKSMS is free software: you can redistribute it and/or modify
+  ~ it under the terms of the GNU General Public License as published by
+  ~ the Free Software Foundation, either version 3 of the License, or
+  ~ (at your option) any later version.
+  ~
+  ~ QKSMS is distributed in the hope that it will be useful,
+  ~ but WITHOUT ANY WARRANTY; without even the implied warranty of
+  ~ MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+  ~ GNU General Public License for more details.
+  ~
+  ~ You should have received a copy of the GNU General Public License
+  ~ along with QKSMS.  If not, see <http://www.gnu.org/licenses/>.
+  -->
+<ScrollView xmlns:android="http://schemas.android.com/apk/res/android"
+    xmlns:app="http://schemas.android.com/apk/res-auto"
+    xmlns:tools="http://schemas.android.com/tools"
+    android:id="@+id/contentView"
+    android:layout_width="match_parent"
+    android:layout_height="match_parent"
+    android:background="?android:attr/windowBackground">
+
+    <LinearLayout
+        android:id="@+id/preferences"
+        android:layout_width="match_parent"
+        android:layout_height="wrap_content"
+        android:orientation="vertical"
+        android:paddingTop="8dp"
+        android:paddingBottom="8dp">
+
+        <com.moez.QKSMS.common.widget.QkTextView
+            style="@style/PreferenceCategory"
+            android:text="@string/settings_category_appearance" />
+
+        <com.moez.QKSMS.common.widget.PreferenceView
+            android:id="@+id/theme"
+            android:layout_width="match_parent"
+            android:layout_height="wrap_content"
+            app:icon="@drawable/ic_color_lens_black_24dp"
+            app:title="@string/settings_theme_title"
+            app:widget="@layout/settings_theme_widget" />
+
+        <com.moez.QKSMS.common.widget.PreferenceView
+            android:id="@+id/night"
+            android:layout_width="match_parent"
+            android:layout_height="wrap_content"
+            app:icon="@drawable/ic_invert_colors_black_24dp"
+            app:title="@string/settings_night_title"
+            tools:summary="Automatic" />
+
+        <com.moez.QKSMS.common.widget.PreferenceView
+            android:id="@+id/black"
+            android:layout_width="match_parent"
+            android:layout_height="wrap_content"
+            android:visibility="gone"
+            app:title="@string/settings_black_title"
+            app:widget="@layout/settings_switch_widget" />
+
+        <com.moez.QKSMS.common.widget.PreferenceView
+            android:id="@+id/nightStart"
+            android:layout_width="match_parent"
+            android:layout_height="wrap_content"
+            android:visibility="gone"
+            app:title="@string/settings_night_start_title"
+            tools:summary="6:00PM" />
+
+        <com.moez.QKSMS.common.widget.PreferenceView
+            android:id="@+id/nightEnd"
+            android:layout_width="match_parent"
+            android:layout_height="wrap_content"
+            android:visibility="gone"
+            app:title="@string/settings_night_end_title"
+            tools:summary="9:00AM" />
+
+        <com.moez.QKSMS.common.widget.PreferenceView
+            android:id="@+id/textSize"
+            android:layout_width="match_parent"
+            android:layout_height="wrap_content"
+            app:icon="@drawable/ic_format_size_black_24dp"
+            app:title="@string/settings_text_size_title" />
+
+        <com.moez.QKSMS.common.widget.PreferenceView
+            android:id="@+id/autoColor"
+            android:layout_width="match_parent"
+            android:layout_height="wrap_content"
+            app:icon="@drawable/ic_person_black_24dp"
+            app:title="@string/settings_automatic_colors_title"
+            app:widget="@layout/settings_switch_widget" />
+
+        <com.moez.QKSMS.common.widget.PreferenceView
+            android:id="@+id/systemFont"
+            android:layout_width="match_parent"
+            android:layout_height="wrap_content"
+            app:icon="@drawable/ic_title_black_24dp"
+            app:title="@string/settings_system_font_title"
+            app:widget="@layout/settings_switch_widget" />
+
+        <View
+            android:layout_width="match_parent"
+            android:layout_height="1dp"
+            android:layout_marginTop="8dp"
+            android:layout_marginBottom="8dp"
+            android:background="?android:attr/divider" />
+
+        <com.moez.QKSMS.common.widget.QkTextView
+            style="@style/PreferenceCategory"
+            android:text="@string/settings_category_general" />
+
+        <com.moez.QKSMS.common.widget.PreferenceView
+            android:id="@+id/notifications"
+            android:layout_width="match_parent"
+            android:layout_height="wrap_content"
+            app:icon="@drawable/ic_notifications_black_24dp"
+            app:title="@string/settings_notifications_title" />
+
+        <com.moez.QKSMS.common.widget.PreferenceView
+            android:id="@+id/autoEmoji"
+            android:layout_width="match_parent"
+            android:layout_height="wrap_content"
+            android:visibility="gone"
+            app:title="@string/settings_auto_emoji_title"
+            app:widget="@layout/settings_switch_widget" />
+
+        <com.moez.QKSMS.common.widget.PreferenceView
+            android:id="@+id/delayed"
+            android:layout_width="match_parent"
+            android:layout_height="wrap_content"
+            app:icon="@drawable/ic_av_timer_black_24dp"
+            app:title="@string/settings_delayed_title"
+            tools:summary="No delay" />
+
+        <com.moez.QKSMS.common.widget.PreferenceView
+            android:id="@+id/swipeActions"
+            android:layout_width="match_parent"
+            android:layout_height="wrap_content"
+            android:visibility="visible"
+            app:icon="@drawable/ic_clear_all_black_24dp"
+            app:summary="@string/settings_swipe_actions_summary"
+            app:title="@string/settings_swipe_actions" />
+
+        <com.moez.QKSMS.common.widget.PreferenceView
+            android:id="@+id/delivery"
+            android:layout_width="match_parent"
+            android:layout_height="wrap_content"
+            app:icon="@drawable/ic_check_white_24dp"
+            app:summary="@string/settings_delivery_summary"
+            app:title="@string/settings_delivery_title"
+            app:widget="@layout/settings_switch_widget" />
+
+        <com.moez.QKSMS.common.widget.PreferenceView
+            android:id="@+id/signature"
+            android:layout_width="match_parent"
+            android:layout_height="wrap_content"
+            app:icon="@drawable/ic_short_text_black_24dp"
+            app:title="@string/settings_signature_title" />
+
+        <com.moez.QKSMS.common.widget.PreferenceView
+            android:id="@+id/unicode"
+            android:layout_width="match_parent"
+            android:layout_height="wrap_content"
+            app:icon="@drawable/ic_translate_black_24dp"
+            app:summary="@string/settings_unicode_summary"
+            app:title="@string/settings_unicode_title"
+            app:widget="@layout/settings_switch_widget" />
+
+        <com.moez.QKSMS.common.widget.PreferenceView
+            android:id="@+id/mobileOnly"
+            android:layout_width="match_parent"
+            android:layout_height="wrap_content"
+            app:icon="@drawable/ic_smartphone_black_24dp"
+            app:summary="@string/settings_mobile_summary"
+            app:title="@string/settings_mobile_title"
+            app:widget="@layout/settings_switch_widget" />
+
+        <com.moez.QKSMS.common.widget.PreferenceView
+            android:id="@+id/autoDelete"
+            android:layout_width="match_parent"
+            android:layout_height="wrap_content"
+            app:icon="@drawable/ic_baseline_history_toggle_off_24"
+            app:title="@string/settings_auto_delete"
+            tools:summary="Never" />
+
+        <com.moez.QKSMS.common.widget.PreferenceView
+            android:id="@+id/longAsMms"
+            android:layout_width="match_parent"
+            android:layout_height="wrap_content"
+            app:icon="@drawable/ic_message_black_24dp"
+            app:summary="@string/settings_long_as_mms_summary"
+            app:title="@string/settings_long_as_mms_title"
+            app:widget="@layout/settings_switch_widget" />
+
+        <com.moez.QKSMS.common.widget.PreferenceView
+            android:id="@+id/mmsSize"
+            android:layout_width="match_parent"
+            android:layout_height="wrap_content"
+            android:visibility="visible"
+            app:icon="@drawable/ic_photo_size_select_actual_black_24dp"
+            app:title="@string/settings_mms_size_title"
+            tools:summary="100KB" />
+
+        <View
+            android:layout_width="match_parent"
+            android:layout_height="1dp"
+            android:layout_marginTop="8dp"
+            android:layout_marginBottom="8dp"
+            android:background="?android:attr/divider" />
+
+        <com.moez.QKSMS.common.widget.PreferenceView
+            android:id="@+id/sync"
+            android:layout_width="match_parent"
+            android:layout_height="wrap_content"
+            app:icon="@drawable/ic_sync_black_24dp"
+            app:summary="@string/settings_sync_summary"
+            app:title="@string/settings_sync_title" />
+
+        <ProgressBar
+            android:id="@+id/syncingProgress"
+            style="@style/Widget.AppCompat.ProgressBar.Horizontal"
+            android:layout_width="match_parent"
+            android:layout_height="wrap_content"
+            android:layout_marginStart="72dp"
+            android:layout_marginEnd="16dp"
+            android:layout_marginBottom="16dp"
+            android:indeterminate="true"
+            app:layout_constraintBottom_toBottomOf="parent" />
+
+        <com.moez.QKSMS.common.widget.PreferenceView
+            android:id="@+id/about"
+            android:layout_width="match_parent"
+            android:layout_height="wrap_content"
+            app:icon="@drawable/ic_info_black_24dp"
+            app:title="@string/settings_about_title"
+            tools:summary="Version 3.0.7" />
+
+    </LinearLayout>
+
+</ScrollView>
diff --git a/presentation/src/main/res/layout/settings_switch_widget.xml b/presentation/src/main/res/layout/settings_switch_widget.xml
index 4958dcdb7..bddc24351 100644
--- a/presentation/src/main/res/layout/settings_switch_widget.xml
+++ b/presentation/src/main/res/layout/settings_switch_widget.xml
@@ -1,26 +1,26 @@
-<?xml version="1.0" encoding="utf-8"?>
-<!--
-  ~ Copyright (C) 2019 Moez Bhatti <moez.bhatti@gmail.com>
-  ~
-  ~ This file is part of QKSMS.
-  ~
-  ~ QKSMS is free software: you can redistribute it and/or modify
-  ~ it under the terms of the GNU General Public License as published by
-  ~ the Free Software Foundation, either version 3 of the License, or
-  ~ (at your option) any later version.
-  ~
-  ~ QKSMS is distributed in the hope that it will be useful,
-  ~ but WITHOUT ANY WARRANTY; without even the implied warranty of
-  ~ MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
-  ~ GNU General Public License for more details.
-  ~
-  ~ You should have received a copy of the GNU General Public License
-  ~ along with QKSMS.  If not, see <http://www.gnu.org/licenses/>.
-  -->
-<com.moez.QKSMS.common.widget.QkSwitch xmlns:android="http://schemas.android.com/apk/res/android"
-    android:id="@+id/checkbox"
-    android:layout_width="wrap_content"
-    android:layout_height="wrap_content"
-    android:layout_gravity="center"
-    android:clickable="false"
-    android:duplicateParentState="true" />
+<?xml version="1.0" encoding="utf-8"?>
+<!--
+  ~ Copyright (C) 2019 Moez Bhatti <moez.bhatti@gmail.com>
+  ~
+  ~ This file is part of QKSMS.
+  ~
+  ~ QKSMS is free software: you can redistribute it and/or modify
+  ~ it under the terms of the GNU General Public License as published by
+  ~ the Free Software Foundation, either version 3 of the License, or
+  ~ (at your option) any later version.
+  ~
+  ~ QKSMS is distributed in the hope that it will be useful,
+  ~ but WITHOUT ANY WARRANTY; without even the implied warranty of
+  ~ MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+  ~ GNU General Public License for more details.
+  ~
+  ~ You should have received a copy of the GNU General Public License
+  ~ along with QKSMS.  If not, see <http://www.gnu.org/licenses/>.
+  -->
+<com.moez.QKSMS.common.widget.QkSwitch xmlns:android="http://schemas.android.com/apk/res/android"
+    android:id="@+id/checkbox"
+    android:layout_width="wrap_content"
+    android:layout_height="wrap_content"
+    android:layout_gravity="center"
+    android:clickable="false"
+    android:duplicateParentState="true" />
diff --git a/presentation/src/main/res/layout/settings_theme_widget.xml b/presentation/src/main/res/layout/settings_theme_widget.xml
index 249d4c00c..63c34ebcc 100644
--- a/presentation/src/main/res/layout/settings_theme_widget.xml
+++ b/presentation/src/main/res/layout/settings_theme_widget.xml
@@ -1,35 +1,35 @@
-<?xml version="1.0" encoding="utf-8"?>
-<!--
-  ~ Copyright (C) 2019 Moez Bhatti <moez.bhatti@gmail.com>
-  ~
-  ~ This file is part of QKSMS.
-  ~
-  ~ QKSMS is free software: you can redistribute it and/or modify
-  ~ it under the terms of the GNU General Public License as published by
-  ~ the Free Software Foundation, either version 3 of the License, or
-  ~ (at your option) any later version.
-  ~
-  ~ QKSMS is distributed in the hope that it will be useful,
-  ~ but WITHOUT ANY WARRANTY; without even the implied warranty of
-  ~ MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
-  ~ GNU General Public License for more details.
-  ~
-  ~ You should have received a copy of the GNU General Public License
-  ~ along with QKSMS.  If not, see <http://www.gnu.org/licenses/>.
-  -->
-<FrameLayout xmlns:android="http://schemas.android.com/apk/res/android"
-    xmlns:tools="http://schemas.android.com/tools"
-    android:layout_width="wrap_content"
-    android:layout_height="match_parent"
-    android:paddingStart="8dp"
-    android:paddingEnd="8dp">
-
-    <View
-        android:id="@+id/themePreview"
-        android:layout_width="24dp"
-        android:layout_height="24dp"
-        android:layout_gravity="center"
-        android:background="@drawable/circle"
-        tools:backgroundTint="@color/tools_theme" />
-
+<?xml version="1.0" encoding="utf-8"?>
+<!--
+  ~ Copyright (C) 2019 Moez Bhatti <moez.bhatti@gmail.com>
+  ~
+  ~ This file is part of QKSMS.
+  ~
+  ~ QKSMS is free software: you can redistribute it and/or modify
+  ~ it under the terms of the GNU General Public License as published by
+  ~ the Free Software Foundation, either version 3 of the License, or
+  ~ (at your option) any later version.
+  ~
+  ~ QKSMS is distributed in the hope that it will be useful,
+  ~ but WITHOUT ANY WARRANTY; without even the implied warranty of
+  ~ MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+  ~ GNU General Public License for more details.
+  ~
+  ~ You should have received a copy of the GNU General Public License
+  ~ along with QKSMS.  If not, see <http://www.gnu.org/licenses/>.
+  -->
+<FrameLayout xmlns:android="http://schemas.android.com/apk/res/android"
+    xmlns:tools="http://schemas.android.com/tools"
+    android:layout_width="wrap_content"
+    android:layout_height="match_parent"
+    android:paddingStart="8dp"
+    android:paddingEnd="8dp">
+
+    <View
+        android:id="@+id/themePreview"
+        android:layout_width="24dp"
+        android:layout_height="24dp"
+        android:layout_gravity="center"
+        android:background="@drawable/circle"
+        tools:backgroundTint="@color/tools_theme" />
+
 </FrameLayout>
\ No newline at end of file
diff --git a/presentation/src/main/res/layout/swipe_actions_controller.xml b/presentation/src/main/res/layout/swipe_actions_controller.xml
index a5b706801..b1a8f5b59 100644
--- a/presentation/src/main/res/layout/swipe_actions_controller.xml
+++ b/presentation/src/main/res/layout/swipe_actions_controller.xml
@@ -1,272 +1,272 @@
-<?xml version="1.0" encoding="utf-8"?>
-<!--
-  ~ Copyright (C) 2019 Moez Bhatti <moez.bhatti@gmail.com>
-  ~
-  ~ This file is part of QKSMS.
-  ~
-  ~ QKSMS is free software: you can redistribute it and/or modify
-  ~ it under the terms of the GNU General Public License as published by
-  ~ the Free Software Foundation, either version 3 of the License, or
-  ~ (at your option) any later version.
-  ~
-  ~ QKSMS is distributed in the hope that it will be useful,
-  ~ but WITHOUT ANY WARRANTY; without even the implied warranty of
-  ~ MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
-  ~ GNU General Public License for more details.
-  ~
-  ~ You should have received a copy of the GNU General Public License
-  ~ along with QKSMS.  If not, see <http://www.gnu.org/licenses/>.
-  -->
-<ScrollView xmlns:android="http://schemas.android.com/apk/res/android"
-    xmlns:app="http://schemas.android.com/apk/res-auto"
-    xmlns:tools="http://schemas.android.com/tools"
-    android:id="@+id/scrollView"
-    android:layout_width="match_parent"
-    android:layout_height="match_parent"
-    android:background="?android:attr/windowBackground">
-
-    <LinearLayout
-        android:layout_width="match_parent"
-        android:layout_height="wrap_content"
-        android:orientation="vertical">
-
-        <androidx.constraintlayout.widget.ConstraintLayout
-            android:id="@+id/right"
-            android:layout_width="match_parent"
-            android:layout_height="wrap_content"
-            android:foreground="?attr/selectableItemBackground">
-
-            <com.moez.QKSMS.common.widget.QkTextView
-                android:id="@+id/rightTitle"
-                android:layout_width="0dp"
-                android:layout_height="wrap_content"
-                android:layout_marginStart="24dp"
-                android:layout_marginTop="24dp"
-                android:layout_marginEnd="16dp"
-                android:text="@string/settings_swipe_actions_right"
-                android:textColor="?android:attr/textColorPrimary"
-                app:layout_constraintEnd_toStartOf="@id/rightChange"
-                app:layout_constraintStart_toStartOf="parent"
-                app:layout_constraintTop_toTopOf="parent"
-                app:textSize="primary" />
-
-            <com.moez.QKSMS.common.widget.QkTextView
-                android:id="@+id/rightLabel"
-                android:layout_width="0dp"
-                android:layout_height="wrap_content"
-                android:layout_marginTop="2dp"
-                android:textColor="?android:attr/textColorSecondary"
-                app:layout_constraintEnd_toEndOf="@id/rightTitle"
-                app:layout_constraintStart_toStartOf="@id/rightTitle"
-                app:layout_constraintTop_toBottomOf="@id/rightTitle"
-                app:textSize="secondary"
-                tools:text="Archive" />
-
-            <com.moez.QKSMS.common.widget.QkTextView
-                android:id="@+id/rightChange"
-                android:layout_width="wrap_content"
-                android:layout_height="wrap_content"
-                android:layout_marginEnd="24dp"
-                android:text="@string/settings_swipe_actions_change"
-                android:textAllCaps="true"
-                android:textColor="?android:attr/textColorSecondary"
-                android:textStyle="bold"
-                app:layout_constraintEnd_toEndOf="parent"
-                app:layout_constraintTop_toTopOf="@id/rightTitle"
-                app:textSize="secondary" />
-
-            <View
-                android:id="@+id/rightBackground"
-                android:layout_width="match_parent"
-                android:layout_height="84dp"
-                android:layout_marginStart="16dp"
-                android:layout_marginTop="16dp"
-                android:layout_marginEnd="16dp"
-                android:layout_marginBottom="16dp"
-                android:alpha="0.1"
-                android:background="@drawable/rounded_rectangle_outline_4dp"
-                android:backgroundTint="?android:attr/textColorPrimary"
-                app:layout_constraintBottom_toBottomOf="parent"
-                app:layout_constraintEnd_toEndOf="parent"
-                app:layout_constraintStart_toStartOf="parent"
-                app:layout_constraintTop_toBottomOf="@id/rightLabel" />
-
-            <ImageView
-                android:id="@+id/rightIcon"
-                android:layout_width="96dp"
-                android:layout_height="84dp"
-                android:background="@drawable/rounded_rectangle_left_4dp"
-                android:paddingStart="24dp"
-                android:paddingTop="30dp"
-                android:paddingEnd="48dp"
-                android:paddingBottom="30dp"
-                app:layout_constraintBottom_toBottomOf="@id/rightBackground"
-                app:layout_constraintStart_toStartOf="@id/rightBackground"
-                app:layout_constraintTop_toTopOf="@id/rightBackground"
-                tools:backgroundTint="@color/tools_theme"
-                tools:src="@drawable/ic_archive_white_24dp"
-                tools:tint="@color/textPrimaryDark" />
-
-            <ImageView
-                android:id="@+id/rightAvatar"
-                android:layout_width="40dp"
-                android:layout_height="40dp"
-                android:layout_marginStart="16dp"
-                android:background="@drawable/circle"
-                android:backgroundTint="?android:attr/divider"
-                android:padding="8dp"
-                android:src="@drawable/ic_person_black_24dp"
-                android:tint="?android:attr/textColorTertiary"
-                app:layout_constraintBottom_toBottomOf="@id/rightBackground"
-                app:layout_constraintStart_toEndOf="@id/rightIcon"
-                app:layout_constraintTop_toTopOf="@id/rightBackground" />
-
-            <View
-                android:id="@+id/rightTitleRect"
-                android:layout_width="128dp"
-                android:layout_height="8dp"
-                android:layout_marginStart="16dp"
-                android:background="@drawable/rounded_rectangle_2dp"
-                android:backgroundTint="?android:attr/textColorTertiary"
-                app:layout_constraintBottom_toTopOf="@id/rightSummaryRect"
-                app:layout_constraintStart_toEndOf="@id/rightAvatar"
-                app:layout_constraintTop_toTopOf="@id/rightBackground"
-                app:layout_constraintVertical_chainStyle="packed" />
-
-            <View
-                android:id="@+id/rightSummaryRect"
-                android:layout_width="96dp"
-                android:layout_height="8dp"
-                android:layout_marginTop="8dp"
-                android:background="@drawable/rounded_rectangle_2dp"
-                android:backgroundTint="?android:attr/divider"
-                app:layout_constraintBottom_toBottomOf="@id/rightBackground"
-                app:layout_constraintStart_toStartOf="@id/rightTitleRect"
-                app:layout_constraintTop_toBottomOf="@id/rightTitleRect" />
-
-        </androidx.constraintlayout.widget.ConstraintLayout>
-
-        <View
-            android:layout_width="match_parent"
-            android:layout_height="1dp"
-            android:background="?android:attr/divider" />
-
-        <androidx.constraintlayout.widget.ConstraintLayout
-            android:id="@+id/left"
-            android:layout_width="match_parent"
-            android:layout_height="wrap_content"
-            android:foreground="?attr/selectableItemBackground">
-
-            <com.moez.QKSMS.common.widget.QkTextView
-                android:id="@+id/leftTitle"
-                android:layout_width="0dp"
-                android:layout_height="wrap_content"
-                android:layout_marginStart="24dp"
-                android:layout_marginTop="24dp"
-                android:layout_marginEnd="16dp"
-                android:text="@string/settings_swipe_actions_left"
-                android:textColor="?android:attr/textColorPrimary"
-                app:layout_constraintEnd_toStartOf="@id/leftChange"
-                app:layout_constraintStart_toStartOf="parent"
-                app:layout_constraintTop_toTopOf="parent"
-                app:textSize="primary" />
-
-            <com.moez.QKSMS.common.widget.QkTextView
-                android:id="@+id/leftLabel"
-                android:layout_width="0dp"
-                android:layout_height="wrap_content"
-                android:layout_marginTop="2dp"
-                android:textColor="?android:attr/textColorSecondary"
-                app:layout_constraintEnd_toEndOf="@id/leftTitle"
-                app:layout_constraintStart_toStartOf="@id/leftTitle"
-                app:layout_constraintTop_toBottomOf="@id/leftTitle"
-                app:textSize="secondary"
-                tools:text="Archive" />
-
-            <com.moez.QKSMS.common.widget.QkTextView
-                android:id="@+id/leftChange"
-                android:layout_width="wrap_content"
-                android:layout_height="wrap_content"
-                android:layout_marginEnd="24dp"
-                android:text="@string/settings_swipe_actions_change"
-                android:textAllCaps="true"
-                android:textColor="?android:attr/textColorSecondary"
-                android:textStyle="bold"
-                app:layout_constraintEnd_toEndOf="parent"
-                app:layout_constraintTop_toTopOf="@id/leftTitle"
-                app:textSize="secondary" />
-
-            <View
-                android:id="@+id/leftBackground"
-                android:layout_width="match_parent"
-                android:layout_height="84dp"
-                android:layout_marginStart="16dp"
-                android:layout_marginTop="16dp"
-                android:layout_marginEnd="16dp"
-                android:layout_marginBottom="16dp"
-                android:alpha="0.1"
-                android:background="@drawable/rounded_rectangle_outline_4dp"
-                android:backgroundTint="?android:attr/textColorPrimary"
-                app:layout_constraintBottom_toBottomOf="parent"
-                app:layout_constraintEnd_toEndOf="parent"
-                app:layout_constraintStart_toStartOf="parent"
-                app:layout_constraintTop_toBottomOf="@id/leftLabel" />
-
-            <ImageView
-                android:id="@+id/leftIcon"
-                android:layout_width="96dp"
-                android:layout_height="84dp"
-                android:background="@drawable/rounded_rectangle_right_4dp"
-                android:paddingStart="48dp"
-                android:paddingTop="30dp"
-                android:paddingEnd="24dp"
-                android:paddingBottom="30dp"
-                app:layout_constraintBottom_toBottomOf="@id/leftBackground"
-                app:layout_constraintEnd_toEndOf="@id/leftBackground"
-                app:layout_constraintTop_toTopOf="@id/leftBackground"
-                tools:backgroundTint="@color/tools_theme"
-                tools:src="@drawable/ic_archive_white_24dp"
-                tools:tint="@color/textPrimaryDark" />
-
-            <ImageView
-                android:id="@+id/leftAvatar"
-                android:layout_width="40dp"
-                android:layout_height="40dp"
-                android:layout_marginStart="16dp"
-                android:background="@drawable/circle"
-                android:backgroundTint="?android:attr/divider"
-                android:padding="8dp"
-                android:src="@drawable/ic_person_black_24dp"
-                android:tint="?android:attr/textColorTertiary"
-                app:layout_constraintBottom_toBottomOf="@id/leftBackground"
-                app:layout_constraintStart_toStartOf="@id/leftBackground"
-                app:layout_constraintTop_toTopOf="@id/leftBackground" />
-
-            <View
-                android:id="@+id/leftTitleRect"
-                android:layout_width="128dp"
-                android:layout_height="8dp"
-                android:layout_marginStart="16dp"
-                android:background="@drawable/rounded_rectangle_2dp"
-                android:backgroundTint="?android:attr/textColorTertiary"
-                app:layout_constraintBottom_toTopOf="@id/leftSummaryRect"
-                app:layout_constraintStart_toEndOf="@id/leftAvatar"
-                app:layout_constraintTop_toTopOf="@id/leftBackground"
-                app:layout_constraintVertical_chainStyle="packed" />
-
-            <View
-                android:id="@+id/leftSummaryRect"
-                android:layout_width="96dp"
-                android:layout_height="8dp"
-                android:layout_marginTop="8dp"
-                android:background="@drawable/rounded_rectangle_2dp"
-                android:backgroundTint="?android:attr/divider"
-                app:layout_constraintBottom_toBottomOf="@id/leftBackground"
-                app:layout_constraintStart_toStartOf="@id/leftTitleRect"
-                app:layout_constraintTop_toBottomOf="@id/leftTitleRect" />
-
-        </androidx.constraintlayout.widget.ConstraintLayout>
-
-    </LinearLayout>
-
+<?xml version="1.0" encoding="utf-8"?>
+<!--
+  ~ Copyright (C) 2019 Moez Bhatti <moez.bhatti@gmail.com>
+  ~
+  ~ This file is part of QKSMS.
+  ~
+  ~ QKSMS is free software: you can redistribute it and/or modify
+  ~ it under the terms of the GNU General Public License as published by
+  ~ the Free Software Foundation, either version 3 of the License, or
+  ~ (at your option) any later version.
+  ~
+  ~ QKSMS is distributed in the hope that it will be useful,
+  ~ but WITHOUT ANY WARRANTY; without even the implied warranty of
+  ~ MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+  ~ GNU General Public License for more details.
+  ~
+  ~ You should have received a copy of the GNU General Public License
+  ~ along with QKSMS.  If not, see <http://www.gnu.org/licenses/>.
+  -->
+<ScrollView xmlns:android="http://schemas.android.com/apk/res/android"
+    xmlns:app="http://schemas.android.com/apk/res-auto"
+    xmlns:tools="http://schemas.android.com/tools"
+    android:id="@+id/scrollView"
+    android:layout_width="match_parent"
+    android:layout_height="match_parent"
+    android:background="?android:attr/windowBackground">
+
+    <LinearLayout
+        android:layout_width="match_parent"
+        android:layout_height="wrap_content"
+        android:orientation="vertical">
+
+        <androidx.constraintlayout.widget.ConstraintLayout
+            android:id="@+id/right"
+            android:layout_width="match_parent"
+            android:layout_height="wrap_content"
+            android:foreground="?attr/selectableItemBackground">
+
+            <com.moez.QKSMS.common.widget.QkTextView
+                android:id="@+id/rightTitle"
+                android:layout_width="0dp"
+                android:layout_height="wrap_content"
+                android:layout_marginStart="24dp"
+                android:layout_marginTop="24dp"
+                android:layout_marginEnd="16dp"
+                android:text="@string/settings_swipe_actions_right"
+                android:textColor="?android:attr/textColorPrimary"
+                app:layout_constraintEnd_toStartOf="@id/rightChange"
+                app:layout_constraintStart_toStartOf="parent"
+                app:layout_constraintTop_toTopOf="parent"
+                app:textSize="primary" />
+
+            <com.moez.QKSMS.common.widget.QkTextView
+                android:id="@+id/rightLabel"
+                android:layout_width="0dp"
+                android:layout_height="wrap_content"
+                android:layout_marginTop="2dp"
+                android:textColor="?android:attr/textColorSecondary"
+                app:layout_constraintEnd_toEndOf="@id/rightTitle"
+                app:layout_constraintStart_toStartOf="@id/rightTitle"
+                app:layout_constraintTop_toBottomOf="@id/rightTitle"
+                app:textSize="secondary"
+                tools:text="Archive" />
+
+            <com.moez.QKSMS.common.widget.QkTextView
+                android:id="@+id/rightChange"
+                android:layout_width="wrap_content"
+                android:layout_height="wrap_content"
+                android:layout_marginEnd="24dp"
+                android:text="@string/settings_swipe_actions_change"
+                android:textAllCaps="true"
+                android:textColor="?android:attr/textColorSecondary"
+                android:textStyle="bold"
+                app:layout_constraintEnd_toEndOf="parent"
+                app:layout_constraintTop_toTopOf="@id/rightTitle"
+                app:textSize="secondary" />
+
+            <View
+                android:id="@+id/rightBackground"
+                android:layout_width="match_parent"
+                android:layout_height="84dp"
+                android:layout_marginStart="16dp"
+                android:layout_marginTop="16dp"
+                android:layout_marginEnd="16dp"
+                android:layout_marginBottom="16dp"
+                android:alpha="0.1"
+                android:background="@drawable/rounded_rectangle_outline_4dp"
+                android:backgroundTint="?android:attr/textColorPrimary"
+                app:layout_constraintBottom_toBottomOf="parent"
+                app:layout_constraintEnd_toEndOf="parent"
+                app:layout_constraintStart_toStartOf="parent"
+                app:layout_constraintTop_toBottomOf="@id/rightLabel" />
+
+            <ImageView
+                android:id="@+id/rightIcon"
+                android:layout_width="96dp"
+                android:layout_height="84dp"
+                android:background="@drawable/rounded_rectangle_left_4dp"
+                android:paddingStart="24dp"
+                android:paddingTop="30dp"
+                android:paddingEnd="48dp"
+                android:paddingBottom="30dp"
+                app:layout_constraintBottom_toBottomOf="@id/rightBackground"
+                app:layout_constraintStart_toStartOf="@id/rightBackground"
+                app:layout_constraintTop_toTopOf="@id/rightBackground"
+                tools:backgroundTint="@color/tools_theme"
+                tools:src="@drawable/ic_archive_white_24dp"
+                tools:tint="@color/textPrimaryDark" />
+
+            <ImageView
+                android:id="@+id/rightAvatar"
+                android:layout_width="40dp"
+                android:layout_height="40dp"
+                android:layout_marginStart="16dp"
+                android:background="@drawable/circle"
+                android:backgroundTint="?android:attr/divider"
+                android:padding="8dp"
+                android:src="@drawable/ic_person_black_24dp"
+                android:tint="?android:attr/textColorTertiary"
+                app:layout_constraintBottom_toBottomOf="@id/rightBackground"
+                app:layout_constraintStart_toEndOf="@id/rightIcon"
+                app:layout_constraintTop_toTopOf="@id/rightBackground" />
+
+            <View
+                android:id="@+id/rightTitleRect"
+                android:layout_width="128dp"
+                android:layout_height="8dp"
+                android:layout_marginStart="16dp"
+                android:background="@drawable/rounded_rectangle_2dp"
+                android:backgroundTint="?android:attr/textColorTertiary"
+                app:layout_constraintBottom_toTopOf="@id/rightSummaryRect"
+                app:layout_constraintStart_toEndOf="@id/rightAvatar"
+                app:layout_constraintTop_toTopOf="@id/rightBackground"
+                app:layout_constraintVertical_chainStyle="packed" />
+
+            <View
+                android:id="@+id/rightSummaryRect"
+                android:layout_width="96dp"
+                android:layout_height="8dp"
+                android:layout_marginTop="8dp"
+                android:background="@drawable/rounded_rectangle_2dp"
+                android:backgroundTint="?android:attr/divider"
+                app:layout_constraintBottom_toBottomOf="@id/rightBackground"
+                app:layout_constraintStart_toStartOf="@id/rightTitleRect"
+                app:layout_constraintTop_toBottomOf="@id/rightTitleRect" />
+
+        </androidx.constraintlayout.widget.ConstraintLayout>
+
+        <View
+            android:layout_width="match_parent"
+            android:layout_height="1dp"
+            android:background="?android:attr/divider" />
+
+        <androidx.constraintlayout.widget.ConstraintLayout
+            android:id="@+id/left"
+            android:layout_width="match_parent"
+            android:layout_height="wrap_content"
+            android:foreground="?attr/selectableItemBackground">
+
+            <com.moez.QKSMS.common.widget.QkTextView
+                android:id="@+id/leftTitle"
+                android:layout_width="0dp"
+                android:layout_height="wrap_content"
+                android:layout_marginStart="24dp"
+                android:layout_marginTop="24dp"
+                android:layout_marginEnd="16dp"
+                android:text="@string/settings_swipe_actions_left"
+                android:textColor="?android:attr/textColorPrimary"
+                app:layout_constraintEnd_toStartOf="@id/leftChange"
+                app:layout_constraintStart_toStartOf="parent"
+                app:layout_constraintTop_toTopOf="parent"
+                app:textSize="primary" />
+
+            <com.moez.QKSMS.common.widget.QkTextView
+                android:id="@+id/leftLabel"
+                android:layout_width="0dp"
+                android:layout_height="wrap_content"
+                android:layout_marginTop="2dp"
+                android:textColor="?android:attr/textColorSecondary"
+                app:layout_constraintEnd_toEndOf="@id/leftTitle"
+                app:layout_constraintStart_toStartOf="@id/leftTitle"
+                app:layout_constraintTop_toBottomOf="@id/leftTitle"
+                app:textSize="secondary"
+                tools:text="Archive" />
+
+            <com.moez.QKSMS.common.widget.QkTextView
+                android:id="@+id/leftChange"
+                android:layout_width="wrap_content"
+                android:layout_height="wrap_content"
+                android:layout_marginEnd="24dp"
+                android:text="@string/settings_swipe_actions_change"
+                android:textAllCaps="true"
+                android:textColor="?android:attr/textColorSecondary"
+                android:textStyle="bold"
+                app:layout_constraintEnd_toEndOf="parent"
+                app:layout_constraintTop_toTopOf="@id/leftTitle"
+                app:textSize="secondary" />
+
+            <View
+                android:id="@+id/leftBackground"
+                android:layout_width="match_parent"
+                android:layout_height="84dp"
+                android:layout_marginStart="16dp"
+                android:layout_marginTop="16dp"
+                android:layout_marginEnd="16dp"
+                android:layout_marginBottom="16dp"
+                android:alpha="0.1"
+                android:background="@drawable/rounded_rectangle_outline_4dp"
+                android:backgroundTint="?android:attr/textColorPrimary"
+                app:layout_constraintBottom_toBottomOf="parent"
+                app:layout_constraintEnd_toEndOf="parent"
+                app:layout_constraintStart_toStartOf="parent"
+                app:layout_constraintTop_toBottomOf="@id/leftLabel" />
+
+            <ImageView
+                android:id="@+id/leftIcon"
+                android:layout_width="96dp"
+                android:layout_height="84dp"
+                android:background="@drawable/rounded_rectangle_right_4dp"
+                android:paddingStart="48dp"
+                android:paddingTop="30dp"
+                android:paddingEnd="24dp"
+                android:paddingBottom="30dp"
+                app:layout_constraintBottom_toBottomOf="@id/leftBackground"
+                app:layout_constraintEnd_toEndOf="@id/leftBackground"
+                app:layout_constraintTop_toTopOf="@id/leftBackground"
+                tools:backgroundTint="@color/tools_theme"
+                tools:src="@drawable/ic_archive_white_24dp"
+                tools:tint="@color/textPrimaryDark" />
+
+            <ImageView
+                android:id="@+id/leftAvatar"
+                android:layout_width="40dp"
+                android:layout_height="40dp"
+                android:layout_marginStart="16dp"
+                android:background="@drawable/circle"
+                android:backgroundTint="?android:attr/divider"
+                android:padding="8dp"
+                android:src="@drawable/ic_person_black_24dp"
+                android:tint="?android:attr/textColorTertiary"
+                app:layout_constraintBottom_toBottomOf="@id/leftBackground"
+                app:layout_constraintStart_toStartOf="@id/leftBackground"
+                app:layout_constraintTop_toTopOf="@id/leftBackground" />
+
+            <View
+                android:id="@+id/leftTitleRect"
+                android:layout_width="128dp"
+                android:layout_height="8dp"
+                android:layout_marginStart="16dp"
+                android:background="@drawable/rounded_rectangle_2dp"
+                android:backgroundTint="?android:attr/textColorTertiary"
+                app:layout_constraintBottom_toTopOf="@id/leftSummaryRect"
+                app:layout_constraintStart_toEndOf="@id/leftAvatar"
+                app:layout_constraintTop_toTopOf="@id/leftBackground"
+                app:layout_constraintVertical_chainStyle="packed" />
+
+            <View
+                android:id="@+id/leftSummaryRect"
+                android:layout_width="96dp"
+                android:layout_height="8dp"
+                android:layout_marginTop="8dp"
+                android:background="@drawable/rounded_rectangle_2dp"
+                android:backgroundTint="?android:attr/divider"
+                app:layout_constraintBottom_toBottomOf="@id/leftBackground"
+                app:layout_constraintStart_toStartOf="@id/leftTitleRect"
+                app:layout_constraintTop_toBottomOf="@id/leftTitleRect" />
+
+        </androidx.constraintlayout.widget.ConstraintLayout>
+
+    </LinearLayout>
+
 </ScrollView>
\ No newline at end of file
diff --git a/presentation/src/main/res/layout/tab_view.xml b/presentation/src/main/res/layout/tab_view.xml
index a4a019c77..6db3e0e80 100644
--- a/presentation/src/main/res/layout/tab_view.xml
+++ b/presentation/src/main/res/layout/tab_view.xml
@@ -1,32 +1,32 @@
-<?xml version="1.0" encoding="utf-8"?>
-<!--
-  ~ Copyright (C) 2019 Moez Bhatti <moez.bhatti@gmail.com>
-  ~
-  ~ This file is part of QKSMS.
-  ~
-  ~ QKSMS is free software: you can redistribute it and/or modify
-  ~ it under the terms of the GNU General Public License as published by
-  ~ the Free Software Foundation, either version 3 of the License, or
-  ~ (at your option) any later version.
-  ~
-  ~ QKSMS is distributed in the hope that it will be useful,
-  ~ but WITHOUT ANY WARRANTY; without even the implied warranty of
-  ~ MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
-  ~ GNU General Public License for more details.
-  ~
-  ~ You should have received a copy of the GNU General Public License
-  ~ along with QKSMS.  If not, see <http://www.gnu.org/licenses/>.
-  -->
-<com.moez.QKSMS.common.widget.QkTextView xmlns:android="http://schemas.android.com/apk/res/android"
-    xmlns:app="http://schemas.android.com/apk/res-auto"
-    android:id="@+id/label"
-    android:layout_width="wrap_content"
-    android:layout_height="match_parent"
-    android:background="?attr/selectableItemBackground"
-    android:backgroundTint="@android:color/transparent"
-    android:gravity="center"
-    android:paddingStart="12dp"
-    android:paddingEnd="12dp"
-    android:textAllCaps="true"
-    android:textStyle="bold"
+<?xml version="1.0" encoding="utf-8"?>
+<!--
+  ~ Copyright (C) 2019 Moez Bhatti <moez.bhatti@gmail.com>
+  ~
+  ~ This file is part of QKSMS.
+  ~
+  ~ QKSMS is free software: you can redistribute it and/or modify
+  ~ it under the terms of the GNU General Public License as published by
+  ~ the Free Software Foundation, either version 3 of the License, or
+  ~ (at your option) any later version.
+  ~
+  ~ QKSMS is distributed in the hope that it will be useful,
+  ~ but WITHOUT ANY WARRANTY; without even the implied warranty of
+  ~ MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+  ~ GNU General Public License for more details.
+  ~
+  ~ You should have received a copy of the GNU General Public License
+  ~ along with QKSMS.  If not, see <http://www.gnu.org/licenses/>.
+  -->
+<com.moez.QKSMS.common.widget.QkTextView xmlns:android="http://schemas.android.com/apk/res/android"
+    xmlns:app="http://schemas.android.com/apk/res-auto"
+    android:id="@+id/label"
+    android:layout_width="wrap_content"
+    android:layout_height="match_parent"
+    android:background="?attr/selectableItemBackground"
+    android:backgroundTint="@android:color/transparent"
+    android:gravity="center"
+    android:paddingStart="12dp"
+    android:paddingEnd="12dp"
+    android:textAllCaps="true"
+    android:textStyle="bold"
     app:textSize="secondary" />
\ No newline at end of file
diff --git a/presentation/src/main/res/layout/text_input_dialog.xml b/presentation/src/main/res/layout/text_input_dialog.xml
index b0fec2b93..8df0f5d2f 100644
--- a/presentation/src/main/res/layout/text_input_dialog.xml
+++ b/presentation/src/main/res/layout/text_input_dialog.xml
@@ -1,33 +1,33 @@
-<?xml version="1.0" encoding="utf-8"?>
-<!--
-  ~ Copyright (C) 2019 Moez Bhatti <moez.bhatti@gmail.com>
-  ~
-  ~ This file is part of QKSMS.
-  ~
-  ~ QKSMS is free software: you can redistribute it and/or modify
-  ~ it under the terms of the GNU General Public License as published by
-  ~ the Free Software Foundation, either version 3 of the License, or
-  ~ (at your option) any later version.
-  ~
-  ~ QKSMS is distributed in the hope that it will be useful,
-  ~ but WITHOUT ANY WARRANTY; without even the implied warranty of
-  ~ MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
-  ~ GNU General Public License for more details.
-  ~
-  ~ You should have received a copy of the GNU General Public License
-  ~ along with QKSMS.  If not, see <http://www.gnu.org/licenses/>.
-  -->
-<com.moez.QKSMS.common.widget.QkEditText xmlns:android="http://schemas.android.com/apk/res/android"
-    xmlns:app="http://schemas.android.com/apk/res-auto"
-    xmlns:tools="http://schemas.android.com/tools"
-    android:id="@+id/field"
-    android:layout_width="match_parent"
-    android:layout_height="wrap_content"
-    android:background="@null"
-    android:lines="1"
-    android:maxLength="64"
-    android:padding="24dp"
-    android:singleLine="true"
-    android:textStyle="bold"
-    app:textSize="dialog"
-    tools:hint="Enter something" />
+<?xml version="1.0" encoding="utf-8"?>
+<!--
+  ~ Copyright (C) 2019 Moez Bhatti <moez.bhatti@gmail.com>
+  ~
+  ~ This file is part of QKSMS.
+  ~
+  ~ QKSMS is free software: you can redistribute it and/or modify
+  ~ it under the terms of the GNU General Public License as published by
+  ~ the Free Software Foundation, either version 3 of the License, or
+  ~ (at your option) any later version.
+  ~
+  ~ QKSMS is distributed in the hope that it will be useful,
+  ~ but WITHOUT ANY WARRANTY; without even the implied warranty of
+  ~ MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+  ~ GNU General Public License for more details.
+  ~
+  ~ You should have received a copy of the GNU General Public License
+  ~ along with QKSMS.  If not, see <http://www.gnu.org/licenses/>.
+  -->
+<com.moez.QKSMS.common.widget.QkEditText xmlns:android="http://schemas.android.com/apk/res/android"
+    xmlns:app="http://schemas.android.com/apk/res-auto"
+    xmlns:tools="http://schemas.android.com/tools"
+    android:id="@+id/field"
+    android:layout_width="match_parent"
+    android:layout_height="wrap_content"
+    android:background="@null"
+    android:lines="1"
+    android:maxLength="64"
+    android:padding="24dp"
+    android:singleLine="true"
+    android:textStyle="bold"
+    app:textSize="dialog"
+    tools:hint="Enter something" />
diff --git a/presentation/src/main/res/layout/theme_list_item.xml b/presentation/src/main/res/layout/theme_list_item.xml
index da05ee17d..4e017d8aa 100644
--- a/presentation/src/main/res/layout/theme_list_item.xml
+++ b/presentation/src/main/res/layout/theme_list_item.xml
@@ -1,41 +1,41 @@
-<?xml version="1.0" encoding="utf-8"?>
-<!--
-  ~ Copyright (C) 2019 Moez Bhatti <moez.bhatti@gmail.com>
-  ~
-  ~ This file is part of QKSMS.
-  ~
-  ~ QKSMS is free software: you can redistribute it and/or modify
-  ~ it under the terms of the GNU General Public License as published by
-  ~ the Free Software Foundation, either version 3 of the License, or
-  ~ (at your option) any later version.
-  ~
-  ~ QKSMS is distributed in the hope that it will be useful,
-  ~ but WITHOUT ANY WARRANTY; without even the implied warranty of
-  ~ MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
-  ~ GNU General Public License for more details.
-  ~
-  ~ You should have received a copy of the GNU General Public License
-  ~ along with QKSMS.  If not, see <http://www.gnu.org/licenses/>.
-  -->
-<FrameLayout xmlns:android="http://schemas.android.com/apk/res/android"
-    xmlns:tools="http://schemas.android.com/tools"
-    android:layout_width="wrap_content"
-    android:layout_height="wrap_content">
-
-    <View
-        android:id="@+id/theme"
-        android:layout_width="56dp"
-        android:layout_height="56dp"
-        android:layout_gravity="center"
-        android:background="@drawable/circle"
-        tools:backgroundTint="@color/tools_theme" />
-
-    <ImageView
-        android:id="@+id/check"
-        android:layout_width="24dp"
-        android:layout_height="24dp"
-        android:layout_gravity="center"
-        android:src="@drawable/ic_check_white_24dp"
-        tools:tint="@color/textPrimaryDark" />
-
+<?xml version="1.0" encoding="utf-8"?>
+<!--
+  ~ Copyright (C) 2019 Moez Bhatti <moez.bhatti@gmail.com>
+  ~
+  ~ This file is part of QKSMS.
+  ~
+  ~ QKSMS is free software: you can redistribute it and/or modify
+  ~ it under the terms of the GNU General Public License as published by
+  ~ the Free Software Foundation, either version 3 of the License, or
+  ~ (at your option) any later version.
+  ~
+  ~ QKSMS is distributed in the hope that it will be useful,
+  ~ but WITHOUT ANY WARRANTY; without even the implied warranty of
+  ~ MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+  ~ GNU General Public License for more details.
+  ~
+  ~ You should have received a copy of the GNU General Public License
+  ~ along with QKSMS.  If not, see <http://www.gnu.org/licenses/>.
+  -->
+<FrameLayout xmlns:android="http://schemas.android.com/apk/res/android"
+    xmlns:tools="http://schemas.android.com/tools"
+    android:layout_width="wrap_content"
+    android:layout_height="wrap_content">
+
+    <View
+        android:id="@+id/theme"
+        android:layout_width="56dp"
+        android:layout_height="56dp"
+        android:layout_gravity="center"
+        android:background="@drawable/circle"
+        tools:backgroundTint="@color/tools_theme" />
+
+    <ImageView
+        android:id="@+id/check"
+        android:layout_width="24dp"
+        android:layout_height="24dp"
+        android:layout_gravity="center"
+        android:src="@drawable/ic_check_white_24dp"
+        tools:tint="@color/textPrimaryDark" />
+
 </FrameLayout>
\ No newline at end of file
diff --git a/presentation/src/main/res/layout/theme_palette_list_item.xml b/presentation/src/main/res/layout/theme_palette_list_item.xml
index 1c8ee0cd3..9c56abcb3 100644
--- a/presentation/src/main/res/layout/theme_palette_list_item.xml
+++ b/presentation/src/main/res/layout/theme_palette_list_item.xml
@@ -1,35 +1,35 @@
-<?xml version="1.0" encoding="utf-8"?>
-<!--
-  ~ Copyright (C) 2019 Moez Bhatti <moez.bhatti@gmail.com>
-  ~
-  ~ This file is part of QKSMS.
-  ~
-  ~ QKSMS is free software: you can redistribute it and/or modify
-  ~ it under the terms of the GNU General Public License as published by
-  ~ the Free Software Foundation, either version 3 of the License, or
-  ~ (at your option) any later version.
-  ~
-  ~ QKSMS is distributed in the hope that it will be useful,
-  ~ but WITHOUT ANY WARRANTY; without even the implied warranty of
-  ~ MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
-  ~ GNU General Public License for more details.
-  ~
-  ~ You should have received a copy of the GNU General Public License
-  ~ along with QKSMS.  If not, see <http://www.gnu.org/licenses/>.
-  -->
-<LinearLayout xmlns:android="http://schemas.android.com/apk/res/android"
-    android:layout_width="match_parent"
-    android:layout_height="wrap_content"
-    android:orientation="vertical">
-
-    <com.google.android.flexbox.FlexboxLayout
-        android:id="@+id/palette"
-        android:layout_width="match_parent"
-        android:layout_height="wrap_content" />
-
-    <View
-        android:layout_width="match_parent"
-        android:layout_height="1dp"
-        android:background="?android:attr/divider" />
-
+<?xml version="1.0" encoding="utf-8"?>
+<!--
+  ~ Copyright (C) 2019 Moez Bhatti <moez.bhatti@gmail.com>
+  ~
+  ~ This file is part of QKSMS.
+  ~
+  ~ QKSMS is free software: you can redistribute it and/or modify
+  ~ it under the terms of the GNU General Public License as published by
+  ~ the Free Software Foundation, either version 3 of the License, or
+  ~ (at your option) any later version.
+  ~
+  ~ QKSMS is distributed in the hope that it will be useful,
+  ~ but WITHOUT ANY WARRANTY; without even the implied warranty of
+  ~ MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+  ~ GNU General Public License for more details.
+  ~
+  ~ You should have received a copy of the GNU General Public License
+  ~ along with QKSMS.  If not, see <http://www.gnu.org/licenses/>.
+  -->
+<LinearLayout xmlns:android="http://schemas.android.com/apk/res/android"
+    android:layout_width="match_parent"
+    android:layout_height="wrap_content"
+    android:orientation="vertical">
+
+    <com.google.android.flexbox.FlexboxLayout
+        android:id="@+id/palette"
+        android:layout_width="match_parent"
+        android:layout_height="wrap_content" />
+
+    <View
+        android:layout_width="match_parent"
+        android:layout_height="1dp"
+        android:background="?android:attr/divider" />
+
 </LinearLayout>
\ No newline at end of file
diff --git a/presentation/src/main/res/layout/theme_picker_controller.xml b/presentation/src/main/res/layout/theme_picker_controller.xml
index 7ea2a1ee9..1a1e0eadb 100644
--- a/presentation/src/main/res/layout/theme_picker_controller.xml
+++ b/presentation/src/main/res/layout/theme_picker_controller.xml
@@ -1,57 +1,57 @@
-<?xml version="1.0" encoding="utf-8"?>
-<!--
-  ~ Copyright (C) 2019 Moez Bhatti <moez.bhatti@gmail.com>
-  ~
-  ~ This file is part of QKSMS.
-  ~
-  ~ QKSMS is free software: you can redistribute it and/or modify
-  ~ it under the terms of the GNU General Public License as published by
-  ~ the Free Software Foundation, either version 3 of the License, or
-  ~ (at your option) any later version.
-  ~
-  ~ QKSMS is distributed in the hope that it will be useful,
-  ~ but WITHOUT ANY WARRANTY; without even the implied warranty of
-  ~ MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
-  ~ GNU General Public License for more details.
-  ~
-  ~ You should have received a copy of the GNU General Public License
-  ~ along with QKSMS.  If not, see <http://www.gnu.org/licenses/>.
-  -->
-<LinearLayout xmlns:android="http://schemas.android.com/apk/res/android"
-    android:id="@+id/contentView"
-    android:layout_width="match_parent"
-    android:layout_height="match_parent"
-    android:animateLayoutChanges="true"
-    android:background="?android:attr/windowBackground"
-    android:orientation="vertical">
-
-    <com.moez.QKSMS.common.widget.PagerTitleView
-        android:id="@+id/tabs"
-        android:layout_width="match_parent"
-        android:layout_height="40dp"
-        android:background="?attr/colorPrimary"
-        android:elevation="8dp"
-        android:orientation="horizontal"
-        android:paddingStart="12dp"
-        android:paddingEnd="12dp" />
-
-    <androidx.viewpager.widget.ViewPager
-        android:id="@+id/pager"
-        android:layout_width="match_parent"
-        android:layout_height="0dp"
-        android:layout_weight="1">
-
-        <androidx.recyclerview.widget.RecyclerView
-            android:id="@+id/materialColors"
-            android:layout_width="match_parent"
-            android:layout_height="match_parent" />
-
-        <include
-            android:id="@+id/hsvPicker"
-            layout="@layout/theme_picker_hsv"
-            android:layout_width="match_parent"
-            android:layout_height="match_parent" />
-
-    </androidx.viewpager.widget.ViewPager>
-
+<?xml version="1.0" encoding="utf-8"?>
+<!--
+  ~ Copyright (C) 2019 Moez Bhatti <moez.bhatti@gmail.com>
+  ~
+  ~ This file is part of QKSMS.
+  ~
+  ~ QKSMS is free software: you can redistribute it and/or modify
+  ~ it under the terms of the GNU General Public License as published by
+  ~ the Free Software Foundation, either version 3 of the License, or
+  ~ (at your option) any later version.
+  ~
+  ~ QKSMS is distributed in the hope that it will be useful,
+  ~ but WITHOUT ANY WARRANTY; without even the implied warranty of
+  ~ MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+  ~ GNU General Public License for more details.
+  ~
+  ~ You should have received a copy of the GNU General Public License
+  ~ along with QKSMS.  If not, see <http://www.gnu.org/licenses/>.
+  -->
+<LinearLayout xmlns:android="http://schemas.android.com/apk/res/android"
+    android:id="@+id/contentView"
+    android:layout_width="match_parent"
+    android:layout_height="match_parent"
+    android:animateLayoutChanges="true"
+    android:background="?android:attr/windowBackground"
+    android:orientation="vertical">
+
+    <com.moez.QKSMS.common.widget.PagerTitleView
+        android:id="@+id/tabs"
+        android:layout_width="match_parent"
+        android:layout_height="40dp"
+        android:background="?attr/colorPrimary"
+        android:elevation="8dp"
+        android:orientation="horizontal"
+        android:paddingStart="12dp"
+        android:paddingEnd="12dp" />
+
+    <androidx.viewpager.widget.ViewPager
+        android:id="@+id/pager"
+        android:layout_width="match_parent"
+        android:layout_height="0dp"
+        android:layout_weight="1">
+
+        <androidx.recyclerview.widget.RecyclerView
+            android:id="@+id/materialColors"
+            android:layout_width="match_parent"
+            android:layout_height="match_parent" />
+
+        <include
+            android:id="@+id/hsvPicker"
+            layout="@layout/theme_picker_hsv"
+            android:layout_width="match_parent"
+            android:layout_height="match_parent" />
+
+    </androidx.viewpager.widget.ViewPager>
+
 </LinearLayout>
\ No newline at end of file
diff --git a/presentation/src/main/res/layout/theme_picker_hsv.xml b/presentation/src/main/res/layout/theme_picker_hsv.xml
index 372525624..95dcca003 100644
--- a/presentation/src/main/res/layout/theme_picker_hsv.xml
+++ b/presentation/src/main/res/layout/theme_picker_hsv.xml
@@ -1,130 +1,130 @@
-<?xml version="1.0" encoding="utf-8"?>
-<!--
-  ~ Copyright (C) 2019 Moez Bhatti <moez.bhatti@gmail.com>
-  ~
-  ~ This file is part of QKSMS.
-  ~
-  ~ QKSMS is free software: you can redistribute it and/or modify
-  ~ it under the terms of the GNU General Public License as published by
-  ~ the Free Software Foundation, either version 3 of the License, or
-  ~ (at your option) any later version.
-  ~
-  ~ QKSMS is distributed in the hope that it will be useful,
-  ~ but WITHOUT ANY WARRANTY; without even the implied warranty of
-  ~ MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
-  ~ GNU General Public License for more details.
-  ~
-  ~ You should have received a copy of the GNU General Public License
-  ~ along with QKSMS.  If not, see <http://www.gnu.org/licenses/>.
-  -->
-<androidx.constraintlayout.widget.ConstraintLayout xmlns:android="http://schemas.android.com/apk/res/android"
-    xmlns:app="http://schemas.android.com/apk/res-auto"
-    xmlns:tools="http://schemas.android.com/tools"
-    android:layout_width="match_parent"
-    android:layout_height="match_parent"
-    android:animateLayoutChanges="true">
-
-    <com.moez.QKSMS.feature.themepicker.HSVPickerView
-        android:id="@+id/picker"
-        android:layout_width="0dp"
-        android:layout_height="wrap_content"
-        app:layout_constraintEnd_toEndOf="parent"
-        app:layout_constraintStart_toStartOf="parent"
-        app:layout_constraintTop_toTopOf="parent" />
-
-    <com.moez.QKSMS.common.widget.QkTextView
-        android:id="@+id/hexLabel"
-        style="@style/TextSecondary"
-        android:layout_width="wrap_content"
-        android:layout_height="wrap_content"
-        android:layout_marginStart="24dp"
-        android:gravity="center"
-        android:paddingTop="8dp"
-        android:paddingBottom="8dp"
-        android:text="@string/theme_hex"
-        android:textStyle="bold"
-        android:visibility="gone"
-        app:layout_constraintStart_toStartOf="parent"
-        app:layout_constraintTop_toBottomOf="@id/picker" />
-
-    <View
-        android:id="@+id/hexSeparator"
-        android:layout_width="1dp"
-        android:layout_height="0dp"
-        android:layout_marginStart="16dp"
-        android:background="?android:attr/divider"
-        app:layout_constraintBottom_toBottomOf="@id/hexLabel"
-        app:layout_constraintStart_toEndOf="@id/hexLabel"
-        app:layout_constraintTop_toTopOf="@id/hexLabel" />
-
-    <com.moez.QKSMS.common.widget.QkTextView
-        android:id="@+id/hexSign"
-        android:layout_width="wrap_content"
-        android:layout_height="0dp"
-        android:layout_marginStart="16dp"
-        android:gravity="center"
-        android:text="#"
-        android:textColor="?android:attr/textColorPrimary"
-        android:textStyle="bold"
-        app:layout_constraintBottom_toBottomOf="@id/hexLabel"
-        app:layout_constraintStart_toEndOf="@id/hexSeparator"
-        app:layout_constraintTop_toTopOf="@id/hexLabel"
-        app:textSize="secondary"
-        tools:ignore="HardcodedText" />
-
-    <com.moez.QKSMS.common.widget.QkEditText
-        android:id="@+id/hex"
-        android:layout_width="wrap_content"
-        android:layout_height="0dp"
-        android:background="@null"
-        android:gravity="center"
-        android:paddingEnd="16dp"
-        android:textAllCaps="true"
-        android:textColor="?android:attr/textColorPrimary"
-        android:textStyle="bold"
-        app:layout_constraintBottom_toBottomOf="@id/hexLabel"
-        app:layout_constraintStart_toEndOf="@id/hexSign"
-        app:layout_constraintTop_toTopOf="@id/hexLabel"
-        app:textSize="secondary"
-        tools:text="1B8AE8" />
-
-    <androidx.constraintlayout.widget.Group
-        android:id="@+id/applyGroup"
-        android:layout_width="wrap_content"
-        android:layout_height="wrap_content"
-        app:constraint_referenced_ids="applyDivider, clear, apply" />
-
-    <View
-        android:id="@+id/applyDivider"
-        android:layout_width="match_parent"
-        android:layout_height="1dp"
-        android:background="?android:attr/divider"
-        app:layout_constraintBottom_toTopOf="@id/clear" />
-
-    <ImageView
-        android:id="@+id/clear"
-        android:layout_width="56dp"
-        android:layout_height="56dp"
-        android:background="?attr/selectableItemBackground"
-        android:padding="16dp"
-        android:src="@drawable/ic_cancel_black_24dp"
-        android:tint="?android:attr/textColorSecondary"
-        app:layout_constraintBottom_toBottomOf="parent"
-        app:layout_constraintStart_toStartOf="parent" />
-
-    <com.moez.QKSMS.common.widget.QkTextView
-        android:id="@+id/apply"
-        style="@style/TextButton"
-        android:layout_width="wrap_content"
-        android:layout_height="40dp"
-        android:layout_marginEnd="8dp"
-        android:background="@drawable/rounded_rectangle_2dp"
-        android:elevation="2dp"
-        android:text="@string/theme_apply"
-        app:layout_constraintBottom_toBottomOf="@id/clear"
-        app:layout_constraintEnd_toEndOf="parent"
-        app:layout_constraintTop_toTopOf="@id/clear"
-        tools:backgroundTint="@color/tools_theme"
-        tools:textColor="@color/textPrimaryDark" />
-
+<?xml version="1.0" encoding="utf-8"?>
+<!--
+  ~ Copyright (C) 2019 Moez Bhatti <moez.bhatti@gmail.com>
+  ~
+  ~ This file is part of QKSMS.
+  ~
+  ~ QKSMS is free software: you can redistribute it and/or modify
+  ~ it under the terms of the GNU General Public License as published by
+  ~ the Free Software Foundation, either version 3 of the License, or
+  ~ (at your option) any later version.
+  ~
+  ~ QKSMS is distributed in the hope that it will be useful,
+  ~ but WITHOUT ANY WARRANTY; without even the implied warranty of
+  ~ MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+  ~ GNU General Public License for more details.
+  ~
+  ~ You should have received a copy of the GNU General Public License
+  ~ along with QKSMS.  If not, see <http://www.gnu.org/licenses/>.
+  -->
+<androidx.constraintlayout.widget.ConstraintLayout xmlns:android="http://schemas.android.com/apk/res/android"
+    xmlns:app="http://schemas.android.com/apk/res-auto"
+    xmlns:tools="http://schemas.android.com/tools"
+    android:layout_width="match_parent"
+    android:layout_height="match_parent"
+    android:animateLayoutChanges="true">
+
+    <com.moez.QKSMS.feature.themepicker.HSVPickerView
+        android:id="@+id/picker"
+        android:layout_width="0dp"
+        android:layout_height="wrap_content"
+        app:layout_constraintEnd_toEndOf="parent"
+        app:layout_constraintStart_toStartOf="parent"
+        app:layout_constraintTop_toTopOf="parent" />
+
+    <com.moez.QKSMS.common.widget.QkTextView
+        android:id="@+id/hexLabel"
+        style="@style/TextSecondary"
+        android:layout_width="wrap_content"
+        android:layout_height="wrap_content"
+        android:layout_marginStart="24dp"
+        android:gravity="center"
+        android:paddingTop="8dp"
+        android:paddingBottom="8dp"
+        android:text="@string/theme_hex"
+        android:textStyle="bold"
+        android:visibility="gone"
+        app:layout_constraintStart_toStartOf="parent"
+        app:layout_constraintTop_toBottomOf="@id/picker" />
+
+    <View
+        android:id="@+id/hexSeparator"
+        android:layout_width="1dp"
+        android:layout_height="0dp"
+        android:layout_marginStart="16dp"
+        android:background="?android:attr/divider"
+        app:layout_constraintBottom_toBottomOf="@id/hexLabel"
+        app:layout_constraintStart_toEndOf="@id/hexLabel"
+        app:layout_constraintTop_toTopOf="@id/hexLabel" />
+
+    <com.moez.QKSMS.common.widget.QkTextView
+        android:id="@+id/hexSign"
+        android:layout_width="wrap_content"
+        android:layout_height="0dp"
+        android:layout_marginStart="16dp"
+        android:gravity="center"
+        android:text="#"
+        android:textColor="?android:attr/textColorPrimary"
+        android:textStyle="bold"
+        app:layout_constraintBottom_toBottomOf="@id/hexLabel"
+        app:layout_constraintStart_toEndOf="@id/hexSeparator"
+        app:layout_constraintTop_toTopOf="@id/hexLabel"
+        app:textSize="secondary"
+        tools:ignore="HardcodedText" />
+
+    <com.moez.QKSMS.common.widget.QkEditText
+        android:id="@+id/hex"
+        android:layout_width="wrap_content"
+        android:layout_height="0dp"
+        android:background="@null"
+        android:gravity="center"
+        android:paddingEnd="16dp"
+        android:textAllCaps="true"
+        android:textColor="?android:attr/textColorPrimary"
+        android:textStyle="bold"
+        app:layout_constraintBottom_toBottomOf="@id/hexLabel"
+        app:layout_constraintStart_toEndOf="@id/hexSign"
+        app:layout_constraintTop_toTopOf="@id/hexLabel"
+        app:textSize="secondary"
+        tools:text="1B8AE8" />
+
+    <androidx.constraintlayout.widget.Group
+        android:id="@+id/applyGroup"
+        android:layout_width="wrap_content"
+        android:layout_height="wrap_content"
+        app:constraint_referenced_ids="applyDivider, clear, apply" />
+
+    <View
+        android:id="@+id/applyDivider"
+        android:layout_width="match_parent"
+        android:layout_height="1dp"
+        android:background="?android:attr/divider"
+        app:layout_constraintBottom_toTopOf="@id/clear" />
+
+    <ImageView
+        android:id="@+id/clear"
+        android:layout_width="56dp"
+        android:layout_height="56dp"
+        android:background="?attr/selectableItemBackground"
+        android:padding="16dp"
+        android:src="@drawable/ic_cancel_black_24dp"
+        android:tint="?android:attr/textColorSecondary"
+        app:layout_constraintBottom_toBottomOf="parent"
+        app:layout_constraintStart_toStartOf="parent" />
+
+    <com.moez.QKSMS.common.widget.QkTextView
+        android:id="@+id/apply"
+        style="@style/TextButton"
+        android:layout_width="wrap_content"
+        android:layout_height="40dp"
+        android:layout_marginEnd="8dp"
+        android:background="@drawable/rounded_rectangle_2dp"
+        android:elevation="2dp"
+        android:text="@string/theme_apply"
+        app:layout_constraintBottom_toBottomOf="@id/clear"
+        app:layout_constraintEnd_toEndOf="parent"
+        app:layout_constraintTop_toTopOf="@id/clear"
+        tools:backgroundTint="@color/tools_theme"
+        tools:textColor="@color/textPrimaryDark" />
+
 </androidx.constraintlayout.widget.ConstraintLayout>
\ No newline at end of file
diff --git a/presentation/src/main/res/layout/toolbar.xml b/presentation/src/main/res/layout/toolbar.xml
index ca9e9b8ca..e195d1712 100644
--- a/presentation/src/main/res/layout/toolbar.xml
+++ b/presentation/src/main/res/layout/toolbar.xml
@@ -1,30 +1,30 @@
-<?xml version="1.0" encoding="utf-8"?>
-<!--
-  ~ Copyright (C) 2019 Moez Bhatti <moez.bhatti@gmail.com>
-  ~
-  ~ This file is part of QKSMS.
-  ~
-  ~ QKSMS is free software: you can redistribute it and/or modify
-  ~ it under the terms of the GNU General Public License as published by
-  ~ the Free Software Foundation, either version 3 of the License, or
-  ~ (at your option) any later version.
-  ~
-  ~ QKSMS is distributed in the hope that it will be useful,
-  ~ but WITHOUT ANY WARRANTY; without even the implied warranty of
-  ~ MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
-  ~ GNU General Public License for more details.
-  ~
-  ~ You should have received a copy of the GNU General Public License
-  ~ along with QKSMS.  If not, see <http://www.gnu.org/licenses/>.
-  -->
-<androidx.appcompat.widget.Toolbar xmlns:android="http://schemas.android.com/apk/res/android"
-    xmlns:tools="http://schemas.android.com/tools"
-    android:id="@+id/toolbar"
-    style="@style/Toolbar">
-
-    <com.moez.QKSMS.common.widget.QkTextView
-        android:id="@+id/toolbarTitle"
-        style="@style/ToolbarText"
-        tools:text="Conversations" />
-
+<?xml version="1.0" encoding="utf-8"?>
+<!--
+  ~ Copyright (C) 2019 Moez Bhatti <moez.bhatti@gmail.com>
+  ~
+  ~ This file is part of QKSMS.
+  ~
+  ~ QKSMS is free software: you can redistribute it and/or modify
+  ~ it under the terms of the GNU General Public License as published by
+  ~ the Free Software Foundation, either version 3 of the License, or
+  ~ (at your option) any later version.
+  ~
+  ~ QKSMS is distributed in the hope that it will be useful,
+  ~ but WITHOUT ANY WARRANTY; without even the implied warranty of
+  ~ MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+  ~ GNU General Public License for more details.
+  ~
+  ~ You should have received a copy of the GNU General Public License
+  ~ along with QKSMS.  If not, see <http://www.gnu.org/licenses/>.
+  -->
+<androidx.appcompat.widget.Toolbar xmlns:android="http://schemas.android.com/apk/res/android"
+    xmlns:tools="http://schemas.android.com/tools"
+    android:id="@+id/toolbar"
+    style="@style/Toolbar">
+
+    <com.moez.QKSMS.common.widget.QkTextView
+        android:id="@+id/toolbarTitle"
+        style="@style/ToolbarText"
+        tools:text="Conversations" />
+
 </androidx.appcompat.widget.Toolbar>
\ No newline at end of file
diff --git a/presentation/src/main/res/layout/widget.xml b/presentation/src/main/res/layout/widget.xml
index 408d92156..01fd1b541 100644
--- a/presentation/src/main/res/layout/widget.xml
+++ b/presentation/src/main/res/layout/widget.xml
@@ -1,89 +1,89 @@
-<?xml version="1.0" encoding="utf-8"?>
-<!--
-  ~ Copyright (C) 2019 Moez Bhatti <moez.bhatti@gmail.com>
-  ~
-  ~ This file is part of QKSMS.
-  ~
-  ~ QKSMS is free software: you can redistribute it and/or modify
-  ~ it under the terms of the GNU General Public License as published by
-  ~ the Free Software Foundation, either version 3 of the License, or
-  ~ (at your option) any later version.
-  ~
-  ~ QKSMS is distributed in the hope that it will be useful,
-  ~ but WITHOUT ANY WARRANTY; without even the implied warranty of
-  ~ MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
-  ~ GNU General Public License for more details.
-  ~
-  ~ You should have received a copy of the GNU General Public License
-  ~ along with QKSMS.  If not, see <http://www.gnu.org/licenses/>.
-  -->
-<RelativeLayout xmlns:android="http://schemas.android.com/apk/res/android"
-    xmlns:tools="http://schemas.android.com/tools"
-    android:layout_width="match_parent"
-    android:layout_height="match_parent">
-
-    <!-- Background card. Needs to be an ImageView because nothing else supports tinting -->
-    <ImageView
-        android:id="@+id/background"
-        android:layout_width="match_parent"
-        android:layout_height="match_parent"
-        android:src="@drawable/rounded_rectangle_4dp" />
-
-    <!-- Apply the background card -->
-    <ImageView
-        android:id="@+id/toolbar"
-        android:layout_width="match_parent"
-        android:layout_height="48dp"
-        android:src="@drawable/rounded_rectangle_top_4dp" />
-
-    <TextView
-        android:id="@+id/title"
-        android:layout_width="0dp"
-        android:layout_height="0dp"
-        android:layout_alignTop="@id/toolbar"
-        android:layout_alignBottom="@id/toolbar"
-        android:layout_alignParentStart="true"
-        android:layout_toStartOf="@id/compose"
-        android:background="@drawable/ripple"
-        android:gravity="center_vertical"
-        android:paddingStart="16dp"
-        android:paddingEnd="16dp"
-        android:text="@string/app_name"
-        android:textSize="18sp"
-        tools:textColor="@color/textPrimary" />
-
-    <ImageView
-        android:id="@+id/compose"
-        android:layout_width="48dp"
-        android:layout_height="0dp"
-        android:layout_alignTop="@id/toolbar"
-        android:layout_alignBottom="@id/toolbar"
-        android:layout_alignParentEnd="true"
-        android:background="@drawable/ripple"
-        android:padding="12dp"
-        android:src="@drawable/ic_add_black_24dp"
-        tools:tint="@color/tools_theme" />
-
-    <ListView
-        android:id="@+id/conversations"
-        android:layout_width="match_parent"
-        android:layout_height="match_parent"
-        android:layout_below="@id/toolbar"
-        android:layout_alignParentBottom="true"
-        android:cacheColorHint="#00000000"
-        android:clipChildren="false"
-        android:clipToPadding="false"
-        android:divider="@null"
-        android:dividerHeight="0dp"
-        android:paddingTop="8dp"
-        android:paddingBottom="8dp"
-        tools:listitem="@layout/widget_list_item" />
-
-    <!-- This needs to be a FrameLayout, since Views are not supported-->
-    <FrameLayout
-        android:layout_width="match_parent"
-        android:layout_height="8dp"
-        android:layout_below="@id/toolbar"
-        android:background="@drawable/ab_shadow" />
-
-</RelativeLayout>
+<?xml version="1.0" encoding="utf-8"?>
+<!--
+  ~ Copyright (C) 2019 Moez Bhatti <moez.bhatti@gmail.com>
+  ~
+  ~ This file is part of QKSMS.
+  ~
+  ~ QKSMS is free software: you can redistribute it and/or modify
+  ~ it under the terms of the GNU General Public License as published by
+  ~ the Free Software Foundation, either version 3 of the License, or
+  ~ (at your option) any later version.
+  ~
+  ~ QKSMS is distributed in the hope that it will be useful,
+  ~ but WITHOUT ANY WARRANTY; without even the implied warranty of
+  ~ MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+  ~ GNU General Public License for more details.
+  ~
+  ~ You should have received a copy of the GNU General Public License
+  ~ along with QKSMS.  If not, see <http://www.gnu.org/licenses/>.
+  -->
+<RelativeLayout xmlns:android="http://schemas.android.com/apk/res/android"
+    xmlns:tools="http://schemas.android.com/tools"
+    android:layout_width="match_parent"
+    android:layout_height="match_parent">
+
+    <!-- Background card. Needs to be an ImageView because nothing else supports tinting -->
+    <ImageView
+        android:id="@+id/background"
+        android:layout_width="match_parent"
+        android:layout_height="match_parent"
+        android:src="@drawable/rounded_rectangle_4dp" />
+
+    <!-- Apply the background card -->
+    <ImageView
+        android:id="@+id/toolbar"
+        android:layout_width="match_parent"
+        android:layout_height="48dp"
+        android:src="@drawable/rounded_rectangle_top_4dp" />
+
+    <TextView
+        android:id="@+id/title"
+        android:layout_width="0dp"
+        android:layout_height="0dp"
+        android:layout_alignTop="@id/toolbar"
+        android:layout_alignBottom="@id/toolbar"
+        android:layout_alignParentStart="true"
+        android:layout_toStartOf="@id/compose"
+        android:background="@drawable/ripple"
+        android:gravity="center_vertical"
+        android:paddingStart="16dp"
+        android:paddingEnd="16dp"
+        android:text="@string/app_name"
+        android:textSize="18sp"
+        tools:textColor="@color/textPrimary" />
+
+    <ImageView
+        android:id="@+id/compose"
+        android:layout_width="48dp"
+        android:layout_height="0dp"
+        android:layout_alignTop="@id/toolbar"
+        android:layout_alignBottom="@id/toolbar"
+        android:layout_alignParentEnd="true"
+        android:background="@drawable/ripple"
+        android:padding="12dp"
+        android:src="@drawable/ic_add_black_24dp"
+        tools:tint="@color/tools_theme" />
+
+    <ListView
+        android:id="@+id/conversations"
+        android:layout_width="match_parent"
+        android:layout_height="match_parent"
+        android:layout_below="@id/toolbar"
+        android:layout_alignParentBottom="true"
+        android:cacheColorHint="#00000000"
+        android:clipChildren="false"
+        android:clipToPadding="false"
+        android:divider="@null"
+        android:dividerHeight="0dp"
+        android:paddingTop="8dp"
+        android:paddingBottom="8dp"
+        tools:listitem="@layout/widget_list_item" />
+
+    <!-- This needs to be a FrameLayout, since Views are not supported-->
+    <FrameLayout
+        android:layout_width="match_parent"
+        android:layout_height="8dp"
+        android:layout_below="@id/toolbar"
+        android:background="@drawable/ab_shadow" />
+
+</RelativeLayout>
diff --git a/presentation/src/main/res/layout/widget_list_item.xml b/presentation/src/main/res/layout/widget_list_item.xml
index 2cdaf088a..f4eb9ab3f 100755
--- a/presentation/src/main/res/layout/widget_list_item.xml
+++ b/presentation/src/main/res/layout/widget_list_item.xml
@@ -1,110 +1,110 @@
-<?xml version="1.0" encoding="utf-8"?>
-
-<!--
-  ~ Copyright (C) 2019 Moez Bhatti <moez.bhatti@gmail.com>
-  ~
-  ~ This file is part of QKSMS.
-  ~
-  ~ QKSMS is free software: you can redistribute it and/or modify
-  ~ it under the terms of the GNU General Public License as published by
-  ~ the Free Software Foundation, either version 3 of the License, or
-  ~ (at your option) any later version.
-  ~
-  ~ QKSMS is distributed in the hope that it will be useful,
-  ~ but WITHOUT ANY WARRANTY; without even the implied warranty of
-  ~ MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
-  ~ GNU General Public License for more details.
-  ~
-  ~ You should have received a copy of the GNU General Public License
-  ~ along with QKSMS.  If not, see <http://www.gnu.org/licenses/>.
-  -->
-<LinearLayout xmlns:android="http://schemas.android.com/apk/res/android"
-    xmlns:tools="http://schemas.android.com/tools"
-    android:id="@+id/conversation"
-    android:layout_width="wrap_content"
-    android:layout_height="wrap_content"
-    android:background="@drawable/ripple"
-    android:gravity="center_vertical|start"
-    android:orientation="horizontal"
-    android:paddingLeft="16dp"
-    android:paddingTop="12dp"
-    android:paddingRight="16dp"
-    android:paddingBottom="12dp">
-
-    <FrameLayout
-        android:id="@+id/avatar"
-        android:layout_width="48dp"
-        android:layout_height="48dp"
-        android:layout_marginEnd="16dp"
-        tools:background="@color/tools_theme">
-
-        <TextView
-            android:id="@+id/initial"
-            android:layout_width="match_parent"
-            android:layout_height="match_parent"
-            android:gravity="center"
-            android:textAllCaps="true"
-            android:textSize="20sp"
-            tools:text="A"
-            tools:textColor="@color/textPrimaryDark" />
-
-        <ImageView
-            android:id="@+id/icon"
-            android:layout_width="24dp"
-            android:layout_height="24dp"
-            android:layout_gravity="center"
-            android:src="@drawable/ic_person_black_24dp"
-            tools:tint="@color/textPrimaryDark" />
-
-        <ImageView
-            android:id="@+id/photo"
-            android:layout_width="match_parent"
-            android:layout_height="match_parent"
-            tools:src="@tools:sample/avatars" />
-
-        <ImageView
-            android:id="@+id/avatarMask"
-            android:layout_width="match_parent"
-            android:layout_height="match_parent"
-            android:src="@drawable/circle_mask" />
-
-    </FrameLayout>
-
-    <RelativeLayout
-        android:layout_width="wrap_content"
-        android:layout_height="wrap_content">
-
-        <TextView
-            android:id="@+id/name"
-            android:layout_width="wrap_content"
-            android:layout_height="wrap_content"
-            android:layout_alignParentStart="true"
-            android:layout_toStartOf="@+id/date"
-            android:singleLine="true"
-            android:textSize="16sp"
-            tools:text="@tools:sample/full_names" />
-
-        <TextView
-            android:id="@+id/date"
-            android:layout_width="wrap_content"
-            android:layout_height="wrap_content"
-            android:layout_alignParentTop="true"
-            android:layout_alignParentEnd="true"
-            android:layout_marginStart="16dp"
-            android:textSize="12sp"
-            tools:text="@tools:sample/date/day_of_week" />
-
-        <TextView
-            android:id="@+id/snippet"
-            android:layout_width="wrap_content"
-            android:layout_height="wrap_content"
-            android:layout_below="@id/name"
-            android:layout_alignParentStart="true"
-            android:lines="1"
-            android:singleLine="true"
-            android:textSize="14sp"
-            tools:text="@tools:sample/lorem" />
-
-    </RelativeLayout>
-
+<?xml version="1.0" encoding="utf-8"?>
+
+<!--
+  ~ Copyright (C) 2019 Moez Bhatti <moez.bhatti@gmail.com>
+  ~
+  ~ This file is part of QKSMS.
+  ~
+  ~ QKSMS is free software: you can redistribute it and/or modify
+  ~ it under the terms of the GNU General Public License as published by
+  ~ the Free Software Foundation, either version 3 of the License, or
+  ~ (at your option) any later version.
+  ~
+  ~ QKSMS is distributed in the hope that it will be useful,
+  ~ but WITHOUT ANY WARRANTY; without even the implied warranty of
+  ~ MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+  ~ GNU General Public License for more details.
+  ~
+  ~ You should have received a copy of the GNU General Public License
+  ~ along with QKSMS.  If not, see <http://www.gnu.org/licenses/>.
+  -->
+<LinearLayout xmlns:android="http://schemas.android.com/apk/res/android"
+    xmlns:tools="http://schemas.android.com/tools"
+    android:id="@+id/conversation"
+    android:layout_width="wrap_content"
+    android:layout_height="wrap_content"
+    android:background="@drawable/ripple"
+    android:gravity="center_vertical|start"
+    android:orientation="horizontal"
+    android:paddingLeft="16dp"
+    android:paddingTop="12dp"
+    android:paddingRight="16dp"
+    android:paddingBottom="12dp">
+
+    <FrameLayout
+        android:id="@+id/avatar"
+        android:layout_width="48dp"
+        android:layout_height="48dp"
+        android:layout_marginEnd="16dp"
+        tools:background="@color/tools_theme">
+
+        <TextView
+            android:id="@+id/initial"
+            android:layout_width="match_parent"
+            android:layout_height="match_parent"
+            android:gravity="center"
+            android:textAllCaps="true"
+            android:textSize="20sp"
+            tools:text="A"
+            tools:textColor="@color/textPrimaryDark" />
+
+        <ImageView
+            android:id="@+id/icon"
+            android:layout_width="24dp"
+            android:layout_height="24dp"
+            android:layout_gravity="center"
+            android:src="@drawable/ic_person_black_24dp"
+            tools:tint="@color/textPrimaryDark" />
+
+        <ImageView
+            android:id="@+id/photo"
+            android:layout_width="match_parent"
+            android:layout_height="match_parent"
+            tools:src="@tools:sample/avatars" />
+
+        <ImageView
+            android:id="@+id/avatarMask"
+            android:layout_width="match_parent"
+            android:layout_height="match_parent"
+            android:src="@drawable/circle_mask" />
+
+    </FrameLayout>
+
+    <RelativeLayout
+        android:layout_width="wrap_content"
+        android:layout_height="wrap_content">
+
+        <TextView
+            android:id="@+id/name"
+            android:layout_width="wrap_content"
+            android:layout_height="wrap_content"
+            android:layout_alignParentStart="true"
+            android:layout_toStartOf="@+id/date"
+            android:singleLine="true"
+            android:textSize="16sp"
+            tools:text="@tools:sample/full_names" />
+
+        <TextView
+            android:id="@+id/date"
+            android:layout_width="wrap_content"
+            android:layout_height="wrap_content"
+            android:layout_alignParentTop="true"
+            android:layout_alignParentEnd="true"
+            android:layout_marginStart="16dp"
+            android:textSize="12sp"
+            tools:text="@tools:sample/date/day_of_week" />
+
+        <TextView
+            android:id="@+id/snippet"
+            android:layout_width="wrap_content"
+            android:layout_height="wrap_content"
+            android:layout_below="@id/name"
+            android:layout_alignParentStart="true"
+            android:lines="1"
+            android:singleLine="true"
+            android:textSize="14sp"
+            tools:text="@tools:sample/lorem" />
+
+    </RelativeLayout>
+
 </LinearLayout>
\ No newline at end of file
diff --git a/presentation/src/main/res/layout/widget_loading.xml b/presentation/src/main/res/layout/widget_loading.xml
index 4ee493d8f..4b989c475 100755
--- a/presentation/src/main/res/layout/widget_loading.xml
+++ b/presentation/src/main/res/layout/widget_loading.xml
@@ -1,35 +1,35 @@
-<?xml version="1.0" encoding="utf-8"?>
-<!--
-  ~ Copyright (C) 2019 Moez Bhatti <moez.bhatti@gmail.com>
-  ~
-  ~ This file is part of QKSMS.
-  ~
-  ~ QKSMS is free software: you can redistribute it and/or modify
-  ~ it under the terms of the GNU General Public License as published by
-  ~ the Free Software Foundation, either version 3 of the License, or
-  ~ (at your option) any later version.
-  ~
-  ~ QKSMS is distributed in the hope that it will be useful,
-  ~ but WITHOUT ANY WARRANTY; without even the implied warranty of
-  ~ MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
-  ~ GNU General Public License for more details.
-  ~
-  ~ You should have received a copy of the GNU General Public License
-  ~ along with QKSMS.  If not, see <http://www.gnu.org/licenses/>.
-  -->
-<FrameLayout xmlns:android="http://schemas.android.com/apk/res/android"
-    xmlns:tools="http://schemas.android.com/tools"
-    android:id="@+id/loading"
-    android:layout_width="match_parent"
-    android:layout_height="64sp">
-
-    <TextView
-        android:id="@+id/loadingText"
-        android:layout_width="match_parent"
-        android:layout_height="match_parent"
-        android:gravity="center"
-        android:textColor="?android:attr/textColorSecondary"
-        android:textSize="14sp"
-        tools:text="Loading..." />
-
+<?xml version="1.0" encoding="utf-8"?>
+<!--
+  ~ Copyright (C) 2019 Moez Bhatti <moez.bhatti@gmail.com>
+  ~
+  ~ This file is part of QKSMS.
+  ~
+  ~ QKSMS is free software: you can redistribute it and/or modify
+  ~ it under the terms of the GNU General Public License as published by
+  ~ the Free Software Foundation, either version 3 of the License, or
+  ~ (at your option) any later version.
+  ~
+  ~ QKSMS is distributed in the hope that it will be useful,
+  ~ but WITHOUT ANY WARRANTY; without even the implied warranty of
+  ~ MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+  ~ GNU General Public License for more details.
+  ~
+  ~ You should have received a copy of the GNU General Public License
+  ~ along with QKSMS.  If not, see <http://www.gnu.org/licenses/>.
+  -->
+<FrameLayout xmlns:android="http://schemas.android.com/apk/res/android"
+    xmlns:tools="http://schemas.android.com/tools"
+    android:id="@+id/loading"
+    android:layout_width="match_parent"
+    android:layout_height="64sp">
+
+    <TextView
+        android:id="@+id/loadingText"
+        android:layout_width="match_parent"
+        android:layout_height="match_parent"
+        android:gravity="center"
+        android:textColor="?android:attr/textColorSecondary"
+        android:textSize="14sp"
+        tools:text="Loading..." />
+
 </FrameLayout>
\ No newline at end of file
diff --git a/presentation/src/main/res/menu/blocked_messages.xml b/presentation/src/main/res/menu/blocked_messages.xml
index e4fcb99a1..3642a5c24 100644
--- a/presentation/src/main/res/menu/blocked_messages.xml
+++ b/presentation/src/main/res/menu/blocked_messages.xml
@@ -1,37 +1,37 @@
-<?xml version="1.0" encoding="utf-8"?>
-<!--
-  ~ Copyright (C) 2019 Moez Bhatti <moez.bhatti@gmail.com>
-  ~
-  ~ This file is part of QKSMS.
-  ~
-  ~ QKSMS is free software: you can redistribute it and/or modify
-  ~ it under the terms of the GNU General Public License as published by
-  ~ the Free Software Foundation, either version 3 of the License, or
-  ~ (at your option) any later version.
-  ~
-  ~ QKSMS is distributed in the hope that it will be useful,
-  ~ but WITHOUT ANY WARRANTY; without even the implied warranty of
-  ~ MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
-  ~ GNU General Public License for more details.
-  ~
-  ~ You should have received a copy of the GNU General Public License
-  ~ along with QKSMS.  If not, see <http://www.gnu.org/licenses/>.
-  -->
-<menu xmlns:android="http://schemas.android.com/apk/res/android"
-    xmlns:app="http://schemas.android.com/apk/res-auto">
-
-    <item
-        android:id="@+id/delete"
-        android:icon="@drawable/ic_delete_white_24dp"
-        android:title="@string/main_menu_delete"
-        android:visible="false"
-        app:showAsAction="ifRoom" />
-
-    <item
-        android:id="@+id/block"
-        android:icon="@drawable/ic_block_white_24dp"
-        android:title="@string/main_menu_block"
-        android:visible="false"
-        app:showAsAction="ifRoom" />
-
-</menu>
+<?xml version="1.0" encoding="utf-8"?>
+<!--
+  ~ Copyright (C) 2019 Moez Bhatti <moez.bhatti@gmail.com>
+  ~
+  ~ This file is part of QKSMS.
+  ~
+  ~ QKSMS is free software: you can redistribute it and/or modify
+  ~ it under the terms of the GNU General Public License as published by
+  ~ the Free Software Foundation, either version 3 of the License, or
+  ~ (at your option) any later version.
+  ~
+  ~ QKSMS is distributed in the hope that it will be useful,
+  ~ but WITHOUT ANY WARRANTY; without even the implied warranty of
+  ~ MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+  ~ GNU General Public License for more details.
+  ~
+  ~ You should have received a copy of the GNU General Public License
+  ~ along with QKSMS.  If not, see <http://www.gnu.org/licenses/>.
+  -->
+<menu xmlns:android="http://schemas.android.com/apk/res/android"
+    xmlns:app="http://schemas.android.com/apk/res-auto">
+
+    <item
+        android:id="@+id/delete"
+        android:icon="@drawable/ic_delete_white_24dp"
+        android:title="@string/main_menu_delete"
+        android:visible="false"
+        app:showAsAction="ifRoom" />
+
+    <item
+        android:id="@+id/block"
+        android:icon="@drawable/ic_block_white_24dp"
+        android:title="@string/main_menu_block"
+        android:visible="false"
+        app:showAsAction="ifRoom" />
+
+</menu>
diff --git a/presentation/src/main/res/menu/compose.xml b/presentation/src/main/res/menu/compose.xml
index c39f25ac2..373e7f663 100644
--- a/presentation/src/main/res/menu/compose.xml
+++ b/presentation/src/main/res/menu/compose.xml
@@ -1,93 +1,100 @@
-<?xml version="1.0" encoding="utf-8"?>
-<!--
-  ~ Copyright (C) 2019 Moez Bhatti <moez.bhatti@gmail.com>
-  ~
-  ~ This file is part of QKSMS.
-  ~
-  ~ QKSMS is free software: you can redistribute it and/or modify
-  ~ it under the terms of the GNU General Public License as published by
-  ~ the Free Software Foundation, either version 3 of the License, or
-  ~ (at your option) any later version.
-  ~
-  ~ QKSMS is distributed in the hope that it will be useful,
-  ~ but WITHOUT ANY WARRANTY; without even the implied warranty of
-  ~ MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
-  ~ GNU General Public License for more details.
-  ~
-  ~ You should have received a copy of the GNU General Public License
-  ~ along with QKSMS.  If not, see <http://www.gnu.org/licenses/>.
-  -->
-<menu xmlns:android="http://schemas.android.com/apk/res/android"
-    xmlns:app="http://schemas.android.com/apk/res-auto">
-
-    <item
-        android:id="@+id/add"
-        android:icon="@drawable/ic_person_add_black_24dp"
-        android:title="@string/menu_add_person"
-        android:visible="false"
-        app:showAsAction="always" />
-
-    <item
-        android:id="@+id/call"
-        android:icon="@drawable/ic_call_white_24dp"
-        android:title="@string/menu_call"
-        android:visible="false"
-        app:showAsAction="always" />
-
-    <item
-        android:id="@+id/info"
-        android:icon="@drawable/ic_more_vert_black_24dp"
-        android:title="@string/menu_info"
-        android:visible="false"
-        app:showAsAction="always" />
-
-    <item
-        android:id="@+id/details"
-        android:icon="@drawable/ic_info_black_24dp"
-        android:title="@string/compose_menu_copy"
-        android:visible="false"
-        app:showAsAction="ifRoom" />
-
-    <item
-        android:id="@+id/delete"
-        android:icon="@drawable/ic_delete_white_24dp"
-        android:title="@string/compose_menu_delete"
-        android:visible="false"
-        app:showAsAction="ifRoom" />
-
-    <item
-        android:id="@+id/copy"
-        android:icon="@drawable/ic_content_copy_black_24dp"
-        android:title="@string/compose_menu_copy"
-        android:visible="false"
-        app:showAsAction="ifRoom" />
-
-    <item
-        android:id="@+id/forward"
-        android:icon="@drawable/ic_forward_black_24dp"
-        android:title="@string/compose_menu_forward"
-        android:visible="false"
-        app:showAsAction="ifRoom" />
-
-    <item
-        android:id="@+id/previous"
-        android:icon="@drawable/ic_keyboard_arrow_up_black_24dp"
-        android:title="@string/compose_menu_previous"
-        android:visible="false"
-        app:showAsAction="always" />
-
-    <item
-        android:id="@+id/next"
-        android:icon="@drawable/ic_keyboard_arrow_down_black_24dp"
-        android:title="@string/compose_menu_next"
-        android:visible="false"
-        app:showAsAction="always" />
-
-    <item
-        android:id="@+id/clear"
-        android:icon="@drawable/ic_clear_black_24dp"
-        android:title="@string/compose_menu_clear"
-        android:visible="false"
-        app:showAsAction="always" />
-
+<?xml version="1.0" encoding="utf-8"?>
+<!--
+  ~ Copyright (C) 2019,2021 Moez Bhatti <moez.bhatti@gmail.com>,to268
+  ~
+  ~ This file is part of QKSMS.
+  ~
+  ~ QKSMS is free software: you can redistribute it and/or modify
+  ~ it under the terms of the GNU General Public License as published by
+  ~ the Free Software Foundation, either version 3 of the License, or
+  ~ (at your option) any later version.
+  ~
+  ~ QKSMS is distributed in the hope that it will be useful,
+  ~ but WITHOUT ANY WARRANTY; without even the implied warranty of
+  ~ MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+  ~ GNU General Public License for more details.
+  ~
+  ~ You should have received a copy of the GNU General Public License
+  ~ along with QKSMS.  If not, see <http://www.gnu.org/licenses/>.
+  -->
+<menu xmlns:android="http://schemas.android.com/apk/res/android"
+    xmlns:app="http://schemas.android.com/apk/res-auto">
+
+    <item
+        android:id="@+id/add"
+        android:icon="@drawable/ic_person_add_black_24dp"
+        android:title="@string/menu_add_person"
+        android:visible="false"
+        app:showAsAction="always" />
+
+    <item
+        android:id="@+id/call"
+        android:icon="@drawable/ic_call_white_24dp"
+        android:title="@string/menu_call"
+        android:visible="false"
+        app:showAsAction="always" />
+
+    <item
+        android:id="@+id/info"
+        android:icon="@drawable/ic_more_vert_black_24dp"
+        android:title="@string/menu_info"
+        android:visible="false"
+        app:showAsAction="always" />
+
+    <item
+        android:id="@+id/details"
+        android:icon="@drawable/ic_info_black_24dp"
+        android:title="@string/compose_menu_copy"
+        android:visible="false"
+        app:showAsAction="ifRoom" />
+
+    <item
+        android:id="@+id/delete"
+        android:icon="@drawable/ic_delete_white_24dp"
+        android:title="@string/compose_menu_delete"
+        android:visible="false"
+        app:showAsAction="ifRoom" />
+
+    <item
+        android:id="@+id/copy"
+        android:icon="@drawable/ic_content_copy_black_24dp"
+        android:title="@string/compose_menu_copy"
+        android:visible="false"
+        app:showAsAction="ifRoom" />
+
+    <item
+        android:id="@+id/forward"
+        android:icon="@drawable/ic_forward_black_24dp"
+        android:title="@string/compose_menu_forward"
+        android:visible="false"
+        app:showAsAction="ifRoom" />
+
+    <item
+        android:id="@+id/speech"
+        android:icon="@drawable/ic_speech_black_24dp"
+        android:title="@string/compose_menu_speech"
+        android:visible="false"
+        app:showAsAction="ifRoom" />
+
+    <item
+        android:id="@+id/previous"
+        android:icon="@drawable/ic_keyboard_arrow_up_black_24dp"
+        android:title="@string/compose_menu_previous"
+        android:visible="false"
+        app:showAsAction="always" />
+
+    <item
+        android:id="@+id/next"
+        android:icon="@drawable/ic_keyboard_arrow_down_black_24dp"
+        android:title="@string/compose_menu_next"
+        android:visible="false"
+        app:showAsAction="always" />
+
+    <item
+        android:id="@+id/clear"
+        android:icon="@drawable/ic_clear_black_24dp"
+        android:title="@string/compose_menu_clear"
+        android:visible="false"
+        app:showAsAction="always" />
+
 </menu>
\ No newline at end of file
diff --git a/presentation/src/main/res/menu/gallery.xml b/presentation/src/main/res/menu/gallery.xml
index 9cd668b49..7fd23acbd 100644
--- a/presentation/src/main/res/menu/gallery.xml
+++ b/presentation/src/main/res/menu/gallery.xml
@@ -1,30 +1,30 @@
-<?xml version="1.0" encoding="utf-8"?>
-<!--
-  ~ Copyright (C) 2019 Moez Bhatti <moez.bhatti@gmail.com>
-  ~
-  ~ This file is part of QKSMS.
-  ~
-  ~ QKSMS is free software: you can redistribute it and/or modify
-  ~ it under the terms of the GNU General Public License as published by
-  ~ the Free Software Foundation, either version 3 of the License, or
-  ~ (at your option) any later version.
-  ~
-  ~ QKSMS is distributed in the hope that it will be useful,
-  ~ but WITHOUT ANY WARRANTY; without even the implied warranty of
-  ~ MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
-  ~ GNU General Public License for more details.
-  ~
-  ~ You should have received a copy of the GNU General Public License
-  ~ along with QKSMS.  If not, see <http://www.gnu.org/licenses/>.
-  -->
-<menu xmlns:android="http://schemas.android.com/apk/res/android">
-
-    <item
-        android:id="@+id/save"
-        android:title="@string/menu_save" />
-
-    <item
-        android:id="@+id/share"
-        android:title="@string/menu_share" />
-
-</menu>
+<?xml version="1.0" encoding="utf-8"?>
+<!--
+  ~ Copyright (C) 2019 Moez Bhatti <moez.bhatti@gmail.com>
+  ~
+  ~ This file is part of QKSMS.
+  ~
+  ~ QKSMS is free software: you can redistribute it and/or modify
+  ~ it under the terms of the GNU General Public License as published by
+  ~ the Free Software Foundation, either version 3 of the License, or
+  ~ (at your option) any later version.
+  ~
+  ~ QKSMS is distributed in the hope that it will be useful,
+  ~ but WITHOUT ANY WARRANTY; without even the implied warranty of
+  ~ MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+  ~ GNU General Public License for more details.
+  ~
+  ~ You should have received a copy of the GNU General Public License
+  ~ along with QKSMS.  If not, see <http://www.gnu.org/licenses/>.
+  -->
+<menu xmlns:android="http://schemas.android.com/apk/res/android">
+
+    <item
+        android:id="@+id/save"
+        android:title="@string/menu_save" />
+
+    <item
+        android:id="@+id/share"
+        android:title="@string/menu_share" />
+
+</menu>
diff --git a/presentation/src/main/res/menu/main.xml b/presentation/src/main/res/menu/main.xml
index b8f22b0f3..406d22639 100644
--- a/presentation/src/main/res/menu/main.xml
+++ b/presentation/src/main/res/menu/main.xml
@@ -1,86 +1,86 @@
-<?xml version="1.0" encoding="utf-8"?>
-<!--
-  ~ Copyright (C) 2019 Moez Bhatti <moez.bhatti@gmail.com>
-  ~
-  ~ This file is part of QKSMS.
-  ~
-  ~ QKSMS is free software: you can redistribute it and/or modify
-  ~ it under the terms of the GNU General Public License as published by
-  ~ the Free Software Foundation, either version 3 of the License, or
-  ~ (at your option) any later version.
-  ~
-  ~ QKSMS is distributed in the hope that it will be useful,
-  ~ but WITHOUT ANY WARRANTY; without even the implied warranty of
-  ~ MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
-  ~ GNU General Public License for more details.
-  ~
-  ~ You should have received a copy of the GNU General Public License
-  ~ along with QKSMS.  If not, see <http://www.gnu.org/licenses/>.
-  -->
-<menu xmlns:android="http://schemas.android.com/apk/res/android"
-    xmlns:app="http://schemas.android.com/apk/res-auto">
-
-    <item
-        android:id="@+id/archive"
-        android:icon="@drawable/ic_archive_white_24dp"
-        android:title="@string/main_menu_archive"
-        android:visible="false"
-        app:showAsAction="ifRoom" />
-
-    <item
-        android:id="@+id/unarchive"
-        android:icon="@drawable/ic_inbox_black_24dp"
-        android:title="@string/main_menu_unarchive"
-        android:visible="false"
-        app:showAsAction="ifRoom" />
-
-    <item
-        android:id="@+id/delete"
-        android:icon="@drawable/ic_delete_white_24dp"
-        android:title="@string/main_menu_delete"
-        android:visible="false"
-        app:showAsAction="ifRoom" />
-
-    <item
-        android:id="@+id/add"
-        android:icon="@drawable/ic_person_add_black_24dp"
-        android:title="@string/main_menu_add_contact"
-        android:visible="false"
-        app:showAsAction="ifRoom" />
-
-    <item
-        android:id="@+id/pin"
-        android:icon="@drawable/ic_baseline_push_pin_24"
-        android:title="@string/main_menu_pin"
-        android:visible="false"
-        app:showAsAction="ifRoom" />
-
-    <item
-        android:id="@+id/unpin"
-        android:icon="@drawable/ic_baseline_push_pin_24"
-        android:title="@string/main_menu_unpin"
-        android:visible="false"
-        app:showAsAction="ifRoom" />
-
-    <item
-        android:id="@+id/read"
-        android:icon="@drawable/ic_drafts_black_24dp"
-        android:title="@string/main_menu_read"
-        android:visible="false"
-        app:showAsAction="ifRoom" />
-
-    <item
-        android:id="@+id/unread"
-        android:icon="@drawable/ic_markunread_black_24dp"
-        android:title="@string/main_menu_unread"
-        android:visible="false"
-        app:showAsAction="ifRoom" />
-
-    <item
-        android:id="@+id/block"
-        android:icon="@drawable/ic_block_white_24dp"
-        android:title="@string/main_menu_block"
-        android:visible="false"
-        app:showAsAction="ifRoom" />
-
+<?xml version="1.0" encoding="utf-8"?>
+<!--
+  ~ Copyright (C) 2019 Moez Bhatti <moez.bhatti@gmail.com>
+  ~
+  ~ This file is part of QKSMS.
+  ~
+  ~ QKSMS is free software: you can redistribute it and/or modify
+  ~ it under the terms of the GNU General Public License as published by
+  ~ the Free Software Foundation, either version 3 of the License, or
+  ~ (at your option) any later version.
+  ~
+  ~ QKSMS is distributed in the hope that it will be useful,
+  ~ but WITHOUT ANY WARRANTY; without even the implied warranty of
+  ~ MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+  ~ GNU General Public License for more details.
+  ~
+  ~ You should have received a copy of the GNU General Public License
+  ~ along with QKSMS.  If not, see <http://www.gnu.org/licenses/>.
+  -->
+<menu xmlns:android="http://schemas.android.com/apk/res/android"
+    xmlns:app="http://schemas.android.com/apk/res-auto">
+
+    <item
+        android:id="@+id/archive"
+        android:icon="@drawable/ic_archive_white_24dp"
+        android:title="@string/main_menu_archive"
+        android:visible="false"
+        app:showAsAction="ifRoom" />
+
+    <item
+        android:id="@+id/unarchive"
+        android:icon="@drawable/ic_inbox_black_24dp"
+        android:title="@string/main_menu_unarchive"
+        android:visible="false"
+        app:showAsAction="ifRoom" />
+
+    <item
+        android:id="@+id/delete"
+        android:icon="@drawable/ic_delete_white_24dp"
+        android:title="@string/main_menu_delete"
+        android:visible="false"
+        app:showAsAction="ifRoom" />
+
+    <item
+        android:id="@+id/add"
+        android:icon="@drawable/ic_person_add_black_24dp"
+        android:title="@string/main_menu_add_contact"
+        android:visible="false"
+        app:showAsAction="ifRoom" />
+
+    <item
+        android:id="@+id/pin"
+        android:icon="@drawable/ic_baseline_push_pin_24"
+        android:title="@string/main_menu_pin"
+        android:visible="false"
+        app:showAsAction="ifRoom" />
+
+    <item
+        android:id="@+id/unpin"
+        android:icon="@drawable/ic_baseline_push_pin_24"
+        android:title="@string/main_menu_unpin"
+        android:visible="false"
+        app:showAsAction="ifRoom" />
+
+    <item
+        android:id="@+id/read"
+        android:icon="@drawable/ic_drafts_black_24dp"
+        android:title="@string/main_menu_read"
+        android:visible="false"
+        app:showAsAction="ifRoom" />
+
+    <item
+        android:id="@+id/unread"
+        android:icon="@drawable/ic_markunread_black_24dp"
+        android:title="@string/main_menu_unread"
+        android:visible="false"
+        app:showAsAction="ifRoom" />
+
+    <item
+        android:id="@+id/block"
+        android:icon="@drawable/ic_block_white_24dp"
+        android:title="@string/main_menu_block"
+        android:visible="false"
+        app:showAsAction="ifRoom" />
+
 </menu>
\ No newline at end of file
diff --git a/presentation/src/main/res/menu/qkreply.xml b/presentation/src/main/res/menu/qkreply.xml
index c8777c861..4f31493f9 100644
--- a/presentation/src/main/res/menu/qkreply.xml
+++ b/presentation/src/main/res/menu/qkreply.xml
@@ -1,54 +1,54 @@
-<?xml version="1.0" encoding="utf-8"?>
-<!--
-  ~ Copyright (C) 2019 Moez Bhatti <moez.bhatti@gmail.com>
-  ~
-  ~ This file is part of QKSMS.
-  ~
-  ~ QKSMS is free software: you can redistribute it and/or modify
-  ~ it under the terms of the GNU General Public License as published by
-  ~ the Free Software Foundation, either version 3 of the License, or
-  ~ (at your option) any later version.
-  ~
-  ~ QKSMS is distributed in the hope that it will be useful,
-  ~ but WITHOUT ANY WARRANTY; without even the implied warranty of
-  ~ MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
-  ~ GNU General Public License for more details.
-  ~
-  ~ You should have received a copy of the GNU General Public License
-  ~ along with QKSMS.  If not, see <http://www.gnu.org/licenses/>.
-  -->
-<menu xmlns:android="http://schemas.android.com/apk/res/android"
-    xmlns:app="http://schemas.android.com/apk/res-auto">
-
-    <item
-        android:id="@+id/read"
-        android:icon="@drawable/ic_check_white_24dp"
-        android:title="@string/qkreply_menu_read"
-        app:showAsAction="ifRoom" />
-
-    <item
-        android:id="@+id/expand"
-        android:icon="@drawable/ic_unfold_more_black_24dp"
-        android:title="@string/qkreply_menu_expand"
-        app:showAsAction="ifRoom" />
-
-    <item
-        android:id="@+id/collapse"
-        android:icon="@drawable/ic_unfold_less_black_24dp"
-        android:title="@string/qkreply_menu_collapse"
-        android:visible="false"
-        app:showAsAction="ifRoom" />
-
-    <item
-        android:id="@+id/call"
-        android:title="@string/qkreply_menu_call" />
-
-    <item
-        android:id="@+id/delete"
-        android:title="@string/qkreply_menu_delete" />
-
-    <item
-        android:id="@+id/view"
-        android:title="@string/qkreply_menu_view" />
-
+<?xml version="1.0" encoding="utf-8"?>
+<!--
+  ~ Copyright (C) 2019 Moez Bhatti <moez.bhatti@gmail.com>
+  ~
+  ~ This file is part of QKSMS.
+  ~
+  ~ QKSMS is free software: you can redistribute it and/or modify
+  ~ it under the terms of the GNU General Public License as published by
+  ~ the Free Software Foundation, either version 3 of the License, or
+  ~ (at your option) any later version.
+  ~
+  ~ QKSMS is distributed in the hope that it will be useful,
+  ~ but WITHOUT ANY WARRANTY; without even the implied warranty of
+  ~ MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+  ~ GNU General Public License for more details.
+  ~
+  ~ You should have received a copy of the GNU General Public License
+  ~ along with QKSMS.  If not, see <http://www.gnu.org/licenses/>.
+  -->
+<menu xmlns:android="http://schemas.android.com/apk/res/android"
+    xmlns:app="http://schemas.android.com/apk/res-auto">
+
+    <item
+        android:id="@+id/read"
+        android:icon="@drawable/ic_check_white_24dp"
+        android:title="@string/qkreply_menu_read"
+        app:showAsAction="ifRoom" />
+
+    <item
+        android:id="@+id/expand"
+        android:icon="@drawable/ic_unfold_more_black_24dp"
+        android:title="@string/qkreply_menu_expand"
+        app:showAsAction="ifRoom" />
+
+    <item
+        android:id="@+id/collapse"
+        android:icon="@drawable/ic_unfold_less_black_24dp"
+        android:title="@string/qkreply_menu_collapse"
+        android:visible="false"
+        app:showAsAction="ifRoom" />
+
+    <item
+        android:id="@+id/call"
+        android:title="@string/qkreply_menu_call" />
+
+    <item
+        android:id="@+id/delete"
+        android:title="@string/qkreply_menu_delete" />
+
+    <item
+        android:id="@+id/view"
+        android:title="@string/qkreply_menu_view" />
+
 </menu>
\ No newline at end of file
diff --git a/presentation/src/main/res/mipmap-xxxhdpi-v26/ic_launcher.xml b/presentation/src/main/res/mipmap-xxxhdpi-v26/ic_launcher.xml
index 866932f2d..cd89101f4 100644
--- a/presentation/src/main/res/mipmap-xxxhdpi-v26/ic_launcher.xml
+++ b/presentation/src/main/res/mipmap-xxxhdpi-v26/ic_launcher.xml
@@ -1,23 +1,23 @@
-<?xml version="1.0" encoding="utf-8"?>
-<!--
-  ~ Copyright (C) 2019 Moez Bhatti <moez.bhatti@gmail.com>
-  ~
-  ~ This file is part of QKSMS.
-  ~
-  ~ QKSMS is free software: you can redistribute it and/or modify
-  ~ it under the terms of the GNU General Public License as published by
-  ~ the Free Software Foundation, either version 3 of the License, or
-  ~ (at your option) any later version.
-  ~
-  ~ QKSMS is distributed in the hope that it will be useful,
-  ~ but WITHOUT ANY WARRANTY; without even the implied warranty of
-  ~ MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
-  ~ GNU General Public License for more details.
-  ~
-  ~ You should have received a copy of the GNU General Public License
-  ~ along with QKSMS.  If not, see <http://www.gnu.org/licenses/>.
-  -->
-<adaptive-icon xmlns:android="http://schemas.android.com/apk/res/android">
-    <background android:drawable="@mipmap/ic_launcher_background" />
-    <foreground android:drawable="@mipmap/ic_launcher_foreground" />
+<?xml version="1.0" encoding="utf-8"?>
+<!--
+  ~ Copyright (C) 2019 Moez Bhatti <moez.bhatti@gmail.com>
+  ~
+  ~ This file is part of QKSMS.
+  ~
+  ~ QKSMS is free software: you can redistribute it and/or modify
+  ~ it under the terms of the GNU General Public License as published by
+  ~ the Free Software Foundation, either version 3 of the License, or
+  ~ (at your option) any later version.
+  ~
+  ~ QKSMS is distributed in the hope that it will be useful,
+  ~ but WITHOUT ANY WARRANTY; without even the implied warranty of
+  ~ MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+  ~ GNU General Public License for more details.
+  ~
+  ~ You should have received a copy of the GNU General Public License
+  ~ along with QKSMS.  If not, see <http://www.gnu.org/licenses/>.
+  -->
+<adaptive-icon xmlns:android="http://schemas.android.com/apk/res/android">
+    <background android:drawable="@mipmap/ic_launcher_background" />
+    <foreground android:drawable="@mipmap/ic_launcher_foreground" />
 </adaptive-icon>
\ No newline at end of file
diff --git a/presentation/src/main/res/values-ar/strings.xml b/presentation/src/main/res/values-ar/strings.xml
index d545c94d3..c183ed4ca 100644
--- a/presentation/src/main/res/values-ar/strings.xml
+++ b/presentation/src/main/res/values-ar/strings.xml
@@ -1,436 +1,436 @@
-<?xml version="1.0" encoding="utf-8"?>
-<!--
-  ~ Copyright (C) 2019 Moez Bhatti <moez.bhatti@gmail.com>
-  ~
-  ~ This file is part of QKSMS.
-  ~
-  ~ QKSMS is free software: you can redistribute it and/or modify
-  ~ it under the terms of the GNU General Public License as published by
-  ~ the Free Software Foundation, either version 3 of the License, or
-  ~ (at your option) any later version.
-  ~
-  ~ QKSMS is distributed in the hope that it will be useful,
-  ~ but WITHOUT ANY WARRANTY; without even the implied warranty of
-  ~ MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
-  ~ GNU General Public License for more details.
-  ~
-  ~ You should have received a copy of the GNU General Public License
-  ~ along with QKSMS.  If not, see <http://www.gnu.org/licenses/>.
-  -->
-<resources>
-    <string name="shortcut_compose_long_label">محادثة جديدة</string>
-    <string name="shortcut_compose_short_label">ألِّف</string>
-    <string name="shortcut_compose_disabled_message">الاختصار معطَّل</string>
-    <string name="title_archived">أُرشفت</string>
-    <string name="title_settings">الإعدادات</string>
-    <string name="title_notification_prefs">الإشعارات</string>
-    <string name="title_theme">السمة</string>
-    <string name="title_conversations">البحث في علبة الوارد&#8230;</string>
-    <string name="title_compose">أكتب اسماً أو رقماً</string>
-    <string name="setup_skip">تخطي</string>
-    <string name="setup_next">متابعة</string>
-    <string name="menu_add_person">اضافة شخص</string>
-    <string name="menu_call">اتصال</string>
-    <string name="menu_info">تفاصيل</string>
-    <string name="menu_save">حفظ إلى المعرض</string>
-    <string name="menu_share">مشاركة</string>
-    <string name="main_drawer_open_cd">فتح درج التنقل</string>
-    <string name="main_title_selected">%d محددة</string>
-    <string name="main_menu_clear">مسح</string>
-    <string name="main_menu_archive">أرشفة</string>
-    <string name="main_menu_unarchive">إلغاء الأرشفة</string>
-    <string name="main_menu_delete">حذف</string>
-    <string name="main_menu_add_contact">اضافة الى القائمة</string>
-    <string name="main_menu_pin">التثبيت فوق</string>
-    <string name="main_menu_unpin">إلغاء التثبيت</string>
-    <string name="main_menu_read">Mark read</string>
-    <string name="main_menu_unread">Mark unread</string>
-    <string name="main_menu_block">حظر</string>
-    <string name="main_syncing">مزامنة الرسائل&#8230;</string>
-    <string name="main_sender_you">أنت: %s</string>
-    <string name="main_draft">مسودة</string>
-    <string name="main_message_results_title">النتائج في الرسائل</string>
-    <string name="main_message_results">%d رسائل</string>
-    <string name="inbox_empty_text">ستظهر المحادثات الخاصة بك هنا</string>
-    <string name="inbox_search_empty_text">لا نتائج</string>
-    <string name="archived_empty_text">ستظهر المحادثات المؤرشفة الخاصة بك هنا</string>
-    <string name="main_fab_cd">بدء محادثة جديدة</string>
-    <string name="main_default_sms_title">ستحب المراسلة ثانية</string>
-    <string name="main_default_sms_message">جعل QKSMS تطبيق الرسائل النصية الافتراضي لديك</string>
-    <string name="main_default_sms_change">تغيير</string>
-    <string name="main_permission_required">الإذن مطلوب</string>
-    <string name="main_permission_sms">QKSMS يحتاج إلى إذن لإرسال وعرض الرسائل النصية</string>
-    <string name="main_permission_contacts">QKSMS يحتاج إلى إذن لعرض جهات الاتصال لديك</string>
-    <string name="main_permission_allow">سماح</string>
-    <string name="drawer_inbox">صندوق الوارد</string>
-    <string name="drawer_archived">المؤرشفة</string>
-    <string name="drawer_scheduled">المجدولة</string>
-    <string name="drawer_blocking">الحظر</string>
-    <string name="drawer_more">المزيد</string>
-    <string name="drawer_settings">الإعدادات</string>
-    <string name="drawer_help">المساعدة والتواصل مع المبرمج</string>
-    <string name="drawer_invite">دعوة الأصدقاء</string>
-    <string name="drawer_plus_banner_summary">فتح ميزات رائعة جديدة ، و دعم التطوير</string>
-    <string name="rate_title">هل QKSMS ممتع ؟</string>
-    <string name="rate_summary">أظهر محبتك وقيّمنا على متجر Google Play!</string>
-    <string name="rate_okay">حسناً</string>
-    <string name="rate_dismiss">استبعاد</string>
-    <string name="dialog_delete_title">حذف</string>
-    <plurals name="dialog_delete_message">
-        <item quantity="zero">هل أنت متأكد من رغبتك حذف %d محادثة؟</item>
-        <item quantity="one">هل أنت متأكد من رغبتك حذف %d محادثة؟</item>
-        <item quantity="two">هل أنت متأكد من رغبتك حذف المحادثتين؟</item>
-        <item quantity="few">هل أنت متأكد من رغبتك حذف %d محادثات؟</item>
-        <item quantity="many">هل أنت متأكد من رغبتك حذف %d محادثات؟</item>
-        <item quantity="other">هل أنت متأكد من رغبتك حذف %d محادثات؟</item>
-    </plurals>
-    <string-array name="message_options">
-        <item>نسخ النص</item>
-        <item>إعادة توجيه</item>
-        <item>حذف</item>
-    </string-array>
-    <string name="compose_number_picker_title">اختر رقم الهاتف</string>
-    <string name="compose_number_picker_default">%s ∙ Default</string>
-    <string name="compose_number_picker_once">فقط واحد</string>
-    <string name="compose_number_picker_always">دائما</string>
-    <string name="compose_title_selected">%d مختارة</string>
-    <string name="compose_subtitle_results">%1$d من %2$d النتائج</string>
-    <string name="compose_send_group_title">إرسال رسالة جماعية</string>
-    <string name="compose_send_group_summary">المتلقون والردود سيكونان مرئيين للجميع</string>
-    <string name="compose_messages_empty">هذا أول المحادثة. قل شيئا لطيفاً!</string>
-    <string name="compose_vcard_label">بطاقة جهة الاتصال</string>
-    <string name="compose_scheduled_for">مجدولة لـ</string>
-    <string name="compose_scheduled_future">الوقت المحدّد يجب أن يكون مستقبلاً!</string>
-    <string name="compose_scheduled_plus">يلزمك فك QKSMS+ لاستخدام التراسل المجدول</string>
-    <string name="compose_scheduled_toast">أضيفت إلى الرسائل المجدولة</string>
-    <string name="compose_hint">كتابة رسالة&#8230;</string>
-    <string name="compose_menu_copy">نسخ النص</string>
-    <string name="compose_menu_forward">إعادة توجيه</string>
-    <string name="compose_menu_delete">حذف</string>
-    <string name="compose_menu_previous">السابقة</string>
-    <string name="compose_menu_next">التالية</string>
-    <string name="compose_menu_clear">مسح</string>
-    <string name="compose_details_title">تفاصيل الرسالة</string>
-    <string name="compose_details_type">النوع: %s</string>
-    <string name="compose_details_from">من: %s</string>
-    <string name="compose_details_to">إلى: %s</string>
-    <string name="compose_details_subject">الموضوع: %s</string>
-    <string name="compose_details_priority">الأولوية: %s</string>
-    <string name="compose_details_size">الحجم: %s</string>
-    <string name="compose_details_sent">أرسلت: %s</string>
-    <string name="compose_details_received">استلمت: %s</string>
-    <string name="compose_details_delivered">التسليم: %s</string>
-    <string name="compose_details_error_code">رمز الخطأ: %d</string>
-    <string name="compose_attach_cd">إضافة مرفق</string>
-    <string name="compose_gallery_cd">إرفاق صورة</string>
-    <string name="compose_camera_cd">التقاط صورة</string>
-    <string name="compose_schedule_cd">جدوِل الرسالة</string>
-    <string name="compose_contact_cd">إرفاق جهة اتصال</string>
-    <string name="compose_contact_error">خطأ في قراءة جهة الاتصال</string>
-    <!-- Example: SIM 1 (Verizon) selected-->
-    <string name="compose_sim_changed_toast">SIM %1$d (%2$s) selected</string>
-    <string name="compose_sim_cd">%s محددة، غيّر شريحة SIM</string>
-    <string name="compose_send_cd">إرسال الرسالة</string>
-    <string name="message_status_sending">الإرسال جارٍ&#8230;</string>
-    <string name="message_status_delivered">تم إرسال %s</string>
-    <string name="message_status_failed">فشل الإرسال. إلمس لإعادة المحاولة</string>
-    <string name="info_title">التفاصيل</string>
-    <string name="info_copied_address">تم نسخ العنوان</string>
-    <string name="info_name">عنوان المحادثة</string>
-    <string name="info_notifications">الإشعارات</string>
-    <string name="info_theme">السمة</string>
-    <string name="info_archive">الأرشيف</string>
-    <string name="info_unarchive">إلغاء الأرشفة</string>
-    <string name="info_block">حظر</string>
-    <string name="info_unblock">إلغاء الحظر</string>
-    <string name="info_delete">حذف المحادثة</string>
-    <string name="gallery_error">تعذر تحميل الوسائط</string>
-    <string name="gallery_toast_saved">تم الحفظ في المعرض</string>
-    <string name="backup_title">النسخ الاحتياطي والاستعادة</string>
-    <string name="backup_backing_up">النسخ الاحتياطي للرسائل</string>
-    <string name="backup_restoring">استعادة من النسخة الاحتياطية</string>
-    <string name="backup_last">آخر نسخ احتياطي</string>
-    <string name="backup_loading">تحميل&#8230;</string>
-    <string name="backup_never">أبداً</string>
-    <string name="backup_restore_title">استعادة</string>
-    <string name="backup_restore_summary">اختر نسخة احتياطية</string>
-    <string name="backup_restore_error_plus">يرجى إلغاء تأمين QKSMS+ للتمكن من استخدام النسخ الاحتياطي والاستعادة</string>
-    <string name="backup_restore_error_backup">النسخ الاحتياطي قيد التقدم&#8230;</string>
-    <string name="backup_restore_error_restore">الاستعادة قيد التقدُّم&#8230;</string>
-    <string name="backup_restore_confirm_title">الاستعادة من النسخ الاحتياطي</string>
-    <string name="backup_restore_confirm_message">هل أنت متأكد من رغبتك استرجاع رسائلك من هذه النسخة الاحتياطية؟</string>
-    <string name="backup_restore_stop_title">إيقاف الاستعادة</string>
-    <string name="backup_restore_stop_message">الرسائل التي تمت استعادتها ستبقى في جهازك</string>
-    <string name="backup_restore_dialog_title">النسخ الاحتياطية</string>
-    <string name="backup_restore_dialog_empty">لا توجد أي نسخة احتياطية</string>
-    <plurals name="backup_message_count">
-        <item quantity="zero">لا رسائل</item>
-        <item quantity="one">رسالة</item>
-        <item quantity="two">رسالتان</item>
-        <item quantity="few">%d رسائل</item>
-        <item quantity="many">%d رسائل</item>
-        <item quantity="other">%d رسائل</item>
-    </plurals>
-    <string name="backup_disclaimer">النسخ الاحتياطي والاستعادة متاحة الآن فقط للرسائل النصّية. دعم رسائل الوسائط والرسائل المجدولة قادم قريباً!</string>
-    <string name="backup_now">النسخ الاحتياطي الآن</string>
-    <string name="backup_progress_parsing">توزيع النسخ الاحتياطي&#8230;</string>
-    <string name="backup_progress_running">%d/%d رسائل</string>
-    <string name="backup_progress_saving">جارٍ حفظُ النسخة الاحتياطية&#8230;</string>
-    <string name="backup_progress_syncing">مزامنة الرسائل جارية&#8230;</string>
-    <string name="backup_progress_finished">تم!</string>
-    <string name="backup_notification_channel_name">النسخ الاحتياطي والاستعادة</string>
-    <string name="scheduled_title">مجدولة</string>
-    <string name="scheduled_empty_description">الإرسال الآلي لأي رسالة في الوقت الذي ترغب بالضبط</string>
-    <string name="scheduled_empty_message_1">مهلاً..متى عيد ميلادك؟</string>
-    <string name="scheduled_empty_message_2">إنه في 23 ديسمبر</string>
-    <string name="scheduled_empty_message_3">عيد ميلاد سعيد! أنظر ما أجمل صديقك QKSMS ، يتذكر عيد ميلادك</string>
-    <!--&#x200A; is a special character required at the end of this string to fix it's formatting in the app -->
-    <string name="scheduled_empty_message_3_timestamp">الإرسال في 23 ديسمبر</string>
-    <string name="scheduled_compose_cd">جدولة رسالة</string>
-    <string name="scheduled_options_title">الرسالة المجدولة</string>
-    <string-array name="scheduled_options">
-        <item>أرسل الآن</item>
-        <item>نسخ النص</item>
-        <item>حذف</item>
-    </string-array>
-    <string name="settings_category_appearance">المظهر</string>
-    <string name="settings_category_general">عام</string>
-    <string name="settings_category_qkreply">رد QK</string>
-    <string name="settings_theme_title">السمة</string>
-    <string name="settings_night_title">الوضع الليلي</string>
-    <string name="settings_black_title">وضع ليلي بسوادٍ حالك</string>
-    <string name="settings_night_start_title">وقت البدء</string>
-    <string name="settings_night_end_title">وقت الانتهاء</string>
-    <string name="settings_automatic_colors_title">Automatic contact colors</string>
-    <string name="settings_text_size_title">حجم الخط</string>
-    <string name="settings_system_font_title">استخدم خط النظام</string>
-    <string name="settings_auto_emoji_title">إيموجي تلقائية</string>
-    <string name="settings_notifications_title">الإشعارات</string>
-    <string name="settings_notifications_o_summary">أنقر للتخصيص</string>
-    <string name="settings_notification_actions_title">الاجراءات</string>
-    <string name="settings_notification_action_1">الزر 1</string>
-    <string name="settings_notification_action_2">الزر 2</string>
-    <string name="settings_notification_action_3">الزر 3</string>
-    <string name="settings_notification_previews_title">معاينات الإشعارات</string>
-    <string name="settings_notification_wake_title">فتح الشاشة</string>
-    <string name="settings_vibration_title">الاهتزاز</string>
-    <string name="settings_ringtone_title">الصوت</string>
-    <string name="settings_ringtone_none">بدون نغمة </string>
-    <string name="settings_qkreply_title">رد QK</string>
-    <string name="settings_qkreply_summary">نافذة منبثقة للرسائل الجديدة</string>
-    <string name="settings_qkreply_tap_dismiss_title">إلمس للاستبعاد</string>
-    <string name="settings_qkreply_tap_dismiss_summary">إلمس خارج المنبثقة لإغلاقها</string>
-    <string name="settings_delayed_title">الإرسال المؤخَّر</string>
-    <string name="settings_swipe_actions">إجراءات السَّحْب</string>
-    <string name="settings_swipe_actions_summary">ضبط إجراءات السحب بالنسبة للمحادثات</string>
-    <string name="settings_swipe_actions_right">سحب لليمين</string>
-    <string name="settings_swipe_actions_left">سحب لليسار</string>
-    <string name="settings_swipe_actions_change">تغيير</string>
-    <string-array name="settings_swipe_actions">
-        <item>لاشيء</item>
-        <item>أرشفة</item>
-        <item>حذف</item>
-        <item>Block</item>
-        <item>Call</item>
-        <item>Mark read</item>
-        <item>Mark unread</item>
-    </string-array>
-    <string name="settings_delivery_title">تأكيدات الإستلام</string>
-    <string name="settings_delivery_summary">تأكيد أنه تم إرسال الرسائل بنجاح</string>
-    <string name="settings_signature_title">توقيع</string>
-    <string name="settings_signature_summary">Add a signature to the end of your messages</string>
-    <string name="settings_unicode_title">نزع حركات التشكيل</string>
-    <string name="settings_unicode_summary">حذف حركات التشكيل من المحارف في الرسائل النصية الصادرة</string>
-    <string name="settings_mobile_title">أرقام الهواتف النقالة فقط</string>
-    <string name="settings_mobile_summary">عند إنشاء رسالة، أظهر فقط أرقام الهواتف النقالة</string>
-    <string name="settings_auto_delete">Delete old messages automatically</string>
-    <string name="settings_auto_delete_dialog_message">Messages will be deleted after the specified number of days</string>
-    <string name="settings_auto_delete_dialog_hint">Number of days</string>
-    <string name="settings_auto_delete_never">Never</string>
-    <string name="settings_auto_delete_warning">Delete old messages automatically?</string>
-    <string name="settings_auto_delete_warning_message">If you proceed, %1$d messages will be deleted now</string>
-    <plurals name="settings_auto_delete_summary">
-        <item quantity="zero">After %d days</item>
-        <item quantity="one">After 1 day</item>
-        <item quantity="two">After %d days</item>
-        <item quantity="few">After %d days</item>
-        <item quantity="many">After %d days</item>
-        <item quantity="other">After %d days</item>
-    </plurals>
-    <string name="settings_long_as_mms_title">Send long messages as MMS</string>
-    <string name="settings_long_as_mms_summary">If your longer text messages are failing to send, or sending in the wrong order, you can send them as MMS messages instead. Additional charges may apply</string>
-    <string name="settings_mms_size_title">الضغط التلقائي لمرفقات رسائل الوسائط</string>
-    <string name="settings_sync_title">مزامنة الرسائل</string>
-    <string name="settings_sync_summary">إعادة مزامنة رسائلك مع قاعدة البيانات الأصلية للرسائل في النظام</string>
-    <string name="settings_about_title">حول QKSMS</string>
-    <string name="settings_version">النسخة %s</string>
-    <string name="settings_logging_enabled">تسجيل التصحيح مفعَّل</string>
-    <string name="settings_logging_disabled">تسجيل التصحيح معطَّل</string>
-    <string name="settings_delay_duration_hint">أدخل المدة (ثوان)</string>
-    <string name="blocking_title">المحظورات</string>
-    <string name="blocking_drop_title">Drop messages</string>
-    <string name="blocking_drop_summary">Drop incoming messages from blocked senders instead of hiding them</string>
-    <string name="blocking_conversations">المحادثات المحظورة</string>
-    <string name="blocking_manager_title">مدير المحظورات</string>
-    <string name="blocking_manager_qksms_title">QKSMS</string>
-    <string name="blocking_manager_qksms_summary">Built-in blocking functionality in QKSMS</string>
-    <string name="blocking_manager_call_control_summary">Automatically filter your calls and messages in one convenient place! Community IQ™ allows you to prevent unwanted messages from community known spammers</string>
-    <string name="blocking_manager_sia_summary">الترشيح التلقائي للرسائل من الأرقام غير المرغوبة باستخدام تطبيق \"Should I Answer\"</string>
-    <string name="blocking_manager_copy_title">نسخ الارقام المحظورة</string>
-    <string name="blocking_manager_copy_summary">Continue to %s and copy over your existing blocked numbers</string>
-    <string name="blocked_numbers_title">الارقام المحظورة</string>
-    <string name="blocked_numbers_empty">ارقامك المحظورة سوف تظهر هنا</string>
-    <string name="blocked_numbers_add_cd">حظر رقم جديد</string>
-    <string name="blocked_numbers_dialog_title">حظر الرسائل من</string>
-    <string name="blocked_numbers_dialog_hint">رقم الهاتف</string>
-    <string name="blocked_numbers_dialog_block">حظر</string>
-    <string name="blocked_messages_title">الرسائل المحظورة</string>
-    <string name="blocked_messages_empty">رسائلك المحظورة سوف تظهر هنا</string>
-    <string name="blocking_block_title">حظر</string>
-    <string name="blocking_unblock_title">الغاء الحظر</string>
-    <plurals name="blocking_block_external">
-        <item quantity="zero">الاستمرار الى %s وحظر هذا الرقم</item>
-        <item quantity="one">الاستمرار الى %s وحظر هذا الرقم</item>
-        <item quantity="two">الاستمرار الى %s واتاحة هذا الرقم</item>
-        <item quantity="few">الاستمرار الى %s واتاحة هذا الرقم</item>
-        <item quantity="many">الاستمرار الى %s واتاحة هذا الرقم</item>
-        <item quantity="other">الاستمرار الى %s واتاحة هذا الرقم</item>
-    </plurals>
-    <plurals name="blocking_unblock_external">
-        <item quantity="zero">الاستمرار الى %s واتاحة هذا الرقم</item>
-        <item quantity="one">الاستمرار الى %s واتاحة هذا الرقم</item>
-        <item quantity="two">الاستمرار الى %s واتاحة هذا الرقم</item>
-        <item quantity="few">الاستمرار الى %s واتاحة هذا الرقم</item>
-        <item quantity="many">الاستمرار الى %s واتاحة هذا الرقم</item>
-        <item quantity="other">الاستمرار الى %s واتاحة هذا الرقم</item>
-    </plurals>
-    <string name="about_title">حول</string>
-    <string name="about_version_title">النسخة</string>
-    <string name="about_developer_title">المطوّر</string>
-    <string name="about_source_title">الشفرة المصدر</string>
-    <string name="about_changelog_title">سجل التغييرات</string>
-    <string name="about_contact_title">للاتصال</string>
-    <string name="about_license_title">الترخيص</string>
-    <string name="about_copyright_title">حقوق النسخ</string>
-    <string name="qksms_plus_description_title">دعم التطوير و فتح جميع المزايا</string>
-    <string name="qksms_plus_description_summary">يمكنك إنقاذ المطوّر الجائع ب %s فقط</string>
-    <!-- Substitutions are for price and currency. Ex: Lifetime upgrade for $1.99 USD -->
-    <string name="qksms_plus_upgrade">ترقية مدى الحياة ل %1$s%2$s</string>
-    <!-- Substitutions are for price and currency. Ex: Unlock + donate for $4.99 USD -->
-    <string name="qksms_plus_upgrade_donate">افتح + التبرع ل %1$s%2$s</string>
-    <string name="qksms_plus_thanks_title">شكراً لكم على دعم QKSMS!</string>
-    <string name="qksms_plus_thanks_summary">جميع ميزات QKSMS+ متاحة لك الآن</string>
-    <string name="qksms_plus_free_title">QKSMS+ مجاني لمستخدمي متجر ف-درويد! لا تتردد في التبرع إن كنت ترغب دعم تطوير هذا التطبيق.</string>
-    <string name="qksms_plus_donate">التبرع عن طريق بي بال</string>
-    <string name="qksms_plus_coming_soon">قريباً</string>
-    <string name="qksms_plus_themes_title">سمات فاخرة</string>
-    <string name="qksms_plus_themes_summary">استفد من ألوان رائعة للسمات لاتوجد في لوح ألوان Material Design</string>
-    <string name="qksms_plus_emoji_title">إيموجي تلقائية ومخصصة</string>
-    <string name="qksms_plus_emoji_summary">إنشاء اختصارات إيموجي تلقائية ومخصّصة</string>
-    <string name="qksms_plus_backup_title">النسخ الاحتياطي للرسائل</string>
-    <string name="qksms_plus_backup_summary">النسخ الاحتياطي التلقائي لرسائلك.
-لا تقلق ثانية من فقد سجلات رسائلك عندما تغير جوالك أو عند فقده</string>
-    <string name="qksms_plus_scheduled_title">الرسائل المجدولة</string>
-    <string name="qksms_plus_scheduled_summary">جدولة الرسائل ليتم إرسالها تلقائياً في وقت وتاريخ محدد</string>
-    <string name="qksms_plus_delayed_title">إرسال متأخر</string>
-    <string name="qksms_plus_delayed_summary">انتظر بضع ثوان قبل إرسال رسالتك</string>
-    <string name="qksms_plus_night_title">الوضع الليلي التلقائي</string>
-    <string name="qksms_plus_night_summary">تمكين الوضع الليلي استناداً على الوقت من اليوم</string>
-    <string name="qksms_plus_blacklist_title">الحظر المتقدم</string>
-    <string name="qksms_plus_blacklist_summary">حظر الرسائل التي تحوي كلمات أو تطابق أنماطاً</string>
-    <string name="qksms_plus_forward_title">إعادة التوجيه التلقائية</string>
-    <string name="qksms_plus_forward_summary">أعد التوجيه تلقائياً للرسائل من مرسلين معينين</string>
-    <string name="qksms_plus_respond_title">الرد التلقائي</string>
-    <string name="qksms_plus_respond_summary">الرد تلقائياً على الرسائل الواردة برسالة محددة مسبقاً</string>
-    <string name="qksms_plus_more_title">المزيد</string>
-    <string name="qksms_plus_more_summary">QKSMS قيد التطوير النشط ، مشتراك سيتضمن كل ميزات QKSMS+ المستقبلية!</string>
-    <string name="widget_loading">تحميل&#8230;</string>
-    <string name="widget_more">عرض المزيد من المحادثات</string>
-    <string name="qkreply_menu_read">Mark read</string>
-    <string name="qkreply_menu_call">مكالمة</string>
-    <string name="qkreply_menu_delete">حذف</string>
-    <string name="qkreply_menu_expand">إظهار المزيد</string>
-    <string name="qkreply_menu_collapse">إظهار أقل</string>
-    <string name="qkreply_menu_view">فتح المحادثة</string>
-    <string name="theme_material">Material</string>
-    <string name="theme_hex">HEX</string>
-    <string name="theme_apply">تطبيق</string>
-    <string-array name="notification_actions">
-        <item>لا شيء</item>
-        <item>Archive</item>
-        <item>Delete</item>
-        <item>Block</item>
-        <item>Call</item>
-        <item>Mark read</item>
-        <item>Reply</item>
-    </string-array>
-    <string name="button_yes">نعم</string>
-    <string name="button_continue">الاستمرار</string>
-    <string name="button_cancel">إلغاء</string>
-    <string name="button_delete">حذف</string>
-    <string name="button_save">حفظ</string>
-    <string name="button_stop">إيقاف</string>
-    <string name="button_more">المزيد</string>
-    <string name="button_set">تعيين</string>
-    <string name="button_undo">تراجع</string>
-    <string name="toast_copied">تم النسخ</string>
-    <string name="toast_archived">تم حفظ المحادثة</string>
-    <string name="toast_qksms_plus">استخدام هذه الميزة يتطلب فتح QKSMS+</string>
-    <plurals name="notification_new_messages">
-        <item quantity="zero">لا رسائل جديدة</item>
-        <item quantity="one">رسالة جديدة</item>
-        <item quantity="two">رسالتان جديدتان</item>
-        <item quantity="few">%s رسائل جديدة</item>
-        <item quantity="many">%s رسائل جديدة</item>
-        <item quantity="other">%s رسائل جديدة</item>
-    </plurals>
-    <string name="notification_message_failed_title">لم ترسَل الرسالة</string>
-    <string name="notification_message_failed_text">فشل الإرسال إلى %s</string>
-    <string-array name="night_modes">
-        <item>نظام</item>
-        <item>الغاء التفعيل</item>
-        <item>دائما مفعل</item>
-        <item>تلقائي</item>
-    </string-array>
-    <string-array name="notification_preview_options">
-        <item>عرض الاسم والرسالة</item>
-        <item>عرض الاسم</item>
-        <item>إخفاء المحتويات</item>
-    </string-array>
-    <string-array name="text_sizes">
-        <item>صغير</item>
-        <item>عادي</item>
-        <item>كبير</item>
-        <item>أكبر</item>
-    </string-array>
-    <string-array name="delayed_sending_labels">
-        <item>دون تأخير</item>
-        <item>3 seconds</item>
-        <item>5 seconds</item>
-        <item>10 seconds</item>
-    </string-array>
-    <string-array name="mms_sizes">
-        <item>تلقائي</item>
-        <item>100كيلوبايت</item>
-        <item>200كيلوبايت</item>
-        <item>300كيلوبايت</item>
-        <item>600كيلوبايت</item>
-        <item>1000كيلوبايت</item>
-        <item>2000كيلوبايت</item>
-        <item>No compression</item>
-    </string-array>
-    <string-array name="qk_responses">
-        <item>حسنًا</item>
-        <item>أمهلني بعض الوقت</item>
-        <item>في طريقي</item>
-        <item>شكراً</item>
-        <item>يبدو جيدًا</item>
-        <item>ماذا لديك ؟</item>
-        <item>أوافقك</item>
-        <item>لا</item>
-        <item>أحبك</item>
-        <item>آسف</item>
-        <item>ههههههه</item>
-        <item>هذا مناسب</item>
-    </string-array>
-</resources>
+<?xml version="1.0" encoding="utf-8"?>
+<!--
+  ~ Copyright (C) 2019 Moez Bhatti <moez.bhatti@gmail.com>
+  ~
+  ~ This file is part of QKSMS.
+  ~
+  ~ QKSMS is free software: you can redistribute it and/or modify
+  ~ it under the terms of the GNU General Public License as published by
+  ~ the Free Software Foundation, either version 3 of the License, or
+  ~ (at your option) any later version.
+  ~
+  ~ QKSMS is distributed in the hope that it will be useful,
+  ~ but WITHOUT ANY WARRANTY; without even the implied warranty of
+  ~ MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+  ~ GNU General Public License for more details.
+  ~
+  ~ You should have received a copy of the GNU General Public License
+  ~ along with QKSMS.  If not, see <http://www.gnu.org/licenses/>.
+  -->
+<resources>
+    <string name="shortcut_compose_long_label">محادثة جديدة</string>
+    <string name="shortcut_compose_short_label">ألِّف</string>
+    <string name="shortcut_compose_disabled_message">الاختصار معطَّل</string>
+    <string name="title_archived">أُرشفت</string>
+    <string name="title_settings">الإعدادات</string>
+    <string name="title_notification_prefs">الإشعارات</string>
+    <string name="title_theme">السمة</string>
+    <string name="title_conversations">البحث في علبة الوارد&#8230;</string>
+    <string name="title_compose">أكتب اسماً أو رقماً</string>
+    <string name="setup_skip">تخطي</string>
+    <string name="setup_next">متابعة</string>
+    <string name="menu_add_person">اضافة شخص</string>
+    <string name="menu_call">اتصال</string>
+    <string name="menu_info">تفاصيل</string>
+    <string name="menu_save">حفظ إلى المعرض</string>
+    <string name="menu_share">مشاركة</string>
+    <string name="main_drawer_open_cd">فتح درج التنقل</string>
+    <string name="main_title_selected">%d محددة</string>
+    <string name="main_menu_clear">مسح</string>
+    <string name="main_menu_archive">أرشفة</string>
+    <string name="main_menu_unarchive">إلغاء الأرشفة</string>
+    <string name="main_menu_delete">حذف</string>
+    <string name="main_menu_add_contact">اضافة الى القائمة</string>
+    <string name="main_menu_pin">التثبيت فوق</string>
+    <string name="main_menu_unpin">إلغاء التثبيت</string>
+    <string name="main_menu_read">Mark read</string>
+    <string name="main_menu_unread">Mark unread</string>
+    <string name="main_menu_block">حظر</string>
+    <string name="main_syncing">مزامنة الرسائل&#8230;</string>
+    <string name="main_sender_you">أنت: %s</string>
+    <string name="main_draft">مسودة</string>
+    <string name="main_message_results_title">النتائج في الرسائل</string>
+    <string name="main_message_results">%d رسائل</string>
+    <string name="inbox_empty_text">ستظهر المحادثات الخاصة بك هنا</string>
+    <string name="inbox_search_empty_text">لا نتائج</string>
+    <string name="archived_empty_text">ستظهر المحادثات المؤرشفة الخاصة بك هنا</string>
+    <string name="main_fab_cd">بدء محادثة جديدة</string>
+    <string name="main_default_sms_title">ستحب المراسلة ثانية</string>
+    <string name="main_default_sms_message">جعل QKSMS تطبيق الرسائل النصية الافتراضي لديك</string>
+    <string name="main_default_sms_change">تغيير</string>
+    <string name="main_permission_required">الإذن مطلوب</string>
+    <string name="main_permission_sms">QKSMS يحتاج إلى إذن لإرسال وعرض الرسائل النصية</string>
+    <string name="main_permission_contacts">QKSMS يحتاج إلى إذن لعرض جهات الاتصال لديك</string>
+    <string name="main_permission_allow">سماح</string>
+    <string name="drawer_inbox">صندوق الوارد</string>
+    <string name="drawer_archived">المؤرشفة</string>
+    <string name="drawer_scheduled">المجدولة</string>
+    <string name="drawer_blocking">الحظر</string>
+    <string name="drawer_more">المزيد</string>
+    <string name="drawer_settings">الإعدادات</string>
+    <string name="drawer_help">المساعدة والتواصل مع المبرمج</string>
+    <string name="drawer_invite">دعوة الأصدقاء</string>
+    <string name="drawer_plus_banner_summary">فتح ميزات رائعة جديدة ، و دعم التطوير</string>
+    <string name="rate_title">هل QKSMS ممتع ؟</string>
+    <string name="rate_summary">أظهر محبتك وقيّمنا على متجر Google Play!</string>
+    <string name="rate_okay">حسناً</string>
+    <string name="rate_dismiss">استبعاد</string>
+    <string name="dialog_delete_title">حذف</string>
+    <plurals name="dialog_delete_message">
+        <item quantity="zero">هل أنت متأكد من رغبتك حذف %d محادثة؟</item>
+        <item quantity="one">هل أنت متأكد من رغبتك حذف %d محادثة؟</item>
+        <item quantity="two">هل أنت متأكد من رغبتك حذف المحادثتين؟</item>
+        <item quantity="few">هل أنت متأكد من رغبتك حذف %d محادثات؟</item>
+        <item quantity="many">هل أنت متأكد من رغبتك حذف %d محادثات؟</item>
+        <item quantity="other">هل أنت متأكد من رغبتك حذف %d محادثات؟</item>
+    </plurals>
+    <string-array name="message_options">
+        <item>نسخ النص</item>
+        <item>إعادة توجيه</item>
+        <item>حذف</item>
+    </string-array>
+    <string name="compose_number_picker_title">اختر رقم الهاتف</string>
+    <string name="compose_number_picker_default">%s ∙ Default</string>
+    <string name="compose_number_picker_once">فقط واحد</string>
+    <string name="compose_number_picker_always">دائما</string>
+    <string name="compose_title_selected">%d مختارة</string>
+    <string name="compose_subtitle_results">%1$d من %2$d النتائج</string>
+    <string name="compose_send_group_title">إرسال رسالة جماعية</string>
+    <string name="compose_send_group_summary">المتلقون والردود سيكونان مرئيين للجميع</string>
+    <string name="compose_messages_empty">هذا أول المحادثة. قل شيئا لطيفاً!</string>
+    <string name="compose_vcard_label">بطاقة جهة الاتصال</string>
+    <string name="compose_scheduled_for">مجدولة لـ</string>
+    <string name="compose_scheduled_future">الوقت المحدّد يجب أن يكون مستقبلاً!</string>
+    <string name="compose_scheduled_plus">يلزمك فك QKSMS+ لاستخدام التراسل المجدول</string>
+    <string name="compose_scheduled_toast">أضيفت إلى الرسائل المجدولة</string>
+    <string name="compose_hint">كتابة رسالة&#8230;</string>
+    <string name="compose_menu_copy">نسخ النص</string>
+    <string name="compose_menu_forward">إعادة توجيه</string>
+    <string name="compose_menu_delete">حذف</string>
+    <string name="compose_menu_previous">السابقة</string>
+    <string name="compose_menu_next">التالية</string>
+    <string name="compose_menu_clear">مسح</string>
+    <string name="compose_details_title">تفاصيل الرسالة</string>
+    <string name="compose_details_type">النوع: %s</string>
+    <string name="compose_details_from">من: %s</string>
+    <string name="compose_details_to">إلى: %s</string>
+    <string name="compose_details_subject">الموضوع: %s</string>
+    <string name="compose_details_priority">الأولوية: %s</string>
+    <string name="compose_details_size">الحجم: %s</string>
+    <string name="compose_details_sent">أرسلت: %s</string>
+    <string name="compose_details_received">استلمت: %s</string>
+    <string name="compose_details_delivered">التسليم: %s</string>
+    <string name="compose_details_error_code">رمز الخطأ: %d</string>
+    <string name="compose_attach_cd">إضافة مرفق</string>
+    <string name="compose_gallery_cd">إرفاق صورة</string>
+    <string name="compose_camera_cd">التقاط صورة</string>
+    <string name="compose_schedule_cd">جدوِل الرسالة</string>
+    <string name="compose_contact_cd">إرفاق جهة اتصال</string>
+    <string name="compose_contact_error">خطأ في قراءة جهة الاتصال</string>
+    <!-- Example: SIM 1 (Verizon) selected-->
+    <string name="compose_sim_changed_toast">SIM %1$d (%2$s) selected</string>
+    <string name="compose_sim_cd">%s محددة، غيّر شريحة SIM</string>
+    <string name="compose_send_cd">إرسال الرسالة</string>
+    <string name="message_status_sending">الإرسال جارٍ&#8230;</string>
+    <string name="message_status_delivered">تم إرسال %s</string>
+    <string name="message_status_failed">فشل الإرسال. إلمس لإعادة المحاولة</string>
+    <string name="info_title">التفاصيل</string>
+    <string name="info_copied_address">تم نسخ العنوان</string>
+    <string name="info_name">عنوان المحادثة</string>
+    <string name="info_notifications">الإشعارات</string>
+    <string name="info_theme">السمة</string>
+    <string name="info_archive">الأرشيف</string>
+    <string name="info_unarchive">إلغاء الأرشفة</string>
+    <string name="info_block">حظر</string>
+    <string name="info_unblock">إلغاء الحظر</string>
+    <string name="info_delete">حذف المحادثة</string>
+    <string name="gallery_error">تعذر تحميل الوسائط</string>
+    <string name="gallery_toast_saved">تم الحفظ في المعرض</string>
+    <string name="backup_title">النسخ الاحتياطي والاستعادة</string>
+    <string name="backup_backing_up">النسخ الاحتياطي للرسائل</string>
+    <string name="backup_restoring">استعادة من النسخة الاحتياطية</string>
+    <string name="backup_last">آخر نسخ احتياطي</string>
+    <string name="backup_loading">تحميل&#8230;</string>
+    <string name="backup_never">أبداً</string>
+    <string name="backup_restore_title">استعادة</string>
+    <string name="backup_restore_summary">اختر نسخة احتياطية</string>
+    <string name="backup_restore_error_plus">يرجى إلغاء تأمين QKSMS+ للتمكن من استخدام النسخ الاحتياطي والاستعادة</string>
+    <string name="backup_restore_error_backup">النسخ الاحتياطي قيد التقدم&#8230;</string>
+    <string name="backup_restore_error_restore">الاستعادة قيد التقدُّم&#8230;</string>
+    <string name="backup_restore_confirm_title">الاستعادة من النسخ الاحتياطي</string>
+    <string name="backup_restore_confirm_message">هل أنت متأكد من رغبتك استرجاع رسائلك من هذه النسخة الاحتياطية؟</string>
+    <string name="backup_restore_stop_title">إيقاف الاستعادة</string>
+    <string name="backup_restore_stop_message">الرسائل التي تمت استعادتها ستبقى في جهازك</string>
+    <string name="backup_restore_dialog_title">النسخ الاحتياطية</string>
+    <string name="backup_restore_dialog_empty">لا توجد أي نسخة احتياطية</string>
+    <plurals name="backup_message_count">
+        <item quantity="zero">لا رسائل</item>
+        <item quantity="one">رسالة</item>
+        <item quantity="two">رسالتان</item>
+        <item quantity="few">%d رسائل</item>
+        <item quantity="many">%d رسائل</item>
+        <item quantity="other">%d رسائل</item>
+    </plurals>
+    <string name="backup_disclaimer">النسخ الاحتياطي والاستعادة متاحة الآن فقط للرسائل النصّية. دعم رسائل الوسائط والرسائل المجدولة قادم قريباً!</string>
+    <string name="backup_now">النسخ الاحتياطي الآن</string>
+    <string name="backup_progress_parsing">توزيع النسخ الاحتياطي&#8230;</string>
+    <string name="backup_progress_running">%d/%d رسائل</string>
+    <string name="backup_progress_saving">جارٍ حفظُ النسخة الاحتياطية&#8230;</string>
+    <string name="backup_progress_syncing">مزامنة الرسائل جارية&#8230;</string>
+    <string name="backup_progress_finished">تم!</string>
+    <string name="backup_notification_channel_name">النسخ الاحتياطي والاستعادة</string>
+    <string name="scheduled_title">مجدولة</string>
+    <string name="scheduled_empty_description">الإرسال الآلي لأي رسالة في الوقت الذي ترغب بالضبط</string>
+    <string name="scheduled_empty_message_1">مهلاً..متى عيد ميلادك؟</string>
+    <string name="scheduled_empty_message_2">إنه في 23 ديسمبر</string>
+    <string name="scheduled_empty_message_3">عيد ميلاد سعيد! أنظر ما أجمل صديقك QKSMS ، يتذكر عيد ميلادك</string>
+    <!--&#x200A; is a special character required at the end of this string to fix it's formatting in the app -->
+    <string name="scheduled_empty_message_3_timestamp">الإرسال في 23 ديسمبر</string>
+    <string name="scheduled_compose_cd">جدولة رسالة</string>
+    <string name="scheduled_options_title">الرسالة المجدولة</string>
+    <string-array name="scheduled_options">
+        <item>أرسل الآن</item>
+        <item>نسخ النص</item>
+        <item>حذف</item>
+    </string-array>
+    <string name="settings_category_appearance">المظهر</string>
+    <string name="settings_category_general">عام</string>
+    <string name="settings_category_qkreply">رد QK</string>
+    <string name="settings_theme_title">السمة</string>
+    <string name="settings_night_title">الوضع الليلي</string>
+    <string name="settings_black_title">وضع ليلي بسوادٍ حالك</string>
+    <string name="settings_night_start_title">وقت البدء</string>
+    <string name="settings_night_end_title">وقت الانتهاء</string>
+    <string name="settings_automatic_colors_title">Automatic contact colors</string>
+    <string name="settings_text_size_title">حجم الخط</string>
+    <string name="settings_system_font_title">استخدم خط النظام</string>
+    <string name="settings_auto_emoji_title">إيموجي تلقائية</string>
+    <string name="settings_notifications_title">الإشعارات</string>
+    <string name="settings_notifications_o_summary">أنقر للتخصيص</string>
+    <string name="settings_notification_actions_title">الاجراءات</string>
+    <string name="settings_notification_action_1">الزر 1</string>
+    <string name="settings_notification_action_2">الزر 2</string>
+    <string name="settings_notification_action_3">الزر 3</string>
+    <string name="settings_notification_previews_title">معاينات الإشعارات</string>
+    <string name="settings_notification_wake_title">فتح الشاشة</string>
+    <string name="settings_vibration_title">الاهتزاز</string>
+    <string name="settings_ringtone_title">الصوت</string>
+    <string name="settings_ringtone_none">بدون نغمة </string>
+    <string name="settings_qkreply_title">رد QK</string>
+    <string name="settings_qkreply_summary">نافذة منبثقة للرسائل الجديدة</string>
+    <string name="settings_qkreply_tap_dismiss_title">إلمس للاستبعاد</string>
+    <string name="settings_qkreply_tap_dismiss_summary">إلمس خارج المنبثقة لإغلاقها</string>
+    <string name="settings_delayed_title">الإرسال المؤخَّر</string>
+    <string name="settings_swipe_actions">إجراءات السَّحْب</string>
+    <string name="settings_swipe_actions_summary">ضبط إجراءات السحب بالنسبة للمحادثات</string>
+    <string name="settings_swipe_actions_right">سحب لليمين</string>
+    <string name="settings_swipe_actions_left">سحب لليسار</string>
+    <string name="settings_swipe_actions_change">تغيير</string>
+    <string-array name="settings_swipe_actions">
+        <item>لاشيء</item>
+        <item>أرشفة</item>
+        <item>حذف</item>
+        <item>Block</item>
+        <item>Call</item>
+        <item>Mark read</item>
+        <item>Mark unread</item>
+    </string-array>
+    <string name="settings_delivery_title">تأكيدات الإستلام</string>
+    <string name="settings_delivery_summary">تأكيد أنه تم إرسال الرسائل بنجاح</string>
+    <string name="settings_signature_title">توقيع</string>
+    <string name="settings_signature_summary">Add a signature to the end of your messages</string>
+    <string name="settings_unicode_title">نزع حركات التشكيل</string>
+    <string name="settings_unicode_summary">حذف حركات التشكيل من المحارف في الرسائل النصية الصادرة</string>
+    <string name="settings_mobile_title">أرقام الهواتف النقالة فقط</string>
+    <string name="settings_mobile_summary">عند إنشاء رسالة، أظهر فقط أرقام الهواتف النقالة</string>
+    <string name="settings_auto_delete">Delete old messages automatically</string>
+    <string name="settings_auto_delete_dialog_message">Messages will be deleted after the specified number of days</string>
+    <string name="settings_auto_delete_dialog_hint">Number of days</string>
+    <string name="settings_auto_delete_never">Never</string>
+    <string name="settings_auto_delete_warning">Delete old messages automatically?</string>
+    <string name="settings_auto_delete_warning_message">If you proceed, %1$d messages will be deleted now</string>
+    <plurals name="settings_auto_delete_summary">
+        <item quantity="zero">After %d days</item>
+        <item quantity="one">After 1 day</item>
+        <item quantity="two">After %d days</item>
+        <item quantity="few">After %d days</item>
+        <item quantity="many">After %d days</item>
+        <item quantity="other">After %d days</item>
+    </plurals>
+    <string name="settings_long_as_mms_title">Send long messages as MMS</string>
+    <string name="settings_long_as_mms_summary">If your longer text messages are failing to send, or sending in the wrong order, you can send them as MMS messages instead. Additional charges may apply</string>
+    <string name="settings_mms_size_title">الضغط التلقائي لمرفقات رسائل الوسائط</string>
+    <string name="settings_sync_title">مزامنة الرسائل</string>
+    <string name="settings_sync_summary">إعادة مزامنة رسائلك مع قاعدة البيانات الأصلية للرسائل في النظام</string>
+    <string name="settings_about_title">حول QKSMS</string>
+    <string name="settings_version">النسخة %s</string>
+    <string name="settings_logging_enabled">تسجيل التصحيح مفعَّل</string>
+    <string name="settings_logging_disabled">تسجيل التصحيح معطَّل</string>
+    <string name="settings_delay_duration_hint">أدخل المدة (ثوان)</string>
+    <string name="blocking_title">المحظورات</string>
+    <string name="blocking_drop_title">Drop messages</string>
+    <string name="blocking_drop_summary">Drop incoming messages from blocked senders instead of hiding them</string>
+    <string name="blocking_conversations">المحادثات المحظورة</string>
+    <string name="blocking_manager_title">مدير المحظورات</string>
+    <string name="blocking_manager_qksms_title">QKSMS</string>
+    <string name="blocking_manager_qksms_summary">Built-in blocking functionality in QKSMS</string>
+    <string name="blocking_manager_call_control_summary">Automatically filter your calls and messages in one convenient place! Community IQ™ allows you to prevent unwanted messages from community known spammers</string>
+    <string name="blocking_manager_sia_summary">الترشيح التلقائي للرسائل من الأرقام غير المرغوبة باستخدام تطبيق \"Should I Answer\"</string>
+    <string name="blocking_manager_copy_title">نسخ الارقام المحظورة</string>
+    <string name="blocking_manager_copy_summary">Continue to %s and copy over your existing blocked numbers</string>
+    <string name="blocked_numbers_title">الارقام المحظورة</string>
+    <string name="blocked_numbers_empty">ارقامك المحظورة سوف تظهر هنا</string>
+    <string name="blocked_numbers_add_cd">حظر رقم جديد</string>
+    <string name="blocked_numbers_dialog_title">حظر الرسائل من</string>
+    <string name="blocked_numbers_dialog_hint">رقم الهاتف</string>
+    <string name="blocked_numbers_dialog_block">حظر</string>
+    <string name="blocked_messages_title">الرسائل المحظورة</string>
+    <string name="blocked_messages_empty">رسائلك المحظورة سوف تظهر هنا</string>
+    <string name="blocking_block_title">حظر</string>
+    <string name="blocking_unblock_title">الغاء الحظر</string>
+    <plurals name="blocking_block_external">
+        <item quantity="zero">الاستمرار الى %s وحظر هذا الرقم</item>
+        <item quantity="one">الاستمرار الى %s وحظر هذا الرقم</item>
+        <item quantity="two">الاستمرار الى %s واتاحة هذا الرقم</item>
+        <item quantity="few">الاستمرار الى %s واتاحة هذا الرقم</item>
+        <item quantity="many">الاستمرار الى %s واتاحة هذا الرقم</item>
+        <item quantity="other">الاستمرار الى %s واتاحة هذا الرقم</item>
+    </plurals>
+    <plurals name="blocking_unblock_external">
+        <item quantity="zero">الاستمرار الى %s واتاحة هذا الرقم</item>
+        <item quantity="one">الاستمرار الى %s واتاحة هذا الرقم</item>
+        <item quantity="two">الاستمرار الى %s واتاحة هذا الرقم</item>
+        <item quantity="few">الاستمرار الى %s واتاحة هذا الرقم</item>
+        <item quantity="many">الاستمرار الى %s واتاحة هذا الرقم</item>
+        <item quantity="other">الاستمرار الى %s واتاحة هذا الرقم</item>
+    </plurals>
+    <string name="about_title">حول</string>
+    <string name="about_version_title">النسخة</string>
+    <string name="about_developer_title">المطوّر</string>
+    <string name="about_source_title">الشفرة المصدر</string>
+    <string name="about_changelog_title">سجل التغييرات</string>
+    <string name="about_contact_title">للاتصال</string>
+    <string name="about_license_title">الترخيص</string>
+    <string name="about_copyright_title">حقوق النسخ</string>
+    <string name="qksms_plus_description_title">دعم التطوير و فتح جميع المزايا</string>
+    <string name="qksms_plus_description_summary">يمكنك إنقاذ المطوّر الجائع ب %s فقط</string>
+    <!-- Substitutions are for price and currency. Ex: Lifetime upgrade for $1.99 USD -->
+    <string name="qksms_plus_upgrade">ترقية مدى الحياة ل %1$s%2$s</string>
+    <!-- Substitutions are for price and currency. Ex: Unlock + donate for $4.99 USD -->
+    <string name="qksms_plus_upgrade_donate">افتح + التبرع ل %1$s%2$s</string>
+    <string name="qksms_plus_thanks_title">شكراً لكم على دعم QKSMS!</string>
+    <string name="qksms_plus_thanks_summary">جميع ميزات QKSMS+ متاحة لك الآن</string>
+    <string name="qksms_plus_free_title">QKSMS+ مجاني لمستخدمي متجر ف-درويد! لا تتردد في التبرع إن كنت ترغب دعم تطوير هذا التطبيق.</string>
+    <string name="qksms_plus_donate">التبرع عن طريق بي بال</string>
+    <string name="qksms_plus_coming_soon">قريباً</string>
+    <string name="qksms_plus_themes_title">سمات فاخرة</string>
+    <string name="qksms_plus_themes_summary">استفد من ألوان رائعة للسمات لاتوجد في لوح ألوان Material Design</string>
+    <string name="qksms_plus_emoji_title">إيموجي تلقائية ومخصصة</string>
+    <string name="qksms_plus_emoji_summary">إنشاء اختصارات إيموجي تلقائية ومخصّصة</string>
+    <string name="qksms_plus_backup_title">النسخ الاحتياطي للرسائل</string>
+    <string name="qksms_plus_backup_summary">النسخ الاحتياطي التلقائي لرسائلك.
+لا تقلق ثانية من فقد سجلات رسائلك عندما تغير جوالك أو عند فقده</string>
+    <string name="qksms_plus_scheduled_title">الرسائل المجدولة</string>
+    <string name="qksms_plus_scheduled_summary">جدولة الرسائل ليتم إرسالها تلقائياً في وقت وتاريخ محدد</string>
+    <string name="qksms_plus_delayed_title">إرسال متأخر</string>
+    <string name="qksms_plus_delayed_summary">انتظر بضع ثوان قبل إرسال رسالتك</string>
+    <string name="qksms_plus_night_title">الوضع الليلي التلقائي</string>
+    <string name="qksms_plus_night_summary">تمكين الوضع الليلي استناداً على الوقت من اليوم</string>
+    <string name="qksms_plus_blacklist_title">الحظر المتقدم</string>
+    <string name="qksms_plus_blacklist_summary">حظر الرسائل التي تحوي كلمات أو تطابق أنماطاً</string>
+    <string name="qksms_plus_forward_title">إعادة التوجيه التلقائية</string>
+    <string name="qksms_plus_forward_summary">أعد التوجيه تلقائياً للرسائل من مرسلين معينين</string>
+    <string name="qksms_plus_respond_title">الرد التلقائي</string>
+    <string name="qksms_plus_respond_summary">الرد تلقائياً على الرسائل الواردة برسالة محددة مسبقاً</string>
+    <string name="qksms_plus_more_title">المزيد</string>
+    <string name="qksms_plus_more_summary">QKSMS قيد التطوير النشط ، مشتراك سيتضمن كل ميزات QKSMS+ المستقبلية!</string>
+    <string name="widget_loading">تحميل&#8230;</string>
+    <string name="widget_more">عرض المزيد من المحادثات</string>
+    <string name="qkreply_menu_read">Mark read</string>
+    <string name="qkreply_menu_call">مكالمة</string>
+    <string name="qkreply_menu_delete">حذف</string>
+    <string name="qkreply_menu_expand">إظهار المزيد</string>
+    <string name="qkreply_menu_collapse">إظهار أقل</string>
+    <string name="qkreply_menu_view">فتح المحادثة</string>
+    <string name="theme_material">Material</string>
+    <string name="theme_hex">HEX</string>
+    <string name="theme_apply">تطبيق</string>
+    <string-array name="notification_actions">
+        <item>لا شيء</item>
+        <item>Archive</item>
+        <item>Delete</item>
+        <item>Block</item>
+        <item>Call</item>
+        <item>Mark read</item>
+        <item>Reply</item>
+    </string-array>
+    <string name="button_yes">نعم</string>
+    <string name="button_continue">الاستمرار</string>
+    <string name="button_cancel">إلغاء</string>
+    <string name="button_delete">حذف</string>
+    <string name="button_save">حفظ</string>
+    <string name="button_stop">إيقاف</string>
+    <string name="button_more">المزيد</string>
+    <string name="button_set">تعيين</string>
+    <string name="button_undo">تراجع</string>
+    <string name="toast_copied">تم النسخ</string>
+    <string name="toast_archived">تم حفظ المحادثة</string>
+    <string name="toast_qksms_plus">استخدام هذه الميزة يتطلب فتح QKSMS+</string>
+    <plurals name="notification_new_messages">
+        <item quantity="zero">لا رسائل جديدة</item>
+        <item quantity="one">رسالة جديدة</item>
+        <item quantity="two">رسالتان جديدتان</item>
+        <item quantity="few">%s رسائل جديدة</item>
+        <item quantity="many">%s رسائل جديدة</item>
+        <item quantity="other">%s رسائل جديدة</item>
+    </plurals>
+    <string name="notification_message_failed_title">لم ترسَل الرسالة</string>
+    <string name="notification_message_failed_text">فشل الإرسال إلى %s</string>
+    <string-array name="night_modes">
+        <item>نظام</item>
+        <item>الغاء التفعيل</item>
+        <item>دائما مفعل</item>
+        <item>تلقائي</item>
+    </string-array>
+    <string-array name="notification_preview_options">
+        <item>عرض الاسم والرسالة</item>
+        <item>عرض الاسم</item>
+        <item>إخفاء المحتويات</item>
+    </string-array>
+    <string-array name="text_sizes">
+        <item>صغير</item>
+        <item>عادي</item>
+        <item>كبير</item>
+        <item>أكبر</item>
+    </string-array>
+    <string-array name="delayed_sending_labels">
+        <item>دون تأخير</item>
+        <item>3 seconds</item>
+        <item>5 seconds</item>
+        <item>10 seconds</item>
+    </string-array>
+    <string-array name="mms_sizes">
+        <item>تلقائي</item>
+        <item>100كيلوبايت</item>
+        <item>200كيلوبايت</item>
+        <item>300كيلوبايت</item>
+        <item>600كيلوبايت</item>
+        <item>1000كيلوبايت</item>
+        <item>2000كيلوبايت</item>
+        <item>No compression</item>
+    </string-array>
+    <string-array name="qk_responses">
+        <item>حسنًا</item>
+        <item>أمهلني بعض الوقت</item>
+        <item>في طريقي</item>
+        <item>شكراً</item>
+        <item>يبدو جيدًا</item>
+        <item>ماذا لديك ؟</item>
+        <item>أوافقك</item>
+        <item>لا</item>
+        <item>أحبك</item>
+        <item>آسف</item>
+        <item>ههههههه</item>
+        <item>هذا مناسب</item>
+    </string-array>
+</resources>
diff --git a/presentation/src/main/res/values-bn/strings.xml b/presentation/src/main/res/values-bn/strings.xml
index 93a7c2860..707479fde 100644
--- a/presentation/src/main/res/values-bn/strings.xml
+++ b/presentation/src/main/res/values-bn/strings.xml
@@ -1,411 +1,411 @@
-<?xml version="1.0" encoding="utf-8"?>
-<!--
-  ~ Copyright (C) 2019 Moez Bhatti <moez.bhatti@gmail.com>
-  ~
-  ~ This file is part of QKSMS.
-  ~
-  ~ QKSMS is free software: you can redistribute it and/or modify
-  ~ it under the terms of the GNU General Public License as published by
-  ~ the Free Software Foundation, either version 3 of the License, or
-  ~ (at your option) any later version.
-  ~
-  ~ QKSMS is distributed in the hope that it will be useful,
-  ~ but WITHOUT ANY WARRANTY; without even the implied warranty of
-  ~ MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
-  ~ GNU General Public License for more details.
-  ~
-  ~ You should have received a copy of the GNU General Public License
-  ~ along with QKSMS.  If not, see <http://www.gnu.org/licenses/>.
-  -->
-<resources>
-    <string name="shortcut_compose_long_label">নতুন আলাপ</string>
-    <string name="shortcut_compose_short_label">কম্পোজ করো</string>
-    <string name="shortcut_compose_disabled_message">শর্টকাট নিষ্ক্রিয়</string>
-    <string name="title_archived">আর্কাইভকৃত</string>
-    <string name="title_settings">সেটিংস</string>
-    <string name="title_notification_prefs">বিজ্ঞপ্তি</string>
-    <string name="title_theme">থিম</string>
-    <string name="title_conversations">ইনবক্সে খুঁজো&#8230;</string>
-    <string name="title_compose">নাম বা নম্বর টাইপ করো</string>
-    <string name="setup_skip">এড়িয়ে যাও</string>
-    <string name="setup_next">আগাও</string>
-    <string name="menu_add_person">কাউকে যুক্ত করো</string>
-    <string name="menu_call">কল করো</string>
-    <string name="menu_info">বিস্তারিত</string>
-    <string name="menu_save">গ্যালারিতে সংরক্ষণ করো</string>
-    <string name="menu_share">শেয়ার</string>
-    <string name="main_drawer_open_cd">ন্যাভিগেশন ড্রয়ার খুলো</string>
-    <string name="main_title_selected">%d নির্বাচিত</string>
-    <string name="main_menu_clear">পরিষ্কার</string>
-    <string name="main_menu_archive">আর্কাইভ</string>
-    <string name="main_menu_unarchive">আনআর্কাইভ</string>
-    <string name="main_menu_delete">মুছে ফেলো</string>
-    <string name="main_menu_add_contact">পরিচিততে যুক্ত করো</string>
-    <string name="main_menu_pin">উপরে রাখো</string>
-    <string name="main_menu_unpin">উপর থেকে সরাও</string>
-    <string name="main_menu_read">পড়া হয়েছে</string>
-    <string name="main_menu_unread">পড়া হয়নি</string>
-    <string name="main_menu_block">অবরুদ্ধ</string>
-    <string name="main_syncing">বার্তাগুলি সিঙ্ক হচ্ছে&#8230;</string>
-    <string name="main_sender_you">তুমি: %s</string>
-    <string name="main_draft">খসড়া</string>
-    <string name="main_message_results_title">বার্তার ভিতর পাওয়া গেছে</string>
-    <string name="main_message_results">%dটি বার্তা</string>
-    <string name="inbox_empty_text">তোমার আলাপ এখানে দেখা যাবে</string>
-    <string name="inbox_search_empty_text">কোনো ফলাফল নেই</string>
-    <string name="archived_empty_text">তোমার আর্কাইভ করা আলাপ এখানে দেখা যাবে</string>
-    <string name="main_fab_cd">নতুন আলাপ শুরু করো</string>
-    <string name="main_default_sms_title">আবার বার্তাকে ভালবাসুন</string>
-    <string name="main_default_sms_message">QKSMS-কে তোমার ডিফল্ট এসএমএস অ্যাপ করো</string>
-    <string name="main_default_sms_change">পরিবর্তন করো</string>
-    <string name="main_permission_required">অনুমতি প্রয়োজন</string>
-    <string name="main_permission_sms">QKSMS-এর এসএমএস বার্তাগুলো পাঠানোর এবং দেখার অনুমতি প্রয়োজন</string>
-    <string name="main_permission_contacts">QKSMS-এর তোমার পরিচিতিগুলি দেখার জন্য অনুমতি প্রয়োজন</string>
-    <string name="main_permission_allow">মঞ্জুর করো</string>
-    <string name="drawer_inbox">ইনবক্স</string>
-    <string name="drawer_archived">আর্কাইভকৃত</string>
-    <string name="drawer_scheduled">পরিকল্পিত</string>
-    <string name="drawer_blocking">অবরুদ্ধ</string>
-    <string name="drawer_more">আরো</string>
-    <string name="drawer_settings">সেটিংস</string>
-    <string name="drawer_help">সাহায্য &amp; প্রতিক্রিয়া</string>
-    <string name="drawer_invite">বন্ধুদের আমন্ত্রণ জানাও</string>
-    <string name="drawer_plus_banner_summary">অসাধারণ সব নতুন বৈশিষ্ট্য পাও এবং উন্নয়নে সাহায্য করো</string>
-    <string name="rate_title">QKSMS উপভোগ করছো?</string>
-    <string name="rate_summary">আমাদের প্রতি ভালবাসে দেখাতে Google Play-এ আমাদের মূল্যায়ন করো!</string>
-    <string name="rate_okay">ঠিক আছে!</string>
-    <string name="rate_dismiss">বাতিল করো</string>
-    <string name="dialog_delete_title">মুছে ফেলো</string>
-    <plurals name="dialog_delete_message">
-        <item quantity="one">তুমি কি নিশ্চিত যে এই আলাপটি তুমি মুছে ফেলতে চাও?</item>
-        <item quantity="other">তুমি কি নিশ্চিত যে %d টি আলাপ তুমি মুছতে চাও?</item>
-    </plurals>
-    <string-array name="message_options">
-        <item>লেখা অনুলিপি করো</item>
-        <item>অন্যকে পাঠাও</item>
-        <item>মুছো</item>
-    </string-array>
-    <string name="compose_number_picker_title">ফোন নম্বর নির্বাচন করো</string>
-    <string name="compose_number_picker_default">%s ∙ পূর্বনির্ধারিত</string>
-    <string name="compose_number_picker_once">মাত্র একবার</string>
-    <string name="compose_number_picker_always">সর্বদা</string>
-    <string name="compose_title_selected">%d নির্বাচিত</string>
-    <string name="compose_subtitle_results">%2$d এর %1$d টি ফলাফল </string>
-    <string name="compose_send_group_title">গ্রুপ বার্তা হিসেবে পাঠাও</string>
-    <string name="compose_send_group_summary">প্রাপক এবং উত্তর সবার চোখে পড়বে</string>
-    <string name="compose_messages_empty">এখানে তোমার আলাপ শুরু হয়। সুন্দর কিছু বলো!</string>
-    <string name="compose_vcard_label">পরিচিতি কার্ড</string>
-    <string name="compose_scheduled_for">জন্য পরিকল্পিত</string>
-    <string name="compose_scheduled_future">নির্বাচিত সময় অবশ্য ভবিষ্যতে হতে হবে!</string>
-    <string name="compose_scheduled_plus">পরিকল্পিত বার্তাপ্রেরক ব্যবহার করতে আপনাকে অবশ্যই QKSMS + আনলক করতে হবে</string>
-    <string name="compose_scheduled_toast">পূর্বসূচিত বার্তাগুলোতে যোগ করা হয়েছে</string>
-    <string name="compose_hint">একটি বার্তা লিখো&#8230;</string>
-    <string name="compose_menu_copy">পাঠ্য অনুলিপি করুন</string>
-    <string name="compose_menu_forward">সামনে পাঠান</string>
-    <string name="compose_menu_delete">মুছে ফেলুন</string>
-    <string name="compose_menu_previous">পূর্ববর্তী</string>
-    <string name="compose_menu_next">পরবর্তী</string>
-    <string name="compose_menu_clear">পরিষ্কার</string>
-    <string name="compose_details_title">বার্তার বিস্তারিত</string>
-    <string name="compose_details_type">ধরন: %s</string>
-    <string name="compose_details_from">থেকে: %s</string>
-    <string name="compose_details_to">কাছে: %s</string>
-    <string name="compose_details_subject">বিষয়: %s</string>
-    <string name="compose_details_priority">অগ্রাধিকার: %s</string>
-    <string name="compose_details_size">আকার: %s</string>
-    <string name="compose_details_sent">প্রেরিত: %s</string>
-    <string name="compose_details_received">গৃহীত: %s</string>
-    <string name="compose_details_delivered">প্রেরিত হয়েছে: %s</string>
-    <string name="compose_details_error_code">ত্রুটি কোড: %d</string>
-    <string name="compose_attach_cd">সংযুক্তি যোগ করুন</string>
-    <string name="compose_gallery_cd">ছবি সংযুক্ত করুন</string>
-    <string name="compose_camera_cd">একটি ছবি নিন</string>
-    <string name="compose_schedule_cd">বার্তা পাঠানোর সময়সূচি নির্ধারণ করো</string>
-    <string name="compose_contact_cd">একটি পরিচিতি সংযুক্ত করুন</string>
-    <string name="compose_contact_error">পরিচিতি পড়তে ত্রুটি</string>
-    <!-- Example: SIM 1 (Verizon) selected-->
-    <string name="compose_sim_changed_toast">সিম %1$d (%2$s) নির্বাচিত</string>
-    <string name="compose_sim_cd">নির্বাচিত, %s সিম কার্ড পরিবর্তন করুন</string>
-    <string name="compose_send_cd">বার্তা পাঠাও</string>
-    <string name="message_status_sending">পাঠানো হচ্ছে&#8230;</string>
-    <string name="message_status_delivered">প্রেরিত হয়েছে: %s</string>
-    <string name="message_status_failed">পাঠাতে ব্যর্থ। আবার চেষ্টা করতে টিপ দাও</string>
-    <string name="info_title">বিস্তারিত</string>
-    <string name="info_copied_address">ঠিকানা অনুলিপিত</string>
-    <string name="info_name">আলাপের শিরোনাম</string>
-    <string name="info_notifications">নোটিফিকেশন</string>
-    <string name="info_theme">থিম</string>
-    <string name="info_archive">আর্কাইভ</string>
-    <string name="info_unarchive">আনআর্কাইভ</string>
-    <string name="info_block">ব্লক করুন</string>
-    <string name="info_unblock">আনব্লক করুন</string>
-    <string name="info_delete">আলাপ মুছে ফেলো</string>
-    <string name="gallery_error">মিডিয়া লোড করা যায়নি</string>
-    <string name="gallery_toast_saved">গ্যালারীতে সেভ করুন</string>
-    <string name="backup_title">ব্যাকআপ ও পুনরুদ্ধার</string>
-    <string name="backup_backing_up">মেসেজ ব্যাকআপ হচ্ছে </string>
-    <string name="backup_restoring">ব্যাকআপ হতে পুনরুদ্ধার হচ্ছে </string>
-    <string name="backup_last">সর্বশেষ ব্যাকআপ</string>
-    <string name="backup_loading">লোড হচ্ছে&#8230;</string>
-    <string name="backup_never">কখনই না </string>
-    <string name="backup_restore_title">পুনরুদ্ধার</string>
-    <string name="backup_restore_summary">ব্যাকআপ নির্বাচন করুন</string>
-    <string name="backup_restore_error_plus">ব্যাকআপ এবং পুনরুদ্ধার ব্যবহার করতে দয়া করে QKSMS + আনলক করুন</string>
-    <string name="backup_restore_error_backup">ব্যাক-আপ চলছে&#8230;</string>
-    <string name="backup_restore_error_restore">পুনরুদ্ধার চলছে&#8230;</string>
-    <string name="backup_restore_confirm_title">ব্যাক-আপ থেকে পুনরুদ্ধার করুন</string>
-    <string name="backup_restore_confirm_message">আপনি কি নিশ্চিত যে আপনি এই ব্যাকআপ থেকে আপনার বার্তাগুলি পুনরুদ্ধার করতে চান?</string>
-    <string name="backup_restore_stop_title">পুনরুদ্ধার থামান</string>
-    <string name="backup_restore_stop_message">ইতিমধ্যে পুনরুদ্ধার করা বার্তাগুলি আপনার ডিভাইসে থাকবে</string>
-    <string name="backup_restore_dialog_title">ব্যাকআপ গুলো</string>
-    <string name="backup_restore_dialog_empty">কোন ব্যাকআপ পাওয়া যায়নি</string>
-    <plurals name="backup_message_count">
-        <item quantity="one">%d মেসেজ</item>
-        <item quantity="other">%dটি মেসেজ</item>
-    </plurals>
-    <string name="backup_disclaimer">এইমুহুর্তে, ব্যাকআপ এবং পুনরুদ্ধার শুধুমাত্র এসএমএস এ করতে পারবেন । এমএমএস সাপর্ট  ও  শিডিউল  ব্যাকআপ শীঘ্রই আসছে!</string>
-    <string name="backup_now">ব্যাকআপ করুন </string>
-    <string name="backup_progress_parsing">ব্যাক-আপ পার্স করা হচ্ছে&#8230;</string>
-    <string name="backup_progress_running">%d/%d বার্তা</string>
-    <string name="backup_progress_saving">ব্যাক-আপ সংরক্ষণ করা হচ্ছে&#8230;</string>
-    <string name="backup_progress_syncing">বার্তাগুলো সিঙ্ক করা হচ্ছে&#8230;</string>
-    <string name="backup_progress_finished">শেষ হয়েছে!</string>
-    <string name="backup_notification_channel_name">ব্যাকআপ ও পুনরুদ্ধার</string>
-    <string name="scheduled_title">পরিকল্পিত</string>
-    <string name="scheduled_empty_description">স্বয়ংক্রিয়ভাবে একটি বার্তা পাঠাও, ঠিক যে মুহূর্তে তুমি চাও</string>
-    <string name="scheduled_empty_message_1">ওই! তোমার জন্মদিন যেন কবে?</string>
-    <string name="scheduled_empty_message_2">ওটা ২৩শে ডিসেম্বরে</string>
-    <string name="scheduled_empty_message_3">শুভ জন্মদিন! দেখো তোমার জন্মদিন মনে রাখায় আমি কতো ভালো একটা বন্ধু</string>
-    <!--&#x200A; is a special character required at the end of this string to fix it's formatting in the app -->
-    <string name="scheduled_empty_message_3_timestamp">২৩শে ডিসেম্বর পাঠানো হচ্ছে </string>
-    <string name="scheduled_compose_cd">পরবর্তীতে পাঠানোর জন্য একটি বার্তা পরিকল্পনা করো</string>
-    <string name="scheduled_options_title">পরিকল্পিত বার্তা</string>
-    <string-array name="scheduled_options">
-        <item>এখন পাঠাও</item>
-        <item>লেখা অনুলিপি করো</item>
-        <item>মুছো</item>
-    </string-array>
-    <string name="settings_category_appearance">উপস্থিতি</string>
-    <string name="settings_category_general">সাধারণ</string>
-    <string name="settings_category_qkreply">QK উত্তর</string>
-    <string name="settings_theme_title">থিম</string>
-    <string name="settings_night_title">নাইট মোড</string>
-    <string name="settings_black_title">সম্পূর্ণ কালো রাত্রি মোড</string>
-    <string name="settings_night_start_title">শুরুর সময়</string>
-    <string name="settings_night_end_title">শেষের সময়</string>
-    <string name="settings_automatic_colors_title">যোগাযোগদের স্বয়ংক্রিয় রং</string>
-    <string name="settings_text_size_title">ফন্টের আকার</string>
-    <string name="settings_system_font_title">সিস্টেম ফন্ট ব্যবহার করুন</string>
-    <string name="settings_auto_emoji_title">স্বয়ংক্রিয় ইমোজি</string>
-    <string name="settings_notifications_title">নোটিফিকেশন</string>
-    <string name="settings_notifications_o_summary">কাস্টমাইজ করতে ট্যাপ করুন</string>
-    <string name="settings_notification_actions_title">অ্যাকশনগুলি</string>
-    <string name="settings_notification_action_1">বাটন ১</string>
-    <string name="settings_notification_action_2">বাটন ২</string>
-    <string name="settings_notification_action_3">বাটন ৩</string>
-    <string name="settings_notification_previews_title">নোটিফিকেশন প্রিভিউ</string>
-    <string name="settings_notification_wake_title">স্ক্রিন জাগাও</string>
-    <string name="settings_vibration_title">কম্পন</string>
-    <string name="settings_ringtone_title">শব্দ</string>
-    <string name="settings_ringtone_none">কোনোটা না</string>
-    <string name="settings_qkreply_title">QK উত্তর</string>
-    <string name="settings_qkreply_summary">নতুন বার্তার জন্য পপ-আপ</string>
-    <string name="settings_qkreply_tap_dismiss_title">সরিয়ে দিতে ট্যাপ করুন</string>
-    <string name="settings_qkreply_tap_dismiss_summary">এটি বন্ধ করার জন্য পপআপের বাইরে ট্যাপ করুন</string>
-    <string name="settings_delayed_title">বিলম্বে পাঠাও</string>
-    <string name="settings_swipe_actions">সোয়াইপের জন্য অ্যাকশনগুলি</string>
-    <string name="settings_swipe_actions_summary">আলাপের জন্য সোয়াইপ সংকেতগুলো পরিবর্তন করো</string>
-    <string name="settings_swipe_actions_right">ডানে সোয়াইপ করুন</string>
-    <string name="settings_swipe_actions_left">বামে সোয়াইপ করুন</string>
-    <string name="settings_swipe_actions_change">পরিবর্তন করুন</string>
-    <string-array name="settings_swipe_actions">
-        <item>কোনোটা না</item>
-        <item>আর্কাইভ করুন</item>
-        <item>মুছে ফেলুন</item>
-        <item>অবরুদ্ধ করো</item>
-        <item>কল</item>
-        <item>পড়া হয়েছে চিহ্নিত করো</item>
-        <item>পড়া হয়নি চিহ্নিত করো</item>
-    </string-array>
-    <string name="settings_delivery_title">ডেলিভারি নিশ্চিতকরন</string>
-    <string name="settings_delivery_summary">নিশ্চিত করো যে বার্তা সফলভাবে পাঠানো হয়েছে</string>
-    <string name="settings_signature_title">স্বাক্ষর</string>
-    <string name="settings_signature_summary">তোমার বার্তাগুলোর শেষে একটা স্বাক্ষর যোগ করো</string>
-    <string name="settings_unicode_title">কথার টান সরিয়ে দিন</string>
-    <string name="settings_unicode_summary">বহির্গামী এসএমএস বার্তার অক্ষর থেকে কথার টান সরিয়ে নাও(accent)</string>
-    <string name="settings_mobile_title">শুধু মোবাইল নম্বর</string>
-    <string name="settings_mobile_summary">বার্তা লিখার করার সময়, শুধুমাত্র মোবাইল নম্বর দেখাও</string>
-    <string name="settings_auto_delete">Delete old messages automatically</string>
-    <string name="settings_auto_delete_dialog_message">Messages will be deleted after the specified number of days</string>
-    <string name="settings_auto_delete_dialog_hint">Number of days</string>
-    <string name="settings_auto_delete_never">Never</string>
-    <string name="settings_auto_delete_warning">Delete old messages automatically?</string>
-    <string name="settings_auto_delete_warning_message">If you proceed, %1$d messages will be deleted now</string>
-    <plurals name="settings_auto_delete_summary">
-        <item quantity="one">After 1 day</item>
-        <item quantity="other">After %d days</item>
-    </plurals>
-    <string name="settings_long_as_mms_title">দীর্ঘ বার্তা এমএমএস হিসেবে পাঠাও</string>
-    <string name="settings_long_as_mms_summary">যদি তোমার দীর্ঘ বার্তা পাঠানো ব্যর্থ হয় বা ভুল ক্রমানুসারে পাঠানো হয় তবে তুমি তার পরিবর্তে বার্তাগুলো এমএমএস বার্তা হিসাবে প্রেরণ করতে পারো। অতিরিক্ত চার্জ প্রযোজ্য হতে পারে</string>
-    <string name="settings_mms_size_title">এমএমএসের সংযুক্তি সক্রিয়ভাবে সংকোচন করুন</string>
-    <string name="settings_sync_title">বার্তাগুলি সিঙ্ক করো</string>
-    <string name="settings_sync_summary">তোমার বার্তাগুলি অ্যান্ড্রয়েডের নিজস্ব এসএমএস এর ডাটাবেসের সাথে পুনরায় সিঙ্ক করো</string>
-    <string name="settings_about_title">QKSMS সম্পর্কে</string>
-    <string name="settings_version">সংস্করণ %s</string>
-    <string name="settings_logging_enabled">ডিবাগ লগিং চালু করা হয়ছে</string>
-    <string name="settings_logging_disabled">ডিবাগ লগিং বন্ধ করা হয়ছে</string>
-    <string name="settings_delay_duration_hint">দৈর্ঘ্য (সেকেন্ডে) লিখুন</string>
-    <string name="blocking_title">অবরুদ্ধ হচ্ছে</string>
-    <string name="blocking_drop_title">বার্তা ফেলে দাও</string>
-    <string name="blocking_drop_summary">অবরোধকৃত প্রেরকদের বার্তা লুকানোর জায়গায় ফেলে দাও</string>
-    <string name="blocking_conversations">অবরুদ্ধ কথাবার্তা</string>
-    <string name="blocking_manager_title">অবরুদ্ধকরণ ব্যবস্থাপক</string>
-    <string name="blocking_manager_qksms_title">QKSMS</string>
-    <string name="blocking_manager_qksms_summary">QKSMS-এর অন্তর্ভুক্ত অবরোধী সক্ষমতা(blocking)</string>
-    <string name="blocking_manager_call_control_summary">তোমার কল আর বার্তা একটাই সুবিধাজনক জায়গা থেকে ফিল্টার করো বা ছাঁকো! Community IQ™ দিয়ে অবাঞ্ছিত বার্তা আটকানো যায় সমাজে পরিচিত স্প্যামারদের থেকে</string>
-    <string name="blocking_manager_sia_summary">স্বয়ংক্রিয়ভাবে \"Should I Answer\"(আমার কি উত্তর দেয়া উচিত?) অ্যাপ্লিকেশন ব্যবহার করে অযাচিত নম্বর-এর বার্তাগুলি ফিল্টার করো</string>
-    <string name="blocking_manager_copy_title">অবরুদ্ধ নম্বরগুলো অনুলিপি করো</string>
-    <string name="blocking_manager_copy_summary">%s-এ এগিয়ে যাও এবং তোমার আগের অবরোধকৃত নম্বরগুলো অনুলিপি করো</string>
-    <string name="blocked_numbers_title">অবরুদ্ধ নম্বরগুলো</string>
-    <string name="blocked_numbers_empty">তোমার অবরোধকৃত নম্বরগুলো এখানে আসবে</string>
-    <string name="blocked_numbers_add_cd">একটি নতুন নম্বর অবরোধ করো</string>
-    <string name="blocked_numbers_dialog_title">বার্তা অবরোধ করো এদের থেকে</string>
-    <string name="blocked_numbers_dialog_hint">ফোন নম্বর</string>
-    <string name="blocked_numbers_dialog_block">অবরুদ্ধ করুন</string>
-    <string name="blocked_messages_title">অবরুদ্ধ করা বার্তা</string>
-    <string name="blocked_messages_empty">অবরুদ্ধ করা বার্তা এখানে আসবে</string>
-    <string name="blocking_block_title">অবরুদ্ধ</string>
-    <string name="blocking_unblock_title">অবরুদ্ধতা বাতিল করুন</string>
-    <plurals name="blocking_block_external">
-        <item quantity="one">%s-এ এগিয়ে যাও এবং এই নম্বর অবরোধ করো</item>
-        <item quantity="other">%s-এ এগিয়ে যাও ও এই নম্বরগুলো অবরোধ করো</item>
-    </plurals>
-    <plurals name="blocking_unblock_external">
-        <item quantity="one">%s-এ এগিয়ে যাও ও এই নম্বর থেকে বার্তা আসতে দাও</item>
-        <item quantity="other">%s-এ এগিয়ে যাও ও এই নম্বরগুলো থেকে বার্তা আসতে দাও</item>
-    </plurals>
-    <string name="about_title">সম্পর্কে</string>
-    <string name="about_version_title">সংস্করণ</string>
-    <string name="about_developer_title">ডেভেলপার</string>
-    <string name="about_source_title">সোর্স কোড</string>
-    <string name="about_changelog_title">পরিবর্তনসূচী</string>
-    <string name="about_contact_title">যোগাযোগ করুন</string>
-    <string name="about_license_title">লাইসেন্স</string>
-    <string name="about_copyright_title">স্বত্ব</string>
-    <string name="qksms_plus_description_title">উন্নয়নে সমর্থন করুন, সবকিছু আনলক করুন</string>
-    <string name="qksms_plus_description_summary">আপনি একটি ক্ষুধার ডেভেলপারকে বাঁচাতে পারেন মাত্র %s</string>
-    <!-- Substitutions are for price and currency. Ex: Lifetime upgrade for $1.99 USD -->
-    <string name="qksms_plus_upgrade">সারা জীবনের জন্য আপগ্রেড করুন %1$s %2$s দিয়ে</string>
-    <!-- Substitutions are for price and currency. Ex: Unlock + donate for $4.99 USD -->
-    <string name="qksms_plus_upgrade_donate">%1$s %2$s দান করুন, + আনলক করুন</string>
-    <string name="qksms_plus_thanks_title">QKSMS সমর্থনের জন্য আপনাকে ধন্যবাদ!</string>
-    <string name="qksms_plus_thanks_summary">আপনি এখন QKSMS+-এর সব বৈশিষ্ট্যেের সুবিধা পাচ্ছেন</string>
-    <string name="qksms_plus_free_title">F-Droid ব্যবহারকারীরা QKSMS+ বিনামূল্যে ব্যবহার করতে পারবেন! যদি আপনি উন্নয়ন সমর্থন করতে মুক্ত মনে অনুদান করুন।</string>
-    <string name="qksms_plus_donate">পেপাল এর মাধ্যমে দান করুন</string>
-    <string name="qksms_plus_coming_soon">শীঘ্রই আসছে</string>
-    <string name="qksms_plus_themes_title">প্রিমিয়াম থিম</string>
-    <string name="qksms_plus_themes_summary">Material Design প্যালেট পাওয়া যায় না এমন সুন্দর রঙয়ের থীম আনলক করুন</string>
-    <string name="qksms_plus_emoji_title">কাস্টম সক্রিয়-ইমোজি</string>
-    <string name="qksms_plus_emoji_summary">কাস্টম সক্রিয়-ইমোজি শর্টকাট তৈরি করুন</string>
-    <string name="qksms_plus_backup_title">বার্তাগুলোর ব্যাকআপ</string>
-    <string name="qksms_plus_backup_summary">তোমার বার্তাগুলো স্বয়ংক্রিয়ভাবে ব্যাকআপ করো। এবার তোমার ফোন পরিবর্তন বা নষ্ট হওয়ায় এসএমএস-এর ইতিহাস হারানো নিয়ে কখনো উদ্বিগ্ন হতে হবে না</string>
-    <string name="qksms_plus_scheduled_title">পরিকল্পিত বার্তাগুলি</string>
-    <string name="qksms_plus_scheduled_summary">পরিকল্পিত বার্তাগুলি স্বয়ংক্রিয়ভাবে একটি নির্দিষ্ট সময় ও তারিখে প্রেরণ করা হবে</string>
-    <string name="qksms_plus_delayed_title">বিলম্বে পাঠাও</string>
-    <string name="qksms_plus_delayed_summary">তোমার বার্তা পাঠানোর আগে কয়েক সেকেন্ড অপেক্ষা করো</string>
-    <string name="qksms_plus_night_title">স্বয়ংক্রিয় রাত্রি মোড</string>
-    <string name="qksms_plus_night_summary">দিন সময় উপর ভিত্তি করে নাইট মোড সক্ষম করুন</string>
-    <string name="qksms_plus_blacklist_title">উন্নীত আনব্লক করা</string>
-    <string name="qksms_plus_blacklist_summary">সেই সব বার্তা ব্লক(অবরোধ) করো যা কোন শব্দ বা নমুনার সাথে মিলে</string>
-    <string name="qksms_plus_forward_title">সক্রিয়ভাবে সামনে পাঠান</string>
-    <string name="qksms_plus_forward_summary">নির্দিষ্ট প্রেরকের বার্তাগুলো স্বয়ংক্রিয়ভাবে সামনে পাঠাও(ফরওয়ার্ড)</string>
-    <string name="qksms_plus_respond_title">স্বয়ংক্রিয়-উত্তর</string>
-    <string name="qksms_plus_respond_summary">আগত বার্তার জন্য স্বয়ংক্রিয়ভাবে পূর্বনির্ধারিত প্রতিক্রিয়া পাঠাও</string>
-    <string name="qksms_plus_more_title">আরও</string>
-    <string name="qksms_plus_more_summary">QKSMS সক্রিয় উন্নয়ন অধীনে এবং QKSMS+ এর সকাল ভবিষ্যত ফিচার আপনার কেনা অ্যাপেে অন্তর্ভুক্ত থাকবে!</string>
-    <string name="widget_loading">লোড হচ্ছে&#8230;</string>
-    <string name="widget_more">আরও আলাপ দেখো</string>
-    <string name="qkreply_menu_read">পড়া হয়েছে</string>
-    <string name="qkreply_menu_call">কল করুন</string>
-    <string name="qkreply_menu_delete">মুছে ফেলুন</string>
-    <string name="qkreply_menu_expand">আরও দেখান</string>
-    <string name="qkreply_menu_collapse">আরও কম প্রদর্শন করুন</string>
-    <string name="qkreply_menu_view">আলাপ খুলো</string>
-    <string name="theme_material">উপকরণ</string>
-    <string name="theme_hex">হেক্স</string>
-    <string name="theme_apply">প্রয়োগ করুন</string>
-    <string-array name="notification_actions">
-        <item>কোনোটা না</item>
-        <item>আর্কাইভ</item>
-        <item>মুছুন</item>
-        <item>অবরুদ্ধ</item>
-        <item>কল</item>
-        <item>পড়া হয়েছে</item>
-        <item>প্রতুত্তর</item>
-    </string-array>
-    <string name="button_yes">হ্যাঁ</string>
-    <string name="button_continue">এগিয়ে যানও</string>
-    <string name="button_cancel">বাতিল করুন</string>
-    <string name="button_delete">মুছে ফেলুন</string>
-    <string name="button_save">সেভ করুন</string>
-    <string name="button_stop">থামুন</string>
-    <string name="button_more">আরও</string>
-    <string name="button_set">সেট করুন</string>
-    <string name="button_undo">বাতিল করো</string>
-    <string name="toast_copied">অনুলিপি করা হয়েছে</string>
-    <string name="toast_archived">আর্কাইভ করা আলাপ</string>
-    <string name="toast_qksms_plus">এই ব্যবহার করতে আপনাকে অবশ্যই QKSMS + আনলক করতে হবে</string>
-    <plurals name="notification_new_messages">
-        <item quantity="one">নতুন বার্তা</item>
-        <item quantity="other">%sটি নতুন বার্তা</item>
-    </plurals>
-    <string name="notification_message_failed_title">বার্তা পাঠাতে ব্যর্থ</string>
-    <string name="notification_message_failed_text">%s এর কাছে বার্তাটি পাঠাতে ব্যর্থ</string>
-    <string-array name="night_modes">
-        <item>পদ্ধতি</item>
-        <item>অক্ষম</item>
-        <item>সর্বদা চালু</item>
-        <item>স্বয়ংক্রিয়</item>
-    </string-array>
-    <string-array name="notification_preview_options">
-        <item>নাম এবং বার্তা প্রদর্শন করো</item>
-        <item>নাম দেখান</item>
-        <item>কন্টেন্ট আড়াল করুন</item>
-    </string-array>
-    <string-array name="text_sizes">
-        <item>ছোট</item>
-        <item>স্বাভাবিক</item>
-        <item>বড়</item>
-        <item>বড়</item>
-    </string-array>
-    <string-array name="delayed_sending_labels">
-        <item>কোনো বিলম্ব নেই</item>
-        <item>৩ সেকেন্ড</item>
-        <item>৫ সেকেন্ড</item>
-        <item>১০ সেকেন্ড</item>
-    </string-array>
-    <string-array name="mms_sizes">
-        <item>স্বয়ংক্রিয়</item>
-        <item>১০০কিবা</item>
-        <item>২০০কিবা</item>
-        <item>৩০০কিবা</item>
-        <item>৬০০কিবা</item>
-        <item>১০০০কিবা</item>
-        <item>২০০০কিবা</item>
-        <item>সংকোচন নেই(compression)</item>
-    </string-array>
-    <string-array name="qk_responses">
-        <item>ঠিক আছে</item>
-        <item>একটু অপেক্ষা করুন</item>
-        <item>পথেই আছি</item>
-        <item>ধন্যবাদ</item>
-        <item>শুনতে ভালো লাগে</item>
-        <item>কি খবর?</item>
-        <item>একমত</item>
-        <item>না</item>
-        <item>ভালোবাসি তোমাকে</item>
-        <item>দুঃখিত</item>
-        <item>হাহা</item>
-        <item>তা ঠিক আছে।</item>
-    </string-array>
-</resources>
+<?xml version="1.0" encoding="utf-8"?>
+<!--
+  ~ Copyright (C) 2019 Moez Bhatti <moez.bhatti@gmail.com>
+  ~
+  ~ This file is part of QKSMS.
+  ~
+  ~ QKSMS is free software: you can redistribute it and/or modify
+  ~ it under the terms of the GNU General Public License as published by
+  ~ the Free Software Foundation, either version 3 of the License, or
+  ~ (at your option) any later version.
+  ~
+  ~ QKSMS is distributed in the hope that it will be useful,
+  ~ but WITHOUT ANY WARRANTY; without even the implied warranty of
+  ~ MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+  ~ GNU General Public License for more details.
+  ~
+  ~ You should have received a copy of the GNU General Public License
+  ~ along with QKSMS.  If not, see <http://www.gnu.org/licenses/>.
+  -->
+<resources>
+    <string name="shortcut_compose_long_label">নতুন আলাপ</string>
+    <string name="shortcut_compose_short_label">কম্পোজ করো</string>
+    <string name="shortcut_compose_disabled_message">শর্টকাট নিষ্ক্রিয়</string>
+    <string name="title_archived">আর্কাইভকৃত</string>
+    <string name="title_settings">সেটিংস</string>
+    <string name="title_notification_prefs">বিজ্ঞপ্তি</string>
+    <string name="title_theme">থিম</string>
+    <string name="title_conversations">ইনবক্সে খুঁজো&#8230;</string>
+    <string name="title_compose">নাম বা নম্বর টাইপ করো</string>
+    <string name="setup_skip">এড়িয়ে যাও</string>
+    <string name="setup_next">আগাও</string>
+    <string name="menu_add_person">কাউকে যুক্ত করো</string>
+    <string name="menu_call">কল করো</string>
+    <string name="menu_info">বিস্তারিত</string>
+    <string name="menu_save">গ্যালারিতে সংরক্ষণ করো</string>
+    <string name="menu_share">শেয়ার</string>
+    <string name="main_drawer_open_cd">ন্যাভিগেশন ড্রয়ার খুলো</string>
+    <string name="main_title_selected">%d নির্বাচিত</string>
+    <string name="main_menu_clear">পরিষ্কার</string>
+    <string name="main_menu_archive">আর্কাইভ</string>
+    <string name="main_menu_unarchive">আনআর্কাইভ</string>
+    <string name="main_menu_delete">মুছে ফেলো</string>
+    <string name="main_menu_add_contact">পরিচিততে যুক্ত করো</string>
+    <string name="main_menu_pin">উপরে রাখো</string>
+    <string name="main_menu_unpin">উপর থেকে সরাও</string>
+    <string name="main_menu_read">পড়া হয়েছে</string>
+    <string name="main_menu_unread">পড়া হয়নি</string>
+    <string name="main_menu_block">অবরুদ্ধ</string>
+    <string name="main_syncing">বার্তাগুলি সিঙ্ক হচ্ছে&#8230;</string>
+    <string name="main_sender_you">তুমি: %s</string>
+    <string name="main_draft">খসড়া</string>
+    <string name="main_message_results_title">বার্তার ভিতর পাওয়া গেছে</string>
+    <string name="main_message_results">%dটি বার্তা</string>
+    <string name="inbox_empty_text">তোমার আলাপ এখানে দেখা যাবে</string>
+    <string name="inbox_search_empty_text">কোনো ফলাফল নেই</string>
+    <string name="archived_empty_text">তোমার আর্কাইভ করা আলাপ এখানে দেখা যাবে</string>
+    <string name="main_fab_cd">নতুন আলাপ শুরু করো</string>
+    <string name="main_default_sms_title">আবার বার্তাকে ভালবাসুন</string>
+    <string name="main_default_sms_message">QKSMS-কে তোমার ডিফল্ট এসএমএস অ্যাপ করো</string>
+    <string name="main_default_sms_change">পরিবর্তন করো</string>
+    <string name="main_permission_required">অনুমতি প্রয়োজন</string>
+    <string name="main_permission_sms">QKSMS-এর এসএমএস বার্তাগুলো পাঠানোর এবং দেখার অনুমতি প্রয়োজন</string>
+    <string name="main_permission_contacts">QKSMS-এর তোমার পরিচিতিগুলি দেখার জন্য অনুমতি প্রয়োজন</string>
+    <string name="main_permission_allow">মঞ্জুর করো</string>
+    <string name="drawer_inbox">ইনবক্স</string>
+    <string name="drawer_archived">আর্কাইভকৃত</string>
+    <string name="drawer_scheduled">পরিকল্পিত</string>
+    <string name="drawer_blocking">অবরুদ্ধ</string>
+    <string name="drawer_more">আরো</string>
+    <string name="drawer_settings">সেটিংস</string>
+    <string name="drawer_help">সাহায্য &amp; প্রতিক্রিয়া</string>
+    <string name="drawer_invite">বন্ধুদের আমন্ত্রণ জানাও</string>
+    <string name="drawer_plus_banner_summary">অসাধারণ সব নতুন বৈশিষ্ট্য পাও এবং উন্নয়নে সাহায্য করো</string>
+    <string name="rate_title">QKSMS উপভোগ করছো?</string>
+    <string name="rate_summary">আমাদের প্রতি ভালবাসে দেখাতে Google Play-এ আমাদের মূল্যায়ন করো!</string>
+    <string name="rate_okay">ঠিক আছে!</string>
+    <string name="rate_dismiss">বাতিল করো</string>
+    <string name="dialog_delete_title">মুছে ফেলো</string>
+    <plurals name="dialog_delete_message">
+        <item quantity="one">তুমি কি নিশ্চিত যে এই আলাপটি তুমি মুছে ফেলতে চাও?</item>
+        <item quantity="other">তুমি কি নিশ্চিত যে %d টি আলাপ তুমি মুছতে চাও?</item>
+    </plurals>
+    <string-array name="message_options">
+        <item>লেখা অনুলিপি করো</item>
+        <item>অন্যকে পাঠাও</item>
+        <item>মুছো</item>
+    </string-array>
+    <string name="compose_number_picker_title">ফোন নম্বর নির্বাচন করো</string>
+    <string name="compose_number_picker_default">%s ∙ পূর্বনির্ধারিত</string>
+    <string name="compose_number_picker_once">মাত্র একবার</string>
+    <string name="compose_number_picker_always">সর্বদা</string>
+    <string name="compose_title_selected">%d নির্বাচিত</string>
+    <string name="compose_subtitle_results">%2$d এর %1$d টি ফলাফল </string>
+    <string name="compose_send_group_title">গ্রুপ বার্তা হিসেবে পাঠাও</string>
+    <string name="compose_send_group_summary">প্রাপক এবং উত্তর সবার চোখে পড়বে</string>
+    <string name="compose_messages_empty">এখানে তোমার আলাপ শুরু হয়। সুন্দর কিছু বলো!</string>
+    <string name="compose_vcard_label">পরিচিতি কার্ড</string>
+    <string name="compose_scheduled_for">জন্য পরিকল্পিত</string>
+    <string name="compose_scheduled_future">নির্বাচিত সময় অবশ্য ভবিষ্যতে হতে হবে!</string>
+    <string name="compose_scheduled_plus">পরিকল্পিত বার্তাপ্রেরক ব্যবহার করতে আপনাকে অবশ্যই QKSMS + আনলক করতে হবে</string>
+    <string name="compose_scheduled_toast">পূর্বসূচিত বার্তাগুলোতে যোগ করা হয়েছে</string>
+    <string name="compose_hint">একটি বার্তা লিখো&#8230;</string>
+    <string name="compose_menu_copy">পাঠ্য অনুলিপি করুন</string>
+    <string name="compose_menu_forward">সামনে পাঠান</string>
+    <string name="compose_menu_delete">মুছে ফেলুন</string>
+    <string name="compose_menu_previous">পূর্ববর্তী</string>
+    <string name="compose_menu_next">পরবর্তী</string>
+    <string name="compose_menu_clear">পরিষ্কার</string>
+    <string name="compose_details_title">বার্তার বিস্তারিত</string>
+    <string name="compose_details_type">ধরন: %s</string>
+    <string name="compose_details_from">থেকে: %s</string>
+    <string name="compose_details_to">কাছে: %s</string>
+    <string name="compose_details_subject">বিষয়: %s</string>
+    <string name="compose_details_priority">অগ্রাধিকার: %s</string>
+    <string name="compose_details_size">আকার: %s</string>
+    <string name="compose_details_sent">প্রেরিত: %s</string>
+    <string name="compose_details_received">গৃহীত: %s</string>
+    <string name="compose_details_delivered">প্রেরিত হয়েছে: %s</string>
+    <string name="compose_details_error_code">ত্রুটি কোড: %d</string>
+    <string name="compose_attach_cd">সংযুক্তি যোগ করুন</string>
+    <string name="compose_gallery_cd">ছবি সংযুক্ত করুন</string>
+    <string name="compose_camera_cd">একটি ছবি নিন</string>
+    <string name="compose_schedule_cd">বার্তা পাঠানোর সময়সূচি নির্ধারণ করো</string>
+    <string name="compose_contact_cd">একটি পরিচিতি সংযুক্ত করুন</string>
+    <string name="compose_contact_error">পরিচিতি পড়তে ত্রুটি</string>
+    <!-- Example: SIM 1 (Verizon) selected-->
+    <string name="compose_sim_changed_toast">সিম %1$d (%2$s) নির্বাচিত</string>
+    <string name="compose_sim_cd">নির্বাচিত, %s সিম কার্ড পরিবর্তন করুন</string>
+    <string name="compose_send_cd">বার্তা পাঠাও</string>
+    <string name="message_status_sending">পাঠানো হচ্ছে&#8230;</string>
+    <string name="message_status_delivered">প্রেরিত হয়েছে: %s</string>
+    <string name="message_status_failed">পাঠাতে ব্যর্থ। আবার চেষ্টা করতে টিপ দাও</string>
+    <string name="info_title">বিস্তারিত</string>
+    <string name="info_copied_address">ঠিকানা অনুলিপিত</string>
+    <string name="info_name">আলাপের শিরোনাম</string>
+    <string name="info_notifications">নোটিফিকেশন</string>
+    <string name="info_theme">থিম</string>
+    <string name="info_archive">আর্কাইভ</string>
+    <string name="info_unarchive">আনআর্কাইভ</string>
+    <string name="info_block">ব্লক করুন</string>
+    <string name="info_unblock">আনব্লক করুন</string>
+    <string name="info_delete">আলাপ মুছে ফেলো</string>
+    <string name="gallery_error">মিডিয়া লোড করা যায়নি</string>
+    <string name="gallery_toast_saved">গ্যালারীতে সেভ করুন</string>
+    <string name="backup_title">ব্যাকআপ ও পুনরুদ্ধার</string>
+    <string name="backup_backing_up">মেসেজ ব্যাকআপ হচ্ছে </string>
+    <string name="backup_restoring">ব্যাকআপ হতে পুনরুদ্ধার হচ্ছে </string>
+    <string name="backup_last">সর্বশেষ ব্যাকআপ</string>
+    <string name="backup_loading">লোড হচ্ছে&#8230;</string>
+    <string name="backup_never">কখনই না </string>
+    <string name="backup_restore_title">পুনরুদ্ধার</string>
+    <string name="backup_restore_summary">ব্যাকআপ নির্বাচন করুন</string>
+    <string name="backup_restore_error_plus">ব্যাকআপ এবং পুনরুদ্ধার ব্যবহার করতে দয়া করে QKSMS + আনলক করুন</string>
+    <string name="backup_restore_error_backup">ব্যাক-আপ চলছে&#8230;</string>
+    <string name="backup_restore_error_restore">পুনরুদ্ধার চলছে&#8230;</string>
+    <string name="backup_restore_confirm_title">ব্যাক-আপ থেকে পুনরুদ্ধার করুন</string>
+    <string name="backup_restore_confirm_message">আপনি কি নিশ্চিত যে আপনি এই ব্যাকআপ থেকে আপনার বার্তাগুলি পুনরুদ্ধার করতে চান?</string>
+    <string name="backup_restore_stop_title">পুনরুদ্ধার থামান</string>
+    <string name="backup_restore_stop_message">ইতিমধ্যে পুনরুদ্ধার করা বার্তাগুলি আপনার ডিভাইসে থাকবে</string>
+    <string name="backup_restore_dialog_title">ব্যাকআপ গুলো</string>
+    <string name="backup_restore_dialog_empty">কোন ব্যাকআপ পাওয়া যায়নি</string>
+    <plurals name="backup_message_count">
+        <item quantity="one">%d মেসেজ</item>
+        <item quantity="other">%dটি মেসেজ</item>
+    </plurals>
+    <string name="backup_disclaimer">এইমুহুর্তে, ব্যাকআপ এবং পুনরুদ্ধার শুধুমাত্র এসএমএস এ করতে পারবেন । এমএমএস সাপর্ট  ও  শিডিউল  ব্যাকআপ শীঘ্রই আসছে!</string>
+    <string name="backup_now">ব্যাকআপ করুন </string>
+    <string name="backup_progress_parsing">ব্যাক-আপ পার্স করা হচ্ছে&#8230;</string>
+    <string name="backup_progress_running">%d/%d বার্তা</string>
+    <string name="backup_progress_saving">ব্যাক-আপ সংরক্ষণ করা হচ্ছে&#8230;</string>
+    <string name="backup_progress_syncing">বার্তাগুলো সিঙ্ক করা হচ্ছে&#8230;</string>
+    <string name="backup_progress_finished">শেষ হয়েছে!</string>
+    <string name="backup_notification_channel_name">ব্যাকআপ ও পুনরুদ্ধার</string>
+    <string name="scheduled_title">পরিকল্পিত</string>
+    <string name="scheduled_empty_description">স্বয়ংক্রিয়ভাবে একটি বার্তা পাঠাও, ঠিক যে মুহূর্তে তুমি চাও</string>
+    <string name="scheduled_empty_message_1">ওই! তোমার জন্মদিন যেন কবে?</string>
+    <string name="scheduled_empty_message_2">ওটা ২৩শে ডিসেম্বরে</string>
+    <string name="scheduled_empty_message_3">শুভ জন্মদিন! দেখো তোমার জন্মদিন মনে রাখায় আমি কতো ভালো একটা বন্ধু</string>
+    <!--&#x200A; is a special character required at the end of this string to fix it's formatting in the app -->
+    <string name="scheduled_empty_message_3_timestamp">২৩শে ডিসেম্বর পাঠানো হচ্ছে </string>
+    <string name="scheduled_compose_cd">পরবর্তীতে পাঠানোর জন্য একটি বার্তা পরিকল্পনা করো</string>
+    <string name="scheduled_options_title">পরিকল্পিত বার্তা</string>
+    <string-array name="scheduled_options">
+        <item>এখন পাঠাও</item>
+        <item>লেখা অনুলিপি করো</item>
+        <item>মুছো</item>
+    </string-array>
+    <string name="settings_category_appearance">উপস্থিতি</string>
+    <string name="settings_category_general">সাধারণ</string>
+    <string name="settings_category_qkreply">QK উত্তর</string>
+    <string name="settings_theme_title">থিম</string>
+    <string name="settings_night_title">নাইট মোড</string>
+    <string name="settings_black_title">সম্পূর্ণ কালো রাত্রি মোড</string>
+    <string name="settings_night_start_title">শুরুর সময়</string>
+    <string name="settings_night_end_title">শেষের সময়</string>
+    <string name="settings_automatic_colors_title">যোগাযোগদের স্বয়ংক্রিয় রং</string>
+    <string name="settings_text_size_title">ফন্টের আকার</string>
+    <string name="settings_system_font_title">সিস্টেম ফন্ট ব্যবহার করুন</string>
+    <string name="settings_auto_emoji_title">স্বয়ংক্রিয় ইমোজি</string>
+    <string name="settings_notifications_title">নোটিফিকেশন</string>
+    <string name="settings_notifications_o_summary">কাস্টমাইজ করতে ট্যাপ করুন</string>
+    <string name="settings_notification_actions_title">অ্যাকশনগুলি</string>
+    <string name="settings_notification_action_1">বাটন ১</string>
+    <string name="settings_notification_action_2">বাটন ২</string>
+    <string name="settings_notification_action_3">বাটন ৩</string>
+    <string name="settings_notification_previews_title">নোটিফিকেশন প্রিভিউ</string>
+    <string name="settings_notification_wake_title">স্ক্রিন জাগাও</string>
+    <string name="settings_vibration_title">কম্পন</string>
+    <string name="settings_ringtone_title">শব্দ</string>
+    <string name="settings_ringtone_none">কোনোটা না</string>
+    <string name="settings_qkreply_title">QK উত্তর</string>
+    <string name="settings_qkreply_summary">নতুন বার্তার জন্য পপ-আপ</string>
+    <string name="settings_qkreply_tap_dismiss_title">সরিয়ে দিতে ট্যাপ করুন</string>
+    <string name="settings_qkreply_tap_dismiss_summary">এটি বন্ধ করার জন্য পপআপের বাইরে ট্যাপ করুন</string>
+    <string name="settings_delayed_title">বিলম্বে পাঠাও</string>
+    <string name="settings_swipe_actions">সোয়াইপের জন্য অ্যাকশনগুলি</string>
+    <string name="settings_swipe_actions_summary">আলাপের জন্য সোয়াইপ সংকেতগুলো পরিবর্তন করো</string>
+    <string name="settings_swipe_actions_right">ডানে সোয়াইপ করুন</string>
+    <string name="settings_swipe_actions_left">বামে সোয়াইপ করুন</string>
+    <string name="settings_swipe_actions_change">পরিবর্তন করুন</string>
+    <string-array name="settings_swipe_actions">
+        <item>কোনোটা না</item>
+        <item>আর্কাইভ করুন</item>
+        <item>মুছে ফেলুন</item>
+        <item>অবরুদ্ধ করো</item>
+        <item>কল</item>
+        <item>পড়া হয়েছে চিহ্নিত করো</item>
+        <item>পড়া হয়নি চিহ্নিত করো</item>
+    </string-array>
+    <string name="settings_delivery_title">ডেলিভারি নিশ্চিতকরন</string>
+    <string name="settings_delivery_summary">নিশ্চিত করো যে বার্তা সফলভাবে পাঠানো হয়েছে</string>
+    <string name="settings_signature_title">স্বাক্ষর</string>
+    <string name="settings_signature_summary">তোমার বার্তাগুলোর শেষে একটা স্বাক্ষর যোগ করো</string>
+    <string name="settings_unicode_title">কথার টান সরিয়ে দিন</string>
+    <string name="settings_unicode_summary">বহির্গামী এসএমএস বার্তার অক্ষর থেকে কথার টান সরিয়ে নাও(accent)</string>
+    <string name="settings_mobile_title">শুধু মোবাইল নম্বর</string>
+    <string name="settings_mobile_summary">বার্তা লিখার করার সময়, শুধুমাত্র মোবাইল নম্বর দেখাও</string>
+    <string name="settings_auto_delete">Delete old messages automatically</string>
+    <string name="settings_auto_delete_dialog_message">Messages will be deleted after the specified number of days</string>
+    <string name="settings_auto_delete_dialog_hint">Number of days</string>
+    <string name="settings_auto_delete_never">Never</string>
+    <string name="settings_auto_delete_warning">Delete old messages automatically?</string>
+    <string name="settings_auto_delete_warning_message">If you proceed, %1$d messages will be deleted now</string>
+    <plurals name="settings_auto_delete_summary">
+        <item quantity="one">After 1 day</item>
+        <item quantity="other">After %d days</item>
+    </plurals>
+    <string name="settings_long_as_mms_title">দীর্ঘ বার্তা এমএমএস হিসেবে পাঠাও</string>
+    <string name="settings_long_as_mms_summary">যদি তোমার দীর্ঘ বার্তা পাঠানো ব্যর্থ হয় বা ভুল ক্রমানুসারে পাঠানো হয় তবে তুমি তার পরিবর্তে বার্তাগুলো এমএমএস বার্তা হিসাবে প্রেরণ করতে পারো। অতিরিক্ত চার্জ প্রযোজ্য হতে পারে</string>
+    <string name="settings_mms_size_title">এমএমএসের সংযুক্তি সক্রিয়ভাবে সংকোচন করুন</string>
+    <string name="settings_sync_title">বার্তাগুলি সিঙ্ক করো</string>
+    <string name="settings_sync_summary">তোমার বার্তাগুলি অ্যান্ড্রয়েডের নিজস্ব এসএমএস এর ডাটাবেসের সাথে পুনরায় সিঙ্ক করো</string>
+    <string name="settings_about_title">QKSMS সম্পর্কে</string>
+    <string name="settings_version">সংস্করণ %s</string>
+    <string name="settings_logging_enabled">ডিবাগ লগিং চালু করা হয়ছে</string>
+    <string name="settings_logging_disabled">ডিবাগ লগিং বন্ধ করা হয়ছে</string>
+    <string name="settings_delay_duration_hint">দৈর্ঘ্য (সেকেন্ডে) লিখুন</string>
+    <string name="blocking_title">অবরুদ্ধ হচ্ছে</string>
+    <string name="blocking_drop_title">বার্তা ফেলে দাও</string>
+    <string name="blocking_drop_summary">অবরোধকৃত প্রেরকদের বার্তা লুকানোর জায়গায় ফেলে দাও</string>
+    <string name="blocking_conversations">অবরুদ্ধ কথাবার্তা</string>
+    <string name="blocking_manager_title">অবরুদ্ধকরণ ব্যবস্থাপক</string>
+    <string name="blocking_manager_qksms_title">QKSMS</string>
+    <string name="blocking_manager_qksms_summary">QKSMS-এর অন্তর্ভুক্ত অবরোধী সক্ষমতা(blocking)</string>
+    <string name="blocking_manager_call_control_summary">তোমার কল আর বার্তা একটাই সুবিধাজনক জায়গা থেকে ফিল্টার করো বা ছাঁকো! Community IQ™ দিয়ে অবাঞ্ছিত বার্তা আটকানো যায় সমাজে পরিচিত স্প্যামারদের থেকে</string>
+    <string name="blocking_manager_sia_summary">স্বয়ংক্রিয়ভাবে \"Should I Answer\"(আমার কি উত্তর দেয়া উচিত?) অ্যাপ্লিকেশন ব্যবহার করে অযাচিত নম্বর-এর বার্তাগুলি ফিল্টার করো</string>
+    <string name="blocking_manager_copy_title">অবরুদ্ধ নম্বরগুলো অনুলিপি করো</string>
+    <string name="blocking_manager_copy_summary">%s-এ এগিয়ে যাও এবং তোমার আগের অবরোধকৃত নম্বরগুলো অনুলিপি করো</string>
+    <string name="blocked_numbers_title">অবরুদ্ধ নম্বরগুলো</string>
+    <string name="blocked_numbers_empty">তোমার অবরোধকৃত নম্বরগুলো এখানে আসবে</string>
+    <string name="blocked_numbers_add_cd">একটি নতুন নম্বর অবরোধ করো</string>
+    <string name="blocked_numbers_dialog_title">বার্তা অবরোধ করো এদের থেকে</string>
+    <string name="blocked_numbers_dialog_hint">ফোন নম্বর</string>
+    <string name="blocked_numbers_dialog_block">অবরুদ্ধ করুন</string>
+    <string name="blocked_messages_title">অবরুদ্ধ করা বার্তা</string>
+    <string name="blocked_messages_empty">অবরুদ্ধ করা বার্তা এখানে আসবে</string>
+    <string name="blocking_block_title">অবরুদ্ধ</string>
+    <string name="blocking_unblock_title">অবরুদ্ধতা বাতিল করুন</string>
+    <plurals name="blocking_block_external">
+        <item quantity="one">%s-এ এগিয়ে যাও এবং এই নম্বর অবরোধ করো</item>
+        <item quantity="other">%s-এ এগিয়ে যাও ও এই নম্বরগুলো অবরোধ করো</item>
+    </plurals>
+    <plurals name="blocking_unblock_external">
+        <item quantity="one">%s-এ এগিয়ে যাও ও এই নম্বর থেকে বার্তা আসতে দাও</item>
+        <item quantity="other">%s-এ এগিয়ে যাও ও এই নম্বরগুলো থেকে বার্তা আসতে দাও</item>
+    </plurals>
+    <string name="about_title">সম্পর্কে</string>
+    <string name="about_version_title">সংস্করণ</string>
+    <string name="about_developer_title">ডেভেলপার</string>
+    <string name="about_source_title">সোর্স কোড</string>
+    <string name="about_changelog_title">পরিবর্তনসূচী</string>
+    <string name="about_contact_title">যোগাযোগ করুন</string>
+    <string name="about_license_title">লাইসেন্স</string>
+    <string name="about_copyright_title">স্বত্ব</string>
+    <string name="qksms_plus_description_title">উন্নয়নে সমর্থন করুন, সবকিছু আনলক করুন</string>
+    <string name="qksms_plus_description_summary">আপনি একটি ক্ষুধার ডেভেলপারকে বাঁচাতে পারেন মাত্র %s</string>
+    <!-- Substitutions are for price and currency. Ex: Lifetime upgrade for $1.99 USD -->
+    <string name="qksms_plus_upgrade">সারা জীবনের জন্য আপগ্রেড করুন %1$s %2$s দিয়ে</string>
+    <!-- Substitutions are for price and currency. Ex: Unlock + donate for $4.99 USD -->
+    <string name="qksms_plus_upgrade_donate">%1$s %2$s দান করুন, + আনলক করুন</string>
+    <string name="qksms_plus_thanks_title">QKSMS সমর্থনের জন্য আপনাকে ধন্যবাদ!</string>
+    <string name="qksms_plus_thanks_summary">আপনি এখন QKSMS+-এর সব বৈশিষ্ট্যেের সুবিধা পাচ্ছেন</string>
+    <string name="qksms_plus_free_title">F-Droid ব্যবহারকারীরা QKSMS+ বিনামূল্যে ব্যবহার করতে পারবেন! যদি আপনি উন্নয়ন সমর্থন করতে মুক্ত মনে অনুদান করুন।</string>
+    <string name="qksms_plus_donate">পেপাল এর মাধ্যমে দান করুন</string>
+    <string name="qksms_plus_coming_soon">শীঘ্রই আসছে</string>
+    <string name="qksms_plus_themes_title">প্রিমিয়াম থিম</string>
+    <string name="qksms_plus_themes_summary">Material Design প্যালেট পাওয়া যায় না এমন সুন্দর রঙয়ের থীম আনলক করুন</string>
+    <string name="qksms_plus_emoji_title">কাস্টম সক্রিয়-ইমোজি</string>
+    <string name="qksms_plus_emoji_summary">কাস্টম সক্রিয়-ইমোজি শর্টকাট তৈরি করুন</string>
+    <string name="qksms_plus_backup_title">বার্তাগুলোর ব্যাকআপ</string>
+    <string name="qksms_plus_backup_summary">তোমার বার্তাগুলো স্বয়ংক্রিয়ভাবে ব্যাকআপ করো। এবার তোমার ফোন পরিবর্তন বা নষ্ট হওয়ায় এসএমএস-এর ইতিহাস হারানো নিয়ে কখনো উদ্বিগ্ন হতে হবে না</string>
+    <string name="qksms_plus_scheduled_title">পরিকল্পিত বার্তাগুলি</string>
+    <string name="qksms_plus_scheduled_summary">পরিকল্পিত বার্তাগুলি স্বয়ংক্রিয়ভাবে একটি নির্দিষ্ট সময় ও তারিখে প্রেরণ করা হবে</string>
+    <string name="qksms_plus_delayed_title">বিলম্বে পাঠাও</string>
+    <string name="qksms_plus_delayed_summary">তোমার বার্তা পাঠানোর আগে কয়েক সেকেন্ড অপেক্ষা করো</string>
+    <string name="qksms_plus_night_title">স্বয়ংক্রিয় রাত্রি মোড</string>
+    <string name="qksms_plus_night_summary">দিন সময় উপর ভিত্তি করে নাইট মোড সক্ষম করুন</string>
+    <string name="qksms_plus_blacklist_title">উন্নীত আনব্লক করা</string>
+    <string name="qksms_plus_blacklist_summary">সেই সব বার্তা ব্লক(অবরোধ) করো যা কোন শব্দ বা নমুনার সাথে মিলে</string>
+    <string name="qksms_plus_forward_title">সক্রিয়ভাবে সামনে পাঠান</string>
+    <string name="qksms_plus_forward_summary">নির্দিষ্ট প্রেরকের বার্তাগুলো স্বয়ংক্রিয়ভাবে সামনে পাঠাও(ফরওয়ার্ড)</string>
+    <string name="qksms_plus_respond_title">স্বয়ংক্রিয়-উত্তর</string>
+    <string name="qksms_plus_respond_summary">আগত বার্তার জন্য স্বয়ংক্রিয়ভাবে পূর্বনির্ধারিত প্রতিক্রিয়া পাঠাও</string>
+    <string name="qksms_plus_more_title">আরও</string>
+    <string name="qksms_plus_more_summary">QKSMS সক্রিয় উন্নয়ন অধীনে এবং QKSMS+ এর সকাল ভবিষ্যত ফিচার আপনার কেনা অ্যাপেে অন্তর্ভুক্ত থাকবে!</string>
+    <string name="widget_loading">লোড হচ্ছে&#8230;</string>
+    <string name="widget_more">আরও আলাপ দেখো</string>
+    <string name="qkreply_menu_read">পড়া হয়েছে</string>
+    <string name="qkreply_menu_call">কল করুন</string>
+    <string name="qkreply_menu_delete">মুছে ফেলুন</string>
+    <string name="qkreply_menu_expand">আরও দেখান</string>
+    <string name="qkreply_menu_collapse">আরও কম প্রদর্শন করুন</string>
+    <string name="qkreply_menu_view">আলাপ খুলো</string>
+    <string name="theme_material">উপকরণ</string>
+    <string name="theme_hex">হেক্স</string>
+    <string name="theme_apply">প্রয়োগ করুন</string>
+    <string-array name="notification_actions">
+        <item>কোনোটা না</item>
+        <item>আর্কাইভ</item>
+        <item>মুছুন</item>
+        <item>অবরুদ্ধ</item>
+        <item>কল</item>
+        <item>পড়া হয়েছে</item>
+        <item>প্রতুত্তর</item>
+    </string-array>
+    <string name="button_yes">হ্যাঁ</string>
+    <string name="button_continue">এগিয়ে যানও</string>
+    <string name="button_cancel">বাতিল করুন</string>
+    <string name="button_delete">মুছে ফেলুন</string>
+    <string name="button_save">সেভ করুন</string>
+    <string name="button_stop">থামুন</string>
+    <string name="button_more">আরও</string>
+    <string name="button_set">সেট করুন</string>
+    <string name="button_undo">বাতিল করো</string>
+    <string name="toast_copied">অনুলিপি করা হয়েছে</string>
+    <string name="toast_archived">আর্কাইভ করা আলাপ</string>
+    <string name="toast_qksms_plus">এই ব্যবহার করতে আপনাকে অবশ্যই QKSMS + আনলক করতে হবে</string>
+    <plurals name="notification_new_messages">
+        <item quantity="one">নতুন বার্তা</item>
+        <item quantity="other">%sটি নতুন বার্তা</item>
+    </plurals>
+    <string name="notification_message_failed_title">বার্তা পাঠাতে ব্যর্থ</string>
+    <string name="notification_message_failed_text">%s এর কাছে বার্তাটি পাঠাতে ব্যর্থ</string>
+    <string-array name="night_modes">
+        <item>পদ্ধতি</item>
+        <item>অক্ষম</item>
+        <item>সর্বদা চালু</item>
+        <item>স্বয়ংক্রিয়</item>
+    </string-array>
+    <string-array name="notification_preview_options">
+        <item>নাম এবং বার্তা প্রদর্শন করো</item>
+        <item>নাম দেখান</item>
+        <item>কন্টেন্ট আড়াল করুন</item>
+    </string-array>
+    <string-array name="text_sizes">
+        <item>ছোট</item>
+        <item>স্বাভাবিক</item>
+        <item>বড়</item>
+        <item>বড়</item>
+    </string-array>
+    <string-array name="delayed_sending_labels">
+        <item>কোনো বিলম্ব নেই</item>
+        <item>৩ সেকেন্ড</item>
+        <item>৫ সেকেন্ড</item>
+        <item>১০ সেকেন্ড</item>
+    </string-array>
+    <string-array name="mms_sizes">
+        <item>স্বয়ংক্রিয়</item>
+        <item>১০০কিবা</item>
+        <item>২০০কিবা</item>
+        <item>৩০০কিবা</item>
+        <item>৬০০কিবা</item>
+        <item>১০০০কিবা</item>
+        <item>২০০০কিবা</item>
+        <item>সংকোচন নেই(compression)</item>
+    </string-array>
+    <string-array name="qk_responses">
+        <item>ঠিক আছে</item>
+        <item>একটু অপেক্ষা করুন</item>
+        <item>পথেই আছি</item>
+        <item>ধন্যবাদ</item>
+        <item>শুনতে ভালো লাগে</item>
+        <item>কি খবর?</item>
+        <item>একমত</item>
+        <item>না</item>
+        <item>ভালোবাসি তোমাকে</item>
+        <item>দুঃখিত</item>
+        <item>হাহা</item>
+        <item>তা ঠিক আছে।</item>
+    </string-array>
+</resources>
diff --git a/presentation/src/main/res/values-cs/strings.xml b/presentation/src/main/res/values-cs/strings.xml
index 301b4bf52..d27da861c 100644
--- a/presentation/src/main/res/values-cs/strings.xml
+++ b/presentation/src/main/res/values-cs/strings.xml
@@ -1,423 +1,423 @@
-<?xml version="1.0" encoding="utf-8"?>
-<!--
-  ~ Copyright (C) 2019 Moez Bhatti <moez.bhatti@gmail.com>
-  ~
-  ~ This file is part of QKSMS.
-  ~
-  ~ QKSMS is free software: you can redistribute it and/or modify
-  ~ it under the terms of the GNU General Public License as published by
-  ~ the Free Software Foundation, either version 3 of the License, or
-  ~ (at your option) any later version.
-  ~
-  ~ QKSMS is distributed in the hope that it will be useful,
-  ~ but WITHOUT ANY WARRANTY; without even the implied warranty of
-  ~ MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
-  ~ GNU General Public License for more details.
-  ~
-  ~ You should have received a copy of the GNU General Public License
-  ~ along with QKSMS.  If not, see <http://www.gnu.org/licenses/>.
-  -->
-<resources>
-    <string name="shortcut_compose_long_label">Nová konverzace</string>
-    <string name="shortcut_compose_short_label">Nová zpráva</string>
-    <string name="shortcut_compose_disabled_message">Zkratka vypnuta</string>
-    <string name="title_archived">Archivováno</string>
-    <string name="title_settings">Nastavení</string>
-    <string name="title_notification_prefs">Oznámení</string>
-    <string name="title_theme">Motiv vzhledu</string>
-    <string name="title_conversations">Hledat&#8230;</string>
-    <string name="title_compose">Nová zpráva</string>
-    <string name="setup_skip">Přeskočit</string>
-    <string name="setup_next">Pokračovat</string>
-    <string name="menu_add_person">Přidat osobu</string>
-    <string name="menu_call">Volat</string>
-    <string name="menu_info">Podrobnosti</string>
-    <string name="menu_save">Uložit do galerie</string>
-    <string name="menu_share">Sdílet</string>
-    <string name="main_drawer_open_cd">Otevřít menu</string>
-    <string name="main_title_selected">Vybráno: %d</string>
-    <string name="main_menu_clear">Vymazat</string>
-    <string name="main_menu_archive">Archivovat</string>
-    <string name="main_menu_unarchive">Obnovit z archivu</string>
-    <string name="main_menu_delete">Smazat</string>
-    <string name="main_menu_add_contact">Přidat do kontaktů</string>
-    <string name="main_menu_pin">Připnout nahoru</string>
-    <string name="main_menu_unpin">Odepnout</string>
-    <string name="main_menu_read">Označit jako přečtené</string>
-    <string name="main_menu_unread">Označit jako nepřečtené</string>
-    <string name="main_menu_block">Blokovat</string>
-    <string name="main_syncing">Synchronizace zpráv&#8230;</string>
-    <string name="main_sender_you">Vy: %s</string>
-    <string name="main_draft">Koncept</string>
-    <string name="main_message_results_title">Výsledky ve zprávách</string>
-    <string name="main_message_results">%d zpráv</string>
-    <string name="inbox_empty_text">Zde se objeví vaše konverzace</string>
-    <string name="inbox_search_empty_text">Žádné výsledky</string>
-    <string name="archived_empty_text">Zde se objeví vaše archivované konverzace</string>
-    <string name="main_fab_cd">Zahájit novou konverzaci</string>
-    <string name="main_default_sms_title">Zamilujte si znovu psaní</string>
-    <string name="main_default_sms_message">Nastavte si QKSMS jako výchozí SMS aplikaci</string>
-    <string name="main_default_sms_change">Nastavit</string>
-    <string name="main_permission_required">Vyžadováno oprávnění</string>
-    <string name="main_permission_sms">QKSMS potřebuje oprávnění pro odesílání a zobrazení SMS zpráv</string>
-    <string name="main_permission_contacts">QKSMS potřebuje oprávnění pro zobrazení vašich kontaktů</string>
-    <string name="main_permission_allow">Povolit</string>
-    <string name="drawer_inbox">Příchozí zprávy</string>
-    <string name="drawer_archived">Archivováno</string>
-    <string name="drawer_scheduled">Naplánováno</string>
-    <string name="drawer_blocking">Blokování</string>
-    <string name="drawer_more">Více</string>
-    <string name="drawer_settings">Nastavení</string>
-    <string name="drawer_help">Nápověda a zpětná vazba</string>
-    <string name="drawer_invite">Pozvat přátele</string>
-    <string name="drawer_plus_banner_summary">Odemkněte úžasné nové funkce a podpořte vývoj</string>
-    <string name="rate_title">Líbí se Vám QKSMS?</string>
-    <string name="rate_summary">Sdílejte trochu lásky a ohodnoťte nás na Google Play!</string>
-    <string name="rate_okay">Tak určitě!</string>
-    <string name="rate_dismiss">ZAVŘÍT</string>
-    <string name="dialog_delete_title">Smazat</string>
-    <plurals name="dialog_delete_message">
-        <item quantity="one">Opravdu chcete smazat tuto konverzaci?</item>
-        <item quantity="few">Opravdu chcete smazat %d konverzace?</item>
-        <item quantity="many">Opravdu chcete smazat %d konverzací?</item>
-        <item quantity="other">Opravdu chcete smazat %d konverzací?</item>
-    </plurals>
-    <string-array name="message_options">
-        <item>Kopírovat text</item>
-        <item>Přeposlat</item>
-        <item>Smazat</item>
-    </string-array>
-    <string name="compose_number_picker_title">Vybrat telefonní číslo</string>
-    <string name="compose_number_picker_default">%s ∙ Výchozí</string>
-    <string name="compose_number_picker_once">Pouze jednou</string>
-    <string name="compose_number_picker_always">Vždy</string>
-    <string name="compose_title_selected">Vybráno: %d</string>
-    <string name="compose_subtitle_results">%1$d z %2$d výsledků</string>
-    <string name="compose_send_group_title">Odeslat jako skupinovou zprávu</string>
-    <string name="compose_send_group_summary">Příjemci a odpovědi budou viditelné všem</string>
-    <string name="compose_messages_empty">Toto je začátek vaší konverzace. Řekněte něco hezkého!</string>
-    <string name="compose_vcard_label">Karta kontaktu</string>
-    <string name="compose_scheduled_for">Naplánováno na</string>
-    <string name="compose_scheduled_future">Vybraný čas musí teprve nastat (musí být v budoucnu).</string>
-    <string name="compose_scheduled_plus">Pro použití plánování zpráv je třeba povýšit na QKSMS+</string>
-    <string name="compose_scheduled_toast">Přidáno do naplánovaných zpráv</string>
-    <string name="compose_hint">Napsat zprávu&#8230;</string>
-    <string name="compose_menu_copy">Kopírovat text</string>
-    <string name="compose_menu_forward">Přeposlat</string>
-    <string name="compose_menu_delete">Smazat</string>
-    <string name="compose_menu_previous">Předchozí</string>
-    <string name="compose_menu_next">Další</string>
-    <string name="compose_menu_clear">Vymazat</string>
-    <string name="compose_details_title">Podrobnosti zprávy</string>
-    <string name="compose_details_type">Typ: %s</string>
-    <string name="compose_details_from">Od: %s</string>
-    <string name="compose_details_to">Pro: %s</string>
-    <string name="compose_details_subject">Předmět: %s</string>
-    <string name="compose_details_priority">Priorita: %s</string>
-    <string name="compose_details_size">Velikost: %s</string>
-    <string name="compose_details_sent">Odesláno: %s</string>
-    <string name="compose_details_received">Přijato: %s</string>
-    <string name="compose_details_delivered">Doručeno: %s</string>
-    <string name="compose_details_error_code">Kód chyby: %d</string>
-    <string name="compose_attach_cd">Připojit přílohu</string>
-    <string name="compose_gallery_cd">Připojit fotografii</string>
-    <string name="compose_camera_cd">Fotografovat</string>
-    <string name="compose_schedule_cd">Naplánovat zprávu</string>
-    <string name="compose_contact_cd">Přiložit kontakt</string>
-    <string name="compose_contact_error">Chyba čtení kontaktu</string>
-    <!-- Example: SIM 1 (Verizon) selected-->
-    <string name="compose_sim_changed_toast">Vybrána SIM %1$d (%2$s)</string>
-    <string name="compose_sim_cd">%s vybráno, změňte SIM kartu</string>
-    <string name="compose_send_cd">Odeslat zprávu</string>
-    <string name="message_status_sending">Odesílání&#8230;</string>
-    <string name="message_status_delivered">Doručeno %s</string>
-    <string name="message_status_failed">Odeslání se nezdařilo. Klepnutím zkusíte znovu odeslat</string>
-    <string name="info_title">Podrobnosti</string>
-    <string name="info_copied_address">Adresa zkopírována</string>
-    <string name="info_name">Název konverzace</string>
-    <string name="info_notifications">Oznámení</string>
-    <string name="info_theme">Motiv vzhledu</string>
-    <string name="info_archive">Archivovat</string>
-    <string name="info_unarchive">Obnovit z archivu</string>
-    <string name="info_block">Blokovat</string>
-    <string name="info_unblock">Odblokovat</string>
-    <string name="info_delete">Smazat konverzaci</string>
-    <string name="gallery_error">Soubor nelze načíst</string>
-    <string name="gallery_toast_saved">Uloženo do galerie</string>
-    <string name="backup_title">Záloha a obnovení</string>
-    <string name="backup_backing_up">Zálohování zpráv</string>
-    <string name="backup_restoring">Obnovení ze zálohy</string>
-    <string name="backup_last">Poslední záloha</string>
-    <string name="backup_loading">Načítání&#8230;</string>
-    <string name="backup_never">Nikdy</string>
-    <string name="backup_restore_title">Obnovit</string>
-    <string name="backup_restore_summary">Vybrat zálohu</string>
-    <string name="backup_restore_error_plus">Odemkněte QKSMS+ pro použití funkce zálohování a obnovení</string>
-    <string name="backup_restore_error_backup">Zálohování&#8230;</string>
-    <string name="backup_restore_error_restore">Probíhá obnova&#8230;</string>
-    <string name="backup_restore_confirm_title">Obnovit ze zálohy</string>
-    <string name="backup_restore_confirm_message">Opravdu chcete obnovit všechny vaše zprávy z této zálohy?</string>
-    <string name="backup_restore_stop_title">Zastavit obnovu</string>
-    <string name="backup_restore_stop_message">Dříve obnovené zprávy zůstanou ve vašem zařízení</string>
-    <string name="backup_restore_dialog_title">Zálohy</string>
-    <string name="backup_restore_dialog_empty">Nenalezeny žádné zálohy</string>
-    <plurals name="backup_message_count">
-        <item quantity="one">%d zpráva</item>
-        <item quantity="few">%d zpráv</item>
-        <item quantity="many">%d zprávy</item>
-        <item quantity="other">%d zprávy</item>
-    </plurals>
-    <string name="backup_disclaimer">Momentálně jsou pro zálohování a obnovení podporovány pouze SMS. MMS podpora a plánované zálohy budou přidány již brzy!</string>
-    <string name="backup_now">Zálohovat nyní</string>
-    <string name="backup_progress_parsing">Analyzování zálohy&#8230;</string>
-    <string name="backup_progress_running">%d/%d zpráv</string>
-    <string name="backup_progress_saving">Ukládání zálohy&#8230;</string>
-    <string name="backup_progress_syncing">Synchronizace zpráv&#8230;</string>
-    <string name="backup_progress_finished">Hotovo!</string>
-    <string name="backup_notification_channel_name">Zálohování a obnovení</string>
-    <string name="scheduled_title">Naplánováno</string>
-    <string name="scheduled_empty_description">Automaticky odeslat zprávu v přesný okamžik, který chcete</string>
-    <string name="scheduled_empty_message_1">Zdar! Kdy máš narozeniny?</string>
-    <string name="scheduled_empty_message_2">23. prosince</string>
-    <string name="scheduled_empty_message_3">Všechno nejlepší! Hleďme, ještě že si je pamatuji</string>
-    <!--&#x200A; is a special character required at the end of this string to fix it's formatting in the app -->
-    <string name="scheduled_empty_message_3_timestamp">Posíláno 23. prosince</string>
-    <string name="scheduled_compose_cd">Naplánovat zprávu</string>
-    <string name="scheduled_options_title">Naplánovaná zpráva</string>
-    <string-array name="scheduled_options">
-        <item>Odeslat nyní</item>
-        <item>Kopírovat text</item>
-        <item>Smazat</item>
-    </string-array>
-    <string name="settings_category_appearance">Vzhled</string>
-    <string name="settings_category_general">Obecné</string>
-    <string name="settings_category_qkreply">Rychlá odpověď</string>
-    <string name="settings_theme_title">Motiv vzhledu</string>
-    <string name="settings_night_title">Noční režim</string>
-    <string name="settings_black_title">Čistá černá, noční režim</string>
-    <string name="settings_night_start_title">Čas zahájení</string>
-    <string name="settings_night_end_title">Čas ukončení</string>
-    <string name="settings_automatic_colors_title">Automatické barvy kontaktu</string>
-    <string name="settings_text_size_title">Velikost písma</string>
-    <string name="settings_system_font_title">Použít systémové písmo</string>
-    <string name="settings_auto_emoji_title">Automatické emoji</string>
-    <string name="settings_notifications_title">Upozornění</string>
-    <string name="settings_notifications_o_summary">Klepnutím přizpůsobit</string>
-    <string name="settings_notification_actions_title">Akce</string>
-    <string name="settings_notification_action_1">Tlačítko 1</string>
-    <string name="settings_notification_action_2">Tlačítko 2</string>
-    <string name="settings_notification_action_3">Tlačítko 3</string>
-    <string name="settings_notification_previews_title">Nastavení oznámení</string>
-    <string name="settings_notification_wake_title">Rozsvítit displej</string>
-    <string name="settings_vibration_title">Vibrace</string>
-    <string name="settings_ringtone_title">Vyzvánění</string>
-    <string name="settings_ringtone_none">Žádný</string>
-    <string name="settings_qkreply_title">Rychlá odpověď</string>
-    <string name="settings_qkreply_summary">Vyskakovací okno pro nové zprávy</string>
-    <string name="settings_qkreply_tap_dismiss_title">Klepnutím zavřít</string>
-    <string name="settings_qkreply_tap_dismiss_summary">Pro ukončení klepněte kamkoli mimo okno zprávy</string>
-    <string name="settings_delayed_title">Zpožděné odeslání</string>
-    <string name="settings_swipe_actions">Akce přejetí</string>
-    <string name="settings_swipe_actions_summary">Nastavení akcí pro přejetí v konverzacích</string>
-    <string name="settings_swipe_actions_right">Přejetí vpravo</string>
-    <string name="settings_swipe_actions_left">Přejetí vlevo</string>
-    <string name="settings_swipe_actions_change">ZMĚNIT</string>
-    <string-array name="settings_swipe_actions">
-        <item>Žádná</item>
-        <item>Archivovat</item>
-        <item>Smazat</item>
-        <item>Blokovat</item>
-        <item>Volat</item>
-        <item>Označit jako přečtené</item>
-        <item>Označit jako nepřečtené</item>
-    </string-array>
-    <string name="settings_delivery_title">Potvrzení o doručení</string>
-    <string name="settings_delivery_summary">Potvrdit, že zprávy byly odeslány úspěšně</string>
-    <string name="settings_signature_title">Podpis</string>
-    <string name="settings_signature_summary">Přidat podpis na konec vašich zpráv</string>
-    <string name="settings_unicode_title">Odstranit diakritiku</string>
-    <string name="settings_unicode_summary">Odstranit diakritiku v odesílaných SMS zprávách</string>
-    <string name="settings_mobile_title">Pouze mobilní čísla</string>
-    <string name="settings_mobile_summary">Při psaní zprávy zobrazit pouze mobilní telefonní čísla</string>
-    <string name="settings_auto_delete">Automaticky odstranit staré zprávy</string>
-    <string name="settings_auto_delete_dialog_message">Zprávy budou odstraněny po zadaném počtu dní</string>
-    <string name="settings_auto_delete_dialog_hint">Počet dní</string>
-    <string name="settings_auto_delete_never">Nikdy</string>
-    <string name="settings_auto_delete_warning">Odstranit staré zprávy automaticky?</string>
-    <string name="settings_auto_delete_warning_message">Budete-li pokračovat, bude nyní odstraněno %1$d zpráv</string>
-    <plurals name="settings_auto_delete_summary">
-        <item quantity="one">Po 1 dni</item>
-        <item quantity="few">Po %d dnech</item>
-        <item quantity="many">Po %d dnech</item>
-        <item quantity="other">Po %d dnech</item>
-    </plurals>
-    <string name="settings_long_as_mms_title">Odesílat dlouhé zprávy jako MMS</string>
-    <string name="settings_long_as_mms_summary">Nedaří-li se odeslat vaše dlouhé zprávy, nebo jsou-li poslány v nesprávném pořadí, lze je odeslat jako MMS. Mohou být účtovány další poplatky.</string>
-    <string name="settings_mms_size_title">Automaticky komprimovat MMS přílohy</string>
-    <string name="settings_sync_title">Synchronizovat zprávy</string>
-    <string name="settings_sync_summary">Opětovná synchronizace zpráv s nativní Android SMS databází</string>
-    <string name="settings_about_title">O aplikaci QKSMS</string>
-    <string name="settings_version">Verze %s</string>
-    <string name="settings_logging_enabled">Ladící protokolování zapnuto</string>
-    <string name="settings_logging_disabled">Ladící protokolování vypnuto</string>
-    <string name="settings_delay_duration_hint">Zadejte prodlevu (v sekundách)</string>
-    <string name="blocking_title">Blokování</string>
-    <string name="blocking_drop_title">Zahodit zprávy</string>
-    <string name="blocking_drop_summary">Zahodit příchozí zprávy od blokovaných odesílatelů namísto jejich skrytí</string>
-    <string name="blocking_conversations">Blokované konverzace</string>
-    <string name="blocking_manager_title">Správce blokování</string>
-    <string name="blocking_manager_qksms_title">QKSMS</string>
-    <string name="blocking_manager_qksms_summary">Vestavěné blokování v QKSMS</string>
-    <string name="blocking_manager_call_control_summary">Automatické filtrování hovorů a zpráv na jednom místě. Community IQ™ poskytuje ochranu před nevyžádanými zprávami od komunitou označených spammerů.</string>
-    <string name="blocking_manager_sia_summary">Automaticky filtrovat zprávy od nevyžádaných čísel pomocí aplikace „Můžu to zvednout?“</string>
-    <string name="blocking_manager_copy_title">Kopírovat blokovaná čísla</string>
-    <string name="blocking_manager_copy_summary">Pokračovat do %s a zkopírovat stávající zablokovaná čísla</string>
-    <string name="blocked_numbers_title">Blokovaná čísla</string>
-    <string name="blocked_numbers_empty">Vámi blokovaná čísla se objeví zde</string>
-    <string name="blocked_numbers_add_cd">Blokovat nové číslo</string>
-    <string name="blocked_numbers_dialog_title">Blokované zprávy od</string>
-    <string name="blocked_numbers_dialog_hint">Telefonní číslo</string>
-    <string name="blocked_numbers_dialog_block">Blokovat</string>
-    <string name="blocked_messages_title">Blokované zprávy</string>
-    <string name="blocked_messages_empty">Vámi blokované konverzace se objeví zde</string>
-    <string name="blocking_block_title">Blokovat</string>
-    <string name="blocking_unblock_title">Odblokovat</string>
-    <plurals name="blocking_block_external">
-        <item quantity="one">Přejít do %s a zablokovat toto číslo</item>
-        <item quantity="few">Přejít do %s a zablokovat tato čísla</item>
-        <item quantity="many">Přejít do %s a zablokovat tato čísla</item>
-        <item quantity="other">Přejít do %s a zablokovat tato čísla</item>
-    </plurals>
-    <plurals name="blocking_unblock_external">
-        <item quantity="one">Přejít do %s a povolit toto číslo</item>
-        <item quantity="few">Přejít do %s a povolit tato čísla</item>
-        <item quantity="many">Přejít do %s a povolit tato čísla</item>
-        <item quantity="other">Přejít do %s a povolit tato čísla</item>
-    </plurals>
-    <string name="about_title">O aplikaci</string>
-    <string name="about_version_title">Verze</string>
-    <string name="about_developer_title">Vývojář</string>
-    <string name="about_source_title">Zdrojový kód</string>
-    <string name="about_changelog_title">Přehled změn</string>
-    <string name="about_contact_title">Kontakt</string>
-    <string name="about_license_title">Licence</string>
-    <string name="about_copyright_title">Autorská práva</string>
-    <string name="qksms_plus_description_title">Podpoř vývoj, odemkni vše</string>
-    <string name="qksms_plus_description_summary">Můžete zachránit hladovějícího vývojáře jen za %s</string>
-    <!-- Substitutions are for price and currency. Ex: Lifetime upgrade for $1.99 USD -->
-    <string name="qksms_plus_upgrade">Doživotní aktualizace za %1$s %2$s</string>
-    <!-- Substitutions are for price and currency. Ex: Unlock + donate for $4.99 USD -->
-    <string name="qksms_plus_upgrade_donate">Odemknout + darovat %1$s %2$s</string>
-    <string name="qksms_plus_thanks_title">Děkujeme za podporu QKSMS!</string>
-    <string name="qksms_plus_thanks_summary">Nyní máte přístup ke všem funkcím QKSMS+</string>
-    <string name="qksms_plus_free_title">QKSMS + je zdarma pro uživatele F-Droid! Pokud byste chtěli podpořit vývoj, neváhejte přispět.</string>
-    <string name="qksms_plus_donate">Darovat pomocí PayPal</string>
-    <string name="qksms_plus_coming_soon">Připravujeme</string>
-    <string name="qksms_plus_themes_title">Prémiové motivy vzhledu</string>
-    <string name="qksms_plus_themes_summary">Nádherné barvy, které nejsou na paletě Material designu</string>
-    <string name="qksms_plus_emoji_title">Vlastní automatické emoji</string>
-    <string name="qksms_plus_emoji_summary">Vytvořte si zkratky pro vlastní automatické emoji</string>
-    <string name="qksms_plus_backup_title">Zálohování zpráv</string>
-    <string name="qksms_plus_backup_summary">Zálohujte automaticky své zprávy. Už se nemusíte obávat ztráty historie zpráv při ztrátě nebo výměně telefonu</string>
-    <string name="qksms_plus_scheduled_title">Plánované zprávy</string>
-    <string name="qksms_plus_scheduled_summary">Plánované zprávy budou automaticky odeslány v určené datum a čas</string>
-    <string name="qksms_plus_delayed_title">Zpožděné odeslání</string>
-    <string name="qksms_plus_delayed_summary">Vyčkání několik sekund před odesláním zprávy</string>
-    <string name="qksms_plus_night_title">Automatický noční režim</string>
-    <string name="qksms_plus_night_summary">Zapnutí nočního režimu podle denní doby</string>
-    <string name="qksms_plus_blacklist_title">Pokročilé blokování</string>
-    <string name="qksms_plus_blacklist_summary">Blokování zpráv dle klíčových slov nebo vzorů</string>
-    <string name="qksms_plus_forward_title">Automatické přeposílání</string>
-    <string name="qksms_plus_forward_summary">Automatické přeposílání zpráv od určitých odesílatelů</string>
-    <string name="qksms_plus_respond_title">Automatická odpověď</string>
-    <string name="qksms_plus_respond_summary">Automatické odpovídání na příchozí zprávy přednastavenou odpovědí</string>
-    <string name="qksms_plus_more_title">Více</string>
-    <string name="qksms_plus_more_summary">QKSMS je v aktivním vývoji a váš nákup bude obsahovat i všechny budoucí funkce QKSMS+!</string>
-    <string name="widget_loading">Načítání&#8230;</string>
-    <string name="widget_more">Zobrazit další konverzace</string>
-    <string name="qkreply_menu_read">Označit jako přečtené</string>
-    <string name="qkreply_menu_call">Volat</string>
-    <string name="qkreply_menu_delete">Smazat</string>
-    <string name="qkreply_menu_expand">Zobrazit více</string>
-    <string name="qkreply_menu_collapse">Zobrazit méně</string>
-    <string name="qkreply_menu_view">Otevřít konverzaci</string>
-    <string name="theme_material">Material</string>
-    <string name="theme_hex">HEX</string>
-    <string name="theme_apply">Použít</string>
-    <string-array name="notification_actions">
-        <item>Žádné</item>
-        <item>Archivovat</item>
-        <item>Smazat</item>
-        <item>Blokovat</item>
-        <item>Volat</item>
-        <item>Označit jako přečtené</item>
-        <item>Odpovědět</item>
-    </string-array>
-    <string name="button_yes">Ano</string>
-    <string name="button_continue">Pokračovat</string>
-    <string name="button_cancel">Zrušit</string>
-    <string name="button_delete">Smazat</string>
-    <string name="button_save">Uložit</string>
-    <string name="button_stop">Zastavit</string>
-    <string name="button_more">Více</string>
-    <string name="button_set">Nastavit</string>
-    <string name="button_undo">Zpět</string>
-    <string name="toast_copied">Zkopírováno</string>
-    <string name="toast_archived">Archivované konverzace</string>
-    <string name="toast_qksms_plus">Pro použití musíte odemknout verzi QKSMS +</string>
-    <plurals name="notification_new_messages">
-        <item quantity="one">Nová zpráva</item>
-        <item quantity="few">%s nových zpráv</item>
-        <item quantity="many">%s nových zpráv</item>
-        <item quantity="other">%s nových zpráv</item>
-    </plurals>
-    <string name="notification_message_failed_title">Zpráva nebyla odeslána</string>
-    <string name="notification_message_failed_text">Odeslání zprávy pro %s se nezdařilo</string>
-    <string-array name="night_modes">
-        <item>Dle systému</item>
-        <item>Vypnuto</item>
-        <item>Vždy zapnuto</item>
-        <item>Automaticky</item>
-    </string-array>
-    <string-array name="notification_preview_options">
-        <item>Zobrazit jméno a text zprávy</item>
-        <item>Zobrazit jméno</item>
-        <item>Skrýt obsah</item>
-    </string-array>
-    <string-array name="text_sizes">
-        <item>Malé</item>
-        <item>Normální</item>
-        <item>Velké</item>
-        <item>Větší</item>
-    </string-array>
-    <string-array name="delayed_sending_labels">
-        <item>Bez prodlevy</item>
-        <item>3 sekundy</item>
-        <item>5 sekund</item>
-        <item>10 sekund</item>
-    </string-array>
-    <string-array name="mms_sizes">
-        <item>Automaticky</item>
-        <item>100 kB</item>
-        <item>200 kB</item>
-        <item>300 kB</item>
-        <item>600 kB</item>
-        <item>1 000 kB</item>
-        <item>2 000 kB</item>
-        <item>Bez komprese</item>
-    </string-array>
-    <string-array name="qk_responses">
-        <item>OK</item>
-        <item>Dej mi chvíli</item>
-        <item>Jsem na cestě</item>
-        <item>Díky</item>
-        <item>To zní dobře</item>
-        <item>Co je?</item>
-        <item>Souhlas</item>
-        <item>Ne</item>
-        <item>Miluji tě</item>
-        <item>Omlouvám se</item>
-        <item>LOL</item>
-        <item>To je v pořádku</item>
-    </string-array>
-</resources>
+<?xml version="1.0" encoding="utf-8"?>
+<!--
+  ~ Copyright (C) 2019 Moez Bhatti <moez.bhatti@gmail.com>
+  ~
+  ~ This file is part of QKSMS.
+  ~
+  ~ QKSMS is free software: you can redistribute it and/or modify
+  ~ it under the terms of the GNU General Public License as published by
+  ~ the Free Software Foundation, either version 3 of the License, or
+  ~ (at your option) any later version.
+  ~
+  ~ QKSMS is distributed in the hope that it will be useful,
+  ~ but WITHOUT ANY WARRANTY; without even the implied warranty of
+  ~ MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+  ~ GNU General Public License for more details.
+  ~
+  ~ You should have received a copy of the GNU General Public License
+  ~ along with QKSMS.  If not, see <http://www.gnu.org/licenses/>.
+  -->
+<resources>
+    <string name="shortcut_compose_long_label">Nová konverzace</string>
+    <string name="shortcut_compose_short_label">Nová zpráva</string>
+    <string name="shortcut_compose_disabled_message">Zkratka vypnuta</string>
+    <string name="title_archived">Archivováno</string>
+    <string name="title_settings">Nastavení</string>
+    <string name="title_notification_prefs">Oznámení</string>
+    <string name="title_theme">Motiv vzhledu</string>
+    <string name="title_conversations">Hledat&#8230;</string>
+    <string name="title_compose">Nová zpráva</string>
+    <string name="setup_skip">Přeskočit</string>
+    <string name="setup_next">Pokračovat</string>
+    <string name="menu_add_person">Přidat osobu</string>
+    <string name="menu_call">Volat</string>
+    <string name="menu_info">Podrobnosti</string>
+    <string name="menu_save">Uložit do galerie</string>
+    <string name="menu_share">Sdílet</string>
+    <string name="main_drawer_open_cd">Otevřít menu</string>
+    <string name="main_title_selected">Vybráno: %d</string>
+    <string name="main_menu_clear">Vymazat</string>
+    <string name="main_menu_archive">Archivovat</string>
+    <string name="main_menu_unarchive">Obnovit z archivu</string>
+    <string name="main_menu_delete">Smazat</string>
+    <string name="main_menu_add_contact">Přidat do kontaktů</string>
+    <string name="main_menu_pin">Připnout nahoru</string>
+    <string name="main_menu_unpin">Odepnout</string>
+    <string name="main_menu_read">Označit jako přečtené</string>
+    <string name="main_menu_unread">Označit jako nepřečtené</string>
+    <string name="main_menu_block">Blokovat</string>
+    <string name="main_syncing">Synchronizace zpráv&#8230;</string>
+    <string name="main_sender_you">Vy: %s</string>
+    <string name="main_draft">Koncept</string>
+    <string name="main_message_results_title">Výsledky ve zprávách</string>
+    <string name="main_message_results">%d zpráv</string>
+    <string name="inbox_empty_text">Zde se objeví vaše konverzace</string>
+    <string name="inbox_search_empty_text">Žádné výsledky</string>
+    <string name="archived_empty_text">Zde se objeví vaše archivované konverzace</string>
+    <string name="main_fab_cd">Zahájit novou konverzaci</string>
+    <string name="main_default_sms_title">Zamilujte si znovu psaní</string>
+    <string name="main_default_sms_message">Nastavte si QKSMS jako výchozí SMS aplikaci</string>
+    <string name="main_default_sms_change">Nastavit</string>
+    <string name="main_permission_required">Vyžadováno oprávnění</string>
+    <string name="main_permission_sms">QKSMS potřebuje oprávnění pro odesílání a zobrazení SMS zpráv</string>
+    <string name="main_permission_contacts">QKSMS potřebuje oprávnění pro zobrazení vašich kontaktů</string>
+    <string name="main_permission_allow">Povolit</string>
+    <string name="drawer_inbox">Příchozí zprávy</string>
+    <string name="drawer_archived">Archivováno</string>
+    <string name="drawer_scheduled">Naplánováno</string>
+    <string name="drawer_blocking">Blokování</string>
+    <string name="drawer_more">Více</string>
+    <string name="drawer_settings">Nastavení</string>
+    <string name="drawer_help">Nápověda a zpětná vazba</string>
+    <string name="drawer_invite">Pozvat přátele</string>
+    <string name="drawer_plus_banner_summary">Odemkněte úžasné nové funkce a podpořte vývoj</string>
+    <string name="rate_title">Líbí se Vám QKSMS?</string>
+    <string name="rate_summary">Sdílejte trochu lásky a ohodnoťte nás na Google Play!</string>
+    <string name="rate_okay">Tak určitě!</string>
+    <string name="rate_dismiss">ZAVŘÍT</string>
+    <string name="dialog_delete_title">Smazat</string>
+    <plurals name="dialog_delete_message">
+        <item quantity="one">Opravdu chcete smazat tuto konverzaci?</item>
+        <item quantity="few">Opravdu chcete smazat %d konverzace?</item>
+        <item quantity="many">Opravdu chcete smazat %d konverzací?</item>
+        <item quantity="other">Opravdu chcete smazat %d konverzací?</item>
+    </plurals>
+    <string-array name="message_options">
+        <item>Kopírovat text</item>
+        <item>Přeposlat</item>
+        <item>Smazat</item>
+    </string-array>
+    <string name="compose_number_picker_title">Vybrat telefonní číslo</string>
+    <string name="compose_number_picker_default">%s ∙ Výchozí</string>
+    <string name="compose_number_picker_once">Pouze jednou</string>
+    <string name="compose_number_picker_always">Vždy</string>
+    <string name="compose_title_selected">Vybráno: %d</string>
+    <string name="compose_subtitle_results">%1$d z %2$d výsledků</string>
+    <string name="compose_send_group_title">Odeslat jako skupinovou zprávu</string>
+    <string name="compose_send_group_summary">Příjemci a odpovědi budou viditelné všem</string>
+    <string name="compose_messages_empty">Toto je začátek vaší konverzace. Řekněte něco hezkého!</string>
+    <string name="compose_vcard_label">Karta kontaktu</string>
+    <string name="compose_scheduled_for">Naplánováno na</string>
+    <string name="compose_scheduled_future">Vybraný čas musí teprve nastat (musí být v budoucnu).</string>
+    <string name="compose_scheduled_plus">Pro použití plánování zpráv je třeba povýšit na QKSMS+</string>
+    <string name="compose_scheduled_toast">Přidáno do naplánovaných zpráv</string>
+    <string name="compose_hint">Napsat zprávu&#8230;</string>
+    <string name="compose_menu_copy">Kopírovat text</string>
+    <string name="compose_menu_forward">Přeposlat</string>
+    <string name="compose_menu_delete">Smazat</string>
+    <string name="compose_menu_previous">Předchozí</string>
+    <string name="compose_menu_next">Další</string>
+    <string name="compose_menu_clear">Vymazat</string>
+    <string name="compose_details_title">Podrobnosti zprávy</string>
+    <string name="compose_details_type">Typ: %s</string>
+    <string name="compose_details_from">Od: %s</string>
+    <string name="compose_details_to">Pro: %s</string>
+    <string name="compose_details_subject">Předmět: %s</string>
+    <string name="compose_details_priority">Priorita: %s</string>
+    <string name="compose_details_size">Velikost: %s</string>
+    <string name="compose_details_sent">Odesláno: %s</string>
+    <string name="compose_details_received">Přijato: %s</string>
+    <string name="compose_details_delivered">Doručeno: %s</string>
+    <string name="compose_details_error_code">Kód chyby: %d</string>
+    <string name="compose_attach_cd">Připojit přílohu</string>
+    <string name="compose_gallery_cd">Připojit fotografii</string>
+    <string name="compose_camera_cd">Fotografovat</string>
+    <string name="compose_schedule_cd">Naplánovat zprávu</string>
+    <string name="compose_contact_cd">Přiložit kontakt</string>
+    <string name="compose_contact_error">Chyba čtení kontaktu</string>
+    <!-- Example: SIM 1 (Verizon) selected-->
+    <string name="compose_sim_changed_toast">Vybrána SIM %1$d (%2$s)</string>
+    <string name="compose_sim_cd">%s vybráno, změňte SIM kartu</string>
+    <string name="compose_send_cd">Odeslat zprávu</string>
+    <string name="message_status_sending">Odesílání&#8230;</string>
+    <string name="message_status_delivered">Doručeno %s</string>
+    <string name="message_status_failed">Odeslání se nezdařilo. Klepnutím zkusíte znovu odeslat</string>
+    <string name="info_title">Podrobnosti</string>
+    <string name="info_copied_address">Adresa zkopírována</string>
+    <string name="info_name">Název konverzace</string>
+    <string name="info_notifications">Oznámení</string>
+    <string name="info_theme">Motiv vzhledu</string>
+    <string name="info_archive">Archivovat</string>
+    <string name="info_unarchive">Obnovit z archivu</string>
+    <string name="info_block">Blokovat</string>
+    <string name="info_unblock">Odblokovat</string>
+    <string name="info_delete">Smazat konverzaci</string>
+    <string name="gallery_error">Soubor nelze načíst</string>
+    <string name="gallery_toast_saved">Uloženo do galerie</string>
+    <string name="backup_title">Záloha a obnovení</string>
+    <string name="backup_backing_up">Zálohování zpráv</string>
+    <string name="backup_restoring">Obnovení ze zálohy</string>
+    <string name="backup_last">Poslední záloha</string>
+    <string name="backup_loading">Načítání&#8230;</string>
+    <string name="backup_never">Nikdy</string>
+    <string name="backup_restore_title">Obnovit</string>
+    <string name="backup_restore_summary">Vybrat zálohu</string>
+    <string name="backup_restore_error_plus">Odemkněte QKSMS+ pro použití funkce zálohování a obnovení</string>
+    <string name="backup_restore_error_backup">Zálohování&#8230;</string>
+    <string name="backup_restore_error_restore">Probíhá obnova&#8230;</string>
+    <string name="backup_restore_confirm_title">Obnovit ze zálohy</string>
+    <string name="backup_restore_confirm_message">Opravdu chcete obnovit všechny vaše zprávy z této zálohy?</string>
+    <string name="backup_restore_stop_title">Zastavit obnovu</string>
+    <string name="backup_restore_stop_message">Dříve obnovené zprávy zůstanou ve vašem zařízení</string>
+    <string name="backup_restore_dialog_title">Zálohy</string>
+    <string name="backup_restore_dialog_empty">Nenalezeny žádné zálohy</string>
+    <plurals name="backup_message_count">
+        <item quantity="one">%d zpráva</item>
+        <item quantity="few">%d zpráv</item>
+        <item quantity="many">%d zprávy</item>
+        <item quantity="other">%d zprávy</item>
+    </plurals>
+    <string name="backup_disclaimer">Momentálně jsou pro zálohování a obnovení podporovány pouze SMS. MMS podpora a plánované zálohy budou přidány již brzy!</string>
+    <string name="backup_now">Zálohovat nyní</string>
+    <string name="backup_progress_parsing">Analyzování zálohy&#8230;</string>
+    <string name="backup_progress_running">%d/%d zpráv</string>
+    <string name="backup_progress_saving">Ukládání zálohy&#8230;</string>
+    <string name="backup_progress_syncing">Synchronizace zpráv&#8230;</string>
+    <string name="backup_progress_finished">Hotovo!</string>
+    <string name="backup_notification_channel_name">Zálohování a obnovení</string>
+    <string name="scheduled_title">Naplánováno</string>
+    <string name="scheduled_empty_description">Automaticky odeslat zprávu v přesný okamžik, který chcete</string>
+    <string name="scheduled_empty_message_1">Zdar! Kdy máš narozeniny?</string>
+    <string name="scheduled_empty_message_2">23. prosince</string>
+    <string name="scheduled_empty_message_3">Všechno nejlepší! Hleďme, ještě že si je pamatuji</string>
+    <!--&#x200A; is a special character required at the end of this string to fix it's formatting in the app -->
+    <string name="scheduled_empty_message_3_timestamp">Posíláno 23. prosince</string>
+    <string name="scheduled_compose_cd">Naplánovat zprávu</string>
+    <string name="scheduled_options_title">Naplánovaná zpráva</string>
+    <string-array name="scheduled_options">
+        <item>Odeslat nyní</item>
+        <item>Kopírovat text</item>
+        <item>Smazat</item>
+    </string-array>
+    <string name="settings_category_appearance">Vzhled</string>
+    <string name="settings_category_general">Obecné</string>
+    <string name="settings_category_qkreply">Rychlá odpověď</string>
+    <string name="settings_theme_title">Motiv vzhledu</string>
+    <string name="settings_night_title">Noční režim</string>
+    <string name="settings_black_title">Čistá černá, noční režim</string>
+    <string name="settings_night_start_title">Čas zahájení</string>
+    <string name="settings_night_end_title">Čas ukončení</string>
+    <string name="settings_automatic_colors_title">Automatické barvy kontaktu</string>
+    <string name="settings_text_size_title">Velikost písma</string>
+    <string name="settings_system_font_title">Použít systémové písmo</string>
+    <string name="settings_auto_emoji_title">Automatické emoji</string>
+    <string name="settings_notifications_title">Upozornění</string>
+    <string name="settings_notifications_o_summary">Klepnutím přizpůsobit</string>
+    <string name="settings_notification_actions_title">Akce</string>
+    <string name="settings_notification_action_1">Tlačítko 1</string>
+    <string name="settings_notification_action_2">Tlačítko 2</string>
+    <string name="settings_notification_action_3">Tlačítko 3</string>
+    <string name="settings_notification_previews_title">Nastavení oznámení</string>
+    <string name="settings_notification_wake_title">Rozsvítit displej</string>
+    <string name="settings_vibration_title">Vibrace</string>
+    <string name="settings_ringtone_title">Vyzvánění</string>
+    <string name="settings_ringtone_none">Žádný</string>
+    <string name="settings_qkreply_title">Rychlá odpověď</string>
+    <string name="settings_qkreply_summary">Vyskakovací okno pro nové zprávy</string>
+    <string name="settings_qkreply_tap_dismiss_title">Klepnutím zavřít</string>
+    <string name="settings_qkreply_tap_dismiss_summary">Pro ukončení klepněte kamkoli mimo okno zprávy</string>
+    <string name="settings_delayed_title">Zpožděné odeslání</string>
+    <string name="settings_swipe_actions">Akce přejetí</string>
+    <string name="settings_swipe_actions_summary">Nastavení akcí pro přejetí v konverzacích</string>
+    <string name="settings_swipe_actions_right">Přejetí vpravo</string>
+    <string name="settings_swipe_actions_left">Přejetí vlevo</string>
+    <string name="settings_swipe_actions_change">ZMĚNIT</string>
+    <string-array name="settings_swipe_actions">
+        <item>Žádná</item>
+        <item>Archivovat</item>
+        <item>Smazat</item>
+        <item>Blokovat</item>
+        <item>Volat</item>
+        <item>Označit jako přečtené</item>
+        <item>Označit jako nepřečtené</item>
+    </string-array>
+    <string name="settings_delivery_title">Potvrzení o doručení</string>
+    <string name="settings_delivery_summary">Potvrdit, že zprávy byly odeslány úspěšně</string>
+    <string name="settings_signature_title">Podpis</string>
+    <string name="settings_signature_summary">Přidat podpis na konec vašich zpráv</string>
+    <string name="settings_unicode_title">Odstranit diakritiku</string>
+    <string name="settings_unicode_summary">Odstranit diakritiku v odesílaných SMS zprávách</string>
+    <string name="settings_mobile_title">Pouze mobilní čísla</string>
+    <string name="settings_mobile_summary">Při psaní zprávy zobrazit pouze mobilní telefonní čísla</string>
+    <string name="settings_auto_delete">Automaticky odstranit staré zprávy</string>
+    <string name="settings_auto_delete_dialog_message">Zprávy budou odstraněny po zadaném počtu dní</string>
+    <string name="settings_auto_delete_dialog_hint">Počet dní</string>
+    <string name="settings_auto_delete_never">Nikdy</string>
+    <string name="settings_auto_delete_warning">Odstranit staré zprávy automaticky?</string>
+    <string name="settings_auto_delete_warning_message">Budete-li pokračovat, bude nyní odstraněno %1$d zpráv</string>
+    <plurals name="settings_auto_delete_summary">
+        <item quantity="one">Po 1 dni</item>
+        <item quantity="few">Po %d dnech</item>
+        <item quantity="many">Po %d dnech</item>
+        <item quantity="other">Po %d dnech</item>
+    </plurals>
+    <string name="settings_long_as_mms_title">Odesílat dlouhé zprávy jako MMS</string>
+    <string name="settings_long_as_mms_summary">Nedaří-li se odeslat vaše dlouhé zprávy, nebo jsou-li poslány v nesprávném pořadí, lze je odeslat jako MMS. Mohou být účtovány další poplatky.</string>
+    <string name="settings_mms_size_title">Automaticky komprimovat MMS přílohy</string>
+    <string name="settings_sync_title">Synchronizovat zprávy</string>
+    <string name="settings_sync_summary">Opětovná synchronizace zpráv s nativní Android SMS databází</string>
+    <string name="settings_about_title">O aplikaci QKSMS</string>
+    <string name="settings_version">Verze %s</string>
+    <string name="settings_logging_enabled">Ladící protokolování zapnuto</string>
+    <string name="settings_logging_disabled">Ladící protokolování vypnuto</string>
+    <string name="settings_delay_duration_hint">Zadejte prodlevu (v sekundách)</string>
+    <string name="blocking_title">Blokování</string>
+    <string name="blocking_drop_title">Zahodit zprávy</string>
+    <string name="blocking_drop_summary">Zahodit příchozí zprávy od blokovaných odesílatelů namísto jejich skrytí</string>
+    <string name="blocking_conversations">Blokované konverzace</string>
+    <string name="blocking_manager_title">Správce blokování</string>
+    <string name="blocking_manager_qksms_title">QKSMS</string>
+    <string name="blocking_manager_qksms_summary">Vestavěné blokování v QKSMS</string>
+    <string name="blocking_manager_call_control_summary">Automatické filtrování hovorů a zpráv na jednom místě. Community IQ™ poskytuje ochranu před nevyžádanými zprávami od komunitou označených spammerů.</string>
+    <string name="blocking_manager_sia_summary">Automaticky filtrovat zprávy od nevyžádaných čísel pomocí aplikace „Můžu to zvednout?“</string>
+    <string name="blocking_manager_copy_title">Kopírovat blokovaná čísla</string>
+    <string name="blocking_manager_copy_summary">Pokračovat do %s a zkopírovat stávající zablokovaná čísla</string>
+    <string name="blocked_numbers_title">Blokovaná čísla</string>
+    <string name="blocked_numbers_empty">Vámi blokovaná čísla se objeví zde</string>
+    <string name="blocked_numbers_add_cd">Blokovat nové číslo</string>
+    <string name="blocked_numbers_dialog_title">Blokované zprávy od</string>
+    <string name="blocked_numbers_dialog_hint">Telefonní číslo</string>
+    <string name="blocked_numbers_dialog_block">Blokovat</string>
+    <string name="blocked_messages_title">Blokované zprávy</string>
+    <string name="blocked_messages_empty">Vámi blokované konverzace se objeví zde</string>
+    <string name="blocking_block_title">Blokovat</string>
+    <string name="blocking_unblock_title">Odblokovat</string>
+    <plurals name="blocking_block_external">
+        <item quantity="one">Přejít do %s a zablokovat toto číslo</item>
+        <item quantity="few">Přejít do %s a zablokovat tato čísla</item>
+        <item quantity="many">Přejít do %s a zablokovat tato čísla</item>
+        <item quantity="other">Přejít do %s a zablokovat tato čísla</item>
+    </plurals>
+    <plurals name="blocking_unblock_external">
+        <item quantity="one">Přejít do %s a povolit toto číslo</item>
+        <item quantity="few">Přejít do %s a povolit tato čísla</item>
+        <item quantity="many">Přejít do %s a povolit tato čísla</item>
+        <item quantity="other">Přejít do %s a povolit tato čísla</item>
+    </plurals>
+    <string name="about_title">O aplikaci</string>
+    <string name="about_version_title">Verze</string>
+    <string name="about_developer_title">Vývojář</string>
+    <string name="about_source_title">Zdrojový kód</string>
+    <string name="about_changelog_title">Přehled změn</string>
+    <string name="about_contact_title">Kontakt</string>
+    <string name="about_license_title">Licence</string>
+    <string name="about_copyright_title">Autorská práva</string>
+    <string name="qksms_plus_description_title">Podpoř vývoj, odemkni vše</string>
+    <string name="qksms_plus_description_summary">Můžete zachránit hladovějícího vývojáře jen za %s</string>
+    <!-- Substitutions are for price and currency. Ex: Lifetime upgrade for $1.99 USD -->
+    <string name="qksms_plus_upgrade">Doživotní aktualizace za %1$s %2$s</string>
+    <!-- Substitutions are for price and currency. Ex: Unlock + donate for $4.99 USD -->
+    <string name="qksms_plus_upgrade_donate">Odemknout + darovat %1$s %2$s</string>
+    <string name="qksms_plus_thanks_title">Děkujeme za podporu QKSMS!</string>
+    <string name="qksms_plus_thanks_summary">Nyní máte přístup ke všem funkcím QKSMS+</string>
+    <string name="qksms_plus_free_title">QKSMS + je zdarma pro uživatele F-Droid! Pokud byste chtěli podpořit vývoj, neváhejte přispět.</string>
+    <string name="qksms_plus_donate">Darovat pomocí PayPal</string>
+    <string name="qksms_plus_coming_soon">Připravujeme</string>
+    <string name="qksms_plus_themes_title">Prémiové motivy vzhledu</string>
+    <string name="qksms_plus_themes_summary">Nádherné barvy, které nejsou na paletě Material designu</string>
+    <string name="qksms_plus_emoji_title">Vlastní automatické emoji</string>
+    <string name="qksms_plus_emoji_summary">Vytvořte si zkratky pro vlastní automatické emoji</string>
+    <string name="qksms_plus_backup_title">Zálohování zpráv</string>
+    <string name="qksms_plus_backup_summary">Zálohujte automaticky své zprávy. Už se nemusíte obávat ztráty historie zpráv při ztrátě nebo výměně telefonu</string>
+    <string name="qksms_plus_scheduled_title">Plánované zprávy</string>
+    <string name="qksms_plus_scheduled_summary">Plánované zprávy budou automaticky odeslány v určené datum a čas</string>
+    <string name="qksms_plus_delayed_title">Zpožděné odeslání</string>
+    <string name="qksms_plus_delayed_summary">Vyčkání několik sekund před odesláním zprávy</string>
+    <string name="qksms_plus_night_title">Automatický noční režim</string>
+    <string name="qksms_plus_night_summary">Zapnutí nočního režimu podle denní doby</string>
+    <string name="qksms_plus_blacklist_title">Pokročilé blokování</string>
+    <string name="qksms_plus_blacklist_summary">Blokování zpráv dle klíčových slov nebo vzorů</string>
+    <string name="qksms_plus_forward_title">Automatické přeposílání</string>
+    <string name="qksms_plus_forward_summary">Automatické přeposílání zpráv od určitých odesílatelů</string>
+    <string name="qksms_plus_respond_title">Automatická odpověď</string>
+    <string name="qksms_plus_respond_summary">Automatické odpovídání na příchozí zprávy přednastavenou odpovědí</string>
+    <string name="qksms_plus_more_title">Více</string>
+    <string name="qksms_plus_more_summary">QKSMS je v aktivním vývoji a váš nákup bude obsahovat i všechny budoucí funkce QKSMS+!</string>
+    <string name="widget_loading">Načítání&#8230;</string>
+    <string name="widget_more">Zobrazit další konverzace</string>
+    <string name="qkreply_menu_read">Označit jako přečtené</string>
+    <string name="qkreply_menu_call">Volat</string>
+    <string name="qkreply_menu_delete">Smazat</string>
+    <string name="qkreply_menu_expand">Zobrazit více</string>
+    <string name="qkreply_menu_collapse">Zobrazit méně</string>
+    <string name="qkreply_menu_view">Otevřít konverzaci</string>
+    <string name="theme_material">Material</string>
+    <string name="theme_hex">HEX</string>
+    <string name="theme_apply">Použít</string>
+    <string-array name="notification_actions">
+        <item>Žádné</item>
+        <item>Archivovat</item>
+        <item>Smazat</item>
+        <item>Blokovat</item>
+        <item>Volat</item>
+        <item>Označit jako přečtené</item>
+        <item>Odpovědět</item>
+    </string-array>
+    <string name="button_yes">Ano</string>
+    <string name="button_continue">Pokračovat</string>
+    <string name="button_cancel">Zrušit</string>
+    <string name="button_delete">Smazat</string>
+    <string name="button_save">Uložit</string>
+    <string name="button_stop">Zastavit</string>
+    <string name="button_more">Více</string>
+    <string name="button_set">Nastavit</string>
+    <string name="button_undo">Zpět</string>
+    <string name="toast_copied">Zkopírováno</string>
+    <string name="toast_archived">Archivované konverzace</string>
+    <string name="toast_qksms_plus">Pro použití musíte odemknout verzi QKSMS +</string>
+    <plurals name="notification_new_messages">
+        <item quantity="one">Nová zpráva</item>
+        <item quantity="few">%s nových zpráv</item>
+        <item quantity="many">%s nových zpráv</item>
+        <item quantity="other">%s nových zpráv</item>
+    </plurals>
+    <string name="notification_message_failed_title">Zpráva nebyla odeslána</string>
+    <string name="notification_message_failed_text">Odeslání zprávy pro %s se nezdařilo</string>
+    <string-array name="night_modes">
+        <item>Dle systému</item>
+        <item>Vypnuto</item>
+        <item>Vždy zapnuto</item>
+        <item>Automaticky</item>
+    </string-array>
+    <string-array name="notification_preview_options">
+        <item>Zobrazit jméno a text zprávy</item>
+        <item>Zobrazit jméno</item>
+        <item>Skrýt obsah</item>
+    </string-array>
+    <string-array name="text_sizes">
+        <item>Malé</item>
+        <item>Normální</item>
+        <item>Velké</item>
+        <item>Větší</item>
+    </string-array>
+    <string-array name="delayed_sending_labels">
+        <item>Bez prodlevy</item>
+        <item>3 sekundy</item>
+        <item>5 sekund</item>
+        <item>10 sekund</item>
+    </string-array>
+    <string-array name="mms_sizes">
+        <item>Automaticky</item>
+        <item>100 kB</item>
+        <item>200 kB</item>
+        <item>300 kB</item>
+        <item>600 kB</item>
+        <item>1 000 kB</item>
+        <item>2 000 kB</item>
+        <item>Bez komprese</item>
+    </string-array>
+    <string-array name="qk_responses">
+        <item>OK</item>
+        <item>Dej mi chvíli</item>
+        <item>Jsem na cestě</item>
+        <item>Díky</item>
+        <item>To zní dobře</item>
+        <item>Co je?</item>
+        <item>Souhlas</item>
+        <item>Ne</item>
+        <item>Miluji tě</item>
+        <item>Omlouvám se</item>
+        <item>LOL</item>
+        <item>To je v pořádku</item>
+    </string-array>
+</resources>
diff --git a/presentation/src/main/res/values-da/strings.xml b/presentation/src/main/res/values-da/strings.xml
index f7f468573..724f759bd 100644
--- a/presentation/src/main/res/values-da/strings.xml
+++ b/presentation/src/main/res/values-da/strings.xml
@@ -1,411 +1,411 @@
-<?xml version="1.0" encoding="utf-8"?>
-<!--
-  ~ Copyright (C) 2019 Moez Bhatti <moez.bhatti@gmail.com>
-  ~
-  ~ This file is part of QKSMS.
-  ~
-  ~ QKSMS is free software: you can redistribute it and/or modify
-  ~ it under the terms of the GNU General Public License as published by
-  ~ the Free Software Foundation, either version 3 of the License, or
-  ~ (at your option) any later version.
-  ~
-  ~ QKSMS is distributed in the hope that it will be useful,
-  ~ but WITHOUT ANY WARRANTY; without even the implied warranty of
-  ~ MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
-  ~ GNU General Public License for more details.
-  ~
-  ~ You should have received a copy of the GNU General Public License
-  ~ along with QKSMS.  If not, see <http://www.gnu.org/licenses/>.
-  -->
-<resources>
-    <string name="shortcut_compose_long_label">Åbn samtale</string>
-    <string name="shortcut_compose_short_label">Skriv</string>
-    <string name="shortcut_compose_disabled_message">Genvej deaktiveret</string>
-    <string name="title_archived">Arkiveret</string>
-    <string name="title_settings">Indstillinger</string>
-    <string name="title_notification_prefs">Notifikationer</string>
-    <string name="title_theme">Tema</string>
-    <string name="title_conversations">Søg i Indbakke&#8230;</string>
-    <string name="title_compose">Angiv et navn eller nummer</string>
-    <string name="setup_skip">Overspring</string>
-    <string name="setup_next">Fortsæt</string>
-    <string name="menu_add_person">Tilføj person</string>
-    <string name="menu_call">Opkald</string>
-    <string name="menu_info">Oplysninger</string>
-    <string name="menu_save">Gem i Galleri</string>
-    <string name="menu_share">Del</string>
-    <string name="main_drawer_open_cd">Åbn navigeringsskuffe</string>
-    <string name="main_title_selected">%d valgt</string>
-    <string name="main_menu_clear">Ryd</string>
-    <string name="main_menu_archive">Arkivér</string>
-    <string name="main_menu_unarchive">Fjern fra arkiv</string>
-    <string name="main_menu_delete">Slet</string>
-    <string name="main_menu_add_contact">Føj til kontakter</string>
-    <string name="main_menu_pin">Fastgør til toppen</string>
-    <string name="main_menu_unpin">Frigør</string>
-    <string name="main_menu_read">Markér som læst</string>
-    <string name="main_menu_unread">Markér som ulæst</string>
-    <string name="main_menu_block">Blokér</string>
-    <string name="main_syncing">Synkroniserer beskeder&#8230;</string>
-    <string name="main_sender_you">Dig: %s</string>
-    <string name="main_draft">Udkast</string>
-    <string name="main_message_results_title">Resultater i beskeder</string>
-    <string name="main_message_results">%d beskeder</string>
-    <string name="inbox_empty_text">Dine samtaler vil fremgå her</string>
-    <string name="inbox_search_empty_text">Ingen resultater</string>
-    <string name="archived_empty_text">Dine arkiverede samtaler vil fremgå her</string>
-    <string name="main_fab_cd">Start ny samtale</string>
-    <string name="main_default_sms_title">Elsk at SMS\'e igen</string>
-    <string name="main_default_sms_message">Gør QKSMS til din standard SMS-app</string>
-    <string name="main_default_sms_change">Skift</string>
-    <string name="main_permission_required">Tilladelse nødvendig</string>
-    <string name="main_permission_sms">QKSMS behøver tilladelse til at sende og vise SMS\'er</string>
-    <string name="main_permission_contacts">QKSMS behøver tilladelse til at se dine kontakter</string>
-    <string name="main_permission_allow">Tillad</string>
-    <string name="drawer_inbox">Indbakke</string>
-    <string name="drawer_archived">Arkiveret</string>
-    <string name="drawer_scheduled">Planlagte</string>
-    <string name="drawer_blocking">Blokering</string>
-    <string name="drawer_more">Flere</string>
-    <string name="drawer_settings">Indstillinger</string>
-    <string name="drawer_help">Hjælp og feedback</string>
-    <string name="drawer_invite">Invitér venner</string>
-    <string name="drawer_plus_banner_summary">Oplås fantastiske nye funktioner og støt udvikling</string>
-    <string name="rate_title">Synes om QKSMS?</string>
-    <string name="rate_summary">Del og bedøm os på Google Play!</string>
-    <string name="rate_okay">OKAY!</string>
-    <string name="rate_dismiss">AFVIS</string>
-    <string name="dialog_delete_title">Slet</string>
-    <plurals name="dialog_delete_message">
-        <item quantity="one">Sikker på, at du vil slette denne samtale?</item>
-        <item quantity="other">Sikker på, at du vil slette disse %d samtaler?</item>
-    </plurals>
-    <string-array name="message_options">
-        <item>Kopiér tekst</item>
-        <item>Videresend</item>
-        <item>Slet</item>
-    </string-array>
-    <string name="compose_number_picker_title">Vælg et telefonnr.</string>
-    <string name="compose_number_picker_default">%s ∙ Standard</string>
-    <string name="compose_number_picker_once">Kun én gang</string>
-    <string name="compose_number_picker_always">Altid</string>
-    <string name="compose_title_selected">%d valgt</string>
-    <string name="compose_subtitle_results">%1$d af %2$d resultater</string>
-    <string name="compose_send_group_title">Send som gruppe besked</string>
-    <string name="compose_send_group_summary">Modtagere og besvarelser vil være synlige for alle</string>
-    <string name="compose_messages_empty">Detter er starten på den samtale. Sig noget pænt!</string>
-    <string name="compose_vcard_label">Kontaktkort</string>
-    <string name="compose_scheduled_for">Planlagt til</string>
-    <string name="compose_scheduled_future">Valgte tidspunkt skal være i fremtiden!</string>
-    <string name="compose_scheduled_plus">Du skal oplåse QKSMS+ for at benytte planlagt beskedfunktion</string>
-    <string name="compose_scheduled_toast">Føjet til planlagte beskeder</string>
-    <string name="compose_hint">Skriv en besked&#8230;</string>
-    <string name="compose_menu_copy">Kopier tekst</string>
-    <string name="compose_menu_forward">Videresend</string>
-    <string name="compose_menu_delete">Slet</string>
-    <string name="compose_menu_previous">Foregående</string>
-    <string name="compose_menu_next">Næste</string>
-    <string name="compose_menu_clear">Ryd</string>
-    <string name="compose_details_title">Beskeddetaljer</string>
-    <string name="compose_details_type">Type: %s</string>
-    <string name="compose_details_from">Fra: %s</string>
-    <string name="compose_details_to">Til: %s</string>
-    <string name="compose_details_subject">Emne: %s</string>
-    <string name="compose_details_priority">Prioritet: %s</string>
-    <string name="compose_details_size">Størrelse: %s</string>
-    <string name="compose_details_sent">Afsendt: %s</string>
-    <string name="compose_details_received">Modtaget: %s</string>
-    <string name="compose_details_delivered">Leveret: %s</string>
-    <string name="compose_details_error_code">Fejlkode: %d</string>
-    <string name="compose_attach_cd">Tilføj en vedhæftning</string>
-    <string name="compose_gallery_cd">Vedhæft et foto</string>
-    <string name="compose_camera_cd">Tag et foto</string>
-    <string name="compose_schedule_cd">Planlæg besked</string>
-    <string name="compose_contact_cd">Vedhæft en kontakt</string>
-    <string name="compose_contact_error">Fejl ved læsning af kontakt</string>
-    <!-- Example: SIM 1 (Verizon) selected-->
-    <string name="compose_sim_changed_toast">SIM %1$d (%2$s) valgt</string>
-    <string name="compose_sim_cd">%s valgt, skift SIM-kortet</string>
-    <string name="compose_send_cd">Send besked</string>
-    <string name="message_status_sending">Afsender&#8230;</string>
-    <string name="message_status_delivered">Leveret %s</string>
-    <string name="message_status_failed">Mislykkedes at afsende. Tryk for at forsøge igen</string>
-    <string name="info_title">Oplysninger</string>
-    <string name="info_copied_address">Adresse kopieret</string>
-    <string name="info_name">Samtaletitel</string>
-    <string name="info_notifications">Notifikationer</string>
-    <string name="info_theme">Tema</string>
-    <string name="info_archive">Arkiv</string>
-    <string name="info_unarchive">Fjern fra arkiv</string>
-    <string name="info_block">Blokér</string>
-    <string name="info_unblock">Afblokér</string>
-    <string name="info_delete">Slet samtale</string>
-    <string name="gallery_error">Kunne ikke indlæse medier</string>
-    <string name="gallery_toast_saved">Gemt til galleri</string>
-    <string name="backup_title">Sikkerhedskopiering og gendannelse</string>
-    <string name="backup_backing_up">Sikkerhedskopierer beskeder</string>
-    <string name="backup_restoring">Gendanner fra sikkerhedskopi</string>
-    <string name="backup_last">Seneste sikkerhedskopi</string>
-    <string name="backup_loading">Indlæser&#8230;</string>
-    <string name="backup_never">Aldrig</string>
-    <string name="backup_restore_title">Gendanne</string>
-    <string name="backup_restore_summary">Vælg en sikkerhedskopi</string>
-    <string name="backup_restore_error_plus">Oplås QKSMS+ for at benytte sikkerhedskopiering og gendannelse</string>
-    <string name="backup_restore_error_backup">Sikkerhedskopiering i gang&#8230;</string>
-    <string name="backup_restore_error_restore">Gendannelse i gang&#8230;</string>
-    <string name="backup_restore_confirm_title">Genskab fra sikkerhedskopi</string>
-    <string name="backup_restore_confirm_message">Er du sikker på at du vil gendanne dine beskeder fra denne sikkerhedskopi?</string>
-    <string name="backup_restore_stop_title">Stop gendannelsen</string>
-    <string name="backup_restore_stop_message">Beskeder som allerede er genskabt vil forblive på din enhed</string>
-    <string name="backup_restore_dialog_title">Sikkerhedskopier</string>
-    <string name="backup_restore_dialog_empty">Ingen sikkerhedskopier fundet</string>
-    <plurals name="backup_message_count">
-        <item quantity="one">%d besked</item>
-        <item quantity="other">%d beskeder</item>
-    </plurals>
-    <string name="backup_disclaimer">I øjeblikket understøtter Sikkerhedskopiering og Gendannelse kun SMS. MMS-understøttelse og planlagte sikkerhedskopieringer kommer snart!</string>
-    <string name="backup_now">Sikkerhedskopiér nu</string>
-    <string name="backup_progress_parsing">Analyserer sikkerhedskopi&#8230;</string>
-    <string name="backup_progress_running">%d/%d beskeder</string>
-    <string name="backup_progress_saving">Gemme sikkerhedskopi&#8230;</string>
-    <string name="backup_progress_syncing">Synkroniserer beskeder&#8230;</string>
-    <string name="backup_progress_finished">Færdig!</string>
-    <string name="backup_notification_channel_name">Sikkerhedskopiering og gendannelse</string>
-    <string name="scheduled_title">Planlagt</string>
-    <string name="scheduled_empty_description">Send automatisk en meddelelse på præcist det tidspunkt, du vil</string>
-    <string name="scheduled_empty_message_1">Hej! Hvornår var det, at du har fødselsdag?</string>
-    <string name="scheduled_empty_message_2">Det er d. 23. december</string>
-    <string name="scheduled_empty_message_3">Tillykke med fødselsdagen! Se hvor god en ven jeg er, at huske din fødselsdag</string>
-    <!--&#x200A; is a special character required at the end of this string to fix it's formatting in the app -->
-    <string name="scheduled_empty_message_3_timestamp">Sender d. 23. december </string>
-    <string name="scheduled_compose_cd">Planlæg en besked</string>
-    <string name="scheduled_options_title">Planlagt besked</string>
-    <string-array name="scheduled_options">
-        <item>Send nu</item>
-        <item>Kopiér tekst</item>
-        <item>Slet</item>
-    </string-array>
-    <string name="settings_category_appearance">Udseende</string>
-    <string name="settings_category_general">Generelt</string>
-    <string name="settings_category_qkreply">QK-svar</string>
-    <string name="settings_theme_title">Tema</string>
-    <string name="settings_night_title">Nattilstand</string>
-    <string name="settings_black_title">Ren sort nattilstand</string>
-    <string name="settings_night_start_title">Starttidspunkt</string>
-    <string name="settings_night_end_title">Sluttidspunkt</string>
-    <string name="settings_automatic_colors_title">Automatiske kontaktfarver</string>
-    <string name="settings_text_size_title">Skriftstørrelse</string>
-    <string name="settings_system_font_title">Brug systemets skrifttype</string>
-    <string name="settings_auto_emoji_title">Automatisk emoji</string>
-    <string name="settings_notifications_title">Notifikationer</string>
-    <string name="settings_notifications_o_summary">Tryk for at tilpasse</string>
-    <string name="settings_notification_actions_title">Handlinger</string>
-    <string name="settings_notification_action_1">Knap 1</string>
-    <string name="settings_notification_action_2">Knap 2</string>
-    <string name="settings_notification_action_3">Knap 3</string>
-    <string name="settings_notification_previews_title">Notifikationseksempler</string>
-    <string name="settings_notification_wake_title">Væk skærm</string>
-    <string name="settings_vibration_title">Vibration</string>
-    <string name="settings_ringtone_title">Lyd</string>
-    <string name="settings_ringtone_none">Ingen</string>
-    <string name="settings_qkreply_title">QK-besvarelse</string>
-    <string name="settings_qkreply_summary">Popup ved nye SMS\'er</string>
-    <string name="settings_qkreply_tap_dismiss_title">Tryk for at afvise</string>
-    <string name="settings_qkreply_tap_dismiss_summary">Tryk udenfor popup-vinduet for at lukke det</string>
-    <string name="settings_delayed_title">Forsinket afsendelse</string>
-    <string name="settings_swipe_actions">Strygehandlinger</string>
-    <string name="settings_swipe_actions_summary">Opsæt strygehandlinger for samtaler</string>
-    <string name="settings_swipe_actions_right">Højrestryg</string>
-    <string name="settings_swipe_actions_left">Venstrestryg</string>
-    <string name="settings_swipe_actions_change">SKIFT</string>
-    <string-array name="settings_swipe_actions">
-        <item>Ingen</item>
-        <item>Arkivér</item>
-        <item>Slet</item>
-        <item>Blokér</item>
-        <item>Ring op</item>
-        <item>Markér som læst</item>
-        <item>Markér som ulæst</item>
-    </string-array>
-    <string name="settings_delivery_title">Leveringskvitteringer</string>
-    <string name="settings_delivery_summary">Bekræft, at SMS\'er er afsendt korrekt</string>
-    <string name="settings_signature_title">Signatur</string>
-    <string name="settings_signature_summary">Føj en signatur til slutningen af dine beskeder</string>
-    <string name="settings_unicode_title">Fjern betoninger</string>
-    <string name="settings_unicode_summary">Fjern betoninger fra tegn i udgående SMS\'er</string>
-    <string name="settings_mobile_title">Kun mobilnumre</string>
-    <string name="settings_mobile_summary">Vis kun mobilnumre ved SMS-skrivning,</string>
-    <string name="settings_auto_delete">Slet automatisk gamle beskeder</string>
-    <string name="settings_auto_delete_dialog_message">Beskeder slettes efter det angivne antal dage</string>
-    <string name="settings_auto_delete_dialog_hint">Antal dage</string>
-    <string name="settings_auto_delete_never">Aldrig</string>
-    <string name="settings_auto_delete_warning">Slet automatisk gamle beskeder?</string>
-    <string name="settings_auto_delete_warning_message">Fortsætter du, slettes %1$d beskeder nu</string>
-    <plurals name="settings_auto_delete_summary">
-        <item quantity="one">Efter 1 dag</item>
-        <item quantity="other">Efter %d dage</item>
-    </plurals>
-    <string name="settings_long_as_mms_title">Send lang SMS som MMS</string>
-    <string name="settings_long_as_mms_summary">Hvis dine længere SMS\'er ikke afsendes eller afsendes i forkert rækkefølge, kan du i stedet sende dem som MMS\'er. Ekstragebyrer kan påløbe</string>
-    <string name="settings_mms_size_title">Auto-komprimér MMS-vedhæftninger</string>
-    <string name="settings_sync_title">Beskedsynkronisering</string>
-    <string name="settings_sync_summary">Gen-synkroniéer beskeder med den indbyggede Android SMS-database</string>
-    <string name="settings_about_title">Om QKSMS</string>
-    <string name="settings_version">Version %s</string>
-    <string name="settings_logging_enabled">Fejlfindingslogning aktiveret</string>
-    <string name="settings_logging_disabled">Fejlfindingslogning deaktiveret</string>
-    <string name="settings_delay_duration_hint">Angiv varighed (sekunder)</string>
-    <string name="blocking_title">Blokering</string>
-    <string name="blocking_drop_title">Drop beskeder</string>
-    <string name="blocking_drop_summary">Drop indgående beskeder fra blokerede afsendere i stedet for at skjule dem</string>
-    <string name="blocking_conversations">Blokerede samtaler</string>
-    <string name="blocking_manager_title">Blokeringshåndtering</string>
-    <string name="blocking_manager_qksms_title">QKSMS</string>
-    <string name="blocking_manager_qksms_summary">Indbygget blokeringsfunktionalitet i QKSMS</string>
-    <string name="blocking_manager_call_control_summary">Filtrér automatisk dine opkald og beskeder på ét praktisk sted! Community IQ ™ giver dig mulighed for at forhindre uønskede beskeder fra spammere kendt af fællesskabet</string>
-    <string name="blocking_manager_sia_summary">Filtrér automatisk beskeder fra uopfordrede numre vha. \"Bør jeg besvare\"-app\'en</string>
-    <string name="blocking_manager_copy_title">Kopiér blokerede numre</string>
-    <string name="blocking_manager_copy_summary">Fortsæt til %s og kopiér dine blokerede nummer dertil</string>
-    <string name="blocked_numbers_title">Blokerede numre</string>
-    <string name="blocked_numbers_empty">Dine blokerede numre vil fremgå hér</string>
-    <string name="blocked_numbers_add_cd">Blokér et nyt nummer</string>
-    <string name="blocked_numbers_dialog_title">Blokér SMS\'er fra</string>
-    <string name="blocked_numbers_dialog_hint">Telefonnummer</string>
-    <string name="blocked_numbers_dialog_block">Blokér</string>
-    <string name="blocked_messages_title">Blokerede beskeder</string>
-    <string name="blocked_messages_empty">Dine blokerede beskeder vil fremgå hér</string>
-    <string name="blocking_block_title">Blokér</string>
-    <string name="blocking_unblock_title">Afblokér</string>
-    <plurals name="blocking_block_external">
-        <item quantity="one">Fortsæt til %s og blokér dette nummer</item>
-        <item quantity="other">Fortsæt til %s og blokér disse numre</item>
-    </plurals>
-    <plurals name="blocking_unblock_external">
-        <item quantity="one">Fortsæt til %s og tillad dette nummer</item>
-        <item quantity="other">Fortsæt til %s og tillad disse numre</item>
-    </plurals>
-    <string name="about_title">Om</string>
-    <string name="about_version_title">Version</string>
-    <string name="about_developer_title">Udvikler</string>
-    <string name="about_source_title">Kildekode</string>
-    <string name="about_changelog_title">Ændringslog</string>
-    <string name="about_contact_title">Kontakt</string>
-    <string name="about_license_title">Licens</string>
-    <string name="about_copyright_title">Copyright</string>
-    <string name="qksms_plus_description_title">Støt udviklingen, oplås alt</string>
-    <string name="qksms_plus_description_summary">Du kan redde en sultende udvikler for kun %s</string>
-    <!-- Substitutions are for price and currency. Ex: Lifetime upgrade for $1.99 USD -->
-    <string name="qksms_plus_upgrade">Livstidsopgradering for %1$s %2$s</string>
-    <!-- Substitutions are for price and currency. Ex: Unlock + donate for $4.99 USD -->
-    <string name="qksms_plus_upgrade_donate">Oplås + donér for %1$s %2$s</string>
-    <string name="qksms_plus_thanks_title">Tak for din støtte til QKSMS!</string>
-    <string name="qksms_plus_thanks_summary">Du har nu adgang til alle QKSMS+-funktioner</string>
-    <string name="qksms_plus_free_title">QKSMS+ er gratis for F-Droid-brugere! Ønsker du at støtte udviklingen, er du velkommen til at donere.</string>
-    <string name="qksms_plus_donate">Donér via PayPal</string>
-    <string name="qksms_plus_coming_soon">Kommer snart</string>
-    <string name="qksms_plus_themes_title">Premium-temaer</string>
-    <string name="qksms_plus_themes_summary">Oplås smukke temafarver, som ikke er tilgængelig på Material Design-paletten</string>
-    <string name="qksms_plus_emoji_title">Tilpasset auto-emoji</string>
-    <string name="qksms_plus_emoji_summary">Opret tilpassede auto-emoji-genveje</string>
-    <string name="qksms_plus_backup_title">Beskedsikkerhedskopiering</string>
-    <string name="qksms_plus_backup_summary">Sikkerhedskopiér automatisk dine beskeder. Ikke flere bekymringer over tab af din historik, hvis du udskifter eller mister din mobil</string>
-    <string name="qksms_plus_scheduled_title">Planlagte beskeder</string>
-    <string name="qksms_plus_scheduled_summary">Planlæg beskeder til automatisk at blive sendt på et specifikt tidspunkt og dato</string>
-    <string name="qksms_plus_delayed_title">Forsinket afsendelse</string>
-    <string name="qksms_plus_delayed_summary">Vent et par sekunder før du afsender beskeden</string>
-    <string name="qksms_plus_night_title">Automatisk nattilstand</string>
-    <string name="qksms_plus_night_summary">Aktivér nattilstanden baseret på klokkeslæt</string>
-    <string name="qksms_plus_blacklist_title">Avanceret blokering</string>
-    <string name="qksms_plus_blacklist_summary">Blokér beskeder indeholdende nøgleord eller mønstermatch</string>
-    <string name="qksms_plus_forward_title">Auto-videresendelse</string>
-    <string name="qksms_plus_forward_summary">Videresend automatisk beskeder fra bestemte afsendere</string>
-    <string name="qksms_plus_respond_title">Autosvar</string>
-    <string name="qksms_plus_respond_summary">Besvarer automatisk indgående beskeder med et foruddefineret svar</string>
-    <string name="qksms_plus_more_title">Flere</string>
-    <string name="qksms_plus_more_summary">QKSMS er under aktiv udvikling, og dit køb vil omfatte alle fremtidige QKSMS+ funktioner!</string>
-    <string name="widget_loading">Indlæser&#8230;</string>
-    <string name="widget_more">Se flere samtaler</string>
-    <string name="qkreply_menu_read">Markér som læst</string>
-    <string name="qkreply_menu_call">Ring op</string>
-    <string name="qkreply_menu_delete">Slet</string>
-    <string name="qkreply_menu_expand">Vis flere</string>
-    <string name="qkreply_menu_collapse">Vis mindre</string>
-    <string name="qkreply_menu_view">Åbn samtale</string>
-    <string name="theme_material">Material</string>
-    <string name="theme_hex">HEX</string>
-    <string name="theme_apply">Anvend</string>
-    <string-array name="notification_actions">
-        <item>Ingen</item>
-        <item>Arkivér</item>
-        <item>Slet</item>
-        <item>Blokér</item>
-        <item>Ring op</item>
-        <item>Markér som læst</item>
-        <item>Svar</item>
-    </string-array>
-    <string name="button_yes">Ja</string>
-    <string name="button_continue">Fortsæt</string>
-    <string name="button_cancel">Annullér</string>
-    <string name="button_delete">Slet</string>
-    <string name="button_save">Gem</string>
-    <string name="button_stop">Stop</string>
-    <string name="button_more">Flere</string>
-    <string name="button_set">Indstil</string>
-    <string name="button_undo">Fortryd</string>
-    <string name="toast_copied">Kopieret</string>
-    <string name="toast_archived">Arkiveret samtale</string>
-    <string name="toast_qksms_plus">Dette kræver oplåsning af QKSMS+</string>
-    <plurals name="notification_new_messages">
-        <item quantity="one">Ny besked</item>
-        <item quantity="other">%s nye beskeder</item>
-    </plurals>
-    <string name="notification_message_failed_title">Besked ikke afsendt</string>
-    <string name="notification_message_failed_text">Mislykkedes at afsende beskeden til %s</string>
-    <string-array name="night_modes">
-        <item>System</item>
-        <item>Deaktiveret</item>
-        <item>Altid slået til</item>
-        <item>Automatisk</item>
-    </string-array>
-    <string-array name="notification_preview_options">
-        <item>Vis navn og besked</item>
-        <item>Vis navn</item>
-        <item>Skjul indhold</item>
-    </string-array>
-    <string-array name="text_sizes">
-        <item>Lille</item>
-        <item>Normal</item>
-        <item>Stor</item>
-        <item>Større</item>
-    </string-array>
-    <string-array name="delayed_sending_labels">
-        <item>Ingen forsinkelse</item>
-        <item>3 sekunder</item>
-        <item>5 sekunder</item>
-        <item>10 sekunder</item>
-    </string-array>
-    <string-array name="mms_sizes">
-        <item>Automatisk</item>
-        <item>100KB</item>
-        <item>200KB</item>
-        <item>300KB</item>
-        <item>600KB</item>
-        <item>1MB</item>
-        <item>2MB</item>
-        <item>Ingen kompression</item>
-    </string-array>
-    <string-array name="qk_responses">
-        <item>OK</item>
-        <item>Lige et øjeblik</item>
-        <item>Er på vej</item>
-        <item>Tak</item>
-        <item>Lyder godt</item>
-        <item>Hvad så?</item>
-        <item>Acceptér</item>
-        <item>Nej</item>
-        <item>Elsker dig</item>
-        <item>Beklager</item>
-        <item>LOL</item>
-        <item>Det er OK</item>
-    </string-array>
-</resources>
+<?xml version="1.0" encoding="utf-8"?>
+<!--
+  ~ Copyright (C) 2019 Moez Bhatti <moez.bhatti@gmail.com>
+  ~
+  ~ This file is part of QKSMS.
+  ~
+  ~ QKSMS is free software: you can redistribute it and/or modify
+  ~ it under the terms of the GNU General Public License as published by
+  ~ the Free Software Foundation, either version 3 of the License, or
+  ~ (at your option) any later version.
+  ~
+  ~ QKSMS is distributed in the hope that it will be useful,
+  ~ but WITHOUT ANY WARRANTY; without even the implied warranty of
+  ~ MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+  ~ GNU General Public License for more details.
+  ~
+  ~ You should have received a copy of the GNU General Public License
+  ~ along with QKSMS.  If not, see <http://www.gnu.org/licenses/>.
+  -->
+<resources>
+    <string name="shortcut_compose_long_label">Åbn samtale</string>
+    <string name="shortcut_compose_short_label">Skriv</string>
+    <string name="shortcut_compose_disabled_message">Genvej deaktiveret</string>
+    <string name="title_archived">Arkiveret</string>
+    <string name="title_settings">Indstillinger</string>
+    <string name="title_notification_prefs">Notifikationer</string>
+    <string name="title_theme">Tema</string>
+    <string name="title_conversations">Søg i Indbakke&#8230;</string>
+    <string name="title_compose">Angiv et navn eller nummer</string>
+    <string name="setup_skip">Overspring</string>
+    <string name="setup_next">Fortsæt</string>
+    <string name="menu_add_person">Tilføj person</string>
+    <string name="menu_call">Opkald</string>
+    <string name="menu_info">Oplysninger</string>
+    <string name="menu_save">Gem i Galleri</string>
+    <string name="menu_share">Del</string>
+    <string name="main_drawer_open_cd">Åbn navigeringsskuffe</string>
+    <string name="main_title_selected">%d valgt</string>
+    <string name="main_menu_clear">Ryd</string>
+    <string name="main_menu_archive">Arkivér</string>
+    <string name="main_menu_unarchive">Fjern fra arkiv</string>
+    <string name="main_menu_delete">Slet</string>
+    <string name="main_menu_add_contact">Føj til kontakter</string>
+    <string name="main_menu_pin">Fastgør til toppen</string>
+    <string name="main_menu_unpin">Frigør</string>
+    <string name="main_menu_read">Markér som læst</string>
+    <string name="main_menu_unread">Markér som ulæst</string>
+    <string name="main_menu_block">Blokér</string>
+    <string name="main_syncing">Synkroniserer beskeder&#8230;</string>
+    <string name="main_sender_you">Dig: %s</string>
+    <string name="main_draft">Udkast</string>
+    <string name="main_message_results_title">Resultater i beskeder</string>
+    <string name="main_message_results">%d beskeder</string>
+    <string name="inbox_empty_text">Dine samtaler vil fremgå her</string>
+    <string name="inbox_search_empty_text">Ingen resultater</string>
+    <string name="archived_empty_text">Dine arkiverede samtaler vil fremgå her</string>
+    <string name="main_fab_cd">Start ny samtale</string>
+    <string name="main_default_sms_title">Elsk at SMS\'e igen</string>
+    <string name="main_default_sms_message">Gør QKSMS til din standard SMS-app</string>
+    <string name="main_default_sms_change">Skift</string>
+    <string name="main_permission_required">Tilladelse nødvendig</string>
+    <string name="main_permission_sms">QKSMS behøver tilladelse til at sende og vise SMS\'er</string>
+    <string name="main_permission_contacts">QKSMS behøver tilladelse til at se dine kontakter</string>
+    <string name="main_permission_allow">Tillad</string>
+    <string name="drawer_inbox">Indbakke</string>
+    <string name="drawer_archived">Arkiveret</string>
+    <string name="drawer_scheduled">Planlagte</string>
+    <string name="drawer_blocking">Blokering</string>
+    <string name="drawer_more">Flere</string>
+    <string name="drawer_settings">Indstillinger</string>
+    <string name="drawer_help">Hjælp og feedback</string>
+    <string name="drawer_invite">Invitér venner</string>
+    <string name="drawer_plus_banner_summary">Oplås fantastiske nye funktioner og støt udvikling</string>
+    <string name="rate_title">Synes om QKSMS?</string>
+    <string name="rate_summary">Del og bedøm os på Google Play!</string>
+    <string name="rate_okay">OKAY!</string>
+    <string name="rate_dismiss">AFVIS</string>
+    <string name="dialog_delete_title">Slet</string>
+    <plurals name="dialog_delete_message">
+        <item quantity="one">Sikker på, at du vil slette denne samtale?</item>
+        <item quantity="other">Sikker på, at du vil slette disse %d samtaler?</item>
+    </plurals>
+    <string-array name="message_options">
+        <item>Kopiér tekst</item>
+        <item>Videresend</item>
+        <item>Slet</item>
+    </string-array>
+    <string name="compose_number_picker_title">Vælg et telefonnr.</string>
+    <string name="compose_number_picker_default">%s ∙ Standard</string>
+    <string name="compose_number_picker_once">Kun én gang</string>
+    <string name="compose_number_picker_always">Altid</string>
+    <string name="compose_title_selected">%d valgt</string>
+    <string name="compose_subtitle_results">%1$d af %2$d resultater</string>
+    <string name="compose_send_group_title">Send som gruppe besked</string>
+    <string name="compose_send_group_summary">Modtagere og besvarelser vil være synlige for alle</string>
+    <string name="compose_messages_empty">Detter er starten på den samtale. Sig noget pænt!</string>
+    <string name="compose_vcard_label">Kontaktkort</string>
+    <string name="compose_scheduled_for">Planlagt til</string>
+    <string name="compose_scheduled_future">Valgte tidspunkt skal være i fremtiden!</string>
+    <string name="compose_scheduled_plus">Du skal oplåse QKSMS+ for at benytte planlagt beskedfunktion</string>
+    <string name="compose_scheduled_toast">Føjet til planlagte beskeder</string>
+    <string name="compose_hint">Skriv en besked&#8230;</string>
+    <string name="compose_menu_copy">Kopier tekst</string>
+    <string name="compose_menu_forward">Videresend</string>
+    <string name="compose_menu_delete">Slet</string>
+    <string name="compose_menu_previous">Foregående</string>
+    <string name="compose_menu_next">Næste</string>
+    <string name="compose_menu_clear">Ryd</string>
+    <string name="compose_details_title">Beskeddetaljer</string>
+    <string name="compose_details_type">Type: %s</string>
+    <string name="compose_details_from">Fra: %s</string>
+    <string name="compose_details_to">Til: %s</string>
+    <string name="compose_details_subject">Emne: %s</string>
+    <string name="compose_details_priority">Prioritet: %s</string>
+    <string name="compose_details_size">Størrelse: %s</string>
+    <string name="compose_details_sent">Afsendt: %s</string>
+    <string name="compose_details_received">Modtaget: %s</string>
+    <string name="compose_details_delivered">Leveret: %s</string>
+    <string name="compose_details_error_code">Fejlkode: %d</string>
+    <string name="compose_attach_cd">Tilføj en vedhæftning</string>
+    <string name="compose_gallery_cd">Vedhæft et foto</string>
+    <string name="compose_camera_cd">Tag et foto</string>
+    <string name="compose_schedule_cd">Planlæg besked</string>
+    <string name="compose_contact_cd">Vedhæft en kontakt</string>
+    <string name="compose_contact_error">Fejl ved læsning af kontakt</string>
+    <!-- Example: SIM 1 (Verizon) selected-->
+    <string name="compose_sim_changed_toast">SIM %1$d (%2$s) valgt</string>
+    <string name="compose_sim_cd">%s valgt, skift SIM-kortet</string>
+    <string name="compose_send_cd">Send besked</string>
+    <string name="message_status_sending">Afsender&#8230;</string>
+    <string name="message_status_delivered">Leveret %s</string>
+    <string name="message_status_failed">Mislykkedes at afsende. Tryk for at forsøge igen</string>
+    <string name="info_title">Oplysninger</string>
+    <string name="info_copied_address">Adresse kopieret</string>
+    <string name="info_name">Samtaletitel</string>
+    <string name="info_notifications">Notifikationer</string>
+    <string name="info_theme">Tema</string>
+    <string name="info_archive">Arkiv</string>
+    <string name="info_unarchive">Fjern fra arkiv</string>
+    <string name="info_block">Blokér</string>
+    <string name="info_unblock">Afblokér</string>
+    <string name="info_delete">Slet samtale</string>
+    <string name="gallery_error">Kunne ikke indlæse medier</string>
+    <string name="gallery_toast_saved">Gemt til galleri</string>
+    <string name="backup_title">Sikkerhedskopiering og gendannelse</string>
+    <string name="backup_backing_up">Sikkerhedskopierer beskeder</string>
+    <string name="backup_restoring">Gendanner fra sikkerhedskopi</string>
+    <string name="backup_last">Seneste sikkerhedskopi</string>
+    <string name="backup_loading">Indlæser&#8230;</string>
+    <string name="backup_never">Aldrig</string>
+    <string name="backup_restore_title">Gendanne</string>
+    <string name="backup_restore_summary">Vælg en sikkerhedskopi</string>
+    <string name="backup_restore_error_plus">Oplås QKSMS+ for at benytte sikkerhedskopiering og gendannelse</string>
+    <string name="backup_restore_error_backup">Sikkerhedskopiering i gang&#8230;</string>
+    <string name="backup_restore_error_restore">Gendannelse i gang&#8230;</string>
+    <string name="backup_restore_confirm_title">Genskab fra sikkerhedskopi</string>
+    <string name="backup_restore_confirm_message">Er du sikker på at du vil gendanne dine beskeder fra denne sikkerhedskopi?</string>
+    <string name="backup_restore_stop_title">Stop gendannelsen</string>
+    <string name="backup_restore_stop_message">Beskeder som allerede er genskabt vil forblive på din enhed</string>
+    <string name="backup_restore_dialog_title">Sikkerhedskopier</string>
+    <string name="backup_restore_dialog_empty">Ingen sikkerhedskopier fundet</string>
+    <plurals name="backup_message_count">
+        <item quantity="one">%d besked</item>
+        <item quantity="other">%d beskeder</item>
+    </plurals>
+    <string name="backup_disclaimer">I øjeblikket understøtter Sikkerhedskopiering og Gendannelse kun SMS. MMS-understøttelse og planlagte sikkerhedskopieringer kommer snart!</string>
+    <string name="backup_now">Sikkerhedskopiér nu</string>
+    <string name="backup_progress_parsing">Analyserer sikkerhedskopi&#8230;</string>
+    <string name="backup_progress_running">%d/%d beskeder</string>
+    <string name="backup_progress_saving">Gemme sikkerhedskopi&#8230;</string>
+    <string name="backup_progress_syncing">Synkroniserer beskeder&#8230;</string>
+    <string name="backup_progress_finished">Færdig!</string>
+    <string name="backup_notification_channel_name">Sikkerhedskopiering og gendannelse</string>
+    <string name="scheduled_title">Planlagt</string>
+    <string name="scheduled_empty_description">Send automatisk en meddelelse på præcist det tidspunkt, du vil</string>
+    <string name="scheduled_empty_message_1">Hej! Hvornår var det, at du har fødselsdag?</string>
+    <string name="scheduled_empty_message_2">Det er d. 23. december</string>
+    <string name="scheduled_empty_message_3">Tillykke med fødselsdagen! Se hvor god en ven jeg er, at huske din fødselsdag</string>
+    <!--&#x200A; is a special character required at the end of this string to fix it's formatting in the app -->
+    <string name="scheduled_empty_message_3_timestamp">Sender d. 23. december </string>
+    <string name="scheduled_compose_cd">Planlæg en besked</string>
+    <string name="scheduled_options_title">Planlagt besked</string>
+    <string-array name="scheduled_options">
+        <item>Send nu</item>
+        <item>Kopiér tekst</item>
+        <item>Slet</item>
+    </string-array>
+    <string name="settings_category_appearance">Udseende</string>
+    <string name="settings_category_general">Generelt</string>
+    <string name="settings_category_qkreply">QK-svar</string>
+    <string name="settings_theme_title">Tema</string>
+    <string name="settings_night_title">Nattilstand</string>
+    <string name="settings_black_title">Ren sort nattilstand</string>
+    <string name="settings_night_start_title">Starttidspunkt</string>
+    <string name="settings_night_end_title">Sluttidspunkt</string>
+    <string name="settings_automatic_colors_title">Automatiske kontaktfarver</string>
+    <string name="settings_text_size_title">Skriftstørrelse</string>
+    <string name="settings_system_font_title">Brug systemets skrifttype</string>
+    <string name="settings_auto_emoji_title">Automatisk emoji</string>
+    <string name="settings_notifications_title">Notifikationer</string>
+    <string name="settings_notifications_o_summary">Tryk for at tilpasse</string>
+    <string name="settings_notification_actions_title">Handlinger</string>
+    <string name="settings_notification_action_1">Knap 1</string>
+    <string name="settings_notification_action_2">Knap 2</string>
+    <string name="settings_notification_action_3">Knap 3</string>
+    <string name="settings_notification_previews_title">Notifikationseksempler</string>
+    <string name="settings_notification_wake_title">Væk skærm</string>
+    <string name="settings_vibration_title">Vibration</string>
+    <string name="settings_ringtone_title">Lyd</string>
+    <string name="settings_ringtone_none">Ingen</string>
+    <string name="settings_qkreply_title">QK-besvarelse</string>
+    <string name="settings_qkreply_summary">Popup ved nye SMS\'er</string>
+    <string name="settings_qkreply_tap_dismiss_title">Tryk for at afvise</string>
+    <string name="settings_qkreply_tap_dismiss_summary">Tryk udenfor popup-vinduet for at lukke det</string>
+    <string name="settings_delayed_title">Forsinket afsendelse</string>
+    <string name="settings_swipe_actions">Strygehandlinger</string>
+    <string name="settings_swipe_actions_summary">Opsæt strygehandlinger for samtaler</string>
+    <string name="settings_swipe_actions_right">Højrestryg</string>
+    <string name="settings_swipe_actions_left">Venstrestryg</string>
+    <string name="settings_swipe_actions_change">SKIFT</string>
+    <string-array name="settings_swipe_actions">
+        <item>Ingen</item>
+        <item>Arkivér</item>
+        <item>Slet</item>
+        <item>Blokér</item>
+        <item>Ring op</item>
+        <item>Markér som læst</item>
+        <item>Markér som ulæst</item>
+    </string-array>
+    <string name="settings_delivery_title">Leveringskvitteringer</string>
+    <string name="settings_delivery_summary">Bekræft, at SMS\'er er afsendt korrekt</string>
+    <string name="settings_signature_title">Signatur</string>
+    <string name="settings_signature_summary">Føj en signatur til slutningen af dine beskeder</string>
+    <string name="settings_unicode_title">Fjern betoninger</string>
+    <string name="settings_unicode_summary">Fjern betoninger fra tegn i udgående SMS\'er</string>
+    <string name="settings_mobile_title">Kun mobilnumre</string>
+    <string name="settings_mobile_summary">Vis kun mobilnumre ved SMS-skrivning,</string>
+    <string name="settings_auto_delete">Slet automatisk gamle beskeder</string>
+    <string name="settings_auto_delete_dialog_message">Beskeder slettes efter det angivne antal dage</string>
+    <string name="settings_auto_delete_dialog_hint">Antal dage</string>
+    <string name="settings_auto_delete_never">Aldrig</string>
+    <string name="settings_auto_delete_warning">Slet automatisk gamle beskeder?</string>
+    <string name="settings_auto_delete_warning_message">Fortsætter du, slettes %1$d beskeder nu</string>
+    <plurals name="settings_auto_delete_summary">
+        <item quantity="one">Efter 1 dag</item>
+        <item quantity="other">Efter %d dage</item>
+    </plurals>
+    <string name="settings_long_as_mms_title">Send lang SMS som MMS</string>
+    <string name="settings_long_as_mms_summary">Hvis dine længere SMS\'er ikke afsendes eller afsendes i forkert rækkefølge, kan du i stedet sende dem som MMS\'er. Ekstragebyrer kan påløbe</string>
+    <string name="settings_mms_size_title">Auto-komprimér MMS-vedhæftninger</string>
+    <string name="settings_sync_title">Beskedsynkronisering</string>
+    <string name="settings_sync_summary">Gen-synkroniéer beskeder med den indbyggede Android SMS-database</string>
+    <string name="settings_about_title">Om QKSMS</string>
+    <string name="settings_version">Version %s</string>
+    <string name="settings_logging_enabled">Fejlfindingslogning aktiveret</string>
+    <string name="settings_logging_disabled">Fejlfindingslogning deaktiveret</string>
+    <string name="settings_delay_duration_hint">Angiv varighed (sekunder)</string>
+    <string name="blocking_title">Blokering</string>
+    <string name="blocking_drop_title">Drop beskeder</string>
+    <string name="blocking_drop_summary">Drop indgående beskeder fra blokerede afsendere i stedet for at skjule dem</string>
+    <string name="blocking_conversations">Blokerede samtaler</string>
+    <string name="blocking_manager_title">Blokeringshåndtering</string>
+    <string name="blocking_manager_qksms_title">QKSMS</string>
+    <string name="blocking_manager_qksms_summary">Indbygget blokeringsfunktionalitet i QKSMS</string>
+    <string name="blocking_manager_call_control_summary">Filtrér automatisk dine opkald og beskeder på ét praktisk sted! Community IQ ™ giver dig mulighed for at forhindre uønskede beskeder fra spammere kendt af fællesskabet</string>
+    <string name="blocking_manager_sia_summary">Filtrér automatisk beskeder fra uopfordrede numre vha. \"Bør jeg besvare\"-app\'en</string>
+    <string name="blocking_manager_copy_title">Kopiér blokerede numre</string>
+    <string name="blocking_manager_copy_summary">Fortsæt til %s og kopiér dine blokerede nummer dertil</string>
+    <string name="blocked_numbers_title">Blokerede numre</string>
+    <string name="blocked_numbers_empty">Dine blokerede numre vil fremgå hér</string>
+    <string name="blocked_numbers_add_cd">Blokér et nyt nummer</string>
+    <string name="blocked_numbers_dialog_title">Blokér SMS\'er fra</string>
+    <string name="blocked_numbers_dialog_hint">Telefonnummer</string>
+    <string name="blocked_numbers_dialog_block">Blokér</string>
+    <string name="blocked_messages_title">Blokerede beskeder</string>
+    <string name="blocked_messages_empty">Dine blokerede beskeder vil fremgå hér</string>
+    <string name="blocking_block_title">Blokér</string>
+    <string name="blocking_unblock_title">Afblokér</string>
+    <plurals name="blocking_block_external">
+        <item quantity="one">Fortsæt til %s og blokér dette nummer</item>
+        <item quantity="other">Fortsæt til %s og blokér disse numre</item>
+    </plurals>
+    <plurals name="blocking_unblock_external">
+        <item quantity="one">Fortsæt til %s og tillad dette nummer</item>
+        <item quantity="other">Fortsæt til %s og tillad disse numre</item>
+    </plurals>
+    <string name="about_title">Om</string>
+    <string name="about_version_title">Version</string>
+    <string name="about_developer_title">Udvikler</string>
+    <string name="about_source_title">Kildekode</string>
+    <string name="about_changelog_title">Ændringslog</string>
+    <string name="about_contact_title">Kontakt</string>
+    <string name="about_license_title">Licens</string>
+    <string name="about_copyright_title">Copyright</string>
+    <string name="qksms_plus_description_title">Støt udviklingen, oplås alt</string>
+    <string name="qksms_plus_description_summary">Du kan redde en sultende udvikler for kun %s</string>
+    <!-- Substitutions are for price and currency. Ex: Lifetime upgrade for $1.99 USD -->
+    <string name="qksms_plus_upgrade">Livstidsopgradering for %1$s %2$s</string>
+    <!-- Substitutions are for price and currency. Ex: Unlock + donate for $4.99 USD -->
+    <string name="qksms_plus_upgrade_donate">Oplås + donér for %1$s %2$s</string>
+    <string name="qksms_plus_thanks_title">Tak for din støtte til QKSMS!</string>
+    <string name="qksms_plus_thanks_summary">Du har nu adgang til alle QKSMS+-funktioner</string>
+    <string name="qksms_plus_free_title">QKSMS+ er gratis for F-Droid-brugere! Ønsker du at støtte udviklingen, er du velkommen til at donere.</string>
+    <string name="qksms_plus_donate">Donér via PayPal</string>
+    <string name="qksms_plus_coming_soon">Kommer snart</string>
+    <string name="qksms_plus_themes_title">Premium-temaer</string>
+    <string name="qksms_plus_themes_summary">Oplås smukke temafarver, som ikke er tilgængelig på Material Design-paletten</string>
+    <string name="qksms_plus_emoji_title">Tilpasset auto-emoji</string>
+    <string name="qksms_plus_emoji_summary">Opret tilpassede auto-emoji-genveje</string>
+    <string name="qksms_plus_backup_title">Beskedsikkerhedskopiering</string>
+    <string name="qksms_plus_backup_summary">Sikkerhedskopiér automatisk dine beskeder. Ikke flere bekymringer over tab af din historik, hvis du udskifter eller mister din mobil</string>
+    <string name="qksms_plus_scheduled_title">Planlagte beskeder</string>
+    <string name="qksms_plus_scheduled_summary">Planlæg beskeder til automatisk at blive sendt på et specifikt tidspunkt og dato</string>
+    <string name="qksms_plus_delayed_title">Forsinket afsendelse</string>
+    <string name="qksms_plus_delayed_summary">Vent et par sekunder før du afsender beskeden</string>
+    <string name="qksms_plus_night_title">Automatisk nattilstand</string>
+    <string name="qksms_plus_night_summary">Aktivér nattilstanden baseret på klokkeslæt</string>
+    <string name="qksms_plus_blacklist_title">Avanceret blokering</string>
+    <string name="qksms_plus_blacklist_summary">Blokér beskeder indeholdende nøgleord eller mønstermatch</string>
+    <string name="qksms_plus_forward_title">Auto-videresendelse</string>
+    <string name="qksms_plus_forward_summary">Videresend automatisk beskeder fra bestemte afsendere</string>
+    <string name="qksms_plus_respond_title">Autosvar</string>
+    <string name="qksms_plus_respond_summary">Besvarer automatisk indgående beskeder med et foruddefineret svar</string>
+    <string name="qksms_plus_more_title">Flere</string>
+    <string name="qksms_plus_more_summary">QKSMS er under aktiv udvikling, og dit køb vil omfatte alle fremtidige QKSMS+ funktioner!</string>
+    <string name="widget_loading">Indlæser&#8230;</string>
+    <string name="widget_more">Se flere samtaler</string>
+    <string name="qkreply_menu_read">Markér som læst</string>
+    <string name="qkreply_menu_call">Ring op</string>
+    <string name="qkreply_menu_delete">Slet</string>
+    <string name="qkreply_menu_expand">Vis flere</string>
+    <string name="qkreply_menu_collapse">Vis mindre</string>
+    <string name="qkreply_menu_view">Åbn samtale</string>
+    <string name="theme_material">Material</string>
+    <string name="theme_hex">HEX</string>
+    <string name="theme_apply">Anvend</string>
+    <string-array name="notification_actions">
+        <item>Ingen</item>
+        <item>Arkivér</item>
+        <item>Slet</item>
+        <item>Blokér</item>
+        <item>Ring op</item>
+        <item>Markér som læst</item>
+        <item>Svar</item>
+    </string-array>
+    <string name="button_yes">Ja</string>
+    <string name="button_continue">Fortsæt</string>
+    <string name="button_cancel">Annullér</string>
+    <string name="button_delete">Slet</string>
+    <string name="button_save">Gem</string>
+    <string name="button_stop">Stop</string>
+    <string name="button_more">Flere</string>
+    <string name="button_set">Indstil</string>
+    <string name="button_undo">Fortryd</string>
+    <string name="toast_copied">Kopieret</string>
+    <string name="toast_archived">Arkiveret samtale</string>
+    <string name="toast_qksms_plus">Dette kræver oplåsning af QKSMS+</string>
+    <plurals name="notification_new_messages">
+        <item quantity="one">Ny besked</item>
+        <item quantity="other">%s nye beskeder</item>
+    </plurals>
+    <string name="notification_message_failed_title">Besked ikke afsendt</string>
+    <string name="notification_message_failed_text">Mislykkedes at afsende beskeden til %s</string>
+    <string-array name="night_modes">
+        <item>System</item>
+        <item>Deaktiveret</item>
+        <item>Altid slået til</item>
+        <item>Automatisk</item>
+    </string-array>
+    <string-array name="notification_preview_options">
+        <item>Vis navn og besked</item>
+        <item>Vis navn</item>
+        <item>Skjul indhold</item>
+    </string-array>
+    <string-array name="text_sizes">
+        <item>Lille</item>
+        <item>Normal</item>
+        <item>Stor</item>
+        <item>Større</item>
+    </string-array>
+    <string-array name="delayed_sending_labels">
+        <item>Ingen forsinkelse</item>
+        <item>3 sekunder</item>
+        <item>5 sekunder</item>
+        <item>10 sekunder</item>
+    </string-array>
+    <string-array name="mms_sizes">
+        <item>Automatisk</item>
+        <item>100KB</item>
+        <item>200KB</item>
+        <item>300KB</item>
+        <item>600KB</item>
+        <item>1MB</item>
+        <item>2MB</item>
+        <item>Ingen kompression</item>
+    </string-array>
+    <string-array name="qk_responses">
+        <item>OK</item>
+        <item>Lige et øjeblik</item>
+        <item>Er på vej</item>
+        <item>Tak</item>
+        <item>Lyder godt</item>
+        <item>Hvad så?</item>
+        <item>Acceptér</item>
+        <item>Nej</item>
+        <item>Elsker dig</item>
+        <item>Beklager</item>
+        <item>LOL</item>
+        <item>Det er OK</item>
+    </string-array>
+</resources>
diff --git a/presentation/src/main/res/values-de/strings.xml b/presentation/src/main/res/values-de/strings.xml
index e06f954ca..d8b703a5b 100644
--- a/presentation/src/main/res/values-de/strings.xml
+++ b/presentation/src/main/res/values-de/strings.xml
@@ -1,411 +1,411 @@
-<?xml version="1.0" encoding="utf-8"?>
-<!--
-  ~ Copyright (C) 2019 Moez Bhatti <moez.bhatti@gmail.com>
-  ~
-  ~ This file is part of QKSMS.
-  ~
-  ~ QKSMS is free software: you can redistribute it and/or modify
-  ~ it under the terms of the GNU General Public License as published by
-  ~ the Free Software Foundation, either version 3 of the License, or
-  ~ (at your option) any later version.
-  ~
-  ~ QKSMS is distributed in the hope that it will be useful,
-  ~ but WITHOUT ANY WARRANTY; without even the implied warranty of
-  ~ MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
-  ~ GNU General Public License for more details.
-  ~
-  ~ You should have received a copy of the GNU General Public License
-  ~ along with QKSMS.  If not, see <http://www.gnu.org/licenses/>.
-  -->
-<resources>
-    <string name="shortcut_compose_long_label">Neue Unterhaltung</string>
-    <string name="shortcut_compose_short_label">Verfassen</string>
-    <string name="shortcut_compose_disabled_message">Schnellzugriff deaktiviert</string>
-    <string name="title_archived">Archiviert</string>
-    <string name="title_settings">Einstellungen</string>
-    <string name="title_notification_prefs">Benachrichtigungen</string>
-    <string name="title_theme">Erscheinungsbild</string>
-    <string name="title_conversations">In Posteingang suchen&#8230;</string>
-    <string name="title_compose">Verfassen</string>
-    <string name="setup_skip">Überspringen</string>
-    <string name="setup_next">Weiter</string>
-    <string name="menu_add_person">Person hinzufügen</string>
-    <string name="menu_call">Anrufen</string>
-    <string name="menu_info">Details</string>
-    <string name="menu_save">In Galerie speichern</string>
-    <string name="menu_share">Teilen</string>
-    <string name="main_drawer_open_cd">Öffne den Navigation Drawer</string>
-    <string name="main_title_selected">%d ausgewählt</string>
-    <string name="main_menu_clear">Zurücksetzen</string>
-    <string name="main_menu_archive">Archivieren</string>
-    <string name="main_menu_unarchive">Wiederherstellen</string>
-    <string name="main_menu_delete">Löschen</string>
-    <string name="main_menu_add_contact">Zu Kontakten hinzufügen</string>
-    <string name="main_menu_pin">Oben anheften</string>
-    <string name="main_menu_unpin">Loslösen</string>
-    <string name="main_menu_read">Als gelesen markieren</string>
-    <string name="main_menu_unread">Als ungelesen markieren</string>
-    <string name="main_menu_block">Blockieren</string>
-    <string name="main_syncing">Synchronisiere Nachrichten&#8230;</string>
-    <string name="main_sender_you">Du: %s</string>
-    <string name="main_draft">Entwurf</string>
-    <string name="main_message_results_title">Ergebnisse in Nachrichten</string>
-    <string name="main_message_results">%d Nachrichten</string>
-    <string name="inbox_empty_text">Deine Unterhaltungen werden hier angezeigt</string>
-    <string name="inbox_search_empty_text">Keine Ergebnisse</string>
-    <string name="archived_empty_text">Archivierte Unterhaltungen werden hier angezeigt</string>
-    <string name="main_fab_cd">Neue Unterhaltung starten</string>
-    <string name="main_default_sms_title">Liebe es wieder, SMS zu schreiben</string>
-    <string name="main_default_sms_message">QKSMS als Standard-SMS-App festlegen</string>
-    <string name="main_default_sms_change">Ändern</string>
-    <string name="main_permission_required">Berechtigung erforderlich</string>
-    <string name="main_permission_sms">QKSMS benötigt die Berechtigung zum Senden und Anzeigen von SMS-Nachrichten</string>
-    <string name="main_permission_contacts">QKSMS benötigt die Berechtigung zum Zugreifen auf die Kontakte</string>
-    <string name="main_permission_allow">Zulassen</string>
-    <string name="drawer_inbox">Posteingang</string>
-    <string name="drawer_archived">Archiviert</string>
-    <string name="drawer_scheduled">Geplant</string>
-    <string name="drawer_blocking">Blockiert</string>
-    <string name="drawer_more">Mehr</string>
-    <string name="drawer_settings">Einstellungen</string>
-    <string name="drawer_help">Hilfe &amp; Feedback</string>
-    <string name="drawer_invite">Freunde einladen</string>
-    <string name="drawer_plus_banner_summary">Schalte erstaunliche Neue Funktionen frei und unterstütze die Entwicklung</string>
-    <string name="rate_title">Gefällt dir QKSMS?</string>
-    <string name="rate_summary">Teile etwas von deiner Liebe und Bewerte uns auf Google Play!</string>
-    <string name="rate_okay">OKAY!</string>
-    <string name="rate_dismiss">VERWERFEN</string>
-    <string name="dialog_delete_title">Löschen</string>
-    <plurals name="dialog_delete_message">
-        <item quantity="one">Bist du sicher, dass du diese Unterhaltung löschen möchtest?</item>
-        <item quantity="other">Bist du sicher, dass du %d Unterhaltungen löschen möchtest?</item>
-    </plurals>
-    <string-array name="message_options">
-        <item>Text kopieren</item>
-        <item>Weiterleiten</item>
-        <item>Löschen</item>
-    </string-array>
-    <string name="compose_number_picker_title">Wählen Sie eine Telefonnummer</string>
-    <string name="compose_number_picker_default">%s - Standard</string>
-    <string name="compose_number_picker_once">Nur einmal</string>
-    <string name="compose_number_picker_always">Immer</string>
-    <string name="compose_title_selected">%d ausgewählt</string>
-    <string name="compose_subtitle_results">%1$d von %2$d Ergebnissen</string>
-    <string name="compose_send_group_title">Als Gruppennachricht senden</string>
-    <string name="compose_send_group_summary">Empfänger und Antworten werden für jeden sichtbar sein</string>
-    <string name="compose_messages_empty">Das ist der Beginn der Unterhaltung. Sag\' etwas Nettes!</string>
-    <string name="compose_vcard_label">Kontaktkarte</string>
-    <string name="compose_scheduled_for">Geplant für</string>
-    <string name="compose_scheduled_future">Gewählte Zeit muss in der Zukunft liegen!</string>
-    <string name="compose_scheduled_plus">Für diese Funktion muss QKSMS+ freigeschalten werden</string>
-    <string name="compose_scheduled_toast">Zu geplanten Nachrichten hinzugefügt</string>
-    <string name="compose_hint">Schreibe eine Nachricht&#8230;</string>
-    <string name="compose_menu_copy">Text kopieren</string>
-    <string name="compose_menu_forward">Weiterleiten</string>
-    <string name="compose_menu_delete">Löschen</string>
-    <string name="compose_menu_previous">Vorherige</string>
-    <string name="compose_menu_next">Nächste</string>
-    <string name="compose_menu_clear">Löschen</string>
-    <string name="compose_details_title">Nachrichtendetails</string>
-    <string name="compose_details_type">Typ: %s</string>
-    <string name="compose_details_from">Von: %s</string>
-    <string name="compose_details_to">An: %s</string>
-    <string name="compose_details_subject">Betreff: %s</string>
-    <string name="compose_details_priority">Priorität: %s</string>
-    <string name="compose_details_size">Größe: %s</string>
-    <string name="compose_details_sent">Gesendet: %s</string>
-    <string name="compose_details_received">Erhalten: %s</string>
-    <string name="compose_details_delivered">Zugestellt: %s</string>
-    <string name="compose_details_error_code">Fehlercode: %d</string>
-    <string name="compose_attach_cd">Anhang hinzufügen</string>
-    <string name="compose_gallery_cd">Foto anhängen</string>
-    <string name="compose_camera_cd">Foto aufnehmen</string>
-    <string name="compose_schedule_cd">Plane Nachricht</string>
-    <string name="compose_contact_cd">Kontakt anhängen</string>
-    <string name="compose_contact_error">Fehler beim Lesen des Kontaktes</string>
-    <!-- Example: SIM 1 (Verizon) selected-->
-    <string name="compose_sim_changed_toast">SIM %1$d (%2$s) ausgewählt</string>
-    <string name="compose_sim_cd">%s ausgewählt, SIM-Karte ändern</string>
-    <string name="compose_send_cd">Nachricht senden</string>
-    <string name="message_status_sending">Wird gesendet&#8230;</string>
-    <string name="message_status_delivered">Zugestellt %s</string>
-    <string name="message_status_failed">Fehler beim Senden. Tippen, um es erneut zu versuchen</string>
-    <string name="info_title">Details</string>
-    <string name="info_copied_address">Adresse kopiert</string>
-    <string name="info_name">Unterhaltungstitel</string>
-    <string name="info_notifications">Benachrichtigungen</string>
-    <string name="info_theme">Erscheinungsbild</string>
-    <string name="info_archive">Archivieren</string>
-    <string name="info_unarchive">Wiederherstellen</string>
-    <string name="info_block">Blockieren</string>
-    <string name="info_unblock">Entsperren</string>
-    <string name="info_delete">Unterhaltung löschen</string>
-    <string name="gallery_error">Mediendatei konnte nicht geladen werden</string>
-    <string name="gallery_toast_saved">In Galerie gespeichert</string>
-    <string name="backup_title">Sichern und Wiederherstellen</string>
-    <string name="backup_backing_up">Sichere Nachrichten</string>
-    <string name="backup_restoring">Aus Sicherung wiederherstellen</string>
-    <string name="backup_last">Letzte Sicherung</string>
-    <string name="backup_loading">Lade&#8230;</string>
-    <string name="backup_never">Niemals</string>
-    <string name="backup_restore_title">Wiederherstellen</string>
-    <string name="backup_restore_summary">Sicherung auswählen</string>
-    <string name="backup_restore_error_plus">Bitte QKSMS+ freischalten, um die Sicherung und Wiederherstellung zu nutzen</string>
-    <string name="backup_restore_error_backup">Sicherung wird durchgeführt&#8230;</string>
-    <string name="backup_restore_error_restore">Wiederherstellung wird durchgeführt&#8230;</string>
-    <string name="backup_restore_confirm_title">Aus einer Sicherung wiederherstellen</string>
-    <string name="backup_restore_confirm_message">Sicher, dass die Nachrichten aus dieser Sicherung wiederhergestellt werden sollen?</string>
-    <string name="backup_restore_stop_title">Wiederherstellung abbrechen</string>
-    <string name="backup_restore_stop_message">Nachrichten, die bereits wiederhergestellt wurden, werden auf Ihrem Gerät bleiben</string>
-    <string name="backup_restore_dialog_title">Sicherungen</string>
-    <string name="backup_restore_dialog_empty">Keine Sicherungen gefunden</string>
-    <plurals name="backup_message_count">
-        <item quantity="one">%d Nachricht</item>
-        <item quantity="other">%d Nachrichten</item>
-    </plurals>
-    <string name="backup_disclaimer">Derzeit wird nur das Sichern und Wiederherstellen von SMS unterstützt. Die Unterstützung für MMS und geplante Sicherungen folgen demnächst!</string>
-    <string name="backup_now">Jetzt sichern</string>
-    <string name="backup_progress_parsing">Analysiere Sicherung&#8230;</string>
-    <string name="backup_progress_running">%d/%d Nachrichten</string>
-    <string name="backup_progress_saving">Sicherung wird gespeichert&#8230;</string>
-    <string name="backup_progress_syncing">Synchronisiere Nachrichten&#8230;</string>
-    <string name="backup_progress_finished">Fertig!</string>
-    <string name="backup_notification_channel_name">Sicherung und Wiederherstellung</string>
-    <string name="scheduled_title">Geplant</string>
-    <string name="scheduled_empty_description">Nachricht genau dann senden, wenn du magst</string>
-    <string name="scheduled_empty_message_1">Hey! Wann war dein Geburtstag nochmal?</string>
-    <string name="scheduled_empty_message_2">Er ist am 23. Dezember</string>
-    <string name="scheduled_empty_message_3">Alles Gute zum Geburtstag! Schau was für ein großartiger Freund ich bin, dass ich an deinen Geburtstag denke</string>
-    <!--&#x200A; is a special character required at the end of this string to fix it's formatting in the app -->
-    <string name="scheduled_empty_message_3_timestamp">Am 23. Dezember senden </string>
-    <string name="scheduled_compose_cd">Nachricht verschieben</string>
-    <string name="scheduled_options_title">Geplante Nachricht</string>
-    <string-array name="scheduled_options">
-        <item>Sofort senden</item>
-        <item>Text kopieren</item>
-        <item>Löschen</item>
-    </string-array>
-    <string name="settings_category_appearance">Aussehen</string>
-    <string name="settings_category_general">Allgemein</string>
-    <string name="settings_category_qkreply">Schnellantwort</string>
-    <string name="settings_theme_title">Erscheinungsbild</string>
-    <string name="settings_night_title">Nachtmodus</string>
-    <string name="settings_black_title">Rein schwarzer Nachtmodus</string>
-    <string name="settings_night_start_title">Anfang</string>
-    <string name="settings_night_end_title">Ende</string>
-    <string name="settings_automatic_colors_title">Automatische Kontaktfarben</string>
-    <string name="settings_text_size_title">Schriftgröße</string>
-    <string name="settings_system_font_title">Systemschriftart verwenden</string>
-    <string name="settings_auto_emoji_title">Automatische Emoji</string>
-    <string name="settings_notifications_title">Benachrichtigungen</string>
-    <string name="settings_notifications_o_summary">Zum Anpassen antippen</string>
-    <string name="settings_notification_actions_title">Aktionen</string>
-    <string name="settings_notification_action_1">Taste 1</string>
-    <string name="settings_notification_action_2">Taste 2</string>
-    <string name="settings_notification_action_3">Taste 3</string>
-    <string name="settings_notification_previews_title">Benachrichtigungsvorschau</string>
-    <string name="settings_notification_wake_title">Bildschirm aufwecken</string>
-    <string name="settings_vibration_title">Vibration</string>
-    <string name="settings_ringtone_title">Ton</string>
-    <string name="settings_ringtone_none">Keine</string>
-    <string name="settings_qkreply_title">Schnellantwort</string>
-    <string name="settings_qkreply_summary">Popup für neue Nachrichten</string>
-    <string name="settings_qkreply_tap_dismiss_title">Zum Verwerfen tippen</string>
-    <string name="settings_qkreply_tap_dismiss_summary">Tippe außerhalb des Popup um es zu schließen</string>
-    <string name="settings_delayed_title">Verzögertes Senden</string>
-    <string name="settings_swipe_actions">Gesten</string>
-    <string name="settings_swipe_actions_summary">Konfiguriere Gesten für Unterhaltungen</string>
-    <string name="settings_swipe_actions_right">Nach rechts wischen</string>
-    <string name="settings_swipe_actions_left">Nach links wischen</string>
-    <string name="settings_swipe_actions_change">ÄNDERN</string>
-    <string-array name="settings_swipe_actions">
-        <item>Keine</item>
-        <item>Archivieren</item>
-        <item>Löschen</item>
-        <item>Blockieren</item>
-        <item>Anrufen</item>
-        <item>Als gelesen markieren</item>
-        <item>Als ungelesen markieren</item>
-    </string-array>
-    <string name="settings_delivery_title">Zustellbestätigungen</string>
-    <string name="settings_delivery_summary">Bestätigung, dass Nachrichten erfolgreich gesendet wurden</string>
-    <string name="settings_signature_title">Signatur</string>
-    <string name="settings_signature_summary">Füge eine Signatur am Ende deiner Nachrichten hinzu</string>
-    <string name="settings_unicode_title">Akzente entfernen</string>
-    <string name="settings_unicode_summary">Akzente aus Zeichen in ausgehenden SMS-Nachrichten entfernen</string>
-    <string name="settings_mobile_title">Nur Mobilfunknummern</string>
-    <string name="settings_mobile_summary">Beim Verfassen einer Nachricht nur Mobilfunknummern anzeigen</string>
-    <string name="settings_auto_delete">Alte Nachrichten automatisch löschen</string>
-    <string name="settings_auto_delete_dialog_message">Nachrichten werden nach der angegebenen Anzahl von Tagen gelöscht</string>
-    <string name="settings_auto_delete_dialog_hint">Anzahl der Tage</string>
-    <string name="settings_auto_delete_never">Niemals</string>
-    <string name="settings_auto_delete_warning">Alte Nachrichten automatisch löschen?</string>
-    <string name="settings_auto_delete_warning_message">Wenn Sie fortfahren, werden jetzt %1$d Nachrichten gelöscht</string>
-    <plurals name="settings_auto_delete_summary">
-        <item quantity="one">Nach 1 Tag</item>
-        <item quantity="other">Nach %d Tagen</item>
-    </plurals>
-    <string name="settings_long_as_mms_title">Lange Nachrichten als MMS senden</string>
-    <string name="settings_long_as_mms_summary">Wenn Ihre längeren Textnachrichten nicht gesendet oder in der falsche Reihenfolge gesendet werden, können Sie sie stattdessen als MMS-Nachrichten senden. Dafür können zusätzliche Gebühren anfallen.</string>
-    <string name="settings_mms_size_title">MMS-Anhänge automatisch komprimieren</string>
-    <string name="settings_sync_title">Nachrichten synchronisieren</string>
-    <string name="settings_sync_summary">Nachrichten mit der Android SMS-Datenbank abgleichen</string>
-    <string name="settings_about_title">Über QKSMS</string>
-    <string name="settings_version">Version %s</string>
-    <string name="settings_logging_enabled">Protokollierung zur Fehlerbehebung aktiviert</string>
-    <string name="settings_logging_disabled">Protokollierung zur Fehlerbehebung deaktiviert</string>
-    <string name="settings_delay_duration_hint">Dauer eingeben (in Sekunden)</string>
-    <string name="blocking_title">Blockieren</string>
-    <string name="blocking_drop_title">Nachrichten verwerfen</string>
-    <string name="blocking_drop_summary">Eingehende Nachrichten von blockierten Absendern verwefen anstatt sie auszublenden</string>
-    <string name="blocking_conversations">Blockierte Unterhaltungen</string>
-    <string name="blocking_manager_title">Blockiermanager</string>
-    <string name="blocking_manager_qksms_title">QKSMS</string>
-    <string name="blocking_manager_qksms_summary">In QKSMS integrierte Blockierfunktion</string>
-    <string name="blocking_manager_call_control_summary">Filtern Sie automatisch Ihre Anrufe und Nachrichten in einer geeigneten Umgeben! Community IQ™ erlaubt es Ihnen unerwünschte Nachrichten von bekannten Spamnern zu unterbinden</string>
-    <string name="blocking_manager_sia_summary">Nachrichten von unerwünschten Nummern automatisch mit Hilfe der App \"Should I Answer?\" filtern</string>
-    <string name="blocking_manager_copy_title">blockierte Nummer(n) kopieren</string>
-    <string name="blocking_manager_copy_summary">Zu %s wechseln und zu den existierenden blockierten Nummern kopieren</string>
-    <string name="blocked_numbers_title">blockierte Nummern</string>
-    <string name="blocked_numbers_empty">Ihre blockierte Nummern werden hier angezeigt</string>
-    <string name="blocked_numbers_add_cd">Eine neue Nummer blockieren</string>
-    <string name="blocked_numbers_dialog_title">Blockiere Texte von</string>
-    <string name="blocked_numbers_dialog_hint">Telefonnummer</string>
-    <string name="blocked_numbers_dialog_block">Blockieren</string>
-    <string name="blocked_messages_title">Blockierte Nachrichten</string>
-    <string name="blocked_messages_empty">Ihre blockierte Nachrichten werden hier angezeigt</string>
-    <string name="blocking_block_title">Blockieren</string>
-    <string name="blocking_unblock_title">Freigeben</string>
-    <plurals name="blocking_block_external">
-        <item quantity="one">Wechseln zu %s und diese Nummer blockieren</item>
-        <item quantity="other">Wechseln zu %s und diese Nummern blockieren</item>
-    </plurals>
-    <plurals name="blocking_unblock_external">
-        <item quantity="one">Wechseln zu %s und diese Nummer erlauben</item>
-        <item quantity="other">Wechseln zu %s und diese Nummern erlauben</item>
-    </plurals>
-    <string name="about_title">Über</string>
-    <string name="about_version_title">Version</string>
-    <string name="about_developer_title">Entwickler</string>
-    <string name="about_source_title">Quelltext</string>
-    <string name="about_changelog_title">Änderungsprotokoll</string>
-    <string name="about_contact_title">Kontakt</string>
-    <string name="about_license_title">Lizenz</string>
-    <string name="about_copyright_title">Urheberrecht</string>
-    <string name="qksms_plus_description_title">Unterstütze die Entwicklung, schalte alle Funktionen frei</string>
-    <string name="qksms_plus_description_summary">Rette einen hungernden Entwickler für nur %s</string>
-    <!-- Substitutions are for price and currency. Ex: Lifetime upgrade for $1.99 USD -->
-    <string name="qksms_plus_upgrade">Lebenslanges Upgrade für %1$s %2$s</string>
-    <!-- Substitutions are for price and currency. Ex: Unlock + donate for $4.99 USD -->
-    <string name="qksms_plus_upgrade_donate">Entsperren &amp; Spenden für %1$s %2$s</string>
-    <string name="qksms_plus_thanks_title">Vielen Dank für die Unterstützung von QKSMS!</string>
-    <string name="qksms_plus_thanks_summary">Du kannst jetzt alle QKSMS+ Funktionen verwenden</string>
-    <string name="qksms_plus_free_title">QKSMS+ ist für Nutzer von F-Droid kostenfrei! Spende gerne um die Entwicklung zu Unterstützen.</string>
-    <string name="qksms_plus_donate">Spenden per PayPal</string>
-    <string name="qksms_plus_coming_soon">Demnächst verfügbar</string>
-    <string name="qksms_plus_themes_title">Premium-Erscheinungsbilder</string>
-    <string name="qksms_plus_themes_summary">Wundervolle Farben, die kein Teil der Material Design-Farbpalette sind, für das Erscheinungsbild freischalten</string>
-    <string name="qksms_plus_emoji_title">Benutzerdefinierte Auto-Emoji</string>
-    <string name="qksms_plus_emoji_summary">Benutzerdefinierte Auto-Emoji-Verknüpfungen erstellen</string>
-    <string name="qksms_plus_backup_title">Nachrichtensicherung</string>
-    <string name="qksms_plus_backup_summary">Sichere Deine Nachrichten automatisch. Solltest Du Dein Handy wechseln oder es verlieren, musst Du Dir keine Sorgen mehr machen</string>
-    <string name="qksms_plus_scheduled_title">Geplante Nachrichten</string>
-    <string name="qksms_plus_scheduled_summary">Den automatischen Versand von Nachrichten zu einem bestimmen Zeitpunkt planen</string>
-    <string name="qksms_plus_delayed_title">Verzögertes Senden</string>
-    <string name="qksms_plus_delayed_summary">Wartet einige Sekunden, bevor deine Nachricht gesendet wird</string>
-    <string name="qksms_plus_night_title">Automatischer Nachtmodus</string>
-    <string name="qksms_plus_night_summary">Nachtmodus basierend auf der Uhrzeit aktivieren</string>
-    <string name="qksms_plus_blacklist_title">Erweitertes Blockieren</string>
-    <string name="qksms_plus_blacklist_summary">Nachrichten die bestimmte Wörter oder Muster enthalten blockieren</string>
-    <string name="qksms_plus_forward_title">Automatische Weiterleitung</string>
-    <string name="qksms_plus_forward_summary">Nachrichten von bestimmten Absendern automatisch weiterleiten</string>
-    <string name="qksms_plus_respond_title">Automatische Antwort</string>
-    <string name="qksms_plus_respond_summary">Eingehende Nachrichten werden mit einer voreingestellten Antwort beantwortet</string>
-    <string name="qksms_plus_more_title">Mehr</string>
-    <string name="qksms_plus_more_summary">QKSMS wird aktiv weiterentwickelt und Dein Erwerb wird alle zukünftigen Funktionen enthalten!</string>
-    <string name="widget_loading">Lädt&#8230;</string>
-    <string name="widget_more">Weitere Unterhaltungen anzeigen</string>
-    <string name="qkreply_menu_read">Als gelesen markieren</string>
-    <string name="qkreply_menu_call">Anrufen</string>
-    <string name="qkreply_menu_delete">Löschen</string>
-    <string name="qkreply_menu_expand">Mehr anzeigen</string>
-    <string name="qkreply_menu_collapse">Weniger anzeigen</string>
-    <string name="qkreply_menu_view">Unterhaltung öffnen</string>
-    <string name="theme_material">Material</string>
-    <string name="theme_hex">HEX</string>
-    <string name="theme_apply">Übernehmen</string>
-    <string-array name="notification_actions">
-        <item>Nichts</item>
-        <item>Archiv</item>
-        <item>Löschen</item>
-        <item>Blockieren</item>
-        <item>Anrufen</item>
-        <item>Als gelesen markieren</item>
-        <item>Antwort</item>
-    </string-array>
-    <string name="button_yes">Ja</string>
-    <string name="button_continue">Fortsetzen</string>
-    <string name="button_cancel">Abbrechen</string>
-    <string name="button_delete">Löschen</string>
-    <string name="button_save">Speichern</string>
-    <string name="button_stop">Stop</string>
-    <string name="button_more">Mehr</string>
-    <string name="button_set">OK</string>
-    <string name="button_undo">Rückgängig</string>
-    <string name="toast_copied">Kopiert</string>
-    <string name="toast_archived">Archivierte Unterhaltung</string>
-    <string name="toast_qksms_plus">Für diese Funktion muss QKSMS+ freigeschalten werden</string>
-    <plurals name="notification_new_messages">
-        <item quantity="one">Neue Nachricht</item>
-        <item quantity="other">%s neue Nachrichten</item>
-    </plurals>
-    <string name="notification_message_failed_title">Nachricht wurde nicht gesendet</string>
-    <string name="notification_message_failed_text">Die Nachricht konnte nicht an %s gesendet werden</string>
-    <string-array name="night_modes">
-        <item>System</item>
-        <item>Deaktiviert</item>
-        <item>Immer an</item>
-        <item>Automatisch</item>
-    </string-array>
-    <string-array name="notification_preview_options">
-        <item>Name und Nachricht anzeigen</item>
-        <item>Name anzeigen</item>
-        <item>Inhalt ausblenden</item>
-    </string-array>
-    <string-array name="text_sizes">
-        <item>Klein</item>
-        <item>Normal</item>
-        <item>Groß</item>
-        <item>Größer</item>
-    </string-array>
-    <string-array name="delayed_sending_labels">
-        <item>Keine Verzögerung</item>
-        <item>3 Sekunden</item>
-        <item>5 Sekunden</item>
-        <item>10 Sekunden</item>
-    </string-array>
-    <string-array name="mms_sizes">
-        <item>Automatisch</item>
-        <item>100KB</item>
-        <item>200KB</item>
-        <item>300KB</item>
-        <item>600KB</item>
-        <item>1000KB</item>
-        <item>2000KB</item>
-        <item>Keine Komprimierung</item>
-    </string-array>
-    <string-array name="qk_responses">
-        <item>Okay</item>
-        <item>Gib mir einen Moment</item>
-        <item>Ich bin auf dem Weg</item>
-        <item>Danke</item>
-        <item>Klingt gut</item>
-        <item>Wie geht\'s?</item>
-        <item>Abgemacht</item>
-        <item>Nein</item>
-        <item>Ich liebe dich</item>
-        <item>Tut mir leid</item>
-        <item>LOL</item>
-        <item>Das ist OK</item>
-    </string-array>
-</resources>
+<?xml version="1.0" encoding="utf-8"?>
+<!--
+  ~ Copyright (C) 2019 Moez Bhatti <moez.bhatti@gmail.com>
+  ~
+  ~ This file is part of QKSMS.
+  ~
+  ~ QKSMS is free software: you can redistribute it and/or modify
+  ~ it under the terms of the GNU General Public License as published by
+  ~ the Free Software Foundation, either version 3 of the License, or
+  ~ (at your option) any later version.
+  ~
+  ~ QKSMS is distributed in the hope that it will be useful,
+  ~ but WITHOUT ANY WARRANTY; without even the implied warranty of
+  ~ MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+  ~ GNU General Public License for more details.
+  ~
+  ~ You should have received a copy of the GNU General Public License
+  ~ along with QKSMS.  If not, see <http://www.gnu.org/licenses/>.
+  -->
+<resources>
+    <string name="shortcut_compose_long_label">Neue Unterhaltung</string>
+    <string name="shortcut_compose_short_label">Verfassen</string>
+    <string name="shortcut_compose_disabled_message">Schnellzugriff deaktiviert</string>
+    <string name="title_archived">Archiviert</string>
+    <string name="title_settings">Einstellungen</string>
+    <string name="title_notification_prefs">Benachrichtigungen</string>
+    <string name="title_theme">Erscheinungsbild</string>
+    <string name="title_conversations">In Posteingang suchen&#8230;</string>
+    <string name="title_compose">Verfassen</string>
+    <string name="setup_skip">Überspringen</string>
+    <string name="setup_next">Weiter</string>
+    <string name="menu_add_person">Person hinzufügen</string>
+    <string name="menu_call">Anrufen</string>
+    <string name="menu_info">Details</string>
+    <string name="menu_save">In Galerie speichern</string>
+    <string name="menu_share">Teilen</string>
+    <string name="main_drawer_open_cd">Öffne den Navigation Drawer</string>
+    <string name="main_title_selected">%d ausgewählt</string>
+    <string name="main_menu_clear">Zurücksetzen</string>
+    <string name="main_menu_archive">Archivieren</string>
+    <string name="main_menu_unarchive">Wiederherstellen</string>
+    <string name="main_menu_delete">Löschen</string>
+    <string name="main_menu_add_contact">Zu Kontakten hinzufügen</string>
+    <string name="main_menu_pin">Oben anheften</string>
+    <string name="main_menu_unpin">Loslösen</string>
+    <string name="main_menu_read">Als gelesen markieren</string>
+    <string name="main_menu_unread">Als ungelesen markieren</string>
+    <string name="main_menu_block">Blockieren</string>
+    <string name="main_syncing">Synchronisiere Nachrichten&#8230;</string>
+    <string name="main_sender_you">Du: %s</string>
+    <string name="main_draft">Entwurf</string>
+    <string name="main_message_results_title">Ergebnisse in Nachrichten</string>
+    <string name="main_message_results">%d Nachrichten</string>
+    <string name="inbox_empty_text">Deine Unterhaltungen werden hier angezeigt</string>
+    <string name="inbox_search_empty_text">Keine Ergebnisse</string>
+    <string name="archived_empty_text">Archivierte Unterhaltungen werden hier angezeigt</string>
+    <string name="main_fab_cd">Neue Unterhaltung starten</string>
+    <string name="main_default_sms_title">Liebe es wieder, SMS zu schreiben</string>
+    <string name="main_default_sms_message">QKSMS als Standard-SMS-App festlegen</string>
+    <string name="main_default_sms_change">Ändern</string>
+    <string name="main_permission_required">Berechtigung erforderlich</string>
+    <string name="main_permission_sms">QKSMS benötigt die Berechtigung zum Senden und Anzeigen von SMS-Nachrichten</string>
+    <string name="main_permission_contacts">QKSMS benötigt die Berechtigung zum Zugreifen auf die Kontakte</string>
+    <string name="main_permission_allow">Zulassen</string>
+    <string name="drawer_inbox">Posteingang</string>
+    <string name="drawer_archived">Archiviert</string>
+    <string name="drawer_scheduled">Geplant</string>
+    <string name="drawer_blocking">Blockiert</string>
+    <string name="drawer_more">Mehr</string>
+    <string name="drawer_settings">Einstellungen</string>
+    <string name="drawer_help">Hilfe &amp; Feedback</string>
+    <string name="drawer_invite">Freunde einladen</string>
+    <string name="drawer_plus_banner_summary">Schalte erstaunliche Neue Funktionen frei und unterstütze die Entwicklung</string>
+    <string name="rate_title">Gefällt dir QKSMS?</string>
+    <string name="rate_summary">Teile etwas von deiner Liebe und Bewerte uns auf Google Play!</string>
+    <string name="rate_okay">OKAY!</string>
+    <string name="rate_dismiss">VERWERFEN</string>
+    <string name="dialog_delete_title">Löschen</string>
+    <plurals name="dialog_delete_message">
+        <item quantity="one">Bist du sicher, dass du diese Unterhaltung löschen möchtest?</item>
+        <item quantity="other">Bist du sicher, dass du %d Unterhaltungen löschen möchtest?</item>
+    </plurals>
+    <string-array name="message_options">
+        <item>Text kopieren</item>
+        <item>Weiterleiten</item>
+        <item>Löschen</item>
+    </string-array>
+    <string name="compose_number_picker_title">Wählen Sie eine Telefonnummer</string>
+    <string name="compose_number_picker_default">%s - Standard</string>
+    <string name="compose_number_picker_once">Nur einmal</string>
+    <string name="compose_number_picker_always">Immer</string>
+    <string name="compose_title_selected">%d ausgewählt</string>
+    <string name="compose_subtitle_results">%1$d von %2$d Ergebnissen</string>
+    <string name="compose_send_group_title">Als Gruppennachricht senden</string>
+    <string name="compose_send_group_summary">Empfänger und Antworten werden für jeden sichtbar sein</string>
+    <string name="compose_messages_empty">Das ist der Beginn der Unterhaltung. Sag\' etwas Nettes!</string>
+    <string name="compose_vcard_label">Kontaktkarte</string>
+    <string name="compose_scheduled_for">Geplant für</string>
+    <string name="compose_scheduled_future">Gewählte Zeit muss in der Zukunft liegen!</string>
+    <string name="compose_scheduled_plus">Für diese Funktion muss QKSMS+ freigeschalten werden</string>
+    <string name="compose_scheduled_toast">Zu geplanten Nachrichten hinzugefügt</string>
+    <string name="compose_hint">Schreibe eine Nachricht&#8230;</string>
+    <string name="compose_menu_copy">Text kopieren</string>
+    <string name="compose_menu_forward">Weiterleiten</string>
+    <string name="compose_menu_delete">Löschen</string>
+    <string name="compose_menu_previous">Vorherige</string>
+    <string name="compose_menu_next">Nächste</string>
+    <string name="compose_menu_clear">Löschen</string>
+    <string name="compose_details_title">Nachrichtendetails</string>
+    <string name="compose_details_type">Typ: %s</string>
+    <string name="compose_details_from">Von: %s</string>
+    <string name="compose_details_to">An: %s</string>
+    <string name="compose_details_subject">Betreff: %s</string>
+    <string name="compose_details_priority">Priorität: %s</string>
+    <string name="compose_details_size">Größe: %s</string>
+    <string name="compose_details_sent">Gesendet: %s</string>
+    <string name="compose_details_received">Erhalten: %s</string>
+    <string name="compose_details_delivered">Zugestellt: %s</string>
+    <string name="compose_details_error_code">Fehlercode: %d</string>
+    <string name="compose_attach_cd">Anhang hinzufügen</string>
+    <string name="compose_gallery_cd">Foto anhängen</string>
+    <string name="compose_camera_cd">Foto aufnehmen</string>
+    <string name="compose_schedule_cd">Plane Nachricht</string>
+    <string name="compose_contact_cd">Kontakt anhängen</string>
+    <string name="compose_contact_error">Fehler beim Lesen des Kontaktes</string>
+    <!-- Example: SIM 1 (Verizon) selected-->
+    <string name="compose_sim_changed_toast">SIM %1$d (%2$s) ausgewählt</string>
+    <string name="compose_sim_cd">%s ausgewählt, SIM-Karte ändern</string>
+    <string name="compose_send_cd">Nachricht senden</string>
+    <string name="message_status_sending">Wird gesendet&#8230;</string>
+    <string name="message_status_delivered">Zugestellt %s</string>
+    <string name="message_status_failed">Fehler beim Senden. Tippen, um es erneut zu versuchen</string>
+    <string name="info_title">Details</string>
+    <string name="info_copied_address">Adresse kopiert</string>
+    <string name="info_name">Unterhaltungstitel</string>
+    <string name="info_notifications">Benachrichtigungen</string>
+    <string name="info_theme">Erscheinungsbild</string>
+    <string name="info_archive">Archivieren</string>
+    <string name="info_unarchive">Wiederherstellen</string>
+    <string name="info_block">Blockieren</string>
+    <string name="info_unblock">Entsperren</string>
+    <string name="info_delete">Unterhaltung löschen</string>
+    <string name="gallery_error">Mediendatei konnte nicht geladen werden</string>
+    <string name="gallery_toast_saved">In Galerie gespeichert</string>
+    <string name="backup_title">Sichern und Wiederherstellen</string>
+    <string name="backup_backing_up">Sichere Nachrichten</string>
+    <string name="backup_restoring">Aus Sicherung wiederherstellen</string>
+    <string name="backup_last">Letzte Sicherung</string>
+    <string name="backup_loading">Lade&#8230;</string>
+    <string name="backup_never">Niemals</string>
+    <string name="backup_restore_title">Wiederherstellen</string>
+    <string name="backup_restore_summary">Sicherung auswählen</string>
+    <string name="backup_restore_error_plus">Bitte QKSMS+ freischalten, um die Sicherung und Wiederherstellung zu nutzen</string>
+    <string name="backup_restore_error_backup">Sicherung wird durchgeführt&#8230;</string>
+    <string name="backup_restore_error_restore">Wiederherstellung wird durchgeführt&#8230;</string>
+    <string name="backup_restore_confirm_title">Aus einer Sicherung wiederherstellen</string>
+    <string name="backup_restore_confirm_message">Sicher, dass die Nachrichten aus dieser Sicherung wiederhergestellt werden sollen?</string>
+    <string name="backup_restore_stop_title">Wiederherstellung abbrechen</string>
+    <string name="backup_restore_stop_message">Nachrichten, die bereits wiederhergestellt wurden, werden auf Ihrem Gerät bleiben</string>
+    <string name="backup_restore_dialog_title">Sicherungen</string>
+    <string name="backup_restore_dialog_empty">Keine Sicherungen gefunden</string>
+    <plurals name="backup_message_count">
+        <item quantity="one">%d Nachricht</item>
+        <item quantity="other">%d Nachrichten</item>
+    </plurals>
+    <string name="backup_disclaimer">Derzeit wird nur das Sichern und Wiederherstellen von SMS unterstützt. Die Unterstützung für MMS und geplante Sicherungen folgen demnächst!</string>
+    <string name="backup_now">Jetzt sichern</string>
+    <string name="backup_progress_parsing">Analysiere Sicherung&#8230;</string>
+    <string name="backup_progress_running">%d/%d Nachrichten</string>
+    <string name="backup_progress_saving">Sicherung wird gespeichert&#8230;</string>
+    <string name="backup_progress_syncing">Synchronisiere Nachrichten&#8230;</string>
+    <string name="backup_progress_finished">Fertig!</string>
+    <string name="backup_notification_channel_name">Sicherung und Wiederherstellung</string>
+    <string name="scheduled_title">Geplant</string>
+    <string name="scheduled_empty_description">Nachricht genau dann senden, wenn du magst</string>
+    <string name="scheduled_empty_message_1">Hey! Wann war dein Geburtstag nochmal?</string>
+    <string name="scheduled_empty_message_2">Er ist am 23. Dezember</string>
+    <string name="scheduled_empty_message_3">Alles Gute zum Geburtstag! Schau was für ein großartiger Freund ich bin, dass ich an deinen Geburtstag denke</string>
+    <!--&#x200A; is a special character required at the end of this string to fix it's formatting in the app -->
+    <string name="scheduled_empty_message_3_timestamp">Am 23. Dezember senden </string>
+    <string name="scheduled_compose_cd">Nachricht verschieben</string>
+    <string name="scheduled_options_title">Geplante Nachricht</string>
+    <string-array name="scheduled_options">
+        <item>Sofort senden</item>
+        <item>Text kopieren</item>
+        <item>Löschen</item>
+    </string-array>
+    <string name="settings_category_appearance">Aussehen</string>
+    <string name="settings_category_general">Allgemein</string>
+    <string name="settings_category_qkreply">Schnellantwort</string>
+    <string name="settings_theme_title">Erscheinungsbild</string>
+    <string name="settings_night_title">Nachtmodus</string>
+    <string name="settings_black_title">Rein schwarzer Nachtmodus</string>
+    <string name="settings_night_start_title">Anfang</string>
+    <string name="settings_night_end_title">Ende</string>
+    <string name="settings_automatic_colors_title">Automatische Kontaktfarben</string>
+    <string name="settings_text_size_title">Schriftgröße</string>
+    <string name="settings_system_font_title">Systemschriftart verwenden</string>
+    <string name="settings_auto_emoji_title">Automatische Emoji</string>
+    <string name="settings_notifications_title">Benachrichtigungen</string>
+    <string name="settings_notifications_o_summary">Zum Anpassen antippen</string>
+    <string name="settings_notification_actions_title">Aktionen</string>
+    <string name="settings_notification_action_1">Taste 1</string>
+    <string name="settings_notification_action_2">Taste 2</string>
+    <string name="settings_notification_action_3">Taste 3</string>
+    <string name="settings_notification_previews_title">Benachrichtigungsvorschau</string>
+    <string name="settings_notification_wake_title">Bildschirm aufwecken</string>
+    <string name="settings_vibration_title">Vibration</string>
+    <string name="settings_ringtone_title">Ton</string>
+    <string name="settings_ringtone_none">Keine</string>
+    <string name="settings_qkreply_title">Schnellantwort</string>
+    <string name="settings_qkreply_summary">Popup für neue Nachrichten</string>
+    <string name="settings_qkreply_tap_dismiss_title">Zum Verwerfen tippen</string>
+    <string name="settings_qkreply_tap_dismiss_summary">Tippe außerhalb des Popup um es zu schließen</string>
+    <string name="settings_delayed_title">Verzögertes Senden</string>
+    <string name="settings_swipe_actions">Gesten</string>
+    <string name="settings_swipe_actions_summary">Konfiguriere Gesten für Unterhaltungen</string>
+    <string name="settings_swipe_actions_right">Nach rechts wischen</string>
+    <string name="settings_swipe_actions_left">Nach links wischen</string>
+    <string name="settings_swipe_actions_change">ÄNDERN</string>
+    <string-array name="settings_swipe_actions">
+        <item>Keine</item>
+        <item>Archivieren</item>
+        <item>Löschen</item>
+        <item>Blockieren</item>
+        <item>Anrufen</item>
+        <item>Als gelesen markieren</item>
+        <item>Als ungelesen markieren</item>
+    </string-array>
+    <string name="settings_delivery_title">Zustellbestätigungen</string>
+    <string name="settings_delivery_summary">Bestätigung, dass Nachrichten erfolgreich gesendet wurden</string>
+    <string name="settings_signature_title">Signatur</string>
+    <string name="settings_signature_summary">Füge eine Signatur am Ende deiner Nachrichten hinzu</string>
+    <string name="settings_unicode_title">Akzente entfernen</string>
+    <string name="settings_unicode_summary">Akzente aus Zeichen in ausgehenden SMS-Nachrichten entfernen</string>
+    <string name="settings_mobile_title">Nur Mobilfunknummern</string>
+    <string name="settings_mobile_summary">Beim Verfassen einer Nachricht nur Mobilfunknummern anzeigen</string>
+    <string name="settings_auto_delete">Alte Nachrichten automatisch löschen</string>
+    <string name="settings_auto_delete_dialog_message">Nachrichten werden nach der angegebenen Anzahl von Tagen gelöscht</string>
+    <string name="settings_auto_delete_dialog_hint">Anzahl der Tage</string>
+    <string name="settings_auto_delete_never">Niemals</string>
+    <string name="settings_auto_delete_warning">Alte Nachrichten automatisch löschen?</string>
+    <string name="settings_auto_delete_warning_message">Wenn Sie fortfahren, werden jetzt %1$d Nachrichten gelöscht</string>
+    <plurals name="settings_auto_delete_summary">
+        <item quantity="one">Nach 1 Tag</item>
+        <item quantity="other">Nach %d Tagen</item>
+    </plurals>
+    <string name="settings_long_as_mms_title">Lange Nachrichten als MMS senden</string>
+    <string name="settings_long_as_mms_summary">Wenn Ihre längeren Textnachrichten nicht gesendet oder in der falsche Reihenfolge gesendet werden, können Sie sie stattdessen als MMS-Nachrichten senden. Dafür können zusätzliche Gebühren anfallen.</string>
+    <string name="settings_mms_size_title">MMS-Anhänge automatisch komprimieren</string>
+    <string name="settings_sync_title">Nachrichten synchronisieren</string>
+    <string name="settings_sync_summary">Nachrichten mit der Android SMS-Datenbank abgleichen</string>
+    <string name="settings_about_title">Über QKSMS</string>
+    <string name="settings_version">Version %s</string>
+    <string name="settings_logging_enabled">Protokollierung zur Fehlerbehebung aktiviert</string>
+    <string name="settings_logging_disabled">Protokollierung zur Fehlerbehebung deaktiviert</string>
+    <string name="settings_delay_duration_hint">Dauer eingeben (in Sekunden)</string>
+    <string name="blocking_title">Blockieren</string>
+    <string name="blocking_drop_title">Nachrichten verwerfen</string>
+    <string name="blocking_drop_summary">Eingehende Nachrichten von blockierten Absendern verwefen anstatt sie auszublenden</string>
+    <string name="blocking_conversations">Blockierte Unterhaltungen</string>
+    <string name="blocking_manager_title">Blockiermanager</string>
+    <string name="blocking_manager_qksms_title">QKSMS</string>
+    <string name="blocking_manager_qksms_summary">In QKSMS integrierte Blockierfunktion</string>
+    <string name="blocking_manager_call_control_summary">Filtern Sie automatisch Ihre Anrufe und Nachrichten in einer geeigneten Umgeben! Community IQ™ erlaubt es Ihnen unerwünschte Nachrichten von bekannten Spamnern zu unterbinden</string>
+    <string name="blocking_manager_sia_summary">Nachrichten von unerwünschten Nummern automatisch mit Hilfe der App \"Should I Answer?\" filtern</string>
+    <string name="blocking_manager_copy_title">blockierte Nummer(n) kopieren</string>
+    <string name="blocking_manager_copy_summary">Zu %s wechseln und zu den existierenden blockierten Nummern kopieren</string>
+    <string name="blocked_numbers_title">blockierte Nummern</string>
+    <string name="blocked_numbers_empty">Ihre blockierte Nummern werden hier angezeigt</string>
+    <string name="blocked_numbers_add_cd">Eine neue Nummer blockieren</string>
+    <string name="blocked_numbers_dialog_title">Blockiere Texte von</string>
+    <string name="blocked_numbers_dialog_hint">Telefonnummer</string>
+    <string name="blocked_numbers_dialog_block">Blockieren</string>
+    <string name="blocked_messages_title">Blockierte Nachrichten</string>
+    <string name="blocked_messages_empty">Ihre blockierte Nachrichten werden hier angezeigt</string>
+    <string name="blocking_block_title">Blockieren</string>
+    <string name="blocking_unblock_title">Freigeben</string>
+    <plurals name="blocking_block_external">
+        <item quantity="one">Wechseln zu %s und diese Nummer blockieren</item>
+        <item quantity="other">Wechseln zu %s und diese Nummern blockieren</item>
+    </plurals>
+    <plurals name="blocking_unblock_external">
+        <item quantity="one">Wechseln zu %s und diese Nummer erlauben</item>
+        <item quantity="other">Wechseln zu %s und diese Nummern erlauben</item>
+    </plurals>
+    <string name="about_title">Über</string>
+    <string name="about_version_title">Version</string>
+    <string name="about_developer_title">Entwickler</string>
+    <string name="about_source_title">Quelltext</string>
+    <string name="about_changelog_title">Änderungsprotokoll</string>
+    <string name="about_contact_title">Kontakt</string>
+    <string name="about_license_title">Lizenz</string>
+    <string name="about_copyright_title">Urheberrecht</string>
+    <string name="qksms_plus_description_title">Unterstütze die Entwicklung, schalte alle Funktionen frei</string>
+    <string name="qksms_plus_description_summary">Rette einen hungernden Entwickler für nur %s</string>
+    <!-- Substitutions are for price and currency. Ex: Lifetime upgrade for $1.99 USD -->
+    <string name="qksms_plus_upgrade">Lebenslanges Upgrade für %1$s %2$s</string>
+    <!-- Substitutions are for price and currency. Ex: Unlock + donate for $4.99 USD -->
+    <string name="qksms_plus_upgrade_donate">Entsperren &amp; Spenden für %1$s %2$s</string>
+    <string name="qksms_plus_thanks_title">Vielen Dank für die Unterstützung von QKSMS!</string>
+    <string name="qksms_plus_thanks_summary">Du kannst jetzt alle QKSMS+ Funktionen verwenden</string>
+    <string name="qksms_plus_free_title">QKSMS+ ist für Nutzer von F-Droid kostenfrei! Spende gerne um die Entwicklung zu Unterstützen.</string>
+    <string name="qksms_plus_donate">Spenden per PayPal</string>
+    <string name="qksms_plus_coming_soon">Demnächst verfügbar</string>
+    <string name="qksms_plus_themes_title">Premium-Erscheinungsbilder</string>
+    <string name="qksms_plus_themes_summary">Wundervolle Farben, die kein Teil der Material Design-Farbpalette sind, für das Erscheinungsbild freischalten</string>
+    <string name="qksms_plus_emoji_title">Benutzerdefinierte Auto-Emoji</string>
+    <string name="qksms_plus_emoji_summary">Benutzerdefinierte Auto-Emoji-Verknüpfungen erstellen</string>
+    <string name="qksms_plus_backup_title">Nachrichtensicherung</string>
+    <string name="qksms_plus_backup_summary">Sichere Deine Nachrichten automatisch. Solltest Du Dein Handy wechseln oder es verlieren, musst Du Dir keine Sorgen mehr machen</string>
+    <string name="qksms_plus_scheduled_title">Geplante Nachrichten</string>
+    <string name="qksms_plus_scheduled_summary">Den automatischen Versand von Nachrichten zu einem bestimmen Zeitpunkt planen</string>
+    <string name="qksms_plus_delayed_title">Verzögertes Senden</string>
+    <string name="qksms_plus_delayed_summary">Wartet einige Sekunden, bevor deine Nachricht gesendet wird</string>
+    <string name="qksms_plus_night_title">Automatischer Nachtmodus</string>
+    <string name="qksms_plus_night_summary">Nachtmodus basierend auf der Uhrzeit aktivieren</string>
+    <string name="qksms_plus_blacklist_title">Erweitertes Blockieren</string>
+    <string name="qksms_plus_blacklist_summary">Nachrichten die bestimmte Wörter oder Muster enthalten blockieren</string>
+    <string name="qksms_plus_forward_title">Automatische Weiterleitung</string>
+    <string name="qksms_plus_forward_summary">Nachrichten von bestimmten Absendern automatisch weiterleiten</string>
+    <string name="qksms_plus_respond_title">Automatische Antwort</string>
+    <string name="qksms_plus_respond_summary">Eingehende Nachrichten werden mit einer voreingestellten Antwort beantwortet</string>
+    <string name="qksms_plus_more_title">Mehr</string>
+    <string name="qksms_plus_more_summary">QKSMS wird aktiv weiterentwickelt und Dein Erwerb wird alle zukünftigen Funktionen enthalten!</string>
+    <string name="widget_loading">Lädt&#8230;</string>
+    <string name="widget_more">Weitere Unterhaltungen anzeigen</string>
+    <string name="qkreply_menu_read">Als gelesen markieren</string>
+    <string name="qkreply_menu_call">Anrufen</string>
+    <string name="qkreply_menu_delete">Löschen</string>
+    <string name="qkreply_menu_expand">Mehr anzeigen</string>
+    <string name="qkreply_menu_collapse">Weniger anzeigen</string>
+    <string name="qkreply_menu_view">Unterhaltung öffnen</string>
+    <string name="theme_material">Material</string>
+    <string name="theme_hex">HEX</string>
+    <string name="theme_apply">Übernehmen</string>
+    <string-array name="notification_actions">
+        <item>Nichts</item>
+        <item>Archiv</item>
+        <item>Löschen</item>
+        <item>Blockieren</item>
+        <item>Anrufen</item>
+        <item>Als gelesen markieren</item>
+        <item>Antwort</item>
+    </string-array>
+    <string name="button_yes">Ja</string>
+    <string name="button_continue">Fortsetzen</string>
+    <string name="button_cancel">Abbrechen</string>
+    <string name="button_delete">Löschen</string>
+    <string name="button_save">Speichern</string>
+    <string name="button_stop">Stop</string>
+    <string name="button_more">Mehr</string>
+    <string name="button_set">OK</string>
+    <string name="button_undo">Rückgängig</string>
+    <string name="toast_copied">Kopiert</string>
+    <string name="toast_archived">Archivierte Unterhaltung</string>
+    <string name="toast_qksms_plus">Für diese Funktion muss QKSMS+ freigeschalten werden</string>
+    <plurals name="notification_new_messages">
+        <item quantity="one">Neue Nachricht</item>
+        <item quantity="other">%s neue Nachrichten</item>
+    </plurals>
+    <string name="notification_message_failed_title">Nachricht wurde nicht gesendet</string>
+    <string name="notification_message_failed_text">Die Nachricht konnte nicht an %s gesendet werden</string>
+    <string-array name="night_modes">
+        <item>System</item>
+        <item>Deaktiviert</item>
+        <item>Immer an</item>
+        <item>Automatisch</item>
+    </string-array>
+    <string-array name="notification_preview_options">
+        <item>Name und Nachricht anzeigen</item>
+        <item>Name anzeigen</item>
+        <item>Inhalt ausblenden</item>
+    </string-array>
+    <string-array name="text_sizes">
+        <item>Klein</item>
+        <item>Normal</item>
+        <item>Groß</item>
+        <item>Größer</item>
+    </string-array>
+    <string-array name="delayed_sending_labels">
+        <item>Keine Verzögerung</item>
+        <item>3 Sekunden</item>
+        <item>5 Sekunden</item>
+        <item>10 Sekunden</item>
+    </string-array>
+    <string-array name="mms_sizes">
+        <item>Automatisch</item>
+        <item>100KB</item>
+        <item>200KB</item>
+        <item>300KB</item>
+        <item>600KB</item>
+        <item>1000KB</item>
+        <item>2000KB</item>
+        <item>Keine Komprimierung</item>
+    </string-array>
+    <string-array name="qk_responses">
+        <item>Okay</item>
+        <item>Gib mir einen Moment</item>
+        <item>Ich bin auf dem Weg</item>
+        <item>Danke</item>
+        <item>Klingt gut</item>
+        <item>Wie geht\'s?</item>
+        <item>Abgemacht</item>
+        <item>Nein</item>
+        <item>Ich liebe dich</item>
+        <item>Tut mir leid</item>
+        <item>LOL</item>
+        <item>Das ist OK</item>
+    </string-array>
+</resources>
diff --git a/presentation/src/main/res/values-el/strings.xml b/presentation/src/main/res/values-el/strings.xml
index a2884a225..70fb58d13 100644
--- a/presentation/src/main/res/values-el/strings.xml
+++ b/presentation/src/main/res/values-el/strings.xml
@@ -1,411 +1,411 @@
-<?xml version="1.0" encoding="utf-8"?>
-<!--
-  ~ Copyright (C) 2019 Moez Bhatti <moez.bhatti@gmail.com>
-  ~
-  ~ This file is part of QKSMS.
-  ~
-  ~ QKSMS is free software: you can redistribute it and/or modify
-  ~ it under the terms of the GNU General Public License as published by
-  ~ the Free Software Foundation, either version 3 of the License, or
-  ~ (at your option) any later version.
-  ~
-  ~ QKSMS is distributed in the hope that it will be useful,
-  ~ but WITHOUT ANY WARRANTY; without even the implied warranty of
-  ~ MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
-  ~ GNU General Public License for more details.
-  ~
-  ~ You should have received a copy of the GNU General Public License
-  ~ along with QKSMS.  If not, see <http://www.gnu.org/licenses/>.
-  -->
-<resources>
-    <string name="shortcut_compose_long_label">Νέα συζήτηση</string>
-    <string name="shortcut_compose_short_label">Σύνταξη</string>
-    <string name="shortcut_compose_disabled_message">Η συντόμευση απενεργοποιήθηκε</string>
-    <string name="title_archived">Αρχείο</string>
-    <string name="title_settings">Ρυθμίσεις</string>
-    <string name="title_notification_prefs">Ειδοποιήσεις</string>
-    <string name="title_theme">Θέμα εμφάνισης</string>
-    <string name="title_conversations">Αναζήτηση στα εισερχόμενα&#8230;</string>
-    <string name="title_compose">Πληκτρολογήστε ένα όνομα ή αριθμό</string>
-    <string name="setup_skip">Παράλειψη</string>
-    <string name="setup_next">Συνέχεια</string>
-    <string name="menu_add_person">Προσθήκη ατόμου</string>
-    <string name="menu_call">Κλήση</string>
-    <string name="menu_info">Λεπτομέρειες</string>
-    <string name="menu_save">Αποθήκευση στη συλλογή</string>
-    <string name="menu_share">Κοινή χρήση</string>
-    <string name="main_drawer_open_cd">Άνοιγμα πλαισίου πλοήγησης</string>
-    <string name="main_title_selected">Επιλεγμένα: %d</string>
-    <string name="main_menu_clear">Εκκαθάριση</string>
-    <string name="main_menu_archive">Αρχειοθέτηση</string>
-    <string name="main_menu_unarchive">Αναίρεση αρχειοθέτησης</string>
-    <string name="main_menu_delete">Διαγραφή</string>
-    <string name="main_menu_add_contact">Προσθήκη στις επαφές</string>
-    <string name="main_menu_pin">Καρφίτσωμα στην κορυφή</string>
-    <string name="main_menu_unpin">Ξεκαρφίτσωμα</string>
-    <string name="main_menu_read">Mark read</string>
-    <string name="main_menu_unread">Mark unread</string>
-    <string name="main_menu_block">Φραγή</string>
-    <string name="main_syncing">Συγχρονισμός μηνυμάτων&#8230;</string>
-    <string name="main_sender_you">Εσείς: %s</string>
-    <string name="main_draft">Πρόχειρο</string>
-    <string name="main_message_results_title">Αποτελέσματα στα μηνύματα</string>
-    <string name="main_message_results">Μηνύματα: %d</string>
-    <string name="inbox_empty_text">Οι συζητήσεις σας θα εμφανίζονται εδώ</string>
-    <string name="inbox_search_empty_text">Δεν υπάρχουν αποτελέσματα</string>
-    <string name="archived_empty_text">Οι αρχειοθετημένες συζητήσεις σας θα εμφανίζονται εδώ</string>
-    <string name="main_fab_cd">Έναρξη νέας συνομιλίας</string>
-    <string name="main_default_sms_title">Αγαπήστε και πάλι τα SMS</string>
-    <string name="main_default_sms_message">Ορίστε το QKSMS ως προκαθορισμένη εφαρμογή SMS</string>
-    <string name="main_default_sms_change">Αλλαγή</string>
-    <string name="main_permission_required">Απαιτείται άδεια</string>
-    <string name="main_permission_sms">Το QKSMS απαιτεί την άδεια αποστολής και ανάγνωσης μηνυμάτων SMS</string>
-    <string name="main_permission_contacts">Το QKSMS απαιτεί την άδεια ανάγνωσης των επαφών σας</string>
-    <string name="main_permission_allow">Να επιτραπεί</string>
-    <string name="drawer_inbox">Εισερχόμενα</string>
-    <string name="drawer_archived">Αρχείο</string>
-    <string name="drawer_scheduled">Προγραμματισμένα</string>
-    <string name="drawer_blocking">Με φραγή</string>
-    <string name="drawer_more">Περισσότερα</string>
-    <string name="drawer_settings">Ρυθμίσεις</string>
-    <string name="drawer_help">Βοήθεια &amp; αποστολή σχολίων</string>
-    <string name="drawer_invite">Πρόσκληση φίλων</string>
-    <string name="drawer_plus_banner_summary">Ξεκλειδώστε φανταστικές νέες λειτουργίες και συμβάλετε στην ανάπτυξη</string>
-    <string name="rate_title">Σας αρέσει το QKSMS;</string>
-    <string name="rate_summary">Δείξτε μας την αγάπη σας και βαθμολογήστε μας στο Google Play!</string>
-    <string name="rate_okay">ΕΝΤΑΞΕΙ!</string>
-    <string name="rate_dismiss">ΠΑΡΑΛΕΙΨΗ</string>
-    <string name="dialog_delete_title">Διαγραφή</string>
-    <plurals name="dialog_delete_message">
-        <item quantity="one">Σίγουρα επιθυμείτε να διαγράψετε αυτή τη συζήτηση;</item>
-        <item quantity="other">Σίγουρα επιθυμείτε να διαγράψετε %d συζητήσεις;</item>
-    </plurals>
-    <string-array name="message_options">
-        <item>Αντιγραφή κειμένου</item>
-        <item>Προώθηση</item>
-        <item>Διαγραφή</item>
-    </string-array>
-    <string name="compose_number_picker_title">Επιλέξτε έναν αριθμό τηλεφώνου</string>
-    <string name="compose_number_picker_default">%s ∙ Προεπιλεγμένος</string>
-    <string name="compose_number_picker_once">Μόνο μια φορά</string>
-    <string name="compose_number_picker_always">Πάντα</string>
-    <string name="compose_title_selected">Επιλέχθηκαν: %d</string>
-    <string name="compose_subtitle_results">%1$d από %2$d αποτελέσματα</string>
-    <string name="compose_send_group_title">Αποστολή ως ομαδικό μήνυμα</string>
-    <string name="compose_send_group_summary">Οι παραλήπτες και απαντήσεις θα είναι ορατοί σε όλους</string>
-    <string name="compose_messages_empty">Εδώ ξεκινά η συζήτηση. Πείτε κάτι ωραίο!</string>
-    <string name="compose_vcard_label">Κάρτα επαφής</string>
-    <string name="compose_scheduled_for">Προγραμματίστηκε για</string>
-    <string name="compose_scheduled_future">Η χρονική στιγμή πρέπει να βρίσκεται στο μέλλον!</string>
-    <string name="compose_scheduled_plus">Πρέπει να ξεκλειδώσετε το QKSMS+ για να αποκτήσετε τη δυνατότητα προγραμματισμού μηνυμάτων</string>
-    <string name="compose_scheduled_toast">Προστέθηκε στα προγραμματισμένα μηνύματα</string>
-    <string name="compose_hint">Γράψτε ένα μήνυμα&#8230;</string>
-    <string name="compose_menu_copy">Αντιγραφή κειμένου</string>
-    <string name="compose_menu_forward">Προώθηση</string>
-    <string name="compose_menu_delete">Διαγραφή</string>
-    <string name="compose_menu_previous">Προηγούμενο</string>
-    <string name="compose_menu_next">Επόμενο</string>
-    <string name="compose_menu_clear">Εκκαθάριση</string>
-    <string name="compose_details_title">Λεπτομέρειες μηνύματος</string>
-    <string name="compose_details_type">Τύπος: %s</string>
-    <string name="compose_details_from">Από: %s</string>
-    <string name="compose_details_to">Προς: %s</string>
-    <string name="compose_details_subject">Θέμα: %s</string>
-    <string name="compose_details_priority">Προτεραιότητα: %s</string>
-    <string name="compose_details_size">Μέγεθος: %s</string>
-    <string name="compose_details_sent">Εστάλη: %s</string>
-    <string name="compose_details_received">Ελήφθη: %s</string>
-    <string name="compose_details_delivered">Παραδόθηκε: %s</string>
-    <string name="compose_details_error_code">Κωδικός σφάλματος: %d</string>
-    <string name="compose_attach_cd">Προσθήκη συνημμένου</string>
-    <string name="compose_gallery_cd">Επισύναψη φωτογραφίας</string>
-    <string name="compose_camera_cd">Λήψη φωτογραφίας</string>
-    <string name="compose_schedule_cd">Προγραμματισμός μηνύματος</string>
-    <string name="compose_contact_cd">Επισύναψη επαφής</string>
-    <string name="compose_contact_error">Πρόβλημα ανάγνωσης επαφής</string>
-    <!-- Example: SIM 1 (Verizon) selected-->
-    <string name="compose_sim_changed_toast">SIM %1$d (%2$s) selected</string>
-    <string name="compose_sim_cd">Επελέγη το %s, αλλάξτε την κάρτα SIM</string>
-    <string name="compose_send_cd">Αποστολή μηνύματος</string>
-    <string name="message_status_sending">Αποστολή&#8230;</string>
-    <string name="message_status_delivered">Παραδόθηκε: %s</string>
-    <string name="message_status_failed">Αποτυχία αποστολής. Πατήστε για νέα προσπάθεια</string>
-    <string name="info_title">Λεπτομέρειες</string>
-    <string name="info_copied_address">Η διεύθυνση αντεγράφη</string>
-    <string name="info_name">Τίτλος συζήτησης</string>
-    <string name="info_notifications">Ειδοποιήσεις</string>
-    <string name="info_theme">Θέμα εμφάνισης</string>
-    <string name="info_archive">Αρχειοθέτηση</string>
-    <string name="info_unarchive">Αναίρεση αρχειοθέτησης</string>
-    <string name="info_block">Φραγή</string>
-    <string name="info_unblock">Αναίρεση φραγής</string>
-    <string name="info_delete">Διαγραφή συζήτησης</string>
-    <string name="gallery_error">Αδυναμία φόρτωσης μέσων</string>
-    <string name="gallery_toast_saved">Αποθηκεύτηκε στη συλλογή</string>
-    <string name="backup_title">Αντίγραφα ασφαλείας και επαναφορά</string>
-    <string name="backup_backing_up">Δημιουργία αντιγράφου ασφαλείας μηνυμάτων</string>
-    <string name="backup_restoring">Επαναφορά αντιγράφου ασφαλείας μηνυμάτων</string>
-    <string name="backup_last">Τελευταίο αντίγραφο ασφαλείας</string>
-    <string name="backup_loading">Φόρτωση&#8230;</string>
-    <string name="backup_never">Ποτέ</string>
-    <string name="backup_restore_title">Επαναφορά</string>
-    <string name="backup_restore_summary">Επιλέξτε ένα αντίγραφο ασφαλείας</string>
-    <string name="backup_restore_error_plus">Παρακαλώ ξεκλειδώστε το QKSMS+ για τη δημιουργία και επαναφορά αντιγράφων ασφαλείας</string>
-    <string name="backup_restore_error_backup">Δημιουργία αντιγράφου ασφαλείας&#8230;</string>
-    <string name="backup_restore_error_restore">Επαναφορά αντιγράφου ασφαλείας&#8230;</string>
-    <string name="backup_restore_confirm_title">Επαναφορά αντιγράφου ασφαλείας</string>
-    <string name="backup_restore_confirm_message">Σίγουρα επιθυμείτε να επαναφέρετε τα μηνύματα σας από αυτό το αντίγραφο ασφαλείας;</string>
-    <string name="backup_restore_stop_title">Διακοπή επαναφοράς</string>
-    <string name="backup_restore_stop_message">Τα μηνύματα που έχουν ήδη ανακτηθεί θα παραμείνουν στη συσκευή σας</string>
-    <string name="backup_restore_dialog_title">Αντίγραφα ασφαλείας</string>
-    <string name="backup_restore_dialog_empty">Δεν βρέθηκαν αντίγραφα ασφαλείας</string>
-    <plurals name="backup_message_count">
-        <item quantity="one">%d message</item>
-        <item quantity="other">%d μηνύματα</item>
-    </plurals>
-    <string name="backup_disclaimer">Προς το παρόν, μπορούν να δημιουργηθούν αντίγραφα ασφαλείας μόνο για SMS. Η υποστήριξη MMS και ο προγραμματισμός αντιγράφων ασφαλείας θα προστεθούν σύντομα!</string>
-    <string name="backup_now">Δημιουργία αντιγράφου τώρα</string>
-    <string name="backup_progress_parsing">Ανάγνωση αντιγράφου ασφαλείας&#8230;</string>
-    <string name="backup_progress_running">%d/%d μηνύματα</string>
-    <string name="backup_progress_saving">Αποθήκευση αντιγράφου ασφαλείας&#8230;</string>
-    <string name="backup_progress_syncing">Συγχρονισμός μηνυμάτων&#8230;</string>
-    <string name="backup_progress_finished">Ολοκληρώθηκε!</string>
-    <string name="backup_notification_channel_name">Αντίγραφα ασφαλείας και επαναφορά</string>
-    <string name="scheduled_title">Προγραμματισμένα</string>
-    <string name="scheduled_empty_description">Στείλτε μήνυμα αυτόματα, την ακριβή στιγμή που επιθυμείτε</string>
-    <string name="scheduled_empty_message_1">Γεια! Πότε είπαμε ότι έχεις γενέθλια;</string>
-    <string name="scheduled_empty_message_2">Στις 23 Δεκεμβρίου</string>
-    <string name="scheduled_empty_message_3">Χρόνια πολλά! Δες τι καλός φίλος που είμαι και θυμήθηκα τα γενέθλιά σου</string>
-    <!--&#x200A; is a special character required at the end of this string to fix it's formatting in the app -->
-    <string name="scheduled_empty_message_3_timestamp">Αποστολή στις 23 Δεκεμβρίου</string>
-    <string name="scheduled_compose_cd">Προγραμματισμός μηνύματος</string>
-    <string name="scheduled_options_title">Προγραμματισμένο μήνυμα</string>
-    <string-array name="scheduled_options">
-        <item>Αποστολή τώρα</item>
-        <item>Αντιγραφή κειμένου</item>
-        <item>Διαγραφή</item>
-    </string-array>
-    <string name="settings_category_appearance">Εμφάνιση</string>
-    <string name="settings_category_general">Γενικά</string>
-    <string name="settings_category_qkreply">Γρήγορη απάντηση</string>
-    <string name="settings_theme_title">Θέμα εμφάνισης</string>
-    <string name="settings_night_title">Νυχτερινή λειτουργία</string>
-    <string name="settings_black_title">Νυχτερινή λειτουργία καθαρού μαύρου</string>
-    <string name="settings_night_start_title">Ώρα έναρξης</string>
-    <string name="settings_night_end_title">Ώρα λήξης</string>
-    <string name="settings_automatic_colors_title">Αυτόματος χρωματισμός επαφών</string>
-    <string name="settings_text_size_title">Μέγεθος γραμματοσειράς</string>
-    <string name="settings_system_font_title">Χρήση γραμματοσειράς συστήματος</string>
-    <string name="settings_auto_emoji_title">Αυτόματα emoji</string>
-    <string name="settings_notifications_title">Ειδοποιήσεις</string>
-    <string name="settings_notifications_o_summary">Πατήστε για προσαρμογή</string>
-    <string name="settings_notification_actions_title">Ενέργειες</string>
-    <string name="settings_notification_action_1">Κουμπί 1</string>
-    <string name="settings_notification_action_2">Κουμπί 2</string>
-    <string name="settings_notification_action_3">Κουμπί 3</string>
-    <string name="settings_notification_previews_title">Προεπισκοπήσεις ειδοποιήσεων</string>
-    <string name="settings_notification_wake_title">Ενεργοποίηση οθόνης</string>
-    <string name="settings_vibration_title">Δόνηση</string>
-    <string name="settings_ringtone_title">Ήχος</string>
-    <string name="settings_ringtone_none">Κανένα</string>
-    <string name="settings_qkreply_title">Γρήγορη απάντηση</string>
-    <string name="settings_qkreply_summary">Αναδυόμενο παράθυρο για νέα μηνύματα</string>
-    <string name="settings_qkreply_tap_dismiss_title">Πατήστε για αγνόηση</string>
-    <string name="settings_qkreply_tap_dismiss_summary">Πατήστε εκτός του παραθύρου για να το κλείσετε</string>
-    <string name="settings_delayed_title">Καθυστερημένη αποστολή</string>
-    <string name="settings_swipe_actions">Ενέργειες συρσίματος στην οθόνη</string>
-    <string name="settings_swipe_actions_summary">Configure swipe actions for conversations</string>
-    <string name="settings_swipe_actions_right">Right swipe</string>
-    <string name="settings_swipe_actions_left">Left swipe</string>
-    <string name="settings_swipe_actions_change">CHANGE</string>
-    <string-array name="settings_swipe_actions">
-        <item>None</item>
-        <item>Archive</item>
-        <item>Delete</item>
-        <item>Block</item>
-        <item>Call</item>
-        <item>Mark read</item>
-        <item>Mark unread</item>
-    </string-array>
-    <string name="settings_delivery_title">Επιβεβαιώσεις παράδοσης</string>
-    <string name="settings_delivery_summary">Confirm that messages were sent successfully</string>
-    <string name="settings_signature_title">Υπογραφή</string>
-    <string name="settings_signature_summary">Add a signature to the end of your messages</string>
-    <string name="settings_unicode_title">Strip accents</string>
-    <string name="settings_unicode_summary">Remove accents from characters in outgoing SMS messages</string>
-    <string name="settings_mobile_title">Mobile numbers only</string>
-    <string name="settings_mobile_summary">When composing a message, only show mobile numbers</string>
-    <string name="settings_auto_delete">Delete old messages automatically</string>
-    <string name="settings_auto_delete_dialog_message">Messages will be deleted after the specified number of days</string>
-    <string name="settings_auto_delete_dialog_hint">Number of days</string>
-    <string name="settings_auto_delete_never">Never</string>
-    <string name="settings_auto_delete_warning">Delete old messages automatically?</string>
-    <string name="settings_auto_delete_warning_message">If you proceed, %1$d messages will be deleted now</string>
-    <plurals name="settings_auto_delete_summary">
-        <item quantity="one">After 1 day</item>
-        <item quantity="other">After %d days</item>
-    </plurals>
-    <string name="settings_long_as_mms_title">Send long messages as MMS</string>
-    <string name="settings_long_as_mms_summary">If your longer text messages are failing to send, or sending in the wrong order, you can send them as MMS messages instead. Additional charges may apply</string>
-    <string name="settings_mms_size_title">Auto-compress MMS attachments</string>
-    <string name="settings_sync_title">Συγχρονισμός μηνυμάτων</string>
-    <string name="settings_sync_summary">Επανασυγχρονισμός μηνυμάτων με τη βάση δεδομένων SMS του Android</string>
-    <string name="settings_about_title">Σχετικά με το QKSMS</string>
-    <string name="settings_version">Έκδοση %s</string>
-    <string name="settings_logging_enabled">Η καταγραφή σφαλμάτων ενεργοποιήθηκε</string>
-    <string name="settings_logging_disabled">Η καταγραφή σφαλμάτων απενεργοποιήθηκε</string>
-    <string name="settings_delay_duration_hint">Εισάγετε τη διάρκεια (δευτερόλεπτα)</string>
-    <string name="blocking_title">Φραγή</string>
-    <string name="blocking_drop_title">Απόρριψη μηνυμάτων</string>
-    <string name="blocking_drop_summary">Απόρριψη αντί για απόκρυψη μηνυμάτων από αποστολείς σε φραγή</string>
-    <string name="blocking_conversations">Συζητήσεις σε φραγή</string>
-    <string name="blocking_manager_title">Διαχειριστής φραγής</string>
-    <string name="blocking_manager_qksms_title">QKSMS</string>
-    <string name="blocking_manager_qksms_summary">Ενσωματωμένη λειτουργία φραγής του QKSMS</string>
-    <string name="blocking_manager_call_control_summary">Automatically filter your calls and messages in one convenient place! Community IQ™ allows you to prevent unwanted messages from community known spammers</string>
-    <string name="blocking_manager_sia_summary">Automatically filter messages from unsolicited numbers by using the \"Should I Answer\" app</string>
-    <string name="blocking_manager_copy_title">Αντιγραφή αριθμών με φραγή</string>
-    <string name="blocking_manager_copy_summary">Continue to %s and copy over your existing blocked numbers</string>
-    <string name="blocked_numbers_title">Αριθμοί με φραγή</string>
-    <string name="blocked_numbers_empty">Your blocked numbers will appear here</string>
-    <string name="blocked_numbers_add_cd">Block a new number</string>
-    <string name="blocked_numbers_dialog_title">Block texts from</string>
-    <string name="blocked_numbers_dialog_hint">Phone number</string>
-    <string name="blocked_numbers_dialog_block">Block</string>
-    <string name="blocked_messages_title">Blocked messages</string>
-    <string name="blocked_messages_empty">Your blocked messages will appear here</string>
-    <string name="blocking_block_title">Block</string>
-    <string name="blocking_unblock_title">Unblock</string>
-    <plurals name="blocking_block_external">
-        <item quantity="one">Continue to %s and block this number</item>
-        <item quantity="other">Continue to %s and block these numbers</item>
-    </plurals>
-    <plurals name="blocking_unblock_external">
-        <item quantity="one">Continue to %s and allow this number</item>
-        <item quantity="other">Continue to %s and allow these numbers</item>
-    </plurals>
-    <string name="about_title">Σχετικά με την εφαρμογή</string>
-    <string name="about_version_title">Έκδοση</string>
-    <string name="about_developer_title">Προγραμματιστής</string>
-    <string name="about_source_title">Πηγαίος κώδικας</string>
-    <string name="about_changelog_title">Αρχείο αλλαγών</string>
-    <string name="about_contact_title">Επικοινωνία</string>
-    <string name="about_license_title">Άδεια χρήσης</string>
-    <string name="about_copyright_title">Πνευματικά δικαιώματα</string>
-    <string name="qksms_plus_description_title">Support development, unlock everything</string>
-    <string name="qksms_plus_description_summary">You can save a starving developer for just %s</string>
-    <!-- Substitutions are for price and currency. Ex: Lifetime upgrade for $1.99 USD -->
-    <string name="qksms_plus_upgrade">Lifetime upgrade for %1$s %2$s</string>
-    <!-- Substitutions are for price and currency. Ex: Unlock + donate for $4.99 USD -->
-    <string name="qksms_plus_upgrade_donate">Unlock + donate for %1$s %2$s</string>
-    <string name="qksms_plus_thanks_title">Thank you for supporting QKSMS!</string>
-    <string name="qksms_plus_thanks_summary">You now have access to all QKSMS+ features</string>
-    <string name="qksms_plus_free_title">QKSMS+ is free for F-Droid users! If you\'d like to support development, a donation would be highly appreciated.</string>
-    <string name="qksms_plus_donate">Δωρεά μέσω PayPal</string>
-    <string name="qksms_plus_coming_soon">Έρχεται σύντομα</string>
-    <string name="qksms_plus_themes_title">Premium themes</string>
-    <string name="qksms_plus_themes_summary">Unlock beautiful theme colors not available on the Material Design palette</string>
-    <string name="qksms_plus_emoji_title">Custom auto-emoji</string>
-    <string name="qksms_plus_emoji_summary">Create custom auto-emoji shortcuts</string>
-    <string name="qksms_plus_backup_title">Message backup</string>
-    <string name="qksms_plus_backup_summary">Automatically back up your messages. Never again worry about losing your history if you change phones or your phone gets lost</string>
-    <string name="qksms_plus_scheduled_title">Scheduled messages</string>
-    <string name="qksms_plus_scheduled_summary">Schedule messages to automatically be sent at a specific time and date</string>
-    <string name="qksms_plus_delayed_title">Delayed sending</string>
-    <string name="qksms_plus_delayed_summary">Wait a few seconds before sending your message</string>
-    <string name="qksms_plus_night_title">Automatic night mode</string>
-    <string name="qksms_plus_night_summary">Enable night mode based on the time of day</string>
-    <string name="qksms_plus_blacklist_title">Advanced blocking</string>
-    <string name="qksms_plus_blacklist_summary">Block messages that contain keywords or match patterns</string>
-    <string name="qksms_plus_forward_title">Auto-forward</string>
-    <string name="qksms_plus_forward_summary">Automatically forward messages from certain senders</string>
-    <string name="qksms_plus_respond_title">Auto-respond</string>
-    <string name="qksms_plus_respond_summary">Automatically respond to incoming messages with a preset response</string>
-    <string name="qksms_plus_more_title">More</string>
-    <string name="qksms_plus_more_summary">QKSMS is under active development, and your purchase will include all future QKSMS+ features!</string>
-    <string name="widget_loading">Loading&#8230;</string>
-    <string name="widget_more">View more conversations</string>
-    <string name="qkreply_menu_read">Mark read</string>
-    <string name="qkreply_menu_call">Call</string>
-    <string name="qkreply_menu_delete">Delete</string>
-    <string name="qkreply_menu_expand">Show more</string>
-    <string name="qkreply_menu_collapse">Show less</string>
-    <string name="qkreply_menu_view">Open conversation</string>
-    <string name="theme_material">Material</string>
-    <string name="theme_hex">HEX</string>
-    <string name="theme_apply">Apply</string>
-    <string-array name="notification_actions">
-        <item>None</item>
-        <item>Archive</item>
-        <item>Delete</item>
-        <item>Block</item>
-        <item>Call</item>
-        <item>Mark read</item>
-        <item>Reply</item>
-    </string-array>
-    <string name="button_yes">Yes</string>
-    <string name="button_continue">Continue</string>
-    <string name="button_cancel">Cancel</string>
-    <string name="button_delete">Delete</string>
-    <string name="button_save">Save</string>
-    <string name="button_stop">Stop</string>
-    <string name="button_more">More</string>
-    <string name="button_set">Set</string>
-    <string name="button_undo">Undo</string>
-    <string name="toast_copied">Copied</string>
-    <string name="toast_archived">Archived conversation</string>
-    <string name="toast_qksms_plus">You must unlock QKSMS+ to use this</string>
-    <plurals name="notification_new_messages">
-        <item quantity="one">New message</item>
-        <item quantity="other">%s new messages</item>
-    </plurals>
-    <string name="notification_message_failed_title">Message not sent</string>
-    <string name="notification_message_failed_text">The message to %s failed to send</string>
-    <string-array name="night_modes">
-        <item>System</item>
-        <item>Disabled</item>
-        <item>Always on</item>
-        <item>Automatic</item>
-    </string-array>
-    <string-array name="notification_preview_options">
-        <item>Show name and message</item>
-        <item>Show name</item>
-        <item>Hide contents</item>
-    </string-array>
-    <string-array name="text_sizes">
-        <item>Small</item>
-        <item>Normal</item>
-        <item>Large</item>
-        <item>Larger</item>
-    </string-array>
-    <string-array name="delayed_sending_labels">
-        <item>No delay</item>
-        <item>3 seconds</item>
-        <item>5 seconds</item>
-        <item>10 seconds</item>
-    </string-array>
-    <string-array name="mms_sizes">
-        <item>Automatic</item>
-        <item>100KB</item>
-        <item>200KB</item>
-        <item>300KB</item>
-        <item>600KB</item>
-        <item>1000KB</item>
-        <item>2000KB</item>
-        <item>No compression</item>
-    </string-array>
-    <string-array name="qk_responses">
-        <item>Okay</item>
-        <item>Give me a moment</item>
-        <item>On my way</item>
-        <item>Thanks</item>
-        <item>Sounds good</item>
-        <item>Τι κάνεις;</item>
-        <item>Agreed</item>
-        <item>No</item>
-        <item>Love you</item>
-        <item>Sorry</item>
-        <item>LOL</item>
-        <item>That\'s okay</item>
-    </string-array>
-</resources>
+<?xml version="1.0" encoding="utf-8"?>
+<!--
+  ~ Copyright (C) 2019 Moez Bhatti <moez.bhatti@gmail.com>
+  ~
+  ~ This file is part of QKSMS.
+  ~
+  ~ QKSMS is free software: you can redistribute it and/or modify
+  ~ it under the terms of the GNU General Public License as published by
+  ~ the Free Software Foundation, either version 3 of the License, or
+  ~ (at your option) any later version.
+  ~
+  ~ QKSMS is distributed in the hope that it will be useful,
+  ~ but WITHOUT ANY WARRANTY; without even the implied warranty of
+  ~ MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+  ~ GNU General Public License for more details.
+  ~
+  ~ You should have received a copy of the GNU General Public License
+  ~ along with QKSMS.  If not, see <http://www.gnu.org/licenses/>.
+  -->
+<resources>
+    <string name="shortcut_compose_long_label">Νέα συζήτηση</string>
+    <string name="shortcut_compose_short_label">Σύνταξη</string>
+    <string name="shortcut_compose_disabled_message">Η συντόμευση απενεργοποιήθηκε</string>
+    <string name="title_archived">Αρχείο</string>
+    <string name="title_settings">Ρυθμίσεις</string>
+    <string name="title_notification_prefs">Ειδοποιήσεις</string>
+    <string name="title_theme">Θέμα εμφάνισης</string>
+    <string name="title_conversations">Αναζήτηση στα εισερχόμενα&#8230;</string>
+    <string name="title_compose">Πληκτρολογήστε ένα όνομα ή αριθμό</string>
+    <string name="setup_skip">Παράλειψη</string>
+    <string name="setup_next">Συνέχεια</string>
+    <string name="menu_add_person">Προσθήκη ατόμου</string>
+    <string name="menu_call">Κλήση</string>
+    <string name="menu_info">Λεπτομέρειες</string>
+    <string name="menu_save">Αποθήκευση στη συλλογή</string>
+    <string name="menu_share">Κοινή χρήση</string>
+    <string name="main_drawer_open_cd">Άνοιγμα πλαισίου πλοήγησης</string>
+    <string name="main_title_selected">Επιλεγμένα: %d</string>
+    <string name="main_menu_clear">Εκκαθάριση</string>
+    <string name="main_menu_archive">Αρχειοθέτηση</string>
+    <string name="main_menu_unarchive">Αναίρεση αρχειοθέτησης</string>
+    <string name="main_menu_delete">Διαγραφή</string>
+    <string name="main_menu_add_contact">Προσθήκη στις επαφές</string>
+    <string name="main_menu_pin">Καρφίτσωμα στην κορυφή</string>
+    <string name="main_menu_unpin">Ξεκαρφίτσωμα</string>
+    <string name="main_menu_read">Mark read</string>
+    <string name="main_menu_unread">Mark unread</string>
+    <string name="main_menu_block">Φραγή</string>
+    <string name="main_syncing">Συγχρονισμός μηνυμάτων&#8230;</string>
+    <string name="main_sender_you">Εσείς: %s</string>
+    <string name="main_draft">Πρόχειρο</string>
+    <string name="main_message_results_title">Αποτελέσματα στα μηνύματα</string>
+    <string name="main_message_results">Μηνύματα: %d</string>
+    <string name="inbox_empty_text">Οι συζητήσεις σας θα εμφανίζονται εδώ</string>
+    <string name="inbox_search_empty_text">Δεν υπάρχουν αποτελέσματα</string>
+    <string name="archived_empty_text">Οι αρχειοθετημένες συζητήσεις σας θα εμφανίζονται εδώ</string>
+    <string name="main_fab_cd">Έναρξη νέας συνομιλίας</string>
+    <string name="main_default_sms_title">Αγαπήστε και πάλι τα SMS</string>
+    <string name="main_default_sms_message">Ορίστε το QKSMS ως προκαθορισμένη εφαρμογή SMS</string>
+    <string name="main_default_sms_change">Αλλαγή</string>
+    <string name="main_permission_required">Απαιτείται άδεια</string>
+    <string name="main_permission_sms">Το QKSMS απαιτεί την άδεια αποστολής και ανάγνωσης μηνυμάτων SMS</string>
+    <string name="main_permission_contacts">Το QKSMS απαιτεί την άδεια ανάγνωσης των επαφών σας</string>
+    <string name="main_permission_allow">Να επιτραπεί</string>
+    <string name="drawer_inbox">Εισερχόμενα</string>
+    <string name="drawer_archived">Αρχείο</string>
+    <string name="drawer_scheduled">Προγραμματισμένα</string>
+    <string name="drawer_blocking">Με φραγή</string>
+    <string name="drawer_more">Περισσότερα</string>
+    <string name="drawer_settings">Ρυθμίσεις</string>
+    <string name="drawer_help">Βοήθεια &amp; αποστολή σχολίων</string>
+    <string name="drawer_invite">Πρόσκληση φίλων</string>
+    <string name="drawer_plus_banner_summary">Ξεκλειδώστε φανταστικές νέες λειτουργίες και συμβάλετε στην ανάπτυξη</string>
+    <string name="rate_title">Σας αρέσει το QKSMS;</string>
+    <string name="rate_summary">Δείξτε μας την αγάπη σας και βαθμολογήστε μας στο Google Play!</string>
+    <string name="rate_okay">ΕΝΤΑΞΕΙ!</string>
+    <string name="rate_dismiss">ΠΑΡΑΛΕΙΨΗ</string>
+    <string name="dialog_delete_title">Διαγραφή</string>
+    <plurals name="dialog_delete_message">
+        <item quantity="one">Σίγουρα επιθυμείτε να διαγράψετε αυτή τη συζήτηση;</item>
+        <item quantity="other">Σίγουρα επιθυμείτε να διαγράψετε %d συζητήσεις;</item>
+    </plurals>
+    <string-array name="message_options">
+        <item>Αντιγραφή κειμένου</item>
+        <item>Προώθηση</item>
+        <item>Διαγραφή</item>
+    </string-array>
+    <string name="compose_number_picker_title">Επιλέξτε έναν αριθμό τηλεφώνου</string>
+    <string name="compose_number_picker_default">%s ∙ Προεπιλεγμένος</string>
+    <string name="compose_number_picker_once">Μόνο μια φορά</string>
+    <string name="compose_number_picker_always">Πάντα</string>
+    <string name="compose_title_selected">Επιλέχθηκαν: %d</string>
+    <string name="compose_subtitle_results">%1$d από %2$d αποτελέσματα</string>
+    <string name="compose_send_group_title">Αποστολή ως ομαδικό μήνυμα</string>
+    <string name="compose_send_group_summary">Οι παραλήπτες και απαντήσεις θα είναι ορατοί σε όλους</string>
+    <string name="compose_messages_empty">Εδώ ξεκινά η συζήτηση. Πείτε κάτι ωραίο!</string>
+    <string name="compose_vcard_label">Κάρτα επαφής</string>
+    <string name="compose_scheduled_for">Προγραμματίστηκε για</string>
+    <string name="compose_scheduled_future">Η χρονική στιγμή πρέπει να βρίσκεται στο μέλλον!</string>
+    <string name="compose_scheduled_plus">Πρέπει να ξεκλειδώσετε το QKSMS+ για να αποκτήσετε τη δυνατότητα προγραμματισμού μηνυμάτων</string>
+    <string name="compose_scheduled_toast">Προστέθηκε στα προγραμματισμένα μηνύματα</string>
+    <string name="compose_hint">Γράψτε ένα μήνυμα&#8230;</string>
+    <string name="compose_menu_copy">Αντιγραφή κειμένου</string>
+    <string name="compose_menu_forward">Προώθηση</string>
+    <string name="compose_menu_delete">Διαγραφή</string>
+    <string name="compose_menu_previous">Προηγούμενο</string>
+    <string name="compose_menu_next">Επόμενο</string>
+    <string name="compose_menu_clear">Εκκαθάριση</string>
+    <string name="compose_details_title">Λεπτομέρειες μηνύματος</string>
+    <string name="compose_details_type">Τύπος: %s</string>
+    <string name="compose_details_from">Από: %s</string>
+    <string name="compose_details_to">Προς: %s</string>
+    <string name="compose_details_subject">Θέμα: %s</string>
+    <string name="compose_details_priority">Προτεραιότητα: %s</string>
+    <string name="compose_details_size">Μέγεθος: %s</string>
+    <string name="compose_details_sent">Εστάλη: %s</string>
+    <string name="compose_details_received">Ελήφθη: %s</string>
+    <string name="compose_details_delivered">Παραδόθηκε: %s</string>
+    <string name="compose_details_error_code">Κωδικός σφάλματος: %d</string>
+    <string name="compose_attach_cd">Προσθήκη συνημμένου</string>
+    <string name="compose_gallery_cd">Επισύναψη φωτογραφίας</string>
+    <string name="compose_camera_cd">Λήψη φωτογραφίας</string>
+    <string name="compose_schedule_cd">Προγραμματισμός μηνύματος</string>
+    <string name="compose_contact_cd">Επισύναψη επαφής</string>
+    <string name="compose_contact_error">Πρόβλημα ανάγνωσης επαφής</string>
+    <!-- Example: SIM 1 (Verizon) selected-->
+    <string name="compose_sim_changed_toast">SIM %1$d (%2$s) selected</string>
+    <string name="compose_sim_cd">Επελέγη το %s, αλλάξτε την κάρτα SIM</string>
+    <string name="compose_send_cd">Αποστολή μηνύματος</string>
+    <string name="message_status_sending">Αποστολή&#8230;</string>
+    <string name="message_status_delivered">Παραδόθηκε: %s</string>
+    <string name="message_status_failed">Αποτυχία αποστολής. Πατήστε για νέα προσπάθεια</string>
+    <string name="info_title">Λεπτομέρειες</string>
+    <string name="info_copied_address">Η διεύθυνση αντεγράφη</string>
+    <string name="info_name">Τίτλος συζήτησης</string>
+    <string name="info_notifications">Ειδοποιήσεις</string>
+    <string name="info_theme">Θέμα εμφάνισης</string>
+    <string name="info_archive">Αρχειοθέτηση</string>
+    <string name="info_unarchive">Αναίρεση αρχειοθέτησης</string>
+    <string name="info_block">Φραγή</string>
+    <string name="info_unblock">Αναίρεση φραγής</string>
+    <string name="info_delete">Διαγραφή συζήτησης</string>
+    <string name="gallery_error">Αδυναμία φόρτωσης μέσων</string>
+    <string name="gallery_toast_saved">Αποθηκεύτηκε στη συλλογή</string>
+    <string name="backup_title">Αντίγραφα ασφαλείας και επαναφορά</string>
+    <string name="backup_backing_up">Δημιουργία αντιγράφου ασφαλείας μηνυμάτων</string>
+    <string name="backup_restoring">Επαναφορά αντιγράφου ασφαλείας μηνυμάτων</string>
+    <string name="backup_last">Τελευταίο αντίγραφο ασφαλείας</string>
+    <string name="backup_loading">Φόρτωση&#8230;</string>
+    <string name="backup_never">Ποτέ</string>
+    <string name="backup_restore_title">Επαναφορά</string>
+    <string name="backup_restore_summary">Επιλέξτε ένα αντίγραφο ασφαλείας</string>
+    <string name="backup_restore_error_plus">Παρακαλώ ξεκλειδώστε το QKSMS+ για τη δημιουργία και επαναφορά αντιγράφων ασφαλείας</string>
+    <string name="backup_restore_error_backup">Δημιουργία αντιγράφου ασφαλείας&#8230;</string>
+    <string name="backup_restore_error_restore">Επαναφορά αντιγράφου ασφαλείας&#8230;</string>
+    <string name="backup_restore_confirm_title">Επαναφορά αντιγράφου ασφαλείας</string>
+    <string name="backup_restore_confirm_message">Σίγουρα επιθυμείτε να επαναφέρετε τα μηνύματα σας από αυτό το αντίγραφο ασφαλείας;</string>
+    <string name="backup_restore_stop_title">Διακοπή επαναφοράς</string>
+    <string name="backup_restore_stop_message">Τα μηνύματα που έχουν ήδη ανακτηθεί θα παραμείνουν στη συσκευή σας</string>
+    <string name="backup_restore_dialog_title">Αντίγραφα ασφαλείας</string>
+    <string name="backup_restore_dialog_empty">Δεν βρέθηκαν αντίγραφα ασφαλείας</string>
+    <plurals name="backup_message_count">
+        <item quantity="one">%d message</item>
+        <item quantity="other">%d μηνύματα</item>
+    </plurals>
+    <string name="backup_disclaimer">Προς το παρόν, μπορούν να δημιουργηθούν αντίγραφα ασφαλείας μόνο για SMS. Η υποστήριξη MMS και ο προγραμματισμός αντιγράφων ασφαλείας θα προστεθούν σύντομα!</string>
+    <string name="backup_now">Δημιουργία αντιγράφου τώρα</string>
+    <string name="backup_progress_parsing">Ανάγνωση αντιγράφου ασφαλείας&#8230;</string>
+    <string name="backup_progress_running">%d/%d μηνύματα</string>
+    <string name="backup_progress_saving">Αποθήκευση αντιγράφου ασφαλείας&#8230;</string>
+    <string name="backup_progress_syncing">Συγχρονισμός μηνυμάτων&#8230;</string>
+    <string name="backup_progress_finished">Ολοκληρώθηκε!</string>
+    <string name="backup_notification_channel_name">Αντίγραφα ασφαλείας και επαναφορά</string>
+    <string name="scheduled_title">Προγραμματισμένα</string>
+    <string name="scheduled_empty_description">Στείλτε μήνυμα αυτόματα, την ακριβή στιγμή που επιθυμείτε</string>
+    <string name="scheduled_empty_message_1">Γεια! Πότε είπαμε ότι έχεις γενέθλια;</string>
+    <string name="scheduled_empty_message_2">Στις 23 Δεκεμβρίου</string>
+    <string name="scheduled_empty_message_3">Χρόνια πολλά! Δες τι καλός φίλος που είμαι και θυμήθηκα τα γενέθλιά σου</string>
+    <!--&#x200A; is a special character required at the end of this string to fix it's formatting in the app -->
+    <string name="scheduled_empty_message_3_timestamp">Αποστολή στις 23 Δεκεμβρίου</string>
+    <string name="scheduled_compose_cd">Προγραμματισμός μηνύματος</string>
+    <string name="scheduled_options_title">Προγραμματισμένο μήνυμα</string>
+    <string-array name="scheduled_options">
+        <item>Αποστολή τώρα</item>
+        <item>Αντιγραφή κειμένου</item>
+        <item>Διαγραφή</item>
+    </string-array>
+    <string name="settings_category_appearance">Εμφάνιση</string>
+    <string name="settings_category_general">Γενικά</string>
+    <string name="settings_category_qkreply">Γρήγορη απάντηση</string>
+    <string name="settings_theme_title">Θέμα εμφάνισης</string>
+    <string name="settings_night_title">Νυχτερινή λειτουργία</string>
+    <string name="settings_black_title">Νυχτερινή λειτουργία καθαρού μαύρου</string>
+    <string name="settings_night_start_title">Ώρα έναρξης</string>
+    <string name="settings_night_end_title">Ώρα λήξης</string>
+    <string name="settings_automatic_colors_title">Αυτόματος χρωματισμός επαφών</string>
+    <string name="settings_text_size_title">Μέγεθος γραμματοσειράς</string>
+    <string name="settings_system_font_title">Χρήση γραμματοσειράς συστήματος</string>
+    <string name="settings_auto_emoji_title">Αυτόματα emoji</string>
+    <string name="settings_notifications_title">Ειδοποιήσεις</string>
+    <string name="settings_notifications_o_summary">Πατήστε για προσαρμογή</string>
+    <string name="settings_notification_actions_title">Ενέργειες</string>
+    <string name="settings_notification_action_1">Κουμπί 1</string>
+    <string name="settings_notification_action_2">Κουμπί 2</string>
+    <string name="settings_notification_action_3">Κουμπί 3</string>
+    <string name="settings_notification_previews_title">Προεπισκοπήσεις ειδοποιήσεων</string>
+    <string name="settings_notification_wake_title">Ενεργοποίηση οθόνης</string>
+    <string name="settings_vibration_title">Δόνηση</string>
+    <string name="settings_ringtone_title">Ήχος</string>
+    <string name="settings_ringtone_none">Κανένα</string>
+    <string name="settings_qkreply_title">Γρήγορη απάντηση</string>
+    <string name="settings_qkreply_summary">Αναδυόμενο παράθυρο για νέα μηνύματα</string>
+    <string name="settings_qkreply_tap_dismiss_title">Πατήστε για αγνόηση</string>
+    <string name="settings_qkreply_tap_dismiss_summary">Πατήστε εκτός του παραθύρου για να το κλείσετε</string>
+    <string name="settings_delayed_title">Καθυστερημένη αποστολή</string>
+    <string name="settings_swipe_actions">Ενέργειες συρσίματος στην οθόνη</string>
+    <string name="settings_swipe_actions_summary">Configure swipe actions for conversations</string>
+    <string name="settings_swipe_actions_right">Right swipe</string>
+    <string name="settings_swipe_actions_left">Left swipe</string>
+    <string name="settings_swipe_actions_change">CHANGE</string>
+    <string-array name="settings_swipe_actions">
+        <item>None</item>
+        <item>Archive</item>
+        <item>Delete</item>
+        <item>Block</item>
+        <item>Call</item>
+        <item>Mark read</item>
+        <item>Mark unread</item>
+    </string-array>
+    <string name="settings_delivery_title">Επιβεβαιώσεις παράδοσης</string>
+    <string name="settings_delivery_summary">Confirm that messages were sent successfully</string>
+    <string name="settings_signature_title">Υπογραφή</string>
+    <string name="settings_signature_summary">Add a signature to the end of your messages</string>
+    <string name="settings_unicode_title">Strip accents</string>
+    <string name="settings_unicode_summary">Remove accents from characters in outgoing SMS messages</string>
+    <string name="settings_mobile_title">Mobile numbers only</string>
+    <string name="settings_mobile_summary">When composing a message, only show mobile numbers</string>
+    <string name="settings_auto_delete">Delete old messages automatically</string>
+    <string name="settings_auto_delete_dialog_message">Messages will be deleted after the specified number of days</string>
+    <string name="settings_auto_delete_dialog_hint">Number of days</string>
+    <string name="settings_auto_delete_never">Never</string>
+    <string name="settings_auto_delete_warning">Delete old messages automatically?</string>
+    <string name="settings_auto_delete_warning_message">If you proceed, %1$d messages will be deleted now</string>
+    <plurals name="settings_auto_delete_summary">
+        <item quantity="one">After 1 day</item>
+        <item quantity="other">After %d days</item>
+    </plurals>
+    <string name="settings_long_as_mms_title">Send long messages as MMS</string>
+    <string name="settings_long_as_mms_summary">If your longer text messages are failing to send, or sending in the wrong order, you can send them as MMS messages instead. Additional charges may apply</string>
+    <string name="settings_mms_size_title">Auto-compress MMS attachments</string>
+    <string name="settings_sync_title">Συγχρονισμός μηνυμάτων</string>
+    <string name="settings_sync_summary">Επανασυγχρονισμός μηνυμάτων με τη βάση δεδομένων SMS του Android</string>
+    <string name="settings_about_title">Σχετικά με το QKSMS</string>
+    <string name="settings_version">Έκδοση %s</string>
+    <string name="settings_logging_enabled">Η καταγραφή σφαλμάτων ενεργοποιήθηκε</string>
+    <string name="settings_logging_disabled">Η καταγραφή σφαλμάτων απενεργοποιήθηκε</string>
+    <string name="settings_delay_duration_hint">Εισάγετε τη διάρκεια (δευτερόλεπτα)</string>
+    <string name="blocking_title">Φραγή</string>
+    <string name="blocking_drop_title">Απόρριψη μηνυμάτων</string>
+    <string name="blocking_drop_summary">Απόρριψη αντί για απόκρυψη μηνυμάτων από αποστολείς σε φραγή</string>
+    <string name="blocking_conversations">Συζητήσεις σε φραγή</string>
+    <string name="blocking_manager_title">Διαχειριστής φραγής</string>
+    <string name="blocking_manager_qksms_title">QKSMS</string>
+    <string name="blocking_manager_qksms_summary">Ενσωματωμένη λειτουργία φραγής του QKSMS</string>
+    <string name="blocking_manager_call_control_summary">Automatically filter your calls and messages in one convenient place! Community IQ™ allows you to prevent unwanted messages from community known spammers</string>
+    <string name="blocking_manager_sia_summary">Automatically filter messages from unsolicited numbers by using the \"Should I Answer\" app</string>
+    <string name="blocking_manager_copy_title">Αντιγραφή αριθμών με φραγή</string>
+    <string name="blocking_manager_copy_summary">Continue to %s and copy over your existing blocked numbers</string>
+    <string name="blocked_numbers_title">Αριθμοί με φραγή</string>
+    <string name="blocked_numbers_empty">Your blocked numbers will appear here</string>
+    <string name="blocked_numbers_add_cd">Block a new number</string>
+    <string name="blocked_numbers_dialog_title">Block texts from</string>
+    <string name="blocked_numbers_dialog_hint">Phone number</string>
+    <string name="blocked_numbers_dialog_block">Block</string>
+    <string name="blocked_messages_title">Blocked messages</string>
+    <string name="blocked_messages_empty">Your blocked messages will appear here</string>
+    <string name="blocking_block_title">Block</string>
+    <string name="blocking_unblock_title">Unblock</string>
+    <plurals name="blocking_block_external">
+        <item quantity="one">Continue to %s and block this number</item>
+        <item quantity="other">Continue to %s and block these numbers</item>
+    </plurals>
+    <plurals name="blocking_unblock_external">
+        <item quantity="one">Continue to %s and allow this number</item>
+        <item quantity="other">Continue to %s and allow these numbers</item>
+    </plurals>
+    <string name="about_title">Σχετικά με την εφαρμογή</string>
+    <string name="about_version_title">Έκδοση</string>
+    <string name="about_developer_title">Προγραμματιστής</string>
+    <string name="about_source_title">Πηγαίος κώδικας</string>
+    <string name="about_changelog_title">Αρχείο αλλαγών</string>
+    <string name="about_contact_title">Επικοινωνία</string>
+    <string name="about_license_title">Άδεια χρήσης</string>
+    <string name="about_copyright_title">Πνευματικά δικαιώματα</string>
+    <string name="qksms_plus_description_title">Support development, unlock everything</string>
+    <string name="qksms_plus_description_summary">You can save a starving developer for just %s</string>
+    <!-- Substitutions are for price and currency. Ex: Lifetime upgrade for $1.99 USD -->
+    <string name="qksms_plus_upgrade">Lifetime upgrade for %1$s %2$s</string>
+    <!-- Substitutions are for price and currency. Ex: Unlock + donate for $4.99 USD -->
+    <string name="qksms_plus_upgrade_donate">Unlock + donate for %1$s %2$s</string>
+    <string name="qksms_plus_thanks_title">Thank you for supporting QKSMS!</string>
+    <string name="qksms_plus_thanks_summary">You now have access to all QKSMS+ features</string>
+    <string name="qksms_plus_free_title">QKSMS+ is free for F-Droid users! If you\'d like to support development, a donation would be highly appreciated.</string>
+    <string name="qksms_plus_donate">Δωρεά μέσω PayPal</string>
+    <string name="qksms_plus_coming_soon">Έρχεται σύντομα</string>
+    <string name="qksms_plus_themes_title">Premium themes</string>
+    <string name="qksms_plus_themes_summary">Unlock beautiful theme colors not available on the Material Design palette</string>
+    <string name="qksms_plus_emoji_title">Custom auto-emoji</string>
+    <string name="qksms_plus_emoji_summary">Create custom auto-emoji shortcuts</string>
+    <string name="qksms_plus_backup_title">Message backup</string>
+    <string name="qksms_plus_backup_summary">Automatically back up your messages. Never again worry about losing your history if you change phones or your phone gets lost</string>
+    <string name="qksms_plus_scheduled_title">Scheduled messages</string>
+    <string name="qksms_plus_scheduled_summary">Schedule messages to automatically be sent at a specific time and date</string>
+    <string name="qksms_plus_delayed_title">Delayed sending</string>
+    <string name="qksms_plus_delayed_summary">Wait a few seconds before sending your message</string>
+    <string name="qksms_plus_night_title">Automatic night mode</string>
+    <string name="qksms_plus_night_summary">Enable night mode based on the time of day</string>
+    <string name="qksms_plus_blacklist_title">Advanced blocking</string>
+    <string name="qksms_plus_blacklist_summary">Block messages that contain keywords or match patterns</string>
+    <string name="qksms_plus_forward_title">Auto-forward</string>
+    <string name="qksms_plus_forward_summary">Automatically forward messages from certain senders</string>
+    <string name="qksms_plus_respond_title">Auto-respond</string>
+    <string name="qksms_plus_respond_summary">Automatically respond to incoming messages with a preset response</string>
+    <string name="qksms_plus_more_title">More</string>
+    <string name="qksms_plus_more_summary">QKSMS is under active development, and your purchase will include all future QKSMS+ features!</string>
+    <string name="widget_loading">Loading&#8230;</string>
+    <string name="widget_more">View more conversations</string>
+    <string name="qkreply_menu_read">Mark read</string>
+    <string name="qkreply_menu_call">Call</string>
+    <string name="qkreply_menu_delete">Delete</string>
+    <string name="qkreply_menu_expand">Show more</string>
+    <string name="qkreply_menu_collapse">Show less</string>
+    <string name="qkreply_menu_view">Open conversation</string>
+    <string name="theme_material">Material</string>
+    <string name="theme_hex">HEX</string>
+    <string name="theme_apply">Apply</string>
+    <string-array name="notification_actions">
+        <item>None</item>
+        <item>Archive</item>
+        <item>Delete</item>
+        <item>Block</item>
+        <item>Call</item>
+        <item>Mark read</item>
+        <item>Reply</item>
+    </string-array>
+    <string name="button_yes">Yes</string>
+    <string name="button_continue">Continue</string>
+    <string name="button_cancel">Cancel</string>
+    <string name="button_delete">Delete</string>
+    <string name="button_save">Save</string>
+    <string name="button_stop">Stop</string>
+    <string name="button_more">More</string>
+    <string name="button_set">Set</string>
+    <string name="button_undo">Undo</string>
+    <string name="toast_copied">Copied</string>
+    <string name="toast_archived">Archived conversation</string>
+    <string name="toast_qksms_plus">You must unlock QKSMS+ to use this</string>
+    <plurals name="notification_new_messages">
+        <item quantity="one">New message</item>
+        <item quantity="other">%s new messages</item>
+    </plurals>
+    <string name="notification_message_failed_title">Message not sent</string>
+    <string name="notification_message_failed_text">The message to %s failed to send</string>
+    <string-array name="night_modes">
+        <item>System</item>
+        <item>Disabled</item>
+        <item>Always on</item>
+        <item>Automatic</item>
+    </string-array>
+    <string-array name="notification_preview_options">
+        <item>Show name and message</item>
+        <item>Show name</item>
+        <item>Hide contents</item>
+    </string-array>
+    <string-array name="text_sizes">
+        <item>Small</item>
+        <item>Normal</item>
+        <item>Large</item>
+        <item>Larger</item>
+    </string-array>
+    <string-array name="delayed_sending_labels">
+        <item>No delay</item>
+        <item>3 seconds</item>
+        <item>5 seconds</item>
+        <item>10 seconds</item>
+    </string-array>
+    <string-array name="mms_sizes">
+        <item>Automatic</item>
+        <item>100KB</item>
+        <item>200KB</item>
+        <item>300KB</item>
+        <item>600KB</item>
+        <item>1000KB</item>
+        <item>2000KB</item>
+        <item>No compression</item>
+    </string-array>
+    <string-array name="qk_responses">
+        <item>Okay</item>
+        <item>Give me a moment</item>
+        <item>On my way</item>
+        <item>Thanks</item>
+        <item>Sounds good</item>
+        <item>Τι κάνεις;</item>
+        <item>Agreed</item>
+        <item>No</item>
+        <item>Love you</item>
+        <item>Sorry</item>
+        <item>LOL</item>
+        <item>That\'s okay</item>
+    </string-array>
+</resources>
diff --git a/presentation/src/main/res/values-es/strings.xml b/presentation/src/main/res/values-es/strings.xml
index 1471c4bf8..af83f0097 100644
--- a/presentation/src/main/res/values-es/strings.xml
+++ b/presentation/src/main/res/values-es/strings.xml
@@ -1,411 +1,411 @@
-<?xml version="1.0" encoding="utf-8"?>
-<!--
-  ~ Copyright (C) 2019 Moez Bhatti <moez.bhatti@gmail.com>
-  ~
-  ~ This file is part of QKSMS.
-  ~
-  ~ QKSMS is free software: you can redistribute it and/or modify
-  ~ it under the terms of the GNU General Public License as published by
-  ~ the Free Software Foundation, either version 3 of the License, or
-  ~ (at your option) any later version.
-  ~
-  ~ QKSMS is distributed in the hope that it will be useful,
-  ~ but WITHOUT ANY WARRANTY; without even the implied warranty of
-  ~ MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
-  ~ GNU General Public License for more details.
-  ~
-  ~ You should have received a copy of the GNU General Public License
-  ~ along with QKSMS.  If not, see <http://www.gnu.org/licenses/>.
-  -->
-<resources>
-    <string name="shortcut_compose_long_label">Nueva conversación</string>
-    <string name="shortcut_compose_short_label">Redactar</string>
-    <string name="shortcut_compose_disabled_message">Acceso directo deshabilitado</string>
-    <string name="title_archived">Archivados</string>
-    <string name="title_settings">Configuración</string>
-    <string name="title_notification_prefs">Notificaciones</string>
-    <string name="title_theme">Tema</string>
-    <string name="title_conversations">Buscar mensaje&#8230;</string>
-    <string name="title_compose">Escriba un nombre o número</string>
-    <string name="setup_skip">Omitir</string>
-    <string name="setup_next">Continuar</string>
-    <string name="menu_add_person">Añadir persona</string>
-    <string name="menu_call">Llamar</string>
-    <string name="menu_info">Detalles</string>
-    <string name="menu_save">Guardar en la galería</string>
-    <string name="menu_share">Compartir</string>
-    <string name="main_drawer_open_cd">Abrir cajón de navegación</string>
-    <string name="main_title_selected">%d Seleccionados</string>
-    <string name="main_menu_clear">Limpiar</string>
-    <string name="main_menu_archive">Archivo</string>
-    <string name="main_menu_unarchive">Desarchivar</string>
-    <string name="main_menu_delete">Eliminar</string>
-    <string name="main_menu_add_contact">Añadir a contactos</string>
-    <string name="main_menu_pin">Anclar hacia arriba</string>
-    <string name="main_menu_unpin">Desanclar</string>
-    <string name="main_menu_read">Marcar como leído</string>
-    <string name="main_menu_unread">Marcar como no leído</string>
-    <string name="main_menu_block">Bloquear</string>
-    <string name="main_syncing">Sincronización de mensajes...</string>
-    <string name="main_sender_you">Tú: %s</string>
-    <string name="main_draft">Borrador</string>
-    <string name="main_message_results_title">Resultados en los mensajes</string>
-    <string name="main_message_results">%d mensajes</string>
-    <string name="inbox_empty_text">Sus conversaciones aparecerán aquí</string>
-    <string name="inbox_search_empty_text">No hay resultados</string>
-    <string name="archived_empty_text">Sus conversaciones archivadas aparecerán aquí</string>
-    <string name="main_fab_cd">Iniciar una nueva conversación</string>
-    <string name="main_default_sms_title">Me encanta enviar mensajes de texto otra vez</string>
-    <string name="main_default_sms_message">Haga de QKSMS su aplicación SMS por defecto</string>
-    <string name="main_default_sms_change">Cambios</string>
-    <string name="main_permission_required">Se requiere permiso</string>
-    <string name="main_permission_sms">QKSMS necesita permiso para enviar y ver mensajes SMS</string>
-    <string name="main_permission_contacts">QKSMS necesita permiso para ver sus contactos</string>
-    <string name="main_permission_allow">Permitir</string>
-    <string name="drawer_inbox">Recibidos</string>
-    <string name="drawer_archived">Archivar</string>
-    <string name="drawer_scheduled">Programar</string>
-    <string name="drawer_blocking">Bloqueando</string>
-    <string name="drawer_more">Más</string>
-    <string name="drawer_settings">Ajustes</string>
-    <string name="drawer_help">Ayuda &amp; comentarios</string>
-    <string name="drawer_invite">Invitar amigos</string>
-    <string name="drawer_plus_banner_summary">Desbloquea nuevas e impresionantes características y apoya el desarrollo</string>
-    <string name="rate_title">¿Te diviertes con QKSMS?</string>
-    <string name="rate_summary">Comparte un poco de amor y puntúanos en Google Play!</string>
-    <string name="rate_okay">DE ACUERDO</string>
-    <string name="rate_dismiss">DESESTIMAR</string>
-    <string name="dialog_delete_title">Eliminar</string>
-    <plurals name="dialog_delete_message">
-        <item quantity="one">¿Está seguro de que desea eliminar la conversación?</item>
-        <item quantity="other">¿Está seguro de que desea eliminar %d conversaciones?</item>
-    </plurals>
-    <string-array name="message_options">
-        <item>Copiar texto</item>
-        <item>Reenviar</item>
-        <item>Borrar</item>
-    </string-array>
-    <string name="compose_number_picker_title">Elija un número de teléfono</string>
-    <string name="compose_number_picker_default">%s ∙ Por defecto</string>
-    <string name="compose_number_picker_once">Sólo una vez</string>
-    <string name="compose_number_picker_always">Siempre</string>
-    <string name="compose_title_selected">%d seleccionados</string>
-    <string name="compose_subtitle_results">%1$d de %2$d resultados</string>
-    <string name="compose_send_group_title">Enviar como mensaje de grupo</string>
-    <string name="compose_send_group_summary">Los destinatarios y las respuestas serán visibles a todos</string>
-    <string name="compose_messages_empty">Este es el comienzo de su conversación. ¡Di algo bonito!</string>
-    <string name="compose_vcard_label">Tarjeta de contacto</string>
-    <string name="compose_scheduled_for">Programado para</string>
-    <string name="compose_scheduled_future">El tiempo seleccionado debe de ser en el futuro!</string>
-    <string name="compose_scheduled_plus">Tienes que desbloquear QKSMS+ para usar mensajes programados</string>
-    <string name="compose_scheduled_toast">Añadido a los mensajes programados</string>
-    <string name="compose_hint">Escribir mensaje&#8230;</string>
-    <string name="compose_menu_copy">Copiar texto</string>
-    <string name="compose_menu_forward">Reenviar</string>
-    <string name="compose_menu_delete">Eliminar</string>
-    <string name="compose_menu_previous">Anterior</string>
-    <string name="compose_menu_next">Siguiente</string>
-    <string name="compose_menu_clear">Borrar</string>
-    <string name="compose_details_title">Detalles del mensaje</string>
-    <string name="compose_details_type">Escribe: %s</string>
-    <string name="compose_details_from">De: %s</string>
-    <string name="compose_details_to">Para: %s</string>
-    <string name="compose_details_subject">Asunto: %s</string>
-    <string name="compose_details_priority">Prioridad: %s</string>
-    <string name="compose_details_size">Tamaño: %s</string>
-    <string name="compose_details_sent">Enviado: %s</string>
-    <string name="compose_details_received">Recibido: %s</string>
-    <string name="compose_details_delivered">Entregado: %s</string>
-    <string name="compose_details_error_code">Código de error: %d</string>
-    <string name="compose_attach_cd">Agregar un archivo adjunto</string>
-    <string name="compose_gallery_cd">Adjuntar una foto</string>
-    <string name="compose_camera_cd">Tomar una foto</string>
-    <string name="compose_schedule_cd">Programar mensaje</string>
-    <string name="compose_contact_cd">Adjuntar un contacto</string>
-    <string name="compose_contact_error">Error al leer contacto</string>
-    <!-- Example: SIM 1 (Verizon) selected-->
-    <string name="compose_sim_changed_toast">SIM %1$d (%2$s) seleccionada</string>
-    <string name="compose_sim_cd">%s seleccionado, cambia la tarjeta SIM</string>
-    <string name="compose_send_cd">Enviar mensaje</string>
-    <string name="message_status_sending">Enviando&#8230;</string>
-    <string name="message_status_delivered">Entregado %s</string>
-    <string name="message_status_failed">No se pudo enviar. Pulse para volver a intentarlo</string>
-    <string name="info_title">Detalles</string>
-    <string name="info_copied_address">Dirección copiada</string>
-    <string name="info_name">Título de la conversación</string>
-    <string name="info_notifications">Notificaciones</string>
-    <string name="info_theme">Tema</string>
-    <string name="info_archive">Archivar</string>
-    <string name="info_unarchive">Desarchivar</string>
-    <string name="info_block">Bloquear</string>
-    <string name="info_unblock">Desbloquear</string>
-    <string name="info_delete">Borrar conversación</string>
-    <string name="gallery_error">No se pudo cargar el medio</string>
-    <string name="gallery_toast_saved">Guardado en Galería</string>
-    <string name="backup_title">Copia de seguridad y restauración</string>
-    <string name="backup_backing_up">Respaldando mensajes</string>
-    <string name="backup_restoring">Restaurar desde copia de seguridad</string>
-    <string name="backup_last">Última copia de seguridad</string>
-    <string name="backup_loading">Cargando&#8230;</string>
-    <string name="backup_never">Nunca</string>
-    <string name="backup_restore_title">Restaurar</string>
-    <string name="backup_restore_summary">Seleccione una copia de seguridad</string>
-    <string name="backup_restore_error_plus">Por favor desbloquee QKSMS+ para usar copia de seguridad y restauración</string>
-    <string name="backup_restore_error_backup">Copia de seguridad en progreso&#8230;</string>
-    <string name="backup_restore_error_restore">Restauración en progreso&#8230;</string>
-    <string name="backup_restore_confirm_title">Restaurar desde copia de seguridad</string>
-    <string name="backup_restore_confirm_message">¿Está seguro de que desea restaurar sus mensajes desde esta copia de seguridad?</string>
-    <string name="backup_restore_stop_title">Detener restauración</string>
-    <string name="backup_restore_stop_message">Los mensajes que ya han sido restaurados permanecerán en su dispositivo</string>
-    <string name="backup_restore_dialog_title">Copias de seguridad</string>
-    <string name="backup_restore_dialog_empty">No se encontraron copias de seguridad</string>
-    <plurals name="backup_message_count">
-        <item quantity="one">%dNuevo mensaje</item>
-        <item quantity="other">%dMensajes nuevos</item>
-    </plurals>
-    <string name="backup_disclaimer">Actualmente, sólo los SMS son soportados por la copia de seguridad y restauración. ¡El soporte para MMS y las copias de seguridad programadas se realizarán pronto!</string>
-    <string name="backup_now">Copiar ahora</string>
-    <string name="backup_progress_parsing">Analizando copia de seguridad&#8230;</string>
-    <string name="backup_progress_running">%d/%d mensajes</string>
-    <string name="backup_progress_saving">Guardando copia de seguridad&#8230;</string>
-    <string name="backup_progress_syncing">Sincronizando mensajes&#8230;</string>
-    <string name="backup_progress_finished">¡Terminado!</string>
-    <string name="backup_notification_channel_name">Copiar y restaurar</string>
-    <string name="scheduled_title">Programado</string>
-    <string name="scheduled_empty_description">Enviar automáticamente un mensaje, en el momento exacto que te gustaría</string>
-    <string name="scheduled_empty_message_1">¡Hola! ¿Cuándo será tu cumpleaños de nuevo?</string>
-    <string name="scheduled_empty_message_2">Es el 23 de Diciembre</string>
-    <string name="scheduled_empty_message_3">¡Feliz cumpleaños! Mira qué gran amigo soy, recordando tu cumpleaños</string>
-    <!--&#x200A; is a special character required at the end of this string to fix it's formatting in the app -->
-    <string name="scheduled_empty_message_3_timestamp">Enviando el 23 de Diciembre</string>
-    <string name="scheduled_compose_cd">Programar un mensaje</string>
-    <string name="scheduled_options_title">Mensaje programado</string>
-    <string-array name="scheduled_options">
-        <item>Enviar ahora</item>
-        <item>Copiar texto</item>
-        <item>Borrar</item>
-    </string-array>
-    <string name="settings_category_appearance">Apariencia</string>
-    <string name="settings_category_general">General</string>
-    <string name="settings_category_qkreply">Responder vía QKSMS</string>
-    <string name="settings_theme_title">Tema</string>
-    <string name="settings_night_title">Modo nocturno</string>
-    <string name="settings_black_title">Modo noche negro puro</string>
-    <string name="settings_night_start_title">Hora de inicio</string>
-    <string name="settings_night_end_title">Hora de finalización</string>
-    <string name="settings_automatic_colors_title">Colores de contacto automáticos</string>
-    <string name="settings_text_size_title">Tamaño de la fuente</string>
-    <string name="settings_system_font_title">Usar fuente del sistema</string>
-    <string name="settings_auto_emoji_title">Emojis automáticos</string>
-    <string name="settings_notifications_title">Notificaciones</string>
-    <string name="settings_notifications_o_summary">Toca para personalizar</string>
-    <string name="settings_notification_actions_title">Acciones</string>
-    <string name="settings_notification_action_1">Botón 1</string>
-    <string name="settings_notification_action_2">Botón 2</string>
-    <string name="settings_notification_action_3">Botón 3</string>
-    <string name="settings_notification_previews_title">Previsualización de notificaciones</string>
-    <string name="settings_notification_wake_title">Encender pantalla</string>
-    <string name="settings_vibration_title">Vibración</string>
-    <string name="settings_ringtone_title">Sonido</string>
-    <string name="settings_ringtone_none">Ninguno</string>
-    <string name="settings_qkreply_title">Responder vía QKSMS</string>
-    <string name="settings_qkreply_summary">Ventana emergente para los nuevos mensajes</string>
-    <string name="settings_qkreply_tap_dismiss_title">Tocar para descartar</string>
-    <string name="settings_qkreply_tap_dismiss_summary">Toque fuera de la ventana emergente para cerrarla</string>
-    <string name="settings_delayed_title">Retraso en el envío</string>
-    <string name="settings_swipe_actions">Acciones al deslizar</string>
-    <string name="settings_swipe_actions_summary">Configurar acciones de deslizamiento para conversaciones</string>
-    <string name="settings_swipe_actions_right">Deslizar a la derecha</string>
-    <string name="settings_swipe_actions_left">Deslizar a la izquierda</string>
-    <string name="settings_swipe_actions_change">CAMBIAR</string>
-    <string-array name="settings_swipe_actions">
-        <item>Ninguno</item>
-        <item>Archivar</item>
-        <item>Eliminar</item>
-        <item>Bloquear</item>
-        <item>Llamar</item>
-        <item>Marcar como leído</item>
-        <item>Marcar como no leído</item>
-    </string-array>
-    <string name="settings_delivery_title">Confirmaciones de envío</string>
-    <string name="settings_delivery_summary">Confirmar cuando los mensajes se envien con éxito</string>
-    <string name="settings_signature_title">Firma</string>
-    <string name="settings_signature_summary">Añadir una firma al final de tus mensajes</string>
-    <string name="settings_unicode_title">Detalles en tiras</string>
-    <string name="settings_unicode_summary">Quitar acentos de caracteres en los mensajes SMS salientes</string>
-    <string name="settings_mobile_title">Sólo números móviles</string>
-    <string name="settings_mobile_summary">Al componer un mensaje, sólo mostrar números móviles</string>
-    <string name="settings_auto_delete">Delete old messages automatically</string>
-    <string name="settings_auto_delete_dialog_message">Messages will be deleted after the specified number of days</string>
-    <string name="settings_auto_delete_dialog_hint">Number of days</string>
-    <string name="settings_auto_delete_never">Never</string>
-    <string name="settings_auto_delete_warning">Delete old messages automatically?</string>
-    <string name="settings_auto_delete_warning_message">If you proceed, %1$d messages will be deleted now</string>
-    <plurals name="settings_auto_delete_summary">
-        <item quantity="one">After 1 day</item>
-        <item quantity="other">After %d days</item>
-    </plurals>
-    <string name="settings_long_as_mms_title">Enviar mensajes largos como MMS</string>
-    <string name="settings_long_as_mms_summary">Si sus mensajes de texto largos no se están enviando o enviando en el orden incorrecto, puede enviarlos como mensajes MMS en su lugar. Se pueden aplicar cargos adicionales</string>
-    <string name="settings_mms_size_title">Autocomprimir archivos adjuntos MMS</string>
-    <string name="settings_sync_title">Sincronizar mensajes</string>
-    <string name="settings_sync_summary">Vuelve a sincronizar tus mensajes con la base de datos nativa de Android SMS</string>
-    <string name="settings_about_title">Acerca de QKSMS</string>
-    <string name="settings_version">Versión %s</string>
-    <string name="settings_logging_enabled">Registro de depuración activado</string>
-    <string name="settings_logging_disabled">Registro de depuración desactivado</string>
-    <string name="settings_delay_duration_hint">Introduzca la duración (segundos)</string>
-    <string name="blocking_title">Bloqueando</string>
-    <string name="blocking_drop_title">Borrar mensajes</string>
-    <string name="blocking_drop_summary">Eliminar mensajes entrantes de los remitentes bloqueados en lugar de ocultarlos</string>
-    <string name="blocking_conversations">Conversaciones bloqueadas</string>
-    <string name="blocking_manager_title">Gestor de bloqueo</string>
-    <string name="blocking_manager_qksms_title">QKSMS</string>
-    <string name="blocking_manager_qksms_summary">Función de bloqueo integrado en QKSMS</string>
-    <string name="blocking_manager_call_control_summary">¡Filtrre automáticamente sus llamadas y mensajes en un lugar conveniente! La comunidad IQ™ te permite prevenir mensajes no deseados de spammers conocidos por la comunidad</string>
-    <string name="blocking_manager_sia_summary">Filtra automáticamente los mensajes de números no solicitados mediante la aplicación \"¿Debo responder?\"</string>
-    <string name="blocking_manager_copy_title">Copiar números bloqueados</string>
-    <string name="blocking_manager_copy_summary">Continúa a %s y copia sobre tus números bloqueados existentes</string>
-    <string name="blocked_numbers_title">Números bloqueados</string>
-    <string name="blocked_numbers_empty">Tus números bloqueados aparecerán aquí</string>
-    <string name="blocked_numbers_add_cd">Bloquear un nuevo número</string>
-    <string name="blocked_numbers_dialog_title">Bloquear textos de</string>
-    <string name="blocked_numbers_dialog_hint">Número de teléfono</string>
-    <string name="blocked_numbers_dialog_block">Bloquear</string>
-    <string name="blocked_messages_title">Mensajes bloqueados</string>
-    <string name="blocked_messages_empty">Tus mensajes bloqueados aparecerán aquí</string>
-    <string name="blocking_block_title">Bloquear</string>
-    <string name="blocking_unblock_title">Desbloquear</string>
-    <plurals name="blocking_block_external">
-        <item quantity="one">Continúa a %s y bloquea este número</item>
-        <item quantity="other">Continúa a %s y bloquea estos números</item>
-    </plurals>
-    <plurals name="blocking_unblock_external">
-        <item quantity="one">Continuar a %s y permitir este número</item>
-        <item quantity="other">Continuar a %s y permitir estos números</item>
-    </plurals>
-    <string name="about_title">Acerca de</string>
-    <string name="about_version_title">Versión</string>
-    <string name="about_developer_title">Desarrollador</string>
-    <string name="about_source_title">Código fuente</string>
-    <string name="about_changelog_title">Registro de cambios</string>
-    <string name="about_contact_title">Contáctanos</string>
-    <string name="about_license_title">Licencia</string>
-    <string name="about_copyright_title">Derechos de autor</string>
-    <string name="qksms_plus_description_title">Apoye el desarrollo, desbloquee todo</string>
-    <string name="qksms_plus_description_summary">Puedes salvar a un desarrollador hambriento por sólo %s</string>
-    <!-- Substitutions are for price and currency. Ex: Lifetime upgrade for $1.99 USD -->
-    <string name="qksms_plus_upgrade">Actualización de por vida por %1$s %2$s</string>
-    <!-- Substitutions are for price and currency. Ex: Unlock + donate for $4.99 USD -->
-    <string name="qksms_plus_upgrade_donate">Desbloquear + donación %1$s %2$s</string>
-    <string name="qksms_plus_thanks_title">Gracias por apoyar a QKSMS!</string>
-    <string name="qksms_plus_thanks_summary">Ahora tienes acceso a todas las funciones de QKSMS +</string>
-    <string name="qksms_plus_free_title">QKSMS+ es gratis para los usuarios de F-Droid! Si desea apoyar el desarrollo, no dude en hacer una donación.</string>
-    <string name="qksms_plus_donate">Donar con PayPal</string>
-    <string name="qksms_plus_coming_soon">Próximamente</string>
-    <string name="qksms_plus_themes_title">Temas Premium</string>
-    <string name="qksms_plus_themes_summary">Desbloquea hermosos temas de colores que no están disponibles en la paleta Material Design</string>
-    <string name="qksms_plus_emoji_title">Auto-emoji personalizado</string>
-    <string name="qksms_plus_emoji_summary">Crear accesos directos personalizados de auto-emoji</string>
-    <string name="qksms_plus_backup_title">Copia de seguridad de mensajes</string>
-    <string name="qksms_plus_backup_summary">Copia de seguridad automática de tus mensajes. Nunca más se preocupe por perder su historial si cambia o pierde su teléfono</string>
-    <string name="qksms_plus_scheduled_title">Mensajes programados</string>
-    <string name="qksms_plus_scheduled_summary">Programa mensajes para enviarlos automáticamente a una hora y fecha específica</string>
-    <string name="qksms_plus_delayed_title">Retraso en el envío</string>
-    <string name="qksms_plus_delayed_summary">Espere unos segundos antes de enviar su mensaje</string>
-    <string name="qksms_plus_night_title">Modo nocturno automático</string>
-    <string name="qksms_plus_night_summary">Activar el modo nocturno basado en la hora del día</string>
-    <string name="qksms_plus_blacklist_title">Bloqueo avanzado</string>
-    <string name="qksms_plus_blacklist_summary">Bloquear los mensajes que contengan palabras clave o patrones coincidentes</string>
-    <string name="qksms_plus_forward_title">Reenvío automático</string>
-    <string name="qksms_plus_forward_summary">Reenviar automáticamente los mensajes de determinados remitentes</string>
-    <string name="qksms_plus_respond_title">Auto-responder</string>
-    <string name="qksms_plus_respond_summary">Responder automáticamente a mensajes entrantes con una respuesta preestablecida</string>
-    <string name="qksms_plus_more_title">Más</string>
-    <string name="qksms_plus_more_summary">QKSMS está bajo desarollo activo, y sus compras incluirán todas las características futuras de QKSMS+!</string>
-    <string name="widget_loading">Cargando&#8230;</string>
-    <string name="widget_more">Ver más conversaciones</string>
-    <string name="qkreply_menu_read">Marcar como leído</string>
-    <string name="qkreply_menu_call">Llamar</string>
-    <string name="qkreply_menu_delete">Eliminar</string>
-    <string name="qkreply_menu_expand">Mostrar más</string>
-    <string name="qkreply_menu_collapse">Mostrar menos</string>
-    <string name="qkreply_menu_view">Abrir conversación</string>
-    <string name="theme_material">Material</string>
-    <string name="theme_hex">HEXAGONAL</string>
-    <string name="theme_apply">Aplicar</string>
-    <string-array name="notification_actions">
-        <item>Ninguno</item>
-        <item>Archivar</item>
-        <item>Eliminar</item>
-        <item>Bloquear</item>
-        <item>Llamar</item>
-        <item>Marcar como leído</item>
-        <item>Responder</item>
-    </string-array>
-    <string name="button_yes">Sí</string>
-    <string name="button_continue">Continuar</string>
-    <string name="button_cancel">Cancelar</string>
-    <string name="button_delete">Eliminar</string>
-    <string name="button_save">Guardar</string>
-    <string name="button_stop">Detener</string>
-    <string name="button_more">Más</string>
-    <string name="button_set">Establecer</string>
-    <string name="button_undo">Deshacer</string>
-    <string name="toast_copied">Copiado</string>
-    <string name="toast_archived">Conversación archivada</string>
-    <string name="toast_qksms_plus">Debe desbloquear QKSMS+ para utilizarlo</string>
-    <plurals name="notification_new_messages">
-        <item quantity="one">Nuevo mensaje</item>
-        <item quantity="other">nuevos mensajes de %s</item>
-    </plurals>
-    <string name="notification_message_failed_title">Mensaje no enviado</string>
-    <string name="notification_message_failed_text">El mensaje a %s no se pudo enviar</string>
-    <string-array name="night_modes">
-        <item>Sistema</item>
-        <item>Desactivado</item>
-        <item>Siempre activado</item>
-        <item>Automático</item>
-    </string-array>
-    <string-array name="notification_preview_options">
-        <item>Mostrar nombre y el mensaje</item>
-        <item>Mostrar nombre</item>
-        <item>Ocultar contenido</item>
-    </string-array>
-    <string-array name="text_sizes">
-        <item>Pequeño</item>
-        <item>Normal</item>
-        <item>Grande</item>
-        <item>Más grande</item>
-    </string-array>
-    <string-array name="delayed_sending_labels">
-        <item>Sin demora</item>
-        <item>3 segundos</item>
-        <item>5 segundos</item>
-        <item>10 segundos</item>
-    </string-array>
-    <string-array name="mms_sizes">
-        <item>Automático</item>
-        <item>100KB</item>
-        <item>200KB</item>
-        <item>300KB</item>
-        <item>600KB</item>
-        <item>1000KB</item>
-        <item>2000KB</item>
-        <item>Sin compresión</item>
-    </string-array>
-    <string-array name="qk_responses">
-        <item>Ok</item>
-        <item>Dame un momento</item>
-        <item>Estoy en camino</item>
-        <item>Gracias</item>
-        <item>Suena bien</item>
-        <item>¿Qué hay de nuevo?</item>
-        <item>De acuerdo</item>
-        <item>No</item>
-        <item>Te quiero</item>
-        <item>Lo siento</item>
-        <item>JAJAJA</item>
-        <item>Está bien</item>
-    </string-array>
-</resources>
+<?xml version="1.0" encoding="utf-8"?>
+<!--
+  ~ Copyright (C) 2019 Moez Bhatti <moez.bhatti@gmail.com>
+  ~
+  ~ This file is part of QKSMS.
+  ~
+  ~ QKSMS is free software: you can redistribute it and/or modify
+  ~ it under the terms of the GNU General Public License as published by
+  ~ the Free Software Foundation, either version 3 of the License, or
+  ~ (at your option) any later version.
+  ~
+  ~ QKSMS is distributed in the hope that it will be useful,
+  ~ but WITHOUT ANY WARRANTY; without even the implied warranty of
+  ~ MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+  ~ GNU General Public License for more details.
+  ~
+  ~ You should have received a copy of the GNU General Public License
+  ~ along with QKSMS.  If not, see <http://www.gnu.org/licenses/>.
+  -->
+<resources>
+    <string name="shortcut_compose_long_label">Nueva conversación</string>
+    <string name="shortcut_compose_short_label">Redactar</string>
+    <string name="shortcut_compose_disabled_message">Acceso directo deshabilitado</string>
+    <string name="title_archived">Archivados</string>
+    <string name="title_settings">Configuración</string>
+    <string name="title_notification_prefs">Notificaciones</string>
+    <string name="title_theme">Tema</string>
+    <string name="title_conversations">Buscar mensaje&#8230;</string>
+    <string name="title_compose">Escriba un nombre o número</string>
+    <string name="setup_skip">Omitir</string>
+    <string name="setup_next">Continuar</string>
+    <string name="menu_add_person">Añadir persona</string>
+    <string name="menu_call">Llamar</string>
+    <string name="menu_info">Detalles</string>
+    <string name="menu_save">Guardar en la galería</string>
+    <string name="menu_share">Compartir</string>
+    <string name="main_drawer_open_cd">Abrir cajón de navegación</string>
+    <string name="main_title_selected">%d Seleccionados</string>
+    <string name="main_menu_clear">Limpiar</string>
+    <string name="main_menu_archive">Archivo</string>
+    <string name="main_menu_unarchive">Desarchivar</string>
+    <string name="main_menu_delete">Eliminar</string>
+    <string name="main_menu_add_contact">Añadir a contactos</string>
+    <string name="main_menu_pin">Anclar hacia arriba</string>
+    <string name="main_menu_unpin">Desanclar</string>
+    <string name="main_menu_read">Marcar como leído</string>
+    <string name="main_menu_unread">Marcar como no leído</string>
+    <string name="main_menu_block">Bloquear</string>
+    <string name="main_syncing">Sincronización de mensajes...</string>
+    <string name="main_sender_you">Tú: %s</string>
+    <string name="main_draft">Borrador</string>
+    <string name="main_message_results_title">Resultados en los mensajes</string>
+    <string name="main_message_results">%d mensajes</string>
+    <string name="inbox_empty_text">Sus conversaciones aparecerán aquí</string>
+    <string name="inbox_search_empty_text">No hay resultados</string>
+    <string name="archived_empty_text">Sus conversaciones archivadas aparecerán aquí</string>
+    <string name="main_fab_cd">Iniciar una nueva conversación</string>
+    <string name="main_default_sms_title">Me encanta enviar mensajes de texto otra vez</string>
+    <string name="main_default_sms_message">Haga de QKSMS su aplicación SMS por defecto</string>
+    <string name="main_default_sms_change">Cambios</string>
+    <string name="main_permission_required">Se requiere permiso</string>
+    <string name="main_permission_sms">QKSMS necesita permiso para enviar y ver mensajes SMS</string>
+    <string name="main_permission_contacts">QKSMS necesita permiso para ver sus contactos</string>
+    <string name="main_permission_allow">Permitir</string>
+    <string name="drawer_inbox">Recibidos</string>
+    <string name="drawer_archived">Archivar</string>
+    <string name="drawer_scheduled">Programar</string>
+    <string name="drawer_blocking">Bloqueando</string>
+    <string name="drawer_more">Más</string>
+    <string name="drawer_settings">Ajustes</string>
+    <string name="drawer_help">Ayuda &amp; comentarios</string>
+    <string name="drawer_invite">Invitar amigos</string>
+    <string name="drawer_plus_banner_summary">Desbloquea nuevas e impresionantes características y apoya el desarrollo</string>
+    <string name="rate_title">¿Te diviertes con QKSMS?</string>
+    <string name="rate_summary">Comparte un poco de amor y puntúanos en Google Play!</string>
+    <string name="rate_okay">DE ACUERDO</string>
+    <string name="rate_dismiss">DESESTIMAR</string>
+    <string name="dialog_delete_title">Eliminar</string>
+    <plurals name="dialog_delete_message">
+        <item quantity="one">¿Está seguro de que desea eliminar la conversación?</item>
+        <item quantity="other">¿Está seguro de que desea eliminar %d conversaciones?</item>
+    </plurals>
+    <string-array name="message_options">
+        <item>Copiar texto</item>
+        <item>Reenviar</item>
+        <item>Borrar</item>
+    </string-array>
+    <string name="compose_number_picker_title">Elija un número de teléfono</string>
+    <string name="compose_number_picker_default">%s ∙ Por defecto</string>
+    <string name="compose_number_picker_once">Sólo una vez</string>
+    <string name="compose_number_picker_always">Siempre</string>
+    <string name="compose_title_selected">%d seleccionados</string>
+    <string name="compose_subtitle_results">%1$d de %2$d resultados</string>
+    <string name="compose_send_group_title">Enviar como mensaje de grupo</string>
+    <string name="compose_send_group_summary">Los destinatarios y las respuestas serán visibles a todos</string>
+    <string name="compose_messages_empty">Este es el comienzo de su conversación. ¡Di algo bonito!</string>
+    <string name="compose_vcard_label">Tarjeta de contacto</string>
+    <string name="compose_scheduled_for">Programado para</string>
+    <string name="compose_scheduled_future">El tiempo seleccionado debe de ser en el futuro!</string>
+    <string name="compose_scheduled_plus">Tienes que desbloquear QKSMS+ para usar mensajes programados</string>
+    <string name="compose_scheduled_toast">Añadido a los mensajes programados</string>
+    <string name="compose_hint">Escribir mensaje&#8230;</string>
+    <string name="compose_menu_copy">Copiar texto</string>
+    <string name="compose_menu_forward">Reenviar</string>
+    <string name="compose_menu_delete">Eliminar</string>
+    <string name="compose_menu_previous">Anterior</string>
+    <string name="compose_menu_next">Siguiente</string>
+    <string name="compose_menu_clear">Borrar</string>
+    <string name="compose_details_title">Detalles del mensaje</string>
+    <string name="compose_details_type">Escribe: %s</string>
+    <string name="compose_details_from">De: %s</string>
+    <string name="compose_details_to">Para: %s</string>
+    <string name="compose_details_subject">Asunto: %s</string>
+    <string name="compose_details_priority">Prioridad: %s</string>
+    <string name="compose_details_size">Tamaño: %s</string>
+    <string name="compose_details_sent">Enviado: %s</string>
+    <string name="compose_details_received">Recibido: %s</string>
+    <string name="compose_details_delivered">Entregado: %s</string>
+    <string name="compose_details_error_code">Código de error: %d</string>
+    <string name="compose_attach_cd">Agregar un archivo adjunto</string>
+    <string name="compose_gallery_cd">Adjuntar una foto</string>
+    <string name="compose_camera_cd">Tomar una foto</string>
+    <string name="compose_schedule_cd">Programar mensaje</string>
+    <string name="compose_contact_cd">Adjuntar un contacto</string>
+    <string name="compose_contact_error">Error al leer contacto</string>
+    <!-- Example: SIM 1 (Verizon) selected-->
+    <string name="compose_sim_changed_toast">SIM %1$d (%2$s) seleccionada</string>
+    <string name="compose_sim_cd">%s seleccionado, cambia la tarjeta SIM</string>
+    <string name="compose_send_cd">Enviar mensaje</string>
+    <string name="message_status_sending">Enviando&#8230;</string>
+    <string name="message_status_delivered">Entregado %s</string>
+    <string name="message_status_failed">No se pudo enviar. Pulse para volver a intentarlo</string>
+    <string name="info_title">Detalles</string>
+    <string name="info_copied_address">Dirección copiada</string>
+    <string name="info_name">Título de la conversación</string>
+    <string name="info_notifications">Notificaciones</string>
+    <string name="info_theme">Tema</string>
+    <string name="info_archive">Archivar</string>
+    <string name="info_unarchive">Desarchivar</string>
+    <string name="info_block">Bloquear</string>
+    <string name="info_unblock">Desbloquear</string>
+    <string name="info_delete">Borrar conversación</string>
+    <string name="gallery_error">No se pudo cargar el medio</string>
+    <string name="gallery_toast_saved">Guardado en Galería</string>
+    <string name="backup_title">Copia de seguridad y restauración</string>
+    <string name="backup_backing_up">Respaldando mensajes</string>
+    <string name="backup_restoring">Restaurar desde copia de seguridad</string>
+    <string name="backup_last">Última copia de seguridad</string>
+    <string name="backup_loading">Cargando&#8230;</string>
+    <string name="backup_never">Nunca</string>
+    <string name="backup_restore_title">Restaurar</string>
+    <string name="backup_restore_summary">Seleccione una copia de seguridad</string>
+    <string name="backup_restore_error_plus">Por favor desbloquee QKSMS+ para usar copia de seguridad y restauración</string>
+    <string name="backup_restore_error_backup">Copia de seguridad en progreso&#8230;</string>
+    <string name="backup_restore_error_restore">Restauración en progreso&#8230;</string>
+    <string name="backup_restore_confirm_title">Restaurar desde copia de seguridad</string>
+    <string name="backup_restore_confirm_message">¿Está seguro de que desea restaurar sus mensajes desde esta copia de seguridad?</string>
+    <string name="backup_restore_stop_title">Detener restauración</string>
+    <string name="backup_restore_stop_message">Los mensajes que ya han sido restaurados permanecerán en su dispositivo</string>
+    <string name="backup_restore_dialog_title">Copias de seguridad</string>
+    <string name="backup_restore_dialog_empty">No se encontraron copias de seguridad</string>
+    <plurals name="backup_message_count">
+        <item quantity="one">%dNuevo mensaje</item>
+        <item quantity="other">%dMensajes nuevos</item>
+    </plurals>
+    <string name="backup_disclaimer">Actualmente, sólo los SMS son soportados por la copia de seguridad y restauración. ¡El soporte para MMS y las copias de seguridad programadas se realizarán pronto!</string>
+    <string name="backup_now">Copiar ahora</string>
+    <string name="backup_progress_parsing">Analizando copia de seguridad&#8230;</string>
+    <string name="backup_progress_running">%d/%d mensajes</string>
+    <string name="backup_progress_saving">Guardando copia de seguridad&#8230;</string>
+    <string name="backup_progress_syncing">Sincronizando mensajes&#8230;</string>
+    <string name="backup_progress_finished">¡Terminado!</string>
+    <string name="backup_notification_channel_name">Copiar y restaurar</string>
+    <string name="scheduled_title">Programado</string>
+    <string name="scheduled_empty_description">Enviar automáticamente un mensaje, en el momento exacto que te gustaría</string>
+    <string name="scheduled_empty_message_1">¡Hola! ¿Cuándo será tu cumpleaños de nuevo?</string>
+    <string name="scheduled_empty_message_2">Es el 23 de Diciembre</string>
+    <string name="scheduled_empty_message_3">¡Feliz cumpleaños! Mira qué gran amigo soy, recordando tu cumpleaños</string>
+    <!--&#x200A; is a special character required at the end of this string to fix it's formatting in the app -->
+    <string name="scheduled_empty_message_3_timestamp">Enviando el 23 de Diciembre</string>
+    <string name="scheduled_compose_cd">Programar un mensaje</string>
+    <string name="scheduled_options_title">Mensaje programado</string>
+    <string-array name="scheduled_options">
+        <item>Enviar ahora</item>
+        <item>Copiar texto</item>
+        <item>Borrar</item>
+    </string-array>
+    <string name="settings_category_appearance">Apariencia</string>
+    <string name="settings_category_general">General</string>
+    <string name="settings_category_qkreply">Responder vía QKSMS</string>
+    <string name="settings_theme_title">Tema</string>
+    <string name="settings_night_title">Modo nocturno</string>
+    <string name="settings_black_title">Modo noche negro puro</string>
+    <string name="settings_night_start_title">Hora de inicio</string>
+    <string name="settings_night_end_title">Hora de finalización</string>
+    <string name="settings_automatic_colors_title">Colores de contacto automáticos</string>
+    <string name="settings_text_size_title">Tamaño de la fuente</string>
+    <string name="settings_system_font_title">Usar fuente del sistema</string>
+    <string name="settings_auto_emoji_title">Emojis automáticos</string>
+    <string name="settings_notifications_title">Notificaciones</string>
+    <string name="settings_notifications_o_summary">Toca para personalizar</string>
+    <string name="settings_notification_actions_title">Acciones</string>
+    <string name="settings_notification_action_1">Botón 1</string>
+    <string name="settings_notification_action_2">Botón 2</string>
+    <string name="settings_notification_action_3">Botón 3</string>
+    <string name="settings_notification_previews_title">Previsualización de notificaciones</string>
+    <string name="settings_notification_wake_title">Encender pantalla</string>
+    <string name="settings_vibration_title">Vibración</string>
+    <string name="settings_ringtone_title">Sonido</string>
+    <string name="settings_ringtone_none">Ninguno</string>
+    <string name="settings_qkreply_title">Responder vía QKSMS</string>
+    <string name="settings_qkreply_summary">Ventana emergente para los nuevos mensajes</string>
+    <string name="settings_qkreply_tap_dismiss_title">Tocar para descartar</string>
+    <string name="settings_qkreply_tap_dismiss_summary">Toque fuera de la ventana emergente para cerrarla</string>
+    <string name="settings_delayed_title">Retraso en el envío</string>
+    <string name="settings_swipe_actions">Acciones al deslizar</string>
+    <string name="settings_swipe_actions_summary">Configurar acciones de deslizamiento para conversaciones</string>
+    <string name="settings_swipe_actions_right">Deslizar a la derecha</string>
+    <string name="settings_swipe_actions_left">Deslizar a la izquierda</string>
+    <string name="settings_swipe_actions_change">CAMBIAR</string>
+    <string-array name="settings_swipe_actions">
+        <item>Ninguno</item>
+        <item>Archivar</item>
+        <item>Eliminar</item>
+        <item>Bloquear</item>
+        <item>Llamar</item>
+        <item>Marcar como leído</item>
+        <item>Marcar como no leído</item>
+    </string-array>
+    <string name="settings_delivery_title">Confirmaciones de envío</string>
+    <string name="settings_delivery_summary">Confirmar cuando los mensajes se envien con éxito</string>
+    <string name="settings_signature_title">Firma</string>
+    <string name="settings_signature_summary">Añadir una firma al final de tus mensajes</string>
+    <string name="settings_unicode_title">Detalles en tiras</string>
+    <string name="settings_unicode_summary">Quitar acentos de caracteres en los mensajes SMS salientes</string>
+    <string name="settings_mobile_title">Sólo números móviles</string>
+    <string name="settings_mobile_summary">Al componer un mensaje, sólo mostrar números móviles</string>
+    <string name="settings_auto_delete">Delete old messages automatically</string>
+    <string name="settings_auto_delete_dialog_message">Messages will be deleted after the specified number of days</string>
+    <string name="settings_auto_delete_dialog_hint">Number of days</string>
+    <string name="settings_auto_delete_never">Never</string>
+    <string name="settings_auto_delete_warning">Delete old messages automatically?</string>
+    <string name="settings_auto_delete_warning_message">If you proceed, %1$d messages will be deleted now</string>
+    <plurals name="settings_auto_delete_summary">
+        <item quantity="one">After 1 day</item>
+        <item quantity="other">After %d days</item>
+    </plurals>
+    <string name="settings_long_as_mms_title">Enviar mensajes largos como MMS</string>
+    <string name="settings_long_as_mms_summary">Si sus mensajes de texto largos no se están enviando o enviando en el orden incorrecto, puede enviarlos como mensajes MMS en su lugar. Se pueden aplicar cargos adicionales</string>
+    <string name="settings_mms_size_title">Autocomprimir archivos adjuntos MMS</string>
+    <string name="settings_sync_title">Sincronizar mensajes</string>
+    <string name="settings_sync_summary">Vuelve a sincronizar tus mensajes con la base de datos nativa de Android SMS</string>
+    <string name="settings_about_title">Acerca de QKSMS</string>
+    <string name="settings_version">Versión %s</string>
+    <string name="settings_logging_enabled">Registro de depuración activado</string>
+    <string name="settings_logging_disabled">Registro de depuración desactivado</string>
+    <string name="settings_delay_duration_hint">Introduzca la duración (segundos)</string>
+    <string name="blocking_title">Bloqueando</string>
+    <string name="blocking_drop_title">Borrar mensajes</string>
+    <string name="blocking_drop_summary">Eliminar mensajes entrantes de los remitentes bloqueados en lugar de ocultarlos</string>
+    <string name="blocking_conversations">Conversaciones bloqueadas</string>
+    <string name="blocking_manager_title">Gestor de bloqueo</string>
+    <string name="blocking_manager_qksms_title">QKSMS</string>
+    <string name="blocking_manager_qksms_summary">Función de bloqueo integrado en QKSMS</string>
+    <string name="blocking_manager_call_control_summary">¡Filtrre automáticamente sus llamadas y mensajes en un lugar conveniente! La comunidad IQ™ te permite prevenir mensajes no deseados de spammers conocidos por la comunidad</string>
+    <string name="blocking_manager_sia_summary">Filtra automáticamente los mensajes de números no solicitados mediante la aplicación \"¿Debo responder?\"</string>
+    <string name="blocking_manager_copy_title">Copiar números bloqueados</string>
+    <string name="blocking_manager_copy_summary">Continúa a %s y copia sobre tus números bloqueados existentes</string>
+    <string name="blocked_numbers_title">Números bloqueados</string>
+    <string name="blocked_numbers_empty">Tus números bloqueados aparecerán aquí</string>
+    <string name="blocked_numbers_add_cd">Bloquear un nuevo número</string>
+    <string name="blocked_numbers_dialog_title">Bloquear textos de</string>
+    <string name="blocked_numbers_dialog_hint">Número de teléfono</string>
+    <string name="blocked_numbers_dialog_block">Bloquear</string>
+    <string name="blocked_messages_title">Mensajes bloqueados</string>
+    <string name="blocked_messages_empty">Tus mensajes bloqueados aparecerán aquí</string>
+    <string name="blocking_block_title">Bloquear</string>
+    <string name="blocking_unblock_title">Desbloquear</string>
+    <plurals name="blocking_block_external">
+        <item quantity="one">Continúa a %s y bloquea este número</item>
+        <item quantity="other">Continúa a %s y bloquea estos números</item>
+    </plurals>
+    <plurals name="blocking_unblock_external">
+        <item quantity="one">Continuar a %s y permitir este número</item>
+        <item quantity="other">Continuar a %s y permitir estos números</item>
+    </plurals>
+    <string name="about_title">Acerca de</string>
+    <string name="about_version_title">Versión</string>
+    <string name="about_developer_title">Desarrollador</string>
+    <string name="about_source_title">Código fuente</string>
+    <string name="about_changelog_title">Registro de cambios</string>
+    <string name="about_contact_title">Contáctanos</string>
+    <string name="about_license_title">Licencia</string>
+    <string name="about_copyright_title">Derechos de autor</string>
+    <string name="qksms_plus_description_title">Apoye el desarrollo, desbloquee todo</string>
+    <string name="qksms_plus_description_summary">Puedes salvar a un desarrollador hambriento por sólo %s</string>
+    <!-- Substitutions are for price and currency. Ex: Lifetime upgrade for $1.99 USD -->
+    <string name="qksms_plus_upgrade">Actualización de por vida por %1$s %2$s</string>
+    <!-- Substitutions are for price and currency. Ex: Unlock + donate for $4.99 USD -->
+    <string name="qksms_plus_upgrade_donate">Desbloquear + donación %1$s %2$s</string>
+    <string name="qksms_plus_thanks_title">Gracias por apoyar a QKSMS!</string>
+    <string name="qksms_plus_thanks_summary">Ahora tienes acceso a todas las funciones de QKSMS +</string>
+    <string name="qksms_plus_free_title">QKSMS+ es gratis para los usuarios de F-Droid! Si desea apoyar el desarrollo, no dude en hacer una donación.</string>
+    <string name="qksms_plus_donate">Donar con PayPal</string>
+    <string name="qksms_plus_coming_soon">Próximamente</string>
+    <string name="qksms_plus_themes_title">Temas Premium</string>
+    <string name="qksms_plus_themes_summary">Desbloquea hermosos temas de colores que no están disponibles en la paleta Material Design</string>
+    <string name="qksms_plus_emoji_title">Auto-emoji personalizado</string>
+    <string name="qksms_plus_emoji_summary">Crear accesos directos personalizados de auto-emoji</string>
+    <string name="qksms_plus_backup_title">Copia de seguridad de mensajes</string>
+    <string name="qksms_plus_backup_summary">Copia de seguridad automática de tus mensajes. Nunca más se preocupe por perder su historial si cambia o pierde su teléfono</string>
+    <string name="qksms_plus_scheduled_title">Mensajes programados</string>
+    <string name="qksms_plus_scheduled_summary">Programa mensajes para enviarlos automáticamente a una hora y fecha específica</string>
+    <string name="qksms_plus_delayed_title">Retraso en el envío</string>
+    <string name="qksms_plus_delayed_summary">Espere unos segundos antes de enviar su mensaje</string>
+    <string name="qksms_plus_night_title">Modo nocturno automático</string>
+    <string name="qksms_plus_night_summary">Activar el modo nocturno basado en la hora del día</string>
+    <string name="qksms_plus_blacklist_title">Bloqueo avanzado</string>
+    <string name="qksms_plus_blacklist_summary">Bloquear los mensajes que contengan palabras clave o patrones coincidentes</string>
+    <string name="qksms_plus_forward_title">Reenvío automático</string>
+    <string name="qksms_plus_forward_summary">Reenviar automáticamente los mensajes de determinados remitentes</string>
+    <string name="qksms_plus_respond_title">Auto-responder</string>
+    <string name="qksms_plus_respond_summary">Responder automáticamente a mensajes entrantes con una respuesta preestablecida</string>
+    <string name="qksms_plus_more_title">Más</string>
+    <string name="qksms_plus_more_summary">QKSMS está bajo desarollo activo, y sus compras incluirán todas las características futuras de QKSMS+!</string>
+    <string name="widget_loading">Cargando&#8230;</string>
+    <string name="widget_more">Ver más conversaciones</string>
+    <string name="qkreply_menu_read">Marcar como leído</string>
+    <string name="qkreply_menu_call">Llamar</string>
+    <string name="qkreply_menu_delete">Eliminar</string>
+    <string name="qkreply_menu_expand">Mostrar más</string>
+    <string name="qkreply_menu_collapse">Mostrar menos</string>
+    <string name="qkreply_menu_view">Abrir conversación</string>
+    <string name="theme_material">Material</string>
+    <string name="theme_hex">HEXAGONAL</string>
+    <string name="theme_apply">Aplicar</string>
+    <string-array name="notification_actions">
+        <item>Ninguno</item>
+        <item>Archivar</item>
+        <item>Eliminar</item>
+        <item>Bloquear</item>
+        <item>Llamar</item>
+        <item>Marcar como leído</item>
+        <item>Responder</item>
+    </string-array>
+    <string name="button_yes">Sí</string>
+    <string name="button_continue">Continuar</string>
+    <string name="button_cancel">Cancelar</string>
+    <string name="button_delete">Eliminar</string>
+    <string name="button_save">Guardar</string>
+    <string name="button_stop">Detener</string>
+    <string name="button_more">Más</string>
+    <string name="button_set">Establecer</string>
+    <string name="button_undo">Deshacer</string>
+    <string name="toast_copied">Copiado</string>
+    <string name="toast_archived">Conversación archivada</string>
+    <string name="toast_qksms_plus">Debe desbloquear QKSMS+ para utilizarlo</string>
+    <plurals name="notification_new_messages">
+        <item quantity="one">Nuevo mensaje</item>
+        <item quantity="other">nuevos mensajes de %s</item>
+    </plurals>
+    <string name="notification_message_failed_title">Mensaje no enviado</string>
+    <string name="notification_message_failed_text">El mensaje a %s no se pudo enviar</string>
+    <string-array name="night_modes">
+        <item>Sistema</item>
+        <item>Desactivado</item>
+        <item>Siempre activado</item>
+        <item>Automático</item>
+    </string-array>
+    <string-array name="notification_preview_options">
+        <item>Mostrar nombre y el mensaje</item>
+        <item>Mostrar nombre</item>
+        <item>Ocultar contenido</item>
+    </string-array>
+    <string-array name="text_sizes">
+        <item>Pequeño</item>
+        <item>Normal</item>
+        <item>Grande</item>
+        <item>Más grande</item>
+    </string-array>
+    <string-array name="delayed_sending_labels">
+        <item>Sin demora</item>
+        <item>3 segundos</item>
+        <item>5 segundos</item>
+        <item>10 segundos</item>
+    </string-array>
+    <string-array name="mms_sizes">
+        <item>Automático</item>
+        <item>100KB</item>
+        <item>200KB</item>
+        <item>300KB</item>
+        <item>600KB</item>
+        <item>1000KB</item>
+        <item>2000KB</item>
+        <item>Sin compresión</item>
+    </string-array>
+    <string-array name="qk_responses">
+        <item>Ok</item>
+        <item>Dame un momento</item>
+        <item>Estoy en camino</item>
+        <item>Gracias</item>
+        <item>Suena bien</item>
+        <item>¿Qué hay de nuevo?</item>
+        <item>De acuerdo</item>
+        <item>No</item>
+        <item>Te quiero</item>
+        <item>Lo siento</item>
+        <item>JAJAJA</item>
+        <item>Está bien</item>
+    </string-array>
+</resources>
diff --git a/presentation/src/main/res/values-fa/strings.xml b/presentation/src/main/res/values-fa/strings.xml
index ab04c012a..930af56fb 100644
--- a/presentation/src/main/res/values-fa/strings.xml
+++ b/presentation/src/main/res/values-fa/strings.xml
@@ -1,411 +1,411 @@
-<?xml version="1.0" encoding="utf-8"?>
-<!--
-  ~ Copyright (C) 2019 Moez Bhatti <moez.bhatti@gmail.com>
-  ~
-  ~ This file is part of QKSMS.
-  ~
-  ~ QKSMS is free software: you can redistribute it and/or modify
-  ~ it under the terms of the GNU General Public License as published by
-  ~ the Free Software Foundation, either version 3 of the License, or
-  ~ (at your option) any later version.
-  ~
-  ~ QKSMS is distributed in the hope that it will be useful,
-  ~ but WITHOUT ANY WARRANTY; without even the implied warranty of
-  ~ MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
-  ~ GNU General Public License for more details.
-  ~
-  ~ You should have received a copy of the GNU General Public License
-  ~ along with QKSMS.  If not, see <http://www.gnu.org/licenses/>.
-  -->
-<resources>
-    <string name="shortcut_compose_long_label">گفتگوی جدید</string>
-    <string name="shortcut_compose_short_label">نوشتن</string>
-    <string name="shortcut_compose_disabled_message">میانبر غیرفعال شد</string>
-    <string name="title_archived">بایگانی شد</string>
-    <string name="title_settings">تنظیمات</string>
-    <string name="title_notification_prefs">اعلان‌ها</string>
-    <string name="title_theme">پوسته</string>
-    <string name="title_conversations">جستجو در صندوق ورودی&#8230;</string>
-    <string name="title_compose">یک نام یا شماره را وارد کنید</string>
-    <string name="setup_skip">رد شدن</string>
-    <string name="setup_next">ادامه</string>
-    <string name="menu_add_person">افزودن شخص</string>
-    <string name="menu_call">تماس</string>
-    <string name="menu_info">جزئیات</string>
-    <string name="menu_save">ذخیره در گالری</string>
-    <string name="menu_share">هم‌رسانی</string>
-    <string name="main_drawer_open_cd">بازکردن کشو ناوبری</string>
-    <string name="main_title_selected">%d انتخاب شده</string>
-    <string name="main_menu_clear">پاکسازی</string>
-    <string name="main_menu_archive">بایگانی</string>
-    <string name="main_menu_unarchive">بیرون آوردن از بایگانی</string>
-    <string name="main_menu_delete">حذف</string>
-    <string name="main_menu_add_contact">افزودن به مخاطبین</string>
-    <string name="main_menu_pin">سنجاق به بالای صفحه</string>
-    <string name="main_menu_unpin">رها کردن</string>
-    <string name="main_menu_read">نشان به‌عنوان خوانده شده</string>
-    <string name="main_menu_unread">نشان به‌عنوان خوانده نشده</string>
-    <string name="main_menu_block">مسدود کردن</string>
-    <string name="main_syncing">در حال همگام‌سازی پیام‌ها&#8230;</string>
-    <string name="main_sender_you">شما: %s</string>
-    <string name="main_draft">پیش‌نویس</string>
-    <string name="main_message_results_title">نتایج در پیام‌ها</string>
-    <string name="main_message_results">%d پیام</string>
-    <string name="inbox_empty_text">گفتگوهایتان اینجا نمایش داده می‌شود</string>
-    <string name="inbox_search_empty_text">بدون نتیجه</string>
-    <string name="archived_empty_text">بایگانی‌هایتان اینجا نمایش داده می‌شود</string>
-    <string name="main_fab_cd">شروع گفتگوی جدید</string>
-    <string name="main_default_sms_title">دوباره عاشق پیامک‌ شوید</string>
-    <string name="main_default_sms_message">QKSMS را به‌عنوان برنامه پیش‌فرض پیامک انتخاب کنید</string>
-    <string name="main_default_sms_change">تغییر</string>
-    <string name="main_permission_required">نیاز به اجازه</string>
-    <string name="main_permission_sms">QKSMS برای ارسال و مشاهده پیام‌ها نیاز به اجازه دارد</string>
-    <string name="main_permission_contacts">QKSMS نیاز به اجازه برای مشاهده مخاطبین شما دارد</string>
-    <string name="main_permission_allow">اجازه</string>
-    <string name="drawer_inbox">صندوق ورودی</string>
-    <string name="drawer_archived">بایگانی شده</string>
-    <string name="drawer_scheduled">زمان‌بندی شده</string>
-    <string name="drawer_blocking">مسدود</string>
-    <string name="drawer_more">بيشتر</string>
-    <string name="drawer_settings">تنظیمات</string>
-    <string name="drawer_help">راهنما &amp; بازخورد</string>
-    <string name="drawer_invite">دعوت دوستان</string>
-    <string name="drawer_plus_banner_summary">ویژگی های جدید شگفت انگیز را باز کرده و از توسعه نرم‌افزار پشتیبانی کنید</string>
-    <string name="rate_title">از QKsms لذت می برید؟</string>
-    <string name="rate_summary">علاقه ی خود رابا امتیاز دادن به ما در گوگل پلی به اشتراک بگذارید</string>
-    <string name="rate_okay">باشه!</string>
-    <string name="rate_dismiss">رد شدن</string>
-    <string name="dialog_delete_title">حذف</string>
-    <plurals name="dialog_delete_message">
-        <item quantity="one">آیا مطمئن هستید که می خواهید این گفتگو را حذف کنید؟</item>
-        <item quantity="other">آیا مطمئن هستید که می خواهید این %d گفتگو را حذف کنید؟</item>
-    </plurals>
-    <string-array name="message_options">
-        <item>کپی متن</item>
-        <item>هدایت</item>
-        <item>حذف</item>
-    </string-array>
-    <string name="compose_number_picker_title">یک شماره تلفن انتخاب کنید</string>
-    <string name="compose_number_picker_default">%s ∙ پیش‌فرض</string>
-    <string name="compose_number_picker_once">فقط یک بار</string>
-    <string name="compose_number_picker_always">همیشه</string>
-    <string name="compose_title_selected">%d انتخاب شده</string>
-    <string name="compose_subtitle_results">نتایج %1$d از %2$d</string>
-    <string name="compose_send_group_title">ارسال به‌صورت پیام گروهی</string>
-    <string name="compose_send_group_summary">گیرندگان و پاسخ‌ها برای همه قابل مشاهده خواهد بود</string>
-    <string name="compose_messages_empty">این آغاز گفتگوی شماست. یه چیز خوب بگو!</string>
-    <string name="compose_vcard_label">کارت تماس</string>
-    <string name="compose_scheduled_for">برنامه‌ریزی شده برای</string>
-    <string name="compose_scheduled_future">زمان انتخابی باید در آینده باشد!</string>
-    <string name="compose_scheduled_plus">برای استفاده از پیام‌های برنامه‌ریزی شده ، باید QKSMS+ را باز کنید</string>
-    <string name="compose_scheduled_toast">به پیام‌های برنامه‌ریزی شده افزوده شد</string>
-    <string name="compose_hint">نوشتن پیام&#8230;</string>
-    <string name="compose_menu_copy">کپی‌کردن متن</string>
-    <string name="compose_menu_forward">هدایت</string>
-    <string name="compose_menu_delete">حذف</string>
-    <string name="compose_menu_previous">قبلی</string>
-    <string name="compose_menu_next">بعدی</string>
-    <string name="compose_menu_clear">پاک‌سازی</string>
-    <string name="compose_details_title">جزئیات پیام</string>
-    <string name="compose_details_type">نوع: %s</string>
-    <string name="compose_details_from">از: %s</string>
-    <string name="compose_details_to">به: %s</string>
-    <string name="compose_details_subject">موضوع: %s</string>
-    <string name="compose_details_priority">اولویت: %s</string>
-    <string name="compose_details_size">اندازه: %s</string>
-    <string name="compose_details_sent">فرستاده‌شده: %s</string>
-    <string name="compose_details_received">دریافت شده: %s</string>
-    <string name="compose_details_delivered">تحویل داده شده: %s</string>
-    <string name="compose_details_error_code">کد خطا: %d</string>
-    <string name="compose_attach_cd">افزودن پیوست</string>
-    <string name="compose_gallery_cd">پیوست یک عکس</string>
-    <string name="compose_camera_cd">گرفتن عکس</string>
-    <string name="compose_schedule_cd">زمان‌بندی پیام</string>
-    <string name="compose_contact_cd">یک مخاطب پیوست کنید</string>
-    <string name="compose_contact_error">خطا در خواندن مخاطب</string>
-    <!-- Example: SIM 1 (Verizon) selected-->
-    <string name="compose_sim_changed_toast">سیم‌کارت %1$d (%2$s) انتخاب شد</string>
-    <string name="compose_sim_cd">%s انتخاب شد، سیم‌کارت را عوض کنید</string>
-    <string name="compose_send_cd">فرستادن پیام</string>
-    <string name="message_status_sending">در حال فرستادن&#8230;</string>
-    <string name="message_status_delivered">رسیده %s</string>
-    <string name="message_status_failed">ارسال ناموفق بود. برای تلاش دوباره ضربه بزنید</string>
-    <string name="info_title">جزئیات</string>
-    <string name="info_copied_address">نشانی کپی شد</string>
-    <string name="info_name">عنوان گفتگو</string>
-    <string name="info_notifications">اعلان‌ها</string>
-    <string name="info_theme">پوسته</string>
-    <string name="info_archive">بایگانی کن</string>
-    <string name="info_unarchive">بیرون آوردن از بایگانی</string>
-    <string name="info_block">مسدود کردن</string>
-    <string name="info_unblock">رفع مسدودیت</string>
-    <string name="info_delete">حذف گفتگو</string>
-    <string name="gallery_error">نمی‌توان رسانه را بارگذاری کرد</string>
-    <string name="gallery_toast_saved">در گالری ذخیره شد</string>
-    <string name="backup_title">پشتیبان‌گیری و بازیابی</string>
-    <string name="backup_backing_up">پشتیبان‌گیری از پیام‌ها</string>
-    <string name="backup_restoring">بازگرداندن پشتیبان</string>
-    <string name="backup_last">اخرین پشیبان گیری</string>
-    <string name="backup_loading">در حال بارگذاری&#8230;</string>
-    <string name="backup_never">هرگز</string>
-    <string name="backup_restore_title">بازگردانی</string>
-    <string name="backup_restore_summary">یک پشتیبان را برگزینید</string>
-    <string name="backup_restore_error_plus">لطفاً QKSMS + را باز کنید تا از امکانات پشتیبان و بازیابی بهره ببرید</string>
-    <string name="backup_restore_error_backup">پشتیبان‌گیری در حال انجام است&#8230;</string>
-    <string name="backup_restore_error_restore">بازگردانی در حال انجام است&#8230;</string>
-    <string name="backup_restore_confirm_title">بازگردانی از نسخه پشتیبان</string>
-    <string name="backup_restore_confirm_message">آیا مطمئن هسیتد که می‌خواهید پیام‌هایتان را از این پشتيبان بازگردانی کنید؟</string>
-    <string name="backup_restore_stop_title">بازگردانی را متوقف کن</string>
-    <string name="backup_restore_stop_message">پیام‌هایی که قبلا بازگردانی شده‌اند در دستگاه شما باقی خواهند ماند</string>
-    <string name="backup_restore_dialog_title">پشتیبان‌ها</string>
-    <string name="backup_restore_dialog_empty">نسخه پشتیبانی یافت نشد</string>
-    <plurals name="backup_message_count">
-        <item quantity="one">%d پیام</item>
-        <item quantity="other">%d پیام</item>
-    </plurals>
-    <string name="backup_disclaimer">در حال حاضر ، فقط پشتیبان‌گیری و بازگردانی پیامک پشتیبانی می شود. پشتیبان‌گیری و برنامه‌ریزی برای پشتیبان‌گیری از MMS به زودی ارائه می شود!</string>
-    <string name="backup_now">اکنون پشتیبان‌گیری کن</string>
-    <string name="backup_progress_parsing">در حال تجزیه پشتیبان&#8230;</string>
-    <string name="backup_progress_running">%d/%d پیام</string>
-    <string name="backup_progress_saving">در حال ذخیره پشتیبان&#8230;</string>
-    <string name="backup_progress_syncing">در حال همگام‌سازی پیام‌ها&#8230;</string>
-    <string name="backup_progress_finished">تمام شد!</string>
-    <string name="backup_notification_channel_name">پشتیبان‌گیری و بازگردانی</string>
-    <string name="scheduled_title">برنامه‌ریزی شده</string>
-    <string name="scheduled_empty_description">در همان لحظه ای که می خواهید پیام را به‌صورت خودکار ارسال کنید</string>
-    <string name="scheduled_empty_message_1">سلام! راستی تولدت کی بود؟</string>
-    <string name="scheduled_empty_message_2">روز ۲۳ دسامبر</string>
-    <string name="scheduled_empty_message_3">تولدت مبارک! ببین چه دوست خوبیم، به یاد تولدتم</string>
-    <!--&#x200A; is a special character required at the end of this string to fix it's formatting in the app -->
-    <string name="scheduled_empty_message_3_timestamp">ارسال در ۲۳ دسامبر</string>
-    <string name="scheduled_compose_cd">یک پیام را برنامه‌ریزی کنید</string>
-    <string name="scheduled_options_title">پیام برنامه‌ریزی شده</string>
-    <string-array name="scheduled_options">
-        <item>هم‌اکنون ارسال کن</item>
-        <item>کپی متن</item>
-        <item>حذف</item>
-    </string-array>
-    <string name="settings_category_appearance">ظاهر</string>
-    <string name="settings_category_general">عمومی</string>
-    <string name="settings_category_qkreply">پاسخ سریع</string>
-    <string name="settings_theme_title">پوسته</string>
-    <string name="settings_night_title">حالت شب</string>
-    <string name="settings_black_title">حالت شب کامل</string>
-    <string name="settings_night_start_title">زمان آغاز</string>
-    <string name="settings_night_end_title">زمان پایان</string>
-    <string name="settings_automatic_colors_title">رنگ مخاطب خودکار</string>
-    <string name="settings_text_size_title">اندازه قلم</string>
-    <string name="settings_system_font_title">از فونت سیستم استفاده کن</string>
-    <string name="settings_auto_emoji_title">شکلک خودکار</string>
-    <string name="settings_notifications_title">اعلان‌ها</string>
-    <string name="settings_notifications_o_summary">لمس برای شخصی سازی</string>
-    <string name="settings_notification_actions_title">اقدامات</string>
-    <string name="settings_notification_action_1">دکمه ۱</string>
-    <string name="settings_notification_action_2">دکمه ۲</string>
-    <string name="settings_notification_action_3">دکمه ۳</string>
-    <string name="settings_notification_previews_title">پیش نمایش اعلان</string>
-    <string name="settings_notification_wake_title">صفحه بیدار</string>
-    <string name="settings_vibration_title">لرزش</string>
-    <string name="settings_ringtone_title">صدا</string>
-    <string name="settings_ringtone_none">هیچی</string>
-    <string name="settings_qkreply_title">پاسخ سریع</string>
-    <string name="settings_qkreply_summary">پنجره پیام های جدید</string>
-    <string name="settings_qkreply_tap_dismiss_title">برای رد کردن ضربه بزنید</string>
-    <string name="settings_qkreply_tap_dismiss_summary">برای بستن آن ، به بیرون پنجره ضربه بزنید</string>
-    <string name="settings_delayed_title">ارسال با درنگ</string>
-    <string name="settings_swipe_actions">اقدامات کشیدن</string>
-    <string name="settings_swipe_actions_summary">تنظیم کشیدن برای گفتگو</string>
-    <string name="settings_swipe_actions_right">به راست بکشید</string>
-    <string name="settings_swipe_actions_left">به چپ بکشید</string>
-    <string name="settings_swipe_actions_change">تغییر</string>
-    <string-array name="settings_swipe_actions">
-        <item>هیچی</item>
-        <item>بایگانی</item>
-        <item>پاک کردن</item>
-        <item>مسدود کردن</item>
-        <item>تماس</item>
-        <item>نشان به‌عنوان خوانده شده</item>
-        <item>نشان به‌عنوان خوانده نشده</item>
-    </string-array>
-    <string name="settings_delivery_title">تأیید تحویل</string>
-    <string name="settings_delivery_summary">تأیید کن که پیام‌ها با موفقیت ارسال شدند</string>
-    <string name="settings_signature_title">امضا</string>
-    <string name="settings_signature_summary">به انتهای پیام های خود یک امضا اضافه کنید</string>
-    <string name="settings_unicode_title">حذف لهجه‌ها</string>
-    <string name="settings_unicode_summary">حذف کاراکترهای اضافه پیام ارسالی</string>
-    <string name="settings_mobile_title">فقط شماره های تلفن</string>
-    <string name="settings_mobile_summary">وقتی در حال ارسال پیام هستید فقط می توانید شماره تلفن را ببنید</string>
-    <string name="settings_auto_delete">Delete old messages automatically</string>
-    <string name="settings_auto_delete_dialog_message">Messages will be deleted after the specified number of days</string>
-    <string name="settings_auto_delete_dialog_hint">Number of days</string>
-    <string name="settings_auto_delete_never">Never</string>
-    <string name="settings_auto_delete_warning">Delete old messages automatically?</string>
-    <string name="settings_auto_delete_warning_message">If you proceed, %1$d messages will be deleted now</string>
-    <plurals name="settings_auto_delete_summary">
-        <item quantity="one">After 1 day</item>
-        <item quantity="other">After %d days</item>
-    </plurals>
-    <string name="settings_long_as_mms_title">پیام های طولانی را به عنوان MMS ارسال کن</string>
-    <string name="settings_long_as_mms_summary">اگر پیام های متنی طولانی شما نتوانسته اند ارسال شوند یا به ترتیب اشتباه ارسال شوند ، می توانید به جای آنها پیام های MMS ارسال کنید. هزینه های اضافی ممکن است اعمال شود</string>
-    <string name="settings_mms_size_title">فشرده سازی خودکار پیوست ها</string>
-    <string name="settings_sync_title">همگام‌سازی پیام‌ها</string>
-    <string name="settings_sync_summary">همگام‌سازی مجدد پیام‌ها با پایگاه‌داده بومی پیامک اندروید</string>
-    <string name="settings_about_title">درباره QKSMS</string>
-    <string name="settings_version">نگارش %s</string>
-    <string name="settings_logging_enabled">گزارش‌گیری اشکال‌زدایی فعال است</string>
-    <string name="settings_logging_disabled">گزارش‌گیری اشکال‌زدایی غیرفعال است</string>
-    <string name="settings_delay_duration_hint">مدت زمان را وارد کنید (ثانیه)</string>
-    <string name="blocking_title">انسداد</string>
-    <string name="blocking_drop_title">پیام‌ها را دور بینداز</string>
-    <string name="blocking_drop_summary">پیام های ورودی را از فرستنده های مسدود شده به جای مخفی کردن آنها دور بیندازید</string>
-    <string name="blocking_conversations">گفتگوهای مسدود شده</string>
-    <string name="blocking_manager_title">مدیریت انسداد</string>
-    <string name="blocking_manager_qksms_title">QKSMS</string>
-    <string name="blocking_manager_qksms_summary">عملکرد مسدود کننده داخلی در QKSMS</string>
-    <string name="blocking_manager_call_control_summary">تماس ها و پیام های خود را بطور خودکار فیلتر کنید! IQ Community به شما اجازه می دهد تا از پیام های ناخواسته توسط اسپمرهای شناخته شده در جامعه جلوگیری کنید</string>
-    <string name="blocking_manager_sia_summary">با استفاده از برنامه «آیا باید جواب بدم»، پیام‌ها را از شماره های ناخواسته به طور خودکار فیلتر کنید</string>
-    <string name="blocking_manager_copy_title">کپی شماره های مسدود شده</string>
-    <string name="blocking_manager_copy_summary">به %s ادامه دهید و از شماره های مسدود شده موجود خود کپی کنید</string>
-    <string name="blocked_numbers_title">شماره‌های مسدود شده</string>
-    <string name="blocked_numbers_empty">شماره های مسدود شده شما در اینجا ظاهر می شوند</string>
-    <string name="blocked_numbers_add_cd">انسداد شماره جدید</string>
-    <string name="blocked_numbers_dialog_title">انسداد پیام از طرف</string>
-    <string name="blocked_numbers_dialog_hint">شماره تلفن</string>
-    <string name="blocked_numbers_dialog_block">مسدود کردن</string>
-    <string name="blocked_messages_title">پیام‌های مسدود شده</string>
-    <string name="blocked_messages_empty">پیامهای مسدود شده شما در اینجا ظاهر می شوند</string>
-    <string name="blocking_block_title">مسدود کردن</string>
-    <string name="blocking_unblock_title">رفع مسدوديت</string>
-    <plurals name="blocking_block_external">
-        <item quantity="one">به %s ادامه دهید و این شماره را مسدود کن</item>
-        <item quantity="other">به %s ادامه دهید و این شماره‌ها را مسدود کن</item>
-    </plurals>
-    <plurals name="blocking_unblock_external">
-        <item quantity="one">به %s ادامه دهید و به این شماره اجازه بده</item>
-        <item quantity="other">به %s ادامه دهید و به این شماره‌ها اجازه بده</item>
-    </plurals>
-    <string name="about_title">درباره</string>
-    <string name="about_version_title">نگارش</string>
-    <string name="about_developer_title">توسعه دهنده</string>
-    <string name="about_source_title">کد منبع</string>
-    <string name="about_changelog_title">گزارش دگرگونی‌</string>
-    <string name="about_contact_title">مخاطب</string>
-    <string name="about_license_title">مجوز</string>
-    <string name="about_copyright_title">حق نشر</string>
-    <string name="qksms_plus_description_title">حمایت از تولید کننده،بازشدن همه چیز</string>
-    <string name="qksms_plus_description_summary">شما میتوانید با %s از ما حمایت کنید</string>
-    <!-- Substitutions are for price and currency. Ex: Lifetime upgrade for $1.99 USD -->
-    <string name="qksms_plus_upgrade">ارتقا مادام العمر به‌ازای %1$s %2$s</string>
-    <!-- Substitutions are for price and currency. Ex: Unlock + donate for $4.99 USD -->
-    <string name="qksms_plus_upgrade_donate">نسخه پیشرفته و حمایت به‌ازای %1$s %2$s</string>
-    <string name="qksms_plus_thanks_title">سپاس از شما برای حمایت از QKSMS! </string>
-    <string name="qksms_plus_thanks_summary">حال شما به همه امکانات QKSMS+ دسترسی دارید</string>
-    <string name="qksms_plus_free_title">QKSMS+ برای کاربران F-Droid رایگان است! اگر می‌خواهید از توسعه حمایت کنید، از کمک مالی بسیار قدردانی می‌شود. </string>
-    <string name="qksms_plus_donate">از طریق PayPal کمک مالی کنید</string>
-    <string name="qksms_plus_coming_soon">به زودی</string>
-    <string name="qksms_plus_themes_title">پوسته‌های ویژه</string>
-    <string name="qksms_plus_themes_summary">در حالت متریال دیزاین رنگبندی پوسته امکانپذیر نیست</string>
-    <string name="qksms_plus_emoji_title">شکلک خودکار سفارشی</string>
-    <string name="qksms_plus_emoji_summary">ساخت میانبرهای سفارشی برای شکلک خودکار</string>
-    <string name="qksms_plus_backup_title">پشتیبان‌گیری پیام‌ها</string>
-    <string name="qksms_plus_backup_summary">از پیام‌هایتان به‌طور خودکار پشتیبان بگیرید. دیگر نگران از دست دادن پیام ها نباشید وقتی تلفن همراهتان را عوض می‌کنید یا از دست می‌دهید</string>
-    <string name="qksms_plus_scheduled_title">پیام های برنامه ریزی شده</string>
-    <string name="qksms_plus_scheduled_summary">پیام‌ها را برنامه‌ریزی کنید تا در یک زمان و تاریخ خاص به طور خودکار ارسال شوند</string>
-    <string name="qksms_plus_delayed_title">ارسال با درنگ</string>
-    <string name="qksms_plus_delayed_summary">قبل از ارسال پیامتان چند ثانیه صبر کنید</string>
-    <string name="qksms_plus_night_title">حالت شب خودکار</string>
-    <string name="qksms_plus_night_summary">فعال کردن حالت شب براساس زمان روز</string>
-    <string name="qksms_plus_blacklist_title">مسدود کردن پیشرفته</string>
-    <string name="qksms_plus_blacklist_summary">پیام‌های دارای کلیدواژه‌ها یا مطابق با الگوها را مسدود کن</string>
-    <string name="qksms_plus_forward_title">هدایت خودکار</string>
-    <string name="qksms_plus_forward_summary">هدایت کردن پیام از فرستندگان خاص</string>
-    <string name="qksms_plus_respond_title">پاسخ خودکار</string>
-    <string name="qksms_plus_respond_summary">پاسخ خودکار به پیام‌های دریافتی با پاسخ از پیش تعیین شده</string>
-    <string name="qksms_plus_more_title">بیشتر</string>
-    <string name="qksms_plus_more_summary">QKSMS در حال توسعه فعال است، و خرید شما شامل تمام ویژگی های آینده QKSMS + نیز هست !</string>
-    <string name="widget_loading">درحال بارگذاری&#8230;</string>
-    <string name="widget_more">مشاهده گفتگوهای بیشتر</string>
-    <string name="qkreply_menu_read">نشان به‌عنوان خوانده شده</string>
-    <string name="qkreply_menu_call">تماس</string>
-    <string name="qkreply_menu_delete">پاک کردن</string>
-    <string name="qkreply_menu_expand">بیشتر نمایش بده</string>
-    <string name="qkreply_menu_collapse">کمتر نمایش بده</string>
-    <string name="qkreply_menu_view">بازکردن گفتگو</string>
-    <string name="theme_material">متریال</string>
-    <string name="theme_hex">هگز</string>
-    <string name="theme_apply">اعمال کردن</string>
-    <string-array name="notification_actions">
-        <item>هیچ</item>
-        <item>بایگانی کن</item>
-        <item>حذف</item>
-        <item>مسدود کردن</item>
-        <item>تماس</item>
-        <item>نشان به‌عنوان خوانده شده</item>
-        <item>پاسخ</item>
-    </string-array>
-    <string name="button_yes">بله</string>
-    <string name="button_continue">ادامه</string>
-    <string name="button_cancel">لغو</string>
-    <string name="button_delete">حذف</string>
-    <string name="button_save">ذخیره</string>
-    <string name="button_stop">توقف</string>
-    <string name="button_more">بيشتر</string>
-    <string name="button_set">تنظیم</string>
-    <string name="button_undo">برگرده</string>
-    <string name="toast_copied">کپی شد</string>
-    <string name="toast_archived">گفتگوی بایگانی شده</string>
-    <string name="toast_qksms_plus">باید نسخه پیشرفته را فعال کنید</string>
-    <plurals name="notification_new_messages">
-        <item quantity="one">پیام جدید</item>
-        <item quantity="other">پیام جدید</item>
-    </plurals>
-    <string name="notification_message_failed_title">پیام ارسال نشد</string>
-    <string name="notification_message_failed_text">پیام به %s فرستاده نشد</string>
-    <string-array name="night_modes">
-        <item>سامانه</item>
-        <item>غیرفعال</item>
-        <item>همیشه روشن</item>
-        <item>خودکار</item>
-    </string-array>
-    <string-array name="notification_preview_options">
-        <item>نمایش نام و پیام</item>
-        <item>نمایش نام</item>
-        <item>مخفی کردن محتویات</item>
-    </string-array>
-    <string-array name="text_sizes">
-        <item>کوچک</item>
-        <item>عادی</item>
-        <item>بزرگ</item>
-        <item>بزرگتر</item>
-    </string-array>
-    <string-array name="delayed_sending_labels">
-        <item>بدون درنگ</item>
-        <item>۳ ثانیه</item>
-        <item>۵ ثانیه</item>
-        <item>۱۰ ثانیه</item>
-    </string-array>
-    <string-array name="mms_sizes">
-        <item>خودکار</item>
-        <item>۱۰۰ کیلوبایت</item>
-        <item>۲۰۰ کیلوبایت</item>
-        <item>۳۰۰ کیلوبایت</item>
-        <item>۶۰۰ کیلوبایت</item>
-        <item>۱۰۰۰ کیلوبایت</item>
-        <item>۲۰۰۰ کیلوبایت</item>
-        <item>بدون فشرده‌سازی</item>
-    </string-array>
-    <string-array name="qk_responses">
-        <item>باشه</item>
-        <item>یک لحظه لطفاً</item>
-        <item>تو راهم</item>
-        <item>سپاس</item>
-        <item>به نظر خوبه</item>
-        <item>چه خبر؟</item>
-        <item>موافقم</item>
-        <item>نه</item>
-        <item>دوستت دارم</item>
-        <item>متاسفم</item>
-        <item>خخخخ</item>
-        <item>خوبه</item>
-    </string-array>
-</resources>
+<?xml version="1.0" encoding="utf-8"?>
+<!--
+  ~ Copyright (C) 2019 Moez Bhatti <moez.bhatti@gmail.com>
+  ~
+  ~ This file is part of QKSMS.
+  ~
+  ~ QKSMS is free software: you can redistribute it and/or modify
+  ~ it under the terms of the GNU General Public License as published by
+  ~ the Free Software Foundation, either version 3 of the License, or
+  ~ (at your option) any later version.
+  ~
+  ~ QKSMS is distributed in the hope that it will be useful,
+  ~ but WITHOUT ANY WARRANTY; without even the implied warranty of
+  ~ MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+  ~ GNU General Public License for more details.
+  ~
+  ~ You should have received a copy of the GNU General Public License
+  ~ along with QKSMS.  If not, see <http://www.gnu.org/licenses/>.
+  -->
+<resources>
+    <string name="shortcut_compose_long_label">گفتگوی جدید</string>
+    <string name="shortcut_compose_short_label">نوشتن</string>
+    <string name="shortcut_compose_disabled_message">میانبر غیرفعال شد</string>
+    <string name="title_archived">بایگانی شد</string>
+    <string name="title_settings">تنظیمات</string>
+    <string name="title_notification_prefs">اعلان‌ها</string>
+    <string name="title_theme">پوسته</string>
+    <string name="title_conversations">جستجو در صندوق ورودی&#8230;</string>
+    <string name="title_compose">یک نام یا شماره را وارد کنید</string>
+    <string name="setup_skip">رد شدن</string>
+    <string name="setup_next">ادامه</string>
+    <string name="menu_add_person">افزودن شخص</string>
+    <string name="menu_call">تماس</string>
+    <string name="menu_info">جزئیات</string>
+    <string name="menu_save">ذخیره در گالری</string>
+    <string name="menu_share">هم‌رسانی</string>
+    <string name="main_drawer_open_cd">بازکردن کشو ناوبری</string>
+    <string name="main_title_selected">%d انتخاب شده</string>
+    <string name="main_menu_clear">پاکسازی</string>
+    <string name="main_menu_archive">بایگانی</string>
+    <string name="main_menu_unarchive">بیرون آوردن از بایگانی</string>
+    <string name="main_menu_delete">حذف</string>
+    <string name="main_menu_add_contact">افزودن به مخاطبین</string>
+    <string name="main_menu_pin">سنجاق به بالای صفحه</string>
+    <string name="main_menu_unpin">رها کردن</string>
+    <string name="main_menu_read">نشان به‌عنوان خوانده شده</string>
+    <string name="main_menu_unread">نشان به‌عنوان خوانده نشده</string>
+    <string name="main_menu_block">مسدود کردن</string>
+    <string name="main_syncing">در حال همگام‌سازی پیام‌ها&#8230;</string>
+    <string name="main_sender_you">شما: %s</string>
+    <string name="main_draft">پیش‌نویس</string>
+    <string name="main_message_results_title">نتایج در پیام‌ها</string>
+    <string name="main_message_results">%d پیام</string>
+    <string name="inbox_empty_text">گفتگوهایتان اینجا نمایش داده می‌شود</string>
+    <string name="inbox_search_empty_text">بدون نتیجه</string>
+    <string name="archived_empty_text">بایگانی‌هایتان اینجا نمایش داده می‌شود</string>
+    <string name="main_fab_cd">شروع گفتگوی جدید</string>
+    <string name="main_default_sms_title">دوباره عاشق پیامک‌ شوید</string>
+    <string name="main_default_sms_message">QKSMS را به‌عنوان برنامه پیش‌فرض پیامک انتخاب کنید</string>
+    <string name="main_default_sms_change">تغییر</string>
+    <string name="main_permission_required">نیاز به اجازه</string>
+    <string name="main_permission_sms">QKSMS برای ارسال و مشاهده پیام‌ها نیاز به اجازه دارد</string>
+    <string name="main_permission_contacts">QKSMS نیاز به اجازه برای مشاهده مخاطبین شما دارد</string>
+    <string name="main_permission_allow">اجازه</string>
+    <string name="drawer_inbox">صندوق ورودی</string>
+    <string name="drawer_archived">بایگانی شده</string>
+    <string name="drawer_scheduled">زمان‌بندی شده</string>
+    <string name="drawer_blocking">مسدود</string>
+    <string name="drawer_more">بيشتر</string>
+    <string name="drawer_settings">تنظیمات</string>
+    <string name="drawer_help">راهنما &amp; بازخورد</string>
+    <string name="drawer_invite">دعوت دوستان</string>
+    <string name="drawer_plus_banner_summary">ویژگی های جدید شگفت انگیز را باز کرده و از توسعه نرم‌افزار پشتیبانی کنید</string>
+    <string name="rate_title">از QKsms لذت می برید؟</string>
+    <string name="rate_summary">علاقه ی خود رابا امتیاز دادن به ما در گوگل پلی به اشتراک بگذارید</string>
+    <string name="rate_okay">باشه!</string>
+    <string name="rate_dismiss">رد شدن</string>
+    <string name="dialog_delete_title">حذف</string>
+    <plurals name="dialog_delete_message">
+        <item quantity="one">آیا مطمئن هستید که می خواهید این گفتگو را حذف کنید؟</item>
+        <item quantity="other">آیا مطمئن هستید که می خواهید این %d گفتگو را حذف کنید؟</item>
+    </plurals>
+    <string-array name="message_options">
+        <item>کپی متن</item>
+        <item>هدایت</item>
+        <item>حذف</item>
+    </string-array>
+    <string name="compose_number_picker_title">یک شماره تلفن انتخاب کنید</string>
+    <string name="compose_number_picker_default">%s ∙ پیش‌فرض</string>
+    <string name="compose_number_picker_once">فقط یک بار</string>
+    <string name="compose_number_picker_always">همیشه</string>
+    <string name="compose_title_selected">%d انتخاب شده</string>
+    <string name="compose_subtitle_results">نتایج %1$d از %2$d</string>
+    <string name="compose_send_group_title">ارسال به‌صورت پیام گروهی</string>
+    <string name="compose_send_group_summary">گیرندگان و پاسخ‌ها برای همه قابل مشاهده خواهد بود</string>
+    <string name="compose_messages_empty">این آغاز گفتگوی شماست. یه چیز خوب بگو!</string>
+    <string name="compose_vcard_label">کارت تماس</string>
+    <string name="compose_scheduled_for">برنامه‌ریزی شده برای</string>
+    <string name="compose_scheduled_future">زمان انتخابی باید در آینده باشد!</string>
+    <string name="compose_scheduled_plus">برای استفاده از پیام‌های برنامه‌ریزی شده ، باید QKSMS+ را باز کنید</string>
+    <string name="compose_scheduled_toast">به پیام‌های برنامه‌ریزی شده افزوده شد</string>
+    <string name="compose_hint">نوشتن پیام&#8230;</string>
+    <string name="compose_menu_copy">کپی‌کردن متن</string>
+    <string name="compose_menu_forward">هدایت</string>
+    <string name="compose_menu_delete">حذف</string>
+    <string name="compose_menu_previous">قبلی</string>
+    <string name="compose_menu_next">بعدی</string>
+    <string name="compose_menu_clear">پاک‌سازی</string>
+    <string name="compose_details_title">جزئیات پیام</string>
+    <string name="compose_details_type">نوع: %s</string>
+    <string name="compose_details_from">از: %s</string>
+    <string name="compose_details_to">به: %s</string>
+    <string name="compose_details_subject">موضوع: %s</string>
+    <string name="compose_details_priority">اولویت: %s</string>
+    <string name="compose_details_size">اندازه: %s</string>
+    <string name="compose_details_sent">فرستاده‌شده: %s</string>
+    <string name="compose_details_received">دریافت شده: %s</string>
+    <string name="compose_details_delivered">تحویل داده شده: %s</string>
+    <string name="compose_details_error_code">کد خطا: %d</string>
+    <string name="compose_attach_cd">افزودن پیوست</string>
+    <string name="compose_gallery_cd">پیوست یک عکس</string>
+    <string name="compose_camera_cd">گرفتن عکس</string>
+    <string name="compose_schedule_cd">زمان‌بندی پیام</string>
+    <string name="compose_contact_cd">یک مخاطب پیوست کنید</string>
+    <string name="compose_contact_error">خطا در خواندن مخاطب</string>
+    <!-- Example: SIM 1 (Verizon) selected-->
+    <string name="compose_sim_changed_toast">سیم‌کارت %1$d (%2$s) انتخاب شد</string>
+    <string name="compose_sim_cd">%s انتخاب شد، سیم‌کارت را عوض کنید</string>
+    <string name="compose_send_cd">فرستادن پیام</string>
+    <string name="message_status_sending">در حال فرستادن&#8230;</string>
+    <string name="message_status_delivered">رسیده %s</string>
+    <string name="message_status_failed">ارسال ناموفق بود. برای تلاش دوباره ضربه بزنید</string>
+    <string name="info_title">جزئیات</string>
+    <string name="info_copied_address">نشانی کپی شد</string>
+    <string name="info_name">عنوان گفتگو</string>
+    <string name="info_notifications">اعلان‌ها</string>
+    <string name="info_theme">پوسته</string>
+    <string name="info_archive">بایگانی کن</string>
+    <string name="info_unarchive">بیرون آوردن از بایگانی</string>
+    <string name="info_block">مسدود کردن</string>
+    <string name="info_unblock">رفع مسدودیت</string>
+    <string name="info_delete">حذف گفتگو</string>
+    <string name="gallery_error">نمی‌توان رسانه را بارگذاری کرد</string>
+    <string name="gallery_toast_saved">در گالری ذخیره شد</string>
+    <string name="backup_title">پشتیبان‌گیری و بازیابی</string>
+    <string name="backup_backing_up">پشتیبان‌گیری از پیام‌ها</string>
+    <string name="backup_restoring">بازگرداندن پشتیبان</string>
+    <string name="backup_last">اخرین پشیبان گیری</string>
+    <string name="backup_loading">در حال بارگذاری&#8230;</string>
+    <string name="backup_never">هرگز</string>
+    <string name="backup_restore_title">بازگردانی</string>
+    <string name="backup_restore_summary">یک پشتیبان را برگزینید</string>
+    <string name="backup_restore_error_plus">لطفاً QKSMS + را باز کنید تا از امکانات پشتیبان و بازیابی بهره ببرید</string>
+    <string name="backup_restore_error_backup">پشتیبان‌گیری در حال انجام است&#8230;</string>
+    <string name="backup_restore_error_restore">بازگردانی در حال انجام است&#8230;</string>
+    <string name="backup_restore_confirm_title">بازگردانی از نسخه پشتیبان</string>
+    <string name="backup_restore_confirm_message">آیا مطمئن هسیتد که می‌خواهید پیام‌هایتان را از این پشتيبان بازگردانی کنید؟</string>
+    <string name="backup_restore_stop_title">بازگردانی را متوقف کن</string>
+    <string name="backup_restore_stop_message">پیام‌هایی که قبلا بازگردانی شده‌اند در دستگاه شما باقی خواهند ماند</string>
+    <string name="backup_restore_dialog_title">پشتیبان‌ها</string>
+    <string name="backup_restore_dialog_empty">نسخه پشتیبانی یافت نشد</string>
+    <plurals name="backup_message_count">
+        <item quantity="one">%d پیام</item>
+        <item quantity="other">%d پیام</item>
+    </plurals>
+    <string name="backup_disclaimer">در حال حاضر ، فقط پشتیبان‌گیری و بازگردانی پیامک پشتیبانی می شود. پشتیبان‌گیری و برنامه‌ریزی برای پشتیبان‌گیری از MMS به زودی ارائه می شود!</string>
+    <string name="backup_now">اکنون پشتیبان‌گیری کن</string>
+    <string name="backup_progress_parsing">در حال تجزیه پشتیبان&#8230;</string>
+    <string name="backup_progress_running">%d/%d پیام</string>
+    <string name="backup_progress_saving">در حال ذخیره پشتیبان&#8230;</string>
+    <string name="backup_progress_syncing">در حال همگام‌سازی پیام‌ها&#8230;</string>
+    <string name="backup_progress_finished">تمام شد!</string>
+    <string name="backup_notification_channel_name">پشتیبان‌گیری و بازگردانی</string>
+    <string name="scheduled_title">برنامه‌ریزی شده</string>
+    <string name="scheduled_empty_description">در همان لحظه ای که می خواهید پیام را به‌صورت خودکار ارسال کنید</string>
+    <string name="scheduled_empty_message_1">سلام! راستی تولدت کی بود؟</string>
+    <string name="scheduled_empty_message_2">روز ۲۳ دسامبر</string>
+    <string name="scheduled_empty_message_3">تولدت مبارک! ببین چه دوست خوبیم، به یاد تولدتم</string>
+    <!--&#x200A; is a special character required at the end of this string to fix it's formatting in the app -->
+    <string name="scheduled_empty_message_3_timestamp">ارسال در ۲۳ دسامبر</string>
+    <string name="scheduled_compose_cd">یک پیام را برنامه‌ریزی کنید</string>
+    <string name="scheduled_options_title">پیام برنامه‌ریزی شده</string>
+    <string-array name="scheduled_options">
+        <item>هم‌اکنون ارسال کن</item>
+        <item>کپی متن</item>
+        <item>حذف</item>
+    </string-array>
+    <string name="settings_category_appearance">ظاهر</string>
+    <string name="settings_category_general">عمومی</string>
+    <string name="settings_category_qkreply">پاسخ سریع</string>
+    <string name="settings_theme_title">پوسته</string>
+    <string name="settings_night_title">حالت شب</string>
+    <string name="settings_black_title">حالت شب کامل</string>
+    <string name="settings_night_start_title">زمان آغاز</string>
+    <string name="settings_night_end_title">زمان پایان</string>
+    <string name="settings_automatic_colors_title">رنگ مخاطب خودکار</string>
+    <string name="settings_text_size_title">اندازه قلم</string>
+    <string name="settings_system_font_title">از فونت سیستم استفاده کن</string>
+    <string name="settings_auto_emoji_title">شکلک خودکار</string>
+    <string name="settings_notifications_title">اعلان‌ها</string>
+    <string name="settings_notifications_o_summary">لمس برای شخصی سازی</string>
+    <string name="settings_notification_actions_title">اقدامات</string>
+    <string name="settings_notification_action_1">دکمه ۱</string>
+    <string name="settings_notification_action_2">دکمه ۲</string>
+    <string name="settings_notification_action_3">دکمه ۳</string>
+    <string name="settings_notification_previews_title">پیش نمایش اعلان</string>
+    <string name="settings_notification_wake_title">صفحه بیدار</string>
+    <string name="settings_vibration_title">لرزش</string>
+    <string name="settings_ringtone_title">صدا</string>
+    <string name="settings_ringtone_none">هیچی</string>
+    <string name="settings_qkreply_title">پاسخ سریع</string>
+    <string name="settings_qkreply_summary">پنجره پیام های جدید</string>
+    <string name="settings_qkreply_tap_dismiss_title">برای رد کردن ضربه بزنید</string>
+    <string name="settings_qkreply_tap_dismiss_summary">برای بستن آن ، به بیرون پنجره ضربه بزنید</string>
+    <string name="settings_delayed_title">ارسال با درنگ</string>
+    <string name="settings_swipe_actions">اقدامات کشیدن</string>
+    <string name="settings_swipe_actions_summary">تنظیم کشیدن برای گفتگو</string>
+    <string name="settings_swipe_actions_right">به راست بکشید</string>
+    <string name="settings_swipe_actions_left">به چپ بکشید</string>
+    <string name="settings_swipe_actions_change">تغییر</string>
+    <string-array name="settings_swipe_actions">
+        <item>هیچی</item>
+        <item>بایگانی</item>
+        <item>پاک کردن</item>
+        <item>مسدود کردن</item>
+        <item>تماس</item>
+        <item>نشان به‌عنوان خوانده شده</item>
+        <item>نشان به‌عنوان خوانده نشده</item>
+    </string-array>
+    <string name="settings_delivery_title">تأیید تحویل</string>
+    <string name="settings_delivery_summary">تأیید کن که پیام‌ها با موفقیت ارسال شدند</string>
+    <string name="settings_signature_title">امضا</string>
+    <string name="settings_signature_summary">به انتهای پیام های خود یک امضا اضافه کنید</string>
+    <string name="settings_unicode_title">حذف لهجه‌ها</string>
+    <string name="settings_unicode_summary">حذف کاراکترهای اضافه پیام ارسالی</string>
+    <string name="settings_mobile_title">فقط شماره های تلفن</string>
+    <string name="settings_mobile_summary">وقتی در حال ارسال پیام هستید فقط می توانید شماره تلفن را ببنید</string>
+    <string name="settings_auto_delete">Delete old messages automatically</string>
+    <string name="settings_auto_delete_dialog_message">Messages will be deleted after the specified number of days</string>
+    <string name="settings_auto_delete_dialog_hint">Number of days</string>
+    <string name="settings_auto_delete_never">Never</string>
+    <string name="settings_auto_delete_warning">Delete old messages automatically?</string>
+    <string name="settings_auto_delete_warning_message">If you proceed, %1$d messages will be deleted now</string>
+    <plurals name="settings_auto_delete_summary">
+        <item quantity="one">After 1 day</item>
+        <item quantity="other">After %d days</item>
+    </plurals>
+    <string name="settings_long_as_mms_title">پیام های طولانی را به عنوان MMS ارسال کن</string>
+    <string name="settings_long_as_mms_summary">اگر پیام های متنی طولانی شما نتوانسته اند ارسال شوند یا به ترتیب اشتباه ارسال شوند ، می توانید به جای آنها پیام های MMS ارسال کنید. هزینه های اضافی ممکن است اعمال شود</string>
+    <string name="settings_mms_size_title">فشرده سازی خودکار پیوست ها</string>
+    <string name="settings_sync_title">همگام‌سازی پیام‌ها</string>
+    <string name="settings_sync_summary">همگام‌سازی مجدد پیام‌ها با پایگاه‌داده بومی پیامک اندروید</string>
+    <string name="settings_about_title">درباره QKSMS</string>
+    <string name="settings_version">نگارش %s</string>
+    <string name="settings_logging_enabled">گزارش‌گیری اشکال‌زدایی فعال است</string>
+    <string name="settings_logging_disabled">گزارش‌گیری اشکال‌زدایی غیرفعال است</string>
+    <string name="settings_delay_duration_hint">مدت زمان را وارد کنید (ثانیه)</string>
+    <string name="blocking_title">انسداد</string>
+    <string name="blocking_drop_title">پیام‌ها را دور بینداز</string>
+    <string name="blocking_drop_summary">پیام های ورودی را از فرستنده های مسدود شده به جای مخفی کردن آنها دور بیندازید</string>
+    <string name="blocking_conversations">گفتگوهای مسدود شده</string>
+    <string name="blocking_manager_title">مدیریت انسداد</string>
+    <string name="blocking_manager_qksms_title">QKSMS</string>
+    <string name="blocking_manager_qksms_summary">عملکرد مسدود کننده داخلی در QKSMS</string>
+    <string name="blocking_manager_call_control_summary">تماس ها و پیام های خود را بطور خودکار فیلتر کنید! IQ Community به شما اجازه می دهد تا از پیام های ناخواسته توسط اسپمرهای شناخته شده در جامعه جلوگیری کنید</string>
+    <string name="blocking_manager_sia_summary">با استفاده از برنامه «آیا باید جواب بدم»، پیام‌ها را از شماره های ناخواسته به طور خودکار فیلتر کنید</string>
+    <string name="blocking_manager_copy_title">کپی شماره های مسدود شده</string>
+    <string name="blocking_manager_copy_summary">به %s ادامه دهید و از شماره های مسدود شده موجود خود کپی کنید</string>
+    <string name="blocked_numbers_title">شماره‌های مسدود شده</string>
+    <string name="blocked_numbers_empty">شماره های مسدود شده شما در اینجا ظاهر می شوند</string>
+    <string name="blocked_numbers_add_cd">انسداد شماره جدید</string>
+    <string name="blocked_numbers_dialog_title">انسداد پیام از طرف</string>
+    <string name="blocked_numbers_dialog_hint">شماره تلفن</string>
+    <string name="blocked_numbers_dialog_block">مسدود کردن</string>
+    <string name="blocked_messages_title">پیام‌های مسدود شده</string>
+    <string name="blocked_messages_empty">پیامهای مسدود شده شما در اینجا ظاهر می شوند</string>
+    <string name="blocking_block_title">مسدود کردن</string>
+    <string name="blocking_unblock_title">رفع مسدوديت</string>
+    <plurals name="blocking_block_external">
+        <item quantity="one">به %s ادامه دهید و این شماره را مسدود کن</item>
+        <item quantity="other">به %s ادامه دهید و این شماره‌ها را مسدود کن</item>
+    </plurals>
+    <plurals name="blocking_unblock_external">
+        <item quantity="one">به %s ادامه دهید و به این شماره اجازه بده</item>
+        <item quantity="other">به %s ادامه دهید و به این شماره‌ها اجازه بده</item>
+    </plurals>
+    <string name="about_title">درباره</string>
+    <string name="about_version_title">نگارش</string>
+    <string name="about_developer_title">توسعه دهنده</string>
+    <string name="about_source_title">کد منبع</string>
+    <string name="about_changelog_title">گزارش دگرگونی‌</string>
+    <string name="about_contact_title">مخاطب</string>
+    <string name="about_license_title">مجوز</string>
+    <string name="about_copyright_title">حق نشر</string>
+    <string name="qksms_plus_description_title">حمایت از تولید کننده،بازشدن همه چیز</string>
+    <string name="qksms_plus_description_summary">شما میتوانید با %s از ما حمایت کنید</string>
+    <!-- Substitutions are for price and currency. Ex: Lifetime upgrade for $1.99 USD -->
+    <string name="qksms_plus_upgrade">ارتقا مادام العمر به‌ازای %1$s %2$s</string>
+    <!-- Substitutions are for price and currency. Ex: Unlock + donate for $4.99 USD -->
+    <string name="qksms_plus_upgrade_donate">نسخه پیشرفته و حمایت به‌ازای %1$s %2$s</string>
+    <string name="qksms_plus_thanks_title">سپاس از شما برای حمایت از QKSMS! </string>
+    <string name="qksms_plus_thanks_summary">حال شما به همه امکانات QKSMS+ دسترسی دارید</string>
+    <string name="qksms_plus_free_title">QKSMS+ برای کاربران F-Droid رایگان است! اگر می‌خواهید از توسعه حمایت کنید، از کمک مالی بسیار قدردانی می‌شود. </string>
+    <string name="qksms_plus_donate">از طریق PayPal کمک مالی کنید</string>
+    <string name="qksms_plus_coming_soon">به زودی</string>
+    <string name="qksms_plus_themes_title">پوسته‌های ویژه</string>
+    <string name="qksms_plus_themes_summary">در حالت متریال دیزاین رنگبندی پوسته امکانپذیر نیست</string>
+    <string name="qksms_plus_emoji_title">شکلک خودکار سفارشی</string>
+    <string name="qksms_plus_emoji_summary">ساخت میانبرهای سفارشی برای شکلک خودکار</string>
+    <string name="qksms_plus_backup_title">پشتیبان‌گیری پیام‌ها</string>
+    <string name="qksms_plus_backup_summary">از پیام‌هایتان به‌طور خودکار پشتیبان بگیرید. دیگر نگران از دست دادن پیام ها نباشید وقتی تلفن همراهتان را عوض می‌کنید یا از دست می‌دهید</string>
+    <string name="qksms_plus_scheduled_title">پیام های برنامه ریزی شده</string>
+    <string name="qksms_plus_scheduled_summary">پیام‌ها را برنامه‌ریزی کنید تا در یک زمان و تاریخ خاص به طور خودکار ارسال شوند</string>
+    <string name="qksms_plus_delayed_title">ارسال با درنگ</string>
+    <string name="qksms_plus_delayed_summary">قبل از ارسال پیامتان چند ثانیه صبر کنید</string>
+    <string name="qksms_plus_night_title">حالت شب خودکار</string>
+    <string name="qksms_plus_night_summary">فعال کردن حالت شب براساس زمان روز</string>
+    <string name="qksms_plus_blacklist_title">مسدود کردن پیشرفته</string>
+    <string name="qksms_plus_blacklist_summary">پیام‌های دارای کلیدواژه‌ها یا مطابق با الگوها را مسدود کن</string>
+    <string name="qksms_plus_forward_title">هدایت خودکار</string>
+    <string name="qksms_plus_forward_summary">هدایت کردن پیام از فرستندگان خاص</string>
+    <string name="qksms_plus_respond_title">پاسخ خودکار</string>
+    <string name="qksms_plus_respond_summary">پاسخ خودکار به پیام‌های دریافتی با پاسخ از پیش تعیین شده</string>
+    <string name="qksms_plus_more_title">بیشتر</string>
+    <string name="qksms_plus_more_summary">QKSMS در حال توسعه فعال است، و خرید شما شامل تمام ویژگی های آینده QKSMS + نیز هست !</string>
+    <string name="widget_loading">درحال بارگذاری&#8230;</string>
+    <string name="widget_more">مشاهده گفتگوهای بیشتر</string>
+    <string name="qkreply_menu_read">نشان به‌عنوان خوانده شده</string>
+    <string name="qkreply_menu_call">تماس</string>
+    <string name="qkreply_menu_delete">پاک کردن</string>
+    <string name="qkreply_menu_expand">بیشتر نمایش بده</string>
+    <string name="qkreply_menu_collapse">کمتر نمایش بده</string>
+    <string name="qkreply_menu_view">بازکردن گفتگو</string>
+    <string name="theme_material">متریال</string>
+    <string name="theme_hex">هگز</string>
+    <string name="theme_apply">اعمال کردن</string>
+    <string-array name="notification_actions">
+        <item>هیچ</item>
+        <item>بایگانی کن</item>
+        <item>حذف</item>
+        <item>مسدود کردن</item>
+        <item>تماس</item>
+        <item>نشان به‌عنوان خوانده شده</item>
+        <item>پاسخ</item>
+    </string-array>
+    <string name="button_yes">بله</string>
+    <string name="button_continue">ادامه</string>
+    <string name="button_cancel">لغو</string>
+    <string name="button_delete">حذف</string>
+    <string name="button_save">ذخیره</string>
+    <string name="button_stop">توقف</string>
+    <string name="button_more">بيشتر</string>
+    <string name="button_set">تنظیم</string>
+    <string name="button_undo">برگرده</string>
+    <string name="toast_copied">کپی شد</string>
+    <string name="toast_archived">گفتگوی بایگانی شده</string>
+    <string name="toast_qksms_plus">باید نسخه پیشرفته را فعال کنید</string>
+    <plurals name="notification_new_messages">
+        <item quantity="one">پیام جدید</item>
+        <item quantity="other">پیام جدید</item>
+    </plurals>
+    <string name="notification_message_failed_title">پیام ارسال نشد</string>
+    <string name="notification_message_failed_text">پیام به %s فرستاده نشد</string>
+    <string-array name="night_modes">
+        <item>سامانه</item>
+        <item>غیرفعال</item>
+        <item>همیشه روشن</item>
+        <item>خودکار</item>
+    </string-array>
+    <string-array name="notification_preview_options">
+        <item>نمایش نام و پیام</item>
+        <item>نمایش نام</item>
+        <item>مخفی کردن محتویات</item>
+    </string-array>
+    <string-array name="text_sizes">
+        <item>کوچک</item>
+        <item>عادی</item>
+        <item>بزرگ</item>
+        <item>بزرگتر</item>
+    </string-array>
+    <string-array name="delayed_sending_labels">
+        <item>بدون درنگ</item>
+        <item>۳ ثانیه</item>
+        <item>۵ ثانیه</item>
+        <item>۱۰ ثانیه</item>
+    </string-array>
+    <string-array name="mms_sizes">
+        <item>خودکار</item>
+        <item>۱۰۰ کیلوبایت</item>
+        <item>۲۰۰ کیلوبایت</item>
+        <item>۳۰۰ کیلوبایت</item>
+        <item>۶۰۰ کیلوبایت</item>
+        <item>۱۰۰۰ کیلوبایت</item>
+        <item>۲۰۰۰ کیلوبایت</item>
+        <item>بدون فشرده‌سازی</item>
+    </string-array>
+    <string-array name="qk_responses">
+        <item>باشه</item>
+        <item>یک لحظه لطفاً</item>
+        <item>تو راهم</item>
+        <item>سپاس</item>
+        <item>به نظر خوبه</item>
+        <item>چه خبر؟</item>
+        <item>موافقم</item>
+        <item>نه</item>
+        <item>دوستت دارم</item>
+        <item>متاسفم</item>
+        <item>خخخخ</item>
+        <item>خوبه</item>
+    </string-array>
+</resources>
diff --git a/presentation/src/main/res/values-fi/strings.xml b/presentation/src/main/res/values-fi/strings.xml
index f26dd1083..649ab7428 100644
--- a/presentation/src/main/res/values-fi/strings.xml
+++ b/presentation/src/main/res/values-fi/strings.xml
@@ -1,411 +1,411 @@
-<?xml version="1.0" encoding="utf-8"?>
-<!--
-  ~ Copyright (C) 2019 Moez Bhatti <moez.bhatti@gmail.com>
-  ~
-  ~ This file is part of QKSMS.
-  ~
-  ~ QKSMS is free software: you can redistribute it and/or modify
-  ~ it under the terms of the GNU General Public License as published by
-  ~ the Free Software Foundation, either version 3 of the License, or
-  ~ (at your option) any later version.
-  ~
-  ~ QKSMS is distributed in the hope that it will be useful,
-  ~ but WITHOUT ANY WARRANTY; without even the implied warranty of
-  ~ MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
-  ~ GNU General Public License for more details.
-  ~
-  ~ You should have received a copy of the GNU General Public License
-  ~ along with QKSMS.  If not, see <http://www.gnu.org/licenses/>.
-  -->
-<resources>
-    <string name="shortcut_compose_long_label">Uusi keskustelu</string>
-    <string name="shortcut_compose_short_label">Kirjoita</string>
-    <string name="shortcut_compose_disabled_message">Pikakuvake pois käytöstä</string>
-    <string name="title_archived">Arkisto</string>
-    <string name="title_settings">Asetukset</string>
-    <string name="title_notification_prefs">Ilmoitukset</string>
-    <string name="title_theme">Teema</string>
-    <string name="title_conversations">Hae saapuneista&#8230;</string>
-    <string name="title_compose">Kirjoita nimi tai numero</string>
-    <string name="setup_skip">Ohita</string>
-    <string name="setup_next">Jatka</string>
-    <string name="menu_add_person">Lisää henkilö</string>
-    <string name="menu_call">Soita</string>
-    <string name="menu_info">Lisätiedot</string>
-    <string name="menu_save">Tallenna galleriaan</string>
-    <string name="menu_share">Jaa</string>
-    <string name="main_drawer_open_cd">Avaa navigointilaatikko</string>
-    <string name="main_title_selected">%d valittu</string>
-    <string name="main_menu_clear">Tyhjennä</string>
-    <string name="main_menu_archive">Arkistoi</string>
-    <string name="main_menu_unarchive">Poista arkistosta</string>
-    <string name="main_menu_delete">Poista</string>
-    <string name="main_menu_add_contact">Lisää yhteystietoihin</string>
-    <string name="main_menu_pin">Kiinnitä</string>
-    <string name="main_menu_unpin">Irrota</string>
-    <string name="main_menu_read">Merkitse luetuksi</string>
-    <string name="main_menu_unread">Merkitse lukemattomaksi</string>
-    <string name="main_menu_block">Estä</string>
-    <string name="main_syncing">Synkronoidaan viestejä&#8230;</string>
-    <string name="main_sender_you">Sinä: %s</string>
-    <string name="main_draft">Luonnos: %s</string>
-    <string name="main_message_results_title">Tuloksia viesteissä</string>
-    <string name="main_message_results">%d viestiä</string>
-    <string name="inbox_empty_text">Keskustelusi näkyvät tässä</string>
-    <string name="inbox_search_empty_text">Ei tuloksia</string>
-    <string name="archived_empty_text">Arkistoimasi keskustelut näkyvät tässä</string>
-    <string name="main_fab_cd">Aloita uusi keskustelu</string>
-    <string name="main_default_sms_title">Rakastu tekstaamiseen uudelleen</string>
-    <string name="main_default_sms_message">Tee QKSMS:stä oletusviestintäsovelluksesi</string>
-    <string name="main_default_sms_change">Muuta</string>
-    <string name="main_permission_required">Käyttöoikeus tarvitaan</string>
-    <string name="main_permission_sms">QKSMS tarvitsee oikeuden tekstiviestien lähettämiseen ja tarkastelemiseen</string>
-    <string name="main_permission_contacts">QKSMS tarvitsee oikeuden yhteystietojesi tarkatelemiseen</string>
-    <string name="main_permission_allow">Salli</string>
-    <string name="drawer_inbox">Saapuneet</string>
-    <string name="drawer_archived">Arkistoidut</string>
-    <string name="drawer_scheduled">Ajoitetut</string>
-    <string name="drawer_blocking">Estäminen</string>
-    <string name="drawer_more">Lisää</string>
-    <string name="drawer_settings">Asetukset</string>
-    <string name="drawer_help">Apu ja palaute</string>
-    <string name="drawer_invite">Kutsu kavereita</string>
-    <string name="drawer_plus_banner_summary">Avaa mahtavia uusia ominaisuuksia ja tue kehitystä</string>
-    <string name="rate_title">Tykkäätkö QKSMS:tä?</string>
-    <string name="rate_summary">Jaa rakkautta ja arvostele meidät Google Playssä!</string>
-    <string name="rate_okay">OKEI!</string>
-    <string name="rate_dismiss">HYLKÄÄ</string>
-    <string name="dialog_delete_title">Poista</string>
-    <plurals name="dialog_delete_message">
-        <item quantity="one">Oletko varma, että haluat poistaa tämän keskustelun?</item>
-        <item quantity="other">Oletko varma, että haluat poistaa %d keskustelua?</item>
-    </plurals>
-    <string-array name="message_options">
-        <item>Kopioi teksti</item>
-        <item>Edelleenlähetä</item>
-        <item>Poista</item>
-    </string-array>
-    <string name="compose_number_picker_title">Valitse puhelinnumero</string>
-    <string name="compose_number_picker_default">%s ∙ Oletus</string>
-    <string name="compose_number_picker_once">Vain kerran</string>
-    <string name="compose_number_picker_always">Aina</string>
-    <string name="compose_title_selected">%d valittu</string>
-    <string name="compose_subtitle_results">%1$d / %2$d tuloksesta</string>
-    <string name="compose_send_group_title">Lähetä ryhmäviestinä</string>
-    <string name="compose_send_group_summary">Vastaanottajat ja vastaukset näkyvät kaikille</string>
-    <string name="compose_messages_empty">Tämä on keskustelusi alku. Sano jotain mukavaa!</string>
-    <string name="compose_vcard_label">Käyntikortti</string>
-    <string name="compose_scheduled_for">Ajoitettu</string>
-    <string name="compose_scheduled_future">Valitun ajan täytyy olla tulevaisuudessa!</string>
-    <string name="compose_scheduled_plus">Sinun täytyy avata QKSMS+ ajoittaaksesi viestejä</string>
-    <string name="compose_scheduled_toast">Lisätty ajoitettuihin viesteihin</string>
-    <string name="compose_hint">Kirjoita viesti&#8230;</string>
-    <string name="compose_menu_copy">Kopioi teksti</string>
-    <string name="compose_menu_forward">Edelleenlähetä</string>
-    <string name="compose_menu_delete">Poista</string>
-    <string name="compose_menu_previous">Edellinen</string>
-    <string name="compose_menu_next">Seuraava</string>
-    <string name="compose_menu_clear">Tyhjennä</string>
-    <string name="compose_details_title">Viestin tiedot</string>
-    <string name="compose_details_type">Tyyppi: %s</string>
-    <string name="compose_details_from">Lähettäjä: %s</string>
-    <string name="compose_details_to">Vastaanottaja: %s</string>
-    <string name="compose_details_subject">Aihe: %s</string>
-    <string name="compose_details_priority">Tärkeys: %s</string>
-    <string name="compose_details_size">Koko: %s</string>
-    <string name="compose_details_sent">Lähetetty: %s</string>
-    <string name="compose_details_received">Vastaanotettu: %s</string>
-    <string name="compose_details_delivered">Toimitettu: %s</string>
-    <string name="compose_details_error_code">Virhekoodi: %d</string>
-    <string name="compose_attach_cd">Lisää liite</string>
-    <string name="compose_gallery_cd">Liitä kuva</string>
-    <string name="compose_camera_cd">Ota kuva</string>
-    <string name="compose_schedule_cd">Ajoita viesti</string>
-    <string name="compose_contact_cd">Liitä yhteystieto</string>
-    <string name="compose_contact_error">Yhteystiedon lukuvirhe</string>
-    <!-- Example: SIM 1 (Verizon) selected-->
-    <string name="compose_sim_changed_toast">SIM %1$d (%2$s) valittu</string>
-    <string name="compose_sim_cd">%s valittu, vaihda SIM-korttia</string>
-    <string name="compose_send_cd">Lähetä viesti</string>
-    <string name="message_status_sending">Lähetetään&#8230;</string>
-    <string name="message_status_delivered">Toimitettu: %s</string>
-    <string name="message_status_failed">Lähettäminen epäonnistui. Yritä uudelleen napauttamalla</string>
-    <string name="info_title">Lisätiedot</string>
-    <string name="info_copied_address">Osoite kopioitu</string>
-    <string name="info_name">Keskustelun otsikko</string>
-    <string name="info_notifications">Ilmoitukset</string>
-    <string name="info_theme">Teema</string>
-    <string name="info_archive">Arkistoi</string>
-    <string name="info_unarchive">Poista arkistosta</string>
-    <string name="info_block">Estä</string>
-    <string name="info_unblock">Salli</string>
-    <string name="info_delete">Poista keskustelu</string>
-    <string name="gallery_error">Mediaa ei voitu ladata</string>
-    <string name="gallery_toast_saved">Tallennettu galleriaan</string>
-    <string name="backup_title">Varmuuskopioi ja palauta</string>
-    <string name="backup_backing_up">Viestejä varmuuskopioidaan</string>
-    <string name="backup_restoring">Viestejä palautetaan</string>
-    <string name="backup_last">Viimeisin varmuuskopio</string>
-    <string name="backup_loading">Ladataan&#8230;</string>
-    <string name="backup_never">Ei koskaan</string>
-    <string name="backup_restore_title">Palauta</string>
-    <string name="backup_restore_summary">Valitse varmuuskopio</string>
-    <string name="backup_restore_error_plus">Ole hyvä ja avaa QKSMS+ käyttääksesi varmuuskopiointia ja palautusta</string>
-    <string name="backup_restore_error_backup">Varmuuskopiointi käynnissä&#8230;</string>
-    <string name="backup_restore_error_restore">Palautus käynnissä&#8230;</string>
-    <string name="backup_restore_confirm_title">Palauta varmuuskopiosta</string>
-    <string name="backup_restore_confirm_message">Oletko varma, että haluat palauttaa viestisi tästä varmuuskopiosta?</string>
-    <string name="backup_restore_stop_title">Pysäytä palautus</string>
-    <string name="backup_restore_stop_message">Aiemmin palautetut viestit pysyvät laitteellasi</string>
-    <string name="backup_restore_dialog_title">Varmuuskopiot</string>
-    <string name="backup_restore_dialog_empty">Varmuuskopioita ei löytynyt</string>
-    <plurals name="backup_message_count">
-        <item quantity="one">%d viesti</item>
-        <item quantity="other">%d viestiä</item>
-    </plurals>
-    <string name="backup_disclaimer">Vain tekstiviestejä voidaan varmuuskopioita ja palauttaa tällä hetkellä. Tuki multimediaviesteille ja varmuuskopiointien ajastus tulevat pian!</string>
-    <string name="backup_now">Varmuuskopioi nyt</string>
-    <string name="backup_progress_parsing">Varmuuskopiota jäsennetään&#8230;</string>
-    <string name="backup_progress_running">%d/%d viestiä</string>
-    <string name="backup_progress_saving">Varmuuskopiota tallennetaan&#8230;</string>
-    <string name="backup_progress_syncing">Synkronoidaan viestejä&#8230;</string>
-    <string name="backup_progress_finished">Valmis!</string>
-    <string name="backup_notification_channel_name">Varmuuskopiointi ja palautus</string>
-    <string name="scheduled_title">Ajoitettu</string>
-    <string name="scheduled_empty_description">Lähetä viesti automaattisesti haluamallasi ajankohdalla</string>
-    <string name="scheduled_empty_message_1">Hei! Milloin syntymäpäiväsi olikaan?</string>
-    <string name="scheduled_empty_message_2">Se on joulukuun 23. päivänä</string>
-    <string name="scheduled_empty_message_3">Hyvää syntymäpäivää! Katso miten hyvä ystävä olen, muistan syntymäpäiväsi</string>
-    <!--&#x200A; is a special character required at the end of this string to fix it's formatting in the app -->
-    <string name="scheduled_empty_message_3_timestamp">Lähetetään joulukuun 23. päivänä</string>
-    <string name="scheduled_compose_cd">Ajoita viesti</string>
-    <string name="scheduled_options_title">Ajoitettu viesti</string>
-    <string-array name="scheduled_options">
-        <item>Lähetä nyt</item>
-        <item>Kopioi teksti</item>
-        <item>Poista</item>
-    </string-array>
-    <string name="settings_category_appearance">Ulkonäkö</string>
-    <string name="settings_category_general">Yleiset</string>
-    <string name="settings_category_qkreply">QK-vastaus</string>
-    <string name="settings_theme_title">Teema</string>
-    <string name="settings_night_title">Yötila</string>
-    <string name="settings_black_title">Musta yötilä</string>
-    <string name="settings_night_start_title">Aloitusaika</string>
-    <string name="settings_night_end_title">Lopetusaika</string>
-    <string name="settings_automatic_colors_title">Automaattiset yhteystietojen värit</string>
-    <string name="settings_text_size_title">Fonttikoko</string>
-    <string name="settings_system_font_title">Käytä järjestelmäfonttia</string>
-    <string name="settings_auto_emoji_title">Automaattinen emoji</string>
-    <string name="settings_notifications_title">Ilmoitukset</string>
-    <string name="settings_notifications_o_summary">Muokkaa napauttamalla</string>
-    <string name="settings_notification_actions_title">Toiminnot</string>
-    <string name="settings_notification_action_1">Painike 1</string>
-    <string name="settings_notification_action_2">Painike 2</string>
-    <string name="settings_notification_action_3">Painike 3</string>
-    <string name="settings_notification_previews_title">Ilmoituksien esikatselut</string>
-    <string name="settings_notification_wake_title">Herätä näyttö</string>
-    <string name="settings_vibration_title">Värinä</string>
-    <string name="settings_ringtone_title">Ääni</string>
-    <string name="settings_ringtone_none">Ei mitään</string>
-    <string name="settings_qkreply_title">QK-vastaus</string>
-    <string name="settings_qkreply_summary">Ponnahdusikkuna uusille viesteille</string>
-    <string name="settings_qkreply_tap_dismiss_title">Sulje napauttamalla</string>
-    <string name="settings_qkreply_tap_dismiss_summary">Sulje ponnahdusikkuna napauttamalla sen ulkopuolelle</string>
-    <string name="settings_delayed_title">Lykätty lähetys</string>
-    <string name="settings_swipe_actions">Pyyhkäisytoiminnot</string>
-    <string name="settings_swipe_actions_summary">Muokkaa keskustelujen pyyhkäisytoimintoja</string>
-    <string name="settings_swipe_actions_right">Pyyhkäisy oikealle</string>
-    <string name="settings_swipe_actions_left">Pyyhkäisy vasemmalle</string>
-    <string name="settings_swipe_actions_change">MUUTA</string>
-    <string-array name="settings_swipe_actions">
-        <item>Ei mitään</item>
-        <item>Arkistoi</item>
-        <item>Poista</item>
-        <item>Estä</item>
-        <item>Soita</item>
-        <item>Merkitse luetuksi</item>
-        <item>Merkitse lukemattomaksi</item>
-    </string-array>
-    <string name="settings_delivery_title">Välitystiedot</string>
-    <string name="settings_delivery_summary">Vahvista, että viestit lähetettiin onnistuneesti</string>
-    <string name="settings_signature_title">Allekirjoitus</string>
-    <string name="settings_signature_summary">Lisää allekirjoitus viestiesi loppuun</string>
-    <string name="settings_unicode_title">Käytä yksinkertaisia merkkejä</string>
-    <string name="settings_unicode_summary">Käytä yksinkertaisia merkkejä lähetettävissä tekstiviesteissä</string>
-    <string name="settings_mobile_title">Vain matkapuhelinnumerot</string>
-    <string name="settings_mobile_summary">Ehdota vain matkapuhelinnumeroita viestejä kirjoittaessasi</string>
-    <string name="settings_auto_delete">Delete old messages automatically</string>
-    <string name="settings_auto_delete_dialog_message">Messages will be deleted after the specified number of days</string>
-    <string name="settings_auto_delete_dialog_hint">Number of days</string>
-    <string name="settings_auto_delete_never">Never</string>
-    <string name="settings_auto_delete_warning">Delete old messages automatically?</string>
-    <string name="settings_auto_delete_warning_message">If you proceed, %1$d messages will be deleted now</string>
-    <plurals name="settings_auto_delete_summary">
-        <item quantity="one">After 1 day</item>
-        <item quantity="other">After %d days</item>
-    </plurals>
-    <string name="settings_long_as_mms_title">Lähetä pitkät viestit multimediaviesteinä</string>
-    <string name="settings_long_as_mms_summary">Jos pidempien viestiesi lähetys epäonnistuu, tai viestit lähtevät väärässä järjestyksessä, voit lähettää ne multimediaviesteinä. Operaattori saattaa veloittaa tästä lisämaksuja.</string>
-    <string name="settings_mms_size_title">Pakkaa multimediaviestien liitteet automaattisesti</string>
-    <string name="settings_sync_title">Synkronoi viestit</string>
-    <string name="settings_sync_summary">Synkronoi viestisi uudelleen Androidin oman SMS-tietokannan kanssa</string>
-    <string name="settings_about_title">Tietoja QKSMS:tä</string>
-    <string name="settings_version">Versio %s</string>
-    <string name="settings_logging_enabled">Virheenkorjauslokien kirjaaminen käytössä</string>
-    <string name="settings_logging_disabled">Virheenkorjauslokien kirjaaminen pois käytöstä</string>
-    <string name="settings_delay_duration_hint">Syötä kesto (sekuntia)</string>
-    <string name="blocking_title">Esto</string>
-    <string name="blocking_drop_title">Pudota viestit</string>
-    <string name="blocking_drop_summary">Pudottaa estettyjen yhteystietojen lähettämät viestit, niiden piilottamisen sijasta</string>
-    <string name="blocking_conversations">Estetyt keskustelut</string>
-    <string name="blocking_manager_title">Estojen hallinta</string>
-    <string name="blocking_manager_qksms_title">QKSMS</string>
-    <string name="blocking_manager_qksms_summary">QKSMS:ään sisäänrakennettu esto-toiminto</string>
-    <string name="blocking_manager_call_control_summary">Suodata puhelusi ja soittosi automaattisesti, yhdessä kätevässä paikassa! Community IQ™ antaa sinun estää haluamattomia viestejä, yhteisölle tutuilta roskapostin lähettäjiltä</string>
-    <string name="blocking_manager_sia_summary">Suodata haluamattomien numeroin lähettämät viestit automaattisesti, \"Should I Answer\" -sovellusta käyttämällä</string>
-    <string name="blocking_manager_copy_title">Kopioi estetyt numerot</string>
-    <string name="blocking_manager_copy_summary">Jatka, ja kopioi jo estämäsi numerot, sovellukseen %s</string>
-    <string name="blocked_numbers_title">Estetyt numerot</string>
-    <string name="blocked_numbers_empty">Estämäsi numerot näkyvät tässä</string>
-    <string name="blocked_numbers_add_cd">Estä uusi numero</string>
-    <string name="blocked_numbers_dialog_title">Estä viestit numerosta</string>
-    <string name="blocked_numbers_dialog_hint">Puhelinnumero</string>
-    <string name="blocked_numbers_dialog_block">Estä</string>
-    <string name="blocked_messages_title">Estetyt viestit</string>
-    <string name="blocked_messages_empty">Estämäsi viestit näkyvät täällä</string>
-    <string name="blocking_block_title">Estä</string>
-    <string name="blocking_unblock_title">Salli</string>
-    <plurals name="blocking_block_external">
-        <item quantity="one">Jatka sovellukseen %s, ja estä tämä numero</item>
-        <item quantity="other">Jatka sovellukseen %s, ja estä nämä numerot</item>
-    </plurals>
-    <plurals name="blocking_unblock_external">
-        <item quantity="one">Jatka sovellukseen %s, ja salli tämä numero</item>
-        <item quantity="other">Jatka sovellukseen %s, ja salli nämä numerot</item>
-    </plurals>
-    <string name="about_title">Tietoja</string>
-    <string name="about_version_title">Versio</string>
-    <string name="about_developer_title">Kehittäjä</string>
-    <string name="about_source_title">Lähdekoodi</string>
-    <string name="about_changelog_title">Muutosloki</string>
-    <string name="about_contact_title">Yhteystiedot</string>
-    <string name="about_license_title">Lisenssi</string>
-    <string name="about_copyright_title">Tekijänoikeudet</string>
-    <string name="qksms_plus_description_title">Tue kehitystä, avaa kaiken</string>
-    <string name="qksms_plus_description_summary">Voit pelastaa nälkää näkevän kehittäjän antamalla %s</string>
-    <!-- Substitutions are for price and currency. Ex: Lifetime upgrade for $1.99 USD -->
-    <string name="qksms_plus_upgrade">Elinikäinen päivitys hintaan %1$s %2$s</string>
-    <!-- Substitutions are for price and currency. Ex: Unlock + donate for $4.99 USD -->
-    <string name="qksms_plus_upgrade_donate">Ominaisuuksien avaus + lahjoitus hintaan %1$s %2$s</string>
-    <string name="qksms_plus_thanks_title">Kiitos, kun tuit QKSMS:ää!</string>
-    <string name="qksms_plus_thanks_summary">Olet nyt oikeutettu käyttämään kaikkia QKSMS+ -ominaisuuksia</string>
-    <string name="qksms_plus_free_title">QKSMS+ on ilmainen F-Droidin käyttäjille! Jos haluaisit tukea kehitystyötä tulevaisuudessa, arvostaisimme lahjoitustasi todella paljon.</string>
-    <string name="qksms_plus_donate">Lahjoita PayPalilla</string>
-    <string name="qksms_plus_coming_soon">Tulossa pian</string>
-    <string name="qksms_plus_themes_title">Premium-teemat</string>
-    <string name="qksms_plus_themes_summary">Avaa upeat teemavärit, joita ei ole saatavilla Material Design -väripaletissa</string>
-    <string name="qksms_plus_emoji_title">Mukautettu auto-emoji</string>
-    <string name="qksms_plus_emoji_summary">Luo mukautettuja auto-emoji -pikakuvakkeita</string>
-    <string name="qksms_plus_backup_title">Viestien varmuuskopiointi</string>
-    <string name="qksms_plus_backup_summary">Varmuuskopioi viestisi automaattisesti. Sinun ei enää ikinä tarvitse huolehtia historiasi katoamisesta, jos vaihdat tai hukkaat puhelimesi</string>
-    <string name="qksms_plus_scheduled_title">Ajoitetut viestit</string>
-    <string name="qksms_plus_scheduled_summary">Ajoita viestit lähtemään automaattisesti tiettyinä aikoina ja päivinä</string>
-    <string name="qksms_plus_delayed_title">Lykätty lähetys</string>
-    <string name="qksms_plus_delayed_summary">Odota muutama sekunti ennen viestin lähettämistä</string>
-    <string name="qksms_plus_night_title">Automaattinen yötila</string>
-    <string name="qksms_plus_night_summary">Ota yötila käyttöön päivänajan perusteella</string>
-    <string name="qksms_plus_blacklist_title">Edistynyt estäminen</string>
-    <string name="qksms_plus_blacklist_summary">Estä avainsanoja tai vastaavuuksia sisältävät viestit</string>
-    <string name="qksms_plus_forward_title">Automaattinen välitys</string>
-    <string name="qksms_plus_forward_summary">Edelleenlähetä tiettyjen lähettäjien viestit automaattisesti </string>
-    <string name="qksms_plus_respond_title">Automaattinen vastaus</string>
-    <string name="qksms_plus_respond_summary">Vastaa saapuviin viesteihin automaattisesti, etukäteen luoduilla vastauksilla</string>
-    <string name="qksms_plus_more_title">Lisää</string>
-    <string name="qksms_plus_more_summary">QKSMS:ää kehitetään aktiivisesti, ja ostoksesi sisältää kaikki tulevat QKSMS+ -ominaisuudet!</string>
-    <string name="widget_loading">Ladataan&#8230;</string>
-    <string name="widget_more">Näytä lisää keskusteluja</string>
-    <string name="qkreply_menu_read">Merkitse luetuksi</string>
-    <string name="qkreply_menu_call">Soita</string>
-    <string name="qkreply_menu_delete">Poista</string>
-    <string name="qkreply_menu_expand">Näytä lisää</string>
-    <string name="qkreply_menu_collapse">Näytä vähemmän</string>
-    <string name="qkreply_menu_view">Avaa keskustelu</string>
-    <string name="theme_material">Material</string>
-    <string name="theme_hex">HEX</string>
-    <string name="theme_apply">Käytä</string>
-    <string-array name="notification_actions">
-        <item>Ei mitään</item>
-        <item>Arkistoi</item>
-        <item>Poista</item>
-        <item>Estä</item>
-        <item>Soita</item>
-        <item>Merkitse luetuksi</item>
-        <item>Vastaa</item>
-    </string-array>
-    <string name="button_yes">Kyllä</string>
-    <string name="button_continue">Jatka</string>
-    <string name="button_cancel">Peruuta</string>
-    <string name="button_delete">Poista</string>
-    <string name="button_save">Tallenna</string>
-    <string name="button_stop">Lopeta</string>
-    <string name="button_more">Lisää</string>
-    <string name="button_set">Aseta</string>
-    <string name="button_undo">Kumoa</string>
-    <string name="toast_copied">Kopioitu</string>
-    <string name="toast_archived">Arkistoidut keskustelut</string>
-    <string name="toast_qksms_plus">Sinun pitää avata QKSMS+ käyttääksesi tätä</string>
-    <plurals name="notification_new_messages">
-        <item quantity="one">Uusi viesti</item>
-        <item quantity="other">%s uutta viestiä</item>
-    </plurals>
-    <string name="notification_message_failed_title">Viestiä ei lähetetty</string>
-    <string name="notification_message_failed_text">Viestin lähetys vastaanottajalle %s epäonnistui</string>
-    <string-array name="night_modes">
-        <item>Järjestelmä</item>
-        <item>Pois käytöstä</item>
-        <item>Aina päällä</item>
-        <item>Automaattinen</item>
-    </string-array>
-    <string-array name="notification_preview_options">
-        <item>Näytä nimi ja viesti</item>
-        <item>Näytä nimi</item>
-        <item>Piilota sisältö</item>
-    </string-array>
-    <string-array name="text_sizes">
-        <item>Pieni</item>
-        <item>Normaali</item>
-        <item>Suuri</item>
-        <item>Suurempi</item>
-    </string-array>
-    <string-array name="delayed_sending_labels">
-        <item>Ei viivettä</item>
-        <item>3 sekuntia</item>
-        <item>5 sekuntia</item>
-        <item>10 sekuntia</item>
-    </string-array>
-    <string-array name="mms_sizes">
-        <item>Automaattinen</item>
-        <item>100 kt</item>
-        <item>200 kt</item>
-        <item>300 kt</item>
-        <item>600 kt</item>
-        <item>1000 kt</item>
-        <item>2000 kt</item>
-        <item>Ei pakkausta</item>
-    </string-array>
-    <string-array name="qk_responses">
-        <item>Okei</item>
-        <item>Anna minulle hetki</item>
-        <item>Olen matkalla</item>
-        <item>Kiitos</item>
-        <item>Kuulostaa hyvältä</item>
-        <item>Mitä kuuluu?</item>
-        <item>Sovittu</item>
-        <item>Ei</item>
-        <item>Rakastan sinua</item>
-        <item>Anteeksi</item>
-        <item>LOL</item>
-        <item>Se on okei</item>
-    </string-array>
-</resources>
+<?xml version="1.0" encoding="utf-8"?>
+<!--
+  ~ Copyright (C) 2019 Moez Bhatti <moez.bhatti@gmail.com>
+  ~
+  ~ This file is part of QKSMS.
+  ~
+  ~ QKSMS is free software: you can redistribute it and/or modify
+  ~ it under the terms of the GNU General Public License as published by
+  ~ the Free Software Foundation, either version 3 of the License, or
+  ~ (at your option) any later version.
+  ~
+  ~ QKSMS is distributed in the hope that it will be useful,
+  ~ but WITHOUT ANY WARRANTY; without even the implied warranty of
+  ~ MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+  ~ GNU General Public License for more details.
+  ~
+  ~ You should have received a copy of the GNU General Public License
+  ~ along with QKSMS.  If not, see <http://www.gnu.org/licenses/>.
+  -->
+<resources>
+    <string name="shortcut_compose_long_label">Uusi keskustelu</string>
+    <string name="shortcut_compose_short_label">Kirjoita</string>
+    <string name="shortcut_compose_disabled_message">Pikakuvake pois käytöstä</string>
+    <string name="title_archived">Arkisto</string>
+    <string name="title_settings">Asetukset</string>
+    <string name="title_notification_prefs">Ilmoitukset</string>
+    <string name="title_theme">Teema</string>
+    <string name="title_conversations">Hae saapuneista&#8230;</string>
+    <string name="title_compose">Kirjoita nimi tai numero</string>
+    <string name="setup_skip">Ohita</string>
+    <string name="setup_next">Jatka</string>
+    <string name="menu_add_person">Lisää henkilö</string>
+    <string name="menu_call">Soita</string>
+    <string name="menu_info">Lisätiedot</string>
+    <string name="menu_save">Tallenna galleriaan</string>
+    <string name="menu_share">Jaa</string>
+    <string name="main_drawer_open_cd">Avaa navigointilaatikko</string>
+    <string name="main_title_selected">%d valittu</string>
+    <string name="main_menu_clear">Tyhjennä</string>
+    <string name="main_menu_archive">Arkistoi</string>
+    <string name="main_menu_unarchive">Poista arkistosta</string>
+    <string name="main_menu_delete">Poista</string>
+    <string name="main_menu_add_contact">Lisää yhteystietoihin</string>
+    <string name="main_menu_pin">Kiinnitä</string>
+    <string name="main_menu_unpin">Irrota</string>
+    <string name="main_menu_read">Merkitse luetuksi</string>
+    <string name="main_menu_unread">Merkitse lukemattomaksi</string>
+    <string name="main_menu_block">Estä</string>
+    <string name="main_syncing">Synkronoidaan viestejä&#8230;</string>
+    <string name="main_sender_you">Sinä: %s</string>
+    <string name="main_draft">Luonnos: %s</string>
+    <string name="main_message_results_title">Tuloksia viesteissä</string>
+    <string name="main_message_results">%d viestiä</string>
+    <string name="inbox_empty_text">Keskustelusi näkyvät tässä</string>
+    <string name="inbox_search_empty_text">Ei tuloksia</string>
+    <string name="archived_empty_text">Arkistoimasi keskustelut näkyvät tässä</string>
+    <string name="main_fab_cd">Aloita uusi keskustelu</string>
+    <string name="main_default_sms_title">Rakastu tekstaamiseen uudelleen</string>
+    <string name="main_default_sms_message">Tee QKSMS:stä oletusviestintäsovelluksesi</string>
+    <string name="main_default_sms_change">Muuta</string>
+    <string name="main_permission_required">Käyttöoikeus tarvitaan</string>
+    <string name="main_permission_sms">QKSMS tarvitsee oikeuden tekstiviestien lähettämiseen ja tarkastelemiseen</string>
+    <string name="main_permission_contacts">QKSMS tarvitsee oikeuden yhteystietojesi tarkatelemiseen</string>
+    <string name="main_permission_allow">Salli</string>
+    <string name="drawer_inbox">Saapuneet</string>
+    <string name="drawer_archived">Arkistoidut</string>
+    <string name="drawer_scheduled">Ajoitetut</string>
+    <string name="drawer_blocking">Estäminen</string>
+    <string name="drawer_more">Lisää</string>
+    <string name="drawer_settings">Asetukset</string>
+    <string name="drawer_help">Apu ja palaute</string>
+    <string name="drawer_invite">Kutsu kavereita</string>
+    <string name="drawer_plus_banner_summary">Avaa mahtavia uusia ominaisuuksia ja tue kehitystä</string>
+    <string name="rate_title">Tykkäätkö QKSMS:tä?</string>
+    <string name="rate_summary">Jaa rakkautta ja arvostele meidät Google Playssä!</string>
+    <string name="rate_okay">OKEI!</string>
+    <string name="rate_dismiss">HYLKÄÄ</string>
+    <string name="dialog_delete_title">Poista</string>
+    <plurals name="dialog_delete_message">
+        <item quantity="one">Oletko varma, että haluat poistaa tämän keskustelun?</item>
+        <item quantity="other">Oletko varma, että haluat poistaa %d keskustelua?</item>
+    </plurals>
+    <string-array name="message_options">
+        <item>Kopioi teksti</item>
+        <item>Edelleenlähetä</item>
+        <item>Poista</item>
+    </string-array>
+    <string name="compose_number_picker_title">Valitse puhelinnumero</string>
+    <string name="compose_number_picker_default">%s ∙ Oletus</string>
+    <string name="compose_number_picker_once">Vain kerran</string>
+    <string name="compose_number_picker_always">Aina</string>
+    <string name="compose_title_selected">%d valittu</string>
+    <string name="compose_subtitle_results">%1$d / %2$d tuloksesta</string>
+    <string name="compose_send_group_title">Lähetä ryhmäviestinä</string>
+    <string name="compose_send_group_summary">Vastaanottajat ja vastaukset näkyvät kaikille</string>
+    <string name="compose_messages_empty">Tämä on keskustelusi alku. Sano jotain mukavaa!</string>
+    <string name="compose_vcard_label">Käyntikortti</string>
+    <string name="compose_scheduled_for">Ajoitettu</string>
+    <string name="compose_scheduled_future">Valitun ajan täytyy olla tulevaisuudessa!</string>
+    <string name="compose_scheduled_plus">Sinun täytyy avata QKSMS+ ajoittaaksesi viestejä</string>
+    <string name="compose_scheduled_toast">Lisätty ajoitettuihin viesteihin</string>
+    <string name="compose_hint">Kirjoita viesti&#8230;</string>
+    <string name="compose_menu_copy">Kopioi teksti</string>
+    <string name="compose_menu_forward">Edelleenlähetä</string>
+    <string name="compose_menu_delete">Poista</string>
+    <string name="compose_menu_previous">Edellinen</string>
+    <string name="compose_menu_next">Seuraava</string>
+    <string name="compose_menu_clear">Tyhjennä</string>
+    <string name="compose_details_title">Viestin tiedot</string>
+    <string name="compose_details_type">Tyyppi: %s</string>
+    <string name="compose_details_from">Lähettäjä: %s</string>
+    <string name="compose_details_to">Vastaanottaja: %s</string>
+    <string name="compose_details_subject">Aihe: %s</string>
+    <string name="compose_details_priority">Tärkeys: %s</string>
+    <string name="compose_details_size">Koko: %s</string>
+    <string name="compose_details_sent">Lähetetty: %s</string>
+    <string name="compose_details_received">Vastaanotettu: %s</string>
+    <string name="compose_details_delivered">Toimitettu: %s</string>
+    <string name="compose_details_error_code">Virhekoodi: %d</string>
+    <string name="compose_attach_cd">Lisää liite</string>
+    <string name="compose_gallery_cd">Liitä kuva</string>
+    <string name="compose_camera_cd">Ota kuva</string>
+    <string name="compose_schedule_cd">Ajoita viesti</string>
+    <string name="compose_contact_cd">Liitä yhteystieto</string>
+    <string name="compose_contact_error">Yhteystiedon lukuvirhe</string>
+    <!-- Example: SIM 1 (Verizon) selected-->
+    <string name="compose_sim_changed_toast">SIM %1$d (%2$s) valittu</string>
+    <string name="compose_sim_cd">%s valittu, vaihda SIM-korttia</string>
+    <string name="compose_send_cd">Lähetä viesti</string>
+    <string name="message_status_sending">Lähetetään&#8230;</string>
+    <string name="message_status_delivered">Toimitettu: %s</string>
+    <string name="message_status_failed">Lähettäminen epäonnistui. Yritä uudelleen napauttamalla</string>
+    <string name="info_title">Lisätiedot</string>
+    <string name="info_copied_address">Osoite kopioitu</string>
+    <string name="info_name">Keskustelun otsikko</string>
+    <string name="info_notifications">Ilmoitukset</string>
+    <string name="info_theme">Teema</string>
+    <string name="info_archive">Arkistoi</string>
+    <string name="info_unarchive">Poista arkistosta</string>
+    <string name="info_block">Estä</string>
+    <string name="info_unblock">Salli</string>
+    <string name="info_delete">Poista keskustelu</string>
+    <string name="gallery_error">Mediaa ei voitu ladata</string>
+    <string name="gallery_toast_saved">Tallennettu galleriaan</string>
+    <string name="backup_title">Varmuuskopioi ja palauta</string>
+    <string name="backup_backing_up">Viestejä varmuuskopioidaan</string>
+    <string name="backup_restoring">Viestejä palautetaan</string>
+    <string name="backup_last">Viimeisin varmuuskopio</string>
+    <string name="backup_loading">Ladataan&#8230;</string>
+    <string name="backup_never">Ei koskaan</string>
+    <string name="backup_restore_title">Palauta</string>
+    <string name="backup_restore_summary">Valitse varmuuskopio</string>
+    <string name="backup_restore_error_plus">Ole hyvä ja avaa QKSMS+ käyttääksesi varmuuskopiointia ja palautusta</string>
+    <string name="backup_restore_error_backup">Varmuuskopiointi käynnissä&#8230;</string>
+    <string name="backup_restore_error_restore">Palautus käynnissä&#8230;</string>
+    <string name="backup_restore_confirm_title">Palauta varmuuskopiosta</string>
+    <string name="backup_restore_confirm_message">Oletko varma, että haluat palauttaa viestisi tästä varmuuskopiosta?</string>
+    <string name="backup_restore_stop_title">Pysäytä palautus</string>
+    <string name="backup_restore_stop_message">Aiemmin palautetut viestit pysyvät laitteellasi</string>
+    <string name="backup_restore_dialog_title">Varmuuskopiot</string>
+    <string name="backup_restore_dialog_empty">Varmuuskopioita ei löytynyt</string>
+    <plurals name="backup_message_count">
+        <item quantity="one">%d viesti</item>
+        <item quantity="other">%d viestiä</item>
+    </plurals>
+    <string name="backup_disclaimer">Vain tekstiviestejä voidaan varmuuskopioita ja palauttaa tällä hetkellä. Tuki multimediaviesteille ja varmuuskopiointien ajastus tulevat pian!</string>
+    <string name="backup_now">Varmuuskopioi nyt</string>
+    <string name="backup_progress_parsing">Varmuuskopiota jäsennetään&#8230;</string>
+    <string name="backup_progress_running">%d/%d viestiä</string>
+    <string name="backup_progress_saving">Varmuuskopiota tallennetaan&#8230;</string>
+    <string name="backup_progress_syncing">Synkronoidaan viestejä&#8230;</string>
+    <string name="backup_progress_finished">Valmis!</string>
+    <string name="backup_notification_channel_name">Varmuuskopiointi ja palautus</string>
+    <string name="scheduled_title">Ajoitettu</string>
+    <string name="scheduled_empty_description">Lähetä viesti automaattisesti haluamallasi ajankohdalla</string>
+    <string name="scheduled_empty_message_1">Hei! Milloin syntymäpäiväsi olikaan?</string>
+    <string name="scheduled_empty_message_2">Se on joulukuun 23. päivänä</string>
+    <string name="scheduled_empty_message_3">Hyvää syntymäpäivää! Katso miten hyvä ystävä olen, muistan syntymäpäiväsi</string>
+    <!--&#x200A; is a special character required at the end of this string to fix it's formatting in the app -->
+    <string name="scheduled_empty_message_3_timestamp">Lähetetään joulukuun 23. päivänä</string>
+    <string name="scheduled_compose_cd">Ajoita viesti</string>
+    <string name="scheduled_options_title">Ajoitettu viesti</string>
+    <string-array name="scheduled_options">
+        <item>Lähetä nyt</item>
+        <item>Kopioi teksti</item>
+        <item>Poista</item>
+    </string-array>
+    <string name="settings_category_appearance">Ulkonäkö</string>
+    <string name="settings_category_general">Yleiset</string>
+    <string name="settings_category_qkreply">QK-vastaus</string>
+    <string name="settings_theme_title">Teema</string>
+    <string name="settings_night_title">Yötila</string>
+    <string name="settings_black_title">Musta yötilä</string>
+    <string name="settings_night_start_title">Aloitusaika</string>
+    <string name="settings_night_end_title">Lopetusaika</string>
+    <string name="settings_automatic_colors_title">Automaattiset yhteystietojen värit</string>
+    <string name="settings_text_size_title">Fonttikoko</string>
+    <string name="settings_system_font_title">Käytä järjestelmäfonttia</string>
+    <string name="settings_auto_emoji_title">Automaattinen emoji</string>
+    <string name="settings_notifications_title">Ilmoitukset</string>
+    <string name="settings_notifications_o_summary">Muokkaa napauttamalla</string>
+    <string name="settings_notification_actions_title">Toiminnot</string>
+    <string name="settings_notification_action_1">Painike 1</string>
+    <string name="settings_notification_action_2">Painike 2</string>
+    <string name="settings_notification_action_3">Painike 3</string>
+    <string name="settings_notification_previews_title">Ilmoituksien esikatselut</string>
+    <string name="settings_notification_wake_title">Herätä näyttö</string>
+    <string name="settings_vibration_title">Värinä</string>
+    <string name="settings_ringtone_title">Ääni</string>
+    <string name="settings_ringtone_none">Ei mitään</string>
+    <string name="settings_qkreply_title">QK-vastaus</string>
+    <string name="settings_qkreply_summary">Ponnahdusikkuna uusille viesteille</string>
+    <string name="settings_qkreply_tap_dismiss_title">Sulje napauttamalla</string>
+    <string name="settings_qkreply_tap_dismiss_summary">Sulje ponnahdusikkuna napauttamalla sen ulkopuolelle</string>
+    <string name="settings_delayed_title">Lykätty lähetys</string>
+    <string name="settings_swipe_actions">Pyyhkäisytoiminnot</string>
+    <string name="settings_swipe_actions_summary">Muokkaa keskustelujen pyyhkäisytoimintoja</string>
+    <string name="settings_swipe_actions_right">Pyyhkäisy oikealle</string>
+    <string name="settings_swipe_actions_left">Pyyhkäisy vasemmalle</string>
+    <string name="settings_swipe_actions_change">MUUTA</string>
+    <string-array name="settings_swipe_actions">
+        <item>Ei mitään</item>
+        <item>Arkistoi</item>
+        <item>Poista</item>
+        <item>Estä</item>
+        <item>Soita</item>
+        <item>Merkitse luetuksi</item>
+        <item>Merkitse lukemattomaksi</item>
+    </string-array>
+    <string name="settings_delivery_title">Välitystiedot</string>
+    <string name="settings_delivery_summary">Vahvista, että viestit lähetettiin onnistuneesti</string>
+    <string name="settings_signature_title">Allekirjoitus</string>
+    <string name="settings_signature_summary">Lisää allekirjoitus viestiesi loppuun</string>
+    <string name="settings_unicode_title">Käytä yksinkertaisia merkkejä</string>
+    <string name="settings_unicode_summary">Käytä yksinkertaisia merkkejä lähetettävissä tekstiviesteissä</string>
+    <string name="settings_mobile_title">Vain matkapuhelinnumerot</string>
+    <string name="settings_mobile_summary">Ehdota vain matkapuhelinnumeroita viestejä kirjoittaessasi</string>
+    <string name="settings_auto_delete">Delete old messages automatically</string>
+    <string name="settings_auto_delete_dialog_message">Messages will be deleted after the specified number of days</string>
+    <string name="settings_auto_delete_dialog_hint">Number of days</string>
+    <string name="settings_auto_delete_never">Never</string>
+    <string name="settings_auto_delete_warning">Delete old messages automatically?</string>
+    <string name="settings_auto_delete_warning_message">If you proceed, %1$d messages will be deleted now</string>
+    <plurals name="settings_auto_delete_summary">
+        <item quantity="one">After 1 day</item>
+        <item quantity="other">After %d days</item>
+    </plurals>
+    <string name="settings_long_as_mms_title">Lähetä pitkät viestit multimediaviesteinä</string>
+    <string name="settings_long_as_mms_summary">Jos pidempien viestiesi lähetys epäonnistuu, tai viestit lähtevät väärässä järjestyksessä, voit lähettää ne multimediaviesteinä. Operaattori saattaa veloittaa tästä lisämaksuja.</string>
+    <string name="settings_mms_size_title">Pakkaa multimediaviestien liitteet automaattisesti</string>
+    <string name="settings_sync_title">Synkronoi viestit</string>
+    <string name="settings_sync_summary">Synkronoi viestisi uudelleen Androidin oman SMS-tietokannan kanssa</string>
+    <string name="settings_about_title">Tietoja QKSMS:tä</string>
+    <string name="settings_version">Versio %s</string>
+    <string name="settings_logging_enabled">Virheenkorjauslokien kirjaaminen käytössä</string>
+    <string name="settings_logging_disabled">Virheenkorjauslokien kirjaaminen pois käytöstä</string>
+    <string name="settings_delay_duration_hint">Syötä kesto (sekuntia)</string>
+    <string name="blocking_title">Esto</string>
+    <string name="blocking_drop_title">Pudota viestit</string>
+    <string name="blocking_drop_summary">Pudottaa estettyjen yhteystietojen lähettämät viestit, niiden piilottamisen sijasta</string>
+    <string name="blocking_conversations">Estetyt keskustelut</string>
+    <string name="blocking_manager_title">Estojen hallinta</string>
+    <string name="blocking_manager_qksms_title">QKSMS</string>
+    <string name="blocking_manager_qksms_summary">QKSMS:ään sisäänrakennettu esto-toiminto</string>
+    <string name="blocking_manager_call_control_summary">Suodata puhelusi ja soittosi automaattisesti, yhdessä kätevässä paikassa! Community IQ™ antaa sinun estää haluamattomia viestejä, yhteisölle tutuilta roskapostin lähettäjiltä</string>
+    <string name="blocking_manager_sia_summary">Suodata haluamattomien numeroin lähettämät viestit automaattisesti, \"Should I Answer\" -sovellusta käyttämällä</string>
+    <string name="blocking_manager_copy_title">Kopioi estetyt numerot</string>
+    <string name="blocking_manager_copy_summary">Jatka, ja kopioi jo estämäsi numerot, sovellukseen %s</string>
+    <string name="blocked_numbers_title">Estetyt numerot</string>
+    <string name="blocked_numbers_empty">Estämäsi numerot näkyvät tässä</string>
+    <string name="blocked_numbers_add_cd">Estä uusi numero</string>
+    <string name="blocked_numbers_dialog_title">Estä viestit numerosta</string>
+    <string name="blocked_numbers_dialog_hint">Puhelinnumero</string>
+    <string name="blocked_numbers_dialog_block">Estä</string>
+    <string name="blocked_messages_title">Estetyt viestit</string>
+    <string name="blocked_messages_empty">Estämäsi viestit näkyvät täällä</string>
+    <string name="blocking_block_title">Estä</string>
+    <string name="blocking_unblock_title">Salli</string>
+    <plurals name="blocking_block_external">
+        <item quantity="one">Jatka sovellukseen %s, ja estä tämä numero</item>
+        <item quantity="other">Jatka sovellukseen %s, ja estä nämä numerot</item>
+    </plurals>
+    <plurals name="blocking_unblock_external">
+        <item quantity="one">Jatka sovellukseen %s, ja salli tämä numero</item>
+        <item quantity="other">Jatka sovellukseen %s, ja salli nämä numerot</item>
+    </plurals>
+    <string name="about_title">Tietoja</string>
+    <string name="about_version_title">Versio</string>
+    <string name="about_developer_title">Kehittäjä</string>
+    <string name="about_source_title">Lähdekoodi</string>
+    <string name="about_changelog_title">Muutosloki</string>
+    <string name="about_contact_title">Yhteystiedot</string>
+    <string name="about_license_title">Lisenssi</string>
+    <string name="about_copyright_title">Tekijänoikeudet</string>
+    <string name="qksms_plus_description_title">Tue kehitystä, avaa kaiken</string>
+    <string name="qksms_plus_description_summary">Voit pelastaa nälkää näkevän kehittäjän antamalla %s</string>
+    <!-- Substitutions are for price and currency. Ex: Lifetime upgrade for $1.99 USD -->
+    <string name="qksms_plus_upgrade">Elinikäinen päivitys hintaan %1$s %2$s</string>
+    <!-- Substitutions are for price and currency. Ex: Unlock + donate for $4.99 USD -->
+    <string name="qksms_plus_upgrade_donate">Ominaisuuksien avaus + lahjoitus hintaan %1$s %2$s</string>
+    <string name="qksms_plus_thanks_title">Kiitos, kun tuit QKSMS:ää!</string>
+    <string name="qksms_plus_thanks_summary">Olet nyt oikeutettu käyttämään kaikkia QKSMS+ -ominaisuuksia</string>
+    <string name="qksms_plus_free_title">QKSMS+ on ilmainen F-Droidin käyttäjille! Jos haluaisit tukea kehitystyötä tulevaisuudessa, arvostaisimme lahjoitustasi todella paljon.</string>
+    <string name="qksms_plus_donate">Lahjoita PayPalilla</string>
+    <string name="qksms_plus_coming_soon">Tulossa pian</string>
+    <string name="qksms_plus_themes_title">Premium-teemat</string>
+    <string name="qksms_plus_themes_summary">Avaa upeat teemavärit, joita ei ole saatavilla Material Design -väripaletissa</string>
+    <string name="qksms_plus_emoji_title">Mukautettu auto-emoji</string>
+    <string name="qksms_plus_emoji_summary">Luo mukautettuja auto-emoji -pikakuvakkeita</string>
+    <string name="qksms_plus_backup_title">Viestien varmuuskopiointi</string>
+    <string name="qksms_plus_backup_summary">Varmuuskopioi viestisi automaattisesti. Sinun ei enää ikinä tarvitse huolehtia historiasi katoamisesta, jos vaihdat tai hukkaat puhelimesi</string>
+    <string name="qksms_plus_scheduled_title">Ajoitetut viestit</string>
+    <string name="qksms_plus_scheduled_summary">Ajoita viestit lähtemään automaattisesti tiettyinä aikoina ja päivinä</string>
+    <string name="qksms_plus_delayed_title">Lykätty lähetys</string>
+    <string name="qksms_plus_delayed_summary">Odota muutama sekunti ennen viestin lähettämistä</string>
+    <string name="qksms_plus_night_title">Automaattinen yötila</string>
+    <string name="qksms_plus_night_summary">Ota yötila käyttöön päivänajan perusteella</string>
+    <string name="qksms_plus_blacklist_title">Edistynyt estäminen</string>
+    <string name="qksms_plus_blacklist_summary">Estä avainsanoja tai vastaavuuksia sisältävät viestit</string>
+    <string name="qksms_plus_forward_title">Automaattinen välitys</string>
+    <string name="qksms_plus_forward_summary">Edelleenlähetä tiettyjen lähettäjien viestit automaattisesti </string>
+    <string name="qksms_plus_respond_title">Automaattinen vastaus</string>
+    <string name="qksms_plus_respond_summary">Vastaa saapuviin viesteihin automaattisesti, etukäteen luoduilla vastauksilla</string>
+    <string name="qksms_plus_more_title">Lisää</string>
+    <string name="qksms_plus_more_summary">QKSMS:ää kehitetään aktiivisesti, ja ostoksesi sisältää kaikki tulevat QKSMS+ -ominaisuudet!</string>
+    <string name="widget_loading">Ladataan&#8230;</string>
+    <string name="widget_more">Näytä lisää keskusteluja</string>
+    <string name="qkreply_menu_read">Merkitse luetuksi</string>
+    <string name="qkreply_menu_call">Soita</string>
+    <string name="qkreply_menu_delete">Poista</string>
+    <string name="qkreply_menu_expand">Näytä lisää</string>
+    <string name="qkreply_menu_collapse">Näytä vähemmän</string>
+    <string name="qkreply_menu_view">Avaa keskustelu</string>
+    <string name="theme_material">Material</string>
+    <string name="theme_hex">HEX</string>
+    <string name="theme_apply">Käytä</string>
+    <string-array name="notification_actions">
+        <item>Ei mitään</item>
+        <item>Arkistoi</item>
+        <item>Poista</item>
+        <item>Estä</item>
+        <item>Soita</item>
+        <item>Merkitse luetuksi</item>
+        <item>Vastaa</item>
+    </string-array>
+    <string name="button_yes">Kyllä</string>
+    <string name="button_continue">Jatka</string>
+    <string name="button_cancel">Peruuta</string>
+    <string name="button_delete">Poista</string>
+    <string name="button_save">Tallenna</string>
+    <string name="button_stop">Lopeta</string>
+    <string name="button_more">Lisää</string>
+    <string name="button_set">Aseta</string>
+    <string name="button_undo">Kumoa</string>
+    <string name="toast_copied">Kopioitu</string>
+    <string name="toast_archived">Arkistoidut keskustelut</string>
+    <string name="toast_qksms_plus">Sinun pitää avata QKSMS+ käyttääksesi tätä</string>
+    <plurals name="notification_new_messages">
+        <item quantity="one">Uusi viesti</item>
+        <item quantity="other">%s uutta viestiä</item>
+    </plurals>
+    <string name="notification_message_failed_title">Viestiä ei lähetetty</string>
+    <string name="notification_message_failed_text">Viestin lähetys vastaanottajalle %s epäonnistui</string>
+    <string-array name="night_modes">
+        <item>Järjestelmä</item>
+        <item>Pois käytöstä</item>
+        <item>Aina päällä</item>
+        <item>Automaattinen</item>
+    </string-array>
+    <string-array name="notification_preview_options">
+        <item>Näytä nimi ja viesti</item>
+        <item>Näytä nimi</item>
+        <item>Piilota sisältö</item>
+    </string-array>
+    <string-array name="text_sizes">
+        <item>Pieni</item>
+        <item>Normaali</item>
+        <item>Suuri</item>
+        <item>Suurempi</item>
+    </string-array>
+    <string-array name="delayed_sending_labels">
+        <item>Ei viivettä</item>
+        <item>3 sekuntia</item>
+        <item>5 sekuntia</item>
+        <item>10 sekuntia</item>
+    </string-array>
+    <string-array name="mms_sizes">
+        <item>Automaattinen</item>
+        <item>100 kt</item>
+        <item>200 kt</item>
+        <item>300 kt</item>
+        <item>600 kt</item>
+        <item>1000 kt</item>
+        <item>2000 kt</item>
+        <item>Ei pakkausta</item>
+    </string-array>
+    <string-array name="qk_responses">
+        <item>Okei</item>
+        <item>Anna minulle hetki</item>
+        <item>Olen matkalla</item>
+        <item>Kiitos</item>
+        <item>Kuulostaa hyvältä</item>
+        <item>Mitä kuuluu?</item>
+        <item>Sovittu</item>
+        <item>Ei</item>
+        <item>Rakastan sinua</item>
+        <item>Anteeksi</item>
+        <item>LOL</item>
+        <item>Se on okei</item>
+    </string-array>
+</resources>
diff --git a/presentation/src/main/res/values-fr/strings.xml b/presentation/src/main/res/values-fr/strings.xml
index 27ae8db75..7884157be 100644
--- a/presentation/src/main/res/values-fr/strings.xml
+++ b/presentation/src/main/res/values-fr/strings.xml
@@ -1,411 +1,412 @@
-<?xml version="1.0" encoding="utf-8"?>
-<!--
-  ~ Copyright (C) 2019 Moez Bhatti <moez.bhatti@gmail.com>
-  ~
-  ~ This file is part of QKSMS.
-  ~
-  ~ QKSMS is free software: you can redistribute it and/or modify
-  ~ it under the terms of the GNU General Public License as published by
-  ~ the Free Software Foundation, either version 3 of the License, or
-  ~ (at your option) any later version.
-  ~
-  ~ QKSMS is distributed in the hope that it will be useful,
-  ~ but WITHOUT ANY WARRANTY; without even the implied warranty of
-  ~ MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
-  ~ GNU General Public License for more details.
-  ~
-  ~ You should have received a copy of the GNU General Public License
-  ~ along with QKSMS.  If not, see <http://www.gnu.org/licenses/>.
-  -->
-<resources>
-    <string name="shortcut_compose_long_label">Nouvelle conversation</string>
-    <string name="shortcut_compose_short_label">Rédiger</string>
-    <string name="shortcut_compose_disabled_message">Raccourci désactivé</string>
-    <string name="title_archived">Archivées</string>
-    <string name="title_settings">Paramètres</string>
-    <string name="title_notification_prefs">Notifications</string>
-    <string name="title_theme">Thème</string>
-    <string name="title_conversations">Rechercher dans les conversations&#8230;</string>
-    <string name="title_compose">Entrer un nom ou un numéro</string>
-    <string name="setup_skip">Ignorer</string>
-    <string name="setup_next">Continuer</string>
-    <string name="menu_add_person">Ajouter quelqu\'un</string>
-    <string name="menu_call">Appeler</string>
-    <string name="menu_info">Détails</string>
-    <string name="menu_save">Enregistrer dans la galerie</string>
-    <string name="menu_share">Partager</string>
-    <string name="main_drawer_open_cd">Ouvrir le tiroir de navigation</string>
-    <string name="main_title_selected">%d sélectionnée</string>
-    <string name="main_menu_clear">Effacer</string>
-    <string name="main_menu_archive">Archiver</string>
-    <string name="main_menu_unarchive">Désarchiver</string>
-    <string name="main_menu_delete">Supprimer</string>
-    <string name="main_menu_add_contact">Ajouter aux contacts</string>
-    <string name="main_menu_pin">Épingler en haut</string>
-    <string name="main_menu_unpin">Désépingler</string>
-    <string name="main_menu_read">Marquer comme lu</string>
-    <string name="main_menu_unread">Marquer comme non-lu</string>
-    <string name="main_menu_block">Bloquer</string>
-    <string name="main_syncing">Synchronisation des messages&#8230;</string>
-    <string name="main_sender_you">Vous : %s</string>
-    <string name="main_draft">Brouillons</string>
-    <string name="main_message_results_title">Résultats dans les messages</string>
-    <string name="main_message_results">%d messages</string>
-    <string name="inbox_empty_text">Vos conversations apparaîtront ici</string>
-    <string name="inbox_search_empty_text">Aucun résultat</string>
-    <string name="archived_empty_text">Vos conversations archivées apparaîtront ici</string>
-    <string name="main_fab_cd">Débuter une nouvelle conversation</string>
-    <string name="main_default_sms_title">Réapprenez à aimer les textos</string>
-    <string name="main_default_sms_message">Faire de QKSMS votre application SMS par défaut</string>
-    <string name="main_default_sms_change">Changer</string>
-    <string name="main_permission_required">Autorisation requise</string>
-    <string name="main_permission_sms">QKSMS a besoin de l\'autorisation d’envoyer et de consulter des messages SMS</string>
-    <string name="main_permission_contacts">QKSMS a besoin de l\'autorisation d\'accéder aux contacts</string>
-    <string name="main_permission_allow">Autoriser</string>
-    <string name="drawer_inbox">Boite de réception</string>
-    <string name="drawer_archived">Archivées</string>
-    <string name="drawer_scheduled">Programmés</string>
-    <string name="drawer_blocking">Bloquer</string>
-    <string name="drawer_more">Plus</string>
-    <string name="drawer_settings">Paramètres</string>
-    <string name="drawer_help">Aide &amp; commentaire</string>
-    <string name="drawer_invite">Inviter des amis</string>
-    <string name="drawer_plus_banner_summary">Débloquer les nouvelles fonctions sensationnelles et soutenir le développement</string>
-    <string name="rate_title">Vous aimez QKSMS ?</string>
-    <string name="rate_summary">Partagez un peu d’amour et évaluez-nous sur le Play Store !</string>
-    <string name="rate_okay">OK !</string>
-    <string name="rate_dismiss">ANNULER</string>
-    <string name="dialog_delete_title">Supprimer</string>
-    <plurals name="dialog_delete_message">
-        <item quantity="one">Êtes-vous sûr de vouloir supprimer cette conversation ?</item>
-        <item quantity="other">Êtes-vous sûr de vouloir supprimer %d conversations ?</item>
-    </plurals>
-    <string-array name="message_options">
-        <item>Copier le texte</item>
-        <item>Transférer</item>
-        <item>Supprimer</item>
-    </string-array>
-    <string name="compose_number_picker_title">Choisir un numéro de téléphone</string>
-    <string name="compose_number_picker_default">%s • Défaut</string>
-    <string name="compose_number_picker_once">Une seule fois</string>
-    <string name="compose_number_picker_always">Toujours</string>
-    <string name="compose_title_selected">%d sélectionnée</string>
-    <string name="compose_subtitle_results">%1$d sur %2$d résultats</string>
-    <string name="compose_send_group_title">Envoyer en tant que message groupé</string>
-    <string name="compose_send_group_summary">Les destinataires et les réponses seront visibles par tout le monde</string>
-    <string name="compose_messages_empty">C\'est le début de votre conversation. Dites quelque chose de sympa !</string>
-    <string name="compose_vcard_label">Fiche du contact</string>
-    <string name="compose_scheduled_for">Programmé pour</string>
-    <string name="compose_scheduled_future">Le moment choisi doit être dans le futur !</string>
-    <string name="compose_scheduled_plus">Vous devez déverrouiller QKSMS+ pour utiliser la programmation de message</string>
-    <string name="compose_scheduled_toast">Ajouté aux messages programmés</string>
-    <string name="compose_hint">Écrire un message&#8230;</string>
-    <string name="compose_menu_copy">Copier le texte</string>
-    <string name="compose_menu_forward">Transférer</string>
-    <string name="compose_menu_delete">Supprimer</string>
-    <string name="compose_menu_previous">Précédent</string>
-    <string name="compose_menu_next">Suivant</string>
-    <string name="compose_menu_clear">Effacer</string>
-    <string name="compose_details_title">Détails du message</string>
-    <string name="compose_details_type">Type : %s</string>
-    <string name="compose_details_from">De : %s</string>
-    <string name="compose_details_to">À : %s</string>
-    <string name="compose_details_subject">Objet : %s</string>
-    <string name="compose_details_priority">Priorité : %s</string>
-    <string name="compose_details_size">Taille : %s</string>
-    <string name="compose_details_sent">Envoyé : %s</string>
-    <string name="compose_details_received">Reçu : %s</string>
-    <string name="compose_details_delivered">Délivré : %s</string>
-    <string name="compose_details_error_code">Code erreur : %d</string>
-    <string name="compose_attach_cd">Ajouter une pièce jointe</string>
-    <string name="compose_gallery_cd">Joindre une photo</string>
-    <string name="compose_camera_cd">Prendre une photo</string>
-    <string name="compose_schedule_cd">Programmer un message</string>
-    <string name="compose_contact_cd">Joindre un contact</string>
-    <string name="compose_contact_error">Erreur de lecture du contact</string>
-    <!-- Example: SIM 1 (Verizon) selected-->
-    <string name="compose_sim_changed_toast">SIM %1$d (%2$s) sélectionnée</string>
-    <string name="compose_sim_cd">%s sélectionné, changer la carte SIM</string>
-    <string name="compose_send_cd">Envoyer un message</string>
-    <string name="message_status_sending">Envoi&#8230;</string>
-    <string name="message_status_delivered">Délivré %s</string>
-    <string name="message_status_failed">Échec de l\'envoi. Appuyer pour réessayer</string>
-    <string name="info_title">Détails</string>
-    <string name="info_copied_address">Adresse copiée</string>
-    <string name="info_name">Titre de la conversation</string>
-    <string name="info_notifications">Notifications</string>
-    <string name="info_theme">Thème</string>
-    <string name="info_archive">Archiver</string>
-    <string name="info_unarchive">Désarchiver</string>
-    <string name="info_block">Bloquer</string>
-    <string name="info_unblock">Débloquer</string>
-    <string name="info_delete">Supprimer la conversation</string>
-    <string name="gallery_error">Impossible de charger le média</string>
-    <string name="gallery_toast_saved">Enregistré dans la galerie</string>
-    <string name="backup_title">Sauvegarde et restauration</string>
-    <string name="backup_backing_up">Sauvegarde des messages</string>
-    <string name="backup_restoring">Restaurer à partir d\'une sauvegarde</string>
-    <string name="backup_last">Dernière sauvegarde</string>
-    <string name="backup_loading">Chargement&#8230;</string>
-    <string name="backup_never">Jamais</string>
-    <string name="backup_restore_title">Restauration</string>
-    <string name="backup_restore_summary">Sélectionner une sauvegarde</string>
-    <string name="backup_restore_error_plus">Déverrouillez QKSMS+ pour utiliser la sauvegarde et la restauration</string>
-    <string name="backup_restore_error_backup">Sauvegarde en cours&#8230;</string>
-    <string name="backup_restore_error_restore">Restauration en cours&#8230;</string>
-    <string name="backup_restore_confirm_title">Restaurer à partir d’une sauvegarde</string>
-    <string name="backup_restore_confirm_message">Êtes-vous sûr de vouloir restaurer vos messages à partir de cette sauvegarde ?</string>
-    <string name="backup_restore_stop_title">Arrêter la restauration</string>
-    <string name="backup_restore_stop_message">Les messages qui ont déjà été restaurés resteront sur votre appareil</string>
-    <string name="backup_restore_dialog_title">Sauvegardes</string>
-    <string name="backup_restore_dialog_empty">Aucune sauvegarde trouvée</string>
-    <plurals name="backup_message_count">
-        <item quantity="one">%d message</item>
-        <item quantity="other">%d messages</item>
-    </plurals>
-    <string name="backup_disclaimer">Actuellement, seulement la sauvegarde et la restauration des SMS sont pris en charge. Les MMS et les sauvegardes planifiées arriveront bientôt !</string>
-    <string name="backup_now">Sauvegarder maintenant</string>
-    <string name="backup_progress_parsing">Analyse de la sauvegarde&#8230;</string>
-    <string name="backup_progress_running">%d/%d messages</string>
-    <string name="backup_progress_saving">Enregistrement de la sauvegarde&#8230;</string>
-    <string name="backup_progress_syncing">Synchronisation des messages&#8230;</string>
-    <string name="backup_progress_finished">Terminé !</string>
-    <string name="backup_notification_channel_name">Sauvegarder et restaurer</string>
-    <string name="scheduled_title">Programmé</string>
-    <string name="scheduled_empty_description">Envoyer automatiquement un message, au moment précis que vous souhaitez</string>
-    <string name="scheduled_empty_message_1">Hé ! Quand était votre anniversaire déjà ?</string>
-    <string name="scheduled_empty_message_2">C’est le 23 décembre</string>
-    <string name="scheduled_empty_message_3">Joyeux anniversaire ! Regarde le grand ami que je suis, je me souviens de ton anniversaire</string>
-    <!--&#x200A; is a special character required at the end of this string to fix it's formatting in the app -->
-    <string name="scheduled_empty_message_3_timestamp">Envoyé le 23 décembre </string>
-    <string name="scheduled_compose_cd">Programmer un message</string>
-    <string name="scheduled_options_title">Message programmé</string>
-    <string-array name="scheduled_options">
-        <item>Envoyer maintenant</item>
-        <item>Copier le texte</item>
-        <item>Supprimer</item>
-    </string-array>
-    <string name="settings_category_appearance">Apparence</string>
-    <string name="settings_category_general">Général</string>
-    <string name="settings_category_qkreply">Réponse QK</string>
-    <string name="settings_theme_title">Thème</string>
-    <string name="settings_night_title">Mode nuit</string>
-    <string name="settings_black_title">Mode noir pur</string>
-    <string name="settings_night_start_title">Heure de début</string>
-    <string name="settings_night_end_title">Heure de fin</string>
-    <string name="settings_automatic_colors_title">Couleurs de contact automatiques</string>
-    <string name="settings_text_size_title">Taille de la police</string>
-    <string name="settings_system_font_title">Utiliser la police du système</string>
-    <string name="settings_auto_emoji_title">Émoticône automatique</string>
-    <string name="settings_notifications_title">Notifications</string>
-    <string name="settings_notifications_o_summary">Appuyer pour personnaliser</string>
-    <string name="settings_notification_actions_title">Actions</string>
-    <string name="settings_notification_action_1">Bouton 1</string>
-    <string name="settings_notification_action_2">Bouton 2</string>
-    <string name="settings_notification_action_3">Bouton 3</string>
-    <string name="settings_notification_previews_title">Aperçus de notification</string>
-    <string name="settings_notification_wake_title">Réveiller l\'écran</string>
-    <string name="settings_vibration_title">Vibration</string>
-    <string name="settings_ringtone_title">Son</string>
-    <string name="settings_ringtone_none">Aucun</string>
-    <string name="settings_qkreply_title">Réponse QK</string>
-    <string name="settings_qkreply_summary">Fenêtre pour les nouveaux messages</string>
-    <string name="settings_qkreply_tap_dismiss_title">Appuyer pour annuler</string>
-    <string name="settings_qkreply_tap_dismiss_summary">Appuyer en dehors de la fenêtre pour la fermer</string>
-    <string name="settings_delayed_title">Envoi retardé</string>
-    <string name="settings_swipe_actions">Actions de balayage</string>
-    <string name="settings_swipe_actions_summary">Configurer les actions de balayage pour les conversations</string>
-    <string name="settings_swipe_actions_right">Balayage droite</string>
-    <string name="settings_swipe_actions_left">Balayage gauche</string>
-    <string name="settings_swipe_actions_change">MODIFIER</string>
-    <string-array name="settings_swipe_actions">
-        <item>Aucune</item>
-        <item>Archiver</item>
-        <item>Supprimer</item>
-        <item>Bloquer</item>
-        <item>Appeler</item>
-        <item>Marquer comme lu</item>
-        <item>Marquer comme non-lu</item>
-    </string-array>
-    <string name="settings_delivery_title">Accusés de réception</string>
-    <string name="settings_delivery_summary">Demander un accusé de réception pour chaque SMS envoyé</string>
-    <string name="settings_signature_title">Signature</string>
-    <string name="settings_signature_summary">Ajouter une signature à la fin de vos messages</string>
-    <string name="settings_unicode_title">Enlever les accents</string>
-    <string name="settings_unicode_summary">Supprimer les accents des caractères lors de l\'envoi de messages SMS</string>
-    <string name="settings_mobile_title">Numéros de mobile</string>
-    <string name="settings_mobile_summary">Lorsque vous composez un message, afficher uniquement les numéros de mobile</string>
-    <string name="settings_auto_delete">Delete old messages automatically</string>
-    <string name="settings_auto_delete_dialog_message">Messages will be deleted after the specified number of days</string>
-    <string name="settings_auto_delete_dialog_hint">Number of days</string>
-    <string name="settings_auto_delete_never">Never</string>
-    <string name="settings_auto_delete_warning">Delete old messages automatically?</string>
-    <string name="settings_auto_delete_warning_message">If you proceed, %1$d messages will be deleted now</string>
-    <plurals name="settings_auto_delete_summary">
-        <item quantity="one">After 1 day</item>
-        <item quantity="other">After %d days</item>
-    </plurals>
-    <string name="settings_long_as_mms_title">Envoyer les messages longs en MMS</string>
-    <string name="settings_long_as_mms_summary">Si vos messages texte plus longs ne parviennent pas à être envoyés, ou s\'ils sont envoyés dans le désordre, vous pouvez les envoyer sous forme de messages MMS à la place. Des frais supplémentaires peuvent s\'appliquer</string>
-    <string name="settings_mms_size_title">Compresser automatiquement les pièces jointes des MMS</string>
-    <string name="settings_sync_title">Synchroniser les messages</string>
-    <string name="settings_sync_summary">Resynchroniser les messages avec la base de données Android native</string>
-    <string name="settings_about_title">À propos de QKSMS</string>
-    <string name="settings_version">Version %s</string>
-    <string name="settings_logging_enabled">Journal de débogage activé</string>
-    <string name="settings_logging_disabled">Journal de débogage désactivé</string>
-    <string name="settings_delay_duration_hint">Entrez la durée (en secondes)</string>
-    <string name="blocking_title">Blocage</string>
-    <string name="blocking_drop_title">Supprimer les messages</string>
-    <string name="blocking_drop_summary">Supprimer les messages entrants des expéditeurs bloqués au lieu de les masquer</string>
-    <string name="blocking_conversations">Conversations bloquées</string>
-    <string name="blocking_manager_title">Gestionnaire de blocage</string>
-    <string name="blocking_manager_qksms_title">QKSMS</string>
-    <string name="blocking_manager_qksms_summary">Fonction de blocage intégrée dans QKSMS</string>
-    <string name="blocking_manager_call_control_summary">Filtrez automatiquement vos appels et vos messages dans un seul endroit pratique ! La communauté IQ™ vous permet d\'éviter les messages indésirables des spammeurs connus de celle-ci</string>
-    <string name="blocking_manager_sia_summary">Filtrer automatiquement les messages de numéros non sollicités à l’aide de l’application « Devrais-je répondre »</string>
-    <string name="blocking_manager_copy_title">Copier les numéros bloqués</string>
-    <string name="blocking_manager_copy_summary">Utiliser %s et écraser vos numéros bloqués existants</string>
-    <string name="blocked_numbers_title">Numéros bloqués</string>
-    <string name="blocked_numbers_empty">Vos numéros bloqués apparaîtront ici</string>
-    <string name="blocked_numbers_add_cd">Bloquer un nouveau numéro</string>
-    <string name="blocked_numbers_dialog_title">Bloquer les messages de</string>
-    <string name="blocked_numbers_dialog_hint">Numéro de téléphone</string>
-    <string name="blocked_numbers_dialog_block">Bloquer</string>
-    <string name="blocked_messages_title">Messages bloqués</string>
-    <string name="blocked_messages_empty">Vos messages bloqués apparaîtront ici</string>
-    <string name="blocking_block_title">Bloquer</string>
-    <string name="blocking_unblock_title">Débloquer</string>
-    <plurals name="blocking_block_external">
-        <item quantity="one">Continuer avec %s et bloquer ce numéro</item>
-        <item quantity="other">Continuer à %s et bloquer ces numéros</item>
-    </plurals>
-    <plurals name="blocking_unblock_external">
-        <item quantity="one">Continuer avec %s et autoriser ce numéro</item>
-        <item quantity="other">Continuer à %s et autoriser ces numéros</item>
-    </plurals>
-    <string name="about_title">À propos</string>
-    <string name="about_version_title">Version</string>
-    <string name="about_developer_title">Développeur</string>
-    <string name="about_source_title">Code source</string>
-    <string name="about_changelog_title">Liste des modifications</string>
-    <string name="about_contact_title">Contact</string>
-    <string name="about_license_title">Licence</string>
-    <string name="about_copyright_title">Droits d’auteur</string>
-    <string name="qksms_plus_description_title">Soutenir le développement, tout déverrouiller</string>
-    <string name="qksms_plus_description_summary">Vous pouvez sauver un développeur affamé pour seulement %s</string>
-    <!-- Substitutions are for price and currency. Ex: Lifetime upgrade for $1.99 USD -->
-    <string name="qksms_plus_upgrade">Mise à niveau à vie pour %1$s %2$s</string>
-    <!-- Substitutions are for price and currency. Ex: Unlock + donate for $4.99 USD -->
-    <string name="qksms_plus_upgrade_donate">Déverrouiller + faire un don pour %1$s %2$s</string>
-    <string name="qksms_plus_thanks_title">Merci de soutenir QKSMS !</string>
-    <string name="qksms_plus_thanks_summary">Vous avez maintenant accès à toutes les fonctionnalités de QKSMS+</string>
-    <string name="qksms_plus_free_title">QKSMS + est gratuit pour les utilisateurs de F-Droid ! Si vous souhaitez soutenir le développement, n’hésitez pas à faire un don.</string>
-    <string name="qksms_plus_donate">Faire un don avec PayPal</string>
-    <string name="qksms_plus_coming_soon">Prochainement</string>
-    <string name="qksms_plus_themes_title">Thèmes premium</string>
-    <string name="qksms_plus_themes_summary">Débloquer de magnifiques couleurs de thèmes non disponibles dans la palette Material Design</string>
-    <string name="qksms_plus_emoji_title">Émoticône personnalisée</string>
-    <string name="qksms_plus_emoji_summary">Créer des raccourcis d\'émoticône automatique personnalisée</string>
-    <string name="qksms_plus_backup_title">Sauvegarde de message</string>
-    <string name="qksms_plus_backup_summary">Sauvegarder automatiquement vos messages. Plus de soucis de perdre son historique en cas de changement de téléphone ou de perte</string>
-    <string name="qksms_plus_scheduled_title">Messages programmés</string>
-    <string name="qksms_plus_scheduled_summary">Messages programmés pour être automatiquement envoyés à une date et une heure spécifiques</string>
-    <string name="qksms_plus_delayed_title">Envoi retardé</string>
-    <string name="qksms_plus_delayed_summary">Attendre quelques secondes avant d’envoyer votre message</string>
-    <string name="qksms_plus_night_title">Mode nuit automatique</string>
-    <string name="qksms_plus_night_summary">Activer le mode nuit selon l’heure</string>
-    <string name="qksms_plus_blacklist_title">Blocage avancé</string>
-    <string name="qksms_plus_blacklist_summary">Bloquer les messages qui contiennent les mots-clés ou correspondant à un modèle</string>
-    <string name="qksms_plus_forward_title">Transfert automatique</string>
-    <string name="qksms_plus_forward_summary">Transférer automatiquement les messages de certains expéditeurs</string>
-    <string name="qksms_plus_respond_title">Réponse automatique</string>
-    <string name="qksms_plus_respond_summary">Répondre automatiquement aux messages entrants avec une réponse prédéfinie</string>
-    <string name="qksms_plus_more_title">Plus</string>
-    <string name="qksms_plus_more_summary">QKSMS est en cours de développement actif, et votre achat comprendra toutes les futures fonctionnalités QKSMS + !</string>
-    <string name="widget_loading">Chargement&#8230;</string>
-    <string name="widget_more">Afficher plus de conversations</string>
-    <string name="qkreply_menu_read">Marquer comme lu</string>
-    <string name="qkreply_menu_call">Appeler</string>
-    <string name="qkreply_menu_delete">Supprimer</string>
-    <string name="qkreply_menu_expand">Afficher plus</string>
-    <string name="qkreply_menu_collapse">Afficher moins</string>
-    <string name="qkreply_menu_view">Ouvrir la conversation</string>
-    <string name="theme_material">Material</string>
-    <string name="theme_hex">HEX</string>
-    <string name="theme_apply">Appliquer</string>
-    <string-array name="notification_actions">
-        <item>Aucune</item>
-        <item>Archiver</item>
-        <item>Supprimer</item>
-        <item>Bloquer</item>
-        <item>Appeler</item>
-        <item>Marquer comme lu</item>
-        <item>Répondre</item>
-    </string-array>
-    <string name="button_yes">Oui</string>
-    <string name="button_continue">Continuer</string>
-    <string name="button_cancel">Annuler</string>
-    <string name="button_delete">Supprimer</string>
-    <string name="button_save">Enregistrer</string>
-    <string name="button_stop">Arrêter</string>
-    <string name="button_more">Plus</string>
-    <string name="button_set">Choisir</string>
-    <string name="button_undo">Annuler</string>
-    <string name="toast_copied">Copié</string>
-    <string name="toast_archived">Conversation archivée</string>
-    <string name="toast_qksms_plus">Vous devez déverrouiller QKSMS+ pour utiliser cela</string>
-    <plurals name="notification_new_messages">
-        <item quantity="one">Nouveau message</item>
-        <item quantity="other">%s nouveaux messages</item>
-    </plurals>
-    <string name="notification_message_failed_title">Message non envoyé</string>
-    <string name="notification_message_failed_text">Le message à %s n\'a pu être envoyé</string>
-    <string-array name="night_modes">
-        <item>Système</item>
-        <item>Désactivé</item>
-        <item>Toujours activé</item>
-        <item>Automatique</item>
-    </string-array>
-    <string-array name="notification_preview_options">
-        <item>Afficher le nom et le message</item>
-        <item>Afficher le nom</item>
-        <item>Masquer le contenu</item>
-    </string-array>
-    <string-array name="text_sizes">
-        <item>Petit</item>
-        <item>Normal</item>
-        <item>Grand</item>
-        <item>Énorme</item>
-    </string-array>
-    <string-array name="delayed_sending_labels">
-        <item>Aucun retard</item>
-        <item>3 secondes</item>
-        <item>5 secondes</item>
-        <item>10 secondes</item>
-    </string-array>
-    <string-array name="mms_sizes">
-        <item>Automatique</item>
-        <item>100KB</item>
-        <item>200KB</item>
-        <item>300KB</item>
-        <item>600KB</item>
-        <item>1000KB</item>
-        <item>2000KB</item>
-        <item>Pas de compression</item>
-    </string-array>
-    <string-array name="qk_responses">
-        <item>OK</item>
-        <item>Donnez-moi un moment</item>
-        <item>J\'arrive</item>
-        <item>Merci</item>
-        <item>Ça a l\'air bien</item>
-        <item>Quoi de neuf ?</item>
-        <item>D\'accord</item>
-        <item>Non</item>
-        <item>Je t\'aime</item>
-        <item>Désolé</item>
-        <item>LOL</item>
-        <item>C\'est d\'accord</item>
-    </string-array>
-</resources>
+<?xml version="1.0" encoding="utf-8"?>
+<!--
+  ~ Copyright (C) 2019,2021 Moez Bhatti <moez.bhatti@gmail.com>,to268
+  ~
+  ~ This file is part of QKSMS.
+  ~
+  ~ QKSMS is free software: you can redistribute it and/or modify
+  ~ it under the terms of the GNU General Public License as published by
+  ~ the Free Software Foundation, either version 3 of the License, or
+  ~ (at your option) any later version.
+  ~
+  ~ QKSMS is distributed in the hope that it will be useful,
+  ~ but WITHOUT ANY WARRANTY; without even the implied warranty of
+  ~ MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+  ~ GNU General Public License for more details.
+  ~
+  ~ You should have received a copy of the GNU General Public License
+  ~ along with QKSMS.  If not, see <http://www.gnu.org/licenses/>.
+  -->
+<resources>
+    <string name="shortcut_compose_long_label">Nouvelle conversation</string>
+    <string name="shortcut_compose_short_label">Rédiger</string>
+    <string name="shortcut_compose_disabled_message">Raccourci désactivé</string>
+    <string name="title_archived">Archivées</string>
+    <string name="title_settings">Paramètres</string>
+    <string name="title_notification_prefs">Notifications</string>
+    <string name="title_theme">Thème</string>
+    <string name="title_conversations">Rechercher dans les conversations&#8230;</string>
+    <string name="title_compose">Entrer un nom ou un numéro</string>
+    <string name="setup_skip">Ignorer</string>
+    <string name="setup_next">Continuer</string>
+    <string name="menu_add_person">Ajouter quelqu\'un</string>
+    <string name="menu_call">Appeler</string>
+    <string name="menu_info">Détails</string>
+    <string name="menu_save">Enregistrer dans la galerie</string>
+    <string name="menu_share">Partager</string>
+    <string name="main_drawer_open_cd">Ouvrir le tiroir de navigation</string>
+    <string name="main_title_selected">%d sélectionnée</string>
+    <string name="main_menu_clear">Effacer</string>
+    <string name="main_menu_archive">Archiver</string>
+    <string name="main_menu_unarchive">Désarchiver</string>
+    <string name="main_menu_delete">Supprimer</string>
+    <string name="main_menu_add_contact">Ajouter aux contacts</string>
+    <string name="main_menu_pin">Épingler en haut</string>
+    <string name="main_menu_unpin">Désépingler</string>
+    <string name="main_menu_read">Marquer comme lu</string>
+    <string name="main_menu_unread">Marquer comme non-lu</string>
+    <string name="main_menu_block">Bloquer</string>
+    <string name="main_syncing">Synchronisation des messages&#8230;</string>
+    <string name="main_sender_you">Vous : %s</string>
+    <string name="main_draft">Brouillons</string>
+    <string name="main_message_results_title">Résultats dans les messages</string>
+    <string name="main_message_results">%d messages</string>
+    <string name="inbox_empty_text">Vos conversations apparaîtront ici</string>
+    <string name="inbox_search_empty_text">Aucun résultat</string>
+    <string name="archived_empty_text">Vos conversations archivées apparaîtront ici</string>
+    <string name="main_fab_cd">Débuter une nouvelle conversation</string>
+    <string name="main_default_sms_title">Réapprenez à aimer les textos</string>
+    <string name="main_default_sms_message">Faire de QKSMS votre application SMS par défaut</string>
+    <string name="main_default_sms_change">Changer</string>
+    <string name="main_permission_required">Autorisation requise</string>
+    <string name="main_permission_sms">QKSMS a besoin de l\'autorisation d’envoyer et de consulter des messages SMS</string>
+    <string name="main_permission_contacts">QKSMS a besoin de l\'autorisation d\'accéder aux contacts</string>
+    <string name="main_permission_allow">Autoriser</string>
+    <string name="drawer_inbox">Boite de réception</string>
+    <string name="drawer_archived">Archivées</string>
+    <string name="drawer_scheduled">Programmés</string>
+    <string name="drawer_blocking">Bloquer</string>
+    <string name="drawer_more">Plus</string>
+    <string name="drawer_settings">Paramètres</string>
+    <string name="drawer_help">Aide &amp; commentaire</string>
+    <string name="drawer_invite">Inviter des amis</string>
+    <string name="drawer_plus_banner_summary">Débloquer les nouvelles fonctions sensationnelles et soutenir le développement</string>
+    <string name="rate_title">Vous aimez QKSMS ?</string>
+    <string name="rate_summary">Partagez un peu d’amour et évaluez-nous sur le Play Store !</string>
+    <string name="rate_okay">OK !</string>
+    <string name="rate_dismiss">ANNULER</string>
+    <string name="dialog_delete_title">Supprimer</string>
+    <plurals name="dialog_delete_message">
+        <item quantity="one">Êtes-vous sûr de vouloir supprimer cette conversation ?</item>
+        <item quantity="other">Êtes-vous sûr de vouloir supprimer %d conversations ?</item>
+    </plurals>
+    <string-array name="message_options">
+        <item>Copier le texte</item>
+        <item>Transférer</item>
+        <item>Supprimer</item>
+    </string-array>
+    <string name="compose_number_picker_title">Choisir un numéro de téléphone</string>
+    <string name="compose_number_picker_default">%s • Défaut</string>
+    <string name="compose_number_picker_once">Une seule fois</string>
+    <string name="compose_number_picker_always">Toujours</string>
+    <string name="compose_title_selected">%d sélectionnée</string>
+    <string name="compose_subtitle_results">%1$d sur %2$d résultats</string>
+    <string name="compose_send_group_title">Envoyer en tant que message groupé</string>
+    <string name="compose_send_group_summary">Les destinataires et les réponses seront visibles par tout le monde</string>
+    <string name="compose_messages_empty">C\'est le début de votre conversation. Dites quelque chose de sympa !</string>
+    <string name="compose_vcard_label">Fiche du contact</string>
+    <string name="compose_scheduled_for">Programmé pour</string>
+    <string name="compose_scheduled_future">Le moment choisi doit être dans le futur !</string>
+    <string name="compose_scheduled_plus">Vous devez déverrouiller QKSMS+ pour utiliser la programmation de message</string>
+    <string name="compose_scheduled_toast">Ajouté aux messages programmés</string>
+    <string name="compose_hint">Écrire un message&#8230;</string>
+    <string name="compose_menu_copy">Copier le texte</string>
+    <string name="compose_menu_forward">Transférer</string>
+    <string name="compose_menu_speech">Énoncer le texte</string>
+    <string name="compose_menu_delete">Supprimer</string>
+    <string name="compose_menu_previous">Précédent</string>
+    <string name="compose_menu_next">Suivant</string>
+    <string name="compose_menu_clear">Effacer</string>
+    <string name="compose_details_title">Détails du message</string>
+    <string name="compose_details_type">Type : %s</string>
+    <string name="compose_details_from">De : %s</string>
+    <string name="compose_details_to">À : %s</string>
+    <string name="compose_details_subject">Objet : %s</string>
+    <string name="compose_details_priority">Priorité : %s</string>
+    <string name="compose_details_size">Taille : %s</string>
+    <string name="compose_details_sent">Envoyé : %s</string>
+    <string name="compose_details_received">Reçu : %s</string>
+    <string name="compose_details_delivered">Délivré : %s</string>
+    <string name="compose_details_error_code">Code erreur : %d</string>
+    <string name="compose_attach_cd">Ajouter une pièce jointe</string>
+    <string name="compose_gallery_cd">Joindre une photo</string>
+    <string name="compose_camera_cd">Prendre une photo</string>
+    <string name="compose_schedule_cd">Programmer un message</string>
+    <string name="compose_contact_cd">Joindre un contact</string>
+    <string name="compose_contact_error">Erreur de lecture du contact</string>
+    <!-- Example: SIM 1 (Verizon) selected-->
+    <string name="compose_sim_changed_toast">SIM %1$d (%2$s) sélectionnée</string>
+    <string name="compose_sim_cd">%s sélectionné, changer la carte SIM</string>
+    <string name="compose_send_cd">Envoyer un message</string>
+    <string name="message_status_sending">Envoi&#8230;</string>
+    <string name="message_status_delivered">Délivré %s</string>
+    <string name="message_status_failed">Échec de l\'envoi. Appuyer pour réessayer</string>
+    <string name="info_title">Détails</string>
+    <string name="info_copied_address">Adresse copiée</string>
+    <string name="info_name">Titre de la conversation</string>
+    <string name="info_notifications">Notifications</string>
+    <string name="info_theme">Thème</string>
+    <string name="info_archive">Archiver</string>
+    <string name="info_unarchive">Désarchiver</string>
+    <string name="info_block">Bloquer</string>
+    <string name="info_unblock">Débloquer</string>
+    <string name="info_delete">Supprimer la conversation</string>
+    <string name="gallery_error">Impossible de charger le média</string>
+    <string name="gallery_toast_saved">Enregistré dans la galerie</string>
+    <string name="backup_title">Sauvegarde et restauration</string>
+    <string name="backup_backing_up">Sauvegarde des messages</string>
+    <string name="backup_restoring">Restaurer à partir d\'une sauvegarde</string>
+    <string name="backup_last">Dernière sauvegarde</string>
+    <string name="backup_loading">Chargement&#8230;</string>
+    <string name="backup_never">Jamais</string>
+    <string name="backup_restore_title">Restauration</string>
+    <string name="backup_restore_summary">Sélectionner une sauvegarde</string>
+    <string name="backup_restore_error_plus">Déverrouillez QKSMS+ pour utiliser la sauvegarde et la restauration</string>
+    <string name="backup_restore_error_backup">Sauvegarde en cours&#8230;</string>
+    <string name="backup_restore_error_restore">Restauration en cours&#8230;</string>
+    <string name="backup_restore_confirm_title">Restaurer à partir d’une sauvegarde</string>
+    <string name="backup_restore_confirm_message">Êtes-vous sûr de vouloir restaurer vos messages à partir de cette sauvegarde ?</string>
+    <string name="backup_restore_stop_title">Arrêter la restauration</string>
+    <string name="backup_restore_stop_message">Les messages qui ont déjà été restaurés resteront sur votre appareil</string>
+    <string name="backup_restore_dialog_title">Sauvegardes</string>
+    <string name="backup_restore_dialog_empty">Aucune sauvegarde trouvée</string>
+    <plurals name="backup_message_count">
+        <item quantity="one">%d message</item>
+        <item quantity="other">%d messages</item>
+    </plurals>
+    <string name="backup_disclaimer">Actuellement, seulement la sauvegarde et la restauration des SMS sont pris en charge. Les MMS et les sauvegardes planifiées arriveront bientôt !</string>
+    <string name="backup_now">Sauvegarder maintenant</string>
+    <string name="backup_progress_parsing">Analyse de la sauvegarde&#8230;</string>
+    <string name="backup_progress_running">%d/%d messages</string>
+    <string name="backup_progress_saving">Enregistrement de la sauvegarde&#8230;</string>
+    <string name="backup_progress_syncing">Synchronisation des messages&#8230;</string>
+    <string name="backup_progress_finished">Terminé !</string>
+    <string name="backup_notification_channel_name">Sauvegarder et restaurer</string>
+    <string name="scheduled_title">Programmé</string>
+    <string name="scheduled_empty_description">Envoyer automatiquement un message, au moment précis que vous souhaitez</string>
+    <string name="scheduled_empty_message_1">Hé ! Quand était votre anniversaire déjà ?</string>
+    <string name="scheduled_empty_message_2">C’est le 23 décembre</string>
+    <string name="scheduled_empty_message_3">Joyeux anniversaire ! Regarde le grand ami que je suis, je me souviens de ton anniversaire</string>
+    <!--&#x200A; is a special character required at the end of this string to fix it's formatting in the app -->
+    <string name="scheduled_empty_message_3_timestamp">Envoyé le 23 décembre </string>
+    <string name="scheduled_compose_cd">Programmer un message</string>
+    <string name="scheduled_options_title">Message programmé</string>
+    <string-array name="scheduled_options">
+        <item>Envoyer maintenant</item>
+        <item>Copier le texte</item>
+        <item>Supprimer</item>
+    </string-array>
+    <string name="settings_category_appearance">Apparence</string>
+    <string name="settings_category_general">Général</string>
+    <string name="settings_category_qkreply">Réponse QK</string>
+    <string name="settings_theme_title">Thème</string>
+    <string name="settings_night_title">Mode nuit</string>
+    <string name="settings_black_title">Mode noir pur</string>
+    <string name="settings_night_start_title">Heure de début</string>
+    <string name="settings_night_end_title">Heure de fin</string>
+    <string name="settings_automatic_colors_title">Couleurs de contact automatiques</string>
+    <string name="settings_text_size_title">Taille de la police</string>
+    <string name="settings_system_font_title">Utiliser la police du système</string>
+    <string name="settings_auto_emoji_title">Émoticône automatique</string>
+    <string name="settings_notifications_title">Notifications</string>
+    <string name="settings_notifications_o_summary">Appuyer pour personnaliser</string>
+    <string name="settings_notification_actions_title">Actions</string>
+    <string name="settings_notification_action_1">Bouton 1</string>
+    <string name="settings_notification_action_2">Bouton 2</string>
+    <string name="settings_notification_action_3">Bouton 3</string>
+    <string name="settings_notification_previews_title">Aperçus de notification</string>
+    <string name="settings_notification_wake_title">Réveiller l\'écran</string>
+    <string name="settings_vibration_title">Vibration</string>
+    <string name="settings_ringtone_title">Son</string>
+    <string name="settings_ringtone_none">Aucun</string>
+    <string name="settings_qkreply_title">Réponse QK</string>
+    <string name="settings_qkreply_summary">Fenêtre pour les nouveaux messages</string>
+    <string name="settings_qkreply_tap_dismiss_title">Appuyer pour annuler</string>
+    <string name="settings_qkreply_tap_dismiss_summary">Appuyer en dehors de la fenêtre pour la fermer</string>
+    <string name="settings_delayed_title">Envoi retardé</string>
+    <string name="settings_swipe_actions">Actions de balayage</string>
+    <string name="settings_swipe_actions_summary">Configurer les actions de balayage pour les conversations</string>
+    <string name="settings_swipe_actions_right">Balayage droite</string>
+    <string name="settings_swipe_actions_left">Balayage gauche</string>
+    <string name="settings_swipe_actions_change">MODIFIER</string>
+    <string-array name="settings_swipe_actions">
+        <item>Aucune</item>
+        <item>Archiver</item>
+        <item>Supprimer</item>
+        <item>Bloquer</item>
+        <item>Appeler</item>
+        <item>Marquer comme lu</item>
+        <item>Marquer comme non-lu</item>
+    </string-array>
+    <string name="settings_delivery_title">Accusés de réception</string>
+    <string name="settings_delivery_summary">Demander un accusé de réception pour chaque SMS envoyé</string>
+    <string name="settings_signature_title">Signature</string>
+    <string name="settings_signature_summary">Ajouter une signature à la fin de vos messages</string>
+    <string name="settings_unicode_title">Enlever les accents</string>
+    <string name="settings_unicode_summary">Supprimer les accents des caractères lors de l\'envoi de messages SMS</string>
+    <string name="settings_mobile_title">Numéros de mobile</string>
+    <string name="settings_mobile_summary">Lorsque vous composez un message, afficher uniquement les numéros de mobile</string>
+    <string name="settings_auto_delete">Delete old messages automatically</string>
+    <string name="settings_auto_delete_dialog_message">Messages will be deleted after the specified number of days</string>
+    <string name="settings_auto_delete_dialog_hint">Number of days</string>
+    <string name="settings_auto_delete_never">Never</string>
+    <string name="settings_auto_delete_warning">Delete old messages automatically?</string>
+    <string name="settings_auto_delete_warning_message">If you proceed, %1$d messages will be deleted now</string>
+    <plurals name="settings_auto_delete_summary">
+        <item quantity="one">After 1 day</item>
+        <item quantity="other">After %d days</item>
+    </plurals>
+    <string name="settings_long_as_mms_title">Envoyer les messages longs en MMS</string>
+    <string name="settings_long_as_mms_summary">Si vos messages texte plus longs ne parviennent pas à être envoyés, ou s\'ils sont envoyés dans le désordre, vous pouvez les envoyer sous forme de messages MMS à la place. Des frais supplémentaires peuvent s\'appliquer</string>
+    <string name="settings_mms_size_title">Compresser automatiquement les pièces jointes des MMS</string>
+    <string name="settings_sync_title">Synchroniser les messages</string>
+    <string name="settings_sync_summary">Resynchroniser les messages avec la base de données Android native</string>
+    <string name="settings_about_title">À propos de QKSMS</string>
+    <string name="settings_version">Version %s</string>
+    <string name="settings_logging_enabled">Journal de débogage activé</string>
+    <string name="settings_logging_disabled">Journal de débogage désactivé</string>
+    <string name="settings_delay_duration_hint">Entrez la durée (en secondes)</string>
+    <string name="blocking_title">Blocage</string>
+    <string name="blocking_drop_title">Supprimer les messages</string>
+    <string name="blocking_drop_summary">Supprimer les messages entrants des expéditeurs bloqués au lieu de les masquer</string>
+    <string name="blocking_conversations">Conversations bloquées</string>
+    <string name="blocking_manager_title">Gestionnaire de blocage</string>
+    <string name="blocking_manager_qksms_title">QKSMS</string>
+    <string name="blocking_manager_qksms_summary">Fonction de blocage intégrée dans QKSMS</string>
+    <string name="blocking_manager_call_control_summary">Filtrez automatiquement vos appels et vos messages dans un seul endroit pratique ! La communauté IQ™ vous permet d\'éviter les messages indésirables des spammeurs connus de celle-ci</string>
+    <string name="blocking_manager_sia_summary">Filtrer automatiquement les messages de numéros non sollicités à l’aide de l’application « Devrais-je répondre »</string>
+    <string name="blocking_manager_copy_title">Copier les numéros bloqués</string>
+    <string name="blocking_manager_copy_summary">Utiliser %s et écraser vos numéros bloqués existants</string>
+    <string name="blocked_numbers_title">Numéros bloqués</string>
+    <string name="blocked_numbers_empty">Vos numéros bloqués apparaîtront ici</string>
+    <string name="blocked_numbers_add_cd">Bloquer un nouveau numéro</string>
+    <string name="blocked_numbers_dialog_title">Bloquer les messages de</string>
+    <string name="blocked_numbers_dialog_hint">Numéro de téléphone</string>
+    <string name="blocked_numbers_dialog_block">Bloquer</string>
+    <string name="blocked_messages_title">Messages bloqués</string>
+    <string name="blocked_messages_empty">Vos messages bloqués apparaîtront ici</string>
+    <string name="blocking_block_title">Bloquer</string>
+    <string name="blocking_unblock_title">Débloquer</string>
+    <plurals name="blocking_block_external">
+        <item quantity="one">Continuer avec %s et bloquer ce numéro</item>
+        <item quantity="other">Continuer à %s et bloquer ces numéros</item>
+    </plurals>
+    <plurals name="blocking_unblock_external">
+        <item quantity="one">Continuer avec %s et autoriser ce numéro</item>
+        <item quantity="other">Continuer à %s et autoriser ces numéros</item>
+    </plurals>
+    <string name="about_title">À propos</string>
+    <string name="about_version_title">Version</string>
+    <string name="about_developer_title">Développeur</string>
+    <string name="about_source_title">Code source</string>
+    <string name="about_changelog_title">Liste des modifications</string>
+    <string name="about_contact_title">Contact</string>
+    <string name="about_license_title">Licence</string>
+    <string name="about_copyright_title">Droits d’auteur</string>
+    <string name="qksms_plus_description_title">Soutenir le développement, tout déverrouiller</string>
+    <string name="qksms_plus_description_summary">Vous pouvez sauver un développeur affamé pour seulement %s</string>
+    <!-- Substitutions are for price and currency. Ex: Lifetime upgrade for $1.99 USD -->
+    <string name="qksms_plus_upgrade">Mise à niveau à vie pour %1$s %2$s</string>
+    <!-- Substitutions are for price and currency. Ex: Unlock + donate for $4.99 USD -->
+    <string name="qksms_plus_upgrade_donate">Déverrouiller + faire un don pour %1$s %2$s</string>
+    <string name="qksms_plus_thanks_title">Merci de soutenir QKSMS !</string>
+    <string name="qksms_plus_thanks_summary">Vous avez maintenant accès à toutes les fonctionnalités de QKSMS+</string>
+    <string name="qksms_plus_free_title">QKSMS + est gratuit pour les utilisateurs de F-Droid ! Si vous souhaitez soutenir le développement, n’hésitez pas à faire un don.</string>
+    <string name="qksms_plus_donate">Faire un don avec PayPal</string>
+    <string name="qksms_plus_coming_soon">Prochainement</string>
+    <string name="qksms_plus_themes_title">Thèmes premium</string>
+    <string name="qksms_plus_themes_summary">Débloquer de magnifiques couleurs de thèmes non disponibles dans la palette Material Design</string>
+    <string name="qksms_plus_emoji_title">Émoticône personnalisée</string>
+    <string name="qksms_plus_emoji_summary">Créer des raccourcis d\'émoticône automatique personnalisée</string>
+    <string name="qksms_plus_backup_title">Sauvegarde de message</string>
+    <string name="qksms_plus_backup_summary">Sauvegarder automatiquement vos messages. Plus de soucis de perdre son historique en cas de changement de téléphone ou de perte</string>
+    <string name="qksms_plus_scheduled_title">Messages programmés</string>
+    <string name="qksms_plus_scheduled_summary">Messages programmés pour être automatiquement envoyés à une date et une heure spécifiques</string>
+    <string name="qksms_plus_delayed_title">Envoi retardé</string>
+    <string name="qksms_plus_delayed_summary">Attendre quelques secondes avant d’envoyer votre message</string>
+    <string name="qksms_plus_night_title">Mode nuit automatique</string>
+    <string name="qksms_plus_night_summary">Activer le mode nuit selon l’heure</string>
+    <string name="qksms_plus_blacklist_title">Blocage avancé</string>
+    <string name="qksms_plus_blacklist_summary">Bloquer les messages qui contiennent les mots-clés ou correspondant à un modèle</string>
+    <string name="qksms_plus_forward_title">Transfert automatique</string>
+    <string name="qksms_plus_forward_summary">Transférer automatiquement les messages de certains expéditeurs</string>
+    <string name="qksms_plus_respond_title">Réponse automatique</string>
+    <string name="qksms_plus_respond_summary">Répondre automatiquement aux messages entrants avec une réponse prédéfinie</string>
+    <string name="qksms_plus_more_title">Plus</string>
+    <string name="qksms_plus_more_summary">QKSMS est en cours de développement actif, et votre achat comprendra toutes les futures fonctionnalités QKSMS + !</string>
+    <string name="widget_loading">Chargement&#8230;</string>
+    <string name="widget_more">Afficher plus de conversations</string>
+    <string name="qkreply_menu_read">Marquer comme lu</string>
+    <string name="qkreply_menu_call">Appeler</string>
+    <string name="qkreply_menu_delete">Supprimer</string>
+    <string name="qkreply_menu_expand">Afficher plus</string>
+    <string name="qkreply_menu_collapse">Afficher moins</string>
+    <string name="qkreply_menu_view">Ouvrir la conversation</string>
+    <string name="theme_material">Material</string>
+    <string name="theme_hex">HEX</string>
+    <string name="theme_apply">Appliquer</string>
+    <string-array name="notification_actions">
+        <item>Aucune</item>
+        <item>Archiver</item>
+        <item>Supprimer</item>
+        <item>Bloquer</item>
+        <item>Appeler</item>
+        <item>Marquer comme lu</item>
+        <item>Répondre</item>
+    </string-array>
+    <string name="button_yes">Oui</string>
+    <string name="button_continue">Continuer</string>
+    <string name="button_cancel">Annuler</string>
+    <string name="button_delete">Supprimer</string>
+    <string name="button_save">Enregistrer</string>
+    <string name="button_stop">Arrêter</string>
+    <string name="button_more">Plus</string>
+    <string name="button_set">Choisir</string>
+    <string name="button_undo">Annuler</string>
+    <string name="toast_copied">Copié</string>
+    <string name="toast_archived">Conversation archivée</string>
+    <string name="toast_qksms_plus">Vous devez déverrouiller QKSMS+ pour utiliser cela</string>
+    <plurals name="notification_new_messages">
+        <item quantity="one">Nouveau message</item>
+        <item quantity="other">%s nouveaux messages</item>
+    </plurals>
+    <string name="notification_message_failed_title">Message non envoyé</string>
+    <string name="notification_message_failed_text">Le message à %s n\'a pu être envoyé</string>
+    <string-array name="night_modes">
+        <item>Système</item>
+        <item>Désactivé</item>
+        <item>Toujours activé</item>
+        <item>Automatique</item>
+    </string-array>
+    <string-array name="notification_preview_options">
+        <item>Afficher le nom et le message</item>
+        <item>Afficher le nom</item>
+        <item>Masquer le contenu</item>
+    </string-array>
+    <string-array name="text_sizes">
+        <item>Petit</item>
+        <item>Normal</item>
+        <item>Grand</item>
+        <item>Énorme</item>
+    </string-array>
+    <string-array name="delayed_sending_labels">
+        <item>Aucun retard</item>
+        <item>3 secondes</item>
+        <item>5 secondes</item>
+        <item>10 secondes</item>
+    </string-array>
+    <string-array name="mms_sizes">
+        <item>Automatique</item>
+        <item>100KB</item>
+        <item>200KB</item>
+        <item>300KB</item>
+        <item>600KB</item>
+        <item>1000KB</item>
+        <item>2000KB</item>
+        <item>Pas de compression</item>
+    </string-array>
+    <string-array name="qk_responses">
+        <item>OK</item>
+        <item>Donnez-moi un moment</item>
+        <item>J\'arrive</item>
+        <item>Merci</item>
+        <item>Ça a l\'air bien</item>
+        <item>Quoi de neuf ?</item>
+        <item>D\'accord</item>
+        <item>Non</item>
+        <item>Je t\'aime</item>
+        <item>Désolé</item>
+        <item>LOL</item>
+        <item>C\'est d\'accord</item>
+    </string-array>
+</resources>
diff --git a/presentation/src/main/res/values-hi/strings.xml b/presentation/src/main/res/values-hi/strings.xml
index 2116b8ecf..e83706ae8 100644
--- a/presentation/src/main/res/values-hi/strings.xml
+++ b/presentation/src/main/res/values-hi/strings.xml
@@ -1,411 +1,411 @@
-<?xml version="1.0" encoding="utf-8"?>
-<!--
-  ~ Copyright (C) 2019 Moez Bhatti <moez.bhatti@gmail.com>
-  ~
-  ~ This file is part of QKSMS.
-  ~
-  ~ QKSMS is free software: you can redistribute it and/or modify
-  ~ it under the terms of the GNU General Public License as published by
-  ~ the Free Software Foundation, either version 3 of the License, or
-  ~ (at your option) any later version.
-  ~
-  ~ QKSMS is distributed in the hope that it will be useful,
-  ~ but WITHOUT ANY WARRANTY; without even the implied warranty of
-  ~ MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
-  ~ GNU General Public License for more details.
-  ~
-  ~ You should have received a copy of the GNU General Public License
-  ~ along with QKSMS.  If not, see <http://www.gnu.org/licenses/>.
-  -->
-<resources>
-    <string name="shortcut_compose_long_label">नई बातचीत</string>
-    <string name="shortcut_compose_short_label">रचना</string>
-    <string name="shortcut_compose_disabled_message">शॉर्टकट अक्षम किया गया</string>
-    <string name="title_archived">संग्रहीत</string>
-    <string name="title_settings">सेटिंग्स</string>
-    <string name="title_notification_prefs">सूचनाएं</string>
-    <string name="title_theme">विषय</string>
-    <string name="title_conversations">इनबॉक्स खोजें&#8230;</string>
-    <string name="title_compose">रचना</string>
-    <string name="setup_skip">छोड़</string>
-    <string name="setup_next">जारी रखें</string>
-    <string name="menu_add_person">Add person</string>
-    <string name="menu_call">कॉल</string>
-    <string name="menu_info">विवरण</string>
-    <string name="menu_save">गैलरी में सहेजें</string>
-    <string name="menu_share">Share</string>
-    <string name="main_drawer_open_cd">खुला नेविगेशन दराज</string>
-    <string name="main_title_selected">%d चयनित</string>
-    <string name="main_menu_clear">साफ करें</string>
-    <string name="main_menu_archive">संग्रह</string>
-    <string name="main_menu_unarchive">असंग्रहित</string>
-    <string name="main_menu_delete">हटाएँ</string>
-    <string name="main_menu_add_contact">Add to contacts</string>
-    <string name="main_menu_pin">शीर्ष पर पिन करें</string>
-    <string name="main_menu_unpin">अनपिन</string>
-    <string name="main_menu_read">Mark read</string>
-    <string name="main_menu_unread">Mark unread</string>
-    <string name="main_menu_block">ब्लॉक</string>
-    <string name="main_syncing">संदेशों को सिंक्रनाइज़ कर रहा है.. ।</string>
-    <string name="main_sender_you">आप: %s</string>
-    <string name="main_draft">Draft</string>
-    <string name="main_message_results_title">संदेशों में परिणाम</string>
-    <string name="main_message_results">%d संदेश</string>
-    <string name="inbox_empty_text">आपकी बातचीत यहां दिखाई देगी</string>
-    <string name="inbox_search_empty_text">कोई परिणाम नहीं</string>
-    <string name="archived_empty_text">आपके संग्रहीत वार्तालाप यहां दिखाई देंगे</string>
-    <string name="main_fab_cd">नई वार्तालाप प्रारंभ करें</string>
-    <string name="main_default_sms_title">फिर से टेक्स्टिंग करिये</string>
-    <string name="main_default_sms_message">QKSMS अपना डिफ़ॉल्ट SMS एप्लिकेशन बनाएं</string>
-    <string name="main_default_sms_change">बदलें</string>
-    <string name="main_permission_required">अनुमति आवश्यक</string>
-    <string name="main_permission_sms">QKSMS भेजने और एसएमएस संदेश देखने के लिए अनुमति की जरूरत है</string>
-    <string name="main_permission_contacts">QKSMS अपने संपर्कों को देखने के लिए अनुमति की जरूरत है</string>
-    <string name="main_permission_allow">अनुमति दे</string>
-    <string name="drawer_inbox">इनबॉक्स</string>
-    <string name="drawer_archived">संग्रहीत</string>
-    <string name="drawer_scheduled">अनुसूचित</string>
-    <string name="drawer_blocking">अवरुद्ध</string>
-    <string name="drawer_more">और</string>
-    <string name="drawer_settings">सेटिंग्स</string>
-    <string name="drawer_help">मदद और प्रतिक्रिया</string>
-    <string name="drawer_invite">मित्रों को आमंत्रित करें</string>
-    <string name="drawer_plus_banner_summary">अद्भुत नई सुविधाओं को अनलॉक करें, और विकास का समर्थन करें</string>
-    <string name="rate_title">QKSMS का आनंद ले रहे?</string>
-    <string name="rate_summary">कुछ प्यार साझा करें और गूगल प्ले पर हमें मूल्यांकन करें</string>
-    <string name="rate_okay">ठीक!</string>
-    <string name="rate_dismiss">खारिज</string>
-    <string name="dialog_delete_title">हटाएँ</string>
-    <plurals name="dialog_delete_message">
-        <item quantity="one">क्या आप वाकई इस वार्तालाप को हटाना चाहते हैं?</item>
-        <item quantity="other">क्या आप वाकई %d वार्तालापों को हटाना चाहते हैं?</item>
-    </plurals>
-    <string-array name="message_options">
-        <item>पाठ की प्रतिलिपि बनाएं</item>
-        <item>अग्रेषित करें</item>
-        <item>मिटाएँ</item>
-    </string-array>
-    <string name="compose_number_picker_title">Choose a phone number</string>
-    <string name="compose_number_picker_default">%s ∙ Default</string>
-    <string name="compose_number_picker_once">Just once</string>
-    <string name="compose_number_picker_always">Always</string>
-    <string name="compose_title_selected">%d चयनित</string>
-    <string name="compose_subtitle_results">%1$d के %2$d परिणाम</string>
-    <string name="compose_send_group_title">समूह संदेश के रूप में भेजें</string>
-    <string name="compose_send_group_summary">प्राप्तकर्ता और उत्तर सभी को दिखाई देंगे</string>
-    <string name="compose_messages_empty">यह आपकी बातचीत की शुरुआत है । कुछ अच्छा कहिये!</string>
-    <string name="compose_vcard_label">संपर्क कार्ड</string>
-    <string name="compose_scheduled_for">के लिए निर्धारित</string>
-    <string name="compose_scheduled_future">चयनित समय भविष्य में होना चाहिए!</string>
-    <string name="compose_scheduled_plus">आप QKSMS + अनुसूचित संदेश का उपयोग करने के लिए अनलॉक करना होगा</string>
-    <string name="compose_scheduled_toast">अनुसूचित संदेशों में जोड़ा गया</string>
-    <string name="compose_hint">संदेश लिखें</string>
-    <string name="compose_menu_copy">पाठ की प्रतिलिपि बनाएं</string>
-    <string name="compose_menu_forward">आगे</string>
-    <string name="compose_menu_delete">मिटायें</string>
-    <string name="compose_menu_previous">पिछला</string>
-    <string name="compose_menu_next">अगला</string>
-    <string name="compose_menu_clear">साफ करें</string>
-    <string name="compose_details_title">संदेश विवरण</string>
-    <string name="compose_details_type">टाइप %s</string>
-    <string name="compose_details_from">से: %s</string>
-    <string name="compose_details_to">को: %s</string>
-    <string name="compose_details_subject">विषय: %s</string>
-    <string name="compose_details_priority">महत्व: %s</string>
-    <string name="compose_details_size">आकार: %s</string>
-    <string name="compose_details_sent">भेजा गया: %s</string>
-    <string name="compose_details_received">प्राप्त: %s</string>
-    <string name="compose_details_delivered">वितरित: %s</string>
-    <string name="compose_details_error_code">त्रुटि संकेत: %d</string>
-    <string name="compose_attach_cd">Add an attachment</string>
-    <string name="compose_gallery_cd">चित्र संलग्न करें</string>
-    <string name="compose_camera_cd">चित्र खिंचे</string>
-    <string name="compose_schedule_cd">संदेश अनुसूचित करें</string>
-    <string name="compose_contact_cd">Attach a contact</string>
-    <string name="compose_contact_error">Error reading contact</string>
-    <!-- Example: SIM 1 (Verizon) selected-->
-    <string name="compose_sim_changed_toast">SIM %1$d (%2$s) selected</string>
-    <string name="compose_sim_cd">%s selected, change SIM card</string>
-    <string name="compose_send_cd">संदेश भेजें</string>
-    <string name="message_status_sending">भेज रहा है&#8230;</string>
-    <string name="message_status_delivered">%s वितरित</string>
-    <string name="message_status_failed">भेजने में असफल। पुनः प्रयास करें</string>
-    <string name="info_title">विवरण</string>
-    <string name="info_copied_address">Address copied</string>
-    <string name="info_name">Conversation title</string>
-    <string name="info_notifications">अधिसूचनाएँ</string>
-    <string name="info_theme">थीम</string>
-    <string name="info_archive">संग्रह</string>
-    <string name="info_unarchive">Unarchive</string>
-    <string name="info_block">अवरुदध करें</string>
-    <string name="info_unblock">Unblock</string>
-    <string name="info_delete">वार्तालाप मिटाऐं</string>
-    <string name="gallery_error">Couldn\'t load media</string>
-    <string name="gallery_toast_saved">गैलरी मैं सेव किया गया है</string>
-    <string name="backup_title">Backup and restore</string>
-    <string name="backup_backing_up">Backing up messages</string>
-    <string name="backup_restoring">Restoring from backup</string>
-    <string name="backup_last">पिछला बेकप</string>
-    <string name="backup_loading">लोड हो रहा है...</string>
-    <string name="backup_never">कभी नहीं</string>
-    <string name="backup_restore_title">Restore</string>
-    <string name="backup_restore_summary">किसी बैकअप का चयन करें</string>
-    <string name="backup_restore_error_plus">Please unlock QKSMS+ to use backup and restore</string>
-    <string name="backup_restore_error_backup">Backup in progress&#8230;</string>
-    <string name="backup_restore_error_restore">Restore in progress&#8230;</string>
-    <string name="backup_restore_confirm_title">Restore from backup</string>
-    <string name="backup_restore_confirm_message">Are you sure you would like to restore your messages from this backup?</string>
-    <string name="backup_restore_stop_title">Stop restore</string>
-    <string name="backup_restore_stop_message">Messages that have already been restored will remain on your device</string>
-    <string name="backup_restore_dialog_title">बैकअप</string>
-    <string name="backup_restore_dialog_empty">कोई बैकअप नहीं मिला</string>
-    <plurals name="backup_message_count">
-        <item quantity="one">%d संदेश</item>
-        <item quantity="other">%d संदेशें</item>
-    </plurals>
-    <string name="backup_disclaimer">वर्तमान में, केवल एसएमएस बैकअप और बहाल द्वारा समर्थित है| एमएमएस समर्थन और अनुसूचित बैकअप जल्द ही आ रहा है!</string>
-    <string name="backup_now">अभी बैकअप लें</string>
-    <string name="backup_progress_parsing">बैकअप पदच्छेद हो रहा है...</string>
-    <string name="backup_progress_running">%d/%d संदेशें</string>
-    <string name="backup_progress_saving">बैकअप सहेजा जा रहा है...</string>
-    <string name="backup_progress_syncing">संदेश सिंक्रनाइज़ हो रहा है...</string>
-    <string name="backup_progress_finished">समाप्त!</string>
-    <string name="backup_notification_channel_name">बैकअप और पुनर्स्थापना</string>
-    <string name="scheduled_title">अनुसूचित</string>
-    <string name="scheduled_empty_description">स्वचालित रूप से एक संदेश भेजें, जिस समय आप चाहते हैं</string>
-    <string name="scheduled_empty_message_1">सुनो! आपका जन्मदिन कब था?</string>
-    <string name="scheduled_empty_message_2">यह 23 दिसंबर को था</string>
-    <string name="scheduled_empty_message_3">जन्मदिन की शुभकामनाएं! देखो, मैं कौन सा मित्र हूं, तुम्हारा जन्मदिन याद कर रहा हूं</string>
-    <!--&#x200A; is a special character required at the end of this string to fix it's formatting in the app -->
-    <string name="scheduled_empty_message_3_timestamp">23 दिसंबर को भेजा जा रहा है </string>
-    <string name="scheduled_compose_cd">एक संदेश अनुसूचित करें</string>
-    <string name="scheduled_options_title">निर्धारित संदेश</string>
-    <string-array name="scheduled_options">
-        <item>अभी भेजें</item>
-        <item>Copy text</item>
-        <item>Delete</item>
-    </string-array>
-    <string name="settings_category_appearance">दिखावट</string>
-    <string name="settings_category_general">सामान्य</string>
-    <string name="settings_category_qkreply">QK उत्तर</string>
-    <string name="settings_theme_title">थीम</string>
-    <string name="settings_night_title">रात्रि अंदाज़</string>
-    <string name="settings_black_title">शुद्ध काली रात अंदाज़</string>
-    <string name="settings_night_start_title">शुरुआत समय</string>
-    <string name="settings_night_end_title">अंत समय</string>
-    <string name="settings_automatic_colors_title">Automatic contact colors</string>
-    <string name="settings_text_size_title">लिखाई का आकर</string>
-    <string name="settings_system_font_title">यंत्र ध्वनियां उपयोग करें</string>
-    <string name="settings_auto_emoji_title">Automatic emoji</string>
-    <string name="settings_notifications_title">सूचनाएं</string>
-    <string name="settings_notifications_o_summary">Tap to customize</string>
-    <string name="settings_notification_actions_title">कार्रवाई</string>
-    <string name="settings_notification_action_1">बटन एक</string>
-    <string name="settings_notification_action_2">बटन दो</string>
-    <string name="settings_notification_action_3">बटन तीन</string>
-    <string name="settings_notification_previews_title">अधिसूचना सेटिंग्स</string>
-    <string name="settings_notification_wake_title">Wake screen</string>
-    <string name="settings_vibration_title">कंपन</string>
-    <string name="settings_ringtone_title">ध्वनियाँ</string>
-    <string name="settings_ringtone_none">कुछ नहीं</string>
-    <string name="settings_qkreply_title">QK जवाब</string>
-    <string name="settings_qkreply_summary">Popup for new messages</string>
-    <string name="settings_qkreply_tap_dismiss_title">Tap to dismiss</string>
-    <string name="settings_qkreply_tap_dismiss_summary">Tap outside of the popup to close it</string>
-    <string name="settings_delayed_title">Delayed sending</string>
-    <string name="settings_swipe_actions">Swipe actions</string>
-    <string name="settings_swipe_actions_summary">Configure swipe actions for conversations</string>
-    <string name="settings_swipe_actions_right">दाहिने तरफ से खींचे</string>
-    <string name="settings_swipe_actions_left">बायें तरफ से खींचे</string>
-    <string name="settings_swipe_actions_change">बदलें</string>
-    <string-array name="settings_swipe_actions">
-        <item>None</item>
-        <item>संग्रह</item>
-        <item>मिटायें</item>
-        <item>Block</item>
-        <item>Call</item>
-        <item>Mark read</item>
-        <item>Mark unread</item>
-    </string-array>
-    <string name="settings_delivery_title">वितरण पुष्टि</string>
-    <string name="settings_delivery_summary">Confirm that messages were sent successfully</string>
-    <string name="settings_signature_title">Signature</string>
-    <string name="settings_signature_summary">Add a signature to the end of your messages</string>
-    <string name="settings_unicode_title">Strip accents</string>
-    <string name="settings_unicode_summary">Remove accents from characters in outgoing SMS messages</string>
-    <string name="settings_mobile_title">Mobile numbers only</string>
-    <string name="settings_mobile_summary">When composing a message, only show mobile numbers</string>
-    <string name="settings_auto_delete">Delete old messages automatically</string>
-    <string name="settings_auto_delete_dialog_message">Messages will be deleted after the specified number of days</string>
-    <string name="settings_auto_delete_dialog_hint">Number of days</string>
-    <string name="settings_auto_delete_never">Never</string>
-    <string name="settings_auto_delete_warning">Delete old messages automatically?</string>
-    <string name="settings_auto_delete_warning_message">If you proceed, %1$d messages will be deleted now</string>
-    <plurals name="settings_auto_delete_summary">
-        <item quantity="one">After 1 day</item>
-        <item quantity="other">After %d days</item>
-    </plurals>
-    <string name="settings_long_as_mms_title">Send long messages as MMS</string>
-    <string name="settings_long_as_mms_summary">If your longer text messages are failing to send, or sending in the wrong order, you can send them as MMS messages instead. Additional charges may apply</string>
-    <string name="settings_mms_size_title">Auto-compress MMS attachments</string>
-    <string name="settings_sync_title">Sync messages</string>
-    <string name="settings_sync_summary">Re-sync your messages with the native Android SMS database</string>
-    <string name="settings_about_title">About QKSMS</string>
-    <string name="settings_version">संस्करण %s</string>
-    <string name="settings_logging_enabled">Debug logging enabled</string>
-    <string name="settings_logging_disabled">Debug logging disabled</string>
-    <string name="settings_delay_duration_hint">Enter duration (seconds)</string>
-    <string name="blocking_title">Blocking</string>
-    <string name="blocking_drop_title">Drop messages</string>
-    <string name="blocking_drop_summary">Drop incoming messages from blocked senders instead of hiding them</string>
-    <string name="blocking_conversations">Blocked conversations</string>
-    <string name="blocking_manager_title">Blocking Manager</string>
-    <string name="blocking_manager_qksms_title">QKSMS</string>
-    <string name="blocking_manager_qksms_summary">Built-in blocking functionality in QKSMS</string>
-    <string name="blocking_manager_call_control_summary">Automatically filter your calls and messages in one convenient place! Community IQ™ allows you to prevent unwanted messages from community known spammers</string>
-    <string name="blocking_manager_sia_summary">Automatically filter messages from unsolicited numbers by using the \"Should I Answer\" app</string>
-    <string name="blocking_manager_copy_title">Copy blocked numbers</string>
-    <string name="blocking_manager_copy_summary">Continue to %s and copy over your existing blocked numbers</string>
-    <string name="blocked_numbers_title">Blocked numbers</string>
-    <string name="blocked_numbers_empty">Your blocked numbers will appear here</string>
-    <string name="blocked_numbers_add_cd">Block a new number</string>
-    <string name="blocked_numbers_dialog_title">Block texts from</string>
-    <string name="blocked_numbers_dialog_hint">Phone number</string>
-    <string name="blocked_numbers_dialog_block">Block</string>
-    <string name="blocked_messages_title">Blocked messages</string>
-    <string name="blocked_messages_empty">Your blocked messages will appear here</string>
-    <string name="blocking_block_title">Block</string>
-    <string name="blocking_unblock_title">Unblock</string>
-    <plurals name="blocking_block_external">
-        <item quantity="one">Continue to %s and block this number</item>
-        <item quantity="other">Continue to %s and block these numbers</item>
-    </plurals>
-    <plurals name="blocking_unblock_external">
-        <item quantity="one">Continue to %s and allow this number</item>
-        <item quantity="other">Continue to %s and allow these numbers</item>
-    </plurals>
-    <string name="about_title">About</string>
-    <string name="about_version_title">संस्करण</string>
-    <string name="about_developer_title">Developer</string>
-    <string name="about_source_title">श्रोत कोड</string>
-    <string name="about_changelog_title">बदलाव</string>
-    <string name="about_contact_title">संपर्क</string>
-    <string name="about_license_title">लाइसेंस</string>
-    <string name="about_copyright_title">Copyright</string>
-    <string name="qksms_plus_description_title">Support development, unlock everything</string>
-    <string name="qksms_plus_description_summary">You can save a starving developer for just %s</string>
-    <!-- Substitutions are for price and currency. Ex: Lifetime upgrade for $1.99 USD -->
-    <string name="qksms_plus_upgrade">Lifetime upgrade for %1$s %2$s</string>
-    <!-- Substitutions are for price and currency. Ex: Unlock + donate for $4.99 USD -->
-    <string name="qksms_plus_upgrade_donate">Unlock + donate for %1$s %2$s</string>
-    <string name="qksms_plus_thanks_title">Thank you for supporting QKSMS!</string>
-    <string name="qksms_plus_thanks_summary">You now have access to all QKSMS+ features</string>
-    <string name="qksms_plus_free_title">QKSMS+ is free for F-Droid users! If you\'d like to support development, a donation would be highly appreciated.</string>
-    <string name="qksms_plus_donate">Donate via PayPal</string>
-    <string name="qksms_plus_coming_soon">जल्द आ रहा है</string>
-    <string name="qksms_plus_themes_title">Premium themes</string>
-    <string name="qksms_plus_themes_summary">Unlock beautiful theme colors not available on the Material Design palette</string>
-    <string name="qksms_plus_emoji_title">Custom auto-emoji</string>
-    <string name="qksms_plus_emoji_summary">Create custom auto-emoji shortcuts</string>
-    <string name="qksms_plus_backup_title">Message backup</string>
-    <string name="qksms_plus_backup_summary">Automatically back up your messages. Never again worry about losing your history if you change phones or your phone gets lost</string>
-    <string name="qksms_plus_scheduled_title">Scheduled messages</string>
-    <string name="qksms_plus_scheduled_summary">Schedule messages to automatically be sent at a specific time and date</string>
-    <string name="qksms_plus_delayed_title">Delayed sending</string>
-    <string name="qksms_plus_delayed_summary">Wait a few seconds before sending your message</string>
-    <string name="qksms_plus_night_title">Automatic night mode</string>
-    <string name="qksms_plus_night_summary">Enable night mode based on the time of day</string>
-    <string name="qksms_plus_blacklist_title">Advanced blocking</string>
-    <string name="qksms_plus_blacklist_summary">Block messages that contain keywords or match patterns</string>
-    <string name="qksms_plus_forward_title">Auto-forward</string>
-    <string name="qksms_plus_forward_summary">Automatically forward messages from certain senders</string>
-    <string name="qksms_plus_respond_title">Auto-respond</string>
-    <string name="qksms_plus_respond_summary">Automatically respond to incoming messages with a preset response</string>
-    <string name="qksms_plus_more_title">अधिक</string>
-    <string name="qksms_plus_more_summary">QKSMS is under active development, and your purchase will include all future QKSMS+ features!</string>
-    <string name="widget_loading">तैयार हो रहा है&#8230;</string>
-    <string name="widget_more">अधिक वार्तालाप देखें</string>
-    <string name="qkreply_menu_read">Mark read</string>
-    <string name="qkreply_menu_call">कॉल</string>
-    <string name="qkreply_menu_delete">मिटायें</string>
-    <string name="qkreply_menu_expand">अधिक दिखाएं</string>
-    <string name="qkreply_menu_collapse">कम दिखाएं</string>
-    <string name="qkreply_menu_view">वार्तालाप खोलें</string>
-    <string name="theme_material">Material</string>
-    <string name="theme_hex">HEX</string>
-    <string name="theme_apply">लागू करें</string>
-    <string-array name="notification_actions">
-        <item>None</item>
-        <item>Archive</item>
-        <item>Delete</item>
-        <item>Block</item>
-        <item>Call</item>
-        <item>Mark read</item>
-        <item>Reply</item>
-    </string-array>
-    <string name="button_yes">Yes</string>
-    <string name="button_continue">Continue</string>
-    <string name="button_cancel">Cancel</string>
-    <string name="button_delete">Delete</string>
-    <string name="button_save">Save</string>
-    <string name="button_stop">Stop</string>
-    <string name="button_more">More</string>
-    <string name="button_set">Set</string>
-    <string name="button_undo">Undo</string>
-    <string name="toast_copied">Copied</string>
-    <string name="toast_archived">Archived conversation</string>
-    <string name="toast_qksms_plus">You must unlock QKSMS+ to use this</string>
-    <plurals name="notification_new_messages">
-        <item quantity="one">New message</item>
-        <item quantity="other">%s new messages</item>
-    </plurals>
-    <string name="notification_message_failed_title">संदेश नही भेजा गया</string>
-    <string name="notification_message_failed_text">%s को संदेश भेजने में असफल</string>
-    <string-array name="night_modes">
-        <item>System</item>
-        <item>Disabled</item>
-        <item>Always on</item>
-        <item>Automatic</item>
-    </string-array>
-    <string-array name="notification_preview_options">
-        <item>नाम व संदेश दिखाएं</item>
-        <item>नाम दिखाएं</item>
-        <item>सामाग्री छुपाएं</item>
-    </string-array>
-    <string-array name="text_sizes">
-        <item>छोटा</item>
-        <item>सामान्य</item>
-        <item>बड़ा</item>
-        <item>और बड़ा</item>
-    </string-array>
-    <string-array name="delayed_sending_labels">
-        <item>कोइ विलम्ब नही</item>
-        <item>3 seconds</item>
-        <item>5 seconds</item>
-        <item>10 seconds</item>
-    </string-array>
-    <string-array name="mms_sizes">
-        <item>Automatic</item>
-        <item>100KB</item>
-        <item>200KB</item>
-        <item>300KB</item>
-        <item>600KB</item>
-        <item>1000KB</item>
-        <item>2000KB</item>
-        <item>No compression</item>
-    </string-array>
-    <string-array name="qk_responses">
-        <item>ठीक</item>
-        <item>एक क्षण दें</item>
-        <item>On my way</item>
-        <item>शुक्रिया</item>
-        <item>सही है</item>
-        <item>नया क्या है</item>
-        <item>Agreed</item>
-        <item>नहीं</item>
-        <item>Love you</item>
-        <item>मुझे खेद है</item>
-        <item>LOL</item>
-        <item>ठीक है</item>
-    </string-array>
-</resources>
+<?xml version="1.0" encoding="utf-8"?>
+<!--
+  ~ Copyright (C) 2019 Moez Bhatti <moez.bhatti@gmail.com>
+  ~
+  ~ This file is part of QKSMS.
+  ~
+  ~ QKSMS is free software: you can redistribute it and/or modify
+  ~ it under the terms of the GNU General Public License as published by
+  ~ the Free Software Foundation, either version 3 of the License, or
+  ~ (at your option) any later version.
+  ~
+  ~ QKSMS is distributed in the hope that it will be useful,
+  ~ but WITHOUT ANY WARRANTY; without even the implied warranty of
+  ~ MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+  ~ GNU General Public License for more details.
+  ~
+  ~ You should have received a copy of the GNU General Public License
+  ~ along with QKSMS.  If not, see <http://www.gnu.org/licenses/>.
+  -->
+<resources>
+    <string name="shortcut_compose_long_label">नई बातचीत</string>
+    <string name="shortcut_compose_short_label">रचना</string>
+    <string name="shortcut_compose_disabled_message">शॉर्टकट अक्षम किया गया</string>
+    <string name="title_archived">संग्रहीत</string>
+    <string name="title_settings">सेटिंग्स</string>
+    <string name="title_notification_prefs">सूचनाएं</string>
+    <string name="title_theme">विषय</string>
+    <string name="title_conversations">इनबॉक्स खोजें&#8230;</string>
+    <string name="title_compose">रचना</string>
+    <string name="setup_skip">छोड़</string>
+    <string name="setup_next">जारी रखें</string>
+    <string name="menu_add_person">Add person</string>
+    <string name="menu_call">कॉल</string>
+    <string name="menu_info">विवरण</string>
+    <string name="menu_save">गैलरी में सहेजें</string>
+    <string name="menu_share">Share</string>
+    <string name="main_drawer_open_cd">खुला नेविगेशन दराज</string>
+    <string name="main_title_selected">%d चयनित</string>
+    <string name="main_menu_clear">साफ करें</string>
+    <string name="main_menu_archive">संग्रह</string>
+    <string name="main_menu_unarchive">असंग्रहित</string>
+    <string name="main_menu_delete">हटाएँ</string>
+    <string name="main_menu_add_contact">Add to contacts</string>
+    <string name="main_menu_pin">शीर्ष पर पिन करें</string>
+    <string name="main_menu_unpin">अनपिन</string>
+    <string name="main_menu_read">Mark read</string>
+    <string name="main_menu_unread">Mark unread</string>
+    <string name="main_menu_block">ब्लॉक</string>
+    <string name="main_syncing">संदेशों को सिंक्रनाइज़ कर रहा है.. ।</string>
+    <string name="main_sender_you">आप: %s</string>
+    <string name="main_draft">Draft</string>
+    <string name="main_message_results_title">संदेशों में परिणाम</string>
+    <string name="main_message_results">%d संदेश</string>
+    <string name="inbox_empty_text">आपकी बातचीत यहां दिखाई देगी</string>
+    <string name="inbox_search_empty_text">कोई परिणाम नहीं</string>
+    <string name="archived_empty_text">आपके संग्रहीत वार्तालाप यहां दिखाई देंगे</string>
+    <string name="main_fab_cd">नई वार्तालाप प्रारंभ करें</string>
+    <string name="main_default_sms_title">फिर से टेक्स्टिंग करिये</string>
+    <string name="main_default_sms_message">QKSMS अपना डिफ़ॉल्ट SMS एप्लिकेशन बनाएं</string>
+    <string name="main_default_sms_change">बदलें</string>
+    <string name="main_permission_required">अनुमति आवश्यक</string>
+    <string name="main_permission_sms">QKSMS भेजने और एसएमएस संदेश देखने के लिए अनुमति की जरूरत है</string>
+    <string name="main_permission_contacts">QKSMS अपने संपर्कों को देखने के लिए अनुमति की जरूरत है</string>
+    <string name="main_permission_allow">अनुमति दे</string>
+    <string name="drawer_inbox">इनबॉक्स</string>
+    <string name="drawer_archived">संग्रहीत</string>
+    <string name="drawer_scheduled">अनुसूचित</string>
+    <string name="drawer_blocking">अवरुद्ध</string>
+    <string name="drawer_more">और</string>
+    <string name="drawer_settings">सेटिंग्स</string>
+    <string name="drawer_help">मदद और प्रतिक्रिया</string>
+    <string name="drawer_invite">मित्रों को आमंत्रित करें</string>
+    <string name="drawer_plus_banner_summary">अद्भुत नई सुविधाओं को अनलॉक करें, और विकास का समर्थन करें</string>
+    <string name="rate_title">QKSMS का आनंद ले रहे?</string>
+    <string name="rate_summary">कुछ प्यार साझा करें और गूगल प्ले पर हमें मूल्यांकन करें</string>
+    <string name="rate_okay">ठीक!</string>
+    <string name="rate_dismiss">खारिज</string>
+    <string name="dialog_delete_title">हटाएँ</string>
+    <plurals name="dialog_delete_message">
+        <item quantity="one">क्या आप वाकई इस वार्तालाप को हटाना चाहते हैं?</item>
+        <item quantity="other">क्या आप वाकई %d वार्तालापों को हटाना चाहते हैं?</item>
+    </plurals>
+    <string-array name="message_options">
+        <item>पाठ की प्रतिलिपि बनाएं</item>
+        <item>अग्रेषित करें</item>
+        <item>मिटाएँ</item>
+    </string-array>
+    <string name="compose_number_picker_title">Choose a phone number</string>
+    <string name="compose_number_picker_default">%s ∙ Default</string>
+    <string name="compose_number_picker_once">Just once</string>
+    <string name="compose_number_picker_always">Always</string>
+    <string name="compose_title_selected">%d चयनित</string>
+    <string name="compose_subtitle_results">%1$d के %2$d परिणाम</string>
+    <string name="compose_send_group_title">समूह संदेश के रूप में भेजें</string>
+    <string name="compose_send_group_summary">प्राप्तकर्ता और उत्तर सभी को दिखाई देंगे</string>
+    <string name="compose_messages_empty">यह आपकी बातचीत की शुरुआत है । कुछ अच्छा कहिये!</string>
+    <string name="compose_vcard_label">संपर्क कार्ड</string>
+    <string name="compose_scheduled_for">के लिए निर्धारित</string>
+    <string name="compose_scheduled_future">चयनित समय भविष्य में होना चाहिए!</string>
+    <string name="compose_scheduled_plus">आप QKSMS + अनुसूचित संदेश का उपयोग करने के लिए अनलॉक करना होगा</string>
+    <string name="compose_scheduled_toast">अनुसूचित संदेशों में जोड़ा गया</string>
+    <string name="compose_hint">संदेश लिखें</string>
+    <string name="compose_menu_copy">पाठ की प्रतिलिपि बनाएं</string>
+    <string name="compose_menu_forward">आगे</string>
+    <string name="compose_menu_delete">मिटायें</string>
+    <string name="compose_menu_previous">पिछला</string>
+    <string name="compose_menu_next">अगला</string>
+    <string name="compose_menu_clear">साफ करें</string>
+    <string name="compose_details_title">संदेश विवरण</string>
+    <string name="compose_details_type">टाइप %s</string>
+    <string name="compose_details_from">से: %s</string>
+    <string name="compose_details_to">को: %s</string>
+    <string name="compose_details_subject">विषय: %s</string>
+    <string name="compose_details_priority">महत्व: %s</string>
+    <string name="compose_details_size">आकार: %s</string>
+    <string name="compose_details_sent">भेजा गया: %s</string>
+    <string name="compose_details_received">प्राप्त: %s</string>
+    <string name="compose_details_delivered">वितरित: %s</string>
+    <string name="compose_details_error_code">त्रुटि संकेत: %d</string>
+    <string name="compose_attach_cd">Add an attachment</string>
+    <string name="compose_gallery_cd">चित्र संलग्न करें</string>
+    <string name="compose_camera_cd">चित्र खिंचे</string>
+    <string name="compose_schedule_cd">संदेश अनुसूचित करें</string>
+    <string name="compose_contact_cd">Attach a contact</string>
+    <string name="compose_contact_error">Error reading contact</string>
+    <!-- Example: SIM 1 (Verizon) selected-->
+    <string name="compose_sim_changed_toast">SIM %1$d (%2$s) selected</string>
+    <string name="compose_sim_cd">%s selected, change SIM card</string>
+    <string name="compose_send_cd">संदेश भेजें</string>
+    <string name="message_status_sending">भेज रहा है&#8230;</string>
+    <string name="message_status_delivered">%s वितरित</string>
+    <string name="message_status_failed">भेजने में असफल। पुनः प्रयास करें</string>
+    <string name="info_title">विवरण</string>
+    <string name="info_copied_address">Address copied</string>
+    <string name="info_name">Conversation title</string>
+    <string name="info_notifications">अधिसूचनाएँ</string>
+    <string name="info_theme">थीम</string>
+    <string name="info_archive">संग्रह</string>
+    <string name="info_unarchive">Unarchive</string>
+    <string name="info_block">अवरुदध करें</string>
+    <string name="info_unblock">Unblock</string>
+    <string name="info_delete">वार्तालाप मिटाऐं</string>
+    <string name="gallery_error">Couldn\'t load media</string>
+    <string name="gallery_toast_saved">गैलरी मैं सेव किया गया है</string>
+    <string name="backup_title">Backup and restore</string>
+    <string name="backup_backing_up">Backing up messages</string>
+    <string name="backup_restoring">Restoring from backup</string>
+    <string name="backup_last">पिछला बेकप</string>
+    <string name="backup_loading">लोड हो रहा है...</string>
+    <string name="backup_never">कभी नहीं</string>
+    <string name="backup_restore_title">Restore</string>
+    <string name="backup_restore_summary">किसी बैकअप का चयन करें</string>
+    <string name="backup_restore_error_plus">Please unlock QKSMS+ to use backup and restore</string>
+    <string name="backup_restore_error_backup">Backup in progress&#8230;</string>
+    <string name="backup_restore_error_restore">Restore in progress&#8230;</string>
+    <string name="backup_restore_confirm_title">Restore from backup</string>
+    <string name="backup_restore_confirm_message">Are you sure you would like to restore your messages from this backup?</string>
+    <string name="backup_restore_stop_title">Stop restore</string>
+    <string name="backup_restore_stop_message">Messages that have already been restored will remain on your device</string>
+    <string name="backup_restore_dialog_title">बैकअप</string>
+    <string name="backup_restore_dialog_empty">कोई बैकअप नहीं मिला</string>
+    <plurals name="backup_message_count">
+        <item quantity="one">%d संदेश</item>
+        <item quantity="other">%d संदेशें</item>
+    </plurals>
+    <string name="backup_disclaimer">वर्तमान में, केवल एसएमएस बैकअप और बहाल द्वारा समर्थित है| एमएमएस समर्थन और अनुसूचित बैकअप जल्द ही आ रहा है!</string>
+    <string name="backup_now">अभी बैकअप लें</string>
+    <string name="backup_progress_parsing">बैकअप पदच्छेद हो रहा है...</string>
+    <string name="backup_progress_running">%d/%d संदेशें</string>
+    <string name="backup_progress_saving">बैकअप सहेजा जा रहा है...</string>
+    <string name="backup_progress_syncing">संदेश सिंक्रनाइज़ हो रहा है...</string>
+    <string name="backup_progress_finished">समाप्त!</string>
+    <string name="backup_notification_channel_name">बैकअप और पुनर्स्थापना</string>
+    <string name="scheduled_title">अनुसूचित</string>
+    <string name="scheduled_empty_description">स्वचालित रूप से एक संदेश भेजें, जिस समय आप चाहते हैं</string>
+    <string name="scheduled_empty_message_1">सुनो! आपका जन्मदिन कब था?</string>
+    <string name="scheduled_empty_message_2">यह 23 दिसंबर को था</string>
+    <string name="scheduled_empty_message_3">जन्मदिन की शुभकामनाएं! देखो, मैं कौन सा मित्र हूं, तुम्हारा जन्मदिन याद कर रहा हूं</string>
+    <!--&#x200A; is a special character required at the end of this string to fix it's formatting in the app -->
+    <string name="scheduled_empty_message_3_timestamp">23 दिसंबर को भेजा जा रहा है </string>
+    <string name="scheduled_compose_cd">एक संदेश अनुसूचित करें</string>
+    <string name="scheduled_options_title">निर्धारित संदेश</string>
+    <string-array name="scheduled_options">
+        <item>अभी भेजें</item>
+        <item>Copy text</item>
+        <item>Delete</item>
+    </string-array>
+    <string name="settings_category_appearance">दिखावट</string>
+    <string name="settings_category_general">सामान्य</string>
+    <string name="settings_category_qkreply">QK उत्तर</string>
+    <string name="settings_theme_title">थीम</string>
+    <string name="settings_night_title">रात्रि अंदाज़</string>
+    <string name="settings_black_title">शुद्ध काली रात अंदाज़</string>
+    <string name="settings_night_start_title">शुरुआत समय</string>
+    <string name="settings_night_end_title">अंत समय</string>
+    <string name="settings_automatic_colors_title">Automatic contact colors</string>
+    <string name="settings_text_size_title">लिखाई का आकर</string>
+    <string name="settings_system_font_title">यंत्र ध्वनियां उपयोग करें</string>
+    <string name="settings_auto_emoji_title">Automatic emoji</string>
+    <string name="settings_notifications_title">सूचनाएं</string>
+    <string name="settings_notifications_o_summary">Tap to customize</string>
+    <string name="settings_notification_actions_title">कार्रवाई</string>
+    <string name="settings_notification_action_1">बटन एक</string>
+    <string name="settings_notification_action_2">बटन दो</string>
+    <string name="settings_notification_action_3">बटन तीन</string>
+    <string name="settings_notification_previews_title">अधिसूचना सेटिंग्स</string>
+    <string name="settings_notification_wake_title">Wake screen</string>
+    <string name="settings_vibration_title">कंपन</string>
+    <string name="settings_ringtone_title">ध्वनियाँ</string>
+    <string name="settings_ringtone_none">कुछ नहीं</string>
+    <string name="settings_qkreply_title">QK जवाब</string>
+    <string name="settings_qkreply_summary">Popup for new messages</string>
+    <string name="settings_qkreply_tap_dismiss_title">Tap to dismiss</string>
+    <string name="settings_qkreply_tap_dismiss_summary">Tap outside of the popup to close it</string>
+    <string name="settings_delayed_title">Delayed sending</string>
+    <string name="settings_swipe_actions">Swipe actions</string>
+    <string name="settings_swipe_actions_summary">Configure swipe actions for conversations</string>
+    <string name="settings_swipe_actions_right">दाहिने तरफ से खींचे</string>
+    <string name="settings_swipe_actions_left">बायें तरफ से खींचे</string>
+    <string name="settings_swipe_actions_change">बदलें</string>
+    <string-array name="settings_swipe_actions">
+        <item>None</item>
+        <item>संग्रह</item>
+        <item>मिटायें</item>
+        <item>Block</item>
+        <item>Call</item>
+        <item>Mark read</item>
+        <item>Mark unread</item>
+    </string-array>
+    <string name="settings_delivery_title">वितरण पुष्टि</string>
+    <string name="settings_delivery_summary">Confirm that messages were sent successfully</string>
+    <string name="settings_signature_title">Signature</string>
+    <string name="settings_signature_summary">Add a signature to the end of your messages</string>
+    <string name="settings_unicode_title">Strip accents</string>
+    <string name="settings_unicode_summary">Remove accents from characters in outgoing SMS messages</string>
+    <string name="settings_mobile_title">Mobile numbers only</string>
+    <string name="settings_mobile_summary">When composing a message, only show mobile numbers</string>
+    <string name="settings_auto_delete">Delete old messages automatically</string>
+    <string name="settings_auto_delete_dialog_message">Messages will be deleted after the specified number of days</string>
+    <string name="settings_auto_delete_dialog_hint">Number of days</string>
+    <string name="settings_auto_delete_never">Never</string>
+    <string name="settings_auto_delete_warning">Delete old messages automatically?</string>
+    <string name="settings_auto_delete_warning_message">If you proceed, %1$d messages will be deleted now</string>
+    <plurals name="settings_auto_delete_summary">
+        <item quantity="one">After 1 day</item>
+        <item quantity="other">After %d days</item>
+    </plurals>
+    <string name="settings_long_as_mms_title">Send long messages as MMS</string>
+    <string name="settings_long_as_mms_summary">If your longer text messages are failing to send, or sending in the wrong order, you can send them as MMS messages instead. Additional charges may apply</string>
+    <string name="settings_mms_size_title">Auto-compress MMS attachments</string>
+    <string name="settings_sync_title">Sync messages</string>
+    <string name="settings_sync_summary">Re-sync your messages with the native Android SMS database</string>
+    <string name="settings_about_title">About QKSMS</string>
+    <string name="settings_version">संस्करण %s</string>
+    <string name="settings_logging_enabled">Debug logging enabled</string>
+    <string name="settings_logging_disabled">Debug logging disabled</string>
+    <string name="settings_delay_duration_hint">Enter duration (seconds)</string>
+    <string name="blocking_title">Blocking</string>
+    <string name="blocking_drop_title">Drop messages</string>
+    <string name="blocking_drop_summary">Drop incoming messages from blocked senders instead of hiding them</string>
+    <string name="blocking_conversations">Blocked conversations</string>
+    <string name="blocking_manager_title">Blocking Manager</string>
+    <string name="blocking_manager_qksms_title">QKSMS</string>
+    <string name="blocking_manager_qksms_summary">Built-in blocking functionality in QKSMS</string>
+    <string name="blocking_manager_call_control_summary">Automatically filter your calls and messages in one convenient place! Community IQ™ allows you to prevent unwanted messages from community known spammers</string>
+    <string name="blocking_manager_sia_summary">Automatically filter messages from unsolicited numbers by using the \"Should I Answer\" app</string>
+    <string name="blocking_manager_copy_title">Copy blocked numbers</string>
+    <string name="blocking_manager_copy_summary">Continue to %s and copy over your existing blocked numbers</string>
+    <string name="blocked_numbers_title">Blocked numbers</string>
+    <string name="blocked_numbers_empty">Your blocked numbers will appear here</string>
+    <string name="blocked_numbers_add_cd">Block a new number</string>
+    <string name="blocked_numbers_dialog_title">Block texts from</string>
+    <string name="blocked_numbers_dialog_hint">Phone number</string>
+    <string name="blocked_numbers_dialog_block">Block</string>
+    <string name="blocked_messages_title">Blocked messages</string>
+    <string name="blocked_messages_empty">Your blocked messages will appear here</string>
+    <string name="blocking_block_title">Block</string>
+    <string name="blocking_unblock_title">Unblock</string>
+    <plurals name="blocking_block_external">
+        <item quantity="one">Continue to %s and block this number</item>
+        <item quantity="other">Continue to %s and block these numbers</item>
+    </plurals>
+    <plurals name="blocking_unblock_external">
+        <item quantity="one">Continue to %s and allow this number</item>
+        <item quantity="other">Continue to %s and allow these numbers</item>
+    </plurals>
+    <string name="about_title">About</string>
+    <string name="about_version_title">संस्करण</string>
+    <string name="about_developer_title">Developer</string>
+    <string name="about_source_title">श्रोत कोड</string>
+    <string name="about_changelog_title">बदलाव</string>
+    <string name="about_contact_title">संपर्क</string>
+    <string name="about_license_title">लाइसेंस</string>
+    <string name="about_copyright_title">Copyright</string>
+    <string name="qksms_plus_description_title">Support development, unlock everything</string>
+    <string name="qksms_plus_description_summary">You can save a starving developer for just %s</string>
+    <!-- Substitutions are for price and currency. Ex: Lifetime upgrade for $1.99 USD -->
+    <string name="qksms_plus_upgrade">Lifetime upgrade for %1$s %2$s</string>
+    <!-- Substitutions are for price and currency. Ex: Unlock + donate for $4.99 USD -->
+    <string name="qksms_plus_upgrade_donate">Unlock + donate for %1$s %2$s</string>
+    <string name="qksms_plus_thanks_title">Thank you for supporting QKSMS!</string>
+    <string name="qksms_plus_thanks_summary">You now have access to all QKSMS+ features</string>
+    <string name="qksms_plus_free_title">QKSMS+ is free for F-Droid users! If you\'d like to support development, a donation would be highly appreciated.</string>
+    <string name="qksms_plus_donate">Donate via PayPal</string>
+    <string name="qksms_plus_coming_soon">जल्द आ रहा है</string>
+    <string name="qksms_plus_themes_title">Premium themes</string>
+    <string name="qksms_plus_themes_summary">Unlock beautiful theme colors not available on the Material Design palette</string>
+    <string name="qksms_plus_emoji_title">Custom auto-emoji</string>
+    <string name="qksms_plus_emoji_summary">Create custom auto-emoji shortcuts</string>
+    <string name="qksms_plus_backup_title">Message backup</string>
+    <string name="qksms_plus_backup_summary">Automatically back up your messages. Never again worry about losing your history if you change phones or your phone gets lost</string>
+    <string name="qksms_plus_scheduled_title">Scheduled messages</string>
+    <string name="qksms_plus_scheduled_summary">Schedule messages to automatically be sent at a specific time and date</string>
+    <string name="qksms_plus_delayed_title">Delayed sending</string>
+    <string name="qksms_plus_delayed_summary">Wait a few seconds before sending your message</string>
+    <string name="qksms_plus_night_title">Automatic night mode</string>
+    <string name="qksms_plus_night_summary">Enable night mode based on the time of day</string>
+    <string name="qksms_plus_blacklist_title">Advanced blocking</string>
+    <string name="qksms_plus_blacklist_summary">Block messages that contain keywords or match patterns</string>
+    <string name="qksms_plus_forward_title">Auto-forward</string>
+    <string name="qksms_plus_forward_summary">Automatically forward messages from certain senders</string>
+    <string name="qksms_plus_respond_title">Auto-respond</string>
+    <string name="qksms_plus_respond_summary">Automatically respond to incoming messages with a preset response</string>
+    <string name="qksms_plus_more_title">अधिक</string>
+    <string name="qksms_plus_more_summary">QKSMS is under active development, and your purchase will include all future QKSMS+ features!</string>
+    <string name="widget_loading">तैयार हो रहा है&#8230;</string>
+    <string name="widget_more">अधिक वार्तालाप देखें</string>
+    <string name="qkreply_menu_read">Mark read</string>
+    <string name="qkreply_menu_call">कॉल</string>
+    <string name="qkreply_menu_delete">मिटायें</string>
+    <string name="qkreply_menu_expand">अधिक दिखाएं</string>
+    <string name="qkreply_menu_collapse">कम दिखाएं</string>
+    <string name="qkreply_menu_view">वार्तालाप खोलें</string>
+    <string name="theme_material">Material</string>
+    <string name="theme_hex">HEX</string>
+    <string name="theme_apply">लागू करें</string>
+    <string-array name="notification_actions">
+        <item>None</item>
+        <item>Archive</item>
+        <item>Delete</item>
+        <item>Block</item>
+        <item>Call</item>
+        <item>Mark read</item>
+        <item>Reply</item>
+    </string-array>
+    <string name="button_yes">Yes</string>
+    <string name="button_continue">Continue</string>
+    <string name="button_cancel">Cancel</string>
+    <string name="button_delete">Delete</string>
+    <string name="button_save">Save</string>
+    <string name="button_stop">Stop</string>
+    <string name="button_more">More</string>
+    <string name="button_set">Set</string>
+    <string name="button_undo">Undo</string>
+    <string name="toast_copied">Copied</string>
+    <string name="toast_archived">Archived conversation</string>
+    <string name="toast_qksms_plus">You must unlock QKSMS+ to use this</string>
+    <plurals name="notification_new_messages">
+        <item quantity="one">New message</item>
+        <item quantity="other">%s new messages</item>
+    </plurals>
+    <string name="notification_message_failed_title">संदेश नही भेजा गया</string>
+    <string name="notification_message_failed_text">%s को संदेश भेजने में असफल</string>
+    <string-array name="night_modes">
+        <item>System</item>
+        <item>Disabled</item>
+        <item>Always on</item>
+        <item>Automatic</item>
+    </string-array>
+    <string-array name="notification_preview_options">
+        <item>नाम व संदेश दिखाएं</item>
+        <item>नाम दिखाएं</item>
+        <item>सामाग्री छुपाएं</item>
+    </string-array>
+    <string-array name="text_sizes">
+        <item>छोटा</item>
+        <item>सामान्य</item>
+        <item>बड़ा</item>
+        <item>और बड़ा</item>
+    </string-array>
+    <string-array name="delayed_sending_labels">
+        <item>कोइ विलम्ब नही</item>
+        <item>3 seconds</item>
+        <item>5 seconds</item>
+        <item>10 seconds</item>
+    </string-array>
+    <string-array name="mms_sizes">
+        <item>Automatic</item>
+        <item>100KB</item>
+        <item>200KB</item>
+        <item>300KB</item>
+        <item>600KB</item>
+        <item>1000KB</item>
+        <item>2000KB</item>
+        <item>No compression</item>
+    </string-array>
+    <string-array name="qk_responses">
+        <item>ठीक</item>
+        <item>एक क्षण दें</item>
+        <item>On my way</item>
+        <item>शुक्रिया</item>
+        <item>सही है</item>
+        <item>नया क्या है</item>
+        <item>Agreed</item>
+        <item>नहीं</item>
+        <item>Love you</item>
+        <item>मुझे खेद है</item>
+        <item>LOL</item>
+        <item>ठीक है</item>
+    </string-array>
+</resources>
diff --git a/presentation/src/main/res/values-hr/strings.xml b/presentation/src/main/res/values-hr/strings.xml
index c58b8e68a..a4e760524 100644
--- a/presentation/src/main/res/values-hr/strings.xml
+++ b/presentation/src/main/res/values-hr/strings.xml
@@ -1,417 +1,417 @@
-<?xml version="1.0" encoding="utf-8"?>
-<!--
-  ~ Copyright (C) 2019 Moez Bhatti <moez.bhatti@gmail.com>
-  ~
-  ~ This file is part of QKSMS.
-  ~
-  ~ QKSMS is free software: you can redistribute it and/or modify
-  ~ it under the terms of the GNU General Public License as published by
-  ~ the Free Software Foundation, either version 3 of the License, or
-  ~ (at your option) any later version.
-  ~
-  ~ QKSMS is distributed in the hope that it will be useful,
-  ~ but WITHOUT ANY WARRANTY; without even the implied warranty of
-  ~ MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
-  ~ GNU General Public License for more details.
-  ~
-  ~ You should have received a copy of the GNU General Public License
-  ~ along with QKSMS.  If not, see <http://www.gnu.org/licenses/>.
-  -->
-<resources>
-    <string name="shortcut_compose_long_label">New conversation</string>
-    <string name="shortcut_compose_short_label">Compose</string>
-    <string name="shortcut_compose_disabled_message">Shortcut disabled</string>
-    <string name="title_archived">Arhivirano</string>
-    <string name="title_settings">Postavke</string>
-    <string name="title_notification_prefs">Obavijesti</string>
-    <string name="title_theme">Tema</string>
-    <string name="title_conversations">Pretraži poruke&#8230;</string>
-    <string name="title_compose">Unesite ime ili broj</string>
-    <string name="setup_skip">Preskoči</string>
-    <string name="setup_next">Nastavi</string>
-    <string name="menu_add_person">Add person</string>
-    <string name="menu_call">Nazovi</string>
-    <string name="menu_info">Detalji</string>
-    <string name="menu_save">Save to gallery</string>
-    <string name="menu_share">Share</string>
-    <string name="main_drawer_open_cd">Open navigation drawer</string>
-    <string name="main_title_selected">%d odabrano</string>
-    <string name="main_menu_clear">Očisti</string>
-    <string name="main_menu_archive">Arhiviraj</string>
-    <string name="main_menu_unarchive">Dearhiviraj</string>
-    <string name="main_menu_delete">Izbriši</string>
-    <string name="main_menu_add_contact">Add to contacts</string>
-    <string name="main_menu_pin">Pin to top</string>
-    <string name="main_menu_unpin">Unpin</string>
-    <string name="main_menu_read">Mark read</string>
-    <string name="main_menu_unread">Mark unread</string>
-    <string name="main_menu_block">Blokiraj</string>
-    <string name="main_syncing">Syncing messages&#8230;</string>
-    <string name="main_sender_you">Vi: %s</string>
-    <string name="main_draft">Draft</string>
-    <string name="main_message_results_title">Results in messages</string>
-    <string name="main_message_results">%d messages</string>
-    <string name="inbox_empty_text">Vaši razgovori će se pojaviti ovdje</string>
-    <string name="inbox_search_empty_text">Nema rezultata</string>
-    <string name="archived_empty_text">Vaši arhivirani razgovori će se pojaviti ovdje</string>
-    <string name="main_fab_cd">Započni novi razgovor</string>
-    <string name="main_default_sms_title">Love texting again</string>
-    <string name="main_default_sms_message">Make QKSMS your default SMS app</string>
-    <string name="main_default_sms_change">Change</string>
-    <string name="main_permission_required">Permission required</string>
-    <string name="main_permission_sms">QKSMS needs permission to send and view SMS messages</string>
-    <string name="main_permission_contacts">QKSMS needs permission to view your contacts</string>
-    <string name="main_permission_allow">Allow</string>
-    <string name="drawer_inbox">Poruke</string>
-    <string name="drawer_archived">Arhivirano</string>
-    <string name="drawer_scheduled">Zakazano</string>
-    <string name="drawer_blocking">Blocking</string>
-    <string name="drawer_more"> Više</string>
-    <string name="drawer_settings">Postavke</string>
-    <string name="drawer_help">Pomoć i povratne informacije</string>
-    <string name="drawer_invite">Invite friends</string>
-    <string name="drawer_plus_banner_summary">Unlock amazing new features, and support development</string>
-    <string name="rate_title">Uživate u QKSMS?</string>
-    <string name="rate_summary">Podijelite malo ljubavi i ocijenite nas na Google Playu!</string>
-    <string name="rate_okay">U REDU!</string>
-    <string name="rate_dismiss">ODBACI</string>
-    <string name="dialog_delete_title">Izbriši</string>
-    <plurals name="dialog_delete_message">
-        <item quantity="one">Are you sure you would like to delete this conversation?</item>
-        <item quantity="few">Are you sure you would like to delete %d conversations?</item>
-        <item quantity="other">Are you sure you would like to delete %d conversations?</item>
-    </plurals>
-    <string-array name="message_options">
-        <item>Kopiraj tekst</item>
-        <item>Proslijedi</item>
-        <item>Izbriši</item>
-    </string-array>
-    <string name="compose_number_picker_title">Choose a phone number</string>
-    <string name="compose_number_picker_default">%s ∙ Default</string>
-    <string name="compose_number_picker_once">Just once</string>
-    <string name="compose_number_picker_always">Always</string>
-    <string name="compose_title_selected">%d odabrano</string>
-    <string name="compose_subtitle_results">%1$d of %2$d results</string>
-    <string name="compose_send_group_title">Send as group message</string>
-    <string name="compose_send_group_summary">Recipients and replies will be visible to everyone</string>
-    <string name="compose_messages_empty">Ovo je početak vašeg razgovora. Recite nešto lijepo!</string>
-    <string name="compose_vcard_label">Contact card</string>
-    <string name="compose_scheduled_for">Scheduled for</string>
-    <string name="compose_scheduled_future">Selected time must be in the future!</string>
-    <string name="compose_scheduled_plus">You must unlock QKSMS+ to use scheduled messaging</string>
-    <string name="compose_scheduled_toast">Added to scheduled messages</string>
-    <string name="compose_hint">Napiši poruku&#8230;</string>
-    <string name="compose_menu_copy">Kopiraj tekst</string>
-    <string name="compose_menu_forward">Proslijedi</string>
-    <string name="compose_menu_delete">Izbriši</string>
-    <string name="compose_menu_previous">Previous</string>
-    <string name="compose_menu_next">Next</string>
-    <string name="compose_menu_clear">Clear</string>
-    <string name="compose_details_title">Message details</string>
-    <string name="compose_details_type">Type: %s</string>
-    <string name="compose_details_from">From: %s</string>
-    <string name="compose_details_to">To: %s</string>
-    <string name="compose_details_subject">Subject: %s</string>
-    <string name="compose_details_priority">Priority: %s</string>
-    <string name="compose_details_size">Size: %s</string>
-    <string name="compose_details_sent">Sent: %s</string>
-    <string name="compose_details_received">Received: %s</string>
-    <string name="compose_details_delivered">Delivered: %s</string>
-    <string name="compose_details_error_code">Error code: %d</string>
-    <string name="compose_attach_cd">Dodaj privitak</string>
-    <string name="compose_gallery_cd">Priloži fotografiju</string>
-    <string name="compose_camera_cd">Uslikaj fotografiju</string>
-    <string name="compose_schedule_cd">Schedule message</string>
-    <string name="compose_contact_cd">Attach a contact</string>
-    <string name="compose_contact_error">Error reading contact</string>
-    <!-- Example: SIM 1 (Verizon) selected-->
-    <string name="compose_sim_changed_toast">SIM %1$d (%2$s) selected</string>
-    <string name="compose_sim_cd">%s selected, change SIM card</string>
-    <string name="compose_send_cd">Pošalji poruku</string>
-    <string name="message_status_sending">Slanje&#8230;</string>
-    <string name="message_status_delivered">Isporučeno %s</string>
-    <string name="message_status_failed">Slanje nije uspjelo. Dodirnite da biste pokušali ponovno</string>
-    <string name="info_title">Detalji</string>
-    <string name="info_copied_address">Address copied</string>
-    <string name="info_name">Conversation title</string>
-    <string name="info_notifications">Obavijesti</string>
-    <string name="info_theme">Tema</string>
-    <string name="info_archive">Arhiva</string>
-    <string name="info_unarchive">Dearhiviraj</string>
-    <string name="info_block">Blokiraj</string>
-    <string name="info_unblock">Deblokiraj</string>
-    <string name="info_delete">Izbriši razgovor</string>
-    <string name="gallery_error">Couldn\'t load media</string>
-    <string name="gallery_toast_saved">Saved to gallery</string>
-    <string name="backup_title">Backup and restore</string>
-    <string name="backup_backing_up">Backing up messages</string>
-    <string name="backup_restoring">Restoring from backup</string>
-    <string name="backup_last">Last backup</string>
-    <string name="backup_loading">Loading&#8230;</string>
-    <string name="backup_never">Never</string>
-    <string name="backup_restore_title">Restore</string>
-    <string name="backup_restore_summary">Select a backup</string>
-    <string name="backup_restore_error_plus">Please unlock QKSMS+ to use backup and restore</string>
-    <string name="backup_restore_error_backup">Backup in progress&#8230;</string>
-    <string name="backup_restore_error_restore">Restore in progress&#8230;</string>
-    <string name="backup_restore_confirm_title">Restore from backup</string>
-    <string name="backup_restore_confirm_message">Are you sure you would like to restore your messages from this backup?</string>
-    <string name="backup_restore_stop_title">Stop restore</string>
-    <string name="backup_restore_stop_message">Messages that have already been restored will remain on your device</string>
-    <string name="backup_restore_dialog_title">Backups</string>
-    <string name="backup_restore_dialog_empty">No backups found</string>
-    <plurals name="backup_message_count">
-        <item quantity="one">%d message</item>
-        <item quantity="few">%d messages</item>
-        <item quantity="other">%d messages</item>
-    </plurals>
-    <string name="backup_disclaimer">Currently, only SMS is supported by Backup and Restore. MMS support and scheduled backups will be coming soon!</string>
-    <string name="backup_now">Backup now</string>
-    <string name="backup_progress_parsing">Parsing backup&#8230;</string>
-    <string name="backup_progress_running">%d/%d messages</string>
-    <string name="backup_progress_saving">Saving backup&#8230;</string>
-    <string name="backup_progress_syncing">Syncing messages&#8230;</string>
-    <string name="backup_progress_finished">Finished!</string>
-    <string name="backup_notification_channel_name">Backup and restore</string>
-    <string name="scheduled_title">Scheduled</string>
-    <string name="scheduled_empty_description">Automatically send a message, at the exact moment you\'d like</string>
-    <string name="scheduled_empty_message_1">Hey! When was your birthday again?</string>
-    <string name="scheduled_empty_message_2">It\'s on December 23rd</string>
-    <string name="scheduled_empty_message_3">Happy birthday! Look at what a great friend I am, remembering your birthday</string>
-    <!--&#x200A; is a special character required at the end of this string to fix it's formatting in the app -->
-    <string name="scheduled_empty_message_3_timestamp">Sending on December 23rd </string>
-    <string name="scheduled_compose_cd">Schedule a message</string>
-    <string name="scheduled_options_title">Scheduled message</string>
-    <string-array name="scheduled_options">
-        <item>Send now</item>
-        <item>Copy text</item>
-        <item>Delete</item>
-    </string-array>
-    <string name="settings_category_appearance">Izgled</string>
-    <string name="settings_category_general">Općenito</string>
-    <string name="settings_category_qkreply">QK odgovor</string>
-    <string name="settings_theme_title">Tema</string>
-    <string name="settings_night_title">Noćni način</string>
-    <string name="settings_black_title">Potpuno crni noćni način</string>
-    <string name="settings_night_start_title">Vrijeme početka</string>
-    <string name="settings_night_end_title">Vrijeme završetka</string>
-    <string name="settings_automatic_colors_title">Automatic contact colors</string>
-    <string name="settings_text_size_title">Veličina fonta</string>
-    <string name="settings_system_font_title">Koristi sustavski font</string>
-    <string name="settings_auto_emoji_title">Automatsk emoji</string>
-    <string name="settings_notifications_title">Obavijesti</string>
-    <string name="settings_notifications_o_summary">Tap to customize</string>
-    <string name="settings_notification_actions_title">Actions</string>
-    <string name="settings_notification_action_1">Button 1</string>
-    <string name="settings_notification_action_2">Button 2</string>
-    <string name="settings_notification_action_3">Button 3</string>
-    <string name="settings_notification_previews_title">Pregledi obavijesti</string>
-    <string name="settings_notification_wake_title">Wake screen</string>
-    <string name="settings_vibration_title">Vibracija</string>
-    <string name="settings_ringtone_title">Zvuk</string>
-    <string name="settings_ringtone_none">None</string>
-    <string name="settings_qkreply_title">QK odgovor</string>
-    <string name="settings_qkreply_summary">Skočni prozor za nove poruke</string>
-    <string name="settings_qkreply_tap_dismiss_title">Dodirnite za odbacivanje</string>
-    <string name="settings_qkreply_tap_dismiss_summary">Dodirnite izvan skočnog prozora za zatvaranje</string>
-    <string name="settings_delayed_title">Delayed sending</string>
-    <string name="settings_swipe_actions">Swipe actions</string>
-    <string name="settings_swipe_actions_summary">Configure swipe actions for conversations</string>
-    <string name="settings_swipe_actions_right">Right swipe</string>
-    <string name="settings_swipe_actions_left">Left swipe</string>
-    <string name="settings_swipe_actions_change">CHANGE</string>
-    <string-array name="settings_swipe_actions">
-        <item>None</item>
-        <item>Archive</item>
-        <item>Delete</item>
-        <item>Block</item>
-        <item>Call</item>
-        <item>Mark read</item>
-        <item>Mark unread</item>
-    </string-array>
-    <string name="settings_delivery_title">Potvrde o dostavi</string>
-    <string name="settings_delivery_summary">Budite sigurni da su se poruke uspješno poslale</string>
-    <string name="settings_signature_title">Signature</string>
-    <string name="settings_signature_summary">Add a signature to the end of your messages</string>
-    <string name="settings_unicode_title">Strip naglasci</string>
-    <string name="settings_unicode_summary">Uklonite naglaske sa znakova u odlaznim SMS porukama</string>
-    <string name="settings_mobile_title">Mobile numbers only</string>
-    <string name="settings_mobile_summary">When composing a message, only show mobile numbers</string>
-    <string name="settings_auto_delete">Delete old messages automatically</string>
-    <string name="settings_auto_delete_dialog_message">Messages will be deleted after the specified number of days</string>
-    <string name="settings_auto_delete_dialog_hint">Number of days</string>
-    <string name="settings_auto_delete_never">Never</string>
-    <string name="settings_auto_delete_warning">Delete old messages automatically?</string>
-    <string name="settings_auto_delete_warning_message">If you proceed, %1$d messages will be deleted now</string>
-    <plurals name="settings_auto_delete_summary">
-        <item quantity="one">After 1 day</item>
-        <item quantity="few">After %d days</item>
-        <item quantity="other">After %d days</item>
-    </plurals>
-    <string name="settings_long_as_mms_title">Send long messages as MMS</string>
-    <string name="settings_long_as_mms_summary">If your longer text messages are failing to send, or sending in the wrong order, you can send them as MMS messages instead. Additional charges may apply</string>
-    <string name="settings_mms_size_title">Auto-compress MMS attachments</string>
-    <string name="settings_sync_title">Uskladi poruke</string>
-    <string name="settings_sync_summary">Ponovno uskladite svoje poruke sa nativnom Android SMS bazom podataka</string>
-    <string name="settings_about_title">O aplikaciji</string>
-    <string name="settings_version">Verzija %s</string>
-    <string name="settings_logging_enabled">Debug logging enabled</string>
-    <string name="settings_logging_disabled">Debug logging disabled</string>
-    <string name="settings_delay_duration_hint">Enter duration (seconds)</string>
-    <string name="blocking_title">Blocking</string>
-    <string name="blocking_drop_title">Drop messages</string>
-    <string name="blocking_drop_summary">Drop incoming messages from blocked senders instead of hiding them</string>
-    <string name="blocking_conversations">Blocked conversations</string>
-    <string name="blocking_manager_title">Blocking Manager</string>
-    <string name="blocking_manager_qksms_title">QKSMS</string>
-    <string name="blocking_manager_qksms_summary">Built-in blocking functionality in QKSMS</string>
-    <string name="blocking_manager_call_control_summary">Automatically filter your calls and messages in one convenient place! Community IQ™ allows you to prevent unwanted messages from community known spammers</string>
-    <string name="blocking_manager_sia_summary">Automatically filter messages from unsolicited numbers by using the \"Should I Answer\" app</string>
-    <string name="blocking_manager_copy_title">Copy blocked numbers</string>
-    <string name="blocking_manager_copy_summary">Continue to %s and copy over your existing blocked numbers</string>
-    <string name="blocked_numbers_title">Blocked numbers</string>
-    <string name="blocked_numbers_empty">Your blocked numbers will appear here</string>
-    <string name="blocked_numbers_add_cd">Block a new number</string>
-    <string name="blocked_numbers_dialog_title">Block texts from</string>
-    <string name="blocked_numbers_dialog_hint">Phone number</string>
-    <string name="blocked_numbers_dialog_block">Block</string>
-    <string name="blocked_messages_title">Blocked messages</string>
-    <string name="blocked_messages_empty">Your blocked messages will appear here</string>
-    <string name="blocking_block_title">Block</string>
-    <string name="blocking_unblock_title">Unblock</string>
-    <plurals name="blocking_block_external">
-        <item quantity="one">Continue to %s and block this number</item>
-        <item quantity="few">Continue to %s and block these numbers</item>
-        <item quantity="other">Continue to %s and block these numbers</item>
-    </plurals>
-    <plurals name="blocking_unblock_external">
-        <item quantity="one">Continue to %s and allow this number</item>
-        <item quantity="few">Continue to %s and allow these numbers</item>
-        <item quantity="other">Continue to %s and allow these numbers</item>
-    </plurals>
-    <string name="about_title">O aplikaciji</string>
-    <string name="about_version_title">Verzija</string>
-    <string name="about_developer_title">Autor</string>
-    <string name="about_source_title">Izvorni kod</string>
-    <string name="about_changelog_title">Popis promjena</string>
-    <string name="about_contact_title">Kontakt</string>
-    <string name="about_license_title">Licenca</string>
-    <string name="about_copyright_title">Autorska prava</string>
-    <string name="qksms_plus_description_title">Podržite razvoj, otključajte sve</string>
-    <string name="qksms_plus_description_summary">Možete spasiti izgladnjelog programera za samo %s</string>
-    <!-- Substitutions are for price and currency. Ex: Lifetime upgrade for $1.99 USD -->
-    <string name="qksms_plus_upgrade">Doživotna nadogradnja za %1$s %2$s</string>
-    <!-- Substitutions are for price and currency. Ex: Unlock + donate for $4.99 USD -->
-    <string name="qksms_plus_upgrade_donate">Otključajte + za %1$s %2$s</string>
-    <string name="qksms_plus_thanks_title">Hvala vam za podržavanje QKSMS!</string>
-    <string name="qksms_plus_thanks_summary">Sada imate pristup svim QKSMS+ značajkama</string>
-    <string name="qksms_plus_free_title">QKSMS+ is free for F-Droid users! If you\'d like to support development, a donation would be highly appreciated.</string>
-    <string name="qksms_plus_donate">Donirajte putem PayPala</string>
-    <string name="qksms_plus_coming_soon">Uskoro dolazi</string>
-    <string name="qksms_plus_themes_title">Premium teme</string>
-    <string name="qksms_plus_themes_summary">Otključajte lijepe boje tema koje nisu dostupne na paleti materijalnog dizajna</string>
-    <string name="qksms_plus_emoji_title">Prilagođeni automatski emoji</string>
-    <string name="qksms_plus_emoji_summary">Stvorite prilagođene prečace za automatski emoji</string>
-    <string name="qksms_plus_backup_title">Sigurnosno kopiranje poruka</string>
-    <string name="qksms_plus_backup_summary">Automatski sigurnosno kopirajte svoje poruke. Nikad više nemojte brinuti zbog gubitka povijesti ako promijenite telefon ili ga izgubite</string>
-    <string name="qksms_plus_scheduled_title">Zakazane poruke</string>
-    <string name="qksms_plus_scheduled_summary">Schedule messages to automatically be sent at a specific time and date</string>
-    <string name="qksms_plus_delayed_title">Odgođeno slanje</string>
-    <string name="qksms_plus_delayed_summary">Pričekajte nekoliko sekundi prije slanja poruke</string>
-    <string name="qksms_plus_night_title">Automatski noćni način</string>
-    <string name="qksms_plus_night_summary">Omogućite noćni način prema dobi dana</string>
-    <string name="qksms_plus_blacklist_title">Napredno blokiranje</string>
-    <string name="qksms_plus_blacklist_summary">Blokirajte poruke koje sadrže ključne riječi ili obrasce</string>
-    <string name="qksms_plus_forward_title">Automatsko prosljeđivanje</string>
-    <string name="qksms_plus_forward_summary">Automatski proslijedite poruke određenih pošiljatelja</string>
-    <string name="qksms_plus_respond_title">Automatsko odgovaranje</string>
-    <string name="qksms_plus_respond_summary">Automatski odgovorite na poruke sa prilagođenim odgovorima</string>
-    <string name="qksms_plus_more_title"> Više</string>
-    <string name="qksms_plus_more_summary">QKSMS is under active development, and your purchase will include all future QKSMS+ features!</string>
-    <string name="widget_loading">Učitavanje&#8230;</string>
-    <string name="widget_more">View more conversations</string>
-    <string name="qkreply_menu_read">Mark read</string>
-    <string name="qkreply_menu_call">Call</string>
-    <string name="qkreply_menu_delete">Delete</string>
-    <string name="qkreply_menu_expand">Show more</string>
-    <string name="qkreply_menu_collapse">Show less</string>
-    <string name="qkreply_menu_view">Open conversation</string>
-    <string name="theme_material">Materijalna</string>
-    <string name="theme_hex">HEX</string>
-    <string name="theme_apply">Apply</string>
-    <string-array name="notification_actions">
-        <item>None</item>
-        <item>Archive</item>
-        <item>Delete</item>
-        <item>Block</item>
-        <item>Call</item>
-        <item>Mark read</item>
-        <item>Reply</item>
-    </string-array>
-    <string name="button_yes">Yes</string>
-    <string name="button_continue">Continue</string>
-    <string name="button_cancel">Odustani</string>
-    <string name="button_delete">Izbriši</string>
-    <string name="button_save">Save</string>
-    <string name="button_stop">Stop</string>
-    <string name="button_more"> Više</string>
-    <string name="button_set">Set</string>
-    <string name="button_undo">Poništi</string>
-    <string name="toast_copied">Kopirano</string>
-    <string name="toast_archived">Razgovor je arhiviran</string>
-    <string name="toast_qksms_plus">Morate otključati QKSMS+ za korištenje ovog</string>
-    <plurals name="notification_new_messages">
-        <item quantity="one">New message</item>
-        <item quantity="few">%s new messages</item>
-        <item quantity="other">%s new messages</item>
-    </plurals>
-    <string name="notification_message_failed_title">Poruka nije poslana</string>
-    <string name="notification_message_failed_text">Poruku %s se nije uspjela poslati</string>
-    <string-array name="night_modes">
-        <item>System</item>
-        <item>Disabled</item>
-        <item>Always on</item>
-        <item>Automatic</item>
-    </string-array>
-    <string-array name="notification_preview_options">
-        <item>Show name and message</item>
-        <item>Show name</item>
-        <item>Hide contents</item>
-    </string-array>
-    <string-array name="text_sizes">
-        <item>Small</item>
-        <item>Normal</item>
-        <item>Large</item>
-        <item>Larger</item>
-    </string-array>
-    <string-array name="delayed_sending_labels">
-        <item>No delay</item>
-        <item>3 seconds</item>
-        <item>5 seconds</item>
-        <item>10 seconds</item>
-    </string-array>
-    <string-array name="mms_sizes">
-        <item>Automatic</item>
-        <item>100KB</item>
-        <item>200KB</item>
-        <item>300KB</item>
-        <item>600KB</item>
-        <item>1000KB</item>
-        <item>2000KB</item>
-        <item>No compression</item>
-    </string-array>
-    <string-array name="qk_responses">
-        <item>Okay</item>
-        <item>Give me a moment</item>
-        <item>On my way</item>
-        <item>Thanks</item>
-        <item>Sounds good</item>
-        <item>What\'s up?</item>
-        <item>Agreed</item>
-        <item>No</item>
-        <item>Love you</item>
-        <item>Sorry</item>
-        <item>LOL</item>
-        <item>That\'s okay</item>
-    </string-array>
-</resources>
+<?xml version="1.0" encoding="utf-8"?>
+<!--
+  ~ Copyright (C) 2019 Moez Bhatti <moez.bhatti@gmail.com>
+  ~
+  ~ This file is part of QKSMS.
+  ~
+  ~ QKSMS is free software: you can redistribute it and/or modify
+  ~ it under the terms of the GNU General Public License as published by
+  ~ the Free Software Foundation, either version 3 of the License, or
+  ~ (at your option) any later version.
+  ~
+  ~ QKSMS is distributed in the hope that it will be useful,
+  ~ but WITHOUT ANY WARRANTY; without even the implied warranty of
+  ~ MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+  ~ GNU General Public License for more details.
+  ~
+  ~ You should have received a copy of the GNU General Public License
+  ~ along with QKSMS.  If not, see <http://www.gnu.org/licenses/>.
+  -->
+<resources>
+    <string name="shortcut_compose_long_label">New conversation</string>
+    <string name="shortcut_compose_short_label">Compose</string>
+    <string name="shortcut_compose_disabled_message">Shortcut disabled</string>
+    <string name="title_archived">Arhivirano</string>
+    <string name="title_settings">Postavke</string>
+    <string name="title_notification_prefs">Obavijesti</string>
+    <string name="title_theme">Tema</string>
+    <string name="title_conversations">Pretraži poruke&#8230;</string>
+    <string name="title_compose">Unesite ime ili broj</string>
+    <string name="setup_skip">Preskoči</string>
+    <string name="setup_next">Nastavi</string>
+    <string name="menu_add_person">Add person</string>
+    <string name="menu_call">Nazovi</string>
+    <string name="menu_info">Detalji</string>
+    <string name="menu_save">Save to gallery</string>
+    <string name="menu_share">Share</string>
+    <string name="main_drawer_open_cd">Open navigation drawer</string>
+    <string name="main_title_selected">%d odabrano</string>
+    <string name="main_menu_clear">Očisti</string>
+    <string name="main_menu_archive">Arhiviraj</string>
+    <string name="main_menu_unarchive">Dearhiviraj</string>
+    <string name="main_menu_delete">Izbriši</string>
+    <string name="main_menu_add_contact">Add to contacts</string>
+    <string name="main_menu_pin">Pin to top</string>
+    <string name="main_menu_unpin">Unpin</string>
+    <string name="main_menu_read">Mark read</string>
+    <string name="main_menu_unread">Mark unread</string>
+    <string name="main_menu_block">Blokiraj</string>
+    <string name="main_syncing">Syncing messages&#8230;</string>
+    <string name="main_sender_you">Vi: %s</string>
+    <string name="main_draft">Draft</string>
+    <string name="main_message_results_title">Results in messages</string>
+    <string name="main_message_results">%d messages</string>
+    <string name="inbox_empty_text">Vaši razgovori će se pojaviti ovdje</string>
+    <string name="inbox_search_empty_text">Nema rezultata</string>
+    <string name="archived_empty_text">Vaši arhivirani razgovori će se pojaviti ovdje</string>
+    <string name="main_fab_cd">Započni novi razgovor</string>
+    <string name="main_default_sms_title">Love texting again</string>
+    <string name="main_default_sms_message">Make QKSMS your default SMS app</string>
+    <string name="main_default_sms_change">Change</string>
+    <string name="main_permission_required">Permission required</string>
+    <string name="main_permission_sms">QKSMS needs permission to send and view SMS messages</string>
+    <string name="main_permission_contacts">QKSMS needs permission to view your contacts</string>
+    <string name="main_permission_allow">Allow</string>
+    <string name="drawer_inbox">Poruke</string>
+    <string name="drawer_archived">Arhivirano</string>
+    <string name="drawer_scheduled">Zakazano</string>
+    <string name="drawer_blocking">Blocking</string>
+    <string name="drawer_more"> Više</string>
+    <string name="drawer_settings">Postavke</string>
+    <string name="drawer_help">Pomoć i povratne informacije</string>
+    <string name="drawer_invite">Invite friends</string>
+    <string name="drawer_plus_banner_summary">Unlock amazing new features, and support development</string>
+    <string name="rate_title">Uživate u QKSMS?</string>
+    <string name="rate_summary">Podijelite malo ljubavi i ocijenite nas na Google Playu!</string>
+    <string name="rate_okay">U REDU!</string>
+    <string name="rate_dismiss">ODBACI</string>
+    <string name="dialog_delete_title">Izbriši</string>
+    <plurals name="dialog_delete_message">
+        <item quantity="one">Are you sure you would like to delete this conversation?</item>
+        <item quantity="few">Are you sure you would like to delete %d conversations?</item>
+        <item quantity="other">Are you sure you would like to delete %d conversations?</item>
+    </plurals>
+    <string-array name="message_options">
+        <item>Kopiraj tekst</item>
+        <item>Proslijedi</item>
+        <item>Izbriši</item>
+    </string-array>
+    <string name="compose_number_picker_title">Choose a phone number</string>
+    <string name="compose_number_picker_default">%s ∙ Default</string>
+    <string name="compose_number_picker_once">Just once</string>
+    <string name="compose_number_picker_always">Always</string>
+    <string name="compose_title_selected">%d odabrano</string>
+    <string name="compose_subtitle_results">%1$d of %2$d results</string>
+    <string name="compose_send_group_title">Send as group message</string>
+    <string name="compose_send_group_summary">Recipients and replies will be visible to everyone</string>
+    <string name="compose_messages_empty">Ovo je početak vašeg razgovora. Recite nešto lijepo!</string>
+    <string name="compose_vcard_label">Contact card</string>
+    <string name="compose_scheduled_for">Scheduled for</string>
+    <string name="compose_scheduled_future">Selected time must be in the future!</string>
+    <string name="compose_scheduled_plus">You must unlock QKSMS+ to use scheduled messaging</string>
+    <string name="compose_scheduled_toast">Added to scheduled messages</string>
+    <string name="compose_hint">Napiši poruku&#8230;</string>
+    <string name="compose_menu_copy">Kopiraj tekst</string>
+    <string name="compose_menu_forward">Proslijedi</string>
+    <string name="compose_menu_delete">Izbriši</string>
+    <string name="compose_menu_previous">Previous</string>
+    <string name="compose_menu_next">Next</string>
+    <string name="compose_menu_clear">Clear</string>
+    <string name="compose_details_title">Message details</string>
+    <string name="compose_details_type">Type: %s</string>
+    <string name="compose_details_from">From: %s</string>
+    <string name="compose_details_to">To: %s</string>
+    <string name="compose_details_subject">Subject: %s</string>
+    <string name="compose_details_priority">Priority: %s</string>
+    <string name="compose_details_size">Size: %s</string>
+    <string name="compose_details_sent">Sent: %s</string>
+    <string name="compose_details_received">Received: %s</string>
+    <string name="compose_details_delivered">Delivered: %s</string>
+    <string name="compose_details_error_code">Error code: %d</string>
+    <string name="compose_attach_cd">Dodaj privitak</string>
+    <string name="compose_gallery_cd">Priloži fotografiju</string>
+    <string name="compose_camera_cd">Uslikaj fotografiju</string>
+    <string name="compose_schedule_cd">Schedule message</string>
+    <string name="compose_contact_cd">Attach a contact</string>
+    <string name="compose_contact_error">Error reading contact</string>
+    <!-- Example: SIM 1 (Verizon) selected-->
+    <string name="compose_sim_changed_toast">SIM %1$d (%2$s) selected</string>
+    <string name="compose_sim_cd">%s selected, change SIM card</string>
+    <string name="compose_send_cd">Pošalji poruku</string>
+    <string name="message_status_sending">Slanje&#8230;</string>
+    <string name="message_status_delivered">Isporučeno %s</string>
+    <string name="message_status_failed">Slanje nije uspjelo. Dodirnite da biste pokušali ponovno</string>
+    <string name="info_title">Detalji</string>
+    <string name="info_copied_address">Address copied</string>
+    <string name="info_name">Conversation title</string>
+    <string name="info_notifications">Obavijesti</string>
+    <string name="info_theme">Tema</string>
+    <string name="info_archive">Arhiva</string>
+    <string name="info_unarchive">Dearhiviraj</string>
+    <string name="info_block">Blokiraj</string>
+    <string name="info_unblock">Deblokiraj</string>
+    <string name="info_delete">Izbriši razgovor</string>
+    <string name="gallery_error">Couldn\'t load media</string>
+    <string name="gallery_toast_saved">Saved to gallery</string>
+    <string name="backup_title">Backup and restore</string>
+    <string name="backup_backing_up">Backing up messages</string>
+    <string name="backup_restoring">Restoring from backup</string>
+    <string name="backup_last">Last backup</string>
+    <string name="backup_loading">Loading&#8230;</string>
+    <string name="backup_never">Never</string>
+    <string name="backup_restore_title">Restore</string>
+    <string name="backup_restore_summary">Select a backup</string>
+    <string name="backup_restore_error_plus">Please unlock QKSMS+ to use backup and restore</string>
+    <string name="backup_restore_error_backup">Backup in progress&#8230;</string>
+    <string name="backup_restore_error_restore">Restore in progress&#8230;</string>
+    <string name="backup_restore_confirm_title">Restore from backup</string>
+    <string name="backup_restore_confirm_message">Are you sure you would like to restore your messages from this backup?</string>
+    <string name="backup_restore_stop_title">Stop restore</string>
+    <string name="backup_restore_stop_message">Messages that have already been restored will remain on your device</string>
+    <string name="backup_restore_dialog_title">Backups</string>
+    <string name="backup_restore_dialog_empty">No backups found</string>
+    <plurals name="backup_message_count">
+        <item quantity="one">%d message</item>
+        <item quantity="few">%d messages</item>
+        <item quantity="other">%d messages</item>
+    </plurals>
+    <string name="backup_disclaimer">Currently, only SMS is supported by Backup and Restore. MMS support and scheduled backups will be coming soon!</string>
+    <string name="backup_now">Backup now</string>
+    <string name="backup_progress_parsing">Parsing backup&#8230;</string>
+    <string name="backup_progress_running">%d/%d messages</string>
+    <string name="backup_progress_saving">Saving backup&#8230;</string>
+    <string name="backup_progress_syncing">Syncing messages&#8230;</string>
+    <string name="backup_progress_finished">Finished!</string>
+    <string name="backup_notification_channel_name">Backup and restore</string>
+    <string name="scheduled_title">Scheduled</string>
+    <string name="scheduled_empty_description">Automatically send a message, at the exact moment you\'d like</string>
+    <string name="scheduled_empty_message_1">Hey! When was your birthday again?</string>
+    <string name="scheduled_empty_message_2">It\'s on December 23rd</string>
+    <string name="scheduled_empty_message_3">Happy birthday! Look at what a great friend I am, remembering your birthday</string>
+    <!--&#x200A; is a special character required at the end of this string to fix it's formatting in the app -->
+    <string name="scheduled_empty_message_3_timestamp">Sending on December 23rd </string>
+    <string name="scheduled_compose_cd">Schedule a message</string>
+    <string name="scheduled_options_title">Scheduled message</string>
+    <string-array name="scheduled_options">
+        <item>Send now</item>
+        <item>Copy text</item>
+        <item>Delete</item>
+    </string-array>
+    <string name="settings_category_appearance">Izgled</string>
+    <string name="settings_category_general">Općenito</string>
+    <string name="settings_category_qkreply">QK odgovor</string>
+    <string name="settings_theme_title">Tema</string>
+    <string name="settings_night_title">Noćni način</string>
+    <string name="settings_black_title">Potpuno crni noćni način</string>
+    <string name="settings_night_start_title">Vrijeme početka</string>
+    <string name="settings_night_end_title">Vrijeme završetka</string>
+    <string name="settings_automatic_colors_title">Automatic contact colors</string>
+    <string name="settings_text_size_title">Veličina fonta</string>
+    <string name="settings_system_font_title">Koristi sustavski font</string>
+    <string name="settings_auto_emoji_title">Automatsk emoji</string>
+    <string name="settings_notifications_title">Obavijesti</string>
+    <string name="settings_notifications_o_summary">Tap to customize</string>
+    <string name="settings_notification_actions_title">Actions</string>
+    <string name="settings_notification_action_1">Button 1</string>
+    <string name="settings_notification_action_2">Button 2</string>
+    <string name="settings_notification_action_3">Button 3</string>
+    <string name="settings_notification_previews_title">Pregledi obavijesti</string>
+    <string name="settings_notification_wake_title">Wake screen</string>
+    <string name="settings_vibration_title">Vibracija</string>
+    <string name="settings_ringtone_title">Zvuk</string>
+    <string name="settings_ringtone_none">None</string>
+    <string name="settings_qkreply_title">QK odgovor</string>
+    <string name="settings_qkreply_summary">Skočni prozor za nove poruke</string>
+    <string name="settings_qkreply_tap_dismiss_title">Dodirnite za odbacivanje</string>
+    <string name="settings_qkreply_tap_dismiss_summary">Dodirnite izvan skočnog prozora za zatvaranje</string>
+    <string name="settings_delayed_title">Delayed sending</string>
+    <string name="settings_swipe_actions">Swipe actions</string>
+    <string name="settings_swipe_actions_summary">Configure swipe actions for conversations</string>
+    <string name="settings_swipe_actions_right">Right swipe</string>
+    <string name="settings_swipe_actions_left">Left swipe</string>
+    <string name="settings_swipe_actions_change">CHANGE</string>
+    <string-array name="settings_swipe_actions">
+        <item>None</item>
+        <item>Archive</item>
+        <item>Delete</item>
+        <item>Block</item>
+        <item>Call</item>
+        <item>Mark read</item>
+        <item>Mark unread</item>
+    </string-array>
+    <string name="settings_delivery_title">Potvrde o dostavi</string>
+    <string name="settings_delivery_summary">Budite sigurni da su se poruke uspješno poslale</string>
+    <string name="settings_signature_title">Signature</string>
+    <string name="settings_signature_summary">Add a signature to the end of your messages</string>
+    <string name="settings_unicode_title">Strip naglasci</string>
+    <string name="settings_unicode_summary">Uklonite naglaske sa znakova u odlaznim SMS porukama</string>
+    <string name="settings_mobile_title">Mobile numbers only</string>
+    <string name="settings_mobile_summary">When composing a message, only show mobile numbers</string>
+    <string name="settings_auto_delete">Delete old messages automatically</string>
+    <string name="settings_auto_delete_dialog_message">Messages will be deleted after the specified number of days</string>
+    <string name="settings_auto_delete_dialog_hint">Number of days</string>
+    <string name="settings_auto_delete_never">Never</string>
+    <string name="settings_auto_delete_warning">Delete old messages automatically?</string>
+    <string name="settings_auto_delete_warning_message">If you proceed, %1$d messages will be deleted now</string>
+    <plurals name="settings_auto_delete_summary">
+        <item quantity="one">After 1 day</item>
+        <item quantity="few">After %d days</item>
+        <item quantity="other">After %d days</item>
+    </plurals>
+    <string name="settings_long_as_mms_title">Send long messages as MMS</string>
+    <string name="settings_long_as_mms_summary">If your longer text messages are failing to send, or sending in the wrong order, you can send them as MMS messages instead. Additional charges may apply</string>
+    <string name="settings_mms_size_title">Auto-compress MMS attachments</string>
+    <string name="settings_sync_title">Uskladi poruke</string>
+    <string name="settings_sync_summary">Ponovno uskladite svoje poruke sa nativnom Android SMS bazom podataka</string>
+    <string name="settings_about_title">O aplikaciji</string>
+    <string name="settings_version">Verzija %s</string>
+    <string name="settings_logging_enabled">Debug logging enabled</string>
+    <string name="settings_logging_disabled">Debug logging disabled</string>
+    <string name="settings_delay_duration_hint">Enter duration (seconds)</string>
+    <string name="blocking_title">Blocking</string>
+    <string name="blocking_drop_title">Drop messages</string>
+    <string name="blocking_drop_summary">Drop incoming messages from blocked senders instead of hiding them</string>
+    <string name="blocking_conversations">Blocked conversations</string>
+    <string name="blocking_manager_title">Blocking Manager</string>
+    <string name="blocking_manager_qksms_title">QKSMS</string>
+    <string name="blocking_manager_qksms_summary">Built-in blocking functionality in QKSMS</string>
+    <string name="blocking_manager_call_control_summary">Automatically filter your calls and messages in one convenient place! Community IQ™ allows you to prevent unwanted messages from community known spammers</string>
+    <string name="blocking_manager_sia_summary">Automatically filter messages from unsolicited numbers by using the \"Should I Answer\" app</string>
+    <string name="blocking_manager_copy_title">Copy blocked numbers</string>
+    <string name="blocking_manager_copy_summary">Continue to %s and copy over your existing blocked numbers</string>
+    <string name="blocked_numbers_title">Blocked numbers</string>
+    <string name="blocked_numbers_empty">Your blocked numbers will appear here</string>
+    <string name="blocked_numbers_add_cd">Block a new number</string>
+    <string name="blocked_numbers_dialog_title">Block texts from</string>
+    <string name="blocked_numbers_dialog_hint">Phone number</string>
+    <string name="blocked_numbers_dialog_block">Block</string>
+    <string name="blocked_messages_title">Blocked messages</string>
+    <string name="blocked_messages_empty">Your blocked messages will appear here</string>
+    <string name="blocking_block_title">Block</string>
+    <string name="blocking_unblock_title">Unblock</string>
+    <plurals name="blocking_block_external">
+        <item quantity="one">Continue to %s and block this number</item>
+        <item quantity="few">Continue to %s and block these numbers</item>
+        <item quantity="other">Continue to %s and block these numbers</item>
+    </plurals>
+    <plurals name="blocking_unblock_external">
+        <item quantity="one">Continue to %s and allow this number</item>
+        <item quantity="few">Continue to %s and allow these numbers</item>
+        <item quantity="other">Continue to %s and allow these numbers</item>
+    </plurals>
+    <string name="about_title">O aplikaciji</string>
+    <string name="about_version_title">Verzija</string>
+    <string name="about_developer_title">Autor</string>
+    <string name="about_source_title">Izvorni kod</string>
+    <string name="about_changelog_title">Popis promjena</string>
+    <string name="about_contact_title">Kontakt</string>
+    <string name="about_license_title">Licenca</string>
+    <string name="about_copyright_title">Autorska prava</string>
+    <string name="qksms_plus_description_title">Podržite razvoj, otključajte sve</string>
+    <string name="qksms_plus_description_summary">Možete spasiti izgladnjelog programera za samo %s</string>
+    <!-- Substitutions are for price and currency. Ex: Lifetime upgrade for $1.99 USD -->
+    <string name="qksms_plus_upgrade">Doživotna nadogradnja za %1$s %2$s</string>
+    <!-- Substitutions are for price and currency. Ex: Unlock + donate for $4.99 USD -->
+    <string name="qksms_plus_upgrade_donate">Otključajte + za %1$s %2$s</string>
+    <string name="qksms_plus_thanks_title">Hvala vam za podržavanje QKSMS!</string>
+    <string name="qksms_plus_thanks_summary">Sada imate pristup svim QKSMS+ značajkama</string>
+    <string name="qksms_plus_free_title">QKSMS+ is free for F-Droid users! If you\'d like to support development, a donation would be highly appreciated.</string>
+    <string name="qksms_plus_donate">Donirajte putem PayPala</string>
+    <string name="qksms_plus_coming_soon">Uskoro dolazi</string>
+    <string name="qksms_plus_themes_title">Premium teme</string>
+    <string name="qksms_plus_themes_summary">Otključajte lijepe boje tema koje nisu dostupne na paleti materijalnog dizajna</string>
+    <string name="qksms_plus_emoji_title">Prilagođeni automatski emoji</string>
+    <string name="qksms_plus_emoji_summary">Stvorite prilagođene prečace za automatski emoji</string>
+    <string name="qksms_plus_backup_title">Sigurnosno kopiranje poruka</string>
+    <string name="qksms_plus_backup_summary">Automatski sigurnosno kopirajte svoje poruke. Nikad više nemojte brinuti zbog gubitka povijesti ako promijenite telefon ili ga izgubite</string>
+    <string name="qksms_plus_scheduled_title">Zakazane poruke</string>
+    <string name="qksms_plus_scheduled_summary">Schedule messages to automatically be sent at a specific time and date</string>
+    <string name="qksms_plus_delayed_title">Odgođeno slanje</string>
+    <string name="qksms_plus_delayed_summary">Pričekajte nekoliko sekundi prije slanja poruke</string>
+    <string name="qksms_plus_night_title">Automatski noćni način</string>
+    <string name="qksms_plus_night_summary">Omogućite noćni način prema dobi dana</string>
+    <string name="qksms_plus_blacklist_title">Napredno blokiranje</string>
+    <string name="qksms_plus_blacklist_summary">Blokirajte poruke koje sadrže ključne riječi ili obrasce</string>
+    <string name="qksms_plus_forward_title">Automatsko prosljeđivanje</string>
+    <string name="qksms_plus_forward_summary">Automatski proslijedite poruke određenih pošiljatelja</string>
+    <string name="qksms_plus_respond_title">Automatsko odgovaranje</string>
+    <string name="qksms_plus_respond_summary">Automatski odgovorite na poruke sa prilagođenim odgovorima</string>
+    <string name="qksms_plus_more_title"> Više</string>
+    <string name="qksms_plus_more_summary">QKSMS is under active development, and your purchase will include all future QKSMS+ features!</string>
+    <string name="widget_loading">Učitavanje&#8230;</string>
+    <string name="widget_more">View more conversations</string>
+    <string name="qkreply_menu_read">Mark read</string>
+    <string name="qkreply_menu_call">Call</string>
+    <string name="qkreply_menu_delete">Delete</string>
+    <string name="qkreply_menu_expand">Show more</string>
+    <string name="qkreply_menu_collapse">Show less</string>
+    <string name="qkreply_menu_view">Open conversation</string>
+    <string name="theme_material">Materijalna</string>
+    <string name="theme_hex">HEX</string>
+    <string name="theme_apply">Apply</string>
+    <string-array name="notification_actions">
+        <item>None</item>
+        <item>Archive</item>
+        <item>Delete</item>
+        <item>Block</item>
+        <item>Call</item>
+        <item>Mark read</item>
+        <item>Reply</item>
+    </string-array>
+    <string name="button_yes">Yes</string>
+    <string name="button_continue">Continue</string>
+    <string name="button_cancel">Odustani</string>
+    <string name="button_delete">Izbriši</string>
+    <string name="button_save">Save</string>
+    <string name="button_stop">Stop</string>
+    <string name="button_more"> Više</string>
+    <string name="button_set">Set</string>
+    <string name="button_undo">Poništi</string>
+    <string name="toast_copied">Kopirano</string>
+    <string name="toast_archived">Razgovor je arhiviran</string>
+    <string name="toast_qksms_plus">Morate otključati QKSMS+ za korištenje ovog</string>
+    <plurals name="notification_new_messages">
+        <item quantity="one">New message</item>
+        <item quantity="few">%s new messages</item>
+        <item quantity="other">%s new messages</item>
+    </plurals>
+    <string name="notification_message_failed_title">Poruka nije poslana</string>
+    <string name="notification_message_failed_text">Poruku %s se nije uspjela poslati</string>
+    <string-array name="night_modes">
+        <item>System</item>
+        <item>Disabled</item>
+        <item>Always on</item>
+        <item>Automatic</item>
+    </string-array>
+    <string-array name="notification_preview_options">
+        <item>Show name and message</item>
+        <item>Show name</item>
+        <item>Hide contents</item>
+    </string-array>
+    <string-array name="text_sizes">
+        <item>Small</item>
+        <item>Normal</item>
+        <item>Large</item>
+        <item>Larger</item>
+    </string-array>
+    <string-array name="delayed_sending_labels">
+        <item>No delay</item>
+        <item>3 seconds</item>
+        <item>5 seconds</item>
+        <item>10 seconds</item>
+    </string-array>
+    <string-array name="mms_sizes">
+        <item>Automatic</item>
+        <item>100KB</item>
+        <item>200KB</item>
+        <item>300KB</item>
+        <item>600KB</item>
+        <item>1000KB</item>
+        <item>2000KB</item>
+        <item>No compression</item>
+    </string-array>
+    <string-array name="qk_responses">
+        <item>Okay</item>
+        <item>Give me a moment</item>
+        <item>On my way</item>
+        <item>Thanks</item>
+        <item>Sounds good</item>
+        <item>What\'s up?</item>
+        <item>Agreed</item>
+        <item>No</item>
+        <item>Love you</item>
+        <item>Sorry</item>
+        <item>LOL</item>
+        <item>That\'s okay</item>
+    </string-array>
+</resources>
diff --git a/presentation/src/main/res/values-hu/strings.xml b/presentation/src/main/res/values-hu/strings.xml
index c5c5bd6d0..9614a811b 100644
--- a/presentation/src/main/res/values-hu/strings.xml
+++ b/presentation/src/main/res/values-hu/strings.xml
@@ -1,411 +1,411 @@
-<?xml version="1.0" encoding="utf-8"?>
-<!--
-  ~ Copyright (C) 2019 Moez Bhatti <moez.bhatti@gmail.com>
-  ~
-  ~ This file is part of QKSMS.
-  ~
-  ~ QKSMS is free software: you can redistribute it and/or modify
-  ~ it under the terms of the GNU General Public License as published by
-  ~ the Free Software Foundation, either version 3 of the License, or
-  ~ (at your option) any later version.
-  ~
-  ~ QKSMS is distributed in the hope that it will be useful,
-  ~ but WITHOUT ANY WARRANTY; without even the implied warranty of
-  ~ MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
-  ~ GNU General Public License for more details.
-  ~
-  ~ You should have received a copy of the GNU General Public License
-  ~ along with QKSMS.  If not, see <http://www.gnu.org/licenses/>.
-  -->
-<resources>
-    <string name="shortcut_compose_long_label">Új beszélgetés</string>
-    <string name="shortcut_compose_short_label">Írás</string>
-    <string name="shortcut_compose_disabled_message">Rövidítés letiltva</string>
-    <string name="title_archived">Archivált</string>
-    <string name="title_settings">Beállítások</string>
-    <string name="title_notification_prefs">Értesítések</string>
-    <string name="title_theme">Téma</string>
-    <string name="title_conversations">Keresés az üzenetek között&#8230;</string>
-    <string name="title_compose">Adj meg egy nevet vagy telefonszámot</string>
-    <string name="setup_skip">Kihagy</string>
-    <string name="setup_next">Tovább</string>
-    <string name="menu_add_person">Személy hozzáadása</string>
-    <string name="menu_call">Hívás</string>
-    <string name="menu_info">Részletek</string>
-    <string name="menu_save">Mentés a galériába</string>
-    <string name="menu_share">Megosztás</string>
-    <string name="main_drawer_open_cd">Navigációs kiválasztása</string>
-    <string name="main_title_selected">%d kijelölve</string>
-    <string name="main_menu_clear">Törlés</string>
-    <string name="main_menu_archive">Archiválás</string>
-    <string name="main_menu_unarchive">Archiválás visszavonása</string>
-    <string name="main_menu_delete">Törlés</string>
-    <string name="main_menu_add_contact">Hozzáadás az ismerősökhöz</string>
-    <string name="main_menu_pin">Rögzítés a tetejére</string>
-    <string name="main_menu_unpin">Rögzítés törlése</string>
-    <string name="main_menu_read">Mark read</string>
-    <string name="main_menu_unread">Mark unread</string>
-    <string name="main_menu_block">Tiltás</string>
-    <string name="main_syncing">Üzenetek szinkronizálása&#8230;</string>
-    <string name="main_sender_you">Te: %s</string>
-    <string name="main_draft">Vázlat</string>
-    <string name="main_message_results_title">Eredmények az üzenetek szövegében</string>
-    <string name="main_message_results">%d üzenet</string>
-    <string name="inbox_empty_text">A beszélgetéseid itt jelennek meg</string>
-    <string name="inbox_search_empty_text">Nincs eredmény</string>
-    <string name="archived_empty_text">Az archivált beszélgetéseid itt jelennek meg</string>
-    <string name="main_fab_cd">Új beszélgetés kezdeményezése</string>
-    <string name="main_default_sms_title">Szeresd újból az SMS-ezést</string>
-    <string name="main_default_sms_message">A QKSMS beállítása alapértelmezett SMS alkalmazásként</string>
-    <string name="main_default_sms_change">Módosít</string>
-    <string name="main_permission_required">Engedély szükséges</string>
-    <string name="main_permission_sms">A QKSMS-nek engedélyt kell kapnia az SMS üzenetek küldésére és megtekintésére</string>
-    <string name="main_permission_contacts">A QKSMS-nek engedélyt kell kapnia a telefonkönyv megtekintésére</string>
-    <string name="main_permission_allow">Engedélyez</string>
-    <string name="drawer_inbox">Bejövő üzenetek</string>
-    <string name="drawer_archived">Archivált</string>
-    <string name="drawer_scheduled">Ütemezett</string>
-    <string name="drawer_blocking">Blokkolás</string>
-    <string name="drawer_more">Továbbiak</string>
-    <string name="drawer_settings">Beállítások</string>
-    <string name="drawer_help">Súgó és visszajelzés</string>
-    <string name="drawer_invite">Ismerősök meghívása</string>
-    <string name="drawer_plus_banner_summary">Juss érdekes, új lehetőségekhez és támogasd fejlesztést</string>
-    <string name="rate_title">Tetszik a QKSMS?</string>
-    <string name="rate_summary">Oszd meg a szeretetet és értékelj minket a Google Playen!</string>
-    <string name="rate_okay">OKÉ!</string>
-    <string name="rate_dismiss">MELLŐZÉS</string>
-    <string name="dialog_delete_title">Törlés</string>
-    <plurals name="dialog_delete_message">
-        <item quantity="one">Biztos, hogy törölni szeretnéd ezt a beszélgetést?</item>
-        <item quantity="other">Biztos, hogy törölni szeretnél %d beszélgetést?</item>
-    </plurals>
-    <string-array name="message_options">
-        <item>Szöveg másolása</item>
-        <item>Továbbítás</item>
-        <item>Törlés</item>
-    </string-array>
-    <string name="compose_number_picker_title">Válassz egy telefonszámot</string>
-    <string name="compose_number_picker_default">%s · Alapértelmezett</string>
-    <string name="compose_number_picker_once">Csak egyszer</string>
-    <string name="compose_number_picker_always">Mindig</string>
-    <string name="compose_title_selected">%d kijelölve</string>
-    <string name="compose_subtitle_results">%1$d. a %2$d találatból</string>
-    <string name="compose_send_group_title">Küldés csoportos üzenetként</string>
-    <string name="compose_send_group_summary">A címzettek és a válaszok mindenkinek láthatóak lesznek</string>
-    <string name="compose_messages_empty">Ez a társalgás kezdete. Írj valami kedveset!</string>
-    <string name="compose_vcard_label">Névjegy</string>
-    <string name="compose_scheduled_for">Várakozik</string>
-    <string name="compose_scheduled_future">A kiválasztott időpontnak a jövőben kell lennie!</string>
-    <string name="compose_scheduled_plus">Aktiválnod kell a QKSMS+-t hogy időzített üzeneteteket tudj használni</string>
-    <string name="compose_scheduled_toast">Hozzáadva az időzített üzenetekhez</string>
-    <string name="compose_hint">Írj egy üzenetet&#8230;</string>
-    <string name="compose_menu_copy">Szöveg másolás</string>
-    <string name="compose_menu_forward">Továbbítás</string>
-    <string name="compose_menu_delete">Törlés</string>
-    <string name="compose_menu_previous">Előző</string>
-    <string name="compose_menu_next">Következő</string>
-    <string name="compose_menu_clear">Kiürítés</string>
-    <string name="compose_details_title">Üzenet részletei</string>
-    <string name="compose_details_type">Típus: %s</string>
-    <string name="compose_details_from">Feladó: %s</string>
-    <string name="compose_details_to">Cím: %s</string>
-    <string name="compose_details_subject">Tárgy: %s</string>
-    <string name="compose_details_priority">Prioritás: %s</string>
-    <string name="compose_details_size">Méret: %s</string>
-    <string name="compose_details_sent">Elküldve: %s</string>
-    <string name="compose_details_received">Megkapva: %s</string>
-    <string name="compose_details_delivered">Kézbesítve: %s</string>
-    <string name="compose_details_error_code">Hibakód: %d</string>
-    <string name="compose_attach_cd">Csatolás hozzáadása</string>
-    <string name="compose_gallery_cd">Fénykép hozzáadása</string>
-    <string name="compose_camera_cd">Fénykép készítése</string>
-    <string name="compose_schedule_cd">Időzített küldés</string>
-    <string name="compose_contact_cd">Személy hozzáadása</string>
-    <string name="compose_contact_error">Hiba a személy olvasása közben</string>
-    <!-- Example: SIM 1 (Verizon) selected-->
-    <string name="compose_sim_changed_toast">SIM %1$d (%2$s) selected</string>
-    <string name="compose_sim_cd">%s kiválasztva, cserélj SIM kártyát</string>
-    <string name="compose_send_cd">Üzenet küldése</string>
-    <string name="message_status_sending">Küldés&#8230;</string>
-    <string name="message_status_delivered">Kézbesítve %s</string>
-    <string name="message_status_failed">Sikertelen küldés. Érintsd meg az újraküldéshez</string>
-    <string name="info_title">Részletek</string>
-    <string name="info_copied_address">Cím átmásolva</string>
-    <string name="info_name">A beszélgetés témája</string>
-    <string name="info_notifications">Értesítések</string>
-    <string name="info_theme">Téma</string>
-    <string name="info_archive">Archivál</string>
-    <string name="info_unarchive">Archiválás visszavonása</string>
-    <string name="info_block">Blokkolás</string>
-    <string name="info_unblock">Blokkolás visszavonása</string>
-    <string name="info_delete">Beszélgetés törlése</string>
-    <string name="gallery_error">A média nem érhető el</string>
-    <string name="gallery_toast_saved">Mentés galériába</string>
-    <string name="backup_title">Mentés és visszaállítás</string>
-    <string name="backup_backing_up">Üzenetek mentése</string>
-    <string name="backup_restoring">Üzenetek visszaállítása mentésből</string>
-    <string name="backup_last">Utolsó mentés</string>
-    <string name="backup_loading">Betöltés&#8230;</string>
-    <string name="backup_never">Soha</string>
-    <string name="backup_restore_title">Visszaállítás</string>
-    <string name="backup_restore_summary">Válassz egy mentést</string>
-    <string name="backup_restore_error_plus">Oldd fel a QKSMS+-t a mentés és visszaállítás használatához</string>
-    <string name="backup_restore_error_backup">Mentés folyamatban&#8230;</string>
-    <string name="backup_restore_error_restore">Visszaállítás folyamatban&#8230;</string>
-    <string name="backup_restore_confirm_title">Visszaállítás mentésből</string>
-    <string name="backup_restore_confirm_message">Biztos vagy benne hogy vissza akarod állítani a mentésből a üzeneteket?</string>
-    <string name="backup_restore_stop_title">Visszaállítás megállítása</string>
-    <string name="backup_restore_stop_message">A már visszaállított üzenetek a készülékeden maradnak</string>
-    <string name="backup_restore_dialog_title">Mentések</string>
-    <string name="backup_restore_dialog_empty">Nincsenek mentések</string>
-    <plurals name="backup_message_count">
-        <item quantity="one">%d üzenet</item>
-        <item quantity="other">%d üzenet</item>
-    </plurals>
-    <string name="backup_disclaimer">Jelenleg a mentés csak az SMS üzeneteket menti. Az MMS támogatás és az időzített mentések hamarosan jönnek!</string>
-    <string name="backup_now">Mentés most</string>
-    <string name="backup_progress_parsing">Mentés elemzése&#8230;</string>
-    <string name="backup_progress_running">%d/%d üzenet</string>
-    <string name="backup_progress_saving">Mentés&#8230;</string>
-    <string name="backup_progress_syncing">Üzenetek szinkronizálása&#8230;</string>
-    <string name="backup_progress_finished">Kész!</string>
-    <string name="backup_notification_channel_name">Mentés és visszaállítás</string>
-    <string name="scheduled_title">Ütemezés</string>
-    <string name="scheduled_empty_description">Automatikus üzenetküldés pont akkor, amikor te szeretnéd</string>
-    <string name="scheduled_empty_message_1">Szia! Mikor is van a szülinapod?</string>
-    <string name="scheduled_empty_message_2">December 23</string>
-    <string name="scheduled_empty_message_3">Boldog szülinapot! Látod micsoda remek barát vagyok, eszembe jutott a szülinapod</string>
-    <!--&#x200A; is a special character required at the end of this string to fix it's formatting in the app -->
-    <string name="scheduled_empty_message_3_timestamp">Küldés december 23-án</string>
-    <string name="scheduled_compose_cd">Küldés időzítése</string>
-    <string name="scheduled_options_title">Időzített üzenet</string>
-    <string-array name="scheduled_options">
-        <item>Küldés most</item>
-        <item>Szöveg másolása</item>
-        <item>Törlés</item>
-    </string-array>
-    <string name="settings_category_appearance">Megjelenés</string>
-    <string name="settings_category_general">Általános</string>
-    <string name="settings_category_qkreply">QK válasz</string>
-    <string name="settings_theme_title">Téma</string>
-    <string name="settings_night_title">Éjszakai mód</string>
-    <string name="settings_black_title">Éjfekete mód</string>
-    <string name="settings_night_start_title">Kezdés ideje</string>
-    <string name="settings_night_end_title">Befejezés ideje</string>
-    <string name="settings_automatic_colors_title">Ismerősök automatikus színezése</string>
-    <string name="settings_text_size_title">Betűméret</string>
-    <string name="settings_system_font_title">Rendszer betűtípus visszaállítása</string>
-    <string name="settings_auto_emoji_title">Automatikus emoji</string>
-    <string name="settings_notifications_title">Értesítések</string>
-    <string name="settings_notifications_o_summary">Érintsd meg a testreszabáshoz</string>
-    <string name="settings_notification_actions_title">Műveletek</string>
-    <string name="settings_notification_action_1">Gomb 1</string>
-    <string name="settings_notification_action_2">Gomb 2</string>
-    <string name="settings_notification_action_3">Gomb 3</string>
-    <string name="settings_notification_previews_title">Értesítés előnézet</string>
-    <string name="settings_notification_wake_title">Képernyő felébresztése</string>
-    <string name="settings_vibration_title">Rezgés</string>
-    <string name="settings_ringtone_title">Hang</string>
-    <string name="settings_ringtone_none">Nincs</string>
-    <string name="settings_qkreply_title">QK válasz</string>
-    <string name="settings_qkreply_summary">Felugró új üzenetek</string>
-    <string name="settings_qkreply_tap_dismiss_title">Érintsd meg az eltüntetéshez</string>
-    <string name="settings_qkreply_tap_dismiss_summary">Érintsd meg a felugró ablakon kívül a lezáráshoz</string>
-    <string name="settings_delayed_title">Késleltetett küldés</string>
-    <string name="settings_swipe_actions">Elhúzásos funkciók</string>
-    <string name="settings_swipe_actions_summary">A beszélgetésekhez tartozó elhúzások beállítása</string>
-    <string name="settings_swipe_actions_right">Jobbra húzás</string>
-    <string name="settings_swipe_actions_left">Balra húzás</string>
-    <string name="settings_swipe_actions_change">MEGVÁLTOZTATÁS</string>
-    <string-array name="settings_swipe_actions">
-        <item>Nincs</item>
-        <item>Archiválás</item>
-        <item>Törlés</item>
-        <item>Block</item>
-        <item>Call</item>
-        <item>Mark read</item>
-        <item>Mark unread</item>
-    </string-array>
-    <string name="settings_delivery_title">Elküldés megerősítése</string>
-    <string name="settings_delivery_summary">Megerősíti, hogy az üzenetek sikeresen el lettek-e küldve</string>
-    <string name="settings_signature_title">Aláírás</string>
-    <string name="settings_signature_summary">Aláírás az üzenet végére</string>
-    <string name="settings_unicode_title">Ékezetek törlése</string>
-    <string name="settings_unicode_summary">A kimenő SMS-üzenetek ékezetes karaktereinek átalakítása</string>
-    <string name="settings_mobile_title">Csak mobilszámok</string>
-    <string name="settings_mobile_summary">Üzenet írásánál csak a mobilszámokat mutassa</string>
-    <string name="settings_auto_delete">Delete old messages automatically</string>
-    <string name="settings_auto_delete_dialog_message">Messages will be deleted after the specified number of days</string>
-    <string name="settings_auto_delete_dialog_hint">Number of days</string>
-    <string name="settings_auto_delete_never">Never</string>
-    <string name="settings_auto_delete_warning">Delete old messages automatically?</string>
-    <string name="settings_auto_delete_warning_message">If you proceed, %1$d messages will be deleted now</string>
-    <plurals name="settings_auto_delete_summary">
-        <item quantity="one">After 1 day</item>
-        <item quantity="other">After %d days</item>
-    </plurals>
-    <string name="settings_long_as_mms_title">A hosszú üzenetek MMS-ként küldése</string>
-    <string name="settings_long_as_mms_summary">Ha a hosszabb üzenetek küldése sikertelen, vagy rossz sorrendben érkeznek akkor lehet őket MMS-ként küldeni, de ez díjköteles lehet</string>
-    <string name="settings_mms_size_title">MMS-mellékletek automatikus tömörítése</string>
-    <string name="settings_sync_title">Üzenetek szinkronizálása</string>
-    <string name="settings_sync_summary">Üzenetek újra-szinkronizálása a natív Android SMS-adatbázissal</string>
-    <string name="settings_about_title">A QKSMS-ről</string>
-    <string name="settings_version">%s verzió</string>
-    <string name="settings_logging_enabled">Hibanaplózás engedélyezve</string>
-    <string name="settings_logging_disabled">Hibanaplózás tiltva</string>
-    <string name="settings_delay_duration_hint">Nyomva tartás ideje (másodpercben)</string>
-    <string name="blocking_title">Blokkolás</string>
-    <string name="blocking_drop_title">Üzenetek eldobása</string>
-    <string name="blocking_drop_summary">Üzenetek eldobása a blokkolt küldőktől az elrejtésük helyett</string>
-    <string name="blocking_conversations">Tiltott társalgások</string>
-    <string name="blocking_manager_title">Tiltáskezelő</string>
-    <string name="blocking_manager_qksms_title">QKSMS</string>
-    <string name="blocking_manager_qksms_summary">A QKSMS beépített tiltási funkciója</string>
-    <string name="blocking_manager_call_control_summary">Egy kényelmesen kezelhető helyen a hívások és üzenetek szűrése! A Community IQ™ megakadályozza a közösség által ismert spammerek üzeneteit</string>
-    <string name="blocking_manager_sia_summary">Automatikusan szűrheti az üzeneteket a nem kívánt számok alapján a \"Should I Answer\" alkalmazás használatával</string>
-    <string name="blocking_manager_copy_title">Tiltott számok másolása</string>
-    <string name="blocking_manager_copy_summary">%s másolása a már tiltott számok helyére</string>
-    <string name="blocked_numbers_title">Tiltott számok</string>
-    <string name="blocked_numbers_empty">A tiltott számok itt fognak megjelenni</string>
-    <string name="blocked_numbers_add_cd">Új szám tiltása</string>
-    <string name="blocked_numbers_dialog_title">Üzenetek tiltása:</string>
-    <string name="blocked_numbers_dialog_hint">Telefonszám</string>
-    <string name="blocked_numbers_dialog_block">Blokkolás</string>
-    <string name="blocked_messages_title">Tiltott üzenetek</string>
-    <string name="blocked_messages_empty">A tiltott üzenetek itt fognak megjelenni</string>
-    <string name="blocking_block_title">Blokkolás</string>
-    <string name="blocking_unblock_title">Visszaengedélyezés</string>
-    <plurals name="blocking_block_external">
-        <item quantity="one">%s és ennek a számnak a blokkolása</item>
-        <item quantity="other">%s és ezeknek a számoknak a tiltása</item>
-    </plurals>
-    <plurals name="blocking_unblock_external">
-        <item quantity="one">%s és ennek a számnak az engedélyezése</item>
-        <item quantity="other">%s és ezeknek a számoknak az engedélyezése</item>
-    </plurals>
-    <string name="about_title">Névjegy</string>
-    <string name="about_version_title">Verzió</string>
-    <string name="about_developer_title">Fejlesztői</string>
-    <string name="about_source_title">Forráskód</string>
-    <string name="about_changelog_title">Változások listája</string>
-    <string name="about_contact_title">Kapcsolat</string>
-    <string name="about_license_title">Licensz</string>
-    <string name="about_copyright_title">Copyright</string>
-    <string name="qksms_plus_description_title">Fejlesztés támogatása, minden funkció engedélyezése</string>
-    <string name="qksms_plus_description_summary">Csak %s hogy megmenthess egy éhező fejlesztőt</string>
-    <!-- Substitutions are for price and currency. Ex: Lifetime upgrade for $1.99 USD -->
-    <string name="qksms_plus_upgrade">Életre szóló upgrade %1$s %2$s</string>
-    <!-- Substitutions are for price and currency. Ex: Unlock + donate for $4.99 USD -->
-    <string name="qksms_plus_upgrade_donate">Minden funkció engedélyezése + adomány %1$s %2$s</string>
-    <string name="qksms_plus_thanks_title">Köszönjük, hogy támogatot a QKSMS-t!</string>
-    <string name="qksms_plus_thanks_summary">MOst hozzáférsz minden QKSMS+ funkcióhoz</string>
-    <string name="qksms_plus_free_title">A QKSMS+ minden F-Droid felhasználónak ingyenes. Ha támogatni szeretnéd a fejlesztést az alábbi módon megteheted.</string>
-    <string name="qksms_plus_donate">Támogatás PayPalon keresztül</string>
-    <string name="qksms_plus_coming_soon">Hamarosan</string>
-    <string name="qksms_plus_themes_title">Prémium témák</string>
-    <string name="qksms_plus_themes_summary">Használj olyan csodaszép témákat amik nem érhetőek el a Material Design palettáján</string>
-    <string name="qksms_plus_emoji_title">Személyre szabott auto-emoji</string>
-    <string name="qksms_plus_emoji_summary">Készíts személyre szabott emoji rövidítéseket</string>
-    <string name="qksms_plus_backup_title">Üzenet biztonsági mentés</string>
-    <string name="qksms_plus_backup_summary">Az üzenetek automatikus mentése. Nem kell többé aggódnod, hogy elvesznek az üzeneteid ha telefont cserélsz</string>
-    <string name="qksms_plus_scheduled_title">Időzített üzenetek</string>
-    <string name="qksms_plus_scheduled_summary">Az időzített üzenetek automatikusan a megadott időpontban kerülnek elküldésre</string>
-    <string name="qksms_plus_delayed_title">Késleltetett küldés</string>
-    <string name="qksms_plus_delayed_summary">Küldés előtt várjon pár másodpercet</string>
-    <string name="qksms_plus_night_title">Automatikus éjjeli mód</string>
-    <string name="qksms_plus_night_summary">Az éjjeli mód beálíltása napszaktól függően</string>
-    <string name="qksms_plus_blacklist_title">Fejlett blokkolás</string>
-    <string name="qksms_plus_blacklist_summary">Megadott kulcsszavakat vagy szövegrészleteket tartalmazó üzenetek blokkolása</string>
-    <string name="qksms_plus_forward_title">Automatikus továbbítás</string>
-    <string name="qksms_plus_forward_summary">Adott küldőktől jövő üzenetek automatikus továbbítása</string>
-    <string name="qksms_plus_respond_title">Automatikus válasz</string>
-    <string name="qksms_plus_respond_summary">Előre megadott sablonok küldése bejövő üzenetekre</string>
-    <string name="qksms_plus_more_title">Tovább</string>
-    <string name="qksms_plus_more_summary">A QKSMS folyamatos fejlesztés alatt áll és a vásárlásod a jövőbeni QKSMS+ funkciókat is tartalmazza!</string>
-    <string name="widget_loading">Betöltés&#8230;</string>
-    <string name="widget_more">További társalgások megtekintése</string>
-    <string name="qkreply_menu_read">Mark read</string>
-    <string name="qkreply_menu_call">Hívás</string>
-    <string name="qkreply_menu_delete">Törlés</string>
-    <string name="qkreply_menu_expand">Több megjelenítése</string>
-    <string name="qkreply_menu_collapse">Kevesebb megjelenítése</string>
-    <string name="qkreply_menu_view">Társalgás kinyitása</string>
-    <string name="theme_material">Material</string>
-    <string name="theme_hex">HEX</string>
-    <string name="theme_apply">Alkalmaz</string>
-    <string-array name="notification_actions">
-        <item>Nincs</item>
-        <item>Archive</item>
-        <item>Delete</item>
-        <item>Block</item>
-        <item>Call</item>
-        <item>Mark read</item>
-        <item>Reply</item>
-    </string-array>
-    <string name="button_yes">Igen</string>
-    <string name="button_continue">Folytatás</string>
-    <string name="button_cancel">Mégsem</string>
-    <string name="button_delete">Törlés</string>
-    <string name="button_save">Mentés</string>
-    <string name="button_stop">Megállítás</string>
-    <string name="button_more">Továbbiak</string>
-    <string name="button_set">Beállítás</string>
-    <string name="button_undo">Visszavonás</string>
-    <string name="toast_copied">Átmásolva</string>
-    <string name="toast_archived">Archivált beszélgetés</string>
-    <string name="toast_qksms_plus">Ehhez ki kell nyitnod a QKSMS+-t</string>
-    <plurals name="notification_new_messages">
-        <item quantity="one">Új üzenet</item>
-        <item quantity="other">%s új üzenet</item>
-    </plurals>
-    <string name="notification_message_failed_title">Az üzenet küldése sikertelen</string>
-    <string name="notification_message_failed_text">Nem sikerült az üzenetetet %s címzettnek elküldeni</string>
-    <string-array name="night_modes">
-        <item>Rendszer</item>
-        <item>Letiltva</item>
-        <item>Mindig bekapcsolt</item>
-        <item>Automatikus</item>
-    </string-array>
-    <string-array name="notification_preview_options">
-        <item>Név és üzenet látható</item>
-        <item>Név látható</item>
-        <item>A tartalom rejtett</item>
-    </string-array>
-    <string-array name="text_sizes">
-        <item>Kicsi</item>
-        <item>Normál</item>
-        <item>Nagy</item>
-        <item>Nagyobb</item>
-    </string-array>
-    <string-array name="delayed_sending_labels">
-        <item>Nincs késleltetés</item>
-        <item>3 seconds</item>
-        <item>5 seconds</item>
-        <item>10 seconds</item>
-    </string-array>
-    <string-array name="mms_sizes">
-        <item>Automatic</item>
-        <item>100KB</item>
-        <item>200KB</item>
-        <item>300KB</item>
-        <item>600KB</item>
-        <item>1000KB</item>
-        <item>2000KB</item>
-        <item>No compression</item>
-    </string-array>
-    <string-array name="qk_responses">
-        <item>Oké</item>
-        <item>Adj egy percet</item>
-        <item>Rajta vagyok</item>
-        <item>Köszönöm</item>
-        <item>Jónak tűnik</item>
-        <item>Mi a helyzet?</item>
-        <item>Elfogadva</item>
-        <item>Nem</item>
-        <item>Szeretlek</item>
-        <item>Sajnálom</item>
-        <item>LOL</item>
-        <item>Semmi baj</item>
-    </string-array>
-</resources>
+<?xml version="1.0" encoding="utf-8"?>
+<!--
+  ~ Copyright (C) 2019 Moez Bhatti <moez.bhatti@gmail.com>
+  ~
+  ~ This file is part of QKSMS.
+  ~
+  ~ QKSMS is free software: you can redistribute it and/or modify
+  ~ it under the terms of the GNU General Public License as published by
+  ~ the Free Software Foundation, either version 3 of the License, or
+  ~ (at your option) any later version.
+  ~
+  ~ QKSMS is distributed in the hope that it will be useful,
+  ~ but WITHOUT ANY WARRANTY; without even the implied warranty of
+  ~ MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+  ~ GNU General Public License for more details.
+  ~
+  ~ You should have received a copy of the GNU General Public License
+  ~ along with QKSMS.  If not, see <http://www.gnu.org/licenses/>.
+  -->
+<resources>
+    <string name="shortcut_compose_long_label">Új beszélgetés</string>
+    <string name="shortcut_compose_short_label">Írás</string>
+    <string name="shortcut_compose_disabled_message">Rövidítés letiltva</string>
+    <string name="title_archived">Archivált</string>
+    <string name="title_settings">Beállítások</string>
+    <string name="title_notification_prefs">Értesítések</string>
+    <string name="title_theme">Téma</string>
+    <string name="title_conversations">Keresés az üzenetek között&#8230;</string>
+    <string name="title_compose">Adj meg egy nevet vagy telefonszámot</string>
+    <string name="setup_skip">Kihagy</string>
+    <string name="setup_next">Tovább</string>
+    <string name="menu_add_person">Személy hozzáadása</string>
+    <string name="menu_call">Hívás</string>
+    <string name="menu_info">Részletek</string>
+    <string name="menu_save">Mentés a galériába</string>
+    <string name="menu_share">Megosztás</string>
+    <string name="main_drawer_open_cd">Navigációs kiválasztása</string>
+    <string name="main_title_selected">%d kijelölve</string>
+    <string name="main_menu_clear">Törlés</string>
+    <string name="main_menu_archive">Archiválás</string>
+    <string name="main_menu_unarchive">Archiválás visszavonása</string>
+    <string name="main_menu_delete">Törlés</string>
+    <string name="main_menu_add_contact">Hozzáadás az ismerősökhöz</string>
+    <string name="main_menu_pin">Rögzítés a tetejére</string>
+    <string name="main_menu_unpin">Rögzítés törlése</string>
+    <string name="main_menu_read">Mark read</string>
+    <string name="main_menu_unread">Mark unread</string>
+    <string name="main_menu_block">Tiltás</string>
+    <string name="main_syncing">Üzenetek szinkronizálása&#8230;</string>
+    <string name="main_sender_you">Te: %s</string>
+    <string name="main_draft">Vázlat</string>
+    <string name="main_message_results_title">Eredmények az üzenetek szövegében</string>
+    <string name="main_message_results">%d üzenet</string>
+    <string name="inbox_empty_text">A beszélgetéseid itt jelennek meg</string>
+    <string name="inbox_search_empty_text">Nincs eredmény</string>
+    <string name="archived_empty_text">Az archivált beszélgetéseid itt jelennek meg</string>
+    <string name="main_fab_cd">Új beszélgetés kezdeményezése</string>
+    <string name="main_default_sms_title">Szeresd újból az SMS-ezést</string>
+    <string name="main_default_sms_message">A QKSMS beállítása alapértelmezett SMS alkalmazásként</string>
+    <string name="main_default_sms_change">Módosít</string>
+    <string name="main_permission_required">Engedély szükséges</string>
+    <string name="main_permission_sms">A QKSMS-nek engedélyt kell kapnia az SMS üzenetek küldésére és megtekintésére</string>
+    <string name="main_permission_contacts">A QKSMS-nek engedélyt kell kapnia a telefonkönyv megtekintésére</string>
+    <string name="main_permission_allow">Engedélyez</string>
+    <string name="drawer_inbox">Bejövő üzenetek</string>
+    <string name="drawer_archived">Archivált</string>
+    <string name="drawer_scheduled">Ütemezett</string>
+    <string name="drawer_blocking">Blokkolás</string>
+    <string name="drawer_more">Továbbiak</string>
+    <string name="drawer_settings">Beállítások</string>
+    <string name="drawer_help">Súgó és visszajelzés</string>
+    <string name="drawer_invite">Ismerősök meghívása</string>
+    <string name="drawer_plus_banner_summary">Juss érdekes, új lehetőségekhez és támogasd fejlesztést</string>
+    <string name="rate_title">Tetszik a QKSMS?</string>
+    <string name="rate_summary">Oszd meg a szeretetet és értékelj minket a Google Playen!</string>
+    <string name="rate_okay">OKÉ!</string>
+    <string name="rate_dismiss">MELLŐZÉS</string>
+    <string name="dialog_delete_title">Törlés</string>
+    <plurals name="dialog_delete_message">
+        <item quantity="one">Biztos, hogy törölni szeretnéd ezt a beszélgetést?</item>
+        <item quantity="other">Biztos, hogy törölni szeretnél %d beszélgetést?</item>
+    </plurals>
+    <string-array name="message_options">
+        <item>Szöveg másolása</item>
+        <item>Továbbítás</item>
+        <item>Törlés</item>
+    </string-array>
+    <string name="compose_number_picker_title">Válassz egy telefonszámot</string>
+    <string name="compose_number_picker_default">%s · Alapértelmezett</string>
+    <string name="compose_number_picker_once">Csak egyszer</string>
+    <string name="compose_number_picker_always">Mindig</string>
+    <string name="compose_title_selected">%d kijelölve</string>
+    <string name="compose_subtitle_results">%1$d. a %2$d találatból</string>
+    <string name="compose_send_group_title">Küldés csoportos üzenetként</string>
+    <string name="compose_send_group_summary">A címzettek és a válaszok mindenkinek láthatóak lesznek</string>
+    <string name="compose_messages_empty">Ez a társalgás kezdete. Írj valami kedveset!</string>
+    <string name="compose_vcard_label">Névjegy</string>
+    <string name="compose_scheduled_for">Várakozik</string>
+    <string name="compose_scheduled_future">A kiválasztott időpontnak a jövőben kell lennie!</string>
+    <string name="compose_scheduled_plus">Aktiválnod kell a QKSMS+-t hogy időzített üzeneteteket tudj használni</string>
+    <string name="compose_scheduled_toast">Hozzáadva az időzített üzenetekhez</string>
+    <string name="compose_hint">Írj egy üzenetet&#8230;</string>
+    <string name="compose_menu_copy">Szöveg másolás</string>
+    <string name="compose_menu_forward">Továbbítás</string>
+    <string name="compose_menu_delete">Törlés</string>
+    <string name="compose_menu_previous">Előző</string>
+    <string name="compose_menu_next">Következő</string>
+    <string name="compose_menu_clear">Kiürítés</string>
+    <string name="compose_details_title">Üzenet részletei</string>
+    <string name="compose_details_type">Típus: %s</string>
+    <string name="compose_details_from">Feladó: %s</string>
+    <string name="compose_details_to">Cím: %s</string>
+    <string name="compose_details_subject">Tárgy: %s</string>
+    <string name="compose_details_priority">Prioritás: %s</string>
+    <string name="compose_details_size">Méret: %s</string>
+    <string name="compose_details_sent">Elküldve: %s</string>
+    <string name="compose_details_received">Megkapva: %s</string>
+    <string name="compose_details_delivered">Kézbesítve: %s</string>
+    <string name="compose_details_error_code">Hibakód: %d</string>
+    <string name="compose_attach_cd">Csatolás hozzáadása</string>
+    <string name="compose_gallery_cd">Fénykép hozzáadása</string>
+    <string name="compose_camera_cd">Fénykép készítése</string>
+    <string name="compose_schedule_cd">Időzített küldés</string>
+    <string name="compose_contact_cd">Személy hozzáadása</string>
+    <string name="compose_contact_error">Hiba a személy olvasása közben</string>
+    <!-- Example: SIM 1 (Verizon) selected-->
+    <string name="compose_sim_changed_toast">SIM %1$d (%2$s) selected</string>
+    <string name="compose_sim_cd">%s kiválasztva, cserélj SIM kártyát</string>
+    <string name="compose_send_cd">Üzenet küldése</string>
+    <string name="message_status_sending">Küldés&#8230;</string>
+    <string name="message_status_delivered">Kézbesítve %s</string>
+    <string name="message_status_failed">Sikertelen küldés. Érintsd meg az újraküldéshez</string>
+    <string name="info_title">Részletek</string>
+    <string name="info_copied_address">Cím átmásolva</string>
+    <string name="info_name">A beszélgetés témája</string>
+    <string name="info_notifications">Értesítések</string>
+    <string name="info_theme">Téma</string>
+    <string name="info_archive">Archivál</string>
+    <string name="info_unarchive">Archiválás visszavonása</string>
+    <string name="info_block">Blokkolás</string>
+    <string name="info_unblock">Blokkolás visszavonása</string>
+    <string name="info_delete">Beszélgetés törlése</string>
+    <string name="gallery_error">A média nem érhető el</string>
+    <string name="gallery_toast_saved">Mentés galériába</string>
+    <string name="backup_title">Mentés és visszaállítás</string>
+    <string name="backup_backing_up">Üzenetek mentése</string>
+    <string name="backup_restoring">Üzenetek visszaállítása mentésből</string>
+    <string name="backup_last">Utolsó mentés</string>
+    <string name="backup_loading">Betöltés&#8230;</string>
+    <string name="backup_never">Soha</string>
+    <string name="backup_restore_title">Visszaállítás</string>
+    <string name="backup_restore_summary">Válassz egy mentést</string>
+    <string name="backup_restore_error_plus">Oldd fel a QKSMS+-t a mentés és visszaállítás használatához</string>
+    <string name="backup_restore_error_backup">Mentés folyamatban&#8230;</string>
+    <string name="backup_restore_error_restore">Visszaállítás folyamatban&#8230;</string>
+    <string name="backup_restore_confirm_title">Visszaállítás mentésből</string>
+    <string name="backup_restore_confirm_message">Biztos vagy benne hogy vissza akarod állítani a mentésből a üzeneteket?</string>
+    <string name="backup_restore_stop_title">Visszaállítás megállítása</string>
+    <string name="backup_restore_stop_message">A már visszaállított üzenetek a készülékeden maradnak</string>
+    <string name="backup_restore_dialog_title">Mentések</string>
+    <string name="backup_restore_dialog_empty">Nincsenek mentések</string>
+    <plurals name="backup_message_count">
+        <item quantity="one">%d üzenet</item>
+        <item quantity="other">%d üzenet</item>
+    </plurals>
+    <string name="backup_disclaimer">Jelenleg a mentés csak az SMS üzeneteket menti. Az MMS támogatás és az időzített mentések hamarosan jönnek!</string>
+    <string name="backup_now">Mentés most</string>
+    <string name="backup_progress_parsing">Mentés elemzése&#8230;</string>
+    <string name="backup_progress_running">%d/%d üzenet</string>
+    <string name="backup_progress_saving">Mentés&#8230;</string>
+    <string name="backup_progress_syncing">Üzenetek szinkronizálása&#8230;</string>
+    <string name="backup_progress_finished">Kész!</string>
+    <string name="backup_notification_channel_name">Mentés és visszaállítás</string>
+    <string name="scheduled_title">Ütemezés</string>
+    <string name="scheduled_empty_description">Automatikus üzenetküldés pont akkor, amikor te szeretnéd</string>
+    <string name="scheduled_empty_message_1">Szia! Mikor is van a szülinapod?</string>
+    <string name="scheduled_empty_message_2">December 23</string>
+    <string name="scheduled_empty_message_3">Boldog szülinapot! Látod micsoda remek barát vagyok, eszembe jutott a szülinapod</string>
+    <!--&#x200A; is a special character required at the end of this string to fix it's formatting in the app -->
+    <string name="scheduled_empty_message_3_timestamp">Küldés december 23-án</string>
+    <string name="scheduled_compose_cd">Küldés időzítése</string>
+    <string name="scheduled_options_title">Időzített üzenet</string>
+    <string-array name="scheduled_options">
+        <item>Küldés most</item>
+        <item>Szöveg másolása</item>
+        <item>Törlés</item>
+    </string-array>
+    <string name="settings_category_appearance">Megjelenés</string>
+    <string name="settings_category_general">Általános</string>
+    <string name="settings_category_qkreply">QK válasz</string>
+    <string name="settings_theme_title">Téma</string>
+    <string name="settings_night_title">Éjszakai mód</string>
+    <string name="settings_black_title">Éjfekete mód</string>
+    <string name="settings_night_start_title">Kezdés ideje</string>
+    <string name="settings_night_end_title">Befejezés ideje</string>
+    <string name="settings_automatic_colors_title">Ismerősök automatikus színezése</string>
+    <string name="settings_text_size_title">Betűméret</string>
+    <string name="settings_system_font_title">Rendszer betűtípus visszaállítása</string>
+    <string name="settings_auto_emoji_title">Automatikus emoji</string>
+    <string name="settings_notifications_title">Értesítések</string>
+    <string name="settings_notifications_o_summary">Érintsd meg a testreszabáshoz</string>
+    <string name="settings_notification_actions_title">Műveletek</string>
+    <string name="settings_notification_action_1">Gomb 1</string>
+    <string name="settings_notification_action_2">Gomb 2</string>
+    <string name="settings_notification_action_3">Gomb 3</string>
+    <string name="settings_notification_previews_title">Értesítés előnézet</string>
+    <string name="settings_notification_wake_title">Képernyő felébresztése</string>
+    <string name="settings_vibration_title">Rezgés</string>
+    <string name="settings_ringtone_title">Hang</string>
+    <string name="settings_ringtone_none">Nincs</string>
+    <string name="settings_qkreply_title">QK válasz</string>
+    <string name="settings_qkreply_summary">Felugró új üzenetek</string>
+    <string name="settings_qkreply_tap_dismiss_title">Érintsd meg az eltüntetéshez</string>
+    <string name="settings_qkreply_tap_dismiss_summary">Érintsd meg a felugró ablakon kívül a lezáráshoz</string>
+    <string name="settings_delayed_title">Késleltetett küldés</string>
+    <string name="settings_swipe_actions">Elhúzásos funkciók</string>
+    <string name="settings_swipe_actions_summary">A beszélgetésekhez tartozó elhúzások beállítása</string>
+    <string name="settings_swipe_actions_right">Jobbra húzás</string>
+    <string name="settings_swipe_actions_left">Balra húzás</string>
+    <string name="settings_swipe_actions_change">MEGVÁLTOZTATÁS</string>
+    <string-array name="settings_swipe_actions">
+        <item>Nincs</item>
+        <item>Archiválás</item>
+        <item>Törlés</item>
+        <item>Block</item>
+        <item>Call</item>
+        <item>Mark read</item>
+        <item>Mark unread</item>
+    </string-array>
+    <string name="settings_delivery_title">Elküldés megerősítése</string>
+    <string name="settings_delivery_summary">Megerősíti, hogy az üzenetek sikeresen el lettek-e küldve</string>
+    <string name="settings_signature_title">Aláírás</string>
+    <string name="settings_signature_summary">Aláírás az üzenet végére</string>
+    <string name="settings_unicode_title">Ékezetek törlése</string>
+    <string name="settings_unicode_summary">A kimenő SMS-üzenetek ékezetes karaktereinek átalakítása</string>
+    <string name="settings_mobile_title">Csak mobilszámok</string>
+    <string name="settings_mobile_summary">Üzenet írásánál csak a mobilszámokat mutassa</string>
+    <string name="settings_auto_delete">Delete old messages automatically</string>
+    <string name="settings_auto_delete_dialog_message">Messages will be deleted after the specified number of days</string>
+    <string name="settings_auto_delete_dialog_hint">Number of days</string>
+    <string name="settings_auto_delete_never">Never</string>
+    <string name="settings_auto_delete_warning">Delete old messages automatically?</string>
+    <string name="settings_auto_delete_warning_message">If you proceed, %1$d messages will be deleted now</string>
+    <plurals name="settings_auto_delete_summary">
+        <item quantity="one">After 1 day</item>
+        <item quantity="other">After %d days</item>
+    </plurals>
+    <string name="settings_long_as_mms_title">A hosszú üzenetek MMS-ként küldése</string>
+    <string name="settings_long_as_mms_summary">Ha a hosszabb üzenetek küldése sikertelen, vagy rossz sorrendben érkeznek akkor lehet őket MMS-ként küldeni, de ez díjköteles lehet</string>
+    <string name="settings_mms_size_title">MMS-mellékletek automatikus tömörítése</string>
+    <string name="settings_sync_title">Üzenetek szinkronizálása</string>
+    <string name="settings_sync_summary">Üzenetek újra-szinkronizálása a natív Android SMS-adatbázissal</string>
+    <string name="settings_about_title">A QKSMS-ről</string>
+    <string name="settings_version">%s verzió</string>
+    <string name="settings_logging_enabled">Hibanaplózás engedélyezve</string>
+    <string name="settings_logging_disabled">Hibanaplózás tiltva</string>
+    <string name="settings_delay_duration_hint">Nyomva tartás ideje (másodpercben)</string>
+    <string name="blocking_title">Blokkolás</string>
+    <string name="blocking_drop_title">Üzenetek eldobása</string>
+    <string name="blocking_drop_summary">Üzenetek eldobása a blokkolt küldőktől az elrejtésük helyett</string>
+    <string name="blocking_conversations">Tiltott társalgások</string>
+    <string name="blocking_manager_title">Tiltáskezelő</string>
+    <string name="blocking_manager_qksms_title">QKSMS</string>
+    <string name="blocking_manager_qksms_summary">A QKSMS beépített tiltási funkciója</string>
+    <string name="blocking_manager_call_control_summary">Egy kényelmesen kezelhető helyen a hívások és üzenetek szűrése! A Community IQ™ megakadályozza a közösség által ismert spammerek üzeneteit</string>
+    <string name="blocking_manager_sia_summary">Automatikusan szűrheti az üzeneteket a nem kívánt számok alapján a \"Should I Answer\" alkalmazás használatával</string>
+    <string name="blocking_manager_copy_title">Tiltott számok másolása</string>
+    <string name="blocking_manager_copy_summary">%s másolása a már tiltott számok helyére</string>
+    <string name="blocked_numbers_title">Tiltott számok</string>
+    <string name="blocked_numbers_empty">A tiltott számok itt fognak megjelenni</string>
+    <string name="blocked_numbers_add_cd">Új szám tiltása</string>
+    <string name="blocked_numbers_dialog_title">Üzenetek tiltása:</string>
+    <string name="blocked_numbers_dialog_hint">Telefonszám</string>
+    <string name="blocked_numbers_dialog_block">Blokkolás</string>
+    <string name="blocked_messages_title">Tiltott üzenetek</string>
+    <string name="blocked_messages_empty">A tiltott üzenetek itt fognak megjelenni</string>
+    <string name="blocking_block_title">Blokkolás</string>
+    <string name="blocking_unblock_title">Visszaengedélyezés</string>
+    <plurals name="blocking_block_external">
+        <item quantity="one">%s és ennek a számnak a blokkolása</item>
+        <item quantity="other">%s és ezeknek a számoknak a tiltása</item>
+    </plurals>
+    <plurals name="blocking_unblock_external">
+        <item quantity="one">%s és ennek a számnak az engedélyezése</item>
+        <item quantity="other">%s és ezeknek a számoknak az engedélyezése</item>
+    </plurals>
+    <string name="about_title">Névjegy</string>
+    <string name="about_version_title">Verzió</string>
+    <string name="about_developer_title">Fejlesztői</string>
+    <string name="about_source_title">Forráskód</string>
+    <string name="about_changelog_title">Változások listája</string>
+    <string name="about_contact_title">Kapcsolat</string>
+    <string name="about_license_title">Licensz</string>
+    <string name="about_copyright_title">Copyright</string>
+    <string name="qksms_plus_description_title">Fejlesztés támogatása, minden funkció engedélyezése</string>
+    <string name="qksms_plus_description_summary">Csak %s hogy megmenthess egy éhező fejlesztőt</string>
+    <!-- Substitutions are for price and currency. Ex: Lifetime upgrade for $1.99 USD -->
+    <string name="qksms_plus_upgrade">Életre szóló upgrade %1$s %2$s</string>
+    <!-- Substitutions are for price and currency. Ex: Unlock + donate for $4.99 USD -->
+    <string name="qksms_plus_upgrade_donate">Minden funkció engedélyezése + adomány %1$s %2$s</string>
+    <string name="qksms_plus_thanks_title">Köszönjük, hogy támogatot a QKSMS-t!</string>
+    <string name="qksms_plus_thanks_summary">MOst hozzáférsz minden QKSMS+ funkcióhoz</string>
+    <string name="qksms_plus_free_title">A QKSMS+ minden F-Droid felhasználónak ingyenes. Ha támogatni szeretnéd a fejlesztést az alábbi módon megteheted.</string>
+    <string name="qksms_plus_donate">Támogatás PayPalon keresztül</string>
+    <string name="qksms_plus_coming_soon">Hamarosan</string>
+    <string name="qksms_plus_themes_title">Prémium témák</string>
+    <string name="qksms_plus_themes_summary">Használj olyan csodaszép témákat amik nem érhetőek el a Material Design palettáján</string>
+    <string name="qksms_plus_emoji_title">Személyre szabott auto-emoji</string>
+    <string name="qksms_plus_emoji_summary">Készíts személyre szabott emoji rövidítéseket</string>
+    <string name="qksms_plus_backup_title">Üzenet biztonsági mentés</string>
+    <string name="qksms_plus_backup_summary">Az üzenetek automatikus mentése. Nem kell többé aggódnod, hogy elvesznek az üzeneteid ha telefont cserélsz</string>
+    <string name="qksms_plus_scheduled_title">Időzített üzenetek</string>
+    <string name="qksms_plus_scheduled_summary">Az időzített üzenetek automatikusan a megadott időpontban kerülnek elküldésre</string>
+    <string name="qksms_plus_delayed_title">Késleltetett küldés</string>
+    <string name="qksms_plus_delayed_summary">Küldés előtt várjon pár másodpercet</string>
+    <string name="qksms_plus_night_title">Automatikus éjjeli mód</string>
+    <string name="qksms_plus_night_summary">Az éjjeli mód beálíltása napszaktól függően</string>
+    <string name="qksms_plus_blacklist_title">Fejlett blokkolás</string>
+    <string name="qksms_plus_blacklist_summary">Megadott kulcsszavakat vagy szövegrészleteket tartalmazó üzenetek blokkolása</string>
+    <string name="qksms_plus_forward_title">Automatikus továbbítás</string>
+    <string name="qksms_plus_forward_summary">Adott küldőktől jövő üzenetek automatikus továbbítása</string>
+    <string name="qksms_plus_respond_title">Automatikus válasz</string>
+    <string name="qksms_plus_respond_summary">Előre megadott sablonok küldése bejövő üzenetekre</string>
+    <string name="qksms_plus_more_title">Tovább</string>
+    <string name="qksms_plus_more_summary">A QKSMS folyamatos fejlesztés alatt áll és a vásárlásod a jövőbeni QKSMS+ funkciókat is tartalmazza!</string>
+    <string name="widget_loading">Betöltés&#8230;</string>
+    <string name="widget_more">További társalgások megtekintése</string>
+    <string name="qkreply_menu_read">Mark read</string>
+    <string name="qkreply_menu_call">Hívás</string>
+    <string name="qkreply_menu_delete">Törlés</string>
+    <string name="qkreply_menu_expand">Több megjelenítése</string>
+    <string name="qkreply_menu_collapse">Kevesebb megjelenítése</string>
+    <string name="qkreply_menu_view">Társalgás kinyitása</string>
+    <string name="theme_material">Material</string>
+    <string name="theme_hex">HEX</string>
+    <string name="theme_apply">Alkalmaz</string>
+    <string-array name="notification_actions">
+        <item>Nincs</item>
+        <item>Archive</item>
+        <item>Delete</item>
+        <item>Block</item>
+        <item>Call</item>
+        <item>Mark read</item>
+        <item>Reply</item>
+    </string-array>
+    <string name="button_yes">Igen</string>
+    <string name="button_continue">Folytatás</string>
+    <string name="button_cancel">Mégsem</string>
+    <string name="button_delete">Törlés</string>
+    <string name="button_save">Mentés</string>
+    <string name="button_stop">Megállítás</string>
+    <string name="button_more">Továbbiak</string>
+    <string name="button_set">Beállítás</string>
+    <string name="button_undo">Visszavonás</string>
+    <string name="toast_copied">Átmásolva</string>
+    <string name="toast_archived">Archivált beszélgetés</string>
+    <string name="toast_qksms_plus">Ehhez ki kell nyitnod a QKSMS+-t</string>
+    <plurals name="notification_new_messages">
+        <item quantity="one">Új üzenet</item>
+        <item quantity="other">%s új üzenet</item>
+    </plurals>
+    <string name="notification_message_failed_title">Az üzenet küldése sikertelen</string>
+    <string name="notification_message_failed_text">Nem sikerült az üzenetetet %s címzettnek elküldeni</string>
+    <string-array name="night_modes">
+        <item>Rendszer</item>
+        <item>Letiltva</item>
+        <item>Mindig bekapcsolt</item>
+        <item>Automatikus</item>
+    </string-array>
+    <string-array name="notification_preview_options">
+        <item>Név és üzenet látható</item>
+        <item>Név látható</item>
+        <item>A tartalom rejtett</item>
+    </string-array>
+    <string-array name="text_sizes">
+        <item>Kicsi</item>
+        <item>Normál</item>
+        <item>Nagy</item>
+        <item>Nagyobb</item>
+    </string-array>
+    <string-array name="delayed_sending_labels">
+        <item>Nincs késleltetés</item>
+        <item>3 seconds</item>
+        <item>5 seconds</item>
+        <item>10 seconds</item>
+    </string-array>
+    <string-array name="mms_sizes">
+        <item>Automatic</item>
+        <item>100KB</item>
+        <item>200KB</item>
+        <item>300KB</item>
+        <item>600KB</item>
+        <item>1000KB</item>
+        <item>2000KB</item>
+        <item>No compression</item>
+    </string-array>
+    <string-array name="qk_responses">
+        <item>Oké</item>
+        <item>Adj egy percet</item>
+        <item>Rajta vagyok</item>
+        <item>Köszönöm</item>
+        <item>Jónak tűnik</item>
+        <item>Mi a helyzet?</item>
+        <item>Elfogadva</item>
+        <item>Nem</item>
+        <item>Szeretlek</item>
+        <item>Sajnálom</item>
+        <item>LOL</item>
+        <item>Semmi baj</item>
+    </string-array>
+</resources>
diff --git a/presentation/src/main/res/values-in/strings.xml b/presentation/src/main/res/values-in/strings.xml
index 11a69da83..b1f4b8e3c 100644
--- a/presentation/src/main/res/values-in/strings.xml
+++ b/presentation/src/main/res/values-in/strings.xml
@@ -1,405 +1,405 @@
-<?xml version="1.0" encoding="utf-8"?>
-<!--
-  ~ Copyright (C) 2019 Moez Bhatti <moez.bhatti@gmail.com>
-  ~
-  ~ This file is part of QKSMS.
-  ~
-  ~ QKSMS is free software: you can redistribute it and/or modify
-  ~ it under the terms of the GNU General Public License as published by
-  ~ the Free Software Foundation, either version 3 of the License, or
-  ~ (at your option) any later version.
-  ~
-  ~ QKSMS is distributed in the hope that it will be useful,
-  ~ but WITHOUT ANY WARRANTY; without even the implied warranty of
-  ~ MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
-  ~ GNU General Public License for more details.
-  ~
-  ~ You should have received a copy of the GNU General Public License
-  ~ along with QKSMS.  If not, see <http://www.gnu.org/licenses/>.
-  -->
-<resources>
-    <string name="shortcut_compose_long_label">Percakapan baru</string>
-    <string name="shortcut_compose_short_label">Buat</string>
-    <string name="shortcut_compose_disabled_message">Pintasan nonaktif</string>
-    <string name="title_archived">Diarsipkan</string>
-    <string name="title_settings">Setelan</string>
-    <string name="title_notification_prefs">Notifikasi</string>
-    <string name="title_theme">Tema</string>
-    <string name="title_conversations">Cari kotak masuk&#8230;</string>
-    <string name="title_compose">Ketik nama atau nomor</string>
-    <string name="setup_skip">Lewati</string>
-    <string name="setup_next">Lanjut</string>
-    <string name="menu_add_person">Tambah kontak</string>
-    <string name="menu_call">Panggil</string>
-    <string name="menu_info">Detail</string>
-    <string name="menu_save">Simpan ke galeri</string>
-    <string name="menu_share">Berbagi</string>
-    <string name="main_drawer_open_cd">Buka laci navigasi</string>
-    <string name="main_title_selected">%d dipilih</string>
-    <string name="main_menu_clear">Bersihkan</string>
-    <string name="main_menu_archive">Arsipkan</string>
-    <string name="main_menu_unarchive">Batalkan arsip</string>
-    <string name="main_menu_delete">Hapus</string>
-    <string name="main_menu_add_contact">Tambah ke kontak</string>
-    <string name="main_menu_pin">Pin ke atas</string>
-    <string name="main_menu_unpin">Lepas pin</string>
-    <string name="main_menu_read">Tandai dibaca</string>
-    <string name="main_menu_unread">Tandai belum dibaca</string>
-    <string name="main_menu_block">Blokir</string>
-    <string name="main_syncing">Menyinkronkan pesan&#8230;</string>
-    <string name="main_sender_you">Anda: %s</string>
-    <string name="main_draft">Draf</string>
-    <string name="main_message_results_title">Hasil dalam pesan</string>
-    <string name="main_message_results">%d pesan</string>
-    <string name="inbox_empty_text">Percakapan anda akan ditampilkan di sini</string>
-    <string name="inbox_search_empty_text">Tidak ada hasil</string>
-    <string name="archived_empty_text">Arsip percakapan anda akan ditampilkan di sini</string>
-    <string name="main_fab_cd">Mulai percakapan baru</string>
-    <string name="main_default_sms_title">Love texting again</string>
-    <string name="main_default_sms_message">Tetapkan QKSMS sebagai aplikasi SMS default anda</string>
-    <string name="main_default_sms_change">Ubah</string>
-    <string name="main_permission_required">Membutuhkan izin</string>
-    <string name="main_permission_sms">QKSMS membutuhkan izin untuk mengirim dan membaca pesan SMS</string>
-    <string name="main_permission_contacts">QKSMS membutuhkan izin untuk membaca kontak anda</string>
-    <string name="main_permission_allow">Izinkan</string>
-    <string name="drawer_inbox">Kotak masuk</string>
-    <string name="drawer_archived">Diarsipkan</string>
-    <string name="drawer_scheduled">Terjadwal</string>
-    <string name="drawer_blocking">Pemblokiran</string>
-    <string name="drawer_more">Lainnya</string>
-    <string name="drawer_settings">Setelan</string>
-    <string name="drawer_help">Bantuan &amp; umpanbalik</string>
-    <string name="drawer_invite">Undang teman</string>
-    <string name="drawer_plus_banner_summary">Buka fitur-fitur baru yang menakjubkan, dan dukung pengembangan</string>
-    <string name="rate_title">Menikmati QKSMS?</string>
-    <string name="rate_summary">Share some love and rate us on Google Play!</string>
-    <string name="rate_okay">OKE!</string>
-    <string name="rate_dismiss">ABAIKAN</string>
-    <string name="dialog_delete_title">Hapus</string>
-    <plurals name="dialog_delete_message">
-        <item quantity="other">Apakah anda yakin ingin menghapus percakapan ini?</item>
-    </plurals>
-    <string-array name="message_options">
-        <item>Salin teks</item>
-        <item>Teruskan</item>
-        <item>Hapus</item>
-    </string-array>
-    <string name="compose_number_picker_title">Pilih nomor telepon</string>
-    <string name="compose_number_picker_default">%s ∙ Default</string>
-    <string name="compose_number_picker_once">Hanya sekali</string>
-    <string name="compose_number_picker_always">Selalu</string>
-    <string name="compose_title_selected">%d dipilih</string>
-    <string name="compose_subtitle_results">%1$d dari %2$d hasil</string>
-    <string name="compose_send_group_title">Kirim sebagai pesan grup</string>
-    <string name="compose_send_group_summary">Penerima dan balasan akan ditampilkan ke semua orang</string>
-    <string name="compose_messages_empty">Ini adalah awal percakapan anda. Katakan sesuatu yang baik!</string>
-    <string name="compose_vcard_label">Kartu nama</string>
-    <string name="compose_scheduled_for">Jadwalkan pada</string>
-    <string name="compose_scheduled_future">Waktu yang dipilih harus berada di masa depan!</string>
-    <string name="compose_scheduled_plus">Anda harus membuka akses QKSMS+ untuk menggunakan pesan terjadwal</string>
-    <string name="compose_scheduled_toast">Ditambahkan ke pesan terjadwal</string>
-    <string name="compose_hint">Tulis pesan&#8230;</string>
-    <string name="compose_menu_copy">Salin teks</string>
-    <string name="compose_menu_forward">Teruskan</string>
-    <string name="compose_menu_delete">Hapus</string>
-    <string name="compose_menu_previous">Sebelumnya</string>
-    <string name="compose_menu_next">Berikutnya</string>
-    <string name="compose_menu_clear">Bersihkan</string>
-    <string name="compose_details_title">Detail pesan</string>
-    <string name="compose_details_type">Tipe: %s</string>
-    <string name="compose_details_from">Dari: %s</string>
-    <string name="compose_details_to">Ke: %s</string>
-    <string name="compose_details_subject">Subyek: %s</string>
-    <string name="compose_details_priority">Prioritas: %s</string>
-    <string name="compose_details_size">Ukuran: %s</string>
-    <string name="compose_details_sent">Dikirim: %s</string>
-    <string name="compose_details_received">Diterima: %s</string>
-    <string name="compose_details_delivered">Terkirim: %s</string>
-    <string name="compose_details_error_code">Kode galat: %d</string>
-    <string name="compose_attach_cd">Tambah lampiran</string>
-    <string name="compose_gallery_cd">Lampirkan foto</string>
-    <string name="compose_camera_cd">Ambil foto</string>
-    <string name="compose_schedule_cd">Jadwalkan pesan</string>
-    <string name="compose_contact_cd">Lampirkan kontak</string>
-    <string name="compose_contact_error">Galat membaca kontak</string>
-    <!-- Example: SIM 1 (Verizon) selected-->
-    <string name="compose_sim_changed_toast">SIM %1$d (%2$s) dipilih</string>
-    <string name="compose_sim_cd">%s dipilih, ganti kartu SIM</string>
-    <string name="compose_send_cd">Kirim pesan</string>
-    <string name="message_status_sending">Mengirim&#8230;</string>
-    <string name="message_status_delivered">%s terkirim</string>
-    <string name="message_status_failed">Gagal mengirim. Ketuk untuk mencoba lagi</string>
-    <string name="info_title">Detail</string>
-    <string name="info_copied_address">Alamat disalin</string>
-    <string name="info_name">Judul percakapan</string>
-    <string name="info_notifications">Notifikasi</string>
-    <string name="info_theme">Tema</string>
-    <string name="info_archive">Arsip</string>
-    <string name="info_unarchive">Batalkan arsip</string>
-    <string name="info_block">Blokir</string>
-    <string name="info_unblock">Buka blokir</string>
-    <string name="info_delete">Hapus percakapan</string>
-    <string name="gallery_error">Tidak bisa memuat media</string>
-    <string name="gallery_toast_saved">Disimpan ke galeri</string>
-    <string name="backup_title">Cadangan dan pemulihan</string>
-    <string name="backup_backing_up">Mencadangankan pesan</string>
-    <string name="backup_restoring">Memulihkan cadangan pesan</string>
-    <string name="backup_last">Cadangan terakhir</string>
-    <string name="backup_loading">Memuat&#8230;</string>
-    <string name="backup_never">Tidak pernah</string>
-    <string name="backup_restore_title">Pulihkan</string>
-    <string name="backup_restore_summary">Pilih cadangan</string>
-    <string name="backup_restore_error_plus">Silakan buka akses QKSMS+ untuk menggunakan fitur cadangan dan pemulihan</string>
-    <string name="backup_restore_error_backup">Pencadangan sedang berlangsung&#8230;</string>
-    <string name="backup_restore_error_restore">Pemulihan sedang berlangsung&#8230;</string>
-    <string name="backup_restore_confirm_title">Pulihkan dari cadangan</string>
-    <string name="backup_restore_confirm_message">Apakah anda yakin ingin memulihkan pesan anda dari cadangan ini?</string>
-    <string name="backup_restore_stop_title">Setop pemulihan</string>
-    <string name="backup_restore_stop_message">Pesan yang telah dipulihkan akan tetap berada di perangkat anda</string>
-    <string name="backup_restore_dialog_title">Cadangan</string>
-    <string name="backup_restore_dialog_empty">Cadangan tidak ditemukan</string>
-    <plurals name="backup_message_count">
-        <item quantity="other">%d pesan</item>
-    </plurals>
-    <string name="backup_disclaimer">Saat ini, Cadangan dan Pemulihan hanya mendukung pesan SMS. Dukungan MMS dan cadangan terjadwal akan segera datang!</string>
-    <string name="backup_now">Cadangkan sekarang</string>
-    <string name="backup_progress_parsing">Membaca cadangan&#8230;</string>
-    <string name="backup_progress_running">%d/%d pesan</string>
-    <string name="backup_progress_saving">Menyimpan cadangan&#8230;</string>
-    <string name="backup_progress_syncing">Menyinkronkan pesan&#8230;</string>
-    <string name="backup_progress_finished">Selesai!</string>
-    <string name="backup_notification_channel_name">Cadangan dan pemulihan</string>
-    <string name="scheduled_title">Terjadwal</string>
-    <string name="scheduled_empty_description">Otomatis mengirim pesan pada waktu yang anda inginkan</string>
-    <string name="scheduled_empty_message_1">Hai! Kapan kamu ulang tahun?</string>
-    <string name="scheduled_empty_message_2">23 Desember</string>
-    <string name="scheduled_empty_message_3">Selamat ulang tahun! Aku teman yang baik kan?, selalu ingat ulang tahunmu.</string>
-    <!--&#x200A; is a special character required at the end of this string to fix it's formatting in the app -->
-    <string name="scheduled_empty_message_3_timestamp">Mengirim pada tanggal 23 Desember</string>
-    <string name="scheduled_compose_cd">Jadwalkan pesan</string>
-    <string name="scheduled_options_title">Pesan terjadwal</string>
-    <string-array name="scheduled_options">
-        <item>Kirim sekarang</item>
-        <item>Salin teks</item>
-        <item>Hapus</item>
-    </string-array>
-    <string name="settings_category_appearance">Tampilan</string>
-    <string name="settings_category_general">Umum</string>
-    <string name="settings_category_qkreply">Balasan cepat</string>
-    <string name="settings_theme_title">Tema</string>
-    <string name="settings_night_title">Mode malam</string>
-    <string name="settings_black_title">Mode malam hitam pekat</string>
-    <string name="settings_night_start_title">Waktu mulai</string>
-    <string name="settings_night_end_title">Waktu berakhir</string>
-    <string name="settings_automatic_colors_title">Warna kontak otomatis</string>
-    <string name="settings_text_size_title">Ukuran fon</string>
-    <string name="settings_system_font_title">Gunakan fon sistem</string>
-    <string name="settings_auto_emoji_title">Emoji otomatis</string>
-    <string name="settings_notifications_title">Notifikasi</string>
-    <string name="settings_notifications_o_summary">Ketuk untuk ubahsuai</string>
-    <string name="settings_notification_actions_title">Tindakan</string>
-    <string name="settings_notification_action_1">Tombol 1</string>
-    <string name="settings_notification_action_2">Tombol 2</string>
-    <string name="settings_notification_action_3">Tombol 3</string>
-    <string name="settings_notification_previews_title">Pratinjau notifikasi</string>
-    <string name="settings_notification_wake_title">Layar ambien</string>
-    <string name="settings_vibration_title">Getar</string>
-    <string name="settings_ringtone_title">Suara</string>
-    <string name="settings_ringtone_none">Tidak ada</string>
-    <string name="settings_qkreply_title">Balasan cepat</string>
-    <string name="settings_qkreply_summary">Popup untuk pesan baru</string>
-    <string name="settings_qkreply_tap_dismiss_title">Ketuk untuk mengabaikan</string>
-    <string name="settings_qkreply_tap_dismiss_summary">Ketuk di luar popup untuk menutupnya</string>
-    <string name="settings_delayed_title">Pengiriman tertunda</string>
-    <string name="settings_swipe_actions">Tindakan geser</string>
-    <string name="settings_swipe_actions_summary">Atur tindakan geser untuk percakapan</string>
-    <string name="settings_swipe_actions_right">Geser ke kanan</string>
-    <string name="settings_swipe_actions_left">Geser ke kiri</string>
-    <string name="settings_swipe_actions_change">UBAH</string>
-    <string-array name="settings_swipe_actions">
-        <item>Tidak ada</item>
-        <item>Arsipkan</item>
-        <item>Hapus</item>
-        <item>Blokir</item>
-        <item>Panggil</item>
-        <item>Tandai dibaca</item>
-        <item>Tandai belum dibaca</item>
-    </string-array>
-    <string name="settings_delivery_title">Konfirmasi pengiriman</string>
-    <string name="settings_delivery_summary">Mengonfirmasi bahwa pesan telah berhasil dikirim</string>
-    <string name="settings_signature_title">Tanda tangan</string>
-    <string name="settings_signature_summary">Tambahkan tanda tangan di akhir pesan anda</string>
-    <string name="settings_unicode_title">Hapus aksen</string>
-    <string name="settings_unicode_summary">Membuang aksen dari karakter di dalam pesan SMS keluar</string>
-    <string name="settings_mobile_title">Hanya nomor seluler</string>
-    <string name="settings_mobile_summary">Saat menulis pesan, hanya tampilkan nomor seluler</string>
-    <string name="settings_auto_delete">Otomatis menghapus pesan lama</string>
-    <string name="settings_auto_delete_dialog_message">Pesan akan dihapus setelah rentang hari berikut</string>
-    <string name="settings_auto_delete_dialog_hint">Rentang hari</string>
-    <string name="settings_auto_delete_never">Tidak pernah</string>
-    <string name="settings_auto_delete_warning">Otomatis hapus pesan lama?</string>
-    <string name="settings_auto_delete_warning_message">Jika anda lanjutkan, %1$d pesan akan dihapus sekarang</string>
-    <plurals name="settings_auto_delete_summary">
-        <item quantity="other">Setelah %d hari</item>
-    </plurals>
-    <string name="settings_long_as_mms_title">Kirim pesan panjang sebagai MMS</string>
-    <string name="settings_long_as_mms_summary">Jika pesan teks panjang anda gagal dikirim, atau dikirim dalam urutan yang salah, anda bisa mengirimkannya sebagai pesan MMS. Mungkin akan dikenai tagihan tambahan</string>
-    <string name="settings_mms_size_title">Otomatis kompres lampiran MMS</string>
-    <string name="settings_sync_title">Sinkronisasi pesan</string>
-    <string name="settings_sync_summary">Sinkronisasi ulang pesan anda dengan basis data aplikasi SMS Android bawaan</string>
-    <string name="settings_about_title">Tentang QKSMS</string>
-    <string name="settings_version">Versi %s</string>
-    <string name="settings_logging_enabled">Log awakutu diaktifkan</string>
-    <string name="settings_logging_disabled">Log awakutu dinonaktifkan</string>
-    <string name="settings_delay_duration_hint">Masukkan durasi (detik)</string>
-    <string name="blocking_title">Pemblokiran</string>
-    <string name="blocking_drop_title">Tolak pesan</string>
-    <string name="blocking_drop_summary">Tolak pesan masuk dari pengirim yang diblokir</string>
-    <string name="blocking_conversations">Percakapan diblokir</string>
-    <string name="blocking_manager_title">Pengelola Pemblokiran</string>
-    <string name="blocking_manager_qksms_title">QKSMS</string>
-    <string name="blocking_manager_qksms_summary">Fitur pemblokiran pesan di dalam QKSMS</string>
-    <string name="blocking_manager_call_control_summary">Otomatis menyaring panggilan dan pesan di dalam satu tempat! Community IQ™ memungkinkan anda memblokir pesan yang tidak diinginkan dari daftar spammer</string>
-    <string name="blocking_manager_sia_summary">Secara otomatis menyaring pesan dari nomor yang tidak diinginkan menggunakan aplikasi \"Should I Answer\"</string>
-    <string name="blocking_manager_copy_title">Salin nomor yang diblokir</string>
-    <string name="blocking_manager_copy_summary">Lanjutkan ke %s dan salin semua nomor yang diblokir</string>
-    <string name="blocked_numbers_title">Nomor yang diblokir</string>
-    <string name="blocked_numbers_empty">Nomor yang anda blokir akan ditampilkan di sini</string>
-    <string name="blocked_numbers_add_cd">Blokir nomor baru</string>
-    <string name="blocked_numbers_dialog_title">Blokir pesan sms dari</string>
-    <string name="blocked_numbers_dialog_hint">Nomor telepon</string>
-    <string name="blocked_numbers_dialog_block">Blokir</string>
-    <string name="blocked_messages_title">Pesan yang diblokir</string>
-    <string name="blocked_messages_empty">Pesan yang anda blokir akan ditampilkan di sini</string>
-    <string name="blocking_block_title">Blokir</string>
-    <string name="blocking_unblock_title">Buka blokir</string>
-    <plurals name="blocking_block_external">
-        <item quantity="other">Lanjutkan ke %s dan blokir nomor ini</item>
-    </plurals>
-    <plurals name="blocking_unblock_external">
-        <item quantity="other">Lanjutkan ke %s dan izinkan nomor ini</item>
-    </plurals>
-    <string name="about_title">Tentang</string>
-    <string name="about_version_title">Versi</string>
-    <string name="about_developer_title">Pengembang</string>
-    <string name="about_source_title">Kode sumber</string>
-    <string name="about_changelog_title">Catatan perubahan</string>
-    <string name="about_contact_title">Kontak</string>
-    <string name="about_license_title">Lisensi</string>
-    <string name="about_copyright_title">Hak cipta</string>
-    <string name="qksms_plus_description_title">Dukung pengembangan, dan buka semua fitur</string>
-    <string name="qksms_plus_description_summary">Anda bisa membantu pengembang hanya dengan %s</string>
-    <!-- Substitutions are for price and currency. Ex: Lifetime upgrade for $1.99 USD -->
-    <string name="qksms_plus_upgrade">Lifetime upgrade for %1$s %2$s</string>
-    <!-- Substitutions are for price and currency. Ex: Unlock + donate for $4.99 USD -->
-    <string name="qksms_plus_upgrade_donate">Unlock + donate for %1$s %2$s</string>
-    <string name="qksms_plus_thanks_title">Terima kasih telah mendukung QKSMS!</string>
-    <string name="qksms_plus_thanks_summary">Anda sekarang bisa mengakses semua fitur QKSMS+</string>
-    <string name="qksms_plus_free_title">QKSMS+ selalu gratis untuk pengguna F-Droid! Jika anda ingin mendukung pengembangan, jangan ragu untuk donasi.</string>
-    <string name="qksms_plus_donate">Donasi via PayPal</string>
-    <string name="qksms_plus_coming_soon">Segera hadir</string>
-    <string name="qksms_plus_themes_title">Tema premium</string>
-    <string name="qksms_plus_themes_summary">Unlock beautiful theme colors not available on the Material Design palette</string>
-    <string name="qksms_plus_emoji_title">Emoji otomatis khusus</string>
-    <string name="qksms_plus_emoji_summary">Buat pintasan emoji otomatis khusus</string>
-    <string name="qksms_plus_backup_title">Cadangan pesan</string>
-    <string name="qksms_plus_backup_summary">Cadangkan otomatis pesan anda. Tidak perlu khawatir kehilangan riwayat pesan jika anda mengganti telepon atau telepon hilang</string>
-    <string name="qksms_plus_scheduled_title">Pesan terjadwal</string>
-    <string name="qksms_plus_scheduled_summary">Menjadwalkan pesan untuk secara otomatis dikirim pada waktu dan tanggal tertentu</string>
-    <string name="qksms_plus_delayed_title">Pengiriman tertunda</string>
-    <string name="qksms_plus_delayed_summary">Tunggu beberapa detik sebelum mengirim pesan</string>
-    <string name="qksms_plus_night_title">Mode malam otomatis</string>
-    <string name="qksms_plus_night_summary">Aktifkan mode malam berdasarkan waktu</string>
-    <string name="qksms_plus_blacklist_title">Pemblokiran lanjutan</string>
-    <string name="qksms_plus_blacklist_summary">Memblokir pesan yang mengandung kata tertentu atau sesuai dengan pola</string>
-    <string name="qksms_plus_forward_title">Penerusan otomatis</string>
-    <string name="qksms_plus_forward_summary">Secara otomatis meneruskan pesan dari pengirim tertentu</string>
-    <string name="qksms_plus_respond_title">Balasan otomatis</string>
-    <string name="qksms_plus_respond_summary">Secara otomatis membalas pesan masuk dengan pesan balasan khusus</string>
-    <string name="qksms_plus_more_title">Lainnya</string>
-    <string name="qksms_plus_more_summary">QKSMS sedang dalam pengembangan aktif, dan pembelian anda juga mencakup semua fitur QKSMS+ yang akan datang!</string>
-    <string name="widget_loading">Memuat&#8230;</string>
-    <string name="widget_more">Lihat percakapan lainnya</string>
-    <string name="qkreply_menu_read">Tandai dibaca</string>
-    <string name="qkreply_menu_call">Panggil</string>
-    <string name="qkreply_menu_delete">Hapus</string>
-    <string name="qkreply_menu_expand">Tampilkan lainnya</string>
-    <string name="qkreply_menu_collapse">Tampilkan sedikit</string>
-    <string name="qkreply_menu_view">Buka percakapan</string>
-    <string name="theme_material">Material</string>
-    <string name="theme_hex">HEX</string>
-    <string name="theme_apply">Terapkan</string>
-    <string-array name="notification_actions">
-        <item>Tidak ada</item>
-        <item>Arsip</item>
-        <item>Hapus</item>
-        <item>Blokir</item>
-        <item>Panggil</item>
-        <item>Tandai dibaca</item>
-        <item>Balas</item>
-    </string-array>
-    <string name="button_yes">Ya</string>
-    <string name="button_continue">Lanjutkan</string>
-    <string name="button_cancel">Batal</string>
-    <string name="button_delete">Hapus</string>
-    <string name="button_save">Simpan</string>
-    <string name="button_stop">Setop</string>
-    <string name="button_more">Lainnya</string>
-    <string name="button_set">Set</string>
-    <string name="button_undo">Urungkan</string>
-    <string name="toast_copied">Disalin</string>
-    <string name="toast_archived">Percakapan diarsipkan</string>
-    <string name="toast_qksms_plus">Anda harus membuka akses QKSMS+ untuk menggunakan ini</string>
-    <plurals name="notification_new_messages">
-        <item quantity="other">%s pesan baru</item>
-    </plurals>
-    <string name="notification_message_failed_title">Pesan tidak terkirim</string>
-    <string name="notification_message_failed_text">Pesan ke %s gagal dikirim</string>
-    <string-array name="night_modes">
-        <item>Sistem</item>
-        <item>Nonaktif</item>
-        <item>Selalu aktif</item>
-        <item>Otomatis</item>
-    </string-array>
-    <string-array name="notification_preview_options">
-        <item>Tampilkan nama dan pesan</item>
-        <item>Tampilkan nama</item>
-        <item>Sembunyikan konten</item>
-    </string-array>
-    <string-array name="text_sizes">
-        <item>Kecil</item>
-        <item>Normal</item>
-        <item>Besar</item>
-        <item>Lebih besar</item>
-    </string-array>
-    <string-array name="delayed_sending_labels">
-        <item>Tanpa tundaan</item>
-        <item>3 detik</item>
-        <item>5 detik</item>
-        <item>10 detik</item>
-    </string-array>
-    <string-array name="mms_sizes">
-        <item>Otomatis</item>
-        <item>100KB</item>
-        <item>200KB</item>
-        <item>300KB</item>
-        <item>600KB</item>
-        <item>1000KB</item>
-        <item>2000KB</item>
-        <item>Tanpa kompresi</item>
-    </string-array>
-    <string-array name="qk_responses">
-        <item>Oke</item>
-        <item>Beri saya waktu sebentar</item>
-        <item>Sedang dalam perjalanan</item>
-        <item>Terima kasih</item>
-        <item>Kelihatannya bagus</item>
-        <item>Ada apa?</item>
-        <item>Setuju</item>
-        <item>Tidak</item>
-        <item>Aku cinta kamu</item>
-        <item>Maaf</item>
-        <item>LOL</item>
-        <item>Tidak apa-apa</item>
-    </string-array>
-</resources>
+<?xml version="1.0" encoding="utf-8"?>
+<!--
+  ~ Copyright (C) 2019 Moez Bhatti <moez.bhatti@gmail.com>
+  ~
+  ~ This file is part of QKSMS.
+  ~
+  ~ QKSMS is free software: you can redistribute it and/or modify
+  ~ it under the terms of the GNU General Public License as published by
+  ~ the Free Software Foundation, either version 3 of the License, or
+  ~ (at your option) any later version.
+  ~
+  ~ QKSMS is distributed in the hope that it will be useful,
+  ~ but WITHOUT ANY WARRANTY; without even the implied warranty of
+  ~ MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+  ~ GNU General Public License for more details.
+  ~
+  ~ You should have received a copy of the GNU General Public License
+  ~ along with QKSMS.  If not, see <http://www.gnu.org/licenses/>.
+  -->
+<resources>
+    <string name="shortcut_compose_long_label">Percakapan baru</string>
+    <string name="shortcut_compose_short_label">Buat</string>
+    <string name="shortcut_compose_disabled_message">Pintasan nonaktif</string>
+    <string name="title_archived">Diarsipkan</string>
+    <string name="title_settings">Setelan</string>
+    <string name="title_notification_prefs">Notifikasi</string>
+    <string name="title_theme">Tema</string>
+    <string name="title_conversations">Cari kotak masuk&#8230;</string>
+    <string name="title_compose">Ketik nama atau nomor</string>
+    <string name="setup_skip">Lewati</string>
+    <string name="setup_next">Lanjut</string>
+    <string name="menu_add_person">Tambah kontak</string>
+    <string name="menu_call">Panggil</string>
+    <string name="menu_info">Detail</string>
+    <string name="menu_save">Simpan ke galeri</string>
+    <string name="menu_share">Berbagi</string>
+    <string name="main_drawer_open_cd">Buka laci navigasi</string>
+    <string name="main_title_selected">%d dipilih</string>
+    <string name="main_menu_clear">Bersihkan</string>
+    <string name="main_menu_archive">Arsipkan</string>
+    <string name="main_menu_unarchive">Batalkan arsip</string>
+    <string name="main_menu_delete">Hapus</string>
+    <string name="main_menu_add_contact">Tambah ke kontak</string>
+    <string name="main_menu_pin">Pin ke atas</string>
+    <string name="main_menu_unpin">Lepas pin</string>
+    <string name="main_menu_read">Tandai dibaca</string>
+    <string name="main_menu_unread">Tandai belum dibaca</string>
+    <string name="main_menu_block">Blokir</string>
+    <string name="main_syncing">Menyinkronkan pesan&#8230;</string>
+    <string name="main_sender_you">Anda: %s</string>
+    <string name="main_draft">Draf</string>
+    <string name="main_message_results_title">Hasil dalam pesan</string>
+    <string name="main_message_results">%d pesan</string>
+    <string name="inbox_empty_text">Percakapan anda akan ditampilkan di sini</string>
+    <string name="inbox_search_empty_text">Tidak ada hasil</string>
+    <string name="archived_empty_text">Arsip percakapan anda akan ditampilkan di sini</string>
+    <string name="main_fab_cd">Mulai percakapan baru</string>
+    <string name="main_default_sms_title">Love texting again</string>
+    <string name="main_default_sms_message">Tetapkan QKSMS sebagai aplikasi SMS default anda</string>
+    <string name="main_default_sms_change">Ubah</string>
+    <string name="main_permission_required">Membutuhkan izin</string>
+    <string name="main_permission_sms">QKSMS membutuhkan izin untuk mengirim dan membaca pesan SMS</string>
+    <string name="main_permission_contacts">QKSMS membutuhkan izin untuk membaca kontak anda</string>
+    <string name="main_permission_allow">Izinkan</string>
+    <string name="drawer_inbox">Kotak masuk</string>
+    <string name="drawer_archived">Diarsipkan</string>
+    <string name="drawer_scheduled">Terjadwal</string>
+    <string name="drawer_blocking">Pemblokiran</string>
+    <string name="drawer_more">Lainnya</string>
+    <string name="drawer_settings">Setelan</string>
+    <string name="drawer_help">Bantuan &amp; umpanbalik</string>
+    <string name="drawer_invite">Undang teman</string>
+    <string name="drawer_plus_banner_summary">Buka fitur-fitur baru yang menakjubkan, dan dukung pengembangan</string>
+    <string name="rate_title">Menikmati QKSMS?</string>
+    <string name="rate_summary">Share some love and rate us on Google Play!</string>
+    <string name="rate_okay">OKE!</string>
+    <string name="rate_dismiss">ABAIKAN</string>
+    <string name="dialog_delete_title">Hapus</string>
+    <plurals name="dialog_delete_message">
+        <item quantity="other">Apakah anda yakin ingin menghapus percakapan ini?</item>
+    </plurals>
+    <string-array name="message_options">
+        <item>Salin teks</item>
+        <item>Teruskan</item>
+        <item>Hapus</item>
+    </string-array>
+    <string name="compose_number_picker_title">Pilih nomor telepon</string>
+    <string name="compose_number_picker_default">%s ∙ Default</string>
+    <string name="compose_number_picker_once">Hanya sekali</string>
+    <string name="compose_number_picker_always">Selalu</string>
+    <string name="compose_title_selected">%d dipilih</string>
+    <string name="compose_subtitle_results">%1$d dari %2$d hasil</string>
+    <string name="compose_send_group_title">Kirim sebagai pesan grup</string>
+    <string name="compose_send_group_summary">Penerima dan balasan akan ditampilkan ke semua orang</string>
+    <string name="compose_messages_empty">Ini adalah awal percakapan anda. Katakan sesuatu yang baik!</string>
+    <string name="compose_vcard_label">Kartu nama</string>
+    <string name="compose_scheduled_for">Jadwalkan pada</string>
+    <string name="compose_scheduled_future">Waktu yang dipilih harus berada di masa depan!</string>
+    <string name="compose_scheduled_plus">Anda harus membuka akses QKSMS+ untuk menggunakan pesan terjadwal</string>
+    <string name="compose_scheduled_toast">Ditambahkan ke pesan terjadwal</string>
+    <string name="compose_hint">Tulis pesan&#8230;</string>
+    <string name="compose_menu_copy">Salin teks</string>
+    <string name="compose_menu_forward">Teruskan</string>
+    <string name="compose_menu_delete">Hapus</string>
+    <string name="compose_menu_previous">Sebelumnya</string>
+    <string name="compose_menu_next">Berikutnya</string>
+    <string name="compose_menu_clear">Bersihkan</string>
+    <string name="compose_details_title">Detail pesan</string>
+    <string name="compose_details_type">Tipe: %s</string>
+    <string name="compose_details_from">Dari: %s</string>
+    <string name="compose_details_to">Ke: %s</string>
+    <string name="compose_details_subject">Subyek: %s</string>
+    <string name="compose_details_priority">Prioritas: %s</string>
+    <string name="compose_details_size">Ukuran: %s</string>
+    <string name="compose_details_sent">Dikirim: %s</string>
+    <string name="compose_details_received">Diterima: %s</string>
+    <string name="compose_details_delivered">Terkirim: %s</string>
+    <string name="compose_details_error_code">Kode galat: %d</string>
+    <string name="compose_attach_cd">Tambah lampiran</string>
+    <string name="compose_gallery_cd">Lampirkan foto</string>
+    <string name="compose_camera_cd">Ambil foto</string>
+    <string name="compose_schedule_cd">Jadwalkan pesan</string>
+    <string name="compose_contact_cd">Lampirkan kontak</string>
+    <string name="compose_contact_error">Galat membaca kontak</string>
+    <!-- Example: SIM 1 (Verizon) selected-->
+    <string name="compose_sim_changed_toast">SIM %1$d (%2$s) dipilih</string>
+    <string name="compose_sim_cd">%s dipilih, ganti kartu SIM</string>
+    <string name="compose_send_cd">Kirim pesan</string>
+    <string name="message_status_sending">Mengirim&#8230;</string>
+    <string name="message_status_delivered">%s terkirim</string>
+    <string name="message_status_failed">Gagal mengirim. Ketuk untuk mencoba lagi</string>
+    <string name="info_title">Detail</string>
+    <string name="info_copied_address">Alamat disalin</string>
+    <string name="info_name">Judul percakapan</string>
+    <string name="info_notifications">Notifikasi</string>
+    <string name="info_theme">Tema</string>
+    <string name="info_archive">Arsip</string>
+    <string name="info_unarchive">Batalkan arsip</string>
+    <string name="info_block">Blokir</string>
+    <string name="info_unblock">Buka blokir</string>
+    <string name="info_delete">Hapus percakapan</string>
+    <string name="gallery_error">Tidak bisa memuat media</string>
+    <string name="gallery_toast_saved">Disimpan ke galeri</string>
+    <string name="backup_title">Cadangan dan pemulihan</string>
+    <string name="backup_backing_up">Mencadangankan pesan</string>
+    <string name="backup_restoring">Memulihkan cadangan pesan</string>
+    <string name="backup_last">Cadangan terakhir</string>
+    <string name="backup_loading">Memuat&#8230;</string>
+    <string name="backup_never">Tidak pernah</string>
+    <string name="backup_restore_title">Pulihkan</string>
+    <string name="backup_restore_summary">Pilih cadangan</string>
+    <string name="backup_restore_error_plus">Silakan buka akses QKSMS+ untuk menggunakan fitur cadangan dan pemulihan</string>
+    <string name="backup_restore_error_backup">Pencadangan sedang berlangsung&#8230;</string>
+    <string name="backup_restore_error_restore">Pemulihan sedang berlangsung&#8230;</string>
+    <string name="backup_restore_confirm_title">Pulihkan dari cadangan</string>
+    <string name="backup_restore_confirm_message">Apakah anda yakin ingin memulihkan pesan anda dari cadangan ini?</string>
+    <string name="backup_restore_stop_title">Setop pemulihan</string>
+    <string name="backup_restore_stop_message">Pesan yang telah dipulihkan akan tetap berada di perangkat anda</string>
+    <string name="backup_restore_dialog_title">Cadangan</string>
+    <string name="backup_restore_dialog_empty">Cadangan tidak ditemukan</string>
+    <plurals name="backup_message_count">
+        <item quantity="other">%d pesan</item>
+    </plurals>
+    <string name="backup_disclaimer">Saat ini, Cadangan dan Pemulihan hanya mendukung pesan SMS. Dukungan MMS dan cadangan terjadwal akan segera datang!</string>
+    <string name="backup_now">Cadangkan sekarang</string>
+    <string name="backup_progress_parsing">Membaca cadangan&#8230;</string>
+    <string name="backup_progress_running">%d/%d pesan</string>
+    <string name="backup_progress_saving">Menyimpan cadangan&#8230;</string>
+    <string name="backup_progress_syncing">Menyinkronkan pesan&#8230;</string>
+    <string name="backup_progress_finished">Selesai!</string>
+    <string name="backup_notification_channel_name">Cadangan dan pemulihan</string>
+    <string name="scheduled_title">Terjadwal</string>
+    <string name="scheduled_empty_description">Otomatis mengirim pesan pada waktu yang anda inginkan</string>
+    <string name="scheduled_empty_message_1">Hai! Kapan kamu ulang tahun?</string>
+    <string name="scheduled_empty_message_2">23 Desember</string>
+    <string name="scheduled_empty_message_3">Selamat ulang tahun! Aku teman yang baik kan?, selalu ingat ulang tahunmu.</string>
+    <!--&#x200A; is a special character required at the end of this string to fix it's formatting in the app -->
+    <string name="scheduled_empty_message_3_timestamp">Mengirim pada tanggal 23 Desember</string>
+    <string name="scheduled_compose_cd">Jadwalkan pesan</string>
+    <string name="scheduled_options_title">Pesan terjadwal</string>
+    <string-array name="scheduled_options">
+        <item>Kirim sekarang</item>
+        <item>Salin teks</item>
+        <item>Hapus</item>
+    </string-array>
+    <string name="settings_category_appearance">Tampilan</string>
+    <string name="settings_category_general">Umum</string>
+    <string name="settings_category_qkreply">Balasan cepat</string>
+    <string name="settings_theme_title">Tema</string>
+    <string name="settings_night_title">Mode malam</string>
+    <string name="settings_black_title">Mode malam hitam pekat</string>
+    <string name="settings_night_start_title">Waktu mulai</string>
+    <string name="settings_night_end_title">Waktu berakhir</string>
+    <string name="settings_automatic_colors_title">Warna kontak otomatis</string>
+    <string name="settings_text_size_title">Ukuran fon</string>
+    <string name="settings_system_font_title">Gunakan fon sistem</string>
+    <string name="settings_auto_emoji_title">Emoji otomatis</string>
+    <string name="settings_notifications_title">Notifikasi</string>
+    <string name="settings_notifications_o_summary">Ketuk untuk ubahsuai</string>
+    <string name="settings_notification_actions_title">Tindakan</string>
+    <string name="settings_notification_action_1">Tombol 1</string>
+    <string name="settings_notification_action_2">Tombol 2</string>
+    <string name="settings_notification_action_3">Tombol 3</string>
+    <string name="settings_notification_previews_title">Pratinjau notifikasi</string>
+    <string name="settings_notification_wake_title">Layar ambien</string>
+    <string name="settings_vibration_title">Getar</string>
+    <string name="settings_ringtone_title">Suara</string>
+    <string name="settings_ringtone_none">Tidak ada</string>
+    <string name="settings_qkreply_title">Balasan cepat</string>
+    <string name="settings_qkreply_summary">Popup untuk pesan baru</string>
+    <string name="settings_qkreply_tap_dismiss_title">Ketuk untuk mengabaikan</string>
+    <string name="settings_qkreply_tap_dismiss_summary">Ketuk di luar popup untuk menutupnya</string>
+    <string name="settings_delayed_title">Pengiriman tertunda</string>
+    <string name="settings_swipe_actions">Tindakan geser</string>
+    <string name="settings_swipe_actions_summary">Atur tindakan geser untuk percakapan</string>
+    <string name="settings_swipe_actions_right">Geser ke kanan</string>
+    <string name="settings_swipe_actions_left">Geser ke kiri</string>
+    <string name="settings_swipe_actions_change">UBAH</string>
+    <string-array name="settings_swipe_actions">
+        <item>Tidak ada</item>
+        <item>Arsipkan</item>
+        <item>Hapus</item>
+        <item>Blokir</item>
+        <item>Panggil</item>
+        <item>Tandai dibaca</item>
+        <item>Tandai belum dibaca</item>
+    </string-array>
+    <string name="settings_delivery_title">Konfirmasi pengiriman</string>
+    <string name="settings_delivery_summary">Mengonfirmasi bahwa pesan telah berhasil dikirim</string>
+    <string name="settings_signature_title">Tanda tangan</string>
+    <string name="settings_signature_summary">Tambahkan tanda tangan di akhir pesan anda</string>
+    <string name="settings_unicode_title">Hapus aksen</string>
+    <string name="settings_unicode_summary">Membuang aksen dari karakter di dalam pesan SMS keluar</string>
+    <string name="settings_mobile_title">Hanya nomor seluler</string>
+    <string name="settings_mobile_summary">Saat menulis pesan, hanya tampilkan nomor seluler</string>
+    <string name="settings_auto_delete">Otomatis menghapus pesan lama</string>
+    <string name="settings_auto_delete_dialog_message">Pesan akan dihapus setelah rentang hari berikut</string>
+    <string name="settings_auto_delete_dialog_hint">Rentang hari</string>
+    <string name="settings_auto_delete_never">Tidak pernah</string>
+    <string name="settings_auto_delete_warning">Otomatis hapus pesan lama?</string>
+    <string name="settings_auto_delete_warning_message">Jika anda lanjutkan, %1$d pesan akan dihapus sekarang</string>
+    <plurals name="settings_auto_delete_summary">
+        <item quantity="other">Setelah %d hari</item>
+    </plurals>
+    <string name="settings_long_as_mms_title">Kirim pesan panjang sebagai MMS</string>
+    <string name="settings_long_as_mms_summary">Jika pesan teks panjang anda gagal dikirim, atau dikirim dalam urutan yang salah, anda bisa mengirimkannya sebagai pesan MMS. Mungkin akan dikenai tagihan tambahan</string>
+    <string name="settings_mms_size_title">Otomatis kompres lampiran MMS</string>
+    <string name="settings_sync_title">Sinkronisasi pesan</string>
+    <string name="settings_sync_summary">Sinkronisasi ulang pesan anda dengan basis data aplikasi SMS Android bawaan</string>
+    <string name="settings_about_title">Tentang QKSMS</string>
+    <string name="settings_version">Versi %s</string>
+    <string name="settings_logging_enabled">Log awakutu diaktifkan</string>
+    <string name="settings_logging_disabled">Log awakutu dinonaktifkan</string>
+    <string name="settings_delay_duration_hint">Masukkan durasi (detik)</string>
+    <string name="blocking_title">Pemblokiran</string>
+    <string name="blocking_drop_title">Tolak pesan</string>
+    <string name="blocking_drop_summary">Tolak pesan masuk dari pengirim yang diblokir</string>
+    <string name="blocking_conversations">Percakapan diblokir</string>
+    <string name="blocking_manager_title">Pengelola Pemblokiran</string>
+    <string name="blocking_manager_qksms_title">QKSMS</string>
+    <string name="blocking_manager_qksms_summary">Fitur pemblokiran pesan di dalam QKSMS</string>
+    <string name="blocking_manager_call_control_summary">Otomatis menyaring panggilan dan pesan di dalam satu tempat! Community IQ™ memungkinkan anda memblokir pesan yang tidak diinginkan dari daftar spammer</string>
+    <string name="blocking_manager_sia_summary">Secara otomatis menyaring pesan dari nomor yang tidak diinginkan menggunakan aplikasi \"Should I Answer\"</string>
+    <string name="blocking_manager_copy_title">Salin nomor yang diblokir</string>
+    <string name="blocking_manager_copy_summary">Lanjutkan ke %s dan salin semua nomor yang diblokir</string>
+    <string name="blocked_numbers_title">Nomor yang diblokir</string>
+    <string name="blocked_numbers_empty">Nomor yang anda blokir akan ditampilkan di sini</string>
+    <string name="blocked_numbers_add_cd">Blokir nomor baru</string>
+    <string name="blocked_numbers_dialog_title">Blokir pesan sms dari</string>
+    <string name="blocked_numbers_dialog_hint">Nomor telepon</string>
+    <string name="blocked_numbers_dialog_block">Blokir</string>
+    <string name="blocked_messages_title">Pesan yang diblokir</string>
+    <string name="blocked_messages_empty">Pesan yang anda blokir akan ditampilkan di sini</string>
+    <string name="blocking_block_title">Blokir</string>
+    <string name="blocking_unblock_title">Buka blokir</string>
+    <plurals name="blocking_block_external">
+        <item quantity="other">Lanjutkan ke %s dan blokir nomor ini</item>
+    </plurals>
+    <plurals name="blocking_unblock_external">
+        <item quantity="other">Lanjutkan ke %s dan izinkan nomor ini</item>
+    </plurals>
+    <string name="about_title">Tentang</string>
+    <string name="about_version_title">Versi</string>
+    <string name="about_developer_title">Pengembang</string>
+    <string name="about_source_title">Kode sumber</string>
+    <string name="about_changelog_title">Catatan perubahan</string>
+    <string name="about_contact_title">Kontak</string>
+    <string name="about_license_title">Lisensi</string>
+    <string name="about_copyright_title">Hak cipta</string>
+    <string name="qksms_plus_description_title">Dukung pengembangan, dan buka semua fitur</string>
+    <string name="qksms_plus_description_summary">Anda bisa membantu pengembang hanya dengan %s</string>
+    <!-- Substitutions are for price and currency. Ex: Lifetime upgrade for $1.99 USD -->
+    <string name="qksms_plus_upgrade">Lifetime upgrade for %1$s %2$s</string>
+    <!-- Substitutions are for price and currency. Ex: Unlock + donate for $4.99 USD -->
+    <string name="qksms_plus_upgrade_donate">Unlock + donate for %1$s %2$s</string>
+    <string name="qksms_plus_thanks_title">Terima kasih telah mendukung QKSMS!</string>
+    <string name="qksms_plus_thanks_summary">Anda sekarang bisa mengakses semua fitur QKSMS+</string>
+    <string name="qksms_plus_free_title">QKSMS+ selalu gratis untuk pengguna F-Droid! Jika anda ingin mendukung pengembangan, jangan ragu untuk donasi.</string>
+    <string name="qksms_plus_donate">Donasi via PayPal</string>
+    <string name="qksms_plus_coming_soon">Segera hadir</string>
+    <string name="qksms_plus_themes_title">Tema premium</string>
+    <string name="qksms_plus_themes_summary">Unlock beautiful theme colors not available on the Material Design palette</string>
+    <string name="qksms_plus_emoji_title">Emoji otomatis khusus</string>
+    <string name="qksms_plus_emoji_summary">Buat pintasan emoji otomatis khusus</string>
+    <string name="qksms_plus_backup_title">Cadangan pesan</string>
+    <string name="qksms_plus_backup_summary">Cadangkan otomatis pesan anda. Tidak perlu khawatir kehilangan riwayat pesan jika anda mengganti telepon atau telepon hilang</string>
+    <string name="qksms_plus_scheduled_title">Pesan terjadwal</string>
+    <string name="qksms_plus_scheduled_summary">Menjadwalkan pesan untuk secara otomatis dikirim pada waktu dan tanggal tertentu</string>
+    <string name="qksms_plus_delayed_title">Pengiriman tertunda</string>
+    <string name="qksms_plus_delayed_summary">Tunggu beberapa detik sebelum mengirim pesan</string>
+    <string name="qksms_plus_night_title">Mode malam otomatis</string>
+    <string name="qksms_plus_night_summary">Aktifkan mode malam berdasarkan waktu</string>
+    <string name="qksms_plus_blacklist_title">Pemblokiran lanjutan</string>
+    <string name="qksms_plus_blacklist_summary">Memblokir pesan yang mengandung kata tertentu atau sesuai dengan pola</string>
+    <string name="qksms_plus_forward_title">Penerusan otomatis</string>
+    <string name="qksms_plus_forward_summary">Secara otomatis meneruskan pesan dari pengirim tertentu</string>
+    <string name="qksms_plus_respond_title">Balasan otomatis</string>
+    <string name="qksms_plus_respond_summary">Secara otomatis membalas pesan masuk dengan pesan balasan khusus</string>
+    <string name="qksms_plus_more_title">Lainnya</string>
+    <string name="qksms_plus_more_summary">QKSMS sedang dalam pengembangan aktif, dan pembelian anda juga mencakup semua fitur QKSMS+ yang akan datang!</string>
+    <string name="widget_loading">Memuat&#8230;</string>
+    <string name="widget_more">Lihat percakapan lainnya</string>
+    <string name="qkreply_menu_read">Tandai dibaca</string>
+    <string name="qkreply_menu_call">Panggil</string>
+    <string name="qkreply_menu_delete">Hapus</string>
+    <string name="qkreply_menu_expand">Tampilkan lainnya</string>
+    <string name="qkreply_menu_collapse">Tampilkan sedikit</string>
+    <string name="qkreply_menu_view">Buka percakapan</string>
+    <string name="theme_material">Material</string>
+    <string name="theme_hex">HEX</string>
+    <string name="theme_apply">Terapkan</string>
+    <string-array name="notification_actions">
+        <item>Tidak ada</item>
+        <item>Arsip</item>
+        <item>Hapus</item>
+        <item>Blokir</item>
+        <item>Panggil</item>
+        <item>Tandai dibaca</item>
+        <item>Balas</item>
+    </string-array>
+    <string name="button_yes">Ya</string>
+    <string name="button_continue">Lanjutkan</string>
+    <string name="button_cancel">Batal</string>
+    <string name="button_delete">Hapus</string>
+    <string name="button_save">Simpan</string>
+    <string name="button_stop">Setop</string>
+    <string name="button_more">Lainnya</string>
+    <string name="button_set">Set</string>
+    <string name="button_undo">Urungkan</string>
+    <string name="toast_copied">Disalin</string>
+    <string name="toast_archived">Percakapan diarsipkan</string>
+    <string name="toast_qksms_plus">Anda harus membuka akses QKSMS+ untuk menggunakan ini</string>
+    <plurals name="notification_new_messages">
+        <item quantity="other">%s pesan baru</item>
+    </plurals>
+    <string name="notification_message_failed_title">Pesan tidak terkirim</string>
+    <string name="notification_message_failed_text">Pesan ke %s gagal dikirim</string>
+    <string-array name="night_modes">
+        <item>Sistem</item>
+        <item>Nonaktif</item>
+        <item>Selalu aktif</item>
+        <item>Otomatis</item>
+    </string-array>
+    <string-array name="notification_preview_options">
+        <item>Tampilkan nama dan pesan</item>
+        <item>Tampilkan nama</item>
+        <item>Sembunyikan konten</item>
+    </string-array>
+    <string-array name="text_sizes">
+        <item>Kecil</item>
+        <item>Normal</item>
+        <item>Besar</item>
+        <item>Lebih besar</item>
+    </string-array>
+    <string-array name="delayed_sending_labels">
+        <item>Tanpa tundaan</item>
+        <item>3 detik</item>
+        <item>5 detik</item>
+        <item>10 detik</item>
+    </string-array>
+    <string-array name="mms_sizes">
+        <item>Otomatis</item>
+        <item>100KB</item>
+        <item>200KB</item>
+        <item>300KB</item>
+        <item>600KB</item>
+        <item>1000KB</item>
+        <item>2000KB</item>
+        <item>Tanpa kompresi</item>
+    </string-array>
+    <string-array name="qk_responses">
+        <item>Oke</item>
+        <item>Beri saya waktu sebentar</item>
+        <item>Sedang dalam perjalanan</item>
+        <item>Terima kasih</item>
+        <item>Kelihatannya bagus</item>
+        <item>Ada apa?</item>
+        <item>Setuju</item>
+        <item>Tidak</item>
+        <item>Aku cinta kamu</item>
+        <item>Maaf</item>
+        <item>LOL</item>
+        <item>Tidak apa-apa</item>
+    </string-array>
+</resources>
diff --git a/presentation/src/main/res/values-it/strings.xml b/presentation/src/main/res/values-it/strings.xml
index cee6c8e57..0a7666022 100644
--- a/presentation/src/main/res/values-it/strings.xml
+++ b/presentation/src/main/res/values-it/strings.xml
@@ -1,411 +1,411 @@
-<?xml version="1.0" encoding="utf-8"?>
-<!--
-  ~ Copyright (C) 2019 Moez Bhatti <moez.bhatti@gmail.com>
-  ~
-  ~ This file is part of QKSMS.
-  ~
-  ~ QKSMS is free software: you can redistribute it and/or modify
-  ~ it under the terms of the GNU General Public License as published by
-  ~ the Free Software Foundation, either version 3 of the License, or
-  ~ (at your option) any later version.
-  ~
-  ~ QKSMS is distributed in the hope that it will be useful,
-  ~ but WITHOUT ANY WARRANTY; without even the implied warranty of
-  ~ MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
-  ~ GNU General Public License for more details.
-  ~
-  ~ You should have received a copy of the GNU General Public License
-  ~ along with QKSMS.  If not, see <http://www.gnu.org/licenses/>.
-  -->
-<resources>
-    <string name="shortcut_compose_long_label">Nuova conversazione</string>
-    <string name="shortcut_compose_short_label">Componi</string>
-    <string name="shortcut_compose_disabled_message">Scelta rapida disattivata</string>
-    <string name="title_archived">Archivio</string>
-    <string name="title_settings">Impostazioni</string>
-    <string name="title_notification_prefs">Notifiche</string>
-    <string name="title_theme">Tema</string>
-    <string name="title_conversations">Cerca in posta in arrivo&#8230;</string>
-    <string name="title_compose">Digita un nome o un numero</string>
-    <string name="setup_skip">Salta</string>
-    <string name="setup_next">Continua</string>
-    <string name="menu_add_person">Aggiungi persona</string>
-    <string name="menu_call">Chiama</string>
-    <string name="menu_info">Dettagli</string>
-    <string name="menu_save">Salva nella galleria</string>
-    <string name="menu_share">Condividi</string>
-    <string name="main_drawer_open_cd">Apri il pannello di navigazione</string>
-    <string name="main_title_selected">%d selezionato</string>
-    <string name="main_menu_clear">Azzera</string>
-    <string name="main_menu_archive">Archivia</string>
-    <string name="main_menu_unarchive">Annulla archiviazione</string>
-    <string name="main_menu_delete">Elimina</string>
-    <string name="main_menu_add_contact">Aggiungi ai contatti</string>
-    <string name="main_menu_pin">Blocca in alto</string>
-    <string name="main_menu_unpin">Sblocca</string>
-    <string name="main_menu_read">Segna come \"letto\"</string>
-    <string name="main_menu_unread">Segna come \"da leggere\"</string>
-    <string name="main_menu_block">Sposta negli indesiderati</string>
-    <string name="main_syncing">La sincronizzazione dei messaggi&#8230;</string>
-    <string name="main_sender_you">Tu: %s</string>
-    <string name="main_draft">Bozza</string>
-    <string name="main_message_results_title">Risultati nei messaggi</string>
-    <string name="main_message_results">%d messaggi</string>
-    <string name="inbox_empty_text">Le tue conversazioni vengono visualizzate qui</string>
-    <string name="inbox_search_empty_text">Nessun risultato</string>
-    <string name="archived_empty_text">Le tue conversazioni vengono archiviate qui</string>
-    <string name="main_fab_cd">Inizia nuova conversazione</string>
-    <string name="main_default_sms_title">Adoro scrivere di nuovo SMS</string>
-    <string name="main_default_sms_message">Rendi QKSMS la tua app di SMS predefinita</string>
-    <string name="main_default_sms_change">Modifica</string>
-    <string name="main_permission_required">Autorizzazione necessaria</string>
-    <string name="main_permission_sms">QKSMS ha bisogno dell\'autorizzazione per inviare e visualizzare gli SMS</string>
-    <string name="main_permission_contacts">QKSMS ha bisogno dell\'autorizzazione per visualizzare i tuoi contatti</string>
-    <string name="main_permission_allow">Consenti</string>
-    <string name="drawer_inbox">Ricevuti</string>
-    <string name="drawer_archived">Archiviati</string>
-    <string name="drawer_scheduled">Pianificati</string>
-    <string name="drawer_blocking">Indesiderati</string>
-    <string name="drawer_more">Altro</string>
-    <string name="drawer_settings">Impostazioni</string>
-    <string name="drawer_help">Aiuto &amp; suggerimenti</string>
-    <string name="drawer_invite">Invita gli amici</string>
-    <string name="drawer_plus_banner_summary">Sblocca nuove incredibili funzionalità e sostieni lo sviluppo</string>
-    <string name="rate_title">Ti piace QKSMS?</string>
-    <string name="rate_summary">Condividi un po\' di amore e votaci su Google Play!</string>
-    <string name="rate_okay">OK!</string>
-    <string name="rate_dismiss">ANNULLA</string>
-    <string name="dialog_delete_title">Elimina</string>
-    <plurals name="dialog_delete_message">
-        <item quantity="one">Sei sicuro di voler eliminare questa conversazione?</item>
-        <item quantity="other">Sei sicuro di voler eliminare %d conversazioni?</item>
-    </plurals>
-    <string-array name="message_options">
-        <item>Copia testo</item>
-        <item>Inoltra</item>
-        <item>Elimina</item>
-    </string-array>
-    <string name="compose_number_picker_title">Scegli un numero di telefono</string>
-    <string name="compose_number_picker_default">%s ∙ Predefinito</string>
-    <string name="compose_number_picker_once">Solo una volta</string>
-    <string name="compose_number_picker_always">Sempre</string>
-    <string name="compose_title_selected">%d selezionato</string>
-    <string name="compose_subtitle_results">%1$d di %2$d risultati</string>
-    <string name="compose_send_group_title">Invia come messaggio di gruppo</string>
-    <string name="compose_send_group_summary">I destinatari e le risposte saranno visibili a tutti</string>
-    <string name="compose_messages_empty">Questo è l\'inizio della tua conversazione. Dì qualcosa di carino!</string>
-    <string name="compose_vcard_label">Scheda contatto</string>
-    <string name="compose_scheduled_for">Pianificato per</string>
-    <string name="compose_scheduled_future">L\'ora selezionata deve essere nel futuro!</string>
-    <string name="compose_scheduled_plus">È necessario sbloccare QKSMS+ per utilizzare la pianificazione dei messaggi</string>
-    <string name="compose_scheduled_toast">Aggiunto ai messaggi pianificati</string>
-    <string name="compose_hint">Scrivi un messaggio&#8230;</string>
-    <string name="compose_menu_copy">Copia testo</string>
-    <string name="compose_menu_forward">Inoltra</string>
-    <string name="compose_menu_delete">Elimina</string>
-    <string name="compose_menu_previous">Precedente</string>
-    <string name="compose_menu_next">Successivo</string>
-    <string name="compose_menu_clear">Azzera</string>
-    <string name="compose_details_title">Dettagli del messaggio</string>
-    <string name="compose_details_type">Tipo: %s</string>
-    <string name="compose_details_from">Da: %s</string>
-    <string name="compose_details_to">A: %s</string>
-    <string name="compose_details_subject">Oggetto: %s</string>
-    <string name="compose_details_priority">Priorità: %s</string>
-    <string name="compose_details_size">Dimensione: %s</string>
-    <string name="compose_details_sent">Inviato: %s</string>
-    <string name="compose_details_received">Ricevuto: %s</string>
-    <string name="compose_details_delivered">Consegnato: %s</string>
-    <string name="compose_details_error_code">Codice di errore: %d</string>
-    <string name="compose_attach_cd">Aggiungi un allegato</string>
-    <string name="compose_gallery_cd">Allega una foto</string>
-    <string name="compose_camera_cd">Scatta una foto</string>
-    <string name="compose_schedule_cd">Pianifica messaggio</string>
-    <string name="compose_contact_cd">Collegare un contatto</string>
-    <string name="compose_contact_error">Errore nella lettura del contatto</string>
-    <!-- Example: SIM 1 (Verizon) selected-->
-    <string name="compose_sim_changed_toast">SIM %1$d (%2$s) selezionata</string>
-    <string name="compose_sim_cd">%s selezionato, cambiare SIM</string>
-    <string name="compose_send_cd">Invia messaggio</string>
-    <string name="message_status_sending">Invio in corso&#8230;</string>
-    <string name="message_status_delivered">Consegnato %s</string>
-    <string name="message_status_failed">Impossibile inviare. Tocca per riprovare</string>
-    <string name="info_title">Dettagli</string>
-    <string name="info_copied_address">Indirizzo copiato</string>
-    <string name="info_name">Titolo della conversazione</string>
-    <string name="info_notifications">Notifiche</string>
-    <string name="info_theme">Tema</string>
-    <string name="info_archive">Archivia</string>
-    <string name="info_unarchive">Annulla archiviazione</string>
-    <string name="info_block">Mittente indesiderato</string>
-    <string name="info_unblock">Ripristina mittente</string>
-    <string name="info_delete">Elimina la conversazione</string>
-    <string name="gallery_error">Impossibile caricare il supporto</string>
-    <string name="gallery_toast_saved">Salvato nella galleria</string>
-    <string name="backup_title">Backup e ripristino</string>
-    <string name="backup_backing_up">Backup dei messaggi</string>
-    <string name="backup_restoring">Ripristino da backup</string>
-    <string name="backup_last">Ultimo backup</string>
-    <string name="backup_loading">Caricamento&#8230;</string>
-    <string name="backup_never">Mai</string>
-    <string name="backup_restore_title">Ripristino</string>
-    <string name="backup_restore_summary">Selezionare un backup</string>
-    <string name="backup_restore_error_plus">Si prega di sbloccare QKSMS + per utilizzare backup e ripristino</string>
-    <string name="backup_restore_error_backup">Backup in corso&#8230;</string>
-    <string name="backup_restore_error_restore">Ripristino in corso&#8230;</string>
-    <string name="backup_restore_confirm_title">Ripristino da backup</string>
-    <string name="backup_restore_confirm_message">Sei sicuro che desideri ripristinare i messaggi da questo backup?</string>
-    <string name="backup_restore_stop_title">Interrompi il ripristino</string>
-    <string name="backup_restore_stop_message">I messaggi che sono già stati ripristinati rimarranno sul tuo dispositivo</string>
-    <string name="backup_restore_dialog_title">Backups</string>
-    <string name="backup_restore_dialog_empty">Nessun backup trovato</string>
-    <plurals name="backup_message_count">
-        <item quantity="one">%d messaggio</item>
-        <item quantity="other">%d messaggi</item>
-    </plurals>
-    <string name="backup_disclaimer">Attualmente Backup e Restore supportano solo gli SMS. Il supporto per gli MMS ed i backup schedulati arriverà presto!</string>
-    <string name="backup_now">Backup adesso</string>
-    <string name="backup_progress_parsing">L\'analisi del backup&#8230;</string>
-    <string name="backup_progress_running">%d/%d messaggi</string>
-    <string name="backup_progress_saving">Salvataggio backup&#8230;</string>
-    <string name="backup_progress_syncing">Sincronizzazione messaggi&#8230;</string>
-    <string name="backup_progress_finished">Terminato!</string>
-    <string name="backup_notification_channel_name">Backup e ripristino</string>
-    <string name="scheduled_title">Messaggi pianificati</string>
-    <string name="scheduled_empty_description">Invia un messaggio automatico, nel momento desiderato</string>
-    <string name="scheduled_empty_message_1">Ehi! Quand\'è il tuo compleanno?</string>
-    <string name="scheduled_empty_message_2">È il 23 dicembre</string>
-    <string name="scheduled_empty_message_3">Buon Compleanno! Solo un grande amico si ricorda il tuo compleanno</string>
-    <!--&#x200A; is a special character required at the end of this string to fix it's formatting in the app -->
-    <string name="scheduled_empty_message_3_timestamp">Invio il 23 dicembre </string>
-    <string name="scheduled_compose_cd">Schedula un messaggio</string>
-    <string name="scheduled_options_title">Messaggio pianificato</string>
-    <string-array name="scheduled_options">
-        <item>Invia ora</item>
-        <item>Copia testo</item>
-        <item>Cancella</item>
-    </string-array>
-    <string name="settings_category_appearance">Aspetto</string>
-    <string name="settings_category_general">Generale</string>
-    <string name="settings_category_qkreply">Risposta QK</string>
-    <string name="settings_theme_title">Tema</string>
-    <string name="settings_night_title">Modalità notturna</string>
-    <string name="settings_black_title">Modalità notte nero puro</string>
-    <string name="settings_night_start_title">Ora di inizio</string>
-    <string name="settings_night_end_title">Ora di fine</string>
-    <string name="settings_automatic_colors_title">Colori dei contatti automatici</string>
-    <string name="settings_text_size_title">Dimensione carattere</string>
-    <string name="settings_system_font_title">Usa il carattere di sistema</string>
-    <string name="settings_auto_emoji_title">Emoji automatico</string>
-    <string name="settings_notifications_title">Notifiche</string>
-    <string name="settings_notifications_o_summary">Seleziona per personalizzare</string>
-    <string name="settings_notification_actions_title">Azioni</string>
-    <string name="settings_notification_action_1">Pulsante 1</string>
-    <string name="settings_notification_action_2">Pulsante 2</string>
-    <string name="settings_notification_action_3">Pulsante 3</string>
-    <string name="settings_notification_previews_title">Anteprima delle notifiche</string>
-    <string name="settings_notification_wake_title">Schermata iniziale</string>
-    <string name="settings_vibration_title">Vibrazione</string>
-    <string name="settings_ringtone_title">Suono</string>
-    <string name="settings_ringtone_none">Nessuno</string>
-    <string name="settings_qkreply_title">Risposta QK</string>
-    <string name="settings_qkreply_summary">Popup per i nuovi messaggi</string>
-    <string name="settings_qkreply_tap_dismiss_title">Tocca per archiviare</string>
-    <string name="settings_qkreply_tap_dismiss_summary">Tocca al di fuori del popup per chiuderlo</string>
-    <string name="settings_delayed_title">Invio posticipato</string>
-    <string name="settings_swipe_actions">Azioni di scorrimento</string>
-    <string name="settings_swipe_actions_summary">Configura le azioni di scorrimento per le conversazioni</string>
-    <string name="settings_swipe_actions_right">Scorrimento a destra</string>
-    <string name="settings_swipe_actions_left">Scorrimento a sinistra</string>
-    <string name="settings_swipe_actions_change">CAMBIA</string>
-    <string-array name="settings_swipe_actions">
-        <item>Nessuna</item>
-        <item>Archivia</item>
-        <item>Elimina</item>
-        <item>Blocca</item>
-        <item>Chiama</item>
-        <item>Segna come \"letto\"</item>
-        <item>Segna come \"da leggere\"</item>
-    </string-array>
-    <string name="settings_delivery_title">Conferme di recapito</string>
-    <string name="settings_delivery_summary">Conferma che i messaggi siano stati inviati con successo</string>
-    <string name="settings_signature_title">Firma</string>
-    <string name="settings_signature_summary">Aggiungi una firma alla fine dei tuoi messaggi</string>
-    <string name="settings_unicode_title">Elimina gli accenti</string>
-    <string name="settings_unicode_summary">Rimuovi gli accenti dai caratteri negli SMS in uscita</string>
-    <string name="settings_mobile_title">Solo numeri mobili</string>
-    <string name="settings_mobile_summary">Durante la composizione di un messaggio, visualizza solo i numeri di cellulare</string>
-    <string name="settings_auto_delete">Elimina automaticamente i vecchi messaggi</string>
-    <string name="settings_auto_delete_dialog_message">I messaggi verranno eliminati dopo il numero di giorni specificato</string>
-    <string name="settings_auto_delete_dialog_hint">Numero di giorni</string>
-    <string name="settings_auto_delete_never">Mai</string>
-    <string name="settings_auto_delete_warning">Eliminare i vecchi messaggi automaticamente?</string>
-    <string name="settings_auto_delete_warning_message">Scegliendo di procedere, %1$d messaggi verranno eliminati ora</string>
-    <plurals name="settings_auto_delete_summary">
-        <item quantity="one">Dopo 1 giorno</item>
-        <item quantity="other">Dopo %d giorni</item>
-    </plurals>
-    <string name="settings_long_as_mms_title">Invia messaggi lunghi come MMS</string>
-    <string name="settings_long_as_mms_summary">Se i tuoi messaggi di testo più lunghi non vengono inviati o vengono inviati nell\'ordine sbagliato, puoi invece inviarli come messaggi MMS. Potrebbero essere applicati costi aggiuntivi</string>
-    <string name="settings_mms_size_title">Compressione automatica degli allegati MMS</string>
-    <string name="settings_sync_title">Sincronizza i messaggi</string>
-    <string name="settings_sync_summary">Risincronizza i tuoi messaggi con il database SMS Android nativo</string>
-    <string name="settings_about_title">Informazioni su QKSMS</string>
-    <string name="settings_version">Versione %s</string>
-    <string name="settings_logging_enabled">Registrazione del debug attivata</string>
-    <string name="settings_logging_disabled">Registrazione del debug disattivata</string>
-    <string name="settings_delay_duration_hint">Inserisci la durata (in secondi)</string>
-    <string name="blocking_title">Bloccare</string>
-    <string name="blocking_drop_title">Elimina messaggi</string>
-    <string name="blocking_drop_summary">Elimina i messaggi in arrivo dai mittenti bloccati invece di nasconderli</string>
-    <string name="blocking_conversations">Conversazioni bloccate</string>
-    <string name="blocking_manager_title">Gestore blocchi</string>
-    <string name="blocking_manager_qksms_title">QKSMS</string>
-    <string name="blocking_manager_qksms_summary">Funzionalità di blocco integrata in QKSMS</string>
-    <string name="blocking_manager_call_control_summary">Filtra automaticamente le tue chiamate e i tuoi messaggi in un unico comodo posto! Community IQ™ ti consente di prevenire messaggi indesiderati dagli spammer noti alla comunità</string>
-    <string name="blocking_manager_sia_summary">Filtrare automaticamente i messaggi provenienti da numeri indesiderati utilizzando l\'app \"Dovrei rispondere?\"</string>
-    <string name="blocking_manager_copy_title">Copia i numeri bloccati</string>
-    <string name="blocking_manager_copy_summary">Continua a copiare %s sui tuoi numeri bloccati esistenti</string>
-    <string name="blocked_numbers_title">Numeri bloccati</string>
-    <string name="blocked_numbers_empty">I tuoi numeri bloccati appariranno qui</string>
-    <string name="blocked_numbers_add_cd">Blocca un nuovo numero</string>
-    <string name="blocked_numbers_dialog_title">Blocca i testi da</string>
-    <string name="blocked_numbers_dialog_hint">Numero di telefono</string>
-    <string name="blocked_numbers_dialog_block">Blocca</string>
-    <string name="blocked_messages_title">Messaggi bloccati</string>
-    <string name="blocked_messages_empty">I tuoi messaggi bloccati appariranno qui</string>
-    <string name="blocking_block_title">Blocca</string>
-    <string name="blocking_unblock_title">Sblocca</string>
-    <plurals name="blocking_block_external">
-        <item quantity="one">Continua a %s e blocca questo numero</item>
-        <item quantity="other">Continua a %s e blocca questi numeri</item>
-    </plurals>
-    <plurals name="blocking_unblock_external">
-        <item quantity="one">Continua a %s e permetti questo numero</item>
-        <item quantity="other">Continua a %s e consenti questi numeri</item>
-    </plurals>
-    <string name="about_title">Informazioni</string>
-    <string name="about_version_title">Versione</string>
-    <string name="about_developer_title">Sviluppatore</string>
-    <string name="about_source_title">Codice sorgente</string>
-    <string name="about_changelog_title">Elenco delle modifiche</string>
-    <string name="about_contact_title">Contatto</string>
-    <string name="about_license_title">Licenza</string>
-    <string name="about_copyright_title">Copyright</string>
-    <string name="qksms_plus_description_title">Supporta lo sviluppo, sblocca tutte le funzioni</string>
-    <string name="qksms_plus_description_summary">Salva uno sviluppatore affamato per soli %s</string>
-    <!-- Substitutions are for price and currency. Ex: Lifetime upgrade for $1.99 USD -->
-    <string name="qksms_plus_upgrade">Upgrade a vita per %1$s %2$s</string>
-    <!-- Substitutions are for price and currency. Ex: Unlock + donate for $4.99 USD -->
-    <string name="qksms_plus_upgrade_donate">Sblocca &amp; dona per %1$s %2$s</string>
-    <string name="qksms_plus_thanks_title">Grazie per il supporto a QKSMS!</string>
-    <string name="qksms_plus_thanks_summary">È ora possibile accedere a tutte le funzioni QKSMS+</string>
-    <string name="qksms_plus_free_title">QKSMS+ è gratuito per gli utenti di F-Droid! Se desideri sostenere il progetto, una tua donazione sarebbe molto apprezzata.</string>
-    <string name="qksms_plus_donate">Fai una donazione tramite PayPal</string>
-    <string name="qksms_plus_coming_soon">Prossimamente</string>
-    <string name="qksms_plus_themes_title">Temi Premium</string>
-    <string name="qksms_plus_themes_summary">Sblocca splendidi colori non disponibili nella tavolozza del Material Design</string>
-    <string name="qksms_plus_emoji_title">Personalizza gli emoji automatici</string>
-    <string name="qksms_plus_emoji_summary">Crea scorciatoie personalizzate per gli emoji automatici</string>
-    <string name="qksms_plus_backup_title">Backup dei messaggi</string>
-    <string name="qksms_plus_backup_summary">Effettua automaticamente il backup dei tuoi messaggi. Non dovrai più preoccuparti di perdere la cronologia quando cambi il telefono o lo perdi</string>
-    <string name="qksms_plus_scheduled_title">Messaggi pianificati</string>
-    <string name="qksms_plus_scheduled_summary">Messaggi pianificati da inviare automaticamente ad una specifica data e ora</string>
-    <string name="qksms_plus_delayed_title">Invio posticipato</string>
-    <string name="qksms_plus_delayed_summary">Attendere alcuni secondi prima di inviare il tuo messaggio</string>
-    <string name="qksms_plus_night_title">Modalità notturna automatica</string>
-    <string name="qksms_plus_night_summary">Attiva la modalità notturna in base all\'ora del giorno</string>
-    <string name="qksms_plus_blacklist_title">Blocco avanzato</string>
-    <string name="qksms_plus_blacklist_summary">Bloccare i messaggi che contengono parole chiave o corrispondono a modelli</string>
-    <string name="qksms_plus_forward_title">Inoltro automatico</string>
-    <string name="qksms_plus_forward_summary">Inoltrare automaticamente i messaggi da determinati mittenti</string>
-    <string name="qksms_plus_respond_title">Risposta automatica</string>
-    <string name="qksms_plus_respond_summary">Rispondere automaticamente ai messaggi in arrivo con una risposta preimpostata</string>
-    <string name="qksms_plus_more_title">Altro</string>
-    <string name="qksms_plus_more_summary">QKSMS è sotto sviluppo attivo, e l\'acquisto includerà tutte le caratteristiche future di QKSMS+!</string>
-    <string name="widget_loading">Caricamento&#8230;</string>
-    <string name="widget_more">Mostra altre conversazioni</string>
-    <string name="qkreply_menu_read">Segna come \"letto\"</string>
-    <string name="qkreply_menu_call">Chiama</string>
-    <string name="qkreply_menu_delete">Elimina</string>
-    <string name="qkreply_menu_expand">Mostra dettagli</string>
-    <string name="qkreply_menu_collapse">Mostra meno</string>
-    <string name="qkreply_menu_view">Apri la conversazione</string>
-    <string name="theme_material">Material</string>
-    <string name="theme_hex">HEX</string>
-    <string name="theme_apply">Applica</string>
-    <string-array name="notification_actions">
-        <item>Nessuna</item>
-        <item>Archivia</item>
-        <item>Elimina</item>
-        <item>Blocca</item>
-        <item>Chiama</item>
-        <item>Segna come \"letto\"</item>
-        <item>Rispondi</item>
-    </string-array>
-    <string name="button_yes">Sì</string>
-    <string name="button_continue">Continua</string>
-    <string name="button_cancel">Annulla</string>
-    <string name="button_delete">Elimina</string>
-    <string name="button_save">Salva</string>
-    <string name="button_stop">Stop</string>
-    <string name="button_more">Altro</string>
-    <string name="button_set">Set</string>
-    <string name="button_undo">Annulla</string>
-    <string name="toast_copied">Copiato</string>
-    <string name="toast_archived">Conversazione archiviata</string>
-    <string name="toast_qksms_plus">È necessario sbloccare QKSMS+ per utilizzare questo</string>
-    <plurals name="notification_new_messages">
-        <item quantity="one">Nuovo messaggio</item>
-        <item quantity="other">%s nuovi messaggi</item>
-    </plurals>
-    <string name="notification_message_failed_title">Messaggi non inviati</string>
-    <string name="notification_message_failed_text">Il messaggio a %s non è stato inviato</string>
-    <string-array name="night_modes">
-        <item>Sistema</item>
-        <item>Disabilitato</item>
-        <item>Sempre acceso</item>
-        <item>Automatico</item>
-    </string-array>
-    <string-array name="notification_preview_options">
-        <item>Mostra il nome e il messaggio</item>
-        <item>Mostra il nome</item>
-        <item>Non mostrare il contenuto</item>
-    </string-array>
-    <string-array name="text_sizes">
-        <item>Piccolo</item>
-        <item>Normale</item>
-        <item>Grande</item>
-        <item>Enorme</item>
-    </string-array>
-    <string-array name="delayed_sending_labels">
-        <item>Nessun ritardo</item>
-        <item>3 secondi</item>
-        <item>5 secondi</item>
-        <item>10 secondi</item>
-    </string-array>
-    <string-array name="mms_sizes">
-        <item>Automatico</item>
-        <item>100KB</item>
-        <item>200KB</item>
-        <item>300KB</item>
-        <item>600KB</item>
-        <item>1000KB</item>
-        <item>2000KB</item>
-        <item>Nessuna compressione</item>
-    </string-array>
-    <string-array name="qk_responses">
-        <item>Okay</item>
-        <item>Dammi un attimo</item>
-        <item>Sono per strada</item>
-        <item>Grazie</item>
-        <item>Buona idea</item>
-        <item>Come va?</item>
-        <item>D\'accordo</item>
-        <item>No</item>
-        <item>Ti amo</item>
-        <item>Scusa</item>
-        <item>LOL</item>
-        <item>Va bene</item>
-    </string-array>
-</resources>
+<?xml version="1.0" encoding="utf-8"?>
+<!--
+  ~ Copyright (C) 2019 Moez Bhatti <moez.bhatti@gmail.com>
+  ~
+  ~ This file is part of QKSMS.
+  ~
+  ~ QKSMS is free software: you can redistribute it and/or modify
+  ~ it under the terms of the GNU General Public License as published by
+  ~ the Free Software Foundation, either version 3 of the License, or
+  ~ (at your option) any later version.
+  ~
+  ~ QKSMS is distributed in the hope that it will be useful,
+  ~ but WITHOUT ANY WARRANTY; without even the implied warranty of
+  ~ MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+  ~ GNU General Public License for more details.
+  ~
+  ~ You should have received a copy of the GNU General Public License
+  ~ along with QKSMS.  If not, see <http://www.gnu.org/licenses/>.
+  -->
+<resources>
+    <string name="shortcut_compose_long_label">Nuova conversazione</string>
+    <string name="shortcut_compose_short_label">Componi</string>
+    <string name="shortcut_compose_disabled_message">Scelta rapida disattivata</string>
+    <string name="title_archived">Archivio</string>
+    <string name="title_settings">Impostazioni</string>
+    <string name="title_notification_prefs">Notifiche</string>
+    <string name="title_theme">Tema</string>
+    <string name="title_conversations">Cerca in posta in arrivo&#8230;</string>
+    <string name="title_compose">Digita un nome o un numero</string>
+    <string name="setup_skip">Salta</string>
+    <string name="setup_next">Continua</string>
+    <string name="menu_add_person">Aggiungi persona</string>
+    <string name="menu_call">Chiama</string>
+    <string name="menu_info">Dettagli</string>
+    <string name="menu_save">Salva nella galleria</string>
+    <string name="menu_share">Condividi</string>
+    <string name="main_drawer_open_cd">Apri il pannello di navigazione</string>
+    <string name="main_title_selected">%d selezionato</string>
+    <string name="main_menu_clear">Azzera</string>
+    <string name="main_menu_archive">Archivia</string>
+    <string name="main_menu_unarchive">Annulla archiviazione</string>
+    <string name="main_menu_delete">Elimina</string>
+    <string name="main_menu_add_contact">Aggiungi ai contatti</string>
+    <string name="main_menu_pin">Blocca in alto</string>
+    <string name="main_menu_unpin">Sblocca</string>
+    <string name="main_menu_read">Segna come \"letto\"</string>
+    <string name="main_menu_unread">Segna come \"da leggere\"</string>
+    <string name="main_menu_block">Sposta negli indesiderati</string>
+    <string name="main_syncing">La sincronizzazione dei messaggi&#8230;</string>
+    <string name="main_sender_you">Tu: %s</string>
+    <string name="main_draft">Bozza</string>
+    <string name="main_message_results_title">Risultati nei messaggi</string>
+    <string name="main_message_results">%d messaggi</string>
+    <string name="inbox_empty_text">Le tue conversazioni vengono visualizzate qui</string>
+    <string name="inbox_search_empty_text">Nessun risultato</string>
+    <string name="archived_empty_text">Le tue conversazioni vengono archiviate qui</string>
+    <string name="main_fab_cd">Inizia nuova conversazione</string>
+    <string name="main_default_sms_title">Adoro scrivere di nuovo SMS</string>
+    <string name="main_default_sms_message">Rendi QKSMS la tua app di SMS predefinita</string>
+    <string name="main_default_sms_change">Modifica</string>
+    <string name="main_permission_required">Autorizzazione necessaria</string>
+    <string name="main_permission_sms">QKSMS ha bisogno dell\'autorizzazione per inviare e visualizzare gli SMS</string>
+    <string name="main_permission_contacts">QKSMS ha bisogno dell\'autorizzazione per visualizzare i tuoi contatti</string>
+    <string name="main_permission_allow">Consenti</string>
+    <string name="drawer_inbox">Ricevuti</string>
+    <string name="drawer_archived">Archiviati</string>
+    <string name="drawer_scheduled">Pianificati</string>
+    <string name="drawer_blocking">Indesiderati</string>
+    <string name="drawer_more">Altro</string>
+    <string name="drawer_settings">Impostazioni</string>
+    <string name="drawer_help">Aiuto &amp; suggerimenti</string>
+    <string name="drawer_invite">Invita gli amici</string>
+    <string name="drawer_plus_banner_summary">Sblocca nuove incredibili funzionalità e sostieni lo sviluppo</string>
+    <string name="rate_title">Ti piace QKSMS?</string>
+    <string name="rate_summary">Condividi un po\' di amore e votaci su Google Play!</string>
+    <string name="rate_okay">OK!</string>
+    <string name="rate_dismiss">ANNULLA</string>
+    <string name="dialog_delete_title">Elimina</string>
+    <plurals name="dialog_delete_message">
+        <item quantity="one">Sei sicuro di voler eliminare questa conversazione?</item>
+        <item quantity="other">Sei sicuro di voler eliminare %d conversazioni?</item>
+    </plurals>
+    <string-array name="message_options">
+        <item>Copia testo</item>
+        <item>Inoltra</item>
+        <item>Elimina</item>
+    </string-array>
+    <string name="compose_number_picker_title">Scegli un numero di telefono</string>
+    <string name="compose_number_picker_default">%s ∙ Predefinito</string>
+    <string name="compose_number_picker_once">Solo una volta</string>
+    <string name="compose_number_picker_always">Sempre</string>
+    <string name="compose_title_selected">%d selezionato</string>
+    <string name="compose_subtitle_results">%1$d di %2$d risultati</string>
+    <string name="compose_send_group_title">Invia come messaggio di gruppo</string>
+    <string name="compose_send_group_summary">I destinatari e le risposte saranno visibili a tutti</string>
+    <string name="compose_messages_empty">Questo è l\'inizio della tua conversazione. Dì qualcosa di carino!</string>
+    <string name="compose_vcard_label">Scheda contatto</string>
+    <string name="compose_scheduled_for">Pianificato per</string>
+    <string name="compose_scheduled_future">L\'ora selezionata deve essere nel futuro!</string>
+    <string name="compose_scheduled_plus">È necessario sbloccare QKSMS+ per utilizzare la pianificazione dei messaggi</string>
+    <string name="compose_scheduled_toast">Aggiunto ai messaggi pianificati</string>
+    <string name="compose_hint">Scrivi un messaggio&#8230;</string>
+    <string name="compose_menu_copy">Copia testo</string>
+    <string name="compose_menu_forward">Inoltra</string>
+    <string name="compose_menu_delete">Elimina</string>
+    <string name="compose_menu_previous">Precedente</string>
+    <string name="compose_menu_next">Successivo</string>
+    <string name="compose_menu_clear">Azzera</string>
+    <string name="compose_details_title">Dettagli del messaggio</string>
+    <string name="compose_details_type">Tipo: %s</string>
+    <string name="compose_details_from">Da: %s</string>
+    <string name="compose_details_to">A: %s</string>
+    <string name="compose_details_subject">Oggetto: %s</string>
+    <string name="compose_details_priority">Priorità: %s</string>
+    <string name="compose_details_size">Dimensione: %s</string>
+    <string name="compose_details_sent">Inviato: %s</string>
+    <string name="compose_details_received">Ricevuto: %s</string>
+    <string name="compose_details_delivered">Consegnato: %s</string>
+    <string name="compose_details_error_code">Codice di errore: %d</string>
+    <string name="compose_attach_cd">Aggiungi un allegato</string>
+    <string name="compose_gallery_cd">Allega una foto</string>
+    <string name="compose_camera_cd">Scatta una foto</string>
+    <string name="compose_schedule_cd">Pianifica messaggio</string>
+    <string name="compose_contact_cd">Collegare un contatto</string>
+    <string name="compose_contact_error">Errore nella lettura del contatto</string>
+    <!-- Example: SIM 1 (Verizon) selected-->
+    <string name="compose_sim_changed_toast">SIM %1$d (%2$s) selezionata</string>
+    <string name="compose_sim_cd">%s selezionato, cambiare SIM</string>
+    <string name="compose_send_cd">Invia messaggio</string>
+    <string name="message_status_sending">Invio in corso&#8230;</string>
+    <string name="message_status_delivered">Consegnato %s</string>
+    <string name="message_status_failed">Impossibile inviare. Tocca per riprovare</string>
+    <string name="info_title">Dettagli</string>
+    <string name="info_copied_address">Indirizzo copiato</string>
+    <string name="info_name">Titolo della conversazione</string>
+    <string name="info_notifications">Notifiche</string>
+    <string name="info_theme">Tema</string>
+    <string name="info_archive">Archivia</string>
+    <string name="info_unarchive">Annulla archiviazione</string>
+    <string name="info_block">Mittente indesiderato</string>
+    <string name="info_unblock">Ripristina mittente</string>
+    <string name="info_delete">Elimina la conversazione</string>
+    <string name="gallery_error">Impossibile caricare il supporto</string>
+    <string name="gallery_toast_saved">Salvato nella galleria</string>
+    <string name="backup_title">Backup e ripristino</string>
+    <string name="backup_backing_up">Backup dei messaggi</string>
+    <string name="backup_restoring">Ripristino da backup</string>
+    <string name="backup_last">Ultimo backup</string>
+    <string name="backup_loading">Caricamento&#8230;</string>
+    <string name="backup_never">Mai</string>
+    <string name="backup_restore_title">Ripristino</string>
+    <string name="backup_restore_summary">Selezionare un backup</string>
+    <string name="backup_restore_error_plus">Si prega di sbloccare QKSMS + per utilizzare backup e ripristino</string>
+    <string name="backup_restore_error_backup">Backup in corso&#8230;</string>
+    <string name="backup_restore_error_restore">Ripristino in corso&#8230;</string>
+    <string name="backup_restore_confirm_title">Ripristino da backup</string>
+    <string name="backup_restore_confirm_message">Sei sicuro che desideri ripristinare i messaggi da questo backup?</string>
+    <string name="backup_restore_stop_title">Interrompi il ripristino</string>
+    <string name="backup_restore_stop_message">I messaggi che sono già stati ripristinati rimarranno sul tuo dispositivo</string>
+    <string name="backup_restore_dialog_title">Backups</string>
+    <string name="backup_restore_dialog_empty">Nessun backup trovato</string>
+    <plurals name="backup_message_count">
+        <item quantity="one">%d messaggio</item>
+        <item quantity="other">%d messaggi</item>
+    </plurals>
+    <string name="backup_disclaimer">Attualmente Backup e Restore supportano solo gli SMS. Il supporto per gli MMS ed i backup schedulati arriverà presto!</string>
+    <string name="backup_now">Backup adesso</string>
+    <string name="backup_progress_parsing">L\'analisi del backup&#8230;</string>
+    <string name="backup_progress_running">%d/%d messaggi</string>
+    <string name="backup_progress_saving">Salvataggio backup&#8230;</string>
+    <string name="backup_progress_syncing">Sincronizzazione messaggi&#8230;</string>
+    <string name="backup_progress_finished">Terminato!</string>
+    <string name="backup_notification_channel_name">Backup e ripristino</string>
+    <string name="scheduled_title">Messaggi pianificati</string>
+    <string name="scheduled_empty_description">Invia un messaggio automatico, nel momento desiderato</string>
+    <string name="scheduled_empty_message_1">Ehi! Quand\'è il tuo compleanno?</string>
+    <string name="scheduled_empty_message_2">È il 23 dicembre</string>
+    <string name="scheduled_empty_message_3">Buon Compleanno! Solo un grande amico si ricorda il tuo compleanno</string>
+    <!--&#x200A; is a special character required at the end of this string to fix it's formatting in the app -->
+    <string name="scheduled_empty_message_3_timestamp">Invio il 23 dicembre </string>
+    <string name="scheduled_compose_cd">Schedula un messaggio</string>
+    <string name="scheduled_options_title">Messaggio pianificato</string>
+    <string-array name="scheduled_options">
+        <item>Invia ora</item>
+        <item>Copia testo</item>
+        <item>Cancella</item>
+    </string-array>
+    <string name="settings_category_appearance">Aspetto</string>
+    <string name="settings_category_general">Generale</string>
+    <string name="settings_category_qkreply">Risposta QK</string>
+    <string name="settings_theme_title">Tema</string>
+    <string name="settings_night_title">Modalità notturna</string>
+    <string name="settings_black_title">Modalità notte nero puro</string>
+    <string name="settings_night_start_title">Ora di inizio</string>
+    <string name="settings_night_end_title">Ora di fine</string>
+    <string name="settings_automatic_colors_title">Colori dei contatti automatici</string>
+    <string name="settings_text_size_title">Dimensione carattere</string>
+    <string name="settings_system_font_title">Usa il carattere di sistema</string>
+    <string name="settings_auto_emoji_title">Emoji automatico</string>
+    <string name="settings_notifications_title">Notifiche</string>
+    <string name="settings_notifications_o_summary">Seleziona per personalizzare</string>
+    <string name="settings_notification_actions_title">Azioni</string>
+    <string name="settings_notification_action_1">Pulsante 1</string>
+    <string name="settings_notification_action_2">Pulsante 2</string>
+    <string name="settings_notification_action_3">Pulsante 3</string>
+    <string name="settings_notification_previews_title">Anteprima delle notifiche</string>
+    <string name="settings_notification_wake_title">Schermata iniziale</string>
+    <string name="settings_vibration_title">Vibrazione</string>
+    <string name="settings_ringtone_title">Suono</string>
+    <string name="settings_ringtone_none">Nessuno</string>
+    <string name="settings_qkreply_title">Risposta QK</string>
+    <string name="settings_qkreply_summary">Popup per i nuovi messaggi</string>
+    <string name="settings_qkreply_tap_dismiss_title">Tocca per archiviare</string>
+    <string name="settings_qkreply_tap_dismiss_summary">Tocca al di fuori del popup per chiuderlo</string>
+    <string name="settings_delayed_title">Invio posticipato</string>
+    <string name="settings_swipe_actions">Azioni di scorrimento</string>
+    <string name="settings_swipe_actions_summary">Configura le azioni di scorrimento per le conversazioni</string>
+    <string name="settings_swipe_actions_right">Scorrimento a destra</string>
+    <string name="settings_swipe_actions_left">Scorrimento a sinistra</string>
+    <string name="settings_swipe_actions_change">CAMBIA</string>
+    <string-array name="settings_swipe_actions">
+        <item>Nessuna</item>
+        <item>Archivia</item>
+        <item>Elimina</item>
+        <item>Blocca</item>
+        <item>Chiama</item>
+        <item>Segna come \"letto\"</item>
+        <item>Segna come \"da leggere\"</item>
+    </string-array>
+    <string name="settings_delivery_title">Conferme di recapito</string>
+    <string name="settings_delivery_summary">Conferma che i messaggi siano stati inviati con successo</string>
+    <string name="settings_signature_title">Firma</string>
+    <string name="settings_signature_summary">Aggiungi una firma alla fine dei tuoi messaggi</string>
+    <string name="settings_unicode_title">Elimina gli accenti</string>
+    <string name="settings_unicode_summary">Rimuovi gli accenti dai caratteri negli SMS in uscita</string>
+    <string name="settings_mobile_title">Solo numeri mobili</string>
+    <string name="settings_mobile_summary">Durante la composizione di un messaggio, visualizza solo i numeri di cellulare</string>
+    <string name="settings_auto_delete">Elimina automaticamente i vecchi messaggi</string>
+    <string name="settings_auto_delete_dialog_message">I messaggi verranno eliminati dopo il numero di giorni specificato</string>
+    <string name="settings_auto_delete_dialog_hint">Numero di giorni</string>
+    <string name="settings_auto_delete_never">Mai</string>
+    <string name="settings_auto_delete_warning">Eliminare i vecchi messaggi automaticamente?</string>
+    <string name="settings_auto_delete_warning_message">Scegliendo di procedere, %1$d messaggi verranno eliminati ora</string>
+    <plurals name="settings_auto_delete_summary">
+        <item quantity="one">Dopo 1 giorno</item>
+        <item quantity="other">Dopo %d giorni</item>
+    </plurals>
+    <string name="settings_long_as_mms_title">Invia messaggi lunghi come MMS</string>
+    <string name="settings_long_as_mms_summary">Se i tuoi messaggi di testo più lunghi non vengono inviati o vengono inviati nell\'ordine sbagliato, puoi invece inviarli come messaggi MMS. Potrebbero essere applicati costi aggiuntivi</string>
+    <string name="settings_mms_size_title">Compressione automatica degli allegati MMS</string>
+    <string name="settings_sync_title">Sincronizza i messaggi</string>
+    <string name="settings_sync_summary">Risincronizza i tuoi messaggi con il database SMS Android nativo</string>
+    <string name="settings_about_title">Informazioni su QKSMS</string>
+    <string name="settings_version">Versione %s</string>
+    <string name="settings_logging_enabled">Registrazione del debug attivata</string>
+    <string name="settings_logging_disabled">Registrazione del debug disattivata</string>
+    <string name="settings_delay_duration_hint">Inserisci la durata (in secondi)</string>
+    <string name="blocking_title">Bloccare</string>
+    <string name="blocking_drop_title">Elimina messaggi</string>
+    <string name="blocking_drop_summary">Elimina i messaggi in arrivo dai mittenti bloccati invece di nasconderli</string>
+    <string name="blocking_conversations">Conversazioni bloccate</string>
+    <string name="blocking_manager_title">Gestore blocchi</string>
+    <string name="blocking_manager_qksms_title">QKSMS</string>
+    <string name="blocking_manager_qksms_summary">Funzionalità di blocco integrata in QKSMS</string>
+    <string name="blocking_manager_call_control_summary">Filtra automaticamente le tue chiamate e i tuoi messaggi in un unico comodo posto! Community IQ™ ti consente di prevenire messaggi indesiderati dagli spammer noti alla comunità</string>
+    <string name="blocking_manager_sia_summary">Filtrare automaticamente i messaggi provenienti da numeri indesiderati utilizzando l\'app \"Dovrei rispondere?\"</string>
+    <string name="blocking_manager_copy_title">Copia i numeri bloccati</string>
+    <string name="blocking_manager_copy_summary">Continua a copiare %s sui tuoi numeri bloccati esistenti</string>
+    <string name="blocked_numbers_title">Numeri bloccati</string>
+    <string name="blocked_numbers_empty">I tuoi numeri bloccati appariranno qui</string>
+    <string name="blocked_numbers_add_cd">Blocca un nuovo numero</string>
+    <string name="blocked_numbers_dialog_title">Blocca i testi da</string>
+    <string name="blocked_numbers_dialog_hint">Numero di telefono</string>
+    <string name="blocked_numbers_dialog_block">Blocca</string>
+    <string name="blocked_messages_title">Messaggi bloccati</string>
+    <string name="blocked_messages_empty">I tuoi messaggi bloccati appariranno qui</string>
+    <string name="blocking_block_title">Blocca</string>
+    <string name="blocking_unblock_title">Sblocca</string>
+    <plurals name="blocking_block_external">
+        <item quantity="one">Continua a %s e blocca questo numero</item>
+        <item quantity="other">Continua a %s e blocca questi numeri</item>
+    </plurals>
+    <plurals name="blocking_unblock_external">
+        <item quantity="one">Continua a %s e permetti questo numero</item>
+        <item quantity="other">Continua a %s e consenti questi numeri</item>
+    </plurals>
+    <string name="about_title">Informazioni</string>
+    <string name="about_version_title">Versione</string>
+    <string name="about_developer_title">Sviluppatore</string>
+    <string name="about_source_title">Codice sorgente</string>
+    <string name="about_changelog_title">Elenco delle modifiche</string>
+    <string name="about_contact_title">Contatto</string>
+    <string name="about_license_title">Licenza</string>
+    <string name="about_copyright_title">Copyright</string>
+    <string name="qksms_plus_description_title">Supporta lo sviluppo, sblocca tutte le funzioni</string>
+    <string name="qksms_plus_description_summary">Salva uno sviluppatore affamato per soli %s</string>
+    <!-- Substitutions are for price and currency. Ex: Lifetime upgrade for $1.99 USD -->
+    <string name="qksms_plus_upgrade">Upgrade a vita per %1$s %2$s</string>
+    <!-- Substitutions are for price and currency. Ex: Unlock + donate for $4.99 USD -->
+    <string name="qksms_plus_upgrade_donate">Sblocca &amp; dona per %1$s %2$s</string>
+    <string name="qksms_plus_thanks_title">Grazie per il supporto a QKSMS!</string>
+    <string name="qksms_plus_thanks_summary">È ora possibile accedere a tutte le funzioni QKSMS+</string>
+    <string name="qksms_plus_free_title">QKSMS+ è gratuito per gli utenti di F-Droid! Se desideri sostenere il progetto, una tua donazione sarebbe molto apprezzata.</string>
+    <string name="qksms_plus_donate">Fai una donazione tramite PayPal</string>
+    <string name="qksms_plus_coming_soon">Prossimamente</string>
+    <string name="qksms_plus_themes_title">Temi Premium</string>
+    <string name="qksms_plus_themes_summary">Sblocca splendidi colori non disponibili nella tavolozza del Material Design</string>
+    <string name="qksms_plus_emoji_title">Personalizza gli emoji automatici</string>
+    <string name="qksms_plus_emoji_summary">Crea scorciatoie personalizzate per gli emoji automatici</string>
+    <string name="qksms_plus_backup_title">Backup dei messaggi</string>
+    <string name="qksms_plus_backup_summary">Effettua automaticamente il backup dei tuoi messaggi. Non dovrai più preoccuparti di perdere la cronologia quando cambi il telefono o lo perdi</string>
+    <string name="qksms_plus_scheduled_title">Messaggi pianificati</string>
+    <string name="qksms_plus_scheduled_summary">Messaggi pianificati da inviare automaticamente ad una specifica data e ora</string>
+    <string name="qksms_plus_delayed_title">Invio posticipato</string>
+    <string name="qksms_plus_delayed_summary">Attendere alcuni secondi prima di inviare il tuo messaggio</string>
+    <string name="qksms_plus_night_title">Modalità notturna automatica</string>
+    <string name="qksms_plus_night_summary">Attiva la modalità notturna in base all\'ora del giorno</string>
+    <string name="qksms_plus_blacklist_title">Blocco avanzato</string>
+    <string name="qksms_plus_blacklist_summary">Bloccare i messaggi che contengono parole chiave o corrispondono a modelli</string>
+    <string name="qksms_plus_forward_title">Inoltro automatico</string>
+    <string name="qksms_plus_forward_summary">Inoltrare automaticamente i messaggi da determinati mittenti</string>
+    <string name="qksms_plus_respond_title">Risposta automatica</string>
+    <string name="qksms_plus_respond_summary">Rispondere automaticamente ai messaggi in arrivo con una risposta preimpostata</string>
+    <string name="qksms_plus_more_title">Altro</string>
+    <string name="qksms_plus_more_summary">QKSMS è sotto sviluppo attivo, e l\'acquisto includerà tutte le caratteristiche future di QKSMS+!</string>
+    <string name="widget_loading">Caricamento&#8230;</string>
+    <string name="widget_more">Mostra altre conversazioni</string>
+    <string name="qkreply_menu_read">Segna come \"letto\"</string>
+    <string name="qkreply_menu_call">Chiama</string>
+    <string name="qkreply_menu_delete">Elimina</string>
+    <string name="qkreply_menu_expand">Mostra dettagli</string>
+    <string name="qkreply_menu_collapse">Mostra meno</string>
+    <string name="qkreply_menu_view">Apri la conversazione</string>
+    <string name="theme_material">Material</string>
+    <string name="theme_hex">HEX</string>
+    <string name="theme_apply">Applica</string>
+    <string-array name="notification_actions">
+        <item>Nessuna</item>
+        <item>Archivia</item>
+        <item>Elimina</item>
+        <item>Blocca</item>
+        <item>Chiama</item>
+        <item>Segna come \"letto\"</item>
+        <item>Rispondi</item>
+    </string-array>
+    <string name="button_yes">Sì</string>
+    <string name="button_continue">Continua</string>
+    <string name="button_cancel">Annulla</string>
+    <string name="button_delete">Elimina</string>
+    <string name="button_save">Salva</string>
+    <string name="button_stop">Stop</string>
+    <string name="button_more">Altro</string>
+    <string name="button_set">Set</string>
+    <string name="button_undo">Annulla</string>
+    <string name="toast_copied">Copiato</string>
+    <string name="toast_archived">Conversazione archiviata</string>
+    <string name="toast_qksms_plus">È necessario sbloccare QKSMS+ per utilizzare questo</string>
+    <plurals name="notification_new_messages">
+        <item quantity="one">Nuovo messaggio</item>
+        <item quantity="other">%s nuovi messaggi</item>
+    </plurals>
+    <string name="notification_message_failed_title">Messaggi non inviati</string>
+    <string name="notification_message_failed_text">Il messaggio a %s non è stato inviato</string>
+    <string-array name="night_modes">
+        <item>Sistema</item>
+        <item>Disabilitato</item>
+        <item>Sempre acceso</item>
+        <item>Automatico</item>
+    </string-array>
+    <string-array name="notification_preview_options">
+        <item>Mostra il nome e il messaggio</item>
+        <item>Mostra il nome</item>
+        <item>Non mostrare il contenuto</item>
+    </string-array>
+    <string-array name="text_sizes">
+        <item>Piccolo</item>
+        <item>Normale</item>
+        <item>Grande</item>
+        <item>Enorme</item>
+    </string-array>
+    <string-array name="delayed_sending_labels">
+        <item>Nessun ritardo</item>
+        <item>3 secondi</item>
+        <item>5 secondi</item>
+        <item>10 secondi</item>
+    </string-array>
+    <string-array name="mms_sizes">
+        <item>Automatico</item>
+        <item>100KB</item>
+        <item>200KB</item>
+        <item>300KB</item>
+        <item>600KB</item>
+        <item>1000KB</item>
+        <item>2000KB</item>
+        <item>Nessuna compressione</item>
+    </string-array>
+    <string-array name="qk_responses">
+        <item>Okay</item>
+        <item>Dammi un attimo</item>
+        <item>Sono per strada</item>
+        <item>Grazie</item>
+        <item>Buona idea</item>
+        <item>Come va?</item>
+        <item>D\'accordo</item>
+        <item>No</item>
+        <item>Ti amo</item>
+        <item>Scusa</item>
+        <item>LOL</item>
+        <item>Va bene</item>
+    </string-array>
+</resources>
diff --git a/presentation/src/main/res/values-iw/strings.xml b/presentation/src/main/res/values-iw/strings.xml
index 9d91c28ec..009ba8928 100644
--- a/presentation/src/main/res/values-iw/strings.xml
+++ b/presentation/src/main/res/values-iw/strings.xml
@@ -1,423 +1,423 @@
-<?xml version="1.0" encoding="utf-8"?>
-<!--
-  ~ Copyright (C) 2019 Moez Bhatti <moez.bhatti@gmail.com>
-  ~
-  ~ This file is part of QKSMS.
-  ~
-  ~ QKSMS is free software: you can redistribute it and/or modify
-  ~ it under the terms of the GNU General Public License as published by
-  ~ the Free Software Foundation, either version 3 of the License, or
-  ~ (at your option) any later version.
-  ~
-  ~ QKSMS is distributed in the hope that it will be useful,
-  ~ but WITHOUT ANY WARRANTY; without even the implied warranty of
-  ~ MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
-  ~ GNU General Public License for more details.
-  ~
-  ~ You should have received a copy of the GNU General Public License
-  ~ along with QKSMS.  If not, see <http://www.gnu.org/licenses/>.
-  -->
-<resources>
-    <string name="shortcut_compose_long_label">התכתבות חדשה</string>
-    <string name="shortcut_compose_short_label">כתיבה</string>
-    <string name="shortcut_compose_disabled_message">קיצור הדרך הושבת</string>
-    <string name="title_archived">בארכיון</string>
-    <string name="title_settings">הגדרות</string>
-    <string name="title_notification_prefs">התראות</string>
-    <string name="title_theme">ערכת עיצוב</string>
-    <string name="title_conversations">חיפוש בדואר הנכנס&#8230;</string>
-    <string name="title_compose">נא להקליד שם או מספר</string>
-    <string name="setup_skip">דילוג</string>
-    <string name="setup_next">המשך</string>
-    <string name="menu_add_person">להוסיף מישהו</string>
-    <string name="menu_call">התקשרות</string>
-    <string name="menu_info">פרטים</string>
-    <string name="menu_save">שמירה לגלריה</string>
-    <string name="menu_share">שיתוף</string>
-    <string name="main_drawer_open_cd">פתיחת מגירת ניווט</string>
-    <string name="main_title_selected">%d נבחרו</string>
-    <string name="main_menu_clear">פינוי</string>
-    <string name="main_menu_archive">לארכיון</string>
-    <string name="main_menu_unarchive">שליפה מהארכיון</string>
-    <string name="main_menu_delete">מחיקה</string>
-    <string name="main_menu_add_contact">הוספה לאנשי קשר</string>
-    <string name="main_menu_pin">הצמדה למעלה</string>
-    <string name="main_menu_unpin">שחרור הצמדה</string>
-    <string name="main_menu_read">סימון כהודעה שנקראה</string>
-    <string name="main_menu_unread">סימון כהודעה שלא נקראה</string>
-    <string name="main_menu_block">חסימה</string>
-    <string name="main_syncing">ההודעות מסונכרנות&#8230;</string>
-    <string name="main_sender_you">אני: %s</string>
-    <string name="main_draft">טיוטה</string>
-    <string name="main_message_results_title">תוצאות בהודעות</string>
-    <string name="main_message_results">%d הודעות</string>
-    <string name="inbox_empty_text">ההתכתבויות שלך תופענה כאן</string>
-    <string name="inbox_search_empty_text">אין תוצאות</string>
-    <string name="archived_empty_text">ההתכתבויות שהעברת לארכיון תופענה כאן</string>
-    <string name="main_fab_cd">התחלת התכתבות חדשה</string>
-    <string name="main_default_sms_title">להתאהב בהתמסררות</string>
-    <string name="main_default_sms_message">הגדרת QKSMS ליישומון המסרונים כבררת מחדל</string>
-    <string name="main_default_sms_change">החלפה</string>
-    <string name="main_permission_required">נדרשת הרשאה</string>
-    <string name="main_permission_sms">ל־QKSMS נדרשות הרשאות כדי לשלוח ולצפות במסרונים</string>
-    <string name="main_permission_contacts">ל־QKSMS נדרשות הרשאות כדי לצפות באנשי הקשר שלך</string>
-    <string name="main_permission_allow">לאפשר</string>
-    <string name="drawer_inbox">דואר נכנס</string>
-    <string name="drawer_archived">בארכיון</string>
-    <string name="drawer_scheduled">בתזמון</string>
-    <string name="drawer_blocking">חסימה</string>
-    <string name="drawer_more">עוד</string>
-    <string name="drawer_settings">הגדרות</string>
-    <string name="drawer_help">עזרה ומשוב</string>
-    <string name="drawer_invite">הזמנת חברים</string>
-    <string name="drawer_plus_banner_summary">לחשוף תכונות מדהימות ולתמוך בפיתוח</string>
-    <string name="rate_title">QKSMS נושא חן בעיניך?</string>
-    <string name="rate_summary">נשמח לקבל ממך דירוג ב־Google Play!</string>
-    <string name="rate_okay">כמובן!</string>
-    <string name="rate_dismiss">התעלמות</string>
-    <string name="dialog_delete_title">מחיקה</string>
-    <plurals name="dialog_delete_message">
-        <item quantity="one">למחוק את ההתכתבות הזאת?</item>
-        <item quantity="two">למחוק את %d ההתכתבויות האלה?</item>
-        <item quantity="many">למחוק את %d ההתכתבויות האלה?</item>
-        <item quantity="other">למחוק את %d ההתכתבויות האלה?</item>
-    </plurals>
-    <string-array name="message_options">
-        <item>העתקת טקסט</item>
-        <item>העברה</item>
-        <item>מחיקה</item>
-    </string-array>
-    <string name="compose_number_picker_title">נא לבחור מספר טלפון</string>
-    <string name="compose_number_picker_default">%s ∙ בררת מחדל</string>
-    <string name="compose_number_picker_once">פעם אחד בלבד</string>
-    <string name="compose_number_picker_always">תמיד</string>
-    <string name="compose_title_selected">%d נבחרו</string>
-    <string name="compose_subtitle_results">%1$d מתוך %2$d תוצאות</string>
-    <string name="compose_send_group_title">שליחה כהודעה קבוצתית</string>
-    <string name="compose_send_group_summary">הנמענים והתגובות יהיו חשופים בפני כולם</string>
-    <string name="compose_messages_empty">זאת תחילת ההתכתבות שלך. כדאי לפתוח במשהו נחמד!</string>
-    <string name="compose_vcard_label">כרטיס קשר</string>
-    <string name="compose_scheduled_for">מתוזמן למועד</string>
-    <string name="compose_scheduled_future">הזמן הנבחר חייב להיות בעתיד!</string>
-    <string name="compose_scheduled_plus">עליך לשחרר את QKSMS+‎ כדי להשתמש בהודעות מתוזמנות</string>
-    <string name="compose_scheduled_toast">הוספה להודעות המתוזמנות</string>
-    <string name="compose_hint">כתיבת הודעה&#8230;</string>
-    <string name="compose_menu_copy">העתקת טקסט</string>
-    <string name="compose_menu_forward">העברה</string>
-    <string name="compose_menu_delete">מחיקה</string>
-    <string name="compose_menu_previous">הקודמת</string>
-    <string name="compose_menu_next">הבאה</string>
-    <string name="compose_menu_clear">פינוי</string>
-    <string name="compose_details_title">פרטי הודעה</string>
-    <string name="compose_details_type">סוג: %s</string>
-    <string name="compose_details_from">מאת: %s</string>
-    <string name="compose_details_to">אל: %s</string>
-    <string name="compose_details_subject">נושא: %s</string>
-    <string name="compose_details_priority">עדיפות: %s</string>
-    <string name="compose_details_size">גודל: %s</string>
-    <string name="compose_details_sent">שליחה: %s</string>
-    <string name="compose_details_received">קבלה: %s</string>
-    <string name="compose_details_delivered">מסירה: %s</string>
-    <string name="compose_details_error_code">קוד שגיאה: %d</string>
-    <string name="compose_attach_cd">הוספת קובץ מצורף</string>
-    <string name="compose_gallery_cd">צירוף תמונה</string>
-    <string name="compose_camera_cd">צילום תמונה</string>
-    <string name="compose_schedule_cd">תזמון הודעה</string>
-    <string name="compose_contact_cd">צירוף איש קשר</string>
-    <string name="compose_contact_error">שגיאה בקריאת איש קשר</string>
-    <!-- Example: SIM 1 (Verizon) selected-->
-    <string name="compose_sim_changed_toast">נבחר SIM מס׳ %1$d ‏(%2$s)</string>
-    <string name="compose_sim_cd">%s נבחרו, החלפת כרטיס SIM</string>
-    <string name="compose_send_cd">שליחת הודעה</string>
-    <string name="message_status_sending">מתבצעת שליחה&#8230;</string>
-    <string name="message_status_delivered">%s נמסרה</string>
-    <string name="message_status_failed">השליחה נכשלה. נא לגעת כדי לנסות שוב</string>
-    <string name="info_title">פרטים</string>
-    <string name="info_copied_address">הכתובת הועתקה</string>
-    <string name="info_name">כותרת התכתבות</string>
-    <string name="info_notifications">התראות</string>
-    <string name="info_theme">ערכת עיצוב</string>
-    <string name="info_archive">העברה לארכיון</string>
-    <string name="info_unarchive">הוצאה מארכיון</string>
-    <string name="info_block">חסימה</string>
-    <string name="info_unblock">שחרור חסימה</string>
-    <string name="info_delete">מחיקת התכתבות</string>
-    <string name="gallery_error">לא ניתן לטעון מדיה</string>
-    <string name="gallery_toast_saved">נשמר לגלריה</string>
-    <string name="backup_title">גיבוי ושחזור</string>
-    <string name="backup_backing_up">ההודעות מגובות</string>
-    <string name="backup_restoring">מתבצע שחזור מגיבוי</string>
-    <string name="backup_last">גיבוי אחרון</string>
-    <string name="backup_loading">בטעינה&#8230;</string>
-    <string name="backup_never">מעולם לא</string>
-    <string name="backup_restore_title">שחזור</string>
-    <string name="backup_restore_summary">בחירת גיבוי</string>
-    <string name="backup_restore_error_plus">נא לשחרר את QKSMS+‎ כדי להשתמש בגיבוי ובשחזור</string>
-    <string name="backup_restore_error_backup">מתבצע גיבוי&#8230;</string>
-    <string name="backup_restore_error_restore">מתבצע שחזור&#8230;</string>
-    <string name="backup_restore_confirm_title">שחזור מגיבוי</string>
-    <string name="backup_restore_confirm_message">לשחזר את ההודעות שלך מהגיבוי הזה?</string>
-    <string name="backup_restore_stop_title">עצירת השחזור</string>
-    <string name="backup_restore_stop_message">הודעות שכבר שוחזרו יישארו במכשיר שלך</string>
-    <string name="backup_restore_dialog_title">גיבויים</string>
-    <string name="backup_restore_dialog_empty">לא נמצאו גיבויים</string>
-    <plurals name="backup_message_count">
-        <item quantity="one">הודעה אחת</item>
-        <item quantity="two">שתי הודעות</item>
-        <item quantity="many">%d הודעות</item>
-        <item quantity="other">%d הודעות</item>
-    </plurals>
-    <string name="backup_disclaimer">נכון לעכשיו, קיימת תמיכה בהודעות מסוג SMS בתכונת הגיבוי והשחזור. תמיכה ב־MMS וגיבויים מתוזמנים יגיעו בעתיד הקרוב!</string>
-    <string name="backup_now">לגבות כעת</string>
-    <string name="backup_progress_parsing">הגיבוי מפוענח&#8230;</string>
-    <string name="backup_progress_running">%d/%d הודעות</string>
-    <string name="backup_progress_saving">הגיבוי נשמר&#8230;</string>
-    <string name="backup_progress_syncing">ההודעות מסונכרנות&#8230;</string>
-    <string name="backup_progress_finished">הסתיים!</string>
-    <string name="backup_notification_channel_name">גיבוי ושחזור</string>
-    <string name="scheduled_title">מתוזמנת</string>
-    <string name="scheduled_empty_description">שליחת הודעה אוטומטית, ברגע המדויק שמתאים לך</string>
-    <string name="scheduled_empty_message_1">היי! מתי יום ההולדת שלך שוב?</string>
-    <string name="scheduled_empty_message_2">ב־23 בדצמבר</string>
-    <string name="scheduled_empty_message_3">מזל טוב! תראה איך החברות בינינו פורחת, זכרתי את יום ההולדת שלך</string>
-    <!--&#x200A; is a special character required at the end of this string to fix it's formatting in the app -->
-    <string name="scheduled_empty_message_3_timestamp">לשליחה ב־23 בדצמבר</string>
-    <string name="scheduled_compose_cd">תזמון הודעה</string>
-    <string name="scheduled_options_title">הודעה מתוזמנת</string>
-    <string-array name="scheduled_options">
-        <item>לשלוח כע</item>
-        <item>העתקת טקסט</item>
-        <item>מחיקה</item>
-    </string-array>
-    <string name="settings_category_appearance">מראה</string>
-    <string name="settings_category_general">כללי</string>
-    <string name="settings_category_qkreply">תגובה מהירה</string>
-    <string name="settings_theme_title">ערכת עיצוב</string>
-    <string name="settings_night_title">מצב לילה</string>
-    <string name="settings_black_title">מצב לילה שחור טהור</string>
-    <string name="settings_night_start_title">זמן התחלה</string>
-    <string name="settings_night_end_title">זמן סיום</string>
-    <string name="settings_automatic_colors_title">צבעים אוטומטיים לאנשי קשר</string>
-    <string name="settings_text_size_title">גודל גופן</string>
-    <string name="settings_system_font_title">שימוש בגופן המערכת</string>
-    <string name="settings_auto_emoji_title">אימוג׳י אוטומטי</string>
-    <string name="settings_notifications_title">התראות</string>
-    <string name="settings_notifications_o_summary">יש לגעת כדי להתאים אישית</string>
-    <string name="settings_notification_actions_title">פעולות</string>
-    <string name="settings_notification_action_1">כפתור 1</string>
-    <string name="settings_notification_action_2">כפתור 2</string>
-    <string name="settings_notification_action_3">כפתור 3</string>
-    <string name="settings_notification_previews_title">תצוגות מקדימות של התראות</string>
-    <string name="settings_notification_wake_title">הפעלת המסך</string>
-    <string name="settings_vibration_title">רטט</string>
-    <string name="settings_ringtone_title">צליל</string>
-    <string name="settings_ringtone_none">ללא</string>
-    <string name="settings_qkreply_title">תגובה מהירה</string>
-    <string name="settings_qkreply_summary">חלונית קופצת להודעות חדשות</string>
-    <string name="settings_qkreply_tap_dismiss_title">יש לגעת כדי להתעלם</string>
-    <string name="settings_qkreply_tap_dismiss_summary">יש לגעת מחוץ לחלונית הקופצת כדי לסגור אותה</string>
-    <string name="settings_delayed_title">שליחה בעיכוב</string>
-    <string name="settings_swipe_actions">פעולות גרירה</string>
-    <string name="settings_swipe_actions_summary">להגדיר פעולות גרירה להתכתבויות</string>
-    <string name="settings_swipe_actions_right">גרירה ימינה</string>
-    <string name="settings_swipe_actions_left">גרירה שמאלה</string>
-    <string name="settings_swipe_actions_change">החלפה</string>
-    <string-array name="settings_swipe_actions">
-        <item>ללא</item>
-        <item>לארכיון</item>
-        <item>מחיקה</item>
-        <item>חסימה</item>
-        <item>להתקשר</item>
-        <item>סימון כהודעה שנקראה</item>
-        <item>סימון כהודעה שלא נקראה</item>
-    </string-array>
-    <string name="settings_delivery_title">אישור מסירה</string>
-    <string name="settings_delivery_summary">אישור שההודעות נשלחו בהצלחה</string>
-    <string name="settings_signature_title">חתימה</string>
-    <string name="settings_signature_summary">הוספת חתימה לסוף ההודעות שלך</string>
-    <string name="settings_unicode_title">סינון סימנים דיאקריטיים</string>
-    <string name="settings_unicode_summary">הסרת סימנים דיאקריטיים מתווים במסרונים יוצאים</string>
-    <string name="settings_mobile_title">מספרי ניידים בלבד</string>
-    <string name="settings_mobile_summary">בעת כתיבת הודעה, להציג רק מספרי טלפון של ניידים</string>
-    <string name="settings_auto_delete">למחוק הודעות ישנות אוטומטית</string>
-    <string name="settings_auto_delete_dialog_message">הודעות תימחקנה לאחר כמות מסוימת של ימים</string>
-    <string name="settings_auto_delete_dialog_hint">מספר הימים</string>
-    <string name="settings_auto_delete_never">אף פעם</string>
-    <string name="settings_auto_delete_warning">למחוק הודעות ישנות אוטומטית?</string>
-    <string name="settings_auto_delete_warning_message">המשך הפעולה יוביל למחיקת %1$d הודעות כעת</string>
-    <plurals name="settings_auto_delete_summary">
-        <item quantity="one">לאחר יום</item>
-        <item quantity="two">לאחר יומיים</item>
-        <item quantity="many">לאחר %d ימים</item>
-        <item quantity="other">לאחר %d ימים</item>
-    </plurals>
-    <string name="settings_long_as_mms_title">לשלוח הודעות ארוכות כ־MMS</string>
-    <string name="settings_long_as_mms_summary">אם יש לך בעיה בשליחת הודעות טקסט ארוכות יותר או בעיה ברצף שליחת ההודעה, ניתן לשלוח כהודעת MMS במקום. עלול לגרור עלויות נוספות</string>
-    <string name="settings_mms_size_title">דחיסה אוטומטית של קבצים מצורפים להודעות MMS</string>
-    <string name="settings_sync_title">סנכרון הודעות</string>
-    <string name="settings_sync_summary">סנכרון ההודעות שלך מחדש עם מסד הנתונים המובנה של Android</string>
-    <string name="settings_about_title">על אודות QKSMS</string>
-    <string name="settings_version">גרסה %s</string>
-    <string name="settings_logging_enabled">תיעוד ניפוי שגיאות פעיל</string>
-    <string name="settings_logging_disabled">תיעוד ניפוי שגיאות כבוי</string>
-    <string name="settings_delay_duration_hint">משך הזמן (בשניות)</string>
-    <string name="blocking_title">חסימה</string>
-    <string name="blocking_drop_title">השמטת הודעות</string>
-    <string name="blocking_drop_summary">להשמיט הודעות נכנסות משולחים חסומים במקום להסתיר אותן</string>
-    <string name="blocking_conversations">התכתבויות חסומות</string>
-    <string name="blocking_manager_title">מנהל חסימות</string>
-    <string name="blocking_manager_qksms_title">QKSMS</string>
-    <string name="blocking_manager_qksms_summary">תכונת חסימה מובנית בתוך QKSMS</string>
-    <string name="blocking_manager_call_control_summary">לסנן אוטומטית את השיחות וההודעות שלך במקום אחיד ונוח! Community IQ™‎ מאפשר לך להימנע מהודעות בלתי רצויות בזכות דיווחים על מפיצי ספאם מצד הקהילה</string>
-    <string name="blocking_manager_sia_summary">לסנן אוטומטית הודעות ממספרים בלתי רצויים על ידי שימוש ביישומון „Should I Answer” (שאענה)</string>
-    <string name="blocking_manager_copy_title">העתקת מספרים חסומים</string>
-    <string name="blocking_manager_copy_summary">להמשיך אל %s כדי להעתיק לכאן את המספרים שחסומים אצלך כרגע</string>
-    <string name="blocked_numbers_title">מספרים חסומים</string>
-    <string name="blocked_numbers_empty">המספרים שחסמת יופיעו כאן</string>
-    <string name="blocked_numbers_add_cd">חסימת מספר חדש</string>
-    <string name="blocked_numbers_dialog_title">חסימת הודעות מאת</string>
-    <string name="blocked_numbers_dialog_hint">מספר טלפון</string>
-    <string name="blocked_numbers_dialog_block">חסימה</string>
-    <string name="blocked_messages_title">הודעות חסומות</string>
-    <string name="blocked_messages_empty">ההודעות שנחסמו תופענה להלן</string>
-    <string name="blocking_block_title">חסימה</string>
-    <string name="blocking_unblock_title">שחרור</string>
-    <plurals name="blocking_block_external">
-        <item quantity="one">להמשיך אל %s ולחסום את המספר הזה</item>
-        <item quantity="two">להמשיך אל %s ולחסום את המספרים האלו</item>
-        <item quantity="many">להמשיך אל %s ולחסום את המספרים האלו</item>
-        <item quantity="other">להמשיך אל %s ולחסום את המספרים האלו</item>
-    </plurals>
-    <plurals name="blocking_unblock_external">
-        <item quantity="one">להמשיך אל %s ולאפשר את המספר הזה</item>
-        <item quantity="two">להמשיך אל %s ולאפשר את המספרים האלו</item>
-        <item quantity="many">להמשיך אל %s ולאפשר את המספרים האלו</item>
-        <item quantity="other">להמשיך אל %s ולאפשר את המספרים האלו</item>
-    </plurals>
-    <string name="about_title">על אודות</string>
-    <string name="about_version_title">גרסה</string>
-    <string name="about_developer_title">מפתח</string>
-    <string name="about_source_title">קוד מקור</string>
-    <string name="about_changelog_title">יומן שינויים</string>
-    <string name="about_contact_title">איש קשר</string>
-    <string name="about_license_title">רישיון</string>
-    <string name="about_copyright_title">זכויות יוצרים</string>
-    <string name="qksms_plus_description_title">לתמיכה בפיתוח, ניתן לשחרר את הכול</string>
-    <string name="qksms_plus_description_summary">באפשרותך להציל מפתח גווע ברעב עבור %s בלבד</string>
-    <!-- Substitutions are for price and currency. Ex: Lifetime upgrade for $1.99 USD -->
-    <string name="qksms_plus_upgrade">שדרוג לכל החיים תמורת %1$s %2$s</string>
-    <!-- Substitutions are for price and currency. Ex: Unlock + donate for $4.99 USD -->
-    <string name="qksms_plus_upgrade_donate">שחרור ותרומה תמורת %1$s %2$s</string>
-    <string name="qksms_plus_thanks_title">תודה לך על תמיכתך ב־QKSMS!</string>
-    <string name="qksms_plus_thanks_summary">כעת יש לך גישה לכל התכונות של QKSMS+‎</string>
-    <string name="qksms_plus_free_title">התכנית QKSMS+‎ מוגשת בחינם למשתמשי F-Droid! אם מעניין אותך לתמוך בפיתוח, אפשר להגיש תרומה.</string>
-    <string name="qksms_plus_donate">תרומה באמצעות PayPal</string>
-    <string name="qksms_plus_coming_soon">בקרוב</string>
-    <string name="qksms_plus_themes_title">ערכות עיצוב פרימיום</string>
-    <string name="qksms_plus_themes_summary">חשיפת צבעי ערכות עיצוב שאינן זמינות בערת הצבעים של עיצובי Material</string>
-    <string name="qksms_plus_emoji_title">אימוג׳י אוטומטי בהתאמה אישית</string>
-    <string name="qksms_plus_emoji_summary">יצירת קיצורי דרך מותאמים אישית לאימוג׳י</string>
-    <string name="qksms_plus_backup_title">גיבוי הודעות</string>
-    <string name="qksms_plus_backup_summary">גיבוי ההודעות שלך אוטומטית. לעולם לא תטריד אותך האפשרות שההיסטוריה שלך תלך לאיבוד עקב החלפת טלפונים או אבדן טלפון</string>
-    <string name="qksms_plus_scheduled_title">הודעות מתוזמנות</string>
-    <string name="qksms_plus_scheduled_summary">תזמון הודעות לשליחה אוטומטית במועדים שנקבעו מראש</string>
-    <string name="qksms_plus_delayed_title">שליחה מושהית</string>
-    <string name="qksms_plus_delayed_summary">להמתין מספר שניות בטרם שליחת ההודעה</string>
-    <string name="qksms_plus_night_title">מצב לילה אוטומטי</string>
-    <string name="qksms_plus_night_summary">הפעלת מצב לילה בהתאם לשעה ביום</string>
-    <string name="qksms_plus_blacklist_title">חסימה מתקדמת</string>
-    <string name="qksms_plus_blacklist_summary">חסימת הודעות שמכילות מילות מפתח או שהן תואמות לדפוס מסוים</string>
-    <string name="qksms_plus_forward_title">העברה אוטומטית</string>
-    <string name="qksms_plus_forward_summary">העברה אוטומטית של הודעות משולחים מסוימים</string>
-    <string name="qksms_plus_respond_title">תגובה אוטומטית</string>
-    <string name="qksms_plus_respond_summary">להגיב אוטומטית להודעות נכנסות עם תשובה שנכתבה מראש</string>
-    <string name="qksms_plus_more_title">עוד</string>
-    <string name="qksms_plus_more_summary">הפיתוח של QKSMS מתקיים בימים אלו והרכישה שלך תכלול את כל התכונות העתידיות של QKSMS+‎!</string>
-    <string name="widget_loading">בטעינה&#8230;</string>
-    <string name="widget_more">הצגת התכתבויות נוספות</string>
-    <string name="qkreply_menu_read">סימון כהודעה שנקראה</string>
-    <string name="qkreply_menu_call">להתקשר</string>
-    <string name="qkreply_menu_delete">מחיקה</string>
-    <string name="qkreply_menu_expand">להציג יותר</string>
-    <string name="qkreply_menu_collapse">להציג פחות</string>
-    <string name="qkreply_menu_view">פתיחת התכתבות</string>
-    <string name="theme_material">Material</string>
-    <string name="theme_hex">הקסה</string>
-    <string name="theme_apply">החלה</string>
-    <string-array name="notification_actions">
-        <item>ללא</item>
-        <item>לארכיון</item>
-        <item>מחיקה</item>
-        <item>חסימה</item>
-        <item>להתקשר</item>
-        <item>סימון כהודעה שנקראה</item>
-        <item>להשיב</item>
-    </string-array>
-    <string name="button_yes">כן</string>
-    <string name="button_continue">המשך</string>
-    <string name="button_cancel">ביטול</string>
-    <string name="button_delete">מחיקה</string>
-    <string name="button_save">שמירה</string>
-    <string name="button_stop">עצירה</string>
-    <string name="button_more">עוד</string>
-    <string name="button_set">הגדרה</string>
-    <string name="button_undo">ביטול</string>
-    <string name="toast_copied">הועתק</string>
-    <string name="toast_archived">התכתבות בארכיון</string>
-    <string name="toast_qksms_plus">עליך לשחרר את QKSMS+‎ כדי להשתמש בזה</string>
-    <plurals name="notification_new_messages">
-        <item quantity="one">הודעה חדשה</item>
-        <item quantity="two">%s הודעות חדשות</item>
-        <item quantity="many">%s הודעות חדשות</item>
-        <item quantity="other">%s הודעות חדשות</item>
-    </plurals>
-    <string name="notification_message_failed_title">הודעה לא נשלחה</string>
-    <string name="notification_message_failed_text">שליחת ההודעה אל %s נכשלה</string>
-    <string-array name="night_modes">
-        <item>מערכת</item>
-        <item>מושבת</item>
-        <item>תמיד מופעל</item>
-        <item>אוטומטי</item>
-    </string-array>
-    <string-array name="notification_preview_options">
-        <item>הצגת שם והודעה</item>
-        <item>הצגת שם</item>
-        <item>הסתרת תוכן</item>
-    </string-array>
-    <string-array name="text_sizes">
-        <item>קטן</item>
-        <item>רגיל</item>
-        <item>גדול</item>
-        <item>גדול יותר</item>
-    </string-array>
-    <string-array name="delayed_sending_labels">
-        <item>ללא השהיה</item>
-        <item>3 שניות</item>
-        <item>5 שניות</item>
-        <item>10 שניות</item>
-    </string-array>
-    <string-array name="mms_sizes">
-        <item>אוטומטי</item>
-        <item>100 ק״ב</item>
-        <item>200 ק״ב</item>
-        <item>300 ק״ב</item>
-        <item>600 ק״ב</item>
-        <item>1000 ק״ב</item>
-        <item>2000 ק״ב</item>
-        <item>ללא דחיסה</item>
-    </string-array>
-    <string-array name="qk_responses">
-        <item>בסדר</item>
-        <item>כבר אחזור אליך</item>
-        <item>בדרך</item>
-        <item>תודה רבה</item>
-        <item>נשמע טוב</item>
-        <item>מה קורה?</item>
-        <item>מוסכם</item>
-        <item>לא</item>
-        <item>אהבתי נתונה לך</item>
-        <item>סליחה</item>
-        <item>חחח</item>
-        <item>הכול בסדר</item>
-    </string-array>
-</resources>
+<?xml version="1.0" encoding="utf-8"?>
+<!--
+  ~ Copyright (C) 2019 Moez Bhatti <moez.bhatti@gmail.com>
+  ~
+  ~ This file is part of QKSMS.
+  ~
+  ~ QKSMS is free software: you can redistribute it and/or modify
+  ~ it under the terms of the GNU General Public License as published by
+  ~ the Free Software Foundation, either version 3 of the License, or
+  ~ (at your option) any later version.
+  ~
+  ~ QKSMS is distributed in the hope that it will be useful,
+  ~ but WITHOUT ANY WARRANTY; without even the implied warranty of
+  ~ MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+  ~ GNU General Public License for more details.
+  ~
+  ~ You should have received a copy of the GNU General Public License
+  ~ along with QKSMS.  If not, see <http://www.gnu.org/licenses/>.
+  -->
+<resources>
+    <string name="shortcut_compose_long_label">התכתבות חדשה</string>
+    <string name="shortcut_compose_short_label">כתיבה</string>
+    <string name="shortcut_compose_disabled_message">קיצור הדרך הושבת</string>
+    <string name="title_archived">בארכיון</string>
+    <string name="title_settings">הגדרות</string>
+    <string name="title_notification_prefs">התראות</string>
+    <string name="title_theme">ערכת עיצוב</string>
+    <string name="title_conversations">חיפוש בדואר הנכנס&#8230;</string>
+    <string name="title_compose">נא להקליד שם או מספר</string>
+    <string name="setup_skip">דילוג</string>
+    <string name="setup_next">המשך</string>
+    <string name="menu_add_person">להוסיף מישהו</string>
+    <string name="menu_call">התקשרות</string>
+    <string name="menu_info">פרטים</string>
+    <string name="menu_save">שמירה לגלריה</string>
+    <string name="menu_share">שיתוף</string>
+    <string name="main_drawer_open_cd">פתיחת מגירת ניווט</string>
+    <string name="main_title_selected">%d נבחרו</string>
+    <string name="main_menu_clear">פינוי</string>
+    <string name="main_menu_archive">לארכיון</string>
+    <string name="main_menu_unarchive">שליפה מהארכיון</string>
+    <string name="main_menu_delete">מחיקה</string>
+    <string name="main_menu_add_contact">הוספה לאנשי קשר</string>
+    <string name="main_menu_pin">הצמדה למעלה</string>
+    <string name="main_menu_unpin">שחרור הצמדה</string>
+    <string name="main_menu_read">סימון כהודעה שנקראה</string>
+    <string name="main_menu_unread">סימון כהודעה שלא נקראה</string>
+    <string name="main_menu_block">חסימה</string>
+    <string name="main_syncing">ההודעות מסונכרנות&#8230;</string>
+    <string name="main_sender_you">אני: %s</string>
+    <string name="main_draft">טיוטה</string>
+    <string name="main_message_results_title">תוצאות בהודעות</string>
+    <string name="main_message_results">%d הודעות</string>
+    <string name="inbox_empty_text">ההתכתבויות שלך תופענה כאן</string>
+    <string name="inbox_search_empty_text">אין תוצאות</string>
+    <string name="archived_empty_text">ההתכתבויות שהעברת לארכיון תופענה כאן</string>
+    <string name="main_fab_cd">התחלת התכתבות חדשה</string>
+    <string name="main_default_sms_title">להתאהב בהתמסררות</string>
+    <string name="main_default_sms_message">הגדרת QKSMS ליישומון המסרונים כבררת מחדל</string>
+    <string name="main_default_sms_change">החלפה</string>
+    <string name="main_permission_required">נדרשת הרשאה</string>
+    <string name="main_permission_sms">ל־QKSMS נדרשות הרשאות כדי לשלוח ולצפות במסרונים</string>
+    <string name="main_permission_contacts">ל־QKSMS נדרשות הרשאות כדי לצפות באנשי הקשר שלך</string>
+    <string name="main_permission_allow">לאפשר</string>
+    <string name="drawer_inbox">דואר נכנס</string>
+    <string name="drawer_archived">בארכיון</string>
+    <string name="drawer_scheduled">בתזמון</string>
+    <string name="drawer_blocking">חסימה</string>
+    <string name="drawer_more">עוד</string>
+    <string name="drawer_settings">הגדרות</string>
+    <string name="drawer_help">עזרה ומשוב</string>
+    <string name="drawer_invite">הזמנת חברים</string>
+    <string name="drawer_plus_banner_summary">לחשוף תכונות מדהימות ולתמוך בפיתוח</string>
+    <string name="rate_title">QKSMS נושא חן בעיניך?</string>
+    <string name="rate_summary">נשמח לקבל ממך דירוג ב־Google Play!</string>
+    <string name="rate_okay">כמובן!</string>
+    <string name="rate_dismiss">התעלמות</string>
+    <string name="dialog_delete_title">מחיקה</string>
+    <plurals name="dialog_delete_message">
+        <item quantity="one">למחוק את ההתכתבות הזאת?</item>
+        <item quantity="two">למחוק את %d ההתכתבויות האלה?</item>
+        <item quantity="many">למחוק את %d ההתכתבויות האלה?</item>
+        <item quantity="other">למחוק את %d ההתכתבויות האלה?</item>
+    </plurals>
+    <string-array name="message_options">
+        <item>העתקת טקסט</item>
+        <item>העברה</item>
+        <item>מחיקה</item>
+    </string-array>
+    <string name="compose_number_picker_title">נא לבחור מספר טלפון</string>
+    <string name="compose_number_picker_default">%s ∙ בררת מחדל</string>
+    <string name="compose_number_picker_once">פעם אחד בלבד</string>
+    <string name="compose_number_picker_always">תמיד</string>
+    <string name="compose_title_selected">%d נבחרו</string>
+    <string name="compose_subtitle_results">%1$d מתוך %2$d תוצאות</string>
+    <string name="compose_send_group_title">שליחה כהודעה קבוצתית</string>
+    <string name="compose_send_group_summary">הנמענים והתגובות יהיו חשופים בפני כולם</string>
+    <string name="compose_messages_empty">זאת תחילת ההתכתבות שלך. כדאי לפתוח במשהו נחמד!</string>
+    <string name="compose_vcard_label">כרטיס קשר</string>
+    <string name="compose_scheduled_for">מתוזמן למועד</string>
+    <string name="compose_scheduled_future">הזמן הנבחר חייב להיות בעתיד!</string>
+    <string name="compose_scheduled_plus">עליך לשחרר את QKSMS+‎ כדי להשתמש בהודעות מתוזמנות</string>
+    <string name="compose_scheduled_toast">הוספה להודעות המתוזמנות</string>
+    <string name="compose_hint">כתיבת הודעה&#8230;</string>
+    <string name="compose_menu_copy">העתקת טקסט</string>
+    <string name="compose_menu_forward">העברה</string>
+    <string name="compose_menu_delete">מחיקה</string>
+    <string name="compose_menu_previous">הקודמת</string>
+    <string name="compose_menu_next">הבאה</string>
+    <string name="compose_menu_clear">פינוי</string>
+    <string name="compose_details_title">פרטי הודעה</string>
+    <string name="compose_details_type">סוג: %s</string>
+    <string name="compose_details_from">מאת: %s</string>
+    <string name="compose_details_to">אל: %s</string>
+    <string name="compose_details_subject">נושא: %s</string>
+    <string name="compose_details_priority">עדיפות: %s</string>
+    <string name="compose_details_size">גודל: %s</string>
+    <string name="compose_details_sent">שליחה: %s</string>
+    <string name="compose_details_received">קבלה: %s</string>
+    <string name="compose_details_delivered">מסירה: %s</string>
+    <string name="compose_details_error_code">קוד שגיאה: %d</string>
+    <string name="compose_attach_cd">הוספת קובץ מצורף</string>
+    <string name="compose_gallery_cd">צירוף תמונה</string>
+    <string name="compose_camera_cd">צילום תמונה</string>
+    <string name="compose_schedule_cd">תזמון הודעה</string>
+    <string name="compose_contact_cd">צירוף איש קשר</string>
+    <string name="compose_contact_error">שגיאה בקריאת איש קשר</string>
+    <!-- Example: SIM 1 (Verizon) selected-->
+    <string name="compose_sim_changed_toast">נבחר SIM מס׳ %1$d ‏(%2$s)</string>
+    <string name="compose_sim_cd">%s נבחרו, החלפת כרטיס SIM</string>
+    <string name="compose_send_cd">שליחת הודעה</string>
+    <string name="message_status_sending">מתבצעת שליחה&#8230;</string>
+    <string name="message_status_delivered">%s נמסרה</string>
+    <string name="message_status_failed">השליחה נכשלה. נא לגעת כדי לנסות שוב</string>
+    <string name="info_title">פרטים</string>
+    <string name="info_copied_address">הכתובת הועתקה</string>
+    <string name="info_name">כותרת התכתבות</string>
+    <string name="info_notifications">התראות</string>
+    <string name="info_theme">ערכת עיצוב</string>
+    <string name="info_archive">העברה לארכיון</string>
+    <string name="info_unarchive">הוצאה מארכיון</string>
+    <string name="info_block">חסימה</string>
+    <string name="info_unblock">שחרור חסימה</string>
+    <string name="info_delete">מחיקת התכתבות</string>
+    <string name="gallery_error">לא ניתן לטעון מדיה</string>
+    <string name="gallery_toast_saved">נשמר לגלריה</string>
+    <string name="backup_title">גיבוי ושחזור</string>
+    <string name="backup_backing_up">ההודעות מגובות</string>
+    <string name="backup_restoring">מתבצע שחזור מגיבוי</string>
+    <string name="backup_last">גיבוי אחרון</string>
+    <string name="backup_loading">בטעינה&#8230;</string>
+    <string name="backup_never">מעולם לא</string>
+    <string name="backup_restore_title">שחזור</string>
+    <string name="backup_restore_summary">בחירת גיבוי</string>
+    <string name="backup_restore_error_plus">נא לשחרר את QKSMS+‎ כדי להשתמש בגיבוי ובשחזור</string>
+    <string name="backup_restore_error_backup">מתבצע גיבוי&#8230;</string>
+    <string name="backup_restore_error_restore">מתבצע שחזור&#8230;</string>
+    <string name="backup_restore_confirm_title">שחזור מגיבוי</string>
+    <string name="backup_restore_confirm_message">לשחזר את ההודעות שלך מהגיבוי הזה?</string>
+    <string name="backup_restore_stop_title">עצירת השחזור</string>
+    <string name="backup_restore_stop_message">הודעות שכבר שוחזרו יישארו במכשיר שלך</string>
+    <string name="backup_restore_dialog_title">גיבויים</string>
+    <string name="backup_restore_dialog_empty">לא נמצאו גיבויים</string>
+    <plurals name="backup_message_count">
+        <item quantity="one">הודעה אחת</item>
+        <item quantity="two">שתי הודעות</item>
+        <item quantity="many">%d הודעות</item>
+        <item quantity="other">%d הודעות</item>
+    </plurals>
+    <string name="backup_disclaimer">נכון לעכשיו, קיימת תמיכה בהודעות מסוג SMS בתכונת הגיבוי והשחזור. תמיכה ב־MMS וגיבויים מתוזמנים יגיעו בעתיד הקרוב!</string>
+    <string name="backup_now">לגבות כעת</string>
+    <string name="backup_progress_parsing">הגיבוי מפוענח&#8230;</string>
+    <string name="backup_progress_running">%d/%d הודעות</string>
+    <string name="backup_progress_saving">הגיבוי נשמר&#8230;</string>
+    <string name="backup_progress_syncing">ההודעות מסונכרנות&#8230;</string>
+    <string name="backup_progress_finished">הסתיים!</string>
+    <string name="backup_notification_channel_name">גיבוי ושחזור</string>
+    <string name="scheduled_title">מתוזמנת</string>
+    <string name="scheduled_empty_description">שליחת הודעה אוטומטית, ברגע המדויק שמתאים לך</string>
+    <string name="scheduled_empty_message_1">היי! מתי יום ההולדת שלך שוב?</string>
+    <string name="scheduled_empty_message_2">ב־23 בדצמבר</string>
+    <string name="scheduled_empty_message_3">מזל טוב! תראה איך החברות בינינו פורחת, זכרתי את יום ההולדת שלך</string>
+    <!--&#x200A; is a special character required at the end of this string to fix it's formatting in the app -->
+    <string name="scheduled_empty_message_3_timestamp">לשליחה ב־23 בדצמבר</string>
+    <string name="scheduled_compose_cd">תזמון הודעה</string>
+    <string name="scheduled_options_title">הודעה מתוזמנת</string>
+    <string-array name="scheduled_options">
+        <item>לשלוח כע</item>
+        <item>העתקת טקסט</item>
+        <item>מחיקה</item>
+    </string-array>
+    <string name="settings_category_appearance">מראה</string>
+    <string name="settings_category_general">כללי</string>
+    <string name="settings_category_qkreply">תגובה מהירה</string>
+    <string name="settings_theme_title">ערכת עיצוב</string>
+    <string name="settings_night_title">מצב לילה</string>
+    <string name="settings_black_title">מצב לילה שחור טהור</string>
+    <string name="settings_night_start_title">זמן התחלה</string>
+    <string name="settings_night_end_title">זמן סיום</string>
+    <string name="settings_automatic_colors_title">צבעים אוטומטיים לאנשי קשר</string>
+    <string name="settings_text_size_title">גודל גופן</string>
+    <string name="settings_system_font_title">שימוש בגופן המערכת</string>
+    <string name="settings_auto_emoji_title">אימוג׳י אוטומטי</string>
+    <string name="settings_notifications_title">התראות</string>
+    <string name="settings_notifications_o_summary">יש לגעת כדי להתאים אישית</string>
+    <string name="settings_notification_actions_title">פעולות</string>
+    <string name="settings_notification_action_1">כפתור 1</string>
+    <string name="settings_notification_action_2">כפתור 2</string>
+    <string name="settings_notification_action_3">כפתור 3</string>
+    <string name="settings_notification_previews_title">תצוגות מקדימות של התראות</string>
+    <string name="settings_notification_wake_title">הפעלת המסך</string>
+    <string name="settings_vibration_title">רטט</string>
+    <string name="settings_ringtone_title">צליל</string>
+    <string name="settings_ringtone_none">ללא</string>
+    <string name="settings_qkreply_title">תגובה מהירה</string>
+    <string name="settings_qkreply_summary">חלונית קופצת להודעות חדשות</string>
+    <string name="settings_qkreply_tap_dismiss_title">יש לגעת כדי להתעלם</string>
+    <string name="settings_qkreply_tap_dismiss_summary">יש לגעת מחוץ לחלונית הקופצת כדי לסגור אותה</string>
+    <string name="settings_delayed_title">שליחה בעיכוב</string>
+    <string name="settings_swipe_actions">פעולות גרירה</string>
+    <string name="settings_swipe_actions_summary">להגדיר פעולות גרירה להתכתבויות</string>
+    <string name="settings_swipe_actions_right">גרירה ימינה</string>
+    <string name="settings_swipe_actions_left">גרירה שמאלה</string>
+    <string name="settings_swipe_actions_change">החלפה</string>
+    <string-array name="settings_swipe_actions">
+        <item>ללא</item>
+        <item>לארכיון</item>
+        <item>מחיקה</item>
+        <item>חסימה</item>
+        <item>להתקשר</item>
+        <item>סימון כהודעה שנקראה</item>
+        <item>סימון כהודעה שלא נקראה</item>
+    </string-array>
+    <string name="settings_delivery_title">אישור מסירה</string>
+    <string name="settings_delivery_summary">אישור שההודעות נשלחו בהצלחה</string>
+    <string name="settings_signature_title">חתימה</string>
+    <string name="settings_signature_summary">הוספת חתימה לסוף ההודעות שלך</string>
+    <string name="settings_unicode_title">סינון סימנים דיאקריטיים</string>
+    <string name="settings_unicode_summary">הסרת סימנים דיאקריטיים מתווים במסרונים יוצאים</string>
+    <string name="settings_mobile_title">מספרי ניידים בלבד</string>
+    <string name="settings_mobile_summary">בעת כתיבת הודעה, להציג רק מספרי טלפון של ניידים</string>
+    <string name="settings_auto_delete">למחוק הודעות ישנות אוטומטית</string>
+    <string name="settings_auto_delete_dialog_message">הודעות תימחקנה לאחר כמות מסוימת של ימים</string>
+    <string name="settings_auto_delete_dialog_hint">מספר הימים</string>
+    <string name="settings_auto_delete_never">אף פעם</string>
+    <string name="settings_auto_delete_warning">למחוק הודעות ישנות אוטומטית?</string>
+    <string name="settings_auto_delete_warning_message">המשך הפעולה יוביל למחיקת %1$d הודעות כעת</string>
+    <plurals name="settings_auto_delete_summary">
+        <item quantity="one">לאחר יום</item>
+        <item quantity="two">לאחר יומיים</item>
+        <item quantity="many">לאחר %d ימים</item>
+        <item quantity="other">לאחר %d ימים</item>
+    </plurals>
+    <string name="settings_long_as_mms_title">לשלוח הודעות ארוכות כ־MMS</string>
+    <string name="settings_long_as_mms_summary">אם יש לך בעיה בשליחת הודעות טקסט ארוכות יותר או בעיה ברצף שליחת ההודעה, ניתן לשלוח כהודעת MMS במקום. עלול לגרור עלויות נוספות</string>
+    <string name="settings_mms_size_title">דחיסה אוטומטית של קבצים מצורפים להודעות MMS</string>
+    <string name="settings_sync_title">סנכרון הודעות</string>
+    <string name="settings_sync_summary">סנכרון ההודעות שלך מחדש עם מסד הנתונים המובנה של Android</string>
+    <string name="settings_about_title">על אודות QKSMS</string>
+    <string name="settings_version">גרסה %s</string>
+    <string name="settings_logging_enabled">תיעוד ניפוי שגיאות פעיל</string>
+    <string name="settings_logging_disabled">תיעוד ניפוי שגיאות כבוי</string>
+    <string name="settings_delay_duration_hint">משך הזמן (בשניות)</string>
+    <string name="blocking_title">חסימה</string>
+    <string name="blocking_drop_title">השמטת הודעות</string>
+    <string name="blocking_drop_summary">להשמיט הודעות נכנסות משולחים חסומים במקום להסתיר אותן</string>
+    <string name="blocking_conversations">התכתבויות חסומות</string>
+    <string name="blocking_manager_title">מנהל חסימות</string>
+    <string name="blocking_manager_qksms_title">QKSMS</string>
+    <string name="blocking_manager_qksms_summary">תכונת חסימה מובנית בתוך QKSMS</string>
+    <string name="blocking_manager_call_control_summary">לסנן אוטומטית את השיחות וההודעות שלך במקום אחיד ונוח! Community IQ™‎ מאפשר לך להימנע מהודעות בלתי רצויות בזכות דיווחים על מפיצי ספאם מצד הקהילה</string>
+    <string name="blocking_manager_sia_summary">לסנן אוטומטית הודעות ממספרים בלתי רצויים על ידי שימוש ביישומון „Should I Answer” (שאענה)</string>
+    <string name="blocking_manager_copy_title">העתקת מספרים חסומים</string>
+    <string name="blocking_manager_copy_summary">להמשיך אל %s כדי להעתיק לכאן את המספרים שחסומים אצלך כרגע</string>
+    <string name="blocked_numbers_title">מספרים חסומים</string>
+    <string name="blocked_numbers_empty">המספרים שחסמת יופיעו כאן</string>
+    <string name="blocked_numbers_add_cd">חסימת מספר חדש</string>
+    <string name="blocked_numbers_dialog_title">חסימת הודעות מאת</string>
+    <string name="blocked_numbers_dialog_hint">מספר טלפון</string>
+    <string name="blocked_numbers_dialog_block">חסימה</string>
+    <string name="blocked_messages_title">הודעות חסומות</string>
+    <string name="blocked_messages_empty">ההודעות שנחסמו תופענה להלן</string>
+    <string name="blocking_block_title">חסימה</string>
+    <string name="blocking_unblock_title">שחרור</string>
+    <plurals name="blocking_block_external">
+        <item quantity="one">להמשיך אל %s ולחסום את המספר הזה</item>
+        <item quantity="two">להמשיך אל %s ולחסום את המספרים האלו</item>
+        <item quantity="many">להמשיך אל %s ולחסום את המספרים האלו</item>
+        <item quantity="other">להמשיך אל %s ולחסום את המספרים האלו</item>
+    </plurals>
+    <plurals name="blocking_unblock_external">
+        <item quantity="one">להמשיך אל %s ולאפשר את המספר הזה</item>
+        <item quantity="two">להמשיך אל %s ולאפשר את המספרים האלו</item>
+        <item quantity="many">להמשיך אל %s ולאפשר את המספרים האלו</item>
+        <item quantity="other">להמשיך אל %s ולאפשר את המספרים האלו</item>
+    </plurals>
+    <string name="about_title">על אודות</string>
+    <string name="about_version_title">גרסה</string>
+    <string name="about_developer_title">מפתח</string>
+    <string name="about_source_title">קוד מקור</string>
+    <string name="about_changelog_title">יומן שינויים</string>
+    <string name="about_contact_title">איש קשר</string>
+    <string name="about_license_title">רישיון</string>
+    <string name="about_copyright_title">זכויות יוצרים</string>
+    <string name="qksms_plus_description_title">לתמיכה בפיתוח, ניתן לשחרר את הכול</string>
+    <string name="qksms_plus_description_summary">באפשרותך להציל מפתח גווע ברעב עבור %s בלבד</string>
+    <!-- Substitutions are for price and currency. Ex: Lifetime upgrade for $1.99 USD -->
+    <string name="qksms_plus_upgrade">שדרוג לכל החיים תמורת %1$s %2$s</string>
+    <!-- Substitutions are for price and currency. Ex: Unlock + donate for $4.99 USD -->
+    <string name="qksms_plus_upgrade_donate">שחרור ותרומה תמורת %1$s %2$s</string>
+    <string name="qksms_plus_thanks_title">תודה לך על תמיכתך ב־QKSMS!</string>
+    <string name="qksms_plus_thanks_summary">כעת יש לך גישה לכל התכונות של QKSMS+‎</string>
+    <string name="qksms_plus_free_title">התכנית QKSMS+‎ מוגשת בחינם למשתמשי F-Droid! אם מעניין אותך לתמוך בפיתוח, אפשר להגיש תרומה.</string>
+    <string name="qksms_plus_donate">תרומה באמצעות PayPal</string>
+    <string name="qksms_plus_coming_soon">בקרוב</string>
+    <string name="qksms_plus_themes_title">ערכות עיצוב פרימיום</string>
+    <string name="qksms_plus_themes_summary">חשיפת צבעי ערכות עיצוב שאינן זמינות בערת הצבעים של עיצובי Material</string>
+    <string name="qksms_plus_emoji_title">אימוג׳י אוטומטי בהתאמה אישית</string>
+    <string name="qksms_plus_emoji_summary">יצירת קיצורי דרך מותאמים אישית לאימוג׳י</string>
+    <string name="qksms_plus_backup_title">גיבוי הודעות</string>
+    <string name="qksms_plus_backup_summary">גיבוי ההודעות שלך אוטומטית. לעולם לא תטריד אותך האפשרות שההיסטוריה שלך תלך לאיבוד עקב החלפת טלפונים או אבדן טלפון</string>
+    <string name="qksms_plus_scheduled_title">הודעות מתוזמנות</string>
+    <string name="qksms_plus_scheduled_summary">תזמון הודעות לשליחה אוטומטית במועדים שנקבעו מראש</string>
+    <string name="qksms_plus_delayed_title">שליחה מושהית</string>
+    <string name="qksms_plus_delayed_summary">להמתין מספר שניות בטרם שליחת ההודעה</string>
+    <string name="qksms_plus_night_title">מצב לילה אוטומטי</string>
+    <string name="qksms_plus_night_summary">הפעלת מצב לילה בהתאם לשעה ביום</string>
+    <string name="qksms_plus_blacklist_title">חסימה מתקדמת</string>
+    <string name="qksms_plus_blacklist_summary">חסימת הודעות שמכילות מילות מפתח או שהן תואמות לדפוס מסוים</string>
+    <string name="qksms_plus_forward_title">העברה אוטומטית</string>
+    <string name="qksms_plus_forward_summary">העברה אוטומטית של הודעות משולחים מסוימים</string>
+    <string name="qksms_plus_respond_title">תגובה אוטומטית</string>
+    <string name="qksms_plus_respond_summary">להגיב אוטומטית להודעות נכנסות עם תשובה שנכתבה מראש</string>
+    <string name="qksms_plus_more_title">עוד</string>
+    <string name="qksms_plus_more_summary">הפיתוח של QKSMS מתקיים בימים אלו והרכישה שלך תכלול את כל התכונות העתידיות של QKSMS+‎!</string>
+    <string name="widget_loading">בטעינה&#8230;</string>
+    <string name="widget_more">הצגת התכתבויות נוספות</string>
+    <string name="qkreply_menu_read">סימון כהודעה שנקראה</string>
+    <string name="qkreply_menu_call">להתקשר</string>
+    <string name="qkreply_menu_delete">מחיקה</string>
+    <string name="qkreply_menu_expand">להציג יותר</string>
+    <string name="qkreply_menu_collapse">להציג פחות</string>
+    <string name="qkreply_menu_view">פתיחת התכתבות</string>
+    <string name="theme_material">Material</string>
+    <string name="theme_hex">הקסה</string>
+    <string name="theme_apply">החלה</string>
+    <string-array name="notification_actions">
+        <item>ללא</item>
+        <item>לארכיון</item>
+        <item>מחיקה</item>
+        <item>חסימה</item>
+        <item>להתקשר</item>
+        <item>סימון כהודעה שנקראה</item>
+        <item>להשיב</item>
+    </string-array>
+    <string name="button_yes">כן</string>
+    <string name="button_continue">המשך</string>
+    <string name="button_cancel">ביטול</string>
+    <string name="button_delete">מחיקה</string>
+    <string name="button_save">שמירה</string>
+    <string name="button_stop">עצירה</string>
+    <string name="button_more">עוד</string>
+    <string name="button_set">הגדרה</string>
+    <string name="button_undo">ביטול</string>
+    <string name="toast_copied">הועתק</string>
+    <string name="toast_archived">התכתבות בארכיון</string>
+    <string name="toast_qksms_plus">עליך לשחרר את QKSMS+‎ כדי להשתמש בזה</string>
+    <plurals name="notification_new_messages">
+        <item quantity="one">הודעה חדשה</item>
+        <item quantity="two">%s הודעות חדשות</item>
+        <item quantity="many">%s הודעות חדשות</item>
+        <item quantity="other">%s הודעות חדשות</item>
+    </plurals>
+    <string name="notification_message_failed_title">הודעה לא נשלחה</string>
+    <string name="notification_message_failed_text">שליחת ההודעה אל %s נכשלה</string>
+    <string-array name="night_modes">
+        <item>מערכת</item>
+        <item>מושבת</item>
+        <item>תמיד מופעל</item>
+        <item>אוטומטי</item>
+    </string-array>
+    <string-array name="notification_preview_options">
+        <item>הצגת שם והודעה</item>
+        <item>הצגת שם</item>
+        <item>הסתרת תוכן</item>
+    </string-array>
+    <string-array name="text_sizes">
+        <item>קטן</item>
+        <item>רגיל</item>
+        <item>גדול</item>
+        <item>גדול יותר</item>
+    </string-array>
+    <string-array name="delayed_sending_labels">
+        <item>ללא השהיה</item>
+        <item>3 שניות</item>
+        <item>5 שניות</item>
+        <item>10 שניות</item>
+    </string-array>
+    <string-array name="mms_sizes">
+        <item>אוטומטי</item>
+        <item>100 ק״ב</item>
+        <item>200 ק״ב</item>
+        <item>300 ק״ב</item>
+        <item>600 ק״ב</item>
+        <item>1000 ק״ב</item>
+        <item>2000 ק״ב</item>
+        <item>ללא דחיסה</item>
+    </string-array>
+    <string-array name="qk_responses">
+        <item>בסדר</item>
+        <item>כבר אחזור אליך</item>
+        <item>בדרך</item>
+        <item>תודה רבה</item>
+        <item>נשמע טוב</item>
+        <item>מה קורה?</item>
+        <item>מוסכם</item>
+        <item>לא</item>
+        <item>אהבתי נתונה לך</item>
+        <item>סליחה</item>
+        <item>חחח</item>
+        <item>הכול בסדר</item>
+    </string-array>
+</resources>
diff --git a/presentation/src/main/res/values-ja/strings.xml b/presentation/src/main/res/values-ja/strings.xml
index b277ee049..db49dd1d0 100644
--- a/presentation/src/main/res/values-ja/strings.xml
+++ b/presentation/src/main/res/values-ja/strings.xml
@@ -1,405 +1,405 @@
-<?xml version="1.0" encoding="utf-8"?>
-<!--
-  ~ Copyright (C) 2019 Moez Bhatti <moez.bhatti@gmail.com>
-  ~
-  ~ This file is part of QKSMS.
-  ~
-  ~ QKSMS is free software: you can redistribute it and/or modify
-  ~ it under the terms of the GNU General Public License as published by
-  ~ the Free Software Foundation, either version 3 of the License, or
-  ~ (at your option) any later version.
-  ~
-  ~ QKSMS is distributed in the hope that it will be useful,
-  ~ but WITHOUT ANY WARRANTY; without even the implied warranty of
-  ~ MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
-  ~ GNU General Public License for more details.
-  ~
-  ~ You should have received a copy of the GNU General Public License
-  ~ along with QKSMS.  If not, see <http://www.gnu.org/licenses/>.
-  -->
-<resources>
-    <string name="shortcut_compose_long_label">新しい会話</string>
-    <string name="shortcut_compose_short_label">メッセージを書く</string>
-    <string name="shortcut_compose_disabled_message">無効にするショートカット</string>
-    <string name="title_archived">アーカイブ済</string>
-    <string name="title_settings">設定</string>
-    <string name="title_notification_prefs">通知</string>
-    <string name="title_theme">テーマ</string>
-    <string name="title_conversations">受信トレイを検索&#8230;</string>
-    <string name="title_compose">作成</string>
-    <string name="setup_skip">スキップ</string>
-    <string name="setup_next">続行</string>
-    <string name="menu_add_person">人を追加</string>
-    <string name="menu_call">通話</string>
-    <string name="menu_info">詳細</string>
-    <string name="menu_save">ギャラリーに保存</string>
-    <string name="menu_share">共有</string>
-    <string name="main_drawer_open_cd">ナビゲーション引き出しを開く</string>
-    <string name="main_title_selected">%d 選択された</string>
-    <string name="main_menu_clear">消去しました</string>
-    <string name="main_menu_archive">アーカイブ</string>
-    <string name="main_menu_unarchive">アーカイブしない</string>
-    <string name="main_menu_delete">削除</string>
-    <string name="main_menu_add_contact">連絡先に追加</string>
-    <string name="main_menu_pin">上部に固定します。</string>
-    <string name="main_menu_unpin">固定を解除します。</string>
-    <string name="main_menu_read">既読にする</string>
-    <string name="main_menu_unread">未読にする</string>
-    <string name="main_menu_block">ブロック</string>
-    <string name="main_syncing">同期メッセージ&#8230;</string>
-    <string name="main_sender_you">あなた: %s</string>
-    <string name="main_draft">ドラフト</string>
-    <string name="main_message_results_title">メッセージの結果</string>
-    <string name="main_message_results">%d メッセージ</string>
-    <string name="inbox_empty_text">会話がここに表示されます</string>
-    <string name="inbox_search_empty_text">結果はありません</string>
-    <string name="archived_empty_text">保存した会話がここに表示されます</string>
-    <string name="main_fab_cd">新しい会話を開始します。</string>
-    <string name="main_default_sms_title">もう一度テキストメッセージが大好き</string>
-    <string name="main_default_sms_message">QKSMS を既定の SMS アプリに設定する</string>
-    <string name="main_default_sms_change">変更</string>
-    <string name="main_permission_required">必要なアクセス許可</string>
-    <string name="main_permission_sms">QKSMSはSMSメッセージを送信および表示する権限を必要とします</string>
-    <string name="main_permission_contacts">QKSMSはあなたの連絡先を閲覧する許可を必要とします</string>
-    <string name="main_permission_allow">許可する</string>
-    <string name="drawer_inbox">受信トレイ</string>
-    <string name="drawer_archived">アーカイブ済</string>
-    <string name="drawer_scheduled">スケジュール済</string>
-    <string name="drawer_blocking">ブロック</string>
-    <string name="drawer_more">もっと</string>
-    <string name="drawer_settings">設定</string>
-    <string name="drawer_help">ヘルプとフィードバック</string>
-    <string name="drawer_invite">友達を招待する</string>
-    <string name="drawer_plus_banner_summary">驚くべき新機能のロックを解除し、開発をサポート</string>
-    <string name="rate_title">QKSMS をお楽みいただいていますか?</string>
-    <string name="rate_summary">Google Play で愛を共有して私たちを評価してください!</string>
-    <string name="rate_okay">OK!</string>
-    <string name="rate_dismiss">免じる</string>
-    <string name="dialog_delete_title">削除</string>
-    <plurals name="dialog_delete_message">
-        <item quantity="other">%d の会話を削除するよろしいですか。</item>
-    </plurals>
-    <string-array name="message_options">
-        <item>テキストをコピー</item>
-        <item>転送</item>
-        <item>削除</item>
-    </string-array>
-    <string name="compose_number_picker_title">電話番号を選択</string>
-    <string name="compose_number_picker_default">%s ∙ デフォルト</string>
-    <string name="compose_number_picker_once">一回だけ</string>
-    <string name="compose_number_picker_always">常に</string>
-    <string name="compose_title_selected">%d件を選択中</string>
-    <string name="compose_subtitle_results">%2$d 結果の %1$d</string>
-    <string name="compose_send_group_title">グループ メッセージとして送信します。</string>
-    <string name="compose_send_group_summary">受信者と返信は全員に表示されます</string>
-    <string name="compose_messages_empty">これが会話の始まりです。 何か素敵なことを言ってください!</string>
-    <string name="compose_vcard_label">連絡先カード</string>
-    <string name="compose_scheduled_for">予定されている</string>
-    <string name="compose_scheduled_future">選択した時間は、将来的にする必要があります!</string>
-    <string name="compose_scheduled_plus">あなたのロックを解除する必要があります QKSMS + スケジュールされたメッセージングを使用するには</string>
-    <string name="compose_scheduled_toast">スケジュールされたメッセージに追加</string>
-    <string name="compose_hint">メッセージを書く&#8230;</string>
-    <string name="compose_menu_copy">テキストのコピー</string>
-    <string name="compose_menu_forward">転送</string>
-    <string name="compose_menu_delete">削除</string>
-    <string name="compose_menu_previous">前へ</string>
-    <string name="compose_menu_next">次へ</string>
-    <string name="compose_menu_clear">消去</string>
-    <string name="compose_details_title">メッセージの詳細</string>
-    <string name="compose_details_type">タイプ: %s</string>
-    <string name="compose_details_from">宛先: %s</string>
-    <string name="compose_details_to">宛先:%s</string>
-    <string name="compose_details_subject">件名: %s</string>
-    <string name="compose_details_priority">優先順位: %s</string>
-    <string name="compose_details_size">サイズ: %s</string>
-    <string name="compose_details_sent">送られた: %s</string>
-    <string name="compose_details_received">受け取った: %s</string>
-    <string name="compose_details_delivered">配達: %s</string>
-    <string name="compose_details_error_code">エラーコード:%d</string>
-    <string name="compose_attach_cd">添付ファイルを追加する</string>
-    <string name="compose_gallery_cd">写真を添付する</string>
-    <string name="compose_camera_cd">写真を撮る</string>
-    <string name="compose_schedule_cd">スケジュールメッセージ</string>
-    <string name="compose_contact_cd">連絡先を添付する</string>
-    <string name="compose_contact_error">連絡先の読み取りエラー</string>
-    <!-- Example: SIM 1 (Verizon) selected-->
-    <string name="compose_sim_changed_toast">SIM %1$d (%2$s) を選択しました</string>
-    <string name="compose_sim_cd">%s 選択、SIMカードを交換</string>
-    <string name="compose_send_cd">メッセージを送る</string>
-    <string name="message_status_sending">送信中&#8230;</string>
-    <string name="message_status_delivered">%s を配信しました</string>
-    <string name="message_status_failed">送信に失敗しました。タップすると、もう一度やり直します</string>
-    <string name="info_title">詳細</string>
-    <string name="info_copied_address">アドレスをコピーしました</string>
-    <string name="info_name">会話のタイトル</string>
-    <string name="info_notifications">通知</string>
-    <string name="info_theme">テーマ</string>
-    <string name="info_archive">アーカイブ</string>
-    <string name="info_unarchive">アーカイブ解除</string>
-    <string name="info_block">ブロック</string>
-    <string name="info_unblock">ブロックを解除</string>
-    <string name="info_delete">会話を削除</string>
-    <string name="gallery_error">メディアを読み込めませんでした</string>
-    <string name="gallery_toast_saved">ギャラリーに保存</string>
-    <string name="backup_title">バックアップと復元</string>
-    <string name="backup_backing_up">メッセージをバックアップする</string>
-    <string name="backup_restoring">バックアップからの復元</string>
-    <string name="backup_last">最後のバックアップ</string>
-    <string name="backup_loading">ロード中...</string>
-    <string name="backup_never">決して</string>
-    <string name="backup_restore_title">リストア</string>
-    <string name="backup_restore_summary">バックアップを選択</string>
-    <string name="backup_restore_error_plus">バックアップと復元を使用するにはQKSMS+のロックを解除してください</string>
-    <string name="backup_restore_error_backup">バックアップ中&#8230;</string>
-    <string name="backup_restore_error_restore">復元中&#8230;</string>
-    <string name="backup_restore_confirm_title">バックアップから復元</string>
-    <string name="backup_restore_confirm_message">このバックアップからメッセージを復元してもよろしいですか？</string>
-    <string name="backup_restore_stop_title">復元を停止する</string>
-    <string name="backup_restore_stop_message">既に復元されたメッセージはあなたのデバイスに残ります</string>
-    <string name="backup_restore_dialog_title">バックアップ</string>
-    <string name="backup_restore_dialog_empty">バックアップが見つかりません</string>
-    <plurals name="backup_message_count">
-        <item quantity="other">%d メッセージ</item>
-    </plurals>
-    <string name="backup_disclaimer">現在、SMSのみがバックアップと復元でサポートされています。 MMSのサポートと定期的なバックアップは近日中に開始されます。</string>
-    <string name="backup_now">今すぐバックアップ</string>
-    <string name="backup_progress_parsing">バックアップの解析中...</string>
-    <string name="backup_progress_running">%d/%dすべてのメッセージ</string>
-    <string name="backup_progress_saving">バックアップを保存しています...</string>
-    <string name="backup_progress_syncing">メッセージを同期しています...</string>
-    <string name="backup_progress_finished">終了しました。</string>
-    <string name="backup_notification_channel_name">バックアップと復元</string>
-    <string name="scheduled_title">予定</string>
-    <string name="scheduled_empty_description">希望する瞬間に自動的にメッセージを送信する</string>
-    <string name="scheduled_empty_message_1">ちょっと！あなたの誕生日はいつでしたか？</string>
-    <string name="scheduled_empty_message_2">12月23日です</string>
-    <string name="scheduled_empty_message_3">お誕生日おめでとうございます！ 私はあなたの誕生日を思い出して、何という素晴らしい友達なのか見て</string>
-    <!--&#x200A; is a special character required at the end of this string to fix it's formatting in the app -->
-    <string name="scheduled_empty_message_3_timestamp">12月23日に発送</string>
-    <string name="scheduled_compose_cd">メッセージをスケジュールする</string>
-    <string name="scheduled_options_title">スケジュールされたメッセージ</string>
-    <string-array name="scheduled_options">
-        <item>今すぐ送る</item>
-        <item>テキストをコピー</item>
-        <item>削除</item>
-    </string-array>
-    <string name="settings_category_appearance">外観</string>
-    <string name="settings_category_general">全般</string>
-    <string name="settings_category_qkreply">QK 返信</string>
-    <string name="settings_theme_title">テーマ</string>
-    <string name="settings_night_title">夜間モード</string>
-    <string name="settings_black_title">ピュアブラック夜間モード</string>
-    <string name="settings_night_start_title">開始時刻</string>
-    <string name="settings_night_end_title">終了時刻</string>
-    <string name="settings_automatic_colors_title">自動的に連絡先に色をつける</string>
-    <string name="settings_text_size_title">フォントサイズ</string>
-    <string name="settings_system_font_title">システムフォントを使用する</string>
-    <string name="settings_auto_emoji_title">自動絵文字</string>
-    <string name="settings_notifications_title">通知</string>
-    <string name="settings_notifications_o_summary">カスタマイズするためにタップ</string>
-    <string name="settings_notification_actions_title">アクション</string>
-    <string name="settings_notification_action_1">ボタン 1</string>
-    <string name="settings_notification_action_2">ボタン 2</string>
-    <string name="settings_notification_action_3">ボタン 3</string>
-    <string name="settings_notification_previews_title">通知プレビュー</string>
-    <string name="settings_notification_wake_title">ウェイクスクリーン</string>
-    <string name="settings_vibration_title">振動</string>
-    <string name="settings_ringtone_title">サウンド</string>
-    <string name="settings_ringtone_none">無し</string>
-    <string name="settings_qkreply_title">QK 返信</string>
-    <string name="settings_qkreply_summary">新しいメッセージのポップアップ</string>
-    <string name="settings_qkreply_tap_dismiss_title">タップして閉じる</string>
-    <string name="settings_qkreply_tap_dismiss_summary">ポップアップの外側をタップすると閉じます</string>
-    <string name="settings_delayed_title">遅延送信</string>
-    <string name="settings_swipe_actions">スワイプアクション</string>
-    <string name="settings_swipe_actions_summary">会話のスワイプアクションを設定する</string>
-    <string name="settings_swipe_actions_right">右スワイプ</string>
-    <string name="settings_swipe_actions_left">左スワイプ</string>
-    <string name="settings_swipe_actions_change">変更</string>
-    <string-array name="settings_swipe_actions">
-        <item>無し</item>
-        <item>アーカイブ</item>
-        <item>削除</item>
-        <item>ブロック</item>
-        <item>通話</item>
-        <item>既読にする</item>
-        <item>未読にする</item>
-    </string-array>
-    <string name="settings_delivery_title">配信確認</string>
-    <string name="settings_delivery_summary">メッセージが正常に送信されたことを確認します</string>
-    <string name="settings_signature_title">署名</string>
-    <string name="settings_signature_summary">メッセージの最後に署名を追加します</string>
-    <string name="settings_unicode_title">アクセントの除去</string>
-    <string name="settings_unicode_summary">送信する SMS メッセージの文字からアクセントを削除します</string>
-    <string name="settings_mobile_title">携帯電話番号のみ</string>
-    <string name="settings_mobile_summary">メッセージを作成するときは、携帯電話番号のみを表示します</string>
-    <string name="settings_auto_delete">古いメッセージを自動的に削除</string>
-    <string name="settings_auto_delete_dialog_message">指定された日数の後にメッセージが削除されます</string>
-    <string name="settings_auto_delete_dialog_hint">日数</string>
-    <string name="settings_auto_delete_never">自動削除しない</string>
-    <string name="settings_auto_delete_warning">古いメッセージを自動的に削除しますか？</string>
-    <string name="settings_auto_delete_warning_message">続行すると、今すぐ %1$d 件のメッセージが削除されます</string>
-    <plurals name="settings_auto_delete_summary">
-        <item quantity="other">%d 日後</item>
-    </plurals>
-    <string name="settings_long_as_mms_title">長いメッセージをMMSとして送信する</string>
-    <string name="settings_long_as_mms_summary">長いテキストメッセージの送信が失敗する場合、または間違った順序で送信される場合は、代わりにMMSメッセージとして送信できます。 追加料金が適用される場合があります</string>
-    <string name="settings_mms_size_title">MMS添付ファイルの自動圧縮</string>
-    <string name="settings_sync_title">メッセージを同期</string>
-    <string name="settings_sync_summary">メッセージをネイティブの Android SMS データベースと再同期します</string>
-    <string name="settings_about_title">QKSMS について</string>
-    <string name="settings_version">バージョン %s</string>
-    <string name="settings_logging_enabled">デバッグログが有効</string>
-    <string name="settings_logging_disabled">デバッグログを無効にする</string>
-    <string name="settings_delay_duration_hint">期間を入力してください (秒)</string>
-    <string name="blocking_title">ブロック</string>
-    <string name="blocking_drop_title">メッセージをドロップ</string>
-    <string name="blocking_drop_summary">ブロックした送信者からの受信メッセージを非表示にする代わりにドロップします</string>
-    <string name="blocking_conversations">ブロックした会話</string>
-    <string name="blocking_manager_title">ブロッキングマネージャー</string>
-    <string name="blocking_manager_qksms_title">QKSMS</string>
-    <string name="blocking_manager_qksms_summary">QKSMS の内蔵ブロック機能</string>
-    <string name="blocking_manager_call_control_summary">一か所で便利に通話とメッセージを自動的にフィルタリングします! Community IQ™を使用すると、コミュニティで知られているスパマーからの不要なメッセージを防ぐことができます</string>
-    <string name="blocking_manager_sia_summary">\"Should I Answer\" アプリを使用して、迷惑な番号からのメッセージを自動的にフィルタします</string>
-    <string name="blocking_manager_copy_title">ブロックした番号をコピー</string>
-    <string name="blocking_manager_copy_summary">既存のブロックした番号のコピーを %s まで続けます</string>
-    <string name="blocked_numbers_title">ブロックした番号</string>
-    <string name="blocked_numbers_empty">ブロックした番号がここに表示されます</string>
-    <string name="blocked_numbers_add_cd">新しい番号をブロック</string>
-    <string name="blocked_numbers_dialog_title">次からのテキストをブロック</string>
-    <string name="blocked_numbers_dialog_hint">電話番号</string>
-    <string name="blocked_numbers_dialog_block">ブロック</string>
-    <string name="blocked_messages_title">ブロックしたメッセージ</string>
-    <string name="blocked_messages_empty">ブロックしたメッセージがここに表示されます</string>
-    <string name="blocking_block_title">ブロック</string>
-    <string name="blocking_unblock_title">ブロック解除</string>
-    <plurals name="blocking_block_external">
-        <item quantity="other">%s まで続けてこの番号をブロック</item>
-    </plurals>
-    <plurals name="blocking_unblock_external">
-        <item quantity="other">%s まで続けてこの番号を許可</item>
-    </plurals>
-    <string name="about_title">このアプリについて</string>
-    <string name="about_version_title">バージョン</string>
-    <string name="about_developer_title">開発者</string>
-    <string name="about_source_title">ソースコード</string>
-    <string name="about_changelog_title">更新履歴</string>
-    <string name="about_contact_title">お問い合わせ</string>
-    <string name="about_license_title">ライセンス</string>
-    <string name="about_copyright_title">著作権</string>
-    <string name="qksms_plus_description_title">開発をサポートして、すべてのロックを解除します</string>
-    <string name="qksms_plus_description_summary">ちょうど %s 人の飢えている開発者を助けることができます</string>
-    <!-- Substitutions are for price and currency. Ex: Lifetime upgrade for $1.99 USD -->
-    <string name="qksms_plus_upgrade">%1$s %2$s のライフタイムのアップグレード</string>
-    <!-- Substitutions are for price and currency. Ex: Unlock + donate for $4.99 USD -->
-    <string name="qksms_plus_upgrade_donate">%1$s %2$s のロック解除と寄付</string>
-    <string name="qksms_plus_thanks_title">QKSMS を支援いただきありがとうございます!</string>
-    <string name="qksms_plus_thanks_summary">QKSMS+ のすべての機能にアクセスできます</string>
-    <string name="qksms_plus_free_title">QKSMS+ は F-Droid ユーザーは無料です! 開発をサポートしたい場合は、気軽に寄付をしてください。</string>
-    <string name="qksms_plus_donate">PayPal で寄付する</string>
-    <string name="qksms_plus_coming_soon">近日登場</string>
-    <string name="qksms_plus_themes_title">プレミアムテーマ</string>
-    <string name="qksms_plus_themes_summary">マテリアルデザインパレットで利用できない美しいテーマカラーのロックを解除します</string>
-    <string name="qksms_plus_emoji_title">カスタム自動絵文字</string>
-    <string name="qksms_plus_emoji_summary">カスタム自動絵文字のショートカットを作成します</string>
-    <string name="qksms_plus_backup_title">メッセージのバックアップ</string>
-    <string name="qksms_plus_backup_summary">メッセージを自動的にバックアップします。携帯電話を変更したり、お使いの携帯電話をなくしても、もう二度と履歴がなくなる心配はいりません。</string>
-    <string name="qksms_plus_scheduled_title">スケジュールされたメッセージ</string>
-    <string name="qksms_plus_scheduled_summary">特定の日時に自動的に送信されるようにメッセージをスケジュールする</string>
-    <string name="qksms_plus_delayed_title">送信を遅らせる</string>
-    <string name="qksms_plus_delayed_summary">メッセージを送信する前に、数秒間待ちます</string>
-    <string name="qksms_plus_night_title">自動夜間モード</string>
-    <string name="qksms_plus_night_summary">時間に基づいて夜間モードを有効にします</string>
-    <string name="qksms_plus_blacklist_title">高度なブロック</string>
-    <string name="qksms_plus_blacklist_summary">キーワードを含む、またはパターンに一致するメッセージをブロックします</string>
-    <string name="qksms_plus_forward_title">自動転送</string>
-    <string name="qksms_plus_forward_summary">特定の送信者からのメッセージを自動的に転送します</string>
-    <string name="qksms_plus_respond_title">自動応答</string>
-    <string name="qksms_plus_respond_summary">あらかじめ設定された応答で、受信したメッセージに自動的に返信します</string>
-    <string name="qksms_plus_more_title">さらに</string>
-    <string name="qksms_plus_more_summary">QKMSは活発に開発中です、そして、あなたの購入はすべての将来のQKMS+機能を含みます！</string>
-    <string name="widget_loading">ロード中...</string>
-    <string name="widget_more">さらに会話を表示</string>
-    <string name="qkreply_menu_read">既読にする</string>
-    <string name="qkreply_menu_call">電話する</string>
-    <string name="qkreply_menu_delete">削除</string>
-    <string name="qkreply_menu_expand">もっと見せる</string>
-    <string name="qkreply_menu_collapse">少なく表示</string>
-    <string name="qkreply_menu_view">会話を開く</string>
-    <string name="theme_material">マテリアル</string>
-    <string name="theme_hex">16 進数</string>
-    <string name="theme_apply">適用</string>
-    <string-array name="notification_actions">
-        <item>無し</item>
-        <item>アーカイブ</item>
-        <item>削除</item>
-        <item>ブロック</item>
-        <item>通話</item>
-        <item>既読にする</item>
-        <item>返信</item>
-    </string-array>
-    <string name="button_yes">はい</string>
-    <string name="button_continue">続行</string>
-    <string name="button_cancel">キャンセル</string>
-    <string name="button_delete">削除</string>
-    <string name="button_save">保存する</string>
-    <string name="button_stop">やめる</string>
-    <string name="button_more">さらに</string>
-    <string name="button_set">据える</string>
-    <string name="button_undo">元に戻す</string>
-    <string name="toast_copied">コピーしました</string>
-    <string name="toast_archived">会話をアーカイブしました</string>
-    <string name="toast_qksms_plus">これを使用するには QKSMS+ のロックを解除する必要があります</string>
-    <plurals name="notification_new_messages">
-        <item quantity="other">%s 新着メッセージ</item>
-    </plurals>
-    <string name="notification_message_failed_title">メッセージは送信されませんでした</string>
-    <string name="notification_message_failed_text">%s へのメッセージの送信に失敗しました</string>
-    <string-array name="night_modes">
-        <item>システム</item>
-        <item>無効</item>
-        <item>常にON</item>
-        <item>自動</item>
-    </string-array>
-    <string-array name="notification_preview_options">
-        <item>名前とメッセージを表示</item>
-        <item>名前を表示</item>
-        <item>コンテンツを隠す</item>
-    </string-array>
-    <string-array name="text_sizes">
-        <item>小さい</item>
-        <item>普通の</item>
-        <item>大き</item>
-        <item>大きい</item>
-    </string-array>
-    <string-array name="delayed_sending_labels">
-        <item>遅延なし</item>
-        <item>3秒</item>
-        <item>5秒</item>
-        <item>10秒</item>
-    </string-array>
-    <string-array name="mms_sizes">
-        <item>自動</item>
-        <item>100KB</item>
-        <item>200KB</item>
-        <item>300KB</item>
-        <item>600KB</item>
-        <item>1000KB</item>
-        <item>2000KB</item>
-        <item>圧縮なし</item>
-    </string-array>
-    <string-array name="qk_responses">
-        <item>OK</item>
-        <item>しばらくお待ちください</item>
-        <item>今、途中です</item>
-        <item>ありがとう</item>
-        <item>良さそうですね</item>
-        <item>最近どうですか?</item>
-        <item>了解</item>
-        <item>いいえ</item>
-        <item>好きです</item>
-        <item>ごめんなさい</item>
-        <item>大爆笑です</item>
-        <item>いいんだよ</item>
-    </string-array>
-</resources>
+<?xml version="1.0" encoding="utf-8"?>
+<!--
+  ~ Copyright (C) 2019 Moez Bhatti <moez.bhatti@gmail.com>
+  ~
+  ~ This file is part of QKSMS.
+  ~
+  ~ QKSMS is free software: you can redistribute it and/or modify
+  ~ it under the terms of the GNU General Public License as published by
+  ~ the Free Software Foundation, either version 3 of the License, or
+  ~ (at your option) any later version.
+  ~
+  ~ QKSMS is distributed in the hope that it will be useful,
+  ~ but WITHOUT ANY WARRANTY; without even the implied warranty of
+  ~ MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+  ~ GNU General Public License for more details.
+  ~
+  ~ You should have received a copy of the GNU General Public License
+  ~ along with QKSMS.  If not, see <http://www.gnu.org/licenses/>.
+  -->
+<resources>
+    <string name="shortcut_compose_long_label">新しい会話</string>
+    <string name="shortcut_compose_short_label">メッセージを書く</string>
+    <string name="shortcut_compose_disabled_message">無効にするショートカット</string>
+    <string name="title_archived">アーカイブ済</string>
+    <string name="title_settings">設定</string>
+    <string name="title_notification_prefs">通知</string>
+    <string name="title_theme">テーマ</string>
+    <string name="title_conversations">受信トレイを検索&#8230;</string>
+    <string name="title_compose">作成</string>
+    <string name="setup_skip">スキップ</string>
+    <string name="setup_next">続行</string>
+    <string name="menu_add_person">人を追加</string>
+    <string name="menu_call">通話</string>
+    <string name="menu_info">詳細</string>
+    <string name="menu_save">ギャラリーに保存</string>
+    <string name="menu_share">共有</string>
+    <string name="main_drawer_open_cd">ナビゲーション引き出しを開く</string>
+    <string name="main_title_selected">%d 選択された</string>
+    <string name="main_menu_clear">消去しました</string>
+    <string name="main_menu_archive">アーカイブ</string>
+    <string name="main_menu_unarchive">アーカイブしない</string>
+    <string name="main_menu_delete">削除</string>
+    <string name="main_menu_add_contact">連絡先に追加</string>
+    <string name="main_menu_pin">上部に固定します。</string>
+    <string name="main_menu_unpin">固定を解除します。</string>
+    <string name="main_menu_read">既読にする</string>
+    <string name="main_menu_unread">未読にする</string>
+    <string name="main_menu_block">ブロック</string>
+    <string name="main_syncing">同期メッセージ&#8230;</string>
+    <string name="main_sender_you">あなた: %s</string>
+    <string name="main_draft">ドラフト</string>
+    <string name="main_message_results_title">メッセージの結果</string>
+    <string name="main_message_results">%d メッセージ</string>
+    <string name="inbox_empty_text">会話がここに表示されます</string>
+    <string name="inbox_search_empty_text">結果はありません</string>
+    <string name="archived_empty_text">保存した会話がここに表示されます</string>
+    <string name="main_fab_cd">新しい会話を開始します。</string>
+    <string name="main_default_sms_title">もう一度テキストメッセージが大好き</string>
+    <string name="main_default_sms_message">QKSMS を既定の SMS アプリに設定する</string>
+    <string name="main_default_sms_change">変更</string>
+    <string name="main_permission_required">必要なアクセス許可</string>
+    <string name="main_permission_sms">QKSMSはSMSメッセージを送信および表示する権限を必要とします</string>
+    <string name="main_permission_contacts">QKSMSはあなたの連絡先を閲覧する許可を必要とします</string>
+    <string name="main_permission_allow">許可する</string>
+    <string name="drawer_inbox">受信トレイ</string>
+    <string name="drawer_archived">アーカイブ済</string>
+    <string name="drawer_scheduled">スケジュール済</string>
+    <string name="drawer_blocking">ブロック</string>
+    <string name="drawer_more">もっと</string>
+    <string name="drawer_settings">設定</string>
+    <string name="drawer_help">ヘルプとフィードバック</string>
+    <string name="drawer_invite">友達を招待する</string>
+    <string name="drawer_plus_banner_summary">驚くべき新機能のロックを解除し、開発をサポート</string>
+    <string name="rate_title">QKSMS をお楽みいただいていますか?</string>
+    <string name="rate_summary">Google Play で愛を共有して私たちを評価してください!</string>
+    <string name="rate_okay">OK!</string>
+    <string name="rate_dismiss">免じる</string>
+    <string name="dialog_delete_title">削除</string>
+    <plurals name="dialog_delete_message">
+        <item quantity="other">%d の会話を削除するよろしいですか。</item>
+    </plurals>
+    <string-array name="message_options">
+        <item>テキストをコピー</item>
+        <item>転送</item>
+        <item>削除</item>
+    </string-array>
+    <string name="compose_number_picker_title">電話番号を選択</string>
+    <string name="compose_number_picker_default">%s ∙ デフォルト</string>
+    <string name="compose_number_picker_once">一回だけ</string>
+    <string name="compose_number_picker_always">常に</string>
+    <string name="compose_title_selected">%d件を選択中</string>
+    <string name="compose_subtitle_results">%2$d 結果の %1$d</string>
+    <string name="compose_send_group_title">グループ メッセージとして送信します。</string>
+    <string name="compose_send_group_summary">受信者と返信は全員に表示されます</string>
+    <string name="compose_messages_empty">これが会話の始まりです。 何か素敵なことを言ってください!</string>
+    <string name="compose_vcard_label">連絡先カード</string>
+    <string name="compose_scheduled_for">予定されている</string>
+    <string name="compose_scheduled_future">選択した時間は、将来的にする必要があります!</string>
+    <string name="compose_scheduled_plus">あなたのロックを解除する必要があります QKSMS + スケジュールされたメッセージングを使用するには</string>
+    <string name="compose_scheduled_toast">スケジュールされたメッセージに追加</string>
+    <string name="compose_hint">メッセージを書く&#8230;</string>
+    <string name="compose_menu_copy">テキストのコピー</string>
+    <string name="compose_menu_forward">転送</string>
+    <string name="compose_menu_delete">削除</string>
+    <string name="compose_menu_previous">前へ</string>
+    <string name="compose_menu_next">次へ</string>
+    <string name="compose_menu_clear">消去</string>
+    <string name="compose_details_title">メッセージの詳細</string>
+    <string name="compose_details_type">タイプ: %s</string>
+    <string name="compose_details_from">宛先: %s</string>
+    <string name="compose_details_to">宛先:%s</string>
+    <string name="compose_details_subject">件名: %s</string>
+    <string name="compose_details_priority">優先順位: %s</string>
+    <string name="compose_details_size">サイズ: %s</string>
+    <string name="compose_details_sent">送られた: %s</string>
+    <string name="compose_details_received">受け取った: %s</string>
+    <string name="compose_details_delivered">配達: %s</string>
+    <string name="compose_details_error_code">エラーコード:%d</string>
+    <string name="compose_attach_cd">添付ファイルを追加する</string>
+    <string name="compose_gallery_cd">写真を添付する</string>
+    <string name="compose_camera_cd">写真を撮る</string>
+    <string name="compose_schedule_cd">スケジュールメッセージ</string>
+    <string name="compose_contact_cd">連絡先を添付する</string>
+    <string name="compose_contact_error">連絡先の読み取りエラー</string>
+    <!-- Example: SIM 1 (Verizon) selected-->
+    <string name="compose_sim_changed_toast">SIM %1$d (%2$s) を選択しました</string>
+    <string name="compose_sim_cd">%s 選択、SIMカードを交換</string>
+    <string name="compose_send_cd">メッセージを送る</string>
+    <string name="message_status_sending">送信中&#8230;</string>
+    <string name="message_status_delivered">%s を配信しました</string>
+    <string name="message_status_failed">送信に失敗しました。タップすると、もう一度やり直します</string>
+    <string name="info_title">詳細</string>
+    <string name="info_copied_address">アドレスをコピーしました</string>
+    <string name="info_name">会話のタイトル</string>
+    <string name="info_notifications">通知</string>
+    <string name="info_theme">テーマ</string>
+    <string name="info_archive">アーカイブ</string>
+    <string name="info_unarchive">アーカイブ解除</string>
+    <string name="info_block">ブロック</string>
+    <string name="info_unblock">ブロックを解除</string>
+    <string name="info_delete">会話を削除</string>
+    <string name="gallery_error">メディアを読み込めませんでした</string>
+    <string name="gallery_toast_saved">ギャラリーに保存</string>
+    <string name="backup_title">バックアップと復元</string>
+    <string name="backup_backing_up">メッセージをバックアップする</string>
+    <string name="backup_restoring">バックアップからの復元</string>
+    <string name="backup_last">最後のバックアップ</string>
+    <string name="backup_loading">ロード中...</string>
+    <string name="backup_never">決して</string>
+    <string name="backup_restore_title">リストア</string>
+    <string name="backup_restore_summary">バックアップを選択</string>
+    <string name="backup_restore_error_plus">バックアップと復元を使用するにはQKSMS+のロックを解除してください</string>
+    <string name="backup_restore_error_backup">バックアップ中&#8230;</string>
+    <string name="backup_restore_error_restore">復元中&#8230;</string>
+    <string name="backup_restore_confirm_title">バックアップから復元</string>
+    <string name="backup_restore_confirm_message">このバックアップからメッセージを復元してもよろしいですか？</string>
+    <string name="backup_restore_stop_title">復元を停止する</string>
+    <string name="backup_restore_stop_message">既に復元されたメッセージはあなたのデバイスに残ります</string>
+    <string name="backup_restore_dialog_title">バックアップ</string>
+    <string name="backup_restore_dialog_empty">バックアップが見つかりません</string>
+    <plurals name="backup_message_count">
+        <item quantity="other">%d メッセージ</item>
+    </plurals>
+    <string name="backup_disclaimer">現在、SMSのみがバックアップと復元でサポートされています。 MMSのサポートと定期的なバックアップは近日中に開始されます。</string>
+    <string name="backup_now">今すぐバックアップ</string>
+    <string name="backup_progress_parsing">バックアップの解析中...</string>
+    <string name="backup_progress_running">%d/%dすべてのメッセージ</string>
+    <string name="backup_progress_saving">バックアップを保存しています...</string>
+    <string name="backup_progress_syncing">メッセージを同期しています...</string>
+    <string name="backup_progress_finished">終了しました。</string>
+    <string name="backup_notification_channel_name">バックアップと復元</string>
+    <string name="scheduled_title">予定</string>
+    <string name="scheduled_empty_description">希望する瞬間に自動的にメッセージを送信する</string>
+    <string name="scheduled_empty_message_1">ちょっと！あなたの誕生日はいつでしたか？</string>
+    <string name="scheduled_empty_message_2">12月23日です</string>
+    <string name="scheduled_empty_message_3">お誕生日おめでとうございます！ 私はあなたの誕生日を思い出して、何という素晴らしい友達なのか見て</string>
+    <!--&#x200A; is a special character required at the end of this string to fix it's formatting in the app -->
+    <string name="scheduled_empty_message_3_timestamp">12月23日に発送</string>
+    <string name="scheduled_compose_cd">メッセージをスケジュールする</string>
+    <string name="scheduled_options_title">スケジュールされたメッセージ</string>
+    <string-array name="scheduled_options">
+        <item>今すぐ送る</item>
+        <item>テキストをコピー</item>
+        <item>削除</item>
+    </string-array>
+    <string name="settings_category_appearance">外観</string>
+    <string name="settings_category_general">全般</string>
+    <string name="settings_category_qkreply">QK 返信</string>
+    <string name="settings_theme_title">テーマ</string>
+    <string name="settings_night_title">夜間モード</string>
+    <string name="settings_black_title">ピュアブラック夜間モード</string>
+    <string name="settings_night_start_title">開始時刻</string>
+    <string name="settings_night_end_title">終了時刻</string>
+    <string name="settings_automatic_colors_title">自動的に連絡先に色をつける</string>
+    <string name="settings_text_size_title">フォントサイズ</string>
+    <string name="settings_system_font_title">システムフォントを使用する</string>
+    <string name="settings_auto_emoji_title">自動絵文字</string>
+    <string name="settings_notifications_title">通知</string>
+    <string name="settings_notifications_o_summary">カスタマイズするためにタップ</string>
+    <string name="settings_notification_actions_title">アクション</string>
+    <string name="settings_notification_action_1">ボタン 1</string>
+    <string name="settings_notification_action_2">ボタン 2</string>
+    <string name="settings_notification_action_3">ボタン 3</string>
+    <string name="settings_notification_previews_title">通知プレビュー</string>
+    <string name="settings_notification_wake_title">ウェイクスクリーン</string>
+    <string name="settings_vibration_title">振動</string>
+    <string name="settings_ringtone_title">サウンド</string>
+    <string name="settings_ringtone_none">無し</string>
+    <string name="settings_qkreply_title">QK 返信</string>
+    <string name="settings_qkreply_summary">新しいメッセージのポップアップ</string>
+    <string name="settings_qkreply_tap_dismiss_title">タップして閉じる</string>
+    <string name="settings_qkreply_tap_dismiss_summary">ポップアップの外側をタップすると閉じます</string>
+    <string name="settings_delayed_title">遅延送信</string>
+    <string name="settings_swipe_actions">スワイプアクション</string>
+    <string name="settings_swipe_actions_summary">会話のスワイプアクションを設定する</string>
+    <string name="settings_swipe_actions_right">右スワイプ</string>
+    <string name="settings_swipe_actions_left">左スワイプ</string>
+    <string name="settings_swipe_actions_change">変更</string>
+    <string-array name="settings_swipe_actions">
+        <item>無し</item>
+        <item>アーカイブ</item>
+        <item>削除</item>
+        <item>ブロック</item>
+        <item>通話</item>
+        <item>既読にする</item>
+        <item>未読にする</item>
+    </string-array>
+    <string name="settings_delivery_title">配信確認</string>
+    <string name="settings_delivery_summary">メッセージが正常に送信されたことを確認します</string>
+    <string name="settings_signature_title">署名</string>
+    <string name="settings_signature_summary">メッセージの最後に署名を追加します</string>
+    <string name="settings_unicode_title">アクセントの除去</string>
+    <string name="settings_unicode_summary">送信する SMS メッセージの文字からアクセントを削除します</string>
+    <string name="settings_mobile_title">携帯電話番号のみ</string>
+    <string name="settings_mobile_summary">メッセージを作成するときは、携帯電話番号のみを表示します</string>
+    <string name="settings_auto_delete">古いメッセージを自動的に削除</string>
+    <string name="settings_auto_delete_dialog_message">指定された日数の後にメッセージが削除されます</string>
+    <string name="settings_auto_delete_dialog_hint">日数</string>
+    <string name="settings_auto_delete_never">自動削除しない</string>
+    <string name="settings_auto_delete_warning">古いメッセージを自動的に削除しますか？</string>
+    <string name="settings_auto_delete_warning_message">続行すると、今すぐ %1$d 件のメッセージが削除されます</string>
+    <plurals name="settings_auto_delete_summary">
+        <item quantity="other">%d 日後</item>
+    </plurals>
+    <string name="settings_long_as_mms_title">長いメッセージをMMSとして送信する</string>
+    <string name="settings_long_as_mms_summary">長いテキストメッセージの送信が失敗する場合、または間違った順序で送信される場合は、代わりにMMSメッセージとして送信できます。 追加料金が適用される場合があります</string>
+    <string name="settings_mms_size_title">MMS添付ファイルの自動圧縮</string>
+    <string name="settings_sync_title">メッセージを同期</string>
+    <string name="settings_sync_summary">メッセージをネイティブの Android SMS データベースと再同期します</string>
+    <string name="settings_about_title">QKSMS について</string>
+    <string name="settings_version">バージョン %s</string>
+    <string name="settings_logging_enabled">デバッグログが有効</string>
+    <string name="settings_logging_disabled">デバッグログを無効にする</string>
+    <string name="settings_delay_duration_hint">期間を入力してください (秒)</string>
+    <string name="blocking_title">ブロック</string>
+    <string name="blocking_drop_title">メッセージをドロップ</string>
+    <string name="blocking_drop_summary">ブロックした送信者からの受信メッセージを非表示にする代わりにドロップします</string>
+    <string name="blocking_conversations">ブロックした会話</string>
+    <string name="blocking_manager_title">ブロッキングマネージャー</string>
+    <string name="blocking_manager_qksms_title">QKSMS</string>
+    <string name="blocking_manager_qksms_summary">QKSMS の内蔵ブロック機能</string>
+    <string name="blocking_manager_call_control_summary">一か所で便利に通話とメッセージを自動的にフィルタリングします! Community IQ™を使用すると、コミュニティで知られているスパマーからの不要なメッセージを防ぐことができます</string>
+    <string name="blocking_manager_sia_summary">\"Should I Answer\" アプリを使用して、迷惑な番号からのメッセージを自動的にフィルタします</string>
+    <string name="blocking_manager_copy_title">ブロックした番号をコピー</string>
+    <string name="blocking_manager_copy_summary">既存のブロックした番号のコピーを %s まで続けます</string>
+    <string name="blocked_numbers_title">ブロックした番号</string>
+    <string name="blocked_numbers_empty">ブロックした番号がここに表示されます</string>
+    <string name="blocked_numbers_add_cd">新しい番号をブロック</string>
+    <string name="blocked_numbers_dialog_title">次からのテキストをブロック</string>
+    <string name="blocked_numbers_dialog_hint">電話番号</string>
+    <string name="blocked_numbers_dialog_block">ブロック</string>
+    <string name="blocked_messages_title">ブロックしたメッセージ</string>
+    <string name="blocked_messages_empty">ブロックしたメッセージがここに表示されます</string>
+    <string name="blocking_block_title">ブロック</string>
+    <string name="blocking_unblock_title">ブロック解除</string>
+    <plurals name="blocking_block_external">
+        <item quantity="other">%s まで続けてこの番号をブロック</item>
+    </plurals>
+    <plurals name="blocking_unblock_external">
+        <item quantity="other">%s まで続けてこの番号を許可</item>
+    </plurals>
+    <string name="about_title">このアプリについて</string>
+    <string name="about_version_title">バージョン</string>
+    <string name="about_developer_title">開発者</string>
+    <string name="about_source_title">ソースコード</string>
+    <string name="about_changelog_title">更新履歴</string>
+    <string name="about_contact_title">お問い合わせ</string>
+    <string name="about_license_title">ライセンス</string>
+    <string name="about_copyright_title">著作権</string>
+    <string name="qksms_plus_description_title">開発をサポートして、すべてのロックを解除します</string>
+    <string name="qksms_plus_description_summary">ちょうど %s 人の飢えている開発者を助けることができます</string>
+    <!-- Substitutions are for price and currency. Ex: Lifetime upgrade for $1.99 USD -->
+    <string name="qksms_plus_upgrade">%1$s %2$s のライフタイムのアップグレード</string>
+    <!-- Substitutions are for price and currency. Ex: Unlock + donate for $4.99 USD -->
+    <string name="qksms_plus_upgrade_donate">%1$s %2$s のロック解除と寄付</string>
+    <string name="qksms_plus_thanks_title">QKSMS を支援いただきありがとうございます!</string>
+    <string name="qksms_plus_thanks_summary">QKSMS+ のすべての機能にアクセスできます</string>
+    <string name="qksms_plus_free_title">QKSMS+ は F-Droid ユーザーは無料です! 開発をサポートしたい場合は、気軽に寄付をしてください。</string>
+    <string name="qksms_plus_donate">PayPal で寄付する</string>
+    <string name="qksms_plus_coming_soon">近日登場</string>
+    <string name="qksms_plus_themes_title">プレミアムテーマ</string>
+    <string name="qksms_plus_themes_summary">マテリアルデザインパレットで利用できない美しいテーマカラーのロックを解除します</string>
+    <string name="qksms_plus_emoji_title">カスタム自動絵文字</string>
+    <string name="qksms_plus_emoji_summary">カスタム自動絵文字のショートカットを作成します</string>
+    <string name="qksms_plus_backup_title">メッセージのバックアップ</string>
+    <string name="qksms_plus_backup_summary">メッセージを自動的にバックアップします。携帯電話を変更したり、お使いの携帯電話をなくしても、もう二度と履歴がなくなる心配はいりません。</string>
+    <string name="qksms_plus_scheduled_title">スケジュールされたメッセージ</string>
+    <string name="qksms_plus_scheduled_summary">特定の日時に自動的に送信されるようにメッセージをスケジュールする</string>
+    <string name="qksms_plus_delayed_title">送信を遅らせる</string>
+    <string name="qksms_plus_delayed_summary">メッセージを送信する前に、数秒間待ちます</string>
+    <string name="qksms_plus_night_title">自動夜間モード</string>
+    <string name="qksms_plus_night_summary">時間に基づいて夜間モードを有効にします</string>
+    <string name="qksms_plus_blacklist_title">高度なブロック</string>
+    <string name="qksms_plus_blacklist_summary">キーワードを含む、またはパターンに一致するメッセージをブロックします</string>
+    <string name="qksms_plus_forward_title">自動転送</string>
+    <string name="qksms_plus_forward_summary">特定の送信者からのメッセージを自動的に転送します</string>
+    <string name="qksms_plus_respond_title">自動応答</string>
+    <string name="qksms_plus_respond_summary">あらかじめ設定された応答で、受信したメッセージに自動的に返信します</string>
+    <string name="qksms_plus_more_title">さらに</string>
+    <string name="qksms_plus_more_summary">QKMSは活発に開発中です、そして、あなたの購入はすべての将来のQKMS+機能を含みます！</string>
+    <string name="widget_loading">ロード中...</string>
+    <string name="widget_more">さらに会話を表示</string>
+    <string name="qkreply_menu_read">既読にする</string>
+    <string name="qkreply_menu_call">電話する</string>
+    <string name="qkreply_menu_delete">削除</string>
+    <string name="qkreply_menu_expand">もっと見せる</string>
+    <string name="qkreply_menu_collapse">少なく表示</string>
+    <string name="qkreply_menu_view">会話を開く</string>
+    <string name="theme_material">マテリアル</string>
+    <string name="theme_hex">16 進数</string>
+    <string name="theme_apply">適用</string>
+    <string-array name="notification_actions">
+        <item>無し</item>
+        <item>アーカイブ</item>
+        <item>削除</item>
+        <item>ブロック</item>
+        <item>通話</item>
+        <item>既読にする</item>
+        <item>返信</item>
+    </string-array>
+    <string name="button_yes">はい</string>
+    <string name="button_continue">続行</string>
+    <string name="button_cancel">キャンセル</string>
+    <string name="button_delete">削除</string>
+    <string name="button_save">保存する</string>
+    <string name="button_stop">やめる</string>
+    <string name="button_more">さらに</string>
+    <string name="button_set">据える</string>
+    <string name="button_undo">元に戻す</string>
+    <string name="toast_copied">コピーしました</string>
+    <string name="toast_archived">会話をアーカイブしました</string>
+    <string name="toast_qksms_plus">これを使用するには QKSMS+ のロックを解除する必要があります</string>
+    <plurals name="notification_new_messages">
+        <item quantity="other">%s 新着メッセージ</item>
+    </plurals>
+    <string name="notification_message_failed_title">メッセージは送信されませんでした</string>
+    <string name="notification_message_failed_text">%s へのメッセージの送信に失敗しました</string>
+    <string-array name="night_modes">
+        <item>システム</item>
+        <item>無効</item>
+        <item>常にON</item>
+        <item>自動</item>
+    </string-array>
+    <string-array name="notification_preview_options">
+        <item>名前とメッセージを表示</item>
+        <item>名前を表示</item>
+        <item>コンテンツを隠す</item>
+    </string-array>
+    <string-array name="text_sizes">
+        <item>小さい</item>
+        <item>普通の</item>
+        <item>大き</item>
+        <item>大きい</item>
+    </string-array>
+    <string-array name="delayed_sending_labels">
+        <item>遅延なし</item>
+        <item>3秒</item>
+        <item>5秒</item>
+        <item>10秒</item>
+    </string-array>
+    <string-array name="mms_sizes">
+        <item>自動</item>
+        <item>100KB</item>
+        <item>200KB</item>
+        <item>300KB</item>
+        <item>600KB</item>
+        <item>1000KB</item>
+        <item>2000KB</item>
+        <item>圧縮なし</item>
+    </string-array>
+    <string-array name="qk_responses">
+        <item>OK</item>
+        <item>しばらくお待ちください</item>
+        <item>今、途中です</item>
+        <item>ありがとう</item>
+        <item>良さそうですね</item>
+        <item>最近どうですか?</item>
+        <item>了解</item>
+        <item>いいえ</item>
+        <item>好きです</item>
+        <item>ごめんなさい</item>
+        <item>大爆笑です</item>
+        <item>いいんだよ</item>
+    </string-array>
+</resources>
diff --git a/presentation/src/main/res/values-ko/strings.xml b/presentation/src/main/res/values-ko/strings.xml
index 174e6f286..56e884824 100644
--- a/presentation/src/main/res/values-ko/strings.xml
+++ b/presentation/src/main/res/values-ko/strings.xml
@@ -1,407 +1,407 @@
-<?xml version="1.0" encoding="utf-8"?>
-<!--
-  ~ Copyright (C) 2019 Moez Bhatti <moez.bhatti@gmail.com>
-  ~
-  ~ This file is part of QKSMS.
-  ~
-  ~ QKSMS is free software: you can redistribute it and/or modify
-  ~ it under the terms of the GNU General Public License as published by
-  ~ the Free Software Foundation, either version 3 of the License, or
-  ~ (at your option) any later version.
-  ~
-  ~ QKSMS is distributed in the hope that it will be useful,
-  ~ but WITHOUT ANY WARRANTY; without even the implied warranty of
-  ~ MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
-  ~ GNU General Public License for more details.
-  ~
-  ~ You should have received a copy of the GNU General Public License
-  ~ along with QKSMS.  If not, see <http://www.gnu.org/licenses/>.
-  -->
-<resources>
-    <string name="shortcut_compose_long_label">새로운 대화</string>
-    <string name="shortcut_compose_short_label">메시지 작성</string>
-    <string name="shortcut_compose_disabled_message">바로가기 해제</string>
-    <string name="title_archived">보관됨</string>
-    <string name="title_settings">설정</string>
-    <string name="title_notification_prefs">알림</string>
-    <string name="title_theme">테마</string>
-    <string name="title_conversations">수신함에서 찾기...</string>
-    <string name="title_compose">이름 또는 전화번호 입력</string>
-    <string name="setup_skip">건너뛰기</string>
-    <string name="setup_next">계속</string>
-    <string name="menu_add_person">대화 상대 추가하기</string>
-    <string name="menu_call">전화</string>
-    <string name="menu_info">자세히</string>
-    <string name="menu_save">갤러리에 저장하기</string>
-    <string name="menu_share">공유</string>
-    <string name="main_drawer_open_cd">메뉴 열기</string>
-    <string name="main_title_selected">%d 개가 선택됨</string>
-    <string name="main_menu_clear">삭제하기</string>
-    <string name="main_menu_archive">보관하기</string>
-    <string name="main_menu_unarchive">보관 해제</string>
-    <string name="main_menu_delete">지우기</string>
-    <string name="main_menu_add_contact">연락처에 추가</string>
-    <string name="main_menu_pin">상단에 고정하기</string>
-    <string name="main_menu_unpin">고정 해제하기</string>
-    <string name="main_menu_read">읽음으로 표시</string>
-    <string name="main_menu_unread">읽지않음으로 표시</string>
-    <string name="main_menu_block">차단</string>
-    <string name="main_syncing">메시지 동기화 하기</string>
-    <string name="main_sender_you">나: %s</string>
-    <string name="main_draft">임시 메시지</string>
-    <string name="main_message_results_title">메시지 검색 결과</string>
-    <string name="main_message_results">%d 개의 새로운 메시지</string>
-    <string name="inbox_empty_text">대화가 여기에 나타납니다</string>
-    <string name="inbox_search_empty_text">결과없음</string>
-    <string name="archived_empty_text">보관된 메시지가 여기 나타납니다</string>
-    <string name="main_fab_cd">새로운 대화 시작하기</string>
-    <string name="main_default_sms_title">메시지의 매력에 다시 빠지세요</string>
-    <string name="main_default_sms_message">QKSMS 앱을 기본 메시지 앱으로 설정하기</string>
-    <string name="main_default_sms_change">변경하기</string>
-    <string name="main_permission_required">권한을 부여해 주세요</string>
-    <string name="main_permission_sms">QKSMS 앱은 메시지를 보내고 읽을 수 있는 권한이 필요합니다</string>
-    <string name="main_permission_contacts">QKSMS 앱은 연락처를 읽을 수 있는 권한이 필요합니다</string>
-    <string name="main_permission_allow">허용</string>
-    <string name="drawer_inbox">수신함</string>
-    <string name="drawer_archived">보관됨</string>
-    <string name="drawer_scheduled">예약됨</string>
-    <string name="drawer_blocking">차단</string>
-    <string name="drawer_more">더 보기</string>
-    <string name="drawer_settings">설정</string>
-    <string name="drawer_help">도움말 &amp; 피드백</string>
-    <string name="drawer_invite">친구 초대하기</string>
-    <string name="drawer_plus_banner_summary">새롭고 놀라운 기능을 사용할 수 있고, 개발자에게 지원도 할 수 있습니다</string>
-    <string name="rate_title">QKSMS 앱을 잘 사용하고 계신가요?</string>
-    <string name="rate_summary">Google Play 스토어에 리뷰를 남겨주세요!</string>
-    <string name="rate_okay">좋아요!</string>
-    <string name="rate_dismiss">안할래요</string>
-    <string name="dialog_delete_title">삭제</string>
-    <plurals name="dialog_delete_message">
-        <item quantity="other">정말 %d 개의 대화를 삭제할까요?</item>
-    </plurals>
-    <string-array name="message_options">
-        <item>문자 복사하기</item>
-        <item>전달</item>
-        <item>삭제</item>
-    </string-array>
-    <string name="compose_number_picker_title">전화번호 선택하기</string>
-    <string name="compose_number_picker_default">%s ∙ 기본</string>
-    <string name="compose_number_picker_once">한 번만</string>
-    <string name="compose_number_picker_always">항상</string>
-    <string name="compose_title_selected">%d 개 선택됨</string>
-    <string name="compose_subtitle_results">%2$d 중 %1$d 결과</string>
-    <string name="compose_send_group_title">그룹 메시지 보내기</string>
-    <string name="compose_send_group_summary">받는 사람 및 답장이 모든 사람에게 표시됩니다.</string>
-    <string name="compose_messages_empty">새로운 대화가 시작되었어요! 대화를 해보세요!</string>
-    <string name="compose_vcard_label">연락처</string>
-    <string name="compose_scheduled_for">예정</string>
-    <string name="compose_scheduled_future">선택한 시간은 반드시 현재 이후의 시간으로 설정해야 합니다</string>
-    <string name="compose_scheduled_plus">메시지 예약 전송 기능을 사용하려면 QKSMS+를 구입해야 합니다</string>
-    <string name="compose_scheduled_toast">예약된 메시지에 저장됨</string>
-    <string name="compose_hint">메시지 작성 중...</string>
-    <string name="compose_menu_copy">문자 복사하기</string>
-    <string name="compose_menu_forward">전달</string>
-    <string name="compose_menu_delete">삭제</string>
-    <string name="compose_menu_previous">이전</string>
-    <string name="compose_menu_next">다음</string>
-    <string name="compose_menu_clear">삭제</string>
-    <string name="compose_details_title">세부 정보</string>
-    <string name="compose_details_type">종류: %s</string>
-    <string name="compose_details_from">%s 가</string>
-    <string name="compose_details_to">%s 에게</string>
-    <string name="compose_details_subject">제목: %s</string>
-    <string name="compose_details_priority">우선 순위: %s</string>
-    <string name="compose_details_size">크기: %s</string>
-    <string name="compose_details_sent">전송됨: %s</string>
-    <string name="compose_details_received">받음: %s</string>
-    <string name="compose_details_delivered">보냄: %s</string>
-    <string name="compose_details_error_code">오류 코드: %d</string>
-    <string name="compose_attach_cd">첨부 파일 추가</string>
-    <string name="compose_gallery_cd">사진 첨부</string>
-    <string name="compose_camera_cd">사진 찍기</string>
-    <string name="compose_schedule_cd">예약 전송 메시지</string>
-    <string name="compose_contact_cd">연락처 첨부</string>
-    <string name="compose_contact_error">연락처를 불러오는 중에 문제가 발생했습니다</string>
-    <!-- Example: SIM 1 (Verizon) selected-->
-    <string name="compose_sim_changed_toast">SIM %1$d (%2$s) 선택 됨</string>
-    <string name="compose_sim_cd">%s 선택됨, SIM 카드를 변경하세요.</string>
-    <string name="compose_send_cd">메시지 보내기</string>
-    <string name="message_status_sending">전송 중...</string>
-    <string name="message_status_delivered">%s 전송됨</string>
-    <string name="message_status_failed">전송 실패, 눌러서 다시 시도하세요</string>
-    <string name="info_title">자세히</string>
-    <string name="info_copied_address">주소 복사 됨</string>
-    <string name="info_name">대화 제목</string>
-    <string name="info_notifications">알림</string>
-    <string name="info_theme">테마</string>
-    <string name="info_archive">보관</string>
-    <string name="info_unarchive">보관 해제</string>
-    <string name="info_block">차단</string>
-    <string name="info_unblock">차단 해제</string>
-    <string name="info_delete">대화 삭제</string>
-    <string name="gallery_error">미디어를 불러올 수 없습니다</string>
-    <string name="gallery_toast_saved">갤러리에 저장하기</string>
-    <string name="backup_title">백업과 복원</string>
-    <string name="backup_backing_up">메시지 백업하기</string>
-    <string name="backup_restoring">복원하기</string>
-    <string name="backup_last">최근 백업</string>
-    <string name="backup_loading">로딩 중...</string>
-    <string name="backup_never">사용 안 함</string>
-    <string name="backup_restore_title">복원</string>
-    <string name="backup_restore_summary">백업 선택하기</string>
-    <string name="backup_restore_error_plus">QKSMS+을 구입하여 백업과 복원기능을 사용하세요</string>
-    <string name="backup_restore_error_backup">백업 중...</string>
-    <string name="backup_restore_error_restore">복원 중...</string>
-    <string name="backup_restore_confirm_title">복원을 할까요?</string>
-    <string name="backup_restore_confirm_message">이 백업 파일로부터 복원하시겠어요?</string>
-    <string name="backup_restore_stop_title">복원 중지</string>
-    <string name="backup_restore_stop_message">이미 저장된 메시지들은 내 기기에 남아있습니다.</string>
-    <string name="backup_restore_dialog_title">백업</string>
-    <string name="backup_restore_dialog_empty">백업을 찾지 못했어요</string>
-    <plurals name="backup_message_count">
-        <item quantity="other">%d 개의 새로운 메시지</item>
-    </plurals>
-    <string name="backup_disclaimer">아직 SMS만 백업과 복원기능이 지원됩니다. MMS지원과 백업 스케줄 기능은 곧 찾아옵니다!</string>
-    <string name="backup_now">지금 백업하기</string>
-    <string name="backup_progress_parsing">분석 중...</string>
-    <string name="backup_progress_running">%d/%d 메시지</string>
-    <string name="backup_progress_saving">저장 중...</string>
-    <string name="backup_progress_syncing">동기화 중...</string>
-    <string name="backup_progress_finished">끝!</string>
-    <string name="backup_notification_channel_name">백업과 복원</string>
-    <string name="scheduled_title">예약됨</string>
-    <string name="scheduled_empty_description">원하는 시간에 자동으로 메시지를 보냅니다.</string>
-    <string name="scheduled_empty_message_1">잠깐만! 생일이 언제였더라..?</string>
-    <string name="scheduled_empty_message_2">12월 23일이야</string>
-    <string name="scheduled_empty_message_3">생일 축하해! 너의 생일까지 기억해주는 이렇게 좋은 친구가 어디있겠어</string>
-    <!--&#x200A; is a special character required at the end of this string to fix it's formatting in the app -->
-    <string name="scheduled_empty_message_3_timestamp">12월 23일에 보냅니다.</string>
-    <string name="scheduled_compose_cd">메시지 예약 전송하기</string>
-    <string name="scheduled_options_title">예약된 메시지</string>
-    <string-array name="scheduled_options">
-        <item>지금 보내기</item>
-        <item>텍스트 복사하기</item>
-        <item>삭제</item>
-    </string-array>
-    <string name="settings_category_appearance">디자인</string>
-    <string name="settings_category_general">일반 설정</string>
-    <string name="settings_category_qkreply">빠른 응답</string>
-    <string name="settings_theme_title">테마</string>
-    <string name="settings_night_title">나이트 모드</string>
-    <string name="settings_black_title">완전한 블랙 테마</string>
-    <string name="settings_night_start_title">시작 시간</string>
-    <string name="settings_night_end_title">끝나는 시간</string>
-    <string name="settings_automatic_colors_title">연락처 색 자동 설정</string>
-    <string name="settings_text_size_title">글꼴 크기</string>
-    <string name="settings_system_font_title">시스템 글꼴 사용</string>
-    <string name="settings_auto_emoji_title">자동 이모티콘</string>
-    <string name="settings_notifications_title">알림</string>
-    <string name="settings_notifications_o_summary">탭해서 사용자화</string>
-    <string name="settings_notification_actions_title">동작</string>
-    <string name="settings_notification_action_1">버튼 1</string>
-    <string name="settings_notification_action_2">버튼 2</string>
-    <string name="settings_notification_action_3">버튼 3</string>
-    <string name="settings_notification_previews_title">알림 미리 보기</string>
-    <string name="settings_notification_wake_title">화면 깨우기</string>
-    <string name="settings_vibration_title">진동</string>
-    <string name="settings_ringtone_title">소리</string>
-    <string name="settings_ringtone_none">없음</string>
-    <string name="settings_qkreply_title">QK Reply</string>
-    <string name="settings_qkreply_summary">새로운 메시지에 대한 팝업</string>
-    <string name="settings_qkreply_tap_dismiss_title">탭해서 닫기</string>
-    <string name="settings_qkreply_tap_dismiss_summary">아무데나 탭하면 팝업이 닫힙니다.</string>
-    <string name="settings_delayed_title">전송 지연</string>
-    <string name="settings_swipe_actions">쓸어넘기기 설정</string>
-    <string name="settings_swipe_actions_summary">대화를 쓸어넘겼을 때 할 작업</string>
-    <string name="settings_swipe_actions_right">오른쪽으로 쓸어넘기기</string>
-    <string name="settings_swipe_actions_left">왼쪽으로 쓸어넘기기</string>
-    <string name="settings_swipe_actions_change">변경</string>
-    <string-array name="settings_swipe_actions">
-        <item>없음</item>
-        <item>아카이브</item>
-        <item>삭제</item>
-        <item>차단</item>
-        <item>전화</item>
-        <item>읽음으로 표시</item>
-        <item>읽지않음으로 표시</item>
-    </string-array>
-    <string name="settings_delivery_title">전송 확인</string>
-    <string name="settings_delivery_summary">전송 성공을 확인합니다</string>
-    <string name="settings_signature_title">서명</string>
-    <string name="settings_signature_summary">문자 메시지 마지막에 서명을 추가합니다</string>
-    <string name="settings_unicode_title">스트립 악센트</string>
-    <string name="settings_unicode_summary">SMS를 주고받을 때, 대문자 없애기</string>
-    <string name="settings_mobile_title">전화번호만 보이기</string>
-    <string name="settings_mobile_summary">메시지를 쓸 때, 전화번호만 보이게 하기</string>
-    <string name="settings_auto_delete">Delete old messages automatically</string>
-    <string name="settings_auto_delete_dialog_message">Messages will be deleted after the specified number of days</string>
-    <string name="settings_auto_delete_dialog_hint">Number of days</string>
-    <string name="settings_auto_delete_never">Never</string>
-    <string name="settings_auto_delete_warning">Delete old messages automatically?</string>
-    <string name="settings_auto_delete_warning_message">If you proceed, %1$d messages will be deleted now</string>
-    <plurals name="settings_auto_delete_summary">
-        <item quantity="other">After %d days</item>
-    </plurals>
-    <string name="settings_long_as_mms_title">장문 메시지를 MMS로 보내기</string>
-    <string name="settings_long_as_mms_summary">만약 장문의 메시지가 보내지지 않거나, 잘못된 순서로 보내진다면, MMS 메시지로 보낼 수 있습니다. (MMS로 인한 추가요금이 발생할 수 있습니다)</string>
-    <string name="settings_mms_size_title">자동으로 MMS 첨부 파일 압축하기</string>
-    <string name="settings_sync_title">메시지 동기화하기</string>
-    <string name="settings_sync_summary">기본 안드로이드 SMS 데이터베이스에 다시 동기화하기</string>
-    <string name="settings_about_title">QKSMS에 대해...</string>
-    <string name="settings_version">버전 정보 %s</string>
-    <string name="settings_logging_enabled">디버그 로깅 설정됨</string>
-    <string name="settings_logging_disabled">디버그 로깅 해제됨</string>
-    <string name="settings_delay_duration_hint">기간 (초)을 입력</string>
-    <string name="blocking_title">차단</string>
-    <string name="blocking_drop_title">메시지 자동 삭제</string>
-    <string name="blocking_drop_summary">차단된 사람으로부터 오는 메시지를 가리는 대신 삭제합니다</string>
-    <string name="blocking_conversations">차단된 대화</string>
-    <string name="blocking_manager_title">차단 메니저</string>
-    <string name="blocking_manager_qksms_title">QKSMS</string>
-    <string name="blocking_manager_qksms_summary">빌트인 차단기능이 있는 기본 필터.</string>
-    <string name="blocking_manager_call_control_summary">자동으오 전화와 메시지를 한 곳에서 필터링하세요! Community IQ™는 커뮤니티 기반으로 원하지 않는 스팸 메시지를 차단해줍니다.</string>
-    <string name="blocking_manager_sia_summary">Should I Answer 앱을 이용해 필요없는 번호에서 보낸 메시지를 자동으로 필터링하기</string>
-    <string name="blocking_manager_copy_title">차단된 번호 복사하기</string>
-    <string name="blocking_manager_copy_summary">%s로 계속하고 이미 차단된 번호를 복사합니다.</string>
-    <string name="blocked_numbers_title">차단된 번호</string>
-    <string name="blocked_numbers_empty">차단한 번호가 여기에 나타납니다</string>
-    <string name="blocked_numbers_add_cd">새로운 번호 차단하기</string>
-    <string name="blocked_numbers_dialog_title">차단할 번호 입력</string>
-    <string name="blocked_numbers_dialog_hint">전화번호</string>
-    <string name="blocked_numbers_dialog_block">차단</string>
-    <string name="blocked_messages_title">차단된 메시지</string>
-    <string name="blocked_messages_empty">차단된 메시지가 여기에 나옵니다.</string>
-    <string name="blocking_block_title">차단</string>
-    <string name="blocking_unblock_title">차단해제</string>
-    <plurals name="blocking_block_external">
-        <item quantity="other">%s 하고 이 번호 차단하기</item>
-    </plurals>
-    <plurals name="blocking_unblock_external">
-        <item quantity="other">%s 하고 이 번호 허용하기</item>
-    </plurals>
-    <string name="about_title">정보</string>
-    <string name="about_version_title">버전</string>
-    <string name="about_developer_title">개발자</string>
-    <string name="about_source_title">소스 코드</string>
-    <string name="about_changelog_title">변경 사항</string>
-    <string name="about_contact_title">연락처</string>
-    <string name="about_license_title">라이선스</string>
-    <string name="about_copyright_title">저작권</string>
-    <string name="qksms_plus_description_title">개발을 지원하고 모든 기능을 해제하세요.</string>
-    <string name="qksms_plus_description_summary">배고픈 개발자를 위해 %s 만큼만으로도 구할 수 있습니다.</string>
-    <!-- Substitutions are for price and currency. Ex: Lifetime upgrade for $1.99 USD -->
-    <string name="qksms_plus_upgrade">%1$s %2$s 으로 평생 업그레이드</string>
-    <!-- Substitutions are for price and currency. Ex: Unlock + donate for $4.99 USD -->
-    <string name="qksms_plus_upgrade_donate">%1$s %2$s 으로 프리미엄 기능 잠금 해제 및 기부</string>
-    <string name="qksms_plus_thanks_title">QKSMS를 지원해 주셔서 감사합니다!</string>
-    <string name="qksms_plus_thanks_summary">이제 모든 QKSMS+ 기능에 액세스할 수 있습니다</string>
-    <string name="qksms_plus_free_title">QKSMS+는 F-Droid 사용자들에게 무료입니다! 만약 여러분이 개발을 지원하고 싶으시다면, 기부해 주시기 바랍니다.</string>
-    <string name="qksms_plus_donate">페이팔을 통해 기부</string>
-    <string name="qksms_plus_coming_soon">출시 예정</string>
-    <string name="qksms_plus_themes_title">프리미엄 테마</string>
-    <string name="qksms_plus_themes_summary">Material Design 팔레트에선 볼 수 없던 아름다운 테마를 잠금해제 하세요!</string>
-    <string name="qksms_plus_emoji_title">사용자 지정 이모티콘</string>
-    <string name="qksms_plus_emoji_summary">사용자 지정 이모티콘 바로 가기 만들기</string>
-    <string name="qksms_plus_backup_title">메시지 백업</string>
-    <string name="qksms_plus_backup_summary">자동으로 메시지를 백업해서 휴대폰을 바꾸거나 잊어버려도 문제없죠!</string>
-    <string name="qksms_plus_scheduled_title">예약 전송 메시지</string>
-    <string name="qksms_plus_scheduled_summary">특정한 시간에 메시지가 보내지도록 메시지 전송을 예약하세요</string>
-    <string name="qksms_plus_delayed_title">지연 전송</string>
-    <string name="qksms_plus_delayed_summary">지연 전송이라는 멋진 기능이 있답니다!</string>
-    <string name="qksms_plus_night_title">자동 나이트 모드</string>
-    <string name="qksms_plus_night_summary">시간에 따라 나이트 모드 설정하기</string>
-    <string name="qksms_plus_blacklist_title">고급 차단 기능</string>
-    <string name="qksms_plus_blacklist_summary">특정 키워드 및 패턴이 있을 때 차단합니다</string>
-    <string name="qksms_plus_forward_title">자동 전달</string>
-    <string name="qksms_plus_forward_summary">자동으로 특정한 보낸 사람으로부터 메시지를 전달합니다</string>
-    <string name="qksms_plus_respond_title">자동 응답</string>
-    <string name="qksms_plus_respond_summary">미리 설정된 응답으로 받은 메시지에 자동으로 응답합니다</string>
-    <string name="qksms_plus_more_title">더보기</string>
-    <string name="qksms_plus_more_summary">QKSMS는 개발이 활성화되어 있고 여러분의 구입이 모든 미래의 QKSMS+ 기능들이 포함될 것입니다!</string>
-    <string name="widget_loading">불러오는 중&#8230;</string>
-    <string name="widget_more">더 많은 대화 보기</string>
-    <string name="qkreply_menu_read">읽음으로 표시</string>
-    <string name="qkreply_menu_call">전화하기</string>
-    <string name="qkreply_menu_delete">삭제하기</string>
-    <string name="qkreply_menu_expand">더 보기</string>
-    <string name="qkreply_menu_collapse">적게 표시</string>
-    <string name="qkreply_menu_view">대화 열기</string>
-    <string name="theme_material">Meterial</string>
-    <string name="theme_hex">HEX</string>
-    <string name="theme_apply">적용하기</string>
-    <string-array name="notification_actions">
-        <item>없음</item>
-        <item>보관</item>
-        <item>삭제</item>
-        <item>차단</item>
-        <item>전화</item>
-        <item>읽음으로 표시</item>
-        <item>답장</item>
-    </string-array>
-    <string name="button_yes">예</string>
-    <string name="button_continue">계속</string>
-    <string name="button_cancel">취소</string>
-    <string name="button_delete">삭제</string>
-    <string name="button_save">저장</string>
-    <string name="button_stop">중지</string>
-    <string name="button_more">더보기</string>
-    <string name="button_set">설정</string>
-    <string name="button_undo">되돌리기</string>
-    <string name="toast_copied">복사됨</string>
-    <string name="toast_archived">보관된 대화</string>
-    <string name="toast_qksms_plus">이 기능을 사용하려면 QKSMS+ 를 잠금 해제해야 합니다.</string>
-    <plurals name="notification_new_messages">
-        <item quantity="other">새로운 메세지
-
-%s 개의 새로운 메시지</item>
-    </plurals>
-    <string name="notification_message_failed_title">메시지 전송 실패</string>
-    <string name="notification_message_failed_text">%s 에게 보낼 메시지 전송이 실패했습니다</string>
-    <string-array name="night_modes">
-        <item>시스템 설정</item>
-        <item>사용 안 함</item>
-        <item>항상 켬</item>
-        <item>자동</item>
-    </string-array>
-    <string-array name="notification_preview_options">
-        <item>이름 및 메시지 표시</item>
-        <item>이름 표시</item>
-        <item>내용 숨기기</item>
-    </string-array>
-    <string-array name="text_sizes">
-        <item>작음</item>
-        <item>보통</item>
-        <item>크게</item>
-        <item>더 크게</item>
-    </string-array>
-    <string-array name="delayed_sending_labels">
-        <item>지연 없음</item>
-        <item>3초</item>
-        <item>5초</item>
-        <item>10초</item>
-    </string-array>
-    <string-array name="mms_sizes">
-        <item>자동</item>
-        <item>100KB</item>
-        <item>200KB</item>
-        <item>300KB</item>
-        <item>600KB</item>
-        <item>1000KB</item>
-        <item>2000KB</item>
-        <item>무압축</item>
-    </string-array>
-    <string-array name="qk_responses">
-        <item>확인</item>
-        <item>잠시만 기다려주세요.</item>
-        <item>가고 있어요</item>
-        <item>감사합니다</item>
-        <item>듣기 좋아요</item>
-        <item>무슨 일 이에요?</item>
-        <item>동의</item>
-        <item>아니요</item>
-        <item>사랑해요</item>
-        <item>죄송합니다</item>
-        <item>웃음</item>
-        <item>괜찮아요</item>
-    </string-array>
-</resources>
+<?xml version="1.0" encoding="utf-8"?>
+<!--
+  ~ Copyright (C) 2019 Moez Bhatti <moez.bhatti@gmail.com>
+  ~
+  ~ This file is part of QKSMS.
+  ~
+  ~ QKSMS is free software: you can redistribute it and/or modify
+  ~ it under the terms of the GNU General Public License as published by
+  ~ the Free Software Foundation, either version 3 of the License, or
+  ~ (at your option) any later version.
+  ~
+  ~ QKSMS is distributed in the hope that it will be useful,
+  ~ but WITHOUT ANY WARRANTY; without even the implied warranty of
+  ~ MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+  ~ GNU General Public License for more details.
+  ~
+  ~ You should have received a copy of the GNU General Public License
+  ~ along with QKSMS.  If not, see <http://www.gnu.org/licenses/>.
+  -->
+<resources>
+    <string name="shortcut_compose_long_label">새로운 대화</string>
+    <string name="shortcut_compose_short_label">메시지 작성</string>
+    <string name="shortcut_compose_disabled_message">바로가기 해제</string>
+    <string name="title_archived">보관됨</string>
+    <string name="title_settings">설정</string>
+    <string name="title_notification_prefs">알림</string>
+    <string name="title_theme">테마</string>
+    <string name="title_conversations">수신함에서 찾기...</string>
+    <string name="title_compose">이름 또는 전화번호 입력</string>
+    <string name="setup_skip">건너뛰기</string>
+    <string name="setup_next">계속</string>
+    <string name="menu_add_person">대화 상대 추가하기</string>
+    <string name="menu_call">전화</string>
+    <string name="menu_info">자세히</string>
+    <string name="menu_save">갤러리에 저장하기</string>
+    <string name="menu_share">공유</string>
+    <string name="main_drawer_open_cd">메뉴 열기</string>
+    <string name="main_title_selected">%d 개가 선택됨</string>
+    <string name="main_menu_clear">삭제하기</string>
+    <string name="main_menu_archive">보관하기</string>
+    <string name="main_menu_unarchive">보관 해제</string>
+    <string name="main_menu_delete">지우기</string>
+    <string name="main_menu_add_contact">연락처에 추가</string>
+    <string name="main_menu_pin">상단에 고정하기</string>
+    <string name="main_menu_unpin">고정 해제하기</string>
+    <string name="main_menu_read">읽음으로 표시</string>
+    <string name="main_menu_unread">읽지않음으로 표시</string>
+    <string name="main_menu_block">차단</string>
+    <string name="main_syncing">메시지 동기화 하기</string>
+    <string name="main_sender_you">나: %s</string>
+    <string name="main_draft">임시 메시지</string>
+    <string name="main_message_results_title">메시지 검색 결과</string>
+    <string name="main_message_results">%d 개의 새로운 메시지</string>
+    <string name="inbox_empty_text">대화가 여기에 나타납니다</string>
+    <string name="inbox_search_empty_text">결과없음</string>
+    <string name="archived_empty_text">보관된 메시지가 여기 나타납니다</string>
+    <string name="main_fab_cd">새로운 대화 시작하기</string>
+    <string name="main_default_sms_title">메시지의 매력에 다시 빠지세요</string>
+    <string name="main_default_sms_message">QKSMS 앱을 기본 메시지 앱으로 설정하기</string>
+    <string name="main_default_sms_change">변경하기</string>
+    <string name="main_permission_required">권한을 부여해 주세요</string>
+    <string name="main_permission_sms">QKSMS 앱은 메시지를 보내고 읽을 수 있는 권한이 필요합니다</string>
+    <string name="main_permission_contacts">QKSMS 앱은 연락처를 읽을 수 있는 권한이 필요합니다</string>
+    <string name="main_permission_allow">허용</string>
+    <string name="drawer_inbox">수신함</string>
+    <string name="drawer_archived">보관됨</string>
+    <string name="drawer_scheduled">예약됨</string>
+    <string name="drawer_blocking">차단</string>
+    <string name="drawer_more">더 보기</string>
+    <string name="drawer_settings">설정</string>
+    <string name="drawer_help">도움말 &amp; 피드백</string>
+    <string name="drawer_invite">친구 초대하기</string>
+    <string name="drawer_plus_banner_summary">새롭고 놀라운 기능을 사용할 수 있고, 개발자에게 지원도 할 수 있습니다</string>
+    <string name="rate_title">QKSMS 앱을 잘 사용하고 계신가요?</string>
+    <string name="rate_summary">Google Play 스토어에 리뷰를 남겨주세요!</string>
+    <string name="rate_okay">좋아요!</string>
+    <string name="rate_dismiss">안할래요</string>
+    <string name="dialog_delete_title">삭제</string>
+    <plurals name="dialog_delete_message">
+        <item quantity="other">정말 %d 개의 대화를 삭제할까요?</item>
+    </plurals>
+    <string-array name="message_options">
+        <item>문자 복사하기</item>
+        <item>전달</item>
+        <item>삭제</item>
+    </string-array>
+    <string name="compose_number_picker_title">전화번호 선택하기</string>
+    <string name="compose_number_picker_default">%s ∙ 기본</string>
+    <string name="compose_number_picker_once">한 번만</string>
+    <string name="compose_number_picker_always">항상</string>
+    <string name="compose_title_selected">%d 개 선택됨</string>
+    <string name="compose_subtitle_results">%2$d 중 %1$d 결과</string>
+    <string name="compose_send_group_title">그룹 메시지 보내기</string>
+    <string name="compose_send_group_summary">받는 사람 및 답장이 모든 사람에게 표시됩니다.</string>
+    <string name="compose_messages_empty">새로운 대화가 시작되었어요! 대화를 해보세요!</string>
+    <string name="compose_vcard_label">연락처</string>
+    <string name="compose_scheduled_for">예정</string>
+    <string name="compose_scheduled_future">선택한 시간은 반드시 현재 이후의 시간으로 설정해야 합니다</string>
+    <string name="compose_scheduled_plus">메시지 예약 전송 기능을 사용하려면 QKSMS+를 구입해야 합니다</string>
+    <string name="compose_scheduled_toast">예약된 메시지에 저장됨</string>
+    <string name="compose_hint">메시지 작성 중...</string>
+    <string name="compose_menu_copy">문자 복사하기</string>
+    <string name="compose_menu_forward">전달</string>
+    <string name="compose_menu_delete">삭제</string>
+    <string name="compose_menu_previous">이전</string>
+    <string name="compose_menu_next">다음</string>
+    <string name="compose_menu_clear">삭제</string>
+    <string name="compose_details_title">세부 정보</string>
+    <string name="compose_details_type">종류: %s</string>
+    <string name="compose_details_from">%s 가</string>
+    <string name="compose_details_to">%s 에게</string>
+    <string name="compose_details_subject">제목: %s</string>
+    <string name="compose_details_priority">우선 순위: %s</string>
+    <string name="compose_details_size">크기: %s</string>
+    <string name="compose_details_sent">전송됨: %s</string>
+    <string name="compose_details_received">받음: %s</string>
+    <string name="compose_details_delivered">보냄: %s</string>
+    <string name="compose_details_error_code">오류 코드: %d</string>
+    <string name="compose_attach_cd">첨부 파일 추가</string>
+    <string name="compose_gallery_cd">사진 첨부</string>
+    <string name="compose_camera_cd">사진 찍기</string>
+    <string name="compose_schedule_cd">예약 전송 메시지</string>
+    <string name="compose_contact_cd">연락처 첨부</string>
+    <string name="compose_contact_error">연락처를 불러오는 중에 문제가 발생했습니다</string>
+    <!-- Example: SIM 1 (Verizon) selected-->
+    <string name="compose_sim_changed_toast">SIM %1$d (%2$s) 선택 됨</string>
+    <string name="compose_sim_cd">%s 선택됨, SIM 카드를 변경하세요.</string>
+    <string name="compose_send_cd">메시지 보내기</string>
+    <string name="message_status_sending">전송 중...</string>
+    <string name="message_status_delivered">%s 전송됨</string>
+    <string name="message_status_failed">전송 실패, 눌러서 다시 시도하세요</string>
+    <string name="info_title">자세히</string>
+    <string name="info_copied_address">주소 복사 됨</string>
+    <string name="info_name">대화 제목</string>
+    <string name="info_notifications">알림</string>
+    <string name="info_theme">테마</string>
+    <string name="info_archive">보관</string>
+    <string name="info_unarchive">보관 해제</string>
+    <string name="info_block">차단</string>
+    <string name="info_unblock">차단 해제</string>
+    <string name="info_delete">대화 삭제</string>
+    <string name="gallery_error">미디어를 불러올 수 없습니다</string>
+    <string name="gallery_toast_saved">갤러리에 저장하기</string>
+    <string name="backup_title">백업과 복원</string>
+    <string name="backup_backing_up">메시지 백업하기</string>
+    <string name="backup_restoring">복원하기</string>
+    <string name="backup_last">최근 백업</string>
+    <string name="backup_loading">로딩 중...</string>
+    <string name="backup_never">사용 안 함</string>
+    <string name="backup_restore_title">복원</string>
+    <string name="backup_restore_summary">백업 선택하기</string>
+    <string name="backup_restore_error_plus">QKSMS+을 구입하여 백업과 복원기능을 사용하세요</string>
+    <string name="backup_restore_error_backup">백업 중...</string>
+    <string name="backup_restore_error_restore">복원 중...</string>
+    <string name="backup_restore_confirm_title">복원을 할까요?</string>
+    <string name="backup_restore_confirm_message">이 백업 파일로부터 복원하시겠어요?</string>
+    <string name="backup_restore_stop_title">복원 중지</string>
+    <string name="backup_restore_stop_message">이미 저장된 메시지들은 내 기기에 남아있습니다.</string>
+    <string name="backup_restore_dialog_title">백업</string>
+    <string name="backup_restore_dialog_empty">백업을 찾지 못했어요</string>
+    <plurals name="backup_message_count">
+        <item quantity="other">%d 개의 새로운 메시지</item>
+    </plurals>
+    <string name="backup_disclaimer">아직 SMS만 백업과 복원기능이 지원됩니다. MMS지원과 백업 스케줄 기능은 곧 찾아옵니다!</string>
+    <string name="backup_now">지금 백업하기</string>
+    <string name="backup_progress_parsing">분석 중...</string>
+    <string name="backup_progress_running">%d/%d 메시지</string>
+    <string name="backup_progress_saving">저장 중...</string>
+    <string name="backup_progress_syncing">동기화 중...</string>
+    <string name="backup_progress_finished">끝!</string>
+    <string name="backup_notification_channel_name">백업과 복원</string>
+    <string name="scheduled_title">예약됨</string>
+    <string name="scheduled_empty_description">원하는 시간에 자동으로 메시지를 보냅니다.</string>
+    <string name="scheduled_empty_message_1">잠깐만! 생일이 언제였더라..?</string>
+    <string name="scheduled_empty_message_2">12월 23일이야</string>
+    <string name="scheduled_empty_message_3">생일 축하해! 너의 생일까지 기억해주는 이렇게 좋은 친구가 어디있겠어</string>
+    <!--&#x200A; is a special character required at the end of this string to fix it's formatting in the app -->
+    <string name="scheduled_empty_message_3_timestamp">12월 23일에 보냅니다.</string>
+    <string name="scheduled_compose_cd">메시지 예약 전송하기</string>
+    <string name="scheduled_options_title">예약된 메시지</string>
+    <string-array name="scheduled_options">
+        <item>지금 보내기</item>
+        <item>텍스트 복사하기</item>
+        <item>삭제</item>
+    </string-array>
+    <string name="settings_category_appearance">디자인</string>
+    <string name="settings_category_general">일반 설정</string>
+    <string name="settings_category_qkreply">빠른 응답</string>
+    <string name="settings_theme_title">테마</string>
+    <string name="settings_night_title">나이트 모드</string>
+    <string name="settings_black_title">완전한 블랙 테마</string>
+    <string name="settings_night_start_title">시작 시간</string>
+    <string name="settings_night_end_title">끝나는 시간</string>
+    <string name="settings_automatic_colors_title">연락처 색 자동 설정</string>
+    <string name="settings_text_size_title">글꼴 크기</string>
+    <string name="settings_system_font_title">시스템 글꼴 사용</string>
+    <string name="settings_auto_emoji_title">자동 이모티콘</string>
+    <string name="settings_notifications_title">알림</string>
+    <string name="settings_notifications_o_summary">탭해서 사용자화</string>
+    <string name="settings_notification_actions_title">동작</string>
+    <string name="settings_notification_action_1">버튼 1</string>
+    <string name="settings_notification_action_2">버튼 2</string>
+    <string name="settings_notification_action_3">버튼 3</string>
+    <string name="settings_notification_previews_title">알림 미리 보기</string>
+    <string name="settings_notification_wake_title">화면 깨우기</string>
+    <string name="settings_vibration_title">진동</string>
+    <string name="settings_ringtone_title">소리</string>
+    <string name="settings_ringtone_none">없음</string>
+    <string name="settings_qkreply_title">QK Reply</string>
+    <string name="settings_qkreply_summary">새로운 메시지에 대한 팝업</string>
+    <string name="settings_qkreply_tap_dismiss_title">탭해서 닫기</string>
+    <string name="settings_qkreply_tap_dismiss_summary">아무데나 탭하면 팝업이 닫힙니다.</string>
+    <string name="settings_delayed_title">전송 지연</string>
+    <string name="settings_swipe_actions">쓸어넘기기 설정</string>
+    <string name="settings_swipe_actions_summary">대화를 쓸어넘겼을 때 할 작업</string>
+    <string name="settings_swipe_actions_right">오른쪽으로 쓸어넘기기</string>
+    <string name="settings_swipe_actions_left">왼쪽으로 쓸어넘기기</string>
+    <string name="settings_swipe_actions_change">변경</string>
+    <string-array name="settings_swipe_actions">
+        <item>없음</item>
+        <item>아카이브</item>
+        <item>삭제</item>
+        <item>차단</item>
+        <item>전화</item>
+        <item>읽음으로 표시</item>
+        <item>읽지않음으로 표시</item>
+    </string-array>
+    <string name="settings_delivery_title">전송 확인</string>
+    <string name="settings_delivery_summary">전송 성공을 확인합니다</string>
+    <string name="settings_signature_title">서명</string>
+    <string name="settings_signature_summary">문자 메시지 마지막에 서명을 추가합니다</string>
+    <string name="settings_unicode_title">스트립 악센트</string>
+    <string name="settings_unicode_summary">SMS를 주고받을 때, 대문자 없애기</string>
+    <string name="settings_mobile_title">전화번호만 보이기</string>
+    <string name="settings_mobile_summary">메시지를 쓸 때, 전화번호만 보이게 하기</string>
+    <string name="settings_auto_delete">Delete old messages automatically</string>
+    <string name="settings_auto_delete_dialog_message">Messages will be deleted after the specified number of days</string>
+    <string name="settings_auto_delete_dialog_hint">Number of days</string>
+    <string name="settings_auto_delete_never">Never</string>
+    <string name="settings_auto_delete_warning">Delete old messages automatically?</string>
+    <string name="settings_auto_delete_warning_message">If you proceed, %1$d messages will be deleted now</string>
+    <plurals name="settings_auto_delete_summary">
+        <item quantity="other">After %d days</item>
+    </plurals>
+    <string name="settings_long_as_mms_title">장문 메시지를 MMS로 보내기</string>
+    <string name="settings_long_as_mms_summary">만약 장문의 메시지가 보내지지 않거나, 잘못된 순서로 보내진다면, MMS 메시지로 보낼 수 있습니다. (MMS로 인한 추가요금이 발생할 수 있습니다)</string>
+    <string name="settings_mms_size_title">자동으로 MMS 첨부 파일 압축하기</string>
+    <string name="settings_sync_title">메시지 동기화하기</string>
+    <string name="settings_sync_summary">기본 안드로이드 SMS 데이터베이스에 다시 동기화하기</string>
+    <string name="settings_about_title">QKSMS에 대해...</string>
+    <string name="settings_version">버전 정보 %s</string>
+    <string name="settings_logging_enabled">디버그 로깅 설정됨</string>
+    <string name="settings_logging_disabled">디버그 로깅 해제됨</string>
+    <string name="settings_delay_duration_hint">기간 (초)을 입력</string>
+    <string name="blocking_title">차단</string>
+    <string name="blocking_drop_title">메시지 자동 삭제</string>
+    <string name="blocking_drop_summary">차단된 사람으로부터 오는 메시지를 가리는 대신 삭제합니다</string>
+    <string name="blocking_conversations">차단된 대화</string>
+    <string name="blocking_manager_title">차단 메니저</string>
+    <string name="blocking_manager_qksms_title">QKSMS</string>
+    <string name="blocking_manager_qksms_summary">빌트인 차단기능이 있는 기본 필터.</string>
+    <string name="blocking_manager_call_control_summary">자동으오 전화와 메시지를 한 곳에서 필터링하세요! Community IQ™는 커뮤니티 기반으로 원하지 않는 스팸 메시지를 차단해줍니다.</string>
+    <string name="blocking_manager_sia_summary">Should I Answer 앱을 이용해 필요없는 번호에서 보낸 메시지를 자동으로 필터링하기</string>
+    <string name="blocking_manager_copy_title">차단된 번호 복사하기</string>
+    <string name="blocking_manager_copy_summary">%s로 계속하고 이미 차단된 번호를 복사합니다.</string>
+    <string name="blocked_numbers_title">차단된 번호</string>
+    <string name="blocked_numbers_empty">차단한 번호가 여기에 나타납니다</string>
+    <string name="blocked_numbers_add_cd">새로운 번호 차단하기</string>
+    <string name="blocked_numbers_dialog_title">차단할 번호 입력</string>
+    <string name="blocked_numbers_dialog_hint">전화번호</string>
+    <string name="blocked_numbers_dialog_block">차단</string>
+    <string name="blocked_messages_title">차단된 메시지</string>
+    <string name="blocked_messages_empty">차단된 메시지가 여기에 나옵니다.</string>
+    <string name="blocking_block_title">차단</string>
+    <string name="blocking_unblock_title">차단해제</string>
+    <plurals name="blocking_block_external">
+        <item quantity="other">%s 하고 이 번호 차단하기</item>
+    </plurals>
+    <plurals name="blocking_unblock_external">
+        <item quantity="other">%s 하고 이 번호 허용하기</item>
+    </plurals>
+    <string name="about_title">정보</string>
+    <string name="about_version_title">버전</string>
+    <string name="about_developer_title">개발자</string>
+    <string name="about_source_title">소스 코드</string>
+    <string name="about_changelog_title">변경 사항</string>
+    <string name="about_contact_title">연락처</string>
+    <string name="about_license_title">라이선스</string>
+    <string name="about_copyright_title">저작권</string>
+    <string name="qksms_plus_description_title">개발을 지원하고 모든 기능을 해제하세요.</string>
+    <string name="qksms_plus_description_summary">배고픈 개발자를 위해 %s 만큼만으로도 구할 수 있습니다.</string>
+    <!-- Substitutions are for price and currency. Ex: Lifetime upgrade for $1.99 USD -->
+    <string name="qksms_plus_upgrade">%1$s %2$s 으로 평생 업그레이드</string>
+    <!-- Substitutions are for price and currency. Ex: Unlock + donate for $4.99 USD -->
+    <string name="qksms_plus_upgrade_donate">%1$s %2$s 으로 프리미엄 기능 잠금 해제 및 기부</string>
+    <string name="qksms_plus_thanks_title">QKSMS를 지원해 주셔서 감사합니다!</string>
+    <string name="qksms_plus_thanks_summary">이제 모든 QKSMS+ 기능에 액세스할 수 있습니다</string>
+    <string name="qksms_plus_free_title">QKSMS+는 F-Droid 사용자들에게 무료입니다! 만약 여러분이 개발을 지원하고 싶으시다면, 기부해 주시기 바랍니다.</string>
+    <string name="qksms_plus_donate">페이팔을 통해 기부</string>
+    <string name="qksms_plus_coming_soon">출시 예정</string>
+    <string name="qksms_plus_themes_title">프리미엄 테마</string>
+    <string name="qksms_plus_themes_summary">Material Design 팔레트에선 볼 수 없던 아름다운 테마를 잠금해제 하세요!</string>
+    <string name="qksms_plus_emoji_title">사용자 지정 이모티콘</string>
+    <string name="qksms_plus_emoji_summary">사용자 지정 이모티콘 바로 가기 만들기</string>
+    <string name="qksms_plus_backup_title">메시지 백업</string>
+    <string name="qksms_plus_backup_summary">자동으로 메시지를 백업해서 휴대폰을 바꾸거나 잊어버려도 문제없죠!</string>
+    <string name="qksms_plus_scheduled_title">예약 전송 메시지</string>
+    <string name="qksms_plus_scheduled_summary">특정한 시간에 메시지가 보내지도록 메시지 전송을 예약하세요</string>
+    <string name="qksms_plus_delayed_title">지연 전송</string>
+    <string name="qksms_plus_delayed_summary">지연 전송이라는 멋진 기능이 있답니다!</string>
+    <string name="qksms_plus_night_title">자동 나이트 모드</string>
+    <string name="qksms_plus_night_summary">시간에 따라 나이트 모드 설정하기</string>
+    <string name="qksms_plus_blacklist_title">고급 차단 기능</string>
+    <string name="qksms_plus_blacklist_summary">특정 키워드 및 패턴이 있을 때 차단합니다</string>
+    <string name="qksms_plus_forward_title">자동 전달</string>
+    <string name="qksms_plus_forward_summary">자동으로 특정한 보낸 사람으로부터 메시지를 전달합니다</string>
+    <string name="qksms_plus_respond_title">자동 응답</string>
+    <string name="qksms_plus_respond_summary">미리 설정된 응답으로 받은 메시지에 자동으로 응답합니다</string>
+    <string name="qksms_plus_more_title">더보기</string>
+    <string name="qksms_plus_more_summary">QKSMS는 개발이 활성화되어 있고 여러분의 구입이 모든 미래의 QKSMS+ 기능들이 포함될 것입니다!</string>
+    <string name="widget_loading">불러오는 중&#8230;</string>
+    <string name="widget_more">더 많은 대화 보기</string>
+    <string name="qkreply_menu_read">읽음으로 표시</string>
+    <string name="qkreply_menu_call">전화하기</string>
+    <string name="qkreply_menu_delete">삭제하기</string>
+    <string name="qkreply_menu_expand">더 보기</string>
+    <string name="qkreply_menu_collapse">적게 표시</string>
+    <string name="qkreply_menu_view">대화 열기</string>
+    <string name="theme_material">Meterial</string>
+    <string name="theme_hex">HEX</string>
+    <string name="theme_apply">적용하기</string>
+    <string-array name="notification_actions">
+        <item>없음</item>
+        <item>보관</item>
+        <item>삭제</item>
+        <item>차단</item>
+        <item>전화</item>
+        <item>읽음으로 표시</item>
+        <item>답장</item>
+    </string-array>
+    <string name="button_yes">예</string>
+    <string name="button_continue">계속</string>
+    <string name="button_cancel">취소</string>
+    <string name="button_delete">삭제</string>
+    <string name="button_save">저장</string>
+    <string name="button_stop">중지</string>
+    <string name="button_more">더보기</string>
+    <string name="button_set">설정</string>
+    <string name="button_undo">되돌리기</string>
+    <string name="toast_copied">복사됨</string>
+    <string name="toast_archived">보관된 대화</string>
+    <string name="toast_qksms_plus">이 기능을 사용하려면 QKSMS+ 를 잠금 해제해야 합니다.</string>
+    <plurals name="notification_new_messages">
+        <item quantity="other">새로운 메세지
+
+%s 개의 새로운 메시지</item>
+    </plurals>
+    <string name="notification_message_failed_title">메시지 전송 실패</string>
+    <string name="notification_message_failed_text">%s 에게 보낼 메시지 전송이 실패했습니다</string>
+    <string-array name="night_modes">
+        <item>시스템 설정</item>
+        <item>사용 안 함</item>
+        <item>항상 켬</item>
+        <item>자동</item>
+    </string-array>
+    <string-array name="notification_preview_options">
+        <item>이름 및 메시지 표시</item>
+        <item>이름 표시</item>
+        <item>내용 숨기기</item>
+    </string-array>
+    <string-array name="text_sizes">
+        <item>작음</item>
+        <item>보통</item>
+        <item>크게</item>
+        <item>더 크게</item>
+    </string-array>
+    <string-array name="delayed_sending_labels">
+        <item>지연 없음</item>
+        <item>3초</item>
+        <item>5초</item>
+        <item>10초</item>
+    </string-array>
+    <string-array name="mms_sizes">
+        <item>자동</item>
+        <item>100KB</item>
+        <item>200KB</item>
+        <item>300KB</item>
+        <item>600KB</item>
+        <item>1000KB</item>
+        <item>2000KB</item>
+        <item>무압축</item>
+    </string-array>
+    <string-array name="qk_responses">
+        <item>확인</item>
+        <item>잠시만 기다려주세요.</item>
+        <item>가고 있어요</item>
+        <item>감사합니다</item>
+        <item>듣기 좋아요</item>
+        <item>무슨 일 이에요?</item>
+        <item>동의</item>
+        <item>아니요</item>
+        <item>사랑해요</item>
+        <item>죄송합니다</item>
+        <item>웃음</item>
+        <item>괜찮아요</item>
+    </string-array>
+</resources>
diff --git a/presentation/src/main/res/values-lt/strings.xml b/presentation/src/main/res/values-lt/strings.xml
index f527eecf7..3c9eedf76 100644
--- a/presentation/src/main/res/values-lt/strings.xml
+++ b/presentation/src/main/res/values-lt/strings.xml
@@ -1,423 +1,423 @@
-<?xml version="1.0" encoding="utf-8"?>
-<!--
-  ~ Copyright (C) 2019 Moez Bhatti <moez.bhatti@gmail.com>
-  ~
-  ~ This file is part of QKSMS.
-  ~
-  ~ QKSMS is free software: you can redistribute it and/or modify
-  ~ it under the terms of the GNU General Public License as published by
-  ~ the Free Software Foundation, either version 3 of the License, or
-  ~ (at your option) any later version.
-  ~
-  ~ QKSMS is distributed in the hope that it will be useful,
-  ~ but WITHOUT ANY WARRANTY; without even the implied warranty of
-  ~ MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
-  ~ GNU General Public License for more details.
-  ~
-  ~ You should have received a copy of the GNU General Public License
-  ~ along with QKSMS.  If not, see <http://www.gnu.org/licenses/>.
-  -->
-<resources>
-    <string name="shortcut_compose_long_label">New conversation</string>
-    <string name="shortcut_compose_short_label">Compose</string>
-    <string name="shortcut_compose_disabled_message">Shortcut disabled</string>
-    <string name="title_archived">Archyvas</string>
-    <string name="title_settings">Nustatymai</string>
-    <string name="title_notification_prefs">Pranešimai</string>
-    <string name="title_theme">Spalva</string>
-    <string name="title_conversations">Ieškoti žinutes&#8230;</string>
-    <string name="title_compose">Rašyti</string>
-    <string name="setup_skip">Praleisti</string>
-    <string name="setup_next">Tęsti</string>
-    <string name="menu_add_person">Add person</string>
-    <string name="menu_call">Skambinti</string>
-    <string name="menu_info">Dėtalės</string>
-    <string name="menu_save">Save to gallery</string>
-    <string name="menu_share">Share</string>
-    <string name="main_drawer_open_cd">Open navigation drawer</string>
-    <string name="main_title_selected">%d pasirinkta(s)</string>
-    <string name="main_menu_clear">Ištrinti</string>
-    <string name="main_menu_archive">Archyvuoti</string>
-    <string name="main_menu_unarchive">Išarchyvuoti</string>
-    <string name="main_menu_delete">Ištrinti</string>
-    <string name="main_menu_add_contact">Add to contacts</string>
-    <string name="main_menu_pin">Pin to top</string>
-    <string name="main_menu_unpin">Unpin</string>
-    <string name="main_menu_read">Mark read</string>
-    <string name="main_menu_unread">Mark unread</string>
-    <string name="main_menu_block">Blokuoti</string>
-    <string name="main_syncing">Syncing messages&#8230;</string>
-    <string name="main_sender_you">Tu: %s</string>
-    <string name="main_draft">Draft</string>
-    <string name="main_message_results_title">Results in messages</string>
-    <string name="main_message_results">%d messages</string>
-    <string name="inbox_empty_text">Tavo žinutės buvo matomos čia</string>
-    <string name="inbox_search_empty_text">Nėra rezultatų</string>
-    <string name="archived_empty_text">Tavo archyvuoti pokalbiai bus čia</string>
-    <string name="main_fab_cd">Pradėti naują pokalbį</string>
-    <string name="main_default_sms_title">Love texting again</string>
-    <string name="main_default_sms_message">Make QKSMS your default SMS app</string>
-    <string name="main_default_sms_change">Change</string>
-    <string name="main_permission_required">Permission required</string>
-    <string name="main_permission_sms">QKSMS needs permission to send and view SMS messages</string>
-    <string name="main_permission_contacts">QKSMS needs permission to view your contacts</string>
-    <string name="main_permission_allow">Allow</string>
-    <string name="drawer_inbox">Žinutės</string>
-    <string name="drawer_archived">Archyvas</string>
-    <string name="drawer_scheduled">Planuota</string>
-    <string name="drawer_blocking">Blocking</string>
-    <string name="drawer_more">Daugiau</string>
-    <string name="drawer_settings">Nustatymai</string>
-    <string name="drawer_help">Pagalba ir atsiliepimai</string>
-    <string name="drawer_invite">Invite friends</string>
-    <string name="drawer_plus_banner_summary">Unlock amazing new features, and support development</string>
-    <string name="rate_title">Patinka QKSMS?</string>
-    <string name="rate_summary">Įvertink mūsų programėlę Google Play!</string>
-    <string name="rate_okay">OK!</string>
-    <string name="rate_dismiss">ATMESTI</string>
-    <string name="dialog_delete_title">Ištrinti</string>
-    <plurals name="dialog_delete_message">
-        <item quantity="one">Are you sure you would like to delete this conversation?</item>
-        <item quantity="few">Are you sure you would like to delete %d conversations?</item>
-        <item quantity="many">Are you sure you would like to delete %d conversations?</item>
-        <item quantity="other">Are you sure you would like to delete %d conversations?</item>
-    </plurals>
-    <string-array name="message_options">
-        <item>Kopijuoti tekstą</item>
-        <item>Persiųsti</item>
-        <item>Ištrinti</item>
-    </string-array>
-    <string name="compose_number_picker_title">Choose a phone number</string>
-    <string name="compose_number_picker_default">%s ∙ Default</string>
-    <string name="compose_number_picker_once">Just once</string>
-    <string name="compose_number_picker_always">Always</string>
-    <string name="compose_title_selected">%d parinktas</string>
-    <string name="compose_subtitle_results">%1$d of %2$d results</string>
-    <string name="compose_send_group_title">Send as group message</string>
-    <string name="compose_send_group_summary">Recipients and replies will be visible to everyone</string>
-    <string name="compose_messages_empty">Čia jūsų pokalbio pradžios. Pasakykite kažką gražaus!</string>
-    <string name="compose_vcard_label">Contact card</string>
-    <string name="compose_scheduled_for">Scheduled for</string>
-    <string name="compose_scheduled_future">Selected time must be in the future!</string>
-    <string name="compose_scheduled_plus">You must unlock QKSMS+ to use scheduled messaging</string>
-    <string name="compose_scheduled_toast">Added to scheduled messages</string>
-    <string name="compose_hint">Rašyti žinutę...</string>
-    <string name="compose_menu_copy">Kopijuoti tekstą</string>
-    <string name="compose_menu_forward">Persiųsti</string>
-    <string name="compose_menu_delete">Ištrinti</string>
-    <string name="compose_menu_previous">Previous</string>
-    <string name="compose_menu_next">Next</string>
-    <string name="compose_menu_clear">Clear</string>
-    <string name="compose_details_title">Message details</string>
-    <string name="compose_details_type">Type: %s</string>
-    <string name="compose_details_from">From: %s</string>
-    <string name="compose_details_to">To: %s</string>
-    <string name="compose_details_subject">Subject: %s</string>
-    <string name="compose_details_priority">Priority: %s</string>
-    <string name="compose_details_size">Size: %s</string>
-    <string name="compose_details_sent">Sent: %s</string>
-    <string name="compose_details_received">Received: %s</string>
-    <string name="compose_details_delivered">Delivered: %s</string>
-    <string name="compose_details_error_code">Error code: %d</string>
-    <string name="compose_attach_cd">Pridėti priedą</string>
-    <string name="compose_gallery_cd">Pridėti nuotrauką</string>
-    <string name="compose_camera_cd">Padaryti nuotrauką</string>
-    <string name="compose_schedule_cd">Schedule message</string>
-    <string name="compose_contact_cd">Attach a contact</string>
-    <string name="compose_contact_error">Error reading contact</string>
-    <!-- Example: SIM 1 (Verizon) selected-->
-    <string name="compose_sim_changed_toast">SIM %1$d (%2$s) selected</string>
-    <string name="compose_sim_cd">%s selected, change SIM card</string>
-    <string name="compose_send_cd">Siųsti žinutę</string>
-    <string name="message_status_sending">Siunčiama&#8230;</string>
-    <string name="message_status_delivered">Nusiųsta %s</string>
-    <string name="message_status_failed">Nepavyko nusiųsti. Spausk dar kartą norint persiųsti</string>
-    <string name="info_title">Dėtalės</string>
-    <string name="info_copied_address">Address copied</string>
-    <string name="info_name">Conversation title</string>
-    <string name="info_notifications">Pranešimai</string>
-    <string name="info_theme">Tema</string>
-    <string name="info_archive">Archyvuoti</string>
-    <string name="info_unarchive">Išarchyvuoti</string>
-    <string name="info_block">Blokuoti</string>
-    <string name="info_unblock">Atblokuoti</string>
-    <string name="info_delete">Ištrinti pokalbį</string>
-    <string name="gallery_error">Couldn\'t load media</string>
-    <string name="gallery_toast_saved">Saved to gallery</string>
-    <string name="backup_title">Backup and restore</string>
-    <string name="backup_backing_up">Backing up messages</string>
-    <string name="backup_restoring">Restoring from backup</string>
-    <string name="backup_last">Last backup</string>
-    <string name="backup_loading">Loading&#8230;</string>
-    <string name="backup_never">Never</string>
-    <string name="backup_restore_title">Restore</string>
-    <string name="backup_restore_summary">Select a backup</string>
-    <string name="backup_restore_error_plus">Please unlock QKSMS+ to use backup and restore</string>
-    <string name="backup_restore_error_backup">Backup in progress&#8230;</string>
-    <string name="backup_restore_error_restore">Restore in progress&#8230;</string>
-    <string name="backup_restore_confirm_title">Restore from backup</string>
-    <string name="backup_restore_confirm_message">Are you sure you would like to restore your messages from this backup?</string>
-    <string name="backup_restore_stop_title">Stop restore</string>
-    <string name="backup_restore_stop_message">Messages that have already been restored will remain on your device</string>
-    <string name="backup_restore_dialog_title">Backups</string>
-    <string name="backup_restore_dialog_empty">No backups found</string>
-    <plurals name="backup_message_count">
-        <item quantity="one">%d message</item>
-        <item quantity="few">%d messages</item>
-        <item quantity="many">%d messages</item>
-        <item quantity="other">%d messages</item>
-    </plurals>
-    <string name="backup_disclaimer">Currently, only SMS is supported by Backup and Restore. MMS support and scheduled backups will be coming soon!</string>
-    <string name="backup_now">Backup now</string>
-    <string name="backup_progress_parsing">Parsing backup&#8230;</string>
-    <string name="backup_progress_running">%d/%d messages</string>
-    <string name="backup_progress_saving">Saving backup&#8230;</string>
-    <string name="backup_progress_syncing">Syncing messages&#8230;</string>
-    <string name="backup_progress_finished">Finished!</string>
-    <string name="backup_notification_channel_name">Backup and restore</string>
-    <string name="scheduled_title">Scheduled</string>
-    <string name="scheduled_empty_description">Automatically send a message, at the exact moment you\'d like</string>
-    <string name="scheduled_empty_message_1">Hey! When was your birthday again?</string>
-    <string name="scheduled_empty_message_2">It\'s on December 23rd</string>
-    <string name="scheduled_empty_message_3">Happy birthday! Look at what a great friend I am, remembering your birthday</string>
-    <!--&#x200A; is a special character required at the end of this string to fix it's formatting in the app -->
-    <string name="scheduled_empty_message_3_timestamp">Sending on December 23rd </string>
-    <string name="scheduled_compose_cd">Schedule a message</string>
-    <string name="scheduled_options_title">Scheduled message</string>
-    <string-array name="scheduled_options">
-        <item>Send now</item>
-        <item>Copy text</item>
-        <item>Delete</item>
-    </string-array>
-    <string name="settings_category_appearance">Išvaizda</string>
-    <string name="settings_category_general">Bendra</string>
-    <string name="settings_category_qkreply">Greitas atsakas</string>
-    <string name="settings_theme_title">Tema</string>
-    <string name="settings_night_title">Nakties tema</string>
-    <string name="settings_black_title">Visiškai juoda nakties tema</string>
-    <string name="settings_night_start_title">Pradžios laikas</string>
-    <string name="settings_night_end_title">Pabaigos laikas</string>
-    <string name="settings_automatic_colors_title">Automatic contact colors</string>
-    <string name="settings_text_size_title">Šrifto dydis</string>
-    <string name="settings_system_font_title">Naudoti sistemos šriftą</string>
-    <string name="settings_auto_emoji_title">Automatinis emoji</string>
-    <string name="settings_notifications_title">Pranešimai</string>
-    <string name="settings_notifications_o_summary">Tap to customize</string>
-    <string name="settings_notification_actions_title">Actions</string>
-    <string name="settings_notification_action_1">Button 1</string>
-    <string name="settings_notification_action_2">Button 2</string>
-    <string name="settings_notification_action_3">Button 3</string>
-    <string name="settings_notification_previews_title">Pranešimų peržiūra</string>
-    <string name="settings_notification_wake_title">Wake screen</string>
-    <string name="settings_vibration_title">Vibracija</string>
-    <string name="settings_ringtone_title">Garas</string>
-    <string name="settings_ringtone_none">None</string>
-    <string name="settings_qkreply_title">Greitas atsakas</string>
-    <string name="settings_qkreply_summary">Iššokantis langas naujiems pranešimams</string>
-    <string name="settings_qkreply_tap_dismiss_title">Spustelėkite, kad atmestumėte</string>
-    <string name="settings_qkreply_tap_dismiss_summary">Spustelėkite bet kur už iššokamo lango, kad išjungtumėte</string>
-    <string name="settings_delayed_title">Delayed sending</string>
-    <string name="settings_swipe_actions">Swipe actions</string>
-    <string name="settings_swipe_actions_summary">Configure swipe actions for conversations</string>
-    <string name="settings_swipe_actions_right">Right swipe</string>
-    <string name="settings_swipe_actions_left">Left swipe</string>
-    <string name="settings_swipe_actions_change">CHANGE</string>
-    <string-array name="settings_swipe_actions">
-        <item>None</item>
-        <item>Archive</item>
-        <item>Delete</item>
-        <item>Block</item>
-        <item>Call</item>
-        <item>Mark read</item>
-        <item>Mark unread</item>
-    </string-array>
-    <string name="settings_delivery_title">Žinučių pristatymo patvirtinimai</string>
-    <string name="settings_delivery_summary">Patvirtinti, kad pranešimai buvo sėkmingai išsiųsti</string>
-    <string name="settings_signature_title">Signature</string>
-    <string name="settings_signature_summary">Add a signature to the end of your messages</string>
-    <string name="settings_unicode_title">Trinti akcentus</string>
-    <string name="settings_unicode_summary">Ištrinti jūsų SMS žinučių simbolių akcentus</string>
-    <string name="settings_mobile_title">Mobile numbers only</string>
-    <string name="settings_mobile_summary">When composing a message, only show mobile numbers</string>
-    <string name="settings_auto_delete">Delete old messages automatically</string>
-    <string name="settings_auto_delete_dialog_message">Messages will be deleted after the specified number of days</string>
-    <string name="settings_auto_delete_dialog_hint">Number of days</string>
-    <string name="settings_auto_delete_never">Never</string>
-    <string name="settings_auto_delete_warning">Delete old messages automatically?</string>
-    <string name="settings_auto_delete_warning_message">If you proceed, %1$d messages will be deleted now</string>
-    <plurals name="settings_auto_delete_summary">
-        <item quantity="one">After 1 day</item>
-        <item quantity="few">After %d days</item>
-        <item quantity="many">After %d days</item>
-        <item quantity="other">After %d days</item>
-    </plurals>
-    <string name="settings_long_as_mms_title">Send long messages as MMS</string>
-    <string name="settings_long_as_mms_summary">If your longer text messages are failing to send, or sending in the wrong order, you can send them as MMS messages instead. Additional charges may apply</string>
-    <string name="settings_mms_size_title">Auto-compress MMS attachments</string>
-    <string name="settings_sync_title">Sinchronizuoti pranešimus</string>
-    <string name="settings_sync_summary">Iš naujo sinchronizuoti Android pranešimų duomenų bazę</string>
-    <string name="settings_about_title">Apie QKSMS</string>
-    <string name="settings_version">Versija %s</string>
-    <string name="settings_logging_enabled">Debug logging enabled</string>
-    <string name="settings_logging_disabled">Debug logging disabled</string>
-    <string name="settings_delay_duration_hint">Įvesti trukmę (sek.)</string>
-    <string name="blocking_title">Blocking</string>
-    <string name="blocking_drop_title">Drop messages</string>
-    <string name="blocking_drop_summary">Drop incoming messages from blocked senders instead of hiding them</string>
-    <string name="blocking_conversations">Blocked conversations</string>
-    <string name="blocking_manager_title">Blocking Manager</string>
-    <string name="blocking_manager_qksms_title">QKSMS</string>
-    <string name="blocking_manager_qksms_summary">Built-in blocking functionality in QKSMS</string>
-    <string name="blocking_manager_call_control_summary">Automatically filter your calls and messages in one convenient place! Community IQ™ allows you to prevent unwanted messages from community known spammers</string>
-    <string name="blocking_manager_sia_summary">Automatiškai filtruoti žinutes nuo nežinomų numerių su „Ar reikia atsakyti“ programėle</string>
-    <string name="blocking_manager_copy_title">Copy blocked numbers</string>
-    <string name="blocking_manager_copy_summary">Continue to %s and copy over your existing blocked numbers</string>
-    <string name="blocked_numbers_title">Blocked numbers</string>
-    <string name="blocked_numbers_empty">Your blocked numbers will appear here</string>
-    <string name="blocked_numbers_add_cd">Block a new number</string>
-    <string name="blocked_numbers_dialog_title">Block texts from</string>
-    <string name="blocked_numbers_dialog_hint">Phone number</string>
-    <string name="blocked_numbers_dialog_block">Block</string>
-    <string name="blocked_messages_title">Blocked messages</string>
-    <string name="blocked_messages_empty">Your blocked messages will appear here</string>
-    <string name="blocking_block_title">Block</string>
-    <string name="blocking_unblock_title">Unblock</string>
-    <plurals name="blocking_block_external">
-        <item quantity="one">Continue to %s and block this number</item>
-        <item quantity="few">Continue to %s and block these numbers</item>
-        <item quantity="many">Continue to %s and block these numbers</item>
-        <item quantity="other">Continue to %s and block these numbers</item>
-    </plurals>
-    <plurals name="blocking_unblock_external">
-        <item quantity="one">Continue to %s and allow this number</item>
-        <item quantity="few">Continue to %s and allow these numbers</item>
-        <item quantity="many">Continue to %s and allow these numbers</item>
-        <item quantity="other">Continue to %s and allow these numbers</item>
-    </plurals>
-    <string name="about_title">Apie</string>
-    <string name="about_version_title">Versija</string>
-    <string name="about_developer_title">Kūrėjas</string>
-    <string name="about_source_title">Šaltinio kodas</string>
-    <string name="about_changelog_title">Pakeitimų sąrašas</string>
-    <string name="about_contact_title">Kontaktai</string>
-    <string name="about_license_title">Licencija</string>
-    <string name="about_copyright_title">Autorinės teisės</string>
-    <string name="qksms_plus_description_title">Remti programos vystymąsi, atrakinti viską</string>
-    <string name="qksms_plus_description_summary">Galite išsaugoti badaujantį programėlės kūrėją tik už %s</string>
-    <!-- Substitutions are for price and currency. Ex: Lifetime upgrade for $1.99 USD -->
-    <string name="qksms_plus_upgrade">Amžininis programėlės funkcijų atrakinimas %1$s %2$s</string>
-    <!-- Substitutions are for price and currency. Ex: Unlock + donate for $4.99 USD -->
-    <string name="qksms_plus_upgrade_donate">Atrakinti + aukoti %1$s %2$s</string>
-    <string name="qksms_plus_thanks_title">Ačiū už paramą!</string>
-    <string name="qksms_plus_thanks_summary">Dabar jūs turite prieigą prie visoms QKSMS+ funkcijoms</string>
-    <string name="qksms_plus_free_title">QKSMS+ yra nemokama F-Droid vartotojams! Taip pat galite paremti programos kūrėją aukodami.</string>
-    <string name="qksms_plus_donate">Paaukoti per PayPal</string>
-    <string name="qksms_plus_coming_soon">Jau greitai</string>
-    <string name="qksms_plus_themes_title">Premium temos</string>
-    <string name="qksms_plus_themes_summary">Atrakink kitas spalvas, kurios nėra „Material“ paletėje</string>
-    <string name="qksms_plus_emoji_title">Individualizuoti auto-emoji</string>
-    <string name="qksms_plus_emoji_summary">Sukurkite pasirinktinius automatinių emoji sparčiuosius klavišus</string>
-    <string name="qksms_plus_backup_title">Žinučių atsarginis kopijavimas</string>
-    <string name="qksms_plus_backup_summary">Automatinis atsarginių pranešimų kopijavimas. Niekada nerimaukite, kad prarasite žinutes, jei pakeisite telefonus arba pamesite telefoną</string>
-    <string name="qksms_plus_scheduled_title">Planuotos žinutės</string>
-    <string name="qksms_plus_scheduled_summary">Schedule messages to automatically be sent at a specific time and date</string>
-    <string name="qksms_plus_delayed_title">Atidėtas siuntimas</string>
-    <string name="qksms_plus_delayed_summary">Palaukti kelias sekundes prieš išsiųntant pranešimą</string>
-    <string name="qksms_plus_night_title">Automatinė nakties tema</string>
-    <string name="qksms_plus_night_summary">Įjungti naktinį režimą pagal dienos laiką</string>
-    <string name="qksms_plus_blacklist_title">Sudėtingesnis blokavimas</string>
-    <string name="qksms_plus_blacklist_summary">Blokuoti žinutes pagal raktinius žodžius arba šabloninę struktūrą</string>
-    <string name="qksms_plus_forward_title">Automatiškai persiųsti</string>
-    <string name="qksms_plus_forward_summary">Automatiškai persiųsti žinutes nuo tam tikrų siuntėjų</string>
-    <string name="qksms_plus_respond_title">Automatiškai atsakyti</string>
-    <string name="qksms_plus_respond_summary">Automatiškai atsakyti į žinutes su tam tikru atsaku</string>
-    <string name="qksms_plus_more_title">Daugiau</string>
-    <string name="qksms_plus_more_summary">QKSMS is under active development, and your purchase will include all future QKSMS+ features!</string>
-    <string name="widget_loading">Kraunama&#8230;</string>
-    <string name="widget_more">Žiūrėti daugiau pokalbių</string>
-    <string name="qkreply_menu_read">Mark read</string>
-    <string name="qkreply_menu_call">Skambinti</string>
-    <string name="qkreply_menu_delete">Delete</string>
-    <string name="qkreply_menu_expand">Rodyti daugiau</string>
-    <string name="qkreply_menu_collapse">Rodyti mažiau</string>
-    <string name="qkreply_menu_view">Atidaryti pokalbį</string>
-    <string name="theme_material">„Material“ dizainas</string>
-    <string name="theme_hex">HEX kodas</string>
-    <string name="theme_apply">Pritaikyti</string>
-    <string-array name="notification_actions">
-        <item>None</item>
-        <item>Archive</item>
-        <item>Delete</item>
-        <item>Block</item>
-        <item>Call</item>
-        <item>Mark read</item>
-        <item>Reply</item>
-    </string-array>
-    <string name="button_yes">Yes</string>
-    <string name="button_continue">Continue</string>
-    <string name="button_cancel">Atšaukti</string>
-    <string name="button_delete">Ištrinti</string>
-    <string name="button_save">Save</string>
-    <string name="button_stop">Stop</string>
-    <string name="button_more">Daugiau</string>
-    <string name="button_set">Padaryti</string>
-    <string name="button_undo">Anuliuoti</string>
-    <string name="toast_copied">Nukopijuota</string>
-    <string name="toast_archived">Archyvuotas pokalbis</string>
-    <string name="toast_qksms_plus">Reikia turėti QKSMS+ funkcijos naudojomui</string>
-    <plurals name="notification_new_messages">
-        <item quantity="one">Naujas pranešimas</item>
-        <item quantity="few">%s nauji pranešimai</item>
-        <item quantity="many">%s nauji pranešimai</item>
-        <item quantity="other">%s nauji pranešimai</item>
-    </plurals>
-    <string name="notification_message_failed_title">Žinutė neišsiųsta</string>
-    <string name="notification_message_failed_text">Žinutę, skirta %s, išsiųsti nepavyko</string>
-    <string-array name="night_modes">
-        <item>System</item>
-        <item>Disabled</item>
-        <item>Always on</item>
-        <item>Automatic</item>
-    </string-array>
-    <string-array name="notification_preview_options">
-        <item>Rodyti vardą ir žinutę</item>
-        <item>Rodyti vardą</item>
-        <item>Slėpti turinį</item>
-    </string-array>
-    <string-array name="text_sizes">
-        <item>Mažas</item>
-        <item>Normalus</item>
-        <item>Didelis</item>
-        <item>Didžiausias</item>
-    </string-array>
-    <string-array name="delayed_sending_labels">
-        <item>Be delsimo</item>
-        <item>3 seconds</item>
-        <item>5 seconds</item>
-        <item>10 seconds</item>
-    </string-array>
-    <string-array name="mms_sizes">
-        <item>Automatic</item>
-        <item>100KB</item>
-        <item>200KB</item>
-        <item>300KB</item>
-        <item>600KB</item>
-        <item>1000KB</item>
-        <item>2000KB</item>
-        <item>No compression</item>
-    </string-array>
-    <string-array name="qk_responses">
-        <item>Gerai</item>
-        <item>Duokite minutę</item>
-        <item>Tuoj būsiu</item>
-        <item>Ačiū</item>
-        <item>Gerai skamba</item>
-        <item>Kas naujo?</item>
-        <item>Sutinku</item>
-        <item>Ne</item>
-        <item>Myliu tave</item>
-        <item>Atsiprašau</item>
-        <item>HAHA</item>
-        <item>Viskas gerai</item>
-    </string-array>
-</resources>
+<?xml version="1.0" encoding="utf-8"?>
+<!--
+  ~ Copyright (C) 2019 Moez Bhatti <moez.bhatti@gmail.com>
+  ~
+  ~ This file is part of QKSMS.
+  ~
+  ~ QKSMS is free software: you can redistribute it and/or modify
+  ~ it under the terms of the GNU General Public License as published by
+  ~ the Free Software Foundation, either version 3 of the License, or
+  ~ (at your option) any later version.
+  ~
+  ~ QKSMS is distributed in the hope that it will be useful,
+  ~ but WITHOUT ANY WARRANTY; without even the implied warranty of
+  ~ MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+  ~ GNU General Public License for more details.
+  ~
+  ~ You should have received a copy of the GNU General Public License
+  ~ along with QKSMS.  If not, see <http://www.gnu.org/licenses/>.
+  -->
+<resources>
+    <string name="shortcut_compose_long_label">New conversation</string>
+    <string name="shortcut_compose_short_label">Compose</string>
+    <string name="shortcut_compose_disabled_message">Shortcut disabled</string>
+    <string name="title_archived">Archyvas</string>
+    <string name="title_settings">Nustatymai</string>
+    <string name="title_notification_prefs">Pranešimai</string>
+    <string name="title_theme">Spalva</string>
+    <string name="title_conversations">Ieškoti žinutes&#8230;</string>
+    <string name="title_compose">Rašyti</string>
+    <string name="setup_skip">Praleisti</string>
+    <string name="setup_next">Tęsti</string>
+    <string name="menu_add_person">Add person</string>
+    <string name="menu_call">Skambinti</string>
+    <string name="menu_info">Dėtalės</string>
+    <string name="menu_save">Save to gallery</string>
+    <string name="menu_share">Share</string>
+    <string name="main_drawer_open_cd">Open navigation drawer</string>
+    <string name="main_title_selected">%d pasirinkta(s)</string>
+    <string name="main_menu_clear">Ištrinti</string>
+    <string name="main_menu_archive">Archyvuoti</string>
+    <string name="main_menu_unarchive">Išarchyvuoti</string>
+    <string name="main_menu_delete">Ištrinti</string>
+    <string name="main_menu_add_contact">Add to contacts</string>
+    <string name="main_menu_pin">Pin to top</string>
+    <string name="main_menu_unpin">Unpin</string>
+    <string name="main_menu_read">Mark read</string>
+    <string name="main_menu_unread">Mark unread</string>
+    <string name="main_menu_block">Blokuoti</string>
+    <string name="main_syncing">Syncing messages&#8230;</string>
+    <string name="main_sender_you">Tu: %s</string>
+    <string name="main_draft">Draft</string>
+    <string name="main_message_results_title">Results in messages</string>
+    <string name="main_message_results">%d messages</string>
+    <string name="inbox_empty_text">Tavo žinutės buvo matomos čia</string>
+    <string name="inbox_search_empty_text">Nėra rezultatų</string>
+    <string name="archived_empty_text">Tavo archyvuoti pokalbiai bus čia</string>
+    <string name="main_fab_cd">Pradėti naują pokalbį</string>
+    <string name="main_default_sms_title">Love texting again</string>
+    <string name="main_default_sms_message">Make QKSMS your default SMS app</string>
+    <string name="main_default_sms_change">Change</string>
+    <string name="main_permission_required">Permission required</string>
+    <string name="main_permission_sms">QKSMS needs permission to send and view SMS messages</string>
+    <string name="main_permission_contacts">QKSMS needs permission to view your contacts</string>
+    <string name="main_permission_allow">Allow</string>
+    <string name="drawer_inbox">Žinutės</string>
+    <string name="drawer_archived">Archyvas</string>
+    <string name="drawer_scheduled">Planuota</string>
+    <string name="drawer_blocking">Blocking</string>
+    <string name="drawer_more">Daugiau</string>
+    <string name="drawer_settings">Nustatymai</string>
+    <string name="drawer_help">Pagalba ir atsiliepimai</string>
+    <string name="drawer_invite">Invite friends</string>
+    <string name="drawer_plus_banner_summary">Unlock amazing new features, and support development</string>
+    <string name="rate_title">Patinka QKSMS?</string>
+    <string name="rate_summary">Įvertink mūsų programėlę Google Play!</string>
+    <string name="rate_okay">OK!</string>
+    <string name="rate_dismiss">ATMESTI</string>
+    <string name="dialog_delete_title">Ištrinti</string>
+    <plurals name="dialog_delete_message">
+        <item quantity="one">Are you sure you would like to delete this conversation?</item>
+        <item quantity="few">Are you sure you would like to delete %d conversations?</item>
+        <item quantity="many">Are you sure you would like to delete %d conversations?</item>
+        <item quantity="other">Are you sure you would like to delete %d conversations?</item>
+    </plurals>
+    <string-array name="message_options">
+        <item>Kopijuoti tekstą</item>
+        <item>Persiųsti</item>
+        <item>Ištrinti</item>
+    </string-array>
+    <string name="compose_number_picker_title">Choose a phone number</string>
+    <string name="compose_number_picker_default">%s ∙ Default</string>
+    <string name="compose_number_picker_once">Just once</string>
+    <string name="compose_number_picker_always">Always</string>
+    <string name="compose_title_selected">%d parinktas</string>
+    <string name="compose_subtitle_results">%1$d of %2$d results</string>
+    <string name="compose_send_group_title">Send as group message</string>
+    <string name="compose_send_group_summary">Recipients and replies will be visible to everyone</string>
+    <string name="compose_messages_empty">Čia jūsų pokalbio pradžios. Pasakykite kažką gražaus!</string>
+    <string name="compose_vcard_label">Contact card</string>
+    <string name="compose_scheduled_for">Scheduled for</string>
+    <string name="compose_scheduled_future">Selected time must be in the future!</string>
+    <string name="compose_scheduled_plus">You must unlock QKSMS+ to use scheduled messaging</string>
+    <string name="compose_scheduled_toast">Added to scheduled messages</string>
+    <string name="compose_hint">Rašyti žinutę...</string>
+    <string name="compose_menu_copy">Kopijuoti tekstą</string>
+    <string name="compose_menu_forward">Persiųsti</string>
+    <string name="compose_menu_delete">Ištrinti</string>
+    <string name="compose_menu_previous">Previous</string>
+    <string name="compose_menu_next">Next</string>
+    <string name="compose_menu_clear">Clear</string>
+    <string name="compose_details_title">Message details</string>
+    <string name="compose_details_type">Type: %s</string>
+    <string name="compose_details_from">From: %s</string>
+    <string name="compose_details_to">To: %s</string>
+    <string name="compose_details_subject">Subject: %s</string>
+    <string name="compose_details_priority">Priority: %s</string>
+    <string name="compose_details_size">Size: %s</string>
+    <string name="compose_details_sent">Sent: %s</string>
+    <string name="compose_details_received">Received: %s</string>
+    <string name="compose_details_delivered">Delivered: %s</string>
+    <string name="compose_details_error_code">Error code: %d</string>
+    <string name="compose_attach_cd">Pridėti priedą</string>
+    <string name="compose_gallery_cd">Pridėti nuotrauką</string>
+    <string name="compose_camera_cd">Padaryti nuotrauką</string>
+    <string name="compose_schedule_cd">Schedule message</string>
+    <string name="compose_contact_cd">Attach a contact</string>
+    <string name="compose_contact_error">Error reading contact</string>
+    <!-- Example: SIM 1 (Verizon) selected-->
+    <string name="compose_sim_changed_toast">SIM %1$d (%2$s) selected</string>
+    <string name="compose_sim_cd">%s selected, change SIM card</string>
+    <string name="compose_send_cd">Siųsti žinutę</string>
+    <string name="message_status_sending">Siunčiama&#8230;</string>
+    <string name="message_status_delivered">Nusiųsta %s</string>
+    <string name="message_status_failed">Nepavyko nusiųsti. Spausk dar kartą norint persiųsti</string>
+    <string name="info_title">Dėtalės</string>
+    <string name="info_copied_address">Address copied</string>
+    <string name="info_name">Conversation title</string>
+    <string name="info_notifications">Pranešimai</string>
+    <string name="info_theme">Tema</string>
+    <string name="info_archive">Archyvuoti</string>
+    <string name="info_unarchive">Išarchyvuoti</string>
+    <string name="info_block">Blokuoti</string>
+    <string name="info_unblock">Atblokuoti</string>
+    <string name="info_delete">Ištrinti pokalbį</string>
+    <string name="gallery_error">Couldn\'t load media</string>
+    <string name="gallery_toast_saved">Saved to gallery</string>
+    <string name="backup_title">Backup and restore</string>
+    <string name="backup_backing_up">Backing up messages</string>
+    <string name="backup_restoring">Restoring from backup</string>
+    <string name="backup_last">Last backup</string>
+    <string name="backup_loading">Loading&#8230;</string>
+    <string name="backup_never">Never</string>
+    <string name="backup_restore_title">Restore</string>
+    <string name="backup_restore_summary">Select a backup</string>
+    <string name="backup_restore_error_plus">Please unlock QKSMS+ to use backup and restore</string>
+    <string name="backup_restore_error_backup">Backup in progress&#8230;</string>
+    <string name="backup_restore_error_restore">Restore in progress&#8230;</string>
+    <string name="backup_restore_confirm_title">Restore from backup</string>
+    <string name="backup_restore_confirm_message">Are you sure you would like to restore your messages from this backup?</string>
+    <string name="backup_restore_stop_title">Stop restore</string>
+    <string name="backup_restore_stop_message">Messages that have already been restored will remain on your device</string>
+    <string name="backup_restore_dialog_title">Backups</string>
+    <string name="backup_restore_dialog_empty">No backups found</string>
+    <plurals name="backup_message_count">
+        <item quantity="one">%d message</item>
+        <item quantity="few">%d messages</item>
+        <item quantity="many">%d messages</item>
+        <item quantity="other">%d messages</item>
+    </plurals>
+    <string name="backup_disclaimer">Currently, only SMS is supported by Backup and Restore. MMS support and scheduled backups will be coming soon!</string>
+    <string name="backup_now">Backup now</string>
+    <string name="backup_progress_parsing">Parsing backup&#8230;</string>
+    <string name="backup_progress_running">%d/%d messages</string>
+    <string name="backup_progress_saving">Saving backup&#8230;</string>
+    <string name="backup_progress_syncing">Syncing messages&#8230;</string>
+    <string name="backup_progress_finished">Finished!</string>
+    <string name="backup_notification_channel_name">Backup and restore</string>
+    <string name="scheduled_title">Scheduled</string>
+    <string name="scheduled_empty_description">Automatically send a message, at the exact moment you\'d like</string>
+    <string name="scheduled_empty_message_1">Hey! When was your birthday again?</string>
+    <string name="scheduled_empty_message_2">It\'s on December 23rd</string>
+    <string name="scheduled_empty_message_3">Happy birthday! Look at what a great friend I am, remembering your birthday</string>
+    <!--&#x200A; is a special character required at the end of this string to fix it's formatting in the app -->
+    <string name="scheduled_empty_message_3_timestamp">Sending on December 23rd </string>
+    <string name="scheduled_compose_cd">Schedule a message</string>
+    <string name="scheduled_options_title">Scheduled message</string>
+    <string-array name="scheduled_options">
+        <item>Send now</item>
+        <item>Copy text</item>
+        <item>Delete</item>
+    </string-array>
+    <string name="settings_category_appearance">Išvaizda</string>
+    <string name="settings_category_general">Bendra</string>
+    <string name="settings_category_qkreply">Greitas atsakas</string>
+    <string name="settings_theme_title">Tema</string>
+    <string name="settings_night_title">Nakties tema</string>
+    <string name="settings_black_title">Visiškai juoda nakties tema</string>
+    <string name="settings_night_start_title">Pradžios laikas</string>
+    <string name="settings_night_end_title">Pabaigos laikas</string>
+    <string name="settings_automatic_colors_title">Automatic contact colors</string>
+    <string name="settings_text_size_title">Šrifto dydis</string>
+    <string name="settings_system_font_title">Naudoti sistemos šriftą</string>
+    <string name="settings_auto_emoji_title">Automatinis emoji</string>
+    <string name="settings_notifications_title">Pranešimai</string>
+    <string name="settings_notifications_o_summary">Tap to customize</string>
+    <string name="settings_notification_actions_title">Actions</string>
+    <string name="settings_notification_action_1">Button 1</string>
+    <string name="settings_notification_action_2">Button 2</string>
+    <string name="settings_notification_action_3">Button 3</string>
+    <string name="settings_notification_previews_title">Pranešimų peržiūra</string>
+    <string name="settings_notification_wake_title">Wake screen</string>
+    <string name="settings_vibration_title">Vibracija</string>
+    <string name="settings_ringtone_title">Garas</string>
+    <string name="settings_ringtone_none">None</string>
+    <string name="settings_qkreply_title">Greitas atsakas</string>
+    <string name="settings_qkreply_summary">Iššokantis langas naujiems pranešimams</string>
+    <string name="settings_qkreply_tap_dismiss_title">Spustelėkite, kad atmestumėte</string>
+    <string name="settings_qkreply_tap_dismiss_summary">Spustelėkite bet kur už iššokamo lango, kad išjungtumėte</string>
+    <string name="settings_delayed_title">Delayed sending</string>
+    <string name="settings_swipe_actions">Swipe actions</string>
+    <string name="settings_swipe_actions_summary">Configure swipe actions for conversations</string>
+    <string name="settings_swipe_actions_right">Right swipe</string>
+    <string name="settings_swipe_actions_left">Left swipe</string>
+    <string name="settings_swipe_actions_change">CHANGE</string>
+    <string-array name="settings_swipe_actions">
+        <item>None</item>
+        <item>Archive</item>
+        <item>Delete</item>
+        <item>Block</item>
+        <item>Call</item>
+        <item>Mark read</item>
+        <item>Mark unread</item>
+    </string-array>
+    <string name="settings_delivery_title">Žinučių pristatymo patvirtinimai</string>
+    <string name="settings_delivery_summary">Patvirtinti, kad pranešimai buvo sėkmingai išsiųsti</string>
+    <string name="settings_signature_title">Signature</string>
+    <string name="settings_signature_summary">Add a signature to the end of your messages</string>
+    <string name="settings_unicode_title">Trinti akcentus</string>
+    <string name="settings_unicode_summary">Ištrinti jūsų SMS žinučių simbolių akcentus</string>
+    <string name="settings_mobile_title">Mobile numbers only</string>
+    <string name="settings_mobile_summary">When composing a message, only show mobile numbers</string>
+    <string name="settings_auto_delete">Delete old messages automatically</string>
+    <string name="settings_auto_delete_dialog_message">Messages will be deleted after the specified number of days</string>
+    <string name="settings_auto_delete_dialog_hint">Number of days</string>
+    <string name="settings_auto_delete_never">Never</string>
+    <string name="settings_auto_delete_warning">Delete old messages automatically?</string>
+    <string name="settings_auto_delete_warning_message">If you proceed, %1$d messages will be deleted now</string>
+    <plurals name="settings_auto_delete_summary">
+        <item quantity="one">After 1 day</item>
+        <item quantity="few">After %d days</item>
+        <item quantity="many">After %d days</item>
+        <item quantity="other">After %d days</item>
+    </plurals>
+    <string name="settings_long_as_mms_title">Send long messages as MMS</string>
+    <string name="settings_long_as_mms_summary">If your longer text messages are failing to send, or sending in the wrong order, you can send them as MMS messages instead. Additional charges may apply</string>
+    <string name="settings_mms_size_title">Auto-compress MMS attachments</string>
+    <string name="settings_sync_title">Sinchronizuoti pranešimus</string>
+    <string name="settings_sync_summary">Iš naujo sinchronizuoti Android pranešimų duomenų bazę</string>
+    <string name="settings_about_title">Apie QKSMS</string>
+    <string name="settings_version">Versija %s</string>
+    <string name="settings_logging_enabled">Debug logging enabled</string>
+    <string name="settings_logging_disabled">Debug logging disabled</string>
+    <string name="settings_delay_duration_hint">Įvesti trukmę (sek.)</string>
+    <string name="blocking_title">Blocking</string>
+    <string name="blocking_drop_title">Drop messages</string>
+    <string name="blocking_drop_summary">Drop incoming messages from blocked senders instead of hiding them</string>
+    <string name="blocking_conversations">Blocked conversations</string>
+    <string name="blocking_manager_title">Blocking Manager</string>
+    <string name="blocking_manager_qksms_title">QKSMS</string>
+    <string name="blocking_manager_qksms_summary">Built-in blocking functionality in QKSMS</string>
+    <string name="blocking_manager_call_control_summary">Automatically filter your calls and messages in one convenient place! Community IQ™ allows you to prevent unwanted messages from community known spammers</string>
+    <string name="blocking_manager_sia_summary">Automatiškai filtruoti žinutes nuo nežinomų numerių su „Ar reikia atsakyti“ programėle</string>
+    <string name="blocking_manager_copy_title">Copy blocked numbers</string>
+    <string name="blocking_manager_copy_summary">Continue to %s and copy over your existing blocked numbers</string>
+    <string name="blocked_numbers_title">Blocked numbers</string>
+    <string name="blocked_numbers_empty">Your blocked numbers will appear here</string>
+    <string name="blocked_numbers_add_cd">Block a new number</string>
+    <string name="blocked_numbers_dialog_title">Block texts from</string>
+    <string name="blocked_numbers_dialog_hint">Phone number</string>
+    <string name="blocked_numbers_dialog_block">Block</string>
+    <string name="blocked_messages_title">Blocked messages</string>
+    <string name="blocked_messages_empty">Your blocked messages will appear here</string>
+    <string name="blocking_block_title">Block</string>
+    <string name="blocking_unblock_title">Unblock</string>
+    <plurals name="blocking_block_external">
+        <item quantity="one">Continue to %s and block this number</item>
+        <item quantity="few">Continue to %s and block these numbers</item>
+        <item quantity="many">Continue to %s and block these numbers</item>
+        <item quantity="other">Continue to %s and block these numbers</item>
+    </plurals>
+    <plurals name="blocking_unblock_external">
+        <item quantity="one">Continue to %s and allow this number</item>
+        <item quantity="few">Continue to %s and allow these numbers</item>
+        <item quantity="many">Continue to %s and allow these numbers</item>
+        <item quantity="other">Continue to %s and allow these numbers</item>
+    </plurals>
+    <string name="about_title">Apie</string>
+    <string name="about_version_title">Versija</string>
+    <string name="about_developer_title">Kūrėjas</string>
+    <string name="about_source_title">Šaltinio kodas</string>
+    <string name="about_changelog_title">Pakeitimų sąrašas</string>
+    <string name="about_contact_title">Kontaktai</string>
+    <string name="about_license_title">Licencija</string>
+    <string name="about_copyright_title">Autorinės teisės</string>
+    <string name="qksms_plus_description_title">Remti programos vystymąsi, atrakinti viską</string>
+    <string name="qksms_plus_description_summary">Galite išsaugoti badaujantį programėlės kūrėją tik už %s</string>
+    <!-- Substitutions are for price and currency. Ex: Lifetime upgrade for $1.99 USD -->
+    <string name="qksms_plus_upgrade">Amžininis programėlės funkcijų atrakinimas %1$s %2$s</string>
+    <!-- Substitutions are for price and currency. Ex: Unlock + donate for $4.99 USD -->
+    <string name="qksms_plus_upgrade_donate">Atrakinti + aukoti %1$s %2$s</string>
+    <string name="qksms_plus_thanks_title">Ačiū už paramą!</string>
+    <string name="qksms_plus_thanks_summary">Dabar jūs turite prieigą prie visoms QKSMS+ funkcijoms</string>
+    <string name="qksms_plus_free_title">QKSMS+ yra nemokama F-Droid vartotojams! Taip pat galite paremti programos kūrėją aukodami.</string>
+    <string name="qksms_plus_donate">Paaukoti per PayPal</string>
+    <string name="qksms_plus_coming_soon">Jau greitai</string>
+    <string name="qksms_plus_themes_title">Premium temos</string>
+    <string name="qksms_plus_themes_summary">Atrakink kitas spalvas, kurios nėra „Material“ paletėje</string>
+    <string name="qksms_plus_emoji_title">Individualizuoti auto-emoji</string>
+    <string name="qksms_plus_emoji_summary">Sukurkite pasirinktinius automatinių emoji sparčiuosius klavišus</string>
+    <string name="qksms_plus_backup_title">Žinučių atsarginis kopijavimas</string>
+    <string name="qksms_plus_backup_summary">Automatinis atsarginių pranešimų kopijavimas. Niekada nerimaukite, kad prarasite žinutes, jei pakeisite telefonus arba pamesite telefoną</string>
+    <string name="qksms_plus_scheduled_title">Planuotos žinutės</string>
+    <string name="qksms_plus_scheduled_summary">Schedule messages to automatically be sent at a specific time and date</string>
+    <string name="qksms_plus_delayed_title">Atidėtas siuntimas</string>
+    <string name="qksms_plus_delayed_summary">Palaukti kelias sekundes prieš išsiųntant pranešimą</string>
+    <string name="qksms_plus_night_title">Automatinė nakties tema</string>
+    <string name="qksms_plus_night_summary">Įjungti naktinį režimą pagal dienos laiką</string>
+    <string name="qksms_plus_blacklist_title">Sudėtingesnis blokavimas</string>
+    <string name="qksms_plus_blacklist_summary">Blokuoti žinutes pagal raktinius žodžius arba šabloninę struktūrą</string>
+    <string name="qksms_plus_forward_title">Automatiškai persiųsti</string>
+    <string name="qksms_plus_forward_summary">Automatiškai persiųsti žinutes nuo tam tikrų siuntėjų</string>
+    <string name="qksms_plus_respond_title">Automatiškai atsakyti</string>
+    <string name="qksms_plus_respond_summary">Automatiškai atsakyti į žinutes su tam tikru atsaku</string>
+    <string name="qksms_plus_more_title">Daugiau</string>
+    <string name="qksms_plus_more_summary">QKSMS is under active development, and your purchase will include all future QKSMS+ features!</string>
+    <string name="widget_loading">Kraunama&#8230;</string>
+    <string name="widget_more">Žiūrėti daugiau pokalbių</string>
+    <string name="qkreply_menu_read">Mark read</string>
+    <string name="qkreply_menu_call">Skambinti</string>
+    <string name="qkreply_menu_delete">Delete</string>
+    <string name="qkreply_menu_expand">Rodyti daugiau</string>
+    <string name="qkreply_menu_collapse">Rodyti mažiau</string>
+    <string name="qkreply_menu_view">Atidaryti pokalbį</string>
+    <string name="theme_material">„Material“ dizainas</string>
+    <string name="theme_hex">HEX kodas</string>
+    <string name="theme_apply">Pritaikyti</string>
+    <string-array name="notification_actions">
+        <item>None</item>
+        <item>Archive</item>
+        <item>Delete</item>
+        <item>Block</item>
+        <item>Call</item>
+        <item>Mark read</item>
+        <item>Reply</item>
+    </string-array>
+    <string name="button_yes">Yes</string>
+    <string name="button_continue">Continue</string>
+    <string name="button_cancel">Atšaukti</string>
+    <string name="button_delete">Ištrinti</string>
+    <string name="button_save">Save</string>
+    <string name="button_stop">Stop</string>
+    <string name="button_more">Daugiau</string>
+    <string name="button_set">Padaryti</string>
+    <string name="button_undo">Anuliuoti</string>
+    <string name="toast_copied">Nukopijuota</string>
+    <string name="toast_archived">Archyvuotas pokalbis</string>
+    <string name="toast_qksms_plus">Reikia turėti QKSMS+ funkcijos naudojomui</string>
+    <plurals name="notification_new_messages">
+        <item quantity="one">Naujas pranešimas</item>
+        <item quantity="few">%s nauji pranešimai</item>
+        <item quantity="many">%s nauji pranešimai</item>
+        <item quantity="other">%s nauji pranešimai</item>
+    </plurals>
+    <string name="notification_message_failed_title">Žinutė neišsiųsta</string>
+    <string name="notification_message_failed_text">Žinutę, skirta %s, išsiųsti nepavyko</string>
+    <string-array name="night_modes">
+        <item>System</item>
+        <item>Disabled</item>
+        <item>Always on</item>
+        <item>Automatic</item>
+    </string-array>
+    <string-array name="notification_preview_options">
+        <item>Rodyti vardą ir žinutę</item>
+        <item>Rodyti vardą</item>
+        <item>Slėpti turinį</item>
+    </string-array>
+    <string-array name="text_sizes">
+        <item>Mažas</item>
+        <item>Normalus</item>
+        <item>Didelis</item>
+        <item>Didžiausias</item>
+    </string-array>
+    <string-array name="delayed_sending_labels">
+        <item>Be delsimo</item>
+        <item>3 seconds</item>
+        <item>5 seconds</item>
+        <item>10 seconds</item>
+    </string-array>
+    <string-array name="mms_sizes">
+        <item>Automatic</item>
+        <item>100KB</item>
+        <item>200KB</item>
+        <item>300KB</item>
+        <item>600KB</item>
+        <item>1000KB</item>
+        <item>2000KB</item>
+        <item>No compression</item>
+    </string-array>
+    <string-array name="qk_responses">
+        <item>Gerai</item>
+        <item>Duokite minutę</item>
+        <item>Tuoj būsiu</item>
+        <item>Ačiū</item>
+        <item>Gerai skamba</item>
+        <item>Kas naujo?</item>
+        <item>Sutinku</item>
+        <item>Ne</item>
+        <item>Myliu tave</item>
+        <item>Atsiprašau</item>
+        <item>HAHA</item>
+        <item>Viskas gerai</item>
+    </string-array>
+</resources>
diff --git a/presentation/src/main/res/values-nb/strings.xml b/presentation/src/main/res/values-nb/strings.xml
index 47ecbf767..a1d69da1f 100644
--- a/presentation/src/main/res/values-nb/strings.xml
+++ b/presentation/src/main/res/values-nb/strings.xml
@@ -1,411 +1,411 @@
-<?xml version="1.0" encoding="utf-8"?>
-<!--
-  ~ Copyright (C) 2019 Moez Bhatti <moez.bhatti@gmail.com>
-  ~
-  ~ This file is part of QKSMS.
-  ~
-  ~ QKSMS is free software: you can redistribute it and/or modify
-  ~ it under the terms of the GNU General Public License as published by
-  ~ the Free Software Foundation, either version 3 of the License, or
-  ~ (at your option) any later version.
-  ~
-  ~ QKSMS is distributed in the hope that it will be useful,
-  ~ but WITHOUT ANY WARRANTY; without even the implied warranty of
-  ~ MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
-  ~ GNU General Public License for more details.
-  ~
-  ~ You should have received a copy of the GNU General Public License
-  ~ along with QKSMS.  If not, see <http://www.gnu.org/licenses/>.
-  -->
-<resources>
-    <string name="shortcut_compose_long_label">Ny samtale</string>
-    <string name="shortcut_compose_short_label">Skriv</string>
-    <string name="shortcut_compose_disabled_message">Snarvei deaktivert</string>
-    <string name="title_archived">Arkivert</string>
-    <string name="title_settings">Innstillinger</string>
-    <string name="title_notification_prefs">Varsler</string>
-    <string name="title_theme">Drakt</string>
-    <string name="title_conversations">Søk i innboks &#8230;</string>
-    <string name="title_compose">Skriv navn eller nummer</string>
-    <string name="setup_skip">Hopp over</string>
-    <string name="setup_next">Fortsett</string>
-    <string name="menu_add_person">Add person</string>
-    <string name="menu_call">Ring</string>
-    <string name="menu_info">Detaljer</string>
-    <string name="menu_save">Lagre til galleri</string>
-    <string name="menu_share">Share</string>
-    <string name="main_drawer_open_cd">Åpne navigasjonsskuff</string>
-    <string name="main_title_selected">%d valgt</string>
-    <string name="main_menu_clear">Tøm</string>
-    <string name="main_menu_archive">Arkiv</string>
-    <string name="main_menu_unarchive">Fjern fra arkiv</string>
-    <string name="main_menu_delete">Slett</string>
-    <string name="main_menu_add_contact">Add to contacts</string>
-    <string name="main_menu_pin">Fest øverst</string>
-    <string name="main_menu_unpin">Løsne</string>
-    <string name="main_menu_read">Mark read</string>
-    <string name="main_menu_unread">Mark unread</string>
-    <string name="main_menu_block">Blokker</string>
-    <string name="main_syncing">Synkroniserer meldinger&#8230;</string>
-    <string name="main_sender_you">Du: %s</string>
-    <string name="main_draft">Draft</string>
-    <string name="main_message_results_title">Resultater i meldinger</string>
-    <string name="main_message_results">%d meldinger</string>
-    <string name="inbox_empty_text">Samtalene dine vises her</string>
-    <string name="inbox_search_empty_text">Ingen treff</string>
-    <string name="archived_empty_text">Arkiverte samtaler vises her</string>
-    <string name="main_fab_cd">Start ny samtale</string>
-    <string name="main_default_sms_title">Elsk teksting igjen</string>
-    <string name="main_default_sms_message">Gjør QKSMS til standard SMS-app</string>
-    <string name="main_default_sms_change">Endre</string>
-    <string name="main_permission_required">Tillatelse kreves</string>
-    <string name="main_permission_sms">QKSMS trenger tillatelse til å sende og vise tekstmeldinger</string>
-    <string name="main_permission_contacts">QKSMS trenger tillatelse til å lese kontaktene dine</string>
-    <string name="main_permission_allow">Tillat</string>
-    <string name="drawer_inbox">Innboks</string>
-    <string name="drawer_archived">Arkivert</string>
-    <string name="drawer_scheduled">Planlagt</string>
-    <string name="drawer_blocking">Blokkert</string>
-    <string name="drawer_more">Mer</string>
-    <string name="drawer_settings">Innstillinger</string>
-    <string name="drawer_help">Hjelp og tilbakemelding</string>
-    <string name="drawer_invite">Inviter venner</string>
-    <string name="drawer_plus_banner_summary">Aktiver fantastiske nye funksjoner og støtt utviklingen</string>
-    <string name="rate_title">Liker du QKSMS?</string>
-    <string name="rate_summary">Del litt kjærlighet og vurder oss på Google Play!</string>
-    <string name="rate_okay">Ok!</string>
-    <string name="rate_dismiss">Avvis</string>
-    <string name="dialog_delete_title">Slett</string>
-    <plurals name="dialog_delete_message">
-        <item quantity="one">Er du sikker på at du vil slette samtalen?</item>
-        <item quantity="other">Er du sikker på at du vil slette %d samtaler?</item>
-    </plurals>
-    <string-array name="message_options">
-        <item>Kopier tekst</item>
-        <item>Videresend</item>
-        <item>Slett</item>
-    </string-array>
-    <string name="compose_number_picker_title">Choose a phone number</string>
-    <string name="compose_number_picker_default">%s ∙ Default</string>
-    <string name="compose_number_picker_once">Just once</string>
-    <string name="compose_number_picker_always">Always</string>
-    <string name="compose_title_selected">%d valgt</string>
-    <string name="compose_subtitle_results">%1$d av %2$d funn</string>
-    <string name="compose_send_group_title">Send som gruppemelding</string>
-    <string name="compose_send_group_summary">Mottakere og svar er synlig for alle</string>
-    <string name="compose_messages_empty">Nå starter samtalen. Si noe hyggelig!</string>
-    <string name="compose_vcard_label">Kontakt</string>
-    <string name="compose_scheduled_for">Planlagt for</string>
-    <string name="compose_scheduled_future">Valgt tid må være i fremtid.</string>
-    <string name="compose_scheduled_plus">Du må ha QKSMS+ for å kunne bruke planlagte meldinger</string>
-    <string name="compose_scheduled_toast">Lagt til planlagte meldinger</string>
-    <string name="compose_hint">Skriv en melding</string>
-    <string name="compose_menu_copy">Kopier tekst</string>
-    <string name="compose_menu_forward">Videresend</string>
-    <string name="compose_menu_delete">Slett</string>
-    <string name="compose_menu_previous">Forrige</string>
-    <string name="compose_menu_next">Neste</string>
-    <string name="compose_menu_clear">Tøm</string>
-    <string name="compose_details_title">Meldingsinformasjon</string>
-    <string name="compose_details_type">Type: %s</string>
-    <string name="compose_details_from">Fra: %s</string>
-    <string name="compose_details_to">Til: %s</string>
-    <string name="compose_details_subject">Emne: %s</string>
-    <string name="compose_details_priority">Prioritet: %s</string>
-    <string name="compose_details_size">Størrelse: %s</string>
-    <string name="compose_details_sent">Sendt: %s</string>
-    <string name="compose_details_received">Mottatt: %s</string>
-    <string name="compose_details_delivered">Levert: %s</string>
-    <string name="compose_details_error_code">Feilkode: %d</string>
-    <string name="compose_attach_cd">Legg til vedlegg</string>
-    <string name="compose_gallery_cd">Legg til bilde</string>
-    <string name="compose_camera_cd">Ta bilde</string>
-    <string name="compose_schedule_cd">Planlegg melding</string>
-    <string name="compose_contact_cd">Legg til kontakt</string>
-    <string name="compose_contact_error">Feil ved åpning av kontakt</string>
-    <!-- Example: SIM 1 (Verizon) selected-->
-    <string name="compose_sim_changed_toast">SIM %1$d (%2$s) selected</string>
-    <string name="compose_sim_cd">%s er valgt, velg annet SIM-kort</string>
-    <string name="compose_send_cd">Send melding</string>
-    <string name="message_status_sending">Sender &#8230;</string>
-    <string name="message_status_delivered">Levert %s</string>
-    <string name="message_status_failed">Feil ved sending. Trykk for å prøve igjen</string>
-    <string name="info_title">Detaljer</string>
-    <string name="info_copied_address">Address copied</string>
-    <string name="info_name">Tittel på samtalen</string>
-    <string name="info_notifications">Varsler</string>
-    <string name="info_theme">Drakt</string>
-    <string name="info_archive">Arkiv</string>
-    <string name="info_unarchive">Fjern fra arkiv</string>
-    <string name="info_block">Blokker</string>
-    <string name="info_unblock">Ta bort blokkering</string>
-    <string name="info_delete">Slett samtale</string>
-    <string name="gallery_error">Media kunne ikke lastes</string>
-    <string name="gallery_toast_saved">Lagret i galleriet</string>
-    <string name="backup_title">Sikret</string>
-    <string name="backup_backing_up">Sikkerhetskopierer meldinger</string>
-    <string name="backup_restoring">Gjenoppretter fra sikkerhetskopi</string>
-    <string name="backup_last">Siste sikkerhetskopi</string>
-    <string name="backup_loading">Henter &#8230;</string>
-    <string name="backup_never">Aldri</string>
-    <string name="backup_restore_title">Gjenopprett</string>
-    <string name="backup_restore_summary">Velg en sikkerhetskopi</string>
-    <string name="backup_restore_error_plus">Vennligst aktiver QKSMS+ for å bruke sikkerhetskopiering og gjenoppretting</string>
-    <string name="backup_restore_error_backup">Sikkerhetskopiering pågår &#8230;</string>
-    <string name="backup_restore_error_restore">Gjenoppretting pågår &#8230;</string>
-    <string name="backup_restore_confirm_title">Gjenopprett fra sikkerhetskopi</string>
-    <string name="backup_restore_confirm_message">Er du sikker på at du vil gjenopprette meldinger fra denne sikkerhetskopien?</string>
-    <string name="backup_restore_stop_title">Avbryt gjenoppretting</string>
-    <string name="backup_restore_stop_message">Meldinger som allerede er gjenopprettet vil forbli på din enhet</string>
-    <string name="backup_restore_dialog_title">Sikkerhetskopier</string>
-    <string name="backup_restore_dialog_empty">Fant ingen sikkerhetskopier</string>
-    <plurals name="backup_message_count">
-        <item quantity="one">%d melding</item>
-        <item quantity="other">%d meldinger</item>
-    </plurals>
-    <string name="backup_disclaimer">Per idag er bare mulig å sikkerhetskopiere SMS. MMS og planlagte sikkerhetskopier kommer snart.</string>
-    <string name="backup_now">Sikkerhetskopier nå</string>
-    <string name="backup_progress_parsing">Ser gjennom sikkerhetskopien &#8230;</string>
-    <string name="backup_progress_running">%d/%d meldinger</string>
-    <string name="backup_progress_saving">Lagrer sikkerhetskopi &#8230;</string>
-    <string name="backup_progress_syncing">Synkroniserer meldinger &#8230;</string>
-    <string name="backup_progress_finished">Ferdig!</string>
-    <string name="backup_notification_channel_name">Sikkerhetskopiering og gjenoppretting</string>
-    <string name="scheduled_title">Planlagt</string>
-    <string name="scheduled_empty_description">Send automatisk en melding på det tidspunktet du ønsker</string>
-    <string name="scheduled_empty_message_1">Hei! Når var fødselsdagen din igjen?</string>
-    <string name="scheduled_empty_message_2">Den er på 23. desember</string>
-    <string name="scheduled_empty_message_3">Gratulerer med dagen! For en god venn jeg er som husker på bursdagen din</string>
-    <!--&#x200A; is a special character required at the end of this string to fix it's formatting in the app -->
-    <string name="scheduled_empty_message_3_timestamp">Sender den 23. desember</string>
-    <string name="scheduled_compose_cd">Planlegg en melding</string>
-    <string name="scheduled_options_title">Planlagt melding</string>
-    <string-array name="scheduled_options">
-        <item>Send nå</item>
-        <item>Copy text</item>
-        <item>Delete</item>
-    </string-array>
-    <string name="settings_category_appearance">Utseende</string>
-    <string name="settings_category_general">Generelt</string>
-    <string name="settings_category_qkreply">Raskt svar</string>
-    <string name="settings_theme_title">Drakt</string>
-    <string name="settings_night_title">Nattmodus</string>
-    <string name="settings_black_title">Ren svart nattmodus</string>
-    <string name="settings_night_start_title">Starttid</string>
-    <string name="settings_night_end_title">Sluttidspunkt</string>
-    <string name="settings_automatic_colors_title">Automatic contact colors</string>
-    <string name="settings_text_size_title">Skriftstørrelse</string>
-    <string name="settings_system_font_title">Bruk systemskrift</string>
-    <string name="settings_auto_emoji_title">Automatisk emoji</string>
-    <string name="settings_notifications_title">Varsler</string>
-    <string name="settings_notifications_o_summary">Trykk for å tilpasse</string>
-    <string name="settings_notification_actions_title">Handlinger</string>
-    <string name="settings_notification_action_1">Knapp 1</string>
-    <string name="settings_notification_action_2">Knapp 2</string>
-    <string name="settings_notification_action_3">Knapp 3</string>
-    <string name="settings_notification_previews_title">Forhåndsvisninger av varsler</string>
-    <string name="settings_notification_wake_title">Wake screen</string>
-    <string name="settings_vibration_title">Vibrasjon</string>
-    <string name="settings_ringtone_title">Lyd</string>
-    <string name="settings_ringtone_none">Ingen</string>
-    <string name="settings_qkreply_title">Raskt svar</string>
-    <string name="settings_qkreply_summary">Sprettopp-vindu ved nye meldinger</string>
-    <string name="settings_qkreply_tap_dismiss_title">Trykk for å forkaste</string>
-    <string name="settings_qkreply_tap_dismiss_summary">Trykk hvor som helst utenfor sprettopp-vinduet for å lukke det</string>
-    <string name="settings_delayed_title">Forsinket sending</string>
-    <string name="settings_swipe_actions">Sveipe-handlinger</string>
-    <string name="settings_swipe_actions_summary">Still inn sveipe-handlinger for samtaler</string>
-    <string name="settings_swipe_actions_right">Høyre-sveip</string>
-    <string name="settings_swipe_actions_left">Venstre-sveip</string>
-    <string name="settings_swipe_actions_change">Endring</string>
-    <string-array name="settings_swipe_actions">
-        <item>Ingen</item>
-        <item>Arkivér</item>
-        <item>Slett</item>
-        <item>Block</item>
-        <item>Call</item>
-        <item>Mark read</item>
-        <item>Mark unread</item>
-    </string-array>
-    <string name="settings_delivery_title">Leveringsbekreftelse</string>
-    <string name="settings_delivery_summary">Bekreft at melding ble sendt</string>
-    <string name="settings_signature_title">Signatur</string>
-    <string name="settings_signature_summary">Add a signature to the end of your messages</string>
-    <string name="settings_unicode_title">Ta bort akutt-tegn</string>
-    <string name="settings_unicode_summary">Ta bort akutt-tegn fra utgående meldinger</string>
-    <string name="settings_mobile_title">Kun mobilnummre</string>
-    <string name="settings_mobile_summary">Vis kun mobilnummre når du skriver ny melding</string>
-    <string name="settings_auto_delete">Delete old messages automatically</string>
-    <string name="settings_auto_delete_dialog_message">Messages will be deleted after the specified number of days</string>
-    <string name="settings_auto_delete_dialog_hint">Number of days</string>
-    <string name="settings_auto_delete_never">Never</string>
-    <string name="settings_auto_delete_warning">Delete old messages automatically?</string>
-    <string name="settings_auto_delete_warning_message">If you proceed, %1$d messages will be deleted now</string>
-    <plurals name="settings_auto_delete_summary">
-        <item quantity="one">After 1 day</item>
-        <item quantity="other">After %d days</item>
-    </plurals>
-    <string name="settings_long_as_mms_title">Send long messages as MMS</string>
-    <string name="settings_long_as_mms_summary">If your longer text messages are failing to send, or sending in the wrong order, you can send them as MMS messages instead. Additional charges may apply</string>
-    <string name="settings_mms_size_title">Komprimer MMS-vedlegg</string>
-    <string name="settings_sync_title">Synkroniser meldinger</string>
-    <string name="settings_sync_summary">Resynkroniser meldinger med Androids interne meldingslager</string>
-    <string name="settings_about_title">Om QKSMS</string>
-    <string name="settings_version">Versjon %s</string>
-    <string name="settings_logging_enabled">Feillogg aktivert</string>
-    <string name="settings_logging_disabled">Feillogg deaktivert</string>
-    <string name="settings_delay_duration_hint">Legg inn forsinkelse (i sekunder)</string>
-    <string name="blocking_title">Blocking</string>
-    <string name="blocking_drop_title">Forkast meldinger</string>
-    <string name="blocking_drop_summary">Forkast meldinger fra blokkerte sendere istedenfor å skjule dem</string>
-    <string name="blocking_conversations">Blokkerte samtaler</string>
-    <string name="blocking_manager_title">Blokkeringer</string>
-    <string name="blocking_manager_qksms_title">QKSMS</string>
-    <string name="blocking_manager_qksms_summary">Innebygd blokkeringsfunksjon i QKSMS</string>
-    <string name="blocking_manager_call_control_summary">Filtrer anrop og meldinger automatisk. Fellesskapets intelligens™ hjelper med å forhindre uønskede henvendelser fra plageånder</string>
-    <string name="blocking_manager_sia_summary">Filtrer meldinger fra ukjente numre automatisk med \"Skal jeg svare\"-appen</string>
-    <string name="blocking_manager_copy_title">Kopier blokkerte numre</string>
-    <string name="blocking_manager_copy_summary">Fortsett med %s og kopier eksisterende blokkerte numre</string>
-    <string name="blocked_numbers_title">Blokkerte numre</string>
-    <string name="blocked_numbers_empty">Blokkerte numre vil vises her</string>
-    <string name="blocked_numbers_add_cd">Blokker et nytt nummer</string>
-    <string name="blocked_numbers_dialog_title">Blokker meldinger fra</string>
-    <string name="blocked_numbers_dialog_hint">Telefonnummer</string>
-    <string name="blocked_numbers_dialog_block">Block</string>
-    <string name="blocked_messages_title">Blokkerte meldinger</string>
-    <string name="blocked_messages_empty">Blokkerte meldinger vil vises her</string>
-    <string name="blocking_block_title">Block</string>
-    <string name="blocking_unblock_title">Unblock</string>
-    <plurals name="blocking_block_external">
-        <item quantity="one">Fortsett til %s og blokker nummeret</item>
-        <item quantity="other">Fortsett til %s og blokker numrene</item>
-    </plurals>
-    <plurals name="blocking_unblock_external">
-        <item quantity="one">Fortsett til %s og tillat nummeret</item>
-        <item quantity="other">Fortsett til %s og tillat numrene</item>
-    </plurals>
-    <string name="about_title">Om</string>
-    <string name="about_version_title">Versjon</string>
-    <string name="about_developer_title">Utvikler</string>
-    <string name="about_source_title">Kildekode</string>
-    <string name="about_changelog_title">Endringslogg</string>
-    <string name="about_contact_title">Kontakt</string>
-    <string name="about_license_title">Lisens</string>
-    <string name="about_copyright_title">Opphavsrett</string>
-    <string name="qksms_plus_description_title">Støtt utviklingen, aktiver alle funksjoner</string>
-    <string name="qksms_plus_description_summary">Du kan redde en sultende programmerer for bare %s</string>
-    <!-- Substitutions are for price and currency. Ex: Lifetime upgrade for $1.99 USD -->
-    <string name="qksms_plus_upgrade">Oppdateringer på livstid for %1$s %2$s</string>
-    <!-- Substitutions are for price and currency. Ex: Unlock + donate for $4.99 USD -->
-    <string name="qksms_plus_upgrade_donate">Aktiver + donér for %1$s %2$s</string>
-    <string name="qksms_plus_thanks_title">Takk for at du støtter QKSMS!</string>
-    <string name="qksms_plus_thanks_summary">Du har nå tilgang til alle funksjoner i QKSMS+</string>
-    <string name="qksms_plus_free_title">QKSMS+ er gratis for F-Droid-brukere. Om du ønsker å støtte utviklingen, kan du gjerne donere.</string>
-    <string name="qksms_plus_donate">Donér med PayPal</string>
-    <string name="qksms_plus_coming_soon">Kommer snart</string>
-    <string name="qksms_plus_themes_title">Premium drakter</string>
-    <string name="qksms_plus_themes_summary">Aktiver vakre draktfarger som ikke er tilgjengelig i Material-design-paletten</string>
-    <string name="qksms_plus_emoji_title">Egne auto-emoji</string>
-    <string name="qksms_plus_emoji_summary">Lag egne auto-emoji snarveier</string>
-    <string name="qksms_plus_backup_title">Sikkerhetskopi av meldinger</string>
-    <string name="qksms_plus_backup_summary">Automatisk sikkerhetskopiering av dine meldinger. Slutt på bekymringer om å miste dine meldinger når du bytter telefon eller mister den</string>
-    <string name="qksms_plus_scheduled_title">Planlagte meldinger</string>
-    <string name="qksms_plus_scheduled_summary">Planlegg at meldinger sendes automatisk ved en tid og dato</string>
-    <string name="qksms_plus_delayed_title">Forsinket sending</string>
-    <string name="qksms_plus_delayed_summary">Vent noen sekunder før meldingen sendes</string>
-    <string name="qksms_plus_night_title">Automatisk nattmodus</string>
-    <string name="qksms_plus_night_summary">Aktiver nattmodus basert på tid på døgnet</string>
-    <string name="qksms_plus_blacklist_title">Avansert blokkering</string>
-    <string name="qksms_plus_blacklist_summary">Blokker meldinger som inneholder visse stikkord eller mønstre</string>
-    <string name="qksms_plus_forward_title">Auto-videresend</string>
-    <string name="qksms_plus_forward_summary">Videresend meldinger fra gitte avsendere automatisk</string>
-    <string name="qksms_plus_respond_title">Auto-svar</string>
-    <string name="qksms_plus_respond_summary">Svar på innkommende meldinger automatisk med et forhåndsdefinert svar</string>
-    <string name="qksms_plus_more_title">Mer</string>
-    <string name="qksms_plus_more_summary">QKSMS er i stadig utvikling og ditt kjøp inkluderer alle fremtidige QKSMS+ funksjoner!</string>
-    <string name="widget_loading">Laster inn &#8230;</string>
-    <string name="widget_more">Last inn flere samtaler</string>
-    <string name="qkreply_menu_read">Mark read</string>
-    <string name="qkreply_menu_call">Ring</string>
-    <string name="qkreply_menu_delete">Slett</string>
-    <string name="qkreply_menu_expand">Vis mer</string>
-    <string name="qkreply_menu_collapse">Vis mindre</string>
-    <string name="qkreply_menu_view">Åpne samtale</string>
-    <string name="theme_material">Material</string>
-    <string name="theme_hex">HEX</string>
-    <string name="theme_apply">Bruk</string>
-    <string-array name="notification_actions">
-        <item>Ingen</item>
-        <item>Archive</item>
-        <item>Delete</item>
-        <item>Block</item>
-        <item>Call</item>
-        <item>Mark read</item>
-        <item>Reply</item>
-    </string-array>
-    <string name="button_yes">Ja</string>
-    <string name="button_continue">Continue</string>
-    <string name="button_cancel">Avbryt</string>
-    <string name="button_delete">Slett</string>
-    <string name="button_save">Lagre</string>
-    <string name="button_stop">Avbryt</string>
-    <string name="button_more">Mer</string>
-    <string name="button_set">Angi</string>
-    <string name="button_undo">Angre</string>
-    <string name="toast_copied">Kopiert</string>
-    <string name="toast_archived">Arkiverte samtaler</string>
-    <string name="toast_qksms_plus">Du må aktivere QKSMS+ for å bruke dette</string>
-    <plurals name="notification_new_messages">
-        <item quantity="one">Ny melding</item>
-        <item quantity="other">%s nye meldinger</item>
-    </plurals>
-    <string name="notification_message_failed_title">Meldingen ble ikke sendt</string>
-    <string name="notification_message_failed_text">Meldingen til %s kunne ikke sendes</string>
-    <string-array name="night_modes">
-        <item>System</item>
-        <item>Deaktivert</item>
-        <item>Aktivert</item>
-        <item>Automatisk</item>
-    </string-array>
-    <string-array name="notification_preview_options">
-        <item>Vis navn og melding</item>
-        <item>Vis navn</item>
-        <item>Skjul innhold</item>
-    </string-array>
-    <string-array name="text_sizes">
-        <item>Liten</item>
-        <item>Standard</item>
-        <item>Stor</item>
-        <item>Større</item>
-    </string-array>
-    <string-array name="delayed_sending_labels">
-        <item>Ingen forsinkelse</item>
-        <item>3 seconds</item>
-        <item>5 seconds</item>
-        <item>10 seconds</item>
-    </string-array>
-    <string-array name="mms_sizes">
-        <item>Automatic</item>
-        <item>100KB</item>
-        <item>200KB</item>
-        <item>300KB</item>
-        <item>600KB</item>
-        <item>1000KB</item>
-        <item>2000KB</item>
-        <item>No compression</item>
-    </string-array>
-    <string-array name="qk_responses">
-        <item>Ok</item>
-        <item>Vent litt</item>
-        <item>Er på vei</item>
-        <item>Takk</item>
-        <item>Høres bra ut</item>
-        <item>Skjer\'a?</item>
-        <item>I orden</item>
-        <item>Nei</item>
-        <item>Glad i deg</item>
-        <item>Beklager</item>
-        <item>LOL</item>
-        <item>Det er greit</item>
-    </string-array>
-</resources>
+<?xml version="1.0" encoding="utf-8"?>
+<!--
+  ~ Copyright (C) 2019 Moez Bhatti <moez.bhatti@gmail.com>
+  ~
+  ~ This file is part of QKSMS.
+  ~
+  ~ QKSMS is free software: you can redistribute it and/or modify
+  ~ it under the terms of the GNU General Public License as published by
+  ~ the Free Software Foundation, either version 3 of the License, or
+  ~ (at your option) any later version.
+  ~
+  ~ QKSMS is distributed in the hope that it will be useful,
+  ~ but WITHOUT ANY WARRANTY; without even the implied warranty of
+  ~ MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+  ~ GNU General Public License for more details.
+  ~
+  ~ You should have received a copy of the GNU General Public License
+  ~ along with QKSMS.  If not, see <http://www.gnu.org/licenses/>.
+  -->
+<resources>
+    <string name="shortcut_compose_long_label">Ny samtale</string>
+    <string name="shortcut_compose_short_label">Skriv</string>
+    <string name="shortcut_compose_disabled_message">Snarvei deaktivert</string>
+    <string name="title_archived">Arkivert</string>
+    <string name="title_settings">Innstillinger</string>
+    <string name="title_notification_prefs">Varsler</string>
+    <string name="title_theme">Drakt</string>
+    <string name="title_conversations">Søk i innboks &#8230;</string>
+    <string name="title_compose">Skriv navn eller nummer</string>
+    <string name="setup_skip">Hopp over</string>
+    <string name="setup_next">Fortsett</string>
+    <string name="menu_add_person">Add person</string>
+    <string name="menu_call">Ring</string>
+    <string name="menu_info">Detaljer</string>
+    <string name="menu_save">Lagre til galleri</string>
+    <string name="menu_share">Share</string>
+    <string name="main_drawer_open_cd">Åpne navigasjonsskuff</string>
+    <string name="main_title_selected">%d valgt</string>
+    <string name="main_menu_clear">Tøm</string>
+    <string name="main_menu_archive">Arkiv</string>
+    <string name="main_menu_unarchive">Fjern fra arkiv</string>
+    <string name="main_menu_delete">Slett</string>
+    <string name="main_menu_add_contact">Add to contacts</string>
+    <string name="main_menu_pin">Fest øverst</string>
+    <string name="main_menu_unpin">Løsne</string>
+    <string name="main_menu_read">Mark read</string>
+    <string name="main_menu_unread">Mark unread</string>
+    <string name="main_menu_block">Blokker</string>
+    <string name="main_syncing">Synkroniserer meldinger&#8230;</string>
+    <string name="main_sender_you">Du: %s</string>
+    <string name="main_draft">Draft</string>
+    <string name="main_message_results_title">Resultater i meldinger</string>
+    <string name="main_message_results">%d meldinger</string>
+    <string name="inbox_empty_text">Samtalene dine vises her</string>
+    <string name="inbox_search_empty_text">Ingen treff</string>
+    <string name="archived_empty_text">Arkiverte samtaler vises her</string>
+    <string name="main_fab_cd">Start ny samtale</string>
+    <string name="main_default_sms_title">Elsk teksting igjen</string>
+    <string name="main_default_sms_message">Gjør QKSMS til standard SMS-app</string>
+    <string name="main_default_sms_change">Endre</string>
+    <string name="main_permission_required">Tillatelse kreves</string>
+    <string name="main_permission_sms">QKSMS trenger tillatelse til å sende og vise tekstmeldinger</string>
+    <string name="main_permission_contacts">QKSMS trenger tillatelse til å lese kontaktene dine</string>
+    <string name="main_permission_allow">Tillat</string>
+    <string name="drawer_inbox">Innboks</string>
+    <string name="drawer_archived">Arkivert</string>
+    <string name="drawer_scheduled">Planlagt</string>
+    <string name="drawer_blocking">Blokkert</string>
+    <string name="drawer_more">Mer</string>
+    <string name="drawer_settings">Innstillinger</string>
+    <string name="drawer_help">Hjelp og tilbakemelding</string>
+    <string name="drawer_invite">Inviter venner</string>
+    <string name="drawer_plus_banner_summary">Aktiver fantastiske nye funksjoner og støtt utviklingen</string>
+    <string name="rate_title">Liker du QKSMS?</string>
+    <string name="rate_summary">Del litt kjærlighet og vurder oss på Google Play!</string>
+    <string name="rate_okay">Ok!</string>
+    <string name="rate_dismiss">Avvis</string>
+    <string name="dialog_delete_title">Slett</string>
+    <plurals name="dialog_delete_message">
+        <item quantity="one">Er du sikker på at du vil slette samtalen?</item>
+        <item quantity="other">Er du sikker på at du vil slette %d samtaler?</item>
+    </plurals>
+    <string-array name="message_options">
+        <item>Kopier tekst</item>
+        <item>Videresend</item>
+        <item>Slett</item>
+    </string-array>
+    <string name="compose_number_picker_title">Choose a phone number</string>
+    <string name="compose_number_picker_default">%s ∙ Default</string>
+    <string name="compose_number_picker_once">Just once</string>
+    <string name="compose_number_picker_always">Always</string>
+    <string name="compose_title_selected">%d valgt</string>
+    <string name="compose_subtitle_results">%1$d av %2$d funn</string>
+    <string name="compose_send_group_title">Send som gruppemelding</string>
+    <string name="compose_send_group_summary">Mottakere og svar er synlig for alle</string>
+    <string name="compose_messages_empty">Nå starter samtalen. Si noe hyggelig!</string>
+    <string name="compose_vcard_label">Kontakt</string>
+    <string name="compose_scheduled_for">Planlagt for</string>
+    <string name="compose_scheduled_future">Valgt tid må være i fremtid.</string>
+    <string name="compose_scheduled_plus">Du må ha QKSMS+ for å kunne bruke planlagte meldinger</string>
+    <string name="compose_scheduled_toast">Lagt til planlagte meldinger</string>
+    <string name="compose_hint">Skriv en melding</string>
+    <string name="compose_menu_copy">Kopier tekst</string>
+    <string name="compose_menu_forward">Videresend</string>
+    <string name="compose_menu_delete">Slett</string>
+    <string name="compose_menu_previous">Forrige</string>
+    <string name="compose_menu_next">Neste</string>
+    <string name="compose_menu_clear">Tøm</string>
+    <string name="compose_details_title">Meldingsinformasjon</string>
+    <string name="compose_details_type">Type: %s</string>
+    <string name="compose_details_from">Fra: %s</string>
+    <string name="compose_details_to">Til: %s</string>
+    <string name="compose_details_subject">Emne: %s</string>
+    <string name="compose_details_priority">Prioritet: %s</string>
+    <string name="compose_details_size">Størrelse: %s</string>
+    <string name="compose_details_sent">Sendt: %s</string>
+    <string name="compose_details_received">Mottatt: %s</string>
+    <string name="compose_details_delivered">Levert: %s</string>
+    <string name="compose_details_error_code">Feilkode: %d</string>
+    <string name="compose_attach_cd">Legg til vedlegg</string>
+    <string name="compose_gallery_cd">Legg til bilde</string>
+    <string name="compose_camera_cd">Ta bilde</string>
+    <string name="compose_schedule_cd">Planlegg melding</string>
+    <string name="compose_contact_cd">Legg til kontakt</string>
+    <string name="compose_contact_error">Feil ved åpning av kontakt</string>
+    <!-- Example: SIM 1 (Verizon) selected-->
+    <string name="compose_sim_changed_toast">SIM %1$d (%2$s) selected</string>
+    <string name="compose_sim_cd">%s er valgt, velg annet SIM-kort</string>
+    <string name="compose_send_cd">Send melding</string>
+    <string name="message_status_sending">Sender &#8230;</string>
+    <string name="message_status_delivered">Levert %s</string>
+    <string name="message_status_failed">Feil ved sending. Trykk for å prøve igjen</string>
+    <string name="info_title">Detaljer</string>
+    <string name="info_copied_address">Address copied</string>
+    <string name="info_name">Tittel på samtalen</string>
+    <string name="info_notifications">Varsler</string>
+    <string name="info_theme">Drakt</string>
+    <string name="info_archive">Arkiv</string>
+    <string name="info_unarchive">Fjern fra arkiv</string>
+    <string name="info_block">Blokker</string>
+    <string name="info_unblock">Ta bort blokkering</string>
+    <string name="info_delete">Slett samtale</string>
+    <string name="gallery_error">Media kunne ikke lastes</string>
+    <string name="gallery_toast_saved">Lagret i galleriet</string>
+    <string name="backup_title">Sikret</string>
+    <string name="backup_backing_up">Sikkerhetskopierer meldinger</string>
+    <string name="backup_restoring">Gjenoppretter fra sikkerhetskopi</string>
+    <string name="backup_last">Siste sikkerhetskopi</string>
+    <string name="backup_loading">Henter &#8230;</string>
+    <string name="backup_never">Aldri</string>
+    <string name="backup_restore_title">Gjenopprett</string>
+    <string name="backup_restore_summary">Velg en sikkerhetskopi</string>
+    <string name="backup_restore_error_plus">Vennligst aktiver QKSMS+ for å bruke sikkerhetskopiering og gjenoppretting</string>
+    <string name="backup_restore_error_backup">Sikkerhetskopiering pågår &#8230;</string>
+    <string name="backup_restore_error_restore">Gjenoppretting pågår &#8230;</string>
+    <string name="backup_restore_confirm_title">Gjenopprett fra sikkerhetskopi</string>
+    <string name="backup_restore_confirm_message">Er du sikker på at du vil gjenopprette meldinger fra denne sikkerhetskopien?</string>
+    <string name="backup_restore_stop_title">Avbryt gjenoppretting</string>
+    <string name="backup_restore_stop_message">Meldinger som allerede er gjenopprettet vil forbli på din enhet</string>
+    <string name="backup_restore_dialog_title">Sikkerhetskopier</string>
+    <string name="backup_restore_dialog_empty">Fant ingen sikkerhetskopier</string>
+    <plurals name="backup_message_count">
+        <item quantity="one">%d melding</item>
+        <item quantity="other">%d meldinger</item>
+    </plurals>
+    <string name="backup_disclaimer">Per idag er bare mulig å sikkerhetskopiere SMS. MMS og planlagte sikkerhetskopier kommer snart.</string>
+    <string name="backup_now">Sikkerhetskopier nå</string>
+    <string name="backup_progress_parsing">Ser gjennom sikkerhetskopien &#8230;</string>
+    <string name="backup_progress_running">%d/%d meldinger</string>
+    <string name="backup_progress_saving">Lagrer sikkerhetskopi &#8230;</string>
+    <string name="backup_progress_syncing">Synkroniserer meldinger &#8230;</string>
+    <string name="backup_progress_finished">Ferdig!</string>
+    <string name="backup_notification_channel_name">Sikkerhetskopiering og gjenoppretting</string>
+    <string name="scheduled_title">Planlagt</string>
+    <string name="scheduled_empty_description">Send automatisk en melding på det tidspunktet du ønsker</string>
+    <string name="scheduled_empty_message_1">Hei! Når var fødselsdagen din igjen?</string>
+    <string name="scheduled_empty_message_2">Den er på 23. desember</string>
+    <string name="scheduled_empty_message_3">Gratulerer med dagen! For en god venn jeg er som husker på bursdagen din</string>
+    <!--&#x200A; is a special character required at the end of this string to fix it's formatting in the app -->
+    <string name="scheduled_empty_message_3_timestamp">Sender den 23. desember</string>
+    <string name="scheduled_compose_cd">Planlegg en melding</string>
+    <string name="scheduled_options_title">Planlagt melding</string>
+    <string-array name="scheduled_options">
+        <item>Send nå</item>
+        <item>Copy text</item>
+        <item>Delete</item>
+    </string-array>
+    <string name="settings_category_appearance">Utseende</string>
+    <string name="settings_category_general">Generelt</string>
+    <string name="settings_category_qkreply">Raskt svar</string>
+    <string name="settings_theme_title">Drakt</string>
+    <string name="settings_night_title">Nattmodus</string>
+    <string name="settings_black_title">Ren svart nattmodus</string>
+    <string name="settings_night_start_title">Starttid</string>
+    <string name="settings_night_end_title">Sluttidspunkt</string>
+    <string name="settings_automatic_colors_title">Automatic contact colors</string>
+    <string name="settings_text_size_title">Skriftstørrelse</string>
+    <string name="settings_system_font_title">Bruk systemskrift</string>
+    <string name="settings_auto_emoji_title">Automatisk emoji</string>
+    <string name="settings_notifications_title">Varsler</string>
+    <string name="settings_notifications_o_summary">Trykk for å tilpasse</string>
+    <string name="settings_notification_actions_title">Handlinger</string>
+    <string name="settings_notification_action_1">Knapp 1</string>
+    <string name="settings_notification_action_2">Knapp 2</string>
+    <string name="settings_notification_action_3">Knapp 3</string>
+    <string name="settings_notification_previews_title">Forhåndsvisninger av varsler</string>
+    <string name="settings_notification_wake_title">Wake screen</string>
+    <string name="settings_vibration_title">Vibrasjon</string>
+    <string name="settings_ringtone_title">Lyd</string>
+    <string name="settings_ringtone_none">Ingen</string>
+    <string name="settings_qkreply_title">Raskt svar</string>
+    <string name="settings_qkreply_summary">Sprettopp-vindu ved nye meldinger</string>
+    <string name="settings_qkreply_tap_dismiss_title">Trykk for å forkaste</string>
+    <string name="settings_qkreply_tap_dismiss_summary">Trykk hvor som helst utenfor sprettopp-vinduet for å lukke det</string>
+    <string name="settings_delayed_title">Forsinket sending</string>
+    <string name="settings_swipe_actions">Sveipe-handlinger</string>
+    <string name="settings_swipe_actions_summary">Still inn sveipe-handlinger for samtaler</string>
+    <string name="settings_swipe_actions_right">Høyre-sveip</string>
+    <string name="settings_swipe_actions_left">Venstre-sveip</string>
+    <string name="settings_swipe_actions_change">Endring</string>
+    <string-array name="settings_swipe_actions">
+        <item>Ingen</item>
+        <item>Arkivér</item>
+        <item>Slett</item>
+        <item>Block</item>
+        <item>Call</item>
+        <item>Mark read</item>
+        <item>Mark unread</item>
+    </string-array>
+    <string name="settings_delivery_title">Leveringsbekreftelse</string>
+    <string name="settings_delivery_summary">Bekreft at melding ble sendt</string>
+    <string name="settings_signature_title">Signatur</string>
+    <string name="settings_signature_summary">Add a signature to the end of your messages</string>
+    <string name="settings_unicode_title">Ta bort akutt-tegn</string>
+    <string name="settings_unicode_summary">Ta bort akutt-tegn fra utgående meldinger</string>
+    <string name="settings_mobile_title">Kun mobilnummre</string>
+    <string name="settings_mobile_summary">Vis kun mobilnummre når du skriver ny melding</string>
+    <string name="settings_auto_delete">Delete old messages automatically</string>
+    <string name="settings_auto_delete_dialog_message">Messages will be deleted after the specified number of days</string>
+    <string name="settings_auto_delete_dialog_hint">Number of days</string>
+    <string name="settings_auto_delete_never">Never</string>
+    <string name="settings_auto_delete_warning">Delete old messages automatically?</string>
+    <string name="settings_auto_delete_warning_message">If you proceed, %1$d messages will be deleted now</string>
+    <plurals name="settings_auto_delete_summary">
+        <item quantity="one">After 1 day</item>
+        <item quantity="other">After %d days</item>
+    </plurals>
+    <string name="settings_long_as_mms_title">Send long messages as MMS</string>
+    <string name="settings_long_as_mms_summary">If your longer text messages are failing to send, or sending in the wrong order, you can send them as MMS messages instead. Additional charges may apply</string>
+    <string name="settings_mms_size_title">Komprimer MMS-vedlegg</string>
+    <string name="settings_sync_title">Synkroniser meldinger</string>
+    <string name="settings_sync_summary">Resynkroniser meldinger med Androids interne meldingslager</string>
+    <string name="settings_about_title">Om QKSMS</string>
+    <string name="settings_version">Versjon %s</string>
+    <string name="settings_logging_enabled">Feillogg aktivert</string>
+    <string name="settings_logging_disabled">Feillogg deaktivert</string>
+    <string name="settings_delay_duration_hint">Legg inn forsinkelse (i sekunder)</string>
+    <string name="blocking_title">Blocking</string>
+    <string name="blocking_drop_title">Forkast meldinger</string>
+    <string name="blocking_drop_summary">Forkast meldinger fra blokkerte sendere istedenfor å skjule dem</string>
+    <string name="blocking_conversations">Blokkerte samtaler</string>
+    <string name="blocking_manager_title">Blokkeringer</string>
+    <string name="blocking_manager_qksms_title">QKSMS</string>
+    <string name="blocking_manager_qksms_summary">Innebygd blokkeringsfunksjon i QKSMS</string>
+    <string name="blocking_manager_call_control_summary">Filtrer anrop og meldinger automatisk. Fellesskapets intelligens™ hjelper med å forhindre uønskede henvendelser fra plageånder</string>
+    <string name="blocking_manager_sia_summary">Filtrer meldinger fra ukjente numre automatisk med \"Skal jeg svare\"-appen</string>
+    <string name="blocking_manager_copy_title">Kopier blokkerte numre</string>
+    <string name="blocking_manager_copy_summary">Fortsett med %s og kopier eksisterende blokkerte numre</string>
+    <string name="blocked_numbers_title">Blokkerte numre</string>
+    <string name="blocked_numbers_empty">Blokkerte numre vil vises her</string>
+    <string name="blocked_numbers_add_cd">Blokker et nytt nummer</string>
+    <string name="blocked_numbers_dialog_title">Blokker meldinger fra</string>
+    <string name="blocked_numbers_dialog_hint">Telefonnummer</string>
+    <string name="blocked_numbers_dialog_block">Block</string>
+    <string name="blocked_messages_title">Blokkerte meldinger</string>
+    <string name="blocked_messages_empty">Blokkerte meldinger vil vises her</string>
+    <string name="blocking_block_title">Block</string>
+    <string name="blocking_unblock_title">Unblock</string>
+    <plurals name="blocking_block_external">
+        <item quantity="one">Fortsett til %s og blokker nummeret</item>
+        <item quantity="other">Fortsett til %s og blokker numrene</item>
+    </plurals>
+    <plurals name="blocking_unblock_external">
+        <item quantity="one">Fortsett til %s og tillat nummeret</item>
+        <item quantity="other">Fortsett til %s og tillat numrene</item>
+    </plurals>
+    <string name="about_title">Om</string>
+    <string name="about_version_title">Versjon</string>
+    <string name="about_developer_title">Utvikler</string>
+    <string name="about_source_title">Kildekode</string>
+    <string name="about_changelog_title">Endringslogg</string>
+    <string name="about_contact_title">Kontakt</string>
+    <string name="about_license_title">Lisens</string>
+    <string name="about_copyright_title">Opphavsrett</string>
+    <string name="qksms_plus_description_title">Støtt utviklingen, aktiver alle funksjoner</string>
+    <string name="qksms_plus_description_summary">Du kan redde en sultende programmerer for bare %s</string>
+    <!-- Substitutions are for price and currency. Ex: Lifetime upgrade for $1.99 USD -->
+    <string name="qksms_plus_upgrade">Oppdateringer på livstid for %1$s %2$s</string>
+    <!-- Substitutions are for price and currency. Ex: Unlock + donate for $4.99 USD -->
+    <string name="qksms_plus_upgrade_donate">Aktiver + donér for %1$s %2$s</string>
+    <string name="qksms_plus_thanks_title">Takk for at du støtter QKSMS!</string>
+    <string name="qksms_plus_thanks_summary">Du har nå tilgang til alle funksjoner i QKSMS+</string>
+    <string name="qksms_plus_free_title">QKSMS+ er gratis for F-Droid-brukere. Om du ønsker å støtte utviklingen, kan du gjerne donere.</string>
+    <string name="qksms_plus_donate">Donér med PayPal</string>
+    <string name="qksms_plus_coming_soon">Kommer snart</string>
+    <string name="qksms_plus_themes_title">Premium drakter</string>
+    <string name="qksms_plus_themes_summary">Aktiver vakre draktfarger som ikke er tilgjengelig i Material-design-paletten</string>
+    <string name="qksms_plus_emoji_title">Egne auto-emoji</string>
+    <string name="qksms_plus_emoji_summary">Lag egne auto-emoji snarveier</string>
+    <string name="qksms_plus_backup_title">Sikkerhetskopi av meldinger</string>
+    <string name="qksms_plus_backup_summary">Automatisk sikkerhetskopiering av dine meldinger. Slutt på bekymringer om å miste dine meldinger når du bytter telefon eller mister den</string>
+    <string name="qksms_plus_scheduled_title">Planlagte meldinger</string>
+    <string name="qksms_plus_scheduled_summary">Planlegg at meldinger sendes automatisk ved en tid og dato</string>
+    <string name="qksms_plus_delayed_title">Forsinket sending</string>
+    <string name="qksms_plus_delayed_summary">Vent noen sekunder før meldingen sendes</string>
+    <string name="qksms_plus_night_title">Automatisk nattmodus</string>
+    <string name="qksms_plus_night_summary">Aktiver nattmodus basert på tid på døgnet</string>
+    <string name="qksms_plus_blacklist_title">Avansert blokkering</string>
+    <string name="qksms_plus_blacklist_summary">Blokker meldinger som inneholder visse stikkord eller mønstre</string>
+    <string name="qksms_plus_forward_title">Auto-videresend</string>
+    <string name="qksms_plus_forward_summary">Videresend meldinger fra gitte avsendere automatisk</string>
+    <string name="qksms_plus_respond_title">Auto-svar</string>
+    <string name="qksms_plus_respond_summary">Svar på innkommende meldinger automatisk med et forhåndsdefinert svar</string>
+    <string name="qksms_plus_more_title">Mer</string>
+    <string name="qksms_plus_more_summary">QKSMS er i stadig utvikling og ditt kjøp inkluderer alle fremtidige QKSMS+ funksjoner!</string>
+    <string name="widget_loading">Laster inn &#8230;</string>
+    <string name="widget_more">Last inn flere samtaler</string>
+    <string name="qkreply_menu_read">Mark read</string>
+    <string name="qkreply_menu_call">Ring</string>
+    <string name="qkreply_menu_delete">Slett</string>
+    <string name="qkreply_menu_expand">Vis mer</string>
+    <string name="qkreply_menu_collapse">Vis mindre</string>
+    <string name="qkreply_menu_view">Åpne samtale</string>
+    <string name="theme_material">Material</string>
+    <string name="theme_hex">HEX</string>
+    <string name="theme_apply">Bruk</string>
+    <string-array name="notification_actions">
+        <item>Ingen</item>
+        <item>Archive</item>
+        <item>Delete</item>
+        <item>Block</item>
+        <item>Call</item>
+        <item>Mark read</item>
+        <item>Reply</item>
+    </string-array>
+    <string name="button_yes">Ja</string>
+    <string name="button_continue">Continue</string>
+    <string name="button_cancel">Avbryt</string>
+    <string name="button_delete">Slett</string>
+    <string name="button_save">Lagre</string>
+    <string name="button_stop">Avbryt</string>
+    <string name="button_more">Mer</string>
+    <string name="button_set">Angi</string>
+    <string name="button_undo">Angre</string>
+    <string name="toast_copied">Kopiert</string>
+    <string name="toast_archived">Arkiverte samtaler</string>
+    <string name="toast_qksms_plus">Du må aktivere QKSMS+ for å bruke dette</string>
+    <plurals name="notification_new_messages">
+        <item quantity="one">Ny melding</item>
+        <item quantity="other">%s nye meldinger</item>
+    </plurals>
+    <string name="notification_message_failed_title">Meldingen ble ikke sendt</string>
+    <string name="notification_message_failed_text">Meldingen til %s kunne ikke sendes</string>
+    <string-array name="night_modes">
+        <item>System</item>
+        <item>Deaktivert</item>
+        <item>Aktivert</item>
+        <item>Automatisk</item>
+    </string-array>
+    <string-array name="notification_preview_options">
+        <item>Vis navn og melding</item>
+        <item>Vis navn</item>
+        <item>Skjul innhold</item>
+    </string-array>
+    <string-array name="text_sizes">
+        <item>Liten</item>
+        <item>Standard</item>
+        <item>Stor</item>
+        <item>Større</item>
+    </string-array>
+    <string-array name="delayed_sending_labels">
+        <item>Ingen forsinkelse</item>
+        <item>3 seconds</item>
+        <item>5 seconds</item>
+        <item>10 seconds</item>
+    </string-array>
+    <string-array name="mms_sizes">
+        <item>Automatic</item>
+        <item>100KB</item>
+        <item>200KB</item>
+        <item>300KB</item>
+        <item>600KB</item>
+        <item>1000KB</item>
+        <item>2000KB</item>
+        <item>No compression</item>
+    </string-array>
+    <string-array name="qk_responses">
+        <item>Ok</item>
+        <item>Vent litt</item>
+        <item>Er på vei</item>
+        <item>Takk</item>
+        <item>Høres bra ut</item>
+        <item>Skjer\'a?</item>
+        <item>I orden</item>
+        <item>Nei</item>
+        <item>Glad i deg</item>
+        <item>Beklager</item>
+        <item>LOL</item>
+        <item>Det er greit</item>
+    </string-array>
+</resources>
diff --git a/presentation/src/main/res/values-ne/strings.xml b/presentation/src/main/res/values-ne/strings.xml
index cf88bc382..aced64032 100644
--- a/presentation/src/main/res/values-ne/strings.xml
+++ b/presentation/src/main/res/values-ne/strings.xml
@@ -1,411 +1,411 @@
-<?xml version="1.0" encoding="utf-8"?>
-<!--
-  ~ Copyright (C) 2019 Moez Bhatti <moez.bhatti@gmail.com>
-  ~
-  ~ This file is part of QKSMS.
-  ~
-  ~ QKSMS is free software: you can redistribute it and/or modify
-  ~ it under the terms of the GNU General Public License as published by
-  ~ the Free Software Foundation, either version 3 of the License, or
-  ~ (at your option) any later version.
-  ~
-  ~ QKSMS is distributed in the hope that it will be useful,
-  ~ but WITHOUT ANY WARRANTY; without even the implied warranty of
-  ~ MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
-  ~ GNU General Public License for more details.
-  ~
-  ~ You should have received a copy of the GNU General Public License
-  ~ along with QKSMS.  If not, see <http://www.gnu.org/licenses/>.
-  -->
-<resources>
-    <string name="shortcut_compose_long_label">New conversation</string>
-    <string name="shortcut_compose_short_label">Compose</string>
-    <string name="shortcut_compose_disabled_message">Shortcut disabled</string>
-    <string name="title_archived">Archived</string>
-    <string name="title_settings">Settings</string>
-    <string name="title_notification_prefs">Notifications</string>
-    <string name="title_theme">Theme</string>
-    <string name="title_conversations">Search inbox&#8230;</string>
-    <string name="title_compose">Compose</string>
-    <string name="setup_skip">Skip</string>
-    <string name="setup_next">Continue</string>
-    <string name="menu_add_person">Add person</string>
-    <string name="menu_call">सम्पर्क</string>
-    <string name="menu_info">Details</string>
-    <string name="menu_save">Save to gallery</string>
-    <string name="menu_share">Share</string>
-    <string name="main_drawer_open_cd">Open navigation drawer</string>
-    <string name="main_title_selected">%d selected</string>
-    <string name="main_menu_clear">Clear</string>
-    <string name="main_menu_archive">Archive</string>
-    <string name="main_menu_unarchive">Unarchive</string>
-    <string name="main_menu_delete">Delete</string>
-    <string name="main_menu_add_contact">Add to contacts</string>
-    <string name="main_menu_pin">Pin to top</string>
-    <string name="main_menu_unpin">Unpin</string>
-    <string name="main_menu_read">Mark read</string>
-    <string name="main_menu_unread">Mark unread</string>
-    <string name="main_menu_block">Block</string>
-    <string name="main_syncing">Syncing messages&#8230;</string>
-    <string name="main_sender_you">You: %s</string>
-    <string name="main_draft">Draft</string>
-    <string name="main_message_results_title">Results in messages</string>
-    <string name="main_message_results">%d messages</string>
-    <string name="inbox_empty_text">Your conversations will appear here</string>
-    <string name="inbox_search_empty_text">No results</string>
-    <string name="archived_empty_text">Your archived conversations will appear here</string>
-    <string name="main_fab_cd">Start new conversation</string>
-    <string name="main_default_sms_title">Love texting again</string>
-    <string name="main_default_sms_message">Make QKSMS your default SMS app</string>
-    <string name="main_default_sms_change">Change</string>
-    <string name="main_permission_required">Permission required</string>
-    <string name="main_permission_sms">QKSMS needs permission to send and view SMS messages</string>
-    <string name="main_permission_contacts">QKSMS needs permission to view your contacts</string>
-    <string name="main_permission_allow">Allow</string>
-    <string name="drawer_inbox">Inbox</string>
-    <string name="drawer_archived">Archived</string>
-    <string name="drawer_scheduled">Scheduled</string>
-    <string name="drawer_blocking">Blocking</string>
-    <string name="drawer_more">More</string>
-    <string name="drawer_settings">Settings</string>
-    <string name="drawer_help">Help &amp; feedback</string>
-    <string name="drawer_invite">Invite friends</string>
-    <string name="drawer_plus_banner_summary">Unlock amazing new features, and support development</string>
-    <string name="rate_title">Enjoying QKSMS?</string>
-    <string name="rate_summary">Share some love and rate us on Google Play!</string>
-    <string name="rate_okay">OKAY!</string>
-    <string name="rate_dismiss">DISMISS</string>
-    <string name="dialog_delete_title">Delete</string>
-    <plurals name="dialog_delete_message">
-        <item quantity="one">Are you sure you would like to delete this conversation?</item>
-        <item quantity="other">Are you sure you would like to delete %d conversations?</item>
-    </plurals>
-    <string-array name="message_options">
-        <item>Copy text</item>
-        <item>Forward</item>
-        <item>Delete</item>
-    </string-array>
-    <string name="compose_number_picker_title">Choose a phone number</string>
-    <string name="compose_number_picker_default">%s ∙ Default</string>
-    <string name="compose_number_picker_once">Just once</string>
-    <string name="compose_number_picker_always">Always</string>
-    <string name="compose_title_selected">%d selected</string>
-    <string name="compose_subtitle_results">%1$d of %2$d results</string>
-    <string name="compose_send_group_title">Send as group message</string>
-    <string name="compose_send_group_summary">Recipients and replies will be visible to everyone</string>
-    <string name="compose_messages_empty">This is the start of your conversation. Say something nice!</string>
-    <string name="compose_vcard_label">Contact card</string>
-    <string name="compose_scheduled_for">Scheduled for</string>
-    <string name="compose_scheduled_future">Selected time must be in the future!</string>
-    <string name="compose_scheduled_plus">You must unlock QKSMS+ to use scheduled messaging</string>
-    <string name="compose_scheduled_toast">Added to scheduled messages</string>
-    <string name="compose_hint">Write a message&#8230;</string>
-    <string name="compose_menu_copy">Copy text</string>
-    <string name="compose_menu_forward">Forward</string>
-    <string name="compose_menu_delete">Delete</string>
-    <string name="compose_menu_previous">Previous</string>
-    <string name="compose_menu_next">Next</string>
-    <string name="compose_menu_clear">Clear</string>
-    <string name="compose_details_title">Message details</string>
-    <string name="compose_details_type">Type: %s</string>
-    <string name="compose_details_from">From: %s</string>
-    <string name="compose_details_to">To: %s</string>
-    <string name="compose_details_subject">Subject: %s</string>
-    <string name="compose_details_priority">Priority: %s</string>
-    <string name="compose_details_size">Size: %s</string>
-    <string name="compose_details_sent">Sent: %s</string>
-    <string name="compose_details_received">Received: %s</string>
-    <string name="compose_details_delivered">Delivered: %s</string>
-    <string name="compose_details_error_code">Error code: %d</string>
-    <string name="compose_attach_cd">Add an attachment</string>
-    <string name="compose_gallery_cd">Attach a photo</string>
-    <string name="compose_camera_cd">Take a photo</string>
-    <string name="compose_schedule_cd">Schedule message</string>
-    <string name="compose_contact_cd">Attach a contact</string>
-    <string name="compose_contact_error">Error reading contact</string>
-    <!-- Example: SIM 1 (Verizon) selected-->
-    <string name="compose_sim_changed_toast">SIM %1$d (%2$s) selected</string>
-    <string name="compose_sim_cd">%s selected, change SIM card</string>
-    <string name="compose_send_cd">Send message</string>
-    <string name="message_status_sending">Sending&#8230;</string>
-    <string name="message_status_delivered">Delivered %s</string>
-    <string name="message_status_failed">Failed to send. Tap to try again</string>
-    <string name="info_title">Details</string>
-    <string name="info_copied_address">Address copied</string>
-    <string name="info_name">Conversation title</string>
-    <string name="info_notifications">Notifications</string>
-    <string name="info_theme">Theme</string>
-    <string name="info_archive">Archive</string>
-    <string name="info_unarchive">Unarchive</string>
-    <string name="info_block">Block</string>
-    <string name="info_unblock">Unblock</string>
-    <string name="info_delete">Delete conversation</string>
-    <string name="gallery_error">Couldn\'t load media</string>
-    <string name="gallery_toast_saved">Saved to gallery</string>
-    <string name="backup_title">Backup and restore</string>
-    <string name="backup_backing_up">Backing up messages</string>
-    <string name="backup_restoring">Restoring from backup</string>
-    <string name="backup_last">Last backup</string>
-    <string name="backup_loading">Loading&#8230;</string>
-    <string name="backup_never">Never</string>
-    <string name="backup_restore_title">Restore</string>
-    <string name="backup_restore_summary">Select a backup</string>
-    <string name="backup_restore_error_plus">Please unlock QKSMS+ to use backup and restore</string>
-    <string name="backup_restore_error_backup">Backup in progress&#8230;</string>
-    <string name="backup_restore_error_restore">Restore in progress&#8230;</string>
-    <string name="backup_restore_confirm_title">Restore from backup</string>
-    <string name="backup_restore_confirm_message">Are you sure you would like to restore your messages from this backup?</string>
-    <string name="backup_restore_stop_title">Stop restore</string>
-    <string name="backup_restore_stop_message">Messages that have already been restored will remain on your device</string>
-    <string name="backup_restore_dialog_title">Backups</string>
-    <string name="backup_restore_dialog_empty">No backups found</string>
-    <plurals name="backup_message_count">
-        <item quantity="one">%d message</item>
-        <item quantity="other">%d messages</item>
-    </plurals>
-    <string name="backup_disclaimer">Currently, only SMS is supported by Backup and Restore. MMS support and scheduled backups will be coming soon!</string>
-    <string name="backup_now">Backup now</string>
-    <string name="backup_progress_parsing">Parsing backup&#8230;</string>
-    <string name="backup_progress_running">%d/%d messages</string>
-    <string name="backup_progress_saving">Saving backup&#8230;</string>
-    <string name="backup_progress_syncing">Syncing messages&#8230;</string>
-    <string name="backup_progress_finished">Finished!</string>
-    <string name="backup_notification_channel_name">Backup and restore</string>
-    <string name="scheduled_title">Scheduled</string>
-    <string name="scheduled_empty_description">Automatically send a message, at the exact moment you\'d like</string>
-    <string name="scheduled_empty_message_1">Hey! When was your birthday again?</string>
-    <string name="scheduled_empty_message_2">It\'s on December 23rd</string>
-    <string name="scheduled_empty_message_3">Happy birthday! Look at what a great friend I am, remembering your birthday</string>
-    <!--&#x200A; is a special character required at the end of this string to fix it's formatting in the app -->
-    <string name="scheduled_empty_message_3_timestamp">Sending on December 23rd </string>
-    <string name="scheduled_compose_cd">Schedule a message</string>
-    <string name="scheduled_options_title">Scheduled message</string>
-    <string-array name="scheduled_options">
-        <item>Send now</item>
-        <item>Copy text</item>
-        <item>Delete</item>
-    </string-array>
-    <string name="settings_category_appearance">Appearance</string>
-    <string name="settings_category_general">General</string>
-    <string name="settings_category_qkreply">QK Reply</string>
-    <string name="settings_theme_title">Theme</string>
-    <string name="settings_night_title">Night mode</string>
-    <string name="settings_black_title">Pure black night mode</string>
-    <string name="settings_night_start_title">Start time</string>
-    <string name="settings_night_end_title">End time</string>
-    <string name="settings_automatic_colors_title">Automatic contact colors</string>
-    <string name="settings_text_size_title">Font size</string>
-    <string name="settings_system_font_title">Use system font</string>
-    <string name="settings_auto_emoji_title">Automatic emoji</string>
-    <string name="settings_notifications_title">Notifications</string>
-    <string name="settings_notifications_o_summary">Tap to customize</string>
-    <string name="settings_notification_actions_title">Actions</string>
-    <string name="settings_notification_action_1">Button 1</string>
-    <string name="settings_notification_action_2">Button 2</string>
-    <string name="settings_notification_action_3">Button 3</string>
-    <string name="settings_notification_previews_title">Notification previews</string>
-    <string name="settings_notification_wake_title">Wake screen</string>
-    <string name="settings_vibration_title">Vibration</string>
-    <string name="settings_ringtone_title">Sound</string>
-    <string name="settings_ringtone_none">None</string>
-    <string name="settings_qkreply_title">QK Reply</string>
-    <string name="settings_qkreply_summary">Popup for new messages</string>
-    <string name="settings_qkreply_tap_dismiss_title">Tap to dismiss</string>
-    <string name="settings_qkreply_tap_dismiss_summary">Tap outside of the popup to close it</string>
-    <string name="settings_delayed_title">Delayed sending</string>
-    <string name="settings_swipe_actions">Swipe actions</string>
-    <string name="settings_swipe_actions_summary">Configure swipe actions for conversations</string>
-    <string name="settings_swipe_actions_right">Right swipe</string>
-    <string name="settings_swipe_actions_left">Left swipe</string>
-    <string name="settings_swipe_actions_change">CHANGE</string>
-    <string-array name="settings_swipe_actions">
-        <item>None</item>
-        <item>Archive</item>
-        <item>Delete</item>
-        <item>Block</item>
-        <item>Call</item>
-        <item>Mark read</item>
-        <item>Mark unread</item>
-    </string-array>
-    <string name="settings_delivery_title">Delivery confirmations</string>
-    <string name="settings_delivery_summary">Confirm that messages were sent successfully</string>
-    <string name="settings_signature_title">Signature</string>
-    <string name="settings_signature_summary">Add a signature to the end of your messages</string>
-    <string name="settings_unicode_title">Strip accents</string>
-    <string name="settings_unicode_summary">Remove accents from characters in outgoing SMS messages</string>
-    <string name="settings_mobile_title">Mobile numbers only</string>
-    <string name="settings_mobile_summary">When composing a message, only show mobile numbers</string>
-    <string name="settings_auto_delete">Delete old messages automatically</string>
-    <string name="settings_auto_delete_dialog_message">Messages will be deleted after the specified number of days</string>
-    <string name="settings_auto_delete_dialog_hint">Number of days</string>
-    <string name="settings_auto_delete_never">Never</string>
-    <string name="settings_auto_delete_warning">Delete old messages automatically?</string>
-    <string name="settings_auto_delete_warning_message">If you proceed, %1$d messages will be deleted now</string>
-    <plurals name="settings_auto_delete_summary">
-        <item quantity="one">After 1 day</item>
-        <item quantity="other">After %d days</item>
-    </plurals>
-    <string name="settings_long_as_mms_title">Send long messages as MMS</string>
-    <string name="settings_long_as_mms_summary">If your longer text messages are failing to send, or sending in the wrong order, you can send them as MMS messages instead. Additional charges may apply</string>
-    <string name="settings_mms_size_title">Auto-compress MMS attachments</string>
-    <string name="settings_sync_title">Sync messages</string>
-    <string name="settings_sync_summary">Re-sync your messages with the native Android SMS database</string>
-    <string name="settings_about_title">About QKSMS</string>
-    <string name="settings_version">Version %s</string>
-    <string name="settings_logging_enabled">Debug logging enabled</string>
-    <string name="settings_logging_disabled">Debug logging disabled</string>
-    <string name="settings_delay_duration_hint">Enter duration (seconds)</string>
-    <string name="blocking_title">Blocking</string>
-    <string name="blocking_drop_title">Drop messages</string>
-    <string name="blocking_drop_summary">Drop incoming messages from blocked senders instead of hiding them</string>
-    <string name="blocking_conversations">Blocked conversations</string>
-    <string name="blocking_manager_title">Blocking Manager</string>
-    <string name="blocking_manager_qksms_title">QKSMS</string>
-    <string name="blocking_manager_qksms_summary">Built-in blocking functionality in QKSMS</string>
-    <string name="blocking_manager_call_control_summary">Automatically filter your calls and messages in one convenient place! Community IQ™ allows you to prevent unwanted messages from community known spammers</string>
-    <string name="blocking_manager_sia_summary">Automatically filter messages from unsolicited numbers by using the \"Should I Answer\" app</string>
-    <string name="blocking_manager_copy_title">Copy blocked numbers</string>
-    <string name="blocking_manager_copy_summary">Continue to %s and copy over your existing blocked numbers</string>
-    <string name="blocked_numbers_title">Blocked numbers</string>
-    <string name="blocked_numbers_empty">Your blocked numbers will appear here</string>
-    <string name="blocked_numbers_add_cd">Block a new number</string>
-    <string name="blocked_numbers_dialog_title">Block texts from</string>
-    <string name="blocked_numbers_dialog_hint">Phone number</string>
-    <string name="blocked_numbers_dialog_block">Block</string>
-    <string name="blocked_messages_title">Blocked messages</string>
-    <string name="blocked_messages_empty">Your blocked messages will appear here</string>
-    <string name="blocking_block_title">Block</string>
-    <string name="blocking_unblock_title">Unblock</string>
-    <plurals name="blocking_block_external">
-        <item quantity="one">Continue to %s and block this number</item>
-        <item quantity="other">Continue to %s and block these numbers</item>
-    </plurals>
-    <plurals name="blocking_unblock_external">
-        <item quantity="one">Continue to %s and allow this number</item>
-        <item quantity="other">Continue to %s and allow these numbers</item>
-    </plurals>
-    <string name="about_title">About</string>
-    <string name="about_version_title">Version</string>
-    <string name="about_developer_title">Developer</string>
-    <string name="about_source_title">Source code</string>
-    <string name="about_changelog_title">Changelog</string>
-    <string name="about_contact_title">Contact</string>
-    <string name="about_license_title">License</string>
-    <string name="about_copyright_title">Copyright</string>
-    <string name="qksms_plus_description_title">Support development, unlock everything</string>
-    <string name="qksms_plus_description_summary">You can save a starving developer for just %s</string>
-    <!-- Substitutions are for price and currency. Ex: Lifetime upgrade for $1.99 USD -->
-    <string name="qksms_plus_upgrade">Lifetime upgrade for %1$s %2$s</string>
-    <!-- Substitutions are for price and currency. Ex: Unlock + donate for $4.99 USD -->
-    <string name="qksms_plus_upgrade_donate">Unlock + donate for %1$s %2$s</string>
-    <string name="qksms_plus_thanks_title">Thank you for supporting QKSMS!</string>
-    <string name="qksms_plus_thanks_summary">You now have access to all QKSMS+ features</string>
-    <string name="qksms_plus_free_title">QKSMS+ is free for F-Droid users! If you\'d like to support development, a donation would be highly appreciated.</string>
-    <string name="qksms_plus_donate">Donate via PayPal</string>
-    <string name="qksms_plus_coming_soon">Coming soon</string>
-    <string name="qksms_plus_themes_title">Premium themes</string>
-    <string name="qksms_plus_themes_summary">Unlock beautiful theme colors not available on the Material Design palette</string>
-    <string name="qksms_plus_emoji_title">Custom auto-emoji</string>
-    <string name="qksms_plus_emoji_summary">Create custom auto-emoji shortcuts</string>
-    <string name="qksms_plus_backup_title">Message backup</string>
-    <string name="qksms_plus_backup_summary">Automatically back up your messages. Never again worry about losing your history if you change phones or your phone gets lost</string>
-    <string name="qksms_plus_scheduled_title">Scheduled messages</string>
-    <string name="qksms_plus_scheduled_summary">Schedule messages to automatically be sent at a specific time and date</string>
-    <string name="qksms_plus_delayed_title">Delayed sending</string>
-    <string name="qksms_plus_delayed_summary">Wait a few seconds before sending your message</string>
-    <string name="qksms_plus_night_title">Automatic night mode</string>
-    <string name="qksms_plus_night_summary">Enable night mode based on the time of day</string>
-    <string name="qksms_plus_blacklist_title">Advanced blocking</string>
-    <string name="qksms_plus_blacklist_summary">Block messages that contain keywords or match patterns</string>
-    <string name="qksms_plus_forward_title">Auto-forward</string>
-    <string name="qksms_plus_forward_summary">Automatically forward messages from certain senders</string>
-    <string name="qksms_plus_respond_title">Auto-respond</string>
-    <string name="qksms_plus_respond_summary">Automatically respond to incoming messages with a preset response</string>
-    <string name="qksms_plus_more_title">More</string>
-    <string name="qksms_plus_more_summary">QKSMS is under active development, and your purchase will include all future QKSMS+ features!</string>
-    <string name="widget_loading">Loading&#8230;</string>
-    <string name="widget_more">View more conversations</string>
-    <string name="qkreply_menu_read">Mark read</string>
-    <string name="qkreply_menu_call">Call</string>
-    <string name="qkreply_menu_delete">Delete</string>
-    <string name="qkreply_menu_expand">Show more</string>
-    <string name="qkreply_menu_collapse">Show less</string>
-    <string name="qkreply_menu_view">Open conversation</string>
-    <string name="theme_material">Material</string>
-    <string name="theme_hex">HEX</string>
-    <string name="theme_apply">Apply</string>
-    <string-array name="notification_actions">
-        <item>None</item>
-        <item>Archive</item>
-        <item>Delete</item>
-        <item>Block</item>
-        <item>Call</item>
-        <item>Mark read</item>
-        <item>Reply</item>
-    </string-array>
-    <string name="button_yes">Yes</string>
-    <string name="button_continue">Continue</string>
-    <string name="button_cancel">Cancel</string>
-    <string name="button_delete">Delete</string>
-    <string name="button_save">Save</string>
-    <string name="button_stop">Stop</string>
-    <string name="button_more">More</string>
-    <string name="button_set">Set</string>
-    <string name="button_undo">Undo</string>
-    <string name="toast_copied">Copied</string>
-    <string name="toast_archived">Archived conversation</string>
-    <string name="toast_qksms_plus">You must unlock QKSMS+ to use this</string>
-    <plurals name="notification_new_messages">
-        <item quantity="one">New message</item>
-        <item quantity="other">%s new messages</item>
-    </plurals>
-    <string name="notification_message_failed_title">Message not sent</string>
-    <string name="notification_message_failed_text">The message to %s failed to send</string>
-    <string-array name="night_modes">
-        <item>System</item>
-        <item>Disabled</item>
-        <item>Always on</item>
-        <item>Automatic</item>
-    </string-array>
-    <string-array name="notification_preview_options">
-        <item>Show name and message</item>
-        <item>Show name</item>
-        <item>Hide contents</item>
-    </string-array>
-    <string-array name="text_sizes">
-        <item>Small</item>
-        <item>Normal</item>
-        <item>Large</item>
-        <item>Larger</item>
-    </string-array>
-    <string-array name="delayed_sending_labels">
-        <item>No delay</item>
-        <item>3 seconds</item>
-        <item>5 seconds</item>
-        <item>10 seconds</item>
-    </string-array>
-    <string-array name="mms_sizes">
-        <item>Automatic</item>
-        <item>100KB</item>
-        <item>200KB</item>
-        <item>300KB</item>
-        <item>600KB</item>
-        <item>1000KB</item>
-        <item>2000KB</item>
-        <item>No compression</item>
-    </string-array>
-    <string-array name="qk_responses">
-        <item>Okay</item>
-        <item>Give me a moment</item>
-        <item>On my way</item>
-        <item>Thanks</item>
-        <item>Sounds good</item>
-        <item>What\'s up?</item>
-        <item>Agreed</item>
-        <item>No</item>
-        <item>Love you</item>
-        <item>Sorry</item>
-        <item>LOL</item>
-        <item>That\'s okay</item>
-    </string-array>
-</resources>
+<?xml version="1.0" encoding="utf-8"?>
+<!--
+  ~ Copyright (C) 2019 Moez Bhatti <moez.bhatti@gmail.com>
+  ~
+  ~ This file is part of QKSMS.
+  ~
+  ~ QKSMS is free software: you can redistribute it and/or modify
+  ~ it under the terms of the GNU General Public License as published by
+  ~ the Free Software Foundation, either version 3 of the License, or
+  ~ (at your option) any later version.
+  ~
+  ~ QKSMS is distributed in the hope that it will be useful,
+  ~ but WITHOUT ANY WARRANTY; without even the implied warranty of
+  ~ MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+  ~ GNU General Public License for more details.
+  ~
+  ~ You should have received a copy of the GNU General Public License
+  ~ along with QKSMS.  If not, see <http://www.gnu.org/licenses/>.
+  -->
+<resources>
+    <string name="shortcut_compose_long_label">New conversation</string>
+    <string name="shortcut_compose_short_label">Compose</string>
+    <string name="shortcut_compose_disabled_message">Shortcut disabled</string>
+    <string name="title_archived">Archived</string>
+    <string name="title_settings">Settings</string>
+    <string name="title_notification_prefs">Notifications</string>
+    <string name="title_theme">Theme</string>
+    <string name="title_conversations">Search inbox&#8230;</string>
+    <string name="title_compose">Compose</string>
+    <string name="setup_skip">Skip</string>
+    <string name="setup_next">Continue</string>
+    <string name="menu_add_person">Add person</string>
+    <string name="menu_call">सम्पर्क</string>
+    <string name="menu_info">Details</string>
+    <string name="menu_save">Save to gallery</string>
+    <string name="menu_share">Share</string>
+    <string name="main_drawer_open_cd">Open navigation drawer</string>
+    <string name="main_title_selected">%d selected</string>
+    <string name="main_menu_clear">Clear</string>
+    <string name="main_menu_archive">Archive</string>
+    <string name="main_menu_unarchive">Unarchive</string>
+    <string name="main_menu_delete">Delete</string>
+    <string name="main_menu_add_contact">Add to contacts</string>
+    <string name="main_menu_pin">Pin to top</string>
+    <string name="main_menu_unpin">Unpin</string>
+    <string name="main_menu_read">Mark read</string>
+    <string name="main_menu_unread">Mark unread</string>
+    <string name="main_menu_block">Block</string>
+    <string name="main_syncing">Syncing messages&#8230;</string>
+    <string name="main_sender_you">You: %s</string>
+    <string name="main_draft">Draft</string>
+    <string name="main_message_results_title">Results in messages</string>
+    <string name="main_message_results">%d messages</string>
+    <string name="inbox_empty_text">Your conversations will appear here</string>
+    <string name="inbox_search_empty_text">No results</string>
+    <string name="archived_empty_text">Your archived conversations will appear here</string>
+    <string name="main_fab_cd">Start new conversation</string>
+    <string name="main_default_sms_title">Love texting again</string>
+    <string name="main_default_sms_message">Make QKSMS your default SMS app</string>
+    <string name="main_default_sms_change">Change</string>
+    <string name="main_permission_required">Permission required</string>
+    <string name="main_permission_sms">QKSMS needs permission to send and view SMS messages</string>
+    <string name="main_permission_contacts">QKSMS needs permission to view your contacts</string>
+    <string name="main_permission_allow">Allow</string>
+    <string name="drawer_inbox">Inbox</string>
+    <string name="drawer_archived">Archived</string>
+    <string name="drawer_scheduled">Scheduled</string>
+    <string name="drawer_blocking">Blocking</string>
+    <string name="drawer_more">More</string>
+    <string name="drawer_settings">Settings</string>
+    <string name="drawer_help">Help &amp; feedback</string>
+    <string name="drawer_invite">Invite friends</string>
+    <string name="drawer_plus_banner_summary">Unlock amazing new features, and support development</string>
+    <string name="rate_title">Enjoying QKSMS?</string>
+    <string name="rate_summary">Share some love and rate us on Google Play!</string>
+    <string name="rate_okay">OKAY!</string>
+    <string name="rate_dismiss">DISMISS</string>
+    <string name="dialog_delete_title">Delete</string>
+    <plurals name="dialog_delete_message">
+        <item quantity="one">Are you sure you would like to delete this conversation?</item>
+        <item quantity="other">Are you sure you would like to delete %d conversations?</item>
+    </plurals>
+    <string-array name="message_options">
+        <item>Copy text</item>
+        <item>Forward</item>
+        <item>Delete</item>
+    </string-array>
+    <string name="compose_number_picker_title">Choose a phone number</string>
+    <string name="compose_number_picker_default">%s ∙ Default</string>
+    <string name="compose_number_picker_once">Just once</string>
+    <string name="compose_number_picker_always">Always</string>
+    <string name="compose_title_selected">%d selected</string>
+    <string name="compose_subtitle_results">%1$d of %2$d results</string>
+    <string name="compose_send_group_title">Send as group message</string>
+    <string name="compose_send_group_summary">Recipients and replies will be visible to everyone</string>
+    <string name="compose_messages_empty">This is the start of your conversation. Say something nice!</string>
+    <string name="compose_vcard_label">Contact card</string>
+    <string name="compose_scheduled_for">Scheduled for</string>
+    <string name="compose_scheduled_future">Selected time must be in the future!</string>
+    <string name="compose_scheduled_plus">You must unlock QKSMS+ to use scheduled messaging</string>
+    <string name="compose_scheduled_toast">Added to scheduled messages</string>
+    <string name="compose_hint">Write a message&#8230;</string>
+    <string name="compose_menu_copy">Copy text</string>
+    <string name="compose_menu_forward">Forward</string>
+    <string name="compose_menu_delete">Delete</string>
+    <string name="compose_menu_previous">Previous</string>
+    <string name="compose_menu_next">Next</string>
+    <string name="compose_menu_clear">Clear</string>
+    <string name="compose_details_title">Message details</string>
+    <string name="compose_details_type">Type: %s</string>
+    <string name="compose_details_from">From: %s</string>
+    <string name="compose_details_to">To: %s</string>
+    <string name="compose_details_subject">Subject: %s</string>
+    <string name="compose_details_priority">Priority: %s</string>
+    <string name="compose_details_size">Size: %s</string>
+    <string name="compose_details_sent">Sent: %s</string>
+    <string name="compose_details_received">Received: %s</string>
+    <string name="compose_details_delivered">Delivered: %s</string>
+    <string name="compose_details_error_code">Error code: %d</string>
+    <string name="compose_attach_cd">Add an attachment</string>
+    <string name="compose_gallery_cd">Attach a photo</string>
+    <string name="compose_camera_cd">Take a photo</string>
+    <string name="compose_schedule_cd">Schedule message</string>
+    <string name="compose_contact_cd">Attach a contact</string>
+    <string name="compose_contact_error">Error reading contact</string>
+    <!-- Example: SIM 1 (Verizon) selected-->
+    <string name="compose_sim_changed_toast">SIM %1$d (%2$s) selected</string>
+    <string name="compose_sim_cd">%s selected, change SIM card</string>
+    <string name="compose_send_cd">Send message</string>
+    <string name="message_status_sending">Sending&#8230;</string>
+    <string name="message_status_delivered">Delivered %s</string>
+    <string name="message_status_failed">Failed to send. Tap to try again</string>
+    <string name="info_title">Details</string>
+    <string name="info_copied_address">Address copied</string>
+    <string name="info_name">Conversation title</string>
+    <string name="info_notifications">Notifications</string>
+    <string name="info_theme">Theme</string>
+    <string name="info_archive">Archive</string>
+    <string name="info_unarchive">Unarchive</string>
+    <string name="info_block">Block</string>
+    <string name="info_unblock">Unblock</string>
+    <string name="info_delete">Delete conversation</string>
+    <string name="gallery_error">Couldn\'t load media</string>
+    <string name="gallery_toast_saved">Saved to gallery</string>
+    <string name="backup_title">Backup and restore</string>
+    <string name="backup_backing_up">Backing up messages</string>
+    <string name="backup_restoring">Restoring from backup</string>
+    <string name="backup_last">Last backup</string>
+    <string name="backup_loading">Loading&#8230;</string>
+    <string name="backup_never">Never</string>
+    <string name="backup_restore_title">Restore</string>
+    <string name="backup_restore_summary">Select a backup</string>
+    <string name="backup_restore_error_plus">Please unlock QKSMS+ to use backup and restore</string>
+    <string name="backup_restore_error_backup">Backup in progress&#8230;</string>
+    <string name="backup_restore_error_restore">Restore in progress&#8230;</string>
+    <string name="backup_restore_confirm_title">Restore from backup</string>
+    <string name="backup_restore_confirm_message">Are you sure you would like to restore your messages from this backup?</string>
+    <string name="backup_restore_stop_title">Stop restore</string>
+    <string name="backup_restore_stop_message">Messages that have already been restored will remain on your device</string>
+    <string name="backup_restore_dialog_title">Backups</string>
+    <string name="backup_restore_dialog_empty">No backups found</string>
+    <plurals name="backup_message_count">
+        <item quantity="one">%d message</item>
+        <item quantity="other">%d messages</item>
+    </plurals>
+    <string name="backup_disclaimer">Currently, only SMS is supported by Backup and Restore. MMS support and scheduled backups will be coming soon!</string>
+    <string name="backup_now">Backup now</string>
+    <string name="backup_progress_parsing">Parsing backup&#8230;</string>
+    <string name="backup_progress_running">%d/%d messages</string>
+    <string name="backup_progress_saving">Saving backup&#8230;</string>
+    <string name="backup_progress_syncing">Syncing messages&#8230;</string>
+    <string name="backup_progress_finished">Finished!</string>
+    <string name="backup_notification_channel_name">Backup and restore</string>
+    <string name="scheduled_title">Scheduled</string>
+    <string name="scheduled_empty_description">Automatically send a message, at the exact moment you\'d like</string>
+    <string name="scheduled_empty_message_1">Hey! When was your birthday again?</string>
+    <string name="scheduled_empty_message_2">It\'s on December 23rd</string>
+    <string name="scheduled_empty_message_3">Happy birthday! Look at what a great friend I am, remembering your birthday</string>
+    <!--&#x200A; is a special character required at the end of this string to fix it's formatting in the app -->
+    <string name="scheduled_empty_message_3_timestamp">Sending on December 23rd </string>
+    <string name="scheduled_compose_cd">Schedule a message</string>
+    <string name="scheduled_options_title">Scheduled message</string>
+    <string-array name="scheduled_options">
+        <item>Send now</item>
+        <item>Copy text</item>
+        <item>Delete</item>
+    </string-array>
+    <string name="settings_category_appearance">Appearance</string>
+    <string name="settings_category_general">General</string>
+    <string name="settings_category_qkreply">QK Reply</string>
+    <string name="settings_theme_title">Theme</string>
+    <string name="settings_night_title">Night mode</string>
+    <string name="settings_black_title">Pure black night mode</string>
+    <string name="settings_night_start_title">Start time</string>
+    <string name="settings_night_end_title">End time</string>
+    <string name="settings_automatic_colors_title">Automatic contact colors</string>
+    <string name="settings_text_size_title">Font size</string>
+    <string name="settings_system_font_title">Use system font</string>
+    <string name="settings_auto_emoji_title">Automatic emoji</string>
+    <string name="settings_notifications_title">Notifications</string>
+    <string name="settings_notifications_o_summary">Tap to customize</string>
+    <string name="settings_notification_actions_title">Actions</string>
+    <string name="settings_notification_action_1">Button 1</string>
+    <string name="settings_notification_action_2">Button 2</string>
+    <string name="settings_notification_action_3">Button 3</string>
+    <string name="settings_notification_previews_title">Notification previews</string>
+    <string name="settings_notification_wake_title">Wake screen</string>
+    <string name="settings_vibration_title">Vibration</string>
+    <string name="settings_ringtone_title">Sound</string>
+    <string name="settings_ringtone_none">None</string>
+    <string name="settings_qkreply_title">QK Reply</string>
+    <string name="settings_qkreply_summary">Popup for new messages</string>
+    <string name="settings_qkreply_tap_dismiss_title">Tap to dismiss</string>
+    <string name="settings_qkreply_tap_dismiss_summary">Tap outside of the popup to close it</string>
+    <string name="settings_delayed_title">Delayed sending</string>
+    <string name="settings_swipe_actions">Swipe actions</string>
+    <string name="settings_swipe_actions_summary">Configure swipe actions for conversations</string>
+    <string name="settings_swipe_actions_right">Right swipe</string>
+    <string name="settings_swipe_actions_left">Left swipe</string>
+    <string name="settings_swipe_actions_change">CHANGE</string>
+    <string-array name="settings_swipe_actions">
+        <item>None</item>
+        <item>Archive</item>
+        <item>Delete</item>
+        <item>Block</item>
+        <item>Call</item>
+        <item>Mark read</item>
+        <item>Mark unread</item>
+    </string-array>
+    <string name="settings_delivery_title">Delivery confirmations</string>
+    <string name="settings_delivery_summary">Confirm that messages were sent successfully</string>
+    <string name="settings_signature_title">Signature</string>
+    <string name="settings_signature_summary">Add a signature to the end of your messages</string>
+    <string name="settings_unicode_title">Strip accents</string>
+    <string name="settings_unicode_summary">Remove accents from characters in outgoing SMS messages</string>
+    <string name="settings_mobile_title">Mobile numbers only</string>
+    <string name="settings_mobile_summary">When composing a message, only show mobile numbers</string>
+    <string name="settings_auto_delete">Delete old messages automatically</string>
+    <string name="settings_auto_delete_dialog_message">Messages will be deleted after the specified number of days</string>
+    <string name="settings_auto_delete_dialog_hint">Number of days</string>
+    <string name="settings_auto_delete_never">Never</string>
+    <string name="settings_auto_delete_warning">Delete old messages automatically?</string>
+    <string name="settings_auto_delete_warning_message">If you proceed, %1$d messages will be deleted now</string>
+    <plurals name="settings_auto_delete_summary">
+        <item quantity="one">After 1 day</item>
+        <item quantity="other">After %d days</item>
+    </plurals>
+    <string name="settings_long_as_mms_title">Send long messages as MMS</string>
+    <string name="settings_long_as_mms_summary">If your longer text messages are failing to send, or sending in the wrong order, you can send them as MMS messages instead. Additional charges may apply</string>
+    <string name="settings_mms_size_title">Auto-compress MMS attachments</string>
+    <string name="settings_sync_title">Sync messages</string>
+    <string name="settings_sync_summary">Re-sync your messages with the native Android SMS database</string>
+    <string name="settings_about_title">About QKSMS</string>
+    <string name="settings_version">Version %s</string>
+    <string name="settings_logging_enabled">Debug logging enabled</string>
+    <string name="settings_logging_disabled">Debug logging disabled</string>
+    <string name="settings_delay_duration_hint">Enter duration (seconds)</string>
+    <string name="blocking_title">Blocking</string>
+    <string name="blocking_drop_title">Drop messages</string>
+    <string name="blocking_drop_summary">Drop incoming messages from blocked senders instead of hiding them</string>
+    <string name="blocking_conversations">Blocked conversations</string>
+    <string name="blocking_manager_title">Blocking Manager</string>
+    <string name="blocking_manager_qksms_title">QKSMS</string>
+    <string name="blocking_manager_qksms_summary">Built-in blocking functionality in QKSMS</string>
+    <string name="blocking_manager_call_control_summary">Automatically filter your calls and messages in one convenient place! Community IQ™ allows you to prevent unwanted messages from community known spammers</string>
+    <string name="blocking_manager_sia_summary">Automatically filter messages from unsolicited numbers by using the \"Should I Answer\" app</string>
+    <string name="blocking_manager_copy_title">Copy blocked numbers</string>
+    <string name="blocking_manager_copy_summary">Continue to %s and copy over your existing blocked numbers</string>
+    <string name="blocked_numbers_title">Blocked numbers</string>
+    <string name="blocked_numbers_empty">Your blocked numbers will appear here</string>
+    <string name="blocked_numbers_add_cd">Block a new number</string>
+    <string name="blocked_numbers_dialog_title">Block texts from</string>
+    <string name="blocked_numbers_dialog_hint">Phone number</string>
+    <string name="blocked_numbers_dialog_block">Block</string>
+    <string name="blocked_messages_title">Blocked messages</string>
+    <string name="blocked_messages_empty">Your blocked messages will appear here</string>
+    <string name="blocking_block_title">Block</string>
+    <string name="blocking_unblock_title">Unblock</string>
+    <plurals name="blocking_block_external">
+        <item quantity="one">Continue to %s and block this number</item>
+        <item quantity="other">Continue to %s and block these numbers</item>
+    </plurals>
+    <plurals name="blocking_unblock_external">
+        <item quantity="one">Continue to %s and allow this number</item>
+        <item quantity="other">Continue to %s and allow these numbers</item>
+    </plurals>
+    <string name="about_title">About</string>
+    <string name="about_version_title">Version</string>
+    <string name="about_developer_title">Developer</string>
+    <string name="about_source_title">Source code</string>
+    <string name="about_changelog_title">Changelog</string>
+    <string name="about_contact_title">Contact</string>
+    <string name="about_license_title">License</string>
+    <string name="about_copyright_title">Copyright</string>
+    <string name="qksms_plus_description_title">Support development, unlock everything</string>
+    <string name="qksms_plus_description_summary">You can save a starving developer for just %s</string>
+    <!-- Substitutions are for price and currency. Ex: Lifetime upgrade for $1.99 USD -->
+    <string name="qksms_plus_upgrade">Lifetime upgrade for %1$s %2$s</string>
+    <!-- Substitutions are for price and currency. Ex: Unlock + donate for $4.99 USD -->
+    <string name="qksms_plus_upgrade_donate">Unlock + donate for %1$s %2$s</string>
+    <string name="qksms_plus_thanks_title">Thank you for supporting QKSMS!</string>
+    <string name="qksms_plus_thanks_summary">You now have access to all QKSMS+ features</string>
+    <string name="qksms_plus_free_title">QKSMS+ is free for F-Droid users! If you\'d like to support development, a donation would be highly appreciated.</string>
+    <string name="qksms_plus_donate">Donate via PayPal</string>
+    <string name="qksms_plus_coming_soon">Coming soon</string>
+    <string name="qksms_plus_themes_title">Premium themes</string>
+    <string name="qksms_plus_themes_summary">Unlock beautiful theme colors not available on the Material Design palette</string>
+    <string name="qksms_plus_emoji_title">Custom auto-emoji</string>
+    <string name="qksms_plus_emoji_summary">Create custom auto-emoji shortcuts</string>
+    <string name="qksms_plus_backup_title">Message backup</string>
+    <string name="qksms_plus_backup_summary">Automatically back up your messages. Never again worry about losing your history if you change phones or your phone gets lost</string>
+    <string name="qksms_plus_scheduled_title">Scheduled messages</string>
+    <string name="qksms_plus_scheduled_summary">Schedule messages to automatically be sent at a specific time and date</string>
+    <string name="qksms_plus_delayed_title">Delayed sending</string>
+    <string name="qksms_plus_delayed_summary">Wait a few seconds before sending your message</string>
+    <string name="qksms_plus_night_title">Automatic night mode</string>
+    <string name="qksms_plus_night_summary">Enable night mode based on the time of day</string>
+    <string name="qksms_plus_blacklist_title">Advanced blocking</string>
+    <string name="qksms_plus_blacklist_summary">Block messages that contain keywords or match patterns</string>
+    <string name="qksms_plus_forward_title">Auto-forward</string>
+    <string name="qksms_plus_forward_summary">Automatically forward messages from certain senders</string>
+    <string name="qksms_plus_respond_title">Auto-respond</string>
+    <string name="qksms_plus_respond_summary">Automatically respond to incoming messages with a preset response</string>
+    <string name="qksms_plus_more_title">More</string>
+    <string name="qksms_plus_more_summary">QKSMS is under active development, and your purchase will include all future QKSMS+ features!</string>
+    <string name="widget_loading">Loading&#8230;</string>
+    <string name="widget_more">View more conversations</string>
+    <string name="qkreply_menu_read">Mark read</string>
+    <string name="qkreply_menu_call">Call</string>
+    <string name="qkreply_menu_delete">Delete</string>
+    <string name="qkreply_menu_expand">Show more</string>
+    <string name="qkreply_menu_collapse">Show less</string>
+    <string name="qkreply_menu_view">Open conversation</string>
+    <string name="theme_material">Material</string>
+    <string name="theme_hex">HEX</string>
+    <string name="theme_apply">Apply</string>
+    <string-array name="notification_actions">
+        <item>None</item>
+        <item>Archive</item>
+        <item>Delete</item>
+        <item>Block</item>
+        <item>Call</item>
+        <item>Mark read</item>
+        <item>Reply</item>
+    </string-array>
+    <string name="button_yes">Yes</string>
+    <string name="button_continue">Continue</string>
+    <string name="button_cancel">Cancel</string>
+    <string name="button_delete">Delete</string>
+    <string name="button_save">Save</string>
+    <string name="button_stop">Stop</string>
+    <string name="button_more">More</string>
+    <string name="button_set">Set</string>
+    <string name="button_undo">Undo</string>
+    <string name="toast_copied">Copied</string>
+    <string name="toast_archived">Archived conversation</string>
+    <string name="toast_qksms_plus">You must unlock QKSMS+ to use this</string>
+    <plurals name="notification_new_messages">
+        <item quantity="one">New message</item>
+        <item quantity="other">%s new messages</item>
+    </plurals>
+    <string name="notification_message_failed_title">Message not sent</string>
+    <string name="notification_message_failed_text">The message to %s failed to send</string>
+    <string-array name="night_modes">
+        <item>System</item>
+        <item>Disabled</item>
+        <item>Always on</item>
+        <item>Automatic</item>
+    </string-array>
+    <string-array name="notification_preview_options">
+        <item>Show name and message</item>
+        <item>Show name</item>
+        <item>Hide contents</item>
+    </string-array>
+    <string-array name="text_sizes">
+        <item>Small</item>
+        <item>Normal</item>
+        <item>Large</item>
+        <item>Larger</item>
+    </string-array>
+    <string-array name="delayed_sending_labels">
+        <item>No delay</item>
+        <item>3 seconds</item>
+        <item>5 seconds</item>
+        <item>10 seconds</item>
+    </string-array>
+    <string-array name="mms_sizes">
+        <item>Automatic</item>
+        <item>100KB</item>
+        <item>200KB</item>
+        <item>300KB</item>
+        <item>600KB</item>
+        <item>1000KB</item>
+        <item>2000KB</item>
+        <item>No compression</item>
+    </string-array>
+    <string-array name="qk_responses">
+        <item>Okay</item>
+        <item>Give me a moment</item>
+        <item>On my way</item>
+        <item>Thanks</item>
+        <item>Sounds good</item>
+        <item>What\'s up?</item>
+        <item>Agreed</item>
+        <item>No</item>
+        <item>Love you</item>
+        <item>Sorry</item>
+        <item>LOL</item>
+        <item>That\'s okay</item>
+    </string-array>
+</resources>
diff --git a/presentation/src/main/res/values-night-v23/themes.xml b/presentation/src/main/res/values-night-v23/themes.xml
index 3adbc7c01..0d4b8f442 100644
--- a/presentation/src/main/res/values-night-v23/themes.xml
+++ b/presentation/src/main/res/values-night-v23/themes.xml
@@ -1,27 +1,27 @@
-<?xml version="1.0" encoding="utf-8"?>
-<!--
-  ~ Copyright (C) 2019 Moez Bhatti <moez.bhatti@gmail.com>
-  ~
-  ~ This file is part of QKSMS.
-  ~
-  ~ QKSMS is free software: you can redistribute it and/or modify
-  ~ it under the terms of the GNU General Public License as published by
-  ~ the Free Software Foundation, either version 3 of the License, or
-  ~ (at your option) any later version.
-  ~
-  ~ QKSMS is distributed in the hope that it will be useful,
-  ~ but WITHOUT ANY WARRANTY; without even the implied warranty of
-  ~ MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
-  ~ GNU General Public License for more details.
-  ~
-  ~ You should have received a copy of the GNU General Public License
-  ~ along with QKSMS.  If not, see <http://www.gnu.org/licenses/>.
-  -->
-<resources>
-
-    <!-- On Marshmallow, explicitly don't use the light status bar -->
-    <style name="AppTheme" parent="AppBaseTheme">
-        <item name="android:windowLightStatusBar">false</item>
-    </style>
-
-</resources>
+<?xml version="1.0" encoding="utf-8"?>
+<!--
+  ~ Copyright (C) 2019 Moez Bhatti <moez.bhatti@gmail.com>
+  ~
+  ~ This file is part of QKSMS.
+  ~
+  ~ QKSMS is free software: you can redistribute it and/or modify
+  ~ it under the terms of the GNU General Public License as published by
+  ~ the Free Software Foundation, either version 3 of the License, or
+  ~ (at your option) any later version.
+  ~
+  ~ QKSMS is distributed in the hope that it will be useful,
+  ~ but WITHOUT ANY WARRANTY; without even the implied warranty of
+  ~ MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+  ~ GNU General Public License for more details.
+  ~
+  ~ You should have received a copy of the GNU General Public License
+  ~ along with QKSMS.  If not, see <http://www.gnu.org/licenses/>.
+  -->
+<resources>
+
+    <!-- On Marshmallow, explicitly don't use the light status bar -->
+    <style name="AppTheme" parent="AppBaseTheme">
+        <item name="android:windowLightStatusBar">false</item>
+    </style>
+
+</resources>
diff --git a/presentation/src/main/res/values-night-v27/themes.xml b/presentation/src/main/res/values-night-v27/themes.xml
index b9c409bd8..7df654a97 100644
--- a/presentation/src/main/res/values-night-v27/themes.xml
+++ b/presentation/src/main/res/values-night-v27/themes.xml
@@ -1,28 +1,28 @@
-<?xml version="1.0" encoding="utf-8"?>
-<!--
-  ~ Copyright (C) 2019 Moez Bhatti <moez.bhatti@gmail.com>
-  ~
-  ~ This file is part of QKSMS.
-  ~
-  ~ QKSMS is free software: you can redistribute it and/or modify
-  ~ it under the terms of the GNU General Public License as published by
-  ~ the Free Software Foundation, either version 3 of the License, or
-  ~ (at your option) any later version.
-  ~
-  ~ QKSMS is distributed in the hope that it will be useful,
-  ~ but WITHOUT ANY WARRANTY; without even the implied warranty of
-  ~ MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
-  ~ GNU General Public License for more details.
-  ~
-  ~ You should have received a copy of the GNU General Public License
-  ~ along with QKSMS.  If not, see <http://www.gnu.org/licenses/>.
-  -->
-<resources>
-
-    <!-- On Oreo, explicitly don't use the light status and navigation bars -->
-    <style name="AppTheme" parent="AppBaseTheme">
-        <item name="android:windowLightNavigationBar">false</item>
-        <item name="android:windowLightStatusBar">false</item>
-    </style>
-
-</resources>
+<?xml version="1.0" encoding="utf-8"?>
+<!--
+  ~ Copyright (C) 2019 Moez Bhatti <moez.bhatti@gmail.com>
+  ~
+  ~ This file is part of QKSMS.
+  ~
+  ~ QKSMS is free software: you can redistribute it and/or modify
+  ~ it under the terms of the GNU General Public License as published by
+  ~ the Free Software Foundation, either version 3 of the License, or
+  ~ (at your option) any later version.
+  ~
+  ~ QKSMS is distributed in the hope that it will be useful,
+  ~ but WITHOUT ANY WARRANTY; without even the implied warranty of
+  ~ MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+  ~ GNU General Public License for more details.
+  ~
+  ~ You should have received a copy of the GNU General Public License
+  ~ along with QKSMS.  If not, see <http://www.gnu.org/licenses/>.
+  -->
+<resources>
+
+    <!-- On Oreo, explicitly don't use the light status and navigation bars -->
+    <style name="AppTheme" parent="AppBaseTheme">
+        <item name="android:windowLightNavigationBar">false</item>
+        <item name="android:windowLightStatusBar">false</item>
+    </style>
+
+</resources>
diff --git a/presentation/src/main/res/values-night/themes.xml b/presentation/src/main/res/values-night/themes.xml
index b26faa8b7..a535323f1 100644
--- a/presentation/src/main/res/values-night/themes.xml
+++ b/presentation/src/main/res/values-night/themes.xml
@@ -1,86 +1,86 @@
-<?xml version="1.0" encoding="utf-8"?>
-<!--
-  ~ Copyright (C) 2019 Moez Bhatti <moez.bhatti@gmail.com>
-  ~
-  ~ This file is part of QKSMS.
-  ~
-  ~ QKSMS is free software: you can redistribute it and/or modify
-  ~ it under the terms of the GNU General Public License as published by
-  ~ the Free Software Foundation, either version 3 of the License, or
-  ~ (at your option) any later version.
-  ~
-  ~ QKSMS is distributed in the hope that it will be useful,
-  ~ but WITHOUT ANY WARRANTY; without even the implied warranty of
-  ~ MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
-  ~ GNU General Public License for more details.
-  ~
-  ~ You should have received a copy of the GNU General Public License
-  ~ along with QKSMS.  If not, see <http://www.gnu.org/licenses/>.
-  -->
-<resources>
-
-    <style name="AppTheme" parent="AppBaseTheme" />
-
-    <style name="AppBaseTheme" parent="Theme.AppCompat.NoActionBar">
-        <item name="android:divider">@color/separatorDark</item>
-        <item name="android:navigationBarColor">@color/backgroundDark</item>
-        <item name="android:queryBackground">@color/bubbleDark</item>
-        <item name="android:statusBarColor">@color/backgroundDark</item>
-        <item name="android:textColorPrimary">@color/text_primary</item>
-        <item name="android:textColorSecondary">@color/text_secondary</item>
-        <item name="android:textColorTertiary">@color/text_tertiary</item>
-        <item name="android:windowBackground">@color/backgroundDark</item>
-        <item name="android:windowContentTransitions">true</item>
-        <item name="actionBarPopupTheme">@style/PopupTheme</item>
-        <item name="bubbleColor">@color/bubbleDark</item>
-        <item name="colorPrimary">@color/backgroundDark</item>
-        <item name="colorPrimaryDark">@color/backgroundDark</item>
-        <item name="selectableItemBackground">@drawable/ripple_dark</item>
-        <item name="switchThumbEnabled">@color/switchThumbEnabledDark</item>
-        <item name="switchThumbDisabled">@color/switchThumbDisabledDark</item>
-        <item name="switchTrackEnabled">@color/switchTrackEnabledDark</item>
-        <item name="switchTrackDisabled">@color/switchTrackDisabledDark</item>
-        <item name="windowActionBar">false</item>
-    </style>
-
-    <style name="AppThemeDialog" parent="Theme.AppCompat.Dialog">
-        <item name="android:textColorPrimary">@color/text_primary</item>
-        <item name="android:textColorSecondary">@color/text_secondary</item>
-        <item name="android:textColorTertiary">@color/text_tertiary</item>
-        <item name="android:windowBackground">@color/backgroundDark</item>
-        <item name="actionBarPopupTheme">@style/PopupTheme</item>
-        <item name="bubbleColor">@color/bubbleDark</item>
-        <item name="colorPrimary">@color/backgroundDark</item>
-        <item name="colorPrimaryDark">@color/backgroundDark</item>
-        <item name="selectableItemBackground">@drawable/ripple_dark</item>
-        <item name="windowActionBar">false</item>
-    </style>
-
-    <style name="PopupTheme" parent="ThemeOverlay.AppCompat">
-        <item name="android:colorBackground">@color/backgroundDark</item>
-        <item name="android:textColor">@color/textPrimaryDark</item>
-    </style>
-
-    <!-- Black theme -->
-    <style name="AppTheme.Black">
-        <item name="android:navigationBarColor">@color/black</item>
-        <item name="android:statusBarColor">@color/black</item>
-        <item name="android:windowBackground">@color/black</item>
-        <item name="bubbleColor">@color/bubbleBlack</item>
-        <item name="colorPrimary">@color/black</item>
-        <item name="colorPrimaryDark">@color/black</item>
-    </style>
-
-    <style name="AppThemeDialog.Black">
-        <item name="android:windowBackground">@color/black</item>
-        <item name="actionBarPopupTheme">@style/PopupTheme.Black</item>
-        <item name="colorPrimary">@color/black</item>
-        <item name="colorPrimaryDark">@color/black</item>
-    </style>
-
-    <style name="PopupTheme.Black">
-        <item name="android:colorBackground">@color/black</item>
-        <item name="bubbleColor">@color/bubbleBlack</item>
-    </style>
-
-</resources>
+<?xml version="1.0" encoding="utf-8"?>
+<!--
+  ~ Copyright (C) 2019 Moez Bhatti <moez.bhatti@gmail.com>
+  ~
+  ~ This file is part of QKSMS.
+  ~
+  ~ QKSMS is free software: you can redistribute it and/or modify
+  ~ it under the terms of the GNU General Public License as published by
+  ~ the Free Software Foundation, either version 3 of the License, or
+  ~ (at your option) any later version.
+  ~
+  ~ QKSMS is distributed in the hope that it will be useful,
+  ~ but WITHOUT ANY WARRANTY; without even the implied warranty of
+  ~ MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+  ~ GNU General Public License for more details.
+  ~
+  ~ You should have received a copy of the GNU General Public License
+  ~ along with QKSMS.  If not, see <http://www.gnu.org/licenses/>.
+  -->
+<resources>
+
+    <style name="AppTheme" parent="AppBaseTheme" />
+
+    <style name="AppBaseTheme" parent="Theme.AppCompat.NoActionBar">
+        <item name="android:divider">@color/separatorDark</item>
+        <item name="android:navigationBarColor">@color/backgroundDark</item>
+        <item name="android:queryBackground">@color/bubbleDark</item>
+        <item name="android:statusBarColor">@color/backgroundDark</item>
+        <item name="android:textColorPrimary">@color/text_primary</item>
+        <item name="android:textColorSecondary">@color/text_secondary</item>
+        <item name="android:textColorTertiary">@color/text_tertiary</item>
+        <item name="android:windowBackground">@color/backgroundDark</item>
+        <item name="android:windowContentTransitions">true</item>
+        <item name="actionBarPopupTheme">@style/PopupTheme</item>
+        <item name="bubbleColor">@color/bubbleDark</item>
+        <item name="colorPrimary">@color/backgroundDark</item>
+        <item name="colorPrimaryDark">@color/backgroundDark</item>
+        <item name="selectableItemBackground">@drawable/ripple_dark</item>
+        <item name="switchThumbEnabled">@color/switchThumbEnabledDark</item>
+        <item name="switchThumbDisabled">@color/switchThumbDisabledDark</item>
+        <item name="switchTrackEnabled">@color/switchTrackEnabledDark</item>
+        <item name="switchTrackDisabled">@color/switchTrackDisabledDark</item>
+        <item name="windowActionBar">false</item>
+    </style>
+
+    <style name="AppThemeDialog" parent="Theme.AppCompat.Dialog">
+        <item name="android:textColorPrimary">@color/text_primary</item>
+        <item name="android:textColorSecondary">@color/text_secondary</item>
+        <item name="android:textColorTertiary">@color/text_tertiary</item>
+        <item name="android:windowBackground">@color/backgroundDark</item>
+        <item name="actionBarPopupTheme">@style/PopupTheme</item>
+        <item name="bubbleColor">@color/bubbleDark</item>
+        <item name="colorPrimary">@color/backgroundDark</item>
+        <item name="colorPrimaryDark">@color/backgroundDark</item>
+        <item name="selectableItemBackground">@drawable/ripple_dark</item>
+        <item name="windowActionBar">false</item>
+    </style>
+
+    <style name="PopupTheme" parent="ThemeOverlay.AppCompat">
+        <item name="android:colorBackground">@color/backgroundDark</item>
+        <item name="android:textColor">@color/textPrimaryDark</item>
+    </style>
+
+    <!-- Black theme -->
+    <style name="AppTheme.Black">
+        <item name="android:navigationBarColor">@color/black</item>
+        <item name="android:statusBarColor">@color/black</item>
+        <item name="android:windowBackground">@color/black</item>
+        <item name="bubbleColor">@color/bubbleBlack</item>
+        <item name="colorPrimary">@color/black</item>
+        <item name="colorPrimaryDark">@color/black</item>
+    </style>
+
+    <style name="AppThemeDialog.Black">
+        <item name="android:windowBackground">@color/black</item>
+        <item name="actionBarPopupTheme">@style/PopupTheme.Black</item>
+        <item name="colorPrimary">@color/black</item>
+        <item name="colorPrimaryDark">@color/black</item>
+    </style>
+
+    <style name="PopupTheme.Black">
+        <item name="android:colorBackground">@color/black</item>
+        <item name="bubbleColor">@color/bubbleBlack</item>
+    </style>
+
+</resources>
diff --git a/presentation/src/main/res/values-nl/strings.xml b/presentation/src/main/res/values-nl/strings.xml
index acaf0a76b..cfaf8c95d 100644
--- a/presentation/src/main/res/values-nl/strings.xml
+++ b/presentation/src/main/res/values-nl/strings.xml
@@ -1,411 +1,411 @@
-<?xml version="1.0" encoding="utf-8"?>
-<!--
-  ~ Copyright (C) 2019 Moez Bhatti <moez.bhatti@gmail.com>
-  ~
-  ~ This file is part of QKSMS.
-  ~
-  ~ QKSMS is free software: you can redistribute it and/or modify
-  ~ it under the terms of the GNU General Public License as published by
-  ~ the Free Software Foundation, either version 3 of the License, or
-  ~ (at your option) any later version.
-  ~
-  ~ QKSMS is distributed in the hope that it will be useful,
-  ~ but WITHOUT ANY WARRANTY; without even the implied warranty of
-  ~ MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
-  ~ GNU General Public License for more details.
-  ~
-  ~ You should have received a copy of the GNU General Public License
-  ~ along with QKSMS.  If not, see <http://www.gnu.org/licenses/>.
-  -->
-<resources>
-    <string name="shortcut_compose_long_label">Nieuwe conversatie</string>
-    <string name="shortcut_compose_short_label">Opstellen</string>
-    <string name="shortcut_compose_disabled_message">Snelkoppeling uitgeschakeld</string>
-    <string name="title_archived">Archief</string>
-    <string name="title_settings">Instellingen</string>
-    <string name="title_notification_prefs">Notificaties</string>
-    <string name="title_theme">Thema</string>
-    <string name="title_conversations">Doorzoek inbox&#8230;</string>
-    <string name="title_compose">Type een naam of nummer</string>
-    <string name="setup_skip">Overslaan</string>
-    <string name="setup_next">Verder</string>
-    <string name="menu_add_person">Voeg iemand toe</string>
-    <string name="menu_call">Bel</string>
-    <string name="menu_info">Details</string>
-    <string name="menu_save">Opslaan in galerij</string>
-    <string name="menu_share">Delen</string>
-    <string name="main_drawer_open_cd">Open navigatie lade</string>
-    <string name="main_title_selected">%d geselecteerd</string>
-    <string name="main_menu_clear">Wissen</string>
-    <string name="main_menu_archive">Archiveren</string>
-    <string name="main_menu_unarchive">Terugzetten uit archief</string>
-    <string name="main_menu_delete">Verwijderen</string>
-    <string name="main_menu_add_contact">Toevoegen aan contacten</string>
-    <string name="main_menu_pin">Bovenaan vastzetten</string>
-    <string name="main_menu_unpin">Losmaken</string>
-    <string name="main_menu_read">Markeren als gelezen</string>
-    <string name="main_menu_unread">Markeren als ongelezen</string>
-    <string name="main_menu_block">Blokkeren</string>
-    <string name="main_syncing">Berichten synchroniseren&#8230;</string>
-    <string name="main_sender_you">Jij: %s</string>
-    <string name="main_draft">Concept</string>
-    <string name="main_message_results_title">Resultaten in berichten</string>
-    <string name="main_message_results">%d berichten</string>
-    <string name="inbox_empty_text">Je conversaties verschijnen hier</string>
-    <string name="inbox_search_empty_text">Geen resultaten</string>
-    <string name="archived_empty_text">Je gearchiveerde conversaties verschijnen hier</string>
-    <string name="main_fab_cd">Start nieuwe conversatie</string>
-    <string name="main_default_sms_title">Love texting again</string>
-    <string name="main_default_sms_message">QKSMS uw standaard SMS app maken</string>
-    <string name="main_default_sms_change">Wijzigen</string>
-    <string name="main_permission_required">Toestemming vereist</string>
-    <string name="main_permission_sms">QKSMS machtigen voor het verzenden en bekijken van SMS-berichten</string>
-    <string name="main_permission_contacts">QKSMS machtigen om uw contactpersonen te bekijken</string>
-    <string name="main_permission_allow">Toestaan</string>
-    <string name="drawer_inbox">Inbox</string>
-    <string name="drawer_archived">Archief</string>
-    <string name="drawer_scheduled">Gepland</string>
-    <string name="drawer_blocking">Blokkeren</string>
-    <string name="drawer_more">Meer</string>
-    <string name="drawer_settings">Instellingen</string>
-    <string name="drawer_help">Help &amp; feedback</string>
-    <string name="drawer_invite">Vrienden uitnodigen</string>
-    <string name="drawer_plus_banner_summary">Ontgrendel geweldig nieuwe functies en ondersteun verdere ontwikkeling</string>
-    <string name="rate_title">Aan het genieten van QKSMS?</string>
-    <string name="rate_summary">Deel je liefde voor QKSMS door een beoordeling op Google Play te plaatsen!</string>
-    <string name="rate_okay">Ok</string>
-    <string name="rate_dismiss">Sluiten</string>
-    <string name="dialog_delete_title">Verwijderen</string>
-    <plurals name="dialog_delete_message">
-        <item quantity="one">Wil je deze conversatie verwijderen?</item>
-        <item quantity="other">Wil je %d conversaties verwijderen?</item>
-    </plurals>
-    <string-array name="message_options">
-        <item>Kopieer tekst</item>
-        <item>Doorsturen</item>
-        <item>Verwijderen</item>
-    </string-array>
-    <string name="compose_number_picker_title">Kies een telefoonnummer</string>
-    <string name="compose_number_picker_default">%s ∙ Standaard</string>
-    <string name="compose_number_picker_once">Eén keer</string>
-    <string name="compose_number_picker_always">Altijd</string>
-    <string name="compose_title_selected">%d geselecteerd</string>
-    <string name="compose_subtitle_results">%1$d van de %2$d resultaten</string>
-    <string name="compose_send_group_title">Versturen als groepsbericht</string>
-    <string name="compose_send_group_summary">Ontvangers en antwoorden zijn zichtbaar voor iedereen</string>
-    <string name="compose_messages_empty">Dit is het begin van je conversatie. Zeg iets leuks!</string>
-    <string name="compose_vcard_label">Contactpersoonkaart</string>
-    <string name="compose_scheduled_for">Gepland voor</string>
-    <string name="compose_scheduled_future">De geselecteerde tijd moet in de toekomst liggen!</string>
-    <string name="compose_scheduled_plus">Je hebt QKSMS+ nodig om geplande berichten te gebruiken</string>
-    <string name="compose_scheduled_toast">Toegevoegd aan geplande berichten</string>
-    <string name="compose_hint">Type een bericht&#8230;</string>
-    <string name="compose_menu_copy">Tekst kopiëren</string>
-    <string name="compose_menu_forward">Doorsturen</string>
-    <string name="compose_menu_delete">Verwijderen</string>
-    <string name="compose_menu_previous">Vorige</string>
-    <string name="compose_menu_next">Volgende</string>
-    <string name="compose_menu_clear">Wissen</string>
-    <string name="compose_details_title">Details van bericht</string>
-    <string name="compose_details_type">Type: %s</string>
-    <string name="compose_details_from">Van: %s</string>
-    <string name="compose_details_to">Naar: %s</string>
-    <string name="compose_details_subject">Onderwerp: %s</string>
-    <string name="compose_details_priority">Prioriteit: %s</string>
-    <string name="compose_details_size">Grootte: %s</string>
-    <string name="compose_details_sent">Verzonden: %s</string>
-    <string name="compose_details_received">Ontvangen: %s</string>
-    <string name="compose_details_delivered">Afgeleverd: %s</string>
-    <string name="compose_details_error_code">Foutcode: %d</string>
-    <string name="compose_attach_cd">Een bijlage toevoegen</string>
-    <string name="compose_gallery_cd">Een foto toevoegen</string>
-    <string name="compose_camera_cd">Een foto nemen</string>
-    <string name="compose_schedule_cd">Bericht plannen</string>
-    <string name="compose_contact_cd">Een contactpersoon toevoegen</string>
-    <string name="compose_contact_error">Fout bij het lezen van contact</string>
-    <!-- Example: SIM 1 (Verizon) selected-->
-    <string name="compose_sim_changed_toast">Simkaart %1$d (%2$s) geselecteerd</string>
-    <string name="compose_sim_cd">%s geselecteerd, wijzig SIM-kaart</string>
-    <string name="compose_send_cd">Verstuur bericht</string>
-    <string name="message_status_sending">Verzenden&#8230;</string>
-    <string name="message_status_delivered">Afgeleverd %s</string>
-    <string name="message_status_failed">Fout bij verzenden. Tik om opnieuw te proberen</string>
-    <string name="info_title">Details</string>
-    <string name="info_copied_address">Adres gekopieerd</string>
-    <string name="info_name">Titel van conversatie</string>
-    <string name="info_notifications">Notificaties</string>
-    <string name="info_theme">Thema</string>
-    <string name="info_archive">Archief</string>
-    <string name="info_unarchive">Terugzetten uit archief</string>
-    <string name="info_block">Blokkeren</string>
-    <string name="info_unblock">Blokkering opheffen</string>
-    <string name="info_delete">Conversatie verwijderen</string>
-    <string name="gallery_error">Kan media niet laden</string>
-    <string name="gallery_toast_saved">Opgeslagen in galerij</string>
-    <string name="backup_title">Back-up en herstel</string>
-    <string name="backup_backing_up">Back-up van berichten aan het maken</string>
-    <string name="backup_restoring">Bezig met het terugzetten van berichten</string>
-    <string name="backup_last">Laatste back-up</string>
-    <string name="backup_loading">Bezig met laden&#8230;</string>
-    <string name="backup_never">Nooit</string>
-    <string name="backup_restore_title">Herstellen</string>
-    <string name="backup_restore_summary">Selecteer een back-up</string>
-    <string name="backup_restore_error_plus">Je dient QKSMS+ te hebben alvorens je gebruik kan maken van Back-up en herstellen</string>
-    <string name="backup_restore_error_backup">Bezig met het maken van back-up&#8230;</string>
-    <string name="backup_restore_error_restore">Bezig met herstellen&#8230;</string>
-    <string name="backup_restore_confirm_title">Herstel van back-up</string>
-    <string name="backup_restore_confirm_message">Weet je ze zeker dat je de berichten uit deze back-up wilt herstellen?</string>
-    <string name="backup_restore_stop_title">Stop herstellen</string>
-    <string name="backup_restore_stop_message">Berichten die al hersteld zijn zullen worden behouden op je toestel</string>
-    <string name="backup_restore_dialog_title">Back-ups</string>
-    <string name="backup_restore_dialog_empty">Geen back-ups gevonden</string>
-    <plurals name="backup_message_count">
-        <item quantity="one">%d bericht</item>
-        <item quantity="other">%d berichten</item>
-    </plurals>
-    <string name="backup_disclaimer">Op dit moment wordt alleen SMS ondersteund door back-up en terugzetten. MMS ondersteuning en geplande back-ups zullen spoedig beschikbaar komen!</string>
-    <string name="backup_now">Nu back-up maken</string>
-    <string name="backup_progress_parsing">Back-up samenstellen&#8230;</string>
-    <string name="backup_progress_running">%d/%d berichten</string>
-    <string name="backup_progress_saving">Back-up opslaan&#8230;</string>
-    <string name="backup_progress_syncing">Synchroniseren van berichten&#8230;</string>
-    <string name="backup_progress_finished">Klaar!</string>
-    <string name="backup_notification_channel_name">Back-up en herstel</string>
-    <string name="scheduled_title">Gepland</string>
-    <string name="scheduled_empty_description">Verzend automatisch een bericht, op de door jou ingestelde tijd</string>
-    <string name="scheduled_empty_message_1">Hey! Wanneer was je verjaardag nu weer?</string>
-    <string name="scheduled_empty_message_2">Op 23 december</string>
-    <string name="scheduled_empty_message_3">Gelukkige verjaardag! Zie eens wat voor een vriend ik ben, ik herinner je verjaardag</string>
-    <!--&#x200A; is a special character required at the end of this string to fix it's formatting in the app -->
-    <string name="scheduled_empty_message_3_timestamp">Verzenden op 23 december</string>
-    <string name="scheduled_compose_cd">Plan een bericht</string>
-    <string name="scheduled_options_title">Gepland bericht</string>
-    <string-array name="scheduled_options">
-        <item>Nu versturen</item>
-        <item>Tekst kopiëren</item>
-        <item>Verwijderen</item>
-    </string-array>
-    <string name="settings_category_appearance">Uiterlijk</string>
-    <string name="settings_category_general">Algemeen</string>
-    <string name="settings_category_qkreply">QK Reply</string>
-    <string name="settings_theme_title">Thema</string>
-    <string name="settings_night_title">Nachtmodus</string>
-    <string name="settings_black_title">Pure zwarte nachtmodus</string>
-    <string name="settings_night_start_title">Starttijd</string>
-    <string name="settings_night_end_title">Eindtijd</string>
-    <string name="settings_automatic_colors_title">Automatische contactkleuren</string>
-    <string name="settings_text_size_title">Tekst grootte</string>
-    <string name="settings_system_font_title">Gebruik lettertype van systeem</string>
-    <string name="settings_auto_emoji_title">Automatische emoji</string>
-    <string name="settings_notifications_title">Notificaties</string>
-    <string name="settings_notifications_o_summary">Tikken om aan te passen</string>
-    <string name="settings_notification_actions_title">Acties</string>
-    <string name="settings_notification_action_1">Button 1</string>
-    <string name="settings_notification_action_2">Button 2</string>
-    <string name="settings_notification_action_3">Button 3</string>
-    <string name="settings_notification_previews_title">Notificatievoorbeeld</string>
-    <string name="settings_notification_wake_title">Scherm activeren</string>
-    <string name="settings_vibration_title">Trillen</string>
-    <string name="settings_ringtone_title">Geluid</string>
-    <string name="settings_ringtone_none">Geen</string>
-    <string name="settings_qkreply_title">QK Reply</string>
-    <string name="settings_qkreply_summary">Popup voor nieuwe berichten</string>
-    <string name="settings_qkreply_tap_dismiss_title">Tik om te sluiten</string>
-    <string name="settings_qkreply_tap_dismiss_summary">Tik buiten de popup om deze te sluiten</string>
-    <string name="settings_delayed_title">Vertraagd verzenden</string>
-    <string name="settings_swipe_actions">Swipe acties</string>
-    <string name="settings_swipe_actions_summary">Pas de veeg-acties aan voor conversaties</string>
-    <string name="settings_swipe_actions_right">Rechts vegen</string>
-    <string name="settings_swipe_actions_left">Links vegen</string>
-    <string name="settings_swipe_actions_change">WIJZIGEN</string>
-    <string-array name="settings_swipe_actions">
-        <item>Geen</item>
-        <item>Archiveren</item>
-        <item>Verwijderen</item>
-        <item>Blokkeren</item>
-        <item>Bellen</item>
-        <item>Markeren als gelezen</item>
-        <item>Markeren als ongelezen</item>
-    </string-array>
-    <string name="settings_delivery_title">Afleverrapporten</string>
-    <string name="settings_delivery_summary">Bevestig dat berichten met succes zijn verzonden</string>
-    <string name="settings_signature_title">Handtekening</string>
-    <string name="settings_signature_summary">Voeg een handtekening toe aan het eind van je berichten</string>
-    <string name="settings_unicode_title">Verwijder accenten</string>
-    <string name="settings_unicode_summary">Verwijder accenten van karakters voor uitgaande berichten</string>
-    <string name="settings_mobile_title">Alleen GSM-nummers</string>
-    <string name="settings_mobile_summary">Enkel mobiele nummers tonen wanneer je een bericht opstelt</string>
-    <string name="settings_auto_delete">Delete old messages automatically</string>
-    <string name="settings_auto_delete_dialog_message">Messages will be deleted after the specified number of days</string>
-    <string name="settings_auto_delete_dialog_hint">Number of days</string>
-    <string name="settings_auto_delete_never">Never</string>
-    <string name="settings_auto_delete_warning">Delete old messages automatically?</string>
-    <string name="settings_auto_delete_warning_message">If you proceed, %1$d messages will be deleted now</string>
-    <plurals name="settings_auto_delete_summary">
-        <item quantity="one">After 1 day</item>
-        <item quantity="other">After %d days</item>
-    </plurals>
-    <string name="settings_long_as_mms_title">Verstuur lange berichten als MMS</string>
-    <string name="settings_long_as_mms_summary">Als je lange tekstberichten niet kunnen worden verzonden, of in de verkeerde volgorde, kun je ze in plaats daarvan als MMS-berichten versturen. Extra kosten kunnen van toepassing zijn.</string>
-    <string name="settings_mms_size_title">Auto-compress MMS bijlagen</string>
-    <string name="settings_sync_title">Synchroniseer berichten</string>
-    <string name="settings_sync_summary">Hersynchroniseer jouw berichten vanuit de SMS database op je telefoon</string>
-    <string name="settings_about_title">Over QKSMS</string>
-    <string name="settings_version">Versie %s</string>
-    <string name="settings_logging_enabled">Foutenregistratie ingeschakeld</string>
-    <string name="settings_logging_disabled">Foutenregistratie uitgeschakeld</string>
-    <string name="settings_delay_duration_hint">Voer duur (seconden) in</string>
-    <string name="blocking_title">Geblokkeerd</string>
-    <string name="blocking_drop_title">Berichten weggooien</string>
-    <string name="blocking_drop_summary">Verwijder inkomende berichten van geblokkeerde afzenders in plaats van ze te verbergen</string>
-    <string name="blocking_conversations">Geblokkeerde gesprekken</string>
-    <string name="blocking_manager_title">Blokkeermanager</string>
-    <string name="blocking_manager_qksms_title">QKSMS</string>
-    <string name="blocking_manager_qksms_summary">Ingebouwde blokkeerfunctie in QKSMS</string>
-    <string name="blocking_manager_call_control_summary">Filter je oproepen en berichten automatisch op één handige plaats! Community IQ™ stelt je in staat om ongewenste berichten van de bij community bekende spammers te blokkeren</string>
-    <string name="blocking_manager_sia_summary">Automatisch filteren van berichten van ongevraagde nummers met behulp van de app \"Should I Answer\"</string>
-    <string name="blocking_manager_copy_title">Kopieer geblokkeerde nummers</string>
-    <string name="blocking_manager_copy_summary">Ga verder naar %s en kopieer je bestaande geblokkeerde nummers</string>
-    <string name="blocked_numbers_title">Geblokkeerde nummers</string>
-    <string name="blocked_numbers_empty">Je geblokkeerde nummers verschijnen hier</string>
-    <string name="blocked_numbers_add_cd">Blokkeer een nieuw nummer</string>
-    <string name="blocked_numbers_dialog_title">Blokkeer berichten van</string>
-    <string name="blocked_numbers_dialog_hint">Telefoonnummer</string>
-    <string name="blocked_numbers_dialog_block">Blokkeren</string>
-    <string name="blocked_messages_title">Geblokkeerde berichten</string>
-    <string name="blocked_messages_empty">Je geblokkeerde berichten verschijnen hier</string>
-    <string name="blocking_block_title">Blokkeren</string>
-    <string name="blocking_unblock_title">Deblokkeer</string>
-    <plurals name="blocking_block_external">
-        <item quantity="one">Ga verder naar %s en blokkeer dit nummer</item>
-        <item quantity="other">Ga verder naar %s en blokkeer deze nummers</item>
-    </plurals>
-    <plurals name="blocking_unblock_external">
-        <item quantity="one">Ga door naar %s en sta dit nummer toe</item>
-        <item quantity="other">Ga door naar %s en sta deze nummers toe</item>
-    </plurals>
-    <string name="about_title">Over</string>
-    <string name="about_version_title">Versie</string>
-    <string name="about_developer_title">Ontwikkelaar</string>
-    <string name="about_source_title">Broncode</string>
-    <string name="about_changelog_title">Changelog</string>
-    <string name="about_contact_title">Contact</string>
-    <string name="about_license_title">Licentie</string>
-    <string name="about_copyright_title">Copyright</string>
-    <string name="qksms_plus_description_title">Ondersteun ontwikkeling, ontgrendel alles</string>
-    <string name="qksms_plus_description_summary">Je kan de developer al helpen vanaf %s</string>
-    <!-- Substitutions are for price and currency. Ex: Lifetime upgrade for $1.99 USD -->
-    <string name="qksms_plus_upgrade">Levenslange upgrade voor %1$s %2$s</string>
-    <!-- Substitutions are for price and currency. Ex: Unlock + donate for $4.99 USD -->
-    <string name="qksms_plus_upgrade_donate">Ontgrendel en doneer voor %1$s %2$s</string>
-    <string name="qksms_plus_thanks_title">Bedankt voor het onderhouden van QKSMS!</string>
-    <string name="qksms_plus_thanks_summary">Je hebt nu toegang tot alle QKSMS+ functies</string>
-    <string name="qksms_plus_free_title">QKSMS+ is gratis voor F-Droid gebruikers. Als je verdere ontwikkelingen wilt helpen, kun je gerust een donatie overwegen.</string>
-    <string name="qksms_plus_donate">Doneren via PayPal</string>
-    <string name="qksms_plus_coming_soon">Binnenkort</string>
-    <string name="qksms_plus_themes_title">Premium thema\'s</string>
-    <string name="qksms_plus_themes_summary">Ontgrendel vele mooie kleuren die niet beschikbaar zijn in het Material Design kleurenschema</string>
-    <string name="qksms_plus_emoji_title">Aangepaste auto-emoji</string>
-    <string name="qksms_plus_emoji_summary">Maak aangepaste auto-emoji sneltoetsen</string>
-    <string name="qksms_plus_backup_title">Berichtenback-up</string>
-    <string name="qksms_plus_backup_summary">Automatische back-up van jouw berichten. Geen zorgen meer over het kwijtraken van jouw berichten bij het verlies van je telefoon of het overschakelen naar een nieuwe telefoon</string>
-    <string name="qksms_plus_scheduled_title">Geplande berichten</string>
-    <string name="qksms_plus_scheduled_summary">Berichten worden automatisch verzonden op de ingestelde tijd</string>
-    <string name="qksms_plus_delayed_title">Vertraagd verzenden</string>
-    <string name="qksms_plus_delayed_summary">Wacht enkele seconden voor het versturen van je bericht</string>
-    <string name="qksms_plus_night_title">Automatische nachtmodus</string>
-    <string name="qksms_plus_night_summary">Schakel de nachtmodus in gebaseerd op de tijd van de dag</string>
-    <string name="qksms_plus_blacklist_title">Geavanceerd blokkeren</string>
-    <string name="qksms_plus_blacklist_summary">Blokkeer berichten die specifieke woorden of patronen bevatten</string>
-    <string name="qksms_plus_forward_title">Auto-doorsturen</string>
-    <string name="qksms_plus_forward_summary">Automatisch doorsturen van berichten van bepaalde afzenders</string>
-    <string name="qksms_plus_respond_title">Auto-antwoorden</string>
-    <string name="qksms_plus_respond_summary">Automatisch reageren op inkomende berichten met een vooraf ingestelde reactie</string>
-    <string name="qksms_plus_more_title">Meer</string>
-    <string name="qksms_plus_more_summary">QKSMS is in actieve ontwikkeling, uw aankoop bevat alle toekomstige nieuwigheden exclusief voor QKSMS+!</string>
-    <string name="widget_loading">Laden&#8230;</string>
-    <string name="widget_more">Bekijk meer conversaties</string>
-    <string name="qkreply_menu_read">Markeren als gelezen</string>
-    <string name="qkreply_menu_call">Bel</string>
-    <string name="qkreply_menu_delete">Verwijderen</string>
-    <string name="qkreply_menu_expand">Toon meer</string>
-    <string name="qkreply_menu_collapse">Toon minder</string>
-    <string name="qkreply_menu_view">Open conversatie</string>
-    <string name="theme_material">Material</string>
-    <string name="theme_hex">HEX</string>
-    <string name="theme_apply">Toepassen</string>
-    <string-array name="notification_actions">
-        <item>Geen</item>
-        <item>Archiveren</item>
-        <item>Verwijderen</item>
-        <item>Blokkeren</item>
-        <item>Bel</item>
-        <item>Markeer als gelezen</item>
-        <item>Beantwoorden</item>
-    </string-array>
-    <string name="button_yes">Ja</string>
-    <string name="button_continue">Doorgaan</string>
-    <string name="button_cancel">Annuleren</string>
-    <string name="button_delete">Verwijderen</string>
-    <string name="button_save">Opslaan</string>
-    <string name="button_stop">Stop</string>
-    <string name="button_more">Meer</string>
-    <string name="button_set">Instellen</string>
-    <string name="button_undo">Ongedaan maken</string>
-    <string name="toast_copied">Gekopieerd</string>
-    <string name="toast_archived">Conversatie gearchiveerd</string>
-    <string name="toast_qksms_plus">Je dient QKSMS+ te ontgrendelen om dit te gebruiken</string>
-    <plurals name="notification_new_messages">
-        <item quantity="one">Nieuw bericht</item>
-        <item quantity="other">%s nieuwe berichten</item>
-    </plurals>
-    <string name="notification_message_failed_title">Bericht niet verzonden</string>
-    <string name="notification_message_failed_text">Het bericht naar %s is niet verzonden</string>
-    <string-array name="night_modes">
-        <item>Systeem</item>
-        <item>Uitgeschakeld</item>
-        <item>Altijd aan</item>
-        <item>Automatisch</item>
-    </string-array>
-    <string-array name="notification_preview_options">
-        <item>Toon naam en bericht</item>
-        <item>Toon naam</item>
-        <item>Inhoud verbergen</item>
-    </string-array>
-    <string-array name="text_sizes">
-        <item>Klein</item>
-        <item>Normaal</item>
-        <item>Groot</item>
-        <item>Groot</item>
-    </string-array>
-    <string-array name="delayed_sending_labels">
-        <item>Geen vertraging</item>
-        <item>3 seconden</item>
-        <item>5 seconden</item>
-        <item>10 seconden</item>
-    </string-array>
-    <string-array name="mms_sizes">
-        <item>Automatisch</item>
-        <item>100kB</item>
-        <item>200kB</item>
-        <item>300kB</item>
-        <item>600kB</item>
-        <item>1000kB</item>
-        <item>2000kB</item>
-        <item>Geen compressie</item>
-    </string-array>
-    <string-array name="qk_responses">
-        <item>Oké</item>
-        <item>Wacht even</item>
-        <item>Onderweg</item>
-        <item>Bedankt</item>
-        <item>Klinkt goed</item>
-        <item>Alles goed?</item>
-        <item>Ik ga akkoord</item>
-        <item>Nee</item>
-        <item>Hou van je</item>
-        <item>Sorry</item>
-        <item>LOL</item>
-        <item>Dat is oke</item>
-    </string-array>
-</resources>
+<?xml version="1.0" encoding="utf-8"?>
+<!--
+  ~ Copyright (C) 2019 Moez Bhatti <moez.bhatti@gmail.com>
+  ~
+  ~ This file is part of QKSMS.
+  ~
+  ~ QKSMS is free software: you can redistribute it and/or modify
+  ~ it under the terms of the GNU General Public License as published by
+  ~ the Free Software Foundation, either version 3 of the License, or
+  ~ (at your option) any later version.
+  ~
+  ~ QKSMS is distributed in the hope that it will be useful,
+  ~ but WITHOUT ANY WARRANTY; without even the implied warranty of
+  ~ MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+  ~ GNU General Public License for more details.
+  ~
+  ~ You should have received a copy of the GNU General Public License
+  ~ along with QKSMS.  If not, see <http://www.gnu.org/licenses/>.
+  -->
+<resources>
+    <string name="shortcut_compose_long_label">Nieuwe conversatie</string>
+    <string name="shortcut_compose_short_label">Opstellen</string>
+    <string name="shortcut_compose_disabled_message">Snelkoppeling uitgeschakeld</string>
+    <string name="title_archived">Archief</string>
+    <string name="title_settings">Instellingen</string>
+    <string name="title_notification_prefs">Notificaties</string>
+    <string name="title_theme">Thema</string>
+    <string name="title_conversations">Doorzoek inbox&#8230;</string>
+    <string name="title_compose">Type een naam of nummer</string>
+    <string name="setup_skip">Overslaan</string>
+    <string name="setup_next">Verder</string>
+    <string name="menu_add_person">Voeg iemand toe</string>
+    <string name="menu_call">Bel</string>
+    <string name="menu_info">Details</string>
+    <string name="menu_save">Opslaan in galerij</string>
+    <string name="menu_share">Delen</string>
+    <string name="main_drawer_open_cd">Open navigatie lade</string>
+    <string name="main_title_selected">%d geselecteerd</string>
+    <string name="main_menu_clear">Wissen</string>
+    <string name="main_menu_archive">Archiveren</string>
+    <string name="main_menu_unarchive">Terugzetten uit archief</string>
+    <string name="main_menu_delete">Verwijderen</string>
+    <string name="main_menu_add_contact">Toevoegen aan contacten</string>
+    <string name="main_menu_pin">Bovenaan vastzetten</string>
+    <string name="main_menu_unpin">Losmaken</string>
+    <string name="main_menu_read">Markeren als gelezen</string>
+    <string name="main_menu_unread">Markeren als ongelezen</string>
+    <string name="main_menu_block">Blokkeren</string>
+    <string name="main_syncing">Berichten synchroniseren&#8230;</string>
+    <string name="main_sender_you">Jij: %s</string>
+    <string name="main_draft">Concept</string>
+    <string name="main_message_results_title">Resultaten in berichten</string>
+    <string name="main_message_results">%d berichten</string>
+    <string name="inbox_empty_text">Je conversaties verschijnen hier</string>
+    <string name="inbox_search_empty_text">Geen resultaten</string>
+    <string name="archived_empty_text">Je gearchiveerde conversaties verschijnen hier</string>
+    <string name="main_fab_cd">Start nieuwe conversatie</string>
+    <string name="main_default_sms_title">Love texting again</string>
+    <string name="main_default_sms_message">QKSMS uw standaard SMS app maken</string>
+    <string name="main_default_sms_change">Wijzigen</string>
+    <string name="main_permission_required">Toestemming vereist</string>
+    <string name="main_permission_sms">QKSMS machtigen voor het verzenden en bekijken van SMS-berichten</string>
+    <string name="main_permission_contacts">QKSMS machtigen om uw contactpersonen te bekijken</string>
+    <string name="main_permission_allow">Toestaan</string>
+    <string name="drawer_inbox">Inbox</string>
+    <string name="drawer_archived">Archief</string>
+    <string name="drawer_scheduled">Gepland</string>
+    <string name="drawer_blocking">Blokkeren</string>
+    <string name="drawer_more">Meer</string>
+    <string name="drawer_settings">Instellingen</string>
+    <string name="drawer_help">Help &amp; feedback</string>
+    <string name="drawer_invite">Vrienden uitnodigen</string>
+    <string name="drawer_plus_banner_summary">Ontgrendel geweldig nieuwe functies en ondersteun verdere ontwikkeling</string>
+    <string name="rate_title">Aan het genieten van QKSMS?</string>
+    <string name="rate_summary">Deel je liefde voor QKSMS door een beoordeling op Google Play te plaatsen!</string>
+    <string name="rate_okay">Ok</string>
+    <string name="rate_dismiss">Sluiten</string>
+    <string name="dialog_delete_title">Verwijderen</string>
+    <plurals name="dialog_delete_message">
+        <item quantity="one">Wil je deze conversatie verwijderen?</item>
+        <item quantity="other">Wil je %d conversaties verwijderen?</item>
+    </plurals>
+    <string-array name="message_options">
+        <item>Kopieer tekst</item>
+        <item>Doorsturen</item>
+        <item>Verwijderen</item>
+    </string-array>
+    <string name="compose_number_picker_title">Kies een telefoonnummer</string>
+    <string name="compose_number_picker_default">%s ∙ Standaard</string>
+    <string name="compose_number_picker_once">Eén keer</string>
+    <string name="compose_number_picker_always">Altijd</string>
+    <string name="compose_title_selected">%d geselecteerd</string>
+    <string name="compose_subtitle_results">%1$d van de %2$d resultaten</string>
+    <string name="compose_send_group_title">Versturen als groepsbericht</string>
+    <string name="compose_send_group_summary">Ontvangers en antwoorden zijn zichtbaar voor iedereen</string>
+    <string name="compose_messages_empty">Dit is het begin van je conversatie. Zeg iets leuks!</string>
+    <string name="compose_vcard_label">Contactpersoonkaart</string>
+    <string name="compose_scheduled_for">Gepland voor</string>
+    <string name="compose_scheduled_future">De geselecteerde tijd moet in de toekomst liggen!</string>
+    <string name="compose_scheduled_plus">Je hebt QKSMS+ nodig om geplande berichten te gebruiken</string>
+    <string name="compose_scheduled_toast">Toegevoegd aan geplande berichten</string>
+    <string name="compose_hint">Type een bericht&#8230;</string>
+    <string name="compose_menu_copy">Tekst kopiëren</string>
+    <string name="compose_menu_forward">Doorsturen</string>
+    <string name="compose_menu_delete">Verwijderen</string>
+    <string name="compose_menu_previous">Vorige</string>
+    <string name="compose_menu_next">Volgende</string>
+    <string name="compose_menu_clear">Wissen</string>
+    <string name="compose_details_title">Details van bericht</string>
+    <string name="compose_details_type">Type: %s</string>
+    <string name="compose_details_from">Van: %s</string>
+    <string name="compose_details_to">Naar: %s</string>
+    <string name="compose_details_subject">Onderwerp: %s</string>
+    <string name="compose_details_priority">Prioriteit: %s</string>
+    <string name="compose_details_size">Grootte: %s</string>
+    <string name="compose_details_sent">Verzonden: %s</string>
+    <string name="compose_details_received">Ontvangen: %s</string>
+    <string name="compose_details_delivered">Afgeleverd: %s</string>
+    <string name="compose_details_error_code">Foutcode: %d</string>
+    <string name="compose_attach_cd">Een bijlage toevoegen</string>
+    <string name="compose_gallery_cd">Een foto toevoegen</string>
+    <string name="compose_camera_cd">Een foto nemen</string>
+    <string name="compose_schedule_cd">Bericht plannen</string>
+    <string name="compose_contact_cd">Een contactpersoon toevoegen</string>
+    <string name="compose_contact_error">Fout bij het lezen van contact</string>
+    <!-- Example: SIM 1 (Verizon) selected-->
+    <string name="compose_sim_changed_toast">Simkaart %1$d (%2$s) geselecteerd</string>
+    <string name="compose_sim_cd">%s geselecteerd, wijzig SIM-kaart</string>
+    <string name="compose_send_cd">Verstuur bericht</string>
+    <string name="message_status_sending">Verzenden&#8230;</string>
+    <string name="message_status_delivered">Afgeleverd %s</string>
+    <string name="message_status_failed">Fout bij verzenden. Tik om opnieuw te proberen</string>
+    <string name="info_title">Details</string>
+    <string name="info_copied_address">Adres gekopieerd</string>
+    <string name="info_name">Titel van conversatie</string>
+    <string name="info_notifications">Notificaties</string>
+    <string name="info_theme">Thema</string>
+    <string name="info_archive">Archief</string>
+    <string name="info_unarchive">Terugzetten uit archief</string>
+    <string name="info_block">Blokkeren</string>
+    <string name="info_unblock">Blokkering opheffen</string>
+    <string name="info_delete">Conversatie verwijderen</string>
+    <string name="gallery_error">Kan media niet laden</string>
+    <string name="gallery_toast_saved">Opgeslagen in galerij</string>
+    <string name="backup_title">Back-up en herstel</string>
+    <string name="backup_backing_up">Back-up van berichten aan het maken</string>
+    <string name="backup_restoring">Bezig met het terugzetten van berichten</string>
+    <string name="backup_last">Laatste back-up</string>
+    <string name="backup_loading">Bezig met laden&#8230;</string>
+    <string name="backup_never">Nooit</string>
+    <string name="backup_restore_title">Herstellen</string>
+    <string name="backup_restore_summary">Selecteer een back-up</string>
+    <string name="backup_restore_error_plus">Je dient QKSMS+ te hebben alvorens je gebruik kan maken van Back-up en herstellen</string>
+    <string name="backup_restore_error_backup">Bezig met het maken van back-up&#8230;</string>
+    <string name="backup_restore_error_restore">Bezig met herstellen&#8230;</string>
+    <string name="backup_restore_confirm_title">Herstel van back-up</string>
+    <string name="backup_restore_confirm_message">Weet je ze zeker dat je de berichten uit deze back-up wilt herstellen?</string>
+    <string name="backup_restore_stop_title">Stop herstellen</string>
+    <string name="backup_restore_stop_message">Berichten die al hersteld zijn zullen worden behouden op je toestel</string>
+    <string name="backup_restore_dialog_title">Back-ups</string>
+    <string name="backup_restore_dialog_empty">Geen back-ups gevonden</string>
+    <plurals name="backup_message_count">
+        <item quantity="one">%d bericht</item>
+        <item quantity="other">%d berichten</item>
+    </plurals>
+    <string name="backup_disclaimer">Op dit moment wordt alleen SMS ondersteund door back-up en terugzetten. MMS ondersteuning en geplande back-ups zullen spoedig beschikbaar komen!</string>
+    <string name="backup_now">Nu back-up maken</string>
+    <string name="backup_progress_parsing">Back-up samenstellen&#8230;</string>
+    <string name="backup_progress_running">%d/%d berichten</string>
+    <string name="backup_progress_saving">Back-up opslaan&#8230;</string>
+    <string name="backup_progress_syncing">Synchroniseren van berichten&#8230;</string>
+    <string name="backup_progress_finished">Klaar!</string>
+    <string name="backup_notification_channel_name">Back-up en herstel</string>
+    <string name="scheduled_title">Gepland</string>
+    <string name="scheduled_empty_description">Verzend automatisch een bericht, op de door jou ingestelde tijd</string>
+    <string name="scheduled_empty_message_1">Hey! Wanneer was je verjaardag nu weer?</string>
+    <string name="scheduled_empty_message_2">Op 23 december</string>
+    <string name="scheduled_empty_message_3">Gelukkige verjaardag! Zie eens wat voor een vriend ik ben, ik herinner je verjaardag</string>
+    <!--&#x200A; is a special character required at the end of this string to fix it's formatting in the app -->
+    <string name="scheduled_empty_message_3_timestamp">Verzenden op 23 december</string>
+    <string name="scheduled_compose_cd">Plan een bericht</string>
+    <string name="scheduled_options_title">Gepland bericht</string>
+    <string-array name="scheduled_options">
+        <item>Nu versturen</item>
+        <item>Tekst kopiëren</item>
+        <item>Verwijderen</item>
+    </string-array>
+    <string name="settings_category_appearance">Uiterlijk</string>
+    <string name="settings_category_general">Algemeen</string>
+    <string name="settings_category_qkreply">QK Reply</string>
+    <string name="settings_theme_title">Thema</string>
+    <string name="settings_night_title">Nachtmodus</string>
+    <string name="settings_black_title">Pure zwarte nachtmodus</string>
+    <string name="settings_night_start_title">Starttijd</string>
+    <string name="settings_night_end_title">Eindtijd</string>
+    <string name="settings_automatic_colors_title">Automatische contactkleuren</string>
+    <string name="settings_text_size_title">Tekst grootte</string>
+    <string name="settings_system_font_title">Gebruik lettertype van systeem</string>
+    <string name="settings_auto_emoji_title">Automatische emoji</string>
+    <string name="settings_notifications_title">Notificaties</string>
+    <string name="settings_notifications_o_summary">Tikken om aan te passen</string>
+    <string name="settings_notification_actions_title">Acties</string>
+    <string name="settings_notification_action_1">Button 1</string>
+    <string name="settings_notification_action_2">Button 2</string>
+    <string name="settings_notification_action_3">Button 3</string>
+    <string name="settings_notification_previews_title">Notificatievoorbeeld</string>
+    <string name="settings_notification_wake_title">Scherm activeren</string>
+    <string name="settings_vibration_title">Trillen</string>
+    <string name="settings_ringtone_title">Geluid</string>
+    <string name="settings_ringtone_none">Geen</string>
+    <string name="settings_qkreply_title">QK Reply</string>
+    <string name="settings_qkreply_summary">Popup voor nieuwe berichten</string>
+    <string name="settings_qkreply_tap_dismiss_title">Tik om te sluiten</string>
+    <string name="settings_qkreply_tap_dismiss_summary">Tik buiten de popup om deze te sluiten</string>
+    <string name="settings_delayed_title">Vertraagd verzenden</string>
+    <string name="settings_swipe_actions">Swipe acties</string>
+    <string name="settings_swipe_actions_summary">Pas de veeg-acties aan voor conversaties</string>
+    <string name="settings_swipe_actions_right">Rechts vegen</string>
+    <string name="settings_swipe_actions_left">Links vegen</string>
+    <string name="settings_swipe_actions_change">WIJZIGEN</string>
+    <string-array name="settings_swipe_actions">
+        <item>Geen</item>
+        <item>Archiveren</item>
+        <item>Verwijderen</item>
+        <item>Blokkeren</item>
+        <item>Bellen</item>
+        <item>Markeren als gelezen</item>
+        <item>Markeren als ongelezen</item>
+    </string-array>
+    <string name="settings_delivery_title">Afleverrapporten</string>
+    <string name="settings_delivery_summary">Bevestig dat berichten met succes zijn verzonden</string>
+    <string name="settings_signature_title">Handtekening</string>
+    <string name="settings_signature_summary">Voeg een handtekening toe aan het eind van je berichten</string>
+    <string name="settings_unicode_title">Verwijder accenten</string>
+    <string name="settings_unicode_summary">Verwijder accenten van karakters voor uitgaande berichten</string>
+    <string name="settings_mobile_title">Alleen GSM-nummers</string>
+    <string name="settings_mobile_summary">Enkel mobiele nummers tonen wanneer je een bericht opstelt</string>
+    <string name="settings_auto_delete">Delete old messages automatically</string>
+    <string name="settings_auto_delete_dialog_message">Messages will be deleted after the specified number of days</string>
+    <string name="settings_auto_delete_dialog_hint">Number of days</string>
+    <string name="settings_auto_delete_never">Never</string>
+    <string name="settings_auto_delete_warning">Delete old messages automatically?</string>
+    <string name="settings_auto_delete_warning_message">If you proceed, %1$d messages will be deleted now</string>
+    <plurals name="settings_auto_delete_summary">
+        <item quantity="one">After 1 day</item>
+        <item quantity="other">After %d days</item>
+    </plurals>
+    <string name="settings_long_as_mms_title">Verstuur lange berichten als MMS</string>
+    <string name="settings_long_as_mms_summary">Als je lange tekstberichten niet kunnen worden verzonden, of in de verkeerde volgorde, kun je ze in plaats daarvan als MMS-berichten versturen. Extra kosten kunnen van toepassing zijn.</string>
+    <string name="settings_mms_size_title">Auto-compress MMS bijlagen</string>
+    <string name="settings_sync_title">Synchroniseer berichten</string>
+    <string name="settings_sync_summary">Hersynchroniseer jouw berichten vanuit de SMS database op je telefoon</string>
+    <string name="settings_about_title">Over QKSMS</string>
+    <string name="settings_version">Versie %s</string>
+    <string name="settings_logging_enabled">Foutenregistratie ingeschakeld</string>
+    <string name="settings_logging_disabled">Foutenregistratie uitgeschakeld</string>
+    <string name="settings_delay_duration_hint">Voer duur (seconden) in</string>
+    <string name="blocking_title">Geblokkeerd</string>
+    <string name="blocking_drop_title">Berichten weggooien</string>
+    <string name="blocking_drop_summary">Verwijder inkomende berichten van geblokkeerde afzenders in plaats van ze te verbergen</string>
+    <string name="blocking_conversations">Geblokkeerde gesprekken</string>
+    <string name="blocking_manager_title">Blokkeermanager</string>
+    <string name="blocking_manager_qksms_title">QKSMS</string>
+    <string name="blocking_manager_qksms_summary">Ingebouwde blokkeerfunctie in QKSMS</string>
+    <string name="blocking_manager_call_control_summary">Filter je oproepen en berichten automatisch op één handige plaats! Community IQ™ stelt je in staat om ongewenste berichten van de bij community bekende spammers te blokkeren</string>
+    <string name="blocking_manager_sia_summary">Automatisch filteren van berichten van ongevraagde nummers met behulp van de app \"Should I Answer\"</string>
+    <string name="blocking_manager_copy_title">Kopieer geblokkeerde nummers</string>
+    <string name="blocking_manager_copy_summary">Ga verder naar %s en kopieer je bestaande geblokkeerde nummers</string>
+    <string name="blocked_numbers_title">Geblokkeerde nummers</string>
+    <string name="blocked_numbers_empty">Je geblokkeerde nummers verschijnen hier</string>
+    <string name="blocked_numbers_add_cd">Blokkeer een nieuw nummer</string>
+    <string name="blocked_numbers_dialog_title">Blokkeer berichten van</string>
+    <string name="blocked_numbers_dialog_hint">Telefoonnummer</string>
+    <string name="blocked_numbers_dialog_block">Blokkeren</string>
+    <string name="blocked_messages_title">Geblokkeerde berichten</string>
+    <string name="blocked_messages_empty">Je geblokkeerde berichten verschijnen hier</string>
+    <string name="blocking_block_title">Blokkeren</string>
+    <string name="blocking_unblock_title">Deblokkeer</string>
+    <plurals name="blocking_block_external">
+        <item quantity="one">Ga verder naar %s en blokkeer dit nummer</item>
+        <item quantity="other">Ga verder naar %s en blokkeer deze nummers</item>
+    </plurals>
+    <plurals name="blocking_unblock_external">
+        <item quantity="one">Ga door naar %s en sta dit nummer toe</item>
+        <item quantity="other">Ga door naar %s en sta deze nummers toe</item>
+    </plurals>
+    <string name="about_title">Over</string>
+    <string name="about_version_title">Versie</string>
+    <string name="about_developer_title">Ontwikkelaar</string>
+    <string name="about_source_title">Broncode</string>
+    <string name="about_changelog_title">Changelog</string>
+    <string name="about_contact_title">Contact</string>
+    <string name="about_license_title">Licentie</string>
+    <string name="about_copyright_title">Copyright</string>
+    <string name="qksms_plus_description_title">Ondersteun ontwikkeling, ontgrendel alles</string>
+    <string name="qksms_plus_description_summary">Je kan de developer al helpen vanaf %s</string>
+    <!-- Substitutions are for price and currency. Ex: Lifetime upgrade for $1.99 USD -->
+    <string name="qksms_plus_upgrade">Levenslange upgrade voor %1$s %2$s</string>
+    <!-- Substitutions are for price and currency. Ex: Unlock + donate for $4.99 USD -->
+    <string name="qksms_plus_upgrade_donate">Ontgrendel en doneer voor %1$s %2$s</string>
+    <string name="qksms_plus_thanks_title">Bedankt voor het onderhouden van QKSMS!</string>
+    <string name="qksms_plus_thanks_summary">Je hebt nu toegang tot alle QKSMS+ functies</string>
+    <string name="qksms_plus_free_title">QKSMS+ is gratis voor F-Droid gebruikers. Als je verdere ontwikkelingen wilt helpen, kun je gerust een donatie overwegen.</string>
+    <string name="qksms_plus_donate">Doneren via PayPal</string>
+    <string name="qksms_plus_coming_soon">Binnenkort</string>
+    <string name="qksms_plus_themes_title">Premium thema\'s</string>
+    <string name="qksms_plus_themes_summary">Ontgrendel vele mooie kleuren die niet beschikbaar zijn in het Material Design kleurenschema</string>
+    <string name="qksms_plus_emoji_title">Aangepaste auto-emoji</string>
+    <string name="qksms_plus_emoji_summary">Maak aangepaste auto-emoji sneltoetsen</string>
+    <string name="qksms_plus_backup_title">Berichtenback-up</string>
+    <string name="qksms_plus_backup_summary">Automatische back-up van jouw berichten. Geen zorgen meer over het kwijtraken van jouw berichten bij het verlies van je telefoon of het overschakelen naar een nieuwe telefoon</string>
+    <string name="qksms_plus_scheduled_title">Geplande berichten</string>
+    <string name="qksms_plus_scheduled_summary">Berichten worden automatisch verzonden op de ingestelde tijd</string>
+    <string name="qksms_plus_delayed_title">Vertraagd verzenden</string>
+    <string name="qksms_plus_delayed_summary">Wacht enkele seconden voor het versturen van je bericht</string>
+    <string name="qksms_plus_night_title">Automatische nachtmodus</string>
+    <string name="qksms_plus_night_summary">Schakel de nachtmodus in gebaseerd op de tijd van de dag</string>
+    <string name="qksms_plus_blacklist_title">Geavanceerd blokkeren</string>
+    <string name="qksms_plus_blacklist_summary">Blokkeer berichten die specifieke woorden of patronen bevatten</string>
+    <string name="qksms_plus_forward_title">Auto-doorsturen</string>
+    <string name="qksms_plus_forward_summary">Automatisch doorsturen van berichten van bepaalde afzenders</string>
+    <string name="qksms_plus_respond_title">Auto-antwoorden</string>
+    <string name="qksms_plus_respond_summary">Automatisch reageren op inkomende berichten met een vooraf ingestelde reactie</string>
+    <string name="qksms_plus_more_title">Meer</string>
+    <string name="qksms_plus_more_summary">QKSMS is in actieve ontwikkeling, uw aankoop bevat alle toekomstige nieuwigheden exclusief voor QKSMS+!</string>
+    <string name="widget_loading">Laden&#8230;</string>
+    <string name="widget_more">Bekijk meer conversaties</string>
+    <string name="qkreply_menu_read">Markeren als gelezen</string>
+    <string name="qkreply_menu_call">Bel</string>
+    <string name="qkreply_menu_delete">Verwijderen</string>
+    <string name="qkreply_menu_expand">Toon meer</string>
+    <string name="qkreply_menu_collapse">Toon minder</string>
+    <string name="qkreply_menu_view">Open conversatie</string>
+    <string name="theme_material">Material</string>
+    <string name="theme_hex">HEX</string>
+    <string name="theme_apply">Toepassen</string>
+    <string-array name="notification_actions">
+        <item>Geen</item>
+        <item>Archiveren</item>
+        <item>Verwijderen</item>
+        <item>Blokkeren</item>
+        <item>Bel</item>
+        <item>Markeer als gelezen</item>
+        <item>Beantwoorden</item>
+    </string-array>
+    <string name="button_yes">Ja</string>
+    <string name="button_continue">Doorgaan</string>
+    <string name="button_cancel">Annuleren</string>
+    <string name="button_delete">Verwijderen</string>
+    <string name="button_save">Opslaan</string>
+    <string name="button_stop">Stop</string>
+    <string name="button_more">Meer</string>
+    <string name="button_set">Instellen</string>
+    <string name="button_undo">Ongedaan maken</string>
+    <string name="toast_copied">Gekopieerd</string>
+    <string name="toast_archived">Conversatie gearchiveerd</string>
+    <string name="toast_qksms_plus">Je dient QKSMS+ te ontgrendelen om dit te gebruiken</string>
+    <plurals name="notification_new_messages">
+        <item quantity="one">Nieuw bericht</item>
+        <item quantity="other">%s nieuwe berichten</item>
+    </plurals>
+    <string name="notification_message_failed_title">Bericht niet verzonden</string>
+    <string name="notification_message_failed_text">Het bericht naar %s is niet verzonden</string>
+    <string-array name="night_modes">
+        <item>Systeem</item>
+        <item>Uitgeschakeld</item>
+        <item>Altijd aan</item>
+        <item>Automatisch</item>
+    </string-array>
+    <string-array name="notification_preview_options">
+        <item>Toon naam en bericht</item>
+        <item>Toon naam</item>
+        <item>Inhoud verbergen</item>
+    </string-array>
+    <string-array name="text_sizes">
+        <item>Klein</item>
+        <item>Normaal</item>
+        <item>Groot</item>
+        <item>Groot</item>
+    </string-array>
+    <string-array name="delayed_sending_labels">
+        <item>Geen vertraging</item>
+        <item>3 seconden</item>
+        <item>5 seconden</item>
+        <item>10 seconden</item>
+    </string-array>
+    <string-array name="mms_sizes">
+        <item>Automatisch</item>
+        <item>100kB</item>
+        <item>200kB</item>
+        <item>300kB</item>
+        <item>600kB</item>
+        <item>1000kB</item>
+        <item>2000kB</item>
+        <item>Geen compressie</item>
+    </string-array>
+    <string-array name="qk_responses">
+        <item>Oké</item>
+        <item>Wacht even</item>
+        <item>Onderweg</item>
+        <item>Bedankt</item>
+        <item>Klinkt goed</item>
+        <item>Alles goed?</item>
+        <item>Ik ga akkoord</item>
+        <item>Nee</item>
+        <item>Hou van je</item>
+        <item>Sorry</item>
+        <item>LOL</item>
+        <item>Dat is oke</item>
+    </string-array>
+</resources>
diff --git a/presentation/src/main/res/values-pl/strings.xml b/presentation/src/main/res/values-pl/strings.xml
index bdf2dc19d..55efe7601 100644
--- a/presentation/src/main/res/values-pl/strings.xml
+++ b/presentation/src/main/res/values-pl/strings.xml
@@ -1,423 +1,423 @@
-<?xml version="1.0" encoding="utf-8"?>
-<!--
-  ~ Copyright (C) 2019 Moez Bhatti <moez.bhatti@gmail.com>
-  ~
-  ~ This file is part of QKSMS.
-  ~
-  ~ QKSMS is free software: you can redistribute it and/or modify
-  ~ it under the terms of the GNU General Public License as published by
-  ~ the Free Software Foundation, either version 3 of the License, or
-  ~ (at your option) any later version.
-  ~
-  ~ QKSMS is distributed in the hope that it will be useful,
-  ~ but WITHOUT ANY WARRANTY; without even the implied warranty of
-  ~ MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
-  ~ GNU General Public License for more details.
-  ~
-  ~ You should have received a copy of the GNU General Public License
-  ~ along with QKSMS.  If not, see <http://www.gnu.org/licenses/>.
-  -->
-<resources>
-    <string name="shortcut_compose_long_label">Nowa rozmowa</string>
-    <string name="shortcut_compose_short_label">Napisz</string>
-    <string name="shortcut_compose_disabled_message">Skrót wyłączony</string>
-    <string name="title_archived">Archiwum</string>
-    <string name="title_settings">Ustawienia</string>
-    <string name="title_notification_prefs">Powiadomienia</string>
-    <string name="title_theme">Motyw</string>
-    <string name="title_conversations">Przeszukaj skrzynkę odbiorczą&#8230;</string>
-    <string name="title_compose">Nowa wiadomość</string>
-    <string name="setup_skip">Pomiń</string>
-    <string name="setup_next">Kontynuuj</string>
-    <string name="menu_add_person">Dodaj osobę</string>
-    <string name="menu_call">Zadzwoń</string>
-    <string name="menu_info">Szczegóły</string>
-    <string name="menu_save">Zapisz w galerii</string>
-    <string name="menu_share">Udostepnij</string>
-    <string name="main_drawer_open_cd">Otwórz panel nawigacyjny</string>
-    <string name="main_title_selected">%d wybrano</string>
-    <string name="main_menu_clear">Wyczyść</string>
-    <string name="main_menu_archive">Archiwizuj</string>
-    <string name="main_menu_unarchive">Przywróć</string>
-    <string name="main_menu_delete">Usuń</string>
-    <string name="main_menu_add_contact">Dodaj do kontaktów</string>
-    <string name="main_menu_pin">Przypnij</string>
-    <string name="main_menu_unpin">Odepnij</string>
-    <string name="main_menu_read">Oznacz jako przeczytane</string>
-    <string name="main_menu_unread">Oznacz jako nieprzeczytane</string>
-    <string name="main_menu_block">Zablokuj</string>
-    <string name="main_syncing">Synchronizowanie wiadomości&#8230;</string>
-    <string name="main_sender_you">Ty: %s</string>
-    <string name="main_draft">Szkic</string>
-    <string name="main_message_results_title">Wyniki w wiadomościach</string>
-    <string name="main_message_results">%d wiadomości</string>
-    <string name="inbox_empty_text">Twoje rozmowy będą wyświetlane tutaj</string>
-    <string name="inbox_search_empty_text">Brak wyników</string>
-    <string name="archived_empty_text">Twoje zarchiwizowane rozmowy będą wyświetlane tutaj</string>
-    <string name="main_fab_cd">Rozpocznij nową rozmowę</string>
-    <string name="main_default_sms_title">Pokochaj SMSowanie na nowo</string>
-    <string name="main_default_sms_message">Ustaw QKSMS jako domyślną aplikację do osbługi SMSów i MMSów</string>
-    <string name="main_default_sms_change">Zmień</string>
-    <string name="main_permission_required">Wymagane uprawnienie</string>
-    <string name="main_permission_sms">QKSMS wymaga uprawnień do wysyłania i przeglądania wiadomości</string>
-    <string name="main_permission_contacts">QKSMS wymaga uprawnień do przeglądania kontaktów</string>
-    <string name="main_permission_allow">Zezwól</string>
-    <string name="drawer_inbox">Odebrane</string>
-    <string name="drawer_archived">Zarchiwizowane</string>
-    <string name="drawer_scheduled">Zaplanowane</string>
-    <string name="drawer_blocking">Blokowane</string>
-    <string name="drawer_more">Więcej</string>
-    <string name="drawer_settings">Ustawienia</string>
-    <string name="drawer_help">Pomoc i opinie</string>
-    <string name="drawer_invite">Poleć znajomym</string>
-    <string name="drawer_plus_banner_summary">Odblokuj nowe funkcje i wesprzyj rozwój aplikacji</string>
-    <string name="rate_title">Lubisz QKSMS?</string>
-    <string name="rate_summary">Podziel się miłością i oceń nas w Sklepie Google Play!</string>
-    <string name="rate_okay">W PORZĄDKU!</string>
-    <string name="rate_dismiss">ODMAWIAM</string>
-    <string name="dialog_delete_title">Usuń</string>
-    <plurals name="dialog_delete_message">
-        <item quantity="one">Czy na pewno chcesz usunąć tą rozmowę?</item>
-        <item quantity="few">Czy na pewno chcesz usunąć te %d rozmowy?</item>
-        <item quantity="many">Czy na pewno chcesz usunąć te %d rozmów?</item>
-        <item quantity="other">Czy na pewno chcesz usunąć te %d rozmów?</item>
-    </plurals>
-    <string-array name="message_options">
-        <item>Kopiuj tekst</item>
-        <item>Przekaż dalej</item>
-        <item>Usuń</item>
-    </string-array>
-    <string name="compose_number_picker_title">Wybierz numer telefonu</string>
-    <string name="compose_number_picker_default">%s ∙ Domyślny</string>
-    <string name="compose_number_picker_once">Tylko raz</string>
-    <string name="compose_number_picker_always">Zawsze</string>
-    <string name="compose_title_selected">Wybrano %d</string>
-    <string name="compose_subtitle_results">Wyniki: %1$d z %2$d</string>
-    <string name="compose_send_group_title">Wyślij jako wiadomość grupową</string>
-    <string name="compose_send_group_summary">Odbiorcy i odpowiedzi będą widoczne dla wszystkich</string>
-    <string name="compose_messages_empty">To jest początek rozmowy. Powiedz coś miłego!</string>
-    <string name="compose_vcard_label">Karta kontaktu</string>
-    <string name="compose_scheduled_for">Zaplanowane na</string>
-    <string name="compose_scheduled_future">Wybrany czas musi być w przyszłości</string>
-    <string name="compose_scheduled_plus">Musisz odblokować QKSMS+, aby móc używac planowanych widomości</string>
-    <string name="compose_scheduled_toast">Dodano do zaplanowanych wiadomości</string>
-    <string name="compose_hint">Napisz wiadomość&#8230;</string>
-    <string name="compose_menu_copy">Kopiuj tekst</string>
-    <string name="compose_menu_forward">Przekaż dalej</string>
-    <string name="compose_menu_delete">Usuń</string>
-    <string name="compose_menu_previous">Poprzedni</string>
-    <string name="compose_menu_next">Następny</string>
-    <string name="compose_menu_clear">Wyczyść</string>
-    <string name="compose_details_title">Szczegóły wiadomości</string>
-    <string name="compose_details_type">Typ: %s</string>
-    <string name="compose_details_from">Od: %s</string>
-    <string name="compose_details_to">Do: %s</string>
-    <string name="compose_details_subject">Temat: %s</string>
-    <string name="compose_details_priority">Priorytet: %s</string>
-    <string name="compose_details_size">Rozmiar: %s</string>
-    <string name="compose_details_sent">Wysłano: %s</string>
-    <string name="compose_details_received">Otrzymano: %s</string>
-    <string name="compose_details_delivered">Dostarczono: %s</string>
-    <string name="compose_details_error_code">Kod błędu: %d</string>
-    <string name="compose_attach_cd">Dodaj załącznik</string>
-    <string name="compose_gallery_cd">Załącz zdjęcie</string>
-    <string name="compose_camera_cd">Zrób zdjęcie</string>
-    <string name="compose_schedule_cd">Zaplanuj wiadomość</string>
-    <string name="compose_contact_cd">Załącz kontakt</string>
-    <string name="compose_contact_error">Nie można odczytać kontaktu</string>
-    <!-- Example: SIM 1 (Verizon) selected-->
-    <string name="compose_sim_changed_toast">Wybrano kartę SIM %1$d (%2$s)</string>
-    <string name="compose_sim_cd">Wybrano %s, zmień kartę SIM</string>
-    <string name="compose_send_cd">Wyślij wiadomość</string>
-    <string name="message_status_sending">Wysyłanie&#8230;</string>
-    <string name="message_status_delivered">Dostarczono %s</string>
-    <string name="message_status_failed">Nie udało się wysłać wiadomości. Dotknij, aby spróbować ponownie</string>
-    <string name="info_title">Szczegóły</string>
-    <string name="info_copied_address">Adres został skopiowany</string>
-    <string name="info_name">Tytuł rozmowy</string>
-    <string name="info_notifications">Powiadomienia</string>
-    <string name="info_theme">Motyw</string>
-    <string name="info_archive">Dodaj do archiwum</string>
-    <string name="info_unarchive">Usuń z archiwum</string>
-    <string name="info_block">Zablokuj</string>
-    <string name="info_unblock">Odblokuj</string>
-    <string name="info_delete">Usuń rozmowę</string>
-    <string name="gallery_error">Nie można wczytać multimediów</string>
-    <string name="gallery_toast_saved">Zapisano w galerii</string>
-    <string name="backup_title">Kopia zap. i przywr.</string>
-    <string name="backup_backing_up">Tworzenie kopii zapasowej wiadomości</string>
-    <string name="backup_restoring">Przywracanie z kopii zapasowej</string>
-    <string name="backup_last">Ostatnia kopia zapasowa</string>
-    <string name="backup_loading">Wcztywanie&#8230;</string>
-    <string name="backup_never">Nigdy</string>
-    <string name="backup_restore_title">Przywróć</string>
-    <string name="backup_restore_summary">Wybierz kopię zapasową</string>
-    <string name="backup_restore_error_plus">Odblokuj QKSMS+, aby używać kopii i przywracania</string>
-    <string name="backup_restore_error_backup">Tworzenie kopii zapasowej&#8230;</string>
-    <string name="backup_restore_error_restore">Przywracanie kopii zapasowej&#8230;</string>
-    <string name="backup_restore_confirm_title">Przywróć z kopii zapasowej</string>
-    <string name="backup_restore_confirm_message">Czy na pewno chcesz przywrócić wiadomości z tej kopii zapasowej?</string>
-    <string name="backup_restore_stop_title">Zatrzymaj przywracanie</string>
-    <string name="backup_restore_stop_message">Wiadomości, które już zostały przywrócone, pozostaną w urządzeniu</string>
-    <string name="backup_restore_dialog_title">Kopie zapasowe</string>
-    <string name="backup_restore_dialog_empty">Nie znaleziono kopii zapasowych</string>
-    <plurals name="backup_message_count">
-        <item quantity="one">%d wiadomość</item>
-        <item quantity="few">%d wiadomości</item>
-        <item quantity="many">%d wiadomości</item>
-        <item quantity="other">%d wiadomości</item>
-    </plurals>
-    <string name="backup_disclaimer">Obecnie można wykonywać i przwracać tylko kopie zapasowe SMSów. Wsparcie dla MMSów i planowane kopie zapasowe zostaną wprawdzone wkrótce.</string>
-    <string name="backup_now">Utwórz kopię zapasową teraz</string>
-    <string name="backup_progress_parsing">Przetwarzanie kopii zapasowej&#8230;</string>
-    <string name="backup_progress_running">%d/%d wiadomości</string>
-    <string name="backup_progress_saving">Zapisywanie kopii zapasowej&#8230;</string>
-    <string name="backup_progress_syncing">Synchronizowanie wiadomości&#8230;</string>
-    <string name="backup_progress_finished">Zakończono</string>
-    <string name="backup_notification_channel_name">Kopia zapasowa i przywracanie</string>
-    <string name="scheduled_title">Zaplanowane</string>
-    <string name="scheduled_empty_description">Automatyczne wysyłanie wiadomości, w dowolnym wybranym przez Ciebie momencie</string>
-    <string name="scheduled_empty_message_1">Cześć! Możesz powtórzyć kiedy były Twoje urodziny?</string>
-    <string name="scheduled_empty_message_2">23-go grudnia</string>
-    <string name="scheduled_empty_message_3">Wszystkiego najlepszego! Zobacz jaki dobry jestem, pamiętam datę Twoich urodzin!</string>
-    <!--&#x200A; is a special character required at the end of this string to fix it's formatting in the app -->
-    <string name="scheduled_empty_message_3_timestamp">Do wysłania 23-go grudnia</string>
-    <string name="scheduled_compose_cd">Zaplanuj wiadomość</string>
-    <string name="scheduled_options_title">Zaplanowana wiadomość</string>
-    <string-array name="scheduled_options">
-        <item>Wyślij teraz</item>
-        <item>Skopiuj treść</item>
-        <item>Usuń</item>
-    </string-array>
-    <string name="settings_category_appearance">Wygląd</string>
-    <string name="settings_category_general">Ogólne</string>
-    <string name="settings_category_qkreply">QK Reply</string>
-    <string name="settings_theme_title">Motyw</string>
-    <string name="settings_night_title">Tryb nocny</string>
-    <string name="settings_black_title">Czarne tło w trybie nocnym</string>
-    <string name="settings_night_start_title">Czas rozpoczęcia</string>
-    <string name="settings_night_end_title">Czas zakończenia</string>
-    <string name="settings_automatic_colors_title">Automatyczne kolory kontaktów</string>
-    <string name="settings_text_size_title">Rozmiar czcionki</string>
-    <string name="settings_system_font_title">Używaj czcionki systemowej</string>
-    <string name="settings_auto_emoji_title">Automatyczne emoji</string>
-    <string name="settings_notifications_title">Powiadomienia</string>
-    <string name="settings_notifications_o_summary">Dotknij, aby ustawić</string>
-    <string name="settings_notification_actions_title">Akcje</string>
-    <string name="settings_notification_action_1">Przycisk 1</string>
-    <string name="settings_notification_action_2">Przycisk 2</string>
-    <string name="settings_notification_action_3">Przycisk 3</string>
-    <string name="settings_notification_previews_title">Zawartość powiadomień</string>
-    <string name="settings_notification_wake_title">Wybudzaj ekran</string>
-    <string name="settings_vibration_title">Wibracje</string>
-    <string name="settings_ringtone_title">Dźwięki</string>
-    <string name="settings_ringtone_none">Brak</string>
-    <string name="settings_qkreply_title">QK Reply</string>
-    <string name="settings_qkreply_summary">Powiadomienia o nowych wiadomościach</string>
-    <string name="settings_qkreply_tap_dismiss_title">Dotknij, aby odrzucić</string>
-    <string name="settings_qkreply_tap_dismiss_summary">Dotknij gdziekolwiek poza okienkiem, aby zamknąć</string>
-    <string name="settings_delayed_title">Opóźnione wysyłanie</string>
-    <string name="settings_swipe_actions">Akcje po przeciągnięciu</string>
-    <string name="settings_swipe_actions_summary">Ustaw akcje po przeciągnięciu dla rozmów</string>
-    <string name="settings_swipe_actions_right">Przeciągnięcie w prawo</string>
-    <string name="settings_swipe_actions_left">Przeciągnięcie w lewo</string>
-    <string name="settings_swipe_actions_change">ZMIEŃ</string>
-    <string-array name="settings_swipe_actions">
-        <item>Brak</item>
-        <item>Archiwizuj</item>
-        <item>Usuń</item>
-        <item>Zablokuj</item>
-        <item>Zadzwoń</item>
-        <item>Oznacz jako przeczytane</item>
-        <item>Oznacz jako nieprzeczytane</item>
-    </string-array>
-    <string name="settings_delivery_title">Potwierdzenie dostarczenia</string>
-    <string name="settings_delivery_summary">Potwierdzaj dostarczenie każdej wysłanej wiadomości</string>
-    <string name="settings_signature_title">Podpis</string>
-    <string name="settings_signature_summary">Dodawaj podpis na końcu wiadomości</string>
-    <string name="settings_unicode_title">Usuwaj ogonki</string>
-    <string name="settings_unicode_summary">Usuwaj ogonki ze znaków w wiadomościach</string>
-    <string name="settings_mobile_title">Tylko numery komórkowe</string>
-    <string name="settings_mobile_summary">Pokazuj kontakty tylko z numerami komórkowymi</string>
-    <string name="settings_auto_delete">Delete old messages automatically</string>
-    <string name="settings_auto_delete_dialog_message">Messages will be deleted after the specified number of days</string>
-    <string name="settings_auto_delete_dialog_hint">Number of days</string>
-    <string name="settings_auto_delete_never">Never</string>
-    <string name="settings_auto_delete_warning">Delete old messages automatically?</string>
-    <string name="settings_auto_delete_warning_message">If you proceed, %1$d messages will be deleted now</string>
-    <plurals name="settings_auto_delete_summary">
-        <item quantity="one">After 1 day</item>
-        <item quantity="few">After %d days</item>
-        <item quantity="many">After %d days</item>
-        <item quantity="other">After %d days</item>
-    </plurals>
-    <string name="settings_long_as_mms_title">Wysyłaj długie wiadomości jako MMS</string>
-    <string name="settings_long_as_mms_summary">Jeśli dłuższe wiadomości tekstowe nie są wysyłane lub wysyłane są w złej kolejności, możesz wysyłać je jako wiadomości MMS. Mogą zostać naliczone dodatkowe opłaty</string>
-    <string name="settings_mms_size_title">Kompresja załączników MMSów</string>
-    <string name="settings_sync_title">Synchronizuj wiadomości</string>
-    <string name="settings_sync_summary">Zsynchronizuj wiadomości z systemową bazą danych</string>
-    <string name="settings_about_title">O aplikacji</string>
-    <string name="settings_version">Wersja %s</string>
-    <string name="settings_logging_enabled">Logi włączone</string>
-    <string name="settings_logging_disabled">Logi wyłączone</string>
-    <string name="settings_delay_duration_hint">Wprowadź czas (w sekundach)</string>
-    <string name="blocking_title">Blokowanie</string>
-    <string name="blocking_drop_title">Odrzuć wiadomości</string>
-    <string name="blocking_drop_summary">Odrzuć przychodzące wiadomości od zablokowanych nadawców zamiast ich ukrywać</string>
-    <string name="blocking_conversations">Zablokowane rozmowy</string>
-    <string name="blocking_manager_title">Menadżer Blokowania</string>
-    <string name="blocking_manager_qksms_title">QKSMS</string>
-    <string name="blocking_manager_qksms_summary">Wbudowana funkcja blokowania w QKSMS</string>
-    <string name="blocking_manager_call_control_summary">Automatycznie filtruj twoje rozmowy i wiadomości tekstowe w jednym wygodnym miejscu! Community IQ™ pozwala zapobiegać niechcianym wiadomościom od znanych spamerów</string>
-    <string name="blocking_manager_sia_summary">Automatycznie filtruj wiadomości od niechcianych numerów za pomocą aplikacji \"Should I Answer?\"</string>
-    <string name="blocking_manager_copy_title">Skopiuj zablokowane numery</string>
-    <string name="blocking_manager_copy_summary">Kontynuuj do %s i skopiuj twoje obecnie blokowane numery</string>
-    <string name="blocked_numbers_title">Zablokowane numery</string>
-    <string name="blocked_numbers_empty">Twoje blokowane numery się tu pojawią</string>
-    <string name="blocked_numbers_add_cd">Zablokuj nowy numer</string>
-    <string name="blocked_numbers_dialog_title">Blokuj wiadomości od</string>
-    <string name="blocked_numbers_dialog_hint">Numer telefonu</string>
-    <string name="blocked_numbers_dialog_block">Blokuj</string>
-    <string name="blocked_messages_title">Zablokowane wiadomości</string>
-    <string name="blocked_messages_empty">Tutaj pojawią się twoje zablokowane wiadomości</string>
-    <string name="blocking_block_title">Blokuj</string>
-    <string name="blocking_unblock_title">Odblokuj</string>
-    <plurals name="blocking_block_external">
-        <item quantity="one">Kontynuuj do %s i blokuj ten numer</item>
-        <item quantity="few">Kontynuuj do %s i blokuj te numery</item>
-        <item quantity="many">Kontynuuj do %s i blokuj te numery</item>
-        <item quantity="other">Kontynuuj do %s i blokuj te numery</item>
-    </plurals>
-    <plurals name="blocking_unblock_external">
-        <item quantity="one">Kontynuuj do %s i odblokuj ten numer</item>
-        <item quantity="few">Kontynuuj do %s i odblokuj te numery</item>
-        <item quantity="many">Kontynuuj do %s i odblokuj te numery</item>
-        <item quantity="other">Kontynuuj do %s i odblokuj te numery</item>
-    </plurals>
-    <string name="about_title">O aplikacji</string>
-    <string name="about_version_title">Wersja</string>
-    <string name="about_developer_title">Deweloper</string>
-    <string name="about_source_title">Kod źródłowy</string>
-    <string name="about_changelog_title">Lista zmian</string>
-    <string name="about_contact_title">Kontakt</string>
-    <string name="about_license_title">Licencja</string>
-    <string name="about_copyright_title">Prawa autorskie</string>
-    <string name="qksms_plus_description_title">Wesprzyj rozwój, odblokuj wszystko</string>
-    <string name="qksms_plus_description_summary">Możesz wesprzeć głodującego dewelopera za jedyne %s</string>
-    <!-- Substitutions are for price and currency. Ex: Lifetime upgrade for $1.99 USD -->
-    <string name="qksms_plus_upgrade">Dożywotnie aktualizacja za %1$s %2$s</string>
-    <!-- Substitutions are for price and currency. Ex: Unlock + donate for $4.99 USD -->
-    <string name="qksms_plus_upgrade_donate">Odblokuj i wesprzyj (%1$s %2$s)</string>
-    <string name="qksms_plus_thanks_title">Dziękujemy za wsparcie aplikacji QKSMS!</string>
-    <string name="qksms_plus_thanks_summary">Masz teraz dostęp do wszystkich funkcji QKSMS+</string>
-    <string name="qksms_plus_free_title">Aplikacja QKSMS+ jest bezpłatna dla użytkowników F-Droid! Jeśli chcesz wesprzeć jej rozwój, rzuć pieniążka.</string>
-    <string name="qksms_plus_donate">Wsparcie za pośrednictwem serwisu PayPal</string>
-    <string name="qksms_plus_coming_soon">Już wkrótce</string>
-    <string name="qksms_plus_themes_title">Motywy premium</string>
-    <string name="qksms_plus_themes_summary">Odblokuj piękne kolory motywów, które nie są dostępne w palecie Material Design</string>
-    <string name="qksms_plus_emoji_title">Własne automatyczne emoji</string>
-    <string name="qksms_plus_emoji_summary">Twórz niestandardowe skróty do automatycznych emoji</string>
-    <string name="qksms_plus_backup_title">Kopie zapasowe wiadomości</string>
-    <string name="qksms_plus_backup_summary">Automatycznie wykonuj kopie zapasowe wiadomości. Nie martw się o ich utratę, jeśli zmienisz lub zgubisz urządzenie.</string>
-    <string name="qksms_plus_scheduled_title">Zaplanowane wiadomości</string>
-    <string name="qksms_plus_scheduled_summary">Zaplanuj wysyłanie wiadomości na określony czas i dzień</string>
-    <string name="qksms_plus_delayed_title">Opóźnione wysyłanie</string>
-    <string name="qksms_plus_delayed_summary">Poczekaj kilka sekund przed wysłaniem wiadomości</string>
-    <string name="qksms_plus_night_title">Automatyczny tryb nocny</string>
-    <string name="qksms_plus_night_summary">Włączaj tryb nocny w oparciu o porę dnia.</string>
-    <string name="qksms_plus_blacklist_title">Zaawansowane blokowanie</string>
-    <string name="qksms_plus_blacklist_summary">Blokuj wiadomości, które zawierają słowa kluczowe lub dopasowane wzorce.</string>
-    <string name="qksms_plus_forward_title">Automatyczne przekazywanie</string>
-    <string name="qksms_plus_forward_summary">Automatyczne przekazuj wiadomości od określonych nadawców.</string>
-    <string name="qksms_plus_respond_title">Automatyczne odpowiedzi</string>
-    <string name="qksms_plus_respond_summary">Automatyczne odpowiadaj na przychodzące wiadomości korzystając z gotowych odpowiedzi.</string>
-    <string name="qksms_plus_more_title">Więcej</string>
-    <string name="qksms_plus_more_summary">QKSMS jest aktywnie rozwijany, twój zakup będzie zawierać wszelkie przyszłe fukcje QKSMS+</string>
-    <string name="widget_loading">Ładowanie&#8230;</string>
-    <string name="widget_more">Zobacz więcej konwersacji</string>
-    <string name="qkreply_menu_read">Oznacz jako przeczytane</string>
-    <string name="qkreply_menu_call">Zadzwoń</string>
-    <string name="qkreply_menu_delete">Usuń</string>
-    <string name="qkreply_menu_expand">Pokaż więcej</string>
-    <string name="qkreply_menu_collapse">Pokaż mniej</string>
-    <string name="qkreply_menu_view">Otwórz konwersację</string>
-    <string name="theme_material">Material</string>
-    <string name="theme_hex">HEX</string>
-    <string name="theme_apply">Zastosuj</string>
-    <string-array name="notification_actions">
-        <item>Brak</item>
-        <item>Archiwizuj</item>
-        <item>Usuń</item>
-        <item>Zablokuj</item>
-        <item>Zadzwoń</item>
-        <item>Oznacz jako przeczytane</item>
-        <item>Odpowiedz</item>
-    </string-array>
-    <string name="button_yes">Tak</string>
-    <string name="button_continue">Kontynuuj</string>
-    <string name="button_cancel">Anuluj</string>
-    <string name="button_delete">Usuń</string>
-    <string name="button_save">Zapisz</string>
-    <string name="button_stop">Zatrzymaj</string>
-    <string name="button_more">Więcej</string>
-    <string name="button_set">Ustaw</string>
-    <string name="button_undo">Cofnij</string>
-    <string name="toast_copied">Skopiowano</string>
-    <string name="toast_archived">Zarchiwizowana rozmowa</string>
-    <string name="toast_qksms_plus">Musisz odblokować QKSMS+, aby używać tej funkcji</string>
-    <plurals name="notification_new_messages">
-        <item quantity="one">Nowa wiadomość</item>
-        <item quantity="few">%s nowe wiadomości</item>
-        <item quantity="many">%s nowych wiadomości</item>
-        <item quantity="other">%s nowych wiadomości</item>
-    </plurals>
-    <string name="notification_message_failed_title">Wiadomość nie została wysłana</string>
-    <string name="notification_message_failed_text">Wiadomość %s nie została wysłana</string>
-    <string-array name="night_modes">
-        <item>Systemowy</item>
-        <item>Wyłączony</item>
-        <item>Zawsze włączony</item>
-        <item>Automatyczny</item>
-    </string-array>
-    <string-array name="notification_preview_options">
-        <item>Pokazuj nadawcę i treść wiadomości</item>
-        <item>Pokazuj nadawcę</item>
-        <item>Ukrywaj zawartość</item>
-    </string-array>
-    <string-array name="text_sizes">
-        <item>Mały</item>
-        <item>Normalny</item>
-        <item>Duży</item>
-        <item>Bardzo duży</item>
-    </string-array>
-    <string-array name="delayed_sending_labels">
-        <item>Bez opóźnienia</item>
-        <item>3 sekundy</item>
-        <item>5 sekund</item>
-        <item>10 sekund</item>
-    </string-array>
-    <string-array name="mms_sizes">
-        <item>Automatyczna</item>
-        <item>100 KB</item>
-        <item>200 KB</item>
-        <item>300 KB</item>
-        <item>600 KB</item>
-        <item>1000 KB</item>
-        <item>2000 KB</item>
-        <item>Wyłączona</item>
-    </string-array>
-    <string-array name="qk_responses">
-        <item>OK</item>
-        <item>Daj mi chwilę</item>
-        <item>Jestem w drodze</item>
-        <item>Dzięki</item>
-        <item>Brzmi nieźle</item>
-        <item>Co tam?</item>
-        <item>Zgoda</item>
-        <item>Nie</item>
-        <item>Kocham Cię</item>
-        <item>Przepraszam</item>
-        <item>LOL</item>
-        <item>W porządku</item>
-    </string-array>
-</resources>
+<?xml version="1.0" encoding="utf-8"?>
+<!--
+  ~ Copyright (C) 2019 Moez Bhatti <moez.bhatti@gmail.com>
+  ~
+  ~ This file is part of QKSMS.
+  ~
+  ~ QKSMS is free software: you can redistribute it and/or modify
+  ~ it under the terms of the GNU General Public License as published by
+  ~ the Free Software Foundation, either version 3 of the License, or
+  ~ (at your option) any later version.
+  ~
+  ~ QKSMS is distributed in the hope that it will be useful,
+  ~ but WITHOUT ANY WARRANTY; without even the implied warranty of
+  ~ MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+  ~ GNU General Public License for more details.
+  ~
+  ~ You should have received a copy of the GNU General Public License
+  ~ along with QKSMS.  If not, see <http://www.gnu.org/licenses/>.
+  -->
+<resources>
+    <string name="shortcut_compose_long_label">Nowa rozmowa</string>
+    <string name="shortcut_compose_short_label">Napisz</string>
+    <string name="shortcut_compose_disabled_message">Skrót wyłączony</string>
+    <string name="title_archived">Archiwum</string>
+    <string name="title_settings">Ustawienia</string>
+    <string name="title_notification_prefs">Powiadomienia</string>
+    <string name="title_theme">Motyw</string>
+    <string name="title_conversations">Przeszukaj skrzynkę odbiorczą&#8230;</string>
+    <string name="title_compose">Nowa wiadomość</string>
+    <string name="setup_skip">Pomiń</string>
+    <string name="setup_next">Kontynuuj</string>
+    <string name="menu_add_person">Dodaj osobę</string>
+    <string name="menu_call">Zadzwoń</string>
+    <string name="menu_info">Szczegóły</string>
+    <string name="menu_save">Zapisz w galerii</string>
+    <string name="menu_share">Udostepnij</string>
+    <string name="main_drawer_open_cd">Otwórz panel nawigacyjny</string>
+    <string name="main_title_selected">%d wybrano</string>
+    <string name="main_menu_clear">Wyczyść</string>
+    <string name="main_menu_archive">Archiwizuj</string>
+    <string name="main_menu_unarchive">Przywróć</string>
+    <string name="main_menu_delete">Usuń</string>
+    <string name="main_menu_add_contact">Dodaj do kontaktów</string>
+    <string name="main_menu_pin">Przypnij</string>
+    <string name="main_menu_unpin">Odepnij</string>
+    <string name="main_menu_read">Oznacz jako przeczytane</string>
+    <string name="main_menu_unread">Oznacz jako nieprzeczytane</string>
+    <string name="main_menu_block">Zablokuj</string>
+    <string name="main_syncing">Synchronizowanie wiadomości&#8230;</string>
+    <string name="main_sender_you">Ty: %s</string>
+    <string name="main_draft">Szkic</string>
+    <string name="main_message_results_title">Wyniki w wiadomościach</string>
+    <string name="main_message_results">%d wiadomości</string>
+    <string name="inbox_empty_text">Twoje rozmowy będą wyświetlane tutaj</string>
+    <string name="inbox_search_empty_text">Brak wyników</string>
+    <string name="archived_empty_text">Twoje zarchiwizowane rozmowy będą wyświetlane tutaj</string>
+    <string name="main_fab_cd">Rozpocznij nową rozmowę</string>
+    <string name="main_default_sms_title">Pokochaj SMSowanie na nowo</string>
+    <string name="main_default_sms_message">Ustaw QKSMS jako domyślną aplikację do osbługi SMSów i MMSów</string>
+    <string name="main_default_sms_change">Zmień</string>
+    <string name="main_permission_required">Wymagane uprawnienie</string>
+    <string name="main_permission_sms">QKSMS wymaga uprawnień do wysyłania i przeglądania wiadomości</string>
+    <string name="main_permission_contacts">QKSMS wymaga uprawnień do przeglądania kontaktów</string>
+    <string name="main_permission_allow">Zezwól</string>
+    <string name="drawer_inbox">Odebrane</string>
+    <string name="drawer_archived">Zarchiwizowane</string>
+    <string name="drawer_scheduled">Zaplanowane</string>
+    <string name="drawer_blocking">Blokowane</string>
+    <string name="drawer_more">Więcej</string>
+    <string name="drawer_settings">Ustawienia</string>
+    <string name="drawer_help">Pomoc i opinie</string>
+    <string name="drawer_invite">Poleć znajomym</string>
+    <string name="drawer_plus_banner_summary">Odblokuj nowe funkcje i wesprzyj rozwój aplikacji</string>
+    <string name="rate_title">Lubisz QKSMS?</string>
+    <string name="rate_summary">Podziel się miłością i oceń nas w Sklepie Google Play!</string>
+    <string name="rate_okay">W PORZĄDKU!</string>
+    <string name="rate_dismiss">ODMAWIAM</string>
+    <string name="dialog_delete_title">Usuń</string>
+    <plurals name="dialog_delete_message">
+        <item quantity="one">Czy na pewno chcesz usunąć tą rozmowę?</item>
+        <item quantity="few">Czy na pewno chcesz usunąć te %d rozmowy?</item>
+        <item quantity="many">Czy na pewno chcesz usunąć te %d rozmów?</item>
+        <item quantity="other">Czy na pewno chcesz usunąć te %d rozmów?</item>
+    </plurals>
+    <string-array name="message_options">
+        <item>Kopiuj tekst</item>
+        <item>Przekaż dalej</item>
+        <item>Usuń</item>
+    </string-array>
+    <string name="compose_number_picker_title">Wybierz numer telefonu</string>
+    <string name="compose_number_picker_default">%s ∙ Domyślny</string>
+    <string name="compose_number_picker_once">Tylko raz</string>
+    <string name="compose_number_picker_always">Zawsze</string>
+    <string name="compose_title_selected">Wybrano %d</string>
+    <string name="compose_subtitle_results">Wyniki: %1$d z %2$d</string>
+    <string name="compose_send_group_title">Wyślij jako wiadomość grupową</string>
+    <string name="compose_send_group_summary">Odbiorcy i odpowiedzi będą widoczne dla wszystkich</string>
+    <string name="compose_messages_empty">To jest początek rozmowy. Powiedz coś miłego!</string>
+    <string name="compose_vcard_label">Karta kontaktu</string>
+    <string name="compose_scheduled_for">Zaplanowane na</string>
+    <string name="compose_scheduled_future">Wybrany czas musi być w przyszłości</string>
+    <string name="compose_scheduled_plus">Musisz odblokować QKSMS+, aby móc używac planowanych widomości</string>
+    <string name="compose_scheduled_toast">Dodano do zaplanowanych wiadomości</string>
+    <string name="compose_hint">Napisz wiadomość&#8230;</string>
+    <string name="compose_menu_copy">Kopiuj tekst</string>
+    <string name="compose_menu_forward">Przekaż dalej</string>
+    <string name="compose_menu_delete">Usuń</string>
+    <string name="compose_menu_previous">Poprzedni</string>
+    <string name="compose_menu_next">Następny</string>
+    <string name="compose_menu_clear">Wyczyść</string>
+    <string name="compose_details_title">Szczegóły wiadomości</string>
+    <string name="compose_details_type">Typ: %s</string>
+    <string name="compose_details_from">Od: %s</string>
+    <string name="compose_details_to">Do: %s</string>
+    <string name="compose_details_subject">Temat: %s</string>
+    <string name="compose_details_priority">Priorytet: %s</string>
+    <string name="compose_details_size">Rozmiar: %s</string>
+    <string name="compose_details_sent">Wysłano: %s</string>
+    <string name="compose_details_received">Otrzymano: %s</string>
+    <string name="compose_details_delivered">Dostarczono: %s</string>
+    <string name="compose_details_error_code">Kod błędu: %d</string>
+    <string name="compose_attach_cd">Dodaj załącznik</string>
+    <string name="compose_gallery_cd">Załącz zdjęcie</string>
+    <string name="compose_camera_cd">Zrób zdjęcie</string>
+    <string name="compose_schedule_cd">Zaplanuj wiadomość</string>
+    <string name="compose_contact_cd">Załącz kontakt</string>
+    <string name="compose_contact_error">Nie można odczytać kontaktu</string>
+    <!-- Example: SIM 1 (Verizon) selected-->
+    <string name="compose_sim_changed_toast">Wybrano kartę SIM %1$d (%2$s)</string>
+    <string name="compose_sim_cd">Wybrano %s, zmień kartę SIM</string>
+    <string name="compose_send_cd">Wyślij wiadomość</string>
+    <string name="message_status_sending">Wysyłanie&#8230;</string>
+    <string name="message_status_delivered">Dostarczono %s</string>
+    <string name="message_status_failed">Nie udało się wysłać wiadomości. Dotknij, aby spróbować ponownie</string>
+    <string name="info_title">Szczegóły</string>
+    <string name="info_copied_address">Adres został skopiowany</string>
+    <string name="info_name">Tytuł rozmowy</string>
+    <string name="info_notifications">Powiadomienia</string>
+    <string name="info_theme">Motyw</string>
+    <string name="info_archive">Dodaj do archiwum</string>
+    <string name="info_unarchive">Usuń z archiwum</string>
+    <string name="info_block">Zablokuj</string>
+    <string name="info_unblock">Odblokuj</string>
+    <string name="info_delete">Usuń rozmowę</string>
+    <string name="gallery_error">Nie można wczytać multimediów</string>
+    <string name="gallery_toast_saved">Zapisano w galerii</string>
+    <string name="backup_title">Kopia zap. i przywr.</string>
+    <string name="backup_backing_up">Tworzenie kopii zapasowej wiadomości</string>
+    <string name="backup_restoring">Przywracanie z kopii zapasowej</string>
+    <string name="backup_last">Ostatnia kopia zapasowa</string>
+    <string name="backup_loading">Wcztywanie&#8230;</string>
+    <string name="backup_never">Nigdy</string>
+    <string name="backup_restore_title">Przywróć</string>
+    <string name="backup_restore_summary">Wybierz kopię zapasową</string>
+    <string name="backup_restore_error_plus">Odblokuj QKSMS+, aby używać kopii i przywracania</string>
+    <string name="backup_restore_error_backup">Tworzenie kopii zapasowej&#8230;</string>
+    <string name="backup_restore_error_restore">Przywracanie kopii zapasowej&#8230;</string>
+    <string name="backup_restore_confirm_title">Przywróć z kopii zapasowej</string>
+    <string name="backup_restore_confirm_message">Czy na pewno chcesz przywrócić wiadomości z tej kopii zapasowej?</string>
+    <string name="backup_restore_stop_title">Zatrzymaj przywracanie</string>
+    <string name="backup_restore_stop_message">Wiadomości, które już zostały przywrócone, pozostaną w urządzeniu</string>
+    <string name="backup_restore_dialog_title">Kopie zapasowe</string>
+    <string name="backup_restore_dialog_empty">Nie znaleziono kopii zapasowych</string>
+    <plurals name="backup_message_count">
+        <item quantity="one">%d wiadomość</item>
+        <item quantity="few">%d wiadomości</item>
+        <item quantity="many">%d wiadomości</item>
+        <item quantity="other">%d wiadomości</item>
+    </plurals>
+    <string name="backup_disclaimer">Obecnie można wykonywać i przwracać tylko kopie zapasowe SMSów. Wsparcie dla MMSów i planowane kopie zapasowe zostaną wprawdzone wkrótce.</string>
+    <string name="backup_now">Utwórz kopię zapasową teraz</string>
+    <string name="backup_progress_parsing">Przetwarzanie kopii zapasowej&#8230;</string>
+    <string name="backup_progress_running">%d/%d wiadomości</string>
+    <string name="backup_progress_saving">Zapisywanie kopii zapasowej&#8230;</string>
+    <string name="backup_progress_syncing">Synchronizowanie wiadomości&#8230;</string>
+    <string name="backup_progress_finished">Zakończono</string>
+    <string name="backup_notification_channel_name">Kopia zapasowa i przywracanie</string>
+    <string name="scheduled_title">Zaplanowane</string>
+    <string name="scheduled_empty_description">Automatyczne wysyłanie wiadomości, w dowolnym wybranym przez Ciebie momencie</string>
+    <string name="scheduled_empty_message_1">Cześć! Możesz powtórzyć kiedy były Twoje urodziny?</string>
+    <string name="scheduled_empty_message_2">23-go grudnia</string>
+    <string name="scheduled_empty_message_3">Wszystkiego najlepszego! Zobacz jaki dobry jestem, pamiętam datę Twoich urodzin!</string>
+    <!--&#x200A; is a special character required at the end of this string to fix it's formatting in the app -->
+    <string name="scheduled_empty_message_3_timestamp">Do wysłania 23-go grudnia</string>
+    <string name="scheduled_compose_cd">Zaplanuj wiadomość</string>
+    <string name="scheduled_options_title">Zaplanowana wiadomość</string>
+    <string-array name="scheduled_options">
+        <item>Wyślij teraz</item>
+        <item>Skopiuj treść</item>
+        <item>Usuń</item>
+    </string-array>
+    <string name="settings_category_appearance">Wygląd</string>
+    <string name="settings_category_general">Ogólne</string>
+    <string name="settings_category_qkreply">QK Reply</string>
+    <string name="settings_theme_title">Motyw</string>
+    <string name="settings_night_title">Tryb nocny</string>
+    <string name="settings_black_title">Czarne tło w trybie nocnym</string>
+    <string name="settings_night_start_title">Czas rozpoczęcia</string>
+    <string name="settings_night_end_title">Czas zakończenia</string>
+    <string name="settings_automatic_colors_title">Automatyczne kolory kontaktów</string>
+    <string name="settings_text_size_title">Rozmiar czcionki</string>
+    <string name="settings_system_font_title">Używaj czcionki systemowej</string>
+    <string name="settings_auto_emoji_title">Automatyczne emoji</string>
+    <string name="settings_notifications_title">Powiadomienia</string>
+    <string name="settings_notifications_o_summary">Dotknij, aby ustawić</string>
+    <string name="settings_notification_actions_title">Akcje</string>
+    <string name="settings_notification_action_1">Przycisk 1</string>
+    <string name="settings_notification_action_2">Przycisk 2</string>
+    <string name="settings_notification_action_3">Przycisk 3</string>
+    <string name="settings_notification_previews_title">Zawartość powiadomień</string>
+    <string name="settings_notification_wake_title">Wybudzaj ekran</string>
+    <string name="settings_vibration_title">Wibracje</string>
+    <string name="settings_ringtone_title">Dźwięki</string>
+    <string name="settings_ringtone_none">Brak</string>
+    <string name="settings_qkreply_title">QK Reply</string>
+    <string name="settings_qkreply_summary">Powiadomienia o nowych wiadomościach</string>
+    <string name="settings_qkreply_tap_dismiss_title">Dotknij, aby odrzucić</string>
+    <string name="settings_qkreply_tap_dismiss_summary">Dotknij gdziekolwiek poza okienkiem, aby zamknąć</string>
+    <string name="settings_delayed_title">Opóźnione wysyłanie</string>
+    <string name="settings_swipe_actions">Akcje po przeciągnięciu</string>
+    <string name="settings_swipe_actions_summary">Ustaw akcje po przeciągnięciu dla rozmów</string>
+    <string name="settings_swipe_actions_right">Przeciągnięcie w prawo</string>
+    <string name="settings_swipe_actions_left">Przeciągnięcie w lewo</string>
+    <string name="settings_swipe_actions_change">ZMIEŃ</string>
+    <string-array name="settings_swipe_actions">
+        <item>Brak</item>
+        <item>Archiwizuj</item>
+        <item>Usuń</item>
+        <item>Zablokuj</item>
+        <item>Zadzwoń</item>
+        <item>Oznacz jako przeczytane</item>
+        <item>Oznacz jako nieprzeczytane</item>
+    </string-array>
+    <string name="settings_delivery_title">Potwierdzenie dostarczenia</string>
+    <string name="settings_delivery_summary">Potwierdzaj dostarczenie każdej wysłanej wiadomości</string>
+    <string name="settings_signature_title">Podpis</string>
+    <string name="settings_signature_summary">Dodawaj podpis na końcu wiadomości</string>
+    <string name="settings_unicode_title">Usuwaj ogonki</string>
+    <string name="settings_unicode_summary">Usuwaj ogonki ze znaków w wiadomościach</string>
+    <string name="settings_mobile_title">Tylko numery komórkowe</string>
+    <string name="settings_mobile_summary">Pokazuj kontakty tylko z numerami komórkowymi</string>
+    <string name="settings_auto_delete">Delete old messages automatically</string>
+    <string name="settings_auto_delete_dialog_message">Messages will be deleted after the specified number of days</string>
+    <string name="settings_auto_delete_dialog_hint">Number of days</string>
+    <string name="settings_auto_delete_never">Never</string>
+    <string name="settings_auto_delete_warning">Delete old messages automatically?</string>
+    <string name="settings_auto_delete_warning_message">If you proceed, %1$d messages will be deleted now</string>
+    <plurals name="settings_auto_delete_summary">
+        <item quantity="one">After 1 day</item>
+        <item quantity="few">After %d days</item>
+        <item quantity="many">After %d days</item>
+        <item quantity="other">After %d days</item>
+    </plurals>
+    <string name="settings_long_as_mms_title">Wysyłaj długie wiadomości jako MMS</string>
+    <string name="settings_long_as_mms_summary">Jeśli dłuższe wiadomości tekstowe nie są wysyłane lub wysyłane są w złej kolejności, możesz wysyłać je jako wiadomości MMS. Mogą zostać naliczone dodatkowe opłaty</string>
+    <string name="settings_mms_size_title">Kompresja załączników MMSów</string>
+    <string name="settings_sync_title">Synchronizuj wiadomości</string>
+    <string name="settings_sync_summary">Zsynchronizuj wiadomości z systemową bazą danych</string>
+    <string name="settings_about_title">O aplikacji</string>
+    <string name="settings_version">Wersja %s</string>
+    <string name="settings_logging_enabled">Logi włączone</string>
+    <string name="settings_logging_disabled">Logi wyłączone</string>
+    <string name="settings_delay_duration_hint">Wprowadź czas (w sekundach)</string>
+    <string name="blocking_title">Blokowanie</string>
+    <string name="blocking_drop_title">Odrzuć wiadomości</string>
+    <string name="blocking_drop_summary">Odrzuć przychodzące wiadomości od zablokowanych nadawców zamiast ich ukrywać</string>
+    <string name="blocking_conversations">Zablokowane rozmowy</string>
+    <string name="blocking_manager_title">Menadżer Blokowania</string>
+    <string name="blocking_manager_qksms_title">QKSMS</string>
+    <string name="blocking_manager_qksms_summary">Wbudowana funkcja blokowania w QKSMS</string>
+    <string name="blocking_manager_call_control_summary">Automatycznie filtruj twoje rozmowy i wiadomości tekstowe w jednym wygodnym miejscu! Community IQ™ pozwala zapobiegać niechcianym wiadomościom od znanych spamerów</string>
+    <string name="blocking_manager_sia_summary">Automatycznie filtruj wiadomości od niechcianych numerów za pomocą aplikacji \"Should I Answer?\"</string>
+    <string name="blocking_manager_copy_title">Skopiuj zablokowane numery</string>
+    <string name="blocking_manager_copy_summary">Kontynuuj do %s i skopiuj twoje obecnie blokowane numery</string>
+    <string name="blocked_numbers_title">Zablokowane numery</string>
+    <string name="blocked_numbers_empty">Twoje blokowane numery się tu pojawią</string>
+    <string name="blocked_numbers_add_cd">Zablokuj nowy numer</string>
+    <string name="blocked_numbers_dialog_title">Blokuj wiadomości od</string>
+    <string name="blocked_numbers_dialog_hint">Numer telefonu</string>
+    <string name="blocked_numbers_dialog_block">Blokuj</string>
+    <string name="blocked_messages_title">Zablokowane wiadomości</string>
+    <string name="blocked_messages_empty">Tutaj pojawią się twoje zablokowane wiadomości</string>
+    <string name="blocking_block_title">Blokuj</string>
+    <string name="blocking_unblock_title">Odblokuj</string>
+    <plurals name="blocking_block_external">
+        <item quantity="one">Kontynuuj do %s i blokuj ten numer</item>
+        <item quantity="few">Kontynuuj do %s i blokuj te numery</item>
+        <item quantity="many">Kontynuuj do %s i blokuj te numery</item>
+        <item quantity="other">Kontynuuj do %s i blokuj te numery</item>
+    </plurals>
+    <plurals name="blocking_unblock_external">
+        <item quantity="one">Kontynuuj do %s i odblokuj ten numer</item>
+        <item quantity="few">Kontynuuj do %s i odblokuj te numery</item>
+        <item quantity="many">Kontynuuj do %s i odblokuj te numery</item>
+        <item quantity="other">Kontynuuj do %s i odblokuj te numery</item>
+    </plurals>
+    <string name="about_title">O aplikacji</string>
+    <string name="about_version_title">Wersja</string>
+    <string name="about_developer_title">Deweloper</string>
+    <string name="about_source_title">Kod źródłowy</string>
+    <string name="about_changelog_title">Lista zmian</string>
+    <string name="about_contact_title">Kontakt</string>
+    <string name="about_license_title">Licencja</string>
+    <string name="about_copyright_title">Prawa autorskie</string>
+    <string name="qksms_plus_description_title">Wesprzyj rozwój, odblokuj wszystko</string>
+    <string name="qksms_plus_description_summary">Możesz wesprzeć głodującego dewelopera za jedyne %s</string>
+    <!-- Substitutions are for price and currency. Ex: Lifetime upgrade for $1.99 USD -->
+    <string name="qksms_plus_upgrade">Dożywotnie aktualizacja za %1$s %2$s</string>
+    <!-- Substitutions are for price and currency. Ex: Unlock + donate for $4.99 USD -->
+    <string name="qksms_plus_upgrade_donate">Odblokuj i wesprzyj (%1$s %2$s)</string>
+    <string name="qksms_plus_thanks_title">Dziękujemy za wsparcie aplikacji QKSMS!</string>
+    <string name="qksms_plus_thanks_summary">Masz teraz dostęp do wszystkich funkcji QKSMS+</string>
+    <string name="qksms_plus_free_title">Aplikacja QKSMS+ jest bezpłatna dla użytkowników F-Droid! Jeśli chcesz wesprzeć jej rozwój, rzuć pieniążka.</string>
+    <string name="qksms_plus_donate">Wsparcie za pośrednictwem serwisu PayPal</string>
+    <string name="qksms_plus_coming_soon">Już wkrótce</string>
+    <string name="qksms_plus_themes_title">Motywy premium</string>
+    <string name="qksms_plus_themes_summary">Odblokuj piękne kolory motywów, które nie są dostępne w palecie Material Design</string>
+    <string name="qksms_plus_emoji_title">Własne automatyczne emoji</string>
+    <string name="qksms_plus_emoji_summary">Twórz niestandardowe skróty do automatycznych emoji</string>
+    <string name="qksms_plus_backup_title">Kopie zapasowe wiadomości</string>
+    <string name="qksms_plus_backup_summary">Automatycznie wykonuj kopie zapasowe wiadomości. Nie martw się o ich utratę, jeśli zmienisz lub zgubisz urządzenie.</string>
+    <string name="qksms_plus_scheduled_title">Zaplanowane wiadomości</string>
+    <string name="qksms_plus_scheduled_summary">Zaplanuj wysyłanie wiadomości na określony czas i dzień</string>
+    <string name="qksms_plus_delayed_title">Opóźnione wysyłanie</string>
+    <string name="qksms_plus_delayed_summary">Poczekaj kilka sekund przed wysłaniem wiadomości</string>
+    <string name="qksms_plus_night_title">Automatyczny tryb nocny</string>
+    <string name="qksms_plus_night_summary">Włączaj tryb nocny w oparciu o porę dnia.</string>
+    <string name="qksms_plus_blacklist_title">Zaawansowane blokowanie</string>
+    <string name="qksms_plus_blacklist_summary">Blokuj wiadomości, które zawierają słowa kluczowe lub dopasowane wzorce.</string>
+    <string name="qksms_plus_forward_title">Automatyczne przekazywanie</string>
+    <string name="qksms_plus_forward_summary">Automatyczne przekazuj wiadomości od określonych nadawców.</string>
+    <string name="qksms_plus_respond_title">Automatyczne odpowiedzi</string>
+    <string name="qksms_plus_respond_summary">Automatyczne odpowiadaj na przychodzące wiadomości korzystając z gotowych odpowiedzi.</string>
+    <string name="qksms_plus_more_title">Więcej</string>
+    <string name="qksms_plus_more_summary">QKSMS jest aktywnie rozwijany, twój zakup będzie zawierać wszelkie przyszłe fukcje QKSMS+</string>
+    <string name="widget_loading">Ładowanie&#8230;</string>
+    <string name="widget_more">Zobacz więcej konwersacji</string>
+    <string name="qkreply_menu_read">Oznacz jako przeczytane</string>
+    <string name="qkreply_menu_call">Zadzwoń</string>
+    <string name="qkreply_menu_delete">Usuń</string>
+    <string name="qkreply_menu_expand">Pokaż więcej</string>
+    <string name="qkreply_menu_collapse">Pokaż mniej</string>
+    <string name="qkreply_menu_view">Otwórz konwersację</string>
+    <string name="theme_material">Material</string>
+    <string name="theme_hex">HEX</string>
+    <string name="theme_apply">Zastosuj</string>
+    <string-array name="notification_actions">
+        <item>Brak</item>
+        <item>Archiwizuj</item>
+        <item>Usuń</item>
+        <item>Zablokuj</item>
+        <item>Zadzwoń</item>
+        <item>Oznacz jako przeczytane</item>
+        <item>Odpowiedz</item>
+    </string-array>
+    <string name="button_yes">Tak</string>
+    <string name="button_continue">Kontynuuj</string>
+    <string name="button_cancel">Anuluj</string>
+    <string name="button_delete">Usuń</string>
+    <string name="button_save">Zapisz</string>
+    <string name="button_stop">Zatrzymaj</string>
+    <string name="button_more">Więcej</string>
+    <string name="button_set">Ustaw</string>
+    <string name="button_undo">Cofnij</string>
+    <string name="toast_copied">Skopiowano</string>
+    <string name="toast_archived">Zarchiwizowana rozmowa</string>
+    <string name="toast_qksms_plus">Musisz odblokować QKSMS+, aby używać tej funkcji</string>
+    <plurals name="notification_new_messages">
+        <item quantity="one">Nowa wiadomość</item>
+        <item quantity="few">%s nowe wiadomości</item>
+        <item quantity="many">%s nowych wiadomości</item>
+        <item quantity="other">%s nowych wiadomości</item>
+    </plurals>
+    <string name="notification_message_failed_title">Wiadomość nie została wysłana</string>
+    <string name="notification_message_failed_text">Wiadomość %s nie została wysłana</string>
+    <string-array name="night_modes">
+        <item>Systemowy</item>
+        <item>Wyłączony</item>
+        <item>Zawsze włączony</item>
+        <item>Automatyczny</item>
+    </string-array>
+    <string-array name="notification_preview_options">
+        <item>Pokazuj nadawcę i treść wiadomości</item>
+        <item>Pokazuj nadawcę</item>
+        <item>Ukrywaj zawartość</item>
+    </string-array>
+    <string-array name="text_sizes">
+        <item>Mały</item>
+        <item>Normalny</item>
+        <item>Duży</item>
+        <item>Bardzo duży</item>
+    </string-array>
+    <string-array name="delayed_sending_labels">
+        <item>Bez opóźnienia</item>
+        <item>3 sekundy</item>
+        <item>5 sekund</item>
+        <item>10 sekund</item>
+    </string-array>
+    <string-array name="mms_sizes">
+        <item>Automatyczna</item>
+        <item>100 KB</item>
+        <item>200 KB</item>
+        <item>300 KB</item>
+        <item>600 KB</item>
+        <item>1000 KB</item>
+        <item>2000 KB</item>
+        <item>Wyłączona</item>
+    </string-array>
+    <string-array name="qk_responses">
+        <item>OK</item>
+        <item>Daj mi chwilę</item>
+        <item>Jestem w drodze</item>
+        <item>Dzięki</item>
+        <item>Brzmi nieźle</item>
+        <item>Co tam?</item>
+        <item>Zgoda</item>
+        <item>Nie</item>
+        <item>Kocham Cię</item>
+        <item>Przepraszam</item>
+        <item>LOL</item>
+        <item>W porządku</item>
+    </string-array>
+</resources>
diff --git a/presentation/src/main/res/values-pt-rBR/strings.xml b/presentation/src/main/res/values-pt-rBR/strings.xml
index d9e86e707..7ea986208 100644
--- a/presentation/src/main/res/values-pt-rBR/strings.xml
+++ b/presentation/src/main/res/values-pt-rBR/strings.xml
@@ -1,411 +1,411 @@
-<?xml version="1.0" encoding="utf-8"?>
-<!--
-  ~ Copyright (C) 2019 Moez Bhatti <moez.bhatti@gmail.com>
-  ~
-  ~ This file is part of QKSMS.
-  ~
-  ~ QKSMS is free software: you can redistribute it and/or modify
-  ~ it under the terms of the GNU General Public License as published by
-  ~ the Free Software Foundation, either version 3 of the License, or
-  ~ (at your option) any later version.
-  ~
-  ~ QKSMS is distributed in the hope that it will be useful,
-  ~ but WITHOUT ANY WARRANTY; without even the implied warranty of
-  ~ MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
-  ~ GNU General Public License for more details.
-  ~
-  ~ You should have received a copy of the GNU General Public License
-  ~ along with QKSMS.  If not, see <http://www.gnu.org/licenses/>.
-  -->
-<resources>
-    <string name="shortcut_compose_long_label">Nova conversa</string>
-    <string name="shortcut_compose_short_label">Escrever</string>
-    <string name="shortcut_compose_disabled_message">Atalho desativado</string>
-    <string name="title_archived">Arquivado</string>
-    <string name="title_settings">Configurações</string>
-    <string name="title_notification_prefs">Notificações</string>
-    <string name="title_theme">Tema</string>
-    <string name="title_conversations">Buscar na caixa de entrada&#8230;</string>
-    <string name="title_compose">Nova Mensagem</string>
-    <string name="setup_skip">Pular</string>
-    <string name="setup_next">Continuar</string>
-    <string name="menu_add_person">Add person</string>
-    <string name="menu_call">Ligar</string>
-    <string name="menu_info">Detalhes</string>
-    <string name="menu_save">Salvar na galeria</string>
-    <string name="menu_share">Partilhar</string>
-    <string name="main_drawer_open_cd">Abrir gaveta de navegação</string>
-    <string name="main_title_selected">%d selecionada(s)</string>
-    <string name="main_menu_clear">Limpar</string>
-    <string name="main_menu_archive">Arquivar</string>
-    <string name="main_menu_unarchive">Desarquivar</string>
-    <string name="main_menu_delete">Excluir</string>
-    <string name="main_menu_add_contact">Add to contacts</string>
-    <string name="main_menu_pin">Fixar no topo</string>
-    <string name="main_menu_unpin">Desafixar</string>
-    <string name="main_menu_read">Mark read</string>
-    <string name="main_menu_unread">Mark unread</string>
-    <string name="main_menu_block">Bloquear</string>
-    <string name="main_syncing">Sincronizando mensagens&#8230;</string>
-    <string name="main_sender_you">Você: %s</string>
-    <string name="main_draft">Draft</string>
-    <string name="main_message_results_title">Resultados nas mensagens</string>
-    <string name="main_message_results">%d mensagens</string>
-    <string name="inbox_empty_text">Suas conversas aparecerão aqui</string>
-    <string name="inbox_search_empty_text">Nenhum resultado</string>
-    <string name="archived_empty_text">Suas conversas arquivadas irão aparecer aqui</string>
-    <string name="main_fab_cd">Iniciar nova conversa</string>
-    <string name="main_default_sms_title">Ame enviar SMS de novo</string>
-    <string name="main_default_sms_message">Faça o QKSMS seu app padrão de SMS</string>
-    <string name="main_default_sms_change">Alterar</string>
-    <string name="main_permission_required">Permissão necessária</string>
-    <string name="main_permission_sms">O QKSMS precisa de permissão para enviar e visualizar mensagens SMS</string>
-    <string name="main_permission_contacts">O QKSMS precisa de permissão para visualizar seus contatos</string>
-    <string name="main_permission_allow">Permitir</string>
-    <string name="drawer_inbox">Caixa de entrada</string>
-    <string name="drawer_archived">Arquivadas</string>
-    <string name="drawer_scheduled">Agendadas</string>
-    <string name="drawer_blocking">Bloqueadas</string>
-    <string name="drawer_more">Mais</string>
-    <string name="drawer_settings">Configurações</string>
-    <string name="drawer_help">Ajuda &amp; comentários</string>
-    <string name="drawer_invite">Convidar amigos</string>
-    <string name="drawer_plus_banner_summary">Desbloqueie novos recursos incríveis e apoie o desenvolvimento</string>
-    <string name="rate_title">Tá gostando do QKSMS?</string>
-    <string name="rate_summary">Compartilhe um pouco de amor e avalie-nos no Google Play!</string>
-    <string name="rate_okay">OK!</string>
-    <string name="rate_dismiss">DESCARTAR</string>
-    <string name="dialog_delete_title">Apagar</string>
-    <plurals name="dialog_delete_message">
-        <item quantity="one">Tem certeza que quer apagar esta conversa?</item>
-        <item quantity="other">Tem certeza que quer apagar %d conversas?</item>
-    </plurals>
-    <string-array name="message_options">
-        <item>Copiar texto</item>
-        <item>Encaminhar</item>
-        <item>Excluir</item>
-    </string-array>
-    <string name="compose_number_picker_title">Choose a phone number</string>
-    <string name="compose_number_picker_default">%s ∙ Default</string>
-    <string name="compose_number_picker_once">Just once</string>
-    <string name="compose_number_picker_always">Always</string>
-    <string name="compose_title_selected">%d selecionada(s)</string>
-    <string name="compose_subtitle_results">%1$d de %2$d resultados</string>
-    <string name="compose_send_group_title">Enviar como mensagem de grupo</string>
-    <string name="compose_send_group_summary">Os destinatários e respostas serão visíveis para todos</string>
-    <string name="compose_messages_empty">Este é o início da sua conversa. Diga algo legal!</string>
-    <string name="compose_vcard_label">Cartão de contato</string>
-    <string name="compose_scheduled_for">Agendada para</string>
-    <string name="compose_scheduled_future">O tempo selecionado deve ser no futuro!</string>
-    <string name="compose_scheduled_plus">Você deve desbloquear o QKSMS+ para agendar mensagens</string>
-    <string name="compose_scheduled_toast">Adicionada às mensagens agendadas</string>
-    <string name="compose_hint">Escrever uma mensagem&#8230;</string>
-    <string name="compose_menu_copy">Copiar texto</string>
-    <string name="compose_menu_forward">Encaminhar</string>
-    <string name="compose_menu_delete">Excluir</string>
-    <string name="compose_menu_previous">Anterior</string>
-    <string name="compose_menu_next">Próxima</string>
-    <string name="compose_menu_clear">Limpar</string>
-    <string name="compose_details_title">Detalhes da mensagem</string>
-    <string name="compose_details_type">Tipo: %s</string>
-    <string name="compose_details_from">De: %s</string>
-    <string name="compose_details_to">Para: %s</string>
-    <string name="compose_details_subject">Assunto: %s</string>
-    <string name="compose_details_priority">Prioridade: %s</string>
-    <string name="compose_details_size">Tamanho: %s</string>
-    <string name="compose_details_sent">Enviada: %s</string>
-    <string name="compose_details_received">Recebida: %s</string>
-    <string name="compose_details_delivered">Entregue: %s</string>
-    <string name="compose_details_error_code">Código do erro: %d</string>
-    <string name="compose_attach_cd">Adicionar anexo</string>
-    <string name="compose_gallery_cd">Anexar foto</string>
-    <string name="compose_camera_cd">Tirar Foto</string>
-    <string name="compose_schedule_cd">Agendar mensagem</string>
-    <string name="compose_contact_cd">Anexar contato</string>
-    <string name="compose_contact_error">Erro ao ler contato</string>
-    <!-- Example: SIM 1 (Verizon) selected-->
-    <string name="compose_sim_changed_toast">SIM %1$d (%2$s) selected</string>
-    <string name="compose_sim_cd">%s selecionado, altere o cartão SIM</string>
-    <string name="compose_send_cd">Enviar mensagem</string>
-    <string name="message_status_sending">Enviando&#8230;</string>
-    <string name="message_status_delivered">Entregue %s</string>
-    <string name="message_status_failed">Falha ao enviar. Toque para tentar novamente</string>
-    <string name="info_title">Detalhes</string>
-    <string name="info_copied_address">Address copied</string>
-    <string name="info_name">Título da conversa</string>
-    <string name="info_notifications">Notificações</string>
-    <string name="info_theme">Tema</string>
-    <string name="info_archive">Arquivar</string>
-    <string name="info_unarchive">Desarquivar</string>
-    <string name="info_block">Bloquear</string>
-    <string name="info_unblock">Desbloquear</string>
-    <string name="info_delete">Apagar conversa</string>
-    <string name="gallery_error">Não foi possível carregar a mídia</string>
-    <string name="gallery_toast_saved">Salvo na galeria</string>
-    <string name="backup_title">Backup e recuperação</string>
-    <string name="backup_backing_up">Fazendo backup de mensagens</string>
-    <string name="backup_restoring">Recuperando do backup</string>
-    <string name="backup_last">Último backup</string>
-    <string name="backup_loading">Carregando&#8230;</string>
-    <string name="backup_never">Nunca</string>
-    <string name="backup_restore_title">Recuperar</string>
-    <string name="backup_restore_summary">Selecione um backup</string>
-    <string name="backup_restore_error_plus">Por favor, desbloqueie o QKSMS+ para fazer backup e recuperar</string>
-    <string name="backup_restore_error_backup">Backup em andamento&#8230;</string>
-    <string name="backup_restore_error_restore">Recuperação em andamento&#8230;</string>
-    <string name="backup_restore_confirm_title">Recuperar do backup</string>
-    <string name="backup_restore_confirm_message">Tem certeza que deseja recuperar suas mensagens deste backup?</string>
-    <string name="backup_restore_stop_title">Parar de recuperar</string>
-    <string name="backup_restore_stop_message">Mensagens que foram recuperadas permanecerão em seu dispositivo</string>
-    <string name="backup_restore_dialog_title">Backups</string>
-    <string name="backup_restore_dialog_empty">Nenhum backup encontrado</string>
-    <plurals name="backup_message_count">
-        <item quantity="one">%d mensagem</item>
-        <item quantity="other">%d mensagens</item>
-    </plurals>
-    <string name="backup_disclaimer">Atualmente, apenas SMS é suportado para Backup e Recuperação. Suporte a MMS e backups agendados virão em breve!</string>
-    <string name="backup_now">Fazer backup agora</string>
-    <string name="backup_progress_parsing">Analisando backup&#8230;</string>
-    <string name="backup_progress_running">%d/%d mensagens</string>
-    <string name="backup_progress_saving">Salvando backup&#8230;</string>
-    <string name="backup_progress_syncing">Sincronizando mensagens&#8230;</string>
-    <string name="backup_progress_finished">Concluído!</string>
-    <string name="backup_notification_channel_name">Backup e recuperação</string>
-    <string name="scheduled_title">Agendada</string>
-    <string name="scheduled_empty_description">Enviar automaticamente uma mensagem no momento exato que você gostaria</string>
-    <string name="scheduled_empty_message_1">Ei! Quando é o seu aniversário de novo?</string>
-    <string name="scheduled_empty_message_2">É no dia 23 de dezembro</string>
-    <string name="scheduled_empty_message_3">Feliz aniversário! Veja que grande amigo eu sou, lembrando do seu aniversário</string>
-    <!--&#x200A; is a special character required at the end of this string to fix it's formatting in the app -->
-    <string name="scheduled_empty_message_3_timestamp">Enviar no dia 23 de dezembro</string>
-    <string name="scheduled_compose_cd">Agendar mensagem</string>
-    <string name="scheduled_options_title">Mensagem agendada</string>
-    <string-array name="scheduled_options">
-        <item>Enviar agora</item>
-        <item>Copy text</item>
-        <item>Delete</item>
-    </string-array>
-    <string name="settings_category_appearance">Aparência</string>
-    <string name="settings_category_general">Geral</string>
-    <string name="settings_category_qkreply">Responder via QKSMS</string>
-    <string name="settings_theme_title">Tema</string>
-    <string name="settings_night_title">Modo noturno</string>
-    <string name="settings_black_title">Modo noturno preto puro</string>
-    <string name="settings_night_start_title">Hora de início</string>
-    <string name="settings_night_end_title">Hora de término</string>
-    <string name="settings_automatic_colors_title">Automatic contact colors</string>
-    <string name="settings_text_size_title">Tamanho da fonte</string>
-    <string name="settings_system_font_title">Usar fonte do sistema</string>
-    <string name="settings_auto_emoji_title">Emoji automático</string>
-    <string name="settings_notifications_title">Notificações</string>
-    <string name="settings_notifications_o_summary">Toque para personalizar</string>
-    <string name="settings_notification_actions_title">Ações</string>
-    <string name="settings_notification_action_1">Botão 1</string>
-    <string name="settings_notification_action_2">Botão 2</string>
-    <string name="settings_notification_action_3">Botão 3</string>
-    <string name="settings_notification_previews_title">Pré-visualização de notificações</string>
-    <string name="settings_notification_wake_title">Wake screen</string>
-    <string name="settings_vibration_title">Vibração</string>
-    <string name="settings_ringtone_title">Som</string>
-    <string name="settings_ringtone_none">Nenhum</string>
-    <string name="settings_qkreply_title">Responder via QKSMS</string>
-    <string name="settings_qkreply_summary">Popup para novas mensagens</string>
-    <string name="settings_qkreply_tap_dismiss_title">Toque para descartar</string>
-    <string name="settings_qkreply_tap_dismiss_summary">Toque fora do popup para fechá-lo</string>
-    <string name="settings_delayed_title">Atraso de envio</string>
-    <string name="settings_swipe_actions">Ações de deslize</string>
-    <string name="settings_swipe_actions_summary">Configurar ações de deslize para conversas</string>
-    <string name="settings_swipe_actions_right">Deslizar para direita</string>
-    <string name="settings_swipe_actions_left">Deslizar para esquerda</string>
-    <string name="settings_swipe_actions_change">ALTERAR</string>
-    <string-array name="settings_swipe_actions">
-        <item>Nenhuma</item>
-        <item>Arquivar</item>
-        <item>Excluir</item>
-        <item>Block</item>
-        <item>Call</item>
-        <item>Mark read</item>
-        <item>Mark unread</item>
-    </string-array>
-    <string name="settings_delivery_title">Confirmações de entrega</string>
-    <string name="settings_delivery_summary">Confirme que as mensagens foram enviadas com sucesso</string>
-    <string name="settings_signature_title">Assinatura</string>
-    <string name="settings_signature_summary">Add a signature to the end of your messages</string>
-    <string name="settings_unicode_title">Remover acentos</string>
-    <string name="settings_unicode_summary">Remover acentos de caracteres em mensagens SMS enviadas</string>
-    <string name="settings_mobile_title">Somente números de celular</string>
-    <string name="settings_mobile_summary">Ao escrever uma mensagem, mostrar apenas os números de celular</string>
-    <string name="settings_auto_delete">Delete old messages automatically</string>
-    <string name="settings_auto_delete_dialog_message">Messages will be deleted after the specified number of days</string>
-    <string name="settings_auto_delete_dialog_hint">Number of days</string>
-    <string name="settings_auto_delete_never">Never</string>
-    <string name="settings_auto_delete_warning">Delete old messages automatically?</string>
-    <string name="settings_auto_delete_warning_message">If you proceed, %1$d messages will be deleted now</string>
-    <plurals name="settings_auto_delete_summary">
-        <item quantity="one">After 1 day</item>
-        <item quantity="other">After %d days</item>
-    </plurals>
-    <string name="settings_long_as_mms_title">Send long messages as MMS</string>
-    <string name="settings_long_as_mms_summary">If your longer text messages are failing to send, or sending in the wrong order, you can send them as MMS messages instead. Additional charges may apply</string>
-    <string name="settings_mms_size_title">Comprimir anexos MMS automaticamente</string>
-    <string name="settings_sync_title">Sincronizar mensagens</string>
-    <string name="settings_sync_summary">Re-sincronizar suas mensagens com o banco de dados de SMS nativo do Android</string>
-    <string name="settings_about_title">Sobre o QKSMS</string>
-    <string name="settings_version">Versão %s</string>
-    <string name="settings_logging_enabled">Log de depuração ativado</string>
-    <string name="settings_logging_disabled">Log de depuração desativado</string>
-    <string name="settings_delay_duration_hint">Digite a duração (segundos)</string>
-    <string name="blocking_title">Blocking</string>
-    <string name="blocking_drop_title">Drop messages</string>
-    <string name="blocking_drop_summary">Drop incoming messages from blocked senders instead of hiding them</string>
-    <string name="blocking_conversations">Blocked conversations</string>
-    <string name="blocking_manager_title">Blocking Manager</string>
-    <string name="blocking_manager_qksms_title">QKSMS</string>
-    <string name="blocking_manager_qksms_summary">Built-in blocking functionality in QKSMS</string>
-    <string name="blocking_manager_call_control_summary">Automatically filter your calls and messages in one convenient place! Community IQ™ allows you to prevent unwanted messages from community known spammers</string>
-    <string name="blocking_manager_sia_summary">Automaticamente filtrar mensagens não solicitadas usando o aplicativo \"Should I Answer\"</string>
-    <string name="blocking_manager_copy_title">Copy blocked numbers</string>
-    <string name="blocking_manager_copy_summary">Continue to %s and copy over your existing blocked numbers</string>
-    <string name="blocked_numbers_title">Blocked numbers</string>
-    <string name="blocked_numbers_empty">Your blocked numbers will appear here</string>
-    <string name="blocked_numbers_add_cd">Block a new number</string>
-    <string name="blocked_numbers_dialog_title">Block texts from</string>
-    <string name="blocked_numbers_dialog_hint">Phone number</string>
-    <string name="blocked_numbers_dialog_block">Block</string>
-    <string name="blocked_messages_title">Blocked messages</string>
-    <string name="blocked_messages_empty">Your blocked messages will appear here</string>
-    <string name="blocking_block_title">Block</string>
-    <string name="blocking_unblock_title">Unblock</string>
-    <plurals name="blocking_block_external">
-        <item quantity="one">Continue to %s and block this number</item>
-        <item quantity="other">Continue to %s and block these numbers</item>
-    </plurals>
-    <plurals name="blocking_unblock_external">
-        <item quantity="one">Continue to %s and allow this number</item>
-        <item quantity="other">Continue to %s and allow these numbers</item>
-    </plurals>
-    <string name="about_title">Sobre</string>
-    <string name="about_version_title">Versão</string>
-    <string name="about_developer_title">Desenvolvedor</string>
-    <string name="about_source_title">Código-fonte</string>
-    <string name="about_changelog_title">Changelog</string>
-    <string name="about_contact_title">Contato</string>
-    <string name="about_license_title">Licença</string>
-    <string name="about_copyright_title">Copyright</string>
-    <string name="qksms_plus_description_title">Apoie o desenvolvimento, desbloqueie tudo</string>
-    <string name="qksms_plus_description_summary">Você pode salvar um desenvolvedor faminto por apenas %s</string>
-    <!-- Substitutions are for price and currency. Ex: Lifetime upgrade for $1.99 USD -->
-    <string name="qksms_plus_upgrade">Atualização vitalícia por %1$s %2$s</string>
-    <!-- Substitutions are for price and currency. Ex: Unlock + donate for $4.99 USD -->
-    <string name="qksms_plus_upgrade_donate">Desbloqueie e doar por %1$s %2$s</string>
-    <string name="qksms_plus_thanks_title">Obrigado por apoiar o QKSMS!</string>
-    <string name="qksms_plus_thanks_summary">Agora você tem acesso a todos os recursos do QKSMS+</string>
-    <string name="qksms_plus_free_title">QKSMS+ é gratuito para usuários do F-Droid! Se você gostaria de apoiar o desenvolvimento, sinta-se livre para fazer uma doação.</string>
-    <string name="qksms_plus_donate">Doar via PayPal</string>
-    <string name="qksms_plus_coming_soon">Em Breve</string>
-    <string name="qksms_plus_themes_title">Temas premium</string>
-    <string name="qksms_plus_themes_summary">Desbloqueie belos temas não disponíveis na paleta do Material Design</string>
-    <string name="qksms_plus_emoji_title">Emoji personalizado</string>
-    <string name="qksms_plus_emoji_summary">Criar atalhos personalizados para os emojis</string>
-    <string name="qksms_plus_backup_title">Backup de mensagens</string>
-    <string name="qksms_plus_backup_summary">Backup automático de mensagens. Nunca mais terá que se preocupar com o histórico se trocar de telefone ou perdê-lo</string>
-    <string name="qksms_plus_scheduled_title">Mensagens agendadas</string>
-    <string name="qksms_plus_scheduled_summary">Agendar mensagens para serem enviadas automaticamente em uma data e hora específicas</string>
-    <string name="qksms_plus_delayed_title">Atraso de envio</string>
-    <string name="qksms_plus_delayed_summary">Aguarde alguns segundos antes de enviar sua mensagem</string>
-    <string name="qksms_plus_night_title">Modo noturno automático</string>
-    <string name="qksms_plus_night_summary">Habilitar modo noturno automaticamente conforme a hora do dia</string>
-    <string name="qksms_plus_blacklist_title">Bloqueio avançado</string>
-    <string name="qksms_plus_blacklist_summary">Bloquear mensagens através de palavras-chave ou padrões</string>
-    <string name="qksms_plus_forward_title">Auto-encaminhar</string>
-    <string name="qksms_plus_forward_summary">Encaminha mensagens automaticamente de alguns remetentes</string>
-    <string name="qksms_plus_respond_title">Auto-responder</string>
-    <string name="qksms_plus_respond_summary">Responde automaticamente às mensagens recebidas com uma resposta predefinida</string>
-    <string name="qksms_plus_more_title">Mais</string>
-    <string name="qksms_plus_more_summary">O QKSMS está em desenvolvimento ativo e sua compra incluirá todos os futuros recursos do QKSMS+!</string>
-    <string name="widget_loading">Carregando&#8230;</string>
-    <string name="widget_more">Ver mais conversas</string>
-    <string name="qkreply_menu_read">Mark read</string>
-    <string name="qkreply_menu_call">Ligar</string>
-    <string name="qkreply_menu_delete">Excluir</string>
-    <string name="qkreply_menu_expand">Mostrar mais</string>
-    <string name="qkreply_menu_collapse">Mostrar menos</string>
-    <string name="qkreply_menu_view">Abrir conversa</string>
-    <string name="theme_material">Material</string>
-    <string name="theme_hex">HEX</string>
-    <string name="theme_apply">Aplicar</string>
-    <string-array name="notification_actions">
-        <item>Nenhuma</item>
-        <item>Archive</item>
-        <item>Delete</item>
-        <item>Block</item>
-        <item>Call</item>
-        <item>Mark read</item>
-        <item>Reply</item>
-    </string-array>
-    <string name="button_yes">Yes</string>
-    <string name="button_continue">Continue</string>
-    <string name="button_cancel">Cancelar</string>
-    <string name="button_delete">Excluir</string>
-    <string name="button_save">Salvar</string>
-    <string name="button_stop">Parar</string>
-    <string name="button_more">Mais</string>
-    <string name="button_set">Definir</string>
-    <string name="button_undo">Desfazer</string>
-    <string name="toast_copied">Copiada</string>
-    <string name="toast_archived">Conversa arquivada</string>
-    <string name="toast_qksms_plus">Você deve desbloquear o QKSMS+ para isto</string>
-    <plurals name="notification_new_messages">
-        <item quantity="one">Nova mensagem</item>
-        <item quantity="other">%s novas mensagens</item>
-    </plurals>
-    <string name="notification_message_failed_title">Mensagem não enviada</string>
-    <string name="notification_message_failed_text">A mensagem para %s falhou ao enviar</string>
-    <string-array name="night_modes">
-        <item>System</item>
-        <item>Disabled</item>
-        <item>Always on</item>
-        <item>Automatic</item>
-    </string-array>
-    <string-array name="notification_preview_options">
-        <item>Exibir nome e mensagem</item>
-        <item>Exibir nome</item>
-        <item>Ocultar conteúdo</item>
-    </string-array>
-    <string-array name="text_sizes">
-        <item>Pequeno</item>
-        <item>Normal</item>
-        <item>Grande</item>
-        <item>Enorme</item>
-    </string-array>
-    <string-array name="delayed_sending_labels">
-        <item>Sem atraso</item>
-        <item>3 seconds</item>
-        <item>5 seconds</item>
-        <item>10 seconds</item>
-    </string-array>
-    <string-array name="mms_sizes">
-        <item>Automatic</item>
-        <item>100KB</item>
-        <item>200KB</item>
-        <item>300KB</item>
-        <item>600KB</item>
-        <item>1000KB</item>
-        <item>2000KB</item>
-        <item>No compression</item>
-    </string-array>
-    <string-array name="qk_responses">
-        <item>Ok</item>
-        <item>Me dê um momento</item>
-        <item>Estou a caminho</item>
-        <item>Obrigado</item>
-        <item>Parece bom</item>
-        <item>Tudo bem?</item>
-        <item>De acordo</item>
-        <item>Não</item>
-        <item>Te amo</item>
-        <item>Desculpa</item>
-        <item>KKK</item>
-        <item>Está bem</item>
-    </string-array>
-</resources>
+<?xml version="1.0" encoding="utf-8"?>
+<!--
+  ~ Copyright (C) 2019 Moez Bhatti <moez.bhatti@gmail.com>
+  ~
+  ~ This file is part of QKSMS.
+  ~
+  ~ QKSMS is free software: you can redistribute it and/or modify
+  ~ it under the terms of the GNU General Public License as published by
+  ~ the Free Software Foundation, either version 3 of the License, or
+  ~ (at your option) any later version.
+  ~
+  ~ QKSMS is distributed in the hope that it will be useful,
+  ~ but WITHOUT ANY WARRANTY; without even the implied warranty of
+  ~ MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+  ~ GNU General Public License for more details.
+  ~
+  ~ You should have received a copy of the GNU General Public License
+  ~ along with QKSMS.  If not, see <http://www.gnu.org/licenses/>.
+  -->
+<resources>
+    <string name="shortcut_compose_long_label">Nova conversa</string>
+    <string name="shortcut_compose_short_label">Escrever</string>
+    <string name="shortcut_compose_disabled_message">Atalho desativado</string>
+    <string name="title_archived">Arquivado</string>
+    <string name="title_settings">Configurações</string>
+    <string name="title_notification_prefs">Notificações</string>
+    <string name="title_theme">Tema</string>
+    <string name="title_conversations">Buscar na caixa de entrada&#8230;</string>
+    <string name="title_compose">Nova Mensagem</string>
+    <string name="setup_skip">Pular</string>
+    <string name="setup_next">Continuar</string>
+    <string name="menu_add_person">Add person</string>
+    <string name="menu_call">Ligar</string>
+    <string name="menu_info">Detalhes</string>
+    <string name="menu_save">Salvar na galeria</string>
+    <string name="menu_share">Partilhar</string>
+    <string name="main_drawer_open_cd">Abrir gaveta de navegação</string>
+    <string name="main_title_selected">%d selecionada(s)</string>
+    <string name="main_menu_clear">Limpar</string>
+    <string name="main_menu_archive">Arquivar</string>
+    <string name="main_menu_unarchive">Desarquivar</string>
+    <string name="main_menu_delete">Excluir</string>
+    <string name="main_menu_add_contact">Add to contacts</string>
+    <string name="main_menu_pin">Fixar no topo</string>
+    <string name="main_menu_unpin">Desafixar</string>
+    <string name="main_menu_read">Mark read</string>
+    <string name="main_menu_unread">Mark unread</string>
+    <string name="main_menu_block">Bloquear</string>
+    <string name="main_syncing">Sincronizando mensagens&#8230;</string>
+    <string name="main_sender_you">Você: %s</string>
+    <string name="main_draft">Draft</string>
+    <string name="main_message_results_title">Resultados nas mensagens</string>
+    <string name="main_message_results">%d mensagens</string>
+    <string name="inbox_empty_text">Suas conversas aparecerão aqui</string>
+    <string name="inbox_search_empty_text">Nenhum resultado</string>
+    <string name="archived_empty_text">Suas conversas arquivadas irão aparecer aqui</string>
+    <string name="main_fab_cd">Iniciar nova conversa</string>
+    <string name="main_default_sms_title">Ame enviar SMS de novo</string>
+    <string name="main_default_sms_message">Faça o QKSMS seu app padrão de SMS</string>
+    <string name="main_default_sms_change">Alterar</string>
+    <string name="main_permission_required">Permissão necessária</string>
+    <string name="main_permission_sms">O QKSMS precisa de permissão para enviar e visualizar mensagens SMS</string>
+    <string name="main_permission_contacts">O QKSMS precisa de permissão para visualizar seus contatos</string>
+    <string name="main_permission_allow">Permitir</string>
+    <string name="drawer_inbox">Caixa de entrada</string>
+    <string name="drawer_archived">Arquivadas</string>
+    <string name="drawer_scheduled">Agendadas</string>
+    <string name="drawer_blocking">Bloqueadas</string>
+    <string name="drawer_more">Mais</string>
+    <string name="drawer_settings">Configurações</string>
+    <string name="drawer_help">Ajuda &amp; comentários</string>
+    <string name="drawer_invite">Convidar amigos</string>
+    <string name="drawer_plus_banner_summary">Desbloqueie novos recursos incríveis e apoie o desenvolvimento</string>
+    <string name="rate_title">Tá gostando do QKSMS?</string>
+    <string name="rate_summary">Compartilhe um pouco de amor e avalie-nos no Google Play!</string>
+    <string name="rate_okay">OK!</string>
+    <string name="rate_dismiss">DESCARTAR</string>
+    <string name="dialog_delete_title">Apagar</string>
+    <plurals name="dialog_delete_message">
+        <item quantity="one">Tem certeza que quer apagar esta conversa?</item>
+        <item quantity="other">Tem certeza que quer apagar %d conversas?</item>
+    </plurals>
+    <string-array name="message_options">
+        <item>Copiar texto</item>
+        <item>Encaminhar</item>
+        <item>Excluir</item>
+    </string-array>
+    <string name="compose_number_picker_title">Choose a phone number</string>
+    <string name="compose_number_picker_default">%s ∙ Default</string>
+    <string name="compose_number_picker_once">Just once</string>
+    <string name="compose_number_picker_always">Always</string>
+    <string name="compose_title_selected">%d selecionada(s)</string>
+    <string name="compose_subtitle_results">%1$d de %2$d resultados</string>
+    <string name="compose_send_group_title">Enviar como mensagem de grupo</string>
+    <string name="compose_send_group_summary">Os destinatários e respostas serão visíveis para todos</string>
+    <string name="compose_messages_empty">Este é o início da sua conversa. Diga algo legal!</string>
+    <string name="compose_vcard_label">Cartão de contato</string>
+    <string name="compose_scheduled_for">Agendada para</string>
+    <string name="compose_scheduled_future">O tempo selecionado deve ser no futuro!</string>
+    <string name="compose_scheduled_plus">Você deve desbloquear o QKSMS+ para agendar mensagens</string>
+    <string name="compose_scheduled_toast">Adicionada às mensagens agendadas</string>
+    <string name="compose_hint">Escrever uma mensagem&#8230;</string>
+    <string name="compose_menu_copy">Copiar texto</string>
+    <string name="compose_menu_forward">Encaminhar</string>
+    <string name="compose_menu_delete">Excluir</string>
+    <string name="compose_menu_previous">Anterior</string>
+    <string name="compose_menu_next">Próxima</string>
+    <string name="compose_menu_clear">Limpar</string>
+    <string name="compose_details_title">Detalhes da mensagem</string>
+    <string name="compose_details_type">Tipo: %s</string>
+    <string name="compose_details_from">De: %s</string>
+    <string name="compose_details_to">Para: %s</string>
+    <string name="compose_details_subject">Assunto: %s</string>
+    <string name="compose_details_priority">Prioridade: %s</string>
+    <string name="compose_details_size">Tamanho: %s</string>
+    <string name="compose_details_sent">Enviada: %s</string>
+    <string name="compose_details_received">Recebida: %s</string>
+    <string name="compose_details_delivered">Entregue: %s</string>
+    <string name="compose_details_error_code">Código do erro: %d</string>
+    <string name="compose_attach_cd">Adicionar anexo</string>
+    <string name="compose_gallery_cd">Anexar foto</string>
+    <string name="compose_camera_cd">Tirar Foto</string>
+    <string name="compose_schedule_cd">Agendar mensagem</string>
+    <string name="compose_contact_cd">Anexar contato</string>
+    <string name="compose_contact_error">Erro ao ler contato</string>
+    <!-- Example: SIM 1 (Verizon) selected-->
+    <string name="compose_sim_changed_toast">SIM %1$d (%2$s) selected</string>
+    <string name="compose_sim_cd">%s selecionado, altere o cartão SIM</string>
+    <string name="compose_send_cd">Enviar mensagem</string>
+    <string name="message_status_sending">Enviando&#8230;</string>
+    <string name="message_status_delivered">Entregue %s</string>
+    <string name="message_status_failed">Falha ao enviar. Toque para tentar novamente</string>
+    <string name="info_title">Detalhes</string>
+    <string name="info_copied_address">Address copied</string>
+    <string name="info_name">Título da conversa</string>
+    <string name="info_notifications">Notificações</string>
+    <string name="info_theme">Tema</string>
+    <string name="info_archive">Arquivar</string>
+    <string name="info_unarchive">Desarquivar</string>
+    <string name="info_block">Bloquear</string>
+    <string name="info_unblock">Desbloquear</string>
+    <string name="info_delete">Apagar conversa</string>
+    <string name="gallery_error">Não foi possível carregar a mídia</string>
+    <string name="gallery_toast_saved">Salvo na galeria</string>
+    <string name="backup_title">Backup e recuperação</string>
+    <string name="backup_backing_up">Fazendo backup de mensagens</string>
+    <string name="backup_restoring">Recuperando do backup</string>
+    <string name="backup_last">Último backup</string>
+    <string name="backup_loading">Carregando&#8230;</string>
+    <string name="backup_never">Nunca</string>
+    <string name="backup_restore_title">Recuperar</string>
+    <string name="backup_restore_summary">Selecione um backup</string>
+    <string name="backup_restore_error_plus">Por favor, desbloqueie o QKSMS+ para fazer backup e recuperar</string>
+    <string name="backup_restore_error_backup">Backup em andamento&#8230;</string>
+    <string name="backup_restore_error_restore">Recuperação em andamento&#8230;</string>
+    <string name="backup_restore_confirm_title">Recuperar do backup</string>
+    <string name="backup_restore_confirm_message">Tem certeza que deseja recuperar suas mensagens deste backup?</string>
+    <string name="backup_restore_stop_title">Parar de recuperar</string>
+    <string name="backup_restore_stop_message">Mensagens que foram recuperadas permanecerão em seu dispositivo</string>
+    <string name="backup_restore_dialog_title">Backups</string>
+    <string name="backup_restore_dialog_empty">Nenhum backup encontrado</string>
+    <plurals name="backup_message_count">
+        <item quantity="one">%d mensagem</item>
+        <item quantity="other">%d mensagens</item>
+    </plurals>
+    <string name="backup_disclaimer">Atualmente, apenas SMS é suportado para Backup e Recuperação. Suporte a MMS e backups agendados virão em breve!</string>
+    <string name="backup_now">Fazer backup agora</string>
+    <string name="backup_progress_parsing">Analisando backup&#8230;</string>
+    <string name="backup_progress_running">%d/%d mensagens</string>
+    <string name="backup_progress_saving">Salvando backup&#8230;</string>
+    <string name="backup_progress_syncing">Sincronizando mensagens&#8230;</string>
+    <string name="backup_progress_finished">Concluído!</string>
+    <string name="backup_notification_channel_name">Backup e recuperação</string>
+    <string name="scheduled_title">Agendada</string>
+    <string name="scheduled_empty_description">Enviar automaticamente uma mensagem no momento exato que você gostaria</string>
+    <string name="scheduled_empty_message_1">Ei! Quando é o seu aniversário de novo?</string>
+    <string name="scheduled_empty_message_2">É no dia 23 de dezembro</string>
+    <string name="scheduled_empty_message_3">Feliz aniversário! Veja que grande amigo eu sou, lembrando do seu aniversário</string>
+    <!--&#x200A; is a special character required at the end of this string to fix it's formatting in the app -->
+    <string name="scheduled_empty_message_3_timestamp">Enviar no dia 23 de dezembro</string>
+    <string name="scheduled_compose_cd">Agendar mensagem</string>
+    <string name="scheduled_options_title">Mensagem agendada</string>
+    <string-array name="scheduled_options">
+        <item>Enviar agora</item>
+        <item>Copy text</item>
+        <item>Delete</item>
+    </string-array>
+    <string name="settings_category_appearance">Aparência</string>
+    <string name="settings_category_general">Geral</string>
+    <string name="settings_category_qkreply">Responder via QKSMS</string>
+    <string name="settings_theme_title">Tema</string>
+    <string name="settings_night_title">Modo noturno</string>
+    <string name="settings_black_title">Modo noturno preto puro</string>
+    <string name="settings_night_start_title">Hora de início</string>
+    <string name="settings_night_end_title">Hora de término</string>
+    <string name="settings_automatic_colors_title">Automatic contact colors</string>
+    <string name="settings_text_size_title">Tamanho da fonte</string>
+    <string name="settings_system_font_title">Usar fonte do sistema</string>
+    <string name="settings_auto_emoji_title">Emoji automático</string>
+    <string name="settings_notifications_title">Notificações</string>
+    <string name="settings_notifications_o_summary">Toque para personalizar</string>
+    <string name="settings_notification_actions_title">Ações</string>
+    <string name="settings_notification_action_1">Botão 1</string>
+    <string name="settings_notification_action_2">Botão 2</string>
+    <string name="settings_notification_action_3">Botão 3</string>
+    <string name="settings_notification_previews_title">Pré-visualização de notificações</string>
+    <string name="settings_notification_wake_title">Wake screen</string>
+    <string name="settings_vibration_title">Vibração</string>
+    <string name="settings_ringtone_title">Som</string>
+    <string name="settings_ringtone_none">Nenhum</string>
+    <string name="settings_qkreply_title">Responder via QKSMS</string>
+    <string name="settings_qkreply_summary">Popup para novas mensagens</string>
+    <string name="settings_qkreply_tap_dismiss_title">Toque para descartar</string>
+    <string name="settings_qkreply_tap_dismiss_summary">Toque fora do popup para fechá-lo</string>
+    <string name="settings_delayed_title">Atraso de envio</string>
+    <string name="settings_swipe_actions">Ações de deslize</string>
+    <string name="settings_swipe_actions_summary">Configurar ações de deslize para conversas</string>
+    <string name="settings_swipe_actions_right">Deslizar para direita</string>
+    <string name="settings_swipe_actions_left">Deslizar para esquerda</string>
+    <string name="settings_swipe_actions_change">ALTERAR</string>
+    <string-array name="settings_swipe_actions">
+        <item>Nenhuma</item>
+        <item>Arquivar</item>
+        <item>Excluir</item>
+        <item>Block</item>
+        <item>Call</item>
+        <item>Mark read</item>
+        <item>Mark unread</item>
+    </string-array>
+    <string name="settings_delivery_title">Confirmações de entrega</string>
+    <string name="settings_delivery_summary">Confirme que as mensagens foram enviadas com sucesso</string>
+    <string name="settings_signature_title">Assinatura</string>
+    <string name="settings_signature_summary">Add a signature to the end of your messages</string>
+    <string name="settings_unicode_title">Remover acentos</string>
+    <string name="settings_unicode_summary">Remover acentos de caracteres em mensagens SMS enviadas</string>
+    <string name="settings_mobile_title">Somente números de celular</string>
+    <string name="settings_mobile_summary">Ao escrever uma mensagem, mostrar apenas os números de celular</string>
+    <string name="settings_auto_delete">Delete old messages automatically</string>
+    <string name="settings_auto_delete_dialog_message">Messages will be deleted after the specified number of days</string>
+    <string name="settings_auto_delete_dialog_hint">Number of days</string>
+    <string name="settings_auto_delete_never">Never</string>
+    <string name="settings_auto_delete_warning">Delete old messages automatically?</string>
+    <string name="settings_auto_delete_warning_message">If you proceed, %1$d messages will be deleted now</string>
+    <plurals name="settings_auto_delete_summary">
+        <item quantity="one">After 1 day</item>
+        <item quantity="other">After %d days</item>
+    </plurals>
+    <string name="settings_long_as_mms_title">Send long messages as MMS</string>
+    <string name="settings_long_as_mms_summary">If your longer text messages are failing to send, or sending in the wrong order, you can send them as MMS messages instead. Additional charges may apply</string>
+    <string name="settings_mms_size_title">Comprimir anexos MMS automaticamente</string>
+    <string name="settings_sync_title">Sincronizar mensagens</string>
+    <string name="settings_sync_summary">Re-sincronizar suas mensagens com o banco de dados de SMS nativo do Android</string>
+    <string name="settings_about_title">Sobre o QKSMS</string>
+    <string name="settings_version">Versão %s</string>
+    <string name="settings_logging_enabled">Log de depuração ativado</string>
+    <string name="settings_logging_disabled">Log de depuração desativado</string>
+    <string name="settings_delay_duration_hint">Digite a duração (segundos)</string>
+    <string name="blocking_title">Blocking</string>
+    <string name="blocking_drop_title">Drop messages</string>
+    <string name="blocking_drop_summary">Drop incoming messages from blocked senders instead of hiding them</string>
+    <string name="blocking_conversations">Blocked conversations</string>
+    <string name="blocking_manager_title">Blocking Manager</string>
+    <string name="blocking_manager_qksms_title">QKSMS</string>
+    <string name="blocking_manager_qksms_summary">Built-in blocking functionality in QKSMS</string>
+    <string name="blocking_manager_call_control_summary">Automatically filter your calls and messages in one convenient place! Community IQ™ allows you to prevent unwanted messages from community known spammers</string>
+    <string name="blocking_manager_sia_summary">Automaticamente filtrar mensagens não solicitadas usando o aplicativo \"Should I Answer\"</string>
+    <string name="blocking_manager_copy_title">Copy blocked numbers</string>
+    <string name="blocking_manager_copy_summary">Continue to %s and copy over your existing blocked numbers</string>
+    <string name="blocked_numbers_title">Blocked numbers</string>
+    <string name="blocked_numbers_empty">Your blocked numbers will appear here</string>
+    <string name="blocked_numbers_add_cd">Block a new number</string>
+    <string name="blocked_numbers_dialog_title">Block texts from</string>
+    <string name="blocked_numbers_dialog_hint">Phone number</string>
+    <string name="blocked_numbers_dialog_block">Block</string>
+    <string name="blocked_messages_title">Blocked messages</string>
+    <string name="blocked_messages_empty">Your blocked messages will appear here</string>
+    <string name="blocking_block_title">Block</string>
+    <string name="blocking_unblock_title">Unblock</string>
+    <plurals name="blocking_block_external">
+        <item quantity="one">Continue to %s and block this number</item>
+        <item quantity="other">Continue to %s and block these numbers</item>
+    </plurals>
+    <plurals name="blocking_unblock_external">
+        <item quantity="one">Continue to %s and allow this number</item>
+        <item quantity="other">Continue to %s and allow these numbers</item>
+    </plurals>
+    <string name="about_title">Sobre</string>
+    <string name="about_version_title">Versão</string>
+    <string name="about_developer_title">Desenvolvedor</string>
+    <string name="about_source_title">Código-fonte</string>
+    <string name="about_changelog_title">Changelog</string>
+    <string name="about_contact_title">Contato</string>
+    <string name="about_license_title">Licença</string>
+    <string name="about_copyright_title">Copyright</string>
+    <string name="qksms_plus_description_title">Apoie o desenvolvimento, desbloqueie tudo</string>
+    <string name="qksms_plus_description_summary">Você pode salvar um desenvolvedor faminto por apenas %s</string>
+    <!-- Substitutions are for price and currency. Ex: Lifetime upgrade for $1.99 USD -->
+    <string name="qksms_plus_upgrade">Atualização vitalícia por %1$s %2$s</string>
+    <!-- Substitutions are for price and currency. Ex: Unlock + donate for $4.99 USD -->
+    <string name="qksms_plus_upgrade_donate">Desbloqueie e doar por %1$s %2$s</string>
+    <string name="qksms_plus_thanks_title">Obrigado por apoiar o QKSMS!</string>
+    <string name="qksms_plus_thanks_summary">Agora você tem acesso a todos os recursos do QKSMS+</string>
+    <string name="qksms_plus_free_title">QKSMS+ é gratuito para usuários do F-Droid! Se você gostaria de apoiar o desenvolvimento, sinta-se livre para fazer uma doação.</string>
+    <string name="qksms_plus_donate">Doar via PayPal</string>
+    <string name="qksms_plus_coming_soon">Em Breve</string>
+    <string name="qksms_plus_themes_title">Temas premium</string>
+    <string name="qksms_plus_themes_summary">Desbloqueie belos temas não disponíveis na paleta do Material Design</string>
+    <string name="qksms_plus_emoji_title">Emoji personalizado</string>
+    <string name="qksms_plus_emoji_summary">Criar atalhos personalizados para os emojis</string>
+    <string name="qksms_plus_backup_title">Backup de mensagens</string>
+    <string name="qksms_plus_backup_summary">Backup automático de mensagens. Nunca mais terá que se preocupar com o histórico se trocar de telefone ou perdê-lo</string>
+    <string name="qksms_plus_scheduled_title">Mensagens agendadas</string>
+    <string name="qksms_plus_scheduled_summary">Agendar mensagens para serem enviadas automaticamente em uma data e hora específicas</string>
+    <string name="qksms_plus_delayed_title">Atraso de envio</string>
+    <string name="qksms_plus_delayed_summary">Aguarde alguns segundos antes de enviar sua mensagem</string>
+    <string name="qksms_plus_night_title">Modo noturno automático</string>
+    <string name="qksms_plus_night_summary">Habilitar modo noturno automaticamente conforme a hora do dia</string>
+    <string name="qksms_plus_blacklist_title">Bloqueio avançado</string>
+    <string name="qksms_plus_blacklist_summary">Bloquear mensagens através de palavras-chave ou padrões</string>
+    <string name="qksms_plus_forward_title">Auto-encaminhar</string>
+    <string name="qksms_plus_forward_summary">Encaminha mensagens automaticamente de alguns remetentes</string>
+    <string name="qksms_plus_respond_title">Auto-responder</string>
+    <string name="qksms_plus_respond_summary">Responde automaticamente às mensagens recebidas com uma resposta predefinida</string>
+    <string name="qksms_plus_more_title">Mais</string>
+    <string name="qksms_plus_more_summary">O QKSMS está em desenvolvimento ativo e sua compra incluirá todos os futuros recursos do QKSMS+!</string>
+    <string name="widget_loading">Carregando&#8230;</string>
+    <string name="widget_more">Ver mais conversas</string>
+    <string name="qkreply_menu_read">Mark read</string>
+    <string name="qkreply_menu_call">Ligar</string>
+    <string name="qkreply_menu_delete">Excluir</string>
+    <string name="qkreply_menu_expand">Mostrar mais</string>
+    <string name="qkreply_menu_collapse">Mostrar menos</string>
+    <string name="qkreply_menu_view">Abrir conversa</string>
+    <string name="theme_material">Material</string>
+    <string name="theme_hex">HEX</string>
+    <string name="theme_apply">Aplicar</string>
+    <string-array name="notification_actions">
+        <item>Nenhuma</item>
+        <item>Archive</item>
+        <item>Delete</item>
+        <item>Block</item>
+        <item>Call</item>
+        <item>Mark read</item>
+        <item>Reply</item>
+    </string-array>
+    <string name="button_yes">Yes</string>
+    <string name="button_continue">Continue</string>
+    <string name="button_cancel">Cancelar</string>
+    <string name="button_delete">Excluir</string>
+    <string name="button_save">Salvar</string>
+    <string name="button_stop">Parar</string>
+    <string name="button_more">Mais</string>
+    <string name="button_set">Definir</string>
+    <string name="button_undo">Desfazer</string>
+    <string name="toast_copied">Copiada</string>
+    <string name="toast_archived">Conversa arquivada</string>
+    <string name="toast_qksms_plus">Você deve desbloquear o QKSMS+ para isto</string>
+    <plurals name="notification_new_messages">
+        <item quantity="one">Nova mensagem</item>
+        <item quantity="other">%s novas mensagens</item>
+    </plurals>
+    <string name="notification_message_failed_title">Mensagem não enviada</string>
+    <string name="notification_message_failed_text">A mensagem para %s falhou ao enviar</string>
+    <string-array name="night_modes">
+        <item>System</item>
+        <item>Disabled</item>
+        <item>Always on</item>
+        <item>Automatic</item>
+    </string-array>
+    <string-array name="notification_preview_options">
+        <item>Exibir nome e mensagem</item>
+        <item>Exibir nome</item>
+        <item>Ocultar conteúdo</item>
+    </string-array>
+    <string-array name="text_sizes">
+        <item>Pequeno</item>
+        <item>Normal</item>
+        <item>Grande</item>
+        <item>Enorme</item>
+    </string-array>
+    <string-array name="delayed_sending_labels">
+        <item>Sem atraso</item>
+        <item>3 seconds</item>
+        <item>5 seconds</item>
+        <item>10 seconds</item>
+    </string-array>
+    <string-array name="mms_sizes">
+        <item>Automatic</item>
+        <item>100KB</item>
+        <item>200KB</item>
+        <item>300KB</item>
+        <item>600KB</item>
+        <item>1000KB</item>
+        <item>2000KB</item>
+        <item>No compression</item>
+    </string-array>
+    <string-array name="qk_responses">
+        <item>Ok</item>
+        <item>Me dê um momento</item>
+        <item>Estou a caminho</item>
+        <item>Obrigado</item>
+        <item>Parece bom</item>
+        <item>Tudo bem?</item>
+        <item>De acordo</item>
+        <item>Não</item>
+        <item>Te amo</item>
+        <item>Desculpa</item>
+        <item>KKK</item>
+        <item>Está bem</item>
+    </string-array>
+</resources>
diff --git a/presentation/src/main/res/values-pt/strings.xml b/presentation/src/main/res/values-pt/strings.xml
index 9459bfe18..8ff62ad10 100644
--- a/presentation/src/main/res/values-pt/strings.xml
+++ b/presentation/src/main/res/values-pt/strings.xml
@@ -1,411 +1,411 @@
-<?xml version="1.0" encoding="utf-8"?>
-<!--
-  ~ Copyright (C) 2019 Moez Bhatti <moez.bhatti@gmail.com>
-  ~
-  ~ This file is part of QKSMS.
-  ~
-  ~ QKSMS is free software: you can redistribute it and/or modify
-  ~ it under the terms of the GNU General Public License as published by
-  ~ the Free Software Foundation, either version 3 of the License, or
-  ~ (at your option) any later version.
-  ~
-  ~ QKSMS is distributed in the hope that it will be useful,
-  ~ but WITHOUT ANY WARRANTY; without even the implied warranty of
-  ~ MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
-  ~ GNU General Public License for more details.
-  ~
-  ~ You should have received a copy of the GNU General Public License
-  ~ along with QKSMS.  If not, see <http://www.gnu.org/licenses/>.
-  -->
-<resources>
-    <string name="shortcut_compose_long_label">Nova conversa</string>
-    <string name="shortcut_compose_short_label">Escrever</string>
-    <string name="shortcut_compose_disabled_message">Atalho desativado</string>
-    <string name="title_archived">Arquivadas</string>
-    <string name="title_settings">Definições</string>
-    <string name="title_notification_prefs">Notificações</string>
-    <string name="title_theme">Tema</string>
-    <string name="title_conversations">Pesquisar caixa de entrada&#8230;</string>
-    <string name="title_compose">Digite um nome ou um número</string>
-    <string name="setup_skip">Ignorar</string>
-    <string name="setup_next">Continuar</string>
-    <string name="menu_add_person">Adicionar pessoa</string>
-    <string name="menu_call">Ligar</string>
-    <string name="menu_info">Detalhes</string>
-    <string name="menu_save">Guardar na galeria</string>
-    <string name="menu_share">Partilhar</string>
-    <string name="main_drawer_open_cd">Abrir menu de navegação</string>
-    <string name="main_title_selected">%d selecionada(s)</string>
-    <string name="main_menu_clear">Limpar</string>
-    <string name="main_menu_archive">Arquivar</string>
-    <string name="main_menu_unarchive">Retirar do arquivo</string>
-    <string name="main_menu_delete">Apagar</string>
-    <string name="main_menu_add_contact">Adicionar aos contactos</string>
-    <string name="main_menu_pin">Fixar em cima</string>
-    <string name="main_menu_unpin">Desafixar</string>
-    <string name="main_menu_read">Marcar como lida</string>
-    <string name="main_menu_unread">Marcar como não lida</string>
-    <string name="main_menu_block">Bloquear</string>
-    <string name="main_syncing">Sincronização de mensagens&#8230;</string>
-    <string name="main_sender_you">Você: %s</string>
-    <string name="main_draft">Rascunho</string>
-    <string name="main_message_results_title">Resultados nas mensagens</string>
-    <string name="main_message_results">%d mensagens</string>
-    <string name="inbox_empty_text">As suas conversas aparecerão aqui</string>
-    <string name="inbox_search_empty_text">Sem resultados</string>
-    <string name="archived_empty_text">As conversas arquivadas aparecerão aqui</string>
-    <string name="main_fab_cd">Iniciar nova conversa</string>
-    <string name="main_default_sms_title">SMS em grande estilo</string>
-    <string name="main_default_sms_message">Tornar QKSMS a aplicação padrão para SMS</string>
-    <string name="main_default_sms_change">Alterar</string>
-    <string name="main_permission_required">Permissão necessária</string>
-    <string name="main_permission_sms">QKSMS necessita da permissão para ver e enviar as mensagens</string>
-    <string name="main_permission_contacts">QKSMS necessita da permissão para ver os seus contactos</string>
-    <string name="main_permission_allow">Permitir</string>
-    <string name="drawer_inbox">Caixa de entrada</string>
-    <string name="drawer_archived">Arquivadas</string>
-    <string name="drawer_scheduled">Agendadas</string>
-    <string name="drawer_blocking">Bloqueadas</string>
-    <string name="drawer_more">Mais</string>
-    <string name="drawer_settings">Definições</string>
-    <string name="drawer_help">Ajuda e comentários</string>
-    <string name="drawer_invite">Convidar amigos</string>
-    <string name="drawer_plus_banner_summary">Desbloqueie mais funcionalidades e ajude no desenvolvimento</string>
-    <string name="rate_title">Gosta do QKSMS?</string>
-    <string name="rate_summary">Mostre o seu contentamento e avalie a aplicação na Google Play!</string>
-    <string name="rate_okay">Está bem</string>
-    <string name="rate_dismiss">Agora não</string>
-    <string name="dialog_delete_title">Apagar</string>
-    <plurals name="dialog_delete_message">
-        <item quantity="one">Tem a certeza de que deseja apagar esta conversa?</item>
-        <item quantity="other">Tem a certeza de que deseja apagar %d conversas?</item>
-    </plurals>
-    <string-array name="message_options">
-        <item>Copiar texto</item>
-        <item>Reencaminhar</item>
-        <item>Apagar</item>
-    </string-array>
-    <string name="compose_number_picker_title">Escolha um número de telefone</string>
-    <string name="compose_number_picker_default">%s ∙ Padrão</string>
-    <string name="compose_number_picker_once">Uma vez</string>
-    <string name="compose_number_picker_always">Sempre</string>
-    <string name="compose_title_selected">%d selecionada(s)</string>
-    <string name="compose_subtitle_results">%1$d de %2$d resultados</string>
-    <string name="compose_send_group_title">Enviar como mensagem de grupo</string>
-    <string name="compose_send_group_summary">Destinatários e respostas visíveis para todos</string>
-    <string name="compose_messages_empty">Aqui é o início da sua conversa. Pode dizer algo simpático!</string>
-    <string name="compose_vcard_label">Cartão do contacto</string>
-    <string name="compose_scheduled_for">Agendada para</string>
-    <string name="compose_scheduled_future">A hora escolhida tem que ser futura!</string>
-    <string name="compose_scheduled_plus">Para utilizar esta funcionalidade, necessita do QKSMS+</string>
-    <string name="compose_scheduled_toast">Adicionada às mensagens agendadas</string>
-    <string name="compose_hint">Escrever uma mensagem&#8230;</string>
-    <string name="compose_menu_copy">Copiar texto</string>
-    <string name="compose_menu_forward">Reencaminhar</string>
-    <string name="compose_menu_delete">Apagar</string>
-    <string name="compose_menu_previous">Anterior</string>
-    <string name="compose_menu_next">Seguinte</string>
-    <string name="compose_menu_clear">Limpar</string>
-    <string name="compose_details_title">Detalhes da mensagem</string>
-    <string name="compose_details_type">Tipo: %s</string>
-    <string name="compose_details_from">De: %s</string>
-    <string name="compose_details_to">Para: %s</string>
-    <string name="compose_details_subject">Assunto: %s</string>
-    <string name="compose_details_priority">Prioridade: %s</string>
-    <string name="compose_details_size">Tamanho: %s</string>
-    <string name="compose_details_sent">Enviada: %s</string>
-    <string name="compose_details_received">Recebida: %s</string>
-    <string name="compose_details_delivered">Entregue: %s</string>
-    <string name="compose_details_error_code">Código do erro: %d</string>
-    <string name="compose_attach_cd">Adicionar anexo</string>
-    <string name="compose_gallery_cd">Anexar fotografia</string>
-    <string name="compose_camera_cd">Tirar fotografia</string>
-    <string name="compose_schedule_cd">Agendar mensagem</string>
-    <string name="compose_contact_cd">Anexar um contacto</string>
-    <string name="compose_contact_error">Erro ao ler o contacto</string>
-    <!-- Example: SIM 1 (Verizon) selected-->
-    <string name="compose_sim_changed_toast">SIM %1$d (%2$s) selecionado</string>
-    <string name="compose_sim_cd">%s selecionado, alterar cartão SIM</string>
-    <string name="compose_send_cd">Enviar mensagem</string>
-    <string name="message_status_sending">A enviar&#8230;</string>
-    <string name="message_status_delivered">%s entregue</string>
-    <string name="message_status_failed">Falha ao enviar. Toque para tentar novamente</string>
-    <string name="info_title">Detalhes</string>
-    <string name="info_copied_address">Endereço copiado</string>
-    <string name="info_name">Título da conversa</string>
-    <string name="info_notifications">Notificações</string>
-    <string name="info_theme">Tema</string>
-    <string name="info_archive">Arquivar</string>
-    <string name="info_unarchive">Retirar do arquivo</string>
-    <string name="info_block">Bloquear</string>
-    <string name="info_unblock">Desbloquear</string>
-    <string name="info_delete">Apagar conversa</string>
-    <string name="gallery_error">Não foi possível carregar os dados</string>
-    <string name="gallery_toast_saved">Guardada na galeria</string>
-    <string name="backup_title">Backup e restauro</string>
-    <string name="backup_backing_up">Backup de mensagens</string>
-    <string name="backup_restoring">Restauro de backup</string>
-    <string name="backup_last">Último backup</string>
-    <string name="backup_loading">A carregar&#8230;</string>
-    <string name="backup_never">Nunca</string>
-    <string name="backup_restore_title">Restaurar</string>
-    <string name="backup_restore_summary">Selecionar backup</string>
-    <string name="backup_restore_error_plus">Tem que ter QKSMS+ para poder usar o backup e restauro</string>
-    <string name="backup_restore_error_backup">A criar backup&#8230;</string>
-    <string name="backup_restore_error_restore">A restaurar&#8230;</string>
-    <string name="backup_restore_confirm_title">Restaurar de backup</string>
-    <string name="backup_restore_confirm_message">Tem a certeza de que deseja restaurar as mensagens deste backup?</string>
-    <string name="backup_restore_stop_title">Parar restauro</string>
-    <string name="backup_restore_stop_message">As mensagens que tiverem sido restauradas irão permanecer no dispositivo</string>
-    <string name="backup_restore_dialog_title">Backups</string>
-    <string name="backup_restore_dialog_empty">Backup não encontrado</string>
-    <plurals name="backup_message_count">
-        <item quantity="one">%d mensagem</item>
-        <item quantity="other">%d mensagens</item>
-    </plurals>
-    <string name="backup_disclaimer">Atualmente, apenas está disponível o backup e restauro de SMS. O suporte a MMS e o agendamento de backups será adicionado brevemente!</string>
-    <string name="backup_now">Criar backup</string>
-    <string name="backup_progress_parsing">A analisar backup&#8230;</string>
-    <string name="backup_progress_running">%d/%d mensagens</string>
-    <string name="backup_progress_saving">A guardar backup&#8230;</string>
-    <string name="backup_progress_syncing">A sincronizar mensagens&#8230;</string>
-    <string name="backup_progress_finished">Terminado!</string>
-    <string name="backup_notification_channel_name">Backup e restauro</string>
-    <string name="scheduled_title">Agendada</string>
-    <string name="scheduled_empty_description">Enviar automaticamente uma mensagem à hora especificada</string>
-    <string name="scheduled_empty_message_1">Olá! Quando é que é mesmo o teu aniversário?</string>
-    <string name="scheduled_empty_message_2">É no dia 23 de dezembro</string>
-    <string name="scheduled_empty_message_3">Feliz aniversário! Já viste o tipo de amigo que sou, até me lembro do teu aniversário</string>
-    <!--&#x200A; is a special character required at the end of this string to fix it's formatting in the app -->
-    <string name="scheduled_empty_message_3_timestamp">Enviar no dia 23 de dezembro</string>
-    <string name="scheduled_compose_cd">Agendar mensagem</string>
-    <string name="scheduled_options_title">Mensagem agendada</string>
-    <string-array name="scheduled_options">
-        <item>Enviar agora</item>
-        <item>Copiar texto</item>
-        <item>Apagar</item>
-    </string-array>
-    <string name="settings_category_appearance">Aparência</string>
-    <string name="settings_category_general">Geral</string>
-    <string name="settings_category_qkreply">QK Reply</string>
-    <string name="settings_theme_title">Tema</string>
-    <string name="settings_night_title">Modo noturno</string>
-    <string name="settings_black_title">Modo escuro puro</string>
-    <string name="settings_night_start_title">Hora de início</string>
-    <string name="settings_night_end_title">Hora de fim</string>
-    <string name="settings_automatic_colors_title">Cores automáticas para os contactos</string>
-    <string name="settings_text_size_title">Tamanho do texto</string>
-    <string name="settings_system_font_title">Usar tipo de letra do sistema</string>
-    <string name="settings_auto_emoji_title">Emoji automático</string>
-    <string name="settings_notifications_title">Notificações</string>
-    <string name="settings_notifications_o_summary">Toque para personalizar</string>
-    <string name="settings_notification_actions_title">Ações</string>
-    <string name="settings_notification_action_1">Botão 1</string>
-    <string name="settings_notification_action_2">Botão 2</string>
-    <string name="settings_notification_action_3">Botão 3</string>
-    <string name="settings_notification_previews_title">Pré-visualização de notificações</string>
-    <string name="settings_notification_wake_title">Ligar ecrã</string>
-    <string name="settings_vibration_title">Vibração</string>
-    <string name="settings_ringtone_title">Som</string>
-    <string name="settings_ringtone_none">Nenhum</string>
-    <string name="settings_qkreply_title">QK Reply</string>
-    <string name="settings_qkreply_summary">Alerta para novas mensagens</string>
-    <string name="settings_qkreply_tap_dismiss_title">Toque para fechar</string>
-    <string name="settings_qkreply_tap_dismiss_summary">Toque fora do alerta para o fechar</string>
-    <string name="settings_delayed_title">Atraso de envio</string>
-    <string name="settings_swipe_actions">Ações de deslize</string>
-    <string name="settings_swipe_actions_summary">Configurar ações de deslize nas conversas</string>
-    <string name="settings_swipe_actions_right">Deslize à direita</string>
-    <string name="settings_swipe_actions_left">Deslize à esquerda</string>
-    <string name="settings_swipe_actions_change">Alterar</string>
-    <string-array name="settings_swipe_actions">
-        <item>Nenhuma</item>
-        <item>Arquivar</item>
-        <item>Apagar</item>
-        <item>Bloquear</item>
-        <item>Ligar</item>
-        <item>Marcar como lida</item>
-        <item>Marcar como não lida</item>
-    </string-array>
-    <string name="settings_delivery_title">Confirmações de entrega</string>
-    <string name="settings_delivery_summary">Confirma se as mensagens foram enviadas com sucesso</string>
-    <string name="settings_signature_title">Assinatura</string>
-    <string name="settings_signature_summary">Adicionar uma assinatura às mensagens</string>
-    <string name="settings_unicode_title">Remover acentos</string>
-    <string name="settings_unicode_summary">Remover acentos dos caracteres nas mensagens enviadas</string>
-    <string name="settings_mobile_title">Apenas números de telemóvel</string>
-    <string name="settings_mobile_summary">Ao escrever uma mensagem, mostrar apenas os números móveis</string>
-    <string name="settings_auto_delete">Apagar mensagens antigas automaticamente</string>
-    <string name="settings_auto_delete_dialog_message">As mensagens serão eliminadas após o número de dias especificado</string>
-    <string name="settings_auto_delete_dialog_hint">Número de dias</string>
-    <string name="settings_auto_delete_never">Nunca</string>
-    <string name="settings_auto_delete_warning">Apagar mensagens antigas automaticamente?</string>
-    <string name="settings_auto_delete_warning_message">Se continuar, %1$d mensagens serão eliminadas</string>
-    <plurals name="settings_auto_delete_summary">
-        <item quantity="one">Após 1 dia</item>
-        <item quantity="other">Após %d dias</item>
-    </plurals>
-    <string name="settings_long_as_mms_title">Enviar mensagens longas como MMS</string>
-    <string name="settings_long_as_mms_summary">Se as mensagens longas não estiverem a ser enviadas ou estão a ser enviadas pela ordem errada, pode tentar enviar como MMS. Podem ser aplicados custos adicionais.</string>
-    <string name="settings_mms_size_title">Comprimir anexos MMS automaticamente</string>
-    <string name="settings_sync_title">Sincronizar mensagens</string>
-    <string name="settings_sync_summary">Sincronizar as mensagens com a base de dados nativa do Android</string>
-    <string name="settings_about_title">Acerca do QKSMS</string>
-    <string name="settings_version">Versão %s</string>
-    <string name="settings_logging_enabled">Depuração ativada</string>
-    <string name="settings_logging_disabled">Depuração desativada</string>
-    <string name="settings_delay_duration_hint">Digite a duração (segundos)</string>
-    <string name="blocking_title">Bloqueio</string>
-    <string name="blocking_drop_title">Descartar mensagens</string>
-    <string name="blocking_drop_summary">As mensagens enviadas pelos remetentes bloqueados serão descartadas e não ocultadas</string>
-    <string name="blocking_conversations">Conversas bloqueadas</string>
-    <string name="blocking_manager_title">Gestor de bloqueios</string>
-    <string name="blocking_manager_qksms_title">QKSMS</string>
-    <string name="blocking_manager_qksms_summary">Funcionalidade de bloqueio, nativa no QKSMS</string>
-    <string name="blocking_manager_call_control_summary">Filtrar automaticamente as chamadas e as mensagens com a aplicação Community IQ™, com a qual pode descartar as mensagens que forem enviadas pelo \'spammers\' reconhecidos na comunidade</string>
-    <string name="blocking_manager_sia_summary">Filtrar automaticamente as mensagens de números utilizando a aplicação \"Should I Answer\"</string>
-    <string name="blocking_manager_copy_title">Copiar números bloqueados</string>
-    <string name="blocking_manager_copy_summary">Continuar para %s e substituir os números bloqueados</string>
-    <string name="blocked_numbers_title">Números bloqueados</string>
-    <string name="blocked_numbers_empty">Os números bloqueados aparecerão aqui</string>
-    <string name="blocked_numbers_add_cd">Bloquear um novo número</string>
-    <string name="blocked_numbers_dialog_title">Bloquear mensagens de</string>
-    <string name="blocked_numbers_dialog_hint">Número de telefone</string>
-    <string name="blocked_numbers_dialog_block">Bloquear</string>
-    <string name="blocked_messages_title">Mensagens bloqueadas</string>
-    <string name="blocked_messages_empty">As mensagens bloqueadas aparecerão aqui</string>
-    <string name="blocking_block_title">Bloquear</string>
-    <string name="blocking_unblock_title">Desbloquear</string>
-    <plurals name="blocking_block_external">
-        <item quantity="one">Continuar para %s e bloquear este número</item>
-        <item quantity="other">Continuar para %s e bloquear estes números</item>
-    </plurals>
-    <plurals name="blocking_unblock_external">
-        <item quantity="one">Continuar para %s e permitir este número</item>
-        <item quantity="other">Continuar para %s e permitir estes números</item>
-    </plurals>
-    <string name="about_title">Acerca</string>
-    <string name="about_version_title">Versão</string>
-    <string name="about_developer_title">Programador</string>
-    <string name="about_source_title">Código fonte</string>
-    <string name="about_changelog_title">Alterações</string>
-    <string name="about_contact_title">Contactos</string>
-    <string name="about_license_title">Licença</string>
-    <string name="about_copyright_title">Copyright</string>
-    <string name="qksms_plus_description_title">Apoiar o desenvolvimento, desbloquear tudo</string>
-    <string name="qksms_plus_description_summary">Pode ajudar um programador com apenas %s</string>
-    <!-- Substitutions are for price and currency. Ex: Lifetime upgrade for $1.99 USD -->
-    <string name="qksms_plus_upgrade">Atualização vitalícia para %1$s %2$s</string>
-    <!-- Substitutions are for price and currency. Ex: Unlock + donate for $4.99 USD -->
-    <string name="qksms_plus_upgrade_donate">Desbloquear + com uma doação de %1$s %2$s</string>
-    <string name="qksms_plus_thanks_title">Obrigado por apoiar o QKSMS!</string>
-    <string name="qksms_plus_thanks_summary">Agora, tem acesso a todas as funções do QKSMS+</string>
-    <string name="qksms_plus_free_title">O QKSMS+ é gratuito para os utilizadores F-Droid! Se quiser ajudar no desenvolvimento, pode efetuar um donativo.</string>
-    <string name="qksms_plus_donate">Donativos por PayPal</string>
-    <string name="qksms_plus_coming_soon">Brevemente</string>
-    <string name="qksms_plus_themes_title">Temas premium</string>
-    <string name="qksms_plus_themes_summary">Desbloquear diversos temas não disponíveis na paleta Material Design</string>
-    <string name="qksms_plus_emoji_title">Emoji personalizado</string>
-    <string name="qksms_plus_emoji_summary">Criar atalhos personalizados para os emoji</string>
-    <string name="qksms_plus_backup_title">Backup de mensagens</string>
-    <string name="qksms_plus_backup_summary">Backup automático das mensagens. Nunca mais terá que se preocupar com o histórico caso troque de telefone.</string>
-    <string name="qksms_plus_scheduled_title">Mensagens agendadas</string>
-    <string name="qksms_plus_scheduled_summary">Agendar mensagens para envio automático à hora/data especificada</string>
-    <string name="qksms_plus_delayed_title">Atraso de envio</string>
-    <string name="qksms_plus_delayed_summary">Esperar alguns segundos antes de enviar a mensagem</string>
-    <string name="qksms_plus_night_title">Modo noturno automático</string>
-    <string name="qksms_plus_night_summary">Ativar o modo noturno tendo por base a hora</string>
-    <string name="qksms_plus_blacklist_title">Bloqueio avançado</string>
-    <string name="qksms_plus_blacklist_summary">Bloquear mensagens através de palavras-chave ou padrões</string>
-    <string name="qksms_plus_forward_title">Reencaminhamento automático</string>
-    <string name="qksms_plus_forward_summary">Reencaminhar automaticamente as mensagens de alguns remetentes</string>
-    <string name="qksms_plus_respond_title">Resposta automática</string>
-    <string name="qksms_plus_respond_summary">Enviar automaticamente um resposta tendo por base os modelos</string>
-    <string name="qksms_plus_more_title">Mais</string>
-    <string name="qksms_plus_more_summary">Esta aplicação está a ser desenvolvida e a sua compra disponibiliza todas as futuras funcionalidades do QKSMS+!</string>
-    <string name="widget_loading">A carregar&#8230;</string>
-    <string name="widget_more">Ver mais conversas</string>
-    <string name="qkreply_menu_read">Marcar como lida</string>
-    <string name="qkreply_menu_call">Ligar</string>
-    <string name="qkreply_menu_delete">Apagar</string>
-    <string name="qkreply_menu_expand">Mostrar mais</string>
-    <string name="qkreply_menu_collapse">Mostrar menos</string>
-    <string name="qkreply_menu_view">Abrir conversa</string>
-    <string name="theme_material">Material</string>
-    <string name="theme_hex">HEX</string>
-    <string name="theme_apply">Aplicar</string>
-    <string-array name="notification_actions">
-        <item>Nenhuma</item>
-        <item>Arquivar</item>
-        <item>Apagar</item>
-        <item>Bloquear</item>
-        <item>Ligar</item>
-        <item>Marcar como lida</item>
-        <item>Responder</item>
-    </string-array>
-    <string name="button_yes">Sim</string>
-    <string name="button_continue">Continuar</string>
-    <string name="button_cancel">Cancelar</string>
-    <string name="button_delete">Apagar</string>
-    <string name="button_save">Guardar</string>
-    <string name="button_stop">Parar</string>
-    <string name="button_more">Mais</string>
-    <string name="button_set">Definir</string>
-    <string name="button_undo">Anular</string>
-    <string name="toast_copied">Copiada</string>
-    <string name="toast_archived">Conversa arquivada</string>
-    <string name="toast_qksms_plus">Tem que ter o QKSMS+ para esta função</string>
-    <plurals name="notification_new_messages">
-        <item quantity="one">1 nova mensagem</item>
-        <item quantity="other">%s novas mensagens</item>
-    </plurals>
-    <string name="notification_message_failed_title">Mensagem não enviada</string>
-    <string name="notification_message_failed_text">Não foi possível enviar a mensagem para %s</string>
-    <string-array name="night_modes">
-        <item>Sistema</item>
-        <item>Desativado</item>
-        <item>Sempre</item>
-        <item>Automático</item>
-    </string-array>
-    <string-array name="notification_preview_options">
-        <item>Mostrar nome e mensagem</item>
-        <item>Mostrar nome</item>
-        <item>Ocultar conteúdo</item>
-    </string-array>
-    <string-array name="text_sizes">
-        <item>Pequeno</item>
-        <item>Normal</item>
-        <item>Grande</item>
-        <item>Enorme</item>
-    </string-array>
-    <string-array name="delayed_sending_labels">
-        <item>Não</item>
-        <item>3 segundos</item>
-        <item>5 segundos</item>
-        <item>10 segundos</item>
-    </string-array>
-    <string-array name="mms_sizes">
-        <item>Automático</item>
-        <item>100 KB</item>
-        <item>200 KB</item>
-        <item>300 KB</item>
-        <item>600 KB</item>
-        <item>1000 KB</item>
-        <item>2000 KB</item>
-        <item>Sem compressão</item>
-    </string-array>
-    <string-array name="qk_responses">
-        <item>Ok</item>
-        <item>Espera um pouco</item>
-        <item>Estou a caminho</item>
-        <item>Obrigado</item>
-        <item>Parece-me bem</item>
-        <item>Novidades?</item>
-        <item>Concordo</item>
-        <item>Não</item>
-        <item>Amo-te</item>
-        <item>Desculpa</item>
-        <item>LOL</item>
-        <item>Tudo bem</item>
-    </string-array>
-</resources>
+<?xml version="1.0" encoding="utf-8"?>
+<!--
+  ~ Copyright (C) 2019 Moez Bhatti <moez.bhatti@gmail.com>
+  ~
+  ~ This file is part of QKSMS.
+  ~
+  ~ QKSMS is free software: you can redistribute it and/or modify
+  ~ it under the terms of the GNU General Public License as published by
+  ~ the Free Software Foundation, either version 3 of the License, or
+  ~ (at your option) any later version.
+  ~
+  ~ QKSMS is distributed in the hope that it will be useful,
+  ~ but WITHOUT ANY WARRANTY; without even the implied warranty of
+  ~ MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+  ~ GNU General Public License for more details.
+  ~
+  ~ You should have received a copy of the GNU General Public License
+  ~ along with QKSMS.  If not, see <http://www.gnu.org/licenses/>.
+  -->
+<resources>
+    <string name="shortcut_compose_long_label">Nova conversa</string>
+    <string name="shortcut_compose_short_label">Escrever</string>
+    <string name="shortcut_compose_disabled_message">Atalho desativado</string>
+    <string name="title_archived">Arquivadas</string>
+    <string name="title_settings">Definições</string>
+    <string name="title_notification_prefs">Notificações</string>
+    <string name="title_theme">Tema</string>
+    <string name="title_conversations">Pesquisar caixa de entrada&#8230;</string>
+    <string name="title_compose">Digite um nome ou um número</string>
+    <string name="setup_skip">Ignorar</string>
+    <string name="setup_next">Continuar</string>
+    <string name="menu_add_person">Adicionar pessoa</string>
+    <string name="menu_call">Ligar</string>
+    <string name="menu_info">Detalhes</string>
+    <string name="menu_save">Guardar na galeria</string>
+    <string name="menu_share">Partilhar</string>
+    <string name="main_drawer_open_cd">Abrir menu de navegação</string>
+    <string name="main_title_selected">%d selecionada(s)</string>
+    <string name="main_menu_clear">Limpar</string>
+    <string name="main_menu_archive">Arquivar</string>
+    <string name="main_menu_unarchive">Retirar do arquivo</string>
+    <string name="main_menu_delete">Apagar</string>
+    <string name="main_menu_add_contact">Adicionar aos contactos</string>
+    <string name="main_menu_pin">Fixar em cima</string>
+    <string name="main_menu_unpin">Desafixar</string>
+    <string name="main_menu_read">Marcar como lida</string>
+    <string name="main_menu_unread">Marcar como não lida</string>
+    <string name="main_menu_block">Bloquear</string>
+    <string name="main_syncing">Sincronização de mensagens&#8230;</string>
+    <string name="main_sender_you">Você: %s</string>
+    <string name="main_draft">Rascunho</string>
+    <string name="main_message_results_title">Resultados nas mensagens</string>
+    <string name="main_message_results">%d mensagens</string>
+    <string name="inbox_empty_text">As suas conversas aparecerão aqui</string>
+    <string name="inbox_search_empty_text">Sem resultados</string>
+    <string name="archived_empty_text">As conversas arquivadas aparecerão aqui</string>
+    <string name="main_fab_cd">Iniciar nova conversa</string>
+    <string name="main_default_sms_title">SMS em grande estilo</string>
+    <string name="main_default_sms_message">Tornar QKSMS a aplicação padrão para SMS</string>
+    <string name="main_default_sms_change">Alterar</string>
+    <string name="main_permission_required">Permissão necessária</string>
+    <string name="main_permission_sms">QKSMS necessita da permissão para ver e enviar as mensagens</string>
+    <string name="main_permission_contacts">QKSMS necessita da permissão para ver os seus contactos</string>
+    <string name="main_permission_allow">Permitir</string>
+    <string name="drawer_inbox">Caixa de entrada</string>
+    <string name="drawer_archived">Arquivadas</string>
+    <string name="drawer_scheduled">Agendadas</string>
+    <string name="drawer_blocking">Bloqueadas</string>
+    <string name="drawer_more">Mais</string>
+    <string name="drawer_settings">Definições</string>
+    <string name="drawer_help">Ajuda e comentários</string>
+    <string name="drawer_invite">Convidar amigos</string>
+    <string name="drawer_plus_banner_summary">Desbloqueie mais funcionalidades e ajude no desenvolvimento</string>
+    <string name="rate_title">Gosta do QKSMS?</string>
+    <string name="rate_summary">Mostre o seu contentamento e avalie a aplicação na Google Play!</string>
+    <string name="rate_okay">Está bem</string>
+    <string name="rate_dismiss">Agora não</string>
+    <string name="dialog_delete_title">Apagar</string>
+    <plurals name="dialog_delete_message">
+        <item quantity="one">Tem a certeza de que deseja apagar esta conversa?</item>
+        <item quantity="other">Tem a certeza de que deseja apagar %d conversas?</item>
+    </plurals>
+    <string-array name="message_options">
+        <item>Copiar texto</item>
+        <item>Reencaminhar</item>
+        <item>Apagar</item>
+    </string-array>
+    <string name="compose_number_picker_title">Escolha um número de telefone</string>
+    <string name="compose_number_picker_default">%s ∙ Padrão</string>
+    <string name="compose_number_picker_once">Uma vez</string>
+    <string name="compose_number_picker_always">Sempre</string>
+    <string name="compose_title_selected">%d selecionada(s)</string>
+    <string name="compose_subtitle_results">%1$d de %2$d resultados</string>
+    <string name="compose_send_group_title">Enviar como mensagem de grupo</string>
+    <string name="compose_send_group_summary">Destinatários e respostas visíveis para todos</string>
+    <string name="compose_messages_empty">Aqui é o início da sua conversa. Pode dizer algo simpático!</string>
+    <string name="compose_vcard_label">Cartão do contacto</string>
+    <string name="compose_scheduled_for">Agendada para</string>
+    <string name="compose_scheduled_future">A hora escolhida tem que ser futura!</string>
+    <string name="compose_scheduled_plus">Para utilizar esta funcionalidade, necessita do QKSMS+</string>
+    <string name="compose_scheduled_toast">Adicionada às mensagens agendadas</string>
+    <string name="compose_hint">Escrever uma mensagem&#8230;</string>
+    <string name="compose_menu_copy">Copiar texto</string>
+    <string name="compose_menu_forward">Reencaminhar</string>
+    <string name="compose_menu_delete">Apagar</string>
+    <string name="compose_menu_previous">Anterior</string>
+    <string name="compose_menu_next">Seguinte</string>
+    <string name="compose_menu_clear">Limpar</string>
+    <string name="compose_details_title">Detalhes da mensagem</string>
+    <string name="compose_details_type">Tipo: %s</string>
+    <string name="compose_details_from">De: %s</string>
+    <string name="compose_details_to">Para: %s</string>
+    <string name="compose_details_subject">Assunto: %s</string>
+    <string name="compose_details_priority">Prioridade: %s</string>
+    <string name="compose_details_size">Tamanho: %s</string>
+    <string name="compose_details_sent">Enviada: %s</string>
+    <string name="compose_details_received">Recebida: %s</string>
+    <string name="compose_details_delivered">Entregue: %s</string>
+    <string name="compose_details_error_code">Código do erro: %d</string>
+    <string name="compose_attach_cd">Adicionar anexo</string>
+    <string name="compose_gallery_cd">Anexar fotografia</string>
+    <string name="compose_camera_cd">Tirar fotografia</string>
+    <string name="compose_schedule_cd">Agendar mensagem</string>
+    <string name="compose_contact_cd">Anexar um contacto</string>
+    <string name="compose_contact_error">Erro ao ler o contacto</string>
+    <!-- Example: SIM 1 (Verizon) selected-->
+    <string name="compose_sim_changed_toast">SIM %1$d (%2$s) selecionado</string>
+    <string name="compose_sim_cd">%s selecionado, alterar cartão SIM</string>
+    <string name="compose_send_cd">Enviar mensagem</string>
+    <string name="message_status_sending">A enviar&#8230;</string>
+    <string name="message_status_delivered">%s entregue</string>
+    <string name="message_status_failed">Falha ao enviar. Toque para tentar novamente</string>
+    <string name="info_title">Detalhes</string>
+    <string name="info_copied_address">Endereço copiado</string>
+    <string name="info_name">Título da conversa</string>
+    <string name="info_notifications">Notificações</string>
+    <string name="info_theme">Tema</string>
+    <string name="info_archive">Arquivar</string>
+    <string name="info_unarchive">Retirar do arquivo</string>
+    <string name="info_block">Bloquear</string>
+    <string name="info_unblock">Desbloquear</string>
+    <string name="info_delete">Apagar conversa</string>
+    <string name="gallery_error">Não foi possível carregar os dados</string>
+    <string name="gallery_toast_saved">Guardada na galeria</string>
+    <string name="backup_title">Backup e restauro</string>
+    <string name="backup_backing_up">Backup de mensagens</string>
+    <string name="backup_restoring">Restauro de backup</string>
+    <string name="backup_last">Último backup</string>
+    <string name="backup_loading">A carregar&#8230;</string>
+    <string name="backup_never">Nunca</string>
+    <string name="backup_restore_title">Restaurar</string>
+    <string name="backup_restore_summary">Selecionar backup</string>
+    <string name="backup_restore_error_plus">Tem que ter QKSMS+ para poder usar o backup e restauro</string>
+    <string name="backup_restore_error_backup">A criar backup&#8230;</string>
+    <string name="backup_restore_error_restore">A restaurar&#8230;</string>
+    <string name="backup_restore_confirm_title">Restaurar de backup</string>
+    <string name="backup_restore_confirm_message">Tem a certeza de que deseja restaurar as mensagens deste backup?</string>
+    <string name="backup_restore_stop_title">Parar restauro</string>
+    <string name="backup_restore_stop_message">As mensagens que tiverem sido restauradas irão permanecer no dispositivo</string>
+    <string name="backup_restore_dialog_title">Backups</string>
+    <string name="backup_restore_dialog_empty">Backup não encontrado</string>
+    <plurals name="backup_message_count">
+        <item quantity="one">%d mensagem</item>
+        <item quantity="other">%d mensagens</item>
+    </plurals>
+    <string name="backup_disclaimer">Atualmente, apenas está disponível o backup e restauro de SMS. O suporte a MMS e o agendamento de backups será adicionado brevemente!</string>
+    <string name="backup_now">Criar backup</string>
+    <string name="backup_progress_parsing">A analisar backup&#8230;</string>
+    <string name="backup_progress_running">%d/%d mensagens</string>
+    <string name="backup_progress_saving">A guardar backup&#8230;</string>
+    <string name="backup_progress_syncing">A sincronizar mensagens&#8230;</string>
+    <string name="backup_progress_finished">Terminado!</string>
+    <string name="backup_notification_channel_name">Backup e restauro</string>
+    <string name="scheduled_title">Agendada</string>
+    <string name="scheduled_empty_description">Enviar automaticamente uma mensagem à hora especificada</string>
+    <string name="scheduled_empty_message_1">Olá! Quando é que é mesmo o teu aniversário?</string>
+    <string name="scheduled_empty_message_2">É no dia 23 de dezembro</string>
+    <string name="scheduled_empty_message_3">Feliz aniversário! Já viste o tipo de amigo que sou, até me lembro do teu aniversário</string>
+    <!--&#x200A; is a special character required at the end of this string to fix it's formatting in the app -->
+    <string name="scheduled_empty_message_3_timestamp">Enviar no dia 23 de dezembro</string>
+    <string name="scheduled_compose_cd">Agendar mensagem</string>
+    <string name="scheduled_options_title">Mensagem agendada</string>
+    <string-array name="scheduled_options">
+        <item>Enviar agora</item>
+        <item>Copiar texto</item>
+        <item>Apagar</item>
+    </string-array>
+    <string name="settings_category_appearance">Aparência</string>
+    <string name="settings_category_general">Geral</string>
+    <string name="settings_category_qkreply">QK Reply</string>
+    <string name="settings_theme_title">Tema</string>
+    <string name="settings_night_title">Modo noturno</string>
+    <string name="settings_black_title">Modo escuro puro</string>
+    <string name="settings_night_start_title">Hora de início</string>
+    <string name="settings_night_end_title">Hora de fim</string>
+    <string name="settings_automatic_colors_title">Cores automáticas para os contactos</string>
+    <string name="settings_text_size_title">Tamanho do texto</string>
+    <string name="settings_system_font_title">Usar tipo de letra do sistema</string>
+    <string name="settings_auto_emoji_title">Emoji automático</string>
+    <string name="settings_notifications_title">Notificações</string>
+    <string name="settings_notifications_o_summary">Toque para personalizar</string>
+    <string name="settings_notification_actions_title">Ações</string>
+    <string name="settings_notification_action_1">Botão 1</string>
+    <string name="settings_notification_action_2">Botão 2</string>
+    <string name="settings_notification_action_3">Botão 3</string>
+    <string name="settings_notification_previews_title">Pré-visualização de notificações</string>
+    <string name="settings_notification_wake_title">Ligar ecrã</string>
+    <string name="settings_vibration_title">Vibração</string>
+    <string name="settings_ringtone_title">Som</string>
+    <string name="settings_ringtone_none">Nenhum</string>
+    <string name="settings_qkreply_title">QK Reply</string>
+    <string name="settings_qkreply_summary">Alerta para novas mensagens</string>
+    <string name="settings_qkreply_tap_dismiss_title">Toque para fechar</string>
+    <string name="settings_qkreply_tap_dismiss_summary">Toque fora do alerta para o fechar</string>
+    <string name="settings_delayed_title">Atraso de envio</string>
+    <string name="settings_swipe_actions">Ações de deslize</string>
+    <string name="settings_swipe_actions_summary">Configurar ações de deslize nas conversas</string>
+    <string name="settings_swipe_actions_right">Deslize à direita</string>
+    <string name="settings_swipe_actions_left">Deslize à esquerda</string>
+    <string name="settings_swipe_actions_change">Alterar</string>
+    <string-array name="settings_swipe_actions">
+        <item>Nenhuma</item>
+        <item>Arquivar</item>
+        <item>Apagar</item>
+        <item>Bloquear</item>
+        <item>Ligar</item>
+        <item>Marcar como lida</item>
+        <item>Marcar como não lida</item>
+    </string-array>
+    <string name="settings_delivery_title">Confirmações de entrega</string>
+    <string name="settings_delivery_summary">Confirma se as mensagens foram enviadas com sucesso</string>
+    <string name="settings_signature_title">Assinatura</string>
+    <string name="settings_signature_summary">Adicionar uma assinatura às mensagens</string>
+    <string name="settings_unicode_title">Remover acentos</string>
+    <string name="settings_unicode_summary">Remover acentos dos caracteres nas mensagens enviadas</string>
+    <string name="settings_mobile_title">Apenas números de telemóvel</string>
+    <string name="settings_mobile_summary">Ao escrever uma mensagem, mostrar apenas os números móveis</string>
+    <string name="settings_auto_delete">Apagar mensagens antigas automaticamente</string>
+    <string name="settings_auto_delete_dialog_message">As mensagens serão eliminadas após o número de dias especificado</string>
+    <string name="settings_auto_delete_dialog_hint">Número de dias</string>
+    <string name="settings_auto_delete_never">Nunca</string>
+    <string name="settings_auto_delete_warning">Apagar mensagens antigas automaticamente?</string>
+    <string name="settings_auto_delete_warning_message">Se continuar, %1$d mensagens serão eliminadas</string>
+    <plurals name="settings_auto_delete_summary">
+        <item quantity="one">Após 1 dia</item>
+        <item quantity="other">Após %d dias</item>
+    </plurals>
+    <string name="settings_long_as_mms_title">Enviar mensagens longas como MMS</string>
+    <string name="settings_long_as_mms_summary">Se as mensagens longas não estiverem a ser enviadas ou estão a ser enviadas pela ordem errada, pode tentar enviar como MMS. Podem ser aplicados custos adicionais.</string>
+    <string name="settings_mms_size_title">Comprimir anexos MMS automaticamente</string>
+    <string name="settings_sync_title">Sincronizar mensagens</string>
+    <string name="settings_sync_summary">Sincronizar as mensagens com a base de dados nativa do Android</string>
+    <string name="settings_about_title">Acerca do QKSMS</string>
+    <string name="settings_version">Versão %s</string>
+    <string name="settings_logging_enabled">Depuração ativada</string>
+    <string name="settings_logging_disabled">Depuração desativada</string>
+    <string name="settings_delay_duration_hint">Digite a duração (segundos)</string>
+    <string name="blocking_title">Bloqueio</string>
+    <string name="blocking_drop_title">Descartar mensagens</string>
+    <string name="blocking_drop_summary">As mensagens enviadas pelos remetentes bloqueados serão descartadas e não ocultadas</string>
+    <string name="blocking_conversations">Conversas bloqueadas</string>
+    <string name="blocking_manager_title">Gestor de bloqueios</string>
+    <string name="blocking_manager_qksms_title">QKSMS</string>
+    <string name="blocking_manager_qksms_summary">Funcionalidade de bloqueio, nativa no QKSMS</string>
+    <string name="blocking_manager_call_control_summary">Filtrar automaticamente as chamadas e as mensagens com a aplicação Community IQ™, com a qual pode descartar as mensagens que forem enviadas pelo \'spammers\' reconhecidos na comunidade</string>
+    <string name="blocking_manager_sia_summary">Filtrar automaticamente as mensagens de números utilizando a aplicação \"Should I Answer\"</string>
+    <string name="blocking_manager_copy_title">Copiar números bloqueados</string>
+    <string name="blocking_manager_copy_summary">Continuar para %s e substituir os números bloqueados</string>
+    <string name="blocked_numbers_title">Números bloqueados</string>
+    <string name="blocked_numbers_empty">Os números bloqueados aparecerão aqui</string>
+    <string name="blocked_numbers_add_cd">Bloquear um novo número</string>
+    <string name="blocked_numbers_dialog_title">Bloquear mensagens de</string>
+    <string name="blocked_numbers_dialog_hint">Número de telefone</string>
+    <string name="blocked_numbers_dialog_block">Bloquear</string>
+    <string name="blocked_messages_title">Mensagens bloqueadas</string>
+    <string name="blocked_messages_empty">As mensagens bloqueadas aparecerão aqui</string>
+    <string name="blocking_block_title">Bloquear</string>
+    <string name="blocking_unblock_title">Desbloquear</string>
+    <plurals name="blocking_block_external">
+        <item quantity="one">Continuar para %s e bloquear este número</item>
+        <item quantity="other">Continuar para %s e bloquear estes números</item>
+    </plurals>
+    <plurals name="blocking_unblock_external">
+        <item quantity="one">Continuar para %s e permitir este número</item>
+        <item quantity="other">Continuar para %s e permitir estes números</item>
+    </plurals>
+    <string name="about_title">Acerca</string>
+    <string name="about_version_title">Versão</string>
+    <string name="about_developer_title">Programador</string>
+    <string name="about_source_title">Código fonte</string>
+    <string name="about_changelog_title">Alterações</string>
+    <string name="about_contact_title">Contactos</string>
+    <string name="about_license_title">Licença</string>
+    <string name="about_copyright_title">Copyright</string>
+    <string name="qksms_plus_description_title">Apoiar o desenvolvimento, desbloquear tudo</string>
+    <string name="qksms_plus_description_summary">Pode ajudar um programador com apenas %s</string>
+    <!-- Substitutions are for price and currency. Ex: Lifetime upgrade for $1.99 USD -->
+    <string name="qksms_plus_upgrade">Atualização vitalícia para %1$s %2$s</string>
+    <!-- Substitutions are for price and currency. Ex: Unlock + donate for $4.99 USD -->
+    <string name="qksms_plus_upgrade_donate">Desbloquear + com uma doação de %1$s %2$s</string>
+    <string name="qksms_plus_thanks_title">Obrigado por apoiar o QKSMS!</string>
+    <string name="qksms_plus_thanks_summary">Agora, tem acesso a todas as funções do QKSMS+</string>
+    <string name="qksms_plus_free_title">O QKSMS+ é gratuito para os utilizadores F-Droid! Se quiser ajudar no desenvolvimento, pode efetuar um donativo.</string>
+    <string name="qksms_plus_donate">Donativos por PayPal</string>
+    <string name="qksms_plus_coming_soon">Brevemente</string>
+    <string name="qksms_plus_themes_title">Temas premium</string>
+    <string name="qksms_plus_themes_summary">Desbloquear diversos temas não disponíveis na paleta Material Design</string>
+    <string name="qksms_plus_emoji_title">Emoji personalizado</string>
+    <string name="qksms_plus_emoji_summary">Criar atalhos personalizados para os emoji</string>
+    <string name="qksms_plus_backup_title">Backup de mensagens</string>
+    <string name="qksms_plus_backup_summary">Backup automático das mensagens. Nunca mais terá que se preocupar com o histórico caso troque de telefone.</string>
+    <string name="qksms_plus_scheduled_title">Mensagens agendadas</string>
+    <string name="qksms_plus_scheduled_summary">Agendar mensagens para envio automático à hora/data especificada</string>
+    <string name="qksms_plus_delayed_title">Atraso de envio</string>
+    <string name="qksms_plus_delayed_summary">Esperar alguns segundos antes de enviar a mensagem</string>
+    <string name="qksms_plus_night_title">Modo noturno automático</string>
+    <string name="qksms_plus_night_summary">Ativar o modo noturno tendo por base a hora</string>
+    <string name="qksms_plus_blacklist_title">Bloqueio avançado</string>
+    <string name="qksms_plus_blacklist_summary">Bloquear mensagens através de palavras-chave ou padrões</string>
+    <string name="qksms_plus_forward_title">Reencaminhamento automático</string>
+    <string name="qksms_plus_forward_summary">Reencaminhar automaticamente as mensagens de alguns remetentes</string>
+    <string name="qksms_plus_respond_title">Resposta automática</string>
+    <string name="qksms_plus_respond_summary">Enviar automaticamente um resposta tendo por base os modelos</string>
+    <string name="qksms_plus_more_title">Mais</string>
+    <string name="qksms_plus_more_summary">Esta aplicação está a ser desenvolvida e a sua compra disponibiliza todas as futuras funcionalidades do QKSMS+!</string>
+    <string name="widget_loading">A carregar&#8230;</string>
+    <string name="widget_more">Ver mais conversas</string>
+    <string name="qkreply_menu_read">Marcar como lida</string>
+    <string name="qkreply_menu_call">Ligar</string>
+    <string name="qkreply_menu_delete">Apagar</string>
+    <string name="qkreply_menu_expand">Mostrar mais</string>
+    <string name="qkreply_menu_collapse">Mostrar menos</string>
+    <string name="qkreply_menu_view">Abrir conversa</string>
+    <string name="theme_material">Material</string>
+    <string name="theme_hex">HEX</string>
+    <string name="theme_apply">Aplicar</string>
+    <string-array name="notification_actions">
+        <item>Nenhuma</item>
+        <item>Arquivar</item>
+        <item>Apagar</item>
+        <item>Bloquear</item>
+        <item>Ligar</item>
+        <item>Marcar como lida</item>
+        <item>Responder</item>
+    </string-array>
+    <string name="button_yes">Sim</string>
+    <string name="button_continue">Continuar</string>
+    <string name="button_cancel">Cancelar</string>
+    <string name="button_delete">Apagar</string>
+    <string name="button_save">Guardar</string>
+    <string name="button_stop">Parar</string>
+    <string name="button_more">Mais</string>
+    <string name="button_set">Definir</string>
+    <string name="button_undo">Anular</string>
+    <string name="toast_copied">Copiada</string>
+    <string name="toast_archived">Conversa arquivada</string>
+    <string name="toast_qksms_plus">Tem que ter o QKSMS+ para esta função</string>
+    <plurals name="notification_new_messages">
+        <item quantity="one">1 nova mensagem</item>
+        <item quantity="other">%s novas mensagens</item>
+    </plurals>
+    <string name="notification_message_failed_title">Mensagem não enviada</string>
+    <string name="notification_message_failed_text">Não foi possível enviar a mensagem para %s</string>
+    <string-array name="night_modes">
+        <item>Sistema</item>
+        <item>Desativado</item>
+        <item>Sempre</item>
+        <item>Automático</item>
+    </string-array>
+    <string-array name="notification_preview_options">
+        <item>Mostrar nome e mensagem</item>
+        <item>Mostrar nome</item>
+        <item>Ocultar conteúdo</item>
+    </string-array>
+    <string-array name="text_sizes">
+        <item>Pequeno</item>
+        <item>Normal</item>
+        <item>Grande</item>
+        <item>Enorme</item>
+    </string-array>
+    <string-array name="delayed_sending_labels">
+        <item>Não</item>
+        <item>3 segundos</item>
+        <item>5 segundos</item>
+        <item>10 segundos</item>
+    </string-array>
+    <string-array name="mms_sizes">
+        <item>Automático</item>
+        <item>100 KB</item>
+        <item>200 KB</item>
+        <item>300 KB</item>
+        <item>600 KB</item>
+        <item>1000 KB</item>
+        <item>2000 KB</item>
+        <item>Sem compressão</item>
+    </string-array>
+    <string-array name="qk_responses">
+        <item>Ok</item>
+        <item>Espera um pouco</item>
+        <item>Estou a caminho</item>
+        <item>Obrigado</item>
+        <item>Parece-me bem</item>
+        <item>Novidades?</item>
+        <item>Concordo</item>
+        <item>Não</item>
+        <item>Amo-te</item>
+        <item>Desculpa</item>
+        <item>LOL</item>
+        <item>Tudo bem</item>
+    </string-array>
+</resources>
diff --git a/presentation/src/main/res/values-ro/strings.xml b/presentation/src/main/res/values-ro/strings.xml
index 0637d1473..98cb411f4 100644
--- a/presentation/src/main/res/values-ro/strings.xml
+++ b/presentation/src/main/res/values-ro/strings.xml
@@ -1,417 +1,417 @@
-<?xml version="1.0" encoding="utf-8"?>
-<!--
-  ~ Copyright (C) 2019 Moez Bhatti <moez.bhatti@gmail.com>
-  ~
-  ~ This file is part of QKSMS.
-  ~
-  ~ QKSMS is free software: you can redistribute it and/or modify
-  ~ it under the terms of the GNU General Public License as published by
-  ~ the Free Software Foundation, either version 3 of the License, or
-  ~ (at your option) any later version.
-  ~
-  ~ QKSMS is distributed in the hope that it will be useful,
-  ~ but WITHOUT ANY WARRANTY; without even the implied warranty of
-  ~ MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
-  ~ GNU General Public License for more details.
-  ~
-  ~ You should have received a copy of the GNU General Public License
-  ~ along with QKSMS.  If not, see <http://www.gnu.org/licenses/>.
-  -->
-<resources>
-    <string name="shortcut_compose_long_label">New conversation</string>
-    <string name="shortcut_compose_short_label">Compose</string>
-    <string name="shortcut_compose_disabled_message">Shortcut disabled</string>
-    <string name="title_archived">Arhivate</string>
-    <string name="title_settings">Setări</string>
-    <string name="title_notification_prefs">Notificări</string>
-    <string name="title_theme">Teme</string>
-    <string name="title_conversations">Caută în inbox...</string>
-    <string name="title_compose">Compune</string>
-    <string name="setup_skip">Sari</string>
-    <string name="setup_next">Continue</string>
-    <string name="menu_add_person">Add person</string>
-    <string name="menu_call">Apel</string>
-    <string name="menu_info">Details</string>
-    <string name="menu_save">Save to gallery</string>
-    <string name="menu_share">Share</string>
-    <string name="main_drawer_open_cd">Open navigation drawer</string>
-    <string name="main_title_selected">%d selected</string>
-    <string name="main_menu_clear">Clear</string>
-    <string name="main_menu_archive">Archive</string>
-    <string name="main_menu_unarchive">Unarchive</string>
-    <string name="main_menu_delete">Delete</string>
-    <string name="main_menu_add_contact">Add to contacts</string>
-    <string name="main_menu_pin">Pin to top</string>
-    <string name="main_menu_unpin">Unpin</string>
-    <string name="main_menu_read">Mark read</string>
-    <string name="main_menu_unread">Mark unread</string>
-    <string name="main_menu_block">Block</string>
-    <string name="main_syncing">Syncing messages&#8230;</string>
-    <string name="main_sender_you">You: %s</string>
-    <string name="main_draft">Draft</string>
-    <string name="main_message_results_title">Results in messages</string>
-    <string name="main_message_results">%d messages</string>
-    <string name="inbox_empty_text">Your conversations will appear here</string>
-    <string name="inbox_search_empty_text">No results</string>
-    <string name="archived_empty_text">Your archived conversations will appear here</string>
-    <string name="main_fab_cd">Start new conversation</string>
-    <string name="main_default_sms_title">Love texting again</string>
-    <string name="main_default_sms_message">Make QKSMS your default SMS app</string>
-    <string name="main_default_sms_change">Change</string>
-    <string name="main_permission_required">Permission required</string>
-    <string name="main_permission_sms">QKSMS needs permission to send and view SMS messages</string>
-    <string name="main_permission_contacts">QKSMS needs permission to view your contacts</string>
-    <string name="main_permission_allow">Allow</string>
-    <string name="drawer_inbox">Inbox</string>
-    <string name="drawer_archived">Archived</string>
-    <string name="drawer_scheduled">Scheduled</string>
-    <string name="drawer_blocking">Blocking</string>
-    <string name="drawer_more">More</string>
-    <string name="drawer_settings">Settings</string>
-    <string name="drawer_help">Help &amp; feedback</string>
-    <string name="drawer_invite">Invite friends</string>
-    <string name="drawer_plus_banner_summary">Unlock amazing new features, and support development</string>
-    <string name="rate_title">Enjoying QKSMS?</string>
-    <string name="rate_summary">Share some love and rate us on Google Play!</string>
-    <string name="rate_okay">OKAY!</string>
-    <string name="rate_dismiss">DISMISS</string>
-    <string name="dialog_delete_title">Delete</string>
-    <plurals name="dialog_delete_message">
-        <item quantity="one">Are you sure you would like to delete this conversation?</item>
-        <item quantity="few">Are you sure you would like to delete %d conversations?</item>
-        <item quantity="other">Are you sure you would like to delete %d conversations?</item>
-    </plurals>
-    <string-array name="message_options">
-        <item>Copy text</item>
-        <item>Forward</item>
-        <item>Delete</item>
-    </string-array>
-    <string name="compose_number_picker_title">Choose a phone number</string>
-    <string name="compose_number_picker_default">%s ∙ Default</string>
-    <string name="compose_number_picker_once">Just once</string>
-    <string name="compose_number_picker_always">Always</string>
-    <string name="compose_title_selected">%d selected</string>
-    <string name="compose_subtitle_results">%1$d of %2$d results</string>
-    <string name="compose_send_group_title">Send as group message</string>
-    <string name="compose_send_group_summary">Recipients and replies will be visible to everyone</string>
-    <string name="compose_messages_empty">This is the start of your conversation. Say something nice!</string>
-    <string name="compose_vcard_label">Contact card</string>
-    <string name="compose_scheduled_for">Scheduled for</string>
-    <string name="compose_scheduled_future">Selected time must be in the future!</string>
-    <string name="compose_scheduled_plus">You must unlock QKSMS+ to use scheduled messaging</string>
-    <string name="compose_scheduled_toast">Added to scheduled messages</string>
-    <string name="compose_hint">Write a message&#8230;</string>
-    <string name="compose_menu_copy">Copy text</string>
-    <string name="compose_menu_forward">Forward</string>
-    <string name="compose_menu_delete">Delete</string>
-    <string name="compose_menu_previous">Previous</string>
-    <string name="compose_menu_next">Next</string>
-    <string name="compose_menu_clear">Clear</string>
-    <string name="compose_details_title">Message details</string>
-    <string name="compose_details_type">Type: %s</string>
-    <string name="compose_details_from">From: %s</string>
-    <string name="compose_details_to">To: %s</string>
-    <string name="compose_details_subject">Subject: %s</string>
-    <string name="compose_details_priority">Priority: %s</string>
-    <string name="compose_details_size">Size: %s</string>
-    <string name="compose_details_sent">Sent: %s</string>
-    <string name="compose_details_received">Received: %s</string>
-    <string name="compose_details_delivered">Delivered: %s</string>
-    <string name="compose_details_error_code">Error code: %d</string>
-    <string name="compose_attach_cd">Add an attachment</string>
-    <string name="compose_gallery_cd">Attach a photo</string>
-    <string name="compose_camera_cd">Take a photo</string>
-    <string name="compose_schedule_cd">Schedule message</string>
-    <string name="compose_contact_cd">Attach a contact</string>
-    <string name="compose_contact_error">Error reading contact</string>
-    <!-- Example: SIM 1 (Verizon) selected-->
-    <string name="compose_sim_changed_toast">SIM %1$d (%2$s) selected</string>
-    <string name="compose_sim_cd">%s selected, change SIM card</string>
-    <string name="compose_send_cd">Send message</string>
-    <string name="message_status_sending">Sending&#8230;</string>
-    <string name="message_status_delivered">Delivered %s</string>
-    <string name="message_status_failed">Failed to send. Tap to try again</string>
-    <string name="info_title">Details</string>
-    <string name="info_copied_address">Address copied</string>
-    <string name="info_name">Conversation title</string>
-    <string name="info_notifications">Notifications</string>
-    <string name="info_theme">Theme</string>
-    <string name="info_archive">Archive</string>
-    <string name="info_unarchive">Unarchive</string>
-    <string name="info_block">Block</string>
-    <string name="info_unblock">Unblock</string>
-    <string name="info_delete">Delete conversation</string>
-    <string name="gallery_error">Couldn\'t load media</string>
-    <string name="gallery_toast_saved">Saved to gallery</string>
-    <string name="backup_title">Backup and restore</string>
-    <string name="backup_backing_up">Backing up messages</string>
-    <string name="backup_restoring">Restoring from backup</string>
-    <string name="backup_last">Last backup</string>
-    <string name="backup_loading">Loading&#8230;</string>
-    <string name="backup_never">Never</string>
-    <string name="backup_restore_title">Restore</string>
-    <string name="backup_restore_summary">Select a backup</string>
-    <string name="backup_restore_error_plus">Please unlock QKSMS+ to use backup and restore</string>
-    <string name="backup_restore_error_backup">Backup in progress&#8230;</string>
-    <string name="backup_restore_error_restore">Restore in progress&#8230;</string>
-    <string name="backup_restore_confirm_title">Restore from backup</string>
-    <string name="backup_restore_confirm_message">Are you sure you would like to restore your messages from this backup?</string>
-    <string name="backup_restore_stop_title">Stop restore</string>
-    <string name="backup_restore_stop_message">Messages that have already been restored will remain on your device</string>
-    <string name="backup_restore_dialog_title">Backups</string>
-    <string name="backup_restore_dialog_empty">No backups found</string>
-    <plurals name="backup_message_count">
-        <item quantity="one">%d message</item>
-        <item quantity="few">%d messages</item>
-        <item quantity="other">%d messages</item>
-    </plurals>
-    <string name="backup_disclaimer">Currently, only SMS is supported by Backup and Restore. MMS support and scheduled backups will be coming soon!</string>
-    <string name="backup_now">Backup now</string>
-    <string name="backup_progress_parsing">Parsing backup&#8230;</string>
-    <string name="backup_progress_running">%d/%d messages</string>
-    <string name="backup_progress_saving">Saving backup&#8230;</string>
-    <string name="backup_progress_syncing">Syncing messages&#8230;</string>
-    <string name="backup_progress_finished">Finished!</string>
-    <string name="backup_notification_channel_name">Backup and restore</string>
-    <string name="scheduled_title">Scheduled</string>
-    <string name="scheduled_empty_description">Automatically send a message, at the exact moment you\'d like</string>
-    <string name="scheduled_empty_message_1">Hey! When was your birthday again?</string>
-    <string name="scheduled_empty_message_2">It\'s on December 23rd</string>
-    <string name="scheduled_empty_message_3">Happy birthday! Look at what a great friend I am, remembering your birthday</string>
-    <!--&#x200A; is a special character required at the end of this string to fix it's formatting in the app -->
-    <string name="scheduled_empty_message_3_timestamp">Sending on December 23rd </string>
-    <string name="scheduled_compose_cd">Schedule a message</string>
-    <string name="scheduled_options_title">Scheduled message</string>
-    <string-array name="scheduled_options">
-        <item>Send now</item>
-        <item>Copy text</item>
-        <item>Delete</item>
-    </string-array>
-    <string name="settings_category_appearance">Appearance</string>
-    <string name="settings_category_general">General</string>
-    <string name="settings_category_qkreply">QK Reply</string>
-    <string name="settings_theme_title">Theme</string>
-    <string name="settings_night_title">Night mode</string>
-    <string name="settings_black_title">Pure black night mode</string>
-    <string name="settings_night_start_title">Start time</string>
-    <string name="settings_night_end_title">End time</string>
-    <string name="settings_automatic_colors_title">Automatic contact colors</string>
-    <string name="settings_text_size_title">Font size</string>
-    <string name="settings_system_font_title">Use system font</string>
-    <string name="settings_auto_emoji_title">Automatic emoji</string>
-    <string name="settings_notifications_title">Notifications</string>
-    <string name="settings_notifications_o_summary">Tap to customize</string>
-    <string name="settings_notification_actions_title">Actions</string>
-    <string name="settings_notification_action_1">Button 1</string>
-    <string name="settings_notification_action_2">Button 2</string>
-    <string name="settings_notification_action_3">Button 3</string>
-    <string name="settings_notification_previews_title">Notification previews</string>
-    <string name="settings_notification_wake_title">Wake screen</string>
-    <string name="settings_vibration_title">Vibration</string>
-    <string name="settings_ringtone_title">Sound</string>
-    <string name="settings_ringtone_none">None</string>
-    <string name="settings_qkreply_title">QK Reply</string>
-    <string name="settings_qkreply_summary">Popup for new messages</string>
-    <string name="settings_qkreply_tap_dismiss_title">Tap to dismiss</string>
-    <string name="settings_qkreply_tap_dismiss_summary">Tap outside of the popup to close it</string>
-    <string name="settings_delayed_title">Delayed sending</string>
-    <string name="settings_swipe_actions">Swipe actions</string>
-    <string name="settings_swipe_actions_summary">Configure swipe actions for conversations</string>
-    <string name="settings_swipe_actions_right">Right swipe</string>
-    <string name="settings_swipe_actions_left">Left swipe</string>
-    <string name="settings_swipe_actions_change">CHANGE</string>
-    <string-array name="settings_swipe_actions">
-        <item>None</item>
-        <item>Archive</item>
-        <item>Delete</item>
-        <item>Block</item>
-        <item>Call</item>
-        <item>Mark read</item>
-        <item>Mark unread</item>
-    </string-array>
-    <string name="settings_delivery_title">Delivery confirmations</string>
-    <string name="settings_delivery_summary">Confirm that messages were sent successfully</string>
-    <string name="settings_signature_title">Signature</string>
-    <string name="settings_signature_summary">Add a signature to the end of your messages</string>
-    <string name="settings_unicode_title">Strip accents</string>
-    <string name="settings_unicode_summary">Remove accents from characters in outgoing SMS messages</string>
-    <string name="settings_mobile_title">Mobile numbers only</string>
-    <string name="settings_mobile_summary">When composing a message, only show mobile numbers</string>
-    <string name="settings_auto_delete">Delete old messages automatically</string>
-    <string name="settings_auto_delete_dialog_message">Messages will be deleted after the specified number of days</string>
-    <string name="settings_auto_delete_dialog_hint">Number of days</string>
-    <string name="settings_auto_delete_never">Never</string>
-    <string name="settings_auto_delete_warning">Delete old messages automatically?</string>
-    <string name="settings_auto_delete_warning_message">If you proceed, %1$d messages will be deleted now</string>
-    <plurals name="settings_auto_delete_summary">
-        <item quantity="one">After 1 day</item>
-        <item quantity="few">After %d days</item>
-        <item quantity="other">After %d days</item>
-    </plurals>
-    <string name="settings_long_as_mms_title">Send long messages as MMS</string>
-    <string name="settings_long_as_mms_summary">If your longer text messages are failing to send, or sending in the wrong order, you can send them as MMS messages instead. Additional charges may apply</string>
-    <string name="settings_mms_size_title">Auto-compress MMS attachments</string>
-    <string name="settings_sync_title">Sync messages</string>
-    <string name="settings_sync_summary">Re-sync your messages with the native Android SMS database</string>
-    <string name="settings_about_title">About QKSMS</string>
-    <string name="settings_version">Version %s</string>
-    <string name="settings_logging_enabled">Debug logging enabled</string>
-    <string name="settings_logging_disabled">Debug logging disabled</string>
-    <string name="settings_delay_duration_hint">Enter duration (seconds)</string>
-    <string name="blocking_title">Blocking</string>
-    <string name="blocking_drop_title">Drop messages</string>
-    <string name="blocking_drop_summary">Drop incoming messages from blocked senders instead of hiding them</string>
-    <string name="blocking_conversations">Blocked conversations</string>
-    <string name="blocking_manager_title">Blocking Manager</string>
-    <string name="blocking_manager_qksms_title">QKSMS</string>
-    <string name="blocking_manager_qksms_summary">Built-in blocking functionality in QKSMS</string>
-    <string name="blocking_manager_call_control_summary">Automatically filter your calls and messages in one convenient place! Community IQ™ allows you to prevent unwanted messages from community known spammers</string>
-    <string name="blocking_manager_sia_summary">Automatically filter messages from unsolicited numbers by using the \"Should I Answer\" app</string>
-    <string name="blocking_manager_copy_title">Copy blocked numbers</string>
-    <string name="blocking_manager_copy_summary">Continue to %s and copy over your existing blocked numbers</string>
-    <string name="blocked_numbers_title">Blocked numbers</string>
-    <string name="blocked_numbers_empty">Your blocked numbers will appear here</string>
-    <string name="blocked_numbers_add_cd">Block a new number</string>
-    <string name="blocked_numbers_dialog_title">Block texts from</string>
-    <string name="blocked_numbers_dialog_hint">Phone number</string>
-    <string name="blocked_numbers_dialog_block">Block</string>
-    <string name="blocked_messages_title">Blocked messages</string>
-    <string name="blocked_messages_empty">Your blocked messages will appear here</string>
-    <string name="blocking_block_title">Block</string>
-    <string name="blocking_unblock_title">Unblock</string>
-    <plurals name="blocking_block_external">
-        <item quantity="one">Continue to %s and block this number</item>
-        <item quantity="few">Continue to %s and block these numbers</item>
-        <item quantity="other">Continue to %s and block these numbers</item>
-    </plurals>
-    <plurals name="blocking_unblock_external">
-        <item quantity="one">Continue to %s and allow this number</item>
-        <item quantity="few">Continue to %s and allow these numbers</item>
-        <item quantity="other">Continue to %s and allow these numbers</item>
-    </plurals>
-    <string name="about_title">About</string>
-    <string name="about_version_title">Version</string>
-    <string name="about_developer_title">Developer</string>
-    <string name="about_source_title">Source code</string>
-    <string name="about_changelog_title">Changelog</string>
-    <string name="about_contact_title">Contact</string>
-    <string name="about_license_title">License</string>
-    <string name="about_copyright_title">Copyright</string>
-    <string name="qksms_plus_description_title">Support development, unlock everything</string>
-    <string name="qksms_plus_description_summary">You can save a starving developer for just %s</string>
-    <!-- Substitutions are for price and currency. Ex: Lifetime upgrade for $1.99 USD -->
-    <string name="qksms_plus_upgrade">Lifetime upgrade for %1$s %2$s</string>
-    <!-- Substitutions are for price and currency. Ex: Unlock + donate for $4.99 USD -->
-    <string name="qksms_plus_upgrade_donate">Unlock + donate for %1$s %2$s</string>
-    <string name="qksms_plus_thanks_title">Thank you for supporting QKSMS!</string>
-    <string name="qksms_plus_thanks_summary">You now have access to all QKSMS+ features</string>
-    <string name="qksms_plus_free_title">QKSMS+ is free for F-Droid users! If you\'d like to support development, a donation would be highly appreciated.</string>
-    <string name="qksms_plus_donate">Donate via PayPal</string>
-    <string name="qksms_plus_coming_soon">Coming soon</string>
-    <string name="qksms_plus_themes_title">Premium themes</string>
-    <string name="qksms_plus_themes_summary">Unlock beautiful theme colors not available on the Material Design palette</string>
-    <string name="qksms_plus_emoji_title">Custom auto-emoji</string>
-    <string name="qksms_plus_emoji_summary">Create custom auto-emoji shortcuts</string>
-    <string name="qksms_plus_backup_title">Message backup</string>
-    <string name="qksms_plus_backup_summary">Automatically back up your messages. Never again worry about losing your history if you change phones or your phone gets lost</string>
-    <string name="qksms_plus_scheduled_title">Scheduled messages</string>
-    <string name="qksms_plus_scheduled_summary">Schedule messages to automatically be sent at a specific time and date</string>
-    <string name="qksms_plus_delayed_title">Delayed sending</string>
-    <string name="qksms_plus_delayed_summary">Wait a few seconds before sending your message</string>
-    <string name="qksms_plus_night_title">Automatic night mode</string>
-    <string name="qksms_plus_night_summary">Enable night mode based on the time of day</string>
-    <string name="qksms_plus_blacklist_title">Advanced blocking</string>
-    <string name="qksms_plus_blacklist_summary">Block messages that contain keywords or match patterns</string>
-    <string name="qksms_plus_forward_title">Auto-forward</string>
-    <string name="qksms_plus_forward_summary">Automatically forward messages from certain senders</string>
-    <string name="qksms_plus_respond_title">Auto-respond</string>
-    <string name="qksms_plus_respond_summary">Automatically respond to incoming messages with a preset response</string>
-    <string name="qksms_plus_more_title">More</string>
-    <string name="qksms_plus_more_summary">QKSMS is under active development, and your purchase will include all future QKSMS+ features!</string>
-    <string name="widget_loading">Loading&#8230;</string>
-    <string name="widget_more">View more conversations</string>
-    <string name="qkreply_menu_read">Mark read</string>
-    <string name="qkreply_menu_call">Call</string>
-    <string name="qkreply_menu_delete">Delete</string>
-    <string name="qkreply_menu_expand">Show more</string>
-    <string name="qkreply_menu_collapse">Show less</string>
-    <string name="qkreply_menu_view">Open conversation</string>
-    <string name="theme_material">Material</string>
-    <string name="theme_hex">HEX</string>
-    <string name="theme_apply">Apply</string>
-    <string-array name="notification_actions">
-        <item>None</item>
-        <item>Archive</item>
-        <item>Delete</item>
-        <item>Block</item>
-        <item>Call</item>
-        <item>Mark read</item>
-        <item>Reply</item>
-    </string-array>
-    <string name="button_yes">Yes</string>
-    <string name="button_continue">Continue</string>
-    <string name="button_cancel">Cancel</string>
-    <string name="button_delete">Delete</string>
-    <string name="button_save">Save</string>
-    <string name="button_stop">Stop</string>
-    <string name="button_more">More</string>
-    <string name="button_set">Set</string>
-    <string name="button_undo">Undo</string>
-    <string name="toast_copied">Copied</string>
-    <string name="toast_archived">Archived conversation</string>
-    <string name="toast_qksms_plus">You must unlock QKSMS+ to use this</string>
-    <plurals name="notification_new_messages">
-        <item quantity="one">New message</item>
-        <item quantity="few">%s new messages</item>
-        <item quantity="other">%s new messages</item>
-    </plurals>
-    <string name="notification_message_failed_title">Message not sent</string>
-    <string name="notification_message_failed_text">The message to %s failed to send</string>
-    <string-array name="night_modes">
-        <item>System</item>
-        <item>Disabled</item>
-        <item>Always on</item>
-        <item>Automatic</item>
-    </string-array>
-    <string-array name="notification_preview_options">
-        <item>Show name and message</item>
-        <item>Show name</item>
-        <item>Hide contents</item>
-    </string-array>
-    <string-array name="text_sizes">
-        <item>Small</item>
-        <item>Normal</item>
-        <item>Large</item>
-        <item>Larger</item>
-    </string-array>
-    <string-array name="delayed_sending_labels">
-        <item>No delay</item>
-        <item>3 seconds</item>
-        <item>5 seconds</item>
-        <item>10 seconds</item>
-    </string-array>
-    <string-array name="mms_sizes">
-        <item>Automatic</item>
-        <item>100KB</item>
-        <item>200KB</item>
-        <item>300KB</item>
-        <item>600KB</item>
-        <item>1000KB</item>
-        <item>2000KB</item>
-        <item>No compression</item>
-    </string-array>
-    <string-array name="qk_responses">
-        <item>Okay</item>
-        <item>Give me a moment</item>
-        <item>On my way</item>
-        <item>Thanks</item>
-        <item>Sounds good</item>
-        <item>What\'s up?</item>
-        <item>Agreed</item>
-        <item>No</item>
-        <item>Love you</item>
-        <item>Sorry</item>
-        <item>LOL</item>
-        <item>That\'s okay</item>
-    </string-array>
-</resources>
+<?xml version="1.0" encoding="utf-8"?>
+<!--
+  ~ Copyright (C) 2019 Moez Bhatti <moez.bhatti@gmail.com>
+  ~
+  ~ This file is part of QKSMS.
+  ~
+  ~ QKSMS is free software: you can redistribute it and/or modify
+  ~ it under the terms of the GNU General Public License as published by
+  ~ the Free Software Foundation, either version 3 of the License, or
+  ~ (at your option) any later version.
+  ~
+  ~ QKSMS is distributed in the hope that it will be useful,
+  ~ but WITHOUT ANY WARRANTY; without even the implied warranty of
+  ~ MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+  ~ GNU General Public License for more details.
+  ~
+  ~ You should have received a copy of the GNU General Public License
+  ~ along with QKSMS.  If not, see <http://www.gnu.org/licenses/>.
+  -->
+<resources>
+    <string name="shortcut_compose_long_label">New conversation</string>
+    <string name="shortcut_compose_short_label">Compose</string>
+    <string name="shortcut_compose_disabled_message">Shortcut disabled</string>
+    <string name="title_archived">Arhivate</string>
+    <string name="title_settings">Setări</string>
+    <string name="title_notification_prefs">Notificări</string>
+    <string name="title_theme">Teme</string>
+    <string name="title_conversations">Caută în inbox...</string>
+    <string name="title_compose">Compune</string>
+    <string name="setup_skip">Sari</string>
+    <string name="setup_next">Continue</string>
+    <string name="menu_add_person">Add person</string>
+    <string name="menu_call">Apel</string>
+    <string name="menu_info">Details</string>
+    <string name="menu_save">Save to gallery</string>
+    <string name="menu_share">Share</string>
+    <string name="main_drawer_open_cd">Open navigation drawer</string>
+    <string name="main_title_selected">%d selected</string>
+    <string name="main_menu_clear">Clear</string>
+    <string name="main_menu_archive">Archive</string>
+    <string name="main_menu_unarchive">Unarchive</string>
+    <string name="main_menu_delete">Delete</string>
+    <string name="main_menu_add_contact">Add to contacts</string>
+    <string name="main_menu_pin">Pin to top</string>
+    <string name="main_menu_unpin">Unpin</string>
+    <string name="main_menu_read">Mark read</string>
+    <string name="main_menu_unread">Mark unread</string>
+    <string name="main_menu_block">Block</string>
+    <string name="main_syncing">Syncing messages&#8230;</string>
+    <string name="main_sender_you">You: %s</string>
+    <string name="main_draft">Draft</string>
+    <string name="main_message_results_title">Results in messages</string>
+    <string name="main_message_results">%d messages</string>
+    <string name="inbox_empty_text">Your conversations will appear here</string>
+    <string name="inbox_search_empty_text">No results</string>
+    <string name="archived_empty_text">Your archived conversations will appear here</string>
+    <string name="main_fab_cd">Start new conversation</string>
+    <string name="main_default_sms_title">Love texting again</string>
+    <string name="main_default_sms_message">Make QKSMS your default SMS app</string>
+    <string name="main_default_sms_change">Change</string>
+    <string name="main_permission_required">Permission required</string>
+    <string name="main_permission_sms">QKSMS needs permission to send and view SMS messages</string>
+    <string name="main_permission_contacts">QKSMS needs permission to view your contacts</string>
+    <string name="main_permission_allow">Allow</string>
+    <string name="drawer_inbox">Inbox</string>
+    <string name="drawer_archived">Archived</string>
+    <string name="drawer_scheduled">Scheduled</string>
+    <string name="drawer_blocking">Blocking</string>
+    <string name="drawer_more">More</string>
+    <string name="drawer_settings">Settings</string>
+    <string name="drawer_help">Help &amp; feedback</string>
+    <string name="drawer_invite">Invite friends</string>
+    <string name="drawer_plus_banner_summary">Unlock amazing new features, and support development</string>
+    <string name="rate_title">Enjoying QKSMS?</string>
+    <string name="rate_summary">Share some love and rate us on Google Play!</string>
+    <string name="rate_okay">OKAY!</string>
+    <string name="rate_dismiss">DISMISS</string>
+    <string name="dialog_delete_title">Delete</string>
+    <plurals name="dialog_delete_message">
+        <item quantity="one">Are you sure you would like to delete this conversation?</item>
+        <item quantity="few">Are you sure you would like to delete %d conversations?</item>
+        <item quantity="other">Are you sure you would like to delete %d conversations?</item>
+    </plurals>
+    <string-array name="message_options">
+        <item>Copy text</item>
+        <item>Forward</item>
+        <item>Delete</item>
+    </string-array>
+    <string name="compose_number_picker_title">Choose a phone number</string>
+    <string name="compose_number_picker_default">%s ∙ Default</string>
+    <string name="compose_number_picker_once">Just once</string>
+    <string name="compose_number_picker_always">Always</string>
+    <string name="compose_title_selected">%d selected</string>
+    <string name="compose_subtitle_results">%1$d of %2$d results</string>
+    <string name="compose_send_group_title">Send as group message</string>
+    <string name="compose_send_group_summary">Recipients and replies will be visible to everyone</string>
+    <string name="compose_messages_empty">This is the start of your conversation. Say something nice!</string>
+    <string name="compose_vcard_label">Contact card</string>
+    <string name="compose_scheduled_for">Scheduled for</string>
+    <string name="compose_scheduled_future">Selected time must be in the future!</string>
+    <string name="compose_scheduled_plus">You must unlock QKSMS+ to use scheduled messaging</string>
+    <string name="compose_scheduled_toast">Added to scheduled messages</string>
+    <string name="compose_hint">Write a message&#8230;</string>
+    <string name="compose_menu_copy">Copy text</string>
+    <string name="compose_menu_forward">Forward</string>
+    <string name="compose_menu_delete">Delete</string>
+    <string name="compose_menu_previous">Previous</string>
+    <string name="compose_menu_next">Next</string>
+    <string name="compose_menu_clear">Clear</string>
+    <string name="compose_details_title">Message details</string>
+    <string name="compose_details_type">Type: %s</string>
+    <string name="compose_details_from">From: %s</string>
+    <string name="compose_details_to">To: %s</string>
+    <string name="compose_details_subject">Subject: %s</string>
+    <string name="compose_details_priority">Priority: %s</string>
+    <string name="compose_details_size">Size: %s</string>
+    <string name="compose_details_sent">Sent: %s</string>
+    <string name="compose_details_received">Received: %s</string>
+    <string name="compose_details_delivered">Delivered: %s</string>
+    <string name="compose_details_error_code">Error code: %d</string>
+    <string name="compose_attach_cd">Add an attachment</string>
+    <string name="compose_gallery_cd">Attach a photo</string>
+    <string name="compose_camera_cd">Take a photo</string>
+    <string name="compose_schedule_cd">Schedule message</string>
+    <string name="compose_contact_cd">Attach a contact</string>
+    <string name="compose_contact_error">Error reading contact</string>
+    <!-- Example: SIM 1 (Verizon) selected-->
+    <string name="compose_sim_changed_toast">SIM %1$d (%2$s) selected</string>
+    <string name="compose_sim_cd">%s selected, change SIM card</string>
+    <string name="compose_send_cd">Send message</string>
+    <string name="message_status_sending">Sending&#8230;</string>
+    <string name="message_status_delivered">Delivered %s</string>
+    <string name="message_status_failed">Failed to send. Tap to try again</string>
+    <string name="info_title">Details</string>
+    <string name="info_copied_address">Address copied</string>
+    <string name="info_name">Conversation title</string>
+    <string name="info_notifications">Notifications</string>
+    <string name="info_theme">Theme</string>
+    <string name="info_archive">Archive</string>
+    <string name="info_unarchive">Unarchive</string>
+    <string name="info_block">Block</string>
+    <string name="info_unblock">Unblock</string>
+    <string name="info_delete">Delete conversation</string>
+    <string name="gallery_error">Couldn\'t load media</string>
+    <string name="gallery_toast_saved">Saved to gallery</string>
+    <string name="backup_title">Backup and restore</string>
+    <string name="backup_backing_up">Backing up messages</string>
+    <string name="backup_restoring">Restoring from backup</string>
+    <string name="backup_last">Last backup</string>
+    <string name="backup_loading">Loading&#8230;</string>
+    <string name="backup_never">Never</string>
+    <string name="backup_restore_title">Restore</string>
+    <string name="backup_restore_summary">Select a backup</string>
+    <string name="backup_restore_error_plus">Please unlock QKSMS+ to use backup and restore</string>
+    <string name="backup_restore_error_backup">Backup in progress&#8230;</string>
+    <string name="backup_restore_error_restore">Restore in progress&#8230;</string>
+    <string name="backup_restore_confirm_title">Restore from backup</string>
+    <string name="backup_restore_confirm_message">Are you sure you would like to restore your messages from this backup?</string>
+    <string name="backup_restore_stop_title">Stop restore</string>
+    <string name="backup_restore_stop_message">Messages that have already been restored will remain on your device</string>
+    <string name="backup_restore_dialog_title">Backups</string>
+    <string name="backup_restore_dialog_empty">No backups found</string>
+    <plurals name="backup_message_count">
+        <item quantity="one">%d message</item>
+        <item quantity="few">%d messages</item>
+        <item quantity="other">%d messages</item>
+    </plurals>
+    <string name="backup_disclaimer">Currently, only SMS is supported by Backup and Restore. MMS support and scheduled backups will be coming soon!</string>
+    <string name="backup_now">Backup now</string>
+    <string name="backup_progress_parsing">Parsing backup&#8230;</string>
+    <string name="backup_progress_running">%d/%d messages</string>
+    <string name="backup_progress_saving">Saving backup&#8230;</string>
+    <string name="backup_progress_syncing">Syncing messages&#8230;</string>
+    <string name="backup_progress_finished">Finished!</string>
+    <string name="backup_notification_channel_name">Backup and restore</string>
+    <string name="scheduled_title">Scheduled</string>
+    <string name="scheduled_empty_description">Automatically send a message, at the exact moment you\'d like</string>
+    <string name="scheduled_empty_message_1">Hey! When was your birthday again?</string>
+    <string name="scheduled_empty_message_2">It\'s on December 23rd</string>
+    <string name="scheduled_empty_message_3">Happy birthday! Look at what a great friend I am, remembering your birthday</string>
+    <!--&#x200A; is a special character required at the end of this string to fix it's formatting in the app -->
+    <string name="scheduled_empty_message_3_timestamp">Sending on December 23rd </string>
+    <string name="scheduled_compose_cd">Schedule a message</string>
+    <string name="scheduled_options_title">Scheduled message</string>
+    <string-array name="scheduled_options">
+        <item>Send now</item>
+        <item>Copy text</item>
+        <item>Delete</item>
+    </string-array>
+    <string name="settings_category_appearance">Appearance</string>
+    <string name="settings_category_general">General</string>
+    <string name="settings_category_qkreply">QK Reply</string>
+    <string name="settings_theme_title">Theme</string>
+    <string name="settings_night_title">Night mode</string>
+    <string name="settings_black_title">Pure black night mode</string>
+    <string name="settings_night_start_title">Start time</string>
+    <string name="settings_night_end_title">End time</string>
+    <string name="settings_automatic_colors_title">Automatic contact colors</string>
+    <string name="settings_text_size_title">Font size</string>
+    <string name="settings_system_font_title">Use system font</string>
+    <string name="settings_auto_emoji_title">Automatic emoji</string>
+    <string name="settings_notifications_title">Notifications</string>
+    <string name="settings_notifications_o_summary">Tap to customize</string>
+    <string name="settings_notification_actions_title">Actions</string>
+    <string name="settings_notification_action_1">Button 1</string>
+    <string name="settings_notification_action_2">Button 2</string>
+    <string name="settings_notification_action_3">Button 3</string>
+    <string name="settings_notification_previews_title">Notification previews</string>
+    <string name="settings_notification_wake_title">Wake screen</string>
+    <string name="settings_vibration_title">Vibration</string>
+    <string name="settings_ringtone_title">Sound</string>
+    <string name="settings_ringtone_none">None</string>
+    <string name="settings_qkreply_title">QK Reply</string>
+    <string name="settings_qkreply_summary">Popup for new messages</string>
+    <string name="settings_qkreply_tap_dismiss_title">Tap to dismiss</string>
+    <string name="settings_qkreply_tap_dismiss_summary">Tap outside of the popup to close it</string>
+    <string name="settings_delayed_title">Delayed sending</string>
+    <string name="settings_swipe_actions">Swipe actions</string>
+    <string name="settings_swipe_actions_summary">Configure swipe actions for conversations</string>
+    <string name="settings_swipe_actions_right">Right swipe</string>
+    <string name="settings_swipe_actions_left">Left swipe</string>
+    <string name="settings_swipe_actions_change">CHANGE</string>
+    <string-array name="settings_swipe_actions">
+        <item>None</item>
+        <item>Archive</item>
+        <item>Delete</item>
+        <item>Block</item>
+        <item>Call</item>
+        <item>Mark read</item>
+        <item>Mark unread</item>
+    </string-array>
+    <string name="settings_delivery_title">Delivery confirmations</string>
+    <string name="settings_delivery_summary">Confirm that messages were sent successfully</string>
+    <string name="settings_signature_title">Signature</string>
+    <string name="settings_signature_summary">Add a signature to the end of your messages</string>
+    <string name="settings_unicode_title">Strip accents</string>
+    <string name="settings_unicode_summary">Remove accents from characters in outgoing SMS messages</string>
+    <string name="settings_mobile_title">Mobile numbers only</string>
+    <string name="settings_mobile_summary">When composing a message, only show mobile numbers</string>
+    <string name="settings_auto_delete">Delete old messages automatically</string>
+    <string name="settings_auto_delete_dialog_message">Messages will be deleted after the specified number of days</string>
+    <string name="settings_auto_delete_dialog_hint">Number of days</string>
+    <string name="settings_auto_delete_never">Never</string>
+    <string name="settings_auto_delete_warning">Delete old messages automatically?</string>
+    <string name="settings_auto_delete_warning_message">If you proceed, %1$d messages will be deleted now</string>
+    <plurals name="settings_auto_delete_summary">
+        <item quantity="one">After 1 day</item>
+        <item quantity="few">After %d days</item>
+        <item quantity="other">After %d days</item>
+    </plurals>
+    <string name="settings_long_as_mms_title">Send long messages as MMS</string>
+    <string name="settings_long_as_mms_summary">If your longer text messages are failing to send, or sending in the wrong order, you can send them as MMS messages instead. Additional charges may apply</string>
+    <string name="settings_mms_size_title">Auto-compress MMS attachments</string>
+    <string name="settings_sync_title">Sync messages</string>
+    <string name="settings_sync_summary">Re-sync your messages with the native Android SMS database</string>
+    <string name="settings_about_title">About QKSMS</string>
+    <string name="settings_version">Version %s</string>
+    <string name="settings_logging_enabled">Debug logging enabled</string>
+    <string name="settings_logging_disabled">Debug logging disabled</string>
+    <string name="settings_delay_duration_hint">Enter duration (seconds)</string>
+    <string name="blocking_title">Blocking</string>
+    <string name="blocking_drop_title">Drop messages</string>
+    <string name="blocking_drop_summary">Drop incoming messages from blocked senders instead of hiding them</string>
+    <string name="blocking_conversations">Blocked conversations</string>
+    <string name="blocking_manager_title">Blocking Manager</string>
+    <string name="blocking_manager_qksms_title">QKSMS</string>
+    <string name="blocking_manager_qksms_summary">Built-in blocking functionality in QKSMS</string>
+    <string name="blocking_manager_call_control_summary">Automatically filter your calls and messages in one convenient place! Community IQ™ allows you to prevent unwanted messages from community known spammers</string>
+    <string name="blocking_manager_sia_summary">Automatically filter messages from unsolicited numbers by using the \"Should I Answer\" app</string>
+    <string name="blocking_manager_copy_title">Copy blocked numbers</string>
+    <string name="blocking_manager_copy_summary">Continue to %s and copy over your existing blocked numbers</string>
+    <string name="blocked_numbers_title">Blocked numbers</string>
+    <string name="blocked_numbers_empty">Your blocked numbers will appear here</string>
+    <string name="blocked_numbers_add_cd">Block a new number</string>
+    <string name="blocked_numbers_dialog_title">Block texts from</string>
+    <string name="blocked_numbers_dialog_hint">Phone number</string>
+    <string name="blocked_numbers_dialog_block">Block</string>
+    <string name="blocked_messages_title">Blocked messages</string>
+    <string name="blocked_messages_empty">Your blocked messages will appear here</string>
+    <string name="blocking_block_title">Block</string>
+    <string name="blocking_unblock_title">Unblock</string>
+    <plurals name="blocking_block_external">
+        <item quantity="one">Continue to %s and block this number</item>
+        <item quantity="few">Continue to %s and block these numbers</item>
+        <item quantity="other">Continue to %s and block these numbers</item>
+    </plurals>
+    <plurals name="blocking_unblock_external">
+        <item quantity="one">Continue to %s and allow this number</item>
+        <item quantity="few">Continue to %s and allow these numbers</item>
+        <item quantity="other">Continue to %s and allow these numbers</item>
+    </plurals>
+    <string name="about_title">About</string>
+    <string name="about_version_title">Version</string>
+    <string name="about_developer_title">Developer</string>
+    <string name="about_source_title">Source code</string>
+    <string name="about_changelog_title">Changelog</string>
+    <string name="about_contact_title">Contact</string>
+    <string name="about_license_title">License</string>
+    <string name="about_copyright_title">Copyright</string>
+    <string name="qksms_plus_description_title">Support development, unlock everything</string>
+    <string name="qksms_plus_description_summary">You can save a starving developer for just %s</string>
+    <!-- Substitutions are for price and currency. Ex: Lifetime upgrade for $1.99 USD -->
+    <string name="qksms_plus_upgrade">Lifetime upgrade for %1$s %2$s</string>
+    <!-- Substitutions are for price and currency. Ex: Unlock + donate for $4.99 USD -->
+    <string name="qksms_plus_upgrade_donate">Unlock + donate for %1$s %2$s</string>
+    <string name="qksms_plus_thanks_title">Thank you for supporting QKSMS!</string>
+    <string name="qksms_plus_thanks_summary">You now have access to all QKSMS+ features</string>
+    <string name="qksms_plus_free_title">QKSMS+ is free for F-Droid users! If you\'d like to support development, a donation would be highly appreciated.</string>
+    <string name="qksms_plus_donate">Donate via PayPal</string>
+    <string name="qksms_plus_coming_soon">Coming soon</string>
+    <string name="qksms_plus_themes_title">Premium themes</string>
+    <string name="qksms_plus_themes_summary">Unlock beautiful theme colors not available on the Material Design palette</string>
+    <string name="qksms_plus_emoji_title">Custom auto-emoji</string>
+    <string name="qksms_plus_emoji_summary">Create custom auto-emoji shortcuts</string>
+    <string name="qksms_plus_backup_title">Message backup</string>
+    <string name="qksms_plus_backup_summary">Automatically back up your messages. Never again worry about losing your history if you change phones or your phone gets lost</string>
+    <string name="qksms_plus_scheduled_title">Scheduled messages</string>
+    <string name="qksms_plus_scheduled_summary">Schedule messages to automatically be sent at a specific time and date</string>
+    <string name="qksms_plus_delayed_title">Delayed sending</string>
+    <string name="qksms_plus_delayed_summary">Wait a few seconds before sending your message</string>
+    <string name="qksms_plus_night_title">Automatic night mode</string>
+    <string name="qksms_plus_night_summary">Enable night mode based on the time of day</string>
+    <string name="qksms_plus_blacklist_title">Advanced blocking</string>
+    <string name="qksms_plus_blacklist_summary">Block messages that contain keywords or match patterns</string>
+    <string name="qksms_plus_forward_title">Auto-forward</string>
+    <string name="qksms_plus_forward_summary">Automatically forward messages from certain senders</string>
+    <string name="qksms_plus_respond_title">Auto-respond</string>
+    <string name="qksms_plus_respond_summary">Automatically respond to incoming messages with a preset response</string>
+    <string name="qksms_plus_more_title">More</string>
+    <string name="qksms_plus_more_summary">QKSMS is under active development, and your purchase will include all future QKSMS+ features!</string>
+    <string name="widget_loading">Loading&#8230;</string>
+    <string name="widget_more">View more conversations</string>
+    <string name="qkreply_menu_read">Mark read</string>
+    <string name="qkreply_menu_call">Call</string>
+    <string name="qkreply_menu_delete">Delete</string>
+    <string name="qkreply_menu_expand">Show more</string>
+    <string name="qkreply_menu_collapse">Show less</string>
+    <string name="qkreply_menu_view">Open conversation</string>
+    <string name="theme_material">Material</string>
+    <string name="theme_hex">HEX</string>
+    <string name="theme_apply">Apply</string>
+    <string-array name="notification_actions">
+        <item>None</item>
+        <item>Archive</item>
+        <item>Delete</item>
+        <item>Block</item>
+        <item>Call</item>
+        <item>Mark read</item>
+        <item>Reply</item>
+    </string-array>
+    <string name="button_yes">Yes</string>
+    <string name="button_continue">Continue</string>
+    <string name="button_cancel">Cancel</string>
+    <string name="button_delete">Delete</string>
+    <string name="button_save">Save</string>
+    <string name="button_stop">Stop</string>
+    <string name="button_more">More</string>
+    <string name="button_set">Set</string>
+    <string name="button_undo">Undo</string>
+    <string name="toast_copied">Copied</string>
+    <string name="toast_archived">Archived conversation</string>
+    <string name="toast_qksms_plus">You must unlock QKSMS+ to use this</string>
+    <plurals name="notification_new_messages">
+        <item quantity="one">New message</item>
+        <item quantity="few">%s new messages</item>
+        <item quantity="other">%s new messages</item>
+    </plurals>
+    <string name="notification_message_failed_title">Message not sent</string>
+    <string name="notification_message_failed_text">The message to %s failed to send</string>
+    <string-array name="night_modes">
+        <item>System</item>
+        <item>Disabled</item>
+        <item>Always on</item>
+        <item>Automatic</item>
+    </string-array>
+    <string-array name="notification_preview_options">
+        <item>Show name and message</item>
+        <item>Show name</item>
+        <item>Hide contents</item>
+    </string-array>
+    <string-array name="text_sizes">
+        <item>Small</item>
+        <item>Normal</item>
+        <item>Large</item>
+        <item>Larger</item>
+    </string-array>
+    <string-array name="delayed_sending_labels">
+        <item>No delay</item>
+        <item>3 seconds</item>
+        <item>5 seconds</item>
+        <item>10 seconds</item>
+    </string-array>
+    <string-array name="mms_sizes">
+        <item>Automatic</item>
+        <item>100KB</item>
+        <item>200KB</item>
+        <item>300KB</item>
+        <item>600KB</item>
+        <item>1000KB</item>
+        <item>2000KB</item>
+        <item>No compression</item>
+    </string-array>
+    <string-array name="qk_responses">
+        <item>Okay</item>
+        <item>Give me a moment</item>
+        <item>On my way</item>
+        <item>Thanks</item>
+        <item>Sounds good</item>
+        <item>What\'s up?</item>
+        <item>Agreed</item>
+        <item>No</item>
+        <item>Love you</item>
+        <item>Sorry</item>
+        <item>LOL</item>
+        <item>That\'s okay</item>
+    </string-array>
+</resources>
diff --git a/presentation/src/main/res/values-ru/strings.xml b/presentation/src/main/res/values-ru/strings.xml
index 70f8a15ff..c9df71fd9 100644
--- a/presentation/src/main/res/values-ru/strings.xml
+++ b/presentation/src/main/res/values-ru/strings.xml
@@ -1,423 +1,423 @@
-<?xml version="1.0" encoding="utf-8"?>
-<!--
-  ~ Copyright (C) 2019 Moez Bhatti <moez.bhatti@gmail.com>
-  ~
-  ~ This file is part of QKSMS.
-  ~
-  ~ QKSMS is free software: you can redistribute it and/or modify
-  ~ it under the terms of the GNU General Public License as published by
-  ~ the Free Software Foundation, either version 3 of the License, or
-  ~ (at your option) any later version.
-  ~
-  ~ QKSMS is distributed in the hope that it will be useful,
-  ~ but WITHOUT ANY WARRANTY; without even the implied warranty of
-  ~ MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
-  ~ GNU General Public License for more details.
-  ~
-  ~ You should have received a copy of the GNU General Public License
-  ~ along with QKSMS.  If not, see <http://www.gnu.org/licenses/>.
-  -->
-<resources>
-    <string name="shortcut_compose_long_label">Новая беседа</string>
-    <string name="shortcut_compose_short_label">Написать</string>
-    <string name="shortcut_compose_disabled_message">Ярлык отключён</string>
-    <string name="title_archived">Архив</string>
-    <string name="title_settings">Настройки</string>
-    <string name="title_notification_prefs">Уведомления</string>
-    <string name="title_theme">Тема</string>
-    <string name="title_conversations">Поиск во входящих&#8230;</string>
-    <string name="title_compose">Написать</string>
-    <string name="setup_skip">Пропустить</string>
-    <string name="setup_next">Продолжить</string>
-    <string name="menu_add_person">Добавить контакт</string>
-    <string name="menu_call">Позвонить</string>
-    <string name="menu_info">Подробности</string>
-    <string name="menu_save">Сохранить в галерее</string>
-    <string name="menu_share">Поделиться</string>
-    <string name="main_drawer_open_cd">Открыть боковое меню</string>
-    <string name="main_title_selected">%d выбрано</string>
-    <string name="main_menu_clear">Очистить</string>
-    <string name="main_menu_archive">Архивировать</string>
-    <string name="main_menu_unarchive">Разархивировать</string>
-    <string name="main_menu_delete">Удалить</string>
-    <string name="main_menu_add_contact">Добавить в контакты</string>
-    <string name="main_menu_pin">Закрепить наверху</string>
-    <string name="main_menu_unpin">Открепить</string>
-    <string name="main_menu_read">Пометить прочитанным</string>
-    <string name="main_menu_unread">Пометить непрочитанным</string>
-    <string name="main_menu_block">Блокировать</string>
-    <string name="main_syncing">Синхронизация сообщений&#8230;</string>
-    <string name="main_sender_you">Вы: %s</string>
-    <string name="main_draft">Черновик</string>
-    <string name="main_message_results_title">Результаты в сообщениях</string>
-    <string name="main_message_results">%d сообщений</string>
-    <string name="inbox_empty_text">Беседы будут появляться здесь</string>
-    <string name="inbox_search_empty_text">Нет результатов</string>
-    <string name="archived_empty_text">Архивированные беседы будут появляться здесь</string>
-    <string name="main_fab_cd">Начать новую беседу</string>
-    <string name="main_default_sms_title">Снова полюбите писать</string>
-    <string name="main_default_sms_message">Сделать QKSMS приложением SMS по умолчанию</string>
-    <string name="main_default_sms_change">Изменить</string>
-    <string name="main_permission_required">Требуется разрешение</string>
-    <string name="main_permission_sms">QKSMS необходимо разрешение для отправки и просмотра SMS-сообщений</string>
-    <string name="main_permission_contacts">QKSMS необходимо разрешение для просмотра контактов</string>
-    <string name="main_permission_allow">Разрешить</string>
-    <string name="drawer_inbox">Входящие</string>
-    <string name="drawer_archived">Архив</string>
-    <string name="drawer_scheduled">Планировщик</string>
-    <string name="drawer_blocking">Блокировка</string>
-    <string name="drawer_more">Ещё</string>
-    <string name="drawer_settings">Настройки</string>
-    <string name="drawer_help">Помощь и обратная связь</string>
-    <string name="drawer_invite">Пригласить друзей</string>
-    <string name="drawer_plus_banner_summary">Разблокировать новые удивительные функции и поддержать разработку</string>
-    <string name="rate_title">Нравится QKSMS?</string>
-    <string name="rate_summary">Поделитесь любовью и оцените нас в Google Play!</string>
-    <string name="rate_okay">OK!</string>
-    <string name="rate_dismiss">ОТКЛОНИТЬ</string>
-    <string name="dialog_delete_title">Удалить</string>
-    <plurals name="dialog_delete_message">
-        <item quantity="one">Уверены, что хотите удалить эту беседу?</item>
-        <item quantity="few">Уверены, что хотите удалить %d беседы?</item>
-        <item quantity="many">Уверены, что хотите удалить %d бесед?</item>
-        <item quantity="other">Уверены, что хотите удалить %d бесед?</item>
-    </plurals>
-    <string-array name="message_options">
-        <item>Скопировать текст</item>
-        <item>Переслать</item>
-        <item>Удалить</item>
-    </string-array>
-    <string name="compose_number_picker_title">Выбор номера телефона</string>
-    <string name="compose_number_picker_default">%s ∙ по умолчанию</string>
-    <string name="compose_number_picker_once">Один раз</string>
-    <string name="compose_number_picker_always">Всегда</string>
-    <string name="compose_title_selected">%d выбран(о)</string>
-    <string name="compose_subtitle_results">%1$d из %2$d результатов</string>
-    <string name="compose_send_group_title">Отправить как групповое сообщение</string>
-    <string name="compose_send_group_summary">Получатели и ответы будут видны всем</string>
-    <string name="compose_messages_empty">Это начало вашей беседы. Скажите что-нибудь приятное!</string>
-    <string name="compose_vcard_label">Карточка контакта</string>
-    <string name="compose_scheduled_for">Запланировано на</string>
-    <string name="compose_scheduled_future">Выбранное время должно быть в будущем!</string>
-    <string name="compose_scheduled_plus">Вы должны разблокировать QKSMS+, чтобы использовать запланированные сообщения</string>
-    <string name="compose_scheduled_toast">Добавлено в планировщик сообщений</string>
-    <string name="compose_hint">Написать сообщение&#8230;</string>
-    <string name="compose_menu_copy">Скопировать текст</string>
-    <string name="compose_menu_forward">Переслать</string>
-    <string name="compose_menu_delete">Удалить</string>
-    <string name="compose_menu_previous">Назад</string>
-    <string name="compose_menu_next">Вперёд</string>
-    <string name="compose_menu_clear">Очистить</string>
-    <string name="compose_details_title">Подробности сообщения</string>
-    <string name="compose_details_type">Тип: %s</string>
-    <string name="compose_details_from">От: %s</string>
-    <string name="compose_details_to">Кому: %s</string>
-    <string name="compose_details_subject">Тема: %s</string>
-    <string name="compose_details_priority">Приоритет: %s</string>
-    <string name="compose_details_size">Размер: %s</string>
-    <string name="compose_details_sent">Отправлено: %s</string>
-    <string name="compose_details_received">Получено: %s</string>
-    <string name="compose_details_delivered">Доставлено: %s</string>
-    <string name="compose_details_error_code">Код ошибки: %d</string>
-    <string name="compose_attach_cd">Добавить вложение</string>
-    <string name="compose_gallery_cd">Прикрепить фото</string>
-    <string name="compose_camera_cd">Сделать снимок</string>
-    <string name="compose_schedule_cd">Запланировать сообщение</string>
-    <string name="compose_contact_cd">Прикрепить контакт</string>
-    <string name="compose_contact_error">Ошибка чтения контакта</string>
-    <!-- Example: SIM 1 (Verizon) selected-->
-    <string name="compose_sim_changed_toast">Выбрана SIM-карта %1$d (%2$s)</string>
-    <string name="compose_sim_cd">Выбрано %s, сменить SIM-карту</string>
-    <string name="compose_send_cd">Отправить сообщение</string>
-    <string name="message_status_sending">Отправка&#8230;</string>
-    <string name="message_status_delivered">Доставлено %s</string>
-    <string name="message_status_failed">Не удалось отправить. Нажмите, чтобы попробовать ещё раз.</string>
-    <string name="info_title">Подробности</string>
-    <string name="info_copied_address">Адрес скопирован</string>
-    <string name="info_name">Название разговора</string>
-    <string name="info_notifications">Уведомления</string>
-    <string name="info_theme">Тема</string>
-    <string name="info_archive">Архивировать</string>
-    <string name="info_unarchive">Разархивировать</string>
-    <string name="info_block">Заблокировать</string>
-    <string name="info_unblock">Разблокировать</string>
-    <string name="info_delete">Удалить беседу</string>
-    <string name="gallery_error">Не удалось загрузить медиа</string>
-    <string name="gallery_toast_saved">Сохранено в галерее</string>
-    <string name="backup_title">Резервное копирование</string>
-    <string name="backup_backing_up">Резервное копирование сообщений</string>
-    <string name="backup_restoring">Восстановление из резервной копии</string>
-    <string name="backup_last">Последнее резервирование</string>
-    <string name="backup_loading">Загрузка&#8230;</string>
-    <string name="backup_never">Никогда</string>
-    <string name="backup_restore_title">Восстановление</string>
-    <string name="backup_restore_summary">Выберите резервную копию</string>
-    <string name="backup_restore_error_plus">Пожалуйста, разблокируйте QKSMS+ для использования резервного копирования и восстановления</string>
-    <string name="backup_restore_error_backup">Выполняется резервное копирование&#8230;</string>
-    <string name="backup_restore_error_restore">Выполняется восстановление&#8230;</string>
-    <string name="backup_restore_confirm_title">Восстановление из резервной копии</string>
-    <string name="backup_restore_confirm_message">Вы уверены, что хотите восстановить свои сообщения из этой резервной копии?</string>
-    <string name="backup_restore_stop_title">Остановить восстановление</string>
-    <string name="backup_restore_stop_message">Сообщения, которые уже были восстановлены останутся на вашем устройстве</string>
-    <string name="backup_restore_dialog_title">Резервирование</string>
-    <string name="backup_restore_dialog_empty">Резервные копии не найдены</string>
-    <plurals name="backup_message_count">
-        <item quantity="one">%d сообщение</item>
-        <item quantity="few">%d сообщения</item>
-        <item quantity="many">%d сообщений</item>
-        <item quantity="other">%d сообщений</item>
-    </plurals>
-    <string name="backup_disclaimer">В настоящее время поддерживается резервное копирование и восстановление только SMS. Поддержка MMS и регулярные резервные копии появятся в ближайшее время!</string>
-    <string name="backup_now">Резервировать</string>
-    <string name="backup_progress_parsing">Анализ резервной копии&#8230;</string>
-    <string name="backup_progress_running">%d/%d сообщений</string>
-    <string name="backup_progress_saving">Сохранение резервной копии&#8230;</string>
-    <string name="backup_progress_syncing">Синхронизация сообщений&#8230;</string>
-    <string name="backup_progress_finished">Завершено!</string>
-    <string name="backup_notification_channel_name">Резервирование</string>
-    <string name="scheduled_title">Планировщик</string>
-    <string name="scheduled_empty_description">Автоматически отправить сообщение когда пожелаете</string>
-    <string name="scheduled_empty_message_1">Привет! Когда у вас был день рождения?</string>
-    <string name="scheduled_empty_message_2">Он был 23 декабря</string>
-    <string name="scheduled_empty_message_3">С днём рождения! Посмотрите, какой я отличный друг, помнящий о вашем дне рождения!</string>
-    <!--&#x200A; is a special character required at the end of this string to fix it's formatting in the app -->
-    <string name="scheduled_empty_message_3_timestamp">Отправка 23 декабря </string>
-    <string name="scheduled_compose_cd">Запланировать сообщение</string>
-    <string name="scheduled_options_title">Запланированное сообщение</string>
-    <string-array name="scheduled_options">
-        <item>Отправить сейчас</item>
-        <item>Копировать текст</item>
-        <item>Удалить</item>
-    </string-array>
-    <string name="settings_category_appearance">Внешний вид</string>
-    <string name="settings_category_general">Общее</string>
-    <string name="settings_category_qkreply">QK-ответ</string>
-    <string name="settings_theme_title">Тема</string>
-    <string name="settings_night_title">Ночной режим</string>
-    <string name="settings_black_title">Полностью чёрный ночной режим</string>
-    <string name="settings_night_start_title">Время начала</string>
-    <string name="settings_night_end_title">Время окончания</string>
-    <string name="settings_automatic_colors_title">Автоматические цвета контактов</string>
-    <string name="settings_text_size_title">Размер шрифта</string>
-    <string name="settings_system_font_title">Использовать системный шрифт</string>
-    <string name="settings_auto_emoji_title">Автоматические emoji</string>
-    <string name="settings_notifications_title">Уведомления</string>
-    <string name="settings_notifications_o_summary">Нажмите для настройки</string>
-    <string name="settings_notification_actions_title">Действия</string>
-    <string name="settings_notification_action_1">Кнопка 1</string>
-    <string name="settings_notification_action_2">Кнопка 2</string>
-    <string name="settings_notification_action_3">Кнопка 3</string>
-    <string name="settings_notification_previews_title">Предпросмотр уведомлений</string>
-    <string name="settings_notification_wake_title">Экран блокировки</string>
-    <string name="settings_vibration_title">Вибросигнал</string>
-    <string name="settings_ringtone_title">Звук</string>
-    <string name="settings_ringtone_none">Нет</string>
-    <string name="settings_qkreply_title">QK-ответ</string>
-    <string name="settings_qkreply_summary">Всплывающее окно для новых сообщений</string>
-    <string name="settings_qkreply_tap_dismiss_title">Нажмите, чтобы отклонить</string>
-    <string name="settings_qkreply_tap_dismiss_summary">Нажмите за пределами всплывающего окна, чтобы закрыть его</string>
-    <string name="settings_delayed_title">Задержка перед отправкой</string>
-    <string name="settings_swipe_actions">Действия жестами</string>
-    <string name="settings_swipe_actions_summary">Настройка действий жестами для бесед</string>
-    <string name="settings_swipe_actions_right">Жест вправо</string>
-    <string name="settings_swipe_actions_left">Жест влево</string>
-    <string name="settings_swipe_actions_change">ИЗМЕНИТЬ</string>
-    <string-array name="settings_swipe_actions">
-        <item>Нет</item>
-        <item>Архивировать</item>
-        <item>Удалить</item>
-        <item>Блокировать</item>
-        <item>Позвонить</item>
-        <item>Пометить прочитанным</item>
-        <item>Пометить непрочитанным</item>
-    </string-array>
-    <string name="settings_delivery_title">Отчёты о доставке</string>
-    <string name="settings_delivery_summary">Подтверждение успешной отправки сообщений</string>
-    <string name="settings_signature_title">Подпись</string>
-    <string name="settings_signature_summary">Добавлять подпись в конец ваших сообщений</string>
-    <string name="settings_unicode_title">Удалять акценты</string>
-    <string name="settings_unicode_summary">Удаление акцентов с символов в исходящих SMS-сообщениях</string>
-    <string name="settings_mobile_title">Только мобильные номера</string>
-    <string name="settings_mobile_summary">При составлении сообщения показывать только мобильные номера</string>
-    <string name="settings_auto_delete">Удалять старые сообщения автоматически</string>
-    <string name="settings_auto_delete_dialog_message">Сообщения будут удалены после указанного количества дней</string>
-    <string name="settings_auto_delete_dialog_hint">Количество дней</string>
-    <string name="settings_auto_delete_never">Никогда</string>
-    <string name="settings_auto_delete_warning">Удалить старые сообщения автоматически?</string>
-    <string name="settings_auto_delete_warning_message">Если продолжить, будет удалено сообщений: %1$d</string>
-    <plurals name="settings_auto_delete_summary">
-        <item quantity="one">Через день</item>
-        <item quantity="few">Через %d дня</item>
-        <item quantity="many">Через %d дней</item>
-        <item quantity="other">Через %d дней</item>
-    </plurals>
-    <string name="settings_long_as_mms_title">Отправлять длинные сообщения как MMS</string>
-    <string name="settings_long_as_mms_summary">Если не удаётся отправить длинные текстовые сообщения или они отправляются в неправильном порядке, вы можете отправить их в виде MMS. Может взиматься дополнительная плата.</string>
-    <string name="settings_mms_size_title">Автоматически сжимать вложения MMS</string>
-    <string name="settings_sync_title">Синхронизация сообщений</string>
-    <string name="settings_sync_summary">Принудительная синхронизация сообщений с собственной базой данных SMS Android</string>
-    <string name="settings_about_title">О QKSMS</string>
-    <string name="settings_version">Версия %s</string>
-    <string name="settings_logging_enabled">Ведение журнала отладки включено</string>
-    <string name="settings_logging_disabled">Ведение журнала отладки отключено</string>
-    <string name="settings_delay_duration_hint">Введите продолжительность (в секундах)</string>
-    <string name="blocking_title">Блокировка</string>
-    <string name="blocking_drop_title">Удалять сообщения</string>
-    <string name="blocking_drop_summary">Удалять входящие сообщения от заблокированных отправителей, а не скрывать их</string>
-    <string name="blocking_conversations">Заблокированные беседы</string>
-    <string name="blocking_manager_title">Управление блокировкой</string>
-    <string name="blocking_manager_qksms_title">QKSMS</string>
-    <string name="blocking_manager_qksms_summary">Встроенная функция блокировки QKSMS</string>
-    <string name="blocking_manager_call_control_summary">Автоматическая фильтрация звонков и сообщений в одном удобном месте! Community IQ™ позволяет предотвратить получение нежелательных сообщений от известных сообществу спаммеров</string>
-    <string name="blocking_manager_sia_summary">Автоматически фильтровать сообщения от нежелательных номеров, используя приложение «Should I Answer»</string>
-    <string name="blocking_manager_copy_title">Скопировать заблокированные номера</string>
-    <string name="blocking_manager_copy_summary">Продолжить с %s и записать их вместо существующих заблокированных номеров</string>
-    <string name="blocked_numbers_title">Заблокированные номера</string>
-    <string name="blocked_numbers_empty">Заблокированные номера будут появляться здесь</string>
-    <string name="blocked_numbers_add_cd">Блокировать новый номер</string>
-    <string name="blocked_numbers_dialog_title">Заблокировать отправителя</string>
-    <string name="blocked_numbers_dialog_hint">Номер телефона</string>
-    <string name="blocked_numbers_dialog_block">Блокировать</string>
-    <string name="blocked_messages_title">Заблокированные сообщения</string>
-    <string name="blocked_messages_empty">Заблокированные сообщения будут появляться здесь</string>
-    <string name="blocking_block_title">Блокировать</string>
-    <string name="blocking_unblock_title">Разблокировать</string>
-    <plurals name="blocking_block_external">
-        <item quantity="one">Продолжить с %s и заблокировать этот номер</item>
-        <item quantity="few">Продолжить с %s и заблокировать эти номера</item>
-        <item quantity="many">Продолжить с %s и заблокировать эти номера</item>
-        <item quantity="other">Продолжить с %s и заблокировать эти номера</item>
-    </plurals>
-    <plurals name="blocking_unblock_external">
-        <item quantity="one">Продолжить с %s и разрешить этот номер</item>
-        <item quantity="few">Продолжить с %s и разрешить эти номера</item>
-        <item quantity="many">Продолжить с %s и разрешить эти номера</item>
-        <item quantity="other">Продолжить с %s и разрешить эти номера</item>
-    </plurals>
-    <string name="about_title">О приложении</string>
-    <string name="about_version_title">Версия</string>
-    <string name="about_developer_title">Разработчик</string>
-    <string name="about_source_title">Исходный код</string>
-    <string name="about_changelog_title">История изменений</string>
-    <string name="about_contact_title">Контакт</string>
-    <string name="about_license_title">Лицензия</string>
-    <string name="about_copyright_title">Авторское право</string>
-    <string name="qksms_plus_description_title">Поддержать развитие, разблокировать всё</string>
-    <string name="qksms_plus_description_summary">Вы можете спасти голодающего разработчика всего за %s</string>
-    <!-- Substitutions are for price and currency. Ex: Lifetime upgrade for $1.99 USD -->
-    <string name="qksms_plus_upgrade">Пожизненное обновление за %1$s %2$s</string>
-    <!-- Substitutions are for price and currency. Ex: Unlock + donate for $4.99 USD -->
-    <string name="qksms_plus_upgrade_donate">Разблокировать + пожертвовать %1$s %2$s</string>
-    <string name="qksms_plus_thanks_title">Спасибо за поддержку QKSMS!</string>
-    <string name="qksms_plus_thanks_summary">Теперь у вас есть доступ ко всем функциям QKSMS+</string>
-    <string name="qksms_plus_free_title">QKSMS+ является бесплатным для пользователей F-Droid! Если вы хотите поддержать развитие приложения, сделайте пожертвование.</string>
-    <string name="qksms_plus_donate">Пожертвовать через PayPal</string>
-    <string name="qksms_plus_coming_soon">Скоро</string>
-    <string name="qksms_plus_themes_title">Премиальные темы</string>
-    <string name="qksms_plus_themes_summary">Разблокируйте красивые цвета темы, недоступные в палитре Material Design</string>
-    <string name="qksms_plus_emoji_title">Пользовательские авто-emoji</string>
-    <string name="qksms_plus_emoji_summary">Создайте ярлык пользовательских авто-emoji</string>
-    <string name="qksms_plus_backup_title">Резервирование сообщений</string>
-    <string name="qksms_plus_backup_summary">Автоматически создавайте резервные копии сообщений. Не беспокойтесь о потере истории, если вы поменяете или потеряете телефон</string>
-    <string name="qksms_plus_scheduled_title">Запланированные сообщения</string>
-    <string name="qksms_plus_scheduled_summary">Запланированные сообщения для автоматической отправки в определённое время и дату</string>
-    <string name="qksms_plus_delayed_title">Отложенная отправка</string>
-    <string name="qksms_plus_delayed_summary">Выжидание несколько секунд перед отправкой сообщения</string>
-    <string name="qksms_plus_night_title">Автоматический ночной режим</string>
-    <string name="qksms_plus_night_summary">Включать ночной режим, основываясь на времени суток</string>
-    <string name="qksms_plus_blacklist_title">Расширенная блокировка</string>
-    <string name="qksms_plus_blacklist_summary">Блокировать сообщения, содержащие ключевые слова или соответствующие шаблонам</string>
-    <string name="qksms_plus_forward_title">Автоматическая пересылка</string>
-    <string name="qksms_plus_forward_summary">Автоматическая пересылка сообщений от определённых отправителей</string>
-    <string name="qksms_plus_respond_title">Автоматический ответ</string>
-    <string name="qksms_plus_respond_summary">Автоматически отвечать на входящие сообщения предустановленным ответом</string>
-    <string name="qksms_plus_more_title">Ещё</string>
-    <string name="qksms_plus_more_summary">QKSMS находится в активной разработке и ваша покупка будет включать в себя все функции QKSMS+ в будущем!</string>
-    <string name="widget_loading">Загрузка&#8230;</string>
-    <string name="widget_more">Посмотреть больше бесед</string>
-    <string name="qkreply_menu_read">Прочитано</string>
-    <string name="qkreply_menu_call">Позвонить</string>
-    <string name="qkreply_menu_delete">Удалить</string>
-    <string name="qkreply_menu_expand">Показать ещё</string>
-    <string name="qkreply_menu_collapse">Показать меньше</string>
-    <string name="qkreply_menu_view">Открыть беседу</string>
-    <string name="theme_material">Material</string>
-    <string name="theme_hex">HEX</string>
-    <string name="theme_apply">Применить</string>
-    <string-array name="notification_actions">
-        <item>Нет</item>
-        <item>В архив</item>
-        <item>Удалить</item>
-        <item>Заблокировать</item>
-        <item>Позвонить</item>
-        <item>Прочитано</item>
-        <item>Ответить</item>
-    </string-array>
-    <string name="button_yes">Да</string>
-    <string name="button_continue">Продолжить</string>
-    <string name="button_cancel">Отмена</string>
-    <string name="button_delete">Удалить</string>
-    <string name="button_save">Сохранить</string>
-    <string name="button_stop">Остановить</string>
-    <string name="button_more">Ещё</string>
-    <string name="button_set">Задать</string>
-    <string name="button_undo">Отмена</string>
-    <string name="toast_copied">Скопировано</string>
-    <string name="toast_archived">Архивированная беседа</string>
-    <string name="toast_qksms_plus">Вы должны разблокировать QKSMS+, чтобы использовать</string>
-    <plurals name="notification_new_messages">
-        <item quantity="one">Новое сообщение</item>
-        <item quantity="few">%s новых сообщения</item>
-        <item quantity="many">%s новых сообщений</item>
-        <item quantity="other">%s новых сообщений</item>
-    </plurals>
-    <string name="notification_message_failed_title">Сообщение не отправлено</string>
-    <string name="notification_message_failed_text">Не удалось отправить сообщение для %s</string>
-    <string-array name="night_modes">
-        <item>Как в системе</item>
-        <item>Отключено</item>
-        <item>Всегда включено</item>
-        <item>Автоматически</item>
-    </string-array>
-    <string-array name="notification_preview_options">
-        <item>Показать имя и сообщение</item>
-        <item>Показать имя</item>
-        <item>Скрыть содержание</item>
-    </string-array>
-    <string-array name="text_sizes">
-        <item>Маленький</item>
-        <item>Обычный</item>
-        <item>Крупный</item>
-        <item>Большой</item>
-    </string-array>
-    <string-array name="delayed_sending_labels">
-        <item>Без задержки</item>
-        <item>3 секунды</item>
-        <item>5 секунд</item>
-        <item>10 секунд</item>
-    </string-array>
-    <string-array name="mms_sizes">
-        <item>Автоматически</item>
-        <item>100 Кб</item>
-        <item>200 Кб</item>
-        <item>300 Кб</item>
-        <item>600 Кб</item>
-        <item>1000 Кб</item>
-        <item>2000 Кб</item>
-        <item>Без сжатия</item>
-    </string-array>
-    <string-array name="qk_responses">
-        <item>Хорошо</item>
-        <item>Дайте мне минуту</item>
-        <item>Мне по пути</item>
-        <item>Спасибо</item>
-        <item>Звучит заманчиво</item>
-        <item>Что случилось?</item>
-        <item>Согласен</item>
-        <item>Нет</item>
-        <item>Люблю тебя</item>
-        <item>Извините</item>
-        <item>LOL</item>
-        <item>Это нормально</item>
-    </string-array>
-</resources>
+<?xml version="1.0" encoding="utf-8"?>
+<!--
+  ~ Copyright (C) 2019 Moez Bhatti <moez.bhatti@gmail.com>
+  ~
+  ~ This file is part of QKSMS.
+  ~
+  ~ QKSMS is free software: you can redistribute it and/or modify
+  ~ it under the terms of the GNU General Public License as published by
+  ~ the Free Software Foundation, either version 3 of the License, or
+  ~ (at your option) any later version.
+  ~
+  ~ QKSMS is distributed in the hope that it will be useful,
+  ~ but WITHOUT ANY WARRANTY; without even the implied warranty of
+  ~ MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+  ~ GNU General Public License for more details.
+  ~
+  ~ You should have received a copy of the GNU General Public License
+  ~ along with QKSMS.  If not, see <http://www.gnu.org/licenses/>.
+  -->
+<resources>
+    <string name="shortcut_compose_long_label">Новая беседа</string>
+    <string name="shortcut_compose_short_label">Написать</string>
+    <string name="shortcut_compose_disabled_message">Ярлык отключён</string>
+    <string name="title_archived">Архив</string>
+    <string name="title_settings">Настройки</string>
+    <string name="title_notification_prefs">Уведомления</string>
+    <string name="title_theme">Тема</string>
+    <string name="title_conversations">Поиск во входящих&#8230;</string>
+    <string name="title_compose">Написать</string>
+    <string name="setup_skip">Пропустить</string>
+    <string name="setup_next">Продолжить</string>
+    <string name="menu_add_person">Добавить контакт</string>
+    <string name="menu_call">Позвонить</string>
+    <string name="menu_info">Подробности</string>
+    <string name="menu_save">Сохранить в галерее</string>
+    <string name="menu_share">Поделиться</string>
+    <string name="main_drawer_open_cd">Открыть боковое меню</string>
+    <string name="main_title_selected">%d выбрано</string>
+    <string name="main_menu_clear">Очистить</string>
+    <string name="main_menu_archive">Архивировать</string>
+    <string name="main_menu_unarchive">Разархивировать</string>
+    <string name="main_menu_delete">Удалить</string>
+    <string name="main_menu_add_contact">Добавить в контакты</string>
+    <string name="main_menu_pin">Закрепить наверху</string>
+    <string name="main_menu_unpin">Открепить</string>
+    <string name="main_menu_read">Пометить прочитанным</string>
+    <string name="main_menu_unread">Пометить непрочитанным</string>
+    <string name="main_menu_block">Блокировать</string>
+    <string name="main_syncing">Синхронизация сообщений&#8230;</string>
+    <string name="main_sender_you">Вы: %s</string>
+    <string name="main_draft">Черновик</string>
+    <string name="main_message_results_title">Результаты в сообщениях</string>
+    <string name="main_message_results">%d сообщений</string>
+    <string name="inbox_empty_text">Беседы будут появляться здесь</string>
+    <string name="inbox_search_empty_text">Нет результатов</string>
+    <string name="archived_empty_text">Архивированные беседы будут появляться здесь</string>
+    <string name="main_fab_cd">Начать новую беседу</string>
+    <string name="main_default_sms_title">Снова полюбите писать</string>
+    <string name="main_default_sms_message">Сделать QKSMS приложением SMS по умолчанию</string>
+    <string name="main_default_sms_change">Изменить</string>
+    <string name="main_permission_required">Требуется разрешение</string>
+    <string name="main_permission_sms">QKSMS необходимо разрешение для отправки и просмотра SMS-сообщений</string>
+    <string name="main_permission_contacts">QKSMS необходимо разрешение для просмотра контактов</string>
+    <string name="main_permission_allow">Разрешить</string>
+    <string name="drawer_inbox">Входящие</string>
+    <string name="drawer_archived">Архив</string>
+    <string name="drawer_scheduled">Планировщик</string>
+    <string name="drawer_blocking">Блокировка</string>
+    <string name="drawer_more">Ещё</string>
+    <string name="drawer_settings">Настройки</string>
+    <string name="drawer_help">Помощь и обратная связь</string>
+    <string name="drawer_invite">Пригласить друзей</string>
+    <string name="drawer_plus_banner_summary">Разблокировать новые удивительные функции и поддержать разработку</string>
+    <string name="rate_title">Нравится QKSMS?</string>
+    <string name="rate_summary">Поделитесь любовью и оцените нас в Google Play!</string>
+    <string name="rate_okay">OK!</string>
+    <string name="rate_dismiss">ОТКЛОНИТЬ</string>
+    <string name="dialog_delete_title">Удалить</string>
+    <plurals name="dialog_delete_message">
+        <item quantity="one">Уверены, что хотите удалить эту беседу?</item>
+        <item quantity="few">Уверены, что хотите удалить %d беседы?</item>
+        <item quantity="many">Уверены, что хотите удалить %d бесед?</item>
+        <item quantity="other">Уверены, что хотите удалить %d бесед?</item>
+    </plurals>
+    <string-array name="message_options">
+        <item>Скопировать текст</item>
+        <item>Переслать</item>
+        <item>Удалить</item>
+    </string-array>
+    <string name="compose_number_picker_title">Выбор номера телефона</string>
+    <string name="compose_number_picker_default">%s ∙ по умолчанию</string>
+    <string name="compose_number_picker_once">Один раз</string>
+    <string name="compose_number_picker_always">Всегда</string>
+    <string name="compose_title_selected">%d выбран(о)</string>
+    <string name="compose_subtitle_results">%1$d из %2$d результатов</string>
+    <string name="compose_send_group_title">Отправить как групповое сообщение</string>
+    <string name="compose_send_group_summary">Получатели и ответы будут видны всем</string>
+    <string name="compose_messages_empty">Это начало вашей беседы. Скажите что-нибудь приятное!</string>
+    <string name="compose_vcard_label">Карточка контакта</string>
+    <string name="compose_scheduled_for">Запланировано на</string>
+    <string name="compose_scheduled_future">Выбранное время должно быть в будущем!</string>
+    <string name="compose_scheduled_plus">Вы должны разблокировать QKSMS+, чтобы использовать запланированные сообщения</string>
+    <string name="compose_scheduled_toast">Добавлено в планировщик сообщений</string>
+    <string name="compose_hint">Написать сообщение&#8230;</string>
+    <string name="compose_menu_copy">Скопировать текст</string>
+    <string name="compose_menu_forward">Переслать</string>
+    <string name="compose_menu_delete">Удалить</string>
+    <string name="compose_menu_previous">Назад</string>
+    <string name="compose_menu_next">Вперёд</string>
+    <string name="compose_menu_clear">Очистить</string>
+    <string name="compose_details_title">Подробности сообщения</string>
+    <string name="compose_details_type">Тип: %s</string>
+    <string name="compose_details_from">От: %s</string>
+    <string name="compose_details_to">Кому: %s</string>
+    <string name="compose_details_subject">Тема: %s</string>
+    <string name="compose_details_priority">Приоритет: %s</string>
+    <string name="compose_details_size">Размер: %s</string>
+    <string name="compose_details_sent">Отправлено: %s</string>
+    <string name="compose_details_received">Получено: %s</string>
+    <string name="compose_details_delivered">Доставлено: %s</string>
+    <string name="compose_details_error_code">Код ошибки: %d</string>
+    <string name="compose_attach_cd">Добавить вложение</string>
+    <string name="compose_gallery_cd">Прикрепить фото</string>
+    <string name="compose_camera_cd">Сделать снимок</string>
+    <string name="compose_schedule_cd">Запланировать сообщение</string>
+    <string name="compose_contact_cd">Прикрепить контакт</string>
+    <string name="compose_contact_error">Ошибка чтения контакта</string>
+    <!-- Example: SIM 1 (Verizon) selected-->
+    <string name="compose_sim_changed_toast">Выбрана SIM-карта %1$d (%2$s)</string>
+    <string name="compose_sim_cd">Выбрано %s, сменить SIM-карту</string>
+    <string name="compose_send_cd">Отправить сообщение</string>
+    <string name="message_status_sending">Отправка&#8230;</string>
+    <string name="message_status_delivered">Доставлено %s</string>
+    <string name="message_status_failed">Не удалось отправить. Нажмите, чтобы попробовать ещё раз.</string>
+    <string name="info_title">Подробности</string>
+    <string name="info_copied_address">Адрес скопирован</string>
+    <string name="info_name">Название разговора</string>
+    <string name="info_notifications">Уведомления</string>
+    <string name="info_theme">Тема</string>
+    <string name="info_archive">Архивировать</string>
+    <string name="info_unarchive">Разархивировать</string>
+    <string name="info_block">Заблокировать</string>
+    <string name="info_unblock">Разблокировать</string>
+    <string name="info_delete">Удалить беседу</string>
+    <string name="gallery_error">Не удалось загрузить медиа</string>
+    <string name="gallery_toast_saved">Сохранено в галерее</string>
+    <string name="backup_title">Резервное копирование</string>
+    <string name="backup_backing_up">Резервное копирование сообщений</string>
+    <string name="backup_restoring">Восстановление из резервной копии</string>
+    <string name="backup_last">Последнее резервирование</string>
+    <string name="backup_loading">Загрузка&#8230;</string>
+    <string name="backup_never">Никогда</string>
+    <string name="backup_restore_title">Восстановление</string>
+    <string name="backup_restore_summary">Выберите резервную копию</string>
+    <string name="backup_restore_error_plus">Пожалуйста, разблокируйте QKSMS+ для использования резервного копирования и восстановления</string>
+    <string name="backup_restore_error_backup">Выполняется резервное копирование&#8230;</string>
+    <string name="backup_restore_error_restore">Выполняется восстановление&#8230;</string>
+    <string name="backup_restore_confirm_title">Восстановление из резервной копии</string>
+    <string name="backup_restore_confirm_message">Вы уверены, что хотите восстановить свои сообщения из этой резервной копии?</string>
+    <string name="backup_restore_stop_title">Остановить восстановление</string>
+    <string name="backup_restore_stop_message">Сообщения, которые уже были восстановлены останутся на вашем устройстве</string>
+    <string name="backup_restore_dialog_title">Резервирование</string>
+    <string name="backup_restore_dialog_empty">Резервные копии не найдены</string>
+    <plurals name="backup_message_count">
+        <item quantity="one">%d сообщение</item>
+        <item quantity="few">%d сообщения</item>
+        <item quantity="many">%d сообщений</item>
+        <item quantity="other">%d сообщений</item>
+    </plurals>
+    <string name="backup_disclaimer">В настоящее время поддерживается резервное копирование и восстановление только SMS. Поддержка MMS и регулярные резервные копии появятся в ближайшее время!</string>
+    <string name="backup_now">Резервировать</string>
+    <string name="backup_progress_parsing">Анализ резервной копии&#8230;</string>
+    <string name="backup_progress_running">%d/%d сообщений</string>
+    <string name="backup_progress_saving">Сохранение резервной копии&#8230;</string>
+    <string name="backup_progress_syncing">Синхронизация сообщений&#8230;</string>
+    <string name="backup_progress_finished">Завершено!</string>
+    <string name="backup_notification_channel_name">Резервирование</string>
+    <string name="scheduled_title">Планировщик</string>
+    <string name="scheduled_empty_description">Автоматически отправить сообщение когда пожелаете</string>
+    <string name="scheduled_empty_message_1">Привет! Когда у вас был день рождения?</string>
+    <string name="scheduled_empty_message_2">Он был 23 декабря</string>
+    <string name="scheduled_empty_message_3">С днём рождения! Посмотрите, какой я отличный друг, помнящий о вашем дне рождения!</string>
+    <!--&#x200A; is a special character required at the end of this string to fix it's formatting in the app -->
+    <string name="scheduled_empty_message_3_timestamp">Отправка 23 декабря </string>
+    <string name="scheduled_compose_cd">Запланировать сообщение</string>
+    <string name="scheduled_options_title">Запланированное сообщение</string>
+    <string-array name="scheduled_options">
+        <item>Отправить сейчас</item>
+        <item>Копировать текст</item>
+        <item>Удалить</item>
+    </string-array>
+    <string name="settings_category_appearance">Внешний вид</string>
+    <string name="settings_category_general">Общее</string>
+    <string name="settings_category_qkreply">QK-ответ</string>
+    <string name="settings_theme_title">Тема</string>
+    <string name="settings_night_title">Ночной режим</string>
+    <string name="settings_black_title">Полностью чёрный ночной режим</string>
+    <string name="settings_night_start_title">Время начала</string>
+    <string name="settings_night_end_title">Время окончания</string>
+    <string name="settings_automatic_colors_title">Автоматические цвета контактов</string>
+    <string name="settings_text_size_title">Размер шрифта</string>
+    <string name="settings_system_font_title">Использовать системный шрифт</string>
+    <string name="settings_auto_emoji_title">Автоматические emoji</string>
+    <string name="settings_notifications_title">Уведомления</string>
+    <string name="settings_notifications_o_summary">Нажмите для настройки</string>
+    <string name="settings_notification_actions_title">Действия</string>
+    <string name="settings_notification_action_1">Кнопка 1</string>
+    <string name="settings_notification_action_2">Кнопка 2</string>
+    <string name="settings_notification_action_3">Кнопка 3</string>
+    <string name="settings_notification_previews_title">Предпросмотр уведомлений</string>
+    <string name="settings_notification_wake_title">Экран блокировки</string>
+    <string name="settings_vibration_title">Вибросигнал</string>
+    <string name="settings_ringtone_title">Звук</string>
+    <string name="settings_ringtone_none">Нет</string>
+    <string name="settings_qkreply_title">QK-ответ</string>
+    <string name="settings_qkreply_summary">Всплывающее окно для новых сообщений</string>
+    <string name="settings_qkreply_tap_dismiss_title">Нажмите, чтобы отклонить</string>
+    <string name="settings_qkreply_tap_dismiss_summary">Нажмите за пределами всплывающего окна, чтобы закрыть его</string>
+    <string name="settings_delayed_title">Задержка перед отправкой</string>
+    <string name="settings_swipe_actions">Действия жестами</string>
+    <string name="settings_swipe_actions_summary">Настройка действий жестами для бесед</string>
+    <string name="settings_swipe_actions_right">Жест вправо</string>
+    <string name="settings_swipe_actions_left">Жест влево</string>
+    <string name="settings_swipe_actions_change">ИЗМЕНИТЬ</string>
+    <string-array name="settings_swipe_actions">
+        <item>Нет</item>
+        <item>Архивировать</item>
+        <item>Удалить</item>
+        <item>Блокировать</item>
+        <item>Позвонить</item>
+        <item>Пометить прочитанным</item>
+        <item>Пометить непрочитанным</item>
+    </string-array>
+    <string name="settings_delivery_title">Отчёты о доставке</string>
+    <string name="settings_delivery_summary">Подтверждение успешной отправки сообщений</string>
+    <string name="settings_signature_title">Подпись</string>
+    <string name="settings_signature_summary">Добавлять подпись в конец ваших сообщений</string>
+    <string name="settings_unicode_title">Удалять акценты</string>
+    <string name="settings_unicode_summary">Удаление акцентов с символов в исходящих SMS-сообщениях</string>
+    <string name="settings_mobile_title">Только мобильные номера</string>
+    <string name="settings_mobile_summary">При составлении сообщения показывать только мобильные номера</string>
+    <string name="settings_auto_delete">Удалять старые сообщения автоматически</string>
+    <string name="settings_auto_delete_dialog_message">Сообщения будут удалены после указанного количества дней</string>
+    <string name="settings_auto_delete_dialog_hint">Количество дней</string>
+    <string name="settings_auto_delete_never">Никогда</string>
+    <string name="settings_auto_delete_warning">Удалить старые сообщения автоматически?</string>
+    <string name="settings_auto_delete_warning_message">Если продолжить, будет удалено сообщений: %1$d</string>
+    <plurals name="settings_auto_delete_summary">
+        <item quantity="one">Через день</item>
+        <item quantity="few">Через %d дня</item>
+        <item quantity="many">Через %d дней</item>
+        <item quantity="other">Через %d дней</item>
+    </plurals>
+    <string name="settings_long_as_mms_title">Отправлять длинные сообщения как MMS</string>
+    <string name="settings_long_as_mms_summary">Если не удаётся отправить длинные текстовые сообщения или они отправляются в неправильном порядке, вы можете отправить их в виде MMS. Может взиматься дополнительная плата.</string>
+    <string name="settings_mms_size_title">Автоматически сжимать вложения MMS</string>
+    <string name="settings_sync_title">Синхронизация сообщений</string>
+    <string name="settings_sync_summary">Принудительная синхронизация сообщений с собственной базой данных SMS Android</string>
+    <string name="settings_about_title">О QKSMS</string>
+    <string name="settings_version">Версия %s</string>
+    <string name="settings_logging_enabled">Ведение журнала отладки включено</string>
+    <string name="settings_logging_disabled">Ведение журнала отладки отключено</string>
+    <string name="settings_delay_duration_hint">Введите продолжительность (в секундах)</string>
+    <string name="blocking_title">Блокировка</string>
+    <string name="blocking_drop_title">Удалять сообщения</string>
+    <string name="blocking_drop_summary">Удалять входящие сообщения от заблокированных отправителей, а не скрывать их</string>
+    <string name="blocking_conversations">Заблокированные беседы</string>
+    <string name="blocking_manager_title">Управление блокировкой</string>
+    <string name="blocking_manager_qksms_title">QKSMS</string>
+    <string name="blocking_manager_qksms_summary">Встроенная функция блокировки QKSMS</string>
+    <string name="blocking_manager_call_control_summary">Автоматическая фильтрация звонков и сообщений в одном удобном месте! Community IQ™ позволяет предотвратить получение нежелательных сообщений от известных сообществу спаммеров</string>
+    <string name="blocking_manager_sia_summary">Автоматически фильтровать сообщения от нежелательных номеров, используя приложение «Should I Answer»</string>
+    <string name="blocking_manager_copy_title">Скопировать заблокированные номера</string>
+    <string name="blocking_manager_copy_summary">Продолжить с %s и записать их вместо существующих заблокированных номеров</string>
+    <string name="blocked_numbers_title">Заблокированные номера</string>
+    <string name="blocked_numbers_empty">Заблокированные номера будут появляться здесь</string>
+    <string name="blocked_numbers_add_cd">Блокировать новый номер</string>
+    <string name="blocked_numbers_dialog_title">Заблокировать отправителя</string>
+    <string name="blocked_numbers_dialog_hint">Номер телефона</string>
+    <string name="blocked_numbers_dialog_block">Блокировать</string>
+    <string name="blocked_messages_title">Заблокированные сообщения</string>
+    <string name="blocked_messages_empty">Заблокированные сообщения будут появляться здесь</string>
+    <string name="blocking_block_title">Блокировать</string>
+    <string name="blocking_unblock_title">Разблокировать</string>
+    <plurals name="blocking_block_external">
+        <item quantity="one">Продолжить с %s и заблокировать этот номер</item>
+        <item quantity="few">Продолжить с %s и заблокировать эти номера</item>
+        <item quantity="many">Продолжить с %s и заблокировать эти номера</item>
+        <item quantity="other">Продолжить с %s и заблокировать эти номера</item>
+    </plurals>
+    <plurals name="blocking_unblock_external">
+        <item quantity="one">Продолжить с %s и разрешить этот номер</item>
+        <item quantity="few">Продолжить с %s и разрешить эти номера</item>
+        <item quantity="many">Продолжить с %s и разрешить эти номера</item>
+        <item quantity="other">Продолжить с %s и разрешить эти номера</item>
+    </plurals>
+    <string name="about_title">О приложении</string>
+    <string name="about_version_title">Версия</string>
+    <string name="about_developer_title">Разработчик</string>
+    <string name="about_source_title">Исходный код</string>
+    <string name="about_changelog_title">История изменений</string>
+    <string name="about_contact_title">Контакт</string>
+    <string name="about_license_title">Лицензия</string>
+    <string name="about_copyright_title">Авторское право</string>
+    <string name="qksms_plus_description_title">Поддержать развитие, разблокировать всё</string>
+    <string name="qksms_plus_description_summary">Вы можете спасти голодающего разработчика всего за %s</string>
+    <!-- Substitutions are for price and currency. Ex: Lifetime upgrade for $1.99 USD -->
+    <string name="qksms_plus_upgrade">Пожизненное обновление за %1$s %2$s</string>
+    <!-- Substitutions are for price and currency. Ex: Unlock + donate for $4.99 USD -->
+    <string name="qksms_plus_upgrade_donate">Разблокировать + пожертвовать %1$s %2$s</string>
+    <string name="qksms_plus_thanks_title">Спасибо за поддержку QKSMS!</string>
+    <string name="qksms_plus_thanks_summary">Теперь у вас есть доступ ко всем функциям QKSMS+</string>
+    <string name="qksms_plus_free_title">QKSMS+ является бесплатным для пользователей F-Droid! Если вы хотите поддержать развитие приложения, сделайте пожертвование.</string>
+    <string name="qksms_plus_donate">Пожертвовать через PayPal</string>
+    <string name="qksms_plus_coming_soon">Скоро</string>
+    <string name="qksms_plus_themes_title">Премиальные темы</string>
+    <string name="qksms_plus_themes_summary">Разблокируйте красивые цвета темы, недоступные в палитре Material Design</string>
+    <string name="qksms_plus_emoji_title">Пользовательские авто-emoji</string>
+    <string name="qksms_plus_emoji_summary">Создайте ярлык пользовательских авто-emoji</string>
+    <string name="qksms_plus_backup_title">Резервирование сообщений</string>
+    <string name="qksms_plus_backup_summary">Автоматически создавайте резервные копии сообщений. Не беспокойтесь о потере истории, если вы поменяете или потеряете телефон</string>
+    <string name="qksms_plus_scheduled_title">Запланированные сообщения</string>
+    <string name="qksms_plus_scheduled_summary">Запланированные сообщения для автоматической отправки в определённое время и дату</string>
+    <string name="qksms_plus_delayed_title">Отложенная отправка</string>
+    <string name="qksms_plus_delayed_summary">Выжидание несколько секунд перед отправкой сообщения</string>
+    <string name="qksms_plus_night_title">Автоматический ночной режим</string>
+    <string name="qksms_plus_night_summary">Включать ночной режим, основываясь на времени суток</string>
+    <string name="qksms_plus_blacklist_title">Расширенная блокировка</string>
+    <string name="qksms_plus_blacklist_summary">Блокировать сообщения, содержащие ключевые слова или соответствующие шаблонам</string>
+    <string name="qksms_plus_forward_title">Автоматическая пересылка</string>
+    <string name="qksms_plus_forward_summary">Автоматическая пересылка сообщений от определённых отправителей</string>
+    <string name="qksms_plus_respond_title">Автоматический ответ</string>
+    <string name="qksms_plus_respond_summary">Автоматически отвечать на входящие сообщения предустановленным ответом</string>
+    <string name="qksms_plus_more_title">Ещё</string>
+    <string name="qksms_plus_more_summary">QKSMS находится в активной разработке и ваша покупка будет включать в себя все функции QKSMS+ в будущем!</string>
+    <string name="widget_loading">Загрузка&#8230;</string>
+    <string name="widget_more">Посмотреть больше бесед</string>
+    <string name="qkreply_menu_read">Прочитано</string>
+    <string name="qkreply_menu_call">Позвонить</string>
+    <string name="qkreply_menu_delete">Удалить</string>
+    <string name="qkreply_menu_expand">Показать ещё</string>
+    <string name="qkreply_menu_collapse">Показать меньше</string>
+    <string name="qkreply_menu_view">Открыть беседу</string>
+    <string name="theme_material">Material</string>
+    <string name="theme_hex">HEX</string>
+    <string name="theme_apply">Применить</string>
+    <string-array name="notification_actions">
+        <item>Нет</item>
+        <item>В архив</item>
+        <item>Удалить</item>
+        <item>Заблокировать</item>
+        <item>Позвонить</item>
+        <item>Прочитано</item>
+        <item>Ответить</item>
+    </string-array>
+    <string name="button_yes">Да</string>
+    <string name="button_continue">Продолжить</string>
+    <string name="button_cancel">Отмена</string>
+    <string name="button_delete">Удалить</string>
+    <string name="button_save">Сохранить</string>
+    <string name="button_stop">Остановить</string>
+    <string name="button_more">Ещё</string>
+    <string name="button_set">Задать</string>
+    <string name="button_undo">Отмена</string>
+    <string name="toast_copied">Скопировано</string>
+    <string name="toast_archived">Архивированная беседа</string>
+    <string name="toast_qksms_plus">Вы должны разблокировать QKSMS+, чтобы использовать</string>
+    <plurals name="notification_new_messages">
+        <item quantity="one">Новое сообщение</item>
+        <item quantity="few">%s новых сообщения</item>
+        <item quantity="many">%s новых сообщений</item>
+        <item quantity="other">%s новых сообщений</item>
+    </plurals>
+    <string name="notification_message_failed_title">Сообщение не отправлено</string>
+    <string name="notification_message_failed_text">Не удалось отправить сообщение для %s</string>
+    <string-array name="night_modes">
+        <item>Как в системе</item>
+        <item>Отключено</item>
+        <item>Всегда включено</item>
+        <item>Автоматически</item>
+    </string-array>
+    <string-array name="notification_preview_options">
+        <item>Показать имя и сообщение</item>
+        <item>Показать имя</item>
+        <item>Скрыть содержание</item>
+    </string-array>
+    <string-array name="text_sizes">
+        <item>Маленький</item>
+        <item>Обычный</item>
+        <item>Крупный</item>
+        <item>Большой</item>
+    </string-array>
+    <string-array name="delayed_sending_labels">
+        <item>Без задержки</item>
+        <item>3 секунды</item>
+        <item>5 секунд</item>
+        <item>10 секунд</item>
+    </string-array>
+    <string-array name="mms_sizes">
+        <item>Автоматически</item>
+        <item>100 Кб</item>
+        <item>200 Кб</item>
+        <item>300 Кб</item>
+        <item>600 Кб</item>
+        <item>1000 Кб</item>
+        <item>2000 Кб</item>
+        <item>Без сжатия</item>
+    </string-array>
+    <string-array name="qk_responses">
+        <item>Хорошо</item>
+        <item>Дайте мне минуту</item>
+        <item>Мне по пути</item>
+        <item>Спасибо</item>
+        <item>Звучит заманчиво</item>
+        <item>Что случилось?</item>
+        <item>Согласен</item>
+        <item>Нет</item>
+        <item>Люблю тебя</item>
+        <item>Извините</item>
+        <item>LOL</item>
+        <item>Это нормально</item>
+    </string-array>
+</resources>
diff --git a/presentation/src/main/res/values-sk/strings.xml b/presentation/src/main/res/values-sk/strings.xml
index 955be4fbb..912417833 100644
--- a/presentation/src/main/res/values-sk/strings.xml
+++ b/presentation/src/main/res/values-sk/strings.xml
@@ -1,423 +1,423 @@
-<?xml version="1.0" encoding="utf-8"?>
-<!--
-  ~ Copyright (C) 2019 Moez Bhatti <moez.bhatti@gmail.com>
-  ~
-  ~ This file is part of QKSMS.
-  ~
-  ~ QKSMS is free software: you can redistribute it and/or modify
-  ~ it under the terms of the GNU General Public License as published by
-  ~ the Free Software Foundation, either version 3 of the License, or
-  ~ (at your option) any later version.
-  ~
-  ~ QKSMS is distributed in the hope that it will be useful,
-  ~ but WITHOUT ANY WARRANTY; without even the implied warranty of
-  ~ MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
-  ~ GNU General Public License for more details.
-  ~
-  ~ You should have received a copy of the GNU General Public License
-  ~ along with QKSMS.  If not, see <http://www.gnu.org/licenses/>.
-  -->
-<resources>
-    <string name="shortcut_compose_long_label">Nová konverzácia</string>
-    <string name="shortcut_compose_short_label">Nová správa</string>
-    <string name="shortcut_compose_disabled_message">Skratka je vypnutá</string>
-    <string name="title_archived">Archivované</string>
-    <string name="title_settings">Nastavenia</string>
-    <string name="title_notification_prefs">Upozornenia</string>
-    <string name="title_theme">Téma</string>
-    <string name="title_conversations">Hľadať správu&#8230;</string>
-    <string name="title_compose">Nová správa</string>
-    <string name="setup_skip">Preskočiť</string>
-    <string name="setup_next">Pokračovať</string>
-    <string name="menu_add_person">Pridať osobu</string>
-    <string name="menu_call">Volať</string>
-    <string name="menu_info">Podrobnosti</string>
-    <string name="menu_save">Uložiť do galérie</string>
-    <string name="menu_share">Zdielať</string>
-    <string name="main_drawer_open_cd">Otvoriť navigačné menu</string>
-    <string name="main_title_selected">%d vybraných</string>
-    <string name="main_menu_clear">Vymazať</string>
-    <string name="main_menu_archive">Archivovať</string>
-    <string name="main_menu_unarchive">Zrušiť archiváciu</string>
-    <string name="main_menu_delete">Odstrániť</string>
-    <string name="main_menu_add_contact">Pridať do kontaktov</string>
-    <string name="main_menu_pin">Pripnúť na začiatok</string>
-    <string name="main_menu_unpin">Odopnúť</string>
-    <string name="main_menu_read">Označiť ako prečítané</string>
-    <string name="main_menu_unread">Označiť ako neprečítané</string>
-    <string name="main_menu_block">Zablokovať</string>
-    <string name="main_syncing">Synchronizácia správ&#8230;</string>
-    <string name="main_sender_you">Vy: %s</string>
-    <string name="main_draft">Koncept</string>
-    <string name="main_message_results_title">Výsledky v správach</string>
-    <string name="main_message_results">%d správ</string>
-    <string name="inbox_empty_text">Tu sa zobrazia vaše konverzácie</string>
-    <string name="inbox_search_empty_text">Žiadne výsledky</string>
-    <string name="archived_empty_text">Tu sa zobrazia vaše archivované konverzácie</string>
-    <string name="main_fab_cd">Začať novú konverzáciu</string>
-    <string name="main_default_sms_title">Opäť si zamilujte písanie</string>
-    <string name="main_default_sms_message">Nastavte QKSMS ako predvolenú SMS aplikáciu</string>
-    <string name="main_default_sms_change">Zmeniť</string>
-    <string name="main_permission_required">Vyžadované povolenie</string>
-    <string name="main_permission_sms">QKSMS potrebuje povolenie posielať a zobrazovať správy SMS</string>
-    <string name="main_permission_contacts">QKSMS potrebuje povolenie na zobrazenie kontaktov</string>
-    <string name="main_permission_allow">Povoliť</string>
-    <string name="drawer_inbox">Doručené</string>
-    <string name="drawer_archived">Archivované</string>
-    <string name="drawer_scheduled">Naplánované</string>
-    <string name="drawer_blocking">Blokovanie</string>
-    <string name="drawer_more">Viac</string>
-    <string name="drawer_settings">Nastavenia</string>
-    <string name="drawer_help">Nápoveda &amp; spätná väzba</string>
-    <string name="drawer_invite">Pozvať priateľov</string>
-    <string name="drawer_plus_banner_summary">Odomknutie úžasné nové funkcie a podporte vývoj</string>
-    <string name="rate_title">Máte radi QKSMS?</string>
-    <string name="rate_summary">Podeľte sa o trochu lásky a ohodnoťte nás na Google Play!</string>
-    <string name="rate_okay">OUKEJ!</string>
-    <string name="rate_dismiss">ODMIETNUŤ</string>
-    <string name="dialog_delete_title">Zmazať</string>
-    <plurals name="dialog_delete_message">
-        <item quantity="one">Ste si istý, že chcete odstrániť túto konverzáciu?</item>
-        <item quantity="few">Ste si istý, že chcete odstrániť %d konverzácie?</item>
-        <item quantity="many">Ste si istý, že chcete odstrániť %d konverzácií?</item>
-        <item quantity="other">Ste si istý, že chcete odstrániť %d konverzácií?</item>
-    </plurals>
-    <string-array name="message_options">
-        <item>Kopírovať text</item>
-        <item>Preposlať</item>
-        <item>Odstrániť</item>
-    </string-array>
-    <string name="compose_number_picker_title">Vybrať telefónne číslo</string>
-    <string name="compose_number_picker_default">%s ∙ Východzie</string>
-    <string name="compose_number_picker_once">Iba raz</string>
-    <string name="compose_number_picker_always">Vždy</string>
-    <string name="compose_title_selected">%d vybratých</string>
-    <string name="compose_subtitle_results">%1$d z %2$d výsledkov</string>
-    <string name="compose_send_group_title">Poslať ako skupinovú správu</string>
-    <string name="compose_send_group_summary">Príjemcovia a odpovede budú viditeľné všetkým</string>
-    <string name="compose_messages_empty">Toto je začiatok vašej konverzácie. Napíšte niečo pekného!</string>
-    <string name="compose_vcard_label">Karta kontaktu</string>
-    <string name="compose_scheduled_for">Naplánované na</string>
-    <string name="compose_scheduled_future">Vybraný čas musí ešte len nastať!</string>
-    <string name="compose_scheduled_plus">Ak si prajete používať plánovanie správ, aktivujte si QKSMS+</string>
-    <string name="compose_scheduled_toast">Pridané do naplánovaných správ</string>
-    <string name="compose_hint">Napíšte správu&#8230;</string>
-    <string name="compose_menu_copy">Kopírovať text</string>
-    <string name="compose_menu_forward">Preposlať</string>
-    <string name="compose_menu_delete">Odstrániť</string>
-    <string name="compose_menu_previous">Predchádzajúci</string>
-    <string name="compose_menu_next">Ďalší</string>
-    <string name="compose_menu_clear">Vymazať</string>
-    <string name="compose_details_title">Detaily správy</string>
-    <string name="compose_details_type">Typ: %s</string>
-    <string name="compose_details_from">Od: %s</string>
-    <string name="compose_details_to">Pre: %s</string>
-    <string name="compose_details_subject">Predmet: %s</string>
-    <string name="compose_details_priority">Priorita: %s</string>
-    <string name="compose_details_size">Veľkosť: %s</string>
-    <string name="compose_details_sent">Odoslané: %s</string>
-    <string name="compose_details_received">Prijaté: %s</string>
-    <string name="compose_details_delivered">Doručené: %s</string>
-    <string name="compose_details_error_code">Kód chyby: %d</string>
-    <string name="compose_attach_cd">Pridať prílohu</string>
-    <string name="compose_gallery_cd">Priložiť fotografiu</string>
-    <string name="compose_camera_cd">Urobiť fotografiu</string>
-    <string name="compose_schedule_cd">Naplánovať správu</string>
-    <string name="compose_contact_cd">Pripojiť kontakt</string>
-    <string name="compose_contact_error">Chyba čítania kontaktu</string>
-    <!-- Example: SIM 1 (Verizon) selected-->
-    <string name="compose_sim_changed_toast">Vybrána SIM %1$d (%2$s)</string>
-    <string name="compose_sim_cd">%s vybrané, zmeňte SIM kartu</string>
-    <string name="compose_send_cd">Odoslať správu</string>
-    <string name="message_status_sending">Odosiela sa&#8230;</string>
-    <string name="message_status_delivered">Doručené %s</string>
-    <string name="message_status_failed">Odoslanie zlyhalo. Klepnutím skúste znovu</string>
-    <string name="info_title">Detaily</string>
-    <string name="info_copied_address">Adresa skopírovaná</string>
-    <string name="info_name">Názov konverzácie</string>
-    <string name="info_notifications">Upozornenia</string>
-    <string name="info_theme">Motív</string>
-    <string name="info_archive">Archivovať</string>
-    <string name="info_unarchive">Zrušiť archiváciu</string>
-    <string name="info_block">Blokovať</string>
-    <string name="info_unblock">Odblokovať</string>
-    <string name="info_delete">Odstrániť konverzáciu</string>
-    <string name="gallery_error">Súbor sa nepodarilo načítať</string>
-    <string name="gallery_toast_saved">Uložené do galérie</string>
-    <string name="backup_title">Záloha a obnovenie</string>
-    <string name="backup_backing_up">Zálohovanie správ</string>
-    <string name="backup_restoring">Obnovenie zo zálohy</string>
-    <string name="backup_last">Posledná záloha</string>
-    <string name="backup_loading">Načítavanie&#8230;</string>
-    <string name="backup_never">Nikdy</string>
-    <string name="backup_restore_title">Obnoviť</string>
-    <string name="backup_restore_summary">Zvoľte zálohu</string>
-    <string name="backup_restore_error_plus">Ak si prajete používať funkciu zálohovania a obnovy, prosím aktivujte si QKSMS+</string>
-    <string name="backup_restore_error_backup">Prebieha zálohovanie&#8230;</string>
-    <string name="backup_restore_error_restore">Prebieha obnova&#8230;</string>
-    <string name="backup_restore_confirm_title">Obnoviť zo zálohy</string>
-    <string name="backup_restore_confirm_message">Ste si istý obnovou všetkých správ z tejto zálohy?</string>
-    <string name="backup_restore_stop_title">Zastaviť obnovu</string>
-    <string name="backup_restore_stop_message">Už obnovené správy ostanú vo vašom zariadení</string>
-    <string name="backup_restore_dialog_title">Zálohy</string>
-    <string name="backup_restore_dialog_empty">Nenašli sa žiadne zálohy</string>
-    <plurals name="backup_message_count">
-        <item quantity="one">%d správa</item>
-        <item quantity="few">%d správy</item>
-        <item quantity="many">%d správ</item>
-        <item quantity="other">%d správ</item>
-    </plurals>
-    <string name="backup_disclaimer">Momentálne sú pre zálohovanie a obnovenie podporované iba SMS. MMS podpora a plánované zálohy budú pridané už čoskoro!</string>
-    <string name="backup_now">Zálohovať</string>
-    <string name="backup_progress_parsing">Analýza zálohy&#8230;</string>
-    <string name="backup_progress_running">%d/%d správ</string>
-    <string name="backup_progress_saving">Ukladá sa záloha&#8230;</string>
-    <string name="backup_progress_syncing">Synchronizácia správ&#8230;</string>
-    <string name="backup_progress_finished">Dokončené!</string>
-    <string name="backup_notification_channel_name">Zálohovanie a obnovenie</string>
-    <string name="scheduled_title">Naplánované</string>
-    <string name="scheduled_empty_description">Automaticky odošle správu v presnom okamihu, ktorý si prajete</string>
-    <string name="scheduled_empty_message_1">Nazdar! Kedy máš narodeniny?</string>
-    <string name="scheduled_empty_message_2">23. decembra</string>
-    <string name="scheduled_empty_message_3">Všetko najlepšie! Vidíš akého máš dobrého kamaráta, pamätám si tvoje narodeniny.</string>
-    <!--&#x200A; is a special character required at the end of this string to fix it's formatting in the app -->
-    <string name="scheduled_empty_message_3_timestamp">Pošle sa 23. decembra</string>
-    <string name="scheduled_compose_cd">Naplánovať správu</string>
-    <string name="scheduled_options_title">Naplánovaná správa</string>
-    <string-array name="scheduled_options">
-        <item>Odoslať teraz</item>
-        <item>Kopírovať text</item>
-        <item>Odstrániť</item>
-    </string-array>
-    <string name="settings_category_appearance">Vzhľad</string>
-    <string name="settings_category_general">Všeobecné</string>
-    <string name="settings_category_qkreply">Rýchla odpoveď</string>
-    <string name="settings_theme_title">Motív</string>
-    <string name="settings_night_title">Nočný režim</string>
-    <string name="settings_black_title">Čisto čierny nočný režim</string>
-    <string name="settings_night_start_title">Čas spustenia</string>
-    <string name="settings_night_end_title">Čas ukončenia</string>
-    <string name="settings_automatic_colors_title">Automatické farby kontaktov</string>
-    <string name="settings_text_size_title">Veľkosť písma</string>
-    <string name="settings_system_font_title">Použiť systémové písmo</string>
-    <string name="settings_auto_emoji_title">Automatické emoji</string>
-    <string name="settings_notifications_title">Upozornenia</string>
-    <string name="settings_notifications_o_summary">Klepnutím prizpôsobíte</string>
-    <string name="settings_notification_actions_title">Akcie</string>
-    <string name="settings_notification_action_1">Tlačidlo 1</string>
-    <string name="settings_notification_action_2">Tlačidlo 2</string>
-    <string name="settings_notification_action_3">Tlačidlo 3</string>
-    <string name="settings_notification_previews_title">Obsah upozornení</string>
-    <string name="settings_notification_wake_title">Rozsvietiť obrazovku</string>
-    <string name="settings_vibration_title">Vybrácie</string>
-    <string name="settings_ringtone_title">Zvuk</string>
-    <string name="settings_ringtone_none">Žiadny</string>
-    <string name="settings_qkreply_title">Rýchla odpoveď</string>
-    <string name="settings_qkreply_summary">Vyskakovacie okno pre nové správy</string>
-    <string name="settings_qkreply_tap_dismiss_title">Klepnutím zavriete</string>
-    <string name="settings_qkreply_tap_dismiss_summary">Zavriete klepnutím mimo vyskakovacie okno</string>
-    <string name="settings_delayed_title">Oneskorené odoslanie</string>
-    <string name="settings_swipe_actions">Akcie potiahnutím</string>
-    <string name="settings_swipe_actions_summary">Nastavenie akcií potiahnutím pre konverzácie</string>
-    <string name="settings_swipe_actions_right">Potiahnutie doprava</string>
-    <string name="settings_swipe_actions_left">Potiahnutie doľava</string>
-    <string name="settings_swipe_actions_change">ZMENIŤ</string>
-    <string-array name="settings_swipe_actions">
-        <item>Žiadny</item>
-        <item>Archivovať</item>
-        <item>Odstrániť</item>
-        <item>Zablokovať</item>
-        <item>Volať</item>
-        <item>Označiť ako prečítané</item>
-        <item>Označiť ako neprečítané</item>
-    </string-array>
-    <string name="settings_delivery_title">Potvrdenie o doručení</string>
-    <string name="settings_delivery_summary">Potvrdiť úspešné doručenie správy</string>
-    <string name="settings_signature_title">Podpis</string>
-    <string name="settings_signature_summary">Pridať podpis na koniec vašich správ</string>
-    <string name="settings_unicode_title">Odstrániť diakritiku</string>
-    <string name="settings_unicode_summary">Odstrániť diakritiku v odosielaných správach</string>
-    <string name="settings_mobile_title">Iba telefónne čísla</string>
-    <string name="settings_mobile_summary">Pri písaní správ, zobraziť iba telefónne čísla</string>
-    <string name="settings_auto_delete">Delete old messages automatically</string>
-    <string name="settings_auto_delete_dialog_message">Messages will be deleted after the specified number of days</string>
-    <string name="settings_auto_delete_dialog_hint">Number of days</string>
-    <string name="settings_auto_delete_never">Never</string>
-    <string name="settings_auto_delete_warning">Delete old messages automatically?</string>
-    <string name="settings_auto_delete_warning_message">If you proceed, %1$d messages will be deleted now</string>
-    <plurals name="settings_auto_delete_summary">
-        <item quantity="one">After 1 day</item>
-        <item quantity="few">After %d days</item>
-        <item quantity="many">After %d days</item>
-        <item quantity="other">After %d days</item>
-    </plurals>
-    <string name="settings_long_as_mms_title">Dlhé správy odoslať ako MMS</string>
-    <string name="settings_long_as_mms_summary">Ak zlyháva odosielanie dlhých správ alebo sú odoslané v nesprávnom poradí, môžete ich poslať ako MMS. Môžu byť účtované ďalšie poplatky.</string>
-    <string name="settings_mms_size_title">Automaticky komprimovať MMS prílohy</string>
-    <string name="settings_sync_title">Synchronizovať správy</string>
-    <string name="settings_sync_summary">Opätovne synchronizovať vaše správy s natívnou SMS databázou</string>
-    <string name="settings_about_title">O aplikácii QKSMS</string>
-    <string name="settings_version">Verzia %s</string>
-    <string name="settings_logging_enabled">Ladiace záznamy povolené</string>
-    <string name="settings_logging_disabled">Ladiace záznamy vypnuté</string>
-    <string name="settings_delay_duration_hint">Zadajte trvanie v sekundách</string>
-    <string name="blocking_title">Blokovanie</string>
-    <string name="blocking_drop_title">Zahodiť správy</string>
-    <string name="blocking_drop_summary">Zahodiť prichádzajúce správy od blokovaných odosielateľov namiesto ich skrytia.</string>
-    <string name="blocking_conversations">Blokované konverzácie</string>
-    <string name="blocking_manager_title">Správca blokovaní</string>
-    <string name="blocking_manager_qksms_title">QKSMS</string>
-    <string name="blocking_manager_qksms_summary">Vstavané blokovanie v QKSMS</string>
-    <string name="blocking_manager_call_control_summary">Automaticky filtrujte svoje hovory a správy na jednom mieste! Community IQ™ vám poskytuje ochranu pred spamom od komunitou označených spammerov.</string>
-    <string name="blocking_manager_sia_summary">Automaticky filtrovať správy od nevyžiadaných čísiel pomocou aplikácie \"Should I Answer?\"</string>
-    <string name="blocking_manager_copy_title">Kopírovať blokované čísla</string>
-    <string name="blocking_manager_copy_summary">Pokračovať do %s a skopírovať existujúce zablokované čísla</string>
-    <string name="blocked_numbers_title">Blokované čísla</string>
-    <string name="blocked_numbers_empty">Tu sa objavia vami blokované čísla</string>
-    <string name="blocked_numbers_add_cd">Zablokovať nové číslo</string>
-    <string name="blocked_numbers_dialog_title">Zablokovať správy od</string>
-    <string name="blocked_numbers_dialog_hint">Telefónne číslo</string>
-    <string name="blocked_numbers_dialog_block">Zablokovať</string>
-    <string name="blocked_messages_title">Blokované správy</string>
-    <string name="blocked_messages_empty">Tu sa objavia vami blokované čísla</string>
-    <string name="blocking_block_title">Zablokovať</string>
-    <string name="blocking_unblock_title">Odblokovať</string>
-    <plurals name="blocking_block_external">
-        <item quantity="one">Pokračovať na %s a zablokovať toto číslo</item>
-        <item quantity="few">Pokračovať na %s a zablokovať tieto čísla</item>
-        <item quantity="many">Pokračovať na %s a zablokovať tieto čísla</item>
-        <item quantity="other">Pokračovať na %s a zablokovať tieto čísla</item>
-    </plurals>
-    <plurals name="blocking_unblock_external">
-        <item quantity="one">Pokračovať na %s a povoliť toto číslo</item>
-        <item quantity="few">Pokračovať na %s a povoliť tieto čísla</item>
-        <item quantity="many">Pokračovať na %s a povoliť tieto čísla</item>
-        <item quantity="other">Pokračovať na %s a povoliť tieto čísla</item>
-    </plurals>
-    <string name="about_title">O aplikácii</string>
-    <string name="about_version_title">Verzia</string>
-    <string name="about_developer_title">Vývojár</string>
-    <string name="about_source_title">Zdrojový kód</string>
-    <string name="about_changelog_title">Zoznam zmien</string>
-    <string name="about_contact_title">Konktakt</string>
-    <string name="about_license_title">Licencia</string>
-    <string name="about_copyright_title">Autorské práva</string>
-    <string name="qksms_plus_description_title">Podporiť vývoj, odomknúť všetko</string>
-    <string name="qksms_plus_description_summary">Môžete zachrániť hladujúceho vývojára iba za %s</string>
-    <!-- Substitutions are for price and currency. Ex: Lifetime upgrade for $1.99 USD -->
-    <string name="qksms_plus_upgrade">Doživotná aktivácia za %1$s %2$s</string>
-    <!-- Substitutions are for price and currency. Ex: Unlock + donate for $4.99 USD -->
-    <string name="qksms_plus_upgrade_donate">Odomknúť + darovať za %1$s %2$s</string>
-    <string name="qksms_plus_thanks_title">Ďakujeme, že ste podporili  QKSMS!</string>
-    <string name="qksms_plus_thanks_summary">Odteraz máte prístup ku všetkým QKSMS+ funkciám</string>
-    <string name="qksms_plus_free_title">QKSMS+ je zdarma pre používateľov F-Droid! Ak si prajete podporiť vývoj, neváhajte prispieť.</string>
-    <string name="qksms_plus_donate">Prispieť cez PayPal</string>
-    <string name="qksms_plus_coming_soon">Už čoskoro</string>
-    <string name="qksms_plus_themes_title">Prémiové témy</string>
-    <string name="qksms_plus_themes_summary">Odomknúť nádherné farebné témy, ktoré nie sú dostupné v Material Design palete </string>
-    <string name="qksms_plus_emoji_title">Vlastné automatické emoji</string>
-    <string name="qksms_plus_emoji_summary">Vytvorte si skratku pre vlastné automatické emoji</string>
-    <string name="qksms_plus_backup_title">Zálohovanie správ</string>
-    <string name="qksms_plus_backup_summary">Automaticky zálohujte svoje správy. Už sa nemusíte obávať straty správ pri strate alebo výmene telefónu</string>
-    <string name="qksms_plus_scheduled_title">Plánované správy</string>
-    <string name="qksms_plus_scheduled_summary">Plánované správy budú automaticky odoslané v určený dátum a čas</string>
-    <string name="qksms_plus_delayed_title">Oneskorené odoslanie</string>
-    <string name="qksms_plus_delayed_summary">Vyčkať pár sekúnd pred odoslaním správy</string>
-    <string name="qksms_plus_night_title">Automatický nočný režim</string>
-    <string name="qksms_plus_night_summary">Zapnutie nočného režimu podľa dennej doby</string>
-    <string name="qksms_plus_blacklist_title">Rozšírené blokovanie</string>
-    <string name="qksms_plus_blacklist_summary">Blokujte správy, ktoré obsahujú kľúčové slová, alebo odpovedajú vzoru</string>
-    <string name="qksms_plus_forward_title">Automatické preposlanie</string>
-    <string name="qksms_plus_forward_summary">Automaticky preposlať správy od určitých odosielateľov</string>
-    <string name="qksms_plus_respond_title">Automatická odpoveď</string>
-    <string name="qksms_plus_respond_summary">Automaticky odpovedať na príchodzie správy s prednastavenou odpoveďou</string>
-    <string name="qksms_plus_more_title">Viac</string>
-    <string name="qksms_plus_more_summary">QKSMS je v aktívnom vývoji a váš nákup bude obsahovať aj všetky budúce QKSMS+ funkcie!</string>
-    <string name="widget_loading">Načítavanie&#8230;</string>
-    <string name="widget_more">Zobraziť viacej konverácií</string>
-    <string name="qkreply_menu_read">Označiť ako prečítané</string>
-    <string name="qkreply_menu_call">Volať</string>
-    <string name="qkreply_menu_delete">Odstrániť</string>
-    <string name="qkreply_menu_expand">Zobraziť viac</string>
-    <string name="qkreply_menu_collapse">Zobraziť menej</string>
-    <string name="qkreply_menu_view">Otvoriť konverzáciu</string>
-    <string name="theme_material">Materiál</string>
-    <string name="theme_hex">HEX</string>
-    <string name="theme_apply">Použiť</string>
-    <string-array name="notification_actions">
-        <item>Žiadny</item>
-        <item>Archivovať</item>
-        <item>Odstrániť</item>
-        <item>Zablokovať</item>
-        <item>Volať</item>
-        <item>Označiť ako prečítané</item>
-        <item>Odpovedať</item>
-    </string-array>
-    <string name="button_yes">Áno</string>
-    <string name="button_continue">Pokračovať</string>
-    <string name="button_cancel">Zrušiť</string>
-    <string name="button_delete">Odstrániť</string>
-    <string name="button_save">Uložiť</string>
-    <string name="button_stop">Zastaviť</string>
-    <string name="button_more">Viac</string>
-    <string name="button_set">Nastaviť</string>
-    <string name="button_undo">Vrátiť späť</string>
-    <string name="toast_copied">Skopírované</string>
-    <string name="toast_archived">Archivované konverzácie</string>
-    <string name="toast_qksms_plus">Pre použitie aktivujte QKSMS+</string>
-    <plurals name="notification_new_messages">
-        <item quantity="one">Nová správa</item>
-        <item quantity="few">%s nové správy</item>
-        <item quantity="many">%s nových správ</item>
-        <item quantity="other">%s nových správ</item>
-    </plurals>
-    <string name="notification_message_failed_title">Správa nebola odoslaná</string>
-    <string name="notification_message_failed_text">Zlyhalo odoslanie správy pre %s</string>
-    <string-array name="night_modes">
-        <item>Systém</item>
-        <item>Vypnuté</item>
-        <item>Vždy zapnuté</item>
-        <item>Automaticky</item>
-    </string-array>
-    <string-array name="notification_preview_options">
-        <item>Zobraziť meno a správu</item>
-        <item>Zobraziť meno</item>
-        <item>Skryť obsah</item>
-    </string-array>
-    <string-array name="text_sizes">
-        <item>Malý</item>
-        <item>Stredný</item>
-        <item>Veľký</item>
-        <item>Najväčší</item>
-    </string-array>
-    <string-array name="delayed_sending_labels">
-        <item>Bez oneskorenia</item>
-        <item>3 sekundy</item>
-        <item>5 sekúnd</item>
-        <item>10 sekúnd</item>
-    </string-array>
-    <string-array name="mms_sizes">
-        <item>Automaticky</item>
-        <item>100 kB</item>
-        <item>200 kB</item>
-        <item>300 kB</item>
-        <item>600 kB</item>
-        <item>1 000 kB</item>
-        <item>2 000 kB</item>
-        <item>Bez kompresie</item>
-    </string-array>
-    <string-array name="qk_responses">
-        <item>V poriadku</item>
-        <item>Ešte chvíľku</item>
-        <item>Som na ceste</item>
-        <item>Vďaka</item>
-        <item>Môže byť</item>
-        <item>Čo sa deje?</item>
-        <item>Súhlasím</item>
-        <item>Nie</item>
-        <item>Ľúbim ťa</item>
-        <item>Ospravedlňujem sa</item>
-        <item>LOL</item>
-        <item>To je v poriadku</item>
-    </string-array>
-</resources>
+<?xml version="1.0" encoding="utf-8"?>
+<!--
+  ~ Copyright (C) 2019 Moez Bhatti <moez.bhatti@gmail.com>
+  ~
+  ~ This file is part of QKSMS.
+  ~
+  ~ QKSMS is free software: you can redistribute it and/or modify
+  ~ it under the terms of the GNU General Public License as published by
+  ~ the Free Software Foundation, either version 3 of the License, or
+  ~ (at your option) any later version.
+  ~
+  ~ QKSMS is distributed in the hope that it will be useful,
+  ~ but WITHOUT ANY WARRANTY; without even the implied warranty of
+  ~ MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+  ~ GNU General Public License for more details.
+  ~
+  ~ You should have received a copy of the GNU General Public License
+  ~ along with QKSMS.  If not, see <http://www.gnu.org/licenses/>.
+  -->
+<resources>
+    <string name="shortcut_compose_long_label">Nová konverzácia</string>
+    <string name="shortcut_compose_short_label">Nová správa</string>
+    <string name="shortcut_compose_disabled_message">Skratka je vypnutá</string>
+    <string name="title_archived">Archivované</string>
+    <string name="title_settings">Nastavenia</string>
+    <string name="title_notification_prefs">Upozornenia</string>
+    <string name="title_theme">Téma</string>
+    <string name="title_conversations">Hľadať správu&#8230;</string>
+    <string name="title_compose">Nová správa</string>
+    <string name="setup_skip">Preskočiť</string>
+    <string name="setup_next">Pokračovať</string>
+    <string name="menu_add_person">Pridať osobu</string>
+    <string name="menu_call">Volať</string>
+    <string name="menu_info">Podrobnosti</string>
+    <string name="menu_save">Uložiť do galérie</string>
+    <string name="menu_share">Zdielať</string>
+    <string name="main_drawer_open_cd">Otvoriť navigačné menu</string>
+    <string name="main_title_selected">%d vybraných</string>
+    <string name="main_menu_clear">Vymazať</string>
+    <string name="main_menu_archive">Archivovať</string>
+    <string name="main_menu_unarchive">Zrušiť archiváciu</string>
+    <string name="main_menu_delete">Odstrániť</string>
+    <string name="main_menu_add_contact">Pridať do kontaktov</string>
+    <string name="main_menu_pin">Pripnúť na začiatok</string>
+    <string name="main_menu_unpin">Odopnúť</string>
+    <string name="main_menu_read">Označiť ako prečítané</string>
+    <string name="main_menu_unread">Označiť ako neprečítané</string>
+    <string name="main_menu_block">Zablokovať</string>
+    <string name="main_syncing">Synchronizácia správ&#8230;</string>
+    <string name="main_sender_you">Vy: %s</string>
+    <string name="main_draft">Koncept</string>
+    <string name="main_message_results_title">Výsledky v správach</string>
+    <string name="main_message_results">%d správ</string>
+    <string name="inbox_empty_text">Tu sa zobrazia vaše konverzácie</string>
+    <string name="inbox_search_empty_text">Žiadne výsledky</string>
+    <string name="archived_empty_text">Tu sa zobrazia vaše archivované konverzácie</string>
+    <string name="main_fab_cd">Začať novú konverzáciu</string>
+    <string name="main_default_sms_title">Opäť si zamilujte písanie</string>
+    <string name="main_default_sms_message">Nastavte QKSMS ako predvolenú SMS aplikáciu</string>
+    <string name="main_default_sms_change">Zmeniť</string>
+    <string name="main_permission_required">Vyžadované povolenie</string>
+    <string name="main_permission_sms">QKSMS potrebuje povolenie posielať a zobrazovať správy SMS</string>
+    <string name="main_permission_contacts">QKSMS potrebuje povolenie na zobrazenie kontaktov</string>
+    <string name="main_permission_allow">Povoliť</string>
+    <string name="drawer_inbox">Doručené</string>
+    <string name="drawer_archived">Archivované</string>
+    <string name="drawer_scheduled">Naplánované</string>
+    <string name="drawer_blocking">Blokovanie</string>
+    <string name="drawer_more">Viac</string>
+    <string name="drawer_settings">Nastavenia</string>
+    <string name="drawer_help">Nápoveda &amp; spätná väzba</string>
+    <string name="drawer_invite">Pozvať priateľov</string>
+    <string name="drawer_plus_banner_summary">Odomknutie úžasné nové funkcie a podporte vývoj</string>
+    <string name="rate_title">Máte radi QKSMS?</string>
+    <string name="rate_summary">Podeľte sa o trochu lásky a ohodnoťte nás na Google Play!</string>
+    <string name="rate_okay">OUKEJ!</string>
+    <string name="rate_dismiss">ODMIETNUŤ</string>
+    <string name="dialog_delete_title">Zmazať</string>
+    <plurals name="dialog_delete_message">
+        <item quantity="one">Ste si istý, že chcete odstrániť túto konverzáciu?</item>
+        <item quantity="few">Ste si istý, že chcete odstrániť %d konverzácie?</item>
+        <item quantity="many">Ste si istý, že chcete odstrániť %d konverzácií?</item>
+        <item quantity="other">Ste si istý, že chcete odstrániť %d konverzácií?</item>
+    </plurals>
+    <string-array name="message_options">
+        <item>Kopírovať text</item>
+        <item>Preposlať</item>
+        <item>Odstrániť</item>
+    </string-array>
+    <string name="compose_number_picker_title">Vybrať telefónne číslo</string>
+    <string name="compose_number_picker_default">%s ∙ Východzie</string>
+    <string name="compose_number_picker_once">Iba raz</string>
+    <string name="compose_number_picker_always">Vždy</string>
+    <string name="compose_title_selected">%d vybratých</string>
+    <string name="compose_subtitle_results">%1$d z %2$d výsledkov</string>
+    <string name="compose_send_group_title">Poslať ako skupinovú správu</string>
+    <string name="compose_send_group_summary">Príjemcovia a odpovede budú viditeľné všetkým</string>
+    <string name="compose_messages_empty">Toto je začiatok vašej konverzácie. Napíšte niečo pekného!</string>
+    <string name="compose_vcard_label">Karta kontaktu</string>
+    <string name="compose_scheduled_for">Naplánované na</string>
+    <string name="compose_scheduled_future">Vybraný čas musí ešte len nastať!</string>
+    <string name="compose_scheduled_plus">Ak si prajete používať plánovanie správ, aktivujte si QKSMS+</string>
+    <string name="compose_scheduled_toast">Pridané do naplánovaných správ</string>
+    <string name="compose_hint">Napíšte správu&#8230;</string>
+    <string name="compose_menu_copy">Kopírovať text</string>
+    <string name="compose_menu_forward">Preposlať</string>
+    <string name="compose_menu_delete">Odstrániť</string>
+    <string name="compose_menu_previous">Predchádzajúci</string>
+    <string name="compose_menu_next">Ďalší</string>
+    <string name="compose_menu_clear">Vymazať</string>
+    <string name="compose_details_title">Detaily správy</string>
+    <string name="compose_details_type">Typ: %s</string>
+    <string name="compose_details_from">Od: %s</string>
+    <string name="compose_details_to">Pre: %s</string>
+    <string name="compose_details_subject">Predmet: %s</string>
+    <string name="compose_details_priority">Priorita: %s</string>
+    <string name="compose_details_size">Veľkosť: %s</string>
+    <string name="compose_details_sent">Odoslané: %s</string>
+    <string name="compose_details_received">Prijaté: %s</string>
+    <string name="compose_details_delivered">Doručené: %s</string>
+    <string name="compose_details_error_code">Kód chyby: %d</string>
+    <string name="compose_attach_cd">Pridať prílohu</string>
+    <string name="compose_gallery_cd">Priložiť fotografiu</string>
+    <string name="compose_camera_cd">Urobiť fotografiu</string>
+    <string name="compose_schedule_cd">Naplánovať správu</string>
+    <string name="compose_contact_cd">Pripojiť kontakt</string>
+    <string name="compose_contact_error">Chyba čítania kontaktu</string>
+    <!-- Example: SIM 1 (Verizon) selected-->
+    <string name="compose_sim_changed_toast">Vybrána SIM %1$d (%2$s)</string>
+    <string name="compose_sim_cd">%s vybrané, zmeňte SIM kartu</string>
+    <string name="compose_send_cd">Odoslať správu</string>
+    <string name="message_status_sending">Odosiela sa&#8230;</string>
+    <string name="message_status_delivered">Doručené %s</string>
+    <string name="message_status_failed">Odoslanie zlyhalo. Klepnutím skúste znovu</string>
+    <string name="info_title">Detaily</string>
+    <string name="info_copied_address">Adresa skopírovaná</string>
+    <string name="info_name">Názov konverzácie</string>
+    <string name="info_notifications">Upozornenia</string>
+    <string name="info_theme">Motív</string>
+    <string name="info_archive">Archivovať</string>
+    <string name="info_unarchive">Zrušiť archiváciu</string>
+    <string name="info_block">Blokovať</string>
+    <string name="info_unblock">Odblokovať</string>
+    <string name="info_delete">Odstrániť konverzáciu</string>
+    <string name="gallery_error">Súbor sa nepodarilo načítať</string>
+    <string name="gallery_toast_saved">Uložené do galérie</string>
+    <string name="backup_title">Záloha a obnovenie</string>
+    <string name="backup_backing_up">Zálohovanie správ</string>
+    <string name="backup_restoring">Obnovenie zo zálohy</string>
+    <string name="backup_last">Posledná záloha</string>
+    <string name="backup_loading">Načítavanie&#8230;</string>
+    <string name="backup_never">Nikdy</string>
+    <string name="backup_restore_title">Obnoviť</string>
+    <string name="backup_restore_summary">Zvoľte zálohu</string>
+    <string name="backup_restore_error_plus">Ak si prajete používať funkciu zálohovania a obnovy, prosím aktivujte si QKSMS+</string>
+    <string name="backup_restore_error_backup">Prebieha zálohovanie&#8230;</string>
+    <string name="backup_restore_error_restore">Prebieha obnova&#8230;</string>
+    <string name="backup_restore_confirm_title">Obnoviť zo zálohy</string>
+    <string name="backup_restore_confirm_message">Ste si istý obnovou všetkých správ z tejto zálohy?</string>
+    <string name="backup_restore_stop_title">Zastaviť obnovu</string>
+    <string name="backup_restore_stop_message">Už obnovené správy ostanú vo vašom zariadení</string>
+    <string name="backup_restore_dialog_title">Zálohy</string>
+    <string name="backup_restore_dialog_empty">Nenašli sa žiadne zálohy</string>
+    <plurals name="backup_message_count">
+        <item quantity="one">%d správa</item>
+        <item quantity="few">%d správy</item>
+        <item quantity="many">%d správ</item>
+        <item quantity="other">%d správ</item>
+    </plurals>
+    <string name="backup_disclaimer">Momentálne sú pre zálohovanie a obnovenie podporované iba SMS. MMS podpora a plánované zálohy budú pridané už čoskoro!</string>
+    <string name="backup_now">Zálohovať</string>
+    <string name="backup_progress_parsing">Analýza zálohy&#8230;</string>
+    <string name="backup_progress_running">%d/%d správ</string>
+    <string name="backup_progress_saving">Ukladá sa záloha&#8230;</string>
+    <string name="backup_progress_syncing">Synchronizácia správ&#8230;</string>
+    <string name="backup_progress_finished">Dokončené!</string>
+    <string name="backup_notification_channel_name">Zálohovanie a obnovenie</string>
+    <string name="scheduled_title">Naplánované</string>
+    <string name="scheduled_empty_description">Automaticky odošle správu v presnom okamihu, ktorý si prajete</string>
+    <string name="scheduled_empty_message_1">Nazdar! Kedy máš narodeniny?</string>
+    <string name="scheduled_empty_message_2">23. decembra</string>
+    <string name="scheduled_empty_message_3">Všetko najlepšie! Vidíš akého máš dobrého kamaráta, pamätám si tvoje narodeniny.</string>
+    <!--&#x200A; is a special character required at the end of this string to fix it's formatting in the app -->
+    <string name="scheduled_empty_message_3_timestamp">Pošle sa 23. decembra</string>
+    <string name="scheduled_compose_cd">Naplánovať správu</string>
+    <string name="scheduled_options_title">Naplánovaná správa</string>
+    <string-array name="scheduled_options">
+        <item>Odoslať teraz</item>
+        <item>Kopírovať text</item>
+        <item>Odstrániť</item>
+    </string-array>
+    <string name="settings_category_appearance">Vzhľad</string>
+    <string name="settings_category_general">Všeobecné</string>
+    <string name="settings_category_qkreply">Rýchla odpoveď</string>
+    <string name="settings_theme_title">Motív</string>
+    <string name="settings_night_title">Nočný režim</string>
+    <string name="settings_black_title">Čisto čierny nočný režim</string>
+    <string name="settings_night_start_title">Čas spustenia</string>
+    <string name="settings_night_end_title">Čas ukončenia</string>
+    <string name="settings_automatic_colors_title">Automatické farby kontaktov</string>
+    <string name="settings_text_size_title">Veľkosť písma</string>
+    <string name="settings_system_font_title">Použiť systémové písmo</string>
+    <string name="settings_auto_emoji_title">Automatické emoji</string>
+    <string name="settings_notifications_title">Upozornenia</string>
+    <string name="settings_notifications_o_summary">Klepnutím prizpôsobíte</string>
+    <string name="settings_notification_actions_title">Akcie</string>
+    <string name="settings_notification_action_1">Tlačidlo 1</string>
+    <string name="settings_notification_action_2">Tlačidlo 2</string>
+    <string name="settings_notification_action_3">Tlačidlo 3</string>
+    <string name="settings_notification_previews_title">Obsah upozornení</string>
+    <string name="settings_notification_wake_title">Rozsvietiť obrazovku</string>
+    <string name="settings_vibration_title">Vybrácie</string>
+    <string name="settings_ringtone_title">Zvuk</string>
+    <string name="settings_ringtone_none">Žiadny</string>
+    <string name="settings_qkreply_title">Rýchla odpoveď</string>
+    <string name="settings_qkreply_summary">Vyskakovacie okno pre nové správy</string>
+    <string name="settings_qkreply_tap_dismiss_title">Klepnutím zavriete</string>
+    <string name="settings_qkreply_tap_dismiss_summary">Zavriete klepnutím mimo vyskakovacie okno</string>
+    <string name="settings_delayed_title">Oneskorené odoslanie</string>
+    <string name="settings_swipe_actions">Akcie potiahnutím</string>
+    <string name="settings_swipe_actions_summary">Nastavenie akcií potiahnutím pre konverzácie</string>
+    <string name="settings_swipe_actions_right">Potiahnutie doprava</string>
+    <string name="settings_swipe_actions_left">Potiahnutie doľava</string>
+    <string name="settings_swipe_actions_change">ZMENIŤ</string>
+    <string-array name="settings_swipe_actions">
+        <item>Žiadny</item>
+        <item>Archivovať</item>
+        <item>Odstrániť</item>
+        <item>Zablokovať</item>
+        <item>Volať</item>
+        <item>Označiť ako prečítané</item>
+        <item>Označiť ako neprečítané</item>
+    </string-array>
+    <string name="settings_delivery_title">Potvrdenie o doručení</string>
+    <string name="settings_delivery_summary">Potvrdiť úspešné doručenie správy</string>
+    <string name="settings_signature_title">Podpis</string>
+    <string name="settings_signature_summary">Pridať podpis na koniec vašich správ</string>
+    <string name="settings_unicode_title">Odstrániť diakritiku</string>
+    <string name="settings_unicode_summary">Odstrániť diakritiku v odosielaných správach</string>
+    <string name="settings_mobile_title">Iba telefónne čísla</string>
+    <string name="settings_mobile_summary">Pri písaní správ, zobraziť iba telefónne čísla</string>
+    <string name="settings_auto_delete">Delete old messages automatically</string>
+    <string name="settings_auto_delete_dialog_message">Messages will be deleted after the specified number of days</string>
+    <string name="settings_auto_delete_dialog_hint">Number of days</string>
+    <string name="settings_auto_delete_never">Never</string>
+    <string name="settings_auto_delete_warning">Delete old messages automatically?</string>
+    <string name="settings_auto_delete_warning_message">If you proceed, %1$d messages will be deleted now</string>
+    <plurals name="settings_auto_delete_summary">
+        <item quantity="one">After 1 day</item>
+        <item quantity="few">After %d days</item>
+        <item quantity="many">After %d days</item>
+        <item quantity="other">After %d days</item>
+    </plurals>
+    <string name="settings_long_as_mms_title">Dlhé správy odoslať ako MMS</string>
+    <string name="settings_long_as_mms_summary">Ak zlyháva odosielanie dlhých správ alebo sú odoslané v nesprávnom poradí, môžete ich poslať ako MMS. Môžu byť účtované ďalšie poplatky.</string>
+    <string name="settings_mms_size_title">Automaticky komprimovať MMS prílohy</string>
+    <string name="settings_sync_title">Synchronizovať správy</string>
+    <string name="settings_sync_summary">Opätovne synchronizovať vaše správy s natívnou SMS databázou</string>
+    <string name="settings_about_title">O aplikácii QKSMS</string>
+    <string name="settings_version">Verzia %s</string>
+    <string name="settings_logging_enabled">Ladiace záznamy povolené</string>
+    <string name="settings_logging_disabled">Ladiace záznamy vypnuté</string>
+    <string name="settings_delay_duration_hint">Zadajte trvanie v sekundách</string>
+    <string name="blocking_title">Blokovanie</string>
+    <string name="blocking_drop_title">Zahodiť správy</string>
+    <string name="blocking_drop_summary">Zahodiť prichádzajúce správy od blokovaných odosielateľov namiesto ich skrytia.</string>
+    <string name="blocking_conversations">Blokované konverzácie</string>
+    <string name="blocking_manager_title">Správca blokovaní</string>
+    <string name="blocking_manager_qksms_title">QKSMS</string>
+    <string name="blocking_manager_qksms_summary">Vstavané blokovanie v QKSMS</string>
+    <string name="blocking_manager_call_control_summary">Automaticky filtrujte svoje hovory a správy na jednom mieste! Community IQ™ vám poskytuje ochranu pred spamom od komunitou označených spammerov.</string>
+    <string name="blocking_manager_sia_summary">Automaticky filtrovať správy od nevyžiadaných čísiel pomocou aplikácie \"Should I Answer?\"</string>
+    <string name="blocking_manager_copy_title">Kopírovať blokované čísla</string>
+    <string name="blocking_manager_copy_summary">Pokračovať do %s a skopírovať existujúce zablokované čísla</string>
+    <string name="blocked_numbers_title">Blokované čísla</string>
+    <string name="blocked_numbers_empty">Tu sa objavia vami blokované čísla</string>
+    <string name="blocked_numbers_add_cd">Zablokovať nové číslo</string>
+    <string name="blocked_numbers_dialog_title">Zablokovať správy od</string>
+    <string name="blocked_numbers_dialog_hint">Telefónne číslo</string>
+    <string name="blocked_numbers_dialog_block">Zablokovať</string>
+    <string name="blocked_messages_title">Blokované správy</string>
+    <string name="blocked_messages_empty">Tu sa objavia vami blokované čísla</string>
+    <string name="blocking_block_title">Zablokovať</string>
+    <string name="blocking_unblock_title">Odblokovať</string>
+    <plurals name="blocking_block_external">
+        <item quantity="one">Pokračovať na %s a zablokovať toto číslo</item>
+        <item quantity="few">Pokračovať na %s a zablokovať tieto čísla</item>
+        <item quantity="many">Pokračovať na %s a zablokovať tieto čísla</item>
+        <item quantity="other">Pokračovať na %s a zablokovať tieto čísla</item>
+    </plurals>
+    <plurals name="blocking_unblock_external">
+        <item quantity="one">Pokračovať na %s a povoliť toto číslo</item>
+        <item quantity="few">Pokračovať na %s a povoliť tieto čísla</item>
+        <item quantity="many">Pokračovať na %s a povoliť tieto čísla</item>
+        <item quantity="other">Pokračovať na %s a povoliť tieto čísla</item>
+    </plurals>
+    <string name="about_title">O aplikácii</string>
+    <string name="about_version_title">Verzia</string>
+    <string name="about_developer_title">Vývojár</string>
+    <string name="about_source_title">Zdrojový kód</string>
+    <string name="about_changelog_title">Zoznam zmien</string>
+    <string name="about_contact_title">Konktakt</string>
+    <string name="about_license_title">Licencia</string>
+    <string name="about_copyright_title">Autorské práva</string>
+    <string name="qksms_plus_description_title">Podporiť vývoj, odomknúť všetko</string>
+    <string name="qksms_plus_description_summary">Môžete zachrániť hladujúceho vývojára iba za %s</string>
+    <!-- Substitutions are for price and currency. Ex: Lifetime upgrade for $1.99 USD -->
+    <string name="qksms_plus_upgrade">Doživotná aktivácia za %1$s %2$s</string>
+    <!-- Substitutions are for price and currency. Ex: Unlock + donate for $4.99 USD -->
+    <string name="qksms_plus_upgrade_donate">Odomknúť + darovať za %1$s %2$s</string>
+    <string name="qksms_plus_thanks_title">Ďakujeme, že ste podporili  QKSMS!</string>
+    <string name="qksms_plus_thanks_summary">Odteraz máte prístup ku všetkým QKSMS+ funkciám</string>
+    <string name="qksms_plus_free_title">QKSMS+ je zdarma pre používateľov F-Droid! Ak si prajete podporiť vývoj, neváhajte prispieť.</string>
+    <string name="qksms_plus_donate">Prispieť cez PayPal</string>
+    <string name="qksms_plus_coming_soon">Už čoskoro</string>
+    <string name="qksms_plus_themes_title">Prémiové témy</string>
+    <string name="qksms_plus_themes_summary">Odomknúť nádherné farebné témy, ktoré nie sú dostupné v Material Design palete </string>
+    <string name="qksms_plus_emoji_title">Vlastné automatické emoji</string>
+    <string name="qksms_plus_emoji_summary">Vytvorte si skratku pre vlastné automatické emoji</string>
+    <string name="qksms_plus_backup_title">Zálohovanie správ</string>
+    <string name="qksms_plus_backup_summary">Automaticky zálohujte svoje správy. Už sa nemusíte obávať straty správ pri strate alebo výmene telefónu</string>
+    <string name="qksms_plus_scheduled_title">Plánované správy</string>
+    <string name="qksms_plus_scheduled_summary">Plánované správy budú automaticky odoslané v určený dátum a čas</string>
+    <string name="qksms_plus_delayed_title">Oneskorené odoslanie</string>
+    <string name="qksms_plus_delayed_summary">Vyčkať pár sekúnd pred odoslaním správy</string>
+    <string name="qksms_plus_night_title">Automatický nočný režim</string>
+    <string name="qksms_plus_night_summary">Zapnutie nočného režimu podľa dennej doby</string>
+    <string name="qksms_plus_blacklist_title">Rozšírené blokovanie</string>
+    <string name="qksms_plus_blacklist_summary">Blokujte správy, ktoré obsahujú kľúčové slová, alebo odpovedajú vzoru</string>
+    <string name="qksms_plus_forward_title">Automatické preposlanie</string>
+    <string name="qksms_plus_forward_summary">Automaticky preposlať správy od určitých odosielateľov</string>
+    <string name="qksms_plus_respond_title">Automatická odpoveď</string>
+    <string name="qksms_plus_respond_summary">Automaticky odpovedať na príchodzie správy s prednastavenou odpoveďou</string>
+    <string name="qksms_plus_more_title">Viac</string>
+    <string name="qksms_plus_more_summary">QKSMS je v aktívnom vývoji a váš nákup bude obsahovať aj všetky budúce QKSMS+ funkcie!</string>
+    <string name="widget_loading">Načítavanie&#8230;</string>
+    <string name="widget_more">Zobraziť viacej konverácií</string>
+    <string name="qkreply_menu_read">Označiť ako prečítané</string>
+    <string name="qkreply_menu_call">Volať</string>
+    <string name="qkreply_menu_delete">Odstrániť</string>
+    <string name="qkreply_menu_expand">Zobraziť viac</string>
+    <string name="qkreply_menu_collapse">Zobraziť menej</string>
+    <string name="qkreply_menu_view">Otvoriť konverzáciu</string>
+    <string name="theme_material">Materiál</string>
+    <string name="theme_hex">HEX</string>
+    <string name="theme_apply">Použiť</string>
+    <string-array name="notification_actions">
+        <item>Žiadny</item>
+        <item>Archivovať</item>
+        <item>Odstrániť</item>
+        <item>Zablokovať</item>
+        <item>Volať</item>
+        <item>Označiť ako prečítané</item>
+        <item>Odpovedať</item>
+    </string-array>
+    <string name="button_yes">Áno</string>
+    <string name="button_continue">Pokračovať</string>
+    <string name="button_cancel">Zrušiť</string>
+    <string name="button_delete">Odstrániť</string>
+    <string name="button_save">Uložiť</string>
+    <string name="button_stop">Zastaviť</string>
+    <string name="button_more">Viac</string>
+    <string name="button_set">Nastaviť</string>
+    <string name="button_undo">Vrátiť späť</string>
+    <string name="toast_copied">Skopírované</string>
+    <string name="toast_archived">Archivované konverzácie</string>
+    <string name="toast_qksms_plus">Pre použitie aktivujte QKSMS+</string>
+    <plurals name="notification_new_messages">
+        <item quantity="one">Nová správa</item>
+        <item quantity="few">%s nové správy</item>
+        <item quantity="many">%s nových správ</item>
+        <item quantity="other">%s nových správ</item>
+    </plurals>
+    <string name="notification_message_failed_title">Správa nebola odoslaná</string>
+    <string name="notification_message_failed_text">Zlyhalo odoslanie správy pre %s</string>
+    <string-array name="night_modes">
+        <item>Systém</item>
+        <item>Vypnuté</item>
+        <item>Vždy zapnuté</item>
+        <item>Automaticky</item>
+    </string-array>
+    <string-array name="notification_preview_options">
+        <item>Zobraziť meno a správu</item>
+        <item>Zobraziť meno</item>
+        <item>Skryť obsah</item>
+    </string-array>
+    <string-array name="text_sizes">
+        <item>Malý</item>
+        <item>Stredný</item>
+        <item>Veľký</item>
+        <item>Najväčší</item>
+    </string-array>
+    <string-array name="delayed_sending_labels">
+        <item>Bez oneskorenia</item>
+        <item>3 sekundy</item>
+        <item>5 sekúnd</item>
+        <item>10 sekúnd</item>
+    </string-array>
+    <string-array name="mms_sizes">
+        <item>Automaticky</item>
+        <item>100 kB</item>
+        <item>200 kB</item>
+        <item>300 kB</item>
+        <item>600 kB</item>
+        <item>1 000 kB</item>
+        <item>2 000 kB</item>
+        <item>Bez kompresie</item>
+    </string-array>
+    <string-array name="qk_responses">
+        <item>V poriadku</item>
+        <item>Ešte chvíľku</item>
+        <item>Som na ceste</item>
+        <item>Vďaka</item>
+        <item>Môže byť</item>
+        <item>Čo sa deje?</item>
+        <item>Súhlasím</item>
+        <item>Nie</item>
+        <item>Ľúbim ťa</item>
+        <item>Ospravedlňujem sa</item>
+        <item>LOL</item>
+        <item>To je v poriadku</item>
+    </string-array>
+</resources>
diff --git a/presentation/src/main/res/values-sl/strings.xml b/presentation/src/main/res/values-sl/strings.xml
index 593a3ac58..e04711129 100644
--- a/presentation/src/main/res/values-sl/strings.xml
+++ b/presentation/src/main/res/values-sl/strings.xml
@@ -1,423 +1,423 @@
-<?xml version="1.0" encoding="utf-8"?>
-<!--
-  ~ Copyright (C) 2019 Moez Bhatti <moez.bhatti@gmail.com>
-  ~
-  ~ This file is part of QKSMS.
-  ~
-  ~ QKSMS is free software: you can redistribute it and/or modify
-  ~ it under the terms of the GNU General Public License as published by
-  ~ the Free Software Foundation, either version 3 of the License, or
-  ~ (at your option) any later version.
-  ~
-  ~ QKSMS is distributed in the hope that it will be useful,
-  ~ but WITHOUT ANY WARRANTY; without even the implied warranty of
-  ~ MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
-  ~ GNU General Public License for more details.
-  ~
-  ~ You should have received a copy of the GNU General Public License
-  ~ along with QKSMS.  If not, see <http://www.gnu.org/licenses/>.
-  -->
-<resources>
-    <string name="shortcut_compose_long_label">Nov pogovor</string>
-    <string name="shortcut_compose_short_label">Sestavi</string>
-    <string name="shortcut_compose_disabled_message">Bližnjica onemogočena</string>
-    <string name="title_archived">Arhivirano</string>
-    <string name="title_settings">Nastavitve</string>
-    <string name="title_notification_prefs">Obvestila</string>
-    <string name="title_theme">Tema</string>
-    <string name="title_conversations">Išči po prejetih sporočilih&#8230;</string>
-    <string name="title_compose">Vnesi ime ali številko</string>
-    <string name="setup_skip">Preskoči</string>
-    <string name="setup_next">Nadaljuj</string>
-    <string name="menu_add_person">Dodaj osebo</string>
-    <string name="menu_call">Klic</string>
-    <string name="menu_info">Podrobnosti</string>
-    <string name="menu_save">Shrani v galerijo</string>
-    <string name="menu_share">Deli</string>
-    <string name="main_drawer_open_cd">Odpri nacigacijski meni</string>
-    <string name="main_title_selected">%d izbranih</string>
-    <string name="main_menu_clear">Počisti</string>
-    <string name="main_menu_archive">Arhiv</string>
-    <string name="main_menu_unarchive">Odstrani iz arhiva</string>
-    <string name="main_menu_delete">Izbriši</string>
-    <string name="main_menu_add_contact">Shrani v imenik</string>
-    <string name="main_menu_pin">Pripni na vrh</string>
-    <string name="main_menu_unpin">Odpni</string>
-    <string name="main_menu_read">Mark read</string>
-    <string name="main_menu_unread">Mark unread</string>
-    <string name="main_menu_block">Blokiraj</string>
-    <string name="main_syncing">Sinhroniziranje sporočil&#8230;</string>
-    <string name="main_sender_you">Vi: %s</string>
-    <string name="main_draft">Osnutek</string>
-    <string name="main_message_results_title">Rezultati v sporočilih</string>
-    <string name="main_message_results">%d sporočil</string>
-    <string name="inbox_empty_text">Vaši pogovori se bodo pojavili tukaj</string>
-    <string name="inbox_search_empty_text">Ni rezultatov</string>
-    <string name="archived_empty_text">Vaši arhivirani pogovori se bodo pojavili tukaj</string>
-    <string name="main_fab_cd">Začni nov pogovor</string>
-    <string name="main_default_sms_title">Znova vzljubite sporočanje</string>
-    <string name="main_default_sms_message">Napravi QKSMS privzet program za sporočanje</string>
-    <string name="main_default_sms_change">Spremeni</string>
-    <string name="main_permission_required">Potrebno dovoljenje</string>
-    <string name="main_permission_sms">QKSMS potrebuje dovoljenje za pošiljanje in branje SMS sporočil</string>
-    <string name="main_permission_contacts">QKSMS potrebuje dovoljenje za dostop do stikov</string>
-    <string name="main_permission_allow">Dovoli</string>
-    <string name="drawer_inbox">Prejeto</string>
-    <string name="drawer_archived">Arhiv</string>
-    <string name="drawer_scheduled">Načrtovano</string>
-    <string name="drawer_blocking">Blokiranje</string>
-    <string name="drawer_more">Več</string>
-    <string name="drawer_settings">Nastavitve</string>
-    <string name="drawer_help">Pošlji povratne informacije</string>
-    <string name="drawer_invite">Povabi prijatelje</string>
-    <string name="drawer_plus_banner_summary">Odkleni neverjetne nove funkcije in podpri razvoj</string>
-    <string name="rate_title">Uživate v QKSMS?</string>
-    <string name="rate_summary">Deli nekaj ljubezni in nas oceni na Google Play!</string>
-    <string name="rate_okay">V REDU!</string>
-    <string name="rate_dismiss">OPUSTI</string>
-    <string name="dialog_delete_title">Izbriši</string>
-    <plurals name="dialog_delete_message">
-        <item quantity="one">Ali ste prepričani, da želite izbrisati %d pogovor?</item>
-        <item quantity="two">Ali ste prepričani, da želite izbrisati %d pogovora?</item>
-        <item quantity="few">Ali ste prepričani, da želite izbrisati %d pogovorov?</item>
-        <item quantity="other">Ali ste prepričani, da želite izbrisati %d pogovorov?</item>
-    </plurals>
-    <string-array name="message_options">
-        <item>Kopiraj besedilo</item>
-        <item>Naprej</item>
-        <item>Izbriši</item>
-    </string-array>
-    <string name="compose_number_picker_title">Izberi telefonsko številko</string>
-    <string name="compose_number_picker_default">%s ∙ Privzeto</string>
-    <string name="compose_number_picker_once">Samo enkrat</string>
-    <string name="compose_number_picker_always">Vedno</string>
-    <string name="compose_title_selected">%d izbran</string>
-    <string name="compose_subtitle_results">%1$d od %2$d rezultatov</string>
-    <string name="compose_send_group_title">Pošlji kot skupinsko sporočilo</string>
-    <string name="compose_send_group_summary">Prejemniki in odgovori bodo vidni vsem</string>
-    <string name="compose_messages_empty">To je začetek vašega pogovora. Povej nekaj lepega!</string>
-    <string name="compose_vcard_label">Kontaktna kartica</string>
-    <string name="compose_scheduled_for">Načrtovano za</string>
-    <string name="compose_scheduled_future">Izbran čas mora biti v prihodnosti!</string>
-    <string name="compose_scheduled_plus">Da lahko uporabiš načrtovano sporočanje, moraš odkleniti QKSMS+</string>
-    <string name="compose_scheduled_toast">Dodano k načrtovanim sporočilom</string>
-    <string name="compose_hint">Napiši sporočilo&#8230;</string>
-    <string name="compose_menu_copy">Kopiraj besedilo</string>
-    <string name="compose_menu_forward">Naprej</string>
-    <string name="compose_menu_delete">Izbriši</string>
-    <string name="compose_menu_previous">Prejšnje</string>
-    <string name="compose_menu_next">Naslednje</string>
-    <string name="compose_menu_clear">Počisti</string>
-    <string name="compose_details_title">Podrobnosti sporočila</string>
-    <string name="compose_details_type">Vnesi: %s</string>
-    <string name="compose_details_from">Od: %s</string>
-    <string name="compose_details_to">Za: %s</string>
-    <string name="compose_details_subject">Zadeva %s</string>
-    <string name="compose_details_priority">Prioriteta: %s</string>
-    <string name="compose_details_size">Velikost: %s</string>
-    <string name="compose_details_sent">Poslano: %s</string>
-    <string name="compose_details_received">Prejeto: %s</string>
-    <string name="compose_details_delivered">Dostavljeno: %s</string>
-    <string name="compose_details_error_code">Koda napake: %d</string>
-    <string name="compose_attach_cd">Vstavi priponko</string>
-    <string name="compose_gallery_cd">Vstavi sliko</string>
-    <string name="compose_camera_cd">Zajemi sliko</string>
-    <string name="compose_schedule_cd">Načrtuj sporočilo</string>
-    <string name="compose_contact_cd">Vstavi stik</string>
-    <string name="compose_contact_error">Napaka pri branju stika</string>
-    <!-- Example: SIM 1 (Verizon) selected-->
-    <string name="compose_sim_changed_toast">SIM %1$d (%2$s) selected</string>
-    <string name="compose_sim_cd">%s izbran, zamenjaj kartico SIM</string>
-    <string name="compose_send_cd">Pošlji sporočilo</string>
-    <string name="message_status_sending">Pošiljanje&#8230;</string>
-    <string name="message_status_delivered">Dostavljeno %s</string>
-    <string name="message_status_failed">Napaka pri pošiljanju. Pritisni za ponovni poskus</string>
-    <string name="info_title">Podrobnosti</string>
-    <string name="info_copied_address">Naslov kopiran</string>
-    <string name="info_name">Naslov pogovora</string>
-    <string name="info_notifications">Obvestila</string>
-    <string name="info_theme">Teme</string>
-    <string name="info_archive">Arhiv</string>
-    <string name="info_unarchive">Ostrani iz arhiva</string>
-    <string name="info_block">Blokiraj</string>
-    <string name="info_unblock">Odblokiraj</string>
-    <string name="info_delete">Izbriši pogovor</string>
-    <string name="gallery_error">Napaka pri nalaganju večpredstavnosti</string>
-    <string name="gallery_toast_saved">Shranjeno v galerijo</string>
-    <string name="backup_title">Varnostna kopija in obnovitev</string>
-    <string name="backup_backing_up">Ustvarjanje varnostne kopije sporočil</string>
-    <string name="backup_restoring">Obnovitev varnostne kopije</string>
-    <string name="backup_last">Zadnja varnostna kopija</string>
-    <string name="backup_loading">Nalaganje&#8230;</string>
-    <string name="backup_never">Nikoli</string>
-    <string name="backup_restore_title">Obnovi</string>
-    <string name="backup_restore_summary">Izberi varnostno kopijo</string>
-    <string name="backup_restore_error_plus">Prosimo odklenite QKSMS+ da omogočite uporabo varnostnih kopij in njihove obnove</string>
-    <string name="backup_restore_error_backup">Varnostna kopija se izvaja&#8230;</string>
-    <string name="backup_restore_error_restore">Obnavljanje varnostne kopije se izvaja&#8230;</string>
-    <string name="backup_restore_confirm_title">Obnovi iz varnotsne kopije</string>
-    <string name="backup_restore_confirm_message">Ali ste prepričani, da želite obnoviti sporočila iz te varnostne kopije?</string>
-    <string name="backup_restore_stop_title">Prekliči obnovitev varnostne kopije</string>
-    <string name="backup_restore_stop_message">Sporočila, ki so že bila obnovljena, bodo ostala na vaši napravi</string>
-    <string name="backup_restore_dialog_title">Varnostne kopije</string>
-    <string name="backup_restore_dialog_empty">Ni najdenih varnostnih kopij</string>
-    <plurals name="backup_message_count">
-        <item quantity="one">%d sporočilo</item>
-        <item quantity="two">%d sporočila</item>
-        <item quantity="few">%d sporočil</item>
-        <item quantity="other">%d sporočila</item>
-    </plurals>
-    <string name="backup_disclaimer">Trenutno so za ustvarjanje in obnovo varnostnih kopij podprta le sporočila SMS. MMS podpora in varnostne kopije pridejo kmalu!</string>
-    <string name="backup_now">Ustvari varnostno kopijo</string>
-    <string name="backup_progress_parsing">Razčlenjevanje varnostne kopije&#8230;</string>
-    <string name="backup_progress_running">%d/%d sporočil</string>
-    <string name="backup_progress_saving">Shranjevanje varnostne kopije&#8230;</string>
-    <string name="backup_progress_syncing">Sinhroniziranje sporočil&#8230;</string>
-    <string name="backup_progress_finished">Končano!</string>
-    <string name="backup_notification_channel_name">Varnostna kopija in obnovitev</string>
-    <string name="scheduled_title">Načrtovano</string>
-    <string name="scheduled_empty_description">Samodejno pošlji sporočilo ob nastavljenem točno določenem trenutku</string>
-    <string name="scheduled_empty_message_1">Hej! Kdaj je že tvoj rojstni dan?</string>
-    <string name="scheduled_empty_message_2">Je 23. Decembra</string>
-    <string name="scheduled_empty_message_3">Vse najboljše! Poglej kako dober prijatelj sem, da se spomnim tvojega rojstnega dneva</string>
-    <!--&#x200A; is a special character required at the end of this string to fix it's formatting in the app -->
-    <string name="scheduled_empty_message_3_timestamp">Pošiljanje na 23. December</string>
-    <string name="scheduled_compose_cd">Načrtuj sporočilo</string>
-    <string name="scheduled_options_title">Načrtovano sporočilo</string>
-    <string-array name="scheduled_options">
-        <item>Pošlji sedaj</item>
-        <item>Kopiraj besedilo</item>
-        <item>Izbriši</item>
-    </string-array>
-    <string name="settings_category_appearance">Izgled</string>
-    <string name="settings_category_general">Glavno</string>
-    <string name="settings_category_qkreply">QK Odgovor</string>
-    <string name="settings_theme_title">Teme</string>
-    <string name="settings_night_title">Nočni način</string>
-    <string name="settings_black_title">Črn nočni način</string>
-    <string name="settings_night_start_title">Začetni čas</string>
-    <string name="settings_night_end_title">Čas končanja</string>
-    <string name="settings_automatic_colors_title">Samodejne barve stikov</string>
-    <string name="settings_text_size_title">Velikost pisave</string>
-    <string name="settings_system_font_title">Uporabi sistemsko pisavo</string>
-    <string name="settings_auto_emoji_title">Samodejni čustvenček</string>
-    <string name="settings_notifications_title">Obvestila</string>
-    <string name="settings_notifications_o_summary">Tapni za prilagoditev</string>
-    <string name="settings_notification_actions_title">Dejanja</string>
-    <string name="settings_notification_action_1">Gumb 1</string>
-    <string name="settings_notification_action_2">Gumb 2</string>
-    <string name="settings_notification_action_3">Gumb 3</string>
-    <string name="settings_notification_previews_title">Predogledi obvestil</string>
-    <string name="settings_notification_wake_title">Zbudi zaslon</string>
-    <string name="settings_vibration_title">Vibriranje</string>
-    <string name="settings_ringtone_title">Zvok</string>
-    <string name="settings_ringtone_none">Brez</string>
-    <string name="settings_qkreply_title">QK Odgovor</string>
-    <string name="settings_qkreply_summary">Pojavno obvestilo za nova sporočila</string>
-    <string name="settings_qkreply_tap_dismiss_title">Tapni da opustiš</string>
-    <string name="settings_qkreply_tap_dismiss_summary">Tapni izven obvestila, da ga zapreš</string>
-    <string name="settings_delayed_title">Zakasnjeno sporočanje</string>
-    <string name="settings_swipe_actions">Dejanja drsenja</string>
-    <string name="settings_swipe_actions_summary">Nastavi dejanja drsenja za pogovore</string>
-    <string name="settings_swipe_actions_right">Podrsaj desno</string>
-    <string name="settings_swipe_actions_left">Podrsaj levo</string>
-    <string name="settings_swipe_actions_change">SPREMENI</string>
-    <string-array name="settings_swipe_actions">
-        <item>Brez</item>
-        <item>Arhiviraj</item>
-        <item>Izbriši</item>
-        <item>Block</item>
-        <item>Call</item>
-        <item>Mark read</item>
-        <item>Mark unread</item>
-    </string-array>
-    <string name="settings_delivery_title">Potrditev dostavitve sporočila</string>
-    <string name="settings_delivery_summary">Potrdi, da so bila sporočila dostavljena uspešno</string>
-    <string name="settings_signature_title">Podpis</string>
-    <string name="settings_signature_summary">Dodaj podpis na konec vaših sporočil</string>
-    <string name="settings_unicode_title">Odstrani narečja</string>
-    <string name="settings_unicode_summary">Odstrani narečja iz besedila odhodnih SMS sporočil</string>
-    <string name="settings_mobile_title">Samo telefonske številke</string>
-    <string name="settings_mobile_summary">Ko sestavljaš sporočilo, prikaži samo telefonske številke</string>
-    <string name="settings_auto_delete">Delete old messages automatically</string>
-    <string name="settings_auto_delete_dialog_message">Messages will be deleted after the specified number of days</string>
-    <string name="settings_auto_delete_dialog_hint">Number of days</string>
-    <string name="settings_auto_delete_never">Never</string>
-    <string name="settings_auto_delete_warning">Delete old messages automatically?</string>
-    <string name="settings_auto_delete_warning_message">If you proceed, %1$d messages will be deleted now</string>
-    <plurals name="settings_auto_delete_summary">
-        <item quantity="one">After 1 day</item>
-        <item quantity="two">After %d days</item>
-        <item quantity="few">After %d days</item>
-        <item quantity="other">After %d days</item>
-    </plurals>
-    <string name="settings_long_as_mms_title">Pošlji dolga sporočila kot MMS</string>
-    <string name="settings_long_as_mms_summary">Če se vaša daljša sporočila ne pošljejo, ali se pošiljajo v napačnem vrstnem redu, jih lahko pošljete kot MMS sporočilo. To lahko povzroči dodatne stroške</string>
-    <string name="settings_mms_size_title">Samodejno stisni MMS priponke</string>
-    <string name="settings_sync_title">Sinhroniziraj sporočila</string>
-    <string name="settings_sync_summary">Znova sinhroniziraj sporočila s sistemsko SMS bazo</string>
-    <string name="settings_about_title">Več o QKSMS</string>
-    <string name="settings_version">Različica %s</string>
-    <string name="settings_logging_enabled">Beleženje dnevnika za odpravljanje napak omogočeno</string>
-    <string name="settings_logging_disabled">Beleženje dnevnika za odpravljanje napak onemogočeno</string>
-    <string name="settings_delay_duration_hint">Vnesi trajanje (v sekundah)</string>
-    <string name="blocking_title">Blokiranje</string>
-    <string name="blocking_drop_title">Opusti sporočila</string>
-    <string name="blocking_drop_summary">Opusti prihajajoča sporočila blokiranih pošiljateljev, namesto da jih skriješ</string>
-    <string name="blocking_conversations">Blokirani pogovori</string>
-    <string name="blocking_manager_title">Upravljalnik Blokiranja</string>
-    <string name="blocking_manager_qksms_title">QKSMS</string>
-    <string name="blocking_manager_qksms_summary">Vgrajena sposobnost blokiranja v QKSMS</string>
-    <string name="blocking_manager_call_control_summary">Samodejno razvrstite vaše klice in sporočila v eno priročno mesto! Skupnostni IQ™ omogoča, da preprečite prejemanje sporočil pošiljateljev neželenih sporočil, kateri so skupnosti poznani</string>
-    <string name="blocking_manager_sia_summary">Samodejno razvrstite sporočila neželenih številk tako, da uporabiš \"Should I Answer\" aplikacijo</string>
-    <string name="blocking_manager_copy_title">Kopiraj blokirane številke</string>
-    <string name="blocking_manager_copy_summary">Nadaljuj z %s in kopiraj obstoječe blokirane številke</string>
-    <string name="blocked_numbers_title">Blokirane številke</string>
-    <string name="blocked_numbers_empty">Vaše blokirane številke se bodo pojavile tukaj</string>
-    <string name="blocked_numbers_add_cd">Blokiraj novo številko</string>
-    <string name="blocked_numbers_dialog_title">Blokiraj besedila od</string>
-    <string name="blocked_numbers_dialog_hint">Telefonska številka</string>
-    <string name="blocked_numbers_dialog_block">Blokirano</string>
-    <string name="blocked_messages_title">Blokirana sporočila</string>
-    <string name="blocked_messages_empty">Blokirana sporočila bodo prikazana tukaj</string>
-    <string name="blocking_block_title">Blokiraj</string>
-    <string name="blocking_unblock_title">Odblokiraj</string>
-    <plurals name="blocking_block_external">
-        <item quantity="one">Nadaljuj z %s in blokiraj to številko</item>
-        <item quantity="two">Nadaljuj z %s in blokiraj ti številki</item>
-        <item quantity="few">Nadaljuj z %s in blokiraj te številke</item>
-        <item quantity="other">Nadaljuj z %s in blokiraj te številke</item>
-    </plurals>
-    <plurals name="blocking_unblock_external">
-        <item quantity="one">Nadaljuj z %s in dovoli to številko</item>
-        <item quantity="two">Nadaljuj z %s in dovoli ti številki</item>
-        <item quantity="few">Nadaljuj z %s in dovoli te številke</item>
-        <item quantity="other">Nadaljuj z %s in dovoli te številke</item>
-    </plurals>
-    <string name="about_title">O aplikaciji</string>
-    <string name="about_version_title">Različica</string>
-    <string name="about_developer_title">Razvijalec</string>
-    <string name="about_source_title">Izvirna koda</string>
-    <string name="about_changelog_title">Dnevnik sprememb</string>
-    <string name="about_contact_title">Stik</string>
-    <string name="about_license_title">Licenca</string>
-    <string name="about_copyright_title">Avtorske pravice</string>
-    <string name="qksms_plus_description_title">Podpri razvoj, odkleni vse</string>
-    <string name="qksms_plus_description_summary">Že s %s lahko rešiš stradajočega razvijalca</string>
-    <!-- Substitutions are for price and currency. Ex: Lifetime upgrade for $1.99 USD -->
-    <string name="qksms_plus_upgrade">Doživljenjska nadgradnja za %1$s %2$s</string>
-    <!-- Substitutions are for price and currency. Ex: Unlock + donate for $4.99 USD -->
-    <string name="qksms_plus_upgrade_donate">Odkleni + doniraj za %1$s %2$s</string>
-    <string name="qksms_plus_thanks_title">Hvala da podpirate QKSMS!</string>
-    <string name="qksms_plus_thanks_summary">Zdaj imate dostop do vseh QKSMS+ funkcij</string>
-    <string name="qksms_plus_free_title">QKSMS+ je brezplačen za F-Droid uporabnike! Če želite podpirati razvoj, so donacije zelo dobrodošle.</string>
-    <string name="qksms_plus_donate">Doniraj preko PayPal</string>
-    <string name="qksms_plus_coming_soon">Prihaja kmalu</string>
-    <string name="qksms_plus_themes_title">Premium teme</string>
-    <string name="qksms_plus_themes_summary">Odkleni čudovite barve tem, ki niso vidne na paleti materialnega dizajna</string>
-    <string name="qksms_plus_emoji_title">Auto-čustvenček po meri</string>
-    <string name="qksms_plus_emoji_summary">Ustvari avto-čustvenček bližnjico po meri</string>
-    <string name="qksms_plus_backup_title">Varnostna kopija sporočila</string>
-    <string name="qksms_plus_backup_summary">Samodejno varnostno kopiraj sporočila. Nikoli več ne skrbi za izgubljeno zgodovino, če zamenjaš ali izgubiš telefon</string>
-    <string name="qksms_plus_scheduled_title">Načrtovana sporočila</string>
-    <string name="qksms_plus_scheduled_summary">Načrtuj, da bodo sporočila poslana ob določenem datumu in času</string>
-    <string name="qksms_plus_delayed_title">Zakasnjeno pošiljanje</string>
-    <string name="qksms_plus_delayed_summary">Počakaj nekaj sekund, preden pošlješ svoje sporočilo</string>
-    <string name="qksms_plus_night_title">Samodejni temni način</string>
-    <string name="qksms_plus_night_summary">Omogoči temni način, glede na čas dneva</string>
-    <string name="qksms_plus_blacklist_title">Napredno blokiranje</string>
-    <string name="qksms_plus_blacklist_summary">Blokiraj sporočila, ki vsebujejo ključne besede ali se ujemajo z vzorci</string>
-    <string name="qksms_plus_forward_title">Samodejno-posreduj</string>
-    <string name="qksms_plus_forward_summary">Samodejno posreduj sporočila določenih pošiljateljev</string>
-    <string name="qksms_plus_respond_title">Samodejen odgovor</string>
-    <string name="qksms_plus_respond_summary">Samodejno odgovori na prihajajoča sporočila s prednastavljenim sporočilom</string>
-    <string name="qksms_plus_more_title">Več</string>
-    <string name="qksms_plus_more_summary">QKSMS je pod aktivnim razvojem in vaš nakup QKSMS+ bo vseboval vse prihodnje funkcije!</string>
-    <string name="widget_loading">Nalaganje&#8230;</string>
-    <string name="widget_more">Poglej več pogovorov</string>
-    <string name="qkreply_menu_read">Mark read</string>
-    <string name="qkreply_menu_call">Pokliči</string>
-    <string name="qkreply_menu_delete">Izbriši</string>
-    <string name="qkreply_menu_expand">Pokaži več</string>
-    <string name="qkreply_menu_collapse">Pokaži manj</string>
-    <string name="qkreply_menu_view">Odpri pogovor</string>
-    <string name="theme_material">Material</string>
-    <string name="theme_hex">HEX</string>
-    <string name="theme_apply">Potrdi</string>
-    <string-array name="notification_actions">
-        <item>Brez</item>
-        <item>Archive</item>
-        <item>Delete</item>
-        <item>Block</item>
-        <item>Call</item>
-        <item>Mark read</item>
-        <item>Reply</item>
-    </string-array>
-    <string name="button_yes">Da</string>
-    <string name="button_continue">Nadaljuj</string>
-    <string name="button_cancel">Prekliči</string>
-    <string name="button_delete">Izbriši</string>
-    <string name="button_save">Shrani</string>
-    <string name="button_stop">Ustavi</string>
-    <string name="button_more">Več</string>
-    <string name="button_set">Nastavi</string>
-    <string name="button_undo">Razveljavi</string>
-    <string name="toast_copied">Kopirano</string>
-    <string name="toast_archived">Arhivirani pogovori</string>
-    <string name="toast_qksms_plus">Da uporabiš to, moraš odkleniti QKSMS+</string>
-    <plurals name="notification_new_messages">
-        <item quantity="one">Novo sporočilo</item>
-        <item quantity="two">%s novi sporočili</item>
-        <item quantity="few">%s novih sporočil</item>
-        <item quantity="other">%s novih sporočil</item>
-    </plurals>
-    <string name="notification_message_failed_title">Sporočilo ni poslano</string>
-    <string name="notification_message_failed_text">Sporočilo za %s ni bilo poslano</string>
-    <string-array name="night_modes">
-        <item>Sistem</item>
-        <item>Onemogočen</item>
-        <item>Vedno vključen</item>
-        <item>Samodejen</item>
-    </string-array>
-    <string-array name="notification_preview_options">
-        <item>Prikaži ime in sporočilo</item>
-        <item>Prikaži ime</item>
-        <item>Skrij vsebino</item>
-    </string-array>
-    <string-array name="text_sizes">
-        <item>Majhna</item>
-        <item>Običajna</item>
-        <item>Velika</item>
-        <item>Večja</item>
-    </string-array>
-    <string-array name="delayed_sending_labels">
-        <item>Brez zakasnitve</item>
-        <item>3 seconds</item>
-        <item>5 seconds</item>
-        <item>10 seconds</item>
-    </string-array>
-    <string-array name="mms_sizes">
-        <item>Samodejno</item>
-        <item>100 kB</item>
-        <item>200 kB</item>
-        <item>300 kB</item>
-        <item>600 kB</item>
-        <item>1000 kB</item>
-        <item>2000 kB</item>
-        <item>Brez stiskanja</item>
-    </string-array>
-    <string-array name="qk_responses">
-        <item>V redu</item>
-        <item>Počakaj trenutek</item>
-        <item>Na poti</item>
-        <item>Hvala</item>
-        <item>Zveni dobro</item>
-        <item>Kako si?</item>
-        <item>Se strinjam</item>
-        <item>Ne</item>
-        <item>Ljubim te</item>
-        <item>Oprosti</item>
-        <item>LOL</item>
-        <item>To je v redu</item>
-    </string-array>
-</resources>
+<?xml version="1.0" encoding="utf-8"?>
+<!--
+  ~ Copyright (C) 2019 Moez Bhatti <moez.bhatti@gmail.com>
+  ~
+  ~ This file is part of QKSMS.
+  ~
+  ~ QKSMS is free software: you can redistribute it and/or modify
+  ~ it under the terms of the GNU General Public License as published by
+  ~ the Free Software Foundation, either version 3 of the License, or
+  ~ (at your option) any later version.
+  ~
+  ~ QKSMS is distributed in the hope that it will be useful,
+  ~ but WITHOUT ANY WARRANTY; without even the implied warranty of
+  ~ MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+  ~ GNU General Public License for more details.
+  ~
+  ~ You should have received a copy of the GNU General Public License
+  ~ along with QKSMS.  If not, see <http://www.gnu.org/licenses/>.
+  -->
+<resources>
+    <string name="shortcut_compose_long_label">Nov pogovor</string>
+    <string name="shortcut_compose_short_label">Sestavi</string>
+    <string name="shortcut_compose_disabled_message">Bližnjica onemogočena</string>
+    <string name="title_archived">Arhivirano</string>
+    <string name="title_settings">Nastavitve</string>
+    <string name="title_notification_prefs">Obvestila</string>
+    <string name="title_theme">Tema</string>
+    <string name="title_conversations">Išči po prejetih sporočilih&#8230;</string>
+    <string name="title_compose">Vnesi ime ali številko</string>
+    <string name="setup_skip">Preskoči</string>
+    <string name="setup_next">Nadaljuj</string>
+    <string name="menu_add_person">Dodaj osebo</string>
+    <string name="menu_call">Klic</string>
+    <string name="menu_info">Podrobnosti</string>
+    <string name="menu_save">Shrani v galerijo</string>
+    <string name="menu_share">Deli</string>
+    <string name="main_drawer_open_cd">Odpri nacigacijski meni</string>
+    <string name="main_title_selected">%d izbranih</string>
+    <string name="main_menu_clear">Počisti</string>
+    <string name="main_menu_archive">Arhiv</string>
+    <string name="main_menu_unarchive">Odstrani iz arhiva</string>
+    <string name="main_menu_delete">Izbriši</string>
+    <string name="main_menu_add_contact">Shrani v imenik</string>
+    <string name="main_menu_pin">Pripni na vrh</string>
+    <string name="main_menu_unpin">Odpni</string>
+    <string name="main_menu_read">Mark read</string>
+    <string name="main_menu_unread">Mark unread</string>
+    <string name="main_menu_block">Blokiraj</string>
+    <string name="main_syncing">Sinhroniziranje sporočil&#8230;</string>
+    <string name="main_sender_you">Vi: %s</string>
+    <string name="main_draft">Osnutek</string>
+    <string name="main_message_results_title">Rezultati v sporočilih</string>
+    <string name="main_message_results">%d sporočil</string>
+    <string name="inbox_empty_text">Vaši pogovori se bodo pojavili tukaj</string>
+    <string name="inbox_search_empty_text">Ni rezultatov</string>
+    <string name="archived_empty_text">Vaši arhivirani pogovori se bodo pojavili tukaj</string>
+    <string name="main_fab_cd">Začni nov pogovor</string>
+    <string name="main_default_sms_title">Znova vzljubite sporočanje</string>
+    <string name="main_default_sms_message">Napravi QKSMS privzet program za sporočanje</string>
+    <string name="main_default_sms_change">Spremeni</string>
+    <string name="main_permission_required">Potrebno dovoljenje</string>
+    <string name="main_permission_sms">QKSMS potrebuje dovoljenje za pošiljanje in branje SMS sporočil</string>
+    <string name="main_permission_contacts">QKSMS potrebuje dovoljenje za dostop do stikov</string>
+    <string name="main_permission_allow">Dovoli</string>
+    <string name="drawer_inbox">Prejeto</string>
+    <string name="drawer_archived">Arhiv</string>
+    <string name="drawer_scheduled">Načrtovano</string>
+    <string name="drawer_blocking">Blokiranje</string>
+    <string name="drawer_more">Več</string>
+    <string name="drawer_settings">Nastavitve</string>
+    <string name="drawer_help">Pošlji povratne informacije</string>
+    <string name="drawer_invite">Povabi prijatelje</string>
+    <string name="drawer_plus_banner_summary">Odkleni neverjetne nove funkcije in podpri razvoj</string>
+    <string name="rate_title">Uživate v QKSMS?</string>
+    <string name="rate_summary">Deli nekaj ljubezni in nas oceni na Google Play!</string>
+    <string name="rate_okay">V REDU!</string>
+    <string name="rate_dismiss">OPUSTI</string>
+    <string name="dialog_delete_title">Izbriši</string>
+    <plurals name="dialog_delete_message">
+        <item quantity="one">Ali ste prepričani, da želite izbrisati %d pogovor?</item>
+        <item quantity="two">Ali ste prepričani, da želite izbrisati %d pogovora?</item>
+        <item quantity="few">Ali ste prepričani, da želite izbrisati %d pogovorov?</item>
+        <item quantity="other">Ali ste prepričani, da želite izbrisati %d pogovorov?</item>
+    </plurals>
+    <string-array name="message_options">
+        <item>Kopiraj besedilo</item>
+        <item>Naprej</item>
+        <item>Izbriši</item>
+    </string-array>
+    <string name="compose_number_picker_title">Izberi telefonsko številko</string>
+    <string name="compose_number_picker_default">%s ∙ Privzeto</string>
+    <string name="compose_number_picker_once">Samo enkrat</string>
+    <string name="compose_number_picker_always">Vedno</string>
+    <string name="compose_title_selected">%d izbran</string>
+    <string name="compose_subtitle_results">%1$d od %2$d rezultatov</string>
+    <string name="compose_send_group_title">Pošlji kot skupinsko sporočilo</string>
+    <string name="compose_send_group_summary">Prejemniki in odgovori bodo vidni vsem</string>
+    <string name="compose_messages_empty">To je začetek vašega pogovora. Povej nekaj lepega!</string>
+    <string name="compose_vcard_label">Kontaktna kartica</string>
+    <string name="compose_scheduled_for">Načrtovano za</string>
+    <string name="compose_scheduled_future">Izbran čas mora biti v prihodnosti!</string>
+    <string name="compose_scheduled_plus">Da lahko uporabiš načrtovano sporočanje, moraš odkleniti QKSMS+</string>
+    <string name="compose_scheduled_toast">Dodano k načrtovanim sporočilom</string>
+    <string name="compose_hint">Napiši sporočilo&#8230;</string>
+    <string name="compose_menu_copy">Kopiraj besedilo</string>
+    <string name="compose_menu_forward">Naprej</string>
+    <string name="compose_menu_delete">Izbriši</string>
+    <string name="compose_menu_previous">Prejšnje</string>
+    <string name="compose_menu_next">Naslednje</string>
+    <string name="compose_menu_clear">Počisti</string>
+    <string name="compose_details_title">Podrobnosti sporočila</string>
+    <string name="compose_details_type">Vnesi: %s</string>
+    <string name="compose_details_from">Od: %s</string>
+    <string name="compose_details_to">Za: %s</string>
+    <string name="compose_details_subject">Zadeva %s</string>
+    <string name="compose_details_priority">Prioriteta: %s</string>
+    <string name="compose_details_size">Velikost: %s</string>
+    <string name="compose_details_sent">Poslano: %s</string>
+    <string name="compose_details_received">Prejeto: %s</string>
+    <string name="compose_details_delivered">Dostavljeno: %s</string>
+    <string name="compose_details_error_code">Koda napake: %d</string>
+    <string name="compose_attach_cd">Vstavi priponko</string>
+    <string name="compose_gallery_cd">Vstavi sliko</string>
+    <string name="compose_camera_cd">Zajemi sliko</string>
+    <string name="compose_schedule_cd">Načrtuj sporočilo</string>
+    <string name="compose_contact_cd">Vstavi stik</string>
+    <string name="compose_contact_error">Napaka pri branju stika</string>
+    <!-- Example: SIM 1 (Verizon) selected-->
+    <string name="compose_sim_changed_toast">SIM %1$d (%2$s) selected</string>
+    <string name="compose_sim_cd">%s izbran, zamenjaj kartico SIM</string>
+    <string name="compose_send_cd">Pošlji sporočilo</string>
+    <string name="message_status_sending">Pošiljanje&#8230;</string>
+    <string name="message_status_delivered">Dostavljeno %s</string>
+    <string name="message_status_failed">Napaka pri pošiljanju. Pritisni za ponovni poskus</string>
+    <string name="info_title">Podrobnosti</string>
+    <string name="info_copied_address">Naslov kopiran</string>
+    <string name="info_name">Naslov pogovora</string>
+    <string name="info_notifications">Obvestila</string>
+    <string name="info_theme">Teme</string>
+    <string name="info_archive">Arhiv</string>
+    <string name="info_unarchive">Ostrani iz arhiva</string>
+    <string name="info_block">Blokiraj</string>
+    <string name="info_unblock">Odblokiraj</string>
+    <string name="info_delete">Izbriši pogovor</string>
+    <string name="gallery_error">Napaka pri nalaganju večpredstavnosti</string>
+    <string name="gallery_toast_saved">Shranjeno v galerijo</string>
+    <string name="backup_title">Varnostna kopija in obnovitev</string>
+    <string name="backup_backing_up">Ustvarjanje varnostne kopije sporočil</string>
+    <string name="backup_restoring">Obnovitev varnostne kopije</string>
+    <string name="backup_last">Zadnja varnostna kopija</string>
+    <string name="backup_loading">Nalaganje&#8230;</string>
+    <string name="backup_never">Nikoli</string>
+    <string name="backup_restore_title">Obnovi</string>
+    <string name="backup_restore_summary">Izberi varnostno kopijo</string>
+    <string name="backup_restore_error_plus">Prosimo odklenite QKSMS+ da omogočite uporabo varnostnih kopij in njihove obnove</string>
+    <string name="backup_restore_error_backup">Varnostna kopija se izvaja&#8230;</string>
+    <string name="backup_restore_error_restore">Obnavljanje varnostne kopije se izvaja&#8230;</string>
+    <string name="backup_restore_confirm_title">Obnovi iz varnotsne kopije</string>
+    <string name="backup_restore_confirm_message">Ali ste prepričani, da želite obnoviti sporočila iz te varnostne kopije?</string>
+    <string name="backup_restore_stop_title">Prekliči obnovitev varnostne kopije</string>
+    <string name="backup_restore_stop_message">Sporočila, ki so že bila obnovljena, bodo ostala na vaši napravi</string>
+    <string name="backup_restore_dialog_title">Varnostne kopije</string>
+    <string name="backup_restore_dialog_empty">Ni najdenih varnostnih kopij</string>
+    <plurals name="backup_message_count">
+        <item quantity="one">%d sporočilo</item>
+        <item quantity="two">%d sporočila</item>
+        <item quantity="few">%d sporočil</item>
+        <item quantity="other">%d sporočila</item>
+    </plurals>
+    <string name="backup_disclaimer">Trenutno so za ustvarjanje in obnovo varnostnih kopij podprta le sporočila SMS. MMS podpora in varnostne kopije pridejo kmalu!</string>
+    <string name="backup_now">Ustvari varnostno kopijo</string>
+    <string name="backup_progress_parsing">Razčlenjevanje varnostne kopije&#8230;</string>
+    <string name="backup_progress_running">%d/%d sporočil</string>
+    <string name="backup_progress_saving">Shranjevanje varnostne kopije&#8230;</string>
+    <string name="backup_progress_syncing">Sinhroniziranje sporočil&#8230;</string>
+    <string name="backup_progress_finished">Končano!</string>
+    <string name="backup_notification_channel_name">Varnostna kopija in obnovitev</string>
+    <string name="scheduled_title">Načrtovano</string>
+    <string name="scheduled_empty_description">Samodejno pošlji sporočilo ob nastavljenem točno določenem trenutku</string>
+    <string name="scheduled_empty_message_1">Hej! Kdaj je že tvoj rojstni dan?</string>
+    <string name="scheduled_empty_message_2">Je 23. Decembra</string>
+    <string name="scheduled_empty_message_3">Vse najboljše! Poglej kako dober prijatelj sem, da se spomnim tvojega rojstnega dneva</string>
+    <!--&#x200A; is a special character required at the end of this string to fix it's formatting in the app -->
+    <string name="scheduled_empty_message_3_timestamp">Pošiljanje na 23. December</string>
+    <string name="scheduled_compose_cd">Načrtuj sporočilo</string>
+    <string name="scheduled_options_title">Načrtovano sporočilo</string>
+    <string-array name="scheduled_options">
+        <item>Pošlji sedaj</item>
+        <item>Kopiraj besedilo</item>
+        <item>Izbriši</item>
+    </string-array>
+    <string name="settings_category_appearance">Izgled</string>
+    <string name="settings_category_general">Glavno</string>
+    <string name="settings_category_qkreply">QK Odgovor</string>
+    <string name="settings_theme_title">Teme</string>
+    <string name="settings_night_title">Nočni način</string>
+    <string name="settings_black_title">Črn nočni način</string>
+    <string name="settings_night_start_title">Začetni čas</string>
+    <string name="settings_night_end_title">Čas končanja</string>
+    <string name="settings_automatic_colors_title">Samodejne barve stikov</string>
+    <string name="settings_text_size_title">Velikost pisave</string>
+    <string name="settings_system_font_title">Uporabi sistemsko pisavo</string>
+    <string name="settings_auto_emoji_title">Samodejni čustvenček</string>
+    <string name="settings_notifications_title">Obvestila</string>
+    <string name="settings_notifications_o_summary">Tapni za prilagoditev</string>
+    <string name="settings_notification_actions_title">Dejanja</string>
+    <string name="settings_notification_action_1">Gumb 1</string>
+    <string name="settings_notification_action_2">Gumb 2</string>
+    <string name="settings_notification_action_3">Gumb 3</string>
+    <string name="settings_notification_previews_title">Predogledi obvestil</string>
+    <string name="settings_notification_wake_title">Zbudi zaslon</string>
+    <string name="settings_vibration_title">Vibriranje</string>
+    <string name="settings_ringtone_title">Zvok</string>
+    <string name="settings_ringtone_none">Brez</string>
+    <string name="settings_qkreply_title">QK Odgovor</string>
+    <string name="settings_qkreply_summary">Pojavno obvestilo za nova sporočila</string>
+    <string name="settings_qkreply_tap_dismiss_title">Tapni da opustiš</string>
+    <string name="settings_qkreply_tap_dismiss_summary">Tapni izven obvestila, da ga zapreš</string>
+    <string name="settings_delayed_title">Zakasnjeno sporočanje</string>
+    <string name="settings_swipe_actions">Dejanja drsenja</string>
+    <string name="settings_swipe_actions_summary">Nastavi dejanja drsenja za pogovore</string>
+    <string name="settings_swipe_actions_right">Podrsaj desno</string>
+    <string name="settings_swipe_actions_left">Podrsaj levo</string>
+    <string name="settings_swipe_actions_change">SPREMENI</string>
+    <string-array name="settings_swipe_actions">
+        <item>Brez</item>
+        <item>Arhiviraj</item>
+        <item>Izbriši</item>
+        <item>Block</item>
+        <item>Call</item>
+        <item>Mark read</item>
+        <item>Mark unread</item>
+    </string-array>
+    <string name="settings_delivery_title">Potrditev dostavitve sporočila</string>
+    <string name="settings_delivery_summary">Potrdi, da so bila sporočila dostavljena uspešno</string>
+    <string name="settings_signature_title">Podpis</string>
+    <string name="settings_signature_summary">Dodaj podpis na konec vaših sporočil</string>
+    <string name="settings_unicode_title">Odstrani narečja</string>
+    <string name="settings_unicode_summary">Odstrani narečja iz besedila odhodnih SMS sporočil</string>
+    <string name="settings_mobile_title">Samo telefonske številke</string>
+    <string name="settings_mobile_summary">Ko sestavljaš sporočilo, prikaži samo telefonske številke</string>
+    <string name="settings_auto_delete">Delete old messages automatically</string>
+    <string name="settings_auto_delete_dialog_message">Messages will be deleted after the specified number of days</string>
+    <string name="settings_auto_delete_dialog_hint">Number of days</string>
+    <string name="settings_auto_delete_never">Never</string>
+    <string name="settings_auto_delete_warning">Delete old messages automatically?</string>
+    <string name="settings_auto_delete_warning_message">If you proceed, %1$d messages will be deleted now</string>
+    <plurals name="settings_auto_delete_summary">
+        <item quantity="one">After 1 day</item>
+        <item quantity="two">After %d days</item>
+        <item quantity="few">After %d days</item>
+        <item quantity="other">After %d days</item>
+    </plurals>
+    <string name="settings_long_as_mms_title">Pošlji dolga sporočila kot MMS</string>
+    <string name="settings_long_as_mms_summary">Če se vaša daljša sporočila ne pošljejo, ali se pošiljajo v napačnem vrstnem redu, jih lahko pošljete kot MMS sporočilo. To lahko povzroči dodatne stroške</string>
+    <string name="settings_mms_size_title">Samodejno stisni MMS priponke</string>
+    <string name="settings_sync_title">Sinhroniziraj sporočila</string>
+    <string name="settings_sync_summary">Znova sinhroniziraj sporočila s sistemsko SMS bazo</string>
+    <string name="settings_about_title">Več o QKSMS</string>
+    <string name="settings_version">Različica %s</string>
+    <string name="settings_logging_enabled">Beleženje dnevnika za odpravljanje napak omogočeno</string>
+    <string name="settings_logging_disabled">Beleženje dnevnika za odpravljanje napak onemogočeno</string>
+    <string name="settings_delay_duration_hint">Vnesi trajanje (v sekundah)</string>
+    <string name="blocking_title">Blokiranje</string>
+    <string name="blocking_drop_title">Opusti sporočila</string>
+    <string name="blocking_drop_summary">Opusti prihajajoča sporočila blokiranih pošiljateljev, namesto da jih skriješ</string>
+    <string name="blocking_conversations">Blokirani pogovori</string>
+    <string name="blocking_manager_title">Upravljalnik Blokiranja</string>
+    <string name="blocking_manager_qksms_title">QKSMS</string>
+    <string name="blocking_manager_qksms_summary">Vgrajena sposobnost blokiranja v QKSMS</string>
+    <string name="blocking_manager_call_control_summary">Samodejno razvrstite vaše klice in sporočila v eno priročno mesto! Skupnostni IQ™ omogoča, da preprečite prejemanje sporočil pošiljateljev neželenih sporočil, kateri so skupnosti poznani</string>
+    <string name="blocking_manager_sia_summary">Samodejno razvrstite sporočila neželenih številk tako, da uporabiš \"Should I Answer\" aplikacijo</string>
+    <string name="blocking_manager_copy_title">Kopiraj blokirane številke</string>
+    <string name="blocking_manager_copy_summary">Nadaljuj z %s in kopiraj obstoječe blokirane številke</string>
+    <string name="blocked_numbers_title">Blokirane številke</string>
+    <string name="blocked_numbers_empty">Vaše blokirane številke se bodo pojavile tukaj</string>
+    <string name="blocked_numbers_add_cd">Blokiraj novo številko</string>
+    <string name="blocked_numbers_dialog_title">Blokiraj besedila od</string>
+    <string name="blocked_numbers_dialog_hint">Telefonska številka</string>
+    <string name="blocked_numbers_dialog_block">Blokirano</string>
+    <string name="blocked_messages_title">Blokirana sporočila</string>
+    <string name="blocked_messages_empty">Blokirana sporočila bodo prikazana tukaj</string>
+    <string name="blocking_block_title">Blokiraj</string>
+    <string name="blocking_unblock_title">Odblokiraj</string>
+    <plurals name="blocking_block_external">
+        <item quantity="one">Nadaljuj z %s in blokiraj to številko</item>
+        <item quantity="two">Nadaljuj z %s in blokiraj ti številki</item>
+        <item quantity="few">Nadaljuj z %s in blokiraj te številke</item>
+        <item quantity="other">Nadaljuj z %s in blokiraj te številke</item>
+    </plurals>
+    <plurals name="blocking_unblock_external">
+        <item quantity="one">Nadaljuj z %s in dovoli to številko</item>
+        <item quantity="two">Nadaljuj z %s in dovoli ti številki</item>
+        <item quantity="few">Nadaljuj z %s in dovoli te številke</item>
+        <item quantity="other">Nadaljuj z %s in dovoli te številke</item>
+    </plurals>
+    <string name="about_title">O aplikaciji</string>
+    <string name="about_version_title">Različica</string>
+    <string name="about_developer_title">Razvijalec</string>
+    <string name="about_source_title">Izvirna koda</string>
+    <string name="about_changelog_title">Dnevnik sprememb</string>
+    <string name="about_contact_title">Stik</string>
+    <string name="about_license_title">Licenca</string>
+    <string name="about_copyright_title">Avtorske pravice</string>
+    <string name="qksms_plus_description_title">Podpri razvoj, odkleni vse</string>
+    <string name="qksms_plus_description_summary">Že s %s lahko rešiš stradajočega razvijalca</string>
+    <!-- Substitutions are for price and currency. Ex: Lifetime upgrade for $1.99 USD -->
+    <string name="qksms_plus_upgrade">Doživljenjska nadgradnja za %1$s %2$s</string>
+    <!-- Substitutions are for price and currency. Ex: Unlock + donate for $4.99 USD -->
+    <string name="qksms_plus_upgrade_donate">Odkleni + doniraj za %1$s %2$s</string>
+    <string name="qksms_plus_thanks_title">Hvala da podpirate QKSMS!</string>
+    <string name="qksms_plus_thanks_summary">Zdaj imate dostop do vseh QKSMS+ funkcij</string>
+    <string name="qksms_plus_free_title">QKSMS+ je brezplačen za F-Droid uporabnike! Če želite podpirati razvoj, so donacije zelo dobrodošle.</string>
+    <string name="qksms_plus_donate">Doniraj preko PayPal</string>
+    <string name="qksms_plus_coming_soon">Prihaja kmalu</string>
+    <string name="qksms_plus_themes_title">Premium teme</string>
+    <string name="qksms_plus_themes_summary">Odkleni čudovite barve tem, ki niso vidne na paleti materialnega dizajna</string>
+    <string name="qksms_plus_emoji_title">Auto-čustvenček po meri</string>
+    <string name="qksms_plus_emoji_summary">Ustvari avto-čustvenček bližnjico po meri</string>
+    <string name="qksms_plus_backup_title">Varnostna kopija sporočila</string>
+    <string name="qksms_plus_backup_summary">Samodejno varnostno kopiraj sporočila. Nikoli več ne skrbi za izgubljeno zgodovino, če zamenjaš ali izgubiš telefon</string>
+    <string name="qksms_plus_scheduled_title">Načrtovana sporočila</string>
+    <string name="qksms_plus_scheduled_summary">Načrtuj, da bodo sporočila poslana ob določenem datumu in času</string>
+    <string name="qksms_plus_delayed_title">Zakasnjeno pošiljanje</string>
+    <string name="qksms_plus_delayed_summary">Počakaj nekaj sekund, preden pošlješ svoje sporočilo</string>
+    <string name="qksms_plus_night_title">Samodejni temni način</string>
+    <string name="qksms_plus_night_summary">Omogoči temni način, glede na čas dneva</string>
+    <string name="qksms_plus_blacklist_title">Napredno blokiranje</string>
+    <string name="qksms_plus_blacklist_summary">Blokiraj sporočila, ki vsebujejo ključne besede ali se ujemajo z vzorci</string>
+    <string name="qksms_plus_forward_title">Samodejno-posreduj</string>
+    <string name="qksms_plus_forward_summary">Samodejno posreduj sporočila določenih pošiljateljev</string>
+    <string name="qksms_plus_respond_title">Samodejen odgovor</string>
+    <string name="qksms_plus_respond_summary">Samodejno odgovori na prihajajoča sporočila s prednastavljenim sporočilom</string>
+    <string name="qksms_plus_more_title">Več</string>
+    <string name="qksms_plus_more_summary">QKSMS je pod aktivnim razvojem in vaš nakup QKSMS+ bo vseboval vse prihodnje funkcije!</string>
+    <string name="widget_loading">Nalaganje&#8230;</string>
+    <string name="widget_more">Poglej več pogovorov</string>
+    <string name="qkreply_menu_read">Mark read</string>
+    <string name="qkreply_menu_call">Pokliči</string>
+    <string name="qkreply_menu_delete">Izbriši</string>
+    <string name="qkreply_menu_expand">Pokaži več</string>
+    <string name="qkreply_menu_collapse">Pokaži manj</string>
+    <string name="qkreply_menu_view">Odpri pogovor</string>
+    <string name="theme_material">Material</string>
+    <string name="theme_hex">HEX</string>
+    <string name="theme_apply">Potrdi</string>
+    <string-array name="notification_actions">
+        <item>Brez</item>
+        <item>Archive</item>
+        <item>Delete</item>
+        <item>Block</item>
+        <item>Call</item>
+        <item>Mark read</item>
+        <item>Reply</item>
+    </string-array>
+    <string name="button_yes">Da</string>
+    <string name="button_continue">Nadaljuj</string>
+    <string name="button_cancel">Prekliči</string>
+    <string name="button_delete">Izbriši</string>
+    <string name="button_save">Shrani</string>
+    <string name="button_stop">Ustavi</string>
+    <string name="button_more">Več</string>
+    <string name="button_set">Nastavi</string>
+    <string name="button_undo">Razveljavi</string>
+    <string name="toast_copied">Kopirano</string>
+    <string name="toast_archived">Arhivirani pogovori</string>
+    <string name="toast_qksms_plus">Da uporabiš to, moraš odkleniti QKSMS+</string>
+    <plurals name="notification_new_messages">
+        <item quantity="one">Novo sporočilo</item>
+        <item quantity="two">%s novi sporočili</item>
+        <item quantity="few">%s novih sporočil</item>
+        <item quantity="other">%s novih sporočil</item>
+    </plurals>
+    <string name="notification_message_failed_title">Sporočilo ni poslano</string>
+    <string name="notification_message_failed_text">Sporočilo za %s ni bilo poslano</string>
+    <string-array name="night_modes">
+        <item>Sistem</item>
+        <item>Onemogočen</item>
+        <item>Vedno vključen</item>
+        <item>Samodejen</item>
+    </string-array>
+    <string-array name="notification_preview_options">
+        <item>Prikaži ime in sporočilo</item>
+        <item>Prikaži ime</item>
+        <item>Skrij vsebino</item>
+    </string-array>
+    <string-array name="text_sizes">
+        <item>Majhna</item>
+        <item>Običajna</item>
+        <item>Velika</item>
+        <item>Večja</item>
+    </string-array>
+    <string-array name="delayed_sending_labels">
+        <item>Brez zakasnitve</item>
+        <item>3 seconds</item>
+        <item>5 seconds</item>
+        <item>10 seconds</item>
+    </string-array>
+    <string-array name="mms_sizes">
+        <item>Samodejno</item>
+        <item>100 kB</item>
+        <item>200 kB</item>
+        <item>300 kB</item>
+        <item>600 kB</item>
+        <item>1000 kB</item>
+        <item>2000 kB</item>
+        <item>Brez stiskanja</item>
+    </string-array>
+    <string-array name="qk_responses">
+        <item>V redu</item>
+        <item>Počakaj trenutek</item>
+        <item>Na poti</item>
+        <item>Hvala</item>
+        <item>Zveni dobro</item>
+        <item>Kako si?</item>
+        <item>Se strinjam</item>
+        <item>Ne</item>
+        <item>Ljubim te</item>
+        <item>Oprosti</item>
+        <item>LOL</item>
+        <item>To je v redu</item>
+    </string-array>
+</resources>
diff --git a/presentation/src/main/res/values-sr/strings.xml b/presentation/src/main/res/values-sr/strings.xml
index 14a2fc5a4..39732a511 100644
--- a/presentation/src/main/res/values-sr/strings.xml
+++ b/presentation/src/main/res/values-sr/strings.xml
@@ -1,417 +1,417 @@
-<?xml version="1.0" encoding="utf-8"?>
-<!--
-  ~ Copyright (C) 2019 Moez Bhatti <moez.bhatti@gmail.com>
-  ~
-  ~ This file is part of QKSMS.
-  ~
-  ~ QKSMS is free software: you can redistribute it and/or modify
-  ~ it under the terms of the GNU General Public License as published by
-  ~ the Free Software Foundation, either version 3 of the License, or
-  ~ (at your option) any later version.
-  ~
-  ~ QKSMS is distributed in the hope that it will be useful,
-  ~ but WITHOUT ANY WARRANTY; without even the implied warranty of
-  ~ MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
-  ~ GNU General Public License for more details.
-  ~
-  ~ You should have received a copy of the GNU General Public License
-  ~ along with QKSMS.  If not, see <http://www.gnu.org/licenses/>.
-  -->
-<resources>
-    <string name="shortcut_compose_long_label">New conversation</string>
-    <string name="shortcut_compose_short_label">Compose</string>
-    <string name="shortcut_compose_disabled_message">Shortcut disabled</string>
-    <string name="title_archived">Archived</string>
-    <string name="title_settings">Подешавања</string>
-    <string name="title_notification_prefs">Notifications</string>
-    <string name="title_theme">Theme</string>
-    <string name="title_conversations">Search inbox&#8230;</string>
-    <string name="title_compose">Састављање</string>
-    <string name="setup_skip">Skip</string>
-    <string name="setup_next">Continue</string>
-    <string name="menu_add_person">Add person</string>
-    <string name="menu_call">Позови</string>
-    <string name="menu_info">Details</string>
-    <string name="menu_save">Save to gallery</string>
-    <string name="menu_share">Share</string>
-    <string name="main_drawer_open_cd">Open navigation drawer</string>
-    <string name="main_title_selected">%d selected</string>
-    <string name="main_menu_clear">Clear</string>
-    <string name="main_menu_archive">Archive</string>
-    <string name="main_menu_unarchive">Unarchive</string>
-    <string name="main_menu_delete">Delete</string>
-    <string name="main_menu_add_contact">Add to contacts</string>
-    <string name="main_menu_pin">Pin to top</string>
-    <string name="main_menu_unpin">Unpin</string>
-    <string name="main_menu_read">Mark read</string>
-    <string name="main_menu_unread">Mark unread</string>
-    <string name="main_menu_block">Block</string>
-    <string name="main_syncing">Syncing messages&#8230;</string>
-    <string name="main_sender_you">You: %s</string>
-    <string name="main_draft">Draft</string>
-    <string name="main_message_results_title">Results in messages</string>
-    <string name="main_message_results">%d messages</string>
-    <string name="inbox_empty_text">Your conversations will appear here</string>
-    <string name="inbox_search_empty_text">No results</string>
-    <string name="archived_empty_text">Your archived conversations will appear here</string>
-    <string name="main_fab_cd">Start new conversation</string>
-    <string name="main_default_sms_title">Love texting again</string>
-    <string name="main_default_sms_message">Make QKSMS your default SMS app</string>
-    <string name="main_default_sms_change">Change</string>
-    <string name="main_permission_required">Permission required</string>
-    <string name="main_permission_sms">QKSMS needs permission to send and view SMS messages</string>
-    <string name="main_permission_contacts">QKSMS needs permission to view your contacts</string>
-    <string name="main_permission_allow">Allow</string>
-    <string name="drawer_inbox">Inbox</string>
-    <string name="drawer_archived">Archived</string>
-    <string name="drawer_scheduled">Scheduled</string>
-    <string name="drawer_blocking">Blocking</string>
-    <string name="drawer_more">More</string>
-    <string name="drawer_settings">Settings</string>
-    <string name="drawer_help">Help &amp; feedback</string>
-    <string name="drawer_invite">Invite friends</string>
-    <string name="drawer_plus_banner_summary">Unlock amazing new features, and support development</string>
-    <string name="rate_title">Enjoying QKSMS?</string>
-    <string name="rate_summary">Share some love and rate us on Google Play!</string>
-    <string name="rate_okay">OKAY!</string>
-    <string name="rate_dismiss">DISMISS</string>
-    <string name="dialog_delete_title">Delete</string>
-    <plurals name="dialog_delete_message">
-        <item quantity="one">Are you sure you would like to delete this conversation?</item>
-        <item quantity="few">Are you sure you would like to delete %d conversations?</item>
-        <item quantity="other">Are you sure you would like to delete %d conversations?</item>
-    </plurals>
-    <string-array name="message_options">
-        <item>Copy text</item>
-        <item>Forward</item>
-        <item>Delete</item>
-    </string-array>
-    <string name="compose_number_picker_title">Choose a phone number</string>
-    <string name="compose_number_picker_default">%s ∙ Default</string>
-    <string name="compose_number_picker_once">Just once</string>
-    <string name="compose_number_picker_always">Always</string>
-    <string name="compose_title_selected">%d selected</string>
-    <string name="compose_subtitle_results">%1$d of %2$d results</string>
-    <string name="compose_send_group_title">Send as group message</string>
-    <string name="compose_send_group_summary">Recipients and replies will be visible to everyone</string>
-    <string name="compose_messages_empty">This is the start of your conversation. Say something nice!</string>
-    <string name="compose_vcard_label">Contact card</string>
-    <string name="compose_scheduled_for">Scheduled for</string>
-    <string name="compose_scheduled_future">Selected time must be in the future!</string>
-    <string name="compose_scheduled_plus">You must unlock QKSMS+ to use scheduled messaging</string>
-    <string name="compose_scheduled_toast">Added to scheduled messages</string>
-    <string name="compose_hint">Write a message&#8230;</string>
-    <string name="compose_menu_copy">Copy text</string>
-    <string name="compose_menu_forward">Forward</string>
-    <string name="compose_menu_delete">Delete</string>
-    <string name="compose_menu_previous">Previous</string>
-    <string name="compose_menu_next">Next</string>
-    <string name="compose_menu_clear">Clear</string>
-    <string name="compose_details_title">Message details</string>
-    <string name="compose_details_type">Type: %s</string>
-    <string name="compose_details_from">From: %s</string>
-    <string name="compose_details_to">To: %s</string>
-    <string name="compose_details_subject">Subject: %s</string>
-    <string name="compose_details_priority">Priority: %s</string>
-    <string name="compose_details_size">Size: %s</string>
-    <string name="compose_details_sent">Sent: %s</string>
-    <string name="compose_details_received">Received: %s</string>
-    <string name="compose_details_delivered">Delivered: %s</string>
-    <string name="compose_details_error_code">Error code: %d</string>
-    <string name="compose_attach_cd">Add an attachment</string>
-    <string name="compose_gallery_cd">Attach a photo</string>
-    <string name="compose_camera_cd">Take a photo</string>
-    <string name="compose_schedule_cd">Schedule message</string>
-    <string name="compose_contact_cd">Attach a contact</string>
-    <string name="compose_contact_error">Error reading contact</string>
-    <!-- Example: SIM 1 (Verizon) selected-->
-    <string name="compose_sim_changed_toast">SIM %1$d (%2$s) selected</string>
-    <string name="compose_sim_cd">%s selected, change SIM card</string>
-    <string name="compose_send_cd">Send message</string>
-    <string name="message_status_sending">Sending&#8230;</string>
-    <string name="message_status_delivered">Delivered %s</string>
-    <string name="message_status_failed">Failed to send. Tap to try again</string>
-    <string name="info_title">Details</string>
-    <string name="info_copied_address">Address copied</string>
-    <string name="info_name">Conversation title</string>
-    <string name="info_notifications">Notifications</string>
-    <string name="info_theme">Theme</string>
-    <string name="info_archive">Archive</string>
-    <string name="info_unarchive">Unarchive</string>
-    <string name="info_block">Block</string>
-    <string name="info_unblock">Unblock</string>
-    <string name="info_delete">Delete conversation</string>
-    <string name="gallery_error">Couldn\'t load media</string>
-    <string name="gallery_toast_saved">Saved to gallery</string>
-    <string name="backup_title">Backup and restore</string>
-    <string name="backup_backing_up">Backing up messages</string>
-    <string name="backup_restoring">Restoring from backup</string>
-    <string name="backup_last">Last backup</string>
-    <string name="backup_loading">Loading&#8230;</string>
-    <string name="backup_never">Never</string>
-    <string name="backup_restore_title">Restore</string>
-    <string name="backup_restore_summary">Select a backup</string>
-    <string name="backup_restore_error_plus">Please unlock QKSMS+ to use backup and restore</string>
-    <string name="backup_restore_error_backup">Backup in progress&#8230;</string>
-    <string name="backup_restore_error_restore">Restore in progress&#8230;</string>
-    <string name="backup_restore_confirm_title">Restore from backup</string>
-    <string name="backup_restore_confirm_message">Are you sure you would like to restore your messages from this backup?</string>
-    <string name="backup_restore_stop_title">Stop restore</string>
-    <string name="backup_restore_stop_message">Messages that have already been restored will remain on your device</string>
-    <string name="backup_restore_dialog_title">Backups</string>
-    <string name="backup_restore_dialog_empty">No backups found</string>
-    <plurals name="backup_message_count">
-        <item quantity="one">%d message</item>
-        <item quantity="few">%d messages</item>
-        <item quantity="other">%d messages</item>
-    </plurals>
-    <string name="backup_disclaimer">Currently, only SMS is supported by Backup and Restore. MMS support and scheduled backups will be coming soon!</string>
-    <string name="backup_now">Backup now</string>
-    <string name="backup_progress_parsing">Parsing backup&#8230;</string>
-    <string name="backup_progress_running">%d/%d messages</string>
-    <string name="backup_progress_saving">Saving backup&#8230;</string>
-    <string name="backup_progress_syncing">Syncing messages&#8230;</string>
-    <string name="backup_progress_finished">Finished!</string>
-    <string name="backup_notification_channel_name">Backup and restore</string>
-    <string name="scheduled_title">Scheduled</string>
-    <string name="scheduled_empty_description">Automatically send a message, at the exact moment you\'d like</string>
-    <string name="scheduled_empty_message_1">Hey! When was your birthday again?</string>
-    <string name="scheduled_empty_message_2">It\'s on December 23rd</string>
-    <string name="scheduled_empty_message_3">Happy birthday! Look at what a great friend I am, remembering your birthday</string>
-    <!--&#x200A; is a special character required at the end of this string to fix it's formatting in the app -->
-    <string name="scheduled_empty_message_3_timestamp">Sending on December 23rd </string>
-    <string name="scheduled_compose_cd">Schedule a message</string>
-    <string name="scheduled_options_title">Scheduled message</string>
-    <string-array name="scheduled_options">
-        <item>Send now</item>
-        <item>Copy text</item>
-        <item>Delete</item>
-    </string-array>
-    <string name="settings_category_appearance">Appearance</string>
-    <string name="settings_category_general">General</string>
-    <string name="settings_category_qkreply">QK Reply</string>
-    <string name="settings_theme_title">Theme</string>
-    <string name="settings_night_title">Night mode</string>
-    <string name="settings_black_title">Pure black night mode</string>
-    <string name="settings_night_start_title">Start time</string>
-    <string name="settings_night_end_title">End time</string>
-    <string name="settings_automatic_colors_title">Automatic contact colors</string>
-    <string name="settings_text_size_title">Font size</string>
-    <string name="settings_system_font_title">Use system font</string>
-    <string name="settings_auto_emoji_title">Automatic emoji</string>
-    <string name="settings_notifications_title">Notifications</string>
-    <string name="settings_notifications_o_summary">Tap to customize</string>
-    <string name="settings_notification_actions_title">Actions</string>
-    <string name="settings_notification_action_1">Button 1</string>
-    <string name="settings_notification_action_2">Button 2</string>
-    <string name="settings_notification_action_3">Button 3</string>
-    <string name="settings_notification_previews_title">Notification previews</string>
-    <string name="settings_notification_wake_title">Wake screen</string>
-    <string name="settings_vibration_title">Vibration</string>
-    <string name="settings_ringtone_title">Sound</string>
-    <string name="settings_ringtone_none">None</string>
-    <string name="settings_qkreply_title">QK Reply</string>
-    <string name="settings_qkreply_summary">Popup for new messages</string>
-    <string name="settings_qkreply_tap_dismiss_title">Tap to dismiss</string>
-    <string name="settings_qkreply_tap_dismiss_summary">Tap outside of the popup to close it</string>
-    <string name="settings_delayed_title">Delayed sending</string>
-    <string name="settings_swipe_actions">Swipe actions</string>
-    <string name="settings_swipe_actions_summary">Configure swipe actions for conversations</string>
-    <string name="settings_swipe_actions_right">Right swipe</string>
-    <string name="settings_swipe_actions_left">Left swipe</string>
-    <string name="settings_swipe_actions_change">CHANGE</string>
-    <string-array name="settings_swipe_actions">
-        <item>None</item>
-        <item>Archive</item>
-        <item>Delete</item>
-        <item>Block</item>
-        <item>Call</item>
-        <item>Mark read</item>
-        <item>Mark unread</item>
-    </string-array>
-    <string name="settings_delivery_title">Delivery confirmations</string>
-    <string name="settings_delivery_summary">Confirm that messages were sent successfully</string>
-    <string name="settings_signature_title">Signature</string>
-    <string name="settings_signature_summary">Add a signature to the end of your messages</string>
-    <string name="settings_unicode_title">Strip accents</string>
-    <string name="settings_unicode_summary">Remove accents from characters in outgoing SMS messages</string>
-    <string name="settings_mobile_title">Mobile numbers only</string>
-    <string name="settings_mobile_summary">When composing a message, only show mobile numbers</string>
-    <string name="settings_auto_delete">Delete old messages automatically</string>
-    <string name="settings_auto_delete_dialog_message">Messages will be deleted after the specified number of days</string>
-    <string name="settings_auto_delete_dialog_hint">Number of days</string>
-    <string name="settings_auto_delete_never">Never</string>
-    <string name="settings_auto_delete_warning">Delete old messages automatically?</string>
-    <string name="settings_auto_delete_warning_message">If you proceed, %1$d messages will be deleted now</string>
-    <plurals name="settings_auto_delete_summary">
-        <item quantity="one">After 1 day</item>
-        <item quantity="few">After %d days</item>
-        <item quantity="other">After %d days</item>
-    </plurals>
-    <string name="settings_long_as_mms_title">Send long messages as MMS</string>
-    <string name="settings_long_as_mms_summary">If your longer text messages are failing to send, or sending in the wrong order, you can send them as MMS messages instead. Additional charges may apply</string>
-    <string name="settings_mms_size_title">Auto-compress MMS attachments</string>
-    <string name="settings_sync_title">Sync messages</string>
-    <string name="settings_sync_summary">Re-sync your messages with the native Android SMS database</string>
-    <string name="settings_about_title">About QKSMS</string>
-    <string name="settings_version">Version %s</string>
-    <string name="settings_logging_enabled">Debug logging enabled</string>
-    <string name="settings_logging_disabled">Debug logging disabled</string>
-    <string name="settings_delay_duration_hint">Enter duration (seconds)</string>
-    <string name="blocking_title">Blocking</string>
-    <string name="blocking_drop_title">Drop messages</string>
-    <string name="blocking_drop_summary">Drop incoming messages from blocked senders instead of hiding them</string>
-    <string name="blocking_conversations">Blocked conversations</string>
-    <string name="blocking_manager_title">Blocking Manager</string>
-    <string name="blocking_manager_qksms_title">QKSMS</string>
-    <string name="blocking_manager_qksms_summary">Built-in blocking functionality in QKSMS</string>
-    <string name="blocking_manager_call_control_summary">Automatically filter your calls and messages in one convenient place! Community IQ™ allows you to prevent unwanted messages from community known spammers</string>
-    <string name="blocking_manager_sia_summary">Automatically filter messages from unsolicited numbers by using the \"Should I Answer\" app</string>
-    <string name="blocking_manager_copy_title">Copy blocked numbers</string>
-    <string name="blocking_manager_copy_summary">Continue to %s and copy over your existing blocked numbers</string>
-    <string name="blocked_numbers_title">Blocked numbers</string>
-    <string name="blocked_numbers_empty">Your blocked numbers will appear here</string>
-    <string name="blocked_numbers_add_cd">Block a new number</string>
-    <string name="blocked_numbers_dialog_title">Block texts from</string>
-    <string name="blocked_numbers_dialog_hint">Phone number</string>
-    <string name="blocked_numbers_dialog_block">Block</string>
-    <string name="blocked_messages_title">Blocked messages</string>
-    <string name="blocked_messages_empty">Your blocked messages will appear here</string>
-    <string name="blocking_block_title">Block</string>
-    <string name="blocking_unblock_title">Unblock</string>
-    <plurals name="blocking_block_external">
-        <item quantity="one">Continue to %s and block this number</item>
-        <item quantity="few">Continue to %s and block these numbers</item>
-        <item quantity="other">Continue to %s and block these numbers</item>
-    </plurals>
-    <plurals name="blocking_unblock_external">
-        <item quantity="one">Continue to %s and allow this number</item>
-        <item quantity="few">Continue to %s and allow these numbers</item>
-        <item quantity="other">Continue to %s and allow these numbers</item>
-    </plurals>
-    <string name="about_title">About</string>
-    <string name="about_version_title">Version</string>
-    <string name="about_developer_title">Developer</string>
-    <string name="about_source_title">Source code</string>
-    <string name="about_changelog_title">Changelog</string>
-    <string name="about_contact_title">Contact</string>
-    <string name="about_license_title">License</string>
-    <string name="about_copyright_title">Copyright</string>
-    <string name="qksms_plus_description_title">Support development, unlock everything</string>
-    <string name="qksms_plus_description_summary">You can save a starving developer for just %s</string>
-    <!-- Substitutions are for price and currency. Ex: Lifetime upgrade for $1.99 USD -->
-    <string name="qksms_plus_upgrade">Lifetime upgrade for %1$s %2$s</string>
-    <!-- Substitutions are for price and currency. Ex: Unlock + donate for $4.99 USD -->
-    <string name="qksms_plus_upgrade_donate">Unlock + donate for %1$s %2$s</string>
-    <string name="qksms_plus_thanks_title">Thank you for supporting QKSMS!</string>
-    <string name="qksms_plus_thanks_summary">You now have access to all QKSMS+ features</string>
-    <string name="qksms_plus_free_title">QKSMS+ is free for F-Droid users! If you\'d like to support development, a donation would be highly appreciated.</string>
-    <string name="qksms_plus_donate">Donate via PayPal</string>
-    <string name="qksms_plus_coming_soon">Coming soon</string>
-    <string name="qksms_plus_themes_title">Premium themes</string>
-    <string name="qksms_plus_themes_summary">Unlock beautiful theme colors not available on the Material Design palette</string>
-    <string name="qksms_plus_emoji_title">Custom auto-emoji</string>
-    <string name="qksms_plus_emoji_summary">Create custom auto-emoji shortcuts</string>
-    <string name="qksms_plus_backup_title">Message backup</string>
-    <string name="qksms_plus_backup_summary">Automatically back up your messages. Never again worry about losing your history if you change phones or your phone gets lost</string>
-    <string name="qksms_plus_scheduled_title">Scheduled messages</string>
-    <string name="qksms_plus_scheduled_summary">Schedule messages to automatically be sent at a specific time and date</string>
-    <string name="qksms_plus_delayed_title">Delayed sending</string>
-    <string name="qksms_plus_delayed_summary">Wait a few seconds before sending your message</string>
-    <string name="qksms_plus_night_title">Automatic night mode</string>
-    <string name="qksms_plus_night_summary">Enable night mode based on the time of day</string>
-    <string name="qksms_plus_blacklist_title">Advanced blocking</string>
-    <string name="qksms_plus_blacklist_summary">Block messages that contain keywords or match patterns</string>
-    <string name="qksms_plus_forward_title">Auto-forward</string>
-    <string name="qksms_plus_forward_summary">Automatically forward messages from certain senders</string>
-    <string name="qksms_plus_respond_title">Auto-respond</string>
-    <string name="qksms_plus_respond_summary">Automatically respond to incoming messages with a preset response</string>
-    <string name="qksms_plus_more_title">More</string>
-    <string name="qksms_plus_more_summary">QKSMS is under active development, and your purchase will include all future QKSMS+ features!</string>
-    <string name="widget_loading">Loading&#8230;</string>
-    <string name="widget_more">View more conversations</string>
-    <string name="qkreply_menu_read">Mark read</string>
-    <string name="qkreply_menu_call">Call</string>
-    <string name="qkreply_menu_delete">Delete</string>
-    <string name="qkreply_menu_expand">Show more</string>
-    <string name="qkreply_menu_collapse">Show less</string>
-    <string name="qkreply_menu_view">Open conversation</string>
-    <string name="theme_material">Material</string>
-    <string name="theme_hex">HEX</string>
-    <string name="theme_apply">Apply</string>
-    <string-array name="notification_actions">
-        <item>None</item>
-        <item>Archive</item>
-        <item>Delete</item>
-        <item>Block</item>
-        <item>Call</item>
-        <item>Mark read</item>
-        <item>Reply</item>
-    </string-array>
-    <string name="button_yes">Yes</string>
-    <string name="button_continue">Continue</string>
-    <string name="button_cancel">Cancel</string>
-    <string name="button_delete">Delete</string>
-    <string name="button_save">Save</string>
-    <string name="button_stop">Stop</string>
-    <string name="button_more">More</string>
-    <string name="button_set">Set</string>
-    <string name="button_undo">Undo</string>
-    <string name="toast_copied">Copied</string>
-    <string name="toast_archived">Archived conversation</string>
-    <string name="toast_qksms_plus">You must unlock QKSMS+ to use this</string>
-    <plurals name="notification_new_messages">
-        <item quantity="one">New message</item>
-        <item quantity="few">%s new messages</item>
-        <item quantity="other">%s new messages</item>
-    </plurals>
-    <string name="notification_message_failed_title">Message not sent</string>
-    <string name="notification_message_failed_text">The message to %s failed to send</string>
-    <string-array name="night_modes">
-        <item>System</item>
-        <item>Disabled</item>
-        <item>Always on</item>
-        <item>Automatic</item>
-    </string-array>
-    <string-array name="notification_preview_options">
-        <item>Show name and message</item>
-        <item>Show name</item>
-        <item>Hide contents</item>
-    </string-array>
-    <string-array name="text_sizes">
-        <item>Small</item>
-        <item>Normal</item>
-        <item>Large</item>
-        <item>Larger</item>
-    </string-array>
-    <string-array name="delayed_sending_labels">
-        <item>No delay</item>
-        <item>3 seconds</item>
-        <item>5 seconds</item>
-        <item>10 seconds</item>
-    </string-array>
-    <string-array name="mms_sizes">
-        <item>Automatic</item>
-        <item>100KB</item>
-        <item>200KB</item>
-        <item>300KB</item>
-        <item>600KB</item>
-        <item>1000KB</item>
-        <item>2000KB</item>
-        <item>No compression</item>
-    </string-array>
-    <string-array name="qk_responses">
-        <item>У реду</item>
-        <item>Сачекај секунд</item>
-        <item>Стижем</item>
-        <item>Хвала</item>
-        <item>Не звучи лоше</item>
-        <item>Шта има?</item>
-        <item>Договорено</item>
-        <item>Не</item>
-        <item>Волим те</item>
-        <item>Извини</item>
-        <item>Значи, ЛОЛ</item>
-        <item>Добро онда</item>
-    </string-array>
-</resources>
+<?xml version="1.0" encoding="utf-8"?>
+<!--
+  ~ Copyright (C) 2019 Moez Bhatti <moez.bhatti@gmail.com>
+  ~
+  ~ This file is part of QKSMS.
+  ~
+  ~ QKSMS is free software: you can redistribute it and/or modify
+  ~ it under the terms of the GNU General Public License as published by
+  ~ the Free Software Foundation, either version 3 of the License, or
+  ~ (at your option) any later version.
+  ~
+  ~ QKSMS is distributed in the hope that it will be useful,
+  ~ but WITHOUT ANY WARRANTY; without even the implied warranty of
+  ~ MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+  ~ GNU General Public License for more details.
+  ~
+  ~ You should have received a copy of the GNU General Public License
+  ~ along with QKSMS.  If not, see <http://www.gnu.org/licenses/>.
+  -->
+<resources>
+    <string name="shortcut_compose_long_label">New conversation</string>
+    <string name="shortcut_compose_short_label">Compose</string>
+    <string name="shortcut_compose_disabled_message">Shortcut disabled</string>
+    <string name="title_archived">Archived</string>
+    <string name="title_settings">Подешавања</string>
+    <string name="title_notification_prefs">Notifications</string>
+    <string name="title_theme">Theme</string>
+    <string name="title_conversations">Search inbox&#8230;</string>
+    <string name="title_compose">Састављање</string>
+    <string name="setup_skip">Skip</string>
+    <string name="setup_next">Continue</string>
+    <string name="menu_add_person">Add person</string>
+    <string name="menu_call">Позови</string>
+    <string name="menu_info">Details</string>
+    <string name="menu_save">Save to gallery</string>
+    <string name="menu_share">Share</string>
+    <string name="main_drawer_open_cd">Open navigation drawer</string>
+    <string name="main_title_selected">%d selected</string>
+    <string name="main_menu_clear">Clear</string>
+    <string name="main_menu_archive">Archive</string>
+    <string name="main_menu_unarchive">Unarchive</string>
+    <string name="main_menu_delete">Delete</string>
+    <string name="main_menu_add_contact">Add to contacts</string>
+    <string name="main_menu_pin">Pin to top</string>
+    <string name="main_menu_unpin">Unpin</string>
+    <string name="main_menu_read">Mark read</string>
+    <string name="main_menu_unread">Mark unread</string>
+    <string name="main_menu_block">Block</string>
+    <string name="main_syncing">Syncing messages&#8230;</string>
+    <string name="main_sender_you">You: %s</string>
+    <string name="main_draft">Draft</string>
+    <string name="main_message_results_title">Results in messages</string>
+    <string name="main_message_results">%d messages</string>
+    <string name="inbox_empty_text">Your conversations will appear here</string>
+    <string name="inbox_search_empty_text">No results</string>
+    <string name="archived_empty_text">Your archived conversations will appear here</string>
+    <string name="main_fab_cd">Start new conversation</string>
+    <string name="main_default_sms_title">Love texting again</string>
+    <string name="main_default_sms_message">Make QKSMS your default SMS app</string>
+    <string name="main_default_sms_change">Change</string>
+    <string name="main_permission_required">Permission required</string>
+    <string name="main_permission_sms">QKSMS needs permission to send and view SMS messages</string>
+    <string name="main_permission_contacts">QKSMS needs permission to view your contacts</string>
+    <string name="main_permission_allow">Allow</string>
+    <string name="drawer_inbox">Inbox</string>
+    <string name="drawer_archived">Archived</string>
+    <string name="drawer_scheduled">Scheduled</string>
+    <string name="drawer_blocking">Blocking</string>
+    <string name="drawer_more">More</string>
+    <string name="drawer_settings">Settings</string>
+    <string name="drawer_help">Help &amp; feedback</string>
+    <string name="drawer_invite">Invite friends</string>
+    <string name="drawer_plus_banner_summary">Unlock amazing new features, and support development</string>
+    <string name="rate_title">Enjoying QKSMS?</string>
+    <string name="rate_summary">Share some love and rate us on Google Play!</string>
+    <string name="rate_okay">OKAY!</string>
+    <string name="rate_dismiss">DISMISS</string>
+    <string name="dialog_delete_title">Delete</string>
+    <plurals name="dialog_delete_message">
+        <item quantity="one">Are you sure you would like to delete this conversation?</item>
+        <item quantity="few">Are you sure you would like to delete %d conversations?</item>
+        <item quantity="other">Are you sure you would like to delete %d conversations?</item>
+    </plurals>
+    <string-array name="message_options">
+        <item>Copy text</item>
+        <item>Forward</item>
+        <item>Delete</item>
+    </string-array>
+    <string name="compose_number_picker_title">Choose a phone number</string>
+    <string name="compose_number_picker_default">%s ∙ Default</string>
+    <string name="compose_number_picker_once">Just once</string>
+    <string name="compose_number_picker_always">Always</string>
+    <string name="compose_title_selected">%d selected</string>
+    <string name="compose_subtitle_results">%1$d of %2$d results</string>
+    <string name="compose_send_group_title">Send as group message</string>
+    <string name="compose_send_group_summary">Recipients and replies will be visible to everyone</string>
+    <string name="compose_messages_empty">This is the start of your conversation. Say something nice!</string>
+    <string name="compose_vcard_label">Contact card</string>
+    <string name="compose_scheduled_for">Scheduled for</string>
+    <string name="compose_scheduled_future">Selected time must be in the future!</string>
+    <string name="compose_scheduled_plus">You must unlock QKSMS+ to use scheduled messaging</string>
+    <string name="compose_scheduled_toast">Added to scheduled messages</string>
+    <string name="compose_hint">Write a message&#8230;</string>
+    <string name="compose_menu_copy">Copy text</string>
+    <string name="compose_menu_forward">Forward</string>
+    <string name="compose_menu_delete">Delete</string>
+    <string name="compose_menu_previous">Previous</string>
+    <string name="compose_menu_next">Next</string>
+    <string name="compose_menu_clear">Clear</string>
+    <string name="compose_details_title">Message details</string>
+    <string name="compose_details_type">Type: %s</string>
+    <string name="compose_details_from">From: %s</string>
+    <string name="compose_details_to">To: %s</string>
+    <string name="compose_details_subject">Subject: %s</string>
+    <string name="compose_details_priority">Priority: %s</string>
+    <string name="compose_details_size">Size: %s</string>
+    <string name="compose_details_sent">Sent: %s</string>
+    <string name="compose_details_received">Received: %s</string>
+    <string name="compose_details_delivered">Delivered: %s</string>
+    <string name="compose_details_error_code">Error code: %d</string>
+    <string name="compose_attach_cd">Add an attachment</string>
+    <string name="compose_gallery_cd">Attach a photo</string>
+    <string name="compose_camera_cd">Take a photo</string>
+    <string name="compose_schedule_cd">Schedule message</string>
+    <string name="compose_contact_cd">Attach a contact</string>
+    <string name="compose_contact_error">Error reading contact</string>
+    <!-- Example: SIM 1 (Verizon) selected-->
+    <string name="compose_sim_changed_toast">SIM %1$d (%2$s) selected</string>
+    <string name="compose_sim_cd">%s selected, change SIM card</string>
+    <string name="compose_send_cd">Send message</string>
+    <string name="message_status_sending">Sending&#8230;</string>
+    <string name="message_status_delivered">Delivered %s</string>
+    <string name="message_status_failed">Failed to send. Tap to try again</string>
+    <string name="info_title">Details</string>
+    <string name="info_copied_address">Address copied</string>
+    <string name="info_name">Conversation title</string>
+    <string name="info_notifications">Notifications</string>
+    <string name="info_theme">Theme</string>
+    <string name="info_archive">Archive</string>
+    <string name="info_unarchive">Unarchive</string>
+    <string name="info_block">Block</string>
+    <string name="info_unblock">Unblock</string>
+    <string name="info_delete">Delete conversation</string>
+    <string name="gallery_error">Couldn\'t load media</string>
+    <string name="gallery_toast_saved">Saved to gallery</string>
+    <string name="backup_title">Backup and restore</string>
+    <string name="backup_backing_up">Backing up messages</string>
+    <string name="backup_restoring">Restoring from backup</string>
+    <string name="backup_last">Last backup</string>
+    <string name="backup_loading">Loading&#8230;</string>
+    <string name="backup_never">Never</string>
+    <string name="backup_restore_title">Restore</string>
+    <string name="backup_restore_summary">Select a backup</string>
+    <string name="backup_restore_error_plus">Please unlock QKSMS+ to use backup and restore</string>
+    <string name="backup_restore_error_backup">Backup in progress&#8230;</string>
+    <string name="backup_restore_error_restore">Restore in progress&#8230;</string>
+    <string name="backup_restore_confirm_title">Restore from backup</string>
+    <string name="backup_restore_confirm_message">Are you sure you would like to restore your messages from this backup?</string>
+    <string name="backup_restore_stop_title">Stop restore</string>
+    <string name="backup_restore_stop_message">Messages that have already been restored will remain on your device</string>
+    <string name="backup_restore_dialog_title">Backups</string>
+    <string name="backup_restore_dialog_empty">No backups found</string>
+    <plurals name="backup_message_count">
+        <item quantity="one">%d message</item>
+        <item quantity="few">%d messages</item>
+        <item quantity="other">%d messages</item>
+    </plurals>
+    <string name="backup_disclaimer">Currently, only SMS is supported by Backup and Restore. MMS support and scheduled backups will be coming soon!</string>
+    <string name="backup_now">Backup now</string>
+    <string name="backup_progress_parsing">Parsing backup&#8230;</string>
+    <string name="backup_progress_running">%d/%d messages</string>
+    <string name="backup_progress_saving">Saving backup&#8230;</string>
+    <string name="backup_progress_syncing">Syncing messages&#8230;</string>
+    <string name="backup_progress_finished">Finished!</string>
+    <string name="backup_notification_channel_name">Backup and restore</string>
+    <string name="scheduled_title">Scheduled</string>
+    <string name="scheduled_empty_description">Automatically send a message, at the exact moment you\'d like</string>
+    <string name="scheduled_empty_message_1">Hey! When was your birthday again?</string>
+    <string name="scheduled_empty_message_2">It\'s on December 23rd</string>
+    <string name="scheduled_empty_message_3">Happy birthday! Look at what a great friend I am, remembering your birthday</string>
+    <!--&#x200A; is a special character required at the end of this string to fix it's formatting in the app -->
+    <string name="scheduled_empty_message_3_timestamp">Sending on December 23rd </string>
+    <string name="scheduled_compose_cd">Schedule a message</string>
+    <string name="scheduled_options_title">Scheduled message</string>
+    <string-array name="scheduled_options">
+        <item>Send now</item>
+        <item>Copy text</item>
+        <item>Delete</item>
+    </string-array>
+    <string name="settings_category_appearance">Appearance</string>
+    <string name="settings_category_general">General</string>
+    <string name="settings_category_qkreply">QK Reply</string>
+    <string name="settings_theme_title">Theme</string>
+    <string name="settings_night_title">Night mode</string>
+    <string name="settings_black_title">Pure black night mode</string>
+    <string name="settings_night_start_title">Start time</string>
+    <string name="settings_night_end_title">End time</string>
+    <string name="settings_automatic_colors_title">Automatic contact colors</string>
+    <string name="settings_text_size_title">Font size</string>
+    <string name="settings_system_font_title">Use system font</string>
+    <string name="settings_auto_emoji_title">Automatic emoji</string>
+    <string name="settings_notifications_title">Notifications</string>
+    <string name="settings_notifications_o_summary">Tap to customize</string>
+    <string name="settings_notification_actions_title">Actions</string>
+    <string name="settings_notification_action_1">Button 1</string>
+    <string name="settings_notification_action_2">Button 2</string>
+    <string name="settings_notification_action_3">Button 3</string>
+    <string name="settings_notification_previews_title">Notification previews</string>
+    <string name="settings_notification_wake_title">Wake screen</string>
+    <string name="settings_vibration_title">Vibration</string>
+    <string name="settings_ringtone_title">Sound</string>
+    <string name="settings_ringtone_none">None</string>
+    <string name="settings_qkreply_title">QK Reply</string>
+    <string name="settings_qkreply_summary">Popup for new messages</string>
+    <string name="settings_qkreply_tap_dismiss_title">Tap to dismiss</string>
+    <string name="settings_qkreply_tap_dismiss_summary">Tap outside of the popup to close it</string>
+    <string name="settings_delayed_title">Delayed sending</string>
+    <string name="settings_swipe_actions">Swipe actions</string>
+    <string name="settings_swipe_actions_summary">Configure swipe actions for conversations</string>
+    <string name="settings_swipe_actions_right">Right swipe</string>
+    <string name="settings_swipe_actions_left">Left swipe</string>
+    <string name="settings_swipe_actions_change">CHANGE</string>
+    <string-array name="settings_swipe_actions">
+        <item>None</item>
+        <item>Archive</item>
+        <item>Delete</item>
+        <item>Block</item>
+        <item>Call</item>
+        <item>Mark read</item>
+        <item>Mark unread</item>
+    </string-array>
+    <string name="settings_delivery_title">Delivery confirmations</string>
+    <string name="settings_delivery_summary">Confirm that messages were sent successfully</string>
+    <string name="settings_signature_title">Signature</string>
+    <string name="settings_signature_summary">Add a signature to the end of your messages</string>
+    <string name="settings_unicode_title">Strip accents</string>
+    <string name="settings_unicode_summary">Remove accents from characters in outgoing SMS messages</string>
+    <string name="settings_mobile_title">Mobile numbers only</string>
+    <string name="settings_mobile_summary">When composing a message, only show mobile numbers</string>
+    <string name="settings_auto_delete">Delete old messages automatically</string>
+    <string name="settings_auto_delete_dialog_message">Messages will be deleted after the specified number of days</string>
+    <string name="settings_auto_delete_dialog_hint">Number of days</string>
+    <string name="settings_auto_delete_never">Never</string>
+    <string name="settings_auto_delete_warning">Delete old messages automatically?</string>
+    <string name="settings_auto_delete_warning_message">If you proceed, %1$d messages will be deleted now</string>
+    <plurals name="settings_auto_delete_summary">
+        <item quantity="one">After 1 day</item>
+        <item quantity="few">After %d days</item>
+        <item quantity="other">After %d days</item>
+    </plurals>
+    <string name="settings_long_as_mms_title">Send long messages as MMS</string>
+    <string name="settings_long_as_mms_summary">If your longer text messages are failing to send, or sending in the wrong order, you can send them as MMS messages instead. Additional charges may apply</string>
+    <string name="settings_mms_size_title">Auto-compress MMS attachments</string>
+    <string name="settings_sync_title">Sync messages</string>
+    <string name="settings_sync_summary">Re-sync your messages with the native Android SMS database</string>
+    <string name="settings_about_title">About QKSMS</string>
+    <string name="settings_version">Version %s</string>
+    <string name="settings_logging_enabled">Debug logging enabled</string>
+    <string name="settings_logging_disabled">Debug logging disabled</string>
+    <string name="settings_delay_duration_hint">Enter duration (seconds)</string>
+    <string name="blocking_title">Blocking</string>
+    <string name="blocking_drop_title">Drop messages</string>
+    <string name="blocking_drop_summary">Drop incoming messages from blocked senders instead of hiding them</string>
+    <string name="blocking_conversations">Blocked conversations</string>
+    <string name="blocking_manager_title">Blocking Manager</string>
+    <string name="blocking_manager_qksms_title">QKSMS</string>
+    <string name="blocking_manager_qksms_summary">Built-in blocking functionality in QKSMS</string>
+    <string name="blocking_manager_call_control_summary">Automatically filter your calls and messages in one convenient place! Community IQ™ allows you to prevent unwanted messages from community known spammers</string>
+    <string name="blocking_manager_sia_summary">Automatically filter messages from unsolicited numbers by using the \"Should I Answer\" app</string>
+    <string name="blocking_manager_copy_title">Copy blocked numbers</string>
+    <string name="blocking_manager_copy_summary">Continue to %s and copy over your existing blocked numbers</string>
+    <string name="blocked_numbers_title">Blocked numbers</string>
+    <string name="blocked_numbers_empty">Your blocked numbers will appear here</string>
+    <string name="blocked_numbers_add_cd">Block a new number</string>
+    <string name="blocked_numbers_dialog_title">Block texts from</string>
+    <string name="blocked_numbers_dialog_hint">Phone number</string>
+    <string name="blocked_numbers_dialog_block">Block</string>
+    <string name="blocked_messages_title">Blocked messages</string>
+    <string name="blocked_messages_empty">Your blocked messages will appear here</string>
+    <string name="blocking_block_title">Block</string>
+    <string name="blocking_unblock_title">Unblock</string>
+    <plurals name="blocking_block_external">
+        <item quantity="one">Continue to %s and block this number</item>
+        <item quantity="few">Continue to %s and block these numbers</item>
+        <item quantity="other">Continue to %s and block these numbers</item>
+    </plurals>
+    <plurals name="blocking_unblock_external">
+        <item quantity="one">Continue to %s and allow this number</item>
+        <item quantity="few">Continue to %s and allow these numbers</item>
+        <item quantity="other">Continue to %s and allow these numbers</item>
+    </plurals>
+    <string name="about_title">About</string>
+    <string name="about_version_title">Version</string>
+    <string name="about_developer_title">Developer</string>
+    <string name="about_source_title">Source code</string>
+    <string name="about_changelog_title">Changelog</string>
+    <string name="about_contact_title">Contact</string>
+    <string name="about_license_title">License</string>
+    <string name="about_copyright_title">Copyright</string>
+    <string name="qksms_plus_description_title">Support development, unlock everything</string>
+    <string name="qksms_plus_description_summary">You can save a starving developer for just %s</string>
+    <!-- Substitutions are for price and currency. Ex: Lifetime upgrade for $1.99 USD -->
+    <string name="qksms_plus_upgrade">Lifetime upgrade for %1$s %2$s</string>
+    <!-- Substitutions are for price and currency. Ex: Unlock + donate for $4.99 USD -->
+    <string name="qksms_plus_upgrade_donate">Unlock + donate for %1$s %2$s</string>
+    <string name="qksms_plus_thanks_title">Thank you for supporting QKSMS!</string>
+    <string name="qksms_plus_thanks_summary">You now have access to all QKSMS+ features</string>
+    <string name="qksms_plus_free_title">QKSMS+ is free for F-Droid users! If you\'d like to support development, a donation would be highly appreciated.</string>
+    <string name="qksms_plus_donate">Donate via PayPal</string>
+    <string name="qksms_plus_coming_soon">Coming soon</string>
+    <string name="qksms_plus_themes_title">Premium themes</string>
+    <string name="qksms_plus_themes_summary">Unlock beautiful theme colors not available on the Material Design palette</string>
+    <string name="qksms_plus_emoji_title">Custom auto-emoji</string>
+    <string name="qksms_plus_emoji_summary">Create custom auto-emoji shortcuts</string>
+    <string name="qksms_plus_backup_title">Message backup</string>
+    <string name="qksms_plus_backup_summary">Automatically back up your messages. Never again worry about losing your history if you change phones or your phone gets lost</string>
+    <string name="qksms_plus_scheduled_title">Scheduled messages</string>
+    <string name="qksms_plus_scheduled_summary">Schedule messages to automatically be sent at a specific time and date</string>
+    <string name="qksms_plus_delayed_title">Delayed sending</string>
+    <string name="qksms_plus_delayed_summary">Wait a few seconds before sending your message</string>
+    <string name="qksms_plus_night_title">Automatic night mode</string>
+    <string name="qksms_plus_night_summary">Enable night mode based on the time of day</string>
+    <string name="qksms_plus_blacklist_title">Advanced blocking</string>
+    <string name="qksms_plus_blacklist_summary">Block messages that contain keywords or match patterns</string>
+    <string name="qksms_plus_forward_title">Auto-forward</string>
+    <string name="qksms_plus_forward_summary">Automatically forward messages from certain senders</string>
+    <string name="qksms_plus_respond_title">Auto-respond</string>
+    <string name="qksms_plus_respond_summary">Automatically respond to incoming messages with a preset response</string>
+    <string name="qksms_plus_more_title">More</string>
+    <string name="qksms_plus_more_summary">QKSMS is under active development, and your purchase will include all future QKSMS+ features!</string>
+    <string name="widget_loading">Loading&#8230;</string>
+    <string name="widget_more">View more conversations</string>
+    <string name="qkreply_menu_read">Mark read</string>
+    <string name="qkreply_menu_call">Call</string>
+    <string name="qkreply_menu_delete">Delete</string>
+    <string name="qkreply_menu_expand">Show more</string>
+    <string name="qkreply_menu_collapse">Show less</string>
+    <string name="qkreply_menu_view">Open conversation</string>
+    <string name="theme_material">Material</string>
+    <string name="theme_hex">HEX</string>
+    <string name="theme_apply">Apply</string>
+    <string-array name="notification_actions">
+        <item>None</item>
+        <item>Archive</item>
+        <item>Delete</item>
+        <item>Block</item>
+        <item>Call</item>
+        <item>Mark read</item>
+        <item>Reply</item>
+    </string-array>
+    <string name="button_yes">Yes</string>
+    <string name="button_continue">Continue</string>
+    <string name="button_cancel">Cancel</string>
+    <string name="button_delete">Delete</string>
+    <string name="button_save">Save</string>
+    <string name="button_stop">Stop</string>
+    <string name="button_more">More</string>
+    <string name="button_set">Set</string>
+    <string name="button_undo">Undo</string>
+    <string name="toast_copied">Copied</string>
+    <string name="toast_archived">Archived conversation</string>
+    <string name="toast_qksms_plus">You must unlock QKSMS+ to use this</string>
+    <plurals name="notification_new_messages">
+        <item quantity="one">New message</item>
+        <item quantity="few">%s new messages</item>
+        <item quantity="other">%s new messages</item>
+    </plurals>
+    <string name="notification_message_failed_title">Message not sent</string>
+    <string name="notification_message_failed_text">The message to %s failed to send</string>
+    <string-array name="night_modes">
+        <item>System</item>
+        <item>Disabled</item>
+        <item>Always on</item>
+        <item>Automatic</item>
+    </string-array>
+    <string-array name="notification_preview_options">
+        <item>Show name and message</item>
+        <item>Show name</item>
+        <item>Hide contents</item>
+    </string-array>
+    <string-array name="text_sizes">
+        <item>Small</item>
+        <item>Normal</item>
+        <item>Large</item>
+        <item>Larger</item>
+    </string-array>
+    <string-array name="delayed_sending_labels">
+        <item>No delay</item>
+        <item>3 seconds</item>
+        <item>5 seconds</item>
+        <item>10 seconds</item>
+    </string-array>
+    <string-array name="mms_sizes">
+        <item>Automatic</item>
+        <item>100KB</item>
+        <item>200KB</item>
+        <item>300KB</item>
+        <item>600KB</item>
+        <item>1000KB</item>
+        <item>2000KB</item>
+        <item>No compression</item>
+    </string-array>
+    <string-array name="qk_responses">
+        <item>У реду</item>
+        <item>Сачекај секунд</item>
+        <item>Стижем</item>
+        <item>Хвала</item>
+        <item>Не звучи лоше</item>
+        <item>Шта има?</item>
+        <item>Договорено</item>
+        <item>Не</item>
+        <item>Волим те</item>
+        <item>Извини</item>
+        <item>Значи, ЛОЛ</item>
+        <item>Добро онда</item>
+    </string-array>
+</resources>
diff --git a/presentation/src/main/res/values-sv/strings.xml b/presentation/src/main/res/values-sv/strings.xml
index 48b4c6fdc..c01efa4d1 100644
--- a/presentation/src/main/res/values-sv/strings.xml
+++ b/presentation/src/main/res/values-sv/strings.xml
@@ -1,411 +1,411 @@
-<?xml version="1.0" encoding="utf-8"?>
-<!--
-  ~ Copyright (C) 2019 Moez Bhatti <moez.bhatti@gmail.com>
-  ~
-  ~ This file is part of QKSMS.
-  ~
-  ~ QKSMS is free software: you can redistribute it and/or modify
-  ~ it under the terms of the GNU General Public License as published by
-  ~ the Free Software Foundation, either version 3 of the License, or
-  ~ (at your option) any later version.
-  ~
-  ~ QKSMS is distributed in the hope that it will be useful,
-  ~ but WITHOUT ANY WARRANTY; without even the implied warranty of
-  ~ MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
-  ~ GNU General Public License for more details.
-  ~
-  ~ You should have received a copy of the GNU General Public License
-  ~ along with QKSMS.  If not, see <http://www.gnu.org/licenses/>.
-  -->
-<resources>
-    <string name="shortcut_compose_long_label">Ny konversation</string>
-    <string name="shortcut_compose_short_label">Skriv</string>
-    <string name="shortcut_compose_disabled_message">Genvägen inaktiverades</string>
-    <string name="title_archived">Arkiverat</string>
-    <string name="title_settings">Inställningar</string>
-    <string name="title_notification_prefs">Aviseringar</string>
-    <string name="title_theme">Tema</string>
-    <string name="title_conversations">Sök i inkorg&#8230;</string>
-    <string name="title_compose">Ange ett namn eller nummer</string>
-    <string name="setup_skip">Hoppa över</string>
-    <string name="setup_next">Fortsätt</string>
-    <string name="menu_add_person">Lägg till person</string>
-    <string name="menu_call">Ring</string>
-    <string name="menu_info">Detaljer</string>
-    <string name="menu_save">Spara till galleri</string>
-    <string name="menu_share">Dela</string>
-    <string name="main_drawer_open_cd">Öppna navigeringspanelen</string>
-    <string name="main_title_selected">%d vald</string>
-    <string name="main_menu_clear">Rensa</string>
-    <string name="main_menu_archive">Arkiv</string>
-    <string name="main_menu_unarchive">Avarkivera</string>
-    <string name="main_menu_delete">Radera</string>
-    <string name="main_menu_add_contact">Lägg till i kontakter</string>
-    <string name="main_menu_pin">Fäst på toppen</string>
-    <string name="main_menu_unpin">Frigör</string>
-    <string name="main_menu_read">Markera som läst</string>
-    <string name="main_menu_unread">Markera som oläst</string>
-    <string name="main_menu_block">Blockera</string>
-    <string name="main_syncing">Synkroniserar meddelanden&#8230;</string>
-    <string name="main_sender_you">Du: %s</string>
-    <string name="main_draft">Utkast</string>
-    <string name="main_message_results_title">Resultat i meddelanden</string>
-    <string name="main_message_results">%d meddelanden</string>
-    <string name="inbox_empty_text">Dina konversationer kommer att dyka upp här</string>
-    <string name="inbox_search_empty_text">Inga resultat</string>
-    <string name="archived_empty_text">Dina arkiverade konversationer kommer att dyka upp här</string>
-    <string name="main_fab_cd">Starta en ny konversation</string>
-    <string name="main_default_sms_title">Älska att skicka SMS igen</string>
-    <string name="main_default_sms_message">Gör QKSMS till din standard-app för SMS</string>
-    <string name="main_default_sms_change">Ändra</string>
-    <string name="main_permission_required">Tillstånd krävs</string>
-    <string name="main_permission_sms">QKSMS behöver tillåtelse att skicka och visa SMS-meddelanden</string>
-    <string name="main_permission_contacts">QKSMS behöver tillåtelse för att kunna se dina kontakter</string>
-    <string name="main_permission_allow">Tillåt</string>
-    <string name="drawer_inbox">Inkorg</string>
-    <string name="drawer_archived">Arkiverat</string>
-    <string name="drawer_scheduled">Schemalagt</string>
-    <string name="drawer_blocking">Blockerar</string>
-    <string name="drawer_more">Mer</string>
-    <string name="drawer_settings">Inställningar</string>
-    <string name="drawer_help">Hjälp &amp; återgivning</string>
-    <string name="drawer_invite">Bjud in vänner</string>
-    <string name="drawer_plus_banner_summary">Lås upp nya spännande funktioner och stötta utvecklingen</string>
-    <string name="rate_title">Tycker du om QKSMS?</string>
-    <string name="rate_summary">Dela lite kärlek och betygsätt oss på Google Play!</string>
-    <string name="rate_okay">OKEJ!</string>
-    <string name="rate_dismiss">AVFÄRDA</string>
-    <string name="dialog_delete_title">Radera</string>
-    <plurals name="dialog_delete_message">
-        <item quantity="one">Är du säker på att du vill ta bort den här konversationen?</item>
-        <item quantity="other">Är du säker på att du vill ta bort %d konversationer?</item>
-    </plurals>
-    <string-array name="message_options">
-        <item>Kopiera text</item>
-        <item>Vidarebefordra</item>
-        <item>Radera</item>
-    </string-array>
-    <string name="compose_number_picker_title">Välj ett telefonnummer</string>
-    <string name="compose_number_picker_default">%s ∙ Standard</string>
-    <string name="compose_number_picker_once">Bara en gång</string>
-    <string name="compose_number_picker_always">Alltid</string>
-    <string name="compose_title_selected">%d vald</string>
-    <string name="compose_subtitle_results">%1$d av %2$d resultat</string>
-    <string name="compose_send_group_title">Skicka som ett grupp-meddelande</string>
-    <string name="compose_send_group_summary">Mottagare och svar kommer att vara synligt för alla</string>
-    <string name="compose_messages_empty">Det här är början på din konversation. Säg något snällt!</string>
-    <string name="compose_vcard_label">Kontaktkort</string>
-    <string name="compose_scheduled_for">Schemalagd för</string>
-    <string name="compose_scheduled_future">Den valda tiden måste vara i framtiden!</string>
-    <string name="compose_scheduled_plus">Du måste låsa upp QKSMS+ om du vill använda schemalagda meddelanden</string>
-    <string name="compose_scheduled_toast">Lades till i schemalagda meddelanden</string>
-    <string name="compose_hint">Skriv ett meddelande&#8230;</string>
-    <string name="compose_menu_copy">Kopiera text</string>
-    <string name="compose_menu_forward">Vidarebefordra</string>
-    <string name="compose_menu_delete">Radera</string>
-    <string name="compose_menu_previous">Föregående</string>
-    <string name="compose_menu_next">Nästa</string>
-    <string name="compose_menu_clear">Rensa</string>
-    <string name="compose_details_title">Meddelandedetaljer</string>
-    <string name="compose_details_type">Typ: %s</string>
-    <string name="compose_details_from">Från: %s</string>
-    <string name="compose_details_to">Till: %s</string>
-    <string name="compose_details_subject">Ämne: %s</string>
-    <string name="compose_details_priority">Prioritet: %s</string>
-    <string name="compose_details_size">Storlek: %s</string>
-    <string name="compose_details_sent">Skickades: %s</string>
-    <string name="compose_details_received">Togs emot: %s</string>
-    <string name="compose_details_delivered">Levererades: %s</string>
-    <string name="compose_details_error_code">Felkod: %d</string>
-    <string name="compose_attach_cd">Lägg till en bilaga</string>
-    <string name="compose_gallery_cd">Bifoga en bild</string>
-    <string name="compose_camera_cd">Ta en bild</string>
-    <string name="compose_schedule_cd">Schemalägg meddelande</string>
-    <string name="compose_contact_cd">Bifoga en kontakt</string>
-    <string name="compose_contact_error">Fel uppstod när kontakt lästes in</string>
-    <!-- Example: SIM 1 (Verizon) selected-->
-    <string name="compose_sim_changed_toast">SIM %1$d (%2$s) valdes</string>
-    <string name="compose_sim_cd">%s valt, byt SIM-kort</string>
-    <string name="compose_send_cd">Skicka meddelandet</string>
-    <string name="message_status_sending">Skickar&#8230;</string>
-    <string name="message_status_delivered">Levererade %s</string>
-    <string name="message_status_failed">Misslyckades med att skicka. Knacka för att försöka igen</string>
-    <string name="info_title">Detaljer</string>
-    <string name="info_copied_address">Adress kopierades</string>
-    <string name="info_name">Titel för konversation</string>
-    <string name="info_notifications">Aviseringar</string>
-    <string name="info_theme">Tema</string>
-    <string name="info_archive">Arkivera</string>
-    <string name="info_unarchive">Avarkivera</string>
-    <string name="info_block">Blockera</string>
-    <string name="info_unblock">Avblockera</string>
-    <string name="info_delete">Radera konversation</string>
-    <string name="gallery_error">Kunde inte ladda mediet</string>
-    <string name="gallery_toast_saved">Spara till galleri</string>
-    <string name="backup_title">Säkerhetskopiera och återställ</string>
-    <string name="backup_backing_up">Säkerhetskopierar meddelandena</string>
-    <string name="backup_restoring">Återställer från säkerhetskopia</string>
-    <string name="backup_last">Senaste säkerhetskopiering</string>
-    <string name="backup_loading">Laddar&#8230;</string>
-    <string name="backup_never">Aldrig</string>
-    <string name="backup_restore_title">Återställ</string>
-    <string name="backup_restore_summary">Välj en säkerhetskopia</string>
-    <string name="backup_restore_error_plus">Vänligen lås upp QKSMS+ för att använda säkerhetskopiera och återställ</string>
-    <string name="backup_restore_error_backup">Säkerhetskopiering pågår&#8230;</string>
-    <string name="backup_restore_error_restore">Återställning pågår&#8230;</string>
-    <string name="backup_restore_confirm_title">Återställ från säkerhetskopia</string>
-    <string name="backup_restore_confirm_message">Är du säker på att du vill återställa dina meddelanden från den här säkerhetskopian?</string>
-    <string name="backup_restore_stop_title">Stoppa återställningen</string>
-    <string name="backup_restore_stop_message">Meddelanden som redan har blivit återställda kommer att stanna kvar i din enhet</string>
-    <string name="backup_restore_dialog_title">Säkerhetskopior</string>
-    <string name="backup_restore_dialog_empty">Inga säkerhetskopior kunde hittas</string>
-    <plurals name="backup_message_count">
-        <item quantity="one">%d meddelande</item>
-        <item quantity="other">%d meddelanden</item>
-    </plurals>
-    <string name="backup_disclaimer">För närvarande så stöds endast SMS av Säkerhetskopiera och Återställ. MMS-stöd och schemalagda säkerhetskopieringar kommer att dyka upp inom kort!</string>
-    <string name="backup_now">Säkerhetskopiera nu</string>
-    <string name="backup_progress_parsing">Tolkar säkerhetskopieringen&#8230;</string>
-    <string name="backup_progress_running">%d/%d meddelanden</string>
-    <string name="backup_progress_saving">Sparar säkerhetskopian&#8230;</string>
-    <string name="backup_progress_syncing">Synkroniserar meddelandena&#8230;</string>
-    <string name="backup_progress_finished">Avslutad!</string>
-    <string name="backup_notification_channel_name">Säkerhetskopiera och återställ</string>
-    <string name="scheduled_title">Schemalagda</string>
-    <string name="scheduled_empty_description">Skicka ett meddelande automatiskt i det exakta ögonblicket som du önskar</string>
-    <string name="scheduled_empty_message_1">Hi! När var din födelsedag igen?</string>
-    <string name="scheduled_empty_message_2">Den är den 23:e December</string>
-    <string name="scheduled_empty_message_3">Grattis på födelsedagen! Se vilken fin vän jag är som kommer ihåg din födelsedag</string>
-    <!--&#x200A; is a special character required at the end of this string to fix it's formatting in the app -->
-    <string name="scheduled_empty_message_3_timestamp">Skickar den 23:e December </string>
-    <string name="scheduled_compose_cd">Schemalägg ett meddelande</string>
-    <string name="scheduled_options_title">Schemalagt meddelande</string>
-    <string-array name="scheduled_options">
-        <item>Skicka nu</item>
-        <item>Kopiera text</item>
-        <item>Radera</item>
-    </string-array>
-    <string name="settings_category_appearance">Utseende</string>
-    <string name="settings_category_general">Generellt</string>
-    <string name="settings_category_qkreply">QK svar</string>
-    <string name="settings_theme_title">Tema</string>
-    <string name="settings_night_title">Nattläge</string>
-    <string name="settings_black_title">Svart nattläge</string>
-    <string name="settings_night_start_title">Starttid</string>
-    <string name="settings_night_end_title">Sluttid</string>
-    <string name="settings_automatic_colors_title">Automatiska kontaktfärger</string>
-    <string name="settings_text_size_title">Storlek på typsnitt</string>
-    <string name="settings_system_font_title">Använd systemteckensnitt</string>
-    <string name="settings_auto_emoji_title">Automatisk uttryckssymbol</string>
-    <string name="settings_notifications_title">Aviseringar</string>
-    <string name="settings_notifications_o_summary">Tryck för att anpassa</string>
-    <string name="settings_notification_actions_title">Åtgärder</string>
-    <string name="settings_notification_action_1">Knapp 1</string>
-    <string name="settings_notification_action_2">Knapp 2</string>
-    <string name="settings_notification_action_3">Knapp 3</string>
-    <string name="settings_notification_previews_title">Notifikations förhandsvisningar</string>
-    <string name="settings_notification_wake_title">Väck skärm</string>
-    <string name="settings_vibration_title">Vibration</string>
-    <string name="settings_ringtone_title">Ljud</string>
-    <string name="settings_ringtone_none">Ingen</string>
-    <string name="settings_qkreply_title">QK-svar</string>
-    <string name="settings_qkreply_summary">Popup för nya meddelanden</string>
-    <string name="settings_qkreply_tap_dismiss_title">Tryck för att avfärda</string>
-    <string name="settings_qkreply_tap_dismiss_summary">Tryck var som helst utanför popupen för att stänga den</string>
-    <string name="settings_delayed_title">Fördröj skickande av meddelanden</string>
-    <string name="settings_swipe_actions">Svepåtgärder</string>
-    <string name="settings_swipe_actions_summary">Ställ in svep-åtgärder för konversationer</string>
-    <string name="settings_swipe_actions_right">Svepning till höger</string>
-    <string name="settings_swipe_actions_left">Svepning till vänster</string>
-    <string name="settings_swipe_actions_change">BYT</string>
-    <string-array name="settings_swipe_actions">
-        <item>Inget</item>
-        <item>Arkivera</item>
-        <item>Ta bort</item>
-        <item>Blockera</item>
-        <item>Ring upp</item>
-        <item>Markera som läst</item>
-        <item>Markera som oläst</item>
-    </string-array>
-    <string name="settings_delivery_title">Leveransrapporter</string>
-    <string name="settings_delivery_summary">Bekräfta att meddelanden har skickats</string>
-    <string name="settings_signature_title">Signatur</string>
-    <string name="settings_signature_summary">Lägg till en signatur i slutet av dina meddelanden</string>
-    <string name="settings_unicode_title">Ta bort accenter</string>
-    <string name="settings_unicode_summary">Ta bort accenter från tecken i utåtgående SMS-meddelanden</string>
-    <string name="settings_mobile_title">Endast mobilnummer</string>
-    <string name="settings_mobile_summary">Visa endast mobilnummer när ett meddelanden skrivs</string>
-    <string name="settings_auto_delete">Radera gamla meddelanden automatiskt</string>
-    <string name="settings_auto_delete_dialog_message">Meddelanden kommer att raderas efter det angivna antalet dagar</string>
-    <string name="settings_auto_delete_dialog_hint">Antal dagar</string>
-    <string name="settings_auto_delete_never">Aldrig</string>
-    <string name="settings_auto_delete_warning">Radera gamla meddelanden automatiskt?</string>
-    <string name="settings_auto_delete_warning_message">Om du fortsätter raderas %1$d meddelanden direkt</string>
-    <plurals name="settings_auto_delete_summary">
-        <item quantity="one">After 1 day</item>
-        <item quantity="other">Efter %d dagar</item>
-    </plurals>
-    <string name="settings_long_as_mms_title">Skicka långa meddelanden som MMS</string>
-    <string name="settings_long_as_mms_summary">Om dina längre textmeddelanden inte skickas eller skickas i fel ordning kan du skicka dem som MMS-meddelanden istället. Ytterligare avgifter kan tillkomma</string>
-    <string name="settings_mms_size_title">Komprimera MMS-bilagor automatiskt</string>
-    <string name="settings_sync_title">Synkronisera meddelanden</string>
-    <string name="settings_sync_summary">Synkronisera dina meddelanden med telefonens SMS-databas</string>
-    <string name="settings_about_title">Om QKSMS</string>
-    <string name="settings_version">Version %s</string>
-    <string name="settings_logging_enabled">Felsökningsloggning aktiverades</string>
-    <string name="settings_logging_disabled">Felsökningsloggning inaktiverad</string>
-    <string name="settings_delay_duration_hint">Fyll i varaktighet (sekunder)</string>
-    <string name="blocking_title">Blockerar</string>
-    <string name="blocking_drop_title">Avvisa meddelanden</string>
-    <string name="blocking_drop_summary">Avvisa inkommande meddelanden från blockerade avsändare istället för att dölja dem</string>
-    <string name="blocking_conversations">Blockerade konversationer</string>
-    <string name="blocking_manager_title">Blockerings-hanterare</string>
-    <string name="blocking_manager_qksms_title">QKSMS</string>
-    <string name="blocking_manager_qksms_summary">Inbyggd blockeringsfunktion i QKSMS</string>
-    <string name="blocking_manager_call_control_summary">Filtrera automatiskt dina samtal och meddelanden på ett bekvämt ställe! Med Community IQ™ kan du förhindra oönskade meddelanden från gemenskapens kända spammare</string>
-    <string name="blocking_manager_sia_summary">Filtrera automatiskt meddelanden från oönskade nummer genom att använda appen \"Borde jag svara\"</string>
-    <string name="blocking_manager_copy_title">Kopiera blockerade nummer</string>
-    <string name="blocking_manager_copy_summary">Fortsätt till %s och kopiera över dina befintliga blockerade nummer</string>
-    <string name="blocked_numbers_title">Blockerade nummer</string>
-    <string name="blocked_numbers_empty">Dina blockerade nummer kommer att visas här</string>
-    <string name="blocked_numbers_add_cd">Blockera ett nytt nummer</string>
-    <string name="blocked_numbers_dialog_title">Blockera SMS från</string>
-    <string name="blocked_numbers_dialog_hint">Telefonnummer</string>
-    <string name="blocked_numbers_dialog_block">Blockera</string>
-    <string name="blocked_messages_title">Blockerade meddelanden</string>
-    <string name="blocked_messages_empty">Dina blockerade meddelanden visas här</string>
-    <string name="blocking_block_title">Blockera</string>
-    <string name="blocking_unblock_title">Avblockera</string>
-    <plurals name="blocking_block_external">
-        <item quantity="one">Fortsätt till %s och blockera detta nummer</item>
-        <item quantity="other">Fortsätt till %s och blockera dessa nummer</item>
-    </plurals>
-    <plurals name="blocking_unblock_external">
-        <item quantity="one">Fortsätt till %s och tillåt detta nummer</item>
-        <item quantity="other">Fortsätt till %s och tillåt dessa nummer</item>
-    </plurals>
-    <string name="about_title">Om</string>
-    <string name="about_version_title">Version</string>
-    <string name="about_developer_title">Utvecklare</string>
-    <string name="about_source_title">Källkod</string>
-    <string name="about_changelog_title">Ändringslogg</string>
-    <string name="about_contact_title">Kontakt</string>
-    <string name="about_license_title">Licens</string>
-    <string name="about_copyright_title">Kopieringsskydd</string>
-    <string name="qksms_plus_description_title">Ge stöd till utveckling, lås upp allting</string>
-    <string name="qksms_plus_description_summary">Du kan hjälpa en svältande utvecklare för bara %s</string>
-    <!-- Substitutions are for price and currency. Ex: Lifetime upgrade for $1.99 USD -->
-    <string name="qksms_plus_upgrade">Livstidsuppgradering för %1$s %2$s</string>
-    <!-- Substitutions are for price and currency. Ex: Unlock + donate for $4.99 USD -->
-    <string name="qksms_plus_upgrade_donate">Lås upp + donera för %1$s %2$s</string>
-    <string name="qksms_plus_thanks_title">Tack för att du stöttar QKSMS!</string>
-    <string name="qksms_plus_thanks_summary">Du har nu tillgång till alla funktioner i QKSMS+</string>
-    <string name="qksms_plus_free_title">QKSMS + är gratis för F-Droid användare! Om du vill stödja utvecklingen, Så får du gärna donationera.</string>
-    <string name="qksms_plus_donate">Donera via PayPal</string>
-    <string name="qksms_plus_coming_soon">Kommer snart</string>
-    <string name="qksms_plus_themes_title">Högkvalitativa teman</string>
-    <string name="qksms_plus_themes_summary">Lås upp vackra färger som inte finns tillgängliga på Material Design paletten</string>
-    <string name="qksms_plus_emoji_title">Anpassad auto-emoji</string>
-    <string name="qksms_plus_emoji_summary">Skapa anpassade auto-emoji genvägar</string>
-    <string name="qksms_plus_backup_title">Säkerhetskopiering av meddelande</string>
-    <string name="qksms_plus_backup_summary">Säkerhetskopiera automatiskt dina meddelanden. Du behöver aldrig mer oroa dig för att förlora dina konversationer om du byter telefon eller telefonen försvinner</string>
-    <string name="qksms_plus_scheduled_title">Schemalagda meddelanden</string>
-    <string name="qksms_plus_scheduled_summary">Schemalägg meddelanden att automatiskt skickas vid en specifik tid och datum</string>
-    <string name="qksms_plus_delayed_title">Fördröj skickande av meddelanden</string>
-    <string name="qksms_plus_delayed_summary">Vänta några sekunder innan du skickar ditt meddelande</string>
-    <string name="qksms_plus_night_title">Automatiskt nattläge</string>
-    <string name="qksms_plus_night_summary">Aktivera nattläge baserat på tiden på dygnet</string>
-    <string name="qksms_plus_blacklist_title">Avancerade blockering</string>
-    <string name="qksms_plus_blacklist_summary">Blockera meddelanden som innehåller specifika ord eller matchar mönster</string>
-    <string name="qksms_plus_forward_title">Auto-forward</string>
-    <string name="qksms_plus_forward_summary">Automatiskt vidarebefordra meddelanden från vissa avsändare</string>
-    <string name="qksms_plus_respond_title">Auto-svara</string>
-    <string name="qksms_plus_respond_summary">Svara automatiskt på inkommande meddelanden med ett förinställt svar</string>
-    <string name="qksms_plus_more_title">Mer</string>
-    <string name="qksms_plus_more_summary">QKSMS är under aktiv utveckling, och dina köp kommer att inkludera alla kommande QKSMS+-funktioner!</string>
-    <string name="widget_loading">Laddar&#8230;</string>
-    <string name="widget_more">Visa fler konversationer</string>
-    <string name="qkreply_menu_read">Markera som läst</string>
-    <string name="qkreply_menu_call">Ring</string>
-    <string name="qkreply_menu_delete">Ta bort</string>
-    <string name="qkreply_menu_expand">Visa mer</string>
-    <string name="qkreply_menu_collapse">Visa färre</string>
-    <string name="qkreply_menu_view">Öppna konversation</string>
-    <string name="theme_material">Material</string>
-    <string name="theme_hex">HEX</string>
-    <string name="theme_apply">Verkställ</string>
-    <string-array name="notification_actions">
-        <item>Inget</item>
-        <item>Arkivera</item>
-        <item>Radera</item>
-        <item>Blockera</item>
-        <item>Ring upp</item>
-        <item>Markera som läst</item>
-        <item>Svara</item>
-    </string-array>
-    <string name="button_yes">Ja</string>
-    <string name="button_continue">Fortsätt</string>
-    <string name="button_cancel">Avbryt</string>
-    <string name="button_delete">Radera</string>
-    <string name="button_save">Spara</string>
-    <string name="button_stop">Stoppa</string>
-    <string name="button_more">Mer</string>
-    <string name="button_set">Ställ in</string>
-    <string name="button_undo">Ångra</string>
-    <string name="toast_copied">Kopierad</string>
-    <string name="toast_archived">Arkiverade konversationer</string>
-    <string name="toast_qksms_plus">Du måste låsa upp QKSMS+ för att använda det här</string>
-    <plurals name="notification_new_messages">
-        <item quantity="one">Nytt meddelande</item>
-        <item quantity="other">%s nya meddelanden</item>
-    </plurals>
-    <string name="notification_message_failed_title">Meddelandet skickades inte</string>
-    <string name="notification_message_failed_text">Meddelandet till %s misslyckades att skicka</string>
-    <string-array name="night_modes">
-        <item>System</item>
-        <item>Inaktiverad</item>
-        <item>Alltid på</item>
-        <item>Automatisk</item>
-    </string-array>
-    <string-array name="notification_preview_options">
-        <item>Visa namn och meddelande</item>
-        <item>Visa namn</item>
-        <item>Göm innehåll</item>
-    </string-array>
-    <string-array name="text_sizes">
-        <item>Liten</item>
-        <item>Normal</item>
-        <item>Stort</item>
-        <item>Större</item>
-    </string-array>
-    <string-array name="delayed_sending_labels">
-        <item>Ingen fördröjning</item>
-        <item>3 sekunder</item>
-        <item>5 sekunder</item>
-        <item>10 sekunder</item>
-    </string-array>
-    <string-array name="mms_sizes">
-        <item>Automatisk</item>
-        <item>100KB</item>
-        <item>200kB</item>
-        <item>300KB</item>
-        <item>600kB</item>
-        <item>1000KB</item>
-        <item>2000KB</item>
-        <item>Ingen komprimering</item>
-    </string-array>
-    <string-array name="qk_responses">
-        <item>Okej</item>
-        <item>Ett ögonblick</item>
-        <item>Jag är på väg</item>
-        <item>Tack</item>
-        <item>Låter bra</item>
-        <item>Vad händer?</item>
-        <item>Håller med</item>
-        <item>Nej</item>
-        <item>Älskar dig</item>
-        <item>Förlåt</item>
-        <item>LOL</item>
-        <item>Det är okej</item>
-    </string-array>
-</resources>
+<?xml version="1.0" encoding="utf-8"?>
+<!--
+  ~ Copyright (C) 2019 Moez Bhatti <moez.bhatti@gmail.com>
+  ~
+  ~ This file is part of QKSMS.
+  ~
+  ~ QKSMS is free software: you can redistribute it and/or modify
+  ~ it under the terms of the GNU General Public License as published by
+  ~ the Free Software Foundation, either version 3 of the License, or
+  ~ (at your option) any later version.
+  ~
+  ~ QKSMS is distributed in the hope that it will be useful,
+  ~ but WITHOUT ANY WARRANTY; without even the implied warranty of
+  ~ MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+  ~ GNU General Public License for more details.
+  ~
+  ~ You should have received a copy of the GNU General Public License
+  ~ along with QKSMS.  If not, see <http://www.gnu.org/licenses/>.
+  -->
+<resources>
+    <string name="shortcut_compose_long_label">Ny konversation</string>
+    <string name="shortcut_compose_short_label">Skriv</string>
+    <string name="shortcut_compose_disabled_message">Genvägen inaktiverades</string>
+    <string name="title_archived">Arkiverat</string>
+    <string name="title_settings">Inställningar</string>
+    <string name="title_notification_prefs">Aviseringar</string>
+    <string name="title_theme">Tema</string>
+    <string name="title_conversations">Sök i inkorg&#8230;</string>
+    <string name="title_compose">Ange ett namn eller nummer</string>
+    <string name="setup_skip">Hoppa över</string>
+    <string name="setup_next">Fortsätt</string>
+    <string name="menu_add_person">Lägg till person</string>
+    <string name="menu_call">Ring</string>
+    <string name="menu_info">Detaljer</string>
+    <string name="menu_save">Spara till galleri</string>
+    <string name="menu_share">Dela</string>
+    <string name="main_drawer_open_cd">Öppna navigeringspanelen</string>
+    <string name="main_title_selected">%d vald</string>
+    <string name="main_menu_clear">Rensa</string>
+    <string name="main_menu_archive">Arkiv</string>
+    <string name="main_menu_unarchive">Avarkivera</string>
+    <string name="main_menu_delete">Radera</string>
+    <string name="main_menu_add_contact">Lägg till i kontakter</string>
+    <string name="main_menu_pin">Fäst på toppen</string>
+    <string name="main_menu_unpin">Frigör</string>
+    <string name="main_menu_read">Markera som läst</string>
+    <string name="main_menu_unread">Markera som oläst</string>
+    <string name="main_menu_block">Blockera</string>
+    <string name="main_syncing">Synkroniserar meddelanden&#8230;</string>
+    <string name="main_sender_you">Du: %s</string>
+    <string name="main_draft">Utkast</string>
+    <string name="main_message_results_title">Resultat i meddelanden</string>
+    <string name="main_message_results">%d meddelanden</string>
+    <string name="inbox_empty_text">Dina konversationer kommer att dyka upp här</string>
+    <string name="inbox_search_empty_text">Inga resultat</string>
+    <string name="archived_empty_text">Dina arkiverade konversationer kommer att dyka upp här</string>
+    <string name="main_fab_cd">Starta en ny konversation</string>
+    <string name="main_default_sms_title">Älska att skicka SMS igen</string>
+    <string name="main_default_sms_message">Gör QKSMS till din standard-app för SMS</string>
+    <string name="main_default_sms_change">Ändra</string>
+    <string name="main_permission_required">Tillstånd krävs</string>
+    <string name="main_permission_sms">QKSMS behöver tillåtelse att skicka och visa SMS-meddelanden</string>
+    <string name="main_permission_contacts">QKSMS behöver tillåtelse för att kunna se dina kontakter</string>
+    <string name="main_permission_allow">Tillåt</string>
+    <string name="drawer_inbox">Inkorg</string>
+    <string name="drawer_archived">Arkiverat</string>
+    <string name="drawer_scheduled">Schemalagt</string>
+    <string name="drawer_blocking">Blockerar</string>
+    <string name="drawer_more">Mer</string>
+    <string name="drawer_settings">Inställningar</string>
+    <string name="drawer_help">Hjälp &amp; återgivning</string>
+    <string name="drawer_invite">Bjud in vänner</string>
+    <string name="drawer_plus_banner_summary">Lås upp nya spännande funktioner och stötta utvecklingen</string>
+    <string name="rate_title">Tycker du om QKSMS?</string>
+    <string name="rate_summary">Dela lite kärlek och betygsätt oss på Google Play!</string>
+    <string name="rate_okay">OKEJ!</string>
+    <string name="rate_dismiss">AVFÄRDA</string>
+    <string name="dialog_delete_title">Radera</string>
+    <plurals name="dialog_delete_message">
+        <item quantity="one">Är du säker på att du vill ta bort den här konversationen?</item>
+        <item quantity="other">Är du säker på att du vill ta bort %d konversationer?</item>
+    </plurals>
+    <string-array name="message_options">
+        <item>Kopiera text</item>
+        <item>Vidarebefordra</item>
+        <item>Radera</item>
+    </string-array>
+    <string name="compose_number_picker_title">Välj ett telefonnummer</string>
+    <string name="compose_number_picker_default">%s ∙ Standard</string>
+    <string name="compose_number_picker_once">Bara en gång</string>
+    <string name="compose_number_picker_always">Alltid</string>
+    <string name="compose_title_selected">%d vald</string>
+    <string name="compose_subtitle_results">%1$d av %2$d resultat</string>
+    <string name="compose_send_group_title">Skicka som ett grupp-meddelande</string>
+    <string name="compose_send_group_summary">Mottagare och svar kommer att vara synligt för alla</string>
+    <string name="compose_messages_empty">Det här är början på din konversation. Säg något snällt!</string>
+    <string name="compose_vcard_label">Kontaktkort</string>
+    <string name="compose_scheduled_for">Schemalagd för</string>
+    <string name="compose_scheduled_future">Den valda tiden måste vara i framtiden!</string>
+    <string name="compose_scheduled_plus">Du måste låsa upp QKSMS+ om du vill använda schemalagda meddelanden</string>
+    <string name="compose_scheduled_toast">Lades till i schemalagda meddelanden</string>
+    <string name="compose_hint">Skriv ett meddelande&#8230;</string>
+    <string name="compose_menu_copy">Kopiera text</string>
+    <string name="compose_menu_forward">Vidarebefordra</string>
+    <string name="compose_menu_delete">Radera</string>
+    <string name="compose_menu_previous">Föregående</string>
+    <string name="compose_menu_next">Nästa</string>
+    <string name="compose_menu_clear">Rensa</string>
+    <string name="compose_details_title">Meddelandedetaljer</string>
+    <string name="compose_details_type">Typ: %s</string>
+    <string name="compose_details_from">Från: %s</string>
+    <string name="compose_details_to">Till: %s</string>
+    <string name="compose_details_subject">Ämne: %s</string>
+    <string name="compose_details_priority">Prioritet: %s</string>
+    <string name="compose_details_size">Storlek: %s</string>
+    <string name="compose_details_sent">Skickades: %s</string>
+    <string name="compose_details_received">Togs emot: %s</string>
+    <string name="compose_details_delivered">Levererades: %s</string>
+    <string name="compose_details_error_code">Felkod: %d</string>
+    <string name="compose_attach_cd">Lägg till en bilaga</string>
+    <string name="compose_gallery_cd">Bifoga en bild</string>
+    <string name="compose_camera_cd">Ta en bild</string>
+    <string name="compose_schedule_cd">Schemalägg meddelande</string>
+    <string name="compose_contact_cd">Bifoga en kontakt</string>
+    <string name="compose_contact_error">Fel uppstod när kontakt lästes in</string>
+    <!-- Example: SIM 1 (Verizon) selected-->
+    <string name="compose_sim_changed_toast">SIM %1$d (%2$s) valdes</string>
+    <string name="compose_sim_cd">%s valt, byt SIM-kort</string>
+    <string name="compose_send_cd">Skicka meddelandet</string>
+    <string name="message_status_sending">Skickar&#8230;</string>
+    <string name="message_status_delivered">Levererade %s</string>
+    <string name="message_status_failed">Misslyckades med att skicka. Knacka för att försöka igen</string>
+    <string name="info_title">Detaljer</string>
+    <string name="info_copied_address">Adress kopierades</string>
+    <string name="info_name">Titel för konversation</string>
+    <string name="info_notifications">Aviseringar</string>
+    <string name="info_theme">Tema</string>
+    <string name="info_archive">Arkivera</string>
+    <string name="info_unarchive">Avarkivera</string>
+    <string name="info_block">Blockera</string>
+    <string name="info_unblock">Avblockera</string>
+    <string name="info_delete">Radera konversation</string>
+    <string name="gallery_error">Kunde inte ladda mediet</string>
+    <string name="gallery_toast_saved">Spara till galleri</string>
+    <string name="backup_title">Säkerhetskopiera och återställ</string>
+    <string name="backup_backing_up">Säkerhetskopierar meddelandena</string>
+    <string name="backup_restoring">Återställer från säkerhetskopia</string>
+    <string name="backup_last">Senaste säkerhetskopiering</string>
+    <string name="backup_loading">Laddar&#8230;</string>
+    <string name="backup_never">Aldrig</string>
+    <string name="backup_restore_title">Återställ</string>
+    <string name="backup_restore_summary">Välj en säkerhetskopia</string>
+    <string name="backup_restore_error_plus">Vänligen lås upp QKSMS+ för att använda säkerhetskopiera och återställ</string>
+    <string name="backup_restore_error_backup">Säkerhetskopiering pågår&#8230;</string>
+    <string name="backup_restore_error_restore">Återställning pågår&#8230;</string>
+    <string name="backup_restore_confirm_title">Återställ från säkerhetskopia</string>
+    <string name="backup_restore_confirm_message">Är du säker på att du vill återställa dina meddelanden från den här säkerhetskopian?</string>
+    <string name="backup_restore_stop_title">Stoppa återställningen</string>
+    <string name="backup_restore_stop_message">Meddelanden som redan har blivit återställda kommer att stanna kvar i din enhet</string>
+    <string name="backup_restore_dialog_title">Säkerhetskopior</string>
+    <string name="backup_restore_dialog_empty">Inga säkerhetskopior kunde hittas</string>
+    <plurals name="backup_message_count">
+        <item quantity="one">%d meddelande</item>
+        <item quantity="other">%d meddelanden</item>
+    </plurals>
+    <string name="backup_disclaimer">För närvarande så stöds endast SMS av Säkerhetskopiera och Återställ. MMS-stöd och schemalagda säkerhetskopieringar kommer att dyka upp inom kort!</string>
+    <string name="backup_now">Säkerhetskopiera nu</string>
+    <string name="backup_progress_parsing">Tolkar säkerhetskopieringen&#8230;</string>
+    <string name="backup_progress_running">%d/%d meddelanden</string>
+    <string name="backup_progress_saving">Sparar säkerhetskopian&#8230;</string>
+    <string name="backup_progress_syncing">Synkroniserar meddelandena&#8230;</string>
+    <string name="backup_progress_finished">Avslutad!</string>
+    <string name="backup_notification_channel_name">Säkerhetskopiera och återställ</string>
+    <string name="scheduled_title">Schemalagda</string>
+    <string name="scheduled_empty_description">Skicka ett meddelande automatiskt i det exakta ögonblicket som du önskar</string>
+    <string name="scheduled_empty_message_1">Hi! När var din födelsedag igen?</string>
+    <string name="scheduled_empty_message_2">Den är den 23:e December</string>
+    <string name="scheduled_empty_message_3">Grattis på födelsedagen! Se vilken fin vän jag är som kommer ihåg din födelsedag</string>
+    <!--&#x200A; is a special character required at the end of this string to fix it's formatting in the app -->
+    <string name="scheduled_empty_message_3_timestamp">Skickar den 23:e December </string>
+    <string name="scheduled_compose_cd">Schemalägg ett meddelande</string>
+    <string name="scheduled_options_title">Schemalagt meddelande</string>
+    <string-array name="scheduled_options">
+        <item>Skicka nu</item>
+        <item>Kopiera text</item>
+        <item>Radera</item>
+    </string-array>
+    <string name="settings_category_appearance">Utseende</string>
+    <string name="settings_category_general">Generellt</string>
+    <string name="settings_category_qkreply">QK svar</string>
+    <string name="settings_theme_title">Tema</string>
+    <string name="settings_night_title">Nattläge</string>
+    <string name="settings_black_title">Svart nattläge</string>
+    <string name="settings_night_start_title">Starttid</string>
+    <string name="settings_night_end_title">Sluttid</string>
+    <string name="settings_automatic_colors_title">Automatiska kontaktfärger</string>
+    <string name="settings_text_size_title">Storlek på typsnitt</string>
+    <string name="settings_system_font_title">Använd systemteckensnitt</string>
+    <string name="settings_auto_emoji_title">Automatisk uttryckssymbol</string>
+    <string name="settings_notifications_title">Aviseringar</string>
+    <string name="settings_notifications_o_summary">Tryck för att anpassa</string>
+    <string name="settings_notification_actions_title">Åtgärder</string>
+    <string name="settings_notification_action_1">Knapp 1</string>
+    <string name="settings_notification_action_2">Knapp 2</string>
+    <string name="settings_notification_action_3">Knapp 3</string>
+    <string name="settings_notification_previews_title">Notifikations förhandsvisningar</string>
+    <string name="settings_notification_wake_title">Väck skärm</string>
+    <string name="settings_vibration_title">Vibration</string>
+    <string name="settings_ringtone_title">Ljud</string>
+    <string name="settings_ringtone_none">Ingen</string>
+    <string name="settings_qkreply_title">QK-svar</string>
+    <string name="settings_qkreply_summary">Popup för nya meddelanden</string>
+    <string name="settings_qkreply_tap_dismiss_title">Tryck för att avfärda</string>
+    <string name="settings_qkreply_tap_dismiss_summary">Tryck var som helst utanför popupen för att stänga den</string>
+    <string name="settings_delayed_title">Fördröj skickande av meddelanden</string>
+    <string name="settings_swipe_actions">Svepåtgärder</string>
+    <string name="settings_swipe_actions_summary">Ställ in svep-åtgärder för konversationer</string>
+    <string name="settings_swipe_actions_right">Svepning till höger</string>
+    <string name="settings_swipe_actions_left">Svepning till vänster</string>
+    <string name="settings_swipe_actions_change">BYT</string>
+    <string-array name="settings_swipe_actions">
+        <item>Inget</item>
+        <item>Arkivera</item>
+        <item>Ta bort</item>
+        <item>Blockera</item>
+        <item>Ring upp</item>
+        <item>Markera som läst</item>
+        <item>Markera som oläst</item>
+    </string-array>
+    <string name="settings_delivery_title">Leveransrapporter</string>
+    <string name="settings_delivery_summary">Bekräfta att meddelanden har skickats</string>
+    <string name="settings_signature_title">Signatur</string>
+    <string name="settings_signature_summary">Lägg till en signatur i slutet av dina meddelanden</string>
+    <string name="settings_unicode_title">Ta bort accenter</string>
+    <string name="settings_unicode_summary">Ta bort accenter från tecken i utåtgående SMS-meddelanden</string>
+    <string name="settings_mobile_title">Endast mobilnummer</string>
+    <string name="settings_mobile_summary">Visa endast mobilnummer när ett meddelanden skrivs</string>
+    <string name="settings_auto_delete">Radera gamla meddelanden automatiskt</string>
+    <string name="settings_auto_delete_dialog_message">Meddelanden kommer att raderas efter det angivna antalet dagar</string>
+    <string name="settings_auto_delete_dialog_hint">Antal dagar</string>
+    <string name="settings_auto_delete_never">Aldrig</string>
+    <string name="settings_auto_delete_warning">Radera gamla meddelanden automatiskt?</string>
+    <string name="settings_auto_delete_warning_message">Om du fortsätter raderas %1$d meddelanden direkt</string>
+    <plurals name="settings_auto_delete_summary">
+        <item quantity="one">After 1 day</item>
+        <item quantity="other">Efter %d dagar</item>
+    </plurals>
+    <string name="settings_long_as_mms_title">Skicka långa meddelanden som MMS</string>
+    <string name="settings_long_as_mms_summary">Om dina längre textmeddelanden inte skickas eller skickas i fel ordning kan du skicka dem som MMS-meddelanden istället. Ytterligare avgifter kan tillkomma</string>
+    <string name="settings_mms_size_title">Komprimera MMS-bilagor automatiskt</string>
+    <string name="settings_sync_title">Synkronisera meddelanden</string>
+    <string name="settings_sync_summary">Synkronisera dina meddelanden med telefonens SMS-databas</string>
+    <string name="settings_about_title">Om QKSMS</string>
+    <string name="settings_version">Version %s</string>
+    <string name="settings_logging_enabled">Felsökningsloggning aktiverades</string>
+    <string name="settings_logging_disabled">Felsökningsloggning inaktiverad</string>
+    <string name="settings_delay_duration_hint">Fyll i varaktighet (sekunder)</string>
+    <string name="blocking_title">Blockerar</string>
+    <string name="blocking_drop_title">Avvisa meddelanden</string>
+    <string name="blocking_drop_summary">Avvisa inkommande meddelanden från blockerade avsändare istället för att dölja dem</string>
+    <string name="blocking_conversations">Blockerade konversationer</string>
+    <string name="blocking_manager_title">Blockerings-hanterare</string>
+    <string name="blocking_manager_qksms_title">QKSMS</string>
+    <string name="blocking_manager_qksms_summary">Inbyggd blockeringsfunktion i QKSMS</string>
+    <string name="blocking_manager_call_control_summary">Filtrera automatiskt dina samtal och meddelanden på ett bekvämt ställe! Med Community IQ™ kan du förhindra oönskade meddelanden från gemenskapens kända spammare</string>
+    <string name="blocking_manager_sia_summary">Filtrera automatiskt meddelanden från oönskade nummer genom att använda appen \"Borde jag svara\"</string>
+    <string name="blocking_manager_copy_title">Kopiera blockerade nummer</string>
+    <string name="blocking_manager_copy_summary">Fortsätt till %s och kopiera över dina befintliga blockerade nummer</string>
+    <string name="blocked_numbers_title">Blockerade nummer</string>
+    <string name="blocked_numbers_empty">Dina blockerade nummer kommer att visas här</string>
+    <string name="blocked_numbers_add_cd">Blockera ett nytt nummer</string>
+    <string name="blocked_numbers_dialog_title">Blockera SMS från</string>
+    <string name="blocked_numbers_dialog_hint">Telefonnummer</string>
+    <string name="blocked_numbers_dialog_block">Blockera</string>
+    <string name="blocked_messages_title">Blockerade meddelanden</string>
+    <string name="blocked_messages_empty">Dina blockerade meddelanden visas här</string>
+    <string name="blocking_block_title">Blockera</string>
+    <string name="blocking_unblock_title">Avblockera</string>
+    <plurals name="blocking_block_external">
+        <item quantity="one">Fortsätt till %s och blockera detta nummer</item>
+        <item quantity="other">Fortsätt till %s och blockera dessa nummer</item>
+    </plurals>
+    <plurals name="blocking_unblock_external">
+        <item quantity="one">Fortsätt till %s och tillåt detta nummer</item>
+        <item quantity="other">Fortsätt till %s och tillåt dessa nummer</item>
+    </plurals>
+    <string name="about_title">Om</string>
+    <string name="about_version_title">Version</string>
+    <string name="about_developer_title">Utvecklare</string>
+    <string name="about_source_title">Källkod</string>
+    <string name="about_changelog_title">Ändringslogg</string>
+    <string name="about_contact_title">Kontakt</string>
+    <string name="about_license_title">Licens</string>
+    <string name="about_copyright_title">Kopieringsskydd</string>
+    <string name="qksms_plus_description_title">Ge stöd till utveckling, lås upp allting</string>
+    <string name="qksms_plus_description_summary">Du kan hjälpa en svältande utvecklare för bara %s</string>
+    <!-- Substitutions are for price and currency. Ex: Lifetime upgrade for $1.99 USD -->
+    <string name="qksms_plus_upgrade">Livstidsuppgradering för %1$s %2$s</string>
+    <!-- Substitutions are for price and currency. Ex: Unlock + donate for $4.99 USD -->
+    <string name="qksms_plus_upgrade_donate">Lås upp + donera för %1$s %2$s</string>
+    <string name="qksms_plus_thanks_title">Tack för att du stöttar QKSMS!</string>
+    <string name="qksms_plus_thanks_summary">Du har nu tillgång till alla funktioner i QKSMS+</string>
+    <string name="qksms_plus_free_title">QKSMS + är gratis för F-Droid användare! Om du vill stödja utvecklingen, Så får du gärna donationera.</string>
+    <string name="qksms_plus_donate">Donera via PayPal</string>
+    <string name="qksms_plus_coming_soon">Kommer snart</string>
+    <string name="qksms_plus_themes_title">Högkvalitativa teman</string>
+    <string name="qksms_plus_themes_summary">Lås upp vackra färger som inte finns tillgängliga på Material Design paletten</string>
+    <string name="qksms_plus_emoji_title">Anpassad auto-emoji</string>
+    <string name="qksms_plus_emoji_summary">Skapa anpassade auto-emoji genvägar</string>
+    <string name="qksms_plus_backup_title">Säkerhetskopiering av meddelande</string>
+    <string name="qksms_plus_backup_summary">Säkerhetskopiera automatiskt dina meddelanden. Du behöver aldrig mer oroa dig för att förlora dina konversationer om du byter telefon eller telefonen försvinner</string>
+    <string name="qksms_plus_scheduled_title">Schemalagda meddelanden</string>
+    <string name="qksms_plus_scheduled_summary">Schemalägg meddelanden att automatiskt skickas vid en specifik tid och datum</string>
+    <string name="qksms_plus_delayed_title">Fördröj skickande av meddelanden</string>
+    <string name="qksms_plus_delayed_summary">Vänta några sekunder innan du skickar ditt meddelande</string>
+    <string name="qksms_plus_night_title">Automatiskt nattläge</string>
+    <string name="qksms_plus_night_summary">Aktivera nattläge baserat på tiden på dygnet</string>
+    <string name="qksms_plus_blacklist_title">Avancerade blockering</string>
+    <string name="qksms_plus_blacklist_summary">Blockera meddelanden som innehåller specifika ord eller matchar mönster</string>
+    <string name="qksms_plus_forward_title">Auto-forward</string>
+    <string name="qksms_plus_forward_summary">Automatiskt vidarebefordra meddelanden från vissa avsändare</string>
+    <string name="qksms_plus_respond_title">Auto-svara</string>
+    <string name="qksms_plus_respond_summary">Svara automatiskt på inkommande meddelanden med ett förinställt svar</string>
+    <string name="qksms_plus_more_title">Mer</string>
+    <string name="qksms_plus_more_summary">QKSMS är under aktiv utveckling, och dina köp kommer att inkludera alla kommande QKSMS+-funktioner!</string>
+    <string name="widget_loading">Laddar&#8230;</string>
+    <string name="widget_more">Visa fler konversationer</string>
+    <string name="qkreply_menu_read">Markera som läst</string>
+    <string name="qkreply_menu_call">Ring</string>
+    <string name="qkreply_menu_delete">Ta bort</string>
+    <string name="qkreply_menu_expand">Visa mer</string>
+    <string name="qkreply_menu_collapse">Visa färre</string>
+    <string name="qkreply_menu_view">Öppna konversation</string>
+    <string name="theme_material">Material</string>
+    <string name="theme_hex">HEX</string>
+    <string name="theme_apply">Verkställ</string>
+    <string-array name="notification_actions">
+        <item>Inget</item>
+        <item>Arkivera</item>
+        <item>Radera</item>
+        <item>Blockera</item>
+        <item>Ring upp</item>
+        <item>Markera som läst</item>
+        <item>Svara</item>
+    </string-array>
+    <string name="button_yes">Ja</string>
+    <string name="button_continue">Fortsätt</string>
+    <string name="button_cancel">Avbryt</string>
+    <string name="button_delete">Radera</string>
+    <string name="button_save">Spara</string>
+    <string name="button_stop">Stoppa</string>
+    <string name="button_more">Mer</string>
+    <string name="button_set">Ställ in</string>
+    <string name="button_undo">Ångra</string>
+    <string name="toast_copied">Kopierad</string>
+    <string name="toast_archived">Arkiverade konversationer</string>
+    <string name="toast_qksms_plus">Du måste låsa upp QKSMS+ för att använda det här</string>
+    <plurals name="notification_new_messages">
+        <item quantity="one">Nytt meddelande</item>
+        <item quantity="other">%s nya meddelanden</item>
+    </plurals>
+    <string name="notification_message_failed_title">Meddelandet skickades inte</string>
+    <string name="notification_message_failed_text">Meddelandet till %s misslyckades att skicka</string>
+    <string-array name="night_modes">
+        <item>System</item>
+        <item>Inaktiverad</item>
+        <item>Alltid på</item>
+        <item>Automatisk</item>
+    </string-array>
+    <string-array name="notification_preview_options">
+        <item>Visa namn och meddelande</item>
+        <item>Visa namn</item>
+        <item>Göm innehåll</item>
+    </string-array>
+    <string-array name="text_sizes">
+        <item>Liten</item>
+        <item>Normal</item>
+        <item>Stort</item>
+        <item>Större</item>
+    </string-array>
+    <string-array name="delayed_sending_labels">
+        <item>Ingen fördröjning</item>
+        <item>3 sekunder</item>
+        <item>5 sekunder</item>
+        <item>10 sekunder</item>
+    </string-array>
+    <string-array name="mms_sizes">
+        <item>Automatisk</item>
+        <item>100KB</item>
+        <item>200kB</item>
+        <item>300KB</item>
+        <item>600kB</item>
+        <item>1000KB</item>
+        <item>2000KB</item>
+        <item>Ingen komprimering</item>
+    </string-array>
+    <string-array name="qk_responses">
+        <item>Okej</item>
+        <item>Ett ögonblick</item>
+        <item>Jag är på väg</item>
+        <item>Tack</item>
+        <item>Låter bra</item>
+        <item>Vad händer?</item>
+        <item>Håller med</item>
+        <item>Nej</item>
+        <item>Älskar dig</item>
+        <item>Förlåt</item>
+        <item>LOL</item>
+        <item>Det är okej</item>
+    </string-array>
+</resources>
diff --git a/presentation/src/main/res/values-th/strings.xml b/presentation/src/main/res/values-th/strings.xml
index 016ea0038..918ced9c2 100644
--- a/presentation/src/main/res/values-th/strings.xml
+++ b/presentation/src/main/res/values-th/strings.xml
@@ -1,405 +1,405 @@
-<?xml version="1.0" encoding="utf-8"?>
-<!--
-  ~ Copyright (C) 2019 Moez Bhatti <moez.bhatti@gmail.com>
-  ~
-  ~ This file is part of QKSMS.
-  ~
-  ~ QKSMS is free software: you can redistribute it and/or modify
-  ~ it under the terms of the GNU General Public License as published by
-  ~ the Free Software Foundation, either version 3 of the License, or
-  ~ (at your option) any later version.
-  ~
-  ~ QKSMS is distributed in the hope that it will be useful,
-  ~ but WITHOUT ANY WARRANTY; without even the implied warranty of
-  ~ MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
-  ~ GNU General Public License for more details.
-  ~
-  ~ You should have received a copy of the GNU General Public License
-  ~ along with QKSMS.  If not, see <http://www.gnu.org/licenses/>.
-  -->
-<resources>
-    <string name="shortcut_compose_long_label">New conversation</string>
-    <string name="shortcut_compose_short_label">Compose</string>
-    <string name="shortcut_compose_disabled_message">Shortcut disabled</string>
-    <string name="title_archived">จัดเก็บ</string>
-    <string name="title_settings">การตั้งค่า</string>
-    <string name="title_notification_prefs">การแจ้งเตือน</string>
-    <string name="title_theme">รูปแบบการแสดงผล</string>
-    <string name="title_conversations">ค้นหากล่องขาเข้า&#8230;</string>
-    <string name="title_compose">พิมพ์ชื่อหรือหมายเลข</string>
-    <string name="setup_skip">ข้าม</string>
-    <string name="setup_next">ทำต่อ</string>
-    <string name="menu_add_person">Add person</string>
-    <string name="menu_call">โทร</string>
-    <string name="menu_info">รายละเอียด</string>
-    <string name="menu_save">บันทึกรูปภาพ</string>
-    <string name="menu_share">Share</string>
-    <string name="main_drawer_open_cd">เปิดเมนูลัด</string>
-    <string name="main_title_selected">%d ถูกเลือก</string>
-    <string name="main_menu_clear">ลบออก</string>
-    <string name="main_menu_archive">จัดเก็บ</string>
-    <string name="main_menu_unarchive">ยกเลิกการเก็บ</string>
-    <string name="main_menu_delete">ลบ</string>
-    <string name="main_menu_add_contact">Add to contacts</string>
-    <string name="main_menu_pin">ปักหมุดไว้ด้านบน</string>
-    <string name="main_menu_unpin">เอาหมุดออก</string>
-    <string name="main_menu_read">Mark read</string>
-    <string name="main_menu_unread">Mark unread</string>
-    <string name="main_menu_block">ปิดกั้น</string>
-    <string name="main_syncing">กำลังปรับแต่งเพิ่มประสิทธิภาพฐานข้อมูล อาจใช้เวลาสักครู่&#8230;</string>
-    <string name="main_sender_you">คุณ: %s</string>
-    <string name="main_draft">Draft</string>
-    <string name="main_message_results_title">ผลลัพธ์ในข้อความ</string>
-    <string name="main_message_results">%d ข้อความ</string>
-    <string name="inbox_empty_text">บทสนทนาของคุณจะปรากฏที่นี่</string>
-    <string name="inbox_search_empty_text">ไม่มีผลลัพธ์</string>
-    <string name="archived_empty_text">บทสนทนาของคุณที่จัดเก็บไว้จะปรากฏที่นี่</string>
-    <string name="main_fab_cd">เริ่มการสนทนาใหม่</string>
-    <string name="main_default_sms_title">อยากส่งข้อความอีกครั้ง</string>
-    <string name="main_default_sms_message">ทำให้ QKSMS แอป SMS ค่าเริ่มต้นของคุณ</string>
-    <string name="main_default_sms_change">เปลี่ยน</string>
-    <string name="main_permission_required">ต้องการใช้สิทธิ์การเข้าถึง</string>
-    <string name="main_permission_sms">QKSMS ต้องการสิทธิ์เพื่อส่ง และดูข้อความ SMS</string>
-    <string name="main_permission_contacts">QKSMS ต้องการสิทธิ์เพื่อดูรายชื่อผู้ติดต่อของคุณ</string>
-    <string name="main_permission_allow">อนุญาต</string>
-    <string name="drawer_inbox">กล่องขาเข้า</string>
-    <string name="drawer_archived">จัดเก็บ</string>
-    <string name="drawer_scheduled">กำหนดเวลา</string>
-    <string name="drawer_blocking">บล็อก</string>
-    <string name="drawer_more">เพิ่มเติม</string>
-    <string name="drawer_settings">การตั้งค่า</string>
-    <string name="drawer_help">ช่วยเหลือ &amp; ข้อคิดเห็น</string>
-    <string name="drawer_invite">เชิญเพื่อน</string>
-    <string name="drawer_plus_banner_summary">ปลดล็อคฟีเจอร์ใหม่ ๆ และสนับสนุนการพัฒนา</string>
-    <string name="rate_title">ชอบ QKSMS ไหม?</string>
-    <string name="rate_summary">แชร์และให้คะแนนเราบน Google Play!</string>
-    <string name="rate_okay">ตกลง!</string>
-    <string name="rate_dismiss">ยกเลิก</string>
-    <string name="dialog_delete_title">ลบ</string>
-    <plurals name="dialog_delete_message">
-        <item quantity="other">คุณแน่ใจหรือว่า คุณต้องการลบการสนทนาทั้งหมด</item>
-    </plurals>
-    <string-array name="message_options">
-        <item>คัดลอกข้อความ</item>
-        <item>ส่งต่อ</item>
-        <item>ลบ</item>
-    </string-array>
-    <string name="compose_number_picker_title">Choose a phone number</string>
-    <string name="compose_number_picker_default">%s ∙ Default</string>
-    <string name="compose_number_picker_once">Just once</string>
-    <string name="compose_number_picker_always">Always</string>
-    <string name="compose_title_selected">%d ถูกเลือก</string>
-    <string name="compose_subtitle_results">%1$d ใน %2$d ของผลลัพท์</string>
-    <string name="compose_send_group_title">ส่งเป็นข้อความกลุ่ม</string>
-    <string name="compose_send_group_summary">ผู้รับและการตอบกลับจะแสดงให้ทุกคนเห็นทุกคน</string>
-    <string name="compose_messages_empty">การเริ่มต้นของการสนทนาของคุณ บอกกล่าวบางอย่างที่นี่</string>
-    <string name="compose_vcard_label">นามบัตร</string>
-    <string name="compose_scheduled_for">กำหนดการ</string>
-    <string name="compose_scheduled_future">เลือกเวลาที่ต้องเป็นเวลาในอนาคต</string>
-    <string name="compose_scheduled_plus">คุณต้องปลดล็อก QKSMS + เพื่อการใช้ข้อความที่กำหนดเวลาได้</string>
-    <string name="compose_scheduled_toast">เพิ่มข้อความที่กำหนดเวลา</string>
-    <string name="compose_hint">เขียนข้อความ...</string>
-    <string name="compose_menu_copy">คัดลอกข้อความ</string>
-    <string name="compose_menu_forward">ส่งต่อ</string>
-    <string name="compose_menu_delete">ลบ</string>
-    <string name="compose_menu_previous">ก่อนหน้านี้</string>
-    <string name="compose_menu_next">ถัดไป</string>
-    <string name="compose_menu_clear">ล้าง</string>
-    <string name="compose_details_title">รายละเอียดข้อความ</string>
-    <string name="compose_details_type">ประเภท: %s</string>
-    <string name="compose_details_from">จาก: %s</string>
-    <string name="compose_details_to">ถึง: %s</string>
-    <string name="compose_details_subject">เรื่อง: %s</string>
-    <string name="compose_details_priority">ความสำคัญ: %s</string>
-    <string name="compose_details_size">ขนาด: %s</string>
-    <string name="compose_details_sent">ส่งแล้ว: %s</string>
-    <string name="compose_details_received">รับ: %s</string>
-    <string name="compose_details_delivered">การจัดส่ง: %s</string>
-    <string name="compose_details_error_code">รหัสข้อผิดพลาด: %d</string>
-    <string name="compose_attach_cd">เพิ่มสิ่งที่แนบ</string>
-    <string name="compose_gallery_cd">แนบรูปภาพ</string>
-    <string name="compose_camera_cd">ถ่ายภาพ</string>
-    <string name="compose_schedule_cd">กำหนดเวลาของข้อความ</string>
-    <string name="compose_contact_cd">Attach a contact</string>
-    <string name="compose_contact_error">Error reading contact</string>
-    <!-- Example: SIM 1 (Verizon) selected-->
-    <string name="compose_sim_changed_toast">SIM %1$d (%2$s) selected</string>
-    <string name="compose_sim_cd">%s เลือก เปลี่ยน SIM การ์ด</string>
-    <string name="compose_send_cd">ส่งข้อความ</string>
-    <string name="message_status_sending">กำลังส่ง...</string>
-    <string name="message_status_delivered">%s ถูกส่งแล้ว</string>
-    <string name="message_status_failed">การส่งล้มเหลว ลองแตะเพื่อส่งอีกครั้ง</string>
-    <string name="info_title">รายละเอียด</string>
-    <string name="info_copied_address">Address copied</string>
-    <string name="info_name">หัวข้อสนทนา</string>
-    <string name="info_notifications">การแจ้งเตือน</string>
-    <string name="info_theme">รูปแบบการแสดงผล</string>
-    <string name="info_archive">จัดเก็บ</string>
-    <string name="info_unarchive">ยกเลิกการเก็บ</string>
-    <string name="info_block">ปิดกั้น</string>
-    <string name="info_unblock">ยกเลิกการปิดกั้น</string>
-    <string name="info_delete">ลบการสนทนา</string>
-    <string name="gallery_error">Couldn\'t load media</string>
-    <string name="gallery_toast_saved">บันทึกรูปภาพแล้ว</string>
-    <string name="backup_title">Backup and restore</string>
-    <string name="backup_backing_up">Backing up messages</string>
-    <string name="backup_restoring">Restoring from backup</string>
-    <string name="backup_last">Last backup</string>
-    <string name="backup_loading">Loading&#8230;</string>
-    <string name="backup_never">Never</string>
-    <string name="backup_restore_title">Restore</string>
-    <string name="backup_restore_summary">Select a backup</string>
-    <string name="backup_restore_error_plus">Please unlock QKSMS+ to use backup and restore</string>
-    <string name="backup_restore_error_backup">Backup in progress&#8230;</string>
-    <string name="backup_restore_error_restore">Restore in progress&#8230;</string>
-    <string name="backup_restore_confirm_title">Restore from backup</string>
-    <string name="backup_restore_confirm_message">Are you sure you would like to restore your messages from this backup?</string>
-    <string name="backup_restore_stop_title">Stop restore</string>
-    <string name="backup_restore_stop_message">Messages that have already been restored will remain on your device</string>
-    <string name="backup_restore_dialog_title">Backups</string>
-    <string name="backup_restore_dialog_empty">No backups found</string>
-    <plurals name="backup_message_count">
-        <item quantity="other">%d messages</item>
-    </plurals>
-    <string name="backup_disclaimer">Currently, only SMS is supported by Backup and Restore. MMS support and scheduled backups will be coming soon!</string>
-    <string name="backup_now">Backup now</string>
-    <string name="backup_progress_parsing">Parsing backup&#8230;</string>
-    <string name="backup_progress_running">%d/%d messages</string>
-    <string name="backup_progress_saving">Saving backup&#8230;</string>
-    <string name="backup_progress_syncing">Syncing messages&#8230;</string>
-    <string name="backup_progress_finished">Finished!</string>
-    <string name="backup_notification_channel_name">Backup and restore</string>
-    <string name="scheduled_title">กำหนดการ</string>
-    <string name="scheduled_empty_description">ส่งข้อความ โดยอัตโนมัติที่คุณต้องการ</string>
-    <string name="scheduled_empty_message_1">วันเกิดของคุณอีกครั้งเมื่อไหร่</string>
-    <string name="scheduled_empty_message_2">วันที่ 23 นี้ธันวาคม</string>
-    <string name="scheduled_empty_message_3">Happy birthday! Look at what a great friend I am, remembering your birthday</string>
-    <!--&#x200A; is a special character required at the end of this string to fix it's formatting in the app -->
-    <string name="scheduled_empty_message_3_timestamp">Sending on December 23rd </string>
-    <string name="scheduled_compose_cd">Schedule a message</string>
-    <string name="scheduled_options_title">Scheduled message</string>
-    <string-array name="scheduled_options">
-        <item>Send now</item>
-        <item>Copy text</item>
-        <item>Delete</item>
-    </string-array>
-    <string name="settings_category_appearance">ลักษณะที่ปรากฏ</string>
-    <string name="settings_category_general">ทั่วไป</string>
-    <string name="settings_category_qkreply">QK ตอบกลับ</string>
-    <string name="settings_theme_title">รูปแบบการแสดงผล</string>
-    <string name="settings_night_title">โหมดกลางคืน</string>
-    <string name="settings_black_title">โหมดกลางคืนแบบมืดสนิท</string>
-    <string name="settings_night_start_title">เวลาเริ่มต้น</string>
-    <string name="settings_night_end_title">เวลาสิ้นสุด</string>
-    <string name="settings_automatic_colors_title">Automatic contact colors</string>
-    <string name="settings_text_size_title">ขนาดแบบอักษร</string>
-    <string name="settings_system_font_title">ใช้แบบอักษรของระบบ</string>
-    <string name="settings_auto_emoji_title">อีโมจิอัตโนมัติ</string>
-    <string name="settings_notifications_title">การแจ้งเตือน</string>
-    <string name="settings_notifications_o_summary">Tap to customize</string>
-    <string name="settings_notification_actions_title">Actions</string>
-    <string name="settings_notification_action_1">Button 1</string>
-    <string name="settings_notification_action_2">Button 2</string>
-    <string name="settings_notification_action_3">Button 3</string>
-    <string name="settings_notification_previews_title">ตัวอย่างการแจ้งเตือน</string>
-    <string name="settings_notification_wake_title">Wake screen</string>
-    <string name="settings_vibration_title">การสั่น</string>
-    <string name="settings_ringtone_title">เสียง</string>
-    <string name="settings_ringtone_none">ไม่มี</string>
-    <string name="settings_qkreply_title">QK ตอบกลับ</string>
-    <string name="settings_qkreply_summary">ป๊อปอัพข้อความใหม่</string>
-    <string name="settings_qkreply_tap_dismiss_title">แตะเพื่อยกเลิก</string>
-    <string name="settings_qkreply_tap_dismiss_summary">แตะนอกป๊อปอัพเพื่อปิด</string>
-    <string name="settings_delayed_title">การส่งแบบล่าช้า</string>
-    <string name="settings_swipe_actions">Swipe actions</string>
-    <string name="settings_swipe_actions_summary">Configure swipe actions for conversations</string>
-    <string name="settings_swipe_actions_right">Right swipe</string>
-    <string name="settings_swipe_actions_left">Left swipe</string>
-    <string name="settings_swipe_actions_change">CHANGE</string>
-    <string-array name="settings_swipe_actions">
-        <item>None</item>
-        <item>Archive</item>
-        <item>Delete</item>
-        <item>Block</item>
-        <item>Call</item>
-        <item>Mark read</item>
-        <item>Mark unread</item>
-    </string-array>
-    <string name="settings_delivery_title">ยืนยันการส่ง</string>
-    <string name="settings_delivery_summary">ยืนยันว่า ส่งข้อความเรียบร้อยแล้ว</string>
-    <string name="settings_signature_title">Signature</string>
-    <string name="settings_signature_summary">Add a signature to the end of your messages</string>
-    <string name="settings_unicode_title">ลบอักษรพิเศษ accents</string>
-    <string name="settings_unicode_summary">ลบอักษรพิเศษ accents ออกจากข้อความ SMS ที่กำลังจะส่งออก</string>
-    <string name="settings_mobile_title">Mobile numbers only</string>
-    <string name="settings_mobile_summary">When composing a message, only show mobile numbers</string>
-    <string name="settings_auto_delete">Delete old messages automatically</string>
-    <string name="settings_auto_delete_dialog_message">Messages will be deleted after the specified number of days</string>
-    <string name="settings_auto_delete_dialog_hint">Number of days</string>
-    <string name="settings_auto_delete_never">Never</string>
-    <string name="settings_auto_delete_warning">Delete old messages automatically?</string>
-    <string name="settings_auto_delete_warning_message">If you proceed, %1$d messages will be deleted now</string>
-    <plurals name="settings_auto_delete_summary">
-        <item quantity="other">After %d days</item>
-    </plurals>
-    <string name="settings_long_as_mms_title">Send long messages as MMS</string>
-    <string name="settings_long_as_mms_summary">If your longer text messages are failing to send, or sending in the wrong order, you can send them as MMS messages instead. Additional charges may apply</string>
-    <string name="settings_mms_size_title">บีบอัดสิ่งที่แนบมาใน MMS อัตโนมัติ</string>
-    <string name="settings_sync_title">ซิงค์ข้อความ</string>
-    <string name="settings_sync_summary">ซิงค์ข้อความของคุณกับฐานข้อมูลของ Android SMS</string>
-    <string name="settings_about_title">เกี่ยวกับ QKSMS</string>
-    <string name="settings_version">เวอร์ชัน: %s</string>
-    <string name="settings_logging_enabled">Debug logging enabled</string>
-    <string name="settings_logging_disabled">Debug logging disabled</string>
-    <string name="settings_delay_duration_hint">ระยะเวลาการป้อน (วินาที)</string>
-    <string name="blocking_title">Blocking</string>
-    <string name="blocking_drop_title">Drop messages</string>
-    <string name="blocking_drop_summary">Drop incoming messages from blocked senders instead of hiding them</string>
-    <string name="blocking_conversations">Blocked conversations</string>
-    <string name="blocking_manager_title">Blocking Manager</string>
-    <string name="blocking_manager_qksms_title">QKSMS</string>
-    <string name="blocking_manager_qksms_summary">Built-in blocking functionality in QKSMS</string>
-    <string name="blocking_manager_call_control_summary">Automatically filter your calls and messages in one convenient place! Community IQ™ allows you to prevent unwanted messages from community known spammers</string>
-    <string name="blocking_manager_sia_summary">กรองข้อความจากหมายเลขที่ไม่พึงประสงค์ โดยใช้แอพควรตอบกลับหรือไม่</string>
-    <string name="blocking_manager_copy_title">Copy blocked numbers</string>
-    <string name="blocking_manager_copy_summary">Continue to %s and copy over your existing blocked numbers</string>
-    <string name="blocked_numbers_title">Blocked numbers</string>
-    <string name="blocked_numbers_empty">Your blocked numbers will appear here</string>
-    <string name="blocked_numbers_add_cd">Block a new number</string>
-    <string name="blocked_numbers_dialog_title">Block texts from</string>
-    <string name="blocked_numbers_dialog_hint">Phone number</string>
-    <string name="blocked_numbers_dialog_block">Block</string>
-    <string name="blocked_messages_title">Blocked messages</string>
-    <string name="blocked_messages_empty">Your blocked messages will appear here</string>
-    <string name="blocking_block_title">Block</string>
-    <string name="blocking_unblock_title">Unblock</string>
-    <plurals name="blocking_block_external">
-        <item quantity="other">Continue to %s and block these numbers</item>
-    </plurals>
-    <plurals name="blocking_unblock_external">
-        <item quantity="other">Continue to %s and allow these numbers</item>
-    </plurals>
-    <string name="about_title">เกี่ยวกับ</string>
-    <string name="about_version_title">เวอร์ชัน</string>
-    <string name="about_developer_title">นักพัฒนา</string>
-    <string name="about_source_title">ซอสโค๊ด</string>
-    <string name="about_changelog_title">บันทึกการเปลี่ยนแปลง</string>
-    <string name="about_contact_title">ติดต่อ</string>
-    <string name="about_license_title">สิทธิ์การใช้งาน</string>
-    <string name="about_copyright_title">ลิขสิทธิ์</string>
-    <string name="qksms_plus_description_title">สนับสนุนการพัฒนา หรือปลดล็อคทุกอย่าง</string>
-    <string name="qksms_plus_description_summary">คุณสามารถช่วยเหลือนักพัฒนาเหล่าได้เพียง %s</string>
-    <!-- Substitutions are for price and currency. Ex: Lifetime upgrade for $1.99 USD -->
-    <string name="qksms_plus_upgrade">อัพเกรดตลอดอายุการใช้งานสำหรับ %1$s %2$s</string>
-    <!-- Substitutions are for price and currency. Ex: Unlock + donate for $4.99 USD -->
-    <string name="qksms_plus_upgrade_donate">ปลดล็อค + บริจาค %1$s %2$s</string>
-    <string name="qksms_plus_thanks_title">ขอบคุณสำหรับการสนับสนุน QKSMS</string>
-    <string name="qksms_plus_thanks_summary">ตอนนี้คุณสามารถเข้าถึงคุณสมบัติทั้งหมดของ QKSMS+ ได้แล้ว</string>
-    <string name="qksms_plus_free_title">QKSMS+ เป็นบริการฟรีสำหรับผู้ใช้งาน F-Droid หากคุณต้องการสนับสนุนการพัฒนา สามารถบริจาคได้</string>
-    <string name="qksms_plus_donate">บริจาคผ่าน PayPal</string>
-    <string name="qksms_plus_coming_soon">เร็วๆ นี้</string>
-    <string name="qksms_plus_themes_title">รูปแบบพรีเมี่ยม</string>
-    <string name="qksms_plus_themes_summary">ปลดล็อครูปแบบการแสดงผลที่ไม่ได้อยู่ใน Material Design</string>
-    <string name="qksms_plus_emoji_title">อีโมจิอัตโนมัติที่กำหนดเอง</string>
-    <string name="qksms_plus_emoji_summary">สร้างทางลัดอิโมจิอัตโนมัติแบบกำหนดเอง</string>
-    <string name="qksms_plus_backup_title">สำรองข้อมูลข้อความ</string>
-    <string name="qksms_plus_backup_summary">สำรองข้อมูลข้อความของคุณโดยอัตโนมัติ ไม่ต้องกังวลว่าประวัติข้อความของคุณจะสูญหายถ้าคุณเปลี่ยนโทรศัพท์มือถือ หรือทำโทรศัพท์หาย</string>
-    <string name="qksms_plus_scheduled_title">ข้อความที่กำหนดเวลา</string>
-    <string name="qksms_plus_scheduled_summary">ข้อความจะถูกส่งโดยอัตโนมัติตามวันและเวลาที่กำหนด</string>
-    <string name="qksms_plus_delayed_title">การส่งแบบล่าช้า</string>
-    <string name="qksms_plus_delayed_summary">รอสักครู่ก่อนที่จะส่งข้อความของคุณ</string>
-    <string name="qksms_plus_night_title">โหมดกลางคืนอัตโนมัติ</string>
-    <string name="qksms_plus_night_summary">เปิดใช้งานโหมดกลางคืนตามเวลาของวัน</string>
-    <string name="qksms_plus_blacklist_title">ปิดกั้นขั้นสูง</string>
-    <string name="qksms_plus_blacklist_summary">ปิดกั้นข้อความที่ประกอบด้วยคำสำคัญ หรือตรงกับรูปแบบ</string>
-    <string name="qksms_plus_forward_title">ส่งต่ออัตโนมัติ</string>
-    <string name="qksms_plus_forward_summary">ส่งต่อข้อความจากผู้ส่งที่ถูกระบุโดยอัตโนมัติ</string>
-    <string name="qksms_plus_respond_title">ตอบกลับอัตโนมัติ</string>
-    <string name="qksms_plus_respond_summary">ตอบกลับข้อความที่เข้ามาอัตโนมัติ โดยใช้ข้อความที่จัดเตรียมไว้</string>
-    <string name="qksms_plus_more_title">เพิ่มเติม</string>
-    <string name="qksms_plus_more_summary">QKSMS is under active development, and your purchase will include all future QKSMS+ features!</string>
-    <string name="widget_loading">กำลังโหลด&#8230;</string>
-    <string name="widget_more">ดูการสนทนาเพิ่มเติม</string>
-    <string name="qkreply_menu_read">Mark read</string>
-    <string name="qkreply_menu_call">โทร</string>
-    <string name="qkreply_menu_delete">Delete</string>
-    <string name="qkreply_menu_expand">แสดงเพิ่มเติม</string>
-    <string name="qkreply_menu_collapse">แสดงน้อยลง</string>
-    <string name="qkreply_menu_view">เริ่มการสนทนา</string>
-    <string name="theme_material">Material</string>
-    <string name="theme_hex">HEX</string>
-    <string name="theme_apply">ตกลง</string>
-    <string-array name="notification_actions">
-        <item>None</item>
-        <item>Archive</item>
-        <item>Delete</item>
-        <item>Block</item>
-        <item>Call</item>
-        <item>Mark read</item>
-        <item>Reply</item>
-    </string-array>
-    <string name="button_yes">Yes</string>
-    <string name="button_continue">Continue</string>
-    <string name="button_cancel">ยกเลิก</string>
-    <string name="button_delete">ลบ</string>
-    <string name="button_save">Save</string>
-    <string name="button_stop">Stop</string>
-    <string name="button_more">เพิ่มเติม</string>
-    <string name="button_set">ตั้งค่า</string>
-    <string name="button_undo">ย้อนกลับ</string>
-    <string name="toast_copied">คัดลอกแล้ว</string>
-    <string name="toast_archived">จัดเก็บการสนทนาแล้ว</string>
-    <string name="toast_qksms_plus">คุณต้องปลดล็อก QKSMS+ เพื่อใช้งานคุณสมบัตินี้</string>
-    <plurals name="notification_new_messages">
-        <item quantity="other">มี %s ข้อความใหม่</item>
-    </plurals>
-    <string name="notification_message_failed_title">ข้อความไม่ถูกส่ง</string>
-    <string name="notification_message_failed_text">ข้อความที่จะส่งถึง %s ไม่สามารถส่งได้</string>
-    <string-array name="night_modes">
-        <item>System</item>
-        <item>Disabled</item>
-        <item>Always on</item>
-        <item>Automatic</item>
-    </string-array>
-    <string-array name="notification_preview_options">
-        <item>แสดงชื่อและข้อความ</item>
-        <item>แสดงชื่อ</item>
-        <item>ซ่อนเนื้อหา</item>
-    </string-array>
-    <string-array name="text_sizes">
-        <item>ขนาดเล็ก</item>
-        <item>ปกติ</item>
-        <item>ขนาดใหญ่</item>
-        <item>ขนาดใหญ่มาก</item>
-    </string-array>
-    <string-array name="delayed_sending_labels">
-        <item>ไม่ล่าช้า</item>
-        <item>3 seconds</item>
-        <item>5 seconds</item>
-        <item>10 seconds</item>
-    </string-array>
-    <string-array name="mms_sizes">
-        <item>Automatic</item>
-        <item>100KB</item>
-        <item>200KB</item>
-        <item>300KB</item>
-        <item>600KB</item>
-        <item>1000KB</item>
-        <item>2000KB</item>
-        <item>No compression</item>
-    </string-array>
-    <string-array name="qk_responses">
-        <item>ตกลง</item>
-        <item>ให้เวลาฉันสักครู่</item>
-        <item>ตามใจฉัน</item>
-        <item>ขอบคุณ</item>
-        <item>ฟังดูดี</item>
-        <item>เป็นอย่างไรบ้าง?</item>
-        <item>ยอมรับ</item>
-        <item>ไม่</item>
-        <item>รักเธอนะ</item>
-        <item>ขอโทษ</item>
-        <item>555</item>
-        <item>ไม่เป็นไร</item>
-    </string-array>
-</resources>
+<?xml version="1.0" encoding="utf-8"?>
+<!--
+  ~ Copyright (C) 2019 Moez Bhatti <moez.bhatti@gmail.com>
+  ~
+  ~ This file is part of QKSMS.
+  ~
+  ~ QKSMS is free software: you can redistribute it and/or modify
+  ~ it under the terms of the GNU General Public License as published by
+  ~ the Free Software Foundation, either version 3 of the License, or
+  ~ (at your option) any later version.
+  ~
+  ~ QKSMS is distributed in the hope that it will be useful,
+  ~ but WITHOUT ANY WARRANTY; without even the implied warranty of
+  ~ MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+  ~ GNU General Public License for more details.
+  ~
+  ~ You should have received a copy of the GNU General Public License
+  ~ along with QKSMS.  If not, see <http://www.gnu.org/licenses/>.
+  -->
+<resources>
+    <string name="shortcut_compose_long_label">New conversation</string>
+    <string name="shortcut_compose_short_label">Compose</string>
+    <string name="shortcut_compose_disabled_message">Shortcut disabled</string>
+    <string name="title_archived">จัดเก็บ</string>
+    <string name="title_settings">การตั้งค่า</string>
+    <string name="title_notification_prefs">การแจ้งเตือน</string>
+    <string name="title_theme">รูปแบบการแสดงผล</string>
+    <string name="title_conversations">ค้นหากล่องขาเข้า&#8230;</string>
+    <string name="title_compose">พิมพ์ชื่อหรือหมายเลข</string>
+    <string name="setup_skip">ข้าม</string>
+    <string name="setup_next">ทำต่อ</string>
+    <string name="menu_add_person">Add person</string>
+    <string name="menu_call">โทร</string>
+    <string name="menu_info">รายละเอียด</string>
+    <string name="menu_save">บันทึกรูปภาพ</string>
+    <string name="menu_share">Share</string>
+    <string name="main_drawer_open_cd">เปิดเมนูลัด</string>
+    <string name="main_title_selected">%d ถูกเลือก</string>
+    <string name="main_menu_clear">ลบออก</string>
+    <string name="main_menu_archive">จัดเก็บ</string>
+    <string name="main_menu_unarchive">ยกเลิกการเก็บ</string>
+    <string name="main_menu_delete">ลบ</string>
+    <string name="main_menu_add_contact">Add to contacts</string>
+    <string name="main_menu_pin">ปักหมุดไว้ด้านบน</string>
+    <string name="main_menu_unpin">เอาหมุดออก</string>
+    <string name="main_menu_read">Mark read</string>
+    <string name="main_menu_unread">Mark unread</string>
+    <string name="main_menu_block">ปิดกั้น</string>
+    <string name="main_syncing">กำลังปรับแต่งเพิ่มประสิทธิภาพฐานข้อมูล อาจใช้เวลาสักครู่&#8230;</string>
+    <string name="main_sender_you">คุณ: %s</string>
+    <string name="main_draft">Draft</string>
+    <string name="main_message_results_title">ผลลัพธ์ในข้อความ</string>
+    <string name="main_message_results">%d ข้อความ</string>
+    <string name="inbox_empty_text">บทสนทนาของคุณจะปรากฏที่นี่</string>
+    <string name="inbox_search_empty_text">ไม่มีผลลัพธ์</string>
+    <string name="archived_empty_text">บทสนทนาของคุณที่จัดเก็บไว้จะปรากฏที่นี่</string>
+    <string name="main_fab_cd">เริ่มการสนทนาใหม่</string>
+    <string name="main_default_sms_title">อยากส่งข้อความอีกครั้ง</string>
+    <string name="main_default_sms_message">ทำให้ QKSMS แอป SMS ค่าเริ่มต้นของคุณ</string>
+    <string name="main_default_sms_change">เปลี่ยน</string>
+    <string name="main_permission_required">ต้องการใช้สิทธิ์การเข้าถึง</string>
+    <string name="main_permission_sms">QKSMS ต้องการสิทธิ์เพื่อส่ง และดูข้อความ SMS</string>
+    <string name="main_permission_contacts">QKSMS ต้องการสิทธิ์เพื่อดูรายชื่อผู้ติดต่อของคุณ</string>
+    <string name="main_permission_allow">อนุญาต</string>
+    <string name="drawer_inbox">กล่องขาเข้า</string>
+    <string name="drawer_archived">จัดเก็บ</string>
+    <string name="drawer_scheduled">กำหนดเวลา</string>
+    <string name="drawer_blocking">บล็อก</string>
+    <string name="drawer_more">เพิ่มเติม</string>
+    <string name="drawer_settings">การตั้งค่า</string>
+    <string name="drawer_help">ช่วยเหลือ &amp; ข้อคิดเห็น</string>
+    <string name="drawer_invite">เชิญเพื่อน</string>
+    <string name="drawer_plus_banner_summary">ปลดล็อคฟีเจอร์ใหม่ ๆ และสนับสนุนการพัฒนา</string>
+    <string name="rate_title">ชอบ QKSMS ไหม?</string>
+    <string name="rate_summary">แชร์และให้คะแนนเราบน Google Play!</string>
+    <string name="rate_okay">ตกลง!</string>
+    <string name="rate_dismiss">ยกเลิก</string>
+    <string name="dialog_delete_title">ลบ</string>
+    <plurals name="dialog_delete_message">
+        <item quantity="other">คุณแน่ใจหรือว่า คุณต้องการลบการสนทนาทั้งหมด</item>
+    </plurals>
+    <string-array name="message_options">
+        <item>คัดลอกข้อความ</item>
+        <item>ส่งต่อ</item>
+        <item>ลบ</item>
+    </string-array>
+    <string name="compose_number_picker_title">Choose a phone number</string>
+    <string name="compose_number_picker_default">%s ∙ Default</string>
+    <string name="compose_number_picker_once">Just once</string>
+    <string name="compose_number_picker_always">Always</string>
+    <string name="compose_title_selected">%d ถูกเลือก</string>
+    <string name="compose_subtitle_results">%1$d ใน %2$d ของผลลัพท์</string>
+    <string name="compose_send_group_title">ส่งเป็นข้อความกลุ่ม</string>
+    <string name="compose_send_group_summary">ผู้รับและการตอบกลับจะแสดงให้ทุกคนเห็นทุกคน</string>
+    <string name="compose_messages_empty">การเริ่มต้นของการสนทนาของคุณ บอกกล่าวบางอย่างที่นี่</string>
+    <string name="compose_vcard_label">นามบัตร</string>
+    <string name="compose_scheduled_for">กำหนดการ</string>
+    <string name="compose_scheduled_future">เลือกเวลาที่ต้องเป็นเวลาในอนาคต</string>
+    <string name="compose_scheduled_plus">คุณต้องปลดล็อก QKSMS + เพื่อการใช้ข้อความที่กำหนดเวลาได้</string>
+    <string name="compose_scheduled_toast">เพิ่มข้อความที่กำหนดเวลา</string>
+    <string name="compose_hint">เขียนข้อความ...</string>
+    <string name="compose_menu_copy">คัดลอกข้อความ</string>
+    <string name="compose_menu_forward">ส่งต่อ</string>
+    <string name="compose_menu_delete">ลบ</string>
+    <string name="compose_menu_previous">ก่อนหน้านี้</string>
+    <string name="compose_menu_next">ถัดไป</string>
+    <string name="compose_menu_clear">ล้าง</string>
+    <string name="compose_details_title">รายละเอียดข้อความ</string>
+    <string name="compose_details_type">ประเภท: %s</string>
+    <string name="compose_details_from">จาก: %s</string>
+    <string name="compose_details_to">ถึง: %s</string>
+    <string name="compose_details_subject">เรื่อง: %s</string>
+    <string name="compose_details_priority">ความสำคัญ: %s</string>
+    <string name="compose_details_size">ขนาด: %s</string>
+    <string name="compose_details_sent">ส่งแล้ว: %s</string>
+    <string name="compose_details_received">รับ: %s</string>
+    <string name="compose_details_delivered">การจัดส่ง: %s</string>
+    <string name="compose_details_error_code">รหัสข้อผิดพลาด: %d</string>
+    <string name="compose_attach_cd">เพิ่มสิ่งที่แนบ</string>
+    <string name="compose_gallery_cd">แนบรูปภาพ</string>
+    <string name="compose_camera_cd">ถ่ายภาพ</string>
+    <string name="compose_schedule_cd">กำหนดเวลาของข้อความ</string>
+    <string name="compose_contact_cd">Attach a contact</string>
+    <string name="compose_contact_error">Error reading contact</string>
+    <!-- Example: SIM 1 (Verizon) selected-->
+    <string name="compose_sim_changed_toast">SIM %1$d (%2$s) selected</string>
+    <string name="compose_sim_cd">%s เลือก เปลี่ยน SIM การ์ด</string>
+    <string name="compose_send_cd">ส่งข้อความ</string>
+    <string name="message_status_sending">กำลังส่ง...</string>
+    <string name="message_status_delivered">%s ถูกส่งแล้ว</string>
+    <string name="message_status_failed">การส่งล้มเหลว ลองแตะเพื่อส่งอีกครั้ง</string>
+    <string name="info_title">รายละเอียด</string>
+    <string name="info_copied_address">Address copied</string>
+    <string name="info_name">หัวข้อสนทนา</string>
+    <string name="info_notifications">การแจ้งเตือน</string>
+    <string name="info_theme">รูปแบบการแสดงผล</string>
+    <string name="info_archive">จัดเก็บ</string>
+    <string name="info_unarchive">ยกเลิกการเก็บ</string>
+    <string name="info_block">ปิดกั้น</string>
+    <string name="info_unblock">ยกเลิกการปิดกั้น</string>
+    <string name="info_delete">ลบการสนทนา</string>
+    <string name="gallery_error">Couldn\'t load media</string>
+    <string name="gallery_toast_saved">บันทึกรูปภาพแล้ว</string>
+    <string name="backup_title">Backup and restore</string>
+    <string name="backup_backing_up">Backing up messages</string>
+    <string name="backup_restoring">Restoring from backup</string>
+    <string name="backup_last">Last backup</string>
+    <string name="backup_loading">Loading&#8230;</string>
+    <string name="backup_never">Never</string>
+    <string name="backup_restore_title">Restore</string>
+    <string name="backup_restore_summary">Select a backup</string>
+    <string name="backup_restore_error_plus">Please unlock QKSMS+ to use backup and restore</string>
+    <string name="backup_restore_error_backup">Backup in progress&#8230;</string>
+    <string name="backup_restore_error_restore">Restore in progress&#8230;</string>
+    <string name="backup_restore_confirm_title">Restore from backup</string>
+    <string name="backup_restore_confirm_message">Are you sure you would like to restore your messages from this backup?</string>
+    <string name="backup_restore_stop_title">Stop restore</string>
+    <string name="backup_restore_stop_message">Messages that have already been restored will remain on your device</string>
+    <string name="backup_restore_dialog_title">Backups</string>
+    <string name="backup_restore_dialog_empty">No backups found</string>
+    <plurals name="backup_message_count">
+        <item quantity="other">%d messages</item>
+    </plurals>
+    <string name="backup_disclaimer">Currently, only SMS is supported by Backup and Restore. MMS support and scheduled backups will be coming soon!</string>
+    <string name="backup_now">Backup now</string>
+    <string name="backup_progress_parsing">Parsing backup&#8230;</string>
+    <string name="backup_progress_running">%d/%d messages</string>
+    <string name="backup_progress_saving">Saving backup&#8230;</string>
+    <string name="backup_progress_syncing">Syncing messages&#8230;</string>
+    <string name="backup_progress_finished">Finished!</string>
+    <string name="backup_notification_channel_name">Backup and restore</string>
+    <string name="scheduled_title">กำหนดการ</string>
+    <string name="scheduled_empty_description">ส่งข้อความ โดยอัตโนมัติที่คุณต้องการ</string>
+    <string name="scheduled_empty_message_1">วันเกิดของคุณอีกครั้งเมื่อไหร่</string>
+    <string name="scheduled_empty_message_2">วันที่ 23 นี้ธันวาคม</string>
+    <string name="scheduled_empty_message_3">Happy birthday! Look at what a great friend I am, remembering your birthday</string>
+    <!--&#x200A; is a special character required at the end of this string to fix it's formatting in the app -->
+    <string name="scheduled_empty_message_3_timestamp">Sending on December 23rd </string>
+    <string name="scheduled_compose_cd">Schedule a message</string>
+    <string name="scheduled_options_title">Scheduled message</string>
+    <string-array name="scheduled_options">
+        <item>Send now</item>
+        <item>Copy text</item>
+        <item>Delete</item>
+    </string-array>
+    <string name="settings_category_appearance">ลักษณะที่ปรากฏ</string>
+    <string name="settings_category_general">ทั่วไป</string>
+    <string name="settings_category_qkreply">QK ตอบกลับ</string>
+    <string name="settings_theme_title">รูปแบบการแสดงผล</string>
+    <string name="settings_night_title">โหมดกลางคืน</string>
+    <string name="settings_black_title">โหมดกลางคืนแบบมืดสนิท</string>
+    <string name="settings_night_start_title">เวลาเริ่มต้น</string>
+    <string name="settings_night_end_title">เวลาสิ้นสุด</string>
+    <string name="settings_automatic_colors_title">Automatic contact colors</string>
+    <string name="settings_text_size_title">ขนาดแบบอักษร</string>
+    <string name="settings_system_font_title">ใช้แบบอักษรของระบบ</string>
+    <string name="settings_auto_emoji_title">อีโมจิอัตโนมัติ</string>
+    <string name="settings_notifications_title">การแจ้งเตือน</string>
+    <string name="settings_notifications_o_summary">Tap to customize</string>
+    <string name="settings_notification_actions_title">Actions</string>
+    <string name="settings_notification_action_1">Button 1</string>
+    <string name="settings_notification_action_2">Button 2</string>
+    <string name="settings_notification_action_3">Button 3</string>
+    <string name="settings_notification_previews_title">ตัวอย่างการแจ้งเตือน</string>
+    <string name="settings_notification_wake_title">Wake screen</string>
+    <string name="settings_vibration_title">การสั่น</string>
+    <string name="settings_ringtone_title">เสียง</string>
+    <string name="settings_ringtone_none">ไม่มี</string>
+    <string name="settings_qkreply_title">QK ตอบกลับ</string>
+    <string name="settings_qkreply_summary">ป๊อปอัพข้อความใหม่</string>
+    <string name="settings_qkreply_tap_dismiss_title">แตะเพื่อยกเลิก</string>
+    <string name="settings_qkreply_tap_dismiss_summary">แตะนอกป๊อปอัพเพื่อปิด</string>
+    <string name="settings_delayed_title">การส่งแบบล่าช้า</string>
+    <string name="settings_swipe_actions">Swipe actions</string>
+    <string name="settings_swipe_actions_summary">Configure swipe actions for conversations</string>
+    <string name="settings_swipe_actions_right">Right swipe</string>
+    <string name="settings_swipe_actions_left">Left swipe</string>
+    <string name="settings_swipe_actions_change">CHANGE</string>
+    <string-array name="settings_swipe_actions">
+        <item>None</item>
+        <item>Archive</item>
+        <item>Delete</item>
+        <item>Block</item>
+        <item>Call</item>
+        <item>Mark read</item>
+        <item>Mark unread</item>
+    </string-array>
+    <string name="settings_delivery_title">ยืนยันการส่ง</string>
+    <string name="settings_delivery_summary">ยืนยันว่า ส่งข้อความเรียบร้อยแล้ว</string>
+    <string name="settings_signature_title">Signature</string>
+    <string name="settings_signature_summary">Add a signature to the end of your messages</string>
+    <string name="settings_unicode_title">ลบอักษรพิเศษ accents</string>
+    <string name="settings_unicode_summary">ลบอักษรพิเศษ accents ออกจากข้อความ SMS ที่กำลังจะส่งออก</string>
+    <string name="settings_mobile_title">Mobile numbers only</string>
+    <string name="settings_mobile_summary">When composing a message, only show mobile numbers</string>
+    <string name="settings_auto_delete">Delete old messages automatically</string>
+    <string name="settings_auto_delete_dialog_message">Messages will be deleted after the specified number of days</string>
+    <string name="settings_auto_delete_dialog_hint">Number of days</string>
+    <string name="settings_auto_delete_never">Never</string>
+    <string name="settings_auto_delete_warning">Delete old messages automatically?</string>
+    <string name="settings_auto_delete_warning_message">If you proceed, %1$d messages will be deleted now</string>
+    <plurals name="settings_auto_delete_summary">
+        <item quantity="other">After %d days</item>
+    </plurals>
+    <string name="settings_long_as_mms_title">Send long messages as MMS</string>
+    <string name="settings_long_as_mms_summary">If your longer text messages are failing to send, or sending in the wrong order, you can send them as MMS messages instead. Additional charges may apply</string>
+    <string name="settings_mms_size_title">บีบอัดสิ่งที่แนบมาใน MMS อัตโนมัติ</string>
+    <string name="settings_sync_title">ซิงค์ข้อความ</string>
+    <string name="settings_sync_summary">ซิงค์ข้อความของคุณกับฐานข้อมูลของ Android SMS</string>
+    <string name="settings_about_title">เกี่ยวกับ QKSMS</string>
+    <string name="settings_version">เวอร์ชัน: %s</string>
+    <string name="settings_logging_enabled">Debug logging enabled</string>
+    <string name="settings_logging_disabled">Debug logging disabled</string>
+    <string name="settings_delay_duration_hint">ระยะเวลาการป้อน (วินาที)</string>
+    <string name="blocking_title">Blocking</string>
+    <string name="blocking_drop_title">Drop messages</string>
+    <string name="blocking_drop_summary">Drop incoming messages from blocked senders instead of hiding them</string>
+    <string name="blocking_conversations">Blocked conversations</string>
+    <string name="blocking_manager_title">Blocking Manager</string>
+    <string name="blocking_manager_qksms_title">QKSMS</string>
+    <string name="blocking_manager_qksms_summary">Built-in blocking functionality in QKSMS</string>
+    <string name="blocking_manager_call_control_summary">Automatically filter your calls and messages in one convenient place! Community IQ™ allows you to prevent unwanted messages from community known spammers</string>
+    <string name="blocking_manager_sia_summary">กรองข้อความจากหมายเลขที่ไม่พึงประสงค์ โดยใช้แอพควรตอบกลับหรือไม่</string>
+    <string name="blocking_manager_copy_title">Copy blocked numbers</string>
+    <string name="blocking_manager_copy_summary">Continue to %s and copy over your existing blocked numbers</string>
+    <string name="blocked_numbers_title">Blocked numbers</string>
+    <string name="blocked_numbers_empty">Your blocked numbers will appear here</string>
+    <string name="blocked_numbers_add_cd">Block a new number</string>
+    <string name="blocked_numbers_dialog_title">Block texts from</string>
+    <string name="blocked_numbers_dialog_hint">Phone number</string>
+    <string name="blocked_numbers_dialog_block">Block</string>
+    <string name="blocked_messages_title">Blocked messages</string>
+    <string name="blocked_messages_empty">Your blocked messages will appear here</string>
+    <string name="blocking_block_title">Block</string>
+    <string name="blocking_unblock_title">Unblock</string>
+    <plurals name="blocking_block_external">
+        <item quantity="other">Continue to %s and block these numbers</item>
+    </plurals>
+    <plurals name="blocking_unblock_external">
+        <item quantity="other">Continue to %s and allow these numbers</item>
+    </plurals>
+    <string name="about_title">เกี่ยวกับ</string>
+    <string name="about_version_title">เวอร์ชัน</string>
+    <string name="about_developer_title">นักพัฒนา</string>
+    <string name="about_source_title">ซอสโค๊ด</string>
+    <string name="about_changelog_title">บันทึกการเปลี่ยนแปลง</string>
+    <string name="about_contact_title">ติดต่อ</string>
+    <string name="about_license_title">สิทธิ์การใช้งาน</string>
+    <string name="about_copyright_title">ลิขสิทธิ์</string>
+    <string name="qksms_plus_description_title">สนับสนุนการพัฒนา หรือปลดล็อคทุกอย่าง</string>
+    <string name="qksms_plus_description_summary">คุณสามารถช่วยเหลือนักพัฒนาเหล่าได้เพียง %s</string>
+    <!-- Substitutions are for price and currency. Ex: Lifetime upgrade for $1.99 USD -->
+    <string name="qksms_plus_upgrade">อัพเกรดตลอดอายุการใช้งานสำหรับ %1$s %2$s</string>
+    <!-- Substitutions are for price and currency. Ex: Unlock + donate for $4.99 USD -->
+    <string name="qksms_plus_upgrade_donate">ปลดล็อค + บริจาค %1$s %2$s</string>
+    <string name="qksms_plus_thanks_title">ขอบคุณสำหรับการสนับสนุน QKSMS</string>
+    <string name="qksms_plus_thanks_summary">ตอนนี้คุณสามารถเข้าถึงคุณสมบัติทั้งหมดของ QKSMS+ ได้แล้ว</string>
+    <string name="qksms_plus_free_title">QKSMS+ เป็นบริการฟรีสำหรับผู้ใช้งาน F-Droid หากคุณต้องการสนับสนุนการพัฒนา สามารถบริจาคได้</string>
+    <string name="qksms_plus_donate">บริจาคผ่าน PayPal</string>
+    <string name="qksms_plus_coming_soon">เร็วๆ นี้</string>
+    <string name="qksms_plus_themes_title">รูปแบบพรีเมี่ยม</string>
+    <string name="qksms_plus_themes_summary">ปลดล็อครูปแบบการแสดงผลที่ไม่ได้อยู่ใน Material Design</string>
+    <string name="qksms_plus_emoji_title">อีโมจิอัตโนมัติที่กำหนดเอง</string>
+    <string name="qksms_plus_emoji_summary">สร้างทางลัดอิโมจิอัตโนมัติแบบกำหนดเอง</string>
+    <string name="qksms_plus_backup_title">สำรองข้อมูลข้อความ</string>
+    <string name="qksms_plus_backup_summary">สำรองข้อมูลข้อความของคุณโดยอัตโนมัติ ไม่ต้องกังวลว่าประวัติข้อความของคุณจะสูญหายถ้าคุณเปลี่ยนโทรศัพท์มือถือ หรือทำโทรศัพท์หาย</string>
+    <string name="qksms_plus_scheduled_title">ข้อความที่กำหนดเวลา</string>
+    <string name="qksms_plus_scheduled_summary">ข้อความจะถูกส่งโดยอัตโนมัติตามวันและเวลาที่กำหนด</string>
+    <string name="qksms_plus_delayed_title">การส่งแบบล่าช้า</string>
+    <string name="qksms_plus_delayed_summary">รอสักครู่ก่อนที่จะส่งข้อความของคุณ</string>
+    <string name="qksms_plus_night_title">โหมดกลางคืนอัตโนมัติ</string>
+    <string name="qksms_plus_night_summary">เปิดใช้งานโหมดกลางคืนตามเวลาของวัน</string>
+    <string name="qksms_plus_blacklist_title">ปิดกั้นขั้นสูง</string>
+    <string name="qksms_plus_blacklist_summary">ปิดกั้นข้อความที่ประกอบด้วยคำสำคัญ หรือตรงกับรูปแบบ</string>
+    <string name="qksms_plus_forward_title">ส่งต่ออัตโนมัติ</string>
+    <string name="qksms_plus_forward_summary">ส่งต่อข้อความจากผู้ส่งที่ถูกระบุโดยอัตโนมัติ</string>
+    <string name="qksms_plus_respond_title">ตอบกลับอัตโนมัติ</string>
+    <string name="qksms_plus_respond_summary">ตอบกลับข้อความที่เข้ามาอัตโนมัติ โดยใช้ข้อความที่จัดเตรียมไว้</string>
+    <string name="qksms_plus_more_title">เพิ่มเติม</string>
+    <string name="qksms_plus_more_summary">QKSMS is under active development, and your purchase will include all future QKSMS+ features!</string>
+    <string name="widget_loading">กำลังโหลด&#8230;</string>
+    <string name="widget_more">ดูการสนทนาเพิ่มเติม</string>
+    <string name="qkreply_menu_read">Mark read</string>
+    <string name="qkreply_menu_call">โทร</string>
+    <string name="qkreply_menu_delete">Delete</string>
+    <string name="qkreply_menu_expand">แสดงเพิ่มเติม</string>
+    <string name="qkreply_menu_collapse">แสดงน้อยลง</string>
+    <string name="qkreply_menu_view">เริ่มการสนทนา</string>
+    <string name="theme_material">Material</string>
+    <string name="theme_hex">HEX</string>
+    <string name="theme_apply">ตกลง</string>
+    <string-array name="notification_actions">
+        <item>None</item>
+        <item>Archive</item>
+        <item>Delete</item>
+        <item>Block</item>
+        <item>Call</item>
+        <item>Mark read</item>
+        <item>Reply</item>
+    </string-array>
+    <string name="button_yes">Yes</string>
+    <string name="button_continue">Continue</string>
+    <string name="button_cancel">ยกเลิก</string>
+    <string name="button_delete">ลบ</string>
+    <string name="button_save">Save</string>
+    <string name="button_stop">Stop</string>
+    <string name="button_more">เพิ่มเติม</string>
+    <string name="button_set">ตั้งค่า</string>
+    <string name="button_undo">ย้อนกลับ</string>
+    <string name="toast_copied">คัดลอกแล้ว</string>
+    <string name="toast_archived">จัดเก็บการสนทนาแล้ว</string>
+    <string name="toast_qksms_plus">คุณต้องปลดล็อก QKSMS+ เพื่อใช้งานคุณสมบัตินี้</string>
+    <plurals name="notification_new_messages">
+        <item quantity="other">มี %s ข้อความใหม่</item>
+    </plurals>
+    <string name="notification_message_failed_title">ข้อความไม่ถูกส่ง</string>
+    <string name="notification_message_failed_text">ข้อความที่จะส่งถึง %s ไม่สามารถส่งได้</string>
+    <string-array name="night_modes">
+        <item>System</item>
+        <item>Disabled</item>
+        <item>Always on</item>
+        <item>Automatic</item>
+    </string-array>
+    <string-array name="notification_preview_options">
+        <item>แสดงชื่อและข้อความ</item>
+        <item>แสดงชื่อ</item>
+        <item>ซ่อนเนื้อหา</item>
+    </string-array>
+    <string-array name="text_sizes">
+        <item>ขนาดเล็ก</item>
+        <item>ปกติ</item>
+        <item>ขนาดใหญ่</item>
+        <item>ขนาดใหญ่มาก</item>
+    </string-array>
+    <string-array name="delayed_sending_labels">
+        <item>ไม่ล่าช้า</item>
+        <item>3 seconds</item>
+        <item>5 seconds</item>
+        <item>10 seconds</item>
+    </string-array>
+    <string-array name="mms_sizes">
+        <item>Automatic</item>
+        <item>100KB</item>
+        <item>200KB</item>
+        <item>300KB</item>
+        <item>600KB</item>
+        <item>1000KB</item>
+        <item>2000KB</item>
+        <item>No compression</item>
+    </string-array>
+    <string-array name="qk_responses">
+        <item>ตกลง</item>
+        <item>ให้เวลาฉันสักครู่</item>
+        <item>ตามใจฉัน</item>
+        <item>ขอบคุณ</item>
+        <item>ฟังดูดี</item>
+        <item>เป็นอย่างไรบ้าง?</item>
+        <item>ยอมรับ</item>
+        <item>ไม่</item>
+        <item>รักเธอนะ</item>
+        <item>ขอโทษ</item>
+        <item>555</item>
+        <item>ไม่เป็นไร</item>
+    </string-array>
+</resources>
diff --git a/presentation/src/main/res/values-tl/strings.xml b/presentation/src/main/res/values-tl/strings.xml
index cb32cf1c1..ac398931a 100644
--- a/presentation/src/main/res/values-tl/strings.xml
+++ b/presentation/src/main/res/values-tl/strings.xml
@@ -1,411 +1,411 @@
-<?xml version="1.0" encoding="utf-8"?>
-<!--
-  ~ Copyright (C) 2019 Moez Bhatti <moez.bhatti@gmail.com>
-  ~
-  ~ This file is part of QKSMS.
-  ~
-  ~ QKSMS is free software: you can redistribute it and/or modify
-  ~ it under the terms of the GNU General Public License as published by
-  ~ the Free Software Foundation, either version 3 of the License, or
-  ~ (at your option) any later version.
-  ~
-  ~ QKSMS is distributed in the hope that it will be useful,
-  ~ but WITHOUT ANY WARRANTY; without even the implied warranty of
-  ~ MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
-  ~ GNU General Public License for more details.
-  ~
-  ~ You should have received a copy of the GNU General Public License
-  ~ along with QKSMS.  If not, see <http://www.gnu.org/licenses/>.
-  -->
-<resources>
-    <string name="shortcut_compose_long_label">Bagong usapan</string>
-    <string name="shortcut_compose_short_label">Sumulat</string>
-    <string name="shortcut_compose_disabled_message">Shortcut disabled</string>
-    <string name="title_archived">Nakatabi</string>
-    <string name="title_settings">Mga setting</string>
-    <string name="title_notification_prefs">Notifications</string>
-    <string name="title_theme">Theme</string>
-    <string name="title_conversations">Hanapin sa inbox&#8230;</string>
-    <string name="title_compose">Sumulat</string>
-    <string name="setup_skip">Laktawan</string>
-    <string name="setup_next">Magpatuloy</string>
-    <string name="menu_add_person">Add person</string>
-    <string name="menu_call">Tawagan</string>
-    <string name="menu_info">Mga detalye</string>
-    <string name="menu_save">Save to gallery</string>
-    <string name="menu_share">Share</string>
-    <string name="main_drawer_open_cd">Open navigation drawer</string>
-    <string name="main_title_selected">%d selected</string>
-    <string name="main_menu_clear">Clear</string>
-    <string name="main_menu_archive">Itabi</string>
-    <string name="main_menu_unarchive">Ilabas</string>
-    <string name="main_menu_delete">Burahin</string>
-    <string name="main_menu_add_contact">Add to contacts</string>
-    <string name="main_menu_pin">I-ipit sa itaas</string>
-    <string name="main_menu_unpin">Unpin</string>
-    <string name="main_menu_read">Mark read</string>
-    <string name="main_menu_unread">Mark unread</string>
-    <string name="main_menu_block">Block</string>
-    <string name="main_syncing">Syncing messages&#8230;</string>
-    <string name="main_sender_you">Ikaw: %s</string>
-    <string name="main_draft">Draft</string>
-    <string name="main_message_results_title">Resulta sa mga messages</string>
-    <string name="main_message_results">%d mga messages</string>
-    <string name="inbox_empty_text">Ang iyong mga pakikipag-usap ay makikita rito</string>
-    <string name="inbox_search_empty_text">Walang nakita</string>
-    <string name="archived_empty_text">Ang iyong mga isinantabing pakikipag-usap at makikita rito</string>
-    <string name="main_fab_cd">Magsimula ng bagong usapan</string>
-    <string name="main_default_sms_title">Love texting again</string>
-    <string name="main_default_sms_message">Gawin ang QKSMS bilang iyong default na SMS app</string>
-    <string name="main_default_sms_change">Baguhin</string>
-    <string name="main_permission_required">Kailangan ang iyong pahintulot</string>
-    <string name="main_permission_sms">Kailangan ng QKSMS ang iyong pahintulot para maipadala at makita ang mga mensahe</string>
-    <string name="main_permission_contacts">Kailangan ng QKSMS ang iyong pahintulot para makita ang iyong contacts</string>
-    <string name="main_permission_allow">Payagan</string>
-    <string name="drawer_inbox">Inbox</string>
-    <string name="drawer_archived">Nakatabi</string>
-    <string name="drawer_scheduled">Iskedyul</string>
-    <string name="drawer_blocking">Blocking</string>
-    <string name="drawer_more">Higit pa</string>
-    <string name="drawer_settings">Settings</string>
-    <string name="drawer_help">magbigay ng Feedback</string>
-    <string name="drawer_invite">Maganyaya ng mga kaibigan</string>
-    <string name="drawer_plus_banner_summary">I-unlock ang mga kamangha-manghang mga bagong features, at suportahan ang pag-unlad ng proyekto</string>
-    <string name="rate_title">Natutuwa sa QKSMS?</string>
-    <string name="rate_summary">Ibahagi ang pag-ibig at i-rate kami sa Google Play!</string>
-    <string name="rate_okay">OKAY!</string>
-    <string name="rate_dismiss">DISMISS</string>
-    <string name="dialog_delete_title">Tanggalin</string>
-    <plurals name="dialog_delete_message">
-        <item quantity="one">Sigurado ka bang gusto mong burahin ang pag-uusap na ito?</item>
-        <item quantity="other">Sigurado ka bang nais mong tanggalin ang pag-uusap na ito?</item>
-    </plurals>
-    <string-array name="message_options">
-        <item>Kopyahin ang text</item>
-        <item>Forward</item>
-        <item>Tanggalin</item>
-    </string-array>
-    <string name="compose_number_picker_title">Magpili ng phone number</string>
-    <string name="compose_number_picker_default">%s - Default</string>
-    <string name="compose_number_picker_once">Isang beses lang</string>
-    <string name="compose_number_picker_always">Palagi</string>
-    <string name="compose_title_selected">%d napili</string>
-    <string name="compose_subtitle_results">%1$d ng %2$d mga resulta</string>
-    <string name="compose_send_group_title">Magpadala bilang group message</string>
-    <string name="compose_send_group_summary">Ang mga tatanggap at tugon ay makikita ng lahat</string>
-    <string name="compose_messages_empty">Ito ang simula ng iyong pag-uusap. Magsabi ka ng maganda!</string>
-    <string name="compose_vcard_label">Contact card</string>
-    <string name="compose_scheduled_for">Naka-iskedyul para sa</string>
-    <string name="compose_scheduled_future">Ang napiling oras ay dapat na sa hinaharap!</string>
-    <string name="compose_scheduled_plus">Dapat mong i-unlock ang QKSMS + upang magamit ang naka-iskedyul na pagmemensahe</string>
-    <string name="compose_scheduled_toast">Added to scheduled messages</string>
-    <string name="compose_hint">Write a message&#8230;</string>
-    <string name="compose_menu_copy">Copy text</string>
-    <string name="compose_menu_forward">Forward</string>
-    <string name="compose_menu_delete">Delete</string>
-    <string name="compose_menu_previous">Previous</string>
-    <string name="compose_menu_next">Next</string>
-    <string name="compose_menu_clear">Clear</string>
-    <string name="compose_details_title">Message details</string>
-    <string name="compose_details_type">Type: %s</string>
-    <string name="compose_details_from">From: %s</string>
-    <string name="compose_details_to">To: %s</string>
-    <string name="compose_details_subject">Subject: %s</string>
-    <string name="compose_details_priority">Priority: %s</string>
-    <string name="compose_details_size">Size: %s</string>
-    <string name="compose_details_sent">Sent: %s</string>
-    <string name="compose_details_received">Received: %s</string>
-    <string name="compose_details_delivered">Delivered: %s</string>
-    <string name="compose_details_error_code">Error code: %d</string>
-    <string name="compose_attach_cd">Add an attachment</string>
-    <string name="compose_gallery_cd">Attach a photo</string>
-    <string name="compose_camera_cd">Take a photo</string>
-    <string name="compose_schedule_cd">Schedule message</string>
-    <string name="compose_contact_cd">Attach a contact</string>
-    <string name="compose_contact_error">Error reading contact</string>
-    <!-- Example: SIM 1 (Verizon) selected-->
-    <string name="compose_sim_changed_toast">SIM %1$d (%2$s) selected</string>
-    <string name="compose_sim_cd">%s selected, change SIM card</string>
-    <string name="compose_send_cd">Send message</string>
-    <string name="message_status_sending">Sending&#8230;</string>
-    <string name="message_status_delivered">Delivered %s</string>
-    <string name="message_status_failed">Failed to send. Tap to try again</string>
-    <string name="info_title">Details</string>
-    <string name="info_copied_address">Address copied</string>
-    <string name="info_name">Conversation title</string>
-    <string name="info_notifications">Notifications</string>
-    <string name="info_theme">Theme</string>
-    <string name="info_archive">Archive</string>
-    <string name="info_unarchive">Unarchive</string>
-    <string name="info_block">Block</string>
-    <string name="info_unblock">Unblock</string>
-    <string name="info_delete">Delete conversation</string>
-    <string name="gallery_error">Couldn\'t load media</string>
-    <string name="gallery_toast_saved">Saved to gallery</string>
-    <string name="backup_title">Backup and restore</string>
-    <string name="backup_backing_up">Backing up messages</string>
-    <string name="backup_restoring">Restoring from backup</string>
-    <string name="backup_last">Last backup</string>
-    <string name="backup_loading">Loading&#8230;</string>
-    <string name="backup_never">Never</string>
-    <string name="backup_restore_title">Restore</string>
-    <string name="backup_restore_summary">Select a backup</string>
-    <string name="backup_restore_error_plus">Please unlock QKSMS+ to use backup and restore</string>
-    <string name="backup_restore_error_backup">Backup in progress&#8230;</string>
-    <string name="backup_restore_error_restore">Restore in progress&#8230;</string>
-    <string name="backup_restore_confirm_title">Restore from backup</string>
-    <string name="backup_restore_confirm_message">Are you sure you would like to restore your messages from this backup?</string>
-    <string name="backup_restore_stop_title">Stop restore</string>
-    <string name="backup_restore_stop_message">Messages that have already been restored will remain on your device</string>
-    <string name="backup_restore_dialog_title">Backups</string>
-    <string name="backup_restore_dialog_empty">No backups found</string>
-    <plurals name="backup_message_count">
-        <item quantity="one">%d message</item>
-        <item quantity="other">%d messages</item>
-    </plurals>
-    <string name="backup_disclaimer">Currently, only SMS is supported by Backup and Restore. MMS support and scheduled backups will be coming soon!</string>
-    <string name="backup_now">Backup now</string>
-    <string name="backup_progress_parsing">Parsing backup&#8230;</string>
-    <string name="backup_progress_running">%d/%d messages</string>
-    <string name="backup_progress_saving">Saving backup&#8230;</string>
-    <string name="backup_progress_syncing">Syncing messages&#8230;</string>
-    <string name="backup_progress_finished">Finished!</string>
-    <string name="backup_notification_channel_name">Backup and restore</string>
-    <string name="scheduled_title">Scheduled</string>
-    <string name="scheduled_empty_description">Automatically send a message, at the exact moment you\'d like</string>
-    <string name="scheduled_empty_message_1">Hey! When was your birthday again?</string>
-    <string name="scheduled_empty_message_2">It\'s on December 23rd</string>
-    <string name="scheduled_empty_message_3">Happy birthday! Look at what a great friend I am, remembering your birthday</string>
-    <!--&#x200A; is a special character required at the end of this string to fix it's formatting in the app -->
-    <string name="scheduled_empty_message_3_timestamp">Sending on December 23rd </string>
-    <string name="scheduled_compose_cd">Schedule a message</string>
-    <string name="scheduled_options_title">Scheduled message</string>
-    <string-array name="scheduled_options">
-        <item>Send now</item>
-        <item>Copy text</item>
-        <item>Delete</item>
-    </string-array>
-    <string name="settings_category_appearance">Appearance</string>
-    <string name="settings_category_general">General</string>
-    <string name="settings_category_qkreply">QK Reply</string>
-    <string name="settings_theme_title">Theme</string>
-    <string name="settings_night_title">Night mode</string>
-    <string name="settings_black_title">Pure black night mode</string>
-    <string name="settings_night_start_title">Start time</string>
-    <string name="settings_night_end_title">End time</string>
-    <string name="settings_automatic_colors_title">Automatic contact colors</string>
-    <string name="settings_text_size_title">Font size</string>
-    <string name="settings_system_font_title">Use system font</string>
-    <string name="settings_auto_emoji_title">Automatic emoji</string>
-    <string name="settings_notifications_title">Notifications</string>
-    <string name="settings_notifications_o_summary">Tap to customize</string>
-    <string name="settings_notification_actions_title">Actions</string>
-    <string name="settings_notification_action_1">Button 1</string>
-    <string name="settings_notification_action_2">Button 2</string>
-    <string name="settings_notification_action_3">Button 3</string>
-    <string name="settings_notification_previews_title">Notification previews</string>
-    <string name="settings_notification_wake_title">Wake screen</string>
-    <string name="settings_vibration_title">Vibration</string>
-    <string name="settings_ringtone_title">Sound</string>
-    <string name="settings_ringtone_none">None</string>
-    <string name="settings_qkreply_title">QK Reply</string>
-    <string name="settings_qkreply_summary">Popup for new messages</string>
-    <string name="settings_qkreply_tap_dismiss_title">Tap to dismiss</string>
-    <string name="settings_qkreply_tap_dismiss_summary">Tap outside of the popup to close it</string>
-    <string name="settings_delayed_title">Delayed sending</string>
-    <string name="settings_swipe_actions">Swipe actions</string>
-    <string name="settings_swipe_actions_summary">Configure swipe actions for conversations</string>
-    <string name="settings_swipe_actions_right">Right swipe</string>
-    <string name="settings_swipe_actions_left">Left swipe</string>
-    <string name="settings_swipe_actions_change">CHANGE</string>
-    <string-array name="settings_swipe_actions">
-        <item>None</item>
-        <item>Archive</item>
-        <item>Delete</item>
-        <item>Block</item>
-        <item>Call</item>
-        <item>Mark read</item>
-        <item>Mark unread</item>
-    </string-array>
-    <string name="settings_delivery_title">Delivery confirmations</string>
-    <string name="settings_delivery_summary">Confirm that messages were sent successfully</string>
-    <string name="settings_signature_title">Signature</string>
-    <string name="settings_signature_summary">Add a signature to the end of your messages</string>
-    <string name="settings_unicode_title">Strip accents</string>
-    <string name="settings_unicode_summary">Remove accents from characters in outgoing SMS messages</string>
-    <string name="settings_mobile_title">Mobile numbers only</string>
-    <string name="settings_mobile_summary">When composing a message, only show mobile numbers</string>
-    <string name="settings_auto_delete">Delete old messages automatically</string>
-    <string name="settings_auto_delete_dialog_message">Messages will be deleted after the specified number of days</string>
-    <string name="settings_auto_delete_dialog_hint">Number of days</string>
-    <string name="settings_auto_delete_never">Never</string>
-    <string name="settings_auto_delete_warning">Delete old messages automatically?</string>
-    <string name="settings_auto_delete_warning_message">If you proceed, %1$d messages will be deleted now</string>
-    <plurals name="settings_auto_delete_summary">
-        <item quantity="one">After 1 day</item>
-        <item quantity="other">After %d days</item>
-    </plurals>
-    <string name="settings_long_as_mms_title">Send long messages as MMS</string>
-    <string name="settings_long_as_mms_summary">If your longer text messages are failing to send, or sending in the wrong order, you can send them as MMS messages instead. Additional charges may apply</string>
-    <string name="settings_mms_size_title">Auto-compress MMS attachments</string>
-    <string name="settings_sync_title">Sync messages</string>
-    <string name="settings_sync_summary">Re-sync your messages with the native Android SMS database</string>
-    <string name="settings_about_title">About QKSMS</string>
-    <string name="settings_version">Version %s</string>
-    <string name="settings_logging_enabled">Debug logging enabled</string>
-    <string name="settings_logging_disabled">Debug logging disabled</string>
-    <string name="settings_delay_duration_hint">Enter duration (seconds)</string>
-    <string name="blocking_title">Blocking</string>
-    <string name="blocking_drop_title">Drop messages</string>
-    <string name="blocking_drop_summary">Drop incoming messages from blocked senders instead of hiding them</string>
-    <string name="blocking_conversations">Blocked conversations</string>
-    <string name="blocking_manager_title">Blocking Manager</string>
-    <string name="blocking_manager_qksms_title">QKSMS</string>
-    <string name="blocking_manager_qksms_summary">Built-in blocking functionality in QKSMS</string>
-    <string name="blocking_manager_call_control_summary">Automatically filter your calls and messages in one convenient place! Community IQ™ allows you to prevent unwanted messages from community known spammers</string>
-    <string name="blocking_manager_sia_summary">Automatically filter messages from unsolicited numbers by using the \"Should I Answer\" app</string>
-    <string name="blocking_manager_copy_title">Copy blocked numbers</string>
-    <string name="blocking_manager_copy_summary">Continue to %s and copy over your existing blocked numbers</string>
-    <string name="blocked_numbers_title">Blocked numbers</string>
-    <string name="blocked_numbers_empty">Your blocked numbers will appear here</string>
-    <string name="blocked_numbers_add_cd">Block a new number</string>
-    <string name="blocked_numbers_dialog_title">Block texts from</string>
-    <string name="blocked_numbers_dialog_hint">Phone number</string>
-    <string name="blocked_numbers_dialog_block">Block</string>
-    <string name="blocked_messages_title">Blocked messages</string>
-    <string name="blocked_messages_empty">Your blocked messages will appear here</string>
-    <string name="blocking_block_title">Block</string>
-    <string name="blocking_unblock_title">Unblock</string>
-    <plurals name="blocking_block_external">
-        <item quantity="one">Continue to %s and block this number</item>
-        <item quantity="other">Continue to %s and block these numbers</item>
-    </plurals>
-    <plurals name="blocking_unblock_external">
-        <item quantity="one">Continue to %s and allow this number</item>
-        <item quantity="other">Continue to %s and allow these numbers</item>
-    </plurals>
-    <string name="about_title">About</string>
-    <string name="about_version_title">Version</string>
-    <string name="about_developer_title">Developer</string>
-    <string name="about_source_title">Source code</string>
-    <string name="about_changelog_title">Changelog</string>
-    <string name="about_contact_title">Contact</string>
-    <string name="about_license_title">License</string>
-    <string name="about_copyright_title">Copyright</string>
-    <string name="qksms_plus_description_title">Support development, unlock everything</string>
-    <string name="qksms_plus_description_summary">You can save a starving developer for just %s</string>
-    <!-- Substitutions are for price and currency. Ex: Lifetime upgrade for $1.99 USD -->
-    <string name="qksms_plus_upgrade">Lifetime upgrade for %1$s %2$s</string>
-    <!-- Substitutions are for price and currency. Ex: Unlock + donate for $4.99 USD -->
-    <string name="qksms_plus_upgrade_donate">Unlock + donate for %1$s %2$s</string>
-    <string name="qksms_plus_thanks_title">Thank you for supporting QKSMS!</string>
-    <string name="qksms_plus_thanks_summary">You now have access to all QKSMS+ features</string>
-    <string name="qksms_plus_free_title">QKSMS+ is free for F-Droid users! If you\'d like to support development, a donation would be highly appreciated.</string>
-    <string name="qksms_plus_donate">Donate via PayPal</string>
-    <string name="qksms_plus_coming_soon">Coming soon</string>
-    <string name="qksms_plus_themes_title">Premium themes</string>
-    <string name="qksms_plus_themes_summary">Unlock beautiful theme colors not available on the Material Design palette</string>
-    <string name="qksms_plus_emoji_title">Custom auto-emoji</string>
-    <string name="qksms_plus_emoji_summary">Create custom auto-emoji shortcuts</string>
-    <string name="qksms_plus_backup_title">Message backup</string>
-    <string name="qksms_plus_backup_summary">Automatically back up your messages. Never again worry about losing your history if you change phones or your phone gets lost</string>
-    <string name="qksms_plus_scheduled_title">Scheduled messages</string>
-    <string name="qksms_plus_scheduled_summary">Schedule messages to automatically be sent at a specific time and date</string>
-    <string name="qksms_plus_delayed_title">Delayed sending</string>
-    <string name="qksms_plus_delayed_summary">Wait a few seconds before sending your message</string>
-    <string name="qksms_plus_night_title">Automatic night mode</string>
-    <string name="qksms_plus_night_summary">Enable night mode based on the time of day</string>
-    <string name="qksms_plus_blacklist_title">Advanced blocking</string>
-    <string name="qksms_plus_blacklist_summary">Block messages that contain keywords or match patterns</string>
-    <string name="qksms_plus_forward_title">Auto-forward</string>
-    <string name="qksms_plus_forward_summary">Automatically forward messages from certain senders</string>
-    <string name="qksms_plus_respond_title">Auto-respond</string>
-    <string name="qksms_plus_respond_summary">Automatically respond to incoming messages with a preset response</string>
-    <string name="qksms_plus_more_title">More</string>
-    <string name="qksms_plus_more_summary">QKSMS is under active development, and your purchase will include all future QKSMS+ features!</string>
-    <string name="widget_loading">Loading&#8230;</string>
-    <string name="widget_more">View more conversations</string>
-    <string name="qkreply_menu_read">Mark read</string>
-    <string name="qkreply_menu_call">Call</string>
-    <string name="qkreply_menu_delete">Delete</string>
-    <string name="qkreply_menu_expand">Show more</string>
-    <string name="qkreply_menu_collapse">Show less</string>
-    <string name="qkreply_menu_view">Open conversation</string>
-    <string name="theme_material">Material</string>
-    <string name="theme_hex">HEX</string>
-    <string name="theme_apply">Apply</string>
-    <string-array name="notification_actions">
-        <item>None</item>
-        <item>Archive</item>
-        <item>Delete</item>
-        <item>Block</item>
-        <item>Call</item>
-        <item>Mark read</item>
-        <item>Reply</item>
-    </string-array>
-    <string name="button_yes">Yes</string>
-    <string name="button_continue">Continue</string>
-    <string name="button_cancel">Cancel</string>
-    <string name="button_delete">Delete</string>
-    <string name="button_save">Save</string>
-    <string name="button_stop">Stop</string>
-    <string name="button_more">More</string>
-    <string name="button_set">Set</string>
-    <string name="button_undo">Undo</string>
-    <string name="toast_copied">Copied</string>
-    <string name="toast_archived">Archived conversation</string>
-    <string name="toast_qksms_plus">You must unlock QKSMS+ to use this</string>
-    <plurals name="notification_new_messages">
-        <item quantity="one">New message</item>
-        <item quantity="other">%s new messages</item>
-    </plurals>
-    <string name="notification_message_failed_title">Message not sent</string>
-    <string name="notification_message_failed_text">The message to %s failed to send</string>
-    <string-array name="night_modes">
-        <item>System</item>
-        <item>Disabled</item>
-        <item>Always on</item>
-        <item>Automatic</item>
-    </string-array>
-    <string-array name="notification_preview_options">
-        <item>Show name and message</item>
-        <item>Show name</item>
-        <item>Hide contents</item>
-    </string-array>
-    <string-array name="text_sizes">
-        <item>Small</item>
-        <item>Normal</item>
-        <item>Large</item>
-        <item>Larger</item>
-    </string-array>
-    <string-array name="delayed_sending_labels">
-        <item>No delay</item>
-        <item>3 seconds</item>
-        <item>5 seconds</item>
-        <item>10 seconds</item>
-    </string-array>
-    <string-array name="mms_sizes">
-        <item>Automatic</item>
-        <item>100KB</item>
-        <item>200KB</item>
-        <item>300KB</item>
-        <item>600KB</item>
-        <item>1000KB</item>
-        <item>2000KB</item>
-        <item>No compression</item>
-    </string-array>
-    <string-array name="qk_responses">
-        <item>Okay</item>
-        <item>Give me a moment</item>
-        <item>On my way</item>
-        <item>Thanks</item>
-        <item>Sounds good</item>
-        <item>What\'s up?</item>
-        <item>Agreed</item>
-        <item>No</item>
-        <item>Love you</item>
-        <item>Sorry</item>
-        <item>LOL</item>
-        <item>That\'s okay</item>
-    </string-array>
-</resources>
+<?xml version="1.0" encoding="utf-8"?>
+<!--
+  ~ Copyright (C) 2019 Moez Bhatti <moez.bhatti@gmail.com>
+  ~
+  ~ This file is part of QKSMS.
+  ~
+  ~ QKSMS is free software: you can redistribute it and/or modify
+  ~ it under the terms of the GNU General Public License as published by
+  ~ the Free Software Foundation, either version 3 of the License, or
+  ~ (at your option) any later version.
+  ~
+  ~ QKSMS is distributed in the hope that it will be useful,
+  ~ but WITHOUT ANY WARRANTY; without even the implied warranty of
+  ~ MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+  ~ GNU General Public License for more details.
+  ~
+  ~ You should have received a copy of the GNU General Public License
+  ~ along with QKSMS.  If not, see <http://www.gnu.org/licenses/>.
+  -->
+<resources>
+    <string name="shortcut_compose_long_label">Bagong usapan</string>
+    <string name="shortcut_compose_short_label">Sumulat</string>
+    <string name="shortcut_compose_disabled_message">Shortcut disabled</string>
+    <string name="title_archived">Nakatabi</string>
+    <string name="title_settings">Mga setting</string>
+    <string name="title_notification_prefs">Notifications</string>
+    <string name="title_theme">Theme</string>
+    <string name="title_conversations">Hanapin sa inbox&#8230;</string>
+    <string name="title_compose">Sumulat</string>
+    <string name="setup_skip">Laktawan</string>
+    <string name="setup_next">Magpatuloy</string>
+    <string name="menu_add_person">Add person</string>
+    <string name="menu_call">Tawagan</string>
+    <string name="menu_info">Mga detalye</string>
+    <string name="menu_save">Save to gallery</string>
+    <string name="menu_share">Share</string>
+    <string name="main_drawer_open_cd">Open navigation drawer</string>
+    <string name="main_title_selected">%d selected</string>
+    <string name="main_menu_clear">Clear</string>
+    <string name="main_menu_archive">Itabi</string>
+    <string name="main_menu_unarchive">Ilabas</string>
+    <string name="main_menu_delete">Burahin</string>
+    <string name="main_menu_add_contact">Add to contacts</string>
+    <string name="main_menu_pin">I-ipit sa itaas</string>
+    <string name="main_menu_unpin">Unpin</string>
+    <string name="main_menu_read">Mark read</string>
+    <string name="main_menu_unread">Mark unread</string>
+    <string name="main_menu_block">Block</string>
+    <string name="main_syncing">Syncing messages&#8230;</string>
+    <string name="main_sender_you">Ikaw: %s</string>
+    <string name="main_draft">Draft</string>
+    <string name="main_message_results_title">Resulta sa mga messages</string>
+    <string name="main_message_results">%d mga messages</string>
+    <string name="inbox_empty_text">Ang iyong mga pakikipag-usap ay makikita rito</string>
+    <string name="inbox_search_empty_text">Walang nakita</string>
+    <string name="archived_empty_text">Ang iyong mga isinantabing pakikipag-usap at makikita rito</string>
+    <string name="main_fab_cd">Magsimula ng bagong usapan</string>
+    <string name="main_default_sms_title">Love texting again</string>
+    <string name="main_default_sms_message">Gawin ang QKSMS bilang iyong default na SMS app</string>
+    <string name="main_default_sms_change">Baguhin</string>
+    <string name="main_permission_required">Kailangan ang iyong pahintulot</string>
+    <string name="main_permission_sms">Kailangan ng QKSMS ang iyong pahintulot para maipadala at makita ang mga mensahe</string>
+    <string name="main_permission_contacts">Kailangan ng QKSMS ang iyong pahintulot para makita ang iyong contacts</string>
+    <string name="main_permission_allow">Payagan</string>
+    <string name="drawer_inbox">Inbox</string>
+    <string name="drawer_archived">Nakatabi</string>
+    <string name="drawer_scheduled">Iskedyul</string>
+    <string name="drawer_blocking">Blocking</string>
+    <string name="drawer_more">Higit pa</string>
+    <string name="drawer_settings">Settings</string>
+    <string name="drawer_help">magbigay ng Feedback</string>
+    <string name="drawer_invite">Maganyaya ng mga kaibigan</string>
+    <string name="drawer_plus_banner_summary">I-unlock ang mga kamangha-manghang mga bagong features, at suportahan ang pag-unlad ng proyekto</string>
+    <string name="rate_title">Natutuwa sa QKSMS?</string>
+    <string name="rate_summary">Ibahagi ang pag-ibig at i-rate kami sa Google Play!</string>
+    <string name="rate_okay">OKAY!</string>
+    <string name="rate_dismiss">DISMISS</string>
+    <string name="dialog_delete_title">Tanggalin</string>
+    <plurals name="dialog_delete_message">
+        <item quantity="one">Sigurado ka bang gusto mong burahin ang pag-uusap na ito?</item>
+        <item quantity="other">Sigurado ka bang nais mong tanggalin ang pag-uusap na ito?</item>
+    </plurals>
+    <string-array name="message_options">
+        <item>Kopyahin ang text</item>
+        <item>Forward</item>
+        <item>Tanggalin</item>
+    </string-array>
+    <string name="compose_number_picker_title">Magpili ng phone number</string>
+    <string name="compose_number_picker_default">%s - Default</string>
+    <string name="compose_number_picker_once">Isang beses lang</string>
+    <string name="compose_number_picker_always">Palagi</string>
+    <string name="compose_title_selected">%d napili</string>
+    <string name="compose_subtitle_results">%1$d ng %2$d mga resulta</string>
+    <string name="compose_send_group_title">Magpadala bilang group message</string>
+    <string name="compose_send_group_summary">Ang mga tatanggap at tugon ay makikita ng lahat</string>
+    <string name="compose_messages_empty">Ito ang simula ng iyong pag-uusap. Magsabi ka ng maganda!</string>
+    <string name="compose_vcard_label">Contact card</string>
+    <string name="compose_scheduled_for">Naka-iskedyul para sa</string>
+    <string name="compose_scheduled_future">Ang napiling oras ay dapat na sa hinaharap!</string>
+    <string name="compose_scheduled_plus">Dapat mong i-unlock ang QKSMS + upang magamit ang naka-iskedyul na pagmemensahe</string>
+    <string name="compose_scheduled_toast">Added to scheduled messages</string>
+    <string name="compose_hint">Write a message&#8230;</string>
+    <string name="compose_menu_copy">Copy text</string>
+    <string name="compose_menu_forward">Forward</string>
+    <string name="compose_menu_delete">Delete</string>
+    <string name="compose_menu_previous">Previous</string>
+    <string name="compose_menu_next">Next</string>
+    <string name="compose_menu_clear">Clear</string>
+    <string name="compose_details_title">Message details</string>
+    <string name="compose_details_type">Type: %s</string>
+    <string name="compose_details_from">From: %s</string>
+    <string name="compose_details_to">To: %s</string>
+    <string name="compose_details_subject">Subject: %s</string>
+    <string name="compose_details_priority">Priority: %s</string>
+    <string name="compose_details_size">Size: %s</string>
+    <string name="compose_details_sent">Sent: %s</string>
+    <string name="compose_details_received">Received: %s</string>
+    <string name="compose_details_delivered">Delivered: %s</string>
+    <string name="compose_details_error_code">Error code: %d</string>
+    <string name="compose_attach_cd">Add an attachment</string>
+    <string name="compose_gallery_cd">Attach a photo</string>
+    <string name="compose_camera_cd">Take a photo</string>
+    <string name="compose_schedule_cd">Schedule message</string>
+    <string name="compose_contact_cd">Attach a contact</string>
+    <string name="compose_contact_error">Error reading contact</string>
+    <!-- Example: SIM 1 (Verizon) selected-->
+    <string name="compose_sim_changed_toast">SIM %1$d (%2$s) selected</string>
+    <string name="compose_sim_cd">%s selected, change SIM card</string>
+    <string name="compose_send_cd">Send message</string>
+    <string name="message_status_sending">Sending&#8230;</string>
+    <string name="message_status_delivered">Delivered %s</string>
+    <string name="message_status_failed">Failed to send. Tap to try again</string>
+    <string name="info_title">Details</string>
+    <string name="info_copied_address">Address copied</string>
+    <string name="info_name">Conversation title</string>
+    <string name="info_notifications">Notifications</string>
+    <string name="info_theme">Theme</string>
+    <string name="info_archive">Archive</string>
+    <string name="info_unarchive">Unarchive</string>
+    <string name="info_block">Block</string>
+    <string name="info_unblock">Unblock</string>
+    <string name="info_delete">Delete conversation</string>
+    <string name="gallery_error">Couldn\'t load media</string>
+    <string name="gallery_toast_saved">Saved to gallery</string>
+    <string name="backup_title">Backup and restore</string>
+    <string name="backup_backing_up">Backing up messages</string>
+    <string name="backup_restoring">Restoring from backup</string>
+    <string name="backup_last">Last backup</string>
+    <string name="backup_loading">Loading&#8230;</string>
+    <string name="backup_never">Never</string>
+    <string name="backup_restore_title">Restore</string>
+    <string name="backup_restore_summary">Select a backup</string>
+    <string name="backup_restore_error_plus">Please unlock QKSMS+ to use backup and restore</string>
+    <string name="backup_restore_error_backup">Backup in progress&#8230;</string>
+    <string name="backup_restore_error_restore">Restore in progress&#8230;</string>
+    <string name="backup_restore_confirm_title">Restore from backup</string>
+    <string name="backup_restore_confirm_message">Are you sure you would like to restore your messages from this backup?</string>
+    <string name="backup_restore_stop_title">Stop restore</string>
+    <string name="backup_restore_stop_message">Messages that have already been restored will remain on your device</string>
+    <string name="backup_restore_dialog_title">Backups</string>
+    <string name="backup_restore_dialog_empty">No backups found</string>
+    <plurals name="backup_message_count">
+        <item quantity="one">%d message</item>
+        <item quantity="other">%d messages</item>
+    </plurals>
+    <string name="backup_disclaimer">Currently, only SMS is supported by Backup and Restore. MMS support and scheduled backups will be coming soon!</string>
+    <string name="backup_now">Backup now</string>
+    <string name="backup_progress_parsing">Parsing backup&#8230;</string>
+    <string name="backup_progress_running">%d/%d messages</string>
+    <string name="backup_progress_saving">Saving backup&#8230;</string>
+    <string name="backup_progress_syncing">Syncing messages&#8230;</string>
+    <string name="backup_progress_finished">Finished!</string>
+    <string name="backup_notification_channel_name">Backup and restore</string>
+    <string name="scheduled_title">Scheduled</string>
+    <string name="scheduled_empty_description">Automatically send a message, at the exact moment you\'d like</string>
+    <string name="scheduled_empty_message_1">Hey! When was your birthday again?</string>
+    <string name="scheduled_empty_message_2">It\'s on December 23rd</string>
+    <string name="scheduled_empty_message_3">Happy birthday! Look at what a great friend I am, remembering your birthday</string>
+    <!--&#x200A; is a special character required at the end of this string to fix it's formatting in the app -->
+    <string name="scheduled_empty_message_3_timestamp">Sending on December 23rd </string>
+    <string name="scheduled_compose_cd">Schedule a message</string>
+    <string name="scheduled_options_title">Scheduled message</string>
+    <string-array name="scheduled_options">
+        <item>Send now</item>
+        <item>Copy text</item>
+        <item>Delete</item>
+    </string-array>
+    <string name="settings_category_appearance">Appearance</string>
+    <string name="settings_category_general">General</string>
+    <string name="settings_category_qkreply">QK Reply</string>
+    <string name="settings_theme_title">Theme</string>
+    <string name="settings_night_title">Night mode</string>
+    <string name="settings_black_title">Pure black night mode</string>
+    <string name="settings_night_start_title">Start time</string>
+    <string name="settings_night_end_title">End time</string>
+    <string name="settings_automatic_colors_title">Automatic contact colors</string>
+    <string name="settings_text_size_title">Font size</string>
+    <string name="settings_system_font_title">Use system font</string>
+    <string name="settings_auto_emoji_title">Automatic emoji</string>
+    <string name="settings_notifications_title">Notifications</string>
+    <string name="settings_notifications_o_summary">Tap to customize</string>
+    <string name="settings_notification_actions_title">Actions</string>
+    <string name="settings_notification_action_1">Button 1</string>
+    <string name="settings_notification_action_2">Button 2</string>
+    <string name="settings_notification_action_3">Button 3</string>
+    <string name="settings_notification_previews_title">Notification previews</string>
+    <string name="settings_notification_wake_title">Wake screen</string>
+    <string name="settings_vibration_title">Vibration</string>
+    <string name="settings_ringtone_title">Sound</string>
+    <string name="settings_ringtone_none">None</string>
+    <string name="settings_qkreply_title">QK Reply</string>
+    <string name="settings_qkreply_summary">Popup for new messages</string>
+    <string name="settings_qkreply_tap_dismiss_title">Tap to dismiss</string>
+    <string name="settings_qkreply_tap_dismiss_summary">Tap outside of the popup to close it</string>
+    <string name="settings_delayed_title">Delayed sending</string>
+    <string name="settings_swipe_actions">Swipe actions</string>
+    <string name="settings_swipe_actions_summary">Configure swipe actions for conversations</string>
+    <string name="settings_swipe_actions_right">Right swipe</string>
+    <string name="settings_swipe_actions_left">Left swipe</string>
+    <string name="settings_swipe_actions_change">CHANGE</string>
+    <string-array name="settings_swipe_actions">
+        <item>None</item>
+        <item>Archive</item>
+        <item>Delete</item>
+        <item>Block</item>
+        <item>Call</item>
+        <item>Mark read</item>
+        <item>Mark unread</item>
+    </string-array>
+    <string name="settings_delivery_title">Delivery confirmations</string>
+    <string name="settings_delivery_summary">Confirm that messages were sent successfully</string>
+    <string name="settings_signature_title">Signature</string>
+    <string name="settings_signature_summary">Add a signature to the end of your messages</string>
+    <string name="settings_unicode_title">Strip accents</string>
+    <string name="settings_unicode_summary">Remove accents from characters in outgoing SMS messages</string>
+    <string name="settings_mobile_title">Mobile numbers only</string>
+    <string name="settings_mobile_summary">When composing a message, only show mobile numbers</string>
+    <string name="settings_auto_delete">Delete old messages automatically</string>
+    <string name="settings_auto_delete_dialog_message">Messages will be deleted after the specified number of days</string>
+    <string name="settings_auto_delete_dialog_hint">Number of days</string>
+    <string name="settings_auto_delete_never">Never</string>
+    <string name="settings_auto_delete_warning">Delete old messages automatically?</string>
+    <string name="settings_auto_delete_warning_message">If you proceed, %1$d messages will be deleted now</string>
+    <plurals name="settings_auto_delete_summary">
+        <item quantity="one">After 1 day</item>
+        <item quantity="other">After %d days</item>
+    </plurals>
+    <string name="settings_long_as_mms_title">Send long messages as MMS</string>
+    <string name="settings_long_as_mms_summary">If your longer text messages are failing to send, or sending in the wrong order, you can send them as MMS messages instead. Additional charges may apply</string>
+    <string name="settings_mms_size_title">Auto-compress MMS attachments</string>
+    <string name="settings_sync_title">Sync messages</string>
+    <string name="settings_sync_summary">Re-sync your messages with the native Android SMS database</string>
+    <string name="settings_about_title">About QKSMS</string>
+    <string name="settings_version">Version %s</string>
+    <string name="settings_logging_enabled">Debug logging enabled</string>
+    <string name="settings_logging_disabled">Debug logging disabled</string>
+    <string name="settings_delay_duration_hint">Enter duration (seconds)</string>
+    <string name="blocking_title">Blocking</string>
+    <string name="blocking_drop_title">Drop messages</string>
+    <string name="blocking_drop_summary">Drop incoming messages from blocked senders instead of hiding them</string>
+    <string name="blocking_conversations">Blocked conversations</string>
+    <string name="blocking_manager_title">Blocking Manager</string>
+    <string name="blocking_manager_qksms_title">QKSMS</string>
+    <string name="blocking_manager_qksms_summary">Built-in blocking functionality in QKSMS</string>
+    <string name="blocking_manager_call_control_summary">Automatically filter your calls and messages in one convenient place! Community IQ™ allows you to prevent unwanted messages from community known spammers</string>
+    <string name="blocking_manager_sia_summary">Automatically filter messages from unsolicited numbers by using the \"Should I Answer\" app</string>
+    <string name="blocking_manager_copy_title">Copy blocked numbers</string>
+    <string name="blocking_manager_copy_summary">Continue to %s and copy over your existing blocked numbers</string>
+    <string name="blocked_numbers_title">Blocked numbers</string>
+    <string name="blocked_numbers_empty">Your blocked numbers will appear here</string>
+    <string name="blocked_numbers_add_cd">Block a new number</string>
+    <string name="blocked_numbers_dialog_title">Block texts from</string>
+    <string name="blocked_numbers_dialog_hint">Phone number</string>
+    <string name="blocked_numbers_dialog_block">Block</string>
+    <string name="blocked_messages_title">Blocked messages</string>
+    <string name="blocked_messages_empty">Your blocked messages will appear here</string>
+    <string name="blocking_block_title">Block</string>
+    <string name="blocking_unblock_title">Unblock</string>
+    <plurals name="blocking_block_external">
+        <item quantity="one">Continue to %s and block this number</item>
+        <item quantity="other">Continue to %s and block these numbers</item>
+    </plurals>
+    <plurals name="blocking_unblock_external">
+        <item quantity="one">Continue to %s and allow this number</item>
+        <item quantity="other">Continue to %s and allow these numbers</item>
+    </plurals>
+    <string name="about_title">About</string>
+    <string name="about_version_title">Version</string>
+    <string name="about_developer_title">Developer</string>
+    <string name="about_source_title">Source code</string>
+    <string name="about_changelog_title">Changelog</string>
+    <string name="about_contact_title">Contact</string>
+    <string name="about_license_title">License</string>
+    <string name="about_copyright_title">Copyright</string>
+    <string name="qksms_plus_description_title">Support development, unlock everything</string>
+    <string name="qksms_plus_description_summary">You can save a starving developer for just %s</string>
+    <!-- Substitutions are for price and currency. Ex: Lifetime upgrade for $1.99 USD -->
+    <string name="qksms_plus_upgrade">Lifetime upgrade for %1$s %2$s</string>
+    <!-- Substitutions are for price and currency. Ex: Unlock + donate for $4.99 USD -->
+    <string name="qksms_plus_upgrade_donate">Unlock + donate for %1$s %2$s</string>
+    <string name="qksms_plus_thanks_title">Thank you for supporting QKSMS!</string>
+    <string name="qksms_plus_thanks_summary">You now have access to all QKSMS+ features</string>
+    <string name="qksms_plus_free_title">QKSMS+ is free for F-Droid users! If you\'d like to support development, a donation would be highly appreciated.</string>
+    <string name="qksms_plus_donate">Donate via PayPal</string>
+    <string name="qksms_plus_coming_soon">Coming soon</string>
+    <string name="qksms_plus_themes_title">Premium themes</string>
+    <string name="qksms_plus_themes_summary">Unlock beautiful theme colors not available on the Material Design palette</string>
+    <string name="qksms_plus_emoji_title">Custom auto-emoji</string>
+    <string name="qksms_plus_emoji_summary">Create custom auto-emoji shortcuts</string>
+    <string name="qksms_plus_backup_title">Message backup</string>
+    <string name="qksms_plus_backup_summary">Automatically back up your messages. Never again worry about losing your history if you change phones or your phone gets lost</string>
+    <string name="qksms_plus_scheduled_title">Scheduled messages</string>
+    <string name="qksms_plus_scheduled_summary">Schedule messages to automatically be sent at a specific time and date</string>
+    <string name="qksms_plus_delayed_title">Delayed sending</string>
+    <string name="qksms_plus_delayed_summary">Wait a few seconds before sending your message</string>
+    <string name="qksms_plus_night_title">Automatic night mode</string>
+    <string name="qksms_plus_night_summary">Enable night mode based on the time of day</string>
+    <string name="qksms_plus_blacklist_title">Advanced blocking</string>
+    <string name="qksms_plus_blacklist_summary">Block messages that contain keywords or match patterns</string>
+    <string name="qksms_plus_forward_title">Auto-forward</string>
+    <string name="qksms_plus_forward_summary">Automatically forward messages from certain senders</string>
+    <string name="qksms_plus_respond_title">Auto-respond</string>
+    <string name="qksms_plus_respond_summary">Automatically respond to incoming messages with a preset response</string>
+    <string name="qksms_plus_more_title">More</string>
+    <string name="qksms_plus_more_summary">QKSMS is under active development, and your purchase will include all future QKSMS+ features!</string>
+    <string name="widget_loading">Loading&#8230;</string>
+    <string name="widget_more">View more conversations</string>
+    <string name="qkreply_menu_read">Mark read</string>
+    <string name="qkreply_menu_call">Call</string>
+    <string name="qkreply_menu_delete">Delete</string>
+    <string name="qkreply_menu_expand">Show more</string>
+    <string name="qkreply_menu_collapse">Show less</string>
+    <string name="qkreply_menu_view">Open conversation</string>
+    <string name="theme_material">Material</string>
+    <string name="theme_hex">HEX</string>
+    <string name="theme_apply">Apply</string>
+    <string-array name="notification_actions">
+        <item>None</item>
+        <item>Archive</item>
+        <item>Delete</item>
+        <item>Block</item>
+        <item>Call</item>
+        <item>Mark read</item>
+        <item>Reply</item>
+    </string-array>
+    <string name="button_yes">Yes</string>
+    <string name="button_continue">Continue</string>
+    <string name="button_cancel">Cancel</string>
+    <string name="button_delete">Delete</string>
+    <string name="button_save">Save</string>
+    <string name="button_stop">Stop</string>
+    <string name="button_more">More</string>
+    <string name="button_set">Set</string>
+    <string name="button_undo">Undo</string>
+    <string name="toast_copied">Copied</string>
+    <string name="toast_archived">Archived conversation</string>
+    <string name="toast_qksms_plus">You must unlock QKSMS+ to use this</string>
+    <plurals name="notification_new_messages">
+        <item quantity="one">New message</item>
+        <item quantity="other">%s new messages</item>
+    </plurals>
+    <string name="notification_message_failed_title">Message not sent</string>
+    <string name="notification_message_failed_text">The message to %s failed to send</string>
+    <string-array name="night_modes">
+        <item>System</item>
+        <item>Disabled</item>
+        <item>Always on</item>
+        <item>Automatic</item>
+    </string-array>
+    <string-array name="notification_preview_options">
+        <item>Show name and message</item>
+        <item>Show name</item>
+        <item>Hide contents</item>
+    </string-array>
+    <string-array name="text_sizes">
+        <item>Small</item>
+        <item>Normal</item>
+        <item>Large</item>
+        <item>Larger</item>
+    </string-array>
+    <string-array name="delayed_sending_labels">
+        <item>No delay</item>
+        <item>3 seconds</item>
+        <item>5 seconds</item>
+        <item>10 seconds</item>
+    </string-array>
+    <string-array name="mms_sizes">
+        <item>Automatic</item>
+        <item>100KB</item>
+        <item>200KB</item>
+        <item>300KB</item>
+        <item>600KB</item>
+        <item>1000KB</item>
+        <item>2000KB</item>
+        <item>No compression</item>
+    </string-array>
+    <string-array name="qk_responses">
+        <item>Okay</item>
+        <item>Give me a moment</item>
+        <item>On my way</item>
+        <item>Thanks</item>
+        <item>Sounds good</item>
+        <item>What\'s up?</item>
+        <item>Agreed</item>
+        <item>No</item>
+        <item>Love you</item>
+        <item>Sorry</item>
+        <item>LOL</item>
+        <item>That\'s okay</item>
+    </string-array>
+</resources>
diff --git a/presentation/src/main/res/values-tr/strings.xml b/presentation/src/main/res/values-tr/strings.xml
index e1a4e017b..e156a4e70 100644
--- a/presentation/src/main/res/values-tr/strings.xml
+++ b/presentation/src/main/res/values-tr/strings.xml
@@ -1,413 +1,413 @@
-<?xml version="1.0" encoding="utf-8"?>
-<!--
-  ~ Copyright (C) 2019 Moez Bhatti <moez.bhatti@gmail.com>
-  ~
-  ~ This file is part of QKSMS.
-  ~
-  ~ QKSMS is free software: you can redistribute it and/or modify
-  ~ it under the terms of the GNU General Public License as published by
-  ~ the Free Software Foundation, either version 3 of the License, or
-  ~ (at your option) any later version.
-  ~
-  ~ QKSMS is distributed in the hope that it will be useful,
-  ~ but WITHOUT ANY WARRANTY; without even the implied warranty of
-  ~ MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
-  ~ GNU General Public License for more details.
-  ~
-  ~ You should have received a copy of the GNU General Public License
-  ~ along with QKSMS.  If not, see <http://www.gnu.org/licenses/>.
-  -->
-<resources>
-    <string name="shortcut_compose_long_label">Yeni konuşma</string>
-    <string name="shortcut_compose_short_label">Oluştur</string>
-    <string name="shortcut_compose_disabled_message">Kısayol devre dışı</string>
-    <string name="title_archived">Arşivlenmiş</string>
-    <string name="title_settings">Ayarlar</string>
-    <string name="title_notification_prefs">Bildirimler</string>
-    <string name="title_theme">Tema</string>
-    <string name="title_conversations">Gelen mesajlarda ara...</string>
-    <string name="title_compose">Bir isme veya numaraya yazın</string>
-    <string name="setup_skip">Atla</string>
-    <string name="setup_next">Devam</string>
-    <string name="menu_add_person">Kişi ekle</string>
-    <string name="menu_call">Ara</string>
-    <string name="menu_info">Ayrıntılar</string>
-    <string name="menu_save">Galeriye Kaydet</string>
-    <string name="menu_share">Paylaş</string>
-    <string name="main_drawer_open_cd">Gezinti çubuğunu aç</string>
-    <string name="main_title_selected">%d Seçili</string>
-    <string name="main_menu_clear">Temizle</string>
-    <string name="main_menu_archive">Arşiv</string>
-    <string name="main_menu_unarchive">Arşivden çıkar</string>
-    <string name="main_menu_delete">Sil</string>
-    <string name="main_menu_add_contact">Kişilere ekle</string>
-    <string name="main_menu_pin">Sabitle</string>
-    <string name="main_menu_unpin">Sabitlemeyi kaldır</string>
-    <string name="main_menu_read">Okundu olarak işaretle</string>
-    <string name="main_menu_unread">Okunmadı olarak işaretle</string>
-    <string name="main_menu_block">Engelle</string>
-    <string name="main_syncing">İletiler eşitleniyor.. </string>
-    <string name="main_sender_you">Sen: %s</string>
-    <string name="main_draft">Taslak</string>
-    <string name="main_message_results_title">Mesajlardaki sonuçlar</string>
-    <string name="main_message_results">%d mesaj</string>
-    <string name="inbox_empty_text">Konuşmalarınız burada görünür</string>
-    <string name="inbox_search_empty_text"> Sonuç Yok</string>
-    <string name="archived_empty_text">Arşivlenmiş konuşmalarınız burada görünür</string>
-    <string name="main_fab_cd">Yeni konuşma başlat</string>
-    <string name="main_default_sms_title">Yine mesajlaşmayı seviyorum</string>
-    <string name="main_default_sms_message">QKSMS varsayılan SMS uygulaması yap</string>
-    <string name="main_default_sms_change">Değiştir</string>
-    <string name="main_permission_required">İzin gerekli</string>
-    <string name="main_permission_sms">QKSMS göndermek ve SMS mesajları görüntülemek için izni olması gerekir.</string>
-    <string name="main_permission_contacts">QKSMS kişilerinizi görüntülemek için izni olması gerekir.</string>
-    <string name="main_permission_allow">İzin ver</string>
-    <string name="drawer_inbox">Gelen Kutusu</string>
-    <string name="drawer_archived">Arşivle</string>
-    <string name="drawer_scheduled">Zamanlanmış</string>
-    <string name="drawer_blocking">Engellenmiş</string>
-    <string name="drawer_more">Daha fazla</string>
-    <string name="drawer_settings">Ayarlar</string>
-    <string name="drawer_help">Yardım &amp; Geri bildirim</string>
-    <string name="drawer_invite">Arkadaşlarınızı davet edin</string>
-    <string name="drawer_plus_banner_summary">İnanılmaz yeni özelliklerin kilidini aç ve geliştirmeye destek ol</string>
-    <string name="rate_title">QKSMS tadını çıkarıyor musun?</string>
-    <string name="rate_summary">Biraz sevgi paylaş ve Google Playden bizi oyla!</string>
-    <string name="rate_okay">TAMAM!</string>
-    <string name="rate_dismiss">GÖREVDEN</string>
-    <string name="dialog_delete_title">Sil</string>
-    <plurals name="dialog_delete_message">
-        <item quantity="one">Sohbeti silmek istediğinizden emin misiniz?</item>
-        <item quantity="other">%d konuşmayı silmek istediğinizden emin misiniz?</item>
-    </plurals>
-    <string-array name="message_options">
-        <item>Metni kopyala</item>
-        <item>Yönlendir</item>
-        <item>Sil</item>
-    </string-array>
-    <string name="compose_number_picker_title">Bir telefon numarası seçin</string>
-    <string name="compose_number_picker_default">%s ∙ Varsayılan</string>
-    <string name="compose_number_picker_once">Sadece bir kez</string>
-    <string name="compose_number_picker_always">Her zaman</string>
-    <string name="compose_title_selected">%d Seçili</string>
-    <string name="compose_subtitle_results">%1$d / %2$d sonuçlar</string>
-    <string name="compose_send_group_title">Grup mesajı gönder</string>
-    <string name="compose_send_group_summary">Alıcılar ve yanıtlar herkese görünür olacak</string>
-    <string name="compose_messages_empty">Senin konuşma başlıyor. Güzel bir şey söyle!</string>
-    <string name="compose_vcard_label">Kişi Kartı</string>
-    <string name="compose_scheduled_for">Planlanan</string>
-    <string name="compose_scheduled_future">Seçilen zaman gelecekte olmalı!</string>
-    <string name="compose_scheduled_plus">Zamanlanmış mesajlaşma kullanmak için QKSMS+ kilidini kaldırmak gerekir</string>
-    <string name="compose_scheduled_toast">Zamanlanmış iletilere eklendi</string>
-    <string name="compose_hint">Mesaj Yaz...</string>
-    <string name="compose_menu_copy">Metni kopyala</string>
-    <string name="compose_menu_forward">Yönlendir</string>
-    <string name="compose_menu_delete">Sil</string>
-    <string name="compose_menu_previous">Önceki</string>
-    <string name="compose_menu_next">Sonraki</string>
-    <string name="compose_menu_clear">Temizle</string>
-    <string name="compose_details_title">Mesaj ayrıntıları</string>
-    <string name="compose_details_type">Tip: %s</string>
-    <string name="compose_details_from">Gönderen: %s</string>
-    <string name="compose_details_to">Alıcı: %s</string>
-    <string name="compose_details_subject">Konu: %s</string>
-    <string name="compose_details_priority">Öncelik: %s</string>
-    <string name="compose_details_size">Boyut: %s</string>
-    <string name="compose_details_sent">Gönderilme: %s</string>
-    <string name="compose_details_received">Alınan: %s</string>
-    <string name="compose_details_delivered">Teslim Edildi: %s</string>
-    <string name="compose_details_error_code">Hata kodu: %d</string>
-    <string name="compose_attach_cd">Dosya Ekle</string>
-    <string name="compose_gallery_cd">Bir fotoğraf eklemek</string>
-    <string name="compose_camera_cd">Fotoğraf Çek</string>
-    <string name="compose_schedule_cd">Mesajı zamanlama</string>
-    <string name="compose_contact_cd">Bir kişi ekle</string>
-    <string name="compose_contact_error">Kişi okunurken hata oluştu</string>
-    <!-- Example: SIM 1 (Verizon) selected-->
-    <string name="compose_sim_changed_toast">SIM %1$d (%2$s) seçili</string>
-    <string name="compose_sim_cd">Seçili, %s SIM kartı değiştirin</string>
-    <string name="compose_send_cd">Mesaj gönder</string>
-    <string name="message_status_sending">Gönderiliyor...</string>
-    <string name="message_status_delivered">Teslim Edildi %s</string>
-    <string name="message_status_failed">Gönderilemedi. Yeniden denemek için dokunun</string>
-    <string name="info_title">Ayrıntılar</string>
-    <string name="info_copied_address">Adres kopyalandı</string>
-    <string name="info_name">Konuşma başlığı</string>
-    <string name="info_notifications">Bildirimler</string>
-    <string name="info_theme">Tema</string>
-    <string name="info_archive">Arşivle</string>
-    <string name="info_unarchive">Arşivden çıkar</string>
-    <string name="info_block">Engelle</string>
-    <string name="info_unblock">Engeli kaldır</string>
-    <string name="info_delete">Yazışmayı sil</string>
-    <string name="gallery_error">Medya yüklenemedi</string>
-    <string name="gallery_toast_saved">Galeriye kaydedildi</string>
-    <string name="backup_title">Yedekleme ve geri yükleme</string>
-    <string name="backup_backing_up">Mesajları yedekleme</string>
-    <string name="backup_restoring">Yedekten geri yükleme</string>
-    <string name="backup_last">Son yedekleme</string>
-    <string name="backup_loading">Yükleniyor...</string>
-    <string name="backup_never">Asla</string>
-    <string name="backup_restore_title">Geri yükle</string>
-    <string name="backup_restore_summary">Bir yedekleme\'yi seçin</string>
-    <string name="backup_restore_error_plus">Lütfen yedeklemeyi ve geri yüklemeyi kullanmak için QKSMS+\'ı açınız.</string>
-    <string name="backup_restore_error_backup">Yedekleme devam ediyor...</string>
-    <string name="backup_restore_error_restore">Geri yükleme devam ediyor...</string>
-    <string name="backup_restore_confirm_title">Yedeklemeyi geri yükle</string>
-    <string name="backup_restore_confirm_message">Mesajlarınızı bu yedekten geri yüklemek istediğinizden emin misiniz?</string>
-    <string name="backup_restore_stop_title">Geri yüklemeyi durdur</string>
-    <string name="backup_restore_stop_message">Zaten geri yüklenen mesajlar cihazınızda kalacaktır</string>
-    <string name="backup_restore_dialog_title">Yedekler</string>
-    <string name="backup_restore_dialog_empty">Yedekleme bulunamadı</string>
-    <plurals name="backup_message_count">
-        <item quantity="one">%d mesaj</item>
-        <item quantity="other">%d mesajlar</item>
-    </plurals>
-    <string name="backup_disclaimer">Şu anda, sadece SMS yedekleme ve geri yükleme desteklenmektedir. MMS desteği ve zamanlanmış mesaj yedeklemeleri çok yakında !</string>
-    <string name="backup_now">Şimdi yedekle</string>
-    <string name="backup_progress_parsing">Yedekleme ayrılıyor&#8230;</string>
-    <string name="backup_progress_running">%d%d mesajlar</string>
-    <string name="backup_progress_saving">Yedekleme kaydediliyor...</string>
-    <string name="backup_progress_syncing">Mesajlar senkronize ediliyor...</string>
-    <string name="backup_progress_finished">Tamamlandı!</string>
-    <string name="backup_notification_channel_name">Yedekleme ve geri yükleme</string>
-    <string name="scheduled_title">Zamanlanmış</string>
-    <string name="scheduled_empty_description">Otomatik olarak istediğiniz zamanda, bir mesaj göndermek</string>
-    <string name="scheduled_empty_message_1">Hey! Doğum günün ne zamandı?</string>
-    <string name="scheduled_empty_message_2">23 Aralık\'ta</string>
-    <string name="scheduled_empty_message_3">Doğum günün kutlu olsun! Doğum gününü hatırladığım harika arkadaşım</string>
-    <!--&#x200A; is a special character required at the end of this string to fix it's formatting in the app -->
-    <string name="scheduled_empty_message_3_timestamp">23  Aralık\'ta gönder</string>
-    <string name="scheduled_compose_cd">Bir mesaj zamanla</string>
-    <string name="scheduled_options_title">Zamanlanmış mesaj</string>
-    <string-array name="scheduled_options">
-        <item>Şimdi gönder</item>
-        <item>Metni kopyala</item>
-        <item>Sil</item>
-    </string-array>
-    <string name="settings_category_appearance">Görünüm</string>
-    <string name="settings_category_general">Genel</string>
-    <string name="settings_category_qkreply">QK Yanıt</string>
-    <string name="settings_theme_title">Tema</string>
-    <string name="settings_night_title">Gece Modu</string>
-    <string name="settings_black_title">Saf siyah gece modu</string>
-    <string name="settings_night_start_title">Başlama zamanı</string>
-    <string name="settings_night_end_title">Bitiş Zamanı</string>
-    <string name="settings_automatic_colors_title">Otomatik kişi renkleri</string>
-    <string name="settings_text_size_title">Yazı tipi boyutu</string>
-    <string name="settings_system_font_title">Sistem yazı tipini kullan</string>
-    <string name="settings_auto_emoji_title">Otomatik emoji</string>
-    <string name="settings_notifications_title">Bildirimler</string>
-    <string name="settings_notifications_o_summary">Özelleştirmek için dokunun</string>
-    <string name="settings_notification_actions_title">Eylemler</string>
-    <string name="settings_notification_action_1">Buton 1</string>
-    <string name="settings_notification_action_2">Buton 2</string>
-    <string name="settings_notification_action_3">Buton 3</string>
-    <string name="settings_notification_previews_title">Bildirim ön izleme</string>
-    <string name="settings_notification_wake_title">Uyandırma ekranı</string>
-    <string name="settings_vibration_title">Titreşim</string>
-    <string name="settings_ringtone_title">Ses</string>
-    <string name="settings_ringtone_none">Hiçbiri</string>
-    <string name="settings_qkreply_title">QK Yanıt</string>
-    <string name="settings_qkreply_summary">Yeni iletiler için açılan menü</string>
-    <string name="settings_qkreply_tap_dismiss_title">Kapatmak için dokunun</string>
-    <string name="settings_qkreply_tap_dismiss_summary">Açılır pencereyi kapatmak için pencere dışındaki herhangi bir yere dokunun</string>
-    <string name="settings_delayed_title">Gecikmeli gönderme</string>
-    <string name="settings_swipe_actions">Kaydırma eylemleri</string>
-    <string name="settings_swipe_actions_summary">Konuşmalar için kaydırma eylemlerini yapılandırma</string>
-    <string name="settings_swipe_actions_right">Sağa kaydır</string>
-    <string name="settings_swipe_actions_left">Sola Kaydır</string>
-    <string name="settings_swipe_actions_change">DEĞİŞTİR</string>
-    <string-array name="settings_swipe_actions">
-        <item>Hiçbiri</item>
-        <item>Arşivle</item>
-        <item>Sil</item>
-        <item>Engelle</item>
-        <item>Ara</item>
-        <item>Okundu olarak işaretle</item>
-        <item>Okunmadı olarak işaretle</item>
-    </string-array>
-    <string name="settings_delivery_title">İletim raporları</string>
-    <string name="settings_delivery_summary">Mesajınızın sorunsuz gönderildiğinin onayını alın</string>
-    <string name="settings_signature_title">İmza</string>
-    <string name="settings_signature_summary">Mesajlarınızın sonuna bir imza ekleyin</string>
-    <string name="settings_unicode_title">Şeritli aksanlar</string>
-    <string name="settings_unicode_summary">Giden SMS mesajlarından aksanlı karakterleri kaldırın</string>
-    <string name="settings_mobile_title">Sadece cep telefonu numaraları</string>
-    <string name="settings_mobile_summary">Bir mesaj oluştururken, yalnızca cep telefonu numaralarını göster</string>
-    <string name="settings_auto_delete">Eski mesajları otomatik olarak sil</string>
-    <string name="settings_auto_delete_dialog_message">Belirtilen sayıda gün geçtikten sonra mesajlar silinecek</string>
-    <string name="settings_auto_delete_dialog_hint">Gün sayısı</string>
-    <string name="settings_auto_delete_never">Asla</string>
-    <string name="settings_auto_delete_warning">Eski mesajlar otomatik olarak silinsin mi?</string>
-    <string name="settings_auto_delete_warning_message">Devam ederseniz, %1$d mesaj şimdi silinecek</string>
-    <plurals name="settings_auto_delete_summary">
-        <item quantity="one">1 gün sonra</item>
-        <item quantity="other">%d gün sonra</item>
-    </plurals>
-    <string name="settings_long_as_mms_title">Uzun mesajları MMS olarak gönder</string>
-    <string name="settings_long_as_mms_summary">Uzun metin mesajlarınız gönderilemiyorsa veya yanlış sırada gönderiliyorsa, onları MMS mesajları olarak gönderebilirsiniz. Ek ücretler uygulanabilir</string>
-    <string name="settings_mms_size_title">Otomatik-MMS ekleri sıkıştır</string>
-    <string name="settings_sync_title"> İletileri eşitle</string>
-    <string name="settings_sync_summary">İletilerinizi  Android SMS veritabanı ile yeniden senkronize edin</string>
-    <string name="settings_about_title">QKSMS Hakkında</string>
-    <string name="settings_version">Sürüm %s</string>
-    <string name="settings_logging_enabled">Hata ayıklama günlüğü etkin</string>
-    <string name="settings_logging_disabled">Hata ayıklama günlüğü devre dışı</string>
-    <string name="settings_delay_duration_hint">Süre (saniye olarak) girin</string>
-    <string name="blocking_title">Engelleyici</string>
-    <string name="blocking_drop_title">Mesajları bırak</string>
-    <string name="blocking_drop_summary">Engellenen gönderenlerden gelen mesajları gizlemek yerine bırakın</string>
-    <string name="blocking_conversations">Engellenen konuşmalar</string>
-    <string name="blocking_manager_title">Engelleme Yöneticisi</string>
-    <string name="blocking_manager_qksms_title">QKSMS</string>
-    <string name="blocking_manager_qksms_summary">QKSMS\'de yerleşik engelleme işlevi</string>
-    <string name="blocking_manager_call_control_summary">Aramalarınızı ve mesajlarınızı uygun bir yerde otomatik olarak filtreleyin! Topluluk IQ™ bilinen spam istenmeyen mesajları önlemek için izin verir
-
-BAĞLAM İSTEĞİ</string>
-    <string name="blocking_manager_sia_summary">İstenmeyen numaralardan gelen iletileri otomatik olarak filtre</string>
-    <string name="blocking_manager_copy_title">Engellenen numaraları kopyala</string>
-    <string name="blocking_manager_copy_summary">Mevcut engellenen numaralarınızın üzerine %s kopyalamaya devam edin</string>
-    <string name="blocked_numbers_title">Engellenen numaralar</string>
-    <string name="blocked_numbers_empty">Engellenen numaralarınız burada görünecektir</string>
-    <string name="blocked_numbers_add_cd">Yeni bir numarayı engelle</string>
-    <string name="blocked_numbers_dialog_title">Gelen metinleri engelle</string>
-    <string name="blocked_numbers_dialog_hint">Telefon numarası</string>
-    <string name="blocked_numbers_dialog_block">Engelle</string>
-    <string name="blocked_messages_title">Engellenen mesajlar</string>
-    <string name="blocked_messages_empty">Engellenen mesajlarınız burada görünecektir</string>
-    <string name="blocking_block_title">Engelle</string>
-    <string name="blocking_unblock_title">Engeli kaldır</string>
-    <plurals name="blocking_block_external">
-        <item quantity="one">%s\'ye devam edin ve bu sayıyı engelleyin</item>
-        <item quantity="other">%s\'ye devam edin ve bu sayıları engelleyin</item>
-    </plurals>
-    <plurals name="blocking_unblock_external">
-        <item quantity="one">%s\'ye devam edin ve bu sayıya izin verin</item>
-        <item quantity="other">%s\'ye devam edin ve bu sayılara izin verin</item>
-    </plurals>
-    <string name="about_title">Hakkında</string>
-    <string name="about_version_title">Sürüm</string>
-    <string name="about_developer_title">Geliştirici</string>
-    <string name="about_source_title">Kaynak kodu</string>
-    <string name="about_changelog_title">Yenilikler</string>
-    <string name="about_contact_title">İletişim</string>
-    <string name="about_license_title">Lisanslar</string>
-    <string name="about_copyright_title">Telif hakkı</string>
-    <string name="qksms_plus_description_title">Gelişimini desteklemek, her şey kilitsiz</string>
-    <string name="qksms_plus_description_summary">Seni  kurtarmak için sadece %s açlıktan ölen bir geliştirici</string>
-    <!-- Substitutions are for price and currency. Ex: Lifetime upgrade for $1.99 USD -->
-    <string name="qksms_plus_upgrade">Süresiz kullanmak 1$s %2$s</string>
-    <!-- Substitutions are for price and currency. Ex: Unlock + donate for $4.99 USD -->
-    <string name="qksms_plus_upgrade_donate">Kilidi aç ve Satın Al %1$s %2$s</string>
-    <string name="qksms_plus_thanks_title">QKSMS desteği için teşekkür ederiz!!</string>
-    <string name="qksms_plus_thanks_summary">Şimdi tüm QKSMS+ özellikleri açıldı!</string>
-    <string name="qksms_plus_free_title">QKSMS+ F-Droid kullanıcıları için ücretsizdir! Eğer gelişmeyi desteklemek istiyorsanız, bağış yapmakta özgürsünüz.</string>
-    <string name="qksms_plus_donate">Paypal ile satın al</string>
-    <string name="qksms_plus_coming_soon">Yakında</string>
-    <string name="qksms_plus_themes_title">Ücretli Temalar</string>
-    <string name="qksms_plus_themes_summary">Malzeme tasarım paleti üzerinde bulunmayan güzel tema renkleri aç</string>
-    <string name="qksms_plus_emoji_title">Özel otomatik ifadeler</string>
-    <string name="qksms_plus_emoji_summary">Özel otomatik ifadeler kısayolları oluştur</string>
-    <string name="qksms_plus_backup_title">Mesajları yedekle</string>
-    <string name="qksms_plus_backup_summary">İletileriniz otomatik olarak yedekleyin. Telefonunuzu değiştirir veya kaybolursa endişelenmeyin.</string>
-    <string name="qksms_plus_scheduled_title">Zamanlanmış iletiler</string>
-    <string name="qksms_plus_scheduled_summary">Belirli bir saatte ve tarihte otomatik olarak gönderilecek mesajları zamanla</string>
-    <string name="qksms_plus_delayed_title">Gecikmeli gönderme</string>
-    <string name="qksms_plus_delayed_summary">İletinizi göndermeden önce birkaç saniye bekleyin</string>
-    <string name="qksms_plus_night_title">Otomatik gece modu</string>
-    <string name="qksms_plus_night_summary">Günün zamanına göre gece modunu etkinleştir</string>
-    <string name="qksms_plus_blacklist_title">Gelişmiş engelleme</string>
-    <string name="qksms_plus_blacklist_summary">Belirli anahtar sözcükleri içeren veya desen eşleşen iletileri engelleme</string>
-    <string name="qksms_plus_forward_title">Otomatik ilet</string>
-    <string name="qksms_plus_forward_summary">Belirli gönderenlerden gelen iletileri otomatik olarak ilet</string>
-    <string name="qksms_plus_respond_title">Otomatik yanıtla</string>
-    <string name="qksms_plus_respond_summary">Önceden ayarlanmış bir yanıt ile gelen iletilere otomatik olarak yanıtla</string>
-    <string name="qksms_plus_more_title">Daha fazla</string>
-    <string name="qksms_plus_more_summary">QKSMS etkin geliştirme altında ve satın alırsan tüm gelecek QKSMS+ özellikleri dahil olacaktır!</string>
-    <string name="widget_loading">Yükleniyor...</string>
-    <string name="widget_more">Daha fazla konuşma göster</string>
-    <string name="qkreply_menu_read">Okundu olarak işaretle</string>
-    <string name="qkreply_menu_call">Ara</string>
-    <string name="qkreply_menu_delete">Sil</string>
-    <string name="qkreply_menu_expand">Daha fazla göster</string>
-    <string name="qkreply_menu_collapse">Daha az göster</string>
-    <string name="qkreply_menu_view">Sohbeti aç</string>
-    <string name="theme_material">Malzeme</string>
-    <string name="theme_hex">HEX</string>
-    <string name="theme_apply">Uygula</string>
-    <string-array name="notification_actions">
-        <item>Hiçbiri</item>
-        <item>Arşivle</item>
-        <item>Sil</item>
-        <item>Engelle</item>
-        <item>Ara</item>
-        <item>Okundu olarak işaretle</item>
-        <item>Cevapla</item>
-    </string-array>
-    <string name="button_yes">Evet</string>
-    <string name="button_continue">Devam</string>
-    <string name="button_cancel">İptal</string>
-    <string name="button_delete">Sil</string>
-    <string name="button_save">Kaydet</string>
-    <string name="button_stop">Durdur</string>
-    <string name="button_more">Daha fazla</string>
-    <string name="button_set">Ayarla</string>
-    <string name="button_undo">Geri al</string>
-    <string name="toast_copied">Kopyalandı.</string>
-    <string name="toast_archived">Arşivlenmiş konuşmalar</string>
-    <string name="toast_qksms_plus">Bunu kullanmak için QKSMS+ kilidi gerekir</string>
-    <plurals name="notification_new_messages">
-        <item quantity="one">Yeni mesaj</item>
-        <item quantity="other">Yeni mesaj</item>
-    </plurals>
-    <string name="notification_message_failed_title">İleti gönderilemedi</string>
-    <string name="notification_message_failed_text">%s mesaj gönderilemedi</string>
-    <string-array name="night_modes">
-        <item>Sistem</item>
-        <item>Devre dışı</item>
-        <item>Her zaman açık</item>
-        <item>Otomatik</item>
-    </string-array>
-    <string-array name="notification_preview_options">
-        <item>Adı ve ileti göster</item>
-        <item>Adını göster</item>
-        <item>İçeriği gizle</item>
-    </string-array>
-    <string-array name="text_sizes">
-        <item>Küçük</item>
-        <item>Normal</item>
-        <item>Büyük</item>
-        <item>Daha büyük</item>
-    </string-array>
-    <string-array name="delayed_sending_labels">
-        <item>Gecikme yok</item>
-        <item>3 saniye</item>
-        <item>5 saniye</item>
-        <item>10 saniye</item>
-    </string-array>
-    <string-array name="mms_sizes">
-        <item>Otomatik</item>
-        <item>100KB</item>
-        <item>200KB</item>
-        <item>300KB</item>
-        <item>600KB</item>
-        <item>1000KB</item>
-        <item>2000KB</item>
-        <item>Sıkıştırma yok</item>
-    </string-array>
-    <string-array name="qk_responses">
-        <item>Tamam</item>
-        <item>Bana bir dakika ver</item>
-        <item>Yolda</item>
-        <item>Teşekkürler</item>
-        <item>Kulağa güzel geliyor</item>
-        <item>Naber?</item>
-        <item>Kararlaştırıldı</item>
-        <item>Hayır</item>
-        <item>Seni seviyorum</item>
-        <item>Özür dilerim</item>
-        <item>He</item>
-        <item>Tamam o zaman</item>
-    </string-array>
-</resources>
+<?xml version="1.0" encoding="utf-8"?>
+<!--
+  ~ Copyright (C) 2019 Moez Bhatti <moez.bhatti@gmail.com>
+  ~
+  ~ This file is part of QKSMS.
+  ~
+  ~ QKSMS is free software: you can redistribute it and/or modify
+  ~ it under the terms of the GNU General Public License as published by
+  ~ the Free Software Foundation, either version 3 of the License, or
+  ~ (at your option) any later version.
+  ~
+  ~ QKSMS is distributed in the hope that it will be useful,
+  ~ but WITHOUT ANY WARRANTY; without even the implied warranty of
+  ~ MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+  ~ GNU General Public License for more details.
+  ~
+  ~ You should have received a copy of the GNU General Public License
+  ~ along with QKSMS.  If not, see <http://www.gnu.org/licenses/>.
+  -->
+<resources>
+    <string name="shortcut_compose_long_label">Yeni konuşma</string>
+    <string name="shortcut_compose_short_label">Oluştur</string>
+    <string name="shortcut_compose_disabled_message">Kısayol devre dışı</string>
+    <string name="title_archived">Arşivlenmiş</string>
+    <string name="title_settings">Ayarlar</string>
+    <string name="title_notification_prefs">Bildirimler</string>
+    <string name="title_theme">Tema</string>
+    <string name="title_conversations">Gelen mesajlarda ara...</string>
+    <string name="title_compose">Bir isme veya numaraya yazın</string>
+    <string name="setup_skip">Atla</string>
+    <string name="setup_next">Devam</string>
+    <string name="menu_add_person">Kişi ekle</string>
+    <string name="menu_call">Ara</string>
+    <string name="menu_info">Ayrıntılar</string>
+    <string name="menu_save">Galeriye Kaydet</string>
+    <string name="menu_share">Paylaş</string>
+    <string name="main_drawer_open_cd">Gezinti çubuğunu aç</string>
+    <string name="main_title_selected">%d Seçili</string>
+    <string name="main_menu_clear">Temizle</string>
+    <string name="main_menu_archive">Arşiv</string>
+    <string name="main_menu_unarchive">Arşivden çıkar</string>
+    <string name="main_menu_delete">Sil</string>
+    <string name="main_menu_add_contact">Kişilere ekle</string>
+    <string name="main_menu_pin">Sabitle</string>
+    <string name="main_menu_unpin">Sabitlemeyi kaldır</string>
+    <string name="main_menu_read">Okundu olarak işaretle</string>
+    <string name="main_menu_unread">Okunmadı olarak işaretle</string>
+    <string name="main_menu_block">Engelle</string>
+    <string name="main_syncing">İletiler eşitleniyor.. </string>
+    <string name="main_sender_you">Sen: %s</string>
+    <string name="main_draft">Taslak</string>
+    <string name="main_message_results_title">Mesajlardaki sonuçlar</string>
+    <string name="main_message_results">%d mesaj</string>
+    <string name="inbox_empty_text">Konuşmalarınız burada görünür</string>
+    <string name="inbox_search_empty_text"> Sonuç Yok</string>
+    <string name="archived_empty_text">Arşivlenmiş konuşmalarınız burada görünür</string>
+    <string name="main_fab_cd">Yeni konuşma başlat</string>
+    <string name="main_default_sms_title">Yine mesajlaşmayı seviyorum</string>
+    <string name="main_default_sms_message">QKSMS varsayılan SMS uygulaması yap</string>
+    <string name="main_default_sms_change">Değiştir</string>
+    <string name="main_permission_required">İzin gerekli</string>
+    <string name="main_permission_sms">QKSMS göndermek ve SMS mesajları görüntülemek için izni olması gerekir.</string>
+    <string name="main_permission_contacts">QKSMS kişilerinizi görüntülemek için izni olması gerekir.</string>
+    <string name="main_permission_allow">İzin ver</string>
+    <string name="drawer_inbox">Gelen Kutusu</string>
+    <string name="drawer_archived">Arşivle</string>
+    <string name="drawer_scheduled">Zamanlanmış</string>
+    <string name="drawer_blocking">Engellenmiş</string>
+    <string name="drawer_more">Daha fazla</string>
+    <string name="drawer_settings">Ayarlar</string>
+    <string name="drawer_help">Yardım &amp; Geri bildirim</string>
+    <string name="drawer_invite">Arkadaşlarınızı davet edin</string>
+    <string name="drawer_plus_banner_summary">İnanılmaz yeni özelliklerin kilidini aç ve geliştirmeye destek ol</string>
+    <string name="rate_title">QKSMS tadını çıkarıyor musun?</string>
+    <string name="rate_summary">Biraz sevgi paylaş ve Google Playden bizi oyla!</string>
+    <string name="rate_okay">TAMAM!</string>
+    <string name="rate_dismiss">GÖREVDEN</string>
+    <string name="dialog_delete_title">Sil</string>
+    <plurals name="dialog_delete_message">
+        <item quantity="one">Sohbeti silmek istediğinizden emin misiniz?</item>
+        <item quantity="other">%d konuşmayı silmek istediğinizden emin misiniz?</item>
+    </plurals>
+    <string-array name="message_options">
+        <item>Metni kopyala</item>
+        <item>Yönlendir</item>
+        <item>Sil</item>
+    </string-array>
+    <string name="compose_number_picker_title">Bir telefon numarası seçin</string>
+    <string name="compose_number_picker_default">%s ∙ Varsayılan</string>
+    <string name="compose_number_picker_once">Sadece bir kez</string>
+    <string name="compose_number_picker_always">Her zaman</string>
+    <string name="compose_title_selected">%d Seçili</string>
+    <string name="compose_subtitle_results">%1$d / %2$d sonuçlar</string>
+    <string name="compose_send_group_title">Grup mesajı gönder</string>
+    <string name="compose_send_group_summary">Alıcılar ve yanıtlar herkese görünür olacak</string>
+    <string name="compose_messages_empty">Senin konuşma başlıyor. Güzel bir şey söyle!</string>
+    <string name="compose_vcard_label">Kişi Kartı</string>
+    <string name="compose_scheduled_for">Planlanan</string>
+    <string name="compose_scheduled_future">Seçilen zaman gelecekte olmalı!</string>
+    <string name="compose_scheduled_plus">Zamanlanmış mesajlaşma kullanmak için QKSMS+ kilidini kaldırmak gerekir</string>
+    <string name="compose_scheduled_toast">Zamanlanmış iletilere eklendi</string>
+    <string name="compose_hint">Mesaj Yaz...</string>
+    <string name="compose_menu_copy">Metni kopyala</string>
+    <string name="compose_menu_forward">Yönlendir</string>
+    <string name="compose_menu_delete">Sil</string>
+    <string name="compose_menu_previous">Önceki</string>
+    <string name="compose_menu_next">Sonraki</string>
+    <string name="compose_menu_clear">Temizle</string>
+    <string name="compose_details_title">Mesaj ayrıntıları</string>
+    <string name="compose_details_type">Tip: %s</string>
+    <string name="compose_details_from">Gönderen: %s</string>
+    <string name="compose_details_to">Alıcı: %s</string>
+    <string name="compose_details_subject">Konu: %s</string>
+    <string name="compose_details_priority">Öncelik: %s</string>
+    <string name="compose_details_size">Boyut: %s</string>
+    <string name="compose_details_sent">Gönderilme: %s</string>
+    <string name="compose_details_received">Alınan: %s</string>
+    <string name="compose_details_delivered">Teslim Edildi: %s</string>
+    <string name="compose_details_error_code">Hata kodu: %d</string>
+    <string name="compose_attach_cd">Dosya Ekle</string>
+    <string name="compose_gallery_cd">Bir fotoğraf eklemek</string>
+    <string name="compose_camera_cd">Fotoğraf Çek</string>
+    <string name="compose_schedule_cd">Mesajı zamanlama</string>
+    <string name="compose_contact_cd">Bir kişi ekle</string>
+    <string name="compose_contact_error">Kişi okunurken hata oluştu</string>
+    <!-- Example: SIM 1 (Verizon) selected-->
+    <string name="compose_sim_changed_toast">SIM %1$d (%2$s) seçili</string>
+    <string name="compose_sim_cd">Seçili, %s SIM kartı değiştirin</string>
+    <string name="compose_send_cd">Mesaj gönder</string>
+    <string name="message_status_sending">Gönderiliyor...</string>
+    <string name="message_status_delivered">Teslim Edildi %s</string>
+    <string name="message_status_failed">Gönderilemedi. Yeniden denemek için dokunun</string>
+    <string name="info_title">Ayrıntılar</string>
+    <string name="info_copied_address">Adres kopyalandı</string>
+    <string name="info_name">Konuşma başlığı</string>
+    <string name="info_notifications">Bildirimler</string>
+    <string name="info_theme">Tema</string>
+    <string name="info_archive">Arşivle</string>
+    <string name="info_unarchive">Arşivden çıkar</string>
+    <string name="info_block">Engelle</string>
+    <string name="info_unblock">Engeli kaldır</string>
+    <string name="info_delete">Yazışmayı sil</string>
+    <string name="gallery_error">Medya yüklenemedi</string>
+    <string name="gallery_toast_saved">Galeriye kaydedildi</string>
+    <string name="backup_title">Yedekleme ve geri yükleme</string>
+    <string name="backup_backing_up">Mesajları yedekleme</string>
+    <string name="backup_restoring">Yedekten geri yükleme</string>
+    <string name="backup_last">Son yedekleme</string>
+    <string name="backup_loading">Yükleniyor...</string>
+    <string name="backup_never">Asla</string>
+    <string name="backup_restore_title">Geri yükle</string>
+    <string name="backup_restore_summary">Bir yedekleme\'yi seçin</string>
+    <string name="backup_restore_error_plus">Lütfen yedeklemeyi ve geri yüklemeyi kullanmak için QKSMS+\'ı açınız.</string>
+    <string name="backup_restore_error_backup">Yedekleme devam ediyor...</string>
+    <string name="backup_restore_error_restore">Geri yükleme devam ediyor...</string>
+    <string name="backup_restore_confirm_title">Yedeklemeyi geri yükle</string>
+    <string name="backup_restore_confirm_message">Mesajlarınızı bu yedekten geri yüklemek istediğinizden emin misiniz?</string>
+    <string name="backup_restore_stop_title">Geri yüklemeyi durdur</string>
+    <string name="backup_restore_stop_message">Zaten geri yüklenen mesajlar cihazınızda kalacaktır</string>
+    <string name="backup_restore_dialog_title">Yedekler</string>
+    <string name="backup_restore_dialog_empty">Yedekleme bulunamadı</string>
+    <plurals name="backup_message_count">
+        <item quantity="one">%d mesaj</item>
+        <item quantity="other">%d mesajlar</item>
+    </plurals>
+    <string name="backup_disclaimer">Şu anda, sadece SMS yedekleme ve geri yükleme desteklenmektedir. MMS desteği ve zamanlanmış mesaj yedeklemeleri çok yakında !</string>
+    <string name="backup_now">Şimdi yedekle</string>
+    <string name="backup_progress_parsing">Yedekleme ayrılıyor&#8230;</string>
+    <string name="backup_progress_running">%d%d mesajlar</string>
+    <string name="backup_progress_saving">Yedekleme kaydediliyor...</string>
+    <string name="backup_progress_syncing">Mesajlar senkronize ediliyor...</string>
+    <string name="backup_progress_finished">Tamamlandı!</string>
+    <string name="backup_notification_channel_name">Yedekleme ve geri yükleme</string>
+    <string name="scheduled_title">Zamanlanmış</string>
+    <string name="scheduled_empty_description">Otomatik olarak istediğiniz zamanda, bir mesaj göndermek</string>
+    <string name="scheduled_empty_message_1">Hey! Doğum günün ne zamandı?</string>
+    <string name="scheduled_empty_message_2">23 Aralık\'ta</string>
+    <string name="scheduled_empty_message_3">Doğum günün kutlu olsun! Doğum gününü hatırladığım harika arkadaşım</string>
+    <!--&#x200A; is a special character required at the end of this string to fix it's formatting in the app -->
+    <string name="scheduled_empty_message_3_timestamp">23  Aralık\'ta gönder</string>
+    <string name="scheduled_compose_cd">Bir mesaj zamanla</string>
+    <string name="scheduled_options_title">Zamanlanmış mesaj</string>
+    <string-array name="scheduled_options">
+        <item>Şimdi gönder</item>
+        <item>Metni kopyala</item>
+        <item>Sil</item>
+    </string-array>
+    <string name="settings_category_appearance">Görünüm</string>
+    <string name="settings_category_general">Genel</string>
+    <string name="settings_category_qkreply">QK Yanıt</string>
+    <string name="settings_theme_title">Tema</string>
+    <string name="settings_night_title">Gece Modu</string>
+    <string name="settings_black_title">Saf siyah gece modu</string>
+    <string name="settings_night_start_title">Başlama zamanı</string>
+    <string name="settings_night_end_title">Bitiş Zamanı</string>
+    <string name="settings_automatic_colors_title">Otomatik kişi renkleri</string>
+    <string name="settings_text_size_title">Yazı tipi boyutu</string>
+    <string name="settings_system_font_title">Sistem yazı tipini kullan</string>
+    <string name="settings_auto_emoji_title">Otomatik emoji</string>
+    <string name="settings_notifications_title">Bildirimler</string>
+    <string name="settings_notifications_o_summary">Özelleştirmek için dokunun</string>
+    <string name="settings_notification_actions_title">Eylemler</string>
+    <string name="settings_notification_action_1">Buton 1</string>
+    <string name="settings_notification_action_2">Buton 2</string>
+    <string name="settings_notification_action_3">Buton 3</string>
+    <string name="settings_notification_previews_title">Bildirim ön izleme</string>
+    <string name="settings_notification_wake_title">Uyandırma ekranı</string>
+    <string name="settings_vibration_title">Titreşim</string>
+    <string name="settings_ringtone_title">Ses</string>
+    <string name="settings_ringtone_none">Hiçbiri</string>
+    <string name="settings_qkreply_title">QK Yanıt</string>
+    <string name="settings_qkreply_summary">Yeni iletiler için açılan menü</string>
+    <string name="settings_qkreply_tap_dismiss_title">Kapatmak için dokunun</string>
+    <string name="settings_qkreply_tap_dismiss_summary">Açılır pencereyi kapatmak için pencere dışındaki herhangi bir yere dokunun</string>
+    <string name="settings_delayed_title">Gecikmeli gönderme</string>
+    <string name="settings_swipe_actions">Kaydırma eylemleri</string>
+    <string name="settings_swipe_actions_summary">Konuşmalar için kaydırma eylemlerini yapılandırma</string>
+    <string name="settings_swipe_actions_right">Sağa kaydır</string>
+    <string name="settings_swipe_actions_left">Sola Kaydır</string>
+    <string name="settings_swipe_actions_change">DEĞİŞTİR</string>
+    <string-array name="settings_swipe_actions">
+        <item>Hiçbiri</item>
+        <item>Arşivle</item>
+        <item>Sil</item>
+        <item>Engelle</item>
+        <item>Ara</item>
+        <item>Okundu olarak işaretle</item>
+        <item>Okunmadı olarak işaretle</item>
+    </string-array>
+    <string name="settings_delivery_title">İletim raporları</string>
+    <string name="settings_delivery_summary">Mesajınızın sorunsuz gönderildiğinin onayını alın</string>
+    <string name="settings_signature_title">İmza</string>
+    <string name="settings_signature_summary">Mesajlarınızın sonuna bir imza ekleyin</string>
+    <string name="settings_unicode_title">Şeritli aksanlar</string>
+    <string name="settings_unicode_summary">Giden SMS mesajlarından aksanlı karakterleri kaldırın</string>
+    <string name="settings_mobile_title">Sadece cep telefonu numaraları</string>
+    <string name="settings_mobile_summary">Bir mesaj oluştururken, yalnızca cep telefonu numaralarını göster</string>
+    <string name="settings_auto_delete">Eski mesajları otomatik olarak sil</string>
+    <string name="settings_auto_delete_dialog_message">Belirtilen sayıda gün geçtikten sonra mesajlar silinecek</string>
+    <string name="settings_auto_delete_dialog_hint">Gün sayısı</string>
+    <string name="settings_auto_delete_never">Asla</string>
+    <string name="settings_auto_delete_warning">Eski mesajlar otomatik olarak silinsin mi?</string>
+    <string name="settings_auto_delete_warning_message">Devam ederseniz, %1$d mesaj şimdi silinecek</string>
+    <plurals name="settings_auto_delete_summary">
+        <item quantity="one">1 gün sonra</item>
+        <item quantity="other">%d gün sonra</item>
+    </plurals>
+    <string name="settings_long_as_mms_title">Uzun mesajları MMS olarak gönder</string>
+    <string name="settings_long_as_mms_summary">Uzun metin mesajlarınız gönderilemiyorsa veya yanlış sırada gönderiliyorsa, onları MMS mesajları olarak gönderebilirsiniz. Ek ücretler uygulanabilir</string>
+    <string name="settings_mms_size_title">Otomatik-MMS ekleri sıkıştır</string>
+    <string name="settings_sync_title"> İletileri eşitle</string>
+    <string name="settings_sync_summary">İletilerinizi  Android SMS veritabanı ile yeniden senkronize edin</string>
+    <string name="settings_about_title">QKSMS Hakkında</string>
+    <string name="settings_version">Sürüm %s</string>
+    <string name="settings_logging_enabled">Hata ayıklama günlüğü etkin</string>
+    <string name="settings_logging_disabled">Hata ayıklama günlüğü devre dışı</string>
+    <string name="settings_delay_duration_hint">Süre (saniye olarak) girin</string>
+    <string name="blocking_title">Engelleyici</string>
+    <string name="blocking_drop_title">Mesajları bırak</string>
+    <string name="blocking_drop_summary">Engellenen gönderenlerden gelen mesajları gizlemek yerine bırakın</string>
+    <string name="blocking_conversations">Engellenen konuşmalar</string>
+    <string name="blocking_manager_title">Engelleme Yöneticisi</string>
+    <string name="blocking_manager_qksms_title">QKSMS</string>
+    <string name="blocking_manager_qksms_summary">QKSMS\'de yerleşik engelleme işlevi</string>
+    <string name="blocking_manager_call_control_summary">Aramalarınızı ve mesajlarınızı uygun bir yerde otomatik olarak filtreleyin! Topluluk IQ™ bilinen spam istenmeyen mesajları önlemek için izin verir
+
+BAĞLAM İSTEĞİ</string>
+    <string name="blocking_manager_sia_summary">İstenmeyen numaralardan gelen iletileri otomatik olarak filtre</string>
+    <string name="blocking_manager_copy_title">Engellenen numaraları kopyala</string>
+    <string name="blocking_manager_copy_summary">Mevcut engellenen numaralarınızın üzerine %s kopyalamaya devam edin</string>
+    <string name="blocked_numbers_title">Engellenen numaralar</string>
+    <string name="blocked_numbers_empty">Engellenen numaralarınız burada görünecektir</string>
+    <string name="blocked_numbers_add_cd">Yeni bir numarayı engelle</string>
+    <string name="blocked_numbers_dialog_title">Gelen metinleri engelle</string>
+    <string name="blocked_numbers_dialog_hint">Telefon numarası</string>
+    <string name="blocked_numbers_dialog_block">Engelle</string>
+    <string name="blocked_messages_title">Engellenen mesajlar</string>
+    <string name="blocked_messages_empty">Engellenen mesajlarınız burada görünecektir</string>
+    <string name="blocking_block_title">Engelle</string>
+    <string name="blocking_unblock_title">Engeli kaldır</string>
+    <plurals name="blocking_block_external">
+        <item quantity="one">%s\'ye devam edin ve bu sayıyı engelleyin</item>
+        <item quantity="other">%s\'ye devam edin ve bu sayıları engelleyin</item>
+    </plurals>
+    <plurals name="blocking_unblock_external">
+        <item quantity="one">%s\'ye devam edin ve bu sayıya izin verin</item>
+        <item quantity="other">%s\'ye devam edin ve bu sayılara izin verin</item>
+    </plurals>
+    <string name="about_title">Hakkında</string>
+    <string name="about_version_title">Sürüm</string>
+    <string name="about_developer_title">Geliştirici</string>
+    <string name="about_source_title">Kaynak kodu</string>
+    <string name="about_changelog_title">Yenilikler</string>
+    <string name="about_contact_title">İletişim</string>
+    <string name="about_license_title">Lisanslar</string>
+    <string name="about_copyright_title">Telif hakkı</string>
+    <string name="qksms_plus_description_title">Gelişimini desteklemek, her şey kilitsiz</string>
+    <string name="qksms_plus_description_summary">Seni  kurtarmak için sadece %s açlıktan ölen bir geliştirici</string>
+    <!-- Substitutions are for price and currency. Ex: Lifetime upgrade for $1.99 USD -->
+    <string name="qksms_plus_upgrade">Süresiz kullanmak 1$s %2$s</string>
+    <!-- Substitutions are for price and currency. Ex: Unlock + donate for $4.99 USD -->
+    <string name="qksms_plus_upgrade_donate">Kilidi aç ve Satın Al %1$s %2$s</string>
+    <string name="qksms_plus_thanks_title">QKSMS desteği için teşekkür ederiz!!</string>
+    <string name="qksms_plus_thanks_summary">Şimdi tüm QKSMS+ özellikleri açıldı!</string>
+    <string name="qksms_plus_free_title">QKSMS+ F-Droid kullanıcıları için ücretsizdir! Eğer gelişmeyi desteklemek istiyorsanız, bağış yapmakta özgürsünüz.</string>
+    <string name="qksms_plus_donate">Paypal ile satın al</string>
+    <string name="qksms_plus_coming_soon">Yakında</string>
+    <string name="qksms_plus_themes_title">Ücretli Temalar</string>
+    <string name="qksms_plus_themes_summary">Malzeme tasarım paleti üzerinde bulunmayan güzel tema renkleri aç</string>
+    <string name="qksms_plus_emoji_title">Özel otomatik ifadeler</string>
+    <string name="qksms_plus_emoji_summary">Özel otomatik ifadeler kısayolları oluştur</string>
+    <string name="qksms_plus_backup_title">Mesajları yedekle</string>
+    <string name="qksms_plus_backup_summary">İletileriniz otomatik olarak yedekleyin. Telefonunuzu değiştirir veya kaybolursa endişelenmeyin.</string>
+    <string name="qksms_plus_scheduled_title">Zamanlanmış iletiler</string>
+    <string name="qksms_plus_scheduled_summary">Belirli bir saatte ve tarihte otomatik olarak gönderilecek mesajları zamanla</string>
+    <string name="qksms_plus_delayed_title">Gecikmeli gönderme</string>
+    <string name="qksms_plus_delayed_summary">İletinizi göndermeden önce birkaç saniye bekleyin</string>
+    <string name="qksms_plus_night_title">Otomatik gece modu</string>
+    <string name="qksms_plus_night_summary">Günün zamanına göre gece modunu etkinleştir</string>
+    <string name="qksms_plus_blacklist_title">Gelişmiş engelleme</string>
+    <string name="qksms_plus_blacklist_summary">Belirli anahtar sözcükleri içeren veya desen eşleşen iletileri engelleme</string>
+    <string name="qksms_plus_forward_title">Otomatik ilet</string>
+    <string name="qksms_plus_forward_summary">Belirli gönderenlerden gelen iletileri otomatik olarak ilet</string>
+    <string name="qksms_plus_respond_title">Otomatik yanıtla</string>
+    <string name="qksms_plus_respond_summary">Önceden ayarlanmış bir yanıt ile gelen iletilere otomatik olarak yanıtla</string>
+    <string name="qksms_plus_more_title">Daha fazla</string>
+    <string name="qksms_plus_more_summary">QKSMS etkin geliştirme altında ve satın alırsan tüm gelecek QKSMS+ özellikleri dahil olacaktır!</string>
+    <string name="widget_loading">Yükleniyor...</string>
+    <string name="widget_more">Daha fazla konuşma göster</string>
+    <string name="qkreply_menu_read">Okundu olarak işaretle</string>
+    <string name="qkreply_menu_call">Ara</string>
+    <string name="qkreply_menu_delete">Sil</string>
+    <string name="qkreply_menu_expand">Daha fazla göster</string>
+    <string name="qkreply_menu_collapse">Daha az göster</string>
+    <string name="qkreply_menu_view">Sohbeti aç</string>
+    <string name="theme_material">Malzeme</string>
+    <string name="theme_hex">HEX</string>
+    <string name="theme_apply">Uygula</string>
+    <string-array name="notification_actions">
+        <item>Hiçbiri</item>
+        <item>Arşivle</item>
+        <item>Sil</item>
+        <item>Engelle</item>
+        <item>Ara</item>
+        <item>Okundu olarak işaretle</item>
+        <item>Cevapla</item>
+    </string-array>
+    <string name="button_yes">Evet</string>
+    <string name="button_continue">Devam</string>
+    <string name="button_cancel">İptal</string>
+    <string name="button_delete">Sil</string>
+    <string name="button_save">Kaydet</string>
+    <string name="button_stop">Durdur</string>
+    <string name="button_more">Daha fazla</string>
+    <string name="button_set">Ayarla</string>
+    <string name="button_undo">Geri al</string>
+    <string name="toast_copied">Kopyalandı.</string>
+    <string name="toast_archived">Arşivlenmiş konuşmalar</string>
+    <string name="toast_qksms_plus">Bunu kullanmak için QKSMS+ kilidi gerekir</string>
+    <plurals name="notification_new_messages">
+        <item quantity="one">Yeni mesaj</item>
+        <item quantity="other">Yeni mesaj</item>
+    </plurals>
+    <string name="notification_message_failed_title">İleti gönderilemedi</string>
+    <string name="notification_message_failed_text">%s mesaj gönderilemedi</string>
+    <string-array name="night_modes">
+        <item>Sistem</item>
+        <item>Devre dışı</item>
+        <item>Her zaman açık</item>
+        <item>Otomatik</item>
+    </string-array>
+    <string-array name="notification_preview_options">
+        <item>Adı ve ileti göster</item>
+        <item>Adını göster</item>
+        <item>İçeriği gizle</item>
+    </string-array>
+    <string-array name="text_sizes">
+        <item>Küçük</item>
+        <item>Normal</item>
+        <item>Büyük</item>
+        <item>Daha büyük</item>
+    </string-array>
+    <string-array name="delayed_sending_labels">
+        <item>Gecikme yok</item>
+        <item>3 saniye</item>
+        <item>5 saniye</item>
+        <item>10 saniye</item>
+    </string-array>
+    <string-array name="mms_sizes">
+        <item>Otomatik</item>
+        <item>100KB</item>
+        <item>200KB</item>
+        <item>300KB</item>
+        <item>600KB</item>
+        <item>1000KB</item>
+        <item>2000KB</item>
+        <item>Sıkıştırma yok</item>
+    </string-array>
+    <string-array name="qk_responses">
+        <item>Tamam</item>
+        <item>Bana bir dakika ver</item>
+        <item>Yolda</item>
+        <item>Teşekkürler</item>
+        <item>Kulağa güzel geliyor</item>
+        <item>Naber?</item>
+        <item>Kararlaştırıldı</item>
+        <item>Hayır</item>
+        <item>Seni seviyorum</item>
+        <item>Özür dilerim</item>
+        <item>He</item>
+        <item>Tamam o zaman</item>
+    </string-array>
+</resources>
diff --git a/presentation/src/main/res/values-uk/strings.xml b/presentation/src/main/res/values-uk/strings.xml
index 45ed4b6e0..7d034cb23 100644
--- a/presentation/src/main/res/values-uk/strings.xml
+++ b/presentation/src/main/res/values-uk/strings.xml
@@ -1,423 +1,423 @@
-<?xml version="1.0" encoding="utf-8"?>
-<!--
-  ~ Copyright (C) 2019 Moez Bhatti <moez.bhatti@gmail.com>
-  ~
-  ~ This file is part of QKSMS.
-  ~
-  ~ QKSMS is free software: you can redistribute it and/or modify
-  ~ it under the terms of the GNU General Public License as published by
-  ~ the Free Software Foundation, either version 3 of the License, or
-  ~ (at your option) any later version.
-  ~
-  ~ QKSMS is distributed in the hope that it will be useful,
-  ~ but WITHOUT ANY WARRANTY; without even the implied warranty of
-  ~ MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
-  ~ GNU General Public License for more details.
-  ~
-  ~ You should have received a copy of the GNU General Public License
-  ~ along with QKSMS.  If not, see <http://www.gnu.org/licenses/>.
-  -->
-<resources>
-    <string name="shortcut_compose_long_label">Нова бесіда</string>
-    <string name="shortcut_compose_short_label">Написати</string>
-    <string name="shortcut_compose_disabled_message">Ярлик вимкнуто</string>
-    <string name="title_archived">Архівні</string>
-    <string name="title_settings">Налаштування</string>
-    <string name="title_notification_prefs">Сповіщення</string>
-    <string name="title_theme">Тема</string>
-    <string name="title_conversations">Пошук у вхідних&#8230;</string>
-    <string name="title_compose">Кому: ім\'я або номер</string>
-    <string name="setup_skip">Пропустити</string>
-    <string name="setup_next">Продовжити</string>
-    <string name="menu_add_person">Додати контакт</string>
-    <string name="menu_call">Зателефонувати</string>
-    <string name="menu_info">Деталі</string>
-    <string name="menu_save">Зберегти в галереї</string>
-    <string name="menu_share">Поділитися</string>
-    <string name="main_drawer_open_cd">Відкрити панель навігації</string>
-    <string name="main_title_selected">Обрано: %d</string>
-    <string name="main_menu_clear">Очистити</string>
-    <string name="main_menu_archive">Архівувати</string>
-    <string name="main_menu_unarchive">Розархівувати</string>
-    <string name="main_menu_delete">Видалити</string>
-    <string name="main_menu_add_contact">Додати до контактів</string>
-    <string name="main_menu_pin">Закріпити</string>
-    <string name="main_menu_unpin">Відкріпити</string>
-    <string name="main_menu_read">Позначити як прочитане</string>
-    <string name="main_menu_unread">Позначити як непрочитане</string>
-    <string name="main_menu_block">Блокувати</string>
-    <string name="main_syncing">Синхронізація повідомлень&#8230;</string>
-    <string name="main_sender_you">Ви: %s</string>
-    <string name="main_draft">Чернетка</string>
-    <string name="main_message_results_title">Результати в повідомленнях</string>
-    <string name="main_message_results">Повідомлень: %d</string>
-    <string name="inbox_empty_text">Ваші бесіди з\'являтимуться тут</string>
-    <string name="inbox_search_empty_text">Результатів немає</string>
-    <string name="archived_empty_text">Ваші архівовані бесіди з\'являтимуться тут</string>
-    <string name="main_fab_cd">Почати нову бесіду</string>
-    <string name="main_default_sms_title">Ви знову полюбите писати</string>
-    <string name="main_default_sms_message">Зробити QKSMS початковою програмою для SMS</string>
-    <string name="main_default_sms_change">Встановити</string>
-    <string name="main_permission_required">Вимагається дозвіл</string>
-    <string name="main_permission_sms">Для надсилання та перегляду SMS-повідомлень QKSMS потрібен дозвіл</string>
-    <string name="main_permission_contacts">Для перегляду ваших контактів QKSMS потрібен дозвіл</string>
-    <string name="main_permission_allow">Дозволити</string>
-    <string name="drawer_inbox">Вхідні</string>
-    <string name="drawer_archived">Архівні</string>
-    <string name="drawer_scheduled">Заплановані</string>
-    <string name="drawer_blocking">Блокування</string>
-    <string name="drawer_more">Більше</string>
-    <string name="drawer_settings">Налаштування</string>
-    <string name="drawer_help">Допомога та зворотній зв\'язок</string>
-    <string name="drawer_invite">Запросити друзів</string>
-    <string name="drawer_plus_banner_summary">Розблокувати нові дивовижні можливості та підтримати розробку</string>
-    <string name="rate_title">Подобається QKSMS?</string>
-    <string name="rate_summary">Поділись любов\'ю та оціни нас на Google Play!</string>
-    <string name="rate_okay">Добре!</string>
-    <string name="rate_dismiss">ВІДХИЛИТИ</string>
-    <string name="dialog_delete_title">Видалити</string>
-    <plurals name="dialog_delete_message">
-        <item quantity="one">Ви впевнені, що хочете видалити цю бесіду?</item>
-        <item quantity="few">Ви впевнені, що хочете видалити %d бесіди?</item>
-        <item quantity="many">Ви впевнені, що хочете видалити %d бесід?</item>
-        <item quantity="other">Ви впевнені, що хочете видалити %d бесіди?</item>
-    </plurals>
-    <string-array name="message_options">
-        <item>Скопіювати текст</item>
-        <item>Переслати</item>
-        <item>Видалити</item>
-    </string-array>
-    <string name="compose_number_picker_title">Виберіть номер телефону</string>
-    <string name="compose_number_picker_default">%s ∙ початково</string>
-    <string name="compose_number_picker_once">Один раз</string>
-    <string name="compose_number_picker_always">Завжди</string>
-    <string name="compose_title_selected">Обрано: %d</string>
-    <string name="compose_subtitle_results">%1$d із %2$d результатів</string>
-    <string name="compose_send_group_title">Надіслати як групове повідомлення</string>
-    <string name="compose_send_group_summary">Отримувачі та відповіді будуть видимі для всіх</string>
-    <string name="compose_messages_empty">Це початок вашої бесіди. Скажіть, що-небудь приємне!</string>
-    <string name="compose_vcard_label">Картка контакту</string>
-    <string name="compose_scheduled_for">Заплановано на</string>
-    <string name="compose_scheduled_future">Обраний час повинен бути в майбутньому!</string>
-    <string name="compose_scheduled_plus">Для використання запланованих повідомлень ви повинні розблокувати QKSMS+</string>
-    <string name="compose_scheduled_toast">Додано до запланованих повідомлень</string>
-    <string name="compose_hint">Написати повідомлення&#8230;</string>
-    <string name="compose_menu_copy">Скопіювати текст</string>
-    <string name="compose_menu_forward">Переслати</string>
-    <string name="compose_menu_delete">Видалити</string>
-    <string name="compose_menu_previous">Назад</string>
-    <string name="compose_menu_next">Далі</string>
-    <string name="compose_menu_clear">Очистити</string>
-    <string name="compose_details_title">Деталі повідомлення</string>
-    <string name="compose_details_type">Тип: %s</string>
-    <string name="compose_details_from">Від: %s</string>
-    <string name="compose_details_to">Кому: %s</string>
-    <string name="compose_details_subject">Тема: %s</string>
-    <string name="compose_details_priority">Пріоритет: %s</string>
-    <string name="compose_details_size">Розмір: %s</string>
-    <string name="compose_details_sent">Надіслано: %s</string>
-    <string name="compose_details_received">Отримано: %s</string>
-    <string name="compose_details_delivered">Доставлено: %s</string>
-    <string name="compose_details_error_code">Код помилки: %d</string>
-    <string name="compose_attach_cd">Додати вкладення</string>
-    <string name="compose_gallery_cd">Прикріпити фотографію</string>
-    <string name="compose_camera_cd">Сфотографувати</string>
-    <string name="compose_schedule_cd">Запланувати повідомлення</string>
-    <string name="compose_contact_cd">Прикріпити контакт</string>
-    <string name="compose_contact_error">Помилка читання контакту</string>
-    <!-- Example: SIM 1 (Verizon) selected-->
-    <string name="compose_sim_changed_toast">Обрана SIM-карта %1$d (%2$s)</string>
-    <string name="compose_sim_cd">%s обрано, змініть SIM-картку</string>
-    <string name="compose_send_cd">Надіслати повідомлення</string>
-    <string name="message_status_sending">Надсилання&#8230;</string>
-    <string name="message_status_delivered">Доставлено %s</string>
-    <string name="message_status_failed">Не вдалося надіслати. Торкніться, щоб повторити спробу</string>
-    <string name="info_title">Деталі</string>
-    <string name="info_copied_address">Адреса скопійована</string>
-    <string name="info_name">Заголовок бесіди</string>
-    <string name="info_notifications">Сповіщення</string>
-    <string name="info_theme">Тема</string>
-    <string name="info_archive">Архівувати</string>
-    <string name="info_unarchive">Розархівувати</string>
-    <string name="info_block">Заблокувати</string>
-    <string name="info_unblock">Розблокувати</string>
-    <string name="info_delete">Видалити бесіду</string>
-    <string name="gallery_error">Не вдалося завантажити медіа</string>
-    <string name="gallery_toast_saved">Збережено в галереї</string>
-    <string name="backup_title">Резервне копіювання</string>
-    <string name="backup_backing_up">Резервне копіювання повідомлень</string>
-    <string name="backup_restoring">Відновити з резервної копії</string>
-    <string name="backup_last">Остання резервна копія</string>
-    <string name="backup_loading">Завантаження&#8230;</string>
-    <string name="backup_never">Ніколи</string>
-    <string name="backup_restore_title">Відновити</string>
-    <string name="backup_restore_summary">Оберіть резервну копію</string>
-    <string name="backup_restore_error_plus">Для використання резервного копіювання та відновлення розблокуйте QKSMS+</string>
-    <string name="backup_restore_error_backup">Триває створення резервної копії&#8230;</string>
-    <string name="backup_restore_error_restore">Триває відновлення&#8230;</string>
-    <string name="backup_restore_confirm_title">Відновити з резервної копії</string>
-    <string name="backup_restore_confirm_message">Відновити повідомлення з цієї резервної копії?</string>
-    <string name="backup_restore_stop_title">Зупинити відновлення</string>
-    <string name="backup_restore_stop_message">Повідомлення, які були відновлені залишатимуться на пристрої</string>
-    <string name="backup_restore_dialog_title">Резервні копії</string>
-    <string name="backup_restore_dialog_empty">Резервних копій не знайдено</string>
-    <plurals name="backup_message_count">
-        <item quantity="one">%d повідомлення</item>
-        <item quantity="few">%d повідомлення</item>
-        <item quantity="many">%d повідомлень</item>
-        <item quantity="other">%d повідомлення</item>
-    </plurals>
-    <string name="backup_disclaimer">На даний момент підтримуються лише SMS-повідомлення. Підтримка MMS-повідомлень та створення резервних копій за розкладом буде реалізована незабаром!</string>
-    <string name="backup_now">Створити резервну копію</string>
-    <string name="backup_progress_parsing">Аналіз резервної копії&#8230;</string>
-    <string name="backup_progress_running">%d/%d повідомлень</string>
-    <string name="backup_progress_saving">Збереження резервної копії&#8230;</string>
-    <string name="backup_progress_syncing">Синхронізація повідомлень&#8230;</string>
-    <string name="backup_progress_finished">Готово!</string>
-    <string name="backup_notification_channel_name">Резервне копіювання</string>
-    <string name="scheduled_title">Заплановані</string>
-    <string name="scheduled_empty_description">Автоматично надсилайте повідомлення саме в той час, який ви захочете</string>
-    <string name="scheduled_empty_message_1">Агов! Коли в тебе день народження?</string>
-    <string name="scheduled_empty_message_2">23-го грудня</string>
-    <string name="scheduled_empty_message_3">З Днем народження! Дивись, який я чудовий друг, згадав про твій день народження</string>
-    <!--&#x200A; is a special character required at the end of this string to fix it's formatting in the app -->
-    <string name="scheduled_empty_message_3_timestamp">Надіслано: 23 грудня </string>
-    <string name="scheduled_compose_cd">Запланувати повідомлення</string>
-    <string name="scheduled_options_title">Заплановане повідомлення</string>
-    <string-array name="scheduled_options">
-        <item>Надіслати зараз</item>
-        <item>Копіювати текст</item>
-        <item>Видалити</item>
-    </string-array>
-    <string name="settings_category_appearance">Зовнішній вигляд</string>
-    <string name="settings_category_general">Загальні</string>
-    <string name="settings_category_qkreply">QK Відповідь</string>
-    <string name="settings_theme_title">Тема</string>
-    <string name="settings_night_title">Нічний режим</string>
-    <string name="settings_black_title">Повністю чорний нічний режим</string>
-    <string name="settings_night_start_title">Час початку</string>
-    <string name="settings_night_end_title">Час завершення</string>
-    <string name="settings_automatic_colors_title">Автоматичні кольори контактів</string>
-    <string name="settings_text_size_title">Розмір шрифта</string>
-    <string name="settings_system_font_title">Використовувати системний шрифт</string>
-    <string name="settings_auto_emoji_title">Автоматичні emoji</string>
-    <string name="settings_notifications_title">Сповіщення</string>
-    <string name="settings_notifications_o_summary">Торкніться, щоб налаштувати</string>
-    <string name="settings_notification_actions_title">Дії</string>
-    <string name="settings_notification_action_1">Кнопка 1</string>
-    <string name="settings_notification_action_2">Кнопка 2</string>
-    <string name="settings_notification_action_3">Кнопка 3</string>
-    <string name="settings_notification_previews_title">Попередній перегляд сповіщень</string>
-    <string name="settings_notification_wake_title">Екран заблокований</string>
-    <string name="settings_vibration_title">Вібро</string>
-    <string name="settings_ringtone_title">Звук</string>
-    <string name="settings_ringtone_none">Ні</string>
-    <string name="settings_qkreply_title">QK Відповідь</string>
-    <string name="settings_qkreply_summary">Виринаюче вікно для нових повідомлень</string>
-    <string name="settings_qkreply_tap_dismiss_title">Торкніться, щоб вимкнути</string>
-    <string name="settings_qkreply_tap_dismiss_summary">Торкніться за межами виринаючого вікна, щоб закрити його</string>
-    <string name="settings_delayed_title">Затримка відправлення</string>
-    <string name="settings_swipe_actions">Дії жестів</string>
-    <string name="settings_swipe_actions_summary">Налаштуйте використання жестів для розмови</string>
-    <string name="settings_swipe_actions_right">Провести праворуч</string>
-    <string name="settings_swipe_actions_left">Провести ліворуч</string>
-    <string name="settings_swipe_actions_change">ЗМІНИТИ</string>
-    <string-array name="settings_swipe_actions">
-        <item>Немає</item>
-        <item>Перенести в архів</item>
-        <item>Видалити</item>
-        <item>Заблокувати</item>
-        <item>Виклик</item>
-        <item>Позначити як прочитане</item>
-        <item>Позначити як непрочитане</item>
-    </string-array>
-    <string name="settings_delivery_title">Звіти про доставку</string>
-    <string name="settings_delivery_summary">Підтвердження успішного надсилання повідомлень</string>
-    <string name="settings_signature_title">Підпис</string>
-    <string name="settings_signature_summary">Додавати підпис в кінець ваших повідомлень</string>
-    <string name="settings_unicode_title">Видалити акценти</string>
-    <string name="settings_unicode_summary">Видалення акцентів з символів у вихідних SMS-повідомленнях</string>
-    <string name="settings_mobile_title">Лише номери мобільних</string>
-    <string name="settings_mobile_summary">При написанні повідомлення показувати лише мобільні номери</string>
-    <string name="settings_auto_delete">Автоматично видаляти старі повідомлення</string>
-    <string name="settings_auto_delete_dialog_message">Повідомлення будуть видалені після вказаної кількості днів</string>
-    <string name="settings_auto_delete_dialog_hint">Кількість днів</string>
-    <string name="settings_auto_delete_never">Ніколи</string>
-    <string name="settings_auto_delete_warning">Автоматично видаляти старі повідомлення?</string>
-    <string name="settings_auto_delete_warning_message">Якщо ви продовжите, %1$d повідомлень буде видалено</string>
-    <plurals name="settings_auto_delete_summary">
-        <item quantity="one">Після 1 дня</item>
-        <item quantity="few">Після %d днів</item>
-        <item quantity="many">Після %d днів</item>
-        <item quantity="other">Після %d днів</item>
-    </plurals>
-    <string name="settings_long_as_mms_title">Надсилати довгі повідомлення як MMS</string>
-    <string name="settings_long_as_mms_summary">Якщо частини довгого повідомлення не відправляються або роблять це в хибному порядку, ви можете відправити їх як MMS натомість. Оплата згідно тарифів вашого оператора</string>
-    <string name="settings_mms_size_title">Автоматичне стиснення MMS-вкладень</string>
-    <string name="settings_sync_title">Синхронізація повідомлень</string>
-    <string name="settings_sync_summary">Повторна синхронізація ваших повідомлень з власною базою даних SMS Android</string>
-    <string name="settings_about_title">Про QKSMS</string>
-    <string name="settings_version">Версія %s</string>
-    <string name="settings_logging_enabled">Ведення журналу зневаження увімкнуте</string>
-    <string name="settings_logging_disabled">Ведення журналу зневаження вимкнуте</string>
-    <string name="settings_delay_duration_hint">Введіть тривалість (у секундах)</string>
-    <string name="blocking_title">Блокування</string>
-    <string name="blocking_drop_title">Видалити повідомлення</string>
-    <string name="blocking_drop_summary">Видаляти вхідні повідомлення від заблокованих відправників, а не приховувати їх</string>
-    <string name="blocking_conversations">Заблоковані бесіди</string>
-    <string name="blocking_manager_title">Керування блокуванням</string>
-    <string name="blocking_manager_qksms_title">QKSMS</string>
-    <string name="blocking_manager_qksms_summary">Вбудована функція блокування QKSMS</string>
-    <string name="blocking_manager_call_control_summary">Автоматична фільтрація дзвінків та повідомлень в одному зручному місці! Community IQ™ дозволить запобігти отримуванню небажаних повідомлень від відомих спільноті спамерів</string>
-    <string name="blocking_manager_sia_summary">Автоматично фільтрувати повідомлення від небажаних номерів, використовуючи додаток «Should I Answer»</string>
-    <string name="blocking_manager_copy_title">Скопіювати заблоковані номери</string>
-    <string name="blocking_manager_copy_summary">Продовжити з %s і записати їх замість наявних заблокованих номерів</string>
-    <string name="blocked_numbers_title">Заблоковані номери</string>
-    <string name="blocked_numbers_empty">Тут з\'являтимуться ваші заблоковані номери</string>
-    <string name="blocked_numbers_add_cd">Заблокувати новий номер</string>
-    <string name="blocked_numbers_dialog_title">Блокувати SMS від</string>
-    <string name="blocked_numbers_dialog_hint">Номер телефону</string>
-    <string name="blocked_numbers_dialog_block">Блокувати</string>
-    <string name="blocked_messages_title">Заблоковані повідомлення</string>
-    <string name="blocked_messages_empty">Ваші заблоковані повідомлення будуть відображатися тут</string>
-    <string name="blocking_block_title">Блокувати</string>
-    <string name="blocking_unblock_title">Розблокувати</string>
-    <plurals name="blocking_block_external">
-        <item quantity="one">Продовжити з %s і заблокувати цей номер</item>
-        <item quantity="few">Продовжити з %s і заблокувати ці номери</item>
-        <item quantity="many">Продовжити з %s і заблокувати ці номери</item>
-        <item quantity="other">Продовжити з %s і заблокувати ці номери</item>
-    </plurals>
-    <plurals name="blocking_unblock_external">
-        <item quantity="one">Перейти до %s на дозволити цей номер</item>
-        <item quantity="few">Перейти до %s на дозволити ці номери</item>
-        <item quantity="many">Перейти до %s на дозволити ці номери</item>
-        <item quantity="other">Перейти до %s на дозволити ці номери</item>
-    </plurals>
-    <string name="about_title">Про додаток</string>
-    <string name="about_version_title">Версія</string>
-    <string name="about_developer_title">Розробник</string>
-    <string name="about_source_title">Вихідний код</string>
-    <string name="about_changelog_title">Журнал змін</string>
-    <string name="about_contact_title">Контакт</string>
-    <string name="about_license_title">Ліцензія</string>
-    <string name="about_copyright_title">Авторське право</string>
-    <string name="qksms_plus_description_title">Підтримати подальший розвиток, розблокувати все</string>
-    <string name="qksms_plus_description_summary">Ви можете врятувати голодуючого розробника всього за %s</string>
-    <!-- Substitutions are for price and currency. Ex: Lifetime upgrade for $1.99 USD -->
-    <string name="qksms_plus_upgrade">Довічне оновлення %1$s %2$s</string>
-    <!-- Substitutions are for price and currency. Ex: Unlock + donate for $4.99 USD -->
-    <string name="qksms_plus_upgrade_donate">Розблокувати + пожертвувати %1$s %2$s</string>
-    <string name="qksms_plus_thanks_title">Дякуємо вам за підтримку QKSMS!</string>
-    <string name="qksms_plus_thanks_summary">Тепер у вас є доступ до всіх функцій QKSMS+</string>
-    <string name="qksms_plus_free_title">QKSMS+ є безкоштовним для користувачів F-Droid! Якщо ви хочете підтримати подальший розвиток програми, зробіть пожертву.</string>
-    <string name="qksms_plus_donate">Пожертвування через PayPal</string>
-    <string name="qksms_plus_coming_soon">Незабаром</string>
-    <string name="qksms_plus_themes_title">Преміум теми</string>
-    <string name="qksms_plus_themes_summary">Розблокуйте гарні кольори теми, недоступні в палітрі Material Design</string>
-    <string name="qksms_plus_emoji_title">Власні авто-emoji</string>
-    <string name="qksms_plus_emoji_summary">Створюйте ярлик власних авто-emoji</string>
-    <string name="qksms_plus_backup_title">Резерв. копіювання</string>
-    <string name="qksms_plus_backup_summary">Автоматично створюйте резервні копії ваших повідомлень. Не переймайтеся, що втратите історію, якщо ви зміните або загубите телефон</string>
-    <string name="qksms_plus_scheduled_title">Заплановані повідомлення</string>
-    <string name="qksms_plus_scheduled_summary">Заплановані повідомлення для надсилання у визначений час та дату</string>
-    <string name="qksms_plus_delayed_title">Відкладене надсилання</string>
-    <string name="qksms_plus_delayed_summary">Зачекайте кілька секунд, перш ніж надсилати повідомлення</string>
-    <string name="qksms_plus_night_title">Автоматичний нічний режим</string>
-    <string name="qksms_plus_night_summary">Увімкнення нічного режиму на основі часу доби</string>
-    <string name="qksms_plus_blacklist_title">Розширене блокування</string>
-    <string name="qksms_plus_blacklist_summary">Блокувати повідомлення, які містять ключові слова або відповідають шаблонам</string>
-    <string name="qksms_plus_forward_title">Автоматичне пересилання</string>
-    <string name="qksms_plus_forward_summary">Автоматичне пересилання повідомлень від певних відправників</string>
-    <string name="qksms_plus_respond_title">Автоматична відповідь</string>
-    <string name="qksms_plus_respond_summary">Автоматично відповідати на вхідні повідомлення за допомогою попередньо налаштованих шаблонів</string>
-    <string name="qksms_plus_more_title">Ще</string>
-    <string name="qksms_plus_more_summary">QKSMS перебуває у активній розробці, і Ваша покупка буде включати в себе всі майбутні можливості QKSMS +!</string>
-    <string name="widget_loading">Завантаження&#8230;</string>
-    <string name="widget_more">Переглянути більше бесід</string>
-    <string name="qkreply_menu_read">Позначити як прочитане</string>
-    <string name="qkreply_menu_call">Зателефонувати</string>
-    <string name="qkreply_menu_delete">Видалити</string>
-    <string name="qkreply_menu_expand">Показати більше</string>
-    <string name="qkreply_menu_collapse">Показати меньше</string>
-    <string name="qkreply_menu_view">Відкрити бесіду</string>
-    <string name="theme_material">Material</string>
-    <string name="theme_hex">HEX</string>
-    <string name="theme_apply">Застосувати</string>
-    <string-array name="notification_actions">
-        <item>Немає</item>
-        <item>Архів</item>
-        <item>Видалити</item>
-        <item>Заблокувати</item>
-        <item>Виклик</item>
-        <item>Позначити як прочитане</item>
-        <item>Відповісти</item>
-    </string-array>
-    <string name="button_yes">Так</string>
-    <string name="button_continue">Продовжити</string>
-    <string name="button_cancel">Скасувати</string>
-    <string name="button_delete">Видалити</string>
-    <string name="button_save">Зберегти</string>
-    <string name="button_stop">Зупинити</string>
-    <string name="button_more">Більше</string>
-    <string name="button_set">Задати</string>
-    <string name="button_undo">Скасувати</string>
-    <string name="toast_copied">Скопійовано</string>
-    <string name="toast_archived">Бесіду заархівовано</string>
-    <string name="toast_qksms_plus">Для використання ви повинні розблокувати QKSMS+</string>
-    <plurals name="notification_new_messages">
-        <item quantity="one">Нове повідомлення</item>
-        <item quantity="few">%s нових повідомлень</item>
-        <item quantity="many">%s нових повідомлень</item>
-        <item quantity="other">%s нових повідомлень</item>
-    </plurals>
-    <string name="notification_message_failed_title">Повідомлення не надіслано</string>
-    <string name="notification_message_failed_text">Не вдалося надіслати повідомлення для %s</string>
-    <string-array name="night_modes">
-        <item>Система</item>
-        <item>Вимкнено</item>
-        <item>Завжди увімкнено</item>
-        <item>Автоматично</item>
-    </string-array>
-    <string-array name="notification_preview_options">
-        <item>Показати ім\'я та повідомлення</item>
-        <item>Показати ім\'я</item>
-        <item>Приховати вміст</item>
-    </string-array>
-    <string-array name="text_sizes">
-        <item>Малий</item>
-        <item>Нормальний</item>
-        <item>Великий</item>
-        <item>Більший</item>
-    </string-array>
-    <string-array name="delayed_sending_labels">
-        <item>Без затримок</item>
-        <item>3 секунди</item>
-        <item>5 секунд</item>
-        <item>10 секунд</item>
-    </string-array>
-    <string-array name="mms_sizes">
-        <item>Автоматично</item>
-        <item>100 Кб</item>
-        <item>200 Кб</item>
-        <item>300 Кб</item>
-        <item>600 Кб</item>
-        <item>1000 Кб</item>
-        <item>2000 Кб</item>
-        <item>Без стиснення</item>
-    </string-array>
-    <string-array name="qk_responses">
-        <item>Добре</item>
-        <item>Одну хвилинку</item>
-        <item>Мені по дорозі</item>
-        <item>Дякую</item>
-        <item>Звучить цікаво</item>
-        <item>Що сталося?</item>
-        <item>Згода</item>
-        <item>Ні</item>
-        <item>Кохаю тебе</item>
-        <item>Вибач</item>
-        <item>LOL</item>
-        <item>Це нормально</item>
-    </string-array>
-</resources>
+<?xml version="1.0" encoding="utf-8"?>
+<!--
+  ~ Copyright (C) 2019 Moez Bhatti <moez.bhatti@gmail.com>
+  ~
+  ~ This file is part of QKSMS.
+  ~
+  ~ QKSMS is free software: you can redistribute it and/or modify
+  ~ it under the terms of the GNU General Public License as published by
+  ~ the Free Software Foundation, either version 3 of the License, or
+  ~ (at your option) any later version.
+  ~
+  ~ QKSMS is distributed in the hope that it will be useful,
+  ~ but WITHOUT ANY WARRANTY; without even the implied warranty of
+  ~ MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+  ~ GNU General Public License for more details.
+  ~
+  ~ You should have received a copy of the GNU General Public License
+  ~ along with QKSMS.  If not, see <http://www.gnu.org/licenses/>.
+  -->
+<resources>
+    <string name="shortcut_compose_long_label">Нова бесіда</string>
+    <string name="shortcut_compose_short_label">Написати</string>
+    <string name="shortcut_compose_disabled_message">Ярлик вимкнуто</string>
+    <string name="title_archived">Архівні</string>
+    <string name="title_settings">Налаштування</string>
+    <string name="title_notification_prefs">Сповіщення</string>
+    <string name="title_theme">Тема</string>
+    <string name="title_conversations">Пошук у вхідних&#8230;</string>
+    <string name="title_compose">Кому: ім\'я або номер</string>
+    <string name="setup_skip">Пропустити</string>
+    <string name="setup_next">Продовжити</string>
+    <string name="menu_add_person">Додати контакт</string>
+    <string name="menu_call">Зателефонувати</string>
+    <string name="menu_info">Деталі</string>
+    <string name="menu_save">Зберегти в галереї</string>
+    <string name="menu_share">Поділитися</string>
+    <string name="main_drawer_open_cd">Відкрити панель навігації</string>
+    <string name="main_title_selected">Обрано: %d</string>
+    <string name="main_menu_clear">Очистити</string>
+    <string name="main_menu_archive">Архівувати</string>
+    <string name="main_menu_unarchive">Розархівувати</string>
+    <string name="main_menu_delete">Видалити</string>
+    <string name="main_menu_add_contact">Додати до контактів</string>
+    <string name="main_menu_pin">Закріпити</string>
+    <string name="main_menu_unpin">Відкріпити</string>
+    <string name="main_menu_read">Позначити як прочитане</string>
+    <string name="main_menu_unread">Позначити як непрочитане</string>
+    <string name="main_menu_block">Блокувати</string>
+    <string name="main_syncing">Синхронізація повідомлень&#8230;</string>
+    <string name="main_sender_you">Ви: %s</string>
+    <string name="main_draft">Чернетка</string>
+    <string name="main_message_results_title">Результати в повідомленнях</string>
+    <string name="main_message_results">Повідомлень: %d</string>
+    <string name="inbox_empty_text">Ваші бесіди з\'являтимуться тут</string>
+    <string name="inbox_search_empty_text">Результатів немає</string>
+    <string name="archived_empty_text">Ваші архівовані бесіди з\'являтимуться тут</string>
+    <string name="main_fab_cd">Почати нову бесіду</string>
+    <string name="main_default_sms_title">Ви знову полюбите писати</string>
+    <string name="main_default_sms_message">Зробити QKSMS початковою програмою для SMS</string>
+    <string name="main_default_sms_change">Встановити</string>
+    <string name="main_permission_required">Вимагається дозвіл</string>
+    <string name="main_permission_sms">Для надсилання та перегляду SMS-повідомлень QKSMS потрібен дозвіл</string>
+    <string name="main_permission_contacts">Для перегляду ваших контактів QKSMS потрібен дозвіл</string>
+    <string name="main_permission_allow">Дозволити</string>
+    <string name="drawer_inbox">Вхідні</string>
+    <string name="drawer_archived">Архівні</string>
+    <string name="drawer_scheduled">Заплановані</string>
+    <string name="drawer_blocking">Блокування</string>
+    <string name="drawer_more">Більше</string>
+    <string name="drawer_settings">Налаштування</string>
+    <string name="drawer_help">Допомога та зворотній зв\'язок</string>
+    <string name="drawer_invite">Запросити друзів</string>
+    <string name="drawer_plus_banner_summary">Розблокувати нові дивовижні можливості та підтримати розробку</string>
+    <string name="rate_title">Подобається QKSMS?</string>
+    <string name="rate_summary">Поділись любов\'ю та оціни нас на Google Play!</string>
+    <string name="rate_okay">Добре!</string>
+    <string name="rate_dismiss">ВІДХИЛИТИ</string>
+    <string name="dialog_delete_title">Видалити</string>
+    <plurals name="dialog_delete_message">
+        <item quantity="one">Ви впевнені, що хочете видалити цю бесіду?</item>
+        <item quantity="few">Ви впевнені, що хочете видалити %d бесіди?</item>
+        <item quantity="many">Ви впевнені, що хочете видалити %d бесід?</item>
+        <item quantity="other">Ви впевнені, що хочете видалити %d бесіди?</item>
+    </plurals>
+    <string-array name="message_options">
+        <item>Скопіювати текст</item>
+        <item>Переслати</item>
+        <item>Видалити</item>
+    </string-array>
+    <string name="compose_number_picker_title">Виберіть номер телефону</string>
+    <string name="compose_number_picker_default">%s ∙ початково</string>
+    <string name="compose_number_picker_once">Один раз</string>
+    <string name="compose_number_picker_always">Завжди</string>
+    <string name="compose_title_selected">Обрано: %d</string>
+    <string name="compose_subtitle_results">%1$d із %2$d результатів</string>
+    <string name="compose_send_group_title">Надіслати як групове повідомлення</string>
+    <string name="compose_send_group_summary">Отримувачі та відповіді будуть видимі для всіх</string>
+    <string name="compose_messages_empty">Це початок вашої бесіди. Скажіть, що-небудь приємне!</string>
+    <string name="compose_vcard_label">Картка контакту</string>
+    <string name="compose_scheduled_for">Заплановано на</string>
+    <string name="compose_scheduled_future">Обраний час повинен бути в майбутньому!</string>
+    <string name="compose_scheduled_plus">Для використання запланованих повідомлень ви повинні розблокувати QKSMS+</string>
+    <string name="compose_scheduled_toast">Додано до запланованих повідомлень</string>
+    <string name="compose_hint">Написати повідомлення&#8230;</string>
+    <string name="compose_menu_copy">Скопіювати текст</string>
+    <string name="compose_menu_forward">Переслати</string>
+    <string name="compose_menu_delete">Видалити</string>
+    <string name="compose_menu_previous">Назад</string>
+    <string name="compose_menu_next">Далі</string>
+    <string name="compose_menu_clear">Очистити</string>
+    <string name="compose_details_title">Деталі повідомлення</string>
+    <string name="compose_details_type">Тип: %s</string>
+    <string name="compose_details_from">Від: %s</string>
+    <string name="compose_details_to">Кому: %s</string>
+    <string name="compose_details_subject">Тема: %s</string>
+    <string name="compose_details_priority">Пріоритет: %s</string>
+    <string name="compose_details_size">Розмір: %s</string>
+    <string name="compose_details_sent">Надіслано: %s</string>
+    <string name="compose_details_received">Отримано: %s</string>
+    <string name="compose_details_delivered">Доставлено: %s</string>
+    <string name="compose_details_error_code">Код помилки: %d</string>
+    <string name="compose_attach_cd">Додати вкладення</string>
+    <string name="compose_gallery_cd">Прикріпити фотографію</string>
+    <string name="compose_camera_cd">Сфотографувати</string>
+    <string name="compose_schedule_cd">Запланувати повідомлення</string>
+    <string name="compose_contact_cd">Прикріпити контакт</string>
+    <string name="compose_contact_error">Помилка читання контакту</string>
+    <!-- Example: SIM 1 (Verizon) selected-->
+    <string name="compose_sim_changed_toast">Обрана SIM-карта %1$d (%2$s)</string>
+    <string name="compose_sim_cd">%s обрано, змініть SIM-картку</string>
+    <string name="compose_send_cd">Надіслати повідомлення</string>
+    <string name="message_status_sending">Надсилання&#8230;</string>
+    <string name="message_status_delivered">Доставлено %s</string>
+    <string name="message_status_failed">Не вдалося надіслати. Торкніться, щоб повторити спробу</string>
+    <string name="info_title">Деталі</string>
+    <string name="info_copied_address">Адреса скопійована</string>
+    <string name="info_name">Заголовок бесіди</string>
+    <string name="info_notifications">Сповіщення</string>
+    <string name="info_theme">Тема</string>
+    <string name="info_archive">Архівувати</string>
+    <string name="info_unarchive">Розархівувати</string>
+    <string name="info_block">Заблокувати</string>
+    <string name="info_unblock">Розблокувати</string>
+    <string name="info_delete">Видалити бесіду</string>
+    <string name="gallery_error">Не вдалося завантажити медіа</string>
+    <string name="gallery_toast_saved">Збережено в галереї</string>
+    <string name="backup_title">Резервне копіювання</string>
+    <string name="backup_backing_up">Резервне копіювання повідомлень</string>
+    <string name="backup_restoring">Відновити з резервної копії</string>
+    <string name="backup_last">Остання резервна копія</string>
+    <string name="backup_loading">Завантаження&#8230;</string>
+    <string name="backup_never">Ніколи</string>
+    <string name="backup_restore_title">Відновити</string>
+    <string name="backup_restore_summary">Оберіть резервну копію</string>
+    <string name="backup_restore_error_plus">Для використання резервного копіювання та відновлення розблокуйте QKSMS+</string>
+    <string name="backup_restore_error_backup">Триває створення резервної копії&#8230;</string>
+    <string name="backup_restore_error_restore">Триває відновлення&#8230;</string>
+    <string name="backup_restore_confirm_title">Відновити з резервної копії</string>
+    <string name="backup_restore_confirm_message">Відновити повідомлення з цієї резервної копії?</string>
+    <string name="backup_restore_stop_title">Зупинити відновлення</string>
+    <string name="backup_restore_stop_message">Повідомлення, які були відновлені залишатимуться на пристрої</string>
+    <string name="backup_restore_dialog_title">Резервні копії</string>
+    <string name="backup_restore_dialog_empty">Резервних копій не знайдено</string>
+    <plurals name="backup_message_count">
+        <item quantity="one">%d повідомлення</item>
+        <item quantity="few">%d повідомлення</item>
+        <item quantity="many">%d повідомлень</item>
+        <item quantity="other">%d повідомлення</item>
+    </plurals>
+    <string name="backup_disclaimer">На даний момент підтримуються лише SMS-повідомлення. Підтримка MMS-повідомлень та створення резервних копій за розкладом буде реалізована незабаром!</string>
+    <string name="backup_now">Створити резервну копію</string>
+    <string name="backup_progress_parsing">Аналіз резервної копії&#8230;</string>
+    <string name="backup_progress_running">%d/%d повідомлень</string>
+    <string name="backup_progress_saving">Збереження резервної копії&#8230;</string>
+    <string name="backup_progress_syncing">Синхронізація повідомлень&#8230;</string>
+    <string name="backup_progress_finished">Готово!</string>
+    <string name="backup_notification_channel_name">Резервне копіювання</string>
+    <string name="scheduled_title">Заплановані</string>
+    <string name="scheduled_empty_description">Автоматично надсилайте повідомлення саме в той час, який ви захочете</string>
+    <string name="scheduled_empty_message_1">Агов! Коли в тебе день народження?</string>
+    <string name="scheduled_empty_message_2">23-го грудня</string>
+    <string name="scheduled_empty_message_3">З Днем народження! Дивись, який я чудовий друг, згадав про твій день народження</string>
+    <!--&#x200A; is a special character required at the end of this string to fix it's formatting in the app -->
+    <string name="scheduled_empty_message_3_timestamp">Надіслано: 23 грудня </string>
+    <string name="scheduled_compose_cd">Запланувати повідомлення</string>
+    <string name="scheduled_options_title">Заплановане повідомлення</string>
+    <string-array name="scheduled_options">
+        <item>Надіслати зараз</item>
+        <item>Копіювати текст</item>
+        <item>Видалити</item>
+    </string-array>
+    <string name="settings_category_appearance">Зовнішній вигляд</string>
+    <string name="settings_category_general">Загальні</string>
+    <string name="settings_category_qkreply">QK Відповідь</string>
+    <string name="settings_theme_title">Тема</string>
+    <string name="settings_night_title">Нічний режим</string>
+    <string name="settings_black_title">Повністю чорний нічний режим</string>
+    <string name="settings_night_start_title">Час початку</string>
+    <string name="settings_night_end_title">Час завершення</string>
+    <string name="settings_automatic_colors_title">Автоматичні кольори контактів</string>
+    <string name="settings_text_size_title">Розмір шрифта</string>
+    <string name="settings_system_font_title">Використовувати системний шрифт</string>
+    <string name="settings_auto_emoji_title">Автоматичні emoji</string>
+    <string name="settings_notifications_title">Сповіщення</string>
+    <string name="settings_notifications_o_summary">Торкніться, щоб налаштувати</string>
+    <string name="settings_notification_actions_title">Дії</string>
+    <string name="settings_notification_action_1">Кнопка 1</string>
+    <string name="settings_notification_action_2">Кнопка 2</string>
+    <string name="settings_notification_action_3">Кнопка 3</string>
+    <string name="settings_notification_previews_title">Попередній перегляд сповіщень</string>
+    <string name="settings_notification_wake_title">Екран заблокований</string>
+    <string name="settings_vibration_title">Вібро</string>
+    <string name="settings_ringtone_title">Звук</string>
+    <string name="settings_ringtone_none">Ні</string>
+    <string name="settings_qkreply_title">QK Відповідь</string>
+    <string name="settings_qkreply_summary">Виринаюче вікно для нових повідомлень</string>
+    <string name="settings_qkreply_tap_dismiss_title">Торкніться, щоб вимкнути</string>
+    <string name="settings_qkreply_tap_dismiss_summary">Торкніться за межами виринаючого вікна, щоб закрити його</string>
+    <string name="settings_delayed_title">Затримка відправлення</string>
+    <string name="settings_swipe_actions">Дії жестів</string>
+    <string name="settings_swipe_actions_summary">Налаштуйте використання жестів для розмови</string>
+    <string name="settings_swipe_actions_right">Провести праворуч</string>
+    <string name="settings_swipe_actions_left">Провести ліворуч</string>
+    <string name="settings_swipe_actions_change">ЗМІНИТИ</string>
+    <string-array name="settings_swipe_actions">
+        <item>Немає</item>
+        <item>Перенести в архів</item>
+        <item>Видалити</item>
+        <item>Заблокувати</item>
+        <item>Виклик</item>
+        <item>Позначити як прочитане</item>
+        <item>Позначити як непрочитане</item>
+    </string-array>
+    <string name="settings_delivery_title">Звіти про доставку</string>
+    <string name="settings_delivery_summary">Підтвердження успішного надсилання повідомлень</string>
+    <string name="settings_signature_title">Підпис</string>
+    <string name="settings_signature_summary">Додавати підпис в кінець ваших повідомлень</string>
+    <string name="settings_unicode_title">Видалити акценти</string>
+    <string name="settings_unicode_summary">Видалення акцентів з символів у вихідних SMS-повідомленнях</string>
+    <string name="settings_mobile_title">Лише номери мобільних</string>
+    <string name="settings_mobile_summary">При написанні повідомлення показувати лише мобільні номери</string>
+    <string name="settings_auto_delete">Автоматично видаляти старі повідомлення</string>
+    <string name="settings_auto_delete_dialog_message">Повідомлення будуть видалені після вказаної кількості днів</string>
+    <string name="settings_auto_delete_dialog_hint">Кількість днів</string>
+    <string name="settings_auto_delete_never">Ніколи</string>
+    <string name="settings_auto_delete_warning">Автоматично видаляти старі повідомлення?</string>
+    <string name="settings_auto_delete_warning_message">Якщо ви продовжите, %1$d повідомлень буде видалено</string>
+    <plurals name="settings_auto_delete_summary">
+        <item quantity="one">Після 1 дня</item>
+        <item quantity="few">Після %d днів</item>
+        <item quantity="many">Після %d днів</item>
+        <item quantity="other">Після %d днів</item>
+    </plurals>
+    <string name="settings_long_as_mms_title">Надсилати довгі повідомлення як MMS</string>
+    <string name="settings_long_as_mms_summary">Якщо частини довгого повідомлення не відправляються або роблять це в хибному порядку, ви можете відправити їх як MMS натомість. Оплата згідно тарифів вашого оператора</string>
+    <string name="settings_mms_size_title">Автоматичне стиснення MMS-вкладень</string>
+    <string name="settings_sync_title">Синхронізація повідомлень</string>
+    <string name="settings_sync_summary">Повторна синхронізація ваших повідомлень з власною базою даних SMS Android</string>
+    <string name="settings_about_title">Про QKSMS</string>
+    <string name="settings_version">Версія %s</string>
+    <string name="settings_logging_enabled">Ведення журналу зневаження увімкнуте</string>
+    <string name="settings_logging_disabled">Ведення журналу зневаження вимкнуте</string>
+    <string name="settings_delay_duration_hint">Введіть тривалість (у секундах)</string>
+    <string name="blocking_title">Блокування</string>
+    <string name="blocking_drop_title">Видалити повідомлення</string>
+    <string name="blocking_drop_summary">Видаляти вхідні повідомлення від заблокованих відправників, а не приховувати їх</string>
+    <string name="blocking_conversations">Заблоковані бесіди</string>
+    <string name="blocking_manager_title">Керування блокуванням</string>
+    <string name="blocking_manager_qksms_title">QKSMS</string>
+    <string name="blocking_manager_qksms_summary">Вбудована функція блокування QKSMS</string>
+    <string name="blocking_manager_call_control_summary">Автоматична фільтрація дзвінків та повідомлень в одному зручному місці! Community IQ™ дозволить запобігти отримуванню небажаних повідомлень від відомих спільноті спамерів</string>
+    <string name="blocking_manager_sia_summary">Автоматично фільтрувати повідомлення від небажаних номерів, використовуючи додаток «Should I Answer»</string>
+    <string name="blocking_manager_copy_title">Скопіювати заблоковані номери</string>
+    <string name="blocking_manager_copy_summary">Продовжити з %s і записати їх замість наявних заблокованих номерів</string>
+    <string name="blocked_numbers_title">Заблоковані номери</string>
+    <string name="blocked_numbers_empty">Тут з\'являтимуться ваші заблоковані номери</string>
+    <string name="blocked_numbers_add_cd">Заблокувати новий номер</string>
+    <string name="blocked_numbers_dialog_title">Блокувати SMS від</string>
+    <string name="blocked_numbers_dialog_hint">Номер телефону</string>
+    <string name="blocked_numbers_dialog_block">Блокувати</string>
+    <string name="blocked_messages_title">Заблоковані повідомлення</string>
+    <string name="blocked_messages_empty">Ваші заблоковані повідомлення будуть відображатися тут</string>
+    <string name="blocking_block_title">Блокувати</string>
+    <string name="blocking_unblock_title">Розблокувати</string>
+    <plurals name="blocking_block_external">
+        <item quantity="one">Продовжити з %s і заблокувати цей номер</item>
+        <item quantity="few">Продовжити з %s і заблокувати ці номери</item>
+        <item quantity="many">Продовжити з %s і заблокувати ці номери</item>
+        <item quantity="other">Продовжити з %s і заблокувати ці номери</item>
+    </plurals>
+    <plurals name="blocking_unblock_external">
+        <item quantity="one">Перейти до %s на дозволити цей номер</item>
+        <item quantity="few">Перейти до %s на дозволити ці номери</item>
+        <item quantity="many">Перейти до %s на дозволити ці номери</item>
+        <item quantity="other">Перейти до %s на дозволити ці номери</item>
+    </plurals>
+    <string name="about_title">Про додаток</string>
+    <string name="about_version_title">Версія</string>
+    <string name="about_developer_title">Розробник</string>
+    <string name="about_source_title">Вихідний код</string>
+    <string name="about_changelog_title">Журнал змін</string>
+    <string name="about_contact_title">Контакт</string>
+    <string name="about_license_title">Ліцензія</string>
+    <string name="about_copyright_title">Авторське право</string>
+    <string name="qksms_plus_description_title">Підтримати подальший розвиток, розблокувати все</string>
+    <string name="qksms_plus_description_summary">Ви можете врятувати голодуючого розробника всього за %s</string>
+    <!-- Substitutions are for price and currency. Ex: Lifetime upgrade for $1.99 USD -->
+    <string name="qksms_plus_upgrade">Довічне оновлення %1$s %2$s</string>
+    <!-- Substitutions are for price and currency. Ex: Unlock + donate for $4.99 USD -->
+    <string name="qksms_plus_upgrade_donate">Розблокувати + пожертвувати %1$s %2$s</string>
+    <string name="qksms_plus_thanks_title">Дякуємо вам за підтримку QKSMS!</string>
+    <string name="qksms_plus_thanks_summary">Тепер у вас є доступ до всіх функцій QKSMS+</string>
+    <string name="qksms_plus_free_title">QKSMS+ є безкоштовним для користувачів F-Droid! Якщо ви хочете підтримати подальший розвиток програми, зробіть пожертву.</string>
+    <string name="qksms_plus_donate">Пожертвування через PayPal</string>
+    <string name="qksms_plus_coming_soon">Незабаром</string>
+    <string name="qksms_plus_themes_title">Преміум теми</string>
+    <string name="qksms_plus_themes_summary">Розблокуйте гарні кольори теми, недоступні в палітрі Material Design</string>
+    <string name="qksms_plus_emoji_title">Власні авто-emoji</string>
+    <string name="qksms_plus_emoji_summary">Створюйте ярлик власних авто-emoji</string>
+    <string name="qksms_plus_backup_title">Резерв. копіювання</string>
+    <string name="qksms_plus_backup_summary">Автоматично створюйте резервні копії ваших повідомлень. Не переймайтеся, що втратите історію, якщо ви зміните або загубите телефон</string>
+    <string name="qksms_plus_scheduled_title">Заплановані повідомлення</string>
+    <string name="qksms_plus_scheduled_summary">Заплановані повідомлення для надсилання у визначений час та дату</string>
+    <string name="qksms_plus_delayed_title">Відкладене надсилання</string>
+    <string name="qksms_plus_delayed_summary">Зачекайте кілька секунд, перш ніж надсилати повідомлення</string>
+    <string name="qksms_plus_night_title">Автоматичний нічний режим</string>
+    <string name="qksms_plus_night_summary">Увімкнення нічного режиму на основі часу доби</string>
+    <string name="qksms_plus_blacklist_title">Розширене блокування</string>
+    <string name="qksms_plus_blacklist_summary">Блокувати повідомлення, які містять ключові слова або відповідають шаблонам</string>
+    <string name="qksms_plus_forward_title">Автоматичне пересилання</string>
+    <string name="qksms_plus_forward_summary">Автоматичне пересилання повідомлень від певних відправників</string>
+    <string name="qksms_plus_respond_title">Автоматична відповідь</string>
+    <string name="qksms_plus_respond_summary">Автоматично відповідати на вхідні повідомлення за допомогою попередньо налаштованих шаблонів</string>
+    <string name="qksms_plus_more_title">Ще</string>
+    <string name="qksms_plus_more_summary">QKSMS перебуває у активній розробці, і Ваша покупка буде включати в себе всі майбутні можливості QKSMS +!</string>
+    <string name="widget_loading">Завантаження&#8230;</string>
+    <string name="widget_more">Переглянути більше бесід</string>
+    <string name="qkreply_menu_read">Позначити як прочитане</string>
+    <string name="qkreply_menu_call">Зателефонувати</string>
+    <string name="qkreply_menu_delete">Видалити</string>
+    <string name="qkreply_menu_expand">Показати більше</string>
+    <string name="qkreply_menu_collapse">Показати меньше</string>
+    <string name="qkreply_menu_view">Відкрити бесіду</string>
+    <string name="theme_material">Material</string>
+    <string name="theme_hex">HEX</string>
+    <string name="theme_apply">Застосувати</string>
+    <string-array name="notification_actions">
+        <item>Немає</item>
+        <item>Архів</item>
+        <item>Видалити</item>
+        <item>Заблокувати</item>
+        <item>Виклик</item>
+        <item>Позначити як прочитане</item>
+        <item>Відповісти</item>
+    </string-array>
+    <string name="button_yes">Так</string>
+    <string name="button_continue">Продовжити</string>
+    <string name="button_cancel">Скасувати</string>
+    <string name="button_delete">Видалити</string>
+    <string name="button_save">Зберегти</string>
+    <string name="button_stop">Зупинити</string>
+    <string name="button_more">Більше</string>
+    <string name="button_set">Задати</string>
+    <string name="button_undo">Скасувати</string>
+    <string name="toast_copied">Скопійовано</string>
+    <string name="toast_archived">Бесіду заархівовано</string>
+    <string name="toast_qksms_plus">Для використання ви повинні розблокувати QKSMS+</string>
+    <plurals name="notification_new_messages">
+        <item quantity="one">Нове повідомлення</item>
+        <item quantity="few">%s нових повідомлень</item>
+        <item quantity="many">%s нових повідомлень</item>
+        <item quantity="other">%s нових повідомлень</item>
+    </plurals>
+    <string name="notification_message_failed_title">Повідомлення не надіслано</string>
+    <string name="notification_message_failed_text">Не вдалося надіслати повідомлення для %s</string>
+    <string-array name="night_modes">
+        <item>Система</item>
+        <item>Вимкнено</item>
+        <item>Завжди увімкнено</item>
+        <item>Автоматично</item>
+    </string-array>
+    <string-array name="notification_preview_options">
+        <item>Показати ім\'я та повідомлення</item>
+        <item>Показати ім\'я</item>
+        <item>Приховати вміст</item>
+    </string-array>
+    <string-array name="text_sizes">
+        <item>Малий</item>
+        <item>Нормальний</item>
+        <item>Великий</item>
+        <item>Більший</item>
+    </string-array>
+    <string-array name="delayed_sending_labels">
+        <item>Без затримок</item>
+        <item>3 секунди</item>
+        <item>5 секунд</item>
+        <item>10 секунд</item>
+    </string-array>
+    <string-array name="mms_sizes">
+        <item>Автоматично</item>
+        <item>100 Кб</item>
+        <item>200 Кб</item>
+        <item>300 Кб</item>
+        <item>600 Кб</item>
+        <item>1000 Кб</item>
+        <item>2000 Кб</item>
+        <item>Без стиснення</item>
+    </string-array>
+    <string-array name="qk_responses">
+        <item>Добре</item>
+        <item>Одну хвилинку</item>
+        <item>Мені по дорозі</item>
+        <item>Дякую</item>
+        <item>Звучить цікаво</item>
+        <item>Що сталося?</item>
+        <item>Згода</item>
+        <item>Ні</item>
+        <item>Кохаю тебе</item>
+        <item>Вибач</item>
+        <item>LOL</item>
+        <item>Це нормально</item>
+    </string-array>
+</resources>
diff --git a/presentation/src/main/res/values-ur/strings.xml b/presentation/src/main/res/values-ur/strings.xml
index aa94dc935..8ddf091ef 100644
--- a/presentation/src/main/res/values-ur/strings.xml
+++ b/presentation/src/main/res/values-ur/strings.xml
@@ -1,411 +1,411 @@
-<?xml version="1.0" encoding="utf-8"?>
-<!--
-  ~ Copyright (C) 2019 Moez Bhatti <moez.bhatti@gmail.com>
-  ~
-  ~ This file is part of QKSMS.
-  ~
-  ~ QKSMS is free software: you can redistribute it and/or modify
-  ~ it under the terms of the GNU General Public License as published by
-  ~ the Free Software Foundation, either version 3 of the License, or
-  ~ (at your option) any later version.
-  ~
-  ~ QKSMS is distributed in the hope that it will be useful,
-  ~ but WITHOUT ANY WARRANTY; without even the implied warranty of
-  ~ MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
-  ~ GNU General Public License for more details.
-  ~
-  ~ You should have received a copy of the GNU General Public License
-  ~ along with QKSMS.  If not, see <http://www.gnu.org/licenses/>.
-  -->
-<resources>
-    <string name="shortcut_compose_long_label">New conversation</string>
-    <string name="shortcut_compose_short_label">Compose</string>
-    <string name="shortcut_compose_disabled_message">Shortcut disabled</string>
-    <string name="title_archived">Archived</string>
-    <string name="title_settings">Settings</string>
-    <string name="title_notification_prefs">Notifications</string>
-    <string name="title_theme">Theme</string>
-    <string name="title_conversations">Search inbox&#8230;</string>
-    <string name="title_compose">Type a name or number</string>
-    <string name="setup_skip">Skip</string>
-    <string name="setup_next">Continue</string>
-    <string name="menu_add_person">Add person</string>
-    <string name="menu_call">Call</string>
-    <string name="menu_info">Details</string>
-    <string name="menu_save">Save to gallery</string>
-    <string name="menu_share">Share</string>
-    <string name="main_drawer_open_cd">Open navigation drawer</string>
-    <string name="main_title_selected">%d selected</string>
-    <string name="main_menu_clear">Clear</string>
-    <string name="main_menu_archive">Archive</string>
-    <string name="main_menu_unarchive">Unarchive</string>
-    <string name="main_menu_delete">Delete</string>
-    <string name="main_menu_add_contact">Add to contacts</string>
-    <string name="main_menu_pin">Pin to top</string>
-    <string name="main_menu_unpin">Unpin</string>
-    <string name="main_menu_read">Mark read</string>
-    <string name="main_menu_unread">Mark unread</string>
-    <string name="main_menu_block">Block</string>
-    <string name="main_syncing">Syncing messages&#8230;</string>
-    <string name="main_sender_you">You: %s</string>
-    <string name="main_draft">Draft</string>
-    <string name="main_message_results_title">Results in messages</string>
-    <string name="main_message_results">%d messages</string>
-    <string name="inbox_empty_text">Your conversations will appear here</string>
-    <string name="inbox_search_empty_text">No results</string>
-    <string name="archived_empty_text">Your archived conversations will appear here</string>
-    <string name="main_fab_cd">Start new conversation</string>
-    <string name="main_default_sms_title">Love texting again</string>
-    <string name="main_default_sms_message">Make QKSMS your default SMS app</string>
-    <string name="main_default_sms_change">Change</string>
-    <string name="main_permission_required">Permission required</string>
-    <string name="main_permission_sms">QKSMS needs permission to send and view SMS messages</string>
-    <string name="main_permission_contacts">QKSMS needs permission to view your contacts</string>
-    <string name="main_permission_allow">Allow</string>
-    <string name="drawer_inbox">Inbox</string>
-    <string name="drawer_archived">Archived</string>
-    <string name="drawer_scheduled">Scheduled</string>
-    <string name="drawer_blocking">Blocking</string>
-    <string name="drawer_more">More</string>
-    <string name="drawer_settings">Settings</string>
-    <string name="drawer_help">Help &amp; feedback</string>
-    <string name="drawer_invite">Invite friends</string>
-    <string name="drawer_plus_banner_summary">Unlock amazing new features, and support development</string>
-    <string name="rate_title">Enjoying QKSMS?</string>
-    <string name="rate_summary">Share some love and rate us on Google Play!</string>
-    <string name="rate_okay">OKAY!</string>
-    <string name="rate_dismiss">DISMISS</string>
-    <string name="dialog_delete_title">Delete</string>
-    <plurals name="dialog_delete_message">
-        <item quantity="one">Are you sure you would like to delete this conversation?</item>
-        <item quantity="other">Are you sure you would like to delete %d conversations?</item>
-    </plurals>
-    <string-array name="message_options">
-        <item>Copy text</item>
-        <item>Forward</item>
-        <item>Delete</item>
-    </string-array>
-    <string name="compose_number_picker_title">Choose a phone number</string>
-    <string name="compose_number_picker_default">%s ∙ Default</string>
-    <string name="compose_number_picker_once">Just once</string>
-    <string name="compose_number_picker_always">Always</string>
-    <string name="compose_title_selected">%d selected</string>
-    <string name="compose_subtitle_results">%1$d of %2$d results</string>
-    <string name="compose_send_group_title">Send as group message</string>
-    <string name="compose_send_group_summary">Recipients and replies will be visible to everyone</string>
-    <string name="compose_messages_empty">This is the start of your conversation. Say something nice!</string>
-    <string name="compose_vcard_label">Contact card</string>
-    <string name="compose_scheduled_for">Scheduled for</string>
-    <string name="compose_scheduled_future">Selected time must be in the future!</string>
-    <string name="compose_scheduled_plus">You must unlock QKSMS+ to use scheduled messaging</string>
-    <string name="compose_scheduled_toast">Added to scheduled messages</string>
-    <string name="compose_hint">Write a message&#8230;</string>
-    <string name="compose_menu_copy">Copy text</string>
-    <string name="compose_menu_forward">Forward</string>
-    <string name="compose_menu_delete">Delete</string>
-    <string name="compose_menu_previous">Previous</string>
-    <string name="compose_menu_next">Next</string>
-    <string name="compose_menu_clear">Clear</string>
-    <string name="compose_details_title">Message details</string>
-    <string name="compose_details_type">Type: %s</string>
-    <string name="compose_details_from">From: %s</string>
-    <string name="compose_details_to">To: %s</string>
-    <string name="compose_details_subject">Subject: %s</string>
-    <string name="compose_details_priority">Priority: %s</string>
-    <string name="compose_details_size">Size: %s</string>
-    <string name="compose_details_sent">Sent: %s</string>
-    <string name="compose_details_received">Received: %s</string>
-    <string name="compose_details_delivered">Delivered: %s</string>
-    <string name="compose_details_error_code">Error code: %d</string>
-    <string name="compose_attach_cd">Add an attachment</string>
-    <string name="compose_gallery_cd">Attach a photo</string>
-    <string name="compose_camera_cd">Take a photo</string>
-    <string name="compose_schedule_cd">Schedule message</string>
-    <string name="compose_contact_cd">Attach a contact</string>
-    <string name="compose_contact_error">Error reading contact</string>
-    <!-- Example: SIM 1 (Verizon) selected-->
-    <string name="compose_sim_changed_toast">SIM %1$d (%2$s) selected</string>
-    <string name="compose_sim_cd">%s selected, change SIM card</string>
-    <string name="compose_send_cd">Send message</string>
-    <string name="message_status_sending">Sending&#8230;</string>
-    <string name="message_status_delivered">Delivered %s</string>
-    <string name="message_status_failed">Failed to send. Tap to try again</string>
-    <string name="info_title">Details</string>
-    <string name="info_copied_address">Address copied</string>
-    <string name="info_name">Conversation title</string>
-    <string name="info_notifications">Notifications</string>
-    <string name="info_theme">Theme</string>
-    <string name="info_archive">Archive</string>
-    <string name="info_unarchive">Unarchive</string>
-    <string name="info_block">Block</string>
-    <string name="info_unblock">Unblock</string>
-    <string name="info_delete">Delete conversation</string>
-    <string name="gallery_error">Couldn\'t load media</string>
-    <string name="gallery_toast_saved">Saved to gallery</string>
-    <string name="backup_title">Backup and restore</string>
-    <string name="backup_backing_up">Backing up messages</string>
-    <string name="backup_restoring">Restoring from backup</string>
-    <string name="backup_last">Last backup</string>
-    <string name="backup_loading">Loading&#8230;</string>
-    <string name="backup_never">Never</string>
-    <string name="backup_restore_title">Restore</string>
-    <string name="backup_restore_summary">Select a backup</string>
-    <string name="backup_restore_error_plus">Please unlock QKSMS+ to use backup and restore</string>
-    <string name="backup_restore_error_backup">Backup in progress&#8230;</string>
-    <string name="backup_restore_error_restore">Restore in progress&#8230;</string>
-    <string name="backup_restore_confirm_title">Restore from backup</string>
-    <string name="backup_restore_confirm_message">Are you sure you would like to restore your messages from this backup?</string>
-    <string name="backup_restore_stop_title">Stop restore</string>
-    <string name="backup_restore_stop_message">Messages that have already been restored will remain on your device</string>
-    <string name="backup_restore_dialog_title">Backups</string>
-    <string name="backup_restore_dialog_empty">No backups found</string>
-    <plurals name="backup_message_count">
-        <item quantity="one">%d message</item>
-        <item quantity="other">%d messages</item>
-    </plurals>
-    <string name="backup_disclaimer">Currently, only SMS is supported by Backup and Restore. MMS support and scheduled backups will be coming soon!</string>
-    <string name="backup_now">Backup now</string>
-    <string name="backup_progress_parsing">Parsing backup&#8230;</string>
-    <string name="backup_progress_running">%d/%d messages</string>
-    <string name="backup_progress_saving">Saving backup&#8230;</string>
-    <string name="backup_progress_syncing">Syncing messages&#8230;</string>
-    <string name="backup_progress_finished">Finished!</string>
-    <string name="backup_notification_channel_name">Backup and restore</string>
-    <string name="scheduled_title">Scheduled</string>
-    <string name="scheduled_empty_description">Automatically send a message, at the exact moment you\'d like</string>
-    <string name="scheduled_empty_message_1">Hey! When was your birthday again?</string>
-    <string name="scheduled_empty_message_2">It\'s on December 23rd</string>
-    <string name="scheduled_empty_message_3">Happy birthday! Look at what a great friend I am, remembering your birthday</string>
-    <!--&#x200A; is a special character required at the end of this string to fix it's formatting in the app -->
-    <string name="scheduled_empty_message_3_timestamp">Sending on December 23rd </string>
-    <string name="scheduled_compose_cd">Schedule a message</string>
-    <string name="scheduled_options_title">Scheduled message</string>
-    <string-array name="scheduled_options">
-        <item>Send now</item>
-        <item>Copy text</item>
-        <item>Delete</item>
-    </string-array>
-    <string name="settings_category_appearance">Appearance</string>
-    <string name="settings_category_general">General</string>
-    <string name="settings_category_qkreply">QK Reply</string>
-    <string name="settings_theme_title">Theme</string>
-    <string name="settings_night_title">Night mode</string>
-    <string name="settings_black_title">Pure black night mode</string>
-    <string name="settings_night_start_title">Start time</string>
-    <string name="settings_night_end_title">End time</string>
-    <string name="settings_automatic_colors_title">Automatic contact colors</string>
-    <string name="settings_text_size_title">Font size</string>
-    <string name="settings_system_font_title">Use system font</string>
-    <string name="settings_auto_emoji_title">Automatic emoji</string>
-    <string name="settings_notifications_title">Notifications</string>
-    <string name="settings_notifications_o_summary">Tap to customize</string>
-    <string name="settings_notification_actions_title">Actions</string>
-    <string name="settings_notification_action_1">Button 1</string>
-    <string name="settings_notification_action_2">Button 2</string>
-    <string name="settings_notification_action_3">Button 3</string>
-    <string name="settings_notification_previews_title">Notification previews</string>
-    <string name="settings_notification_wake_title">Wake screen</string>
-    <string name="settings_vibration_title">Vibration</string>
-    <string name="settings_ringtone_title">Sound</string>
-    <string name="settings_ringtone_none">None</string>
-    <string name="settings_qkreply_title">QK Reply</string>
-    <string name="settings_qkreply_summary">Popup for new messages</string>
-    <string name="settings_qkreply_tap_dismiss_title">Tap to dismiss</string>
-    <string name="settings_qkreply_tap_dismiss_summary">Tap outside of the popup to close it</string>
-    <string name="settings_delayed_title">Delayed sending</string>
-    <string name="settings_swipe_actions">Swipe actions</string>
-    <string name="settings_swipe_actions_summary">Configure swipe actions for conversations</string>
-    <string name="settings_swipe_actions_right">Right swipe</string>
-    <string name="settings_swipe_actions_left">Left swipe</string>
-    <string name="settings_swipe_actions_change">CHANGE</string>
-    <string-array name="settings_swipe_actions">
-        <item>None</item>
-        <item>Archive</item>
-        <item>Delete</item>
-        <item>Block</item>
-        <item>Call</item>
-        <item>Mark read</item>
-        <item>Mark unread</item>
-    </string-array>
-    <string name="settings_delivery_title">Delivery confirmations</string>
-    <string name="settings_delivery_summary">Confirm that messages were sent successfully</string>
-    <string name="settings_signature_title">Signature</string>
-    <string name="settings_signature_summary">Add a signature to the end of your messages</string>
-    <string name="settings_unicode_title">Strip accents</string>
-    <string name="settings_unicode_summary">Remove accents from characters in outgoing SMS messages</string>
-    <string name="settings_mobile_title">Mobile numbers only</string>
-    <string name="settings_mobile_summary">When composing a message, only show mobile numbers</string>
-    <string name="settings_auto_delete">Delete old messages automatically</string>
-    <string name="settings_auto_delete_dialog_message">Messages will be deleted after the specified number of days</string>
-    <string name="settings_auto_delete_dialog_hint">Number of days</string>
-    <string name="settings_auto_delete_never">Never</string>
-    <string name="settings_auto_delete_warning">Delete old messages automatically?</string>
-    <string name="settings_auto_delete_warning_message">If you proceed, %1$d messages will be deleted now</string>
-    <plurals name="settings_auto_delete_summary">
-        <item quantity="one">After 1 day</item>
-        <item quantity="other">After %d days</item>
-    </plurals>
-    <string name="settings_long_as_mms_title">Send long messages as MMS</string>
-    <string name="settings_long_as_mms_summary">If your longer text messages are failing to send, or sending in the wrong order, you can send them as MMS messages instead. Additional charges may apply</string>
-    <string name="settings_mms_size_title">Auto-compress MMS attachments</string>
-    <string name="settings_sync_title">Sync messages</string>
-    <string name="settings_sync_summary">Re-sync your messages with the native Android SMS database</string>
-    <string name="settings_about_title">About QKSMS</string>
-    <string name="settings_version">Version %s</string>
-    <string name="settings_logging_enabled">Debug logging enabled</string>
-    <string name="settings_logging_disabled">Debug logging disabled</string>
-    <string name="settings_delay_duration_hint">Enter duration (seconds)</string>
-    <string name="blocking_title">Blocking</string>
-    <string name="blocking_drop_title">Drop messages</string>
-    <string name="blocking_drop_summary">Drop incoming messages from blocked senders instead of hiding them</string>
-    <string name="blocking_conversations">Blocked conversations</string>
-    <string name="blocking_manager_title">Blocking Manager</string>
-    <string name="blocking_manager_qksms_title">QKSMS</string>
-    <string name="blocking_manager_qksms_summary">Built-in blocking functionality in QKSMS</string>
-    <string name="blocking_manager_call_control_summary">Automatically filter your calls and messages in one convenient place! Community IQ™ allows you to prevent unwanted messages from community known spammers</string>
-    <string name="blocking_manager_sia_summary">Automatically filter messages from unsolicited numbers by using the \"Should I Answer\" app</string>
-    <string name="blocking_manager_copy_title">Copy blocked numbers</string>
-    <string name="blocking_manager_copy_summary">Continue to %s and copy over your existing blocked numbers</string>
-    <string name="blocked_numbers_title">Blocked numbers</string>
-    <string name="blocked_numbers_empty">Your blocked numbers will appear here</string>
-    <string name="blocked_numbers_add_cd">Block a new number</string>
-    <string name="blocked_numbers_dialog_title">Block texts from</string>
-    <string name="blocked_numbers_dialog_hint">Phone number</string>
-    <string name="blocked_numbers_dialog_block">Block</string>
-    <string name="blocked_messages_title">Blocked messages</string>
-    <string name="blocked_messages_empty">Your blocked messages will appear here</string>
-    <string name="blocking_block_title">Block</string>
-    <string name="blocking_unblock_title">Unblock</string>
-    <plurals name="blocking_block_external">
-        <item quantity="one">Continue to %s and block this number</item>
-        <item quantity="other">Continue to %s and block these numbers</item>
-    </plurals>
-    <plurals name="blocking_unblock_external">
-        <item quantity="one">Continue to %s and allow this number</item>
-        <item quantity="other">Continue to %s and allow these numbers</item>
-    </plurals>
-    <string name="about_title">About</string>
-    <string name="about_version_title">Version</string>
-    <string name="about_developer_title">Developer</string>
-    <string name="about_source_title">Source code</string>
-    <string name="about_changelog_title">Changelog</string>
-    <string name="about_contact_title">Contact</string>
-    <string name="about_license_title">License</string>
-    <string name="about_copyright_title">Copyright</string>
-    <string name="qksms_plus_description_title">Support development, unlock everything</string>
-    <string name="qksms_plus_description_summary">You can save a starving developer for just %s</string>
-    <!-- Substitutions are for price and currency. Ex: Lifetime upgrade for $1.99 USD -->
-    <string name="qksms_plus_upgrade">Lifetime upgrade for %1$s %2$s</string>
-    <!-- Substitutions are for price and currency. Ex: Unlock + donate for $4.99 USD -->
-    <string name="qksms_plus_upgrade_donate">Unlock + donate for %1$s %2$s</string>
-    <string name="qksms_plus_thanks_title">Thank you for supporting QKSMS!</string>
-    <string name="qksms_plus_thanks_summary">You now have access to all QKSMS+ features</string>
-    <string name="qksms_plus_free_title">QKSMS+ is free for F-Droid users! If you\'d like to support development, a donation would be highly appreciated.</string>
-    <string name="qksms_plus_donate">Donate via PayPal</string>
-    <string name="qksms_plus_coming_soon">Coming soon</string>
-    <string name="qksms_plus_themes_title">Premium themes</string>
-    <string name="qksms_plus_themes_summary">Unlock beautiful theme colors not available on the Material Design palette</string>
-    <string name="qksms_plus_emoji_title">Custom auto-emoji</string>
-    <string name="qksms_plus_emoji_summary">Create custom auto-emoji shortcuts</string>
-    <string name="qksms_plus_backup_title">Message backup</string>
-    <string name="qksms_plus_backup_summary">Automatically back up your messages. Never again worry about losing your history if you change phones or your phone gets lost</string>
-    <string name="qksms_plus_scheduled_title">Scheduled messages</string>
-    <string name="qksms_plus_scheduled_summary">Schedule messages to automatically be sent at a specific time and date</string>
-    <string name="qksms_plus_delayed_title">Delayed sending</string>
-    <string name="qksms_plus_delayed_summary">Wait a few seconds before sending your message</string>
-    <string name="qksms_plus_night_title">Automatic night mode</string>
-    <string name="qksms_plus_night_summary">Enable night mode based on the time of day</string>
-    <string name="qksms_plus_blacklist_title">Advanced blocking</string>
-    <string name="qksms_plus_blacklist_summary">Block messages that contain keywords or match patterns</string>
-    <string name="qksms_plus_forward_title">Auto-forward</string>
-    <string name="qksms_plus_forward_summary">Automatically forward messages from certain senders</string>
-    <string name="qksms_plus_respond_title">Auto-respond</string>
-    <string name="qksms_plus_respond_summary">Automatically respond to incoming messages with a preset response</string>
-    <string name="qksms_plus_more_title">More</string>
-    <string name="qksms_plus_more_summary">QKSMS is under active development, and your purchase will include all future QKSMS+ features!</string>
-    <string name="widget_loading">Loading&#8230;</string>
-    <string name="widget_more">View more conversations</string>
-    <string name="qkreply_menu_read">Mark read</string>
-    <string name="qkreply_menu_call">Call</string>
-    <string name="qkreply_menu_delete">Delete</string>
-    <string name="qkreply_menu_expand">Show more</string>
-    <string name="qkreply_menu_collapse">Show less</string>
-    <string name="qkreply_menu_view">Open conversation</string>
-    <string name="theme_material">Material</string>
-    <string name="theme_hex">HEX</string>
-    <string name="theme_apply">Apply</string>
-    <string-array name="notification_actions">
-        <item>None</item>
-        <item>Archive</item>
-        <item>Delete</item>
-        <item>Block</item>
-        <item>Call</item>
-        <item>Mark read</item>
-        <item>Reply</item>
-    </string-array>
-    <string name="button_yes">Yes</string>
-    <string name="button_continue">Continue</string>
-    <string name="button_cancel">Cancel</string>
-    <string name="button_delete">Delete</string>
-    <string name="button_save">Save</string>
-    <string name="button_stop">Stop</string>
-    <string name="button_more">More</string>
-    <string name="button_set">Set</string>
-    <string name="button_undo">Undo</string>
-    <string name="toast_copied">Copied</string>
-    <string name="toast_archived">Archived conversation</string>
-    <string name="toast_qksms_plus">You must unlock QKSMS+ to use this</string>
-    <plurals name="notification_new_messages">
-        <item quantity="one">New message</item>
-        <item quantity="other">%s new messages</item>
-    </plurals>
-    <string name="notification_message_failed_title">Message not sent</string>
-    <string name="notification_message_failed_text">The message to %s failed to send</string>
-    <string-array name="night_modes">
-        <item>System</item>
-        <item>Disabled</item>
-        <item>Always on</item>
-        <item>Automatic</item>
-    </string-array>
-    <string-array name="notification_preview_options">
-        <item>Show name and message</item>
-        <item>Show name</item>
-        <item>Hide contents</item>
-    </string-array>
-    <string-array name="text_sizes">
-        <item>Small</item>
-        <item>Normal</item>
-        <item>Large</item>
-        <item>Larger</item>
-    </string-array>
-    <string-array name="delayed_sending_labels">
-        <item>No delay</item>
-        <item>3 seconds</item>
-        <item>5 seconds</item>
-        <item>10 seconds</item>
-    </string-array>
-    <string-array name="mms_sizes">
-        <item>Automatic</item>
-        <item>100KB</item>
-        <item>200KB</item>
-        <item>300KB</item>
-        <item>600KB</item>
-        <item>1000KB</item>
-        <item>2000KB</item>
-        <item>No compression</item>
-    </string-array>
-    <string-array name="qk_responses">
-        <item>Okay</item>
-        <item>Give me a moment</item>
-        <item>On my way</item>
-        <item>Thanks</item>
-        <item>Sounds good</item>
-        <item>What\'s up?</item>
-        <item>Agreed</item>
-        <item>No</item>
-        <item>Love you</item>
-        <item>Sorry</item>
-        <item>LOL</item>
-        <item>That\'s okay</item>
-    </string-array>
-</resources>
+<?xml version="1.0" encoding="utf-8"?>
+<!--
+  ~ Copyright (C) 2019 Moez Bhatti <moez.bhatti@gmail.com>
+  ~
+  ~ This file is part of QKSMS.
+  ~
+  ~ QKSMS is free software: you can redistribute it and/or modify
+  ~ it under the terms of the GNU General Public License as published by
+  ~ the Free Software Foundation, either version 3 of the License, or
+  ~ (at your option) any later version.
+  ~
+  ~ QKSMS is distributed in the hope that it will be useful,
+  ~ but WITHOUT ANY WARRANTY; without even the implied warranty of
+  ~ MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+  ~ GNU General Public License for more details.
+  ~
+  ~ You should have received a copy of the GNU General Public License
+  ~ along with QKSMS.  If not, see <http://www.gnu.org/licenses/>.
+  -->
+<resources>
+    <string name="shortcut_compose_long_label">New conversation</string>
+    <string name="shortcut_compose_short_label">Compose</string>
+    <string name="shortcut_compose_disabled_message">Shortcut disabled</string>
+    <string name="title_archived">Archived</string>
+    <string name="title_settings">Settings</string>
+    <string name="title_notification_prefs">Notifications</string>
+    <string name="title_theme">Theme</string>
+    <string name="title_conversations">Search inbox&#8230;</string>
+    <string name="title_compose">Type a name or number</string>
+    <string name="setup_skip">Skip</string>
+    <string name="setup_next">Continue</string>
+    <string name="menu_add_person">Add person</string>
+    <string name="menu_call">Call</string>
+    <string name="menu_info">Details</string>
+    <string name="menu_save">Save to gallery</string>
+    <string name="menu_share">Share</string>
+    <string name="main_drawer_open_cd">Open navigation drawer</string>
+    <string name="main_title_selected">%d selected</string>
+    <string name="main_menu_clear">Clear</string>
+    <string name="main_menu_archive">Archive</string>
+    <string name="main_menu_unarchive">Unarchive</string>
+    <string name="main_menu_delete">Delete</string>
+    <string name="main_menu_add_contact">Add to contacts</string>
+    <string name="main_menu_pin">Pin to top</string>
+    <string name="main_menu_unpin">Unpin</string>
+    <string name="main_menu_read">Mark read</string>
+    <string name="main_menu_unread">Mark unread</string>
+    <string name="main_menu_block">Block</string>
+    <string name="main_syncing">Syncing messages&#8230;</string>
+    <string name="main_sender_you">You: %s</string>
+    <string name="main_draft">Draft</string>
+    <string name="main_message_results_title">Results in messages</string>
+    <string name="main_message_results">%d messages</string>
+    <string name="inbox_empty_text">Your conversations will appear here</string>
+    <string name="inbox_search_empty_text">No results</string>
+    <string name="archived_empty_text">Your archived conversations will appear here</string>
+    <string name="main_fab_cd">Start new conversation</string>
+    <string name="main_default_sms_title">Love texting again</string>
+    <string name="main_default_sms_message">Make QKSMS your default SMS app</string>
+    <string name="main_default_sms_change">Change</string>
+    <string name="main_permission_required">Permission required</string>
+    <string name="main_permission_sms">QKSMS needs permission to send and view SMS messages</string>
+    <string name="main_permission_contacts">QKSMS needs permission to view your contacts</string>
+    <string name="main_permission_allow">Allow</string>
+    <string name="drawer_inbox">Inbox</string>
+    <string name="drawer_archived">Archived</string>
+    <string name="drawer_scheduled">Scheduled</string>
+    <string name="drawer_blocking">Blocking</string>
+    <string name="drawer_more">More</string>
+    <string name="drawer_settings">Settings</string>
+    <string name="drawer_help">Help &amp; feedback</string>
+    <string name="drawer_invite">Invite friends</string>
+    <string name="drawer_plus_banner_summary">Unlock amazing new features, and support development</string>
+    <string name="rate_title">Enjoying QKSMS?</string>
+    <string name="rate_summary">Share some love and rate us on Google Play!</string>
+    <string name="rate_okay">OKAY!</string>
+    <string name="rate_dismiss">DISMISS</string>
+    <string name="dialog_delete_title">Delete</string>
+    <plurals name="dialog_delete_message">
+        <item quantity="one">Are you sure you would like to delete this conversation?</item>
+        <item quantity="other">Are you sure you would like to delete %d conversations?</item>
+    </plurals>
+    <string-array name="message_options">
+        <item>Copy text</item>
+        <item>Forward</item>
+        <item>Delete</item>
+    </string-array>
+    <string name="compose_number_picker_title">Choose a phone number</string>
+    <string name="compose_number_picker_default">%s ∙ Default</string>
+    <string name="compose_number_picker_once">Just once</string>
+    <string name="compose_number_picker_always">Always</string>
+    <string name="compose_title_selected">%d selected</string>
+    <string name="compose_subtitle_results">%1$d of %2$d results</string>
+    <string name="compose_send_group_title">Send as group message</string>
+    <string name="compose_send_group_summary">Recipients and replies will be visible to everyone</string>
+    <string name="compose_messages_empty">This is the start of your conversation. Say something nice!</string>
+    <string name="compose_vcard_label">Contact card</string>
+    <string name="compose_scheduled_for">Scheduled for</string>
+    <string name="compose_scheduled_future">Selected time must be in the future!</string>
+    <string name="compose_scheduled_plus">You must unlock QKSMS+ to use scheduled messaging</string>
+    <string name="compose_scheduled_toast">Added to scheduled messages</string>
+    <string name="compose_hint">Write a message&#8230;</string>
+    <string name="compose_menu_copy">Copy text</string>
+    <string name="compose_menu_forward">Forward</string>
+    <string name="compose_menu_delete">Delete</string>
+    <string name="compose_menu_previous">Previous</string>
+    <string name="compose_menu_next">Next</string>
+    <string name="compose_menu_clear">Clear</string>
+    <string name="compose_details_title">Message details</string>
+    <string name="compose_details_type">Type: %s</string>
+    <string name="compose_details_from">From: %s</string>
+    <string name="compose_details_to">To: %s</string>
+    <string name="compose_details_subject">Subject: %s</string>
+    <string name="compose_details_priority">Priority: %s</string>
+    <string name="compose_details_size">Size: %s</string>
+    <string name="compose_details_sent">Sent: %s</string>
+    <string name="compose_details_received">Received: %s</string>
+    <string name="compose_details_delivered">Delivered: %s</string>
+    <string name="compose_details_error_code">Error code: %d</string>
+    <string name="compose_attach_cd">Add an attachment</string>
+    <string name="compose_gallery_cd">Attach a photo</string>
+    <string name="compose_camera_cd">Take a photo</string>
+    <string name="compose_schedule_cd">Schedule message</string>
+    <string name="compose_contact_cd">Attach a contact</string>
+    <string name="compose_contact_error">Error reading contact</string>
+    <!-- Example: SIM 1 (Verizon) selected-->
+    <string name="compose_sim_changed_toast">SIM %1$d (%2$s) selected</string>
+    <string name="compose_sim_cd">%s selected, change SIM card</string>
+    <string name="compose_send_cd">Send message</string>
+    <string name="message_status_sending">Sending&#8230;</string>
+    <string name="message_status_delivered">Delivered %s</string>
+    <string name="message_status_failed">Failed to send. Tap to try again</string>
+    <string name="info_title">Details</string>
+    <string name="info_copied_address">Address copied</string>
+    <string name="info_name">Conversation title</string>
+    <string name="info_notifications">Notifications</string>
+    <string name="info_theme">Theme</string>
+    <string name="info_archive">Archive</string>
+    <string name="info_unarchive">Unarchive</string>
+    <string name="info_block">Block</string>
+    <string name="info_unblock">Unblock</string>
+    <string name="info_delete">Delete conversation</string>
+    <string name="gallery_error">Couldn\'t load media</string>
+    <string name="gallery_toast_saved">Saved to gallery</string>
+    <string name="backup_title">Backup and restore</string>
+    <string name="backup_backing_up">Backing up messages</string>
+    <string name="backup_restoring">Restoring from backup</string>
+    <string name="backup_last">Last backup</string>
+    <string name="backup_loading">Loading&#8230;</string>
+    <string name="backup_never">Never</string>
+    <string name="backup_restore_title">Restore</string>
+    <string name="backup_restore_summary">Select a backup</string>
+    <string name="backup_restore_error_plus">Please unlock QKSMS+ to use backup and restore</string>
+    <string name="backup_restore_error_backup">Backup in progress&#8230;</string>
+    <string name="backup_restore_error_restore">Restore in progress&#8230;</string>
+    <string name="backup_restore_confirm_title">Restore from backup</string>
+    <string name="backup_restore_confirm_message">Are you sure you would like to restore your messages from this backup?</string>
+    <string name="backup_restore_stop_title">Stop restore</string>
+    <string name="backup_restore_stop_message">Messages that have already been restored will remain on your device</string>
+    <string name="backup_restore_dialog_title">Backups</string>
+    <string name="backup_restore_dialog_empty">No backups found</string>
+    <plurals name="backup_message_count">
+        <item quantity="one">%d message</item>
+        <item quantity="other">%d messages</item>
+    </plurals>
+    <string name="backup_disclaimer">Currently, only SMS is supported by Backup and Restore. MMS support and scheduled backups will be coming soon!</string>
+    <string name="backup_now">Backup now</string>
+    <string name="backup_progress_parsing">Parsing backup&#8230;</string>
+    <string name="backup_progress_running">%d/%d messages</string>
+    <string name="backup_progress_saving">Saving backup&#8230;</string>
+    <string name="backup_progress_syncing">Syncing messages&#8230;</string>
+    <string name="backup_progress_finished">Finished!</string>
+    <string name="backup_notification_channel_name">Backup and restore</string>
+    <string name="scheduled_title">Scheduled</string>
+    <string name="scheduled_empty_description">Automatically send a message, at the exact moment you\'d like</string>
+    <string name="scheduled_empty_message_1">Hey! When was your birthday again?</string>
+    <string name="scheduled_empty_message_2">It\'s on December 23rd</string>
+    <string name="scheduled_empty_message_3">Happy birthday! Look at what a great friend I am, remembering your birthday</string>
+    <!--&#x200A; is a special character required at the end of this string to fix it's formatting in the app -->
+    <string name="scheduled_empty_message_3_timestamp">Sending on December 23rd </string>
+    <string name="scheduled_compose_cd">Schedule a message</string>
+    <string name="scheduled_options_title">Scheduled message</string>
+    <string-array name="scheduled_options">
+        <item>Send now</item>
+        <item>Copy text</item>
+        <item>Delete</item>
+    </string-array>
+    <string name="settings_category_appearance">Appearance</string>
+    <string name="settings_category_general">General</string>
+    <string name="settings_category_qkreply">QK Reply</string>
+    <string name="settings_theme_title">Theme</string>
+    <string name="settings_night_title">Night mode</string>
+    <string name="settings_black_title">Pure black night mode</string>
+    <string name="settings_night_start_title">Start time</string>
+    <string name="settings_night_end_title">End time</string>
+    <string name="settings_automatic_colors_title">Automatic contact colors</string>
+    <string name="settings_text_size_title">Font size</string>
+    <string name="settings_system_font_title">Use system font</string>
+    <string name="settings_auto_emoji_title">Automatic emoji</string>
+    <string name="settings_notifications_title">Notifications</string>
+    <string name="settings_notifications_o_summary">Tap to customize</string>
+    <string name="settings_notification_actions_title">Actions</string>
+    <string name="settings_notification_action_1">Button 1</string>
+    <string name="settings_notification_action_2">Button 2</string>
+    <string name="settings_notification_action_3">Button 3</string>
+    <string name="settings_notification_previews_title">Notification previews</string>
+    <string name="settings_notification_wake_title">Wake screen</string>
+    <string name="settings_vibration_title">Vibration</string>
+    <string name="settings_ringtone_title">Sound</string>
+    <string name="settings_ringtone_none">None</string>
+    <string name="settings_qkreply_title">QK Reply</string>
+    <string name="settings_qkreply_summary">Popup for new messages</string>
+    <string name="settings_qkreply_tap_dismiss_title">Tap to dismiss</string>
+    <string name="settings_qkreply_tap_dismiss_summary">Tap outside of the popup to close it</string>
+    <string name="settings_delayed_title">Delayed sending</string>
+    <string name="settings_swipe_actions">Swipe actions</string>
+    <string name="settings_swipe_actions_summary">Configure swipe actions for conversations</string>
+    <string name="settings_swipe_actions_right">Right swipe</string>
+    <string name="settings_swipe_actions_left">Left swipe</string>
+    <string name="settings_swipe_actions_change">CHANGE</string>
+    <string-array name="settings_swipe_actions">
+        <item>None</item>
+        <item>Archive</item>
+        <item>Delete</item>
+        <item>Block</item>
+        <item>Call</item>
+        <item>Mark read</item>
+        <item>Mark unread</item>
+    </string-array>
+    <string name="settings_delivery_title">Delivery confirmations</string>
+    <string name="settings_delivery_summary">Confirm that messages were sent successfully</string>
+    <string name="settings_signature_title">Signature</string>
+    <string name="settings_signature_summary">Add a signature to the end of your messages</string>
+    <string name="settings_unicode_title">Strip accents</string>
+    <string name="settings_unicode_summary">Remove accents from characters in outgoing SMS messages</string>
+    <string name="settings_mobile_title">Mobile numbers only</string>
+    <string name="settings_mobile_summary">When composing a message, only show mobile numbers</string>
+    <string name="settings_auto_delete">Delete old messages automatically</string>
+    <string name="settings_auto_delete_dialog_message">Messages will be deleted after the specified number of days</string>
+    <string name="settings_auto_delete_dialog_hint">Number of days</string>
+    <string name="settings_auto_delete_never">Never</string>
+    <string name="settings_auto_delete_warning">Delete old messages automatically?</string>
+    <string name="settings_auto_delete_warning_message">If you proceed, %1$d messages will be deleted now</string>
+    <plurals name="settings_auto_delete_summary">
+        <item quantity="one">After 1 day</item>
+        <item quantity="other">After %d days</item>
+    </plurals>
+    <string name="settings_long_as_mms_title">Send long messages as MMS</string>
+    <string name="settings_long_as_mms_summary">If your longer text messages are failing to send, or sending in the wrong order, you can send them as MMS messages instead. Additional charges may apply</string>
+    <string name="settings_mms_size_title">Auto-compress MMS attachments</string>
+    <string name="settings_sync_title">Sync messages</string>
+    <string name="settings_sync_summary">Re-sync your messages with the native Android SMS database</string>
+    <string name="settings_about_title">About QKSMS</string>
+    <string name="settings_version">Version %s</string>
+    <string name="settings_logging_enabled">Debug logging enabled</string>
+    <string name="settings_logging_disabled">Debug logging disabled</string>
+    <string name="settings_delay_duration_hint">Enter duration (seconds)</string>
+    <string name="blocking_title">Blocking</string>
+    <string name="blocking_drop_title">Drop messages</string>
+    <string name="blocking_drop_summary">Drop incoming messages from blocked senders instead of hiding them</string>
+    <string name="blocking_conversations">Blocked conversations</string>
+    <string name="blocking_manager_title">Blocking Manager</string>
+    <string name="blocking_manager_qksms_title">QKSMS</string>
+    <string name="blocking_manager_qksms_summary">Built-in blocking functionality in QKSMS</string>
+    <string name="blocking_manager_call_control_summary">Automatically filter your calls and messages in one convenient place! Community IQ™ allows you to prevent unwanted messages from community known spammers</string>
+    <string name="blocking_manager_sia_summary">Automatically filter messages from unsolicited numbers by using the \"Should I Answer\" app</string>
+    <string name="blocking_manager_copy_title">Copy blocked numbers</string>
+    <string name="blocking_manager_copy_summary">Continue to %s and copy over your existing blocked numbers</string>
+    <string name="blocked_numbers_title">Blocked numbers</string>
+    <string name="blocked_numbers_empty">Your blocked numbers will appear here</string>
+    <string name="blocked_numbers_add_cd">Block a new number</string>
+    <string name="blocked_numbers_dialog_title">Block texts from</string>
+    <string name="blocked_numbers_dialog_hint">Phone number</string>
+    <string name="blocked_numbers_dialog_block">Block</string>
+    <string name="blocked_messages_title">Blocked messages</string>
+    <string name="blocked_messages_empty">Your blocked messages will appear here</string>
+    <string name="blocking_block_title">Block</string>
+    <string name="blocking_unblock_title">Unblock</string>
+    <plurals name="blocking_block_external">
+        <item quantity="one">Continue to %s and block this number</item>
+        <item quantity="other">Continue to %s and block these numbers</item>
+    </plurals>
+    <plurals name="blocking_unblock_external">
+        <item quantity="one">Continue to %s and allow this number</item>
+        <item quantity="other">Continue to %s and allow these numbers</item>
+    </plurals>
+    <string name="about_title">About</string>
+    <string name="about_version_title">Version</string>
+    <string name="about_developer_title">Developer</string>
+    <string name="about_source_title">Source code</string>
+    <string name="about_changelog_title">Changelog</string>
+    <string name="about_contact_title">Contact</string>
+    <string name="about_license_title">License</string>
+    <string name="about_copyright_title">Copyright</string>
+    <string name="qksms_plus_description_title">Support development, unlock everything</string>
+    <string name="qksms_plus_description_summary">You can save a starving developer for just %s</string>
+    <!-- Substitutions are for price and currency. Ex: Lifetime upgrade for $1.99 USD -->
+    <string name="qksms_plus_upgrade">Lifetime upgrade for %1$s %2$s</string>
+    <!-- Substitutions are for price and currency. Ex: Unlock + donate for $4.99 USD -->
+    <string name="qksms_plus_upgrade_donate">Unlock + donate for %1$s %2$s</string>
+    <string name="qksms_plus_thanks_title">Thank you for supporting QKSMS!</string>
+    <string name="qksms_plus_thanks_summary">You now have access to all QKSMS+ features</string>
+    <string name="qksms_plus_free_title">QKSMS+ is free for F-Droid users! If you\'d like to support development, a donation would be highly appreciated.</string>
+    <string name="qksms_plus_donate">Donate via PayPal</string>
+    <string name="qksms_plus_coming_soon">Coming soon</string>
+    <string name="qksms_plus_themes_title">Premium themes</string>
+    <string name="qksms_plus_themes_summary">Unlock beautiful theme colors not available on the Material Design palette</string>
+    <string name="qksms_plus_emoji_title">Custom auto-emoji</string>
+    <string name="qksms_plus_emoji_summary">Create custom auto-emoji shortcuts</string>
+    <string name="qksms_plus_backup_title">Message backup</string>
+    <string name="qksms_plus_backup_summary">Automatically back up your messages. Never again worry about losing your history if you change phones or your phone gets lost</string>
+    <string name="qksms_plus_scheduled_title">Scheduled messages</string>
+    <string name="qksms_plus_scheduled_summary">Schedule messages to automatically be sent at a specific time and date</string>
+    <string name="qksms_plus_delayed_title">Delayed sending</string>
+    <string name="qksms_plus_delayed_summary">Wait a few seconds before sending your message</string>
+    <string name="qksms_plus_night_title">Automatic night mode</string>
+    <string name="qksms_plus_night_summary">Enable night mode based on the time of day</string>
+    <string name="qksms_plus_blacklist_title">Advanced blocking</string>
+    <string name="qksms_plus_blacklist_summary">Block messages that contain keywords or match patterns</string>
+    <string name="qksms_plus_forward_title">Auto-forward</string>
+    <string name="qksms_plus_forward_summary">Automatically forward messages from certain senders</string>
+    <string name="qksms_plus_respond_title">Auto-respond</string>
+    <string name="qksms_plus_respond_summary">Automatically respond to incoming messages with a preset response</string>
+    <string name="qksms_plus_more_title">More</string>
+    <string name="qksms_plus_more_summary">QKSMS is under active development, and your purchase will include all future QKSMS+ features!</string>
+    <string name="widget_loading">Loading&#8230;</string>
+    <string name="widget_more">View more conversations</string>
+    <string name="qkreply_menu_read">Mark read</string>
+    <string name="qkreply_menu_call">Call</string>
+    <string name="qkreply_menu_delete">Delete</string>
+    <string name="qkreply_menu_expand">Show more</string>
+    <string name="qkreply_menu_collapse">Show less</string>
+    <string name="qkreply_menu_view">Open conversation</string>
+    <string name="theme_material">Material</string>
+    <string name="theme_hex">HEX</string>
+    <string name="theme_apply">Apply</string>
+    <string-array name="notification_actions">
+        <item>None</item>
+        <item>Archive</item>
+        <item>Delete</item>
+        <item>Block</item>
+        <item>Call</item>
+        <item>Mark read</item>
+        <item>Reply</item>
+    </string-array>
+    <string name="button_yes">Yes</string>
+    <string name="button_continue">Continue</string>
+    <string name="button_cancel">Cancel</string>
+    <string name="button_delete">Delete</string>
+    <string name="button_save">Save</string>
+    <string name="button_stop">Stop</string>
+    <string name="button_more">More</string>
+    <string name="button_set">Set</string>
+    <string name="button_undo">Undo</string>
+    <string name="toast_copied">Copied</string>
+    <string name="toast_archived">Archived conversation</string>
+    <string name="toast_qksms_plus">You must unlock QKSMS+ to use this</string>
+    <plurals name="notification_new_messages">
+        <item quantity="one">New message</item>
+        <item quantity="other">%s new messages</item>
+    </plurals>
+    <string name="notification_message_failed_title">Message not sent</string>
+    <string name="notification_message_failed_text">The message to %s failed to send</string>
+    <string-array name="night_modes">
+        <item>System</item>
+        <item>Disabled</item>
+        <item>Always on</item>
+        <item>Automatic</item>
+    </string-array>
+    <string-array name="notification_preview_options">
+        <item>Show name and message</item>
+        <item>Show name</item>
+        <item>Hide contents</item>
+    </string-array>
+    <string-array name="text_sizes">
+        <item>Small</item>
+        <item>Normal</item>
+        <item>Large</item>
+        <item>Larger</item>
+    </string-array>
+    <string-array name="delayed_sending_labels">
+        <item>No delay</item>
+        <item>3 seconds</item>
+        <item>5 seconds</item>
+        <item>10 seconds</item>
+    </string-array>
+    <string-array name="mms_sizes">
+        <item>Automatic</item>
+        <item>100KB</item>
+        <item>200KB</item>
+        <item>300KB</item>
+        <item>600KB</item>
+        <item>1000KB</item>
+        <item>2000KB</item>
+        <item>No compression</item>
+    </string-array>
+    <string-array name="qk_responses">
+        <item>Okay</item>
+        <item>Give me a moment</item>
+        <item>On my way</item>
+        <item>Thanks</item>
+        <item>Sounds good</item>
+        <item>What\'s up?</item>
+        <item>Agreed</item>
+        <item>No</item>
+        <item>Love you</item>
+        <item>Sorry</item>
+        <item>LOL</item>
+        <item>That\'s okay</item>
+    </string-array>
+</resources>
diff --git a/presentation/src/main/res/values-v23/themes.xml b/presentation/src/main/res/values-v23/themes.xml
index c27a31ed1..5e9f0c5e9 100644
--- a/presentation/src/main/res/values-v23/themes.xml
+++ b/presentation/src/main/res/values-v23/themes.xml
@@ -1,28 +1,28 @@
-<?xml version="1.0" encoding="utf-8"?>
-<!--
-  ~ Copyright (C) 2019 Moez Bhatti <moez.bhatti@gmail.com>
-  ~
-  ~ This file is part of QKSMS.
-  ~
-  ~ QKSMS is free software: you can redistribute it and/or modify
-  ~ it under the terms of the GNU General Public License as published by
-  ~ the Free Software Foundation, either version 3 of the License, or
-  ~ (at your option) any later version.
-  ~
-  ~ QKSMS is distributed in the hope that it will be useful,
-  ~ but WITHOUT ANY WARRANTY; without even the implied warranty of
-  ~ MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
-  ~ GNU General Public License for more details.
-  ~
-  ~ You should have received a copy of the GNU General Public License
-  ~ along with QKSMS.  If not, see <http://www.gnu.org/licenses/>.
-  -->
-<resources>
-
-    <!-- On Marshmallow, use the light status bar -->
-    <style name="AppTheme" parent="AppBaseTheme">
-        <item name="android:statusBarColor">@color/backgroundLight</item>
-        <item name="android:windowLightStatusBar">true</item>
-    </style>
-
-</resources>
+<?xml version="1.0" encoding="utf-8"?>
+<!--
+  ~ Copyright (C) 2019 Moez Bhatti <moez.bhatti@gmail.com>
+  ~
+  ~ This file is part of QKSMS.
+  ~
+  ~ QKSMS is free software: you can redistribute it and/or modify
+  ~ it under the terms of the GNU General Public License as published by
+  ~ the Free Software Foundation, either version 3 of the License, or
+  ~ (at your option) any later version.
+  ~
+  ~ QKSMS is distributed in the hope that it will be useful,
+  ~ but WITHOUT ANY WARRANTY; without even the implied warranty of
+  ~ MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+  ~ GNU General Public License for more details.
+  ~
+  ~ You should have received a copy of the GNU General Public License
+  ~ along with QKSMS.  If not, see <http://www.gnu.org/licenses/>.
+  -->
+<resources>
+
+    <!-- On Marshmallow, use the light status bar -->
+    <style name="AppTheme" parent="AppBaseTheme">
+        <item name="android:statusBarColor">@color/backgroundLight</item>
+        <item name="android:windowLightStatusBar">true</item>
+    </style>
+
+</resources>
diff --git a/presentation/src/main/res/values-v27/themes.xml b/presentation/src/main/res/values-v27/themes.xml
index 1a7fd8cae..4dc0b9bfe 100644
--- a/presentation/src/main/res/values-v27/themes.xml
+++ b/presentation/src/main/res/values-v27/themes.xml
@@ -1,30 +1,30 @@
-<?xml version="1.0" encoding="utf-8"?>
-<!--
-  ~ Copyright (C) 2019 Moez Bhatti <moez.bhatti@gmail.com>
-  ~
-  ~ This file is part of QKSMS.
-  ~
-  ~ QKSMS is free software: you can redistribute it and/or modify
-  ~ it under the terms of the GNU General Public License as published by
-  ~ the Free Software Foundation, either version 3 of the License, or
-  ~ (at your option) any later version.
-  ~
-  ~ QKSMS is distributed in the hope that it will be useful,
-  ~ but WITHOUT ANY WARRANTY; without even the implied warranty of
-  ~ MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
-  ~ GNU General Public License for more details.
-  ~
-  ~ You should have received a copy of the GNU General Public License
-  ~ along with QKSMS.  If not, see <http://www.gnu.org/licenses/>.
-  -->
-<resources>
-
-    <!-- On Oreo, use the light status and navigation bars -->
-    <style name="AppTheme" parent="AppBaseTheme">
-        <item name="android:navigationBarColor">@color/white</item>
-        <item name="android:statusBarColor">@color/backgroundLight</item>
-        <item name="android:windowLightNavigationBar">true</item>
-        <item name="android:windowLightStatusBar">true</item>
-    </style>
-
-</resources>
+<?xml version="1.0" encoding="utf-8"?>
+<!--
+  ~ Copyright (C) 2019 Moez Bhatti <moez.bhatti@gmail.com>
+  ~
+  ~ This file is part of QKSMS.
+  ~
+  ~ QKSMS is free software: you can redistribute it and/or modify
+  ~ it under the terms of the GNU General Public License as published by
+  ~ the Free Software Foundation, either version 3 of the License, or
+  ~ (at your option) any later version.
+  ~
+  ~ QKSMS is distributed in the hope that it will be useful,
+  ~ but WITHOUT ANY WARRANTY; without even the implied warranty of
+  ~ MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+  ~ GNU General Public License for more details.
+  ~
+  ~ You should have received a copy of the GNU General Public License
+  ~ along with QKSMS.  If not, see <http://www.gnu.org/licenses/>.
+  -->
+<resources>
+
+    <!-- On Oreo, use the light status and navigation bars -->
+    <style name="AppTheme" parent="AppBaseTheme">
+        <item name="android:navigationBarColor">@color/white</item>
+        <item name="android:statusBarColor">@color/backgroundLight</item>
+        <item name="android:windowLightNavigationBar">true</item>
+        <item name="android:windowLightStatusBar">true</item>
+    </style>
+
+</resources>
diff --git a/presentation/src/main/res/values-vi/strings.xml b/presentation/src/main/res/values-vi/strings.xml
index d051c7a87..24a87392d 100644
--- a/presentation/src/main/res/values-vi/strings.xml
+++ b/presentation/src/main/res/values-vi/strings.xml
@@ -1,405 +1,405 @@
-<?xml version="1.0" encoding="utf-8"?>
-<!--
-  ~ Copyright (C) 2019 Moez Bhatti <moez.bhatti@gmail.com>
-  ~
-  ~ This file is part of QKSMS.
-  ~
-  ~ QKSMS is free software: you can redistribute it and/or modify
-  ~ it under the terms of the GNU General Public License as published by
-  ~ the Free Software Foundation, either version 3 of the License, or
-  ~ (at your option) any later version.
-  ~
-  ~ QKSMS is distributed in the hope that it will be useful,
-  ~ but WITHOUT ANY WARRANTY; without even the implied warranty of
-  ~ MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
-  ~ GNU General Public License for more details.
-  ~
-  ~ You should have received a copy of the GNU General Public License
-  ~ along with QKSMS.  If not, see <http://www.gnu.org/licenses/>.
-  -->
-<resources>
-    <string name="shortcut_compose_long_label">Cuộc trò chuyện mới</string>
-    <string name="shortcut_compose_short_label">Soạn tin</string>
-    <string name="shortcut_compose_disabled_message">Đã tắt lối tắt</string>
-    <string name="title_archived">Lưu trữ</string>
-    <string name="title_settings">Cài đặt</string>
-    <string name="title_notification_prefs">Thông báo</string>
-    <string name="title_theme">Chủ đề</string>
-    <string name="title_conversations">Tìm kiếm tin nhắn&#8230;</string>
-    <string name="title_compose">Nhập tên hoặc số điện thoại</string>
-    <string name="setup_skip">Bỏ qua</string>
-    <string name="setup_next">Tiếp tục</string>
-    <string name="menu_add_person">Thêm người</string>
-    <string name="menu_call">Cuộc gọi</string>
-    <string name="menu_info">Chi tiết</string>
-    <string name="menu_save">Lưu vào bộ sưu tập</string>
-    <string name="menu_share">Chia sẻ</string>
-    <string name="main_drawer_open_cd">Mở menu điều hướng</string>
-    <string name="main_title_selected">%d đã chọn</string>
-    <string name="main_menu_clear">Dọn sạch</string>
-    <string name="main_menu_archive">Lưu trữ</string>
-    <string name="main_menu_unarchive">Hủy lưu trữ</string>
-    <string name="main_menu_delete">Xóa</string>
-    <string name="main_menu_add_contact">Thêm vào danh bạ</string>
-    <string name="main_menu_pin">Ghim lên đầu</string>
-    <string name="main_menu_unpin">Bỏ ghim</string>
-    <string name="main_menu_read">Đánh dấu đã đọc</string>
-    <string name="main_menu_unread">Đánh dấu chưa đọc</string>
-    <string name="main_menu_block">Chặn liên hệ</string>
-    <string name="main_syncing">Đang đồng bộ tin nhắn&#8230;</string>
-    <string name="main_sender_you">Bạn: %s</string>
-    <string name="main_draft">Bản nháp</string>
-    <string name="main_message_results_title">Kết quả trong tin nhắn</string>
-    <string name="main_message_results">%d tin nhắn</string>
-    <string name="inbox_empty_text">Các cuộc trò chuyện của bạn sẽ xuất hiện ở đây</string>
-    <string name="inbox_search_empty_text">Không có kết quả</string>
-    <string name="archived_empty_text">Các cuộc trò chuyện đã lưu trữ của bạn sẽ xuất hiện ở đây</string>
-    <string name="main_fab_cd">Bắt đầu cuộc trò chuyện</string>
-    <string name="main_default_sms_title">Yêu thích nhắn tin ở đây</string>
-    <string name="main_default_sms_message">Đặt QKSMS là ứng dụng SMS mặc định</string>
-    <string name="main_default_sms_change">Thay đổi</string>
-    <string name="main_permission_required">Yêu cầu quyền truy cập</string>
-    <string name="main_permission_sms">QKSMS cần cấp quyền để gửi và xem tin nhắn SMS</string>
-    <string name="main_permission_contacts">QKSMS cần cấp quyền để xem danh bạ</string>
-    <string name="main_permission_allow">Cho phép</string>
-    <string name="drawer_inbox">Trò chuyện</string>
-    <string name="drawer_archived">Lưu trữ</string>
-    <string name="drawer_scheduled">Hẹn giờ tin nhắn</string>
-    <string name="drawer_blocking">Chặn liên hệ</string>
-    <string name="drawer_more">Xem thêm</string>
-    <string name="drawer_settings">Cài đặt</string>
-    <string name="drawer_help">Giúp đỡ và phản hồi</string>
-    <string name="drawer_invite">Giới thiệu đến bạn bè</string>
-    <string name="drawer_plus_banner_summary">Mở khoá những tính năng đặc sắc và hỗ trợ cho nhà phát triển</string>
-    <string name="rate_title">Bạn có thích QKSMS không?</string>
-    <string name="rate_summary">Chia sẻ và vote chúng tôi trên Google Play!</string>
-    <string name="rate_okay">Đồng ý!</string>
-    <string name="rate_dismiss">Bỏ qua</string>
-    <string name="dialog_delete_title">Xóa</string>
-    <plurals name="dialog_delete_message">
-        <item quantity="other">Bạn chắc chắn muốn xoá %d cuộc trò chuyện này chứ ?</item>
-    </plurals>
-    <string-array name="message_options">
-        <item>Sao chép văn bản</item>
-        <item>Chuyển tiếp</item>
-        <item>Xóa</item>
-    </string-array>
-    <string name="compose_number_picker_title">Chọn một số điện thoại</string>
-    <string name="compose_number_picker_default">%s ∙ Mặc định</string>
-    <string name="compose_number_picker_once">Chỉ lần này</string>
-    <string name="compose_number_picker_always">Luôn luôn</string>
-    <string name="compose_title_selected">%d đã chọn</string>
-    <string name="compose_subtitle_results">%1$d trên %2$d kết quả</string>
-    <string name="compose_send_group_title">Gửi theo nhóm tin nhắn</string>
-    <string name="compose_send_group_summary">Người nhận và các câu trả lời sẽ được hiển thị với mọi người</string>
-    <string name="compose_messages_empty">Đây là sự khởi đầu của một cuộc trò chuyện. Hãy nói điều gì đó tốt đẹp nhé!</string>
-    <string name="compose_vcard_label">Thẻ danh thiếp</string>
-    <string name="compose_scheduled_for">Hẹn giờ cho</string>
-    <string name="compose_scheduled_future">Thời gian chọn phải trong tương lai!</string>
-    <string name="compose_scheduled_plus">Bạn phải mở khoá QKSMS+ để dùng tính năng hẹn giờ</string>
-    <string name="compose_scheduled_toast">Đã hẹn giờ cho tin nhắn</string>
-    <string name="compose_hint">Viết tin nhắn&#8230;</string>
-    <string name="compose_menu_copy">Sao chép văn bản</string>
-    <string name="compose_menu_forward">Chuyển tiếp</string>
-    <string name="compose_menu_delete">Xóa</string>
-    <string name="compose_menu_previous">Trước đó</string>
-    <string name="compose_menu_next">Tiếp theo</string>
-    <string name="compose_menu_clear">Xóa</string>
-    <string name="compose_details_title">Chi tiết tin nhắn</string>
-    <string name="compose_details_type">Loại: %s</string>
-    <string name="compose_details_from">Từ: %s</string>
-    <string name="compose_details_to">Tới: %s</string>
-    <string name="compose_details_subject">Chủ đề: %s</string>
-    <string name="compose_details_priority">Độ ưu tiên: %s</string>
-    <string name="compose_details_size">Kích cỡ: %s</string>
-    <string name="compose_details_sent">Đã gửi: %s</string>
-    <string name="compose_details_received">Đã nhận: %s</string>
-    <string name="compose_details_delivered">Đã chuyển: %s</string>
-    <string name="compose_details_error_code">Mã lỗi: %d</string>
-    <string name="compose_attach_cd">Thêm tập tin đính kèm</string>
-    <string name="compose_gallery_cd">Đính kèm ảnh</string>
-    <string name="compose_camera_cd">Chụp ảnh</string>
-    <string name="compose_schedule_cd">Hẹn giờ tin nhắn</string>
-    <string name="compose_contact_cd">Đính kèm liên hệ</string>
-    <string name="compose_contact_error">Lỗi đọc liên hệ</string>
-    <!-- Example: SIM 1 (Verizon) selected-->
-    <string name="compose_sim_changed_toast">Đã chọn SIM %1$d (%2$s)</string>
-    <string name="compose_sim_cd">%s đã được chọn, hãy đổi thẻ SIM</string>
-    <string name="compose_send_cd">Gửi tin nhắn</string>
-    <string name="message_status_sending">Đang gửi&#8230;</string>
-    <string name="message_status_delivered">Đã chuyển %s</string>
-    <string name="message_status_failed">Gửi thất bại. Bấm để thử lại lần nữa</string>
-    <string name="info_title">Chi tiết</string>
-    <string name="info_copied_address">Địa chỉ đã được sao chép</string>
-    <string name="info_name">Tiêu đề cuộc trò chuyện</string>
-    <string name="info_notifications">Thông báo</string>
-    <string name="info_theme">Chủ đề</string>
-    <string name="info_archive">Lưu trữ</string>
-    <string name="info_unarchive">Hủy lưu trữ</string>
-    <string name="info_block">Chặn liên hệ</string>
-    <string name="info_unblock">Bỏ chặn liên hệ</string>
-    <string name="info_delete">Xóa cuộc trò chuyện</string>
-    <string name="gallery_error">Không thể tải thư viện</string>
-    <string name="gallery_toast_saved">Đã lưu vào thư viện</string>
-    <string name="backup_title">Sao lưu và khôi phục</string>
-    <string name="backup_backing_up">Đang sao lưu tin nhắn</string>
-    <string name="backup_restoring">Đang khôi phục từ bản sao lưu</string>
-    <string name="backup_last">Sao lưu lần cuối</string>
-    <string name="backup_loading">Đang tải&#8230;</string>
-    <string name="backup_never">Chưa bao giờ</string>
-    <string name="backup_restore_title">Khôi phục</string>
-    <string name="backup_restore_summary">Chọn một bản sao lưu</string>
-    <string name="backup_restore_error_plus">Vui lòng mở khoá QKSMS+ để dùng tính năng sao lưu và khôi phục</string>
-    <string name="backup_restore_error_backup">Đang sao lưu&#8230;</string>
-    <string name="backup_restore_error_restore">Đang khôi phục&#8230;</string>
-    <string name="backup_restore_confirm_title">Khôi phục từ bản sao lưu này</string>
-    <string name="backup_restore_confirm_message">Bạn chắc chắn muốn khôi phục tin nhắn từ bản sao lưu này chứ ?</string>
-    <string name="backup_restore_stop_title">Dừng khôi phục</string>
-    <string name="backup_restore_stop_message">Tin nhắn đã được khôi phục sẽ vẫn còn trên thiết bị của bạn</string>
-    <string name="backup_restore_dialog_title">Các bản sao lưu</string>
-    <string name="backup_restore_dialog_empty">Không tìm thấy bản sao lưu nào</string>
-    <plurals name="backup_message_count">
-        <item quantity="other">%d tin nhắn</item>
-    </plurals>
-    <string name="backup_disclaimer">Hiện tại, tính năng sao lưu và khôi phục chỉ hỗ trợ SMS. Việc hỗ trợ MMS và tính năng sao lưu định kì sẽ có sớm!</string>
-    <string name="backup_now">Sao lưu ngay</string>
-    <string name="backup_progress_parsing">Đang phân tích bản sao lưu&#8230;</string>
-    <string name="backup_progress_running">%d/%d tin nhắn</string>
-    <string name="backup_progress_saving">Đang lưu bản sao lưu&#8230;</string>
-    <string name="backup_progress_syncing">Đang đồng bộ tin nhắn&#8230;</string>
-    <string name="backup_progress_finished">Hoàn tất!</string>
-    <string name="backup_notification_channel_name">Sao lưu và khôi phục</string>
-    <string name="scheduled_title">Hẹn giờ tin nhắn</string>
-    <string name="scheduled_empty_description">Tự động gửi tin nhắn vào lúc mà bạn muốn</string>
-    <string name="scheduled_empty_message_1">Này, khi nào thì đến sinh nhật bạn?</string>
-    <string name="scheduled_empty_message_2">Vào ngày 23 tháng 12 đó</string>
-    <string name="scheduled_empty_message_3">Chúc mừng sinh nhật! Nhìn xem, tôi đúng là một người bạn tuyệt vời, nhớ ngày sinh nhật của bạn đấy</string>
-    <!--&#x200A; is a special character required at the end of this string to fix it's formatting in the app -->
-    <string name="scheduled_empty_message_3_timestamp">Sẽ gửi vào ngày 23 tháng 12</string>
-    <string name="scheduled_compose_cd">Hẹn giờ tin nhắn</string>
-    <string name="scheduled_options_title">Tin nhắn đã hẹn giờ</string>
-    <string-array name="scheduled_options">
-        <item>Gửi ngay</item>
-        <item>Sao chép kí tự</item>
-        <item>Xoá</item>
-    </string-array>
-    <string name="settings_category_appearance">Giao diện</string>
-    <string name="settings_category_general">Chung</string>
-    <string name="settings_category_qkreply">Trả lời nhanh</string>
-    <string name="settings_theme_title">Chủ đề</string>
-    <string name="settings_night_title">Giao diện tối</string>
-    <string name="settings_black_title">Giao diện tối AMOLED</string>
-    <string name="settings_night_start_title">Thời gian bắt đầu</string>
-    <string name="settings_night_end_title">Thời gian kết thúc</string>
-    <string name="settings_automatic_colors_title">Tự động hiện màu sắc của liên hệ</string>
-    <string name="settings_text_size_title">Cỡ chữ</string>
-    <string name="settings_system_font_title">Sử dụng font chữ hệ thống</string>
-    <string name="settings_auto_emoji_title">Emoji tự động</string>
-    <string name="settings_notifications_title">Thông báo</string>
-    <string name="settings_notifications_o_summary">Chạm để tuỳ chỉnh</string>
-    <string name="settings_notification_actions_title">Các hành động</string>
-    <string name="settings_notification_action_1">Nút 1</string>
-    <string name="settings_notification_action_2">Nút 2</string>
-    <string name="settings_notification_action_3">Nút 3</string>
-    <string name="settings_notification_previews_title">Xem trước các thông báo</string>
-    <string name="settings_notification_wake_title">Đánh thức màn hình</string>
-    <string name="settings_vibration_title">Rung</string>
-    <string name="settings_ringtone_title">Âm thanh</string>
-    <string name="settings_ringtone_none">Không dùng</string>
-    <string name="settings_qkreply_title">Trả lời nhanh</string>
-    <string name="settings_qkreply_summary">Hiển thị popup khi có tin nhắn mới</string>
-    <string name="settings_qkreply_tap_dismiss_title">Chạm để bỏ qua</string>
-    <string name="settings_qkreply_tap_dismiss_summary">Chạm vào phía ngoài của hộp thoại để đóng</string>
-    <string name="settings_delayed_title">Trì hoãn gửi tin</string>
-    <string name="settings_swipe_actions">Các hành động vuốt</string>
-    <string name="settings_swipe_actions_summary">Tuỳ chỉnh hành động vuốt cho cuộc trò chuyện</string>
-    <string name="settings_swipe_actions_right">Vuốt phải</string>
-    <string name="settings_swipe_actions_left">Vuốt trái</string>
-    <string name="settings_swipe_actions_change">THAY ĐỔI</string>
-    <string-array name="settings_swipe_actions">
-        <item>Không dùng</item>
-        <item>Lưu trữ</item>
-        <item>Xoá</item>
-        <item>Chặn</item>
-        <item>Gọi</item>
-        <item>Đánh dấu đã đọc</item>
-        <item>Đánh dấu chưa đọc</item>
-    </string-array>
-    <string name="settings_delivery_title">Xác nhận đã gửi tin</string>
-    <string name="settings_delivery_summary">Xác nhận rằng các tin nhắn được gửi thành công</string>
-    <string name="settings_signature_title">Chữ ký</string>
-    <string name="settings_signature_summary">Thêm chữ kí vào cuối đoạn tin nhắn của bạn</string>
-    <string name="settings_unicode_title">Bỏ dấu</string>
-    <string name="settings_unicode_summary">Bỏ dấu ký tự khi gửi SMS</string>
-    <string name="settings_mobile_title">Lọc số di động</string>
-    <string name="settings_mobile_summary">Khi soạn tin mới, chỉ hiển thị liên hệ có số di động</string>
-    <string name="settings_auto_delete">Delete old messages automatically</string>
-    <string name="settings_auto_delete_dialog_message">Messages will be deleted after the specified number of days</string>
-    <string name="settings_auto_delete_dialog_hint">Number of days</string>
-    <string name="settings_auto_delete_never">Never</string>
-    <string name="settings_auto_delete_warning">Delete old messages automatically?</string>
-    <string name="settings_auto_delete_warning_message">If you proceed, %1$d messages will be deleted now</string>
-    <plurals name="settings_auto_delete_summary">
-        <item quantity="other">After %d days</item>
-    </plurals>
-    <string name="settings_long_as_mms_title">Gửi đoạn tin nhắn dài như MMS</string>
-    <string name="settings_long_as_mms_summary">Nếu đoạn tin nhắn dài bị lỗi khi gửi, hoặc gửi sai thứ tự, bạn có thể gửi chúng như tin nhắn MMS thay thế. Cước phí bổ sung có thể bị áp dụng</string>
-    <string name="settings_mms_size_title">Tự động nén các tệp đính kèm MMS</string>
-    <string name="settings_sync_title">Đồng bộ tin nhắn</string>
-    <string name="settings_sync_summary">Đồng bộ lại tin nhắn với thiết bị</string>
-    <string name="settings_about_title">Thông tin QKSMS</string>
-    <string name="settings_version">Phiên bản: %s</string>
-    <string name="settings_logging_enabled">Đã bật bản ghi gỡ lỗi</string>
-    <string name="settings_logging_disabled">Đã tắt bản ghi gỡ lỗi</string>
-    <string name="settings_delay_duration_hint">Nhập khoảng thời gian (giây)</string>
-    <string name="blocking_title">Đang chặn</string>
-    <string name="blocking_drop_title">Loại bỏ tin nhắn</string>
-    <string name="blocking_drop_summary">Loại bỏ các tin nhắn được gửi tới từ người gửi đã chặn thay vì ẩn chúng</string>
-    <string name="blocking_conversations">Các cuộc trò chuyện đã chặn</string>
-    <string name="blocking_manager_title">Quản lý danh sách chặn</string>
-    <string name="blocking_manager_qksms_title">QKSMS</string>
-    <string name="blocking_manager_qksms_summary">Chức năng chặn tích hợp sẵn trong QKSMS</string>
-    <string name="blocking_manager_call_control_summary">Tự động lọc các cuộc gọi và tin nhắn của bạn ở một nơi thuận tiện! Cộng đồng IQ™ cho phép bạn ngăn chặn các tin nhắn từ những kẻ gửi tin rác được đóng góp bởi cộng đồng</string>
-    <string name="blocking_manager_sia_summary">Tự động lọc tin nhắn từ số điện thoại không mong muốn bằng cách sử dụng ứng dụng \"Should I Answer\"</string>
-    <string name="blocking_manager_copy_title">Sao chép số đã chặn</string>
-    <string name="blocking_manager_copy_summary">Tiếp tục %s sao chép vào các số đã chặn hiện có của bạn</string>
-    <string name="blocked_numbers_title">Các số đã chặn</string>
-    <string name="blocked_numbers_empty">Các số bạn đã chặn sẽ xuất hiện ở đây</string>
-    <string name="blocked_numbers_add_cd">Chặn một số mới</string>
-    <string name="blocked_numbers_dialog_title">Chặn văn bản từ</string>
-    <string name="blocked_numbers_dialog_hint">Số điện thoại</string>
-    <string name="blocked_numbers_dialog_block">Chặn</string>
-    <string name="blocked_messages_title">Các tin nhắn đã chặn</string>
-    <string name="blocked_messages_empty">Các tin nhắn bạn đã chặn sẽ xuất hiện ở đây</string>
-    <string name="blocking_block_title">Chặn</string>
-    <string name="blocking_unblock_title">Bỏ chặn</string>
-    <plurals name="blocking_block_external">
-        <item quantity="other">Tiếp tục %s và chặn các số này</item>
-    </plurals>
-    <plurals name="blocking_unblock_external">
-        <item quantity="other">Tiếp tục %s và cho phép các số này</item>
-    </plurals>
-    <string name="about_title">Giới thiệu</string>
-    <string name="about_version_title">Phiên bản</string>
-    <string name="about_developer_title">Nhà phát triển</string>
-    <string name="about_source_title">Mã nguồn</string>
-    <string name="about_changelog_title">Các thay đổi</string>
-    <string name="about_contact_title">Liên hệ</string>
-    <string name="about_license_title">Giấy phép</string>
-    <string name="about_copyright_title">Bản quyền</string>
-    <string name="qksms_plus_description_title">Hỗ trợ phát triển, mở khóa mọi thứ</string>
-    <string name="qksms_plus_description_summary">Bạn có thể ủng hộ chúng tôi chỉ với %s</string>
-    <!-- Substitutions are for price and currency. Ex: Lifetime upgrade for $1.99 USD -->
-    <string name="qksms_plus_upgrade">Nâng cấp trọn đời với %1$s %2$s</string>
-    <!-- Substitutions are for price and currency. Ex: Unlock + donate for $4.99 USD -->
-    <string name="qksms_plus_upgrade_donate">Mở khoá và tài trợ với %1$s %2$s</string>
-    <string name="qksms_plus_thanks_title">Cảm ơn bạn đã ủng hộ QKSMS!</string>
-    <string name="qksms_plus_thanks_summary">Bây giờ bạn có thể sử dụng tất cả các chức năng của QKSMS+</string>
-    <string name="qksms_plus_free_title">QKSMS+ miễn phí cho người sử dụng F-Droid! Bạn có thể trả phí nếu muốn hỗ trợ phát triển.</string>
-    <string name="qksms_plus_donate">Tài trợ bằng PayPal</string>
-    <string name="qksms_plus_coming_soon">Sắp có</string>
-    <string name="qksms_plus_themes_title">Chủ đề đặc biệt</string>
-    <string name="qksms_plus_themes_summary">Mở khóa các màu sắc đẹp không có sẵn trong bản thiết kế Material</string>
-    <string name="qksms_plus_emoji_title">Tuỳ biến Emoji tự động</string>
-    <string name="qksms_plus_emoji_summary">Tạo phím tắt Emoji tự động</string>
-    <string name="qksms_plus_backup_title">Sao lưu tin nhắn</string>
-    <string name="qksms_plus_backup_summary">Tự động sao lưu tin nhắn của bạn. Không bao giờ lo lắng về việc mất đi lịch sử của bạn nếu bạn thay đổi điện thoại hoặc điện thoại của bạn bị mất</string>
-    <string name="qksms_plus_scheduled_title">Hẹn giờ tin nhắn</string>
-    <string name="qksms_plus_scheduled_summary">Tin nhắn hẹn giờ sẽ được tự động gửi vào thời gian cụ thể</string>
-    <string name="qksms_plus_delayed_title">Trì hoãn gửi tin nhắn</string>
-    <string name="qksms_plus_delayed_summary">Chờ một vài giây trước khi gửi tin nhắn để bạn có thể hoàn tác nó</string>
-    <string name="qksms_plus_night_title">Giao diện tối tự động</string>
-    <string name="qksms_plus_night_summary">Kích hoạt giao diện tối dựa trên thời gian trong ngày</string>
-    <string name="qksms_plus_blacklist_title">Chặn nâng cao</string>
-    <string name="qksms_plus_blacklist_summary">Chặn tin nhắn có chứa các từ khóa hoặc phù hợp với các mẫu</string>
-    <string name="qksms_plus_forward_title">Tự động chuyển tiếp</string>
-    <string name="qksms_plus_forward_summary">Tự động chuyển tiếp tin nhắn từ người gửi</string>
-    <string name="qksms_plus_respond_title">Tự động trả lời</string>
-    <string name="qksms_plus_respond_summary">Tự động trả lời các tin nhắn với nội dung cài sẵn</string>
-    <string name="qksms_plus_more_title">Nhiều tính năng khác</string>
-    <string name="qksms_plus_more_summary">QKSMS đang trong giai đoạn phát triển, và việc thanh toán của bạn sẽ bao gồm tất cả tính năng QKSMS+ tương lai!</string>
-    <string name="widget_loading">Đang tải&#8230;</string>
-    <string name="widget_more">Xem thêm các cuộc trò chuyện</string>
-    <string name="qkreply_menu_read">Đánh dấu đã đọc</string>
-    <string name="qkreply_menu_call">Đàm thoại</string>
-    <string name="qkreply_menu_delete">Xoá</string>
-    <string name="qkreply_menu_expand">Hiển thị nhiều hơn</string>
-    <string name="qkreply_menu_collapse">Hiển thị ít hơn</string>
-    <string name="qkreply_menu_view">Mở cuộc trò chuyện</string>
-    <string name="theme_material">Material</string>
-    <string name="theme_hex">Hệ 16</string>
-    <string name="theme_apply">Áp dụng</string>
-    <string-array name="notification_actions">
-        <item>Không dùng</item>
-        <item>Lưu trữ</item>
-        <item>Xoá</item>
-        <item>Chặn</item>
-        <item>Gọi</item>
-        <item>Đánh dấu đã đọc</item>
-        <item>Trả lời</item>
-    </string-array>
-    <string name="button_yes">Đồng ý</string>
-    <string name="button_continue">Tiếp tục</string>
-    <string name="button_cancel">Hủy</string>
-    <string name="button_delete">Xóa</string>
-    <string name="button_save">Lưu</string>
-    <string name="button_stop">Dừng</string>
-    <string name="button_more">Xem thêm</string>
-    <string name="button_set">Chọn</string>
-    <string name="button_undo">Undo</string>
-    <string name="toast_copied">Đã sao chép</string>
-    <string name="toast_archived">Cuộc trò chuyện đã được lưu trữ</string>
-    <string name="toast_qksms_plus">Bạn phải mở khóa QKSMS+ để sử dụng chức năng này</string>
-    <plurals name="notification_new_messages">
-        <item quantity="other">%s tin nhắn mới</item>
-    </plurals>
-    <string name="notification_message_failed_title">Các tin không gửi</string>
-    <string name="notification_message_failed_text">Các tin gửi đến %s không thành công</string>
-    <string-array name="night_modes">
-        <item>Theo hệ thống</item>
-        <item>Vô hiệu hoá</item>
-        <item>Luôn bật</item>
-        <item>Tự động</item>
-    </string-array>
-    <string-array name="notification_preview_options">
-        <item>Hiển thị tên và tin nhắn</item>
-        <item>Hiển thị tên</item>
-        <item>Ẩn nội dung</item>
-    </string-array>
-    <string-array name="text_sizes">
-        <item>Nhỏ</item>
-        <item>Bình thường</item>
-        <item>Lớn</item>
-        <item>Lớn hơn</item>
-    </string-array>
-    <string-array name="delayed_sending_labels">
-        <item>Không trì hoãn</item>
-        <item>3 giây</item>
-        <item>5 giây</item>
-        <item>10 giây</item>
-    </string-array>
-    <string-array name="mms_sizes">
-        <item>Tự động</item>
-        <item>100KB</item>
-        <item>200KB</item>
-        <item>300KB</item>
-        <item>600KB</item>
-        <item>1000KB</item>
-        <item>2000KB</item>
-        <item>Không nén</item>
-    </string-array>
-    <string-array name="qk_responses">
-        <item>Ok</item>
-        <item>Chờ một lát</item>
-        <item>Tôi đang đến đây</item>
-        <item>Cảm ơn</item>
-        <item>Có vẻ được</item>
-        <item>Có chuyện gì vậy?</item>
-        <item>Đồng ý</item>
-        <item>Không</item>
-        <item>Yêu bạn</item>
-        <item>Xin lỗi</item>
-        <item>LOL</item>
-        <item>Không sao đâu</item>
-    </string-array>
-</resources>
+<?xml version="1.0" encoding="utf-8"?>
+<!--
+  ~ Copyright (C) 2019 Moez Bhatti <moez.bhatti@gmail.com>
+  ~
+  ~ This file is part of QKSMS.
+  ~
+  ~ QKSMS is free software: you can redistribute it and/or modify
+  ~ it under the terms of the GNU General Public License as published by
+  ~ the Free Software Foundation, either version 3 of the License, or
+  ~ (at your option) any later version.
+  ~
+  ~ QKSMS is distributed in the hope that it will be useful,
+  ~ but WITHOUT ANY WARRANTY; without even the implied warranty of
+  ~ MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+  ~ GNU General Public License for more details.
+  ~
+  ~ You should have received a copy of the GNU General Public License
+  ~ along with QKSMS.  If not, see <http://www.gnu.org/licenses/>.
+  -->
+<resources>
+    <string name="shortcut_compose_long_label">Cuộc trò chuyện mới</string>
+    <string name="shortcut_compose_short_label">Soạn tin</string>
+    <string name="shortcut_compose_disabled_message">Đã tắt lối tắt</string>
+    <string name="title_archived">Lưu trữ</string>
+    <string name="title_settings">Cài đặt</string>
+    <string name="title_notification_prefs">Thông báo</string>
+    <string name="title_theme">Chủ đề</string>
+    <string name="title_conversations">Tìm kiếm tin nhắn&#8230;</string>
+    <string name="title_compose">Nhập tên hoặc số điện thoại</string>
+    <string name="setup_skip">Bỏ qua</string>
+    <string name="setup_next">Tiếp tục</string>
+    <string name="menu_add_person">Thêm người</string>
+    <string name="menu_call">Cuộc gọi</string>
+    <string name="menu_info">Chi tiết</string>
+    <string name="menu_save">Lưu vào bộ sưu tập</string>
+    <string name="menu_share">Chia sẻ</string>
+    <string name="main_drawer_open_cd">Mở menu điều hướng</string>
+    <string name="main_title_selected">%d đã chọn</string>
+    <string name="main_menu_clear">Dọn sạch</string>
+    <string name="main_menu_archive">Lưu trữ</string>
+    <string name="main_menu_unarchive">Hủy lưu trữ</string>
+    <string name="main_menu_delete">Xóa</string>
+    <string name="main_menu_add_contact">Thêm vào danh bạ</string>
+    <string name="main_menu_pin">Ghim lên đầu</string>
+    <string name="main_menu_unpin">Bỏ ghim</string>
+    <string name="main_menu_read">Đánh dấu đã đọc</string>
+    <string name="main_menu_unread">Đánh dấu chưa đọc</string>
+    <string name="main_menu_block">Chặn liên hệ</string>
+    <string name="main_syncing">Đang đồng bộ tin nhắn&#8230;</string>
+    <string name="main_sender_you">Bạn: %s</string>
+    <string name="main_draft">Bản nháp</string>
+    <string name="main_message_results_title">Kết quả trong tin nhắn</string>
+    <string name="main_message_results">%d tin nhắn</string>
+    <string name="inbox_empty_text">Các cuộc trò chuyện của bạn sẽ xuất hiện ở đây</string>
+    <string name="inbox_search_empty_text">Không có kết quả</string>
+    <string name="archived_empty_text">Các cuộc trò chuyện đã lưu trữ của bạn sẽ xuất hiện ở đây</string>
+    <string name="main_fab_cd">Bắt đầu cuộc trò chuyện</string>
+    <string name="main_default_sms_title">Yêu thích nhắn tin ở đây</string>
+    <string name="main_default_sms_message">Đặt QKSMS là ứng dụng SMS mặc định</string>
+    <string name="main_default_sms_change">Thay đổi</string>
+    <string name="main_permission_required">Yêu cầu quyền truy cập</string>
+    <string name="main_permission_sms">QKSMS cần cấp quyền để gửi và xem tin nhắn SMS</string>
+    <string name="main_permission_contacts">QKSMS cần cấp quyền để xem danh bạ</string>
+    <string name="main_permission_allow">Cho phép</string>
+    <string name="drawer_inbox">Trò chuyện</string>
+    <string name="drawer_archived">Lưu trữ</string>
+    <string name="drawer_scheduled">Hẹn giờ tin nhắn</string>
+    <string name="drawer_blocking">Chặn liên hệ</string>
+    <string name="drawer_more">Xem thêm</string>
+    <string name="drawer_settings">Cài đặt</string>
+    <string name="drawer_help">Giúp đỡ và phản hồi</string>
+    <string name="drawer_invite">Giới thiệu đến bạn bè</string>
+    <string name="drawer_plus_banner_summary">Mở khoá những tính năng đặc sắc và hỗ trợ cho nhà phát triển</string>
+    <string name="rate_title">Bạn có thích QKSMS không?</string>
+    <string name="rate_summary">Chia sẻ và vote chúng tôi trên Google Play!</string>
+    <string name="rate_okay">Đồng ý!</string>
+    <string name="rate_dismiss">Bỏ qua</string>
+    <string name="dialog_delete_title">Xóa</string>
+    <plurals name="dialog_delete_message">
+        <item quantity="other">Bạn chắc chắn muốn xoá %d cuộc trò chuyện này chứ ?</item>
+    </plurals>
+    <string-array name="message_options">
+        <item>Sao chép văn bản</item>
+        <item>Chuyển tiếp</item>
+        <item>Xóa</item>
+    </string-array>
+    <string name="compose_number_picker_title">Chọn một số điện thoại</string>
+    <string name="compose_number_picker_default">%s ∙ Mặc định</string>
+    <string name="compose_number_picker_once">Chỉ lần này</string>
+    <string name="compose_number_picker_always">Luôn luôn</string>
+    <string name="compose_title_selected">%d đã chọn</string>
+    <string name="compose_subtitle_results">%1$d trên %2$d kết quả</string>
+    <string name="compose_send_group_title">Gửi theo nhóm tin nhắn</string>
+    <string name="compose_send_group_summary">Người nhận và các câu trả lời sẽ được hiển thị với mọi người</string>
+    <string name="compose_messages_empty">Đây là sự khởi đầu của một cuộc trò chuyện. Hãy nói điều gì đó tốt đẹp nhé!</string>
+    <string name="compose_vcard_label">Thẻ danh thiếp</string>
+    <string name="compose_scheduled_for">Hẹn giờ cho</string>
+    <string name="compose_scheduled_future">Thời gian chọn phải trong tương lai!</string>
+    <string name="compose_scheduled_plus">Bạn phải mở khoá QKSMS+ để dùng tính năng hẹn giờ</string>
+    <string name="compose_scheduled_toast">Đã hẹn giờ cho tin nhắn</string>
+    <string name="compose_hint">Viết tin nhắn&#8230;</string>
+    <string name="compose_menu_copy">Sao chép văn bản</string>
+    <string name="compose_menu_forward">Chuyển tiếp</string>
+    <string name="compose_menu_delete">Xóa</string>
+    <string name="compose_menu_previous">Trước đó</string>
+    <string name="compose_menu_next">Tiếp theo</string>
+    <string name="compose_menu_clear">Xóa</string>
+    <string name="compose_details_title">Chi tiết tin nhắn</string>
+    <string name="compose_details_type">Loại: %s</string>
+    <string name="compose_details_from">Từ: %s</string>
+    <string name="compose_details_to">Tới: %s</string>
+    <string name="compose_details_subject">Chủ đề: %s</string>
+    <string name="compose_details_priority">Độ ưu tiên: %s</string>
+    <string name="compose_details_size">Kích cỡ: %s</string>
+    <string name="compose_details_sent">Đã gửi: %s</string>
+    <string name="compose_details_received">Đã nhận: %s</string>
+    <string name="compose_details_delivered">Đã chuyển: %s</string>
+    <string name="compose_details_error_code">Mã lỗi: %d</string>
+    <string name="compose_attach_cd">Thêm tập tin đính kèm</string>
+    <string name="compose_gallery_cd">Đính kèm ảnh</string>
+    <string name="compose_camera_cd">Chụp ảnh</string>
+    <string name="compose_schedule_cd">Hẹn giờ tin nhắn</string>
+    <string name="compose_contact_cd">Đính kèm liên hệ</string>
+    <string name="compose_contact_error">Lỗi đọc liên hệ</string>
+    <!-- Example: SIM 1 (Verizon) selected-->
+    <string name="compose_sim_changed_toast">Đã chọn SIM %1$d (%2$s)</string>
+    <string name="compose_sim_cd">%s đã được chọn, hãy đổi thẻ SIM</string>
+    <string name="compose_send_cd">Gửi tin nhắn</string>
+    <string name="message_status_sending">Đang gửi&#8230;</string>
+    <string name="message_status_delivered">Đã chuyển %s</string>
+    <string name="message_status_failed">Gửi thất bại. Bấm để thử lại lần nữa</string>
+    <string name="info_title">Chi tiết</string>
+    <string name="info_copied_address">Địa chỉ đã được sao chép</string>
+    <string name="info_name">Tiêu đề cuộc trò chuyện</string>
+    <string name="info_notifications">Thông báo</string>
+    <string name="info_theme">Chủ đề</string>
+    <string name="info_archive">Lưu trữ</string>
+    <string name="info_unarchive">Hủy lưu trữ</string>
+    <string name="info_block">Chặn liên hệ</string>
+    <string name="info_unblock">Bỏ chặn liên hệ</string>
+    <string name="info_delete">Xóa cuộc trò chuyện</string>
+    <string name="gallery_error">Không thể tải thư viện</string>
+    <string name="gallery_toast_saved">Đã lưu vào thư viện</string>
+    <string name="backup_title">Sao lưu và khôi phục</string>
+    <string name="backup_backing_up">Đang sao lưu tin nhắn</string>
+    <string name="backup_restoring">Đang khôi phục từ bản sao lưu</string>
+    <string name="backup_last">Sao lưu lần cuối</string>
+    <string name="backup_loading">Đang tải&#8230;</string>
+    <string name="backup_never">Chưa bao giờ</string>
+    <string name="backup_restore_title">Khôi phục</string>
+    <string name="backup_restore_summary">Chọn một bản sao lưu</string>
+    <string name="backup_restore_error_plus">Vui lòng mở khoá QKSMS+ để dùng tính năng sao lưu và khôi phục</string>
+    <string name="backup_restore_error_backup">Đang sao lưu&#8230;</string>
+    <string name="backup_restore_error_restore">Đang khôi phục&#8230;</string>
+    <string name="backup_restore_confirm_title">Khôi phục từ bản sao lưu này</string>
+    <string name="backup_restore_confirm_message">Bạn chắc chắn muốn khôi phục tin nhắn từ bản sao lưu này chứ ?</string>
+    <string name="backup_restore_stop_title">Dừng khôi phục</string>
+    <string name="backup_restore_stop_message">Tin nhắn đã được khôi phục sẽ vẫn còn trên thiết bị của bạn</string>
+    <string name="backup_restore_dialog_title">Các bản sao lưu</string>
+    <string name="backup_restore_dialog_empty">Không tìm thấy bản sao lưu nào</string>
+    <plurals name="backup_message_count">
+        <item quantity="other">%d tin nhắn</item>
+    </plurals>
+    <string name="backup_disclaimer">Hiện tại, tính năng sao lưu và khôi phục chỉ hỗ trợ SMS. Việc hỗ trợ MMS và tính năng sao lưu định kì sẽ có sớm!</string>
+    <string name="backup_now">Sao lưu ngay</string>
+    <string name="backup_progress_parsing">Đang phân tích bản sao lưu&#8230;</string>
+    <string name="backup_progress_running">%d/%d tin nhắn</string>
+    <string name="backup_progress_saving">Đang lưu bản sao lưu&#8230;</string>
+    <string name="backup_progress_syncing">Đang đồng bộ tin nhắn&#8230;</string>
+    <string name="backup_progress_finished">Hoàn tất!</string>
+    <string name="backup_notification_channel_name">Sao lưu và khôi phục</string>
+    <string name="scheduled_title">Hẹn giờ tin nhắn</string>
+    <string name="scheduled_empty_description">Tự động gửi tin nhắn vào lúc mà bạn muốn</string>
+    <string name="scheduled_empty_message_1">Này, khi nào thì đến sinh nhật bạn?</string>
+    <string name="scheduled_empty_message_2">Vào ngày 23 tháng 12 đó</string>
+    <string name="scheduled_empty_message_3">Chúc mừng sinh nhật! Nhìn xem, tôi đúng là một người bạn tuyệt vời, nhớ ngày sinh nhật của bạn đấy</string>
+    <!--&#x200A; is a special character required at the end of this string to fix it's formatting in the app -->
+    <string name="scheduled_empty_message_3_timestamp">Sẽ gửi vào ngày 23 tháng 12</string>
+    <string name="scheduled_compose_cd">Hẹn giờ tin nhắn</string>
+    <string name="scheduled_options_title">Tin nhắn đã hẹn giờ</string>
+    <string-array name="scheduled_options">
+        <item>Gửi ngay</item>
+        <item>Sao chép kí tự</item>
+        <item>Xoá</item>
+    </string-array>
+    <string name="settings_category_appearance">Giao diện</string>
+    <string name="settings_category_general">Chung</string>
+    <string name="settings_category_qkreply">Trả lời nhanh</string>
+    <string name="settings_theme_title">Chủ đề</string>
+    <string name="settings_night_title">Giao diện tối</string>
+    <string name="settings_black_title">Giao diện tối AMOLED</string>
+    <string name="settings_night_start_title">Thời gian bắt đầu</string>
+    <string name="settings_night_end_title">Thời gian kết thúc</string>
+    <string name="settings_automatic_colors_title">Tự động hiện màu sắc của liên hệ</string>
+    <string name="settings_text_size_title">Cỡ chữ</string>
+    <string name="settings_system_font_title">Sử dụng font chữ hệ thống</string>
+    <string name="settings_auto_emoji_title">Emoji tự động</string>
+    <string name="settings_notifications_title">Thông báo</string>
+    <string name="settings_notifications_o_summary">Chạm để tuỳ chỉnh</string>
+    <string name="settings_notification_actions_title">Các hành động</string>
+    <string name="settings_notification_action_1">Nút 1</string>
+    <string name="settings_notification_action_2">Nút 2</string>
+    <string name="settings_notification_action_3">Nút 3</string>
+    <string name="settings_notification_previews_title">Xem trước các thông báo</string>
+    <string name="settings_notification_wake_title">Đánh thức màn hình</string>
+    <string name="settings_vibration_title">Rung</string>
+    <string name="settings_ringtone_title">Âm thanh</string>
+    <string name="settings_ringtone_none">Không dùng</string>
+    <string name="settings_qkreply_title">Trả lời nhanh</string>
+    <string name="settings_qkreply_summary">Hiển thị popup khi có tin nhắn mới</string>
+    <string name="settings_qkreply_tap_dismiss_title">Chạm để bỏ qua</string>
+    <string name="settings_qkreply_tap_dismiss_summary">Chạm vào phía ngoài của hộp thoại để đóng</string>
+    <string name="settings_delayed_title">Trì hoãn gửi tin</string>
+    <string name="settings_swipe_actions">Các hành động vuốt</string>
+    <string name="settings_swipe_actions_summary">Tuỳ chỉnh hành động vuốt cho cuộc trò chuyện</string>
+    <string name="settings_swipe_actions_right">Vuốt phải</string>
+    <string name="settings_swipe_actions_left">Vuốt trái</string>
+    <string name="settings_swipe_actions_change">THAY ĐỔI</string>
+    <string-array name="settings_swipe_actions">
+        <item>Không dùng</item>
+        <item>Lưu trữ</item>
+        <item>Xoá</item>
+        <item>Chặn</item>
+        <item>Gọi</item>
+        <item>Đánh dấu đã đọc</item>
+        <item>Đánh dấu chưa đọc</item>
+    </string-array>
+    <string name="settings_delivery_title">Xác nhận đã gửi tin</string>
+    <string name="settings_delivery_summary">Xác nhận rằng các tin nhắn được gửi thành công</string>
+    <string name="settings_signature_title">Chữ ký</string>
+    <string name="settings_signature_summary">Thêm chữ kí vào cuối đoạn tin nhắn của bạn</string>
+    <string name="settings_unicode_title">Bỏ dấu</string>
+    <string name="settings_unicode_summary">Bỏ dấu ký tự khi gửi SMS</string>
+    <string name="settings_mobile_title">Lọc số di động</string>
+    <string name="settings_mobile_summary">Khi soạn tin mới, chỉ hiển thị liên hệ có số di động</string>
+    <string name="settings_auto_delete">Delete old messages automatically</string>
+    <string name="settings_auto_delete_dialog_message">Messages will be deleted after the specified number of days</string>
+    <string name="settings_auto_delete_dialog_hint">Number of days</string>
+    <string name="settings_auto_delete_never">Never</string>
+    <string name="settings_auto_delete_warning">Delete old messages automatically?</string>
+    <string name="settings_auto_delete_warning_message">If you proceed, %1$d messages will be deleted now</string>
+    <plurals name="settings_auto_delete_summary">
+        <item quantity="other">After %d days</item>
+    </plurals>
+    <string name="settings_long_as_mms_title">Gửi đoạn tin nhắn dài như MMS</string>
+    <string name="settings_long_as_mms_summary">Nếu đoạn tin nhắn dài bị lỗi khi gửi, hoặc gửi sai thứ tự, bạn có thể gửi chúng như tin nhắn MMS thay thế. Cước phí bổ sung có thể bị áp dụng</string>
+    <string name="settings_mms_size_title">Tự động nén các tệp đính kèm MMS</string>
+    <string name="settings_sync_title">Đồng bộ tin nhắn</string>
+    <string name="settings_sync_summary">Đồng bộ lại tin nhắn với thiết bị</string>
+    <string name="settings_about_title">Thông tin QKSMS</string>
+    <string name="settings_version">Phiên bản: %s</string>
+    <string name="settings_logging_enabled">Đã bật bản ghi gỡ lỗi</string>
+    <string name="settings_logging_disabled">Đã tắt bản ghi gỡ lỗi</string>
+    <string name="settings_delay_duration_hint">Nhập khoảng thời gian (giây)</string>
+    <string name="blocking_title">Đang chặn</string>
+    <string name="blocking_drop_title">Loại bỏ tin nhắn</string>
+    <string name="blocking_drop_summary">Loại bỏ các tin nhắn được gửi tới từ người gửi đã chặn thay vì ẩn chúng</string>
+    <string name="blocking_conversations">Các cuộc trò chuyện đã chặn</string>
+    <string name="blocking_manager_title">Quản lý danh sách chặn</string>
+    <string name="blocking_manager_qksms_title">QKSMS</string>
+    <string name="blocking_manager_qksms_summary">Chức năng chặn tích hợp sẵn trong QKSMS</string>
+    <string name="blocking_manager_call_control_summary">Tự động lọc các cuộc gọi và tin nhắn của bạn ở một nơi thuận tiện! Cộng đồng IQ™ cho phép bạn ngăn chặn các tin nhắn từ những kẻ gửi tin rác được đóng góp bởi cộng đồng</string>
+    <string name="blocking_manager_sia_summary">Tự động lọc tin nhắn từ số điện thoại không mong muốn bằng cách sử dụng ứng dụng \"Should I Answer\"</string>
+    <string name="blocking_manager_copy_title">Sao chép số đã chặn</string>
+    <string name="blocking_manager_copy_summary">Tiếp tục %s sao chép vào các số đã chặn hiện có của bạn</string>
+    <string name="blocked_numbers_title">Các số đã chặn</string>
+    <string name="blocked_numbers_empty">Các số bạn đã chặn sẽ xuất hiện ở đây</string>
+    <string name="blocked_numbers_add_cd">Chặn một số mới</string>
+    <string name="blocked_numbers_dialog_title">Chặn văn bản từ</string>
+    <string name="blocked_numbers_dialog_hint">Số điện thoại</string>
+    <string name="blocked_numbers_dialog_block">Chặn</string>
+    <string name="blocked_messages_title">Các tin nhắn đã chặn</string>
+    <string name="blocked_messages_empty">Các tin nhắn bạn đã chặn sẽ xuất hiện ở đây</string>
+    <string name="blocking_block_title">Chặn</string>
+    <string name="blocking_unblock_title">Bỏ chặn</string>
+    <plurals name="blocking_block_external">
+        <item quantity="other">Tiếp tục %s và chặn các số này</item>
+    </plurals>
+    <plurals name="blocking_unblock_external">
+        <item quantity="other">Tiếp tục %s và cho phép các số này</item>
+    </plurals>
+    <string name="about_title">Giới thiệu</string>
+    <string name="about_version_title">Phiên bản</string>
+    <string name="about_developer_title">Nhà phát triển</string>
+    <string name="about_source_title">Mã nguồn</string>
+    <string name="about_changelog_title">Các thay đổi</string>
+    <string name="about_contact_title">Liên hệ</string>
+    <string name="about_license_title">Giấy phép</string>
+    <string name="about_copyright_title">Bản quyền</string>
+    <string name="qksms_plus_description_title">Hỗ trợ phát triển, mở khóa mọi thứ</string>
+    <string name="qksms_plus_description_summary">Bạn có thể ủng hộ chúng tôi chỉ với %s</string>
+    <!-- Substitutions are for price and currency. Ex: Lifetime upgrade for $1.99 USD -->
+    <string name="qksms_plus_upgrade">Nâng cấp trọn đời với %1$s %2$s</string>
+    <!-- Substitutions are for price and currency. Ex: Unlock + donate for $4.99 USD -->
+    <string name="qksms_plus_upgrade_donate">Mở khoá và tài trợ với %1$s %2$s</string>
+    <string name="qksms_plus_thanks_title">Cảm ơn bạn đã ủng hộ QKSMS!</string>
+    <string name="qksms_plus_thanks_summary">Bây giờ bạn có thể sử dụng tất cả các chức năng của QKSMS+</string>
+    <string name="qksms_plus_free_title">QKSMS+ miễn phí cho người sử dụng F-Droid! Bạn có thể trả phí nếu muốn hỗ trợ phát triển.</string>
+    <string name="qksms_plus_donate">Tài trợ bằng PayPal</string>
+    <string name="qksms_plus_coming_soon">Sắp có</string>
+    <string name="qksms_plus_themes_title">Chủ đề đặc biệt</string>
+    <string name="qksms_plus_themes_summary">Mở khóa các màu sắc đẹp không có sẵn trong bản thiết kế Material</string>
+    <string name="qksms_plus_emoji_title">Tuỳ biến Emoji tự động</string>
+    <string name="qksms_plus_emoji_summary">Tạo phím tắt Emoji tự động</string>
+    <string name="qksms_plus_backup_title">Sao lưu tin nhắn</string>
+    <string name="qksms_plus_backup_summary">Tự động sao lưu tin nhắn của bạn. Không bao giờ lo lắng về việc mất đi lịch sử của bạn nếu bạn thay đổi điện thoại hoặc điện thoại của bạn bị mất</string>
+    <string name="qksms_plus_scheduled_title">Hẹn giờ tin nhắn</string>
+    <string name="qksms_plus_scheduled_summary">Tin nhắn hẹn giờ sẽ được tự động gửi vào thời gian cụ thể</string>
+    <string name="qksms_plus_delayed_title">Trì hoãn gửi tin nhắn</string>
+    <string name="qksms_plus_delayed_summary">Chờ một vài giây trước khi gửi tin nhắn để bạn có thể hoàn tác nó</string>
+    <string name="qksms_plus_night_title">Giao diện tối tự động</string>
+    <string name="qksms_plus_night_summary">Kích hoạt giao diện tối dựa trên thời gian trong ngày</string>
+    <string name="qksms_plus_blacklist_title">Chặn nâng cao</string>
+    <string name="qksms_plus_blacklist_summary">Chặn tin nhắn có chứa các từ khóa hoặc phù hợp với các mẫu</string>
+    <string name="qksms_plus_forward_title">Tự động chuyển tiếp</string>
+    <string name="qksms_plus_forward_summary">Tự động chuyển tiếp tin nhắn từ người gửi</string>
+    <string name="qksms_plus_respond_title">Tự động trả lời</string>
+    <string name="qksms_plus_respond_summary">Tự động trả lời các tin nhắn với nội dung cài sẵn</string>
+    <string name="qksms_plus_more_title">Nhiều tính năng khác</string>
+    <string name="qksms_plus_more_summary">QKSMS đang trong giai đoạn phát triển, và việc thanh toán của bạn sẽ bao gồm tất cả tính năng QKSMS+ tương lai!</string>
+    <string name="widget_loading">Đang tải&#8230;</string>
+    <string name="widget_more">Xem thêm các cuộc trò chuyện</string>
+    <string name="qkreply_menu_read">Đánh dấu đã đọc</string>
+    <string name="qkreply_menu_call">Đàm thoại</string>
+    <string name="qkreply_menu_delete">Xoá</string>
+    <string name="qkreply_menu_expand">Hiển thị nhiều hơn</string>
+    <string name="qkreply_menu_collapse">Hiển thị ít hơn</string>
+    <string name="qkreply_menu_view">Mở cuộc trò chuyện</string>
+    <string name="theme_material">Material</string>
+    <string name="theme_hex">Hệ 16</string>
+    <string name="theme_apply">Áp dụng</string>
+    <string-array name="notification_actions">
+        <item>Không dùng</item>
+        <item>Lưu trữ</item>
+        <item>Xoá</item>
+        <item>Chặn</item>
+        <item>Gọi</item>
+        <item>Đánh dấu đã đọc</item>
+        <item>Trả lời</item>
+    </string-array>
+    <string name="button_yes">Đồng ý</string>
+    <string name="button_continue">Tiếp tục</string>
+    <string name="button_cancel">Hủy</string>
+    <string name="button_delete">Xóa</string>
+    <string name="button_save">Lưu</string>
+    <string name="button_stop">Dừng</string>
+    <string name="button_more">Xem thêm</string>
+    <string name="button_set">Chọn</string>
+    <string name="button_undo">Undo</string>
+    <string name="toast_copied">Đã sao chép</string>
+    <string name="toast_archived">Cuộc trò chuyện đã được lưu trữ</string>
+    <string name="toast_qksms_plus">Bạn phải mở khóa QKSMS+ để sử dụng chức năng này</string>
+    <plurals name="notification_new_messages">
+        <item quantity="other">%s tin nhắn mới</item>
+    </plurals>
+    <string name="notification_message_failed_title">Các tin không gửi</string>
+    <string name="notification_message_failed_text">Các tin gửi đến %s không thành công</string>
+    <string-array name="night_modes">
+        <item>Theo hệ thống</item>
+        <item>Vô hiệu hoá</item>
+        <item>Luôn bật</item>
+        <item>Tự động</item>
+    </string-array>
+    <string-array name="notification_preview_options">
+        <item>Hiển thị tên và tin nhắn</item>
+        <item>Hiển thị tên</item>
+        <item>Ẩn nội dung</item>
+    </string-array>
+    <string-array name="text_sizes">
+        <item>Nhỏ</item>
+        <item>Bình thường</item>
+        <item>Lớn</item>
+        <item>Lớn hơn</item>
+    </string-array>
+    <string-array name="delayed_sending_labels">
+        <item>Không trì hoãn</item>
+        <item>3 giây</item>
+        <item>5 giây</item>
+        <item>10 giây</item>
+    </string-array>
+    <string-array name="mms_sizes">
+        <item>Tự động</item>
+        <item>100KB</item>
+        <item>200KB</item>
+        <item>300KB</item>
+        <item>600KB</item>
+        <item>1000KB</item>
+        <item>2000KB</item>
+        <item>Không nén</item>
+    </string-array>
+    <string-array name="qk_responses">
+        <item>Ok</item>
+        <item>Chờ một lát</item>
+        <item>Tôi đang đến đây</item>
+        <item>Cảm ơn</item>
+        <item>Có vẻ được</item>
+        <item>Có chuyện gì vậy?</item>
+        <item>Đồng ý</item>
+        <item>Không</item>
+        <item>Yêu bạn</item>
+        <item>Xin lỗi</item>
+        <item>LOL</item>
+        <item>Không sao đâu</item>
+    </string-array>
+</resources>
diff --git a/presentation/src/main/res/values-zh-rCN/strings.xml b/presentation/src/main/res/values-zh-rCN/strings.xml
index 88c705b0c..40c3dfd30 100644
--- a/presentation/src/main/res/values-zh-rCN/strings.xml
+++ b/presentation/src/main/res/values-zh-rCN/strings.xml
@@ -1,405 +1,405 @@
-<?xml version="1.0" encoding="utf-8"?>
-<!--
-  ~ Copyright (C) 2019 Moez Bhatti <moez.bhatti@gmail.com>
-  ~
-  ~ This file is part of QKSMS.
-  ~
-  ~ QKSMS is free software: you can redistribute it and/or modify
-  ~ it under the terms of the GNU General Public License as published by
-  ~ the Free Software Foundation, either version 3 of the License, or
-  ~ (at your option) any later version.
-  ~
-  ~ QKSMS is distributed in the hope that it will be useful,
-  ~ but WITHOUT ANY WARRANTY; without even the implied warranty of
-  ~ MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
-  ~ GNU General Public License for more details.
-  ~
-  ~ You should have received a copy of the GNU General Public License
-  ~ along with QKSMS.  If not, see <http://www.gnu.org/licenses/>.
-  -->
-<resources>
-    <string name="shortcut_compose_long_label">新对话</string>
-    <string name="shortcut_compose_short_label">编写</string>
-    <string name="shortcut_compose_disabled_message">快捷方式已禁用</string>
-    <string name="title_archived">已存档</string>
-    <string name="title_settings">设置</string>
-    <string name="title_notification_prefs">通知</string>
-    <string name="title_theme">主题</string>
-    <string name="title_conversations">搜索收件箱&#8230;</string>
-    <string name="title_compose">撰写</string>
-    <string name="setup_skip">跳过</string>
-    <string name="setup_next">继续</string>
-    <string name="menu_add_person">添加人物</string>
-    <string name="menu_call">致电</string>
-    <string name="menu_info">详情</string>
-    <string name="menu_save">保存到图库</string>
-    <string name="menu_share">分享</string>
-    <string name="main_drawer_open_cd">打开导航栏</string>
-    <string name="main_title_selected">已选择 %d 项</string>
-    <string name="main_menu_clear">清除</string>
-    <string name="main_menu_archive">存档</string>
-    <string name="main_menu_unarchive">取消存档</string>
-    <string name="main_menu_delete">删除</string>
-    <string name="main_menu_add_contact">添加到通讯录</string>
-    <string name="main_menu_pin">固定到顶部</string>
-    <string name="main_menu_unpin">取消固定</string>
-    <string name="main_menu_read">标记为已读</string>
-    <string name="main_menu_unread">标记为未读</string>
-    <string name="main_menu_block">拦截</string>
-    <string name="main_syncing">正在同步信息&#8230;</string>
-    <string name="main_sender_you">你：%s</string>
-    <string name="main_draft">草稿</string>
-    <string name="main_message_results_title">信息中的结果</string>
-    <string name="main_message_results">%d 条信息</string>
-    <string name="inbox_empty_text">对话会在这里显示</string>
-    <string name="inbox_search_empty_text">无结果</string>
-    <string name="archived_empty_text">存档的对话会出现在这里</string>
-    <string name="main_fab_cd">开始新对话</string>
-    <string name="main_default_sms_title">再次爱上发短信</string>
-    <string name="main_default_sms_message">将 QKSMS 设为默认短信应用</string>
-    <string name="main_default_sms_change">更改</string>
-    <string name="main_permission_required">需要权限</string>
-    <string name="main_permission_sms">QKSMS 需要权限来发送和查看短信</string>
-    <string name="main_permission_contacts">QKSMS 需要权限来查看联系人</string>
-    <string name="main_permission_allow">允许</string>
-    <string name="drawer_inbox">收件箱</string>
-    <string name="drawer_archived">已存档</string>
-    <string name="drawer_scheduled">已计划</string>
-    <string name="drawer_blocking">拦截</string>
-    <string name="drawer_more">更多</string>
-    <string name="drawer_settings">设置</string>
-    <string name="drawer_help">帮助及反馈</string>
-    <string name="drawer_invite">邀请朋友</string>
-    <string name="drawer_plus_banner_summary">解锁炫酷特性并支持开发者</string>
-    <string name="rate_title">喜欢 QKSMS？</string>
-    <string name="rate_summary">在 Google Play 分享你的感受，并给我们评分！</string>
-    <string name="rate_okay">好的！</string>
-    <string name="rate_dismiss">放弃</string>
-    <string name="dialog_delete_title">删除</string>
-    <plurals name="dialog_delete_message">
-        <item quantity="other">你确定要删除%d段对话么？</item>
-    </plurals>
-    <string-array name="message_options">
-        <item>复制文本</item>
-        <item>转发</item>
-        <item>删除</item>
-    </string-array>
-    <string name="compose_number_picker_title">选择电话号码</string>
-    <string name="compose_number_picker_default">%s ∙ 默认</string>
-    <string name="compose_number_picker_once">仅一次</string>
-    <string name="compose_number_picker_always">始终</string>
-    <string name="compose_title_selected">已选择 %d 个项目</string>
-    <string name="compose_subtitle_results">已显示 %2$d 中的 %1$d 条结果</string>
-    <string name="compose_send_group_title">群发消息</string>
-    <string name="compose_send_group_summary">收件人和回复将对所有人可见</string>
-    <string name="compose_messages_empty">对话从这里开始，说些什么吧！</string>
-    <string name="compose_vcard_label">联系人卡片</string>
-    <string name="compose_scheduled_for">计划于</string>
-    <string name="compose_scheduled_future">所选时间必须是未来！</string>
-    <string name="compose_scheduled_plus">你需要解锁 QKSMS+ 才可以使用预约短信</string>
-    <string name="compose_scheduled_toast">已添加到预约短信队列</string>
-    <string name="compose_hint">写一条消息...</string>
-    <string name="compose_menu_copy">复制文本</string>
-    <string name="compose_menu_forward">转发</string>
-    <string name="compose_menu_delete">删除</string>
-    <string name="compose_menu_previous">上一个</string>
-    <string name="compose_menu_next">下一个</string>
-    <string name="compose_menu_clear">清除</string>
-    <string name="compose_details_title">信息详情</string>
-    <string name="compose_details_type">类型：%s</string>
-    <string name="compose_details_from">来自：%s</string>
-    <string name="compose_details_to">发送给：%s</string>
-    <string name="compose_details_subject">主题：%s</string>
-    <string name="compose_details_priority">优先级：%s</string>
-    <string name="compose_details_size">大小：%s</string>
-    <string name="compose_details_sent">发送时间：%s</string>
-    <string name="compose_details_received">接收时间：%s</string>
-    <string name="compose_details_delivered">送达时间：%s</string>
-    <string name="compose_details_error_code">错误码：%d</string>
-    <string name="compose_attach_cd">添加附件</string>
-    <string name="compose_gallery_cd">添加照片</string>
-    <string name="compose_camera_cd">拍照</string>
-    <string name="compose_schedule_cd">定时消息</string>
-    <string name="compose_contact_cd">附加联系人</string>
-    <string name="compose_contact_error">读取联系人时出错</string>
-    <!-- Example: SIM 1 (Verizon) selected-->
-    <string name="compose_sim_changed_toast">已选择 SIM 卡 %1$d (%2$s)</string>
-    <string name="compose_sim_cd">%s 已选择，更改 SIM 卡</string>
-    <string name="compose_send_cd">发送消息</string>
-    <string name="message_status_sending">正在发送...</string>
-    <string name="message_status_delivered">已送达 %s</string>
-    <string name="message_status_failed">发送失败。点击再试一次</string>
-    <string name="info_title">详情</string>
-    <string name="info_copied_address">地址已复制</string>
-    <string name="info_name">对话标题</string>
-    <string name="info_notifications">通知</string>
-    <string name="info_theme">主题</string>
-    <string name="info_archive">存档</string>
-    <string name="info_unarchive">取消存档</string>
-    <string name="info_block">拦截</string>
-    <string name="info_unblock">取消拦截</string>
-    <string name="info_delete">删除对话</string>
-    <string name="gallery_error">无法加载媒体</string>
-    <string name="gallery_toast_saved">保存到图库</string>
-    <string name="backup_title">备份和还原</string>
-    <string name="backup_backing_up">正在备份消息</string>
-    <string name="backup_restoring">正在从备份还原</string>
-    <string name="backup_last">上次备份</string>
-    <string name="backup_loading">正在加载&#8230;</string>
-    <string name="backup_never">从未</string>
-    <string name="backup_restore_title">还原</string>
-    <string name="backup_restore_summary">选择备份</string>
-    <string name="backup_restore_error_plus">请解锁 QKSMS+ 以使用备份和还原</string>
-    <string name="backup_restore_error_backup">正在进行备份&#8230;</string>
-    <string name="backup_restore_error_restore">正在还原&#8230;</string>
-    <string name="backup_restore_confirm_title">从备份还原</string>
-    <string name="backup_restore_confirm_message">是否确实要从该备份还原消息？</string>
-    <string name="backup_restore_stop_title">停止还原</string>
-    <string name="backup_restore_stop_message">已还原的消息将保留在您的设备上</string>
-    <string name="backup_restore_dialog_title">备份</string>
-    <string name="backup_restore_dialog_empty">找不到备份</string>
-    <plurals name="backup_message_count">
-        <item quantity="other">%d 条消息</item>
-    </plurals>
-    <string name="backup_disclaimer">目前只有短信支持备份和恢复。彩信支持和定时备份将很快到来!</string>
-    <string name="backup_now">立即备份</string>
-    <string name="backup_progress_parsing">正在分析备份&#8230;</string>
-    <string name="backup_progress_running">%d/%d 消息</string>
-    <string name="backup_progress_saving">正在保存备份&#8230;</string>
-    <string name="backup_progress_syncing">正在同步信息&#8230;</string>
-    <string name="backup_progress_finished">完成！</string>
-    <string name="backup_notification_channel_name">备份和还原</string>
-    <string name="scheduled_title">预约</string>
-    <string name="scheduled_empty_description">在指定时间自动发送消息</string>
-    <string name="scheduled_empty_message_1">嘿！你的生日是什么时候？</string>
-    <string name="scheduled_empty_message_2">是12月23日</string>
-    <string name="scheduled_empty_message_3">生日快乐！我够朋友吧，还记得你的生日</string>
-    <!--&#x200A; is a special character required at the end of this string to fix it's formatting in the app -->
-    <string name="scheduled_empty_message_3_timestamp">在12月23日发送 </string>
-    <string name="scheduled_compose_cd">创建预约短信</string>
-    <string name="scheduled_options_title">预约短信</string>
-    <string-array name="scheduled_options">
-        <item>现在发送</item>
-        <item>复制文本</item>
-        <item>删除</item>
-    </string-array>
-    <string name="settings_category_appearance">外观</string>
-    <string name="settings_category_general">通用</string>
-    <string name="settings_category_qkreply">快速回复</string>
-    <string name="settings_theme_title">主题</string>
-    <string name="settings_night_title">夜间模式</string>
-    <string name="settings_black_title">纯黑夜间模式</string>
-    <string name="settings_night_start_title">开始时间</string>
-    <string name="settings_night_end_title">结束时间</string>
-    <string name="settings_automatic_colors_title">自动化联系人颜色</string>
-    <string name="settings_text_size_title">字体大小</string>
-    <string name="settings_system_font_title">使用系统字体</string>
-    <string name="settings_auto_emoji_title">自动颜文字</string>
-    <string name="settings_notifications_title">通知</string>
-    <string name="settings_notifications_o_summary">点击跳转到系统设置</string>
-    <string name="settings_notification_actions_title">操作</string>
-    <string name="settings_notification_action_1">按钮1</string>
-    <string name="settings_notification_action_2">按钮2</string>
-    <string name="settings_notification_action_3">按钮3</string>
-    <string name="settings_notification_previews_title">通知预览</string>
-    <string name="settings_notification_wake_title">唤醒屏幕</string>
-    <string name="settings_vibration_title">振动</string>
-    <string name="settings_ringtone_title">铃声</string>
-    <string name="settings_ringtone_none">无</string>
-    <string name="settings_qkreply_title">快速回复</string>
-    <string name="settings_qkreply_summary">弹出新消息</string>
-    <string name="settings_qkreply_tap_dismiss_title">点击忽略</string>
-    <string name="settings_qkreply_tap_dismiss_summary">点击弹窗外部以关闭</string>
-    <string name="settings_delayed_title">延迟发送</string>
-    <string name="settings_swipe_actions">滑动操作</string>
-    <string name="settings_swipe_actions_summary">配置对话的滑动操作</string>
-    <string name="settings_swipe_actions_right">右划</string>
-    <string name="settings_swipe_actions_left">左划</string>
-    <string name="settings_swipe_actions_change">更改</string>
-    <string-array name="settings_swipe_actions">
-        <item>无</item>
-        <item>归档</item>
-        <item>删除</item>
-        <item>拦截</item>
-        <item>呼叫</item>
-        <item>标记为已读</item>
-        <item>标记为未读</item>
-    </string-array>
-    <string name="settings_delivery_title">送达确认</string>
-    <string name="settings_delivery_summary">确认短信已成功送达</string>
-    <string name="settings_signature_title">签名</string>
-    <string name="settings_signature_summary">在您的信息结尾添加签名</string>
-    <string name="settings_unicode_title">删除重音符号</string>
-    <string name="settings_unicode_summary">删除短信中字母上的重音符号</string>
-    <string name="settings_mobile_title">仅限手机号码</string>
-    <string name="settings_mobile_summary">撰写邮件时，只显示手机号码</string>
-    <string name="settings_auto_delete">自动删除旧消息</string>
-    <string name="settings_auto_delete_dialog_message">消息将在指定天数后删除</string>
-    <string name="settings_auto_delete_dialog_hint">天数</string>
-    <string name="settings_auto_delete_never">从不</string>
-    <string name="settings_auto_delete_warning">自动删除旧消息吗？</string>
-    <string name="settings_auto_delete_warning_message">如果您继续，现在将删除 %1$d 条消息</string>
-    <plurals name="settings_auto_delete_summary">
-        <item quantity="other">%d 天后</item>
-    </plurals>
-    <string name="settings_long_as_mms_title">将长信息作为彩信发送</string>
-    <string name="settings_long_as_mms_summary">如果您无法发送较长的信息，或者是以错误的顺序发送，您可以将其作为彩信发送。可能会收取额外的费用</string>
-    <string name="settings_mms_size_title">自动压缩彩信附件</string>
-    <string name="settings_sync_title">同步消息</string>
-    <string name="settings_sync_summary">重新与安卓原生短信数据库进行同步</string>
-    <string name="settings_about_title">关于 QKSMS</string>
-    <string name="settings_version">版本 %s</string>
-    <string name="settings_logging_enabled">调试日志记录已启用</string>
-    <string name="settings_logging_disabled">调试日志记录已禁用</string>
-    <string name="settings_delay_duration_hint">输入时长 (秒)</string>
-    <string name="blocking_title">屏蔽</string>
-    <string name="blocking_drop_title">丢弃信息</string>
-    <string name="blocking_drop_summary">丢弃屏蔽的发件人所发送的信息</string>
-    <string name="blocking_conversations">已屏蔽的会话</string>
-    <string name="blocking_manager_title">屏蔽管理器</string>
-    <string name="blocking_manager_qksms_title">QKSMS</string>
-    <string name="blocking_manager_qksms_summary">QKSMS 中内建的屏蔽功能</string>
-    <string name="blocking_manager_call_control_summary">自动在适当的位置过滤您的来电和信息！Community IQ™ 允许您阻止社区中已知的垃圾发件人所发送的垃圾信息</string>
-    <string name="blocking_manager_sia_summary">使用 \"Should I Answer\" 应用过滤未知号码的消息</string>
-    <string name="blocking_manager_copy_title">复制屏蔽的号码</string>
-    <string name="blocking_manager_copy_summary">继续前往%s并复制到您现有的已屏蔽号码</string>
-    <string name="blocked_numbers_title">已屏蔽的号码</string>
-    <string name="blocked_numbers_empty">您所屏蔽的号码将会在这里显示</string>
-    <string name="blocked_numbers_add_cd">屏蔽新的号码</string>
-    <string name="blocked_numbers_dialog_title">屏蔽短信自</string>
-    <string name="blocked_numbers_dialog_hint">电话号码</string>
-    <string name="blocked_numbers_dialog_block">屏蔽</string>
-    <string name="blocked_messages_title">已屏蔽的信息</string>
-    <string name="blocked_messages_empty">您所屏蔽的信息将会在这里显示</string>
-    <string name="blocking_block_title">屏蔽</string>
-    <string name="blocking_unblock_title">取消屏蔽</string>
-    <plurals name="blocking_block_external">
-        <item quantity="other">继续前往%s并屏蔽这个（些）号码</item>
-    </plurals>
-    <plurals name="blocking_unblock_external">
-        <item quantity="other">继续前往%s并允许这个（些）号码</item>
-    </plurals>
-    <string name="about_title">关于</string>
-    <string name="about_version_title">版本</string>
-    <string name="about_developer_title">开发人员</string>
-    <string name="about_source_title">源代码</string>
-    <string name="about_changelog_title">更新日志</string>
-    <string name="about_contact_title">联系人</string>
-    <string name="about_license_title">许可证</string>
-    <string name="about_copyright_title">版权</string>
-    <string name="qksms_plus_description_title">支持开发，解锁全部功能</string>
-    <string name="qksms_plus_description_summary">你可以支付 %s 来拯救一个饥渴的程序猿</string>
-    <!-- Substitutions are for price and currency. Ex: Lifetime upgrade for $1.99 USD -->
-    <string name="qksms_plus_upgrade">终身升级只需 %1$s %2$s</string>
-    <!-- Substitutions are for price and currency. Ex: Unlock + donate for $4.99 USD -->
-    <string name="qksms_plus_upgrade_donate">解锁并捐赠只需 %1$s %2$s</string>
-    <string name="qksms_plus_thanks_title">感谢你对 QKSMS 的支持！</string>
-    <string name="qksms_plus_thanks_summary">现在你可以使用 QKSMS+ 的全部功能！</string>
-    <string name="qksms_plus_free_title">QKSMS+ 对 F-Droid 用户免费！如果您想支持开发，可以随意捐款。</string>
-    <string name="qksms_plus_donate">使用 PayPal 捐赠</string>
-    <string name="qksms_plus_coming_soon">即将推出</string>
-    <string name="qksms_plus_themes_title">高级主题</string>
-    <string name="qksms_plus_themes_summary">解锁 \"Material Design\" 调色板中不可用的美丽彩色主题</string>
-    <string name="qksms_plus_emoji_title">自定义自动颜文字</string>
-    <string name="qksms_plus_emoji_summary">创建自定义自动颜文字的快捷方式</string>
-    <string name="qksms_plus_backup_title">消息备份</string>
-    <string name="qksms_plus_backup_summary">自动备份短信，再也不用担心更换或丢失手机后会丢掉短信记录。</string>
-    <string name="qksms_plus_scheduled_title">定时消息</string>
-    <string name="qksms_plus_scheduled_summary">安排一个时间来自动发送短信</string>
-    <string name="qksms_plus_delayed_title">延迟发送</string>
-    <string name="qksms_plus_delayed_summary">发送短信前，稍等几秒</string>
-    <string name="qksms_plus_night_title">自动夜间模式</string>
-    <string name="qksms_plus_night_summary">根据时间自动启用夜间模式</string>
-    <string name="qksms_plus_blacklist_title">高级拦截选项</string>
-    <string name="qksms_plus_blacklist_summary">根据关键字或匹配模式拦截消息</string>
-    <string name="qksms_plus_forward_title">自动转发</string>
-    <string name="qksms_plus_forward_summary">自动转发特定发件人的短信</string>
-    <string name="qksms_plus_respond_title">自动回复</string>
-    <string name="qksms_plus_respond_summary">使用预设文本自动回复短信</string>
-    <string name="qksms_plus_more_title">更多</string>
-    <string name="qksms_plus_more_summary">QKSMS 积极更新中，您的购买将包含未来 QKSMS+ 的所有功能！</string>
-    <string name="widget_loading">载入中...</string>
-    <string name="widget_more">查看更多对话</string>
-    <string name="qkreply_menu_read">标记为已读</string>
-    <string name="qkreply_menu_call">致电</string>
-    <string name="qkreply_menu_delete">删除</string>
-    <string name="qkreply_menu_expand">显示更多</string>
-    <string name="qkreply_menu_collapse">收起</string>
-    <string name="qkreply_menu_view">打开会话</string>
-    <string name="theme_material">Material</string>
-    <string name="theme_hex">HEX</string>
-    <string name="theme_apply">应用</string>
-    <string-array name="notification_actions">
-        <item>无</item>
-        <item>存档</item>
-        <item>删除</item>
-        <item>拦截</item>
-        <item>呼叫</item>
-        <item>标记为已读</item>
-        <item>回复</item>
-    </string-array>
-    <string name="button_yes">是</string>
-    <string name="button_continue">继续</string>
-    <string name="button_cancel">取消</string>
-    <string name="button_delete">删除</string>
-    <string name="button_save">保存</string>
-    <string name="button_stop">停止</string>
-    <string name="button_more">更多</string>
-    <string name="button_set">设置</string>
-    <string name="button_undo">撤销</string>
-    <string name="toast_copied">已复制</string>
-    <string name="toast_archived">已存档的对话</string>
-    <string name="toast_qksms_plus">您必须解锁 QKSMS+ 才能使用此功能</string>
-    <plurals name="notification_new_messages">
-        <item quantity="other">%s条新信息</item>
-    </plurals>
-    <string name="notification_message_failed_title">消息未发送</string>
-    <string name="notification_message_failed_text">给%s的短信发送失败</string>
-    <string-array name="night_modes">
-        <item>系统</item>
-        <item>已禁用</item>
-        <item>始终打开</item>
-        <item>自动</item>
-    </string-array>
-    <string-array name="notification_preview_options">
-        <item>显示姓名和消息</item>
-        <item>只显示姓名</item>
-        <item>隐藏内容</item>
-    </string-array>
-    <string-array name="text_sizes">
-        <item>小</item>
-        <item>正常</item>
-        <item>大</item>
-        <item>更大</item>
-    </string-array>
-    <string-array name="delayed_sending_labels">
-        <item>无延迟</item>
-        <item>3 秒</item>
-        <item>5 秒</item>
-        <item>10 秒</item>
-    </string-array>
-    <string-array name="mms_sizes">
-        <item>自动</item>
-        <item>100KB</item>
-        <item>200KB</item>
-        <item>300KB</item>
-        <item>600KB</item>
-        <item>1000KB</item>
-        <item>2000KB</item>
-        <item>不压缩</item>
-    </string-array>
-    <string-array name="qk_responses">
-        <item>好的</item>
-        <item>请稍等一会儿</item>
-        <item>在路上了</item>
-        <item>谢谢</item>
-        <item>听上去不错</item>
-        <item>怎么了？</item>
-        <item>同意</item>
-        <item>不</item>
-        <item>爱你</item>
-        <item>抱歉</item>
-        <item>啊哈哈哈哈</item>
-        <item>好的</item>
-    </string-array>
-</resources>
+<?xml version="1.0" encoding="utf-8"?>
+<!--
+  ~ Copyright (C) 2019 Moez Bhatti <moez.bhatti@gmail.com>
+  ~
+  ~ This file is part of QKSMS.
+  ~
+  ~ QKSMS is free software: you can redistribute it and/or modify
+  ~ it under the terms of the GNU General Public License as published by
+  ~ the Free Software Foundation, either version 3 of the License, or
+  ~ (at your option) any later version.
+  ~
+  ~ QKSMS is distributed in the hope that it will be useful,
+  ~ but WITHOUT ANY WARRANTY; without even the implied warranty of
+  ~ MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+  ~ GNU General Public License for more details.
+  ~
+  ~ You should have received a copy of the GNU General Public License
+  ~ along with QKSMS.  If not, see <http://www.gnu.org/licenses/>.
+  -->
+<resources>
+    <string name="shortcut_compose_long_label">新对话</string>
+    <string name="shortcut_compose_short_label">编写</string>
+    <string name="shortcut_compose_disabled_message">快捷方式已禁用</string>
+    <string name="title_archived">已存档</string>
+    <string name="title_settings">设置</string>
+    <string name="title_notification_prefs">通知</string>
+    <string name="title_theme">主题</string>
+    <string name="title_conversations">搜索收件箱&#8230;</string>
+    <string name="title_compose">撰写</string>
+    <string name="setup_skip">跳过</string>
+    <string name="setup_next">继续</string>
+    <string name="menu_add_person">添加人物</string>
+    <string name="menu_call">致电</string>
+    <string name="menu_info">详情</string>
+    <string name="menu_save">保存到图库</string>
+    <string name="menu_share">分享</string>
+    <string name="main_drawer_open_cd">打开导航栏</string>
+    <string name="main_title_selected">已选择 %d 项</string>
+    <string name="main_menu_clear">清除</string>
+    <string name="main_menu_archive">存档</string>
+    <string name="main_menu_unarchive">取消存档</string>
+    <string name="main_menu_delete">删除</string>
+    <string name="main_menu_add_contact">添加到通讯录</string>
+    <string name="main_menu_pin">固定到顶部</string>
+    <string name="main_menu_unpin">取消固定</string>
+    <string name="main_menu_read">标记为已读</string>
+    <string name="main_menu_unread">标记为未读</string>
+    <string name="main_menu_block">拦截</string>
+    <string name="main_syncing">正在同步信息&#8230;</string>
+    <string name="main_sender_you">你：%s</string>
+    <string name="main_draft">草稿</string>
+    <string name="main_message_results_title">信息中的结果</string>
+    <string name="main_message_results">%d 条信息</string>
+    <string name="inbox_empty_text">对话会在这里显示</string>
+    <string name="inbox_search_empty_text">无结果</string>
+    <string name="archived_empty_text">存档的对话会出现在这里</string>
+    <string name="main_fab_cd">开始新对话</string>
+    <string name="main_default_sms_title">再次爱上发短信</string>
+    <string name="main_default_sms_message">将 QKSMS 设为默认短信应用</string>
+    <string name="main_default_sms_change">更改</string>
+    <string name="main_permission_required">需要权限</string>
+    <string name="main_permission_sms">QKSMS 需要权限来发送和查看短信</string>
+    <string name="main_permission_contacts">QKSMS 需要权限来查看联系人</string>
+    <string name="main_permission_allow">允许</string>
+    <string name="drawer_inbox">收件箱</string>
+    <string name="drawer_archived">已存档</string>
+    <string name="drawer_scheduled">已计划</string>
+    <string name="drawer_blocking">拦截</string>
+    <string name="drawer_more">更多</string>
+    <string name="drawer_settings">设置</string>
+    <string name="drawer_help">帮助及反馈</string>
+    <string name="drawer_invite">邀请朋友</string>
+    <string name="drawer_plus_banner_summary">解锁炫酷特性并支持开发者</string>
+    <string name="rate_title">喜欢 QKSMS？</string>
+    <string name="rate_summary">在 Google Play 分享你的感受，并给我们评分！</string>
+    <string name="rate_okay">好的！</string>
+    <string name="rate_dismiss">放弃</string>
+    <string name="dialog_delete_title">删除</string>
+    <plurals name="dialog_delete_message">
+        <item quantity="other">你确定要删除%d段对话么？</item>
+    </plurals>
+    <string-array name="message_options">
+        <item>复制文本</item>
+        <item>转发</item>
+        <item>删除</item>
+    </string-array>
+    <string name="compose_number_picker_title">选择电话号码</string>
+    <string name="compose_number_picker_default">%s ∙ 默认</string>
+    <string name="compose_number_picker_once">仅一次</string>
+    <string name="compose_number_picker_always">始终</string>
+    <string name="compose_title_selected">已选择 %d 个项目</string>
+    <string name="compose_subtitle_results">已显示 %2$d 中的 %1$d 条结果</string>
+    <string name="compose_send_group_title">群发消息</string>
+    <string name="compose_send_group_summary">收件人和回复将对所有人可见</string>
+    <string name="compose_messages_empty">对话从这里开始，说些什么吧！</string>
+    <string name="compose_vcard_label">联系人卡片</string>
+    <string name="compose_scheduled_for">计划于</string>
+    <string name="compose_scheduled_future">所选时间必须是未来！</string>
+    <string name="compose_scheduled_plus">你需要解锁 QKSMS+ 才可以使用预约短信</string>
+    <string name="compose_scheduled_toast">已添加到预约短信队列</string>
+    <string name="compose_hint">写一条消息...</string>
+    <string name="compose_menu_copy">复制文本</string>
+    <string name="compose_menu_forward">转发</string>
+    <string name="compose_menu_delete">删除</string>
+    <string name="compose_menu_previous">上一个</string>
+    <string name="compose_menu_next">下一个</string>
+    <string name="compose_menu_clear">清除</string>
+    <string name="compose_details_title">信息详情</string>
+    <string name="compose_details_type">类型：%s</string>
+    <string name="compose_details_from">来自：%s</string>
+    <string name="compose_details_to">发送给：%s</string>
+    <string name="compose_details_subject">主题：%s</string>
+    <string name="compose_details_priority">优先级：%s</string>
+    <string name="compose_details_size">大小：%s</string>
+    <string name="compose_details_sent">发送时间：%s</string>
+    <string name="compose_details_received">接收时间：%s</string>
+    <string name="compose_details_delivered">送达时间：%s</string>
+    <string name="compose_details_error_code">错误码：%d</string>
+    <string name="compose_attach_cd">添加附件</string>
+    <string name="compose_gallery_cd">添加照片</string>
+    <string name="compose_camera_cd">拍照</string>
+    <string name="compose_schedule_cd">定时消息</string>
+    <string name="compose_contact_cd">附加联系人</string>
+    <string name="compose_contact_error">读取联系人时出错</string>
+    <!-- Example: SIM 1 (Verizon) selected-->
+    <string name="compose_sim_changed_toast">已选择 SIM 卡 %1$d (%2$s)</string>
+    <string name="compose_sim_cd">%s 已选择，更改 SIM 卡</string>
+    <string name="compose_send_cd">发送消息</string>
+    <string name="message_status_sending">正在发送...</string>
+    <string name="message_status_delivered">已送达 %s</string>
+    <string name="message_status_failed">发送失败。点击再试一次</string>
+    <string name="info_title">详情</string>
+    <string name="info_copied_address">地址已复制</string>
+    <string name="info_name">对话标题</string>
+    <string name="info_notifications">通知</string>
+    <string name="info_theme">主题</string>
+    <string name="info_archive">存档</string>
+    <string name="info_unarchive">取消存档</string>
+    <string name="info_block">拦截</string>
+    <string name="info_unblock">取消拦截</string>
+    <string name="info_delete">删除对话</string>
+    <string name="gallery_error">无法加载媒体</string>
+    <string name="gallery_toast_saved">保存到图库</string>
+    <string name="backup_title">备份和还原</string>
+    <string name="backup_backing_up">正在备份消息</string>
+    <string name="backup_restoring">正在从备份还原</string>
+    <string name="backup_last">上次备份</string>
+    <string name="backup_loading">正在加载&#8230;</string>
+    <string name="backup_never">从未</string>
+    <string name="backup_restore_title">还原</string>
+    <string name="backup_restore_summary">选择备份</string>
+    <string name="backup_restore_error_plus">请解锁 QKSMS+ 以使用备份和还原</string>
+    <string name="backup_restore_error_backup">正在进行备份&#8230;</string>
+    <string name="backup_restore_error_restore">正在还原&#8230;</string>
+    <string name="backup_restore_confirm_title">从备份还原</string>
+    <string name="backup_restore_confirm_message">是否确实要从该备份还原消息？</string>
+    <string name="backup_restore_stop_title">停止还原</string>
+    <string name="backup_restore_stop_message">已还原的消息将保留在您的设备上</string>
+    <string name="backup_restore_dialog_title">备份</string>
+    <string name="backup_restore_dialog_empty">找不到备份</string>
+    <plurals name="backup_message_count">
+        <item quantity="other">%d 条消息</item>
+    </plurals>
+    <string name="backup_disclaimer">目前只有短信支持备份和恢复。彩信支持和定时备份将很快到来!</string>
+    <string name="backup_now">立即备份</string>
+    <string name="backup_progress_parsing">正在分析备份&#8230;</string>
+    <string name="backup_progress_running">%d/%d 消息</string>
+    <string name="backup_progress_saving">正在保存备份&#8230;</string>
+    <string name="backup_progress_syncing">正在同步信息&#8230;</string>
+    <string name="backup_progress_finished">完成！</string>
+    <string name="backup_notification_channel_name">备份和还原</string>
+    <string name="scheduled_title">预约</string>
+    <string name="scheduled_empty_description">在指定时间自动发送消息</string>
+    <string name="scheduled_empty_message_1">嘿！你的生日是什么时候？</string>
+    <string name="scheduled_empty_message_2">是12月23日</string>
+    <string name="scheduled_empty_message_3">生日快乐！我够朋友吧，还记得你的生日</string>
+    <!--&#x200A; is a special character required at the end of this string to fix it's formatting in the app -->
+    <string name="scheduled_empty_message_3_timestamp">在12月23日发送 </string>
+    <string name="scheduled_compose_cd">创建预约短信</string>
+    <string name="scheduled_options_title">预约短信</string>
+    <string-array name="scheduled_options">
+        <item>现在发送</item>
+        <item>复制文本</item>
+        <item>删除</item>
+    </string-array>
+    <string name="settings_category_appearance">外观</string>
+    <string name="settings_category_general">通用</string>
+    <string name="settings_category_qkreply">快速回复</string>
+    <string name="settings_theme_title">主题</string>
+    <string name="settings_night_title">夜间模式</string>
+    <string name="settings_black_title">纯黑夜间模式</string>
+    <string name="settings_night_start_title">开始时间</string>
+    <string name="settings_night_end_title">结束时间</string>
+    <string name="settings_automatic_colors_title">自动化联系人颜色</string>
+    <string name="settings_text_size_title">字体大小</string>
+    <string name="settings_system_font_title">使用系统字体</string>
+    <string name="settings_auto_emoji_title">自动颜文字</string>
+    <string name="settings_notifications_title">通知</string>
+    <string name="settings_notifications_o_summary">点击跳转到系统设置</string>
+    <string name="settings_notification_actions_title">操作</string>
+    <string name="settings_notification_action_1">按钮1</string>
+    <string name="settings_notification_action_2">按钮2</string>
+    <string name="settings_notification_action_3">按钮3</string>
+    <string name="settings_notification_previews_title">通知预览</string>
+    <string name="settings_notification_wake_title">唤醒屏幕</string>
+    <string name="settings_vibration_title">振动</string>
+    <string name="settings_ringtone_title">铃声</string>
+    <string name="settings_ringtone_none">无</string>
+    <string name="settings_qkreply_title">快速回复</string>
+    <string name="settings_qkreply_summary">弹出新消息</string>
+    <string name="settings_qkreply_tap_dismiss_title">点击忽略</string>
+    <string name="settings_qkreply_tap_dismiss_summary">点击弹窗外部以关闭</string>
+    <string name="settings_delayed_title">延迟发送</string>
+    <string name="settings_swipe_actions">滑动操作</string>
+    <string name="settings_swipe_actions_summary">配置对话的滑动操作</string>
+    <string name="settings_swipe_actions_right">右划</string>
+    <string name="settings_swipe_actions_left">左划</string>
+    <string name="settings_swipe_actions_change">更改</string>
+    <string-array name="settings_swipe_actions">
+        <item>无</item>
+        <item>归档</item>
+        <item>删除</item>
+        <item>拦截</item>
+        <item>呼叫</item>
+        <item>标记为已读</item>
+        <item>标记为未读</item>
+    </string-array>
+    <string name="settings_delivery_title">送达确认</string>
+    <string name="settings_delivery_summary">确认短信已成功送达</string>
+    <string name="settings_signature_title">签名</string>
+    <string name="settings_signature_summary">在您的信息结尾添加签名</string>
+    <string name="settings_unicode_title">删除重音符号</string>
+    <string name="settings_unicode_summary">删除短信中字母上的重音符号</string>
+    <string name="settings_mobile_title">仅限手机号码</string>
+    <string name="settings_mobile_summary">撰写邮件时，只显示手机号码</string>
+    <string name="settings_auto_delete">自动删除旧消息</string>
+    <string name="settings_auto_delete_dialog_message">消息将在指定天数后删除</string>
+    <string name="settings_auto_delete_dialog_hint">天数</string>
+    <string name="settings_auto_delete_never">从不</string>
+    <string name="settings_auto_delete_warning">自动删除旧消息吗？</string>
+    <string name="settings_auto_delete_warning_message">如果您继续，现在将删除 %1$d 条消息</string>
+    <plurals name="settings_auto_delete_summary">
+        <item quantity="other">%d 天后</item>
+    </plurals>
+    <string name="settings_long_as_mms_title">将长信息作为彩信发送</string>
+    <string name="settings_long_as_mms_summary">如果您无法发送较长的信息，或者是以错误的顺序发送，您可以将其作为彩信发送。可能会收取额外的费用</string>
+    <string name="settings_mms_size_title">自动压缩彩信附件</string>
+    <string name="settings_sync_title">同步消息</string>
+    <string name="settings_sync_summary">重新与安卓原生短信数据库进行同步</string>
+    <string name="settings_about_title">关于 QKSMS</string>
+    <string name="settings_version">版本 %s</string>
+    <string name="settings_logging_enabled">调试日志记录已启用</string>
+    <string name="settings_logging_disabled">调试日志记录已禁用</string>
+    <string name="settings_delay_duration_hint">输入时长 (秒)</string>
+    <string name="blocking_title">屏蔽</string>
+    <string name="blocking_drop_title">丢弃信息</string>
+    <string name="blocking_drop_summary">丢弃屏蔽的发件人所发送的信息</string>
+    <string name="blocking_conversations">已屏蔽的会话</string>
+    <string name="blocking_manager_title">屏蔽管理器</string>
+    <string name="blocking_manager_qksms_title">QKSMS</string>
+    <string name="blocking_manager_qksms_summary">QKSMS 中内建的屏蔽功能</string>
+    <string name="blocking_manager_call_control_summary">自动在适当的位置过滤您的来电和信息！Community IQ™ 允许您阻止社区中已知的垃圾发件人所发送的垃圾信息</string>
+    <string name="blocking_manager_sia_summary">使用 \"Should I Answer\" 应用过滤未知号码的消息</string>
+    <string name="blocking_manager_copy_title">复制屏蔽的号码</string>
+    <string name="blocking_manager_copy_summary">继续前往%s并复制到您现有的已屏蔽号码</string>
+    <string name="blocked_numbers_title">已屏蔽的号码</string>
+    <string name="blocked_numbers_empty">您所屏蔽的号码将会在这里显示</string>
+    <string name="blocked_numbers_add_cd">屏蔽新的号码</string>
+    <string name="blocked_numbers_dialog_title">屏蔽短信自</string>
+    <string name="blocked_numbers_dialog_hint">电话号码</string>
+    <string name="blocked_numbers_dialog_block">屏蔽</string>
+    <string name="blocked_messages_title">已屏蔽的信息</string>
+    <string name="blocked_messages_empty">您所屏蔽的信息将会在这里显示</string>
+    <string name="blocking_block_title">屏蔽</string>
+    <string name="blocking_unblock_title">取消屏蔽</string>
+    <plurals name="blocking_block_external">
+        <item quantity="other">继续前往%s并屏蔽这个（些）号码</item>
+    </plurals>
+    <plurals name="blocking_unblock_external">
+        <item quantity="other">继续前往%s并允许这个（些）号码</item>
+    </plurals>
+    <string name="about_title">关于</string>
+    <string name="about_version_title">版本</string>
+    <string name="about_developer_title">开发人员</string>
+    <string name="about_source_title">源代码</string>
+    <string name="about_changelog_title">更新日志</string>
+    <string name="about_contact_title">联系人</string>
+    <string name="about_license_title">许可证</string>
+    <string name="about_copyright_title">版权</string>
+    <string name="qksms_plus_description_title">支持开发，解锁全部功能</string>
+    <string name="qksms_plus_description_summary">你可以支付 %s 来拯救一个饥渴的程序猿</string>
+    <!-- Substitutions are for price and currency. Ex: Lifetime upgrade for $1.99 USD -->
+    <string name="qksms_plus_upgrade">终身升级只需 %1$s %2$s</string>
+    <!-- Substitutions are for price and currency. Ex: Unlock + donate for $4.99 USD -->
+    <string name="qksms_plus_upgrade_donate">解锁并捐赠只需 %1$s %2$s</string>
+    <string name="qksms_plus_thanks_title">感谢你对 QKSMS 的支持！</string>
+    <string name="qksms_plus_thanks_summary">现在你可以使用 QKSMS+ 的全部功能！</string>
+    <string name="qksms_plus_free_title">QKSMS+ 对 F-Droid 用户免费！如果您想支持开发，可以随意捐款。</string>
+    <string name="qksms_plus_donate">使用 PayPal 捐赠</string>
+    <string name="qksms_plus_coming_soon">即将推出</string>
+    <string name="qksms_plus_themes_title">高级主题</string>
+    <string name="qksms_plus_themes_summary">解锁 \"Material Design\" 调色板中不可用的美丽彩色主题</string>
+    <string name="qksms_plus_emoji_title">自定义自动颜文字</string>
+    <string name="qksms_plus_emoji_summary">创建自定义自动颜文字的快捷方式</string>
+    <string name="qksms_plus_backup_title">消息备份</string>
+    <string name="qksms_plus_backup_summary">自动备份短信，再也不用担心更换或丢失手机后会丢掉短信记录。</string>
+    <string name="qksms_plus_scheduled_title">定时消息</string>
+    <string name="qksms_plus_scheduled_summary">安排一个时间来自动发送短信</string>
+    <string name="qksms_plus_delayed_title">延迟发送</string>
+    <string name="qksms_plus_delayed_summary">发送短信前，稍等几秒</string>
+    <string name="qksms_plus_night_title">自动夜间模式</string>
+    <string name="qksms_plus_night_summary">根据时间自动启用夜间模式</string>
+    <string name="qksms_plus_blacklist_title">高级拦截选项</string>
+    <string name="qksms_plus_blacklist_summary">根据关键字或匹配模式拦截消息</string>
+    <string name="qksms_plus_forward_title">自动转发</string>
+    <string name="qksms_plus_forward_summary">自动转发特定发件人的短信</string>
+    <string name="qksms_plus_respond_title">自动回复</string>
+    <string name="qksms_plus_respond_summary">使用预设文本自动回复短信</string>
+    <string name="qksms_plus_more_title">更多</string>
+    <string name="qksms_plus_more_summary">QKSMS 积极更新中，您的购买将包含未来 QKSMS+ 的所有功能！</string>
+    <string name="widget_loading">载入中...</string>
+    <string name="widget_more">查看更多对话</string>
+    <string name="qkreply_menu_read">标记为已读</string>
+    <string name="qkreply_menu_call">致电</string>
+    <string name="qkreply_menu_delete">删除</string>
+    <string name="qkreply_menu_expand">显示更多</string>
+    <string name="qkreply_menu_collapse">收起</string>
+    <string name="qkreply_menu_view">打开会话</string>
+    <string name="theme_material">Material</string>
+    <string name="theme_hex">HEX</string>
+    <string name="theme_apply">应用</string>
+    <string-array name="notification_actions">
+        <item>无</item>
+        <item>存档</item>
+        <item>删除</item>
+        <item>拦截</item>
+        <item>呼叫</item>
+        <item>标记为已读</item>
+        <item>回复</item>
+    </string-array>
+    <string name="button_yes">是</string>
+    <string name="button_continue">继续</string>
+    <string name="button_cancel">取消</string>
+    <string name="button_delete">删除</string>
+    <string name="button_save">保存</string>
+    <string name="button_stop">停止</string>
+    <string name="button_more">更多</string>
+    <string name="button_set">设置</string>
+    <string name="button_undo">撤销</string>
+    <string name="toast_copied">已复制</string>
+    <string name="toast_archived">已存档的对话</string>
+    <string name="toast_qksms_plus">您必须解锁 QKSMS+ 才能使用此功能</string>
+    <plurals name="notification_new_messages">
+        <item quantity="other">%s条新信息</item>
+    </plurals>
+    <string name="notification_message_failed_title">消息未发送</string>
+    <string name="notification_message_failed_text">给%s的短信发送失败</string>
+    <string-array name="night_modes">
+        <item>系统</item>
+        <item>已禁用</item>
+        <item>始终打开</item>
+        <item>自动</item>
+    </string-array>
+    <string-array name="notification_preview_options">
+        <item>显示姓名和消息</item>
+        <item>只显示姓名</item>
+        <item>隐藏内容</item>
+    </string-array>
+    <string-array name="text_sizes">
+        <item>小</item>
+        <item>正常</item>
+        <item>大</item>
+        <item>更大</item>
+    </string-array>
+    <string-array name="delayed_sending_labels">
+        <item>无延迟</item>
+        <item>3 秒</item>
+        <item>5 秒</item>
+        <item>10 秒</item>
+    </string-array>
+    <string-array name="mms_sizes">
+        <item>自动</item>
+        <item>100KB</item>
+        <item>200KB</item>
+        <item>300KB</item>
+        <item>600KB</item>
+        <item>1000KB</item>
+        <item>2000KB</item>
+        <item>不压缩</item>
+    </string-array>
+    <string-array name="qk_responses">
+        <item>好的</item>
+        <item>请稍等一会儿</item>
+        <item>在路上了</item>
+        <item>谢谢</item>
+        <item>听上去不错</item>
+        <item>怎么了？</item>
+        <item>同意</item>
+        <item>不</item>
+        <item>爱你</item>
+        <item>抱歉</item>
+        <item>啊哈哈哈哈</item>
+        <item>好的</item>
+    </string-array>
+</resources>
diff --git a/presentation/src/main/res/values-zh/strings.xml b/presentation/src/main/res/values-zh/strings.xml
index b590bb274..e9b79b018 100644
--- a/presentation/src/main/res/values-zh/strings.xml
+++ b/presentation/src/main/res/values-zh/strings.xml
@@ -1,405 +1,405 @@
-<?xml version="1.0" encoding="utf-8"?>
-<!--
-  ~ Copyright (C) 2019 Moez Bhatti <moez.bhatti@gmail.com>
-  ~
-  ~ This file is part of QKSMS.
-  ~
-  ~ QKSMS is free software: you can redistribute it and/or modify
-  ~ it under the terms of the GNU General Public License as published by
-  ~ the Free Software Foundation, either version 3 of the License, or
-  ~ (at your option) any later version.
-  ~
-  ~ QKSMS is distributed in the hope that it will be useful,
-  ~ but WITHOUT ANY WARRANTY; without even the implied warranty of
-  ~ MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
-  ~ GNU General Public License for more details.
-  ~
-  ~ You should have received a copy of the GNU General Public License
-  ~ along with QKSMS.  If not, see <http://www.gnu.org/licenses/>.
-  -->
-<resources>
-    <string name="shortcut_compose_long_label">新對話</string>
-    <string name="shortcut_compose_short_label">撰寫</string>
-    <string name="shortcut_compose_disabled_message">捷徑已停用</string>
-    <string name="title_archived">封存</string>
-    <string name="title_settings">設定</string>
-    <string name="title_notification_prefs">通知</string>
-    <string name="title_theme">主題</string>
-    <string name="title_conversations">在收件箱中搜索...</string>
-    <string name="title_compose">編輯</string>
-    <string name="setup_skip">跳过</string>
-    <string name="setup_next">繼續</string>
-    <string name="menu_add_person">增加傳送人</string>
-    <string name="menu_call">致電</string>
-    <string name="menu_info">詳細資訊</string>
-    <string name="menu_save">保存到圖庫</string>
-    <string name="menu_share">分享</string>
-    <string name="main_drawer_open_cd">打開導航抽屜</string>
-    <string name="main_title_selected">已選擇%d項</string>
-    <string name="main_menu_clear">清除</string>
-    <string name="main_menu_archive">封存</string>
-    <string name="main_menu_unarchive">取消封存</string>
-    <string name="main_menu_delete">刪除</string>
-    <string name="main_menu_add_contact">新增聯絡人</string>
-    <string name="main_menu_pin">置頂至頂部</string>
-    <string name="main_menu_unpin">取消置頂</string>
-    <string name="main_menu_read">標示已讀</string>
-    <string name="main_menu_unread">標示未讀</string>
-    <string name="main_menu_block">攔截</string>
-    <string name="main_syncing">正在同步...</string>
-    <string name="main_sender_you">您：%s</string>
-    <string name="main_draft">草稿</string>
-    <string name="main_message_results_title">信息中的結果</string>
-    <string name="main_message_results">%d 條信息</string>
-    <string name="inbox_empty_text">對話會在這裡顯示</string>
-    <string name="inbox_search_empty_text">無結果</string>
-    <string name="archived_empty_text">您存檔的對話將出現在這裡</string>
-    <string name="main_fab_cd">開始新對話</string>
-    <string name="main_default_sms_title">愛上發訊息</string>
-    <string name="main_default_sms_message">將QKSMS設為預設信息應用程式</string>
-    <string name="main_default_sms_change">更改</string>
-    <string name="main_permission_required">需要授權</string>
-    <string name="main_permission_sms">需要允許QKSMS發送和查看SMS訊息</string>
-    <string name="main_permission_contacts">需要允許QKSMS查看您的連絡人</string>
-    <string name="main_permission_allow">允許</string>
-    <string name="drawer_inbox">收件箱</string>
-    <string name="drawer_archived">已存檔</string>
-    <string name="drawer_scheduled">已計劃</string>
-    <string name="drawer_blocking">封鎖</string>
-    <string name="drawer_more">更多</string>
-    <string name="drawer_settings">設定</string>
-    <string name="drawer_help">幫助與反饋</string>
-    <string name="drawer_invite">邀請朋友</string>
-    <string name="drawer_plus_banner_summary">解鎖驚人的新特性並支持開發</string>
-    <string name="rate_title">喜歡 QKSMS？</string>
-    <string name="rate_summary">在 Google Play 分享您的感受，並給我們評分！</string>
-    <string name="rate_okay">好！</string>
-    <string name="rate_dismiss">放棄</string>
-    <string name="dialog_delete_title">刪除</string>
-    <plurals name="dialog_delete_message">
-        <item quantity="other">您確定要刪除這 %d 段對話嗎？</item>
-    </plurals>
-    <string-array name="message_options">
-        <item>複製文本</item>
-        <item>轉寄</item>
-        <item>刪除</item>
-    </string-array>
-    <string name="compose_number_picker_title">選一個號碼</string>
-    <string name="compose_number_picker_default">%s ∙ 預設</string>
-    <string name="compose_number_picker_once">就這一次</string>
-    <string name="compose_number_picker_always">總是如此</string>
-    <string name="compose_title_selected">已選取 %d 個項目</string>
-    <string name="compose_subtitle_results">已顯示 %2$d 條中的 %1$d 條結果</string>
-    <string name="compose_send_group_title">群發訊息</string>
-    <string name="compose_send_group_summary">收件人和回復對每個人都是可見的</string>
-    <string name="compose_messages_empty">這是您談話的開始。說點好聽的吧！</string>
-    <string name="compose_vcard_label">連絡人卡片</string>
-    <string name="compose_scheduled_for">排程於</string>
-    <string name="compose_scheduled_future">所選時間必須是未來時間</string>
-    <string name="compose_scheduled_plus">您必須解鎖 QKSMS+ 以使用排程簡訊</string>
-    <string name="compose_scheduled_toast">已新增至排程訊息</string>
-    <string name="compose_hint">寫一條訊息...</string>
-    <string name="compose_menu_copy">複製文本</string>
-    <string name="compose_menu_forward">轉寄</string>
-    <string name="compose_menu_delete">刪除</string>
-    <string name="compose_menu_previous">前一個</string>
-    <string name="compose_menu_next">下一個</string>
-    <string name="compose_menu_clear">清空</string>
-    <string name="compose_details_title">訊息詳情</string>
-    <string name="compose_details_type">類型：%s</string>
-    <string name="compose_details_from">來自：%s</string>
-    <string name="compose_details_to">发送到：%s</string>
-    <string name="compose_details_subject">主題：%s</string>
-    <string name="compose_details_priority">優先順序：%s</string>
-    <string name="compose_details_size">大小：%s</string>
-    <string name="compose_details_sent">傳送於：%s</string>
-    <string name="compose_details_received">接收於：%s</string>
-    <string name="compose_details_delivered">送達於：%s</string>
-    <string name="compose_details_error_code">錯誤代碼: %d</string>
-    <string name="compose_attach_cd">添加附件</string>
-    <string name="compose_gallery_cd">附加照片</string>
-    <string name="compose_camera_cd">拍攝照片</string>
-    <string name="compose_schedule_cd">排程訊息</string>
-    <string name="compose_contact_cd">附加聯絡人</string>
-    <string name="compose_contact_error">讀取聯絡人時出錯</string>
-    <!-- Example: SIM 1 (Verizon) selected-->
-    <string name="compose_sim_changed_toast">已選取%1$d (%2$s) SIM卡</string>
-    <string name="compose_sim_cd">%s 已選擇，變更 SIM 卡</string>
-    <string name="compose_send_cd">發送訊息</string>
-    <string name="message_status_sending">正在發送...</string>
-    <string name="message_status_delivered">已傳遞 %s</string>
-    <string name="message_status_failed">發送失敗，點擊重試</string>
-    <string name="info_title">詳細資訊</string>
-    <string name="info_copied_address">已複製位址</string>
-    <string name="info_name">對話標題</string>
-    <string name="info_notifications">通知</string>
-    <string name="info_theme">主題</string>
-    <string name="info_archive">存檔</string>
-    <string name="info_unarchive">取消存檔</string>
-    <string name="info_block">攔截</string>
-    <string name="info_unblock">取消攔截</string>
-    <string name="info_delete">刪除對話</string>
-    <string name="gallery_error">無法載入媒體</string>
-    <string name="gallery_toast_saved">保存到圖庫</string>
-    <string name="backup_title">備份和還原</string>
-    <string name="backup_backing_up">正在備份訊息</string>
-    <string name="backup_restoring">正在從備份還原</string>
-    <string name="backup_last">上次備份</string>
-    <string name="backup_loading">載入中&#8230;</string>
-    <string name="backup_never">從未備份</string>
-    <string name="backup_restore_title">還原</string>
-    <string name="backup_restore_summary">選擇備份</string>
-    <string name="backup_restore_error_plus">請解鎖 QKSMS+ 以使用備份和還原功能</string>
-    <string name="backup_restore_error_backup">正在進行備份&#8230;</string>
-    <string name="backup_restore_error_restore">正在進行還原&#8230;</string>
-    <string name="backup_restore_confirm_title">從備份還原</string>
-    <string name="backup_restore_confirm_message">您確定要從此備份還原訊息嗎？</string>
-    <string name="backup_restore_stop_title">停止還原</string>
-    <string name="backup_restore_stop_message">已還原的訊息將保留在您的裝置上</string>
-    <string name="backup_restore_dialog_title">備份</string>
-    <string name="backup_restore_dialog_empty">未能找到備份</string>
-    <plurals name="backup_message_count">
-        <item quantity="other">%d 條訊息</item>
-    </plurals>
-    <string name="backup_disclaimer">目前只有簡訊支援備份和還原，多媒體和排程簡訊備份將在不久後加入！</string>
-    <string name="backup_now">立即備份</string>
-    <string name="backup_progress_parsing">正在解析備份&#8230;</string>
-    <string name="backup_progress_running">%d/%d 條訊息</string>
-    <string name="backup_progress_saving">正在儲存備份&#8230;</string>
-    <string name="backup_progress_syncing">正在同步訊息&#8230;</string>
-    <string name="backup_progress_finished">完成！</string>
-    <string name="backup_notification_channel_name">備份和還原</string>
-    <string name="scheduled_title">排程</string>
-    <string name="scheduled_empty_description">在您指定的時間自動傳送訊息</string>
-    <string name="scheduled_empty_message_1">嘿，您的生日是什麼時候？</string>
-    <string name="scheduled_empty_message_2">是 12 月 23 日</string>
-    <string name="scheduled_empty_message_3">生日快樂！看看我是一個多麼棒的朋友，我還記着你的生日！</string>
-    <!--&#x200A; is a special character required at the end of this string to fix it's formatting in the app -->
-    <string name="scheduled_empty_message_3_timestamp">在 12 月 23 日傳送</string>
-    <string name="scheduled_compose_cd">新增排程訊息</string>
-    <string name="scheduled_options_title">排程訊息</string>
-    <string-array name="scheduled_options">
-        <item>立即發送</item>
-        <item>複製文字</item>
-        <item>刪除</item>
-    </string-array>
-    <string name="settings_category_appearance">外觀</string>
-    <string name="settings_category_general">通用</string>
-    <string name="settings_category_qkreply">快速答覆</string>
-    <string name="settings_theme_title">主題</string>
-    <string name="settings_night_title">夜間模式</string>
-    <string name="settings_black_title">純黑色夜間模式</string>
-    <string name="settings_night_start_title">開始時間</string>
-    <string name="settings_night_end_title">結束時間</string>
-    <string name="settings_automatic_colors_title">聯絡人自動上色</string>
-    <string name="settings_text_size_title">字體大小</string>
-    <string name="settings_system_font_title">使用系統字體</string>
-    <string name="settings_auto_emoji_title">自動 emoji 表情</string>
-    <string name="settings_notifications_title">通知</string>
-    <string name="settings_notifications_o_summary">輕觸以跳轉至系統設定</string>
-    <string name="settings_notification_actions_title">操作</string>
-    <string name="settings_notification_action_1">按鈕1</string>
-    <string name="settings_notification_action_2">按鈕2</string>
-    <string name="settings_notification_action_3">按鈕3</string>
-    <string name="settings_notification_previews_title">通知預覽</string>
-    <string name="settings_notification_wake_title">喚醒畫面</string>
-    <string name="settings_vibration_title">震動</string>
-    <string name="settings_ringtone_title">音效</string>
-    <string name="settings_ringtone_none">無</string>
-    <string name="settings_qkreply_title">快速答覆</string>
-    <string name="settings_qkreply_summary">彈出新訊息</string>
-    <string name="settings_qkreply_tap_dismiss_title">點擊忽略</string>
-    <string name="settings_qkreply_tap_dismiss_summary">在快顯視窗外點擊以關閉它</string>
-    <string name="settings_delayed_title">延遲發送</string>
-    <string name="settings_swipe_actions">滑動操作</string>
-    <string name="settings_swipe_actions_summary">配置對話的滑動操作</string>
-    <string name="settings_swipe_actions_right">向右滑動</string>
-    <string name="settings_swipe_actions_left">向左滑動</string>
-    <string name="settings_swipe_actions_change">變更</string>
-    <string-array name="settings_swipe_actions">
-        <item>無</item>
-        <item>封存</item>
-        <item>刪除</item>
-        <item>封鎖</item>
-        <item>通話</item>
-        <item>標示已讀</item>
-        <item>標示未讀</item>
-    </string-array>
-    <string name="settings_delivery_title">送達確認</string>
-    <string name="settings_delivery_summary">確認訊息已成功送達</string>
-    <string name="settings_signature_title">簽名</string>
-    <string name="settings_signature_summary">在訊息結尾添加簽名</string>
-    <string name="settings_unicode_title">刪除讀音符號</string>
-    <string name="settings_unicode_summary">刪除訊息中字母上的讀音符號</string>
-    <string name="settings_mobile_title">僅限手機號碼</string>
-    <string name="settings_mobile_summary">撰寫訊息時，只顯示手機號碼</string>
-    <string name="settings_auto_delete">Delete old messages automatically</string>
-    <string name="settings_auto_delete_dialog_message">Messages will be deleted after the specified number of days</string>
-    <string name="settings_auto_delete_dialog_hint">Number of days</string>
-    <string name="settings_auto_delete_never">Never</string>
-    <string name="settings_auto_delete_warning">Delete old messages automatically?</string>
-    <string name="settings_auto_delete_warning_message">If you proceed, %1$d messages will be deleted now</string>
-    <plurals name="settings_auto_delete_summary">
-        <item quantity="other">After %d days</item>
-    </plurals>
-    <string name="settings_long_as_mms_title">以MMS傳送長訊息</string>
-    <string name="settings_long_as_mms_summary">若您較長的訊息無法傳送或是以錯誤順序傳送，您可以改用MMS方式傳送訊息。（可能會有額外費用）</string>
-    <string name="settings_mms_size_title">自動壓縮MMS附件</string>
-    <string name="settings_sync_title">同步消息</string>
-    <string name="settings_sync_summary">重新與安卓原生訊息數據庫進行同步</string>
-    <string name="settings_about_title">關於QKSMS</string>
-    <string name="settings_version">版本 %s</string>
-    <string name="settings_logging_enabled">除錯日誌已啓用</string>
-    <string name="settings_logging_disabled">出錯日誌已停用</string>
-    <string name="settings_delay_duration_hint">輸入時長 (秒)</string>
-    <string name="blocking_title">封鎖</string>
-    <string name="blocking_drop_title">直接刪除</string>
-    <string name="blocking_drop_summary">直接刪除封鎖的簡訊，而非只有隱藏簡訊</string>
-    <string name="blocking_conversations">封鎖的對話</string>
-    <string name="blocking_manager_title">封鎖管理器</string>
-    <string name="blocking_manager_qksms_title">QKSMS</string>
-    <string name="blocking_manager_qksms_summary">QKSMS內建封鎖功能</string>
-    <string name="blocking_manager_call_control_summary">自動過濾來電與簡訊！群眾智慧Community IQ™能讓你遠離不想要的垃圾簡訊</string>
-    <string name="blocking_manager_sia_summary">使用\"Should I Answer\"應用過濾未知號碼的消息</string>
-    <string name="blocking_manager_copy_title">複製封鎖號碼</string>
-    <string name="blocking_manager_copy_summary">正在複製你現有的封鎖號碼%s</string>
-    <string name="blocked_numbers_title">封鎖號碼</string>
-    <string name="blocked_numbers_empty">封鎖號碼會顯示在這裡</string>
-    <string name="blocked_numbers_add_cd">封鎖新號碼</string>
-    <string name="blocked_numbers_dialog_title">輸入封鎖號碼</string>
-    <string name="blocked_numbers_dialog_hint">電話號碼</string>
-    <string name="blocked_numbers_dialog_block">封鎖</string>
-    <string name="blocked_messages_title">封鎖的訊息</string>
-    <string name="blocked_messages_empty">封鎖的訊息會顯示在這裡</string>
-    <string name="blocking_block_title">封鎖</string>
-    <string name="blocking_unblock_title">解除封鎖</string>
-    <plurals name="blocking_block_external">
-        <item quantity="other">正在封鎖這些號碼 %s</item>
-    </plurals>
-    <plurals name="blocking_unblock_external">
-        <item quantity="other">正在解鎖這些號碼%s</item>
-    </plurals>
-    <string name="about_title">關於</string>
-    <string name="about_version_title">版本</string>
-    <string name="about_developer_title">開發者</string>
-    <string name="about_source_title">源代碼</string>
-    <string name="about_changelog_title">更新日誌</string>
-    <string name="about_contact_title">聯絡資訊</string>
-    <string name="about_license_title">授權</string>
-    <string name="about_copyright_title">版權</string>
-    <string name="qksms_plus_description_title">支持開發，解鎖全部功能</string>
-    <string name="qksms_plus_description_summary">您可以支付 %s 來拯救一個飢餓的開發者</string>
-    <!-- Substitutions are for price and currency. Ex: Lifetime upgrade for $1.99 USD -->
-    <string name="qksms_plus_upgrade">終身升級只需 %1$s %2$s</string>
-    <!-- Substitutions are for price and currency. Ex: Unlock + donate for $4.99 USD -->
-    <string name="qksms_plus_upgrade_donate">解鎖並捐贈只需 %1$s %2$s</string>
-    <string name="qksms_plus_thanks_title">感謝您對 QKSMS 的支持！</string>
-    <string name="qksms_plus_thanks_summary">現在您可以使用 QKSMS+ 的全部功能！</string>
-    <string name="qksms_plus_free_title">QKSMS+對F-Droid用戶免費！如果您想支持開發，可以隨意捐款。</string>
-    <string name="qksms_plus_donate">使用PayPal捐贈</string>
-    <string name="qksms_plus_coming_soon">即將推出</string>
-    <string name="qksms_plus_themes_title">高級主題</string>
-    <string name="qksms_plus_themes_summary">解鎖 \"Material Design\" 調色板中不可用的美麗彩色主題</string>
-    <string name="qksms_plus_emoji_title">自定義自動emoji</string>
-    <string name="qksms_plus_emoji_summary">創建自定義自動emoji的快捷方式</string>
-    <string name="qksms_plus_backup_title">訊息備份</string>
-    <string name="qksms_plus_backup_summary">自動備份訊息，再也不用擔心更換或丟失手機後會丟掉訊息記錄。</string>
-    <string name="qksms_plus_scheduled_title">计划訊息</string>
-    <string name="qksms_plus_scheduled_summary">安排一個時間來自動計劃訊息</string>
-    <string name="qksms_plus_delayed_title">延遲發送</string>
-    <string name="qksms_plus_delayed_summary">發送訊息前，稍等幾秒</string>
-    <string name="qksms_plus_night_title">自動夜間模式</string>
-    <string name="qksms_plus_night_summary">根據時間自動啟用夜間模式</string>
-    <string name="qksms_plus_blacklist_title">高級攔截選項</string>
-    <string name="qksms_plus_blacklist_summary">根據關鍵字或匹配模式攔截消息</string>
-    <string name="qksms_plus_forward_title">自動轉寄</string>
-    <string name="qksms_plus_forward_summary">自動轉寄特定發件人的訊息</string>
-    <string name="qksms_plus_respond_title">自動回覆</string>
-    <string name="qksms_plus_respond_summary">使用預設回應自動回覆傳入郵件</string>
-    <string name="qksms_plus_more_title">更多</string>
-    <string name="qksms_plus_more_summary">QKSMS 正在積極開發中，您的購買將包含後續 QKSMS+ 的所有功能！</string>
-    <string name="widget_loading">載入中...</string>
-    <string name="widget_more">查看更多對話</string>
-    <string name="qkreply_menu_read">標示已讀</string>
-    <string name="qkreply_menu_call">致電</string>
-    <string name="qkreply_menu_delete">刪除</string>
-    <string name="qkreply_menu_expand">顯示更多</string>
-    <string name="qkreply_menu_collapse">顯示較少</string>
-    <string name="qkreply_menu_view">打開對話</string>
-    <string name="theme_material">Material</string>
-    <string name="theme_hex">HEX</string>
-    <string name="theme_apply">應用</string>
-    <string-array name="notification_actions">
-        <item>無</item>
-        <item>封存</item>
-        <item>刪除</item>
-        <item>封鎖</item>
-        <item>通話</item>
-        <item>標示已讀</item>
-        <item>回覆</item>
-    </string-array>
-    <string name="button_yes">確定</string>
-    <string name="button_continue">繼續</string>
-    <string name="button_cancel">取消</string>
-    <string name="button_delete">刪除</string>
-    <string name="button_save">儲存</string>
-    <string name="button_stop">停止</string>
-    <string name="button_more">更多</string>
-    <string name="button_set">設置</string>
-    <string name="button_undo">復原</string>
-    <string name="toast_copied">已複製</string>
-    <string name="toast_archived">存檔的對話</string>
-    <string name="toast_qksms_plus">您必須解鎖QKSMS+才能使用此功能</string>
-    <plurals name="notification_new_messages">
-        <item quantity="other">%s條新訊息</item>
-    </plurals>
-    <string name="notification_message_failed_title">消息未發送</string>
-    <string name="notification_message_failed_text">給%s的訊息發送失敗</string>
-    <string-array name="night_modes">
-        <item>跟隨系統</item>
-        <item>停用</item>
-        <item>啓用</item>
-        <item>自動</item>
-    </string-array>
-    <string-array name="notification_preview_options">
-        <item>顯示姓名和消息</item>
-        <item>只顯示姓名</item>
-        <item>隱藏內容</item>
-    </string-array>
-    <string-array name="text_sizes">
-        <item>小</item>
-        <item>一般</item>
-        <item>大</item>
-        <item>更大</item>
-    </string-array>
-    <string-array name="delayed_sending_labels">
-        <item>無延遲</item>
-        <item>3 秒</item>
-        <item>5 秒</item>
-        <item>10 秒</item>
-    </string-array>
-    <string-array name="mms_sizes">
-        <item>自動</item>
-        <item>100KB</item>
-        <item>200KB</item>
-        <item>300KB</item>
-        <item>600KB</item>
-        <item>1000KB</item>
-        <item>2000KB</item>
-        <item>無壓縮</item>
-    </string-array>
-    <string-array name="qk_responses">
-        <item>好的</item>
-        <item>請稍等片刻</item>
-        <item>馬上就到</item>
-        <item>謝謝</item>
-        <item>聽上去不錯</item>
-        <item>怎麼了？</item>
-        <item>同意</item>
-        <item>不</item>
-        <item>愛你</item>
-        <item>抱歉</item>
-        <item>啊哈哈哈哈</item>
-        <item>好的</item>
-    </string-array>
-</resources>
+<?xml version="1.0" encoding="utf-8"?>
+<!--
+  ~ Copyright (C) 2019 Moez Bhatti <moez.bhatti@gmail.com>
+  ~
+  ~ This file is part of QKSMS.
+  ~
+  ~ QKSMS is free software: you can redistribute it and/or modify
+  ~ it under the terms of the GNU General Public License as published by
+  ~ the Free Software Foundation, either version 3 of the License, or
+  ~ (at your option) any later version.
+  ~
+  ~ QKSMS is distributed in the hope that it will be useful,
+  ~ but WITHOUT ANY WARRANTY; without even the implied warranty of
+  ~ MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+  ~ GNU General Public License for more details.
+  ~
+  ~ You should have received a copy of the GNU General Public License
+  ~ along with QKSMS.  If not, see <http://www.gnu.org/licenses/>.
+  -->
+<resources>
+    <string name="shortcut_compose_long_label">新對話</string>
+    <string name="shortcut_compose_short_label">撰寫</string>
+    <string name="shortcut_compose_disabled_message">捷徑已停用</string>
+    <string name="title_archived">封存</string>
+    <string name="title_settings">設定</string>
+    <string name="title_notification_prefs">通知</string>
+    <string name="title_theme">主題</string>
+    <string name="title_conversations">在收件箱中搜索...</string>
+    <string name="title_compose">編輯</string>
+    <string name="setup_skip">跳过</string>
+    <string name="setup_next">繼續</string>
+    <string name="menu_add_person">增加傳送人</string>
+    <string name="menu_call">致電</string>
+    <string name="menu_info">詳細資訊</string>
+    <string name="menu_save">保存到圖庫</string>
+    <string name="menu_share">分享</string>
+    <string name="main_drawer_open_cd">打開導航抽屜</string>
+    <string name="main_title_selected">已選擇%d項</string>
+    <string name="main_menu_clear">清除</string>
+    <string name="main_menu_archive">封存</string>
+    <string name="main_menu_unarchive">取消封存</string>
+    <string name="main_menu_delete">刪除</string>
+    <string name="main_menu_add_contact">新增聯絡人</string>
+    <string name="main_menu_pin">置頂至頂部</string>
+    <string name="main_menu_unpin">取消置頂</string>
+    <string name="main_menu_read">標示已讀</string>
+    <string name="main_menu_unread">標示未讀</string>
+    <string name="main_menu_block">攔截</string>
+    <string name="main_syncing">正在同步...</string>
+    <string name="main_sender_you">您：%s</string>
+    <string name="main_draft">草稿</string>
+    <string name="main_message_results_title">信息中的結果</string>
+    <string name="main_message_results">%d 條信息</string>
+    <string name="inbox_empty_text">對話會在這裡顯示</string>
+    <string name="inbox_search_empty_text">無結果</string>
+    <string name="archived_empty_text">您存檔的對話將出現在這裡</string>
+    <string name="main_fab_cd">開始新對話</string>
+    <string name="main_default_sms_title">愛上發訊息</string>
+    <string name="main_default_sms_message">將QKSMS設為預設信息應用程式</string>
+    <string name="main_default_sms_change">更改</string>
+    <string name="main_permission_required">需要授權</string>
+    <string name="main_permission_sms">需要允許QKSMS發送和查看SMS訊息</string>
+    <string name="main_permission_contacts">需要允許QKSMS查看您的連絡人</string>
+    <string name="main_permission_allow">允許</string>
+    <string name="drawer_inbox">收件箱</string>
+    <string name="drawer_archived">已存檔</string>
+    <string name="drawer_scheduled">已計劃</string>
+    <string name="drawer_blocking">封鎖</string>
+    <string name="drawer_more">更多</string>
+    <string name="drawer_settings">設定</string>
+    <string name="drawer_help">幫助與反饋</string>
+    <string name="drawer_invite">邀請朋友</string>
+    <string name="drawer_plus_banner_summary">解鎖驚人的新特性並支持開發</string>
+    <string name="rate_title">喜歡 QKSMS？</string>
+    <string name="rate_summary">在 Google Play 分享您的感受，並給我們評分！</string>
+    <string name="rate_okay">好！</string>
+    <string name="rate_dismiss">放棄</string>
+    <string name="dialog_delete_title">刪除</string>
+    <plurals name="dialog_delete_message">
+        <item quantity="other">您確定要刪除這 %d 段對話嗎？</item>
+    </plurals>
+    <string-array name="message_options">
+        <item>複製文本</item>
+        <item>轉寄</item>
+        <item>刪除</item>
+    </string-array>
+    <string name="compose_number_picker_title">選一個號碼</string>
+    <string name="compose_number_picker_default">%s ∙ 預設</string>
+    <string name="compose_number_picker_once">就這一次</string>
+    <string name="compose_number_picker_always">總是如此</string>
+    <string name="compose_title_selected">已選取 %d 個項目</string>
+    <string name="compose_subtitle_results">已顯示 %2$d 條中的 %1$d 條結果</string>
+    <string name="compose_send_group_title">群發訊息</string>
+    <string name="compose_send_group_summary">收件人和回復對每個人都是可見的</string>
+    <string name="compose_messages_empty">這是您談話的開始。說點好聽的吧！</string>
+    <string name="compose_vcard_label">連絡人卡片</string>
+    <string name="compose_scheduled_for">排程於</string>
+    <string name="compose_scheduled_future">所選時間必須是未來時間</string>
+    <string name="compose_scheduled_plus">您必須解鎖 QKSMS+ 以使用排程簡訊</string>
+    <string name="compose_scheduled_toast">已新增至排程訊息</string>
+    <string name="compose_hint">寫一條訊息...</string>
+    <string name="compose_menu_copy">複製文本</string>
+    <string name="compose_menu_forward">轉寄</string>
+    <string name="compose_menu_delete">刪除</string>
+    <string name="compose_menu_previous">前一個</string>
+    <string name="compose_menu_next">下一個</string>
+    <string name="compose_menu_clear">清空</string>
+    <string name="compose_details_title">訊息詳情</string>
+    <string name="compose_details_type">類型：%s</string>
+    <string name="compose_details_from">來自：%s</string>
+    <string name="compose_details_to">发送到：%s</string>
+    <string name="compose_details_subject">主題：%s</string>
+    <string name="compose_details_priority">優先順序：%s</string>
+    <string name="compose_details_size">大小：%s</string>
+    <string name="compose_details_sent">傳送於：%s</string>
+    <string name="compose_details_received">接收於：%s</string>
+    <string name="compose_details_delivered">送達於：%s</string>
+    <string name="compose_details_error_code">錯誤代碼: %d</string>
+    <string name="compose_attach_cd">添加附件</string>
+    <string name="compose_gallery_cd">附加照片</string>
+    <string name="compose_camera_cd">拍攝照片</string>
+    <string name="compose_schedule_cd">排程訊息</string>
+    <string name="compose_contact_cd">附加聯絡人</string>
+    <string name="compose_contact_error">讀取聯絡人時出錯</string>
+    <!-- Example: SIM 1 (Verizon) selected-->
+    <string name="compose_sim_changed_toast">已選取%1$d (%2$s) SIM卡</string>
+    <string name="compose_sim_cd">%s 已選擇，變更 SIM 卡</string>
+    <string name="compose_send_cd">發送訊息</string>
+    <string name="message_status_sending">正在發送...</string>
+    <string name="message_status_delivered">已傳遞 %s</string>
+    <string name="message_status_failed">發送失敗，點擊重試</string>
+    <string name="info_title">詳細資訊</string>
+    <string name="info_copied_address">已複製位址</string>
+    <string name="info_name">對話標題</string>
+    <string name="info_notifications">通知</string>
+    <string name="info_theme">主題</string>
+    <string name="info_archive">存檔</string>
+    <string name="info_unarchive">取消存檔</string>
+    <string name="info_block">攔截</string>
+    <string name="info_unblock">取消攔截</string>
+    <string name="info_delete">刪除對話</string>
+    <string name="gallery_error">無法載入媒體</string>
+    <string name="gallery_toast_saved">保存到圖庫</string>
+    <string name="backup_title">備份和還原</string>
+    <string name="backup_backing_up">正在備份訊息</string>
+    <string name="backup_restoring">正在從備份還原</string>
+    <string name="backup_last">上次備份</string>
+    <string name="backup_loading">載入中&#8230;</string>
+    <string name="backup_never">從未備份</string>
+    <string name="backup_restore_title">還原</string>
+    <string name="backup_restore_summary">選擇備份</string>
+    <string name="backup_restore_error_plus">請解鎖 QKSMS+ 以使用備份和還原功能</string>
+    <string name="backup_restore_error_backup">正在進行備份&#8230;</string>
+    <string name="backup_restore_error_restore">正在進行還原&#8230;</string>
+    <string name="backup_restore_confirm_title">從備份還原</string>
+    <string name="backup_restore_confirm_message">您確定要從此備份還原訊息嗎？</string>
+    <string name="backup_restore_stop_title">停止還原</string>
+    <string name="backup_restore_stop_message">已還原的訊息將保留在您的裝置上</string>
+    <string name="backup_restore_dialog_title">備份</string>
+    <string name="backup_restore_dialog_empty">未能找到備份</string>
+    <plurals name="backup_message_count">
+        <item quantity="other">%d 條訊息</item>
+    </plurals>
+    <string name="backup_disclaimer">目前只有簡訊支援備份和還原，多媒體和排程簡訊備份將在不久後加入！</string>
+    <string name="backup_now">立即備份</string>
+    <string name="backup_progress_parsing">正在解析備份&#8230;</string>
+    <string name="backup_progress_running">%d/%d 條訊息</string>
+    <string name="backup_progress_saving">正在儲存備份&#8230;</string>
+    <string name="backup_progress_syncing">正在同步訊息&#8230;</string>
+    <string name="backup_progress_finished">完成！</string>
+    <string name="backup_notification_channel_name">備份和還原</string>
+    <string name="scheduled_title">排程</string>
+    <string name="scheduled_empty_description">在您指定的時間自動傳送訊息</string>
+    <string name="scheduled_empty_message_1">嘿，您的生日是什麼時候？</string>
+    <string name="scheduled_empty_message_2">是 12 月 23 日</string>
+    <string name="scheduled_empty_message_3">生日快樂！看看我是一個多麼棒的朋友，我還記着你的生日！</string>
+    <!--&#x200A; is a special character required at the end of this string to fix it's formatting in the app -->
+    <string name="scheduled_empty_message_3_timestamp">在 12 月 23 日傳送</string>
+    <string name="scheduled_compose_cd">新增排程訊息</string>
+    <string name="scheduled_options_title">排程訊息</string>
+    <string-array name="scheduled_options">
+        <item>立即發送</item>
+        <item>複製文字</item>
+        <item>刪除</item>
+    </string-array>
+    <string name="settings_category_appearance">外觀</string>
+    <string name="settings_category_general">通用</string>
+    <string name="settings_category_qkreply">快速答覆</string>
+    <string name="settings_theme_title">主題</string>
+    <string name="settings_night_title">夜間模式</string>
+    <string name="settings_black_title">純黑色夜間模式</string>
+    <string name="settings_night_start_title">開始時間</string>
+    <string name="settings_night_end_title">結束時間</string>
+    <string name="settings_automatic_colors_title">聯絡人自動上色</string>
+    <string name="settings_text_size_title">字體大小</string>
+    <string name="settings_system_font_title">使用系統字體</string>
+    <string name="settings_auto_emoji_title">自動 emoji 表情</string>
+    <string name="settings_notifications_title">通知</string>
+    <string name="settings_notifications_o_summary">輕觸以跳轉至系統設定</string>
+    <string name="settings_notification_actions_title">操作</string>
+    <string name="settings_notification_action_1">按鈕1</string>
+    <string name="settings_notification_action_2">按鈕2</string>
+    <string name="settings_notification_action_3">按鈕3</string>
+    <string name="settings_notification_previews_title">通知預覽</string>
+    <string name="settings_notification_wake_title">喚醒畫面</string>
+    <string name="settings_vibration_title">震動</string>
+    <string name="settings_ringtone_title">音效</string>
+    <string name="settings_ringtone_none">無</string>
+    <string name="settings_qkreply_title">快速答覆</string>
+    <string name="settings_qkreply_summary">彈出新訊息</string>
+    <string name="settings_qkreply_tap_dismiss_title">點擊忽略</string>
+    <string name="settings_qkreply_tap_dismiss_summary">在快顯視窗外點擊以關閉它</string>
+    <string name="settings_delayed_title">延遲發送</string>
+    <string name="settings_swipe_actions">滑動操作</string>
+    <string name="settings_swipe_actions_summary">配置對話的滑動操作</string>
+    <string name="settings_swipe_actions_right">向右滑動</string>
+    <string name="settings_swipe_actions_left">向左滑動</string>
+    <string name="settings_swipe_actions_change">變更</string>
+    <string-array name="settings_swipe_actions">
+        <item>無</item>
+        <item>封存</item>
+        <item>刪除</item>
+        <item>封鎖</item>
+        <item>通話</item>
+        <item>標示已讀</item>
+        <item>標示未讀</item>
+    </string-array>
+    <string name="settings_delivery_title">送達確認</string>
+    <string name="settings_delivery_summary">確認訊息已成功送達</string>
+    <string name="settings_signature_title">簽名</string>
+    <string name="settings_signature_summary">在訊息結尾添加簽名</string>
+    <string name="settings_unicode_title">刪除讀音符號</string>
+    <string name="settings_unicode_summary">刪除訊息中字母上的讀音符號</string>
+    <string name="settings_mobile_title">僅限手機號碼</string>
+    <string name="settings_mobile_summary">撰寫訊息時，只顯示手機號碼</string>
+    <string name="settings_auto_delete">Delete old messages automatically</string>
+    <string name="settings_auto_delete_dialog_message">Messages will be deleted after the specified number of days</string>
+    <string name="settings_auto_delete_dialog_hint">Number of days</string>
+    <string name="settings_auto_delete_never">Never</string>
+    <string name="settings_auto_delete_warning">Delete old messages automatically?</string>
+    <string name="settings_auto_delete_warning_message">If you proceed, %1$d messages will be deleted now</string>
+    <plurals name="settings_auto_delete_summary">
+        <item quantity="other">After %d days</item>
+    </plurals>
+    <string name="settings_long_as_mms_title">以MMS傳送長訊息</string>
+    <string name="settings_long_as_mms_summary">若您較長的訊息無法傳送或是以錯誤順序傳送，您可以改用MMS方式傳送訊息。（可能會有額外費用）</string>
+    <string name="settings_mms_size_title">自動壓縮MMS附件</string>
+    <string name="settings_sync_title">同步消息</string>
+    <string name="settings_sync_summary">重新與安卓原生訊息數據庫進行同步</string>
+    <string name="settings_about_title">關於QKSMS</string>
+    <string name="settings_version">版本 %s</string>
+    <string name="settings_logging_enabled">除錯日誌已啓用</string>
+    <string name="settings_logging_disabled">出錯日誌已停用</string>
+    <string name="settings_delay_duration_hint">輸入時長 (秒)</string>
+    <string name="blocking_title">封鎖</string>
+    <string name="blocking_drop_title">直接刪除</string>
+    <string name="blocking_drop_summary">直接刪除封鎖的簡訊，而非只有隱藏簡訊</string>
+    <string name="blocking_conversations">封鎖的對話</string>
+    <string name="blocking_manager_title">封鎖管理器</string>
+    <string name="blocking_manager_qksms_title">QKSMS</string>
+    <string name="blocking_manager_qksms_summary">QKSMS內建封鎖功能</string>
+    <string name="blocking_manager_call_control_summary">自動過濾來電與簡訊！群眾智慧Community IQ™能讓你遠離不想要的垃圾簡訊</string>
+    <string name="blocking_manager_sia_summary">使用\"Should I Answer\"應用過濾未知號碼的消息</string>
+    <string name="blocking_manager_copy_title">複製封鎖號碼</string>
+    <string name="blocking_manager_copy_summary">正在複製你現有的封鎖號碼%s</string>
+    <string name="blocked_numbers_title">封鎖號碼</string>
+    <string name="blocked_numbers_empty">封鎖號碼會顯示在這裡</string>
+    <string name="blocked_numbers_add_cd">封鎖新號碼</string>
+    <string name="blocked_numbers_dialog_title">輸入封鎖號碼</string>
+    <string name="blocked_numbers_dialog_hint">電話號碼</string>
+    <string name="blocked_numbers_dialog_block">封鎖</string>
+    <string name="blocked_messages_title">封鎖的訊息</string>
+    <string name="blocked_messages_empty">封鎖的訊息會顯示在這裡</string>
+    <string name="blocking_block_title">封鎖</string>
+    <string name="blocking_unblock_title">解除封鎖</string>
+    <plurals name="blocking_block_external">
+        <item quantity="other">正在封鎖這些號碼 %s</item>
+    </plurals>
+    <plurals name="blocking_unblock_external">
+        <item quantity="other">正在解鎖這些號碼%s</item>
+    </plurals>
+    <string name="about_title">關於</string>
+    <string name="about_version_title">版本</string>
+    <string name="about_developer_title">開發者</string>
+    <string name="about_source_title">源代碼</string>
+    <string name="about_changelog_title">更新日誌</string>
+    <string name="about_contact_title">聯絡資訊</string>
+    <string name="about_license_title">授權</string>
+    <string name="about_copyright_title">版權</string>
+    <string name="qksms_plus_description_title">支持開發，解鎖全部功能</string>
+    <string name="qksms_plus_description_summary">您可以支付 %s 來拯救一個飢餓的開發者</string>
+    <!-- Substitutions are for price and currency. Ex: Lifetime upgrade for $1.99 USD -->
+    <string name="qksms_plus_upgrade">終身升級只需 %1$s %2$s</string>
+    <!-- Substitutions are for price and currency. Ex: Unlock + donate for $4.99 USD -->
+    <string name="qksms_plus_upgrade_donate">解鎖並捐贈只需 %1$s %2$s</string>
+    <string name="qksms_plus_thanks_title">感謝您對 QKSMS 的支持！</string>
+    <string name="qksms_plus_thanks_summary">現在您可以使用 QKSMS+ 的全部功能！</string>
+    <string name="qksms_plus_free_title">QKSMS+對F-Droid用戶免費！如果您想支持開發，可以隨意捐款。</string>
+    <string name="qksms_plus_donate">使用PayPal捐贈</string>
+    <string name="qksms_plus_coming_soon">即將推出</string>
+    <string name="qksms_plus_themes_title">高級主題</string>
+    <string name="qksms_plus_themes_summary">解鎖 \"Material Design\" 調色板中不可用的美麗彩色主題</string>
+    <string name="qksms_plus_emoji_title">自定義自動emoji</string>
+    <string name="qksms_plus_emoji_summary">創建自定義自動emoji的快捷方式</string>
+    <string name="qksms_plus_backup_title">訊息備份</string>
+    <string name="qksms_plus_backup_summary">自動備份訊息，再也不用擔心更換或丟失手機後會丟掉訊息記錄。</string>
+    <string name="qksms_plus_scheduled_title">计划訊息</string>
+    <string name="qksms_plus_scheduled_summary">安排一個時間來自動計劃訊息</string>
+    <string name="qksms_plus_delayed_title">延遲發送</string>
+    <string name="qksms_plus_delayed_summary">發送訊息前，稍等幾秒</string>
+    <string name="qksms_plus_night_title">自動夜間模式</string>
+    <string name="qksms_plus_night_summary">根據時間自動啟用夜間模式</string>
+    <string name="qksms_plus_blacklist_title">高級攔截選項</string>
+    <string name="qksms_plus_blacklist_summary">根據關鍵字或匹配模式攔截消息</string>
+    <string name="qksms_plus_forward_title">自動轉寄</string>
+    <string name="qksms_plus_forward_summary">自動轉寄特定發件人的訊息</string>
+    <string name="qksms_plus_respond_title">自動回覆</string>
+    <string name="qksms_plus_respond_summary">使用預設回應自動回覆傳入郵件</string>
+    <string name="qksms_plus_more_title">更多</string>
+    <string name="qksms_plus_more_summary">QKSMS 正在積極開發中，您的購買將包含後續 QKSMS+ 的所有功能！</string>
+    <string name="widget_loading">載入中...</string>
+    <string name="widget_more">查看更多對話</string>
+    <string name="qkreply_menu_read">標示已讀</string>
+    <string name="qkreply_menu_call">致電</string>
+    <string name="qkreply_menu_delete">刪除</string>
+    <string name="qkreply_menu_expand">顯示更多</string>
+    <string name="qkreply_menu_collapse">顯示較少</string>
+    <string name="qkreply_menu_view">打開對話</string>
+    <string name="theme_material">Material</string>
+    <string name="theme_hex">HEX</string>
+    <string name="theme_apply">應用</string>
+    <string-array name="notification_actions">
+        <item>無</item>
+        <item>封存</item>
+        <item>刪除</item>
+        <item>封鎖</item>
+        <item>通話</item>
+        <item>標示已讀</item>
+        <item>回覆</item>
+    </string-array>
+    <string name="button_yes">確定</string>
+    <string name="button_continue">繼續</string>
+    <string name="button_cancel">取消</string>
+    <string name="button_delete">刪除</string>
+    <string name="button_save">儲存</string>
+    <string name="button_stop">停止</string>
+    <string name="button_more">更多</string>
+    <string name="button_set">設置</string>
+    <string name="button_undo">復原</string>
+    <string name="toast_copied">已複製</string>
+    <string name="toast_archived">存檔的對話</string>
+    <string name="toast_qksms_plus">您必須解鎖QKSMS+才能使用此功能</string>
+    <plurals name="notification_new_messages">
+        <item quantity="other">%s條新訊息</item>
+    </plurals>
+    <string name="notification_message_failed_title">消息未發送</string>
+    <string name="notification_message_failed_text">給%s的訊息發送失敗</string>
+    <string-array name="night_modes">
+        <item>跟隨系統</item>
+        <item>停用</item>
+        <item>啓用</item>
+        <item>自動</item>
+    </string-array>
+    <string-array name="notification_preview_options">
+        <item>顯示姓名和消息</item>
+        <item>只顯示姓名</item>
+        <item>隱藏內容</item>
+    </string-array>
+    <string-array name="text_sizes">
+        <item>小</item>
+        <item>一般</item>
+        <item>大</item>
+        <item>更大</item>
+    </string-array>
+    <string-array name="delayed_sending_labels">
+        <item>無延遲</item>
+        <item>3 秒</item>
+        <item>5 秒</item>
+        <item>10 秒</item>
+    </string-array>
+    <string-array name="mms_sizes">
+        <item>自動</item>
+        <item>100KB</item>
+        <item>200KB</item>
+        <item>300KB</item>
+        <item>600KB</item>
+        <item>1000KB</item>
+        <item>2000KB</item>
+        <item>無壓縮</item>
+    </string-array>
+    <string-array name="qk_responses">
+        <item>好的</item>
+        <item>請稍等片刻</item>
+        <item>馬上就到</item>
+        <item>謝謝</item>
+        <item>聽上去不錯</item>
+        <item>怎麼了？</item>
+        <item>同意</item>
+        <item>不</item>
+        <item>愛你</item>
+        <item>抱歉</item>
+        <item>啊哈哈哈哈</item>
+        <item>好的</item>
+    </string-array>
+</resources>
diff --git a/presentation/src/main/res/values/attrs.xml b/presentation/src/main/res/values/attrs.xml
index 3d79ccfe3..03020cd88 100644
--- a/presentation/src/main/res/values/attrs.xml
+++ b/presentation/src/main/res/values/attrs.xml
@@ -1,65 +1,65 @@
-<?xml version="1.0" encoding="utf-8"?>
-<!--
-  ~ Copyright (C) 2019 Moez Bhatti <moez.bhatti@gmail.com>
-  ~
-  ~ This file is part of QKSMS.
-  ~
-  ~ QKSMS is free software: you can redistribute it and/or modify
-  ~ it under the terms of the GNU General Public License as published by
-  ~ the Free Software Foundation, either version 3 of the License, or
-  ~ (at your option) any later version.
-  ~
-  ~ QKSMS is distributed in the hope that it will be useful,
-  ~ but WITHOUT ANY WARRANTY; without even the implied warranty of
-  ~ MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
-  ~ GNU General Public License for more details.
-  ~
-  ~ You should have received a copy of the GNU General Public License
-  ~ along with QKSMS.  If not, see <http://www.gnu.org/licenses/>.
-  -->
-<resources>
-
-    <attr name="title" format="string" />
-    <attr name="summary" format="string" />
-    <attr name="widget" format="reference" />
-
-    <attr name="textColor" format="enum">
-        <enum name="theme" value="0" />
-        <enum name="primaryOnTheme" value="1" />
-        <enum name="secondaryOnTheme" value="2" />
-        <enum name="tertiaryOnTheme" value="3" />
-    </attr>
-
-    <attr name="textSize" format="enum">
-        <enum name="primary" value="0" />
-        <enum name="secondary" value="1" />
-        <enum name="tertiary" value="2" />
-        <enum name="toolbar" value="3" />
-        <enum name="dialog" value="4" />
-        <enum name="emoji" value="5" />
-    </attr>
-
-    <declare-styleable name="QkTextView">
-        <attr name="textColor" />
-        <attr name="textSize" />
-    </declare-styleable>
-
-    <declare-styleable name="QkEditText">
-        <attr name="textColor" />
-        <attr name="textSize" />
-    </declare-styleable>
-
-    <declare-styleable name="PreferenceView">
-        <attr name="title" />
-        <attr name="summary" />
-        <attr name="widget" />
-        <attr name="icon" format="reference" />
-    </declare-styleable>
-
-    <declare-styleable name="RadioPreferenceView">
-        <attr name="title" />
-        <attr name="summary" />
-        <attr name="widget" />
-    </declare-styleable>
-
+<?xml version="1.0" encoding="utf-8"?>
+<!--
+  ~ Copyright (C) 2019 Moez Bhatti <moez.bhatti@gmail.com>
+  ~
+  ~ This file is part of QKSMS.
+  ~
+  ~ QKSMS is free software: you can redistribute it and/or modify
+  ~ it under the terms of the GNU General Public License as published by
+  ~ the Free Software Foundation, either version 3 of the License, or
+  ~ (at your option) any later version.
+  ~
+  ~ QKSMS is distributed in the hope that it will be useful,
+  ~ but WITHOUT ANY WARRANTY; without even the implied warranty of
+  ~ MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+  ~ GNU General Public License for more details.
+  ~
+  ~ You should have received a copy of the GNU General Public License
+  ~ along with QKSMS.  If not, see <http://www.gnu.org/licenses/>.
+  -->
+<resources>
+
+    <attr name="title" format="string" />
+    <attr name="summary" format="string" />
+    <attr name="widget" format="reference" />
+
+    <attr name="textColor" format="enum">
+        <enum name="theme" value="0" />
+        <enum name="primaryOnTheme" value="1" />
+        <enum name="secondaryOnTheme" value="2" />
+        <enum name="tertiaryOnTheme" value="3" />
+    </attr>
+
+    <attr name="textSize" format="enum">
+        <enum name="primary" value="0" />
+        <enum name="secondary" value="1" />
+        <enum name="tertiary" value="2" />
+        <enum name="toolbar" value="3" />
+        <enum name="dialog" value="4" />
+        <enum name="emoji" value="5" />
+    </attr>
+
+    <declare-styleable name="QkTextView">
+        <attr name="textColor" />
+        <attr name="textSize" />
+    </declare-styleable>
+
+    <declare-styleable name="QkEditText">
+        <attr name="textColor" />
+        <attr name="textSize" />
+    </declare-styleable>
+
+    <declare-styleable name="PreferenceView">
+        <attr name="title" />
+        <attr name="summary" />
+        <attr name="widget" />
+        <attr name="icon" format="reference" />
+    </declare-styleable>
+
+    <declare-styleable name="RadioPreferenceView">
+        <attr name="title" />
+        <attr name="summary" />
+        <attr name="widget" />
+    </declare-styleable>
+
 </resources>
\ No newline at end of file
diff --git a/presentation/src/main/res/values/colors.xml b/presentation/src/main/res/values/colors.xml
index 503891293..c5cbbb6d9 100644
--- a/presentation/src/main/res/values/colors.xml
+++ b/presentation/src/main/res/values/colors.xml
@@ -1,325 +1,325 @@
-<?xml version="1.0" encoding="utf-8"?>
-<!--
-  ~ Copyright (C) 2019 Moez Bhatti <moez.bhatti@gmail.com>
-  ~
-  ~ This file is part of QKSMS.
-  ~
-  ~ QKSMS is free software: you can redistribute it and/or modify
-  ~ it under the terms of the GNU General Public License as published by
-  ~ the Free Software Foundation, either version 3 of the License, or
-  ~ (at your option) any later version.
-  ~
-  ~ QKSMS is distributed in the hope that it will be useful,
-  ~ but WITHOUT ANY WARRANTY; without even the implied warranty of
-  ~ MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
-  ~ GNU General Public License for more details.
-  ~
-  ~ You should have received a copy of the GNU General Public License
-  ~ along with QKSMS.  If not, see <http://www.gnu.org/licenses/>.
-  -->
-<resources>
-    <color name="white">#FFFFFF</color>
-    <color name="black">#000000</color>
-
-    <color name="rippleLight">#1f000000</color>
-    <color name="rippleDark">#33ffffff</color>
-
-    <color name="toolbarLight">#FFFFFF</color>
-    <color name="toolbarDark">#1d262b</color>
-    <color name="toolbarTranslucent">#88000000</color>
-
-    <color name="backgroundLight">#FFFFFF</color>
-    <color name="backgroundDark">#192025</color>
-
-    <color name="textPrimary">#49555F</color>
-    <color name="textPrimaryDisabled">#4C49555F</color>
-    <color name="textSecondary">#70808D</color>
-    <color name="textSecondaryDisabled">#4C70808D</color>
-    <color name="textTertiary">#B7B9C0</color>
-
-    <color name="textPrimaryDark">#FFFFFFFF</color>
-    <color name="textPrimaryDisabledDark">#7FFFFFFF</color>
-    <color name="textSecondaryDark">#ccffffff</color>
-    <color name="textSecondaryDisabledDark">#67ffffff</color>
-    <color name="textTertiaryDark">#80ffffff</color>
-
-    <color name="bubbleLight">#ECEFF1</color>
-    <color name="bubbleDark">#11171B</color>
-    <color name="bubbleBlack">#0F1113</color>
-
-    <color name="separatorLight">#0C000000</color>
-    <color name="separatorDark">#1AFFFFFF</color>
-
-    <color name="switchThumbEnabledLight">#ECECEC</color>
-    <color name="switchThumbEnabledDark">#B9B9B9</color>
-
-    <color name="switchTrackEnabledLight">#A6A6A6</color>
-    <color name="switchTrackEnabledDark">#646464</color>
-
-    <color name="switchThumbDisabledLight">#B9B9B9</color>
-    <color name="switchThumbDisabledDark">#595959</color>
-
-    <color name="switchTrackDisabledLight">#D6D6D6</color>
-    <color name="switchTrackDisabledDark">#383838</color>
-
-    <!-- This colour should only ever be used for attrs with the tools tag -->
-    <color name="tools_theme">#00838F</color>
-
-    <array name="random_colors">
-        <item>#06C9AF</item>
-        <item>#6DC966</item>
-        <item>#F1AF28</item>
-        <item>#FF8963</item>
-        <item>#FF6969</item>
-        <item>#5D99FF</item>
-        <item>#8899EC</item>
-    </array>
-
-    <array name="material_red">
-        <item>#FFEBEE</item>
-        <item>#FFCDD2</item>
-        <item>#EF9A9A</item>
-        <item>#E57373</item>
-        <item>#EF5350</item>
-        <item>#F44336</item>
-        <item>#E53935</item>
-        <item>#D32F2F</item>
-        <item>#C62828</item>
-        <item>#B71C1C</item>
-    </array>
-
-    <array name="material_pink">
-        <item>#FCE4EC</item>
-        <item>#F8BBD0</item>
-        <item>#F48FB1</item>
-        <item>#F06292</item>
-        <item>#EC407A</item>
-        <item>#E91E63</item>
-        <item>#D81B60</item>
-        <item>#C2185B</item>
-        <item>#AD1457</item>
-        <item>#880E4F</item>
-    </array>
-
-    <array name="material_purple">
-        <item>#F3E5F5</item>
-        <item>#E1BEE7</item>
-        <item>#CE93D8</item>
-        <item>#BA68C8</item>
-        <item>#AB47BC</item>
-        <item>#9C27B0</item>
-        <item>#8E24AA</item>
-        <item>#7B1FA2</item>
-        <item>#6A1B9A</item>
-        <item>#4A148C</item>
-    </array>
-
-    <array name="material_deep_purple">
-        <item>#EDE7F6</item>
-        <item>#D1C4E9</item>
-        <item>#B39DDB</item>
-        <item>#9575CD</item>
-        <item>#7E57C2</item>
-        <item>#673AB7</item>
-        <item>#5E35B1</item>
-        <item>#512DA8</item>
-        <item>#4527A0</item>
-        <item>#311B92</item>
-    </array>
-
-    <array name="material_indigo">
-        <item>#E8EAF6</item>
-        <item>#C5CAE9</item>
-        <item>#9FA8DA</item>
-        <item>#7986CB</item>
-        <item>#5C6BC0</item>
-        <item>#3F51B5</item>
-        <item>#3949AB</item>
-        <item>#303F9F</item>
-        <item>#283593</item>
-        <item>#1A237E</item>
-    </array>
-
-    <array name="material_blue">
-        <item>#E3F2FD</item>
-        <item>#BBDEFB</item>
-        <item>#90CAF9</item>
-        <item>#64B5F6</item>
-        <item>#42A5F5</item>
-        <item>#2196F3</item>
-        <item>#1E88E5</item>
-        <item>#1976D2</item>
-        <item>#1565C0</item>
-        <item>#0D47A1</item>
-    </array>
-
-    <array name="material_light_blue">
-        <item>#E1F5FE</item>
-        <item>#B3E5FC</item>
-        <item>#81D4FA</item>
-        <item>#4FC3F7</item>
-        <item>#29B6F6</item>
-        <item>#03A9F4</item>
-        <item>#039BE5</item>
-        <item>#0288D1</item>
-        <item>#0277BD</item>
-        <item>#01579B</item>
-    </array>
-
-    <array name="material_cyan">
-        <item>#E0F7FA</item>
-        <item>#B2EBF2</item>
-        <item>#80DEEA</item>
-        <item>#4DD0E1</item>
-        <item>#26C6DA</item>
-        <item>#00BCD4</item>
-        <item>#00ACC1</item>
-        <item>#0097A7</item>
-        <item>#00838F</item>
-        <item>#006064</item>
-    </array>
-
-    <array name="material_teal">
-        <item>#E0F2F1</item>
-        <item>#B2DFDB</item>
-        <item>#80CBC4</item>
-        <item>#4DB6AC</item>
-        <item>#26A69A</item>
-        <item>#009688</item>
-        <item>#00897B</item>
-        <item>#00796B</item>
-        <item>#00695C</item>
-        <item>#004D40</item>
-    </array>
-
-    <array name="material_green">
-        <item>#E8F5E9</item>
-        <item>#C8E6C9</item>
-        <item>#A5D6A7</item>
-        <item>#81C784</item>
-        <item>#66BB6A</item>
-        <item>#4CAF50</item>
-        <item>#43A047</item>
-        <item>#388E3C</item>
-        <item>#2E7D32</item>
-        <item>#1B5E20</item>
-    </array>
-
-    <array name="material_light_green">
-        <item>#F1F8E9</item>
-        <item>#DCEDC8</item>
-        <item>#C5E1A5</item>
-        <item>#AED581</item>
-        <item>#9CCC65</item>
-        <item>#8BC34A</item>
-        <item>#7CB342</item>
-        <item>#689F38</item>
-        <item>#558B2F</item>
-        <item>#33691E</item>
-    </array>
-
-    <array name="material_lime">
-        <item>#F9FBE7</item>
-        <item>#F0F4C3</item>
-        <item>#E6EE9C</item>
-        <item>#DCE775</item>
-        <item>#D4E157</item>
-        <item>#CDDC39</item>
-        <item>#C0CA33</item>
-        <item>#AFB42B</item>
-        <item>#9E9D24</item>
-        <item>#827717</item>
-    </array>
-
-    <array name="material_yellow">
-        <item>#FFFDE7</item>
-        <item>#FFF9C4</item>
-        <item>#FFF59D</item>
-        <item>#FFF176</item>
-        <item>#FFEE58</item>
-        <item>#FFEB3B</item>
-        <item>#FDD835</item>
-        <item>#FBC02D</item>
-        <item>#F9A825</item>
-        <item>#F57F17</item>
-    </array>
-
-    <array name="material_amber">
-        <item>#FFF8E1</item>
-        <item>#FFECB3</item>
-        <item>#FFE082</item>
-        <item>#FFD54F</item>
-        <item>#FFCA28</item>
-        <item>#FFC107</item>
-        <item>#FFB300</item>
-        <item>#FFA000</item>
-        <item>#FF8F00</item>
-        <item>#FF6F00</item>
-    </array>
-
-    <array name="material_orange">
-        <item>#FFF3E0</item>
-        <item>#FFE0B2</item>
-        <item>#FFCC80</item>
-        <item>#FFB74D</item>
-        <item>#FFA726</item>
-        <item>#FF9800</item>
-        <item>#FB8C00</item>
-        <item>#F57C00</item>
-        <item>#EF6C00</item>
-        <item>#E65100</item>
-    </array>
-
-    <array name="material_deep_orange">
-        <item>#FBE9E7</item>
-        <item>#FFCCBC</item>
-        <item>#FFAB91</item>
-        <item>#FF8A65</item>
-        <item>#FF7043</item>
-        <item>#FF5722</item>
-        <item>#F4511E</item>
-        <item>#E64A19</item>
-        <item>#D84315</item>
-        <item>#BF360C</item>
-    </array>
-
-    <array name="material_brown">
-        <item>#EFEBE9</item>
-        <item>#D7CCC8</item>
-        <item>#BCAAA4</item>
-        <item>#A1887F</item>
-        <item>#8D6E63</item>
-        <item>#795548</item>
-        <item>#6D4C41</item>
-        <item>#5D4037</item>
-        <item>#4E342E</item>
-        <item>#3E2723</item>
-    </array>
-
-    <array name="material_gray">
-        <item>#FAFAFA</item>
-        <item>#F5F5F5</item>
-        <item>#EEEEEE</item>
-        <item>#E0E0E0</item>
-        <item>#BDBDBD</item>
-        <item>#9E9E9E</item>
-        <item>#757575</item>
-        <item>#616161</item>
-        <item>#424242</item>
-        <item>#212121</item>
-    </array>
-
-    <array name="material_blue_gray">
-        <item>#ECEFF1</item>
-        <item>#CFD8DC</item>
-        <item>#B0BEC5</item>
-        <item>#90A4AE</item>
-        <item>#78909C</item>
-        <item>#607D8B</item>
-        <item>#546E7A</item>
-        <item>#455A64</item>
-        <item>#37474F</item>
-        <item>#263238</item>
-    </array>
-
-</resources>
+<?xml version="1.0" encoding="utf-8"?>
+<!--
+  ~ Copyright (C) 2019 Moez Bhatti <moez.bhatti@gmail.com>
+  ~
+  ~ This file is part of QKSMS.
+  ~
+  ~ QKSMS is free software: you can redistribute it and/or modify
+  ~ it under the terms of the GNU General Public License as published by
+  ~ the Free Software Foundation, either version 3 of the License, or
+  ~ (at your option) any later version.
+  ~
+  ~ QKSMS is distributed in the hope that it will be useful,
+  ~ but WITHOUT ANY WARRANTY; without even the implied warranty of
+  ~ MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+  ~ GNU General Public License for more details.
+  ~
+  ~ You should have received a copy of the GNU General Public License
+  ~ along with QKSMS.  If not, see <http://www.gnu.org/licenses/>.
+  -->
+<resources>
+    <color name="white">#FFFFFF</color>
+    <color name="black">#000000</color>
+
+    <color name="rippleLight">#1f000000</color>
+    <color name="rippleDark">#33ffffff</color>
+
+    <color name="toolbarLight">#FFFFFF</color>
+    <color name="toolbarDark">#1d262b</color>
+    <color name="toolbarTranslucent">#88000000</color>
+
+    <color name="backgroundLight">#FFFFFF</color>
+    <color name="backgroundDark">#192025</color>
+
+    <color name="textPrimary">#49555F</color>
+    <color name="textPrimaryDisabled">#4C49555F</color>
+    <color name="textSecondary">#70808D</color>
+    <color name="textSecondaryDisabled">#4C70808D</color>
+    <color name="textTertiary">#B7B9C0</color>
+
+    <color name="textPrimaryDark">#FFFFFFFF</color>
+    <color name="textPrimaryDisabledDark">#7FFFFFFF</color>
+    <color name="textSecondaryDark">#ccffffff</color>
+    <color name="textSecondaryDisabledDark">#67ffffff</color>
+    <color name="textTertiaryDark">#80ffffff</color>
+
+    <color name="bubbleLight">#ECEFF1</color>
+    <color name="bubbleDark">#11171B</color>
+    <color name="bubbleBlack">#0F1113</color>
+
+    <color name="separatorLight">#0C000000</color>
+    <color name="separatorDark">#1AFFFFFF</color>
+
+    <color name="switchThumbEnabledLight">#ECECEC</color>
+    <color name="switchThumbEnabledDark">#B9B9B9</color>
+
+    <color name="switchTrackEnabledLight">#A6A6A6</color>
+    <color name="switchTrackEnabledDark">#646464</color>
+
+    <color name="switchThumbDisabledLight">#B9B9B9</color>
+    <color name="switchThumbDisabledDark">#595959</color>
+
+    <color name="switchTrackDisabledLight">#D6D6D6</color>
+    <color name="switchTrackDisabledDark">#383838</color>
+
+    <!-- This colour should only ever be used for attrs with the tools tag -->
+    <color name="tools_theme">#00838F</color>
+
+    <array name="random_colors">
+        <item>#06C9AF</item>
+        <item>#6DC966</item>
+        <item>#F1AF28</item>
+        <item>#FF8963</item>
+        <item>#FF6969</item>
+        <item>#5D99FF</item>
+        <item>#8899EC</item>
+    </array>
+
+    <array name="material_red">
+        <item>#FFEBEE</item>
+        <item>#FFCDD2</item>
+        <item>#EF9A9A</item>
+        <item>#E57373</item>
+        <item>#EF5350</item>
+        <item>#F44336</item>
+        <item>#E53935</item>
+        <item>#D32F2F</item>
+        <item>#C62828</item>
+        <item>#B71C1C</item>
+    </array>
+
+    <array name="material_pink">
+        <item>#FCE4EC</item>
+        <item>#F8BBD0</item>
+        <item>#F48FB1</item>
+        <item>#F06292</item>
+        <item>#EC407A</item>
+        <item>#E91E63</item>
+        <item>#D81B60</item>
+        <item>#C2185B</item>
+        <item>#AD1457</item>
+        <item>#880E4F</item>
+    </array>
+
+    <array name="material_purple">
+        <item>#F3E5F5</item>
+        <item>#E1BEE7</item>
+        <item>#CE93D8</item>
+        <item>#BA68C8</item>
+        <item>#AB47BC</item>
+        <item>#9C27B0</item>
+        <item>#8E24AA</item>
+        <item>#7B1FA2</item>
+        <item>#6A1B9A</item>
+        <item>#4A148C</item>
+    </array>
+
+    <array name="material_deep_purple">
+        <item>#EDE7F6</item>
+        <item>#D1C4E9</item>
+        <item>#B39DDB</item>
+        <item>#9575CD</item>
+        <item>#7E57C2</item>
+        <item>#673AB7</item>
+        <item>#5E35B1</item>
+        <item>#512DA8</item>
+        <item>#4527A0</item>
+        <item>#311B92</item>
+    </array>
+
+    <array name="material_indigo">
+        <item>#E8EAF6</item>
+        <item>#C5CAE9</item>
+        <item>#9FA8DA</item>
+        <item>#7986CB</item>
+        <item>#5C6BC0</item>
+        <item>#3F51B5</item>
+        <item>#3949AB</item>
+        <item>#303F9F</item>
+        <item>#283593</item>
+        <item>#1A237E</item>
+    </array>
+
+    <array name="material_blue">
+        <item>#E3F2FD</item>
+        <item>#BBDEFB</item>
+        <item>#90CAF9</item>
+        <item>#64B5F6</item>
+        <item>#42A5F5</item>
+        <item>#2196F3</item>
+        <item>#1E88E5</item>
+        <item>#1976D2</item>
+        <item>#1565C0</item>
+        <item>#0D47A1</item>
+    </array>
+
+    <array name="material_light_blue">
+        <item>#E1F5FE</item>
+        <item>#B3E5FC</item>
+        <item>#81D4FA</item>
+        <item>#4FC3F7</item>
+        <item>#29B6F6</item>
+        <item>#03A9F4</item>
+        <item>#039BE5</item>
+        <item>#0288D1</item>
+        <item>#0277BD</item>
+        <item>#01579B</item>
+    </array>
+
+    <array name="material_cyan">
+        <item>#E0F7FA</item>
+        <item>#B2EBF2</item>
+        <item>#80DEEA</item>
+        <item>#4DD0E1</item>
+        <item>#26C6DA</item>
+        <item>#00BCD4</item>
+        <item>#00ACC1</item>
+        <item>#0097A7</item>
+        <item>#00838F</item>
+        <item>#006064</item>
+    </array>
+
+    <array name="material_teal">
+        <item>#E0F2F1</item>
+        <item>#B2DFDB</item>
+        <item>#80CBC4</item>
+        <item>#4DB6AC</item>
+        <item>#26A69A</item>
+        <item>#009688</item>
+        <item>#00897B</item>
+        <item>#00796B</item>
+        <item>#00695C</item>
+        <item>#004D40</item>
+    </array>
+
+    <array name="material_green">
+        <item>#E8F5E9</item>
+        <item>#C8E6C9</item>
+        <item>#A5D6A7</item>
+        <item>#81C784</item>
+        <item>#66BB6A</item>
+        <item>#4CAF50</item>
+        <item>#43A047</item>
+        <item>#388E3C</item>
+        <item>#2E7D32</item>
+        <item>#1B5E20</item>
+    </array>
+
+    <array name="material_light_green">
+        <item>#F1F8E9</item>
+        <item>#DCEDC8</item>
+        <item>#C5E1A5</item>
+        <item>#AED581</item>
+        <item>#9CCC65</item>
+        <item>#8BC34A</item>
+        <item>#7CB342</item>
+        <item>#689F38</item>
+        <item>#558B2F</item>
+        <item>#33691E</item>
+    </array>
+
+    <array name="material_lime">
+        <item>#F9FBE7</item>
+        <item>#F0F4C3</item>
+        <item>#E6EE9C</item>
+        <item>#DCE775</item>
+        <item>#D4E157</item>
+        <item>#CDDC39</item>
+        <item>#C0CA33</item>
+        <item>#AFB42B</item>
+        <item>#9E9D24</item>
+        <item>#827717</item>
+    </array>
+
+    <array name="material_yellow">
+        <item>#FFFDE7</item>
+        <item>#FFF9C4</item>
+        <item>#FFF59D</item>
+        <item>#FFF176</item>
+        <item>#FFEE58</item>
+        <item>#FFEB3B</item>
+        <item>#FDD835</item>
+        <item>#FBC02D</item>
+        <item>#F9A825</item>
+        <item>#F57F17</item>
+    </array>
+
+    <array name="material_amber">
+        <item>#FFF8E1</item>
+        <item>#FFECB3</item>
+        <item>#FFE082</item>
+        <item>#FFD54F</item>
+        <item>#FFCA28</item>
+        <item>#FFC107</item>
+        <item>#FFB300</item>
+        <item>#FFA000</item>
+        <item>#FF8F00</item>
+        <item>#FF6F00</item>
+    </array>
+
+    <array name="material_orange">
+        <item>#FFF3E0</item>
+        <item>#FFE0B2</item>
+        <item>#FFCC80</item>
+        <item>#FFB74D</item>
+        <item>#FFA726</item>
+        <item>#FF9800</item>
+        <item>#FB8C00</item>
+        <item>#F57C00</item>
+        <item>#EF6C00</item>
+        <item>#E65100</item>
+    </array>
+
+    <array name="material_deep_orange">
+        <item>#FBE9E7</item>
+        <item>#FFCCBC</item>
+        <item>#FFAB91</item>
+        <item>#FF8A65</item>
+        <item>#FF7043</item>
+        <item>#FF5722</item>
+        <item>#F4511E</item>
+        <item>#E64A19</item>
+        <item>#D84315</item>
+        <item>#BF360C</item>
+    </array>
+
+    <array name="material_brown">
+        <item>#EFEBE9</item>
+        <item>#D7CCC8</item>
+        <item>#BCAAA4</item>
+        <item>#A1887F</item>
+        <item>#8D6E63</item>
+        <item>#795548</item>
+        <item>#6D4C41</item>
+        <item>#5D4037</item>
+        <item>#4E342E</item>
+        <item>#3E2723</item>
+    </array>
+
+    <array name="material_gray">
+        <item>#FAFAFA</item>
+        <item>#F5F5F5</item>
+        <item>#EEEEEE</item>
+        <item>#E0E0E0</item>
+        <item>#BDBDBD</item>
+        <item>#9E9E9E</item>
+        <item>#757575</item>
+        <item>#616161</item>
+        <item>#424242</item>
+        <item>#212121</item>
+    </array>
+
+    <array name="material_blue_gray">
+        <item>#ECEFF1</item>
+        <item>#CFD8DC</item>
+        <item>#B0BEC5</item>
+        <item>#90A4AE</item>
+        <item>#78909C</item>
+        <item>#607D8B</item>
+        <item>#546E7A</item>
+        <item>#455A64</item>
+        <item>#37474F</item>
+        <item>#263238</item>
+    </array>
+
+</resources>
diff --git a/presentation/src/main/res/values/font_certs.xml b/presentation/src/main/res/values/font_certs.xml
index b18426de1..41f4ef20e 100644
--- a/presentation/src/main/res/values/font_certs.xml
+++ b/presentation/src/main/res/values/font_certs.xml
@@ -1,35 +1,35 @@
-<?xml version="1.0" encoding="utf-8"?>
-<!--
-  ~ Copyright (C) 2019 Moez Bhatti <moez.bhatti@gmail.com>
-  ~
-  ~ This file is part of QKSMS.
-  ~
-  ~ QKSMS is free software: you can redistribute it and/or modify
-  ~ it under the terms of the GNU General Public License as published by
-  ~ the Free Software Foundation, either version 3 of the License, or
-  ~ (at your option) any later version.
-  ~
-  ~ QKSMS is distributed in the hope that it will be useful,
-  ~ but WITHOUT ANY WARRANTY; without even the implied warranty of
-  ~ MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
-  ~ GNU General Public License for more details.
-  ~
-  ~ You should have received a copy of the GNU General Public License
-  ~ along with QKSMS.  If not, see <http://www.gnu.org/licenses/>.
-  -->
-<resources>
-    <array name="com_google_android_gms_fonts_certs">
-        <item>@array/com_google_android_gms_fonts_certs_dev</item>
-        <item>@array/com_google_android_gms_fonts_certs_prod</item>
-    </array>
-    <string-array name="com_google_android_gms_fonts_certs_dev" translatable="false">
-        <item>
-            MIIEqDCCA5CgAwIBAgIJANWFuGx90071MA0GCSqGSIb3DQEBBAUAMIGUMQswCQYDVQQGEwJVUzETMBEGA1UECBMKQ2FsaWZvcm5pYTEWMBQGA1UEBxMNTW91bnRhaW4gVmlldzEQMA4GA1UEChMHQW5kcm9pZDEQMA4GA1UECxMHQW5kcm9pZDEQMA4GA1UEAxMHQW5kcm9pZDEiMCAGCSqGSIb3DQEJARYTYW5kcm9pZEBhbmRyb2lkLmNvbTAeFw0wODA0MTUyMzM2NTZaFw0zNTA5MDEyMzM2NTZaMIGUMQswCQYDVQQGEwJVUzETMBEGA1UECBMKQ2FsaWZvcm5pYTEWMBQGA1UEBxMNTW91bnRhaW4gVmlldzEQMA4GA1UEChMHQW5kcm9pZDEQMA4GA1UECxMHQW5kcm9pZDEQMA4GA1UEAxMHQW5kcm9pZDEiMCAGCSqGSIb3DQEJARYTYW5kcm9pZEBhbmRyb2lkLmNvbTCCASAwDQYJKoZIhvcNAQEBBQADggENADCCAQgCggEBANbOLggKv+IxTdGNs8/TGFy0PTP6DHThvbbR24kT9ixcOd9W+EaBPWW+wPPKQmsHxajtWjmQwWfna8mZuSeJS48LIgAZlKkpFeVyxW0qMBujb8X8ETrWy550NaFtI6t9+u7hZeTfHwqNvacKhp1RbE6dBRGWynwMVX8XW8N1+UjFaq6GCJukT4qmpN2afb8sCjUigq0GuMwYXrFVee74bQgLHWGJwPmvmLHC69EH6kWr22ijx4OKXlSIx2xT1AsSHee70w5iDBiK4aph27yH3TxkXy9V89TDdexAcKk/cVHYNnDBapcavl7y0RiQ4biu8ymM8Ga/nmzhRKya6G0cGw8CAQOjgfwwgfkwHQYDVR0OBBYEFI0cxb6VTEM8YYY6FbBMvAPyT+CyMIHJBgNVHSMEgcEwgb6AFI0cxb6VTEM8YYY6FbBMvAPyT+CyoYGapIGXMIGUMQswCQYDVQQGEwJVUzETMBEGA1UECBMKQ2FsaWZvcm5pYTEWMBQGA1UEBxMNTW91bnRhaW4gVmlldzEQMA4GA1UEChMHQW5kcm9pZDEQMA4GA1UECxMHQW5kcm9pZDEQMA4GA1UEAxMHQW5kcm9pZDEiMCAGCSqGSIb3DQEJARYTYW5kcm9pZEBhbmRyb2lkLmNvbYIJANWFuGx90071MAwGA1UdEwQFMAMBAf8wDQYJKoZIhvcNAQEEBQADggEBABnTDPEF+3iSP0wNfdIjIz1AlnrPzgAIHVvXxunW7SBrDhEglQZBbKJEk5kT0mtKoOD1JMrSu1xuTKEBahWRbqHsXclaXjoBADb0kkjVEJu/Lh5hgYZnOjvlba8Ld7HCKePCVePoTJBdI4fvugnL8TsgK05aIskyY0hKI9L8KfqfGTl1lzOv2KoWD0KWwtAWPoGChZxmQ+nBli+gwYMzM1vAkP+aayLe0a1EQimlOalO762r0GXO0ks+UeXde2Z4e+8S/pf7pITEI/tP+MxJTALw9QUWEv9lKTk+jkbqxbsh8nfBUapfKqYn0eidpwq2AzVp3juYl7//fKnaPhJD9gs=
-        </item>
-    </string-array>
-    <string-array name="com_google_android_gms_fonts_certs_prod" translatable="false">
-        <item>
-            MIIEQzCCAyugAwIBAgIJAMLgh0ZkSjCNMA0GCSqGSIb3DQEBBAUAMHQxCzAJBgNVBAYTAlVTMRMwEQYDVQQIEwpDYWxpZm9ybmlhMRYwFAYDVQQHEw1Nb3VudGFpbiBWaWV3MRQwEgYDVQQKEwtHb29nbGUgSW5jLjEQMA4GA1UECxMHQW5kcm9pZDEQMA4GA1UEAxMHQW5kcm9pZDAeFw0wODA4MjEyMzEzMzRaFw0zNjAxMDcyMzEzMzRaMHQxCzAJBgNVBAYTAlVTMRMwEQYDVQQIEwpDYWxpZm9ybmlhMRYwFAYDVQQHEw1Nb3VudGFpbiBWaWV3MRQwEgYDVQQKEwtHb29nbGUgSW5jLjEQMA4GA1UECxMHQW5kcm9pZDEQMA4GA1UEAxMHQW5kcm9pZDCCASAwDQYJKoZIhvcNAQEBBQADggENADCCAQgCggEBAKtWLgDYO6IIrgqWbxJOKdoR8qtW0I9Y4sypEwPpt1TTcvZApxsdyxMJZ2JORland2qSGT2y5b+3JKkedxiLDmpHpDsz2WCbdxgxRczfey5YZnTJ4VZbH0xqWVW/8lGmPav5xVwnIiJS6HXk+BVKZF+JcWjAsb/GEuq/eFdpuzSqeYTcfi6idkyugwfYwXFU1+5fZKUaRKYCwkkFQVfcAs1fXA5V+++FGfvjJ/CxURaSxaBvGdGDhfXE28LWuT9ozCl5xw4Yq5OGazvV24mZVSoOO0yZ31j7kYvtwYK6NeADwbSxDdJEqO4k//0zOHKrUiGYXtqw/A0LFFtqoZKFjnkCAQOjgdkwgdYwHQYDVR0OBBYEFMd9jMIhF1Ylmn/Tgt9r45jk14alMIGmBgNVHSMEgZ4wgZuAFMd9jMIhF1Ylmn/Tgt9r45jk14aloXikdjB0MQswCQYDVQQGEwJVUzETMBEGA1UECBMKQ2FsaWZvcm5pYTEWMBQGA1UEBxMNTW91bnRhaW4gVmlldzEUMBIGA1UEChMLR29vZ2xlIEluYy4xEDAOBgNVBAsTB0FuZHJvaWQxEDAOBgNVBAMTB0FuZHJvaWSCCQDC4IdGZEowjTAMBgNVHRMEBTADAQH/MA0GCSqGSIb3DQEBBAUAA4IBAQBt0lLO74UwLDYKqs6Tm8/yzKkEu116FmH4rkaymUIE0P9KaMftGlMexFlaYjzmB2OxZyl6euNXEsQH8gjwyxCUKRJNexBiGcCEyj6z+a1fuHHvkiaai+KL8W1EyNmgjmyy8AW7P+LLlkR+ho5zEHatRbM/YAnqGcFh5iZBqpknHf1SKMXFh4dd239FJ1jWYfbMDMy3NS5CTMQ2XFI1MvcyUTdZPErjQfTbQe3aDQsQcafEQPD+nqActifKZ0Np0IS9L9kR/wbNvyz6ENwPiTrjV2KRkEjH78ZMcUQXg0L3BYHJ3lc69Vs5Ddf9uUGGMYldX3WfMBEmh/9iFBDAaTCK
-        </item>
-    </string-array>
-</resources>
+<?xml version="1.0" encoding="utf-8"?>
+<!--
+  ~ Copyright (C) 2019 Moez Bhatti <moez.bhatti@gmail.com>
+  ~
+  ~ This file is part of QKSMS.
+  ~
+  ~ QKSMS is free software: you can redistribute it and/or modify
+  ~ it under the terms of the GNU General Public License as published by
+  ~ the Free Software Foundation, either version 3 of the License, or
+  ~ (at your option) any later version.
+  ~
+  ~ QKSMS is distributed in the hope that it will be useful,
+  ~ but WITHOUT ANY WARRANTY; without even the implied warranty of
+  ~ MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+  ~ GNU General Public License for more details.
+  ~
+  ~ You should have received a copy of the GNU General Public License
+  ~ along with QKSMS.  If not, see <http://www.gnu.org/licenses/>.
+  -->
+<resources>
+    <array name="com_google_android_gms_fonts_certs">
+        <item>@array/com_google_android_gms_fonts_certs_dev</item>
+        <item>@array/com_google_android_gms_fonts_certs_prod</item>
+    </array>
+    <string-array name="com_google_android_gms_fonts_certs_dev" translatable="false">
+        <item>
+            MIIEqDCCA5CgAwIBAgIJANWFuGx90071MA0GCSqGSIb3DQEBBAUAMIGUMQswCQYDVQQGEwJVUzETMBEGA1UECBMKQ2FsaWZvcm5pYTEWMBQGA1UEBxMNTW91bnRhaW4gVmlldzEQMA4GA1UEChMHQW5kcm9pZDEQMA4GA1UECxMHQW5kcm9pZDEQMA4GA1UEAxMHQW5kcm9pZDEiMCAGCSqGSIb3DQEJARYTYW5kcm9pZEBhbmRyb2lkLmNvbTAeFw0wODA0MTUyMzM2NTZaFw0zNTA5MDEyMzM2NTZaMIGUMQswCQYDVQQGEwJVUzETMBEGA1UECBMKQ2FsaWZvcm5pYTEWMBQGA1UEBxMNTW91bnRhaW4gVmlldzEQMA4GA1UEChMHQW5kcm9pZDEQMA4GA1UECxMHQW5kcm9pZDEQMA4GA1UEAxMHQW5kcm9pZDEiMCAGCSqGSIb3DQEJARYTYW5kcm9pZEBhbmRyb2lkLmNvbTCCASAwDQYJKoZIhvcNAQEBBQADggENADCCAQgCggEBANbOLggKv+IxTdGNs8/TGFy0PTP6DHThvbbR24kT9ixcOd9W+EaBPWW+wPPKQmsHxajtWjmQwWfna8mZuSeJS48LIgAZlKkpFeVyxW0qMBujb8X8ETrWy550NaFtI6t9+u7hZeTfHwqNvacKhp1RbE6dBRGWynwMVX8XW8N1+UjFaq6GCJukT4qmpN2afb8sCjUigq0GuMwYXrFVee74bQgLHWGJwPmvmLHC69EH6kWr22ijx4OKXlSIx2xT1AsSHee70w5iDBiK4aph27yH3TxkXy9V89TDdexAcKk/cVHYNnDBapcavl7y0RiQ4biu8ymM8Ga/nmzhRKya6G0cGw8CAQOjgfwwgfkwHQYDVR0OBBYEFI0cxb6VTEM8YYY6FbBMvAPyT+CyMIHJBgNVHSMEgcEwgb6AFI0cxb6VTEM8YYY6FbBMvAPyT+CyoYGapIGXMIGUMQswCQYDVQQGEwJVUzETMBEGA1UECBMKQ2FsaWZvcm5pYTEWMBQGA1UEBxMNTW91bnRhaW4gVmlldzEQMA4GA1UEChMHQW5kcm9pZDEQMA4GA1UECxMHQW5kcm9pZDEQMA4GA1UEAxMHQW5kcm9pZDEiMCAGCSqGSIb3DQEJARYTYW5kcm9pZEBhbmRyb2lkLmNvbYIJANWFuGx90071MAwGA1UdEwQFMAMBAf8wDQYJKoZIhvcNAQEEBQADggEBABnTDPEF+3iSP0wNfdIjIz1AlnrPzgAIHVvXxunW7SBrDhEglQZBbKJEk5kT0mtKoOD1JMrSu1xuTKEBahWRbqHsXclaXjoBADb0kkjVEJu/Lh5hgYZnOjvlba8Ld7HCKePCVePoTJBdI4fvugnL8TsgK05aIskyY0hKI9L8KfqfGTl1lzOv2KoWD0KWwtAWPoGChZxmQ+nBli+gwYMzM1vAkP+aayLe0a1EQimlOalO762r0GXO0ks+UeXde2Z4e+8S/pf7pITEI/tP+MxJTALw9QUWEv9lKTk+jkbqxbsh8nfBUapfKqYn0eidpwq2AzVp3juYl7//fKnaPhJD9gs=
+        </item>
+    </string-array>
+    <string-array name="com_google_android_gms_fonts_certs_prod" translatable="false">
+        <item>
+            MIIEQzCCAyugAwIBAgIJAMLgh0ZkSjCNMA0GCSqGSIb3DQEBBAUAMHQxCzAJBgNVBAYTAlVTMRMwEQYDVQQIEwpDYWxpZm9ybmlhMRYwFAYDVQQHEw1Nb3VudGFpbiBWaWV3MRQwEgYDVQQKEwtHb29nbGUgSW5jLjEQMA4GA1UECxMHQW5kcm9pZDEQMA4GA1UEAxMHQW5kcm9pZDAeFw0wODA4MjEyMzEzMzRaFw0zNjAxMDcyMzEzMzRaMHQxCzAJBgNVBAYTAlVTMRMwEQYDVQQIEwpDYWxpZm9ybmlhMRYwFAYDVQQHEw1Nb3VudGFpbiBWaWV3MRQwEgYDVQQKEwtHb29nbGUgSW5jLjEQMA4GA1UECxMHQW5kcm9pZDEQMA4GA1UEAxMHQW5kcm9pZDCCASAwDQYJKoZIhvcNAQEBBQADggENADCCAQgCggEBAKtWLgDYO6IIrgqWbxJOKdoR8qtW0I9Y4sypEwPpt1TTcvZApxsdyxMJZ2JORland2qSGT2y5b+3JKkedxiLDmpHpDsz2WCbdxgxRczfey5YZnTJ4VZbH0xqWVW/8lGmPav5xVwnIiJS6HXk+BVKZF+JcWjAsb/GEuq/eFdpuzSqeYTcfi6idkyugwfYwXFU1+5fZKUaRKYCwkkFQVfcAs1fXA5V+++FGfvjJ/CxURaSxaBvGdGDhfXE28LWuT9ozCl5xw4Yq5OGazvV24mZVSoOO0yZ31j7kYvtwYK6NeADwbSxDdJEqO4k//0zOHKrUiGYXtqw/A0LFFtqoZKFjnkCAQOjgdkwgdYwHQYDVR0OBBYEFMd9jMIhF1Ylmn/Tgt9r45jk14alMIGmBgNVHSMEgZ4wgZuAFMd9jMIhF1Ylmn/Tgt9r45jk14aloXikdjB0MQswCQYDVQQGEwJVUzETMBEGA1UECBMKQ2FsaWZvcm5pYTEWMBQGA1UEBxMNTW91bnRhaW4gVmlldzEUMBIGA1UEChMLR29vZ2xlIEluYy4xEDAOBgNVBAsTB0FuZHJvaWQxEDAOBgNVBAMTB0FuZHJvaWSCCQDC4IdGZEowjTAMBgNVHRMEBTADAQH/MA0GCSqGSIb3DQEBBAUAA4IBAQBt0lLO74UwLDYKqs6Tm8/yzKkEu116FmH4rkaymUIE0P9KaMftGlMexFlaYjzmB2OxZyl6euNXEsQH8gjwyxCUKRJNexBiGcCEyj6z+a1fuHHvkiaai+KL8W1EyNmgjmyy8AW7P+LLlkR+ho5zEHatRbM/YAnqGcFh5iZBqpknHf1SKMXFh4dd239FJ1jWYfbMDMy3NS5CTMQ2XFI1MvcyUTdZPErjQfTbQe3aDQsQcafEQPD+nqActifKZ0Np0IS9L9kR/wbNvyz6ENwPiTrjV2KRkEjH78ZMcUQXg0L3BYHJ3lc69Vs5Ddf9uUGGMYldX3WfMBEmh/9iFBDAaTCK
+        </item>
+    </string-array>
+</resources>
diff --git a/presentation/src/main/res/values/preloaded_fonts.xml b/presentation/src/main/res/values/preloaded_fonts.xml
index c5f650f9f..5c530ac07 100644
--- a/presentation/src/main/res/values/preloaded_fonts.xml
+++ b/presentation/src/main/res/values/preloaded_fonts.xml
@@ -1,24 +1,24 @@
-<?xml version="1.0" encoding="utf-8"?>
-<!--
-  ~ Copyright (C) 2019 Moez Bhatti <moez.bhatti@gmail.com>
-  ~
-  ~ This file is part of QKSMS.
-  ~
-  ~ QKSMS is free software: you can redistribute it and/or modify
-  ~ it under the terms of the GNU General Public License as published by
-  ~ the Free Software Foundation, either version 3 of the License, or
-  ~ (at your option) any later version.
-  ~
-  ~ QKSMS is distributed in the hope that it will be useful,
-  ~ but WITHOUT ANY WARRANTY; without even the implied warranty of
-  ~ MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
-  ~ GNU General Public License for more details.
-  ~
-  ~ You should have received a copy of the GNU General Public License
-  ~ along with QKSMS.  If not, see <http://www.gnu.org/licenses/>.
-  -->
-<resources>
-    <array name="preloaded_fonts" translatable="false">
-        <item>@font/lato</item>
-    </array>
-</resources>
+<?xml version="1.0" encoding="utf-8"?>
+<!--
+  ~ Copyright (C) 2019 Moez Bhatti <moez.bhatti@gmail.com>
+  ~
+  ~ This file is part of QKSMS.
+  ~
+  ~ QKSMS is free software: you can redistribute it and/or modify
+  ~ it under the terms of the GNU General Public License as published by
+  ~ the Free Software Foundation, either version 3 of the License, or
+  ~ (at your option) any later version.
+  ~
+  ~ QKSMS is distributed in the hope that it will be useful,
+  ~ but WITHOUT ANY WARRANTY; without even the implied warranty of
+  ~ MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+  ~ GNU General Public License for more details.
+  ~
+  ~ You should have received a copy of the GNU General Public License
+  ~ along with QKSMS.  If not, see <http://www.gnu.org/licenses/>.
+  -->
+<resources>
+    <array name="preloaded_fonts" translatable="false">
+        <item>@font/lato</item>
+    </array>
+</resources>
diff --git a/presentation/src/main/res/values/strings.xml b/presentation/src/main/res/values/strings.xml
index 2c7e1b838..906b125af 100644
--- a/presentation/src/main/res/values/strings.xml
+++ b/presentation/src/main/res/values/strings.xml
@@ -1,490 +1,491 @@
-<!--
-  ~ Copyright (C) 2019 Moez Bhatti <moez.bhatti@gmail.com>
-  ~
-  ~ This file is part of QKSMS.
-  ~
-  ~ QKSMS is free software: you can redistribute it and/or modify
-  ~ it under the terms of the GNU General Public License as published by
-  ~ the Free Software Foundation, either version 3 of the License, or
-  ~ (at your option) any later version.
-  ~
-  ~ QKSMS is distributed in the hope that it will be useful,
-  ~ but WITHOUT ANY WARRANTY; without even the implied warranty of
-  ~ MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
-  ~ GNU General Public License for more details.
-  ~
-  ~ You should have received a copy of the GNU General Public License
-  ~ along with QKSMS.  If not, see <http://www.gnu.org/licenses/>.
-  -->
-<resources>
-
-    <string name="app_name" translatable="false">QKSMS</string>
-
-    <string name="shortcut_compose_long_label">New conversation</string>
-    <string name="shortcut_compose_short_label">Compose</string>
-    <string name="shortcut_compose_disabled_message">Shortcut disabled</string>
-
-    <string name="title_archived">Archived</string>
-    <string name="title_settings">Settings</string>
-    <string name="title_notification_prefs">Notifications</string>
-    <string name="title_theme">Theme</string>
-    <string name="title_conversations">Search inbox…</string>
-    <string name="title_compose">Type a name or number</string>
-    <string name="title_qksms_plus" translatable="false">QKSMS+</string>
-
-    <string name="setup_skip">Skip</string>
-    <string name="setup_next">Continue</string>
-
-    <string name="menu_add_person">Add person</string>
-    <string name="menu_call">Call</string>
-    <string name="menu_info">Details</string>
-    <string name="menu_save">Save to gallery</string>
-    <string name="menu_share">Share</string>
-
-    <string name="main_drawer_open_cd">Open navigation drawer</string>
-    <string name="main_title_selected">%d selected</string>
-    <string name="main_menu_clear">Clear</string>
-    <string name="main_menu_archive">Archive</string>
-    <string name="main_menu_unarchive">Unarchive</string>
-    <string name="main_menu_delete">Delete</string>
-    <string name="main_menu_add_contact">Add to contacts</string>
-    <string name="main_menu_pin">Pin to top</string>
-    <string name="main_menu_unpin">Unpin</string>
-    <string name="main_menu_read">Mark read</string>
-    <string name="main_menu_unread">Mark unread</string>
-    <string name="main_menu_block">Block</string>
-    <string name="main_syncing">Syncing messages…</string>
-    <string name="main_sender_you">You: %s</string>
-    <string name="main_draft">Draft</string>
-    <string name="main_message_results_title">Results in messages</string>
-    <string name="main_message_results">%d messages</string>
-    <string name="inbox_empty_text">Your conversations will appear here</string>
-    <string name="inbox_search_empty_text">No results</string>
-    <string name="archived_empty_text">Your archived conversations will appear here</string>
-    <string name="main_fab_cd">Start new conversation</string>
-    <string name="main_default_sms_title">Love texting again</string>
-    <string name="main_default_sms_message">Make QKSMS your default SMS app</string>
-    <string name="main_default_sms_change">Change</string>
-    <string name="main_permission_required">Permission required</string>
-    <string name="main_permission_sms">QKSMS needs permission to send and view SMS messages</string>
-    <string name="main_permission_contacts">QKSMS needs permission to view your contacts</string>
-    <string name="main_permission_allow">Allow</string>
-
-    <string name="drawer_inbox">Inbox</string>
-    <string name="drawer_archived">Archived</string>
-    <string name="drawer_scheduled">Scheduled</string>
-    <string name="drawer_blocking">Blocking</string>
-    <string name="drawer_more">More</string>
-    <string name="drawer_settings">Settings</string>
-    <string name="drawer_plus" translatable="false">QKSMS+</string>
-    <string name="drawer_help">Help &amp; feedback</string>
-    <string name="drawer_invite">Invite friends</string>
-    <string name="drawer_plus_banner_title" translatable="false">QKSMS+</string>
-    <string name="drawer_plus_banner_summary">Unlock amazing new features, and support development</string>
-
-    <string name="rate_title">Enjoying QKSMS?</string>
-    <string name="rate_summary">Share some love and rate us on Google Play!</string>
-    <string name="rate_okay">OKAY!</string>
-    <string name="rate_dismiss">DISMISS</string>
-
-    <string name="dialog_delete_title">Delete</string>
-    <plurals name="dialog_delete_message">
-        <item quantity="one">Are you sure you would like to delete this conversation?</item>
-        <item quantity="other">Are you sure you would like to delete %d conversations?</item>
-    </plurals>
-
-    <string-array name="message_options">
-        <item>Copy text</item>
-        <item>Forward</item>
-        <item>Delete</item>
-    </string-array>
-
-    <string name="compose_number_picker_title">Choose a phone number</string>
-    <string name="compose_number_picker_default">%s ∙ Default</string>
-    <string name="compose_number_picker_once">Just once</string>
-    <string name="compose_number_picker_always">Always</string>
-    <string name="compose_title_selected">%d selected</string>
-    <string name="compose_subtitle_results">%1$d of %2$d results</string>
-    <string name="compose_send_group_title">Send as group message</string>
-    <string name="compose_send_group_summary">Recipients and replies will be visible to everyone</string>
-    <string name="compose_messages_empty">This is the start of your conversation. Say something nice!</string>
-    <string name="compose_vcard_label">Contact card</string>
-    <string name="compose_scheduled_for">Scheduled for</string>
-    <string name="compose_scheduled_future">Selected time must be in the future!</string>
-    <string name="compose_scheduled_plus">You must unlock QKSMS+ to use scheduled messaging</string>
-    <string name="compose_scheduled_toast">Added to scheduled messages</string>
-    <string name="compose_hint">Write a message…</string>
-    <string name="compose_menu_copy">Copy text</string>
-    <string name="compose_menu_forward">Forward</string>
-    <string name="compose_menu_delete">Delete</string>
-    <string name="compose_menu_previous">Previous</string>
-    <string name="compose_menu_next">Next</string>
-    <string name="compose_menu_clear">Clear</string>
-    <string name="compose_details_title">Message details</string>
-    <string name="compose_details_type">Type: %s</string>
-    <string name="compose_details_from">From: %s</string>
-    <string name="compose_details_to">To: %s</string>
-    <string name="compose_details_subject">Subject: %s</string>
-    <string name="compose_details_priority">Priority: %s</string>
-    <string name="compose_details_size">Size: %s</string>
-    <string name="compose_details_sent">Sent: %s</string>
-    <string name="compose_details_received">Received: %s</string>
-    <string name="compose_details_delivered">Delivered: %s</string>
-    <string name="compose_details_error_code">Error code: %d</string>
-    <string name="compose_attach_cd">Add an attachment</string>
-    <string name="compose_gallery_cd">Attach a photo</string>
-    <string name="compose_camera_cd">Take a photo</string>
-    <string name="compose_schedule_cd">Schedule message</string>
-    <string name="compose_contact_cd">Attach a contact</string>
-    <string name="compose_contact_error">Error reading contact</string>
-    <!-- Example: SIM 1 (Verizon) selected-->
-    <string name="compose_sim_changed_toast">SIM %1$d (%2$s) selected</string>
-    <string name="compose_sim_cd">%s selected, change SIM card</string>
-    <string name="compose_send_cd">Send message</string>
-
-    <string name="message_status_sending">Sending…</string>
-    <string name="message_status_delivered">Delivered %s</string>
-    <string name="message_status_failed">Failed to send. Tap to try again</string>
-
-    <string name="info_title">Details</string>
-    <string name="info_copied_address">Address copied</string>
-    <string name="info_name">Conversation title</string>
-    <string name="info_notifications">Notifications</string>
-    <string name="info_theme">Theme</string>
-    <string name="info_archive">Archive</string>
-    <string name="info_unarchive">Unarchive</string>
-    <string name="info_block">Block</string>
-    <string name="info_unblock">Unblock</string>
-    <string name="info_delete">Delete conversation</string>
-
-    <string name="gallery_error">Couldn\'t load media</string>
-    <string name="gallery_toast_saved">Saved to gallery</string>
-
-    <string name="backup_title">Backup and restore</string>
-    <string name="backup_backing_up">Backing up messages</string>
-    <string name="backup_restoring">Restoring from backup</string>
-    <string name="backup_last">Last backup</string>
-    <string name="backup_loading">Loading…</string>
-    <string name="backup_never">Never</string>
-    <string name="backup_restore_title">Restore</string>
-    <string name="backup_restore_summary">Select a backup</string>
-    <string name="backup_restore_error_plus">Please unlock QKSMS+ to use backup and restore</string>
-    <string name="backup_restore_error_backup">Backup in progress…</string>
-    <string name="backup_restore_error_restore">Restore in progress…</string>
-    <string name="backup_restore_confirm_title">Restore from backup</string>
-    <string name="backup_restore_confirm_message">Are you sure you would like to restore your messages from this backup?</string>
-    <string name="backup_restore_stop_title">Stop restore</string>
-    <string name="backup_restore_stop_message">Messages that have already been restored will remain on your device</string>
-    <string name="backup_restore_dialog_title">Backups</string>
-    <string name="backup_restore_dialog_summary" translatable="false">/QKSMS/Backups</string>
-    <string name="backup_restore_dialog_empty">No backups found</string>
-    <plurals name="backup_message_count">
-        <item quantity="zero">No messages</item>
-        <item quantity="one">%d message</item>
-        <item quantity="other">%d messages</item>
-    </plurals>
-    <string name="backup_disclaimer">Currently, only SMS is supported by Backup and Restore. MMS support and scheduled backups will be coming soon!</string>
-    <string name="backup_now">Backup now</string>
-    <string name="backup_progress_parsing">Parsing backup…</string>
-    <string name="backup_progress_running">%d/%d messages</string>
-    <string name="backup_progress_saving">Saving backup…</string>
-    <string name="backup_progress_syncing">Syncing messages…</string>
-    <string name="backup_progress_finished">Finished!</string>
-    <string name="backup_notification_channel_name">Backup and restore</string>
-
-    <string name="scheduled_title">Scheduled</string>
-    <string name="scheduled_empty_description">Automatically send a message, at the exact moment you\'d like</string>
-    <string name="scheduled_empty_message_1">Hey! When was your birthday again?</string>
-    <string name="scheduled_empty_message_2">It\'s on December 23rd</string>
-    <string name="scheduled_empty_message_3">Happy birthday! Look at what a great friend I am, remembering your birthday</string>
-    <!--&#x200A; is a special character required at the end of this string to fix it's formatting in the app -->
-    <string name="scheduled_empty_message_3_timestamp">Sending on December 23rd&#x200A;</string>
-    <string name="scheduled_compose_cd">Schedule a message</string>
-    <string name="scheduled_options_title">Scheduled message</string>
-    <string-array name="scheduled_options">
-        <item>Send now</item>
-        <item>Copy text</item>
-        <item>Delete</item>
-    </string-array>
-
-    <string name="settings_category_appearance">Appearance</string>
-    <string name="settings_category_general">General</string>
-    <string name="settings_category_qkreply">QK Reply</string>
-
-    <string name="settings_theme_title">Theme</string>
-    <string name="settings_night_title">Night mode</string>
-    <string name="settings_black_title">Pure black night mode</string>
-    <string name="settings_night_start_title">Start time</string>
-    <string name="settings_night_end_title">End time</string>
-    <string name="settings_automatic_colors_title">Automatic contact colors</string>
-    <string name="settings_text_size_title">Font size</string>
-    <string name="settings_system_font_title">Use system font</string>
-    <string name="settings_auto_emoji_title">Automatic emoji</string>
-    <string name="settings_notifications_title">Notifications</string>
-    <string name="settings_notifications_o_summary">Tap to customize</string>
-    <string name="settings_notification_actions_title">Actions</string>
-    <string name="settings_notification_action_1">Button 1</string>
-    <string name="settings_notification_action_2">Button 2</string>
-    <string name="settings_notification_action_3">Button 3</string>
-    <string name="settings_notification_previews_title">Notification previews</string>
-    <string name="settings_notification_wake_title">Wake screen</string>
-    <string name="settings_vibration_title">Vibration</string>
-    <string name="settings_ringtone_title">Sound</string>
-    <string name="settings_ringtone_none">None</string>
-    <string name="settings_qkreply_title">QK Reply</string>
-    <string name="settings_qkreply_summary">Popup for new messages</string>
-    <string name="settings_qkreply_tap_dismiss_title">Tap to dismiss</string>
-    <string name="settings_qkreply_tap_dismiss_summary">Tap outside of the popup to close it</string>
-    <string name="settings_delayed_title">Delayed sending</string>
-    <string name="settings_swipe_actions">Swipe actions</string>
-    <string name="settings_swipe_actions_summary">Configure swipe actions for conversations</string>
-    <string name="settings_swipe_actions_right">Right swipe</string>
-    <string name="settings_swipe_actions_left">Left swipe</string>
-    <string name="settings_swipe_actions_change">CHANGE</string>
-    <string-array name="settings_swipe_actions">
-        <item>None</item>
-        <item>Archive</item>
-        <item>Delete</item>
-        <item>Block</item>
-        <item>Call</item>
-        <item>Mark read</item>
-        <item>Mark unread</item>
-    </string-array>
-    <string name="settings_delivery_title">Delivery confirmations</string>
-    <string name="settings_delivery_summary">Confirm that messages were sent successfully</string>
-    <string name="settings_signature_title">Signature</string>
-    <string name="settings_signature_summary">Add a signature to the end of your messages</string>
-    <string name="settings_unicode_title">Strip accents</string>
-    <string name="settings_unicode_summary">Remove accents from characters in outgoing SMS messages</string>
-    <string name="settings_mobile_title">Mobile numbers only</string>
-    <string name="settings_mobile_summary">When composing a message, only show mobile numbers</string>
-    <string name="settings_auto_delete">Delete old messages automatically</string>
-    <string name="settings_auto_delete_dialog_message">Messages will be deleted after the specified number of days</string>
-    <string name="settings_auto_delete_dialog_hint">Number of days</string>
-    <string name="settings_auto_delete_never">Never</string>
-    <string name="settings_auto_delete_warning">Delete old messages automatically?</string>
-    <string name="settings_auto_delete_warning_message">If you proceed, %1$d messages will be deleted now</string>
-    <plurals name="settings_auto_delete_summary">
-        <item quantity="zero">Never</item>
-        <item quantity="one">After 1 day</item>
-        <item quantity="other">After %d days</item>
-    </plurals>
-    <string name="settings_long_as_mms_title">Send long messages as MMS</string>
-    <string name="settings_long_as_mms_summary">If your longer text messages are failing to send, or sending in the wrong order, you can send them as MMS messages instead. Additional charges may apply</string>
-    <string name="settings_mms_size_title">Auto-compress MMS attachments</string>
-    <string name="settings_sync_title">Sync messages</string>
-    <string name="settings_sync_summary">Re-sync your messages with the native Android SMS database</string>
-    <string name="settings_about_title">About QKSMS</string>
-    <string name="settings_version">Version %s</string>
-    <string name="settings_logging_enabled">Debug logging enabled</string>
-    <string name="settings_logging_disabled">Debug logging disabled</string>
-
-    <string name="settings_delay_duration_hint">Enter duration (seconds)</string>
-
-    <string name="blocking_title">Blocking</string>
-    <string name="blocking_drop_title">Drop messages</string>
-    <string name="blocking_drop_summary">Drop incoming messages from blocked senders instead of hiding them</string>
-    <string name="blocking_conversations">Blocked conversations</string>
-
-    <string name="blocking_manager_title">Blocking Manager</string>
-    <string name="blocking_manager_qksms_title">QKSMS</string>
-    <string name="blocking_manager_qksms_summary">Built-in blocking functionality in QKSMS</string>
-    <string name="blocking_manager_call_control_title" translatable="false">Call Control</string>
-    <string name="blocking_manager_call_control_summary">Automatically filter your calls and messages in one convenient place! Community IQ™ allows you to prevent unwanted messages from community known spammers</string>
-    <string name="blocking_manager_sia_title" translatable="false">Should I Answer?</string>
-    <string name="blocking_manager_sia_summary">Automatically filter messages from unsolicited numbers by using the \"Should I Answer\" app</string>
-    <string name="blocking_manager_copy_title">Copy blocked numbers</string>
-    <string name="blocking_manager_copy_summary">Continue to %s and copy over your existing blocked numbers</string>
-
-    <string name="blocked_numbers_title">Blocked numbers</string>
-    <string name="blocked_numbers_empty">Your blocked numbers will appear here</string>
-    <string name="blocked_numbers_add_cd">Block a new number</string>
-    <string name="blocked_numbers_dialog_title">Block texts from</string>
-    <string name="blocked_numbers_dialog_hint">Phone number</string>
-    <string name="blocked_numbers_dialog_block">Block</string>
-
-    <string name="blocked_messages_title">Blocked messages</string>
-    <string name="blocked_messages_empty">Your blocked messages will appear here</string>
-
-    <string name="blocking_block_title">Block</string>
-    <string name="blocking_unblock_title">Unblock</string>
-    <plurals name="blocking_block_external">
-        <item quantity="one">Continue to %s and block this number</item>
-        <item quantity="other">Continue to %s and block these numbers</item>
-    </plurals>
-    <plurals name="blocking_unblock_external">
-        <item quantity="one">Continue to %s and allow this number</item>
-        <item quantity="other">Continue to %s and allow these numbers</item>
-    </plurals>
-
-    <string name="about_title">About</string>
-    <string name="about_version_title">Version</string>
-    <string name="about_developer_title">Developer</string>
-    <string name="about_source_title">Source code</string>
-    <string name="about_changelog_title">Changelog</string>
-    <string name="about_contact_title">Contact</string>
-    <string name="about_license_title">License</string>
-    <string name="about_copyright_title">Copyright</string>
-
-    <string name="qksms_plus_description_title">Support development, unlock everything</string>
-    <string name="qksms_plus_description_summary">You can save a starving developer for just %s</string>
-    <!-- Substitutions are for price and currency. Ex: Lifetime upgrade for $1.99 USD -->
-    <string name="qksms_plus_upgrade">Lifetime upgrade for %1$s %2$s</string>
-    <string name="qksms_plus_upgrade_b" translatable="false">Unlock for %1$s %2$s</string>
-    <string name="qksms_plus_upgrade_c" translatable="false">Unlock forever for %1$s %2$s</string>
-    <string name="qksms_plus_upgrade_d" translatable="false">One-time purchase of %1$s %2$s</string>
-    <!-- Substitutions are for price and currency. Ex: Unlock + donate for $4.99 USD -->
-    <string name="qksms_plus_upgrade_donate">Unlock + donate for %1$s %2$s</string>
-    <string name="qksms_plus_thanks_title">Thank you for supporting QKSMS!</string>
-    <string name="qksms_plus_thanks_summary">You now have access to all QKSMS+ features</string>
-    <string name="qksms_plus_error">An error has occurred, please try again</string>
-    <string name="qksms_plus_free_title">QKSMS+ is free for F-Droid users! If you\'d like to support development, a donation would be highly appreciated.</string>
-    <string name="qksms_plus_donate">Donate via PayPal</string>
-    <string name="qksms_plus_coming_soon">Coming soon</string>
-    <string name="qksms_plus_themes_title">Premium themes</string>
-    <string name="qksms_plus_themes_summary">Unlock beautiful theme colors not available on the Material Design palette</string>
-    <string name="qksms_plus_emoji_title">Custom auto-emoji</string>
-    <string name="qksms_plus_emoji_summary">Create custom auto-emoji shortcuts</string>
-    <string name="qksms_plus_backup_title">Message backup</string>
-    <string name="qksms_plus_backup_summary">Automatically back up your messages. Never again worry about losing your history if you change phones or your phone gets lost</string>
-    <string name="qksms_plus_scheduled_title">Scheduled messages</string>
-    <string name="qksms_plus_scheduled_summary">Schedule messages to automatically be sent at a specific time and date</string>
-    <string name="qksms_plus_delayed_title">Delayed sending</string>
-    <string name="qksms_plus_delayed_summary">Wait a few seconds before sending your message</string>
-    <string name="qksms_plus_night_title">Automatic night mode</string>
-    <string name="qksms_plus_night_summary">Enable night mode based on the time of day</string>
-    <string name="qksms_plus_blacklist_title">Advanced blocking</string>
-    <string name="qksms_plus_blacklist_summary">Block messages that contain keywords or match patterns</string>
-    <string name="qksms_plus_forward_title">Auto-forward</string>
-    <string name="qksms_plus_forward_summary">Automatically forward messages from certain senders</string>
-    <string name="qksms_plus_respond_title">Auto-respond</string>
-    <string name="qksms_plus_respond_summary">Automatically respond to incoming messages with a preset response</string>
-    <string name="qksms_plus_more_title">More</string>
-    <string name="qksms_plus_more_summary">QKSMS is under active development, and your purchase will include all future QKSMS+ features!</string>
-
-    <string name="widget_loading">Loading…</string>
-    <string name="widget_more">View more conversations</string>
-
-    <string name="qkreply_menu_read">Mark read</string>
-    <string name="qkreply_menu_call">Call</string>
-    <string name="qkreply_menu_delete">Delete</string>
-    <string name="qkreply_menu_expand">Show more</string>
-    <string name="qkreply_menu_collapse">Show less</string>
-    <string name="qkreply_menu_view">Open conversation</string>
-
-    <string name="theme_material">Material</string>
-    <string name="theme_plus" translatable="false">QKSMS+</string>
-    <string name="theme_hex">HEX</string>
-    <string name="theme_apply">Apply</string>
-
-    <string name="about_developer" translatable="false">Moez Bhatti</string>
-    <string name="about_source" translatable="false">https://github.com/moezbhatti/qksms</string>
-    <string name="about_changelog" translatable="false">https://github.com/moezbhatti/qksms/releases</string>
-    <string name="about_contact" translatable="false">moez@qklabs.com</string>
-    <string name="about_license" translatable="false">GNU General Public License v3.0</string>
-    <string name="about_copyright" translatable="false">© 2014–2019</string>
-
-    <string name="changelog_title" translatable="false">New in QKSMS</string>
-    <string name="changelog_version" translatable="false">Version %s</string>
-    <string name="changelog_added" translatable="false">Added</string>
-    <string name="changelog_improved" translatable="false">Improved</string>
-    <string name="changelog_fixed" translatable="false">Fixed</string>
-    <string name="changelog_more" translatable="false">More</string>
-    <string name="changelog_dismiss" translatable="false">Dismiss</string>
-
-    <string-array name="notification_actions">
-        <item>None</item>
-        <item>Archive</item>
-        <item>Delete</item>
-        <item>Block</item>
-        <item>Call</item>
-        <item>Mark read</item>
-        <item>Reply</item>
-    </string-array>
-
-    <string name="button_yes">Yes</string>
-    <string name="button_continue">Continue</string>
-    <string name="button_cancel">Cancel</string>
-    <string name="button_delete">Delete</string>
-    <string name="button_save">Save</string>
-    <string name="button_stop">Stop</string>
-    <string name="button_more">More</string>
-    <string name="button_set">Set</string>
-    <string name="button_undo">Undo</string>
-
-    <string name="toast_copied">Copied</string>
-    <string name="toast_archived">Archived conversation</string>
-    <string name="toast_qksms_plus">You must unlock QKSMS+ to use this</string>
-
-    <plurals name="notification_new_messages">
-        <item quantity="one">New message</item>
-        <item quantity="other">%s new messages</item>
-    </plurals>
-    <string name="notification_message_failed_title">Message not sent</string>
-    <string name="notification_message_failed_text">The message to %s failed to send</string>
-
-    <string-array name="night_modes">
-        <item>System</item>
-        <item>Disabled</item>
-        <item>Always on</item>
-        <item>Automatic</item>
-    </string-array>
-
-    <string-array name="notification_preview_options">
-        <item>Show name and message</item>
-        <item>Show name</item>
-        <item>Hide contents</item>
-    </string-array>
-
-    <string-array name="text_sizes">
-        <item>Small</item>
-        <item>Normal</item>
-        <item>Large</item>
-        <item>Larger</item>
-    </string-array>
-
-    <string-array name="delayed_sending_labels">
-        <item>No delay</item>
-        <item>3 seconds</item>
-        <item>5 seconds</item>
-        <item>10 seconds</item>
-    </string-array>
-
-    <string-array name="mms_sizes">
-        <item>Automatic</item>
-        <item>100KB</item>
-        <item>200KB</item>
-        <item>300KB</item>
-        <item>600KB</item>
-        <item>1000KB</item>
-        <item>2000KB</item>
-        <item>No compression</item>
-    </string-array>
-
-    <integer-array name="mms_sizes_ids">
-        <item>-1</item>
-        <item>100</item>
-        <item>200</item>
-        <item>300</item>
-        <item>600</item>
-        <item>1000</item>
-        <item>2000</item>
-        <item>0</item>
-    </integer-array>
-
-    <string-array name="qk_responses">
-        <item>Okay</item>
-        <item>Give me a moment</item>
-        <item>On my way</item>
-        <item>Thanks</item>
-        <item>Sounds good</item>
-        <item>What\'s up?</item>
-        <item>Agreed</item>
-        <item>No</item>
-        <item>Love you</item>
-        <item>Sorry</item>
-        <item>LOL</item>
-        <item>That\'s okay</item>
-    </string-array>
-
-</resources>
+<!--
+  ~ Copyright (C) 2019,2021 Moez Bhatti <moez.bhatti@gmail.com>,to268
+  ~
+  ~ This file is part of QKSMS.
+  ~
+  ~ QKSMS is free software: you can redistribute it and/or modify
+  ~ it under the terms of the GNU General Public License as published by
+  ~ the Free Software Foundation, either version 3 of the License, or
+  ~ (at your option) any later version.
+  ~
+  ~ QKSMS is distributed in the hope that it will be useful,
+  ~ but WITHOUT ANY WARRANTY; without even the implied warranty of
+  ~ MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+  ~ GNU General Public License for more details.
+  ~
+  ~ You should have received a copy of the GNU General Public License
+  ~ along with QKSMS.  If not, see <http://www.gnu.org/licenses/>.
+  -->
+<resources>
+
+    <string name="app_name" translatable="false">QKSMS</string>
+
+    <string name="shortcut_compose_long_label">New conversation</string>
+    <string name="shortcut_compose_short_label">Compose</string>
+    <string name="shortcut_compose_disabled_message">Shortcut disabled</string>
+
+    <string name="title_archived">Archived</string>
+    <string name="title_settings">Settings</string>
+    <string name="title_notification_prefs">Notifications</string>
+    <string name="title_theme">Theme</string>
+    <string name="title_conversations">Search inbox…</string>
+    <string name="title_compose">Type a name or number</string>
+    <string name="title_qksms_plus" translatable="false">QKSMS+</string>
+
+    <string name="setup_skip">Skip</string>
+    <string name="setup_next">Continue</string>
+
+    <string name="menu_add_person">Add person</string>
+    <string name="menu_call">Call</string>
+    <string name="menu_info">Details</string>
+    <string name="menu_save">Save to gallery</string>
+    <string name="menu_share">Share</string>
+
+    <string name="main_drawer_open_cd">Open navigation drawer</string>
+    <string name="main_title_selected">%d selected</string>
+    <string name="main_menu_clear">Clear</string>
+    <string name="main_menu_archive">Archive</string>
+    <string name="main_menu_unarchive">Unarchive</string>
+    <string name="main_menu_delete">Delete</string>
+    <string name="main_menu_add_contact">Add to contacts</string>
+    <string name="main_menu_pin">Pin to top</string>
+    <string name="main_menu_unpin">Unpin</string>
+    <string name="main_menu_read">Mark read</string>
+    <string name="main_menu_unread">Mark unread</string>
+    <string name="main_menu_block">Block</string>
+    <string name="main_syncing">Syncing messages…</string>
+    <string name="main_sender_you">You: %s</string>
+    <string name="main_draft">Draft</string>
+    <string name="main_message_results_title">Results in messages</string>
+    <string name="main_message_results">%d messages</string>
+    <string name="inbox_empty_text">Your conversations will appear here</string>
+    <string name="inbox_search_empty_text">No results</string>
+    <string name="archived_empty_text">Your archived conversations will appear here</string>
+    <string name="main_fab_cd">Start new conversation</string>
+    <string name="main_default_sms_title">Love texting again</string>
+    <string name="main_default_sms_message">Make QKSMS your default SMS app</string>
+    <string name="main_default_sms_change">Change</string>
+    <string name="main_permission_required">Permission required</string>
+    <string name="main_permission_sms">QKSMS needs permission to send and view SMS messages</string>
+    <string name="main_permission_contacts">QKSMS needs permission to view your contacts</string>
+    <string name="main_permission_allow">Allow</string>
+
+    <string name="drawer_inbox">Inbox</string>
+    <string name="drawer_archived">Archived</string>
+    <string name="drawer_scheduled">Scheduled</string>
+    <string name="drawer_blocking">Blocking</string>
+    <string name="drawer_more">More</string>
+    <string name="drawer_settings">Settings</string>
+    <string name="drawer_plus" translatable="false">QKSMS+</string>
+    <string name="drawer_help">Help &amp; feedback</string>
+    <string name="drawer_invite">Invite friends</string>
+    <string name="drawer_plus_banner_title" translatable="false">QKSMS+</string>
+    <string name="drawer_plus_banner_summary">Unlock amazing new features, and support development</string>
+
+    <string name="rate_title">Enjoying QKSMS?</string>
+    <string name="rate_summary">Share some love and rate us on Google Play!</string>
+    <string name="rate_okay">OKAY!</string>
+    <string name="rate_dismiss">DISMISS</string>
+
+    <string name="dialog_delete_title">Delete</string>
+    <plurals name="dialog_delete_message">
+        <item quantity="one">Are you sure you would like to delete this conversation?</item>
+        <item quantity="other">Are you sure you would like to delete %d conversations?</item>
+    </plurals>
+
+    <string-array name="message_options">
+        <item>Copy text</item>
+        <item>Forward</item>
+        <item>Delete</item>
+    </string-array>
+
+    <string name="compose_number_picker_title">Choose a phone number</string>
+    <string name="compose_number_picker_default">%s ∙ Default</string>
+    <string name="compose_number_picker_once">Just once</string>
+    <string name="compose_number_picker_always">Always</string>
+    <string name="compose_title_selected">%d selected</string>
+    <string name="compose_subtitle_results">%1$d of %2$d results</string>
+    <string name="compose_send_group_title">Send as group message</string>
+    <string name="compose_send_group_summary">Recipients and replies will be visible to everyone</string>
+    <string name="compose_messages_empty">This is the start of your conversation. Say something nice!</string>
+    <string name="compose_vcard_label">Contact card</string>
+    <string name="compose_scheduled_for">Scheduled for</string>
+    <string name="compose_scheduled_future">Selected time must be in the future!</string>
+    <string name="compose_scheduled_plus">You must unlock QKSMS+ to use scheduled messaging</string>
+    <string name="compose_scheduled_toast">Added to scheduled messages</string>
+    <string name="compose_hint">Write a message…</string>
+    <string name="compose_menu_copy">Copy text</string>
+    <string name="compose_menu_forward">Forward</string>
+    <string name="compose_menu_speech" translatable="false">Speech text</string>
+    <string name="compose_menu_delete">Delete</string>
+    <string name="compose_menu_previous">Previous</string>
+    <string name="compose_menu_next">Next</string>
+    <string name="compose_menu_clear">Clear</string>
+    <string name="compose_details_title">Message details</string>
+    <string name="compose_details_type">Type: %s</string>
+    <string name="compose_details_from">From: %s</string>
+    <string name="compose_details_to">To: %s</string>
+    <string name="compose_details_subject">Subject: %s</string>
+    <string name="compose_details_priority">Priority: %s</string>
+    <string name="compose_details_size">Size: %s</string>
+    <string name="compose_details_sent">Sent: %s</string>
+    <string name="compose_details_received">Received: %s</string>
+    <string name="compose_details_delivered">Delivered: %s</string>
+    <string name="compose_details_error_code">Error code: %d</string>
+    <string name="compose_attach_cd">Add an attachment</string>
+    <string name="compose_gallery_cd">Attach a photo</string>
+    <string name="compose_camera_cd">Take a photo</string>
+    <string name="compose_schedule_cd">Schedule message</string>
+    <string name="compose_contact_cd">Attach a contact</string>
+    <string name="compose_contact_error">Error reading contact</string>
+    <!-- Example: SIM 1 (Verizon) selected-->
+    <string name="compose_sim_changed_toast">SIM %1$d (%2$s) selected</string>
+    <string name="compose_sim_cd">%s selected, change SIM card</string>
+    <string name="compose_send_cd">Send message</string>
+
+    <string name="message_status_sending">Sending…</string>
+    <string name="message_status_delivered">Delivered %s</string>
+    <string name="message_status_failed">Failed to send. Tap to try again</string>
+
+    <string name="info_title">Details</string>
+    <string name="info_copied_address">Address copied</string>
+    <string name="info_name">Conversation title</string>
+    <string name="info_notifications">Notifications</string>
+    <string name="info_theme">Theme</string>
+    <string name="info_archive">Archive</string>
+    <string name="info_unarchive">Unarchive</string>
+    <string name="info_block">Block</string>
+    <string name="info_unblock">Unblock</string>
+    <string name="info_delete">Delete conversation</string>
+
+    <string name="gallery_error">Couldn\'t load media</string>
+    <string name="gallery_toast_saved">Saved to gallery</string>
+
+    <string name="backup_title">Backup and restore</string>
+    <string name="backup_backing_up">Backing up messages</string>
+    <string name="backup_restoring">Restoring from backup</string>
+    <string name="backup_last">Last backup</string>
+    <string name="backup_loading">Loading…</string>
+    <string name="backup_never">Never</string>
+    <string name="backup_restore_title">Restore</string>
+    <string name="backup_restore_summary">Select a backup</string>
+    <string name="backup_restore_error_plus">Please unlock QKSMS+ to use backup and restore</string>
+    <string name="backup_restore_error_backup">Backup in progress…</string>
+    <string name="backup_restore_error_restore">Restore in progress…</string>
+    <string name="backup_restore_confirm_title">Restore from backup</string>
+    <string name="backup_restore_confirm_message">Are you sure you would like to restore your messages from this backup?</string>
+    <string name="backup_restore_stop_title">Stop restore</string>
+    <string name="backup_restore_stop_message">Messages that have already been restored will remain on your device</string>
+    <string name="backup_restore_dialog_title">Backups</string>
+    <string name="backup_restore_dialog_summary" translatable="false">/QKSMS/Backups</string>
+    <string name="backup_restore_dialog_empty">No backups found</string>
+    <plurals name="backup_message_count">
+        <item quantity="zero">No messages</item>
+        <item quantity="one">%d message</item>
+        <item quantity="other">%d messages</item>
+    </plurals>
+    <string name="backup_disclaimer">Currently, only SMS is supported by Backup and Restore. MMS support and scheduled backups will be coming soon!</string>
+    <string name="backup_now">Backup now</string>
+    <string name="backup_progress_parsing">Parsing backup…</string>
+    <string name="backup_progress_running">%d/%d messages</string>
+    <string name="backup_progress_saving">Saving backup…</string>
+    <string name="backup_progress_syncing">Syncing messages…</string>
+    <string name="backup_progress_finished">Finished!</string>
+    <string name="backup_notification_channel_name">Backup and restore</string>
+
+    <string name="scheduled_title">Scheduled</string>
+    <string name="scheduled_empty_description">Automatically send a message, at the exact moment you\'d like</string>
+    <string name="scheduled_empty_message_1">Hey! When was your birthday again?</string>
+    <string name="scheduled_empty_message_2">It\'s on December 23rd</string>
+    <string name="scheduled_empty_message_3">Happy birthday! Look at what a great friend I am, remembering your birthday</string>
+    <!--&#x200A; is a special character required at the end of this string to fix it's formatting in the app -->
+    <string name="scheduled_empty_message_3_timestamp">Sending on December 23rd&#x200A;</string>
+    <string name="scheduled_compose_cd">Schedule a message</string>
+    <string name="scheduled_options_title">Scheduled message</string>
+    <string-array name="scheduled_options">
+        <item>Send now</item>
+        <item>Copy text</item>
+        <item>Delete</item>
+    </string-array>
+
+    <string name="settings_category_appearance">Appearance</string>
+    <string name="settings_category_general">General</string>
+    <string name="settings_category_qkreply">QK Reply</string>
+
+    <string name="settings_theme_title">Theme</string>
+    <string name="settings_night_title">Night mode</string>
+    <string name="settings_black_title">Pure black night mode</string>
+    <string name="settings_night_start_title">Start time</string>
+    <string name="settings_night_end_title">End time</string>
+    <string name="settings_automatic_colors_title">Automatic contact colors</string>
+    <string name="settings_text_size_title">Font size</string>
+    <string name="settings_system_font_title">Use system font</string>
+    <string name="settings_auto_emoji_title">Automatic emoji</string>
+    <string name="settings_notifications_title">Notifications</string>
+    <string name="settings_notifications_o_summary">Tap to customize</string>
+    <string name="settings_notification_actions_title">Actions</string>
+    <string name="settings_notification_action_1">Button 1</string>
+    <string name="settings_notification_action_2">Button 2</string>
+    <string name="settings_notification_action_3">Button 3</string>
+    <string name="settings_notification_previews_title">Notification previews</string>
+    <string name="settings_notification_wake_title">Wake screen</string>
+    <string name="settings_vibration_title">Vibration</string>
+    <string name="settings_ringtone_title">Sound</string>
+    <string name="settings_ringtone_none">None</string>
+    <string name="settings_qkreply_title">QK Reply</string>
+    <string name="settings_qkreply_summary">Popup for new messages</string>
+    <string name="settings_qkreply_tap_dismiss_title">Tap to dismiss</string>
+    <string name="settings_qkreply_tap_dismiss_summary">Tap outside of the popup to close it</string>
+    <string name="settings_delayed_title">Delayed sending</string>
+    <string name="settings_swipe_actions">Swipe actions</string>
+    <string name="settings_swipe_actions_summary">Configure swipe actions for conversations</string>
+    <string name="settings_swipe_actions_right">Right swipe</string>
+    <string name="settings_swipe_actions_left">Left swipe</string>
+    <string name="settings_swipe_actions_change">CHANGE</string>
+    <string-array name="settings_swipe_actions">
+        <item>None</item>
+        <item>Archive</item>
+        <item>Delete</item>
+        <item>Block</item>
+        <item>Call</item>
+        <item>Mark read</item>
+        <item>Mark unread</item>
+    </string-array>
+    <string name="settings_delivery_title">Delivery confirmations</string>
+    <string name="settings_delivery_summary">Confirm that messages were sent successfully</string>
+    <string name="settings_signature_title">Signature</string>
+    <string name="settings_signature_summary">Add a signature to the end of your messages</string>
+    <string name="settings_unicode_title">Strip accents</string>
+    <string name="settings_unicode_summary">Remove accents from characters in outgoing SMS messages</string>
+    <string name="settings_mobile_title">Mobile numbers only</string>
+    <string name="settings_mobile_summary">When composing a message, only show mobile numbers</string>
+    <string name="settings_auto_delete">Delete old messages automatically</string>
+    <string name="settings_auto_delete_dialog_message">Messages will be deleted after the specified number of days</string>
+    <string name="settings_auto_delete_dialog_hint">Number of days</string>
+    <string name="settings_auto_delete_never">Never</string>
+    <string name="settings_auto_delete_warning">Delete old messages automatically?</string>
+    <string name="settings_auto_delete_warning_message">If you proceed, %1$d messages will be deleted now</string>
+    <plurals name="settings_auto_delete_summary">
+        <item quantity="zero">Never</item>
+        <item quantity="one">After 1 day</item>
+        <item quantity="other">After %d days</item>
+    </plurals>
+    <string name="settings_long_as_mms_title">Send long messages as MMS</string>
+    <string name="settings_long_as_mms_summary">If your longer text messages are failing to send, or sending in the wrong order, you can send them as MMS messages instead. Additional charges may apply</string>
+    <string name="settings_mms_size_title">Auto-compress MMS attachments</string>
+    <string name="settings_sync_title">Sync messages</string>
+    <string name="settings_sync_summary">Re-sync your messages with the native Android SMS database</string>
+    <string name="settings_about_title">About QKSMS</string>
+    <string name="settings_version">Version %s</string>
+    <string name="settings_logging_enabled">Debug logging enabled</string>
+    <string name="settings_logging_disabled">Debug logging disabled</string>
+
+    <string name="settings_delay_duration_hint">Enter duration (seconds)</string>
+
+    <string name="blocking_title">Blocking</string>
+    <string name="blocking_drop_title">Drop messages</string>
+    <string name="blocking_drop_summary">Drop incoming messages from blocked senders instead of hiding them</string>
+    <string name="blocking_conversations">Blocked conversations</string>
+
+    <string name="blocking_manager_title">Blocking Manager</string>
+    <string name="blocking_manager_qksms_title">QKSMS</string>
+    <string name="blocking_manager_qksms_summary">Built-in blocking functionality in QKSMS</string>
+    <string name="blocking_manager_call_control_title" translatable="false">Call Control</string>
+    <string name="blocking_manager_call_control_summary">Automatically filter your calls and messages in one convenient place! Community IQ™ allows you to prevent unwanted messages from community known spammers</string>
+    <string name="blocking_manager_sia_title" translatable="false">Should I Answer?</string>
+    <string name="blocking_manager_sia_summary">Automatically filter messages from unsolicited numbers by using the \"Should I Answer\" app</string>
+    <string name="blocking_manager_copy_title">Copy blocked numbers</string>
+    <string name="blocking_manager_copy_summary">Continue to %s and copy over your existing blocked numbers</string>
+
+    <string name="blocked_numbers_title">Blocked numbers</string>
+    <string name="blocked_numbers_empty">Your blocked numbers will appear here</string>
+    <string name="blocked_numbers_add_cd">Block a new number</string>
+    <string name="blocked_numbers_dialog_title">Block texts from</string>
+    <string name="blocked_numbers_dialog_hint">Phone number</string>
+    <string name="blocked_numbers_dialog_block">Block</string>
+
+    <string name="blocked_messages_title">Blocked messages</string>
+    <string name="blocked_messages_empty">Your blocked messages will appear here</string>
+
+    <string name="blocking_block_title">Block</string>
+    <string name="blocking_unblock_title">Unblock</string>
+    <plurals name="blocking_block_external">
+        <item quantity="one">Continue to %s and block this number</item>
+        <item quantity="other">Continue to %s and block these numbers</item>
+    </plurals>
+    <plurals name="blocking_unblock_external">
+        <item quantity="one">Continue to %s and allow this number</item>
+        <item quantity="other">Continue to %s and allow these numbers</item>
+    </plurals>
+
+    <string name="about_title">About</string>
+    <string name="about_version_title">Version</string>
+    <string name="about_developer_title">Developer</string>
+    <string name="about_source_title">Source code</string>
+    <string name="about_changelog_title">Changelog</string>
+    <string name="about_contact_title">Contact</string>
+    <string name="about_license_title">License</string>
+    <string name="about_copyright_title">Copyright</string>
+
+    <string name="qksms_plus_description_title">Support development, unlock everything</string>
+    <string name="qksms_plus_description_summary">You can save a starving developer for just %s</string>
+    <!-- Substitutions are for price and currency. Ex: Lifetime upgrade for $1.99 USD -->
+    <string name="qksms_plus_upgrade">Lifetime upgrade for %1$s %2$s</string>
+    <string name="qksms_plus_upgrade_b" translatable="false">Unlock for %1$s %2$s</string>
+    <string name="qksms_plus_upgrade_c" translatable="false">Unlock forever for %1$s %2$s</string>
+    <string name="qksms_plus_upgrade_d" translatable="false">One-time purchase of %1$s %2$s</string>
+    <!-- Substitutions are for price and currency. Ex: Unlock + donate for $4.99 USD -->
+    <string name="qksms_plus_upgrade_donate">Unlock + donate for %1$s %2$s</string>
+    <string name="qksms_plus_thanks_title">Thank you for supporting QKSMS!</string>
+    <string name="qksms_plus_thanks_summary">You now have access to all QKSMS+ features</string>
+    <string name="qksms_plus_error">An error has occurred, please try again</string>
+    <string name="qksms_plus_free_title">QKSMS+ is free for F-Droid users! If you\'d like to support development, a donation would be highly appreciated.</string>
+    <string name="qksms_plus_donate">Donate via PayPal</string>
+    <string name="qksms_plus_coming_soon">Coming soon</string>
+    <string name="qksms_plus_themes_title">Premium themes</string>
+    <string name="qksms_plus_themes_summary">Unlock beautiful theme colors not available on the Material Design palette</string>
+    <string name="qksms_plus_emoji_title">Custom auto-emoji</string>
+    <string name="qksms_plus_emoji_summary">Create custom auto-emoji shortcuts</string>
+    <string name="qksms_plus_backup_title">Message backup</string>
+    <string name="qksms_plus_backup_summary">Automatically back up your messages. Never again worry about losing your history if you change phones or your phone gets lost</string>
+    <string name="qksms_plus_scheduled_title">Scheduled messages</string>
+    <string name="qksms_plus_scheduled_summary">Schedule messages to automatically be sent at a specific time and date</string>
+    <string name="qksms_plus_delayed_title">Delayed sending</string>
+    <string name="qksms_plus_delayed_summary">Wait a few seconds before sending your message</string>
+    <string name="qksms_plus_night_title">Automatic night mode</string>
+    <string name="qksms_plus_night_summary">Enable night mode based on the time of day</string>
+    <string name="qksms_plus_blacklist_title">Advanced blocking</string>
+    <string name="qksms_plus_blacklist_summary">Block messages that contain keywords or match patterns</string>
+    <string name="qksms_plus_forward_title">Auto-forward</string>
+    <string name="qksms_plus_forward_summary">Automatically forward messages from certain senders</string>
+    <string name="qksms_plus_respond_title">Auto-respond</string>
+    <string name="qksms_plus_respond_summary">Automatically respond to incoming messages with a preset response</string>
+    <string name="qksms_plus_more_title">More</string>
+    <string name="qksms_plus_more_summary">QKSMS is under active development, and your purchase will include all future QKSMS+ features!</string>
+
+    <string name="widget_loading">Loading…</string>
+    <string name="widget_more">View more conversations</string>
+
+    <string name="qkreply_menu_read">Mark read</string>
+    <string name="qkreply_menu_call">Call</string>
+    <string name="qkreply_menu_delete">Delete</string>
+    <string name="qkreply_menu_expand">Show more</string>
+    <string name="qkreply_menu_collapse">Show less</string>
+    <string name="qkreply_menu_view">Open conversation</string>
+
+    <string name="theme_material">Material</string>
+    <string name="theme_plus" translatable="false">QKSMS+</string>
+    <string name="theme_hex">HEX</string>
+    <string name="theme_apply">Apply</string>
+
+    <string name="about_developer" translatable="false">Moez Bhatti</string>
+    <string name="about_source" translatable="false">https://github.com/moezbhatti/qksms</string>
+    <string name="about_changelog" translatable="false">https://github.com/moezbhatti/qksms/releases</string>
+    <string name="about_contact" translatable="false">moez@qklabs.com</string>
+    <string name="about_license" translatable="false">GNU General Public License v3.0</string>
+    <string name="about_copyright" translatable="false">© 2014–2021</string>
+
+    <string name="changelog_title" translatable="false">New in QKSMS</string>
+    <string name="changelog_version" translatable="false">Version %s</string>
+    <string name="changelog_added" translatable="false">Added</string>
+    <string name="changelog_improved" translatable="false">Improved</string>
+    <string name="changelog_fixed" translatable="false">Fixed</string>
+    <string name="changelog_more" translatable="false">More</string>
+    <string name="changelog_dismiss" translatable="false">Dismiss</string>
+
+    <string-array name="notification_actions">
+        <item>None</item>
+        <item>Archive</item>
+        <item>Delete</item>
+        <item>Block</item>
+        <item>Call</item>
+        <item>Mark read</item>
+        <item>Reply</item>
+    </string-array>
+
+    <string name="button_yes">Yes</string>
+    <string name="button_continue">Continue</string>
+    <string name="button_cancel">Cancel</string>
+    <string name="button_delete">Delete</string>
+    <string name="button_save">Save</string>
+    <string name="button_stop">Stop</string>
+    <string name="button_more">More</string>
+    <string name="button_set">Set</string>
+    <string name="button_undo">Undo</string>
+
+    <string name="toast_copied">Copied</string>
+    <string name="toast_archived">Archived conversation</string>
+    <string name="toast_qksms_plus">You must unlock QKSMS+ to use this</string>
+
+    <plurals name="notification_new_messages">
+        <item quantity="one">New message</item>
+        <item quantity="other">%s new messages</item>
+    </plurals>
+    <string name="notification_message_failed_title">Message not sent</string>
+    <string name="notification_message_failed_text">The message to %s failed to send</string>
+
+    <string-array name="night_modes">
+        <item>System</item>
+        <item>Disabled</item>
+        <item>Always on</item>
+        <item>Automatic</item>
+    </string-array>
+
+    <string-array name="notification_preview_options">
+        <item>Show name and message</item>
+        <item>Show name</item>
+        <item>Hide contents</item>
+    </string-array>
+
+    <string-array name="text_sizes">
+        <item>Small</item>
+        <item>Normal</item>
+        <item>Large</item>
+        <item>Larger</item>
+    </string-array>
+
+    <string-array name="delayed_sending_labels">
+        <item>No delay</item>
+        <item>3 seconds</item>
+        <item>5 seconds</item>
+        <item>10 seconds</item>
+    </string-array>
+
+    <string-array name="mms_sizes">
+        <item>Automatic</item>
+        <item>100KB</item>
+        <item>200KB</item>
+        <item>300KB</item>
+        <item>600KB</item>
+        <item>1000KB</item>
+        <item>2000KB</item>
+        <item>No compression</item>
+    </string-array>
+
+    <integer-array name="mms_sizes_ids">
+        <item>-1</item>
+        <item>100</item>
+        <item>200</item>
+        <item>300</item>
+        <item>600</item>
+        <item>1000</item>
+        <item>2000</item>
+        <item>0</item>
+    </integer-array>
+
+    <string-array name="qk_responses">
+        <item>Okay</item>
+        <item>Give me a moment</item>
+        <item>On my way</item>
+        <item>Thanks</item>
+        <item>Sounds good</item>
+        <item>What\'s up?</item>
+        <item>Agreed</item>
+        <item>No</item>
+        <item>Love you</item>
+        <item>Sorry</item>
+        <item>LOL</item>
+        <item>That\'s okay</item>
+    </string-array>
+
+</resources>
diff --git a/presentation/src/main/res/values/styles.xml b/presentation/src/main/res/values/styles.xml
index c8e1eab02..d1fa63d2b 100644
--- a/presentation/src/main/res/values/styles.xml
+++ b/presentation/src/main/res/values/styles.xml
@@ -1,130 +1,130 @@
-<!--
-  ~ Copyright (C) 2019 Moez Bhatti <moez.bhatti@gmail.com>
-  ~
-  ~ This file is part of QKSMS.
-  ~
-  ~ QKSMS is free software: you can redistribute it and/or modify
-  ~ it under the terms of the GNU General Public License as published by
-  ~ the Free Software Foundation, either version 3 of the License, or
-  ~ (at your option) any later version.
-  ~
-  ~ QKSMS is distributed in the hope that it will be useful,
-  ~ but WITHOUT ANY WARRANTY; without even the implied warranty of
-  ~ MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
-  ~ GNU General Public License for more details.
-  ~
-  ~ You should have received a copy of the GNU General Public License
-  ~ along with QKSMS.  If not, see <http://www.gnu.org/licenses/>.
-  -->
-<resources>
-
-    <style name="TextPrimary">
-        <item name="android:textColor">?android:attr/textColorPrimary</item>
-        <item name="textSize">primary</item>
-    </style>
-
-    <style name="TextSecondary">
-        <item name="android:textColor">?android:attr/textColorSecondary</item>
-        <item name="textSize">secondary</item>
-    </style>
-
-    <style name="TextTertiary">
-        <item name="android:textColor">?android:attr/textColorTertiary</item>
-        <item name="textSize">tertiary</item>
-    </style>
-
-    <style name="TextButton">
-        <item name="android:layout_height">36dp</item>
-        <item name="android:layout_width">wrap_content</item>
-        <item name="android:minWidth">88dp</item>
-        <item name="android:paddingLeft">16dp</item>
-        <item name="android:paddingRight">16dp</item>
-        <item name="android:gravity">center</item>
-        <item name="android:textStyle">bold</item>
-        <item name="textSize">secondary</item>
-    </style>
-
-    <style name="Toolbar">
-        <item name="android:layout_width">match_parent</item>
-        <item name="android:layout_height">56dp</item>
-
-        <!-- This needs to be set so that we can tint the toolbar and not change the background
-         resource. This is mainly so that QkReplyActivity can call setClipToOutline -->
-        <item name="android:background">?attr/colorPrimary</item>
-        <item name="android:gravity">center_vertical</item>
-    </style>
-
-    <style name="ToolbarText">
-        <item name="android:layout_width">match_parent</item>
-        <item name="android:layout_height">match_parent</item>
-        <item name="android:background">@null</item>
-        <item name="android:ellipsize">end</item>
-        <item name="android:gravity">start|center_vertical</item>
-        <item name="android:maxLines">1</item>
-        <item name="android:textColor">?android:attr/textColorPrimary</item>
-        <item name="textSize">toolbar</item>
-    </style>
-
-    <style name="PreferenceCategory">
-        <item name="android:layout_width">wrap_content</item>
-        <item name="android:layout_height">wrap_content</item>
-        <item name="android:layout_marginBottom">16dp</item>
-        <item name="android:layout_marginEnd">24dp</item>
-        <item name="android:layout_marginStart">72dp</item>
-        <item name="android:layout_marginTop">16dp</item>
-        <item name="android:textStyle">bold</item>
-        <item name="textColor">theme</item>
-        <item name="textSize">secondary</item>
-    </style>
-
-    <style name="CollapsingToolbarCollapsedText">
-        <item name="textSize">toolbar</item>
-        <item name="android:textStyle">bold</item>
-    </style>
-
-    <style name="CollapsingToolbarExpandedText">
-        <item name="android:textSize">44dp</item>
-        <item name="android:textStyle">bold</item>
-    </style>
-
-    <style name="ScheduledSampleTextStyle">
-        <item name="android:layout_width">wrap_content</item>
-        <item name="android:layout_height">wrap_content</item>
-        <item name="android:background">@drawable/rounded_rectangle_outline_22dp</item>
-        <item name="android:backgroundTint">?android:attr/divider</item>
-        <item name="android:gravity">center_vertical</item>
-        <item name="android:minHeight">44dp</item>
-        <item name="android:paddingBottom">12dp</item>
-        <item name="android:paddingEnd">16dp</item>
-        <item name="android:paddingStart">16dp</item>
-        <item name="android:paddingTop">12dp</item>
-        <item name="android:textColor">?android:attr/textColorPrimary</item>
-        <item name="textSize">primary</item>
-    </style>
-
-    <style name="DrawerRow">
-        <item name="android:layout_height">48dp</item>
-        <item name="android:layout_width">match_parent</item>
-        <item name="android:background">?attr/selectableItemBackground</item>
-        <item name="android:gravity">center_vertical</item>
-        <item name="android:paddingStart">16dp</item>
-        <item name="android:paddingEnd">16dp</item>
-    </style>
-
-    <style name="DrawerText">
-        <item name="android:layout_height">wrap_content</item>
-        <item name="android:layout_width">0dp</item>
-        <item name="android:layout_weight">1</item>
-        <item name="android:lines">1</item>
-        <item name="android:textColor">?android:attr/textColorPrimary</item>
-        <item name="android:textStyle">bold</item>
-        <item name="textSize">secondary</item>
-    </style>
-
-    <style name="DrawerIcon">
-        <item name="android:layout_height">24dp</item>
-        <item name="android:layout_width">24dp</item>
-        <item name="android:layout_marginEnd">32dp</item>
-    </style>
-
-</resources>
+<!--
+  ~ Copyright (C) 2019 Moez Bhatti <moez.bhatti@gmail.com>
+  ~
+  ~ This file is part of QKSMS.
+  ~
+  ~ QKSMS is free software: you can redistribute it and/or modify
+  ~ it under the terms of the GNU General Public License as published by
+  ~ the Free Software Foundation, either version 3 of the License, or
+  ~ (at your option) any later version.
+  ~
+  ~ QKSMS is distributed in the hope that it will be useful,
+  ~ but WITHOUT ANY WARRANTY; without even the implied warranty of
+  ~ MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+  ~ GNU General Public License for more details.
+  ~
+  ~ You should have received a copy of the GNU General Public License
+  ~ along with QKSMS.  If not, see <http://www.gnu.org/licenses/>.
+  -->
+<resources>
+
+    <style name="TextPrimary">
+        <item name="android:textColor">?android:attr/textColorPrimary</item>
+        <item name="textSize">primary</item>
+    </style>
+
+    <style name="TextSecondary">
+        <item name="android:textColor">?android:attr/textColorSecondary</item>
+        <item name="textSize">secondary</item>
+    </style>
+
+    <style name="TextTertiary">
+        <item name="android:textColor">?android:attr/textColorTertiary</item>
+        <item name="textSize">tertiary</item>
+    </style>
+
+    <style name="TextButton">
+        <item name="android:layout_height">36dp</item>
+        <item name="android:layout_width">wrap_content</item>
+        <item name="android:minWidth">88dp</item>
+        <item name="android:paddingLeft">16dp</item>
+        <item name="android:paddingRight">16dp</item>
+        <item name="android:gravity">center</item>
+        <item name="android:textStyle">bold</item>
+        <item name="textSize">secondary</item>
+    </style>
+
+    <style name="Toolbar">
+        <item name="android:layout_width">match_parent</item>
+        <item name="android:layout_height">56dp</item>
+
+        <!-- This needs to be set so that we can tint the toolbar and not change the background
+         resource. This is mainly so that QkReplyActivity can call setClipToOutline -->
+        <item name="android:background">?attr/colorPrimary</item>
+        <item name="android:gravity">center_vertical</item>
+    </style>
+
+    <style name="ToolbarText">
+        <item name="android:layout_width">match_parent</item>
+        <item name="android:layout_height">match_parent</item>
+        <item name="android:background">@null</item>
+        <item name="android:ellipsize">end</item>
+        <item name="android:gravity">start|center_vertical</item>
+        <item name="android:maxLines">1</item>
+        <item name="android:textColor">?android:attr/textColorPrimary</item>
+        <item name="textSize">toolbar</item>
+    </style>
+
+    <style name="PreferenceCategory">
+        <item name="android:layout_width">wrap_content</item>
+        <item name="android:layout_height">wrap_content</item>
+        <item name="android:layout_marginBottom">16dp</item>
+        <item name="android:layout_marginEnd">24dp</item>
+        <item name="android:layout_marginStart">72dp</item>
+        <item name="android:layout_marginTop">16dp</item>
+        <item name="android:textStyle">bold</item>
+        <item name="textColor">theme</item>
+        <item name="textSize">secondary</item>
+    </style>
+
+    <style name="CollapsingToolbarCollapsedText">
+        <item name="textSize">toolbar</item>
+        <item name="android:textStyle">bold</item>
+    </style>
+
+    <style name="CollapsingToolbarExpandedText">
+        <item name="android:textSize">44dp</item>
+        <item name="android:textStyle">bold</item>
+    </style>
+
+    <style name="ScheduledSampleTextStyle">
+        <item name="android:layout_width">wrap_content</item>
+        <item name="android:layout_height">wrap_content</item>
+        <item name="android:background">@drawable/rounded_rectangle_outline_22dp</item>
+        <item name="android:backgroundTint">?android:attr/divider</item>
+        <item name="android:gravity">center_vertical</item>
+        <item name="android:minHeight">44dp</item>
+        <item name="android:paddingBottom">12dp</item>
+        <item name="android:paddingEnd">16dp</item>
+        <item name="android:paddingStart">16dp</item>
+        <item name="android:paddingTop">12dp</item>
+        <item name="android:textColor">?android:attr/textColorPrimary</item>
+        <item name="textSize">primary</item>
+    </style>
+
+    <style name="DrawerRow">
+        <item name="android:layout_height">48dp</item>
+        <item name="android:layout_width">match_parent</item>
+        <item name="android:background">?attr/selectableItemBackground</item>
+        <item name="android:gravity">center_vertical</item>
+        <item name="android:paddingStart">16dp</item>
+        <item name="android:paddingEnd">16dp</item>
+    </style>
+
+    <style name="DrawerText">
+        <item name="android:layout_height">wrap_content</item>
+        <item name="android:layout_width">0dp</item>
+        <item name="android:layout_weight">1</item>
+        <item name="android:lines">1</item>
+        <item name="android:textColor">?android:attr/textColorPrimary</item>
+        <item name="android:textStyle">bold</item>
+        <item name="textSize">secondary</item>
+    </style>
+
+    <style name="DrawerIcon">
+        <item name="android:layout_height">24dp</item>
+        <item name="android:layout_width">24dp</item>
+        <item name="android:layout_marginEnd">32dp</item>
+    </style>
+
+</resources>
diff --git a/presentation/src/main/res/values/themes.xml b/presentation/src/main/res/values/themes.xml
index 16db69160..e06d1c1aa 100644
--- a/presentation/src/main/res/values/themes.xml
+++ b/presentation/src/main/res/values/themes.xml
@@ -1,80 +1,80 @@
-<?xml version="1.0" encoding="utf-8"?>
-<!--
-  ~ Copyright (C) 2019 Moez Bhatti <moez.bhatti@gmail.com>
-  ~
-  ~ This file is part of QKSMS.
-  ~
-  ~ QKSMS is free software: you can redistribute it and/or modify
-  ~ it under the terms of the GNU General Public License as published by
-  ~ the Free Software Foundation, either version 3 of the License, or
-  ~ (at your option) any later version.
-  ~
-  ~ QKSMS is distributed in the hope that it will be useful,
-  ~ but WITHOUT ANY WARRANTY; without even the implied warranty of
-  ~ MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
-  ~ GNU General Public License for more details.
-  ~
-  ~ You should have received a copy of the GNU General Public License
-  ~ along with QKSMS.  If not, see <http://www.gnu.org/licenses/>.
-  -->
-<resources>
-
-    <attr name="bubbleColor" format="reference" />
-    <attr name="switchThumbEnabled" format="color" />
-    <attr name="switchThumbDisabled" format="color" />
-    <attr name="switchTrackEnabled" format="color" />
-    <attr name="switchTrackDisabled" format="color" />
-
-    <style name="AppLaunchTheme" parent="Theme.AppCompat.NoActionBar">
-        <item name="android:navigationBarColor">@color/backgroundDark</item>
-        <item name="android:statusBarColor">@color/backgroundDark</item>
-        <item name="android:windowBackground">@color/backgroundDark</item>
-    </style>
-
-    <style name="AppTheme" parent="AppBaseTheme" />
-
-    <style name="AppBaseTheme" parent="Theme.AppCompat.Light.NoActionBar">
-        <item name="android:divider">@color/separatorLight</item>
-        <item name="android:queryBackground">@color/bubbleLight</item>
-        <item name="android:statusBarColor">@color/black</item>
-        <item name="android:textColorPrimary">@color/text_primary</item>
-        <item name="android:textColorSecondary">@color/text_secondary</item>
-        <item name="android:textColorTertiary">@color/text_tertiary</item>
-        <item name="android:windowBackground">@color/backgroundLight</item>
-        <item name="android:windowContentTransitions">true</item>
-        <item name="actionBarPopupTheme">@style/PopupTheme</item>
-        <item name="bubbleColor">@color/bubbleLight</item>
-        <item name="colorPrimary">@color/backgroundLight</item>
-        <item name="colorPrimaryDark">@color/backgroundLight</item>
-        <item name="selectableItemBackground">@drawable/ripple</item>
-        <item name="switchThumbEnabled">@color/switchThumbEnabledLight</item>
-        <item name="switchThumbDisabled">@color/switchThumbDisabledLight</item>
-        <item name="switchTrackEnabled">@color/switchTrackEnabledLight</item>
-        <item name="switchTrackDisabled">@color/switchTrackDisabledLight</item>
-        <item name="windowActionBar">false</item>
-    </style>
-
-    <style name="AppThemeDialog" parent="Theme.AppCompat.Light.Dialog">
-        <item name="android:textColorPrimary">@color/text_primary</item>
-        <item name="android:textColorSecondary">@color/text_secondary</item>
-        <item name="android:textColorTertiary">@color/text_tertiary</item>
-        <item name="android:windowBackground">@color/backgroundLight</item>
-        <item name="actionBarPopupTheme">@style/PopupTheme</item>
-        <item name="bubbleColor">@color/bubbleLight</item>
-        <item name="colorPrimary">@color/backgroundLight</item>
-        <item name="colorPrimaryDark">@color/backgroundLight</item>
-        <item name="selectableItemBackground">@drawable/ripple</item>
-        <item name="windowActionBar">false</item>
-    </style>
-
-    <style name="PopupTheme" parent="ThemeOverlay.AppCompat.Light">
-        <item name="android:colorBackground">@color/backgroundLight</item>
-        <item name="android:textColor">@color/textPrimary</item>
-    </style>
-
-    <!-- Black mode. No changes needed when not in night theme -->
-    <style name="AppTheme.Black" />
-    <style name="AppThemeDialog.Black" />
-    <style name="PopupTheme.Black" />
-
-</resources>
+<?xml version="1.0" encoding="utf-8"?>
+<!--
+  ~ Copyright (C) 2019 Moez Bhatti <moez.bhatti@gmail.com>
+  ~
+  ~ This file is part of QKSMS.
+  ~
+  ~ QKSMS is free software: you can redistribute it and/or modify
+  ~ it under the terms of the GNU General Public License as published by
+  ~ the Free Software Foundation, either version 3 of the License, or
+  ~ (at your option) any later version.
+  ~
+  ~ QKSMS is distributed in the hope that it will be useful,
+  ~ but WITHOUT ANY WARRANTY; without even the implied warranty of
+  ~ MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+  ~ GNU General Public License for more details.
+  ~
+  ~ You should have received a copy of the GNU General Public License
+  ~ along with QKSMS.  If not, see <http://www.gnu.org/licenses/>.
+  -->
+<resources>
+
+    <attr name="bubbleColor" format="reference" />
+    <attr name="switchThumbEnabled" format="color" />
+    <attr name="switchThumbDisabled" format="color" />
+    <attr name="switchTrackEnabled" format="color" />
+    <attr name="switchTrackDisabled" format="color" />
+
+    <style name="AppLaunchTheme" parent="Theme.AppCompat.NoActionBar">
+        <item name="android:navigationBarColor">@color/backgroundDark</item>
+        <item name="android:statusBarColor">@color/backgroundDark</item>
+        <item name="android:windowBackground">@color/backgroundDark</item>
+    </style>
+
+    <style name="AppTheme" parent="AppBaseTheme" />
+
+    <style name="AppBaseTheme" parent="Theme.AppCompat.Light.NoActionBar">
+        <item name="android:divider">@color/separatorLight</item>
+        <item name="android:queryBackground">@color/bubbleLight</item>
+        <item name="android:statusBarColor">@color/black</item>
+        <item name="android:textColorPrimary">@color/text_primary</item>
+        <item name="android:textColorSecondary">@color/text_secondary</item>
+        <item name="android:textColorTertiary">@color/text_tertiary</item>
+        <item name="android:windowBackground">@color/backgroundLight</item>
+        <item name="android:windowContentTransitions">true</item>
+        <item name="actionBarPopupTheme">@style/PopupTheme</item>
+        <item name="bubbleColor">@color/bubbleLight</item>
+        <item name="colorPrimary">@color/backgroundLight</item>
+        <item name="colorPrimaryDark">@color/backgroundLight</item>
+        <item name="selectableItemBackground">@drawable/ripple</item>
+        <item name="switchThumbEnabled">@color/switchThumbEnabledLight</item>
+        <item name="switchThumbDisabled">@color/switchThumbDisabledLight</item>
+        <item name="switchTrackEnabled">@color/switchTrackEnabledLight</item>
+        <item name="switchTrackDisabled">@color/switchTrackDisabledLight</item>
+        <item name="windowActionBar">false</item>
+    </style>
+
+    <style name="AppThemeDialog" parent="Theme.AppCompat.Light.Dialog">
+        <item name="android:textColorPrimary">@color/text_primary</item>
+        <item name="android:textColorSecondary">@color/text_secondary</item>
+        <item name="android:textColorTertiary">@color/text_tertiary</item>
+        <item name="android:windowBackground">@color/backgroundLight</item>
+        <item name="actionBarPopupTheme">@style/PopupTheme</item>
+        <item name="bubbleColor">@color/bubbleLight</item>
+        <item name="colorPrimary">@color/backgroundLight</item>
+        <item name="colorPrimaryDark">@color/backgroundLight</item>
+        <item name="selectableItemBackground">@drawable/ripple</item>
+        <item name="windowActionBar">false</item>
+    </style>
+
+    <style name="PopupTheme" parent="ThemeOverlay.AppCompat.Light">
+        <item name="android:colorBackground">@color/backgroundLight</item>
+        <item name="android:textColor">@color/textPrimary</item>
+    </style>
+
+    <!-- Black mode. No changes needed when not in night theme -->
+    <style name="AppTheme.Black" />
+    <style name="AppThemeDialog.Black" />
+    <style name="PopupTheme.Black" />
+
+</resources>
diff --git a/presentation/src/main/res/xml/provider_paths.xml b/presentation/src/main/res/xml/provider_paths.xml
index 98b55d83f..ecef40a0a 100644
--- a/presentation/src/main/res/xml/provider_paths.xml
+++ b/presentation/src/main/res/xml/provider_paths.xml
@@ -1,24 +1,24 @@
-<?xml version="1.0" encoding="utf-8"?>
-<!--
-  ~ Copyright (C) 2019 Moez Bhatti <moez.bhatti@gmail.com>
-  ~
-  ~ This file is part of QKSMS.
-  ~
-  ~ QKSMS is free software: you can redistribute it and/or modify
-  ~ it under the terms of the GNU General Public License as published by
-  ~ the Free Software Foundation, either version 3 of the License, or
-  ~ (at your option) any later version.
-  ~
-  ~ QKSMS is distributed in the hope that it will be useful,
-  ~ but WITHOUT ANY WARRANTY; without even the implied warranty of
-  ~ MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
-  ~ GNU General Public License for more details.
-  ~
-  ~ You should have received a copy of the GNU General Public License
-  ~ along with QKSMS.  If not, see <http://www.gnu.org/licenses/>.
-  -->
-<paths>
-    <external-path
-        name="external_files"
-        path="." />
-</paths>
+<?xml version="1.0" encoding="utf-8"?>
+<!--
+  ~ Copyright (C) 2019 Moez Bhatti <moez.bhatti@gmail.com>
+  ~
+  ~ This file is part of QKSMS.
+  ~
+  ~ QKSMS is free software: you can redistribute it and/or modify
+  ~ it under the terms of the GNU General Public License as published by
+  ~ the Free Software Foundation, either version 3 of the License, or
+  ~ (at your option) any later version.
+  ~
+  ~ QKSMS is distributed in the hope that it will be useful,
+  ~ but WITHOUT ANY WARRANTY; without even the implied warranty of
+  ~ MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+  ~ GNU General Public License for more details.
+  ~
+  ~ You should have received a copy of the GNU General Public License
+  ~ along with QKSMS.  If not, see <http://www.gnu.org/licenses/>.
+  -->
+<paths>
+    <external-path
+        name="external_files"
+        path="." />
+</paths>
diff --git a/presentation/src/main/res/xml/shortcuts.xml b/presentation/src/main/res/xml/shortcuts.xml
index ef0901fc7..490e1d014 100644
--- a/presentation/src/main/res/xml/shortcuts.xml
+++ b/presentation/src/main/res/xml/shortcuts.xml
@@ -1,39 +1,39 @@
-<?xml version="1.0" encoding="utf-8"?>
-<!--
-  ~ Copyright (C) 2019 Moez Bhatti <moez.bhatti@gmail.com>
-  ~
-  ~ This file is part of QKSMS.
-  ~
-  ~ QKSMS is free software: you can redistribute it and/or modify
-  ~ it under the terms of the GNU General Public License as published by
-  ~ the Free Software Foundation, either version 3 of the License, or
-  ~ (at your option) any later version.
-  ~
-  ~ QKSMS is distributed in the hope that it will be useful,
-  ~ but WITHOUT ANY WARRANTY; without even the implied warranty of
-  ~ MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
-  ~ GNU General Public License for more details.
-  ~
-  ~ You should have received a copy of the GNU General Public License
-  ~ along with QKSMS.  If not, see <http://www.gnu.org/licenses/>.
-  -->
-<shortcuts xmlns:android="http://schemas.android.com/apk/res/android">
-
-    <shortcut
-        android:enabled="true"
-        android:icon="@mipmap/ic_shortcut_compose"
-        android:shortcutDisabledMessage="@string/shortcut_compose_disabled_message"
-        android:shortcutId="compose"
-        android:shortcutLongLabel="@string/shortcut_compose_long_label"
-        android:shortcutShortLabel="@string/shortcut_compose_short_label">
-
-        <intent
-            android:action="com.moez.QKSMS.START"
-            android:targetClass="com.moez.QKSMS.feature.compose.ComposeActivity"
-            android:targetPackage="com.moez.QKSMS" />
-
-        <categories android:name="android.shortcut.conversation" />
-
-    </shortcut>
-
+<?xml version="1.0" encoding="utf-8"?>
+<!--
+  ~ Copyright (C) 2019 Moez Bhatti <moez.bhatti@gmail.com>
+  ~
+  ~ This file is part of QKSMS.
+  ~
+  ~ QKSMS is free software: you can redistribute it and/or modify
+  ~ it under the terms of the GNU General Public License as published by
+  ~ the Free Software Foundation, either version 3 of the License, or
+  ~ (at your option) any later version.
+  ~
+  ~ QKSMS is distributed in the hope that it will be useful,
+  ~ but WITHOUT ANY WARRANTY; without even the implied warranty of
+  ~ MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+  ~ GNU General Public License for more details.
+  ~
+  ~ You should have received a copy of the GNU General Public License
+  ~ along with QKSMS.  If not, see <http://www.gnu.org/licenses/>.
+  -->
+<shortcuts xmlns:android="http://schemas.android.com/apk/res/android">
+
+    <shortcut
+        android:enabled="true"
+        android:icon="@mipmap/ic_shortcut_compose"
+        android:shortcutDisabledMessage="@string/shortcut_compose_disabled_message"
+        android:shortcutId="compose"
+        android:shortcutLongLabel="@string/shortcut_compose_long_label"
+        android:shortcutShortLabel="@string/shortcut_compose_short_label">
+
+        <intent
+            android:action="com.moez.QKSMS.START"
+            android:targetClass="com.moez.QKSMS.feature.compose.ComposeActivity"
+            android:targetPackage="com.moez.QKSMS" />
+
+        <categories android:name="android.shortcut.conversation" />
+
+    </shortcut>
+
 </shortcuts>
\ No newline at end of file
diff --git a/presentation/src/main/res/xml/widget_info.xml b/presentation/src/main/res/xml/widget_info.xml
index 9b3066cf3..228ec9500 100644
--- a/presentation/src/main/res/xml/widget_info.xml
+++ b/presentation/src/main/res/xml/widget_info.xml
@@ -1,27 +1,27 @@
-<?xml version="1.0" encoding="utf-8"?>
-<!--
-  ~ Copyright (C) 2019 Moez Bhatti <moez.bhatti@gmail.com>
-  ~
-  ~ This file is part of QKSMS.
-  ~
-  ~ QKSMS is free software: you can redistribute it and/or modify
-  ~ it under the terms of the GNU General Public License as published by
-  ~ the Free Software Foundation, either version 3 of the License, or
-  ~ (at your option) any later version.
-  ~
-  ~ QKSMS is distributed in the hope that it will be useful,
-  ~ but WITHOUT ANY WARRANTY; without even the implied warranty of
-  ~ MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
-  ~ GNU General Public License for more details.
-  ~
-  ~ You should have received a copy of the GNU General Public License
-  ~ along with QKSMS.  If not, see <http://www.gnu.org/licenses/>.
-  -->
-<appwidget-provider xmlns:android="http://schemas.android.com/apk/res/android"
-    android:initialLayout="@layout/widget"
-    android:minWidth="180dp"
-    android:minHeight="110dp"
-    android:previewImage="@drawable/widget_preview"
-    android:resizeMode="horizontal|vertical"
-    android:updatePeriodMillis="0"
+<?xml version="1.0" encoding="utf-8"?>
+<!--
+  ~ Copyright (C) 2019 Moez Bhatti <moez.bhatti@gmail.com>
+  ~
+  ~ This file is part of QKSMS.
+  ~
+  ~ QKSMS is free software: you can redistribute it and/or modify
+  ~ it under the terms of the GNU General Public License as published by
+  ~ the Free Software Foundation, either version 3 of the License, or
+  ~ (at your option) any later version.
+  ~
+  ~ QKSMS is distributed in the hope that it will be useful,
+  ~ but WITHOUT ANY WARRANTY; without even the implied warranty of
+  ~ MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+  ~ GNU General Public License for more details.
+  ~
+  ~ You should have received a copy of the GNU General Public License
+  ~ along with QKSMS.  If not, see <http://www.gnu.org/licenses/>.
+  -->
+<appwidget-provider xmlns:android="http://schemas.android.com/apk/res/android"
+    android:initialLayout="@layout/widget"
+    android:minWidth="180dp"
+    android:minHeight="110dp"
+    android:previewImage="@drawable/widget_preview"
+    android:resizeMode="horizontal|vertical"
+    android:updatePeriodMillis="0"
     android:widgetCategory="home_screen|keyguard" />
\ No newline at end of file
diff --git a/presentation/src/noAnalytics/java/com/moez/QKSMS/common/util/BillingManagerImpl.kt b/presentation/src/noAnalytics/java/com/moez/QKSMS/common/util/BillingManagerImpl.kt
index 428caaa13..17b5ed972 100644
--- a/presentation/src/noAnalytics/java/com/moez/QKSMS/common/util/BillingManagerImpl.kt
+++ b/presentation/src/noAnalytics/java/com/moez/QKSMS/common/util/BillingManagerImpl.kt
@@ -1,39 +1,39 @@
-/*
- * Copyright (C) 2020 Moez Bhatti <moez.bhatti@gmail.com>
- *
- * This file is part of QKSMS.
- *
- * QKSMS is free software: you can redistribute it and/or modify
- * it under the terms of the GNU General Public License as published by
- * the Free Software Foundation, either version 3 of the License, or
- * (at your option) any later version.
- *
- * QKSMS is distributed in the hope that it will be useful,
- * but WITHOUT ANY WARRANTY; without even the implied warranty of
- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
- * GNU General Public License for more details.
- *
- * You should have received a copy of the GNU General Public License
- * along with QKSMS.  If not, see <http://www.gnu.org/licenses/>.
- */
-package com.moez.QKSMS.common.util
-
-import android.app.Activity
-import com.moez.QKSMS.manager.BillingManager
-import io.reactivex.Observable
-import io.reactivex.subjects.BehaviorSubject
-import javax.inject.Inject
-import javax.inject.Singleton
-
-@Singleton
-class BillingManagerImpl @Inject constructor(
-): BillingManager {
-
-    override val products: Observable<List<BillingManager.Product>> = BehaviorSubject.createDefault(listOf())
-    override val upgradeStatus: Observable<Boolean> = BehaviorSubject.createDefault(true)
-
-    override suspend fun checkForPurchases() = Unit
-    override suspend fun queryProducts() = Unit
-    override suspend fun initiatePurchaseFlow(activity: Activity, sku: String) = Unit
-
-}
+/*
+ * Copyright (C) 2020 Moez Bhatti <moez.bhatti@gmail.com>
+ *
+ * This file is part of QKSMS.
+ *
+ * QKSMS is free software: you can redistribute it and/or modify
+ * it under the terms of the GNU General Public License as published by
+ * the Free Software Foundation, either version 3 of the License, or
+ * (at your option) any later version.
+ *
+ * QKSMS is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+ * GNU General Public License for more details.
+ *
+ * You should have received a copy of the GNU General Public License
+ * along with QKSMS.  If not, see <http://www.gnu.org/licenses/>.
+ */
+package com.moez.QKSMS.common.util
+
+import android.app.Activity
+import com.moez.QKSMS.manager.BillingManager
+import io.reactivex.Observable
+import io.reactivex.subjects.BehaviorSubject
+import javax.inject.Inject
+import javax.inject.Singleton
+
+@Singleton
+class BillingManagerImpl @Inject constructor(
+): BillingManager {
+
+    override val products: Observable<List<BillingManager.Product>> = BehaviorSubject.createDefault(listOf())
+    override val upgradeStatus: Observable<Boolean> = BehaviorSubject.createDefault(true)
+
+    override suspend fun checkForPurchases() = Unit
+    override suspend fun queryProducts() = Unit
+    override suspend fun initiatePurchaseFlow(activity: Activity, sku: String) = Unit
+
+}
diff --git a/presentation/src/noAnalytics/java/com/moez/QKSMS/common/util/CrashlyticsTree.kt b/presentation/src/noAnalytics/java/com/moez/QKSMS/common/util/CrashlyticsTree.kt
index 4b897e3de..d0f899425 100644
--- a/presentation/src/noAnalytics/java/com/moez/QKSMS/common/util/CrashlyticsTree.kt
+++ b/presentation/src/noAnalytics/java/com/moez/QKSMS/common/util/CrashlyticsTree.kt
@@ -1,30 +1,30 @@
-/*
- * Copyright (C) 2017 Moez Bhatti <moez.bhatti@gmail.com>
- *
- * This file is part of QKSMS.
- *
- * QKSMS is free software: you can redistribute it and/or modify
- * it under the terms of the GNU General Public License as published by
- * the Free Software Foundation, either version 3 of the License, or
- * (at your option) any later version.
- *
- * QKSMS is distributed in the hope that it will be useful,
- * but WITHOUT ANY WARRANTY; without even the implied warranty of
- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
- * GNU General Public License for more details.
- *
- * You should have received a copy of the GNU General Public License
- * along with QKSMS.  If not, see <http://www.gnu.org/licenses/>.
- */
-package com.moez.QKSMS.common.util
-
-import timber.log.Timber
-import javax.inject.Inject
-
-class CrashlyticsTree : Timber.Tree() {
-
-    override fun log(priority: Int, tag: String?, message: String?, throwable: Throwable?) {
-        // Do nothing for noAnalytics build flavor
-    }
-
-}
+/*
+ * Copyright (C) 2017 Moez Bhatti <moez.bhatti@gmail.com>
+ *
+ * This file is part of QKSMS.
+ *
+ * QKSMS is free software: you can redistribute it and/or modify
+ * it under the terms of the GNU General Public License as published by
+ * the Free Software Foundation, either version 3 of the License, or
+ * (at your option) any later version.
+ *
+ * QKSMS is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+ * GNU General Public License for more details.
+ *
+ * You should have received a copy of the GNU General Public License
+ * along with QKSMS.  If not, see <http://www.gnu.org/licenses/>.
+ */
+package com.moez.QKSMS.common.util
+
+import timber.log.Timber
+import javax.inject.Inject
+
+class CrashlyticsTree : Timber.Tree() {
+
+    override fun log(priority: Int, tag: String?, message: String?, throwable: Throwable?) {
+        // Do nothing for noAnalytics build flavor
+    }
+
+}
diff --git a/presentation/src/withAnalytics/java/com/moez/QKSMS/common/util/BillingManagerImpl.kt b/presentation/src/withAnalytics/java/com/moez/QKSMS/common/util/BillingManagerImpl.kt
index c735c8d32..47ad90afe 100644
--- a/presentation/src/withAnalytics/java/com/moez/QKSMS/common/util/BillingManagerImpl.kt
+++ b/presentation/src/withAnalytics/java/com/moez/QKSMS/common/util/BillingManagerImpl.kt
@@ -1,176 +1,176 @@
-/*
- * Copyright (C) 2020 Moez Bhatti <moez.bhatti@gmail.com>
- *
- * This file is part of QKSMS.
- *
- * QKSMS is free software: you can redistribute it and/or modify
- * it under the terms of the GNU General Public License as published by
- * the Free Software Foundation, either version 3 of the License, or
- * (at your option) any later version.
- *
- * QKSMS is distributed in the hope that it will be useful,
- * but WITHOUT ANY WARRANTY; without even the implied warranty of
- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
- * GNU General Public License for more details.
- *
- * You should have received a copy of the GNU General Public License
- * along with QKSMS.  If not, see <http://www.gnu.org/licenses/>.
- */
-
-package com.moez.QKSMS.common.util
-
-import android.app.Activity
-import android.content.Context
-import com.android.billingclient.api.AcknowledgePurchaseParams
-import com.android.billingclient.api.BillingClient
-import com.android.billingclient.api.BillingClientStateListener
-import com.android.billingclient.api.BillingFlowParams
-import com.android.billingclient.api.BillingResult
-import com.android.billingclient.api.Purchase
-import com.android.billingclient.api.PurchasesUpdatedListener
-import com.android.billingclient.api.SkuDetails
-import com.android.billingclient.api.SkuDetailsParams
-import com.android.billingclient.api.acknowledgePurchase
-import com.android.billingclient.api.queryPurchaseHistory
-import com.android.billingclient.api.querySkuDetails
-import com.moez.QKSMS.manager.AnalyticsManager
-import com.moez.QKSMS.manager.BillingManager
-import io.reactivex.Observable
-import io.reactivex.subjects.BehaviorSubject
-import io.reactivex.subjects.Subject
-import kotlinx.coroutines.Dispatchers
-import kotlinx.coroutines.GlobalScope
-import kotlinx.coroutines.channels.BufferOverflow
-import kotlinx.coroutines.flow.MutableSharedFlow
-import kotlinx.coroutines.flow.first
-import kotlinx.coroutines.launch
-import kotlinx.coroutines.withContext
-import timber.log.Timber
-import javax.inject.Inject
-import javax.inject.Singleton
-
-@Singleton
-class BillingManagerImpl @Inject constructor(
-    context: Context,
-    private val analyticsManager: AnalyticsManager
-) : BillingManager, BillingClientStateListener, PurchasesUpdatedListener {
-
-    private val productsSubject: Subject<List<SkuDetails>> = BehaviorSubject.create()
-    override val products: Observable<List<BillingManager.Product>> = productsSubject
-            .map { skuDetailsList ->
-                skuDetailsList.map { skuDetails ->
-                    BillingManager.Product(skuDetails.sku, skuDetails.price, skuDetails.priceCurrencyCode)
-                }
-            }
-
-    private val purchaseListSubject = BehaviorSubject.create<List<Purchase>>()
-    override val upgradeStatus: Observable<Boolean> = purchaseListSubject
-            .map { purchases ->
-                purchases
-                        .filter { it.purchaseState == Purchase.PurchaseState.PURCHASED }
-                        .any { it.sku in skus }
-            }
-            .distinctUntilChanged()
-            .doOnNext { upgraded -> analyticsManager.setUserProperty("Upgraded", upgraded) }
-
-    private val skus = listOf(BillingManager.SKU_PLUS, BillingManager.SKU_PLUS_DONATE)
-    private val billingClient: BillingClient = BillingClient.newBuilder(context)
-            .setListener(this)
-            .enablePendingPurchases()
-            .build()
-
-    private val billingClientState = MutableSharedFlow<Int>(
-            replay = 1,
-            onBufferOverflow = BufferOverflow.DROP_OLDEST
-    )
-
-    init {
-        billingClientState.tryEmit(BillingClient.BillingResponseCode.SERVICE_DISCONNECTED)
-    }
-
-    override suspend fun checkForPurchases() = executeServiceRequest {
-        // Load the cached data
-        queryPurchases()
-
-        // On a fresh device, the purchase might not be cached, and so we'll need to force a refresh
-        billingClient.queryPurchaseHistory(BillingClient.SkuType.INAPP)
-        queryPurchases()
-    }
-
-    override suspend fun queryProducts() = executeServiceRequest {
-        val params = SkuDetailsParams.newBuilder()
-                .setSkusList(skus)
-                .setType(BillingClient.SkuType.INAPP)
-
-        val (billingResult, skuDetailsList) = billingClient.querySkuDetails(params.build())
-        if (billingResult.responseCode == BillingClient.BillingResponseCode.OK) {
-            productsSubject.onNext(skuDetailsList.orEmpty())
-        }
-    }
-
-    override suspend fun initiatePurchaseFlow(activity: Activity, sku: String) = executeServiceRequest {
-        val skuDetails = withContext(Dispatchers.IO) {
-            val params = SkuDetailsParams.newBuilder()
-                    .setType(BillingClient.SkuType.INAPP)
-                    .setSkusList(listOf(sku))
-                    .build()
-
-            billingClient.querySkuDetails(params).skuDetailsList?.firstOrNull()!!
-        }
-
-        val params = BillingFlowParams.newBuilder().setSkuDetails(skuDetails)
-        billingClient.launchBillingFlow(activity, params.build())
-    }
-
-    override fun onPurchasesUpdated(result: BillingResult, purchases: MutableList<Purchase>?) {
-        if (result.responseCode == BillingClient.BillingResponseCode.OK) {
-            GlobalScope.launch(Dispatchers.IO) {
-                handlePurchases(purchases.orEmpty())
-            }
-        }
-    }
-
-    private suspend fun queryPurchases() {
-        val result = billingClient.queryPurchases(BillingClient.SkuType.INAPP)
-        if (result.responseCode == BillingClient.BillingResponseCode.OK) {
-            handlePurchases(result.purchasesList.orEmpty())
-        }
-    }
-
-    private suspend fun handlePurchases(purchases: List<Purchase>) = executeServiceRequest {
-        purchases.forEach { purchase ->
-            if (!purchase.isAcknowledged) {
-                val params = AcknowledgePurchaseParams.newBuilder()
-                        .setPurchaseToken(purchase.purchaseToken)
-                        .build()
-
-                Timber.i("Acknowledging purchase ${purchase.orderId}")
-                val result = billingClient.acknowledgePurchase(params)
-                Timber.i("Acknowledgement result: ${result.responseCode}, ${result.debugMessage}")
-            }
-        }
-
-        purchaseListSubject.onNext(purchases)
-    }
-
-    private suspend fun executeServiceRequest(runnable: suspend () -> Unit) {
-        if (billingClientState.first() != BillingClient.BillingResponseCode.OK) {
-            Timber.i("Starting billing service")
-            billingClient.startConnection(this)
-        }
-
-        billingClientState.first { state -> state == BillingClient.BillingResponseCode.OK }
-        runnable()
-    }
-
-    override fun onBillingSetupFinished(result: BillingResult) {
-        Timber.i("Billing response: ${result.responseCode}")
-        billingClientState.tryEmit(result.responseCode)
-    }
-
-    override fun onBillingServiceDisconnected() {
-        Timber.i("Billing service disconnected")
-        billingClientState.tryEmit(BillingClient.BillingResponseCode.SERVICE_DISCONNECTED)
-    }
-
-}
+/*
+ * Copyright (C) 2020 Moez Bhatti <moez.bhatti@gmail.com>
+ *
+ * This file is part of QKSMS.
+ *
+ * QKSMS is free software: you can redistribute it and/or modify
+ * it under the terms of the GNU General Public License as published by
+ * the Free Software Foundation, either version 3 of the License, or
+ * (at your option) any later version.
+ *
+ * QKSMS is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+ * GNU General Public License for more details.
+ *
+ * You should have received a copy of the GNU General Public License
+ * along with QKSMS.  If not, see <http://www.gnu.org/licenses/>.
+ */
+
+package com.moez.QKSMS.common.util
+
+import android.app.Activity
+import android.content.Context
+import com.android.billingclient.api.AcknowledgePurchaseParams
+import com.android.billingclient.api.BillingClient
+import com.android.billingclient.api.BillingClientStateListener
+import com.android.billingclient.api.BillingFlowParams
+import com.android.billingclient.api.BillingResult
+import com.android.billingclient.api.Purchase
+import com.android.billingclient.api.PurchasesUpdatedListener
+import com.android.billingclient.api.SkuDetails
+import com.android.billingclient.api.SkuDetailsParams
+import com.android.billingclient.api.acknowledgePurchase
+import com.android.billingclient.api.queryPurchaseHistory
+import com.android.billingclient.api.querySkuDetails
+import com.moez.QKSMS.manager.AnalyticsManager
+import com.moez.QKSMS.manager.BillingManager
+import io.reactivex.Observable
+import io.reactivex.subjects.BehaviorSubject
+import io.reactivex.subjects.Subject
+import kotlinx.coroutines.Dispatchers
+import kotlinx.coroutines.GlobalScope
+import kotlinx.coroutines.channels.BufferOverflow
+import kotlinx.coroutines.flow.MutableSharedFlow
+import kotlinx.coroutines.flow.first
+import kotlinx.coroutines.launch
+import kotlinx.coroutines.withContext
+import timber.log.Timber
+import javax.inject.Inject
+import javax.inject.Singleton
+
+@Singleton
+class BillingManagerImpl @Inject constructor(
+    context: Context,
+    private val analyticsManager: AnalyticsManager
+) : BillingManager, BillingClientStateListener, PurchasesUpdatedListener {
+
+    private val productsSubject: Subject<List<SkuDetails>> = BehaviorSubject.create()
+    override val products: Observable<List<BillingManager.Product>> = productsSubject
+            .map { skuDetailsList ->
+                skuDetailsList.map { skuDetails ->
+                    BillingManager.Product(skuDetails.sku, skuDetails.price, skuDetails.priceCurrencyCode)
+                }
+            }
+
+    private val purchaseListSubject = BehaviorSubject.create<List<Purchase>>()
+    override val upgradeStatus: Observable<Boolean> = purchaseListSubject
+            .map { purchases ->
+                purchases
+                        .filter { it.purchaseState == Purchase.PurchaseState.PURCHASED }
+                        .any { it.sku in skus }
+            }
+            .distinctUntilChanged()
+            .doOnNext { upgraded -> analyticsManager.setUserProperty("Upgraded", upgraded) }
+
+    private val skus = listOf(BillingManager.SKU_PLUS, BillingManager.SKU_PLUS_DONATE)
+    private val billingClient: BillingClient = BillingClient.newBuilder(context)
+            .setListener(this)
+            .enablePendingPurchases()
+            .build()
+
+    private val billingClientState = MutableSharedFlow<Int>(
+            replay = 1,
+            onBufferOverflow = BufferOverflow.DROP_OLDEST
+    )
+
+    init {
+        billingClientState.tryEmit(BillingClient.BillingResponseCode.SERVICE_DISCONNECTED)
+    }
+
+    override suspend fun checkForPurchases() = executeServiceRequest {
+        // Load the cached data
+        queryPurchases()
+
+        // On a fresh device, the purchase might not be cached, and so we'll need to force a refresh
+        billingClient.queryPurchaseHistory(BillingClient.SkuType.INAPP)
+        queryPurchases()
+    }
+
+    override suspend fun queryProducts() = executeServiceRequest {
+        val params = SkuDetailsParams.newBuilder()
+                .setSkusList(skus)
+                .setType(BillingClient.SkuType.INAPP)
+
+        val (billingResult, skuDetailsList) = billingClient.querySkuDetails(params.build())
+        if (billingResult.responseCode == BillingClient.BillingResponseCode.OK) {
+            productsSubject.onNext(skuDetailsList.orEmpty())
+        }
+    }
+
+    override suspend fun initiatePurchaseFlow(activity: Activity, sku: String) = executeServiceRequest {
+        val skuDetails = withContext(Dispatchers.IO) {
+            val params = SkuDetailsParams.newBuilder()
+                    .setType(BillingClient.SkuType.INAPP)
+                    .setSkusList(listOf(sku))
+                    .build()
+
+            billingClient.querySkuDetails(params).skuDetailsList?.firstOrNull()!!
+        }
+
+        val params = BillingFlowParams.newBuilder().setSkuDetails(skuDetails)
+        billingClient.launchBillingFlow(activity, params.build())
+    }
+
+    override fun onPurchasesUpdated(result: BillingResult, purchases: MutableList<Purchase>?) {
+        if (result.responseCode == BillingClient.BillingResponseCode.OK) {
+            GlobalScope.launch(Dispatchers.IO) {
+                handlePurchases(purchases.orEmpty())
+            }
+        }
+    }
+
+    private suspend fun queryPurchases() {
+        val result = billingClient.queryPurchases(BillingClient.SkuType.INAPP)
+        if (result.responseCode == BillingClient.BillingResponseCode.OK) {
+            handlePurchases(result.purchasesList.orEmpty())
+        }
+    }
+
+    private suspend fun handlePurchases(purchases: List<Purchase>) = executeServiceRequest {
+        purchases.forEach { purchase ->
+            if (!purchase.isAcknowledged) {
+                val params = AcknowledgePurchaseParams.newBuilder()
+                        .setPurchaseToken(purchase.purchaseToken)
+                        .build()
+
+                Timber.i("Acknowledging purchase ${purchase.orderId}")
+                val result = billingClient.acknowledgePurchase(params)
+                Timber.i("Acknowledgement result: ${result.responseCode}, ${result.debugMessage}")
+            }
+        }
+
+        purchaseListSubject.onNext(purchases)
+    }
+
+    private suspend fun executeServiceRequest(runnable: suspend () -> Unit) {
+        if (billingClientState.first() != BillingClient.BillingResponseCode.OK) {
+            Timber.i("Starting billing service")
+            billingClient.startConnection(this)
+        }
+
+        billingClientState.first { state -> state == BillingClient.BillingResponseCode.OK }
+        runnable()
+    }
+
+    override fun onBillingSetupFinished(result: BillingResult) {
+        Timber.i("Billing response: ${result.responseCode}")
+        billingClientState.tryEmit(result.responseCode)
+    }
+
+    override fun onBillingServiceDisconnected() {
+        Timber.i("Billing service disconnected")
+        billingClientState.tryEmit(BillingClient.BillingResponseCode.SERVICE_DISCONNECTED)
+    }
+
+}
diff --git a/presentation/src/withAnalytics/java/com/moez/QKSMS/common/util/CrashlyticsTree.kt b/presentation/src/withAnalytics/java/com/moez/QKSMS/common/util/CrashlyticsTree.kt
index af0d9c969..0c3842c65 100644
--- a/presentation/src/withAnalytics/java/com/moez/QKSMS/common/util/CrashlyticsTree.kt
+++ b/presentation/src/withAnalytics/java/com/moez/QKSMS/common/util/CrashlyticsTree.kt
@@ -1,42 +1,42 @@
-/*
- * Copyright (C) 2017 Moez Bhatti <moez.bhatti@gmail.com>
- *
- * This file is part of QKSMS.
- *
- * QKSMS is free software: you can redistribute it and/or modify
- * it under the terms of the GNU General Public License as published by
- * the Free Software Foundation, either version 3 of the License, or
- * (at your option) any later version.
- *
- * QKSMS is distributed in the hope that it will be useful,
- * but WITHOUT ANY WARRANTY; without even the implied warranty of
- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
- * GNU General Public License for more details.
- *
- * You should have received a copy of the GNU General Public License
- * along with QKSMS.  If not, see <http://www.gnu.org/licenses/>.
- */
-package com.moez.QKSMS.common.util
-
-import android.util.Log
-import com.google.firebase.crashlytics.FirebaseCrashlytics
-import timber.log.Timber
-
-class CrashlyticsTree : Timber.Tree() {
-
-    override fun log(priority: Int, tag: String?, message: String?, throwable: Throwable?) {
-        val crashlytics = FirebaseCrashlytics.getInstance()
-        val priorityString = when (priority) {
-            Log.VERBOSE -> "V"
-            Log.DEBUG -> "D"
-            Log.INFO -> "I"
-            Log.WARN -> "W"
-            Log.ERROR -> "E"
-            else -> "WTF"
-        }
-
-        crashlytics.log("$priorityString/$tag: $message")
-        throwable?.run(crashlytics::recordException)
-    }
-
-}
+/*
+ * Copyright (C) 2017 Moez Bhatti <moez.bhatti@gmail.com>
+ *
+ * This file is part of QKSMS.
+ *
+ * QKSMS is free software: you can redistribute it and/or modify
+ * it under the terms of the GNU General Public License as published by
+ * the Free Software Foundation, either version 3 of the License, or
+ * (at your option) any later version.
+ *
+ * QKSMS is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+ * GNU General Public License for more details.
+ *
+ * You should have received a copy of the GNU General Public License
+ * along with QKSMS.  If not, see <http://www.gnu.org/licenses/>.
+ */
+package com.moez.QKSMS.common.util
+
+import android.util.Log
+import com.google.firebase.crashlytics.FirebaseCrashlytics
+import timber.log.Timber
+
+class CrashlyticsTree : Timber.Tree() {
+
+    override fun log(priority: Int, tag: String?, message: String?, throwable: Throwable?) {
+        val crashlytics = FirebaseCrashlytics.getInstance()
+        val priorityString = when (priority) {
+            Log.VERBOSE -> "V"
+            Log.DEBUG -> "D"
+            Log.INFO -> "I"
+            Log.WARN -> "W"
+            Log.ERROR -> "E"
+            else -> "WTF"
+        }
+
+        crashlytics.log("$priorityString/$tag: $message")
+        throwable?.run(crashlytics::recordException)
+    }
+
+}
diff --git a/settings.gradle b/settings.gradle
index 2f9fa8d70..4fbd057d6 100644
--- a/settings.gradle
+++ b/settings.gradle
@@ -1 +1 @@
-include ':presentation', ':android-smsmms', ':domain', ':data', ':common'
+include ':presentation', ':android-smsmms', ':domain', ':data', ':common'